feat(storage): add registerStorageCommand for mosaic storage CLI surface

Implements CU-05-02: adds `mosaic storage` command group with subcommands status, tier show, tier switch, export, import, and migrate. Pragmatic stubs print actionable instructions for unimplemented export/import tiers. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-05 00:17:05 -05:00
38 changed files with 11 additions and 3483 deletions
--- a/docs/plans/gateway-token-recovery.md
+++ b/docs/plans/gateway-token-recovery.md
@@ -1,193 +0,0 @@
-# Gateway Admin Token Recovery — Implementation Plan
-
-**Mission:** `cli-unification-20260404`
-**Task:** `CU-03-01` (planning only — no runtime code changes)
-**Status:** Design locked (Session 1) — BetterAuth cookie-based recovery
-
---
-
-## 1. Problem Statement
-
-The gateway installer strands operators when the admin user exists but the admin
-API token is missing. Concrete trigger:
-
- `~/.config/mosaic/gateway/meta.json` was deleted / regenerated.
- The installer was re-run after a previous successful bootstrap.
-
-Flow today (`packages/mosaic/src/commands/gateway/install.ts:375-400`):
-
-1. `bootstrapFirstUser` hits `GET /api/bootstrap/status`.
-2. Server returns `needsSetup: false` because `users` count > 0.
-3. Installer logs `Admin user already exists — skipping setup. (No admin token on file — sign in via the web UI to manage tokens.)` and returns.
-4. The operator now has:
-   - No token in `meta.json`.
-   - No CLI path to mint a new one (`mosaic gateway <anything>` that needs the token fails).
-   - `POST /api/bootstrap/setup` locked out — it only runs when `users` count is zero (`apps/gateway/src/admin/bootstrap.controller.ts:34-37`).
-   - `POST /api/admin/tokens` gated by `AdminGuard` — requires either a bearer token (which they don't have) or a BetterAuth session (which they don't have in the CLI).
-
-Dead end. The web UI is the only escape hatch today, and for headless installs even that may be inaccessible.
-
-## 2. Design Summary
-
-The BetterAuth session cookie is the authority. The operator runs
-`mosaic gateway login` to sign in with email/password, which persists a session
-cookie via `saveSession` (reusing `packages/mosaic/src/auth.ts`). With a valid
-session, `mosaic gateway config recover-token` (stranded-operator entry point)
-and `mosaic gateway config rotate-token` call the existing authenticated admin
-endpoint `POST /api/admin/tokens` using the cookie, then persist the returned
-plaintext to `meta.json` via `writeMeta`. **No new server endpoints are
-required** — `AdminGuard` already accepts BetterAuth session cookies via its
-`validateSession` path (`apps/gateway/src/admin/admin.guard.ts:90-120`).
-
-## 3. Surface Contract
-
-### 3.1 Server — no changes required
-
-| Endpoint                       | Status          | Notes                                                                                                                    |
-| ------------------------------ | --------------- | ------------------------------------------------------------------------------------------------------------------------ |
-| `POST /api/admin/tokens`       | **Reuse as-is** | `admin-tokens.controller.ts:46-72`. Returns `{ id, label, scope, expiresAt, lastUsedAt, createdAt, plaintext }`.         |
-| `GET  /api/admin/tokens`       | **Reuse**       | Useful for `mosaic gateway config tokens list` follow-on (out of scope for CU-03-01, but trivial once auth path exists). |
-| `DELETE /api/admin/tokens/:id` | **Reuse**       | Used by rotate flow for optional old-token revocation.                                                                   |
-| `POST /api/bootstrap/setup`    | **Unchanged**   | Remains first-user-only; not part of recovery.                                                                           |
-
-`AdminGuard.validateSession` takes BetterAuth cookies from `request.raw.headers`
-via `fromNodeHeaders` and calls `auth.api.getSession({ headers })`. It also
-enforces `role === 'admin'`. This is exactly the path the CLI will hit with
-`Cookie: better-auth.session_token=...`.
-
-**Confirmed feasible** during CU-03-01 investigation.
-
-### 3.2 `mosaic gateway login`
-
-Thin wrapper over the existing top-level `mosaic login`
-(`packages/mosaic/src/cli.ts:42-76`) with gateway-specific defaults pulled from
-`readMeta()`.
-
-| Aspect              | Behavior                                                                                                                        |
-| ------------------- | ------------------------------------------------------------------------------------------------------------------------------- |
-| Default gateway URL | `http://${meta.host}:${meta.port}` from `readMeta()`, fallback `http://localhost:14242`.                                        |
-| Flow                | Prompt email + password -> `signIn()` -> `saveSession()`.                                                                       |
-| Persistence         | `~/.mosaic/session.json` via existing `saveSession` (7-day expiry).                                                             |
-| Decision            | **Thin wrapper**, not alias. Rationale: defaults differ (reads `meta.json`), and discoverability under `mosaic gateway --help`. |
-| Implementation      | Share the sign-in logic by extracting a small `runLogin(gatewayUrl, email?, password?)` helper; both commands call it.          |
-
-### 3.3 `mosaic gateway config rotate-token`
-
-| Aspect       | Behavior                                                                                                                                                                                                                             |
-| ------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| Precondition | Valid session (via `loadSession` + `validateSession`). On failure, print: "Not signed in — run `mosaic gateway login`" and exit non-zero.                                                                                            |
-| Request      | `POST ${gatewayUrl}/api/admin/tokens` with header `Cookie: <session>`, body `{ label: "CLI token (rotated YYYY-MM-DD)" }`.                                                                                                           |
-| On success   | Read meta via `readMeta()`, set `meta.adminToken = plaintext`, `writeMeta(meta)`. Print the token banner (reuse `printAdminTokenBanner` shape).                                                                                      |
-| Old token    | **Optional `--revoke-old`** flag. When set and a previous `meta.adminToken` existed, call `DELETE /api/admin/tokens/:id` after rotation. Requires listing first to find the id; punt to CU-03-02 decision. Document as nice-to-have. |
-| Exit codes   | `0` success; `1` network error; `2` auth error; `3` server rejection.                                                                                                                                                                |
-
-### 3.4 `mosaic gateway config recover-token`
-
-Superset of `rotate-token` with an inline login nudge — the "stranded operator"
-entry point.
-
-| Step | Action                                                                                                                           |
-| ---- | -------------------------------------------------------------------------------------------------------------------------------- |
-| 1    | `readMeta()` — derive gateway URL. If meta is missing entirely, fall back to `--gateway` flag or default.                        |
-| 2    | `loadSession(gatewayUrl)` then `validateSession`. If either fails, prompt inline: email + password -> `signIn` -> `saveSession`. |
-| 3    | `POST /api/admin/tokens` with cookie, label `"Recovered via CLI YYYY-MM-DDTHH:mm"`.                                              |
-| 4    | Persist plaintext to `meta.json` via `writeMeta`.                                                                                |
-| 5    | Print the token banner and next-steps hints (e.g. `mosaic gateway status`).                                                      |
-| 6    | Exit `0`.                                                                                                                        |
-
-Key property: this command is **runnable with nothing but email+password in hand**.
-It assumes the gateway is up but assumes no prior CLI session state.
-
-### 3.5 File touch list (for CU-03-02..05 execution)
-
-| File                                                  | Change                                                                                     |
-| ----------------------------------------------------- | ------------------------------------------------------------------------------------------ |
-| `packages/mosaic/src/commands/gateway.ts`             | Register `login`, `config recover-token`, `config rotate-token` subcommands under `gw`.    |
-| `packages/mosaic/src/commands/gateway/config.ts`      | Add `runRecoverToken`, `runRotateToken` handlers; export from module.                      |
-| `packages/mosaic/src/commands/gateway/login.ts` (new) | Thin wrapper calling shared `runLogin` helper with meta-derived default URL.               |
-| `packages/mosaic/src/auth.ts`                         | No change expected. Possibly export a `requireSession(gatewayUrl)` helper (reuse pattern). |
-| `packages/mosaic/src/commands/gateway/install.ts`     | `bootstrapFirstUser` branch: "user exists, no token" -> offer recovery (see Section 4).    |
-
-## 4. Installer Fix (CU-03-06 preview)
-
-Current stranding point is `install.ts:388-395`. The fix:
-
-```
-if (!status.needsSetup) {
-  if (meta.adminToken) {
-    // unchanged — happy path
-  } else {
-    // NEW: prompt "Admin exists but no token on file. Recover now? [Y/n]"
-    // If yes -> call runRecoverToken(gatewayUrl) inline (interactive):
-    //   - prompt email + password
-    //   - signIn -> saveSession
-    //   - POST /api/admin/tokens
-    //   - writeMeta(meta) with returned plaintext
-    //   - print banner
-    // If no -> print the current stranded message but include:
-    //   "Run `mosaic gateway config recover-token` when ready."
-  }
-}
-```
-
-Shape notes (actual code lands in CU-03-06):
-
- Extract the recovery body so it can be called **both** from the standalone
-  command and from `bootstrapFirstUser` without duplicating prompts.
- Reuse the same `rl` readline interface already open in `bootstrapFirstUser`
-  for the inline prompts.
- Preserve non-interactive behavior: if `process.stdin.isTTY` is false, skip the
-  prompt and emit the "run recover-token" hint only.
-
-## 5. Test Strategy (CU-03-07 scope)
-
-### 5.1 Happy paths
-
-| Command                               | Scenario                                         | Expected                                                 |
-| ------------------------------------- | ------------------------------------------------ | -------------------------------------------------------- |
-| `mosaic gateway login`                | Valid creds                                      | `session.json` written, 7-day expiry, exit 0             |
-| `mosaic gateway config rotate-token`  | Valid session, server reachable                  | `meta.json` updated, banner printed, new token usable    |
-| `mosaic gateway config recover-token` | No session, valid creds, server reachable        | Prompts for creds, writes session + meta, exit 0         |
-| Installer inline recovery             | Re-run after `meta.json` wipe, operator says yes | Meta restored, banner printed, no manual CLI step needed |
-
-### 5.2 Error paths (must all produce actionable messages and non-zero exit)
-
-| Failure                           | Expected handling                                                                 |
-| --------------------------------- | --------------------------------------------------------------------------------- |
-| Invalid email/password            | BetterAuth 401 surfaced as "Sign-in failed: <server message>", exit 2             |
-| Expired stored session            | Recover command silently re-prompts; rotate command exits 2 with "run login" hint |
-| Gateway down / connection refused | "Could not reach gateway at <url>" exit 1                                         |
-| Server rejects token creation     | Print status + body excerpt, exit 3                                               |
-| Meta file missing (recover)       | Fall back to `--gateway` flag or default; warn that meta will be created          |
-| Non-admin user                    | `AdminGuard` 403 surfaced as "User is not an admin", exit 2                       |
-
-### 5.3 Integration test (recommended)
-
-Spin up gateway in test harness, create admin user via `/api/bootstrap/setup`,
-wipe `meta.json`, invoke `mosaic gateway config recover-token` programmatically,
-assert new `meta.adminToken` works against `GET /api/admin/tokens`.
-
-## 6. Risks & Open Questions
-
-| #   | Item                                                                                                                                                                                    | Severity | Mitigation                                                                                                     |
-| --- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- | -------------------------------------------------------------------------------------------------------------- |
-| 1   | `AdminGuard.validateSession` calls `getSession` with `fromNodeHeaders(request.raw.headers)`. CLI sends `Cookie:` header only. Confirm BetterAuth reads from `Cookie`, not `Set-Cookie`. | Low      | Confirmed — `mosaic login` + `mosaic tui` already use this flow successfully (`cli.ts:137-181`).               |
-| 2   | Session cookie local expiry (7d) vs BetterAuth server-side expiry may drift.                                                                                                            | Low      | `validateSession` hits `get-session`; handle 401 by re-prompting.                                              |
-| 3   | Label collision / unbounded token growth if operators run `recover-token` repeatedly.                                                                                                   | Low      | Include ISO timestamp in label. Optional `--revoke-old` in CU-03-02. Add `tokens list/prune` later.            |
-| 4   | `mosaic login` exists at top level and `mosaic gateway login` is a wrapper — risk of confusion.                                                                                         | Low      | Document that `gateway login` is the preferred entry for gateway operators; top-level stays for compatibility. |
-| 5   | `meta.json` write is not atomic. Crash between token creation and `writeMeta` leaves an orphan token server-side with no plaintext on disk.                                             | Medium   | Accept for now — re-running `recover-token` mints a fresh token. Document as known limitation.                 |
-| 6   | Non-TTY installer runs (CI, headless provisioners) cannot prompt for creds interactively.                                                                                               | Medium   | Installer inline recovery must skip prompt when `!process.stdin.isTTY`; emit the recover-token hint.           |
-| 7   | If `BETTER_AUTH_SECRET` rotates between login and recover, the session cookie is invalid — user must re-login. Acceptable but surface a clear error.                                    | Low      | Error handler maps 401 on recover -> "Session invalid; re-run `mosaic gateway login`".                         |
-| 8   | No MFA today. When MFA lands, BetterAuth sign-in will return a challenge, not a cookie — recovery UX will need a second prompt step.                                                    | Future   | Out of scope for this mission. Flag for future CLI work.                                                       |
-
-## 7. Downstream Task Hooks
-
-| Task     | Scope                                                                      |
-| -------- | -------------------------------------------------------------------------- |
-| CU-03-02 | Implement `mosaic gateway login` wrapper + shared `runLogin` extraction.   |
-| CU-03-03 | Implement `mosaic gateway config rotate-token`.                            |
-| CU-03-04 | Implement `mosaic gateway config recover-token`.                           |
-| CU-03-05 | Wire commands into `gateway.ts` registration, update `--help` copy.        |
-| CU-03-06 | Installer inline recovery hook in `bootstrapFirstUser`.                    |
-| CU-03-07 | Tests per Section 5.                                                       |
-| CU-03-08 | Docs: update gateway install README + operator runbook with recovery flow. |
--- a/packages/brain/package.json
+++ b/packages/brain/package.json
@@ -22,8 +22,7 @@
  },
  "dependencies": {
    "@mosaicstack/db": "workspace:^",
-    "@mosaicstack/types": "workspace:*",
-    "commander": "^13.0.0"
+    "@mosaicstack/types": "workspace:*"
  },
  "devDependencies": {
    "typescript": "^5.8.0",
--- a/packages/brain/src/cli.spec.ts
+++ b/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');
-  });
-});
--- a/packages/brain/src/cli.ts
+++ b/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)'}`);
-    }
-  });
-}
--- a/packages/brain/src/index.ts
+++ b/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,
--- a/packages/forge/package.json
+++ b/packages/forge/package.json
@@ -26,8 +26,7 @@
    "test": "vitest run --passWithNoTests"
  },
  "dependencies": {
-    "@mosaicstack/macp": "workspace:*",
-    "commander": "^13.0.0"
+    "@mosaicstack/macp": "workspace:*"
  },
  "devDependencies": {
    "@types/node": "^22.0.0",
--- a/packages/forge/src/cli.spec.ts
+++ b/packages/forge/src/cli.spec.ts
@@ -1,57 +0,0 @@
-import { Command } from 'commander';
-import { describe, expect, it } from 'vitest';
-
-import { registerForgeCommand } from './cli.js';
-
-describe('registerForgeCommand', () => {
-  it('registers a "forge" command on the parent program', () => {
-    const program = new Command();
-    registerForgeCommand(program);
-
-    const forgeCmd = program.commands.find((c) => c.name() === 'forge');
-    expect(forgeCmd).toBeDefined();
-  });
-
-  it('registers the four required subcommands under forge', () => {
-    const program = new Command();
-    registerForgeCommand(program);
-
-    const forgeCmd = program.commands.find((c) => c.name() === 'forge');
-    expect(forgeCmd).toBeDefined();
-
-    const subNames = forgeCmd!.commands.map((c) => c.name());
-
-    expect(subNames).toContain('run');
-    expect(subNames).toContain('status');
-    expect(subNames).toContain('resume');
-    expect(subNames).toContain('personas');
-  });
-
-  it('registers "personas list" as a subcommand of "forge personas"', () => {
-    const program = new Command();
-    registerForgeCommand(program);
-
-    const forgeCmd = program.commands.find((c) => c.name() === 'forge');
-    const personasCmd = forgeCmd!.commands.find((c) => c.name() === 'personas');
-    expect(personasCmd).toBeDefined();
-
-    const personasSubNames = personasCmd!.commands.map((c) => c.name());
-    expect(personasSubNames).toContain('list');
-  });
-
-  it('does not modify the parent program name or description', () => {
-    const program = new Command('mosaic');
-    program.description('Mosaic Stack CLI');
-    registerForgeCommand(program);
-
-    expect(program.name()).toBe('mosaic');
-    expect(program.description()).toBe('Mosaic Stack CLI');
-  });
-
-  it('can be called multiple times without throwing', () => {
-    const program = new Command();
-    expect(() => {
-      registerForgeCommand(program);
-    }).not.toThrow();
-  });
-});
--- a/packages/forge/src/cli.ts
+++ b/packages/forge/src/cli.ts
@@ -1,280 +0,0 @@
-import fs from 'node:fs';
-import path from 'node:path';
-
-import type { Command } from 'commander';
-
-import { classifyBrief } from './brief-classifier.js';
-import { STAGE_LABELS, STAGE_SEQUENCE } from './constants.js';
-import { getEffectivePersonas, loadBoardPersonas } from './persona-loader.js';
-import { generateRunId, getPipelineStatus, loadManifest, runPipeline } from './pipeline-runner.js';
-import type { PipelineOptions, RunManifest, TaskExecutor } from './types.js';
-
-// ---------------------------------------------------------------------------
-// Stub executor — used when no real executor is wired at CLI invocation time.
-// ---------------------------------------------------------------------------
-
-const stubExecutor: TaskExecutor = {
-  async submitTask(task) {
-    console.log(`  [forge] stage submitted: ${task.id} (${task.title})`);
-  },
-  async waitForCompletion(taskId, _timeoutMs) {
-    console.log(`  [forge] stage complete:  ${taskId}`);
-    return {
-      task_id: taskId,
-      status: 'completed' as const,
-      completed_at: new Date().toISOString(),
-      exit_code: 0,
-      gate_results: [],
-    };
-  },
-  async getTaskStatus(_taskId) {
-    return 'completed' as const;
-  },
-};
-
-// ---------------------------------------------------------------------------
-// Helpers
-// ---------------------------------------------------------------------------
-
-function formatDuration(startedAt?: string, completedAt?: string): string {
-  if (!startedAt || !completedAt) return '-';
-  const ms = new Date(completedAt).getTime() - new Date(startedAt).getTime();
-  const secs = Math.round(ms / 1000);
-  return secs < 60 ? `${secs}s` : `${Math.floor(secs / 60)}m${secs % 60}s`;
-}
-
-function printManifestTable(manifest: RunManifest): void {
-  console.log(`\nRun ID : ${manifest.runId}`);
-  console.log(`Status : ${manifest.status}`);
-  console.log(`Brief  : ${manifest.brief}`);
-  console.log(`Class  : ${manifest.briefClass} (${manifest.classSource})`);
-  console.log(`Updated: ${manifest.updatedAt}`);
-  console.log('');
-  console.log('Stage'.padEnd(22) + 'Status'.padEnd(14) + 'Duration');
-  console.log('-'.repeat(50));
-  for (const stage of STAGE_SEQUENCE) {
-    const s = manifest.stages[stage];
-    if (!s) continue;
-    const label = (STAGE_LABELS[stage] ?? stage).padEnd(22);
-    const status = s.status.padEnd(14);
-    const dur = formatDuration(s.startedAt, s.completedAt);
-    console.log(`${label}${status}${dur}`);
-  }
-  console.log('');
-}
-
-function resolveRunDir(runId: string, projectRoot?: string): string {
-  const root = projectRoot ?? process.cwd();
-  return path.join(root, '.forge', 'runs', runId);
-}
-
-function listRecentRuns(projectRoot?: string): void {
-  const root = projectRoot ?? process.cwd();
-  const runsDir = path.join(root, '.forge', 'runs');
-
-  if (!fs.existsSync(runsDir)) {
-    console.log('No runs found. Run `mosaic forge run` to start a pipeline.');
-    return;
-  }
-
-  const entries = fs
-    .readdirSync(runsDir)
-    .filter((name) => fs.statSync(path.join(runsDir, name)).isDirectory())
-    .sort()
-    .reverse()
-    .slice(0, 10);
-
-  if (entries.length === 0) {
-    console.log('No runs found.');
-    return;
-  }
-
-  console.log('\nRecent runs:');
-  console.log('Run ID'.padEnd(22) + 'Status'.padEnd(14) + 'Brief');
-  console.log('-'.repeat(70));
-
-  for (const runId of entries) {
-    const runDir = path.join(runsDir, runId);
-    try {
-      const manifest = loadManifest(runDir);
-      const status = manifest.status.padEnd(14);
-      const brief = path.basename(manifest.brief);
-      console.log(`${runId.padEnd(22)}${status}${brief}`);
-    } catch {
-      console.log(`${runId.padEnd(22)}${'(unreadable)'.padEnd(14)}`);
-    }
-  }
-  console.log('');
-}
-
-// ---------------------------------------------------------------------------
-// Register function
-// ---------------------------------------------------------------------------
-
-/**
- * Register forge subcommands on an existing Commander program.
- * Mirrors the pattern used by registerQualityRails in @mosaicstack/quality-rails.
- */
-export function registerForgeCommand(parent: Command): void {
-  const forge = parent.command('forge').description('Run and manage Forge pipelines');
-
-  // ── forge run ────────────────────────────────────────────────────────────
-
-  forge
-    .command('run')
-    .description('Run a Forge pipeline from a brief markdown file')
-    .requiredOption('--brief <path>', 'Path to the brief markdown file')
-    .option('--run-id <id>', 'Override the auto-generated run ID')
-    .option('--resume', 'Resume an existing run instead of starting a new one', false)
-    .option('--config <path>', 'Path to forge config file (.forge/config.yaml)')
-    .option('--codebase <path>', 'Codebase root to pass to the pipeline', process.cwd())
-    .option('--dry-run', 'Print planned stages without executing', false)
-    .action(
-      async (opts: {
-        brief: string;
-        runId?: string;
-        resume: boolean;
-        config?: string;
-        codebase: string;
-        dryRun: boolean;
-      }) => {
-        const briefPath = path.resolve(opts.brief);
-
-        if (!fs.existsSync(briefPath)) {
-          console.error(`[forge] brief not found: ${briefPath}`);
-          process.exitCode = 1;
-          return;
-        }
-
-        const briefContent = fs.readFileSync(briefPath, 'utf-8');
-        const briefClass = classifyBrief(briefContent);
-        const projectRoot = opts.codebase;
-
-        if (opts.resume) {
-          const runId = opts.runId ?? generateRunId();
-          const runDir = resolveRunDir(runId, projectRoot);
-          console.log(`[forge] resuming run: ${runId}`);
-          const { resumePipeline } = await import('./pipeline-runner.js');
-          const result = await resumePipeline(runDir, stubExecutor);
-          console.log(`[forge] pipeline complete: ${result.runId}`);
-          return;
-        }
-
-        const pipelineOptions: PipelineOptions = {
-          briefClass,
-          codebase: projectRoot,
-          dryRun: opts.dryRun,
-          executor: stubExecutor,
-        };
-
-        if (opts.dryRun) {
-          const { stagesForClass } = await import('./brief-classifier.js');
-          const stages = stagesForClass(briefClass);
-          console.log(`[forge] dry-run — brief class: ${briefClass}`);
-          console.log('[forge] planned stages:');
-          for (const stage of stages) {
-            console.log(`  - ${stage}  (${STAGE_LABELS[stage] ?? stage})`);
-          }
-          return;
-        }
-
-        console.log(`[forge] starting pipeline for brief: ${briefPath}`);
-        console.log(`[forge] classified as: ${briefClass}`);
-
-        try {
-          const result = await runPipeline(briefPath, projectRoot, pipelineOptions);
-          console.log(`[forge] pipeline complete: ${result.runId}`);
-          console.log(`[forge] run directory: ${result.runDir}`);
-        } catch (err) {
-          console.error(
-            `[forge] pipeline failed: ${err instanceof Error ? err.message : String(err)}`,
-          );
-          process.exitCode = 1;
-        }
-      },
-    );
-
-  // ── forge status ─────────────────────────────────────────────────────────
-
-  forge
-    .command('status [runId]')
-    .description('Show the status of a pipeline run (omit runId to list recent runs)')
-    .option('--project <path>', 'Project root (defaults to cwd)', process.cwd())
-    .action(async (runId: string | undefined, opts: { project: string }) => {
-      if (!runId) {
-        listRecentRuns(opts.project);
-        return;
-      }
-
-      const runDir = resolveRunDir(runId, opts.project);
-      try {
-        const manifest = getPipelineStatus(runDir);
-        printManifestTable(manifest);
-      } catch (err) {
-        console.error(
-          `[forge] could not load run "${runId}": ${err instanceof Error ? err.message : String(err)}`,
-        );
-        process.exitCode = 1;
-      }
-    });
-
-  // ── forge resume ─────────────────────────────────────────────────────────
-
-  forge
-    .command('resume <runId>')
-    .description('Resume a stopped or failed pipeline run')
-    .option('--project <path>', 'Project root (defaults to cwd)', process.cwd())
-    .action(async (runId: string, opts: { project: string }) => {
-      const runDir = resolveRunDir(runId, opts.project);
-
-      if (!fs.existsSync(runDir)) {
-        console.error(`[forge] run not found: ${runDir}`);
-        process.exitCode = 1;
-        return;
-      }
-
-      console.log(`[forge] resuming run: ${runId}`);
-
-      try {
-        const { resumePipeline } = await import('./pipeline-runner.js');
-        const result = await resumePipeline(runDir, stubExecutor);
-        console.log(`[forge] pipeline complete: ${result.runId}`);
-        console.log(`[forge] run directory: ${result.runDir}`);
-      } catch (err) {
-        console.error(`[forge] resume failed: ${err instanceof Error ? err.message : String(err)}`);
-        process.exitCode = 1;
-      }
-    });
-
-  // ── forge personas ────────────────────────────────────────────────────────
-
-  const personas = forge.command('personas').description('Manage Forge board personas');
-
-  personas
-    .command('list')
-    .description('List configured board personas')
-    .option(
-      '--project <path>',
-      'Project root for persona overrides (defaults to cwd)',
-      process.cwd(),
-    )
-    .option('--board-dir <path>', 'Override the board agents directory')
-    .action((opts: { project: string; boardDir?: string }) => {
-      const effectivePersonas = opts.boardDir
-        ? loadBoardPersonas(opts.boardDir)
-        : getEffectivePersonas(opts.project);
-
-      if (effectivePersonas.length === 0) {
-        console.log('[forge] no board personas configured.');
-        return;
-      }
-
-      console.log(`\nBoard personas (${effectivePersonas.length}):\n`);
-      console.log('Slug'.padEnd(24) + 'Name');
-      console.log('-'.repeat(50));
-      for (const p of effectivePersonas) {
-        console.log(`${p.slug.padEnd(24)}${p.name}`);
-      }
-      console.log('');
-    });
-}
--- a/packages/forge/src/index.ts
+++ b/packages/forge/src/index.ts
@@ -80,6 +80,3 @@ export {
  resumePipeline,
  getPipelineStatus,
 } from './pipeline-runner.js';
-
-// CLI
-export { registerForgeCommand } from './cli.js';
--- a/packages/log/package.json
+++ b/packages/log/package.json
@@ -23,7 +23,6 @@
  },
  "dependencies": {
    "@mosaicstack/db": "workspace:*",
-    "commander": "^13.0.0",
    "drizzle-orm": "^0.45.1"
  },
  "devDependencies": {
--- a/packages/log/src/cli.spec.ts
+++ b/packages/log/src/cli.spec.ts
@@ -1,68 +0,0 @@
-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');
-  });
-});
--- a/packages/log/src/cli.ts
+++ b/packages/log/src/cli.ts
@@ -1,177 +0,0 @@
-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;
-    });
-}
--- a/packages/log/src/index.ts
+++ b/packages/log/src/index.ts
@@ -9,4 +9,3 @@ export {
  type LogTier,
  type LogQuery,
 } from './agent-logs.js';
-export { registerLogCommand } from './cli.js';
--- a/packages/memory/package.json
+++ b/packages/memory/package.json
@@ -25,7 +25,6 @@
    "@mosaicstack/db": "workspace:*",
    "@mosaicstack/storage": "workspace:*",
    "@mosaicstack/types": "workspace:*",
-    "commander": "^13.0.0",
    "drizzle-orm": "^0.45.1"
  },
  "devDependencies": {
--- a/packages/memory/src/cli.spec.ts
+++ b/packages/memory/src/cli.spec.ts
@@ -1,63 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { Command } from 'commander';
-import { registerMemoryCommand } from './cli.js';
-
-/**
- * Smoke test — only verifies command wiring.
- * Does NOT open a database connection.
- */
-describe('registerMemoryCommand', () => {
-  function buildProgram(): Command {
-    const program = new Command('mosaic');
-    program.exitOverride(); // prevent process.exit during tests
-    registerMemoryCommand(program);
-    return program;
-  }
-
-  it('registers a "memory" subcommand', () => {
-    const program = buildProgram();
-    const memory = program.commands.find((c) => c.name() === 'memory');
-    expect(memory).toBeDefined();
-  });
-
-  it('registers "memory search"', () => {
-    const program = buildProgram();
-    const memory = program.commands.find((c) => c.name() === 'memory')!;
-    const search = memory.commands.find((c) => c.name() === 'search');
-    expect(search).toBeDefined();
-  });
-
-  it('registers "memory stats"', () => {
-    const program = buildProgram();
-    const memory = program.commands.find((c) => c.name() === 'memory')!;
-    const stats = memory.commands.find((c) => c.name() === 'stats');
-    expect(stats).toBeDefined();
-  });
-
-  it('registers "memory insights list"', () => {
-    const program = buildProgram();
-    const memory = program.commands.find((c) => c.name() === 'memory')!;
-    const insights = memory.commands.find((c) => c.name() === 'insights');
-    expect(insights).toBeDefined();
-    const list = insights!.commands.find((c) => c.name() === 'list');
-    expect(list).toBeDefined();
-  });
-
-  it('registers "memory preferences list"', () => {
-    const program = buildProgram();
-    const memory = program.commands.find((c) => c.name() === 'memory')!;
-    const preferences = memory.commands.find((c) => c.name() === 'preferences');
-    expect(preferences).toBeDefined();
-    const list = preferences!.commands.find((c) => c.name() === 'list');
-    expect(list).toBeDefined();
-  });
-
-  it('"memory search" has --limit and --agent options', () => {
-    const program = buildProgram();
-    const memory = program.commands.find((c) => c.name() === 'memory')!;
-    const search = memory.commands.find((c) => c.name() === 'search')!;
-    const optNames = search.options.map((o) => o.long);
-    expect(optNames).toContain('--limit');
-    expect(optNames).toContain('--agent');
-  });
-});
--- a/packages/memory/src/cli.ts
+++ b/packages/memory/src/cli.ts
@@ -1,179 +0,0 @@
-import type { Command } from 'commander';
-
-import type { MemoryAdapter } from './types.js';
-
-/**
- * Build and return a connected MemoryAdapter from a connection string or
- * the MEMORY_DB_URL / DATABASE_URL environment variable.
- *
- * For pgvector (postgres://...) the connection string is injected into
- * DATABASE_URL so that PgVectorAdapter's internal createDb() picks it up.
- *
- * Throws with a human-readable message if no connection info is available.
- */
-async function resolveAdapter(dbOption: string | undefined): Promise<MemoryAdapter> {
-  const connStr = dbOption ?? process.env['MEMORY_DB_URL'] ?? process.env['DATABASE_URL'];
-  if (!connStr) {
-    throw new Error(
-      'No database connection string provided. ' +
-        'Pass --db <connection-string> or set MEMORY_DB_URL / DATABASE_URL.',
-    );
-  }
-
-  // Lazy imports so the module loads cleanly without a live DB during smoke tests.
-  const { createMemoryAdapter, registerMemoryAdapter } = await import('./factory.js');
-
-  if (connStr.startsWith('postgres') || connStr.startsWith('pg')) {
-    // PgVectorAdapter reads DATABASE_URL via createDb() — inject it here.
-    process.env['DATABASE_URL'] = connStr;
-
-    const { PgVectorAdapter } = await import('./adapters/pgvector.js');
-    registerMemoryAdapter('pgvector', (cfg) => new PgVectorAdapter(cfg as never));
-    return createMemoryAdapter({ type: 'pgvector' });
-  }
-
-  // Keyword adapter backed by pglite storage; treat connStr as a data directory.
-  const { KeywordAdapter } = await import('./adapters/keyword.js');
-  const { createStorageAdapter, registerStorageAdapter } = await import('@mosaicstack/storage');
-  const { PgliteAdapter } = await import('@mosaicstack/storage');
-
-  registerStorageAdapter('pglite', (cfg) => new PgliteAdapter(cfg as never));
-
-  const storage = createStorageAdapter({ type: 'pglite', dataDir: connStr });
-
-  registerMemoryAdapter('keyword', (cfg) => new KeywordAdapter(cfg as never));
-  return createMemoryAdapter({ type: 'keyword', storage });
-}
-
-/**
- * Register `memory` subcommands on an existing Commander program.
- * Follows the registerQualityRails pattern from @mosaicstack/quality-rails.
- */
-export function registerMemoryCommand(parent: Command): void {
-  const memory = parent.command('memory').description('Inspect and query the Mosaic memory layer');
-
-  // ── memory search <query> ──────────────────────────────────────────────
-  memory
-    .command('search <query>')
-    .description('Semantic search over insights')
-    .option('--db <connection-string>', 'Database connection string (or set MEMORY_DB_URL)')
-    .option('--limit <n>', 'Maximum number of results', '10')
-    .option('--agent <id>', 'Filter by agent / user ID')
-    .action(async (query: string, opts: { db?: string; limit: string; agent?: string }) => {
-      let adapter: MemoryAdapter | undefined;
-      try {
-        adapter = await resolveAdapter(opts.db);
-        const limit = parseInt(opts.limit, 10);
-        const userId = opts.agent ?? 'system';
-        const results = await adapter.searchInsights(userId, query, { limit });
-
-        if (results.length === 0) {
-          console.log('No insights found.');
-        } else {
-          for (const r of results) {
-            console.log(`[${r.id}] (score=${r.score.toFixed(3)}) ${r.content}`);
-          }
-        }
-      } catch (err) {
-        console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
-        process.exitCode = 1;
-      } finally {
-        await adapter?.close();
-      }
-    });
-
-  // ── memory stats ──────────────────────────────────────────────────────
-  memory
-    .command('stats')
-    .description('Print memory tier info: adapter type, insight count, preference count')
-    .option('--db <connection-string>', 'Database connection string (or set MEMORY_DB_URL)')
-    .option('--agent <id>', 'User / agent ID scope for counts', 'system')
-    .action(async (opts: { db?: string; agent: string }) => {
-      let adapter: MemoryAdapter | undefined;
-      try {
-        adapter = await resolveAdapter(opts.db);
-
-        const adapterType = adapter.name;
-
-        const insightCount = await adapter
-          .searchInsights(opts.agent, '', { limit: 100000 })
-          .then((r) => r.length)
-          .catch(() => -1);
-
-        const prefCount = await adapter
-          .listPreferences(opts.agent)
-          .then((r) => r.length)
-          .catch(() => -1);
-
-        console.log(`adapter:     ${adapterType}`);
-        console.log(`insights:    ${insightCount === -1 ? 'unavailable' : String(insightCount)}`);
-        console.log(`preferences: ${prefCount === -1 ? 'unavailable' : String(prefCount)}`);
-      } catch (err) {
-        console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
-        process.exitCode = 1;
-      } finally {
-        await adapter?.close();
-      }
-    });
-
-  // ── memory insights ───────────────────────────────────────────────────
-  const insightsCmd = memory.command('insights').description('Manage insights');
-
-  insightsCmd
-    .command('list')
-    .description('List recent insights')
-    .option('--db <connection-string>', 'Database connection string (or set MEMORY_DB_URL)')
-    .option('--limit <n>', 'Maximum number of results', '20')
-    .option('--agent <id>', 'User / agent ID scope', 'system')
-    .action(async (opts: { db?: string; limit: string; agent: string }) => {
-      let adapter: MemoryAdapter | undefined;
-      try {
-        adapter = await resolveAdapter(opts.db);
-        const limit = parseInt(opts.limit, 10);
-        const results = await adapter.searchInsights(opts.agent, '', { limit });
-
-        if (results.length === 0) {
-          console.log('No insights found.');
-        } else {
-          for (const r of results) {
-            console.log(`[${r.id}] ${r.content}`);
-          }
-        }
-      } catch (err) {
-        console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
-        process.exitCode = 1;
-      } finally {
-        await adapter?.close();
-      }
-    });
-
-  // ── memory preferences ────────────────────────────────────────────────
-  const prefsCmd = memory.command('preferences').description('Manage stored preferences');
-
-  prefsCmd
-    .command('list')
-    .description('List stored preferences')
-    .option('--db <connection-string>', 'Database connection string (or set MEMORY_DB_URL)')
-    .option('--agent <id>', 'User / agent ID scope', 'system')
-    .option('--category <cat>', 'Filter by category')
-    .action(async (opts: { db?: string; agent: string; category?: string }) => {
-      let adapter: MemoryAdapter | undefined;
-      try {
-        adapter = await resolveAdapter(opts.db);
-        const prefs = await adapter.listPreferences(opts.agent, opts.category);
-
-        if (prefs.length === 0) {
-          console.log('No preferences found.');
-        } else {
-          for (const p of prefs) {
-            console.log(`[${p.category}] ${p.key} = ${JSON.stringify(p.value)}`);
-          }
-        }
-      } catch (err) {
-        console.error(`Error: ${err instanceof Error ? err.message : String(err)}`);
-        process.exitCode = 1;
-      } finally {
-        await adapter?.close();
-      }
-    });
-}
--- a/packages/memory/src/index.ts
+++ b/packages/memory/src/index.ts
@@ -1,5 +1,4 @@
 export { createMemory, type Memory } from './memory.js';
-export { registerMemoryCommand } from './cli.js';
 export {
  createPreferencesRepo,
  type PreferencesRepo,
--- a/packages/mosaic/package.json
+++ b/packages/mosaic/package.json
@@ -27,15 +27,11 @@
    "test": "vitest run --passWithNoTests"
  },
  "dependencies": {
-    "@mosaicstack/brain": "workspace:*",
    "@mosaicstack/config": "workspace:*",
    "@mosaicstack/forge": "workspace:*",
-    "@mosaicstack/log": "workspace:*",
    "@mosaicstack/macp": "workspace:*",
-    "@mosaicstack/memory": "workspace:*",
    "@mosaicstack/prdy": "workspace:*",
    "@mosaicstack/quality-rails": "workspace:*",
-    "@mosaicstack/queue": "workspace:*",
    "@mosaicstack/storage": "workspace:*",
    "@mosaicstack/types": "workspace:*",
    "@clack/prompts": "^0.9.1",
--- a/packages/mosaic/src/cli.ts
+++ b/packages/mosaic/src/cli.ts
@@ -2,19 +2,12 @@

 import { createRequire } from 'module';
 import { Command } from 'commander';
-import { registerBrainCommand } from '@mosaicstack/brain';
-import { registerForgeCommand } from '@mosaicstack/forge';
-import { registerLogCommand } from '@mosaicstack/log';
-import { registerMemoryCommand } from '@mosaicstack/memory';
 import { registerQualityRails } from '@mosaicstack/quality-rails';
-import { registerQueueCommand } from '@mosaicstack/queue';
 import { registerStorageCommand } from '@mosaicstack/storage';
 import { registerAgentCommand } from './commands/agent.js';
-import { registerConfigCommand } from './commands/config.js';
 import { registerMissionCommand } from './commands/mission.js';
 // prdy is registered via launch.ts
 import { registerLaunchCommands } from './commands/launch.js';
-import { registerAuthCommand } from './commands/auth.js';
 import { registerGatewayCommand } from './commands/gateway.js';
 import {
  backgroundUpdateCheck,
@@ -41,23 +34,7 @@ try {

 const program = new Command();

-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
-`,
-  );
+program.name('mosaic').description('Mosaic Stack CLI').version(CLI_VERSION);

 // ─── runtime launchers + framework commands ────────────────────────────

@@ -238,10 +215,7 @@ program

 // ─── sessions ───────────────────────────────────────────────────────────

-const sessionsCmd = program
-  .command('sessions')
-  .description('Manage active agent sessions')
-  .configureHelp({ sortSubcommands: true });
+const sessionsCmd = program.command('sessions').description('Manage active agent sessions');

 sessionsCmd
  .command('list')
@@ -329,10 +303,6 @@ sessionsCmd
    }
  });

-// ─── auth ────────────────────────────────────────────────────────────────
-
-registerAuthCommand(program);
-
 // ─── gateway ──────────────────────────────────────────────────────────

 registerGatewayCommand(program);
@@ -341,38 +311,14 @@ registerGatewayCommand(program);

 registerAgentCommand(program);

-// ─── config ────────────────────────────────────────────────────────────
-
-registerConfigCommand(program);
-
 // ─── mission ───────────────────────────────────────────────────────────

 registerMissionCommand(program);

-// ─── brain ──────────────────────────────────────────────────────────────
-
-registerBrainCommand(program);
-
-// ─── forge ───────────────────────────────────────────────────────────────
-
-registerForgeCommand(program);
-
 // ─── quality-rails ──────────────────────────────────────────────────────

 registerQualityRails(program);

-// ─── log ─────────────────────────────────────────────────────────────────
-
-registerLogCommand(program);
-
-// ─── memory ──────────────────────────────────────────────────────────────
-
-registerMemoryCommand(program);
-
-// ─── queue ───────────────────────────────────────────────────────────────
-
-registerQueueCommand(program);
-
 // ─── storage ─────────────────────────────────────────────────────────────

 registerStorageCommand(program);
--- a/packages/mosaic/src/commands/auth.spec.ts
+++ b/packages/mosaic/src/commands/auth.spec.ts
@@ -1,114 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { Command } from 'commander';
-
-// ─── Mocks ──────────────────────────────────────────────────────────────────
-// These mocks prevent any real disk/network access during tests.
-
-vi.mock('./gateway/login.js', () => ({
-  getGatewayUrl: vi.fn().mockReturnValue('http://localhost:14242'),
-}));
-
-vi.mock('./gateway/token-ops.js', () => ({
-  requireSession: vi.fn().mockResolvedValue('better-auth.session_token=test'),
-}));
-
-// Global fetch is never called in smoke tests (no actions invoked).
-
-import { registerAuthCommand } from './auth.js';
-
-// ─── Helpers ─────────────────────────────────────────────────────────────────
-
-function buildTestProgram(): Command {
-  const program = new Command('mosaic').exitOverride();
-  registerAuthCommand(program);
-  return program;
-}
-
-function findCommand(program: Command, ...path: string[]): Command | undefined {
-  let current: Command = program;
-  for (const name of path) {
-    const found = current.commands.find((c) => c.name() === name);
-    if (!found) return undefined;
-    current = found;
-  }
-  return current;
-}
-
-// ─── Tests ───────────────────────────────────────────────────────────────────
-
-describe('registerAuthCommand', () => {
-  let program: Command;
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-    program = buildTestProgram();
-  });
-
-  it('registers the top-level auth command', () => {
-    const authCmd = findCommand(program, 'auth');
-    expect(authCmd).toBeDefined();
-    expect(authCmd?.name()).toBe('auth');
-  });
-
-  describe('auth users', () => {
-    it('registers the users subcommand', () => {
-      const usersCmd = findCommand(program, 'auth', 'users');
-      expect(usersCmd).toBeDefined();
-    });
-
-    it('registers users list with --limit flag', () => {
-      const listCmd = findCommand(program, 'auth', 'users', 'list');
-      expect(listCmd).toBeDefined();
-      const limitOpt = listCmd?.options.find((o) => o.long === '--limit');
-      expect(limitOpt).toBeDefined();
-    });
-
-    it('registers users create', () => {
-      const createCmd = findCommand(program, 'auth', 'users', 'create');
-      expect(createCmd).toBeDefined();
-    });
-
-    it('registers users delete with --yes flag', () => {
-      const deleteCmd = findCommand(program, 'auth', 'users', 'delete');
-      expect(deleteCmd).toBeDefined();
-      const yesOpt = deleteCmd?.options.find((o) => o.long === '--yes');
-      expect(yesOpt).toBeDefined();
-    });
-  });
-
-  describe('auth sso', () => {
-    it('registers the sso subcommand', () => {
-      const ssoCmd = findCommand(program, 'auth', 'sso');
-      expect(ssoCmd).toBeDefined();
-    });
-
-    it('registers sso list', () => {
-      const listCmd = findCommand(program, 'auth', 'sso', 'list');
-      expect(listCmd).toBeDefined();
-    });
-
-    it('registers sso test', () => {
-      const testCmd = findCommand(program, 'auth', 'sso', 'test');
-      expect(testCmd).toBeDefined();
-    });
-  });
-
-  describe('auth sessions', () => {
-    it('registers the sessions subcommand', () => {
-      const sessCmd = findCommand(program, 'auth', 'sessions');
-      expect(sessCmd).toBeDefined();
-    });
-
-    it('registers sessions list', () => {
-      const listCmd = findCommand(program, 'auth', 'sessions', 'list');
-      expect(listCmd).toBeDefined();
-    });
-  });
-
-  it('all top-level auth subcommand names are correct', () => {
-    const authCmd = findCommand(program, 'auth');
-    expect(authCmd).toBeDefined();
-    const names = authCmd!.commands.map((c) => c.name()).sort();
-    expect(names).toEqual(['sessions', 'sso', 'users']);
-  });
-});
--- a/packages/mosaic/src/commands/auth.ts
+++ b/packages/mosaic/src/commands/auth.ts
@@ -1,331 +0,0 @@
-import type { Command } from 'commander';
-import { getGatewayUrl } from './gateway/login.js';
-import { requireSession } from './gateway/token-ops.js';
-
-// ─── Types ───────────────────────────────────────────────────────────────────
-
-interface UserDto {
-  id: string;
-  name: string;
-  email: string;
-  role: string;
-  banned: boolean;
-  banReason: string | null;
-  createdAt: string;
-  updatedAt: string;
-}
-
-interface UserListDto {
-  users: UserDto[];
-  total: number;
-}
-
-// ─── HTTP helpers ────────────────────────────────────────────────────────────
-
-async function adminGet<T>(gatewayUrl: string, cookie: string, path: string): Promise<T> {
-  let res: Response;
-  try {
-    res = await fetch(`${gatewayUrl}${path}`, {
-      headers: { Cookie: cookie, Origin: gatewayUrl },
-    });
-  } catch (err) {
-    console.error(
-      `Could not reach gateway at ${gatewayUrl}: ${err instanceof Error ? err.message : String(err)}`,
-    );
-    process.exit(1);
-  }
-
-  if (res.status === 401 || res.status === 403) {
-    console.error(`Session rejected by the gateway (${res.status.toString()}).`);
-    console.error('Run: mosaic gateway login');
-    process.exit(2);
-  }
-
-  if (!res.ok) {
-    const body = await res.text().catch(() => '');
-    console.error(`Gateway returned error (${res.status.toString()}): ${body.slice(0, 200)}`);
-    process.exit(3);
-  }
-
-  return res.json() as Promise<T>;
-}
-
-async function adminPost<T>(
-  gatewayUrl: string,
-  cookie: string,
-  path: string,
-  body: unknown,
-): Promise<T> {
-  let res: Response;
-  try {
-    res = await fetch(`${gatewayUrl}${path}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Cookie: cookie,
-        Origin: gatewayUrl,
-      },
-      body: JSON.stringify(body),
-    });
-  } catch (err) {
-    console.error(
-      `Could not reach gateway at ${gatewayUrl}: ${err instanceof Error ? err.message : String(err)}`,
-    );
-    process.exit(1);
-  }
-
-  if (res.status === 401 || res.status === 403) {
-    console.error(`Session rejected by the gateway (${res.status.toString()}).`);
-    console.error('Run: mosaic gateway login');
-    process.exit(2);
-  }
-
-  if (!res.ok) {
-    const body = await res.text().catch(() => '');
-    console.error(`Gateway returned error (${res.status.toString()}): ${body.slice(0, 200)}`);
-    process.exit(3);
-  }
-
-  return res.json() as Promise<T>;
-}
-
-async function adminDelete(gatewayUrl: string, cookie: string, path: string): Promise<void> {
-  let res: Response;
-  try {
-    res = await fetch(`${gatewayUrl}${path}`, {
-      method: 'DELETE',
-      headers: { Cookie: cookie, Origin: gatewayUrl },
-    });
-  } catch (err) {
-    console.error(
-      `Could not reach gateway at ${gatewayUrl}: ${err instanceof Error ? err.message : String(err)}`,
-    );
-    process.exit(1);
-  }
-
-  if (res.status === 401 || res.status === 403) {
-    console.error(`Session rejected by the gateway (${res.status.toString()}).`);
-    console.error('Run: mosaic gateway login');
-    process.exit(2);
-  }
-
-  if (!res.ok && res.status !== 204) {
-    const body = await res.text().catch(() => '');
-    console.error(`Gateway returned error (${res.status.toString()}): ${body.slice(0, 200)}`);
-    process.exit(3);
-  }
-}
-
-// ─── Formatters ──────────────────────────────────────────────────────────────
-
-function printUser(u: UserDto): void {
-  console.log(`  ID:        ${u.id}`);
-  console.log(`  Name:      ${u.name}`);
-  console.log(`  Email:     ${u.email}`);
-  console.log(`  Role:      ${u.role}`);
-  console.log(`  Banned:    ${u.banned ? `yes (${u.banReason ?? 'no reason'})` : 'no'}`);
-  console.log(`  Created:   ${new Date(u.createdAt).toLocaleString()}`);
-  console.log('');
-}
-
-// ─── Register function ───────────────────────────────────────────────────────
-
-/**
- * Register `mosaic auth` subcommands on an existing Commander program.
- *
- * Location rationale: placed in packages/mosaic rather than packages/auth because
- * the CLI needs session helpers (loadSession, validateSession, requireSession)
- * and gateway URL resolution (getGatewayUrl) that live in packages/mosaic.
- * Keeping packages/auth as a pure server-side library avoids adding commander
- * and CLI tooling as dependencies there.
- */
-export function registerAuthCommand(parent: Command): void {
-  const auth = parent
-    .command('auth')
-    .description('Manage gateway authentication, users, SSO providers, and sessions')
-    .configureHelp({ sortSubcommands: true })
-    .action(() => {
-      auth.outputHelp();
-    });
-
-  // ─── users ──────────────────────────────────────────────────────────────
-
-  const users = auth
-    .command('users')
-    .description('Manage gateway users')
-    .configureHelp({ sortSubcommands: true })
-    .action(() => {
-      users.outputHelp();
-    });
-
-  users
-    .command('list')
-    .description('List all users on the gateway')
-    .option('-g, --gateway <url>', 'Gateway URL')
-    .option('-l, --limit <n>', 'Maximum number of users to display', '100')
-    .action(async (opts: { gateway?: string; limit: string }) => {
-      const url = getGatewayUrl(opts.gateway);
-      const cookie = await requireSession(url);
-      const limit = parseInt(opts.limit, 10);
-
-      const result = await adminGet<UserListDto>(url, cookie, '/api/admin/users');
-
-      const subset = result.users.slice(0, limit);
-      if (subset.length === 0) {
-        console.log('No users found.');
-        return;
-      }
-
-      console.log(`Users (${subset.length.toString()} of ${result.total.toString()}):\n`);
-      for (const u of subset) {
-        printUser(u);
-      }
-    });
-
-  users
-    .command('create')
-    .description('Create a new gateway user (interactive prompts)')
-    .option('-g, --gateway <url>', 'Gateway URL')
-    .action(async (opts: { gateway?: string }) => {
-      const url = getGatewayUrl(opts.gateway);
-      const cookie = await requireSession(url);
-
-      const {
-        text,
-        password: clackPassword,
-        select,
-        intro,
-        outro,
-        isCancel,
-      } = await import('@clack/prompts');
-
-      intro('Create a new Mosaic gateway user');
-
-      const name = await text({ message: 'Full name:', placeholder: 'Jane Doe' });
-      if (isCancel(name)) {
-        outro('Cancelled.');
-        process.exit(0);
-      }
-
-      const email = await text({ message: 'Email:', placeholder: 'jane@example.com' });
-      if (isCancel(email)) {
-        outro('Cancelled.');
-        process.exit(0);
-      }
-
-      const pw = await clackPassword({ message: 'Password:' });
-      if (isCancel(pw)) {
-        outro('Cancelled.');
-        process.exit(0);
-      }
-
-      const role = await select({
-        message: 'Role:',
-        options: [
-          { value: 'member', label: 'member' },
-          { value: 'admin', label: 'admin' },
-        ],
-      });
-      if (isCancel(role)) {
-        outro('Cancelled.');
-        process.exit(0);
-      }
-
-      const created = await adminPost<UserDto>(url, cookie, '/api/admin/users', {
-        name: name as string,
-        email: email as string,
-        password: pw as string,
-        role: role as string,
-      });
-
-      outro(`User created: ${created.email} (${created.id})`);
-    });
-
-  users
-    .command('delete <id>')
-    .description('Delete a gateway user by ID')
-    .option('-g, --gateway <url>', 'Gateway URL')
-    .option('-y, --yes', 'Skip confirmation prompt')
-    .action(async (id: string, opts: { gateway?: string; yes?: boolean }) => {
-      const url = getGatewayUrl(opts.gateway);
-      const cookie = await requireSession(url);
-
-      if (!opts.yes) {
-        const { confirm, isCancel } = await import('@clack/prompts');
-        const confirmed = await confirm({
-          message: `Delete user ${id}? This cannot be undone.`,
-        });
-        if (isCancel(confirmed) || !confirmed) {
-          console.log('Aborted.');
-          process.exit(0);
-        }
-      }
-
-      await adminDelete(url, cookie, `/api/admin/users/${id}`);
-      console.log(`User ${id} deleted.`);
-    });
-
-  // ─── sso ────────────────────────────────────────────────────────────────
-
-  const sso = auth
-    .command('sso')
-    .description('Manage SSO provider configuration')
-    .configureHelp({ sortSubcommands: true })
-    .action(() => {
-      sso.outputHelp();
-    });
-
-  sso
-    .command('list')
-    .description('List configured SSO providers (reads gateway discovery endpoint if available)')
-    .option('-g, --gateway <url>', 'Gateway URL')
-    .action(async (opts: { gateway?: string }) => {
-      // The admin SSO discovery endpoint is not yet wired server-side.
-      // The buildSsoDiscovery helper in @mosaicstack/auth reads env-vars on the
-      // server; there is no GET /api/admin/sso endpoint in apps/gateway/src/admin/.
-      // Stub until a gateway admin route is wired.
-      console.log(
-        'not yet wired — admin endpoint missing (GET /api/admin/sso not implemented server-side)',
-      );
-      console.log(
-        'Hint: SSO providers are configured via environment variables (AUTHENTIK_*, WORKOS_*, KEYCLOAK_*).',
-      );
-      // Suppress unused variable warning
-      void opts;
-    });
-
-  sso
-    .command('test <provider>')
-    .description('Smoke-test a configured SSO provider')
-    .option('-g, --gateway <url>', 'Gateway URL')
-    .action(async (provider: string, opts: { gateway?: string }) => {
-      // No server-side SSO smoke-test endpoint exists yet.
-      console.log(
-        `not yet wired — admin endpoint missing (POST /api/admin/sso/${provider}/test not implemented server-side)`,
-      );
-      void opts;
-    });
-
-  // ─── sessions ────────────────────────────────────────────────────────────
-
-  const authSessions = auth
-    .command('sessions')
-    .description('Manage BetterAuth user sessions stored on the gateway')
-    .configureHelp({ sortSubcommands: true })
-    .action(() => {
-      authSessions.outputHelp();
-    });
-
-  authSessions
-    .command('list')
-    .description('List active user sessions')
-    .option('-g, --gateway <url>', 'Gateway URL')
-    .action(async (opts: { gateway?: string }) => {
-      // No GET /api/admin/auth-sessions endpoint exists in apps/gateway/src/admin/.
-      // Stub until a gateway admin route is wired.
-      console.log(
-        'not yet wired — admin endpoint missing (GET /api/admin/auth-sessions not implemented server-side)',
-      );
-      void opts;
-    });
-}
--- a/packages/mosaic/src/commands/config.spec.ts
+++ b/packages/mosaic/src/commands/config.spec.ts
@@ -1,289 +0,0 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { Command } from 'commander';
-import { registerConfigCommand } from './config.js';
-
-// ── helpers ──────────────────────────────────────────────────────────────────
-
-/** Build a fresh Command tree with the config command registered. */
-function buildProgram(): Command {
-  const program = new Command();
-  program.exitOverride(); // prevent process.exit during tests
-  registerConfigCommand(program);
-  return program;
-}
-
-/** Locate the 'config' command registered on the root program. */
-function getConfigCmd(program: Command): Command {
-  const found = program.commands.find((c) => c.name() === 'config');
-  if (!found) throw new Error('config command not found');
-  return found;
-}
-
-// ── subcommand registration ───────────────────────────────────────────────────
-
-describe('registerConfigCommand', () => {
-  it('registers a "config" command on the program', () => {
-    const program = buildProgram();
-    const names = program.commands.map((c) => c.name());
-    expect(names).toContain('config');
-  });
-
-  it('registers exactly the five required subcommands', () => {
-    const program = buildProgram();
-    const config = getConfigCmd(program);
-    const subs = config.commands.map((c) => c.name()).sort();
-    expect(subs).toEqual(['edit', 'get', 'path', 'set', 'show']);
-  });
-});
-
-// ── mock config service ───────────────────────────────────────────────────────
-
-const mockSoul = {
-  agentName: 'TestBot',
-  roleDescription: 'test role',
-  communicationStyle: 'direct' as const,
-};
-const mockUser = { userName: 'Tester', pronouns: 'they/them', timezone: 'UTC' };
-const mockTools = { credentialsLocation: '/dev/null' };
-
-const mockSvc = {
-  readSoul: vi.fn().mockResolvedValue(mockSoul),
-  readUser: vi.fn().mockResolvedValue(mockUser),
-  readTools: vi.fn().mockResolvedValue(mockTools),
-  writeSoul: vi.fn().mockResolvedValue(undefined),
-  writeUser: vi.fn().mockResolvedValue(undefined),
-  writeTools: vi.fn().mockResolvedValue(undefined),
-  syncFramework: vi.fn().mockResolvedValue(undefined),
-  readAll: vi.fn().mockResolvedValue({ soul: mockSoul, user: mockUser, tools: mockTools }),
-  getValue: vi.fn().mockResolvedValue('TestBot'),
-  setValue: vi.fn().mockResolvedValue('OldBot'),
-  getConfigPath: vi
-    .fn()
-    .mockImplementation((section?: string) =>
-      section
-        ? `/home/user/.config/mosaic/${section.toUpperCase()}.md`
-        : '/home/user/.config/mosaic',
-    ),
-  isInitialized: vi.fn().mockReturnValue(true),
-};
-
-// Mock the config-service module so commands use our mock.
-vi.mock('../config/config-service.js', () => ({
-  createConfigService: vi.fn(() => mockSvc),
-}));
-
-// Also mock child_process for the edit command.
-vi.mock('node:child_process', () => ({
-  spawnSync: vi.fn().mockReturnValue({ status: 0, error: undefined }),
-}));
-
-// ── config show ───────────────────────────────────────────────────────────────
-
-describe('config show', () => {
-  let consoleSpy: ReturnType<typeof vi.spyOn>;
-
-  beforeEach(() => {
-    consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined);
-    vi.clearAllMocks();
-    mockSvc.isInitialized.mockReturnValue(true);
-    mockSvc.readAll.mockResolvedValue({ soul: mockSoul, user: mockUser, tools: mockTools });
-  });
-
-  afterEach(() => {
-    consoleSpy.mockRestore();
-  });
-
-  it('calls readAll() and prints a table by default', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'show']);
-    expect(mockSvc.readAll).toHaveBeenCalledOnce();
-    // Should have printed something
-    expect(consoleSpy).toHaveBeenCalled();
-  });
-
-  it('prints JSON when --format json is passed', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'show', '--format', 'json']);
-    expect(mockSvc.readAll).toHaveBeenCalledOnce();
-    // Verify JSON was logged
-    const allOutput = consoleSpy.mock.calls.map((c) => c[0] as string).join('\n');
-    expect(allOutput).toContain('"agentName"');
-  });
-});
-
-// ── config get ────────────────────────────────────────────────────────────────
-
-describe('config get', () => {
-  let consoleSpy: ReturnType<typeof vi.spyOn>;
-
-  beforeEach(() => {
-    consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined);
-    vi.clearAllMocks();
-    mockSvc.isInitialized.mockReturnValue(true);
-    mockSvc.getValue.mockResolvedValue('TestBot');
-  });
-
-  afterEach(() => {
-    consoleSpy.mockRestore();
-  });
-
-  it('delegates to getValue() with the provided key', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'get', 'soul.agentName']);
-    expect(mockSvc.getValue).toHaveBeenCalledWith('soul.agentName');
-  });
-
-  it('prints the returned value', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'get', 'soul.agentName']);
-    expect(consoleSpy).toHaveBeenCalledWith('TestBot');
-  });
-});
-
-// ── config set ────────────────────────────────────────────────────────────────
-
-describe('config set', () => {
-  let consoleSpy: ReturnType<typeof vi.spyOn>;
-
-  beforeEach(() => {
-    consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined);
-    vi.clearAllMocks();
-    mockSvc.isInitialized.mockReturnValue(true);
-    mockSvc.setValue.mockResolvedValue('OldBot');
-  });
-
-  afterEach(() => {
-    consoleSpy.mockRestore();
-  });
-
-  it('delegates to setValue() with key and value', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'set', 'soul.agentName', 'NewBot']);
-    expect(mockSvc.setValue).toHaveBeenCalledWith('soul.agentName', 'NewBot');
-  });
-
-  it('prints old and new values', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'set', 'soul.agentName', 'NewBot']);
-    const output = consoleSpy.mock.calls.map((c) => c[0] as string).join('\n');
-    expect(output).toContain('OldBot');
-    expect(output).toContain('NewBot');
-  });
-});
-
-// ── config path ───────────────────────────────────────────────────────────────
-
-describe('config path', () => {
-  let consoleSpy: ReturnType<typeof vi.spyOn>;
-
-  beforeEach(() => {
-    consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined);
-    vi.clearAllMocks();
-    mockSvc.getConfigPath.mockImplementation((section?: string) =>
-      section
-        ? `/home/user/.config/mosaic/${section.toUpperCase()}.md`
-        : '/home/user/.config/mosaic',
-    );
-  });
-
-  afterEach(() => {
-    consoleSpy.mockRestore();
-  });
-
-  it('prints the mosaicHome directory when no section is specified', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'path']);
-    expect(mockSvc.getConfigPath).toHaveBeenCalledWith();
-    expect(consoleSpy).toHaveBeenCalledWith('/home/user/.config/mosaic');
-  });
-
-  it('prints the section file path when --section is given', async () => {
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'path', '--section', 'soul']);
-    expect(mockSvc.getConfigPath).toHaveBeenCalledWith('soul');
-    expect(consoleSpy).toHaveBeenCalledWith('/home/user/.config/mosaic/SOUL.md');
-  });
-});
-
-// ── config edit ───────────────────────────────────────────────────────────────
-
-describe('config edit', () => {
-  let consoleSpy: ReturnType<typeof vi.spyOn>;
-  let spawnSyncMock: ReturnType<typeof vi.fn>;
-
-  beforeEach(async () => {
-    consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => undefined);
-    vi.clearAllMocks();
-    mockSvc.isInitialized.mockReturnValue(true);
-    mockSvc.readAll.mockResolvedValue({ soul: mockSoul, user: mockUser, tools: mockTools });
-    mockSvc.getConfigPath.mockImplementation((section?: string) =>
-      section
-        ? `/home/user/.config/mosaic/${section.toUpperCase()}.md`
-        : '/home/user/.config/mosaic',
-    );
-
-    // Re-import to get the mock reference
-    const cp = await import('node:child_process');
-    spawnSyncMock = cp.spawnSync as ReturnType<typeof vi.fn>;
-    spawnSyncMock.mockReturnValue({ status: 0, error: undefined });
-  });
-
-  afterEach(() => {
-    consoleSpy.mockRestore();
-  });
-
-  it('calls spawnSync with the editor binary and config path', async () => {
-    process.env['EDITOR'] = 'nano';
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'edit']);
-    expect(spawnSyncMock).toHaveBeenCalledWith(
-      'nano',
-      ['/home/user/.config/mosaic'],
-      expect.objectContaining({ stdio: 'inherit' }),
-    );
-    delete process.env['EDITOR'];
-  });
-
-  it('falls back to "vi" when EDITOR is not set', async () => {
-    delete process.env['EDITOR'];
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'edit']);
-    expect(spawnSyncMock).toHaveBeenCalledWith('vi', expect.any(Array), expect.any(Object));
-  });
-
-  it('opens the section-specific file when --section is provided', async () => {
-    process.env['EDITOR'] = 'code';
-    const program = buildProgram();
-    await program.parseAsync(['node', 'mosaic', 'config', 'edit', '--section', 'soul']);
-    expect(spawnSyncMock).toHaveBeenCalledWith(
-      'code',
-      ['/home/user/.config/mosaic/SOUL.md'],
-      expect.any(Object),
-    );
-    delete process.env['EDITOR'];
-  });
-});
-
-// ── not-initialized guard ────────────────────────────────────────────────────
-
-describe('not-initialized guard', () => {
-  let consoleErrorSpy: ReturnType<typeof vi.spyOn>;
-
-  beforeEach(() => {
-    consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => undefined);
-    vi.clearAllMocks();
-    mockSvc.isInitialized.mockReturnValue(false);
-  });
-
-  afterEach(() => {
-    consoleErrorSpy.mockRestore();
-    mockSvc.isInitialized.mockReturnValue(true);
-  });
-
-  it('prints a helpful message when config is missing (show)', async () => {
-    const program = buildProgram();
-    // process.exit is intercepted; catch the resulting error from exitOverride
-    await expect(program.parseAsync(['node', 'mosaic', 'config', 'show'])).rejects.toThrow();
-    expect(consoleErrorSpy).toHaveBeenCalledWith(expect.stringContaining('mosaic wizard'));
-  });
-});
--- a/packages/mosaic/src/commands/config.ts
+++ b/packages/mosaic/src/commands/config.ts
@@ -1,206 +0,0 @@
-import { spawnSync } from 'node:child_process';
-import type { Command } from 'commander';
-import { createConfigService } from '../config/config-service.js';
-import { DEFAULT_MOSAIC_HOME } from '../constants.js';
-
-/**
- * Resolve mosaicHome from the MOSAIC_HOME env var or the default constant.
- */
-function getMosaicHome(): string {
-  return process.env['MOSAIC_HOME'] ?? DEFAULT_MOSAIC_HOME;
-}
-
-/**
- * Guard: print an error and exit(1) if config has not been initialised.
- */
-function assertInitialized(svc: ReturnType<typeof createConfigService>): void {
-  if (!svc.isInitialized()) {
-    console.error('No config found — run `mosaic wizard` first.');
-    process.exit(1);
-  }
-}
-
-/**
- * Flatten a nested object into dotted-key rows for table display.
- */
-function flattenConfig(obj: Record<string, unknown>, prefix = ''): Array<[string, string]> {
-  const rows: Array<[string, string]> = [];
-  for (const [k, v] of Object.entries(obj)) {
-    const key = prefix ? `${prefix}.${k}` : k;
-    if (v !== null && typeof v === 'object' && !Array.isArray(v)) {
-      rows.push(...flattenConfig(v as Record<string, unknown>, key));
-    } else {
-      rows.push([key, v === undefined || v === null ? '' : String(v)]);
-    }
-  }
-  return rows;
-}
-
-/**
- * Print rows as a padded ASCII table.
- */
-function printTable(rows: Array<[string, string]>): void {
-  if (rows.length === 0) {
-    console.log('(no config values)');
-    return;
-  }
-  const maxKey = Math.max(...rows.map(([k]) => k.length));
-  const header = `${'Key'.padEnd(maxKey)}  Value`;
-  const divider = '-'.repeat(header.length);
-  console.log(header);
-  console.log(divider);
-  for (const [k, v] of rows) {
-    console.log(`${k.padEnd(maxKey)}  ${v}`);
-  }
-}
-
-export function registerConfigCommand(program: Command): void {
-  const cmd = program
-    .command('config')
-    .description('Manage Mosaic framework configuration')
-    .configureHelp({ sortSubcommands: true });
-
-  // ── config show ─────────────────────────────────────────────────────────
-
-  cmd
-    .command('show')
-    .description('Print the current resolved config')
-    .option('-f, --format <format>', 'Output format: table or json', 'table')
-    .action(async (opts: { format: string }) => {
-      const mosaicHome = getMosaicHome();
-      const svc = createConfigService(mosaicHome, mosaicHome);
-      assertInitialized(svc);
-
-      const config = await svc.readAll();
-
-      if (opts.format === 'json') {
-        console.log(JSON.stringify(config, null, 2));
-        return;
-      }
-
-      // Default: table
-      const rows = flattenConfig(config as unknown as Record<string, unknown>);
-      printTable(rows);
-    });
-
-  // ── config get <key> ────────────────────────────────────────────────────
-
-  cmd
-    .command('get <key>')
-    .description('Print a single config value (supports dotted keys, e.g. soul.agentName)')
-    .action(async (key: string) => {
-      const mosaicHome = getMosaicHome();
-      const svc = createConfigService(mosaicHome, mosaicHome);
-      assertInitialized(svc);
-
-      const value = await svc.getValue(key);
-      if (value === undefined) {
-        console.error(`Key "${key}" not found.`);
-        process.exit(1);
-      }
-      if (typeof value === 'object') {
-        console.log(JSON.stringify(value, null, 2));
-      } else {
-        console.log(String(value));
-      }
-    });
-
-  // ── config set <key> <value> ────────────────────────────────────────────
-
-  cmd
-    .command('set <key> <value>')
-    .description(
-      'Set a config value and persist (supports dotted keys, e.g. soul.agentName "Jarvis")',
-    )
-    .action(async (key: string, value: string) => {
-      const mosaicHome = getMosaicHome();
-      const svc = createConfigService(mosaicHome, mosaicHome);
-      assertInitialized(svc);
-
-      let previous: unknown;
-      try {
-        previous = await svc.setValue(key, value);
-      } catch (err) {
-        console.error(err instanceof Error ? err.message : String(err));
-        process.exit(1);
-      }
-
-      const prevStr = previous === undefined ? '(unset)' : String(previous);
-      console.log(`${key}`);
-      console.log(`  old: ${prevStr}`);
-      console.log(`  new: ${value}`);
-    });
-
-  // ── config edit ─────────────────────────────────────────────────────────
-
-  cmd
-    .command('edit')
-    .description('Open the config directory in $EDITOR (or vi)')
-    .option('-s, --section <section>', 'Open a specific section file: soul | user | tools')
-    .action(async (opts: { section?: string }) => {
-      const mosaicHome = getMosaicHome();
-      const svc = createConfigService(mosaicHome, mosaicHome);
-      assertInitialized(svc);
-
-      const editor = process.env['EDITOR'] ?? 'vi';
-
-      let targetPath: string;
-      if (opts.section) {
-        const validSections = ['soul', 'user', 'tools'] as const;
-        if (!validSections.includes(opts.section as (typeof validSections)[number])) {
-          console.error(`Invalid section "${opts.section}". Choose: soul, user, tools`);
-          process.exit(1);
-        }
-        targetPath = svc.getConfigPath(opts.section as 'soul' | 'user' | 'tools');
-      } else {
-        targetPath = svc.getConfigPath();
-      }
-
-      const result = spawnSync(editor, [targetPath], { stdio: 'inherit' });
-
-      if (result.error) {
-        console.error(`Failed to open editor: ${result.error.message}`);
-        process.exit(1);
-      }
-
-      if (result.status !== 0) {
-        console.error(`Editor exited with code ${String(result.status ?? 1)}`);
-        process.exit(result.status ?? 1);
-      }
-
-      // Re-read after edit and report any issues
-      try {
-        await svc.readAll();
-        console.log('Config looks valid.');
-      } catch (err) {
-        console.error('Warning: config may have validation issues:');
-        console.error(err instanceof Error ? err.message : String(err));
-        process.exit(1);
-      }
-    });
-
-  // ── config path ─────────────────────────────────────────────────────────
-
-  cmd
-    .command('path')
-    .description('Print the active config directory path (for scripting)')
-    .option(
-      '-s, --section <section>',
-      'Print path for a specific section file: soul | user | tools',
-    )
-    .action(async (opts: { section?: string }) => {
-      const mosaicHome = getMosaicHome();
-      const svc = createConfigService(mosaicHome, mosaicHome);
-
-      if (opts.section) {
-        const validSections = ['soul', 'user', 'tools'] as const;
-        if (!validSections.includes(opts.section as (typeof validSections)[number])) {
-          console.error(`Invalid section "${opts.section}". Choose: soul, user, tools`);
-          process.exit(1);
-        }
-        console.log(svc.getConfigPath(opts.section as 'soul' | 'user' | 'tools'));
-      } else {
-        console.log(svc.getConfigPath());
-      }
-    });
-}
--- a/packages/mosaic/src/commands/gateway.ts
+++ b/packages/mosaic/src/commands/gateway.ts
@@ -6,7 +6,6 @@ import {
  stopDaemon,
  waitForHealth,
 } from './gateway/daemon.js';
-import { getGatewayUrl } from './gateway/login.js';

 interface GatewayParentOpts {
  host: string;
@@ -31,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();
    });
@@ -120,28 +118,9 @@ export function registerGatewayCommand(program: Command): void {
      await runStatus(opts);
    });

-  // ─── login ──────────────────────────────────────────────────────────────
-
-  gw.command('login')
-    .description('Sign in to the gateway (defaults to URL from meta.json)')
-    .option('-g, --gateway <url>', 'Gateway URL (overrides meta.json)')
-    .option('-e, --email <email>', 'Email address')
-    .option('-p, --password <password>', 'Password')
-    .action(async (cmdOpts: { gateway?: string; email?: string; password?: string }) => {
-      const { runLogin } = await import('./gateway/login.js');
-      const url = getGatewayUrl(cmdOpts.gateway);
-      try {
-        await runLogin({ gatewayUrl: url, email: cmdOpts.email, password: cmdOpts.password });
-      } catch (err) {
-        console.error(err instanceof Error ? err.message : String(err));
-        process.exit(1);
-      }
-    });
-
  // ─── config ─────────────────────────────────────────────────────────────

-  const configCmd = gw
-    .command('config')
+  gw.command('config')
    .description('View or modify gateway configuration')
    .option('--set <KEY=VALUE>', 'Set a configuration value')
    .option('--unset <KEY>', 'Remove a configuration key')
@@ -151,24 +130,6 @@ export function registerGatewayCommand(program: Command): void {
      await runConfig(cmdOpts);
    });

-  configCmd
-    .command('rotate-token')
-    .description('Mint a new admin token using the stored BetterAuth session')
-    .option('-g, --gateway <url>', 'Gateway URL (overrides meta.json)')
-    .action(async (cmdOpts: { gateway?: string }) => {
-      const { runRotateToken } = await import('./gateway/token-ops.js');
-      await runRotateToken(cmdOpts.gateway);
-    });
-
-  configCmd
-    .command('recover-token')
-    .description('Recover an admin token — prompts for login if no valid session exists')
-    .option('-g, --gateway <url>', 'Gateway URL (overrides meta.json)')
-    .action(async (cmdOpts: { gateway?: string }) => {
-      const { runRecoverToken } = await import('./gateway/token-ops.js');
-      await runRecoverToken(cmdOpts.gateway);
-    });
-
  // ─── logs ───────────────────────────────────────────────────────────────

  gw.command('logs')
--- a/packages/mosaic/src/commands/gateway/install.ts
+++ b/packages/mosaic/src/commands/gateway/install.ts
@@ -388,32 +388,10 @@ async function bootstrapFirstUser(
    if (!status.needsSetup) {
      if (meta.adminToken) {
        console.log('Admin user already exists (token on file).');
-        return;
+      } else {
+        console.log('Admin user already exists — skipping setup.');
+        console.log('(No admin token on file — sign in via the web UI to manage tokens.)');
      }
-
-      // Admin user exists but no token — offer inline recovery when interactive.
-      console.log('Admin user already exists but no admin token is on file.');
-
-      if (process.stdin.isTTY) {
-        const answer = (await prompt(rl, 'Run token recovery now? [Y/n] ')).trim().toLowerCase();
-        if (answer === '' || answer === 'y' || answer === 'yes') {
-          console.log();
-          try {
-            const { ensureSession, mintAdminToken, persistToken } = await import('./token-ops.js');
-            const cookie = await ensureSession(baseUrl);
-            const label = `CLI recovery token (${new Date().toISOString().slice(0, 16).replace('T', ' ')})`;
-            const minted = await mintAdminToken(baseUrl, cookie, label);
-            persistToken(baseUrl, minted);
-          } catch (err) {
-            console.error(
-              `Token recovery failed: ${err instanceof Error ? err.message : String(err)}`,
-            );
-          }
-          return;
-        }
-      }
-
-      console.log('No admin token on file. Run: mosaic gateway config recover-token');
      return;
    }
  } catch {
--- a/packages/mosaic/src/commands/gateway/login.spec.ts
+++ b/packages/mosaic/src/commands/gateway/login.spec.ts
@@ -1,87 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-// Mock auth module
-vi.mock('../../auth.js', () => ({
-  signIn: vi.fn(),
-  saveSession: vi.fn(),
-}));
-
-// Mock daemon to avoid file-system reads
-vi.mock('./daemon.js', () => ({
-  readMeta: vi.fn().mockReturnValue({
-    host: 'localhost',
-    port: 14242,
-    version: '1.0.0',
-    installedAt: '',
-    entryPoint: '',
-  }),
-}));
-
-import { runLogin, getGatewayUrl } from './login.js';
-import { signIn, saveSession } from '../../auth.js';
-import { readMeta } from './daemon.js';
-
-const mockSignIn = vi.mocked(signIn);
-const mockSaveSession = vi.mocked(saveSession);
-const mockReadMeta = vi.mocked(readMeta);
-
-describe('getGatewayUrl', () => {
-  it('returns override URL when provided', () => {
-    expect(getGatewayUrl('http://my-gateway:9999')).toBe('http://my-gateway:9999');
-  });
-
-  it('builds URL from meta.json when no override given', () => {
-    mockReadMeta.mockReturnValueOnce({
-      host: 'myhost',
-      port: 8080,
-      version: '1.0.0',
-      installedAt: '',
-      entryPoint: '',
-    });
-    expect(getGatewayUrl()).toBe('http://myhost:8080');
-  });
-
-  it('falls back to default when meta is null', () => {
-    mockReadMeta.mockReturnValueOnce(null);
-    expect(getGatewayUrl()).toBe('http://localhost:14242');
-  });
-});
-
-describe('runLogin', () => {
-  const consoleLogSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('calls signIn and saveSession on success', async () => {
-    const fakeAuth = {
-      cookie: 'better-auth.session_token=abc',
-      userId: 'u1',
-      email: 'admin@test.com',
-    };
-    mockSignIn.mockResolvedValueOnce(fakeAuth);
-
-    await runLogin({
-      gatewayUrl: 'http://localhost:14242',
-      email: 'admin@test.com',
-      password: 'password123',
-    });
-
-    expect(mockSignIn).toHaveBeenCalledWith(
-      'http://localhost:14242',
-      'admin@test.com',
-      'password123',
-    );
-    expect(mockSaveSession).toHaveBeenCalledWith('http://localhost:14242', fakeAuth);
-    expect(consoleLogSpy).toHaveBeenCalledWith(expect.stringContaining('admin@test.com'));
-  });
-
-  it('propagates signIn errors', async () => {
-    mockSignIn.mockRejectedValueOnce(new Error('Sign-in failed (401): invalid credentials'));
-
-    await expect(
-      runLogin({ gatewayUrl: 'http://localhost:14242', email: 'bad@test.com', password: 'wrong' }),
-    ).rejects.toThrow('Sign-in failed (401)');
-  });
-});
--- a/packages/mosaic/src/commands/gateway/login.ts
+++ b/packages/mosaic/src/commands/gateway/login.ts
@@ -1,39 +0,0 @@
-import { createInterface } from 'node:readline';
-import { signIn, saveSession } from '../../auth.js';
-import { readMeta } from './daemon.js';
-
-/**
- * Shared login helper used by both `mosaic login` and `mosaic gateway login`.
- * Prompts for email/password if not supplied, signs in, and persists the session.
- */
-export async function runLogin(opts: {
-  gatewayUrl: string;
-  email?: string;
-  password?: string;
-}): Promise<void> {
-  let email = opts.email;
-  let password = opts.password;
-
-  if (!email || !password) {
-    const rl = createInterface({ input: process.stdin, output: process.stdout });
-    const ask = (q: string): Promise<string> => new Promise((resolve) => rl.question(q, resolve));
-
-    if (!email) email = await ask('Email: ');
-    if (!password) password = await ask('Password: ');
-    rl.close();
-  }
-
-  const auth = await signIn(opts.gatewayUrl, email, password);
-  saveSession(opts.gatewayUrl, auth);
-  console.log(`Signed in as ${auth.email} (${opts.gatewayUrl})`);
-}
-
-/**
- * Derive the gateway base URL from meta.json with a fallback.
- */
-export function getGatewayUrl(overrideUrl?: string): string {
-  if (overrideUrl) return overrideUrl;
-  const meta = readMeta();
-  if (meta) return `http://${meta.host}:${meta.port.toString()}`;
-  return 'http://localhost:14242';
-}
--- a/packages/mosaic/src/commands/gateway/recover-token.spec.ts
+++ b/packages/mosaic/src/commands/gateway/recover-token.spec.ts
@@ -1,176 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-// ─── Mocks ──────────────────────────────────────────────────────────────────
-
-vi.mock('../../auth.js', () => ({
-  loadSession: vi.fn(),
-  validateSession: vi.fn(),
-  signIn: vi.fn(),
-  saveSession: vi.fn(),
-}));
-
-vi.mock('./daemon.js', () => ({
-  readMeta: vi.fn(),
-  writeMeta: vi.fn(),
-}));
-
-vi.mock('./login.js', () => ({
-  getGatewayUrl: vi.fn().mockReturnValue('http://localhost:14242'),
-}));
-
-// Mock readline so tests don't block on stdin
-vi.mock('node:readline', () => ({
-  createInterface: vi.fn().mockReturnValue({
-    question: vi.fn((_q: string, cb: (a: string) => void) => cb('test-input')),
-    close: vi.fn(),
-  }),
-}));
-
-const mockFetch = vi.fn();
-vi.stubGlobal('fetch', mockFetch);
-
-import { runRecoverToken, ensureSession } from './token-ops.js';
-import { loadSession, validateSession, signIn, saveSession } from '../../auth.js';
-import { readMeta, writeMeta } from './daemon.js';
-
-const mockLoadSession = vi.mocked(loadSession);
-const mockValidateSession = vi.mocked(validateSession);
-const mockSignIn = vi.mocked(signIn);
-const mockSaveSession = vi.mocked(saveSession);
-const mockReadMeta = vi.mocked(readMeta);
-const mockWriteMeta = vi.mocked(writeMeta);
-
-const baseUrl = 'http://localhost:14242';
-const fakeCookie = 'better-auth.session_token=sess123';
-const fakeToken = {
-  id: 'tok-1',
-  label: 'CLI recovery token (2026-04-04 12:00)',
-  plaintext: 'abcdef1234567890',
-};
-const fakeMeta = {
-  version: '1.0.0',
-  installedAt: '',
-  entryPoint: '',
-  host: 'localhost',
-  port: 14242,
-};
-
-describe('ensureSession', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-  });
-
-  it('returns cookie from stored session when valid', async () => {
-    mockLoadSession.mockReturnValueOnce({ cookie: fakeCookie, userId: 'u1', email: 'a@b.com' });
-    mockValidateSession.mockResolvedValueOnce(true);
-
-    const cookie = await ensureSession(baseUrl);
-    expect(cookie).toBe(fakeCookie);
-    expect(mockSignIn).not.toHaveBeenCalled();
-  });
-
-  it('prompts for credentials and signs in when stored session is invalid', async () => {
-    mockLoadSession.mockReturnValueOnce({ cookie: 'old-cookie', userId: 'u1', email: 'a@b.com' });
-    mockValidateSession.mockResolvedValueOnce(false);
-    const newAuth = { cookie: fakeCookie, userId: 'u2', email: 'a@b.com' };
-    mockSignIn.mockResolvedValueOnce(newAuth);
-
-    const cookie = await ensureSession(baseUrl);
-    expect(cookie).toBe(fakeCookie);
-    expect(mockSaveSession).toHaveBeenCalledWith(baseUrl, newAuth);
-  });
-
-  it('prompts for credentials when no session exists', async () => {
-    mockLoadSession.mockReturnValueOnce(null);
-    const newAuth = { cookie: fakeCookie, userId: 'u2', email: 'a@b.com' };
-    mockSignIn.mockResolvedValueOnce(newAuth);
-
-    const cookie = await ensureSession(baseUrl);
-    expect(cookie).toBe(fakeCookie);
-    expect(mockSignIn).toHaveBeenCalled();
-  });
-
-  it('exits non-zero when signIn fails', async () => {
-    mockLoadSession.mockReturnValueOnce(null);
-    mockSignIn.mockRejectedValueOnce(new Error('Sign-in failed (401): bad creds'));
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((_code?: number | string | null | undefined) => {
-        throw new Error(`process.exit(${String(_code)})`);
-      });
-    const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
-
-    await expect(ensureSession(baseUrl)).rejects.toThrow('process.exit(2)');
-    expect(processExitSpy).toHaveBeenCalledWith(2);
-
-    processExitSpy.mockRestore();
-    consoleErrorSpy.mockRestore();
-  });
-});
-
-describe('runRecoverToken', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-  });
-
-  it('prompts for login, mints a token, and persists it when no session exists', async () => {
-    mockLoadSession.mockReturnValueOnce(null);
-    const newAuth = { cookie: fakeCookie, userId: 'u2', email: 'admin@test.com' };
-    mockSignIn.mockResolvedValueOnce(newAuth);
-    mockReadMeta.mockReturnValue(fakeMeta);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      json: async () => fakeToken,
-    });
-
-    await runRecoverToken();
-
-    expect(mockSignIn).toHaveBeenCalled();
-    expect(mockFetch).toHaveBeenCalledWith(
-      `${baseUrl}/api/admin/tokens`,
-      expect.objectContaining({ method: 'POST' }),
-    );
-    expect(mockWriteMeta).toHaveBeenCalledWith(
-      expect.objectContaining({ adminToken: fakeToken.plaintext }),
-    );
-  });
-
-  it('skips login when a valid session exists and mints a recovery token', async () => {
-    mockLoadSession.mockReturnValueOnce({ cookie: fakeCookie, userId: 'u1', email: 'a@b.com' });
-    mockValidateSession.mockResolvedValueOnce(true);
-    mockReadMeta.mockReturnValue(fakeMeta);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      json: async () => fakeToken,
-    });
-
-    await runRecoverToken();
-
-    expect(mockSignIn).not.toHaveBeenCalled();
-    expect(mockWriteMeta).toHaveBeenCalledWith(
-      expect.objectContaining({ adminToken: fakeToken.plaintext }),
-    );
-  });
-
-  it('uses label containing "recovery token"', async () => {
-    mockLoadSession.mockReturnValueOnce({ cookie: fakeCookie, userId: 'u1', email: 'a@b.com' });
-    mockValidateSession.mockResolvedValueOnce(true);
-    mockReadMeta.mockReturnValue(fakeMeta);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      json: async () => fakeToken,
-    });
-
-    await runRecoverToken();
-
-    const call = mockFetch.mock.calls[0] as [string, RequestInit];
-    const body = JSON.parse(call[1].body as string) as { label: string };
-    expect(body.label).toMatch(/CLI recovery token/);
-  });
-});
--- a/packages/mosaic/src/commands/gateway/rotate-token.spec.ts
+++ b/packages/mosaic/src/commands/gateway/rotate-token.spec.ts
@@ -1,205 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-// ─── Mocks ──────────────────────────────────────────────────────────────────
-
-vi.mock('../../auth.js', () => ({
-  loadSession: vi.fn(),
-  validateSession: vi.fn(),
-  signIn: vi.fn(),
-  saveSession: vi.fn(),
-}));
-
-vi.mock('./daemon.js', () => ({
-  readMeta: vi.fn(),
-  writeMeta: vi.fn(),
-}));
-
-vi.mock('./login.js', () => ({
-  getGatewayUrl: vi.fn().mockReturnValue('http://localhost:14242'),
-}));
-
-// Mock global fetch
-const mockFetch = vi.fn();
-vi.stubGlobal('fetch', mockFetch);
-
-import { runRotateToken, mintAdminToken, persistToken } from './token-ops.js';
-import { loadSession, validateSession } from '../../auth.js';
-import { readMeta, writeMeta } from './daemon.js';
-
-const mockLoadSession = vi.mocked(loadSession);
-const mockValidateSession = vi.mocked(validateSession);
-const mockReadMeta = vi.mocked(readMeta);
-const mockWriteMeta = vi.mocked(writeMeta);
-
-const baseUrl = 'http://localhost:14242';
-const fakeCookie = 'better-auth.session_token=sess123';
-const fakeToken = {
-  id: 'tok-1',
-  label: 'CLI rotated token (2026-04-04)',
-  plaintext: 'abcdef1234567890',
-};
-const fakeMeta = {
-  version: '1.0.0',
-  installedAt: '',
-  entryPoint: '',
-  host: 'localhost',
-  port: 14242,
-};
-
-describe('mintAdminToken', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('calls the admin tokens endpoint with the session cookie and returns the token', async () => {
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      json: async () => fakeToken,
-    });
-
-    const result = await mintAdminToken(baseUrl, fakeCookie, fakeToken.label);
-
-    expect(mockFetch).toHaveBeenCalledWith(
-      `${baseUrl}/api/admin/tokens`,
-      expect.objectContaining({
-        method: 'POST',
-        headers: expect.objectContaining({ Cookie: fakeCookie }),
-      }),
-    );
-    expect(result).toEqual(fakeToken);
-  });
-
-  it('exits 2 on 401 from the server', async () => {
-    mockFetch.mockResolvedValueOnce({ ok: false, status: 401, text: async () => 'Unauthorized' });
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((_code?: number | string | null | undefined) => {
-        throw new Error(`process.exit(${String(_code)})`);
-      });
-
-    await expect(mintAdminToken(baseUrl, fakeCookie, 'label')).rejects.toThrow('process.exit(2)');
-    expect(processExitSpy).toHaveBeenCalledWith(2);
-    processExitSpy.mockRestore();
-  });
-
-  it('exits 2 on 403 from the server', async () => {
-    mockFetch.mockResolvedValueOnce({ ok: false, status: 403, text: async () => 'Forbidden' });
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((_code?: number | string | null | undefined) => {
-        throw new Error(`process.exit(${String(_code)})`);
-      });
-
-    await expect(mintAdminToken(baseUrl, fakeCookie, 'label')).rejects.toThrow('process.exit(2)');
-    expect(processExitSpy).toHaveBeenCalledWith(2);
-    processExitSpy.mockRestore();
-  });
-
-  it('exits 3 on other non-ok status', async () => {
-    mockFetch.mockResolvedValueOnce({ ok: false, status: 500, text: async () => 'Internal Error' });
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((_code?: number | string | null | undefined) => {
-        throw new Error(`process.exit(${String(_code)})`);
-      });
-
-    await expect(mintAdminToken(baseUrl, fakeCookie, 'label')).rejects.toThrow('process.exit(3)');
-    expect(processExitSpy).toHaveBeenCalledWith(3);
-    processExitSpy.mockRestore();
-  });
-
-  it('exits 1 on network error', async () => {
-    mockFetch.mockRejectedValueOnce(new Error('connection refused'));
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((_code?: number | string | null | undefined) => {
-        throw new Error(`process.exit(${String(_code)})`);
-      });
-
-    await expect(mintAdminToken(baseUrl, fakeCookie, 'label')).rejects.toThrow('process.exit(1)');
-    expect(processExitSpy).toHaveBeenCalledWith(1);
-    processExitSpy.mockRestore();
-  });
-});
-
-describe('persistToken', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  it('writes the new token to meta.json', () => {
-    mockReadMeta.mockReturnValueOnce(fakeMeta);
-    const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-
-    persistToken(baseUrl, fakeToken);
-
-    expect(mockWriteMeta).toHaveBeenCalledWith(
-      expect.objectContaining({ adminToken: fakeToken.plaintext }),
-    );
-    consoleSpy.mockRestore();
-  });
-
-  it('prints a masked preview of the token', () => {
-    mockReadMeta.mockReturnValueOnce(fakeMeta);
-    const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {});
-
-    persistToken(baseUrl, fakeToken);
-
-    const allOutput = consoleSpy.mock.calls.map((c) => c.join(' ')).join('\n');
-    expect(allOutput).toContain('abcdef12...');
-    consoleSpy.mockRestore();
-  });
-});
-
-describe('runRotateToken', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-    vi.spyOn(console, 'error').mockImplementation(() => {});
-    vi.spyOn(console, 'log').mockImplementation(() => {});
-  });
-
-  it('exits 2 when there is no stored session', async () => {
-    mockLoadSession.mockReturnValueOnce(null);
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((_code?: number | string | null | undefined) => {
-        throw new Error(`process.exit(${String(_code)})`);
-      });
-
-    await expect(runRotateToken()).rejects.toThrow('process.exit(2)');
-    expect(processExitSpy).toHaveBeenCalledWith(2);
-    processExitSpy.mockRestore();
-  });
-
-  it('exits 2 when session is invalid', async () => {
-    mockLoadSession.mockReturnValueOnce({ cookie: fakeCookie, userId: 'u1', email: 'a@b.com' });
-    mockValidateSession.mockResolvedValueOnce(false);
-    const processExitSpy = vi
-      .spyOn(process, 'exit')
-      .mockImplementation((_code?: number | string | null | undefined) => {
-        throw new Error(`process.exit(${String(_code)})`);
-      });
-
-    await expect(runRotateToken()).rejects.toThrow('process.exit(2)');
-    expect(processExitSpy).toHaveBeenCalledWith(2);
-    processExitSpy.mockRestore();
-  });
-
-  it('mints and persists a new token when session is valid', async () => {
-    mockLoadSession.mockReturnValueOnce({ cookie: fakeCookie, userId: 'u1', email: 'a@b.com' });
-    mockValidateSession.mockResolvedValueOnce(true);
-    mockReadMeta.mockReturnValue(fakeMeta);
-    mockFetch.mockResolvedValueOnce({
-      ok: true,
-      status: 200,
-      json: async () => fakeToken,
-    });
-
-    await runRotateToken();
-
-    expect(mockWriteMeta).toHaveBeenCalledWith(
-      expect.objectContaining({ adminToken: fakeToken.plaintext }),
-    );
-  });
-});
--- a/packages/mosaic/src/commands/gateway/token-ops.ts
+++ b/packages/mosaic/src/commands/gateway/token-ops.ts
@@ -1,149 +0,0 @@
-import { createInterface } from 'node:readline';
-import { loadSession, validateSession, signIn, saveSession } from '../../auth.js';
-import { readMeta, writeMeta } from './daemon.js';
-import { getGatewayUrl } from './login.js';
-
-interface MintedToken {
-  id: string;
-  label: string;
-  plaintext: string;
-}
-
-/**
- * Call POST /api/admin/tokens with the session cookie and return the minted token.
- * Exits the process on network or auth errors.
- */
-export async function mintAdminToken(
-  gatewayUrl: string,
-  cookie: string,
-  label: string,
-): Promise<MintedToken> {
-  let res: Response;
-  try {
-    res = await fetch(`${gatewayUrl}/api/admin/tokens`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        Cookie: cookie,
-        Origin: gatewayUrl,
-      },
-      body: JSON.stringify({ label, scope: 'admin' }),
-    });
-  } catch (err) {
-    console.error(
-      `Could not reach gateway at ${gatewayUrl}: ${err instanceof Error ? err.message : String(err)}`,
-    );
-    process.exit(1);
-  }
-
-  if (res.status === 401 || res.status === 403) {
-    console.error(
-      `Session rejected by the gateway (${res.status.toString()}) — your session may be expired.`,
-    );
-    console.error('Run: mosaic gateway login');
-    process.exit(2);
-  }
-
-  if (!res.ok) {
-    const body = await res.text().catch(() => '');
-    console.error(
-      `Gateway rejected token creation (${res.status.toString()}): ${body.slice(0, 200)}`,
-    );
-    process.exit(3);
-  }
-
-  const data = (await res.json()) as { id: string; label: string; plaintext: string };
-  return { id: data.id, label: data.label, plaintext: data.plaintext };
-}
-
-/**
- * Persist the new token into meta.json and print the confirmation banner.
- */
-export function persistToken(gatewayUrl: string, minted: MintedToken): void {
-  const meta = readMeta() ?? {
-    version: 'unknown',
-    installedAt: new Date().toISOString(),
-    entryPoint: '',
-    host: new URL(gatewayUrl).hostname,
-    port: parseInt(new URL(gatewayUrl).port || '14242', 10),
-  };
-
-  writeMeta({ ...meta, adminToken: minted.plaintext });
-
-  const preview = `${minted.plaintext.slice(0, 8)}...`;
-  console.log();
-  console.log(`Token minted:  ${minted.label}`);
-  console.log(`Preview:       ${preview}`);
-  console.log('Token saved to meta.json. Use it with admin endpoints.');
-}
-
-/**
- * Require a valid session for the given gateway URL.
- * Returns the session cookie or exits if not authenticated.
- */
-export async function requireSession(gatewayUrl: string): Promise<string> {
-  const session = loadSession(gatewayUrl);
-  if (session) {
-    const valid = await validateSession(gatewayUrl, session.cookie);
-    if (valid) return session.cookie;
-  }
-  console.error('Not signed in or session expired.');
-  console.error('Run: mosaic gateway login');
-  process.exit(2);
-}
-
-/**
- * Ensure a valid session for the gateway, prompting for credentials if needed.
- * On sign-in failure, prints the error and exits non-zero.
- * Returns the session cookie.
- */
-export async function ensureSession(gatewayUrl: string): Promise<string> {
-  // Try the stored session first
-  const session = loadSession(gatewayUrl);
-  if (session) {
-    const valid = await validateSession(gatewayUrl, session.cookie);
-    if (valid) return session.cookie;
-    console.log('Stored session is invalid or expired. Please sign in again.');
-  } else {
-    console.log(`No session found for ${gatewayUrl}. Please sign in.`);
-  }
-
-  // Prompt for credentials
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  const ask = (q: string): Promise<string> => new Promise((resolve) => rl.question(q, resolve));
-
-  const email = (await ask('Email: ')).trim();
-  const password = (await ask('Password: ')).trim();
-  rl.close();
-
-  const auth = await signIn(gatewayUrl, email, password).catch((err: unknown) => {
-    console.error(err instanceof Error ? err.message : String(err));
-    process.exit(2);
-  });
-
-  saveSession(gatewayUrl, auth);
-  console.log(`Signed in as ${auth.email}`);
-  return auth.cookie;
-}
-
-/**
- * `mosaic gateway config rotate-token` — requires an existing valid session.
- */
-export async function runRotateToken(gatewayUrl?: string): Promise<void> {
-  const url = getGatewayUrl(gatewayUrl);
-  const cookie = await requireSession(url);
-  const label = `CLI rotated token (${new Date().toISOString().slice(0, 10)})`;
-  const minted = await mintAdminToken(url, cookie, label);
-  persistToken(url, minted);
-}
-
-/**
- * `mosaic gateway config recover-token` — prompts for login if no session exists.
- */
-export async function runRecoverToken(gatewayUrl?: string): Promise<void> {
-  const url = getGatewayUrl(gatewayUrl);
-  const cookie = await ensureSession(url);
-  const label = `CLI recovery token (${new Date().toISOString().slice(0, 16).replace('T', ' ')})`;
-  const minted = await mintAdminToken(url, cookie, label);
-  persistToken(url, minted);
-}
--- a/packages/mosaic/src/commands/mission.ts
+++ b/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,
--- a/packages/mosaic/src/config/config-service.ts
+++ b/packages/mosaic/src/config/config-service.ts
@@ -1,16 +1,6 @@
 import type { SoulConfig, UserConfig, ToolsConfig, InstallAction } from '../types.js';
 import { FileConfigAdapter } from './file-adapter.js';

-/** Supported top-level config sections for dotted-key access. */
-export type ConfigSection = 'soul' | 'user' | 'tools';
-
-/** A resolved view of all config sections, keyed by section name. */
-export interface ResolvedConfig {
-  soul: SoulConfig;
-  user: UserConfig;
-  tools: ToolsConfig;
-}
-
 /**
 * ConfigService interface — abstracts config read/write operations.
 * Currently backed by FileConfigAdapter (writes .md files from templates).
@@ -26,35 +16,6 @@ export interface ConfigService {
  writeTools(config: ToolsConfig): Promise<void>;

  syncFramework(action: InstallAction): Promise<void>;
-
-  /**
-   * Return the resolved (merged) config across all sections.
-   */
-  readAll(): Promise<ResolvedConfig>;
-
-  /**
-   * Read a single value by dotted key (e.g. "soul.agentName").
-   * Returns undefined if the key doesn't exist.
-   */
-  getValue(dottedKey: string): Promise<unknown>;
-
-  /**
-   * Set a single value by dotted key (e.g. "soul.agentName") and persist.
-   * Returns the previous value (or undefined).
-   */
-  setValue(dottedKey: string, value: string): Promise<unknown>;
-
-  /**
-   * Return the filesystem path for a given config section file.
-   * When no section is provided, returns the mosaicHome directory.
-   */
-  getConfigPath(section?: ConfigSection): string;
-
-  /**
-   * Returns true if the mosaicHome directory exists and at least one
-   * config file (SOUL.md, USER.md, TOOLS.md) is present.
-   */
-  isInitialized(): boolean;
 }

 export function createConfigService(mosaicHome: string, sourceDir: string): ConfigService {
--- a/packages/mosaic/src/config/file-adapter.ts
+++ b/packages/mosaic/src/config/file-adapter.ts
@@ -1,6 +1,6 @@
 import { readFileSync, existsSync, readdirSync, statSync, copyFileSync } from 'node:fs';
 import { join } from 'node:path';
-import type { ConfigService, ConfigSection, ResolvedConfig } from './config-service.js';
+import type { ConfigService } from './config-service.js';
 import type { SoulConfig, UserConfig, ToolsConfig, InstallAction } from '../types.js';
 import { soulSchema, userSchema, toolsSchema } from './schemas.js';
 import { renderTemplate } from '../template/engine.js';
@@ -159,73 +159,6 @@ export class FileConfigAdapter implements ConfigService {
    }
  }

-  async readAll(): Promise<ResolvedConfig> {
-    const [soul, user, tools] = await Promise.all([
-      this.readSoul(),
-      this.readUser(),
-      this.readTools(),
-    ]);
-    return { soul, user, tools };
-  }
-
-  async getValue(dottedKey: string): Promise<unknown> {
-    const parts = dottedKey.split('.');
-    const section = parts[0] ?? '';
-    const field = parts.slice(1).join('.');
-    const config = await this.readAll();
-    if (!this.isValidSection(section)) return undefined;
-    const sectionData = config[section as ConfigSection] as Record<string, unknown>;
-    return field ? sectionData[field] : sectionData;
-  }
-
-  async setValue(dottedKey: string, value: string): Promise<unknown> {
-    const parts = dottedKey.split('.');
-    const section = parts[0] ?? '';
-    const field = parts.slice(1).join('.');
-    if (!this.isValidSection(section) || !field) {
-      throw new Error(
-        `Invalid key "${dottedKey}". Use format <section>.<field> (e.g. soul.agentName).`,
-      );
-    }
-
-    const previous = await this.getValue(dottedKey);
-
-    if (section === 'soul') {
-      const current = await this.readSoul();
-      await this.writeSoul({ ...current, [field]: value });
-    } else if (section === 'user') {
-      const current = await this.readUser();
-      await this.writeUser({ ...current, [field]: value });
-    } else {
-      const current = await this.readTools();
-      await this.writeTools({ ...current, [field]: value });
-    }
-
-    return previous;
-  }
-
-  getConfigPath(section?: ConfigSection): string {
-    if (!section) return this.mosaicHome;
-    const fileMap: Record<ConfigSection, string> = {
-      soul: join(this.mosaicHome, 'SOUL.md'),
-      user: join(this.mosaicHome, 'USER.md'),
-      tools: join(this.mosaicHome, 'TOOLS.md'),
-    };
-    return fileMap[section];
-  }
-
-  isInitialized(): boolean {
-    return (
-      existsSync(join(this.mosaicHome, 'SOUL.md')) ||
-      existsSync(join(this.mosaicHome, 'USER.md')) ||
-      existsSync(join(this.mosaicHome, 'TOOLS.md'))
-    );
-  }
-
-  private isValidSection(s: string): s is ConfigSection {
-    return s === 'soul' || s === 'user' || s === 'tools';
-  }
-
  /**
   * Look for template in source dir first, then mosaic home.
   */
--- a/packages/queue/package.json
+++ b/packages/queue/package.json
@@ -22,7 +22,6 @@
  },
  "dependencies": {
    "@mosaicstack/types": "workspace:*",
-    "commander": "^13.0.0",
    "ioredis": "^5.10.0"
  },
  "devDependencies": {
--- a/packages/queue/src/cli.spec.ts
+++ b/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);
-  });
-});
--- a/packages/queue/src/cli.ts
+++ b/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);
-    });
-}
--- a/packages/queue/src/index.ts
+++ b/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';
--- a/pnpm-lock.yaml
+++ b/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
@@ -385,9 +382,6 @@ importers:
      '@mosaicstack/macp':
        specifier: workspace:*
        version: link:../macp
-      commander:
-        specifier: ^13.0.0
-        version: 13.1.0
    devDependencies:
      '@types/node':
        specifier: ^22.0.0
@@ -407,9 +401,6 @@ 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)
@@ -447,9 +438,6 @@ importers:
      '@mosaicstack/types':
        specifier: workspace:*
        version: link:../types
-      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)
@@ -466,33 +454,21 @@ 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
      '@mosaicstack/forge':
        specifier: workspace:*
        version: link:../forge
-      '@mosaicstack/log':
-        specifier: workspace:*
-        version: link:../log
      '@mosaicstack/macp':
        specifier: workspace:*
        version: link:../macp
-      '@mosaicstack/memory':
-        specifier: workspace:*
-        version: link:../memory
      '@mosaicstack/prdy':
        specifier: workspace:*
        version: link:../prdy
      '@mosaicstack/quality-rails':
        specifier: workspace:*
        version: link:../quality-rails
-      '@mosaicstack/queue':
-        specifier: workspace:*
-        version: link:../queue
      '@mosaicstack/storage':
        specifier: workspace:*
        version: link:../storage
@@ -592,9 +568,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
@@ -667,10 +640,10 @@ importers:
    dependencies:
      '@mariozechner/pi-agent-core':
        specifier: ^0.63.1
-        version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)
+        version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)
      '@mariozechner/pi-ai':
        specifier: ^0.63.1
-        version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)
+        version: 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)
      '@sinclair/typebox':
        specifier: ^0.34.41
        version: 0.34.48
@@ -7045,12 +7018,6 @@ snapshots:
      '@jridgewell/gen-mapping': 0.3.13
      '@jridgewell/trace-mapping': 0.3.31

-  '@anthropic-ai/sdk@0.73.0(zod@3.25.76)':
-    dependencies:
-      json-schema-to-ts: 3.1.1
-    optionalDependencies:
-      zod: 3.25.76
-
  '@anthropic-ai/sdk@0.73.0(zod@4.3.6)':
    dependencies:
      json-schema-to-ts: 3.1.1
@@ -8392,18 +8359,6 @@ snapshots:
      - ws
      - zod

-  '@mariozechner/pi-agent-core@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)':
-    dependencies:
-      '@mariozechner/pi-ai': 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)
-    transitivePeerDependencies:
-      - '@modelcontextprotocol/sdk'
-      - aws-crt
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-      - ws
-      - zod
-
  '@mariozechner/pi-agent-core@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)':
    dependencies:
      '@mariozechner/pi-ai': 0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)
@@ -8452,30 +8407,6 @@ snapshots:
      - ws
      - zod

-  '@mariozechner/pi-ai@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@3.25.76)':
-    dependencies:
-      '@anthropic-ai/sdk': 0.73.0(zod@3.25.76)
-      '@aws-sdk/client-bedrock-runtime': 3.1008.0
-      '@google/genai': 1.45.0(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))
-      '@mistralai/mistralai': 1.14.1
-      '@sinclair/typebox': 0.34.48
-      ajv: 8.18.0
-      ajv-formats: 3.0.1(ajv@8.18.0)
-      chalk: 5.6.2
-      openai: 6.26.0(ws@8.20.0)(zod@3.25.76)
-      partial-json: 0.1.7
-      proxy-agent: 6.5.0
-      undici: 7.24.3
-      zod-to-json-schema: 3.25.1(zod@3.25.76)
-    transitivePeerDependencies:
-      - '@modelcontextprotocol/sdk'
-      - aws-crt
-      - bufferutil
-      - supports-color
-      - utf-8-validate
-      - ws
-      - zod
-
  '@mariozechner/pi-ai@0.63.2(@modelcontextprotocol/sdk@1.28.0(zod@4.3.6))(ws@8.20.0)(zod@4.3.6)':
    dependencies:
      '@anthropic-ai/sdk': 0.73.0(zod@4.3.6)
@@ -12851,11 +12782,6 @@ snapshots:
    dependencies:
      mimic-function: 5.0.1

-  openai@6.26.0(ws@8.20.0)(zod@3.25.76):
-    optionalDependencies:
-      ws: 8.20.0
-      zod: 3.25.76
-
  openai@6.26.0(ws@8.20.0)(zod@4.3.6):
    optionalDependencies:
      ws: 8.20.0