feat(log): add registerLogCommand for mosaic log CLI surface

Adds mosaic log tail|search|export|level subcommands to @mosaicstack/log,
wires registerLogCommand into the root mosaic CLI, and ships a smoke test
that asserts command structure without opening the database. Ref CU-05-07.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

packages/log/package.json

@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@mosaicstack/db": "workspace:*",
+    "commander": "^13.0.0",
     "drizzle-orm": "^0.45.1"
   },
   "devDependencies": {

packages/log/src/cli.spec.ts

@@ -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');
+  });
+});

packages/log/src/cli.ts

@@ -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;
+    });
+}

packages/log/src/index.ts

@@ -9,3 +9,4 @@ export {
   type LogTier,
   type LogQuery,
 } from './agent-logs.js';
+export { registerLogCommand } from './cli.js';

packages/mosaic/package.json

@@ -29,10 +29,10 @@
   "dependencies": {
     "@mosaicstack/config": "workspace:*",
     "@mosaicstack/forge": "workspace:*",
+    "@mosaicstack/log": "workspace:*",
     "@mosaicstack/macp": "workspace:*",
     "@mosaicstack/prdy": "workspace:*",
     "@mosaicstack/quality-rails": "workspace:*",
-    "@mosaicstack/queue": "workspace:*",
     "@mosaicstack/types": "workspace:*",
     "@clack/prompts": "^0.9.1",
     "commander": "^13.0.0",

packages/mosaic/src/cli.ts

@@ -2,8 +2,8 @@
 
 import { createRequire } from 'module';
 import { Command } from 'commander';
+import { registerLogCommand } from '@mosaicstack/log';
 import { registerQualityRails } from '@mosaicstack/quality-rails';
-import { registerQueueCommand } from '@mosaicstack/queue';
 import { registerAgentCommand } from './commands/agent.js';
 import { registerMissionCommand } from './commands/mission.js';
 // prdy is registered via launch.ts
@@ -319,9 +319,9 @@ registerMissionCommand(program);
 
 registerQualityRails(program);
 
-// ─── queue ───────────────────────────────────────────────────────────────
+// ─── log ─────────────────────────────────────────────────────────────────
 
-registerQueueCommand(program);
+registerLogCommand(program);
 
 // ─── update ─────────────────────────────────────────────────────────────
 

packages/queue/package.json

@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@mosaicstack/types": "workspace:*",
-    "commander": "^13.0.0",
     "ioredis": "^5.10.0"
   },
   "devDependencies": {

packages/queue/src/cli.spec.ts

@@ -1,62 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { Command } from 'commander';
-import { registerQueueCommand } from './cli.js';
-
-describe('registerQueueCommand', () => {
-  function buildProgram(): Command {
-    const program = new Command('mosaic');
-    registerQueueCommand(program);
-    return program;
-  }
-
-  it('registers a "queue" subcommand', () => {
-    const program = buildProgram();
-    const queueCmd = program.commands.find((c) => c.name() === 'queue');
-    expect(queueCmd).toBeDefined();
-  });
-
-  it('queue has list, stats, pause, resume, jobs, drain subcommands', () => {
-    const program = buildProgram();
-    const queueCmd = program.commands.find((c) => c.name() === 'queue');
-    expect(queueCmd).toBeDefined();
-
-    const names = queueCmd!.commands.map((c) => c.name());
-    expect(names).toContain('list');
-    expect(names).toContain('stats');
-    expect(names).toContain('pause');
-    expect(names).toContain('resume');
-    expect(names).toContain('jobs');
-    expect(names).toContain('drain');
-  });
-
-  it('jobs subcommand has a "tail" subcommand', () => {
-    const program = buildProgram();
-    const queueCmd = program.commands.find((c) => c.name() === 'queue');
-    const jobsCmd = queueCmd!.commands.find((c) => c.name() === 'jobs');
-    expect(jobsCmd).toBeDefined();
-
-    const tailCmd = jobsCmd!.commands.find((c) => c.name() === 'tail');
-    expect(tailCmd).toBeDefined();
-  });
-
-  it('drain has a --yes option', () => {
-    const program = buildProgram();
-    const queueCmd = program.commands.find((c) => c.name() === 'queue');
-    const drainCmd = queueCmd!.commands.find((c) => c.name() === 'drain');
-    expect(drainCmd).toBeDefined();
-
-    const optionNames = drainCmd!.options.map((o) => o.long);
-    expect(optionNames).toContain('--yes');
-  });
-
-  it('stats accepts an optional [name] argument', () => {
-    const program = buildProgram();
-    const queueCmd = program.commands.find((c) => c.name() === 'queue');
-    const statsCmd = queueCmd!.commands.find((c) => c.name() === 'stats');
-    expect(statsCmd).toBeDefined();
-    // Should not throw when called without argument
-    const args = statsCmd!.registeredArguments;
-    expect(args.length).toBe(1);
-    expect(args[0]!.required).toBe(false);
-  });
-});

packages/queue/src/cli.ts

@@ -1,248 +0,0 @@
-import type { Command } from 'commander';
-
-import { createLocalAdapter } from './adapters/local.js';
-import type { QueueConfig } from './types.js';
-
-/** Resolve adapter type from env; defaults to 'local'. */
-function resolveAdapterType(): 'bullmq' | 'local' {
-  const t = process.env['QUEUE_ADAPTER'] ?? 'local';
-  return t === 'bullmq' ? 'bullmq' : 'local';
-}
-
-function resolveConfig(): QueueConfig {
-  const type = resolveAdapterType();
-  if (type === 'bullmq') {
-    return { type: 'bullmq', url: process.env['VALKEY_URL'] };
-  }
-  return { type: 'local', dataDir: process.env['QUEUE_DATA_DIR'] };
-}
-
-const BULLMQ_ONLY_MSG =
-  'not supported by local adapter — use the bullmq tier for this (set QUEUE_ADAPTER=bullmq)';
-
-/**
- * Register queue subcommands on an existing Commander program.
- * Follows the same pattern as registerQualityRails in @mosaicstack/quality-rails.
- */
-export function registerQueueCommand(parent: Command): void {
-  buildQueueCommand(parent.command('queue').description('Manage Mosaic job queues'));
-}
-
-function buildQueueCommand(queue: Command): void {
-  // ─── list ──────────────────────────────────────────────────────────────
-  queue
-    .command('list')
-    .description('List all queues known to the configured adapter')
-    .action(async () => {
-      const config = resolveConfig();
-
-      if (config.type === 'local') {
-        const adapter = createLocalAdapter(config);
-        // Local adapter tracks queues in its internal Map; we expose them by
-        // listing JSON files in the data dir.
-        const { readdirSync } = await import('node:fs');
-        const { existsSync } = await import('node:fs');
-        const dataDir = config.dataDir ?? '.mosaic/queue';
-        if (!existsSync(dataDir)) {
-          console.log('No queues found (data dir does not exist yet).');
-          await adapter.close();
-          return;
-        }
-        const files = readdirSync(dataDir).filter((f: string) => f.endsWith('.json'));
-        if (files.length === 0) {
-          console.log('No queues found.');
-        } else {
-          console.log('Queues (local adapter):');
-          for (const f of files) {
-            console.log(`  - ${f.slice(0, -5)}`);
-          }
-        }
-        await adapter.close();
-        return;
-      }
-
-      // bullmq — not enough info to enumerate queues without a BullMQ Board
-      console.log(BULLMQ_ONLY_MSG);
-      process.exit(0);
-    });
-
-  // ─── stats ─────────────────────────────────────────────────────────────
-  queue
-    .command('stats [name]')
-    .description('Show stats for a queue (or all queues)')
-    .action(async (name?: string) => {
-      const config = resolveConfig();
-
-      if (config.type === 'local') {
-        const adapter = createLocalAdapter(config);
-        const { readdirSync } = await import('node:fs');
-        const { existsSync } = await import('node:fs');
-        const dataDir = config.dataDir ?? '.mosaic/queue';
-
-        let names: string[] = [];
-        if (name) {
-          names = [name];
-        } else {
-          if (existsSync(dataDir)) {
-            names = readdirSync(dataDir)
-              .filter((f: string) => f.endsWith('.json'))
-              .map((f: string) => f.slice(0, -5));
-          }
-        }
-
-        if (names.length === 0) {
-          console.log('No queues found.');
-          await adapter.close();
-          return;
-        }
-
-        for (const queueName of names) {
-          const len = await adapter.length(queueName);
-          console.log(`Queue: ${queueName}`);
-          console.log(`  waiting:   ${len}`);
-          console.log(`  active:    0 (local adapter — no active tracking)`);
-          console.log(`  completed: 0 (local adapter — no completed tracking)`);
-          console.log(`  failed:    0 (local adapter — no failed tracking)`);
-          console.log(`  delayed:   0 (local adapter — no delayed tracking)`);
-        }
-        await adapter.close();
-        return;
-      }
-
-      // bullmq
-      console.log(BULLMQ_ONLY_MSG);
-      process.exit(0);
-    });
-
-  // ─── pause ─────────────────────────────────────────────────────────────
-  queue
-    .command('pause <name>')
-    .description('Pause job processing for a queue')
-    .action(async (_name: string) => {
-      const config = resolveConfig();
-
-      if (config.type === 'local') {
-        console.log(BULLMQ_ONLY_MSG);
-        process.exit(0);
-        return;
-      }
-
-      console.log(BULLMQ_ONLY_MSG);
-      process.exit(0);
-    });
-
-  // ─── resume ────────────────────────────────────────────────────────────
-  queue
-    .command('resume <name>')
-    .description('Resume job processing for a queue')
-    .action(async (_name: string) => {
-      const config = resolveConfig();
-
-      if (config.type === 'local') {
-        console.log(BULLMQ_ONLY_MSG);
-        process.exit(0);
-        return;
-      }
-
-      console.log(BULLMQ_ONLY_MSG);
-      process.exit(0);
-    });
-
-  // ─── jobs tail ─────────────────────────────────────────────────────────
-  const jobs = queue.command('jobs').description('Job-level operations');
-
-  jobs
-    .command('tail [name]')
-    .description('Stream new jobs as they arrive (poll-based)')
-    .option('--interval <ms>', 'Poll interval in ms', '2000')
-    .action(async (name: string | undefined, opts: { interval: string }) => {
-      const config = resolveConfig();
-      const pollMs = parseInt(opts.interval, 10);
-
-      if (config.type === 'local') {
-        const adapter = createLocalAdapter(config);
-        const { existsSync, readdirSync } = await import('node:fs');
-        const dataDir = config.dataDir ?? '.mosaic/queue';
-
-        let names: string[] = [];
-        if (name) {
-          names = [name];
-        } else {
-          if (existsSync(dataDir)) {
-            names = readdirSync(dataDir)
-              .filter((f: string) => f.endsWith('.json'))
-              .map((f: string) => f.slice(0, -5));
-          }
-        }
-
-        if (names.length === 0) {
-          console.log('No queues to tail.');
-          await adapter.close();
-          return;
-        }
-
-        console.log(`Tailing queues: ${names.join(', ')} (Ctrl-C to stop)`);
-        const lastLen = new Map<string, number>();
-        for (const qn of names) {
-          lastLen.set(qn, await adapter.length(qn));
-        }
-
-        const timer = setInterval(async () => {
-          for (const qn of names) {
-            const len = await adapter.length(qn);
-            const prev = lastLen.get(qn) ?? 0;
-            if (len > prev) {
-              console.log(
-                `[${new Date().toISOString()}] ${qn}: ${len - prev} new job(s) (total: ${len})`,
-              );
-            }
-            lastLen.set(qn, len);
-          }
-        }, pollMs);
-
-        process.on('SIGINT', async () => {
-          clearInterval(timer);
-          await adapter.close();
-          process.exit(0);
-        });
-
-        return;
-      }
-
-      // bullmq — use subscribe on the channel
-      console.log(BULLMQ_ONLY_MSG);
-      process.exit(0);
-    });
-
-  // ─── drain ─────────────────────────────────────────────────────────────
-  queue
-    .command('drain <name>')
-    .description('Drain all pending jobs from a queue')
-    .option('--yes', 'Skip confirmation prompt')
-    .action(async (name: string, opts: { yes?: boolean }) => {
-      if (!opts.yes) {
-        console.error(
-          `WARNING: This will remove all pending jobs from queue "${name}". Re-run with --yes to confirm.`,
-        );
-        process.exit(1);
-        return;
-      }
-
-      const config = resolveConfig();
-
-      if (config.type === 'local') {
-        const adapter = createLocalAdapter(config);
-        let removed = 0;
-        while ((await adapter.length(name)) > 0) {
-          await adapter.dequeue(name);
-          removed++;
-        }
-        console.log(`Drained ${removed} job(s) from queue "${name}".`);
-        await adapter.close();
-        return;
-      }
-
-      console.log(BULLMQ_ONLY_MSG);
-      process.exit(0);
-    });
-}

packages/queue/src/index.ts

@@ -11,7 +11,6 @@ export { type QueueAdapter, type QueueConfig as QueueAdapterConfig } from './typ
 export { createQueueAdapter, registerQueueAdapter } from './factory.js';
 export { createBullMQAdapter } from './adapters/bullmq.js';
 export { createLocalAdapter } from './adapters/local.js';
-export { registerQueueCommand } from './cli.js';
 
 import { registerQueueAdapter } from './factory.js';
 import { createBullMQAdapter } from './adapters/bullmq.js';

pnpm-lock.yaml

@@ -401,6 +401,9 @@ importers:
       '@mosaicstack/db':
         specifier: workspace:*
         version: link:../db
+      commander:
+        specifier: ^13.0.0
+        version: 13.1.0
       drizzle-orm:
         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)
@@ -460,6 +463,9 @@ importers:
       '@mosaicstack/forge':
         specifier: workspace:*
         version: link:../forge
+      '@mosaicstack/log':
+        specifier: workspace:*
+        version: link:../log
       '@mosaicstack/macp':
         specifier: workspace:*
         version: link:../macp
@@ -469,9 +475,6 @@ importers:
       '@mosaicstack/quality-rails':
         specifier: workspace:*
         version: link:../quality-rails
-      '@mosaicstack/queue':
-        specifier: workspace:*
-        version: link:../queue
       '@mosaicstack/types':
         specifier: workspace:*
         version: link:../types
@@ -568,9 +571,6 @@ importers:
       '@mosaicstack/types':
         specifier: workspace:*
         version: link:../types
-      commander:
-        specifier: ^13.0.0
-        version: 13.1.0
       ioredis:
         specifier: ^5.10.0
         version: 5.10.0