docs(plan): gateway admin token recovery flow

packages/brain/package.json

@@ -22,8 +22,7 @@
   },
   "dependencies": {
     "@mosaicstack/db": "workspace:^",
-    "@mosaicstack/types": "workspace:*",
+    "@mosaicstack/types": "workspace:*"
-    "commander": "^13.0.0"
   },
   "devDependencies": {
     "typescript": "^5.8.0",

packages/brain/src/cli.spec.ts

@@ -1,95 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { Command } from 'commander';
-import { registerBrainCommand } from './cli.js';
-
-/**
- * Smoke test: verifies the command tree is correctly registered.
- * No database connection is opened — we only inspect Commander metadata.
- */
-describe('registerBrainCommand', () => {
-  function buildProgram(): Command {
-    const program = new Command('mosaic');
-    // Prevent Commander from calling process.exit on parse errors during tests.
-    program.exitOverride();
-    registerBrainCommand(program);
-    return program;
-  }
-
-  it('registers a top-level "brain" command', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain');
-    expect(brainCmd).toBeDefined();
-  });
-
-  it('registers "brain projects" with "list" and "create" subcommands', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain')!;
-    const projectsCmd = brainCmd.commands.find((c) => c.name() === 'projects');
-    expect(projectsCmd).toBeDefined();
-
-    const subNames = projectsCmd!.commands.map((c) => c.name());
-    expect(subNames).toContain('list');
-    expect(subNames).toContain('create');
-  });
-
-  it('registers "brain missions" with "list" subcommand', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain')!;
-    const missionsCmd = brainCmd.commands.find((c) => c.name() === 'missions');
-    expect(missionsCmd).toBeDefined();
-
-    const subNames = missionsCmd!.commands.map((c) => c.name());
-    expect(subNames).toContain('list');
-  });
-
-  it('registers "brain tasks" with "list" subcommand', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain')!;
-    const tasksCmd = brainCmd.commands.find((c) => c.name() === 'tasks');
-    expect(tasksCmd).toBeDefined();
-
-    const subNames = tasksCmd!.commands.map((c) => c.name());
-    expect(subNames).toContain('list');
-  });
-
-  it('registers "brain conversations" with "list" subcommand', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain')!;
-    const conversationsCmd = brainCmd.commands.find((c) => c.name() === 'conversations');
-    expect(conversationsCmd).toBeDefined();
-
-    const subNames = conversationsCmd!.commands.map((c) => c.name());
-    expect(subNames).toContain('list');
-  });
-
-  it('"brain projects list" accepts --db and --limit options', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain')!;
-    const projectsCmd = brainCmd.commands.find((c) => c.name() === 'projects')!;
-    const listCmd = projectsCmd.commands.find((c) => c.name() === 'list')!;
-
-    const optionNames = listCmd.options.map((o) => o.long);
-    expect(optionNames).toContain('--db');
-    expect(optionNames).toContain('--limit');
-  });
-
-  it('"brain missions list" accepts --project option', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain')!;
-    const missionsCmd = brainCmd.commands.find((c) => c.name() === 'missions')!;
-    const listCmd = missionsCmd.commands.find((c) => c.name() === 'list')!;
-
-    const optionNames = listCmd.options.map((o) => o.long);
-    expect(optionNames).toContain('--project');
-  });
-
-  it('"brain tasks list" accepts --project option', () => {
-    const program = buildProgram();
-    const brainCmd = program.commands.find((c) => c.name() === 'brain')!;
-    const tasksCmd = brainCmd.commands.find((c) => c.name() === 'tasks')!;
-    const listCmd = tasksCmd.commands.find((c) => c.name() === 'list')!;
-
-    const optionNames = listCmd.options.map((o) => o.long);
-    expect(optionNames).toContain('--project');
-  });
-});

packages/brain/src/cli.ts

@@ -1,142 +0,0 @@
-import type { Command } from 'commander';
-import { createDb, type DbHandle } from '@mosaicstack/db';
-import { createBrain } from './brain.js';
-
-/**
- * Build and attach the `brain` subcommand tree onto an existing Commander program.
- * Uses the caller's Command instance to avoid cross-package Commander version mismatches.
- */
-export function registerBrainCommand(parent: Command): void {
-  const brain = parent.command('brain').description('Inspect and manage brain data stores');
-
-  // ─── shared DB option helper ─────────────────────────────────────────────
-
-  function addDbOption(cmd: Command): Command {
-    return cmd.option(
-      '--db <connection-string>',
-      'PostgreSQL connection string (overrides MOSAIC_DB_URL)',
-    );
-  }
-
-  function resolveDb(opts: { db?: string }): ReturnType<typeof createBrain> {
-    const connectionString = opts.db ?? process.env['MOSAIC_DB_URL'];
-    if (!connectionString) {
-      console.error('No DB connection string provided. Pass --db <url> or set MOSAIC_DB_URL.');
-      process.exit(1);
-    }
-    const handle: DbHandle = createDb(connectionString);
-    return createBrain(handle.db);
-  }
-
-  // ─── projects ────────────────────────────────────────────────────────────
-
-  const projects = brain.command('projects').description('Manage projects');
-
-  addDbOption(
-    projects
-      .command('list')
-      .description('List all projects')
-      .option('--limit <n>', 'Maximum number of results', '50'),
-  ).action(async (opts: { db?: string; limit: string }) => {
-    const b = resolveDb(opts);
-    const limit = parseInt(opts.limit, 10);
-    const rows = await b.projects.findAll();
-    const sliced = rows.slice(0, limit);
-    if (sliced.length === 0) {
-      console.log('No projects found.');
-      return;
-    }
-    for (const p of sliced) {
-      console.log(`${p.id}  ${p.name}`);
-    }
-  });
-
-  addDbOption(
-    projects
-      .command('create <name>')
-      .description('Create a new project')
-      .requiredOption('--owner-id <id>', 'Owner user ID'),
-  ).action(async (name: string, opts: { db?: string; ownerId: string }) => {
-    const b = resolveDb(opts);
-    const created = await b.projects.create({
-      name,
-      ownerId: opts.ownerId,
-      ownerType: 'user',
-    });
-    console.log(`Created project: ${created.id}  ${created.name}`);
-  });
-
-  // ─── missions ────────────────────────────────────────────────────────────
-
-  const missions = brain.command('missions').description('Manage missions');
-
-  addDbOption(
-    missions
-      .command('list')
-      .description('List all missions')
-      .option('--limit <n>', 'Maximum number of results', '50')
-      .option('--project <id>', 'Filter by project ID'),
-  ).action(async (opts: { db?: string; limit: string; project?: string }) => {
-    const b = resolveDb(opts);
-    const limit = parseInt(opts.limit, 10);
-    const rows = opts.project
-      ? await b.missions.findByProject(opts.project)
-      : await b.missions.findAll();
-    const sliced = rows.slice(0, limit);
-    if (sliced.length === 0) {
-      console.log('No missions found.');
-      return;
-    }
-    for (const m of sliced) {
-      console.log(`${m.id}  ${m.name}`);
-    }
-  });
-
-  // ─── tasks ────────────────────────────────────────────────────────────────
-
-  const tasks = brain.command('tasks').description('Manage generic tasks');
-
-  addDbOption(
-    tasks
-      .command('list')
-      .description('List all tasks')
-      .option('--limit <n>', 'Maximum number of results', '50')
-      .option('--project <id>', 'Filter by project ID'),
-  ).action(async (opts: { db?: string; limit: string; project?: string }) => {
-    const b = resolveDb(opts);
-    const limit = parseInt(opts.limit, 10);
-    const rows = opts.project ? await b.tasks.findByProject(opts.project) : await b.tasks.findAll();
-    const sliced = rows.slice(0, limit);
-    if (sliced.length === 0) {
-      console.log('No tasks found.');
-      return;
-    }
-    for (const t of sliced) {
-      console.log(`${t.id}  ${t.title}  [${t.status}]`);
-    }
-  });
-
-  // ─── conversations ────────────────────────────────────────────────────────
-
-  const conversations = brain.command('conversations').description('Manage conversations');
-
-  addDbOption(
-    conversations
-      .command('list')
-      .description('List conversations for a user')
-      .option('--limit <n>', 'Maximum number of results', '50')
-      .requiredOption('--user-id <id>', 'User ID to scope the query'),
-  ).action(async (opts: { db?: string; limit: string; userId: string }) => {
-    const b = resolveDb(opts);
-    const limit = parseInt(opts.limit, 10);
-    const rows = await b.conversations.findAll(opts.userId);
-    const sliced = rows.slice(0, limit);
-    if (sliced.length === 0) {
-      console.log('No conversations found.');
-      return;
-    }
-    for (const c of sliced) {
-      console.log(`${c.id}  ${c.title ?? '(untitled)'}`);
-    }
-  });
-}

packages/brain/src/index.ts

@@ -1,5 +1,4 @@
 export { createBrain, type Brain } from './brain.js';
-export { registerBrainCommand } from './cli.js';
 export {
   createProjectsRepo,
   type ProjectsRepo,

packages/mosaic/package.json

@@ -27,14 +27,11 @@
     "test": "vitest run --passWithNoTests"
   },
   "dependencies": {
-    "@mosaicstack/brain": "workspace:*",
     "@mosaicstack/config": "workspace:*",
     "@mosaicstack/forge": "workspace:*",
     "@mosaicstack/macp": "workspace:*",
     "@mosaicstack/prdy": "workspace:*",
     "@mosaicstack/quality-rails": "workspace:*",
-    "@mosaicstack/queue": "workspace:*",
-    "@mosaicstack/storage": "workspace:*",
     "@mosaicstack/types": "workspace:*",
     "@clack/prompts": "^0.9.1",
     "commander": "^13.0.0",

packages/mosaic/src/cli.ts

@@ -2,10 +2,7 @@
 
 import { createRequire } from 'module';
 import { Command } from 'commander';
-import { registerBrainCommand } from '@mosaicstack/brain';
 import { registerQualityRails } from '@mosaicstack/quality-rails';
-import { registerQueueCommand } from '@mosaicstack/queue';
-import { registerStorageCommand } from '@mosaicstack/storage';
 import { registerAgentCommand } from './commands/agent.js';
 import { registerMissionCommand } from './commands/mission.js';
 // prdy is registered via launch.ts
@@ -36,23 +33,7 @@ try {
 
 const program = new Command();
 
-program
+program.name('mosaic').description('Mosaic Stack CLI').version(CLI_VERSION);
-  .name('mosaic')
-  .description('Mosaic Stack CLI')
-  .version(CLI_VERSION)
-  .configureHelp({ sortSubcommands: true })
-  .addHelpText(
-    'after',
-    `
-Command Groups:
-
-  Runtime:    tui, login, sessions
-  Gateway:    gateway
-  Framework:  agent, bootstrap, coord, doctor, init, launch, mission, prdy, seq, sync, upgrade, wizard, yolo
-  Platform:   update
-  Runtimes:   claude, codex, opencode, pi
-`,
-  );
 
 // ─── runtime launchers + framework commands ────────────────────────────
 
@@ -233,10 +214,7 @@ program
 
 // ─── sessions ───────────────────────────────────────────────────────────
 
-const sessionsCmd = program
+const sessionsCmd = program.command('sessions').description('Manage active agent sessions');
-  .command('sessions')
-  .description('Manage active agent sessions')
-  .configureHelp({ sortSubcommands: true });
 
 sessionsCmd
   .command('list')
@@ -336,22 +314,10 @@ registerAgentCommand(program);
 
 registerMissionCommand(program);
 
-// ─── brain ──────────────────────────────────────────────────────────────
-
-registerBrainCommand(program);
-
 // ─── quality-rails ──────────────────────────────────────────────────────
 
 registerQualityRails(program);
 
-// ─── queue ───────────────────────────────────────────────────────────────
-
-registerQueueCommand(program);
-
-// ─── storage ─────────────────────────────────────────────────────────────
-
-registerStorageCommand(program);
-
 // ─── update ─────────────────────────────────────────────────────────────
 
 program

packages/mosaic/src/commands/gateway.ts

@@ -30,7 +30,6 @@ export function registerGatewayCommand(program: Command): void {
     .option('-h, --host <host>', 'Gateway host', 'localhost')
     .option('-p, --port <port>', 'Gateway port', '14242')
     .option('-t, --token <token>', 'Admin API token')
-    .configureHelp({ sortSubcommands: true })
     .action(() => {
       gw.outputHelp();
     });

packages/mosaic/src/commands/mission.ts

@@ -47,7 +47,6 @@ export function registerMissionCommand(program: Command) {
     .option('--update <idOrName>', 'Update a mission')
     .option('--project <idOrName>', 'Scope to project')
     .argument('[id]', 'Show mission detail by ID')
-    .configureHelp({ sortSubcommands: true })
     .action(
       async (
         id: string | undefined,

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';

packages/storage/package.json

@@ -23,8 +23,7 @@
   "dependencies": {
     "@electric-sql/pglite": "^0.2.17",
     "@mosaicstack/db": "workspace:^",
-    "@mosaicstack/types": "workspace:*",
+    "@mosaicstack/types": "workspace:*"
-    "commander": "^13.0.0"
   },
   "devDependencies": {
     "typescript": "^5.8.0",

packages/storage/src/cli.spec.ts

@@ -1,85 +0,0 @@
-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');
-  });
-});

packages/storage/src/cli.ts

@@ -1,256 +0,0 @@
-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.');
-      }
-    });
-}

packages/storage/src/index.ts

@@ -2,7 +2,6 @@ export type { StorageAdapter, StorageConfig } from './types.js';
 export { createStorageAdapter, registerStorageAdapter } from './factory.js';
 export { PostgresAdapter } from './adapters/postgres.js';
 export { PgliteAdapter } from './adapters/pglite.js';
-export { registerStorageCommand } from './cli.js';
 
 import { registerStorageAdapter } from './factory.js';
 import { PostgresAdapter } from './adapters/postgres.js';

pnpm-lock.yaml

@@ -294,9 +294,6 @@ importers:
       '@mosaicstack/types':
         specifier: workspace:*
         version: link:../types
-      commander:
-        specifier: ^13.0.0
-        version: 13.1.0
     devDependencies:
       typescript:
         specifier: ^5.8.0
@@ -457,9 +454,6 @@ importers:
       '@clack/prompts':
         specifier: ^0.9.1
         version: 0.9.1
-      '@mosaicstack/brain':
-        specifier: workspace:*
-        version: link:../brain
       '@mosaicstack/config':
         specifier: workspace:*
         version: link:../config
@@ -475,12 +469,6 @@ importers:
       '@mosaicstack/quality-rails':
         specifier: workspace:*
         version: link:../quality-rails
-      '@mosaicstack/queue':
-        specifier: workspace:*
-        version: link:../queue
-      '@mosaicstack/storage':
-        specifier: workspace:*
-        version: link:../storage
       '@mosaicstack/types':
         specifier: workspace:*
         version: link:../types
@@ -577,9 +565,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
@@ -602,9 +587,6 @@ importers:
       '@mosaicstack/types':
         specifier: workspace:*
         version: link:../types
-      commander:
-        specifier: ^13.0.0
-        version: 13.1.0
     devDependencies:
       typescript:
         specifier: ^5.8.0