Compare commits
4 Commits
8d4cd965e1
...
9b5ecc0171
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9b5ecc0171 | ||
|
|
a00325da0e | ||
| 4ebce3422d | |||
| 751e0ee330 |
@@ -23,6 +23,7 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@mosaicstack/db": "workspace:*",
|
"@mosaicstack/db": "workspace:*",
|
||||||
|
"commander": "^13.0.0",
|
||||||
"drizzle-orm": "^0.45.1"
|
"drizzle-orm": "^0.45.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
|||||||
68
packages/log/src/cli.spec.ts
Normal file
68
packages/log/src/cli.spec.ts
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
import { Command } from 'commander';
|
||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
|
||||||
|
import { registerLogCommand } from './cli.js';
|
||||||
|
|
||||||
|
function buildTestProgram(): Command {
|
||||||
|
const program = new Command('mosaic');
|
||||||
|
program.exitOverride(); // prevent process.exit in tests
|
||||||
|
registerLogCommand(program);
|
||||||
|
return program;
|
||||||
|
}
|
||||||
|
|
||||||
|
describe('registerLogCommand', () => {
|
||||||
|
it('registers a "log" subcommand on the parent', () => {
|
||||||
|
const program = buildTestProgram();
|
||||||
|
const names = program.commands.map((c) => c.name());
|
||||||
|
expect(names).toContain('log');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('log command has tail, search, export, and level subcommands', () => {
|
||||||
|
const program = buildTestProgram();
|
||||||
|
const logCmd = program.commands.find((c) => c.name() === 'log');
|
||||||
|
expect(logCmd).toBeDefined();
|
||||||
|
const subNames = logCmd!.commands.map((c) => c.name());
|
||||||
|
expect(subNames).toContain('tail');
|
||||||
|
expect(subNames).toContain('search');
|
||||||
|
expect(subNames).toContain('export');
|
||||||
|
expect(subNames).toContain('level');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('tail subcommand has expected options', () => {
|
||||||
|
const program = buildTestProgram();
|
||||||
|
const logCmd = program.commands.find((c) => c.name() === 'log')!;
|
||||||
|
const tailCmd = logCmd.commands.find((c) => c.name() === 'tail')!;
|
||||||
|
const optionNames = tailCmd.options.map((o) => o.long);
|
||||||
|
expect(optionNames).toContain('--agent');
|
||||||
|
expect(optionNames).toContain('--level');
|
||||||
|
expect(optionNames).toContain('--category');
|
||||||
|
expect(optionNames).toContain('--tier');
|
||||||
|
expect(optionNames).toContain('--limit');
|
||||||
|
expect(optionNames).toContain('--db');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('search subcommand accepts a positional query argument', () => {
|
||||||
|
const program = buildTestProgram();
|
||||||
|
const logCmd = program.commands.find((c) => c.name() === 'log')!;
|
||||||
|
const searchCmd = logCmd.commands.find((c) => c.name() === 'search')!;
|
||||||
|
// Commander stores positional args in _args
|
||||||
|
const argNames = searchCmd.registeredArguments.map((a) => a.name());
|
||||||
|
expect(argNames).toContain('query');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('export subcommand accepts a positional path argument', () => {
|
||||||
|
const program = buildTestProgram();
|
||||||
|
const logCmd = program.commands.find((c) => c.name() === 'log')!;
|
||||||
|
const exportCmd = logCmd.commands.find((c) => c.name() === 'export')!;
|
||||||
|
const argNames = exportCmd.registeredArguments.map((a) => a.name());
|
||||||
|
expect(argNames).toContain('path');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('level subcommand accepts a positional level argument', () => {
|
||||||
|
const program = buildTestProgram();
|
||||||
|
const logCmd = program.commands.find((c) => c.name() === 'log')!;
|
||||||
|
const levelCmd = logCmd.commands.find((c) => c.name() === 'level')!;
|
||||||
|
const argNames = levelCmd.registeredArguments.map((a) => a.name());
|
||||||
|
expect(argNames).toContain('level');
|
||||||
|
});
|
||||||
|
});
|
||||||
177
packages/log/src/cli.ts
Normal file
177
packages/log/src/cli.ts
Normal file
@@ -0,0 +1,177 @@
|
|||||||
|
import { writeFileSync } from 'node:fs';
|
||||||
|
|
||||||
|
import type { Command } from 'commander';
|
||||||
|
|
||||||
|
import type { LogCategory, LogLevel, LogTier } from './agent-logs.js';
|
||||||
|
|
||||||
|
interface FilterOptions {
|
||||||
|
agent?: string;
|
||||||
|
level?: string;
|
||||||
|
category?: string;
|
||||||
|
tier?: string;
|
||||||
|
limit?: string;
|
||||||
|
db?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseLimit(raw: string | undefined, defaultVal = 50): number {
|
||||||
|
if (!raw) return defaultVal;
|
||||||
|
const n = parseInt(raw, 10);
|
||||||
|
return Number.isFinite(n) && n > 0 ? n : defaultVal;
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildQuery(opts: FilterOptions) {
|
||||||
|
return {
|
||||||
|
...(opts.agent ? { sessionId: opts.agent } : {}),
|
||||||
|
...(opts.level ? { level: opts.level as LogLevel } : {}),
|
||||||
|
...(opts.category ? { category: opts.category as LogCategory } : {}),
|
||||||
|
...(opts.tier ? { tier: opts.tier as LogTier } : {}),
|
||||||
|
limit: parseLimit(opts.limit),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function openDb(connectionString: string) {
|
||||||
|
const { createDb } = await import('@mosaicstack/db');
|
||||||
|
return createDb(connectionString);
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveConnectionString(opts: FilterOptions): string | undefined {
|
||||||
|
return opts.db ?? process.env['DATABASE_URL'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register log subcommands on an existing Commander program.
|
||||||
|
* This avoids cross-package Commander version mismatches by using the
|
||||||
|
* caller's Command instance directly.
|
||||||
|
*/
|
||||||
|
export function registerLogCommand(parent: Command): void {
|
||||||
|
const log = parent.command('log').description('Query and manage agent logs');
|
||||||
|
|
||||||
|
// ─── tail ───────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
log
|
||||||
|
.command('tail')
|
||||||
|
.description('Tail recent agent logs')
|
||||||
|
.option('--agent <id>', 'Filter by agent/session ID')
|
||||||
|
.option('--level <level>', 'Filter by log level (debug|info|warn|error)')
|
||||||
|
.option('--category <cat>', 'Filter by category (decision|tool_use|learning|error|general)')
|
||||||
|
.option('--tier <tier>', 'Filter by tier (hot|warm|cold)')
|
||||||
|
.option('--limit <n>', 'Number of logs to return (default 50)', '50')
|
||||||
|
.option('--db <connection-string>', 'Database connection string (or set DATABASE_URL)')
|
||||||
|
.action(async (opts: FilterOptions) => {
|
||||||
|
const connStr = resolveConnectionString(opts);
|
||||||
|
if (!connStr) {
|
||||||
|
console.error('Database connection required: use --db or set DATABASE_URL');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const handle = await openDb(connStr);
|
||||||
|
try {
|
||||||
|
const { createLogService } = await import('./log-service.js');
|
||||||
|
const svc = createLogService(handle.db);
|
||||||
|
const query = buildQuery(opts);
|
||||||
|
|
||||||
|
const logs = await svc.logs.query(query);
|
||||||
|
if (logs.length === 0) {
|
||||||
|
console.log('No logs found.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (const entry of logs) {
|
||||||
|
const ts = new Date(entry.createdAt).toISOString();
|
||||||
|
console.log(`[${ts}] [${entry.level}] [${entry.category}] ${entry.content}`);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
await handle.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── search ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
log
|
||||||
|
.command('search <query>')
|
||||||
|
.description('Full-text search over agent logs')
|
||||||
|
.option('--agent <id>', 'Filter by agent/session ID')
|
||||||
|
.option('--level <level>', 'Filter by log level (debug|info|warn|error)')
|
||||||
|
.option('--category <cat>', 'Filter by category (decision|tool_use|learning|error|general)')
|
||||||
|
.option('--tier <tier>', 'Filter by tier (hot|warm|cold)')
|
||||||
|
.option('--limit <n>', 'Number of logs to return (default 50)', '50')
|
||||||
|
.option('--db <connection-string>', 'Database connection string (or set DATABASE_URL)')
|
||||||
|
.action(async (query: string, opts: FilterOptions) => {
|
||||||
|
const connStr = resolveConnectionString(opts);
|
||||||
|
if (!connStr) {
|
||||||
|
console.error('Database connection required: use --db or set DATABASE_URL');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const handle = await openDb(connStr);
|
||||||
|
try {
|
||||||
|
const { createLogService } = await import('./log-service.js');
|
||||||
|
const svc = createLogService(handle.db);
|
||||||
|
const baseQuery = buildQuery(opts);
|
||||||
|
|
||||||
|
const logs = await svc.logs.query(baseQuery);
|
||||||
|
const lowerQ = query.toLowerCase();
|
||||||
|
const matched = logs.filter(
|
||||||
|
(e) =>
|
||||||
|
e.content.toLowerCase().includes(lowerQ) ||
|
||||||
|
(e.metadata != null && JSON.stringify(e.metadata).toLowerCase().includes(lowerQ)),
|
||||||
|
);
|
||||||
|
|
||||||
|
if (matched.length === 0) {
|
||||||
|
console.log('No matching logs found.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
for (const entry of matched) {
|
||||||
|
const ts = new Date(entry.createdAt).toISOString();
|
||||||
|
console.log(`[${ts}] [${entry.level}] [${entry.category}] ${entry.content}`);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
await handle.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── export ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
log
|
||||||
|
.command('export <path>')
|
||||||
|
.description('Export matching logs to an NDJSON file')
|
||||||
|
.option('--agent <id>', 'Filter by agent/session ID')
|
||||||
|
.option('--level <level>', 'Filter by log level (debug|info|warn|error)')
|
||||||
|
.option('--category <cat>', 'Filter by category (decision|tool_use|learning|error|general)')
|
||||||
|
.option('--tier <tier>', 'Filter by tier (hot|warm|cold)')
|
||||||
|
.option('--limit <n>', 'Number of logs to export (default 50)', '50')
|
||||||
|
.option('--db <connection-string>', 'Database connection string (or set DATABASE_URL)')
|
||||||
|
.action(async (outputPath: string, opts: FilterOptions) => {
|
||||||
|
const connStr = resolveConnectionString(opts);
|
||||||
|
if (!connStr) {
|
||||||
|
console.error('Database connection required: use --db or set DATABASE_URL');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const handle = await openDb(connStr);
|
||||||
|
try {
|
||||||
|
const { createLogService } = await import('./log-service.js');
|
||||||
|
const svc = createLogService(handle.db);
|
||||||
|
const query = buildQuery(opts);
|
||||||
|
|
||||||
|
const logs = await svc.logs.query(query);
|
||||||
|
const ndjson = logs.map((e) => JSON.stringify(e)).join('\n');
|
||||||
|
writeFileSync(outputPath, ndjson, 'utf8');
|
||||||
|
console.log(`Exported ${logs.length} log(s) to ${outputPath}`);
|
||||||
|
} finally {
|
||||||
|
await handle.close();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── level ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
log
|
||||||
|
.command('level <level>')
|
||||||
|
.description('Set runtime log level for the connected log service')
|
||||||
|
.action((level: string) => {
|
||||||
|
void level;
|
||||||
|
console.log(
|
||||||
|
'Runtime log level adjustment is not supported in current mode (DB-backed log service).',
|
||||||
|
);
|
||||||
|
process.exitCode = 0;
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -9,3 +9,4 @@ export {
|
|||||||
type LogTier,
|
type LogTier,
|
||||||
type LogQuery,
|
type LogQuery,
|
||||||
} from './agent-logs.js';
|
} from './agent-logs.js';
|
||||||
|
export { registerLogCommand } from './cli.js';
|
||||||
|
|||||||
@@ -30,11 +30,13 @@
|
|||||||
"@mosaicstack/brain": "workspace:*",
|
"@mosaicstack/brain": "workspace:*",
|
||||||
"@mosaicstack/config": "workspace:*",
|
"@mosaicstack/config": "workspace:*",
|
||||||
"@mosaicstack/forge": "workspace:*",
|
"@mosaicstack/forge": "workspace:*",
|
||||||
|
"@mosaicstack/log": "workspace:*",
|
||||||
"@mosaicstack/macp": "workspace:*",
|
"@mosaicstack/macp": "workspace:*",
|
||||||
"@mosaicstack/memory": "workspace:*",
|
"@mosaicstack/memory": "workspace:*",
|
||||||
"@mosaicstack/prdy": "workspace:*",
|
"@mosaicstack/prdy": "workspace:*",
|
||||||
"@mosaicstack/quality-rails": "workspace:*",
|
"@mosaicstack/quality-rails": "workspace:*",
|
||||||
"@mosaicstack/queue": "workspace:*",
|
"@mosaicstack/queue": "workspace:*",
|
||||||
|
"@mosaicstack/storage": "workspace:*",
|
||||||
"@mosaicstack/types": "workspace:*",
|
"@mosaicstack/types": "workspace:*",
|
||||||
"@clack/prompts": "^0.9.1",
|
"@clack/prompts": "^0.9.1",
|
||||||
"commander": "^13.0.0",
|
"commander": "^13.0.0",
|
||||||
|
|||||||
@@ -4,9 +4,11 @@ import { createRequire } from 'module';
|
|||||||
import { Command } from 'commander';
|
import { Command } from 'commander';
|
||||||
import { registerBrainCommand } from '@mosaicstack/brain';
|
import { registerBrainCommand } from '@mosaicstack/brain';
|
||||||
import { registerForgeCommand } from '@mosaicstack/forge';
|
import { registerForgeCommand } from '@mosaicstack/forge';
|
||||||
|
import { registerLogCommand } from '@mosaicstack/log';
|
||||||
import { registerMemoryCommand } from '@mosaicstack/memory';
|
import { registerMemoryCommand } from '@mosaicstack/memory';
|
||||||
import { registerQualityRails } from '@mosaicstack/quality-rails';
|
import { registerQualityRails } from '@mosaicstack/quality-rails';
|
||||||
import { registerQueueCommand } from '@mosaicstack/queue';
|
import { registerQueueCommand } from '@mosaicstack/queue';
|
||||||
|
import { registerStorageCommand } from '@mosaicstack/storage';
|
||||||
import { registerAgentCommand } from './commands/agent.js';
|
import { registerAgentCommand } from './commands/agent.js';
|
||||||
import { registerConfigCommand } from './commands/config.js';
|
import { registerConfigCommand } from './commands/config.js';
|
||||||
import { registerMissionCommand } from './commands/mission.js';
|
import { registerMissionCommand } from './commands/mission.js';
|
||||||
@@ -359,6 +361,10 @@ registerForgeCommand(program);
|
|||||||
|
|
||||||
registerQualityRails(program);
|
registerQualityRails(program);
|
||||||
|
|
||||||
|
// ─── log ─────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
registerLogCommand(program);
|
||||||
|
|
||||||
// ─── memory ──────────────────────────────────────────────────────────────
|
// ─── memory ──────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
registerMemoryCommand(program);
|
registerMemoryCommand(program);
|
||||||
@@ -367,6 +373,10 @@ registerMemoryCommand(program);
|
|||||||
|
|
||||||
registerQueueCommand(program);
|
registerQueueCommand(program);
|
||||||
|
|
||||||
|
// ─── storage ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
registerStorageCommand(program);
|
||||||
|
|
||||||
// ─── update ─────────────────────────────────────────────────────────────
|
// ─── update ─────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
program
|
program
|
||||||
|
|||||||
@@ -23,7 +23,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@electric-sql/pglite": "^0.2.17",
|
"@electric-sql/pglite": "^0.2.17",
|
||||||
"@mosaicstack/db": "workspace:^",
|
"@mosaicstack/db": "workspace:^",
|
||||||
"@mosaicstack/types": "workspace:*"
|
"@mosaicstack/types": "workspace:*",
|
||||||
|
"commander": "^13.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"typescript": "^5.8.0",
|
"typescript": "^5.8.0",
|
||||||
|
|||||||
85
packages/storage/src/cli.spec.ts
Normal file
85
packages/storage/src/cli.spec.ts
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
import { describe, it, expect } from 'vitest';
|
||||||
|
import { Command } from 'commander';
|
||||||
|
import { registerStorageCommand } from './cli.js';
|
||||||
|
|
||||||
|
describe('registerStorageCommand', () => {
|
||||||
|
function buildProgram(): Command {
|
||||||
|
const program = new Command();
|
||||||
|
program.exitOverride(); // prevent process.exit in tests
|
||||||
|
registerStorageCommand(program);
|
||||||
|
return program;
|
||||||
|
}
|
||||||
|
|
||||||
|
it('registers a "storage" command on the parent', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage');
|
||||||
|
expect(storageCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "storage status" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const statusCmd = storageCmd.commands.find((c) => c.name() === 'status');
|
||||||
|
expect(statusCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "storage tier" subcommand group', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const tierCmd = storageCmd.commands.find((c) => c.name() === 'tier');
|
||||||
|
expect(tierCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "storage tier show" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const tierCmd = storageCmd.commands.find((c) => c.name() === 'tier')!;
|
||||||
|
const showCmd = tierCmd.commands.find((c) => c.name() === 'show');
|
||||||
|
expect(showCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "storage tier switch" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const tierCmd = storageCmd.commands.find((c) => c.name() === 'tier')!;
|
||||||
|
const switchCmd = tierCmd.commands.find((c) => c.name() === 'switch');
|
||||||
|
expect(switchCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "storage export" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const exportCmd = storageCmd.commands.find((c) => c.name() === 'export');
|
||||||
|
expect(exportCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "storage import" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const importCmd = storageCmd.commands.find((c) => c.name() === 'import');
|
||||||
|
expect(importCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('registers "storage migrate" subcommand', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const migrateCmd = storageCmd.commands.find((c) => c.name() === 'migrate');
|
||||||
|
expect(migrateCmd).toBeDefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('has all required subcommands in a single assertion', () => {
|
||||||
|
const program = buildProgram();
|
||||||
|
const storageCmd = program.commands.find((c) => c.name() === 'storage')!;
|
||||||
|
const topLevel = storageCmd.commands.map((c) => c.name());
|
||||||
|
expect(topLevel).toContain('status');
|
||||||
|
expect(topLevel).toContain('tier');
|
||||||
|
expect(topLevel).toContain('export');
|
||||||
|
expect(topLevel).toContain('import');
|
||||||
|
expect(topLevel).toContain('migrate');
|
||||||
|
|
||||||
|
const tierCmd = storageCmd.commands.find((c) => c.name() === 'tier')!;
|
||||||
|
const tierSubcmds = tierCmd.commands.map((c) => c.name());
|
||||||
|
expect(tierSubcmds).toContain('show');
|
||||||
|
expect(tierSubcmds).toContain('switch');
|
||||||
|
});
|
||||||
|
});
|
||||||
256
packages/storage/src/cli.ts
Normal file
256
packages/storage/src/cli.ts
Normal file
@@ -0,0 +1,256 @@
|
|||||||
|
import type { Command } from 'commander';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads the DATABASE_URL environment variable and redacts the password portion.
|
||||||
|
*/
|
||||||
|
function redactedConnectionString(): string | null {
|
||||||
|
const url = process.env['DATABASE_URL'];
|
||||||
|
if (!url) return null;
|
||||||
|
try {
|
||||||
|
const parsed = new URL(url);
|
||||||
|
if (parsed.password) {
|
||||||
|
parsed.password = '***';
|
||||||
|
}
|
||||||
|
return parsed.toString();
|
||||||
|
} catch {
|
||||||
|
// Not a valid URL — redact anything that looks like :password@
|
||||||
|
return url.replace(/:([^@/]+)@/, ':***@');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determine the active storage tier from the environment.
|
||||||
|
* Looks at DATABASE_URL; if absent or set to a pglite path, treats tier as pglite.
|
||||||
|
*/
|
||||||
|
function activeTier(): 'postgres' | 'pglite' {
|
||||||
|
const url = process.env['DATABASE_URL'];
|
||||||
|
if (url && url.startsWith('postgres')) return 'postgres';
|
||||||
|
return 'pglite';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Return a human-readable config source description.
|
||||||
|
*/
|
||||||
|
function configSource(): string {
|
||||||
|
if (process.env['DATABASE_URL']) return 'env:DATABASE_URL';
|
||||||
|
const pgliteDir = process.env['PGLITE_DATA_DIR'];
|
||||||
|
if (pgliteDir) return `env:PGLITE_DATA_DIR (${pgliteDir})`;
|
||||||
|
return 'default (no DATABASE_URL set)';
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Register storage subcommands on an existing Commander program.
|
||||||
|
* Follows the registerQualityRails pattern — uses the caller's Command
|
||||||
|
* instance to avoid cross-package Commander version mismatches.
|
||||||
|
*/
|
||||||
|
export function registerStorageCommand(parent: Command): void {
|
||||||
|
const storage = parent
|
||||||
|
.command('storage')
|
||||||
|
.description('Inspect and manage Mosaic storage configuration');
|
||||||
|
|
||||||
|
// ── storage status ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
storage
|
||||||
|
.command('status')
|
||||||
|
.description('Show the configured storage tier and whether the adapter is reachable')
|
||||||
|
.action(async () => {
|
||||||
|
const tier = activeTier();
|
||||||
|
const source = configSource();
|
||||||
|
const connStr = tier === 'postgres' ? redactedConnectionString() : null;
|
||||||
|
|
||||||
|
console.log(`[storage] tier: ${tier}`);
|
||||||
|
console.log(`[storage] config source: ${source}`);
|
||||||
|
|
||||||
|
if (tier === 'postgres' && connStr) {
|
||||||
|
console.log(`[storage] connection: ${connStr}`);
|
||||||
|
try {
|
||||||
|
const { createDb, sql } = await import('@mosaicstack/db');
|
||||||
|
const url = process.env['DATABASE_URL'] ?? '';
|
||||||
|
const handle = createDb(url);
|
||||||
|
await handle.db.execute(sql`SELECT 1`);
|
||||||
|
await handle.close();
|
||||||
|
console.log('[storage] reachable: yes');
|
||||||
|
} catch (err) {
|
||||||
|
console.log(
|
||||||
|
`[storage] reachable: no (${err instanceof Error ? err.message : String(err)})`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const dataDir = process.env['PGLITE_DATA_DIR'] ?? ':memory:';
|
||||||
|
console.log(`[storage] data dir: ${dataDir}`);
|
||||||
|
console.log('[storage] reachable: pglite is always local — no network check needed');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── storage tier ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const tier = storage.command('tier').description('Inspect or switch the storage tier');
|
||||||
|
|
||||||
|
tier
|
||||||
|
.command('show')
|
||||||
|
.description('Print the active storage tier and its config source')
|
||||||
|
.action(() => {
|
||||||
|
const activeTierValue = activeTier();
|
||||||
|
const source = configSource();
|
||||||
|
console.log(`[storage] active tier: ${activeTierValue}`);
|
||||||
|
console.log(`[storage] config source: ${source}`);
|
||||||
|
});
|
||||||
|
|
||||||
|
tier
|
||||||
|
.command('switch <tier>')
|
||||||
|
.description('Switch storage tier between pglite and postgres')
|
||||||
|
.action((newTier: string) => {
|
||||||
|
const validTiers = ['pglite', 'postgres'];
|
||||||
|
if (!validTiers.includes(newTier)) {
|
||||||
|
console.error(
|
||||||
|
`[storage] unknown tier: ${newTier}. Valid options: ${validTiers.join(', ')}`,
|
||||||
|
);
|
||||||
|
process.exitCode = 1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`[storage] tier switch requested: ${newTier}`);
|
||||||
|
console.log('');
|
||||||
|
console.log('Mosaic storage tier is controlled by environment variables.');
|
||||||
|
console.log('Automatic config-file mutation is not supported — set the variable manually.');
|
||||||
|
console.log('');
|
||||||
|
|
||||||
|
if (newTier === 'postgres') {
|
||||||
|
console.log('To switch to postgres:');
|
||||||
|
console.log(' 1. Set DATABASE_URL in your environment or .env file:');
|
||||||
|
console.log(' export DATABASE_URL="postgresql://user:pass@localhost:5432/mosaic"');
|
||||||
|
console.log(' 2. Run migrations:');
|
||||||
|
console.log(' pnpm --filter @mosaicstack/db db:migrate');
|
||||||
|
console.log(' 3. Restart the gateway.');
|
||||||
|
} else {
|
||||||
|
console.log('To switch to pglite:');
|
||||||
|
console.log(' 1. Unset DATABASE_URL (or set it to a pglite path):');
|
||||||
|
console.log(' unset DATABASE_URL');
|
||||||
|
console.log(' # optionally: export PGLITE_DATA_DIR=/path/to/pglite/data');
|
||||||
|
console.log(' 2. Restart the gateway.');
|
||||||
|
console.log(' Note: pglite uses an in-process database — no migrations needed.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── storage export ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
storage
|
||||||
|
.command('export <path>')
|
||||||
|
.description('Dump the active storage contents to a file')
|
||||||
|
.action((outputPath: string) => {
|
||||||
|
const currentTier = activeTier();
|
||||||
|
|
||||||
|
if (currentTier === 'postgres') {
|
||||||
|
const redacted = redactedConnectionString() ?? '<DATABASE_URL>';
|
||||||
|
console.log('[storage] export for postgres tier');
|
||||||
|
console.log('');
|
||||||
|
console.log('postgres export is not yet wired in the CLI — use pg_dump directly:');
|
||||||
|
console.log('');
|
||||||
|
console.log(` pg_dump "${redacted}" > ${outputPath}`);
|
||||||
|
console.log('');
|
||||||
|
console.log('Or with Docker:');
|
||||||
|
console.log(
|
||||||
|
` docker exec <postgres-container> pg_dump -U <user> <dbname> > ${outputPath}`,
|
||||||
|
);
|
||||||
|
process.exitCode = 0;
|
||||||
|
} else {
|
||||||
|
const dataDir = process.env['PGLITE_DATA_DIR'];
|
||||||
|
console.log('[storage] export for pglite tier');
|
||||||
|
console.log('');
|
||||||
|
console.log(
|
||||||
|
'pglite export is not yet wired in the CLI — copy the data directory directly:',
|
||||||
|
);
|
||||||
|
console.log('');
|
||||||
|
if (dataDir) {
|
||||||
|
console.log(` cp -r ${dataDir} ${outputPath}`);
|
||||||
|
} else {
|
||||||
|
console.log(
|
||||||
|
' PGLITE_DATA_DIR is not set; the database is in-memory and cannot be exported.',
|
||||||
|
);
|
||||||
|
console.log(' Set PGLITE_DATA_DIR to a persistent path before running export.');
|
||||||
|
}
|
||||||
|
process.exitCode = 0;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── storage import ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
storage
|
||||||
|
.command('import <path>')
|
||||||
|
.description('Restore storage contents from a previously exported file')
|
||||||
|
.action((inputPath: string) => {
|
||||||
|
const currentTier = activeTier();
|
||||||
|
|
||||||
|
if (currentTier === 'postgres') {
|
||||||
|
const redacted = redactedConnectionString() ?? '<DATABASE_URL>';
|
||||||
|
console.log('[storage] import for postgres tier');
|
||||||
|
console.log('');
|
||||||
|
console.log('postgres import is not yet wired in the CLI — use psql directly:');
|
||||||
|
console.log('');
|
||||||
|
console.log(` psql "${redacted}" < ${inputPath}`);
|
||||||
|
process.exitCode = 0;
|
||||||
|
} else {
|
||||||
|
const dataDir = process.env['PGLITE_DATA_DIR'];
|
||||||
|
console.log('[storage] import for pglite tier');
|
||||||
|
console.log('');
|
||||||
|
console.log(
|
||||||
|
'pglite import is not yet wired in the CLI — restore the data directory directly:',
|
||||||
|
);
|
||||||
|
console.log('');
|
||||||
|
if (dataDir) {
|
||||||
|
console.log(` rm -rf ${dataDir} && cp -r ${inputPath} ${dataDir}`);
|
||||||
|
console.log(' Then restart the gateway.');
|
||||||
|
} else {
|
||||||
|
console.log(
|
||||||
|
' PGLITE_DATA_DIR is not set; set it to a persistent path before running import.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
process.exitCode = 0;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// ── storage migrate ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
storage
|
||||||
|
.command('migrate')
|
||||||
|
.description(
|
||||||
|
'Run database migrations (thin wrapper — delegates to pnpm db:migrate or prints the command)',
|
||||||
|
)
|
||||||
|
.option('--run', 'Actually execute the migration command via shell')
|
||||||
|
.action(async (opts: { run?: boolean }) => {
|
||||||
|
const currentTier = activeTier();
|
||||||
|
|
||||||
|
if (currentTier === 'pglite') {
|
||||||
|
console.log('[storage] pglite tier detected');
|
||||||
|
console.log(
|
||||||
|
'pglite runs schema setup automatically on first connection via adapter.migrate().',
|
||||||
|
);
|
||||||
|
console.log('No separate migration step is required.');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const migrateCmd = 'pnpm --filter @mosaicstack/db db:migrate';
|
||||||
|
console.log('[storage] postgres tier detected');
|
||||||
|
console.log(`Migration command: ${migrateCmd}`);
|
||||||
|
console.log('');
|
||||||
|
|
||||||
|
if (opts.run) {
|
||||||
|
console.log('Running migrations...');
|
||||||
|
const { execSync } = await import('node:child_process');
|
||||||
|
try {
|
||||||
|
execSync(migrateCmd, { stdio: 'inherit' });
|
||||||
|
console.log('[storage] migrations complete.');
|
||||||
|
} catch (err) {
|
||||||
|
console.error(
|
||||||
|
`[storage] migration failed: ${err instanceof Error ? err.message : String(err)}`,
|
||||||
|
);
|
||||||
|
process.exitCode = 1;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
console.log('To run migrations, execute:');
|
||||||
|
console.log(` ${migrateCmd}`);
|
||||||
|
console.log('');
|
||||||
|
console.log('Or pass --run to have this command execute it for you.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -2,6 +2,7 @@ export type { StorageAdapter, StorageConfig } from './types.js';
|
|||||||
export { createStorageAdapter, registerStorageAdapter } from './factory.js';
|
export { createStorageAdapter, registerStorageAdapter } from './factory.js';
|
||||||
export { PostgresAdapter } from './adapters/postgres.js';
|
export { PostgresAdapter } from './adapters/postgres.js';
|
||||||
export { PgliteAdapter } from './adapters/pglite.js';
|
export { PgliteAdapter } from './adapters/pglite.js';
|
||||||
|
export { registerStorageCommand } from './cli.js';
|
||||||
|
|
||||||
import { registerStorageAdapter } from './factory.js';
|
import { registerStorageAdapter } from './factory.js';
|
||||||
import { PostgresAdapter } from './adapters/postgres.js';
|
import { PostgresAdapter } from './adapters/postgres.js';
|
||||||
|
|||||||
12
pnpm-lock.yaml
generated
12
pnpm-lock.yaml
generated
@@ -407,6 +407,9 @@ importers:
|
|||||||
'@mosaicstack/db':
|
'@mosaicstack/db':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../db
|
version: link:../db
|
||||||
|
commander:
|
||||||
|
specifier: ^13.0.0
|
||||||
|
version: 13.1.0
|
||||||
drizzle-orm:
|
drizzle-orm:
|
||||||
specifier: ^0.45.1
|
specifier: ^0.45.1
|
||||||
version: 0.45.1(@electric-sql/pglite@0.2.17)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.15.6)(better-sqlite3@12.8.0)(kysely@0.28.11)(postgres@3.4.8)
|
version: 0.45.1(@electric-sql/pglite@0.2.17)(@opentelemetry/api@1.9.0)(@types/better-sqlite3@7.6.13)(@types/pg@8.15.6)(better-sqlite3@12.8.0)(kysely@0.28.11)(postgres@3.4.8)
|
||||||
@@ -472,6 +475,9 @@ importers:
|
|||||||
'@mosaicstack/forge':
|
'@mosaicstack/forge':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../forge
|
version: link:../forge
|
||||||
|
'@mosaicstack/log':
|
||||||
|
specifier: workspace:*
|
||||||
|
version: link:../log
|
||||||
'@mosaicstack/macp':
|
'@mosaicstack/macp':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../macp
|
version: link:../macp
|
||||||
@@ -487,6 +493,9 @@ importers:
|
|||||||
'@mosaicstack/queue':
|
'@mosaicstack/queue':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../queue
|
version: link:../queue
|
||||||
|
'@mosaicstack/storage':
|
||||||
|
specifier: workspace:*
|
||||||
|
version: link:../storage
|
||||||
'@mosaicstack/types':
|
'@mosaicstack/types':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../types
|
version: link:../types
|
||||||
@@ -608,6 +617,9 @@ importers:
|
|||||||
'@mosaicstack/types':
|
'@mosaicstack/types':
|
||||||
specifier: workspace:*
|
specifier: workspace:*
|
||||||
version: link:../types
|
version: link:../types
|
||||||
|
commander:
|
||||||
|
specifier: ^13.0.0
|
||||||
|
version: 13.1.0
|
||||||
devDependencies:
|
devDependencies:
|
||||||
typescript:
|
typescript:
|
||||||
specifier: ^5.8.0
|
specifier: ^5.8.0
|
||||||
|
|||||||
Reference in New Issue
Block a user