feat(mosaic): alphabetize and group mosaic --help output

Enables sortSubcommands on the root program, sessions group, gateway
group, and mission group so all subcommand listings render A-Z. Appends
a Command Groups section via addHelpText to group commands by role
(Runtime, Gateway, Framework, Platform, Runtimes).

Implements CU-04-01, CU-04-02, CU-04-03 from mission cli-unification-20260404.

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

packages/mosaic/package.json

@@ -32,7 +32,6 @@
     "@mosaicstack/macp": "workspace:*",
     "@mosaicstack/prdy": "workspace:*",
     "@mosaicstack/quality-rails": "workspace:*",
-    "@mosaicstack/storage": "workspace:*",
     "@mosaicstack/types": "workspace:*",
     "@clack/prompts": "^0.9.1",
     "commander": "^13.0.0",

packages/mosaic/src/cli.ts

@@ -3,7 +3,6 @@
 import { createRequire } from 'module';
 import { Command } from 'commander';
 import { registerQualityRails } from '@mosaicstack/quality-rails';
-import { registerStorageCommand } from '@mosaicstack/storage';
 import { registerAgentCommand } from './commands/agent.js';
 import { registerMissionCommand } from './commands/mission.js';
 // prdy is registered via launch.ts
@@ -34,7 +33,23 @@ try {
 
 const program = new Command();
 
-program.name('mosaic').description('Mosaic Stack CLI').version(CLI_VERSION);
+program
+  .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 ────────────────────────────
 
@@ -215,7 +230,10 @@ program
 
 // ─── sessions ───────────────────────────────────────────────────────────
 
-const sessionsCmd = program.command('sessions').description('Manage active agent sessions');
+const sessionsCmd = program
+  .command('sessions')
+  .description('Manage active agent sessions')
+  .configureHelp({ sortSubcommands: true });
 
 sessionsCmd
   .command('list')
@@ -319,10 +337,6 @@ registerMissionCommand(program);
 
 registerQualityRails(program);
 
-// ─── storage ─────────────────────────────────────────────────────────────
-
-registerStorageCommand(program);
-
 // ─── update ─────────────────────────────────────────────────────────────
 
 program

packages/mosaic/src/commands/gateway.ts

@@ -30,6 +30,7 @@ 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,6 +47,7 @@ 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/storage/package.json

@@ -23,8 +23,7 @@
   "dependencies": {
     "@electric-sql/pglite": "^0.2.17",
     "@mosaicstack/db": "workspace:^",
-    "@mosaicstack/types": "workspace:*",
-    "commander": "^13.0.0"
+    "@mosaicstack/types": "workspace:*"
   },
   "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

@@ -469,9 +469,6 @@ importers:
       '@mosaicstack/quality-rails':
         specifier: workspace:*
         version: link:../quality-rails
-      '@mosaicstack/storage':
-        specifier: workspace:*
-        version: link:../storage
       '@mosaicstack/types':
         specifier: workspace:*
         version: link:../types
@@ -590,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