@productbrain/cli 0.1.0-beta.109 → 0.1.0-beta.10904

package/dist/index.js

@@ -1,122 +1,85 @@
 #!/usr/bin/env node
 /**
- * Product Brain CLI — Chain knowledge + write-back in the terminal.
- * Read: BET-108. Write: pb session + pb capture (TEN-27, INS-80).
- * BET-181 Slice 0: global --json / --pretty flags for agent-native output (DEC-299).
+ * Product Brain CLI — Chain knowledge + write-back in the terminal. Read: BET-108.
+ * Write: pb session + pb capture (TEN-27, INS-80). BET-181 Slice 0: global --json / --pretty flags for agent-native output (DEC-299).
  */
 import { readFileSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { Command, CommanderError } from 'commander';
+import { Command } from 'commander';
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const cliPackageVersion = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf8'));
 import { setOutputMode, setQuietMode, isJsonMode } from './lib/runner.js';
 import { CLIError, ErrorCode } from './lib/errors.js';
+import { handleCliError as handleError } from './handleCliError.js';
 import { runContext } from './commands/context.js';
 import { runGet, runGetMany } from './commands/get.js';
+import { runScoreboard } from './commands/scoreboard.js';
+import { registerHistoryCommand } from './registerHistoryCommand.js';
+import { runReworkReport } from './commands/rework.js';
 import { runConnect } from './commands/connect.js';
 import { runLogin } from './commands/login.js';
-import { runSetup } from './commands/setup.js';
-import { runSetupDetectSurfaces, formatDetectSurfacesSummary } from './commands/setup-detect-surfaces.js';
-import { runSetupState } from './commands/setup-state.js';
 import { runOrient } from './commands/orient.js';
 import { runSearch } from './commands/search.js';
 import { runHandshake, runHandshakeInit } from './commands/handshake.js';
-import { runSessionStart, runSessionClose, runSessionId } from './commands/session.js';
+import { runSessionStart, runSessionClose, runSessionId, runSessionReset, runSessionList, runSessionShow } from './commands/session.js';
 import { runCapture } from './commands/capture.js';
 import { runUpdate } from './commands/update.js';
-import { runRelate, runUnrelate } from './commands/relate.js';
-import { runIngest } from './commands/ingest.js';
+import { runRestore } from './commands/restore.js';
 import { runFields } from './commands/fields.js';
 import { runConstellation } from './commands/constellation.js';
-import { runPromote } from './commands/promote.js';
-import { runBrandPack } from './commands/brand-pack.js';
-import { runAudit } from './commands/audit.js';
-import { runProposals } from './commands/proposals.js';
-import { runAccept } from './commands/accept.js';
-import { runReject } from './commands/reject.js';
+import { registerEntryCommands, registerRelateCommands } from './registerEntryCommands.js';
+import { registerTensionsCommands } from './registerTensionsCommands.js'; // WP-768 L0: same-line combine
 import { runChanges } from './commands/changes.js';
+import { registerOutcomeCommands } from './registerOutcomeCommands.js';
+import { registerRoleCommands } from './registerRoleCommands.js';
 import { runChainWalk } from './commands/chain-walk.js';
 import { runCrossCut } from './commands/cross-cut.js';
 import { runBrief, runCompoundBrief, isCompoundType } from './commands/brief.js';
+import { runDigest } from './commands/digest.js'; // same-line combine
 import { runVerify } from './commands/verify.js';
 import { runCodexPrep } from './commands/codex-prep.js';
+import { runStillTrue } from './commands/stillTrue.js'; // same-line combine, TASK-384 S1
 import { runCollectionsList, runCollectionsGet, runCollectionsAudit, runCollectionsExport } from './commands/collections.js';
-import { runWorkspaceVerify, runWorkspaceRepair, runDefinitionsDiff } from './commands/workspace.js';
-import { runAuthorityDomainsActivateCutover, runAuthorityDomainsDeactivateCutover, runAuthorityDomainsBenchmark, runAuthorityDomainsDiscardPending, runAuthorityDomainsPropose, runAuthorityDomainsRatify, runAuthorityDomainsReadiness, runAuthorityDomainsRecordSample, runAuthorityDomainsReject, runAuthorityDomainsReview, runAuthorityDomainsPrincipleDistribution, } from './commands/authority-domains.js';
+import { runWorkspaceVerify, runDefinitionsDiff } from './commands/workspace.js';
 import { runDoctor } from './commands/doctor.js';
+import { runWhoami } from './commands/whoami.js';
+import { runFiles } from './commands/files.js';
 import { runUpgrade } from './commands/upgrade.js';
 import { runProfileList, runProfileCreate, runProfileUse, runProfileDelete } from './commands/profile.js';
 import { runInit } from './commands/init.js';
-import { runMethodList, runMethodShow, runMethodDiff, runMethodPublish } from './commands/method.js';
+import { runStatus } from './commands/status.js';
 import { createAdminCommand } from './commands/admin/index.js';
+import { createFeedbackCommand } from './commands/feedback.js';
+import { createConflictsCommand } from './commands/conflicts.js';
+import { createQuestionCommand } from './commands/questions.js';
+import { createDirectionCommand } from './commands/direction.js';
+import { createOrganisationCommand } from './commands/organisation.js';
+import { createAcceptPolicyCommand } from './commands/accept-policy.js'; // WP-661 S3
 import { runUsage } from './commands/usage.js';
-import { GLOSSARY, formatGlossary } from './lib/glossary.js';
-import { API_KEY_PREFIX } from './lib/tokenConstants.js';
-import { hint, heading, bold, dim, green, icons } from './lib/style.js';
+import { runProofRun } from './commands/proof-run.js'; // same-line combine
+import { registerQualityCommands } from './commands/quality.js';
+import { formatGlossary } from './lib/glossary.js';
+import { PLATFORM_GLOSSARY_TERMS } from './lib/platformGlossary.js';
+import { API_KEY_PREFIX } from './lib/tokenConstants.js'; // same-line combine
+import { heading } from './lib/style.js';
+import { printPreviewBanner } from './lib/previewBanner.js';
 import { checkForUpdate } from './lib/update-check.js';
 import { UPGRADE_COMMAND } from './lib/constants.js';
-import { resolveSetupState, detectRenderTier } from './lib/state.js';
 const program = new Command();
-/**
- * Global error handler — single exit point for all CLI errors.
- * CLIError: format with code + category + guidance.
- * CommanderError: re-throw for --help / --version (exitCode 0), format others.
- * Regular Error: wrap as INTERNAL.
- */
-function handleError(err) {
-    // Commander help/version exits with code 0 — let them through
-    if (err instanceof CommanderError && err.exitCode === 0) {
-        process.exit(0);
-    }
-    const json = isJsonMode();
-    if (err instanceof CLIError) {
-        if (json) {
-            process.stderr.write(JSON.stringify(err.toJSON()) + '\n');
-        }
-        else {
-            process.stderr.write(err.message + '\n');
-            if (err.guidance) {
-                process.stderr.write(err.guidance + '\n');
-            }
-        }
-        process.exit(1);
-    }
-    // CommanderError (bad usage, missing args, etc.)
-    if (err instanceof CommanderError) {
-        const cliErr = new CLIError(err.message, {
-            code: ErrorCode.VALIDATION_FAILED,
-            category: 'validation',
-        });
-        if (json) {
-            process.stderr.write(JSON.stringify(cliErr.toJSON()) + '\n');
-        }
-        else {
-            process.stderr.write(err.message + '\n');
-        }
-        process.exit(err.exitCode);
-    }
-    // Unknown / unstructured errors
-    const message = err instanceof Error ? err.message : String(err);
-    if (json) {
-        process.stderr.write(JSON.stringify({ error: message, code: 'INTERNAL', category: 'internal' }) + '\n');
-    }
-    else {
-        process.stderr.write(message + '\n');
-    }
-    process.exit(1);
-}
+// WP-753 V2 (TASK-203): the global error handler lives in ./handleCliError.ts (STD-2/DEC-1724 —
+// kept out of this grandfathered file); imported below as handleError for the call site's own name.
 program
     .name('pb')
     .description('Product Brain — Chain knowledge + write-back CLI')
     .version(cliPackageVersion.version)
     // Global output mode flags (DEC-299, BET-181)
-    .option('--json', 'Output machine-readable JSON (overrides TTY auto-detection)')
-    .option('--pretty', 'Force human-readable output even when piped')
+    .option('--json', 'Output machine-readable JSON (the card is the default even when piped)')
+    .option('--pretty', 'Force human-readable output even when PB_JSON=1 is set')
     .option('-q, --quiet', 'Suppress non-essential output (banners, hints, progress)')
     .exitOverride(); // Throw CommanderError instead of calling process.exit directly
-// Apply global output mode BEFORE subcommand actions run
-program.hook('preAction', (thisCommand) => {
+// Apply global output mode BEFORE subcommand actions run. Commander preAction hook signature: (hookedCommand = root program, actionCommand = the subcommand actually invoked).
+program.hook('preAction', (_hookedCommand, actionCommand) => {
     const globalOpts = program.opts();
     if (globalOpts.json) {
         setOutputMode('json');
@@ -124,127 +87,18 @@ program.hook('preAction', (thisCommand) => {
     else if (globalOpts.pretty) {
         setOutputMode('pretty');
     }
-    // else: 'auto' (default) — TTY detection handles it
+    // else: 'auto' (default) — isJsonMode() checks PB_JSON=1, never TTY (WP-744 / 1e-B)
     if (globalOpts.quiet) {
         setQuietMode(true);
     }
     // Ambient update notification — non-blocking, suppressed in JSON mode (WP-322 S1)
     checkForUpdate(cliPackageVersion.version);
-    void thisCommand;
+    // PREVIEW banner — writes to stderr so it's always visible even in --json/--quiet mode. Advisory line added for top-level Chain-write commands: real learnings belong in the real Chain.
+    printPreviewBanner(actionCommand);
 });
-// Default action — status dashboard when `pb` is invoked with no command.
-// `pb --help` still works because Commander intercepts --help before the action runs.
+// Default action — status dashboard when `pb` is invoked with no command. `pb --help` still works because Commander intercepts --help before the action runs.
 program.action(async () => {
-    // Alias handling — forward common shorthands before showing the welcome screen
-    if (program.args.length > 0) {
-        const args = program.args;
-        // `pb start` / `pb start session` → `pb session start`
-        if (args[0] === 'start') {
-            await runSessionStart();
-            return;
-        }
-        // `pb close` / `pb close session` → `pb session close`
-        if (args[0] === 'close') {
-            await runSessionClose({});
-            return;
-        }
-        // Unknown command — show a helpful error instead of the welcome screen
-        const unknown = args[0];
-        process.stderr.write(`error: unknown command '${unknown}'\n`);
-        process.stderr.write(`Run 'pb --help' to see available commands.\n`);
-        process.exit(1);
-    }
-    const tier = detectRenderTier();
-    // JSON tier — structured status output
-    if (tier === 'json') {
-        // Check for API key first (sync, no network)
-        let hasKey = false;
-        try {
-            const { getConfig: gc } = await import('./lib/config.js');
-            gc();
-            hasKey = true;
-        }
-        catch {
-            // No valid key
-        }
-        if (!hasKey) {
-            process.stdout.write(JSON.stringify({
-                configured: false,
-                hint: 'Run pb login to configure your API key.',
-            }) + '\n');
-            return;
-        }
-        const { readSession } = await import('./lib/session.js');
-        const { probeWorkspace } = await import('./lib/workspace-probe.js');
-        const session = readSession();
-        const wsInfo = await probeWorkspace();
-        process.stdout.write(JSON.stringify({
-            configured: true,
-            workspace: wsInfo?.name ?? null,
-            session: session ? { id: session.sessionId, startedAt: session.startedAt } : null,
-            entryCount: wsInfo?.entryCount ?? null,
-            hint: 'Run pb --help for available commands.',
-        }) + '\n');
-        return;
-    }
-    // Ink tier: suppress withSpinner output before Ink mounts — spinner writes pollute the TUI canvas
-    if (tier === 'ink')
-        setQuietMode(true);
-    // Resolve state (plain and ink both need it)
-    const state = await resolveSetupState();
-    // Plain tier — console output driven by state
-    if (tier === 'plain') {
-        process.stdout.write('\n');
-        if (state.stage === 'unconfigured') {
-            process.stdout.write(`${bold('Product Brain')} ${dim('— not connected')}\n\n`);
-            process.stdout.write(`${heading('Get started')}\n\n`);
-            hint('1. pb login      Save your API key');
-            hint('2. pb connect    Connect a workspace');
-            hint('3. pb orient -b  See what\'s happening');
-            process.stdout.write('\n');
-            hint('pb --help        Show all commands');
-            process.stdout.write('\n');
-        }
-        else if (state.stage === 'authenticated') {
-            process.stdout.write(`${bold('Product Brain')} ${dim('— server unreachable')}\n\n`);
-            process.stdout.write(`  ${green(icons.pass)} Key: configured\n`);
-            process.stdout.write(`  ! Server: unreachable — run pb doctor to diagnose\n\n`);
-            hint('pb session start    Start a write session');
-            hint('pb doctor           Diagnose connection issues');
-            hint('pb --help           Show all commands');
-            process.stdout.write('\n');
-        }
-        else {
-            // workspace-bound or active
-            const workspaceName = state.workspaceName ?? 'unknown';
-            const entryCount = state.entryCount ?? 0;
-            const title = `${bold('Product Brain')} ${dim('—')} ${bold(workspaceName)}`;
-            process.stdout.write(`${title}\n\n`);
-            process.stdout.write(`  ${green(icons.pass)} Key: configured\n`);
-            process.stdout.write(`  ${green(icons.pass)} Workspace: ${workspaceName}  (${entryCount} entries)\n`);
-            if (state.sessionActive) {
-                process.stdout.write(`  ${green(icons.pass)} Session: active\n`);
-            }
-            else {
-                process.stdout.write(`  ${dim('- Session: none')}\n`);
-            }
-            process.stdout.write('\n');
-            if (!state.sessionActive) {
-                hint('pb session start    Start a write session');
-            }
-            hint('pb orient -b        Workspace overview');
-            hint('pb --help           Show all commands');
-            process.stdout.write('\n');
-        }
-        return;
-    }
-    // Ink tier — interactive TUI
-    const version = cliPackageVersion.version;
-    const { render } = await import('ink');
-    const { WelcomeCockpit } = await import('./commands/welcome.js');
-    const React = await import('react');
-    const { waitUntilExit, unmount } = render(React.default.createElement(WelcomeCockpit, { state, version, onExit: () => unmount() }));
-    await waitUntilExit();
+    await runStatus({ args: program.args, version: cliPackageVersion.version });
 });
 program
     .command('get <entry-id>')
@@ -256,6 +110,38 @@ program
     }
     await runGet({ entryId: entryId.trim() });
 });
+registerHistoryCommand(program); // WP-753 V2 (TASK-203): same-line combine, module-health shrink-only budget
+program
+    .command('scoreboard')
+    .description('Flywheel scoreboard — M3/M4/M5 metrics + diagnosis layer (agent-primary; --json for structured consumption)')
+    .action(async () => {
+    await runScoreboard();
+});
+const qualityCmd = program
+    .command('quality')
+    .description('Quality-check surfaces');
+registerQualityCommands(qualityCmd);
+const reworkCmd = program
+    .command('rework')
+    .description('Report observed rework signals (WP-487 / FEAT-1373 — fills the M4 rework meter)');
+reworkCmd
+    .command('report <entry-id>')
+    .description('Report a rework event attributed to a previously served governance entry (agent-native checkpoint; requires an active session)')
+    .requiredOption('--classification <kind>', 'revision | ci_review_correction | user_override')
+    .option('--via <kind>', 'How this was observed: followup_commit | ci_rerun | manual', 'manual')
+    .option('--attributable', 'Flag: this ci_review_correction is attributed to a missing/violated served decision')
+    .option('--task <text>', 'Task context this rework relates to (truncated server-side, never raw diff/comment text)')
+    .option('--conversation <id>', 'Explicit conversation override, matching `pb session start --conversation <id>` — use when the shell has no PB_CONVERSATION_ID set')
+    .action(async (entryId, opts) => {
+    await runReworkReport({
+        entryId,
+        classification: opts.classification,
+        reportedVia: opts.via,
+        attributable: opts.attributable,
+        task: opts.task,
+        conversation: opts.conversation,
+    });
+});
 program
     .command('get-many <entry-ids...>')
     .description('Fetch multiple entries in parallel (space-separated IDs)')
@@ -264,7 +150,7 @@ program
 });
 program
     .command('context <entry-id>')
-    .description('Gather and display constellation context (pipe-friendly: JSON when piped, human text in terminal)')
+    .description('Gather and display constellation context (human-readable card by default, even when piped — pass --json for machine-readable output)')
     .action(async (entryId) => {
     if (!entryId?.trim()) {
         program.commands.find((c) => c.name() === 'context')?.help();
@@ -312,7 +198,7 @@ program
     .description('Brief intelligence queries (BET-239).\n' +
     '  pb brief --skill <name>    Incremental delta for a skill (E4)\n' +
     '  pb brief steering          Compound: changes + structure + delta + readiness (E6)\n' +
-    '  pb brief confidence        Compound: changes + active bets + tensions (E6)\n' +
+    '  pb brief confidence        Compound: changes + active work packages (tensions: `pb tensions list`) (E6)\n' +
     '  pb brief delta [--since]   Compound: changes + relations since timestamp (E6)')
     .option('--skill <name>', 'Skill name for incremental brief (e.g. preflight, shaping, review)')
     .option('--since-last', 'Compare against last brief run (incremental mode)')
@@ -333,6 +219,9 @@ program
     }
     await runBrief({ skill: opts.skill, sinceLast: opts.sinceLast });
 });
+program
+    .command('digest').description('Narrative brief over pending drafts: decisions vs fixes, read-only (TASK-130, WP-702)')
+    .requiredOption('--since <window>', 'ISO timestamp or duration (1h, 6h, 1d, 7d, 30d)').action(async (opts) => { await runDigest({ since: opts.since }); });
 program
     .command('search [query...]')
     .description('Full-text search across all collections')
@@ -346,14 +235,12 @@ program
 });
 program
     .command('orient')
-    .description('Print workspace stage and all orient sections (strategic context, bets, governance, tensions, etc.)')
-    .option('-b, --brief', 'Compact view: stage, counts, top bets, tensions, planned work')
+    .description('Print all orient sections (strategic context, work packages, governance, tensions, etc.)')
+    .option('-b, --brief', 'Compact view: counts, top work packages, tensions, planned work')
     .option('-t, --task <task>', 'Task description for task-shaped governance and context')
-    // SYNC: domain list must match TaskDomain in convex/agentKnowledge/startupResolver.ts
-    .option('-s, --scope <domain>', 'Domain scope for governance filtering. Accepts authority roots, child scopes such as product-design/ux and data/analytics, and legacy internal scopes.')
     .option('--full', 'Full depth orient (tier=full). Use for thorough context loading.')
     .action(async (opts) => {
-    await runOrient({ brief: opts.brief, task: opts.task?.trim() || undefined, scope: opts.scope?.trim() || undefined, full: opts.full });
+    await runOrient({ brief: opts.brief, task: opts.task?.trim() || undefined, full: opts.full });
 });
 program
     .command('handshake')
@@ -363,7 +250,6 @@ program
     .option('--dry-run', 'Show what would be generated without writing files (alias for preview)')
     .option('--init', 'Set up Claude Code integration: team hooks + personal trust level')
     .option('--level <level>', 'With --init: trust level (guide|work|silent|full-trust). Without --init: content tier (beginner|intermediate|expert)')
-    .option('--generate', 'Fetch governance entries from the Chain and merge generated rules (BET-286)')
     .option('--surfaces <list>', 'Comma-separated surfaces to write (cursor,claude,copilot,codex)')
     .option('--no-prompt', 'Headless mode: refuse on tampered projection files (WP-421 S3, doneWhen #17). Always implied when stdout is not a TTY.')
     .action(async (opts) => {
@@ -373,7 +259,11 @@ program
     }
     // Commander turns `--no-prompt` into `prompt: false`. We invert so HandshakeOptions sees noPrompt=true.
     const noPrompt = opts.prompt === false;
-    await runHandshake({ force: opts.force, apply: opts.apply, dryRun: opts.dryRun, level: opts.level, generate: opts.generate, surfaces: opts.surfaces?.split(','), noPrompt });
+    // Attribute the bare-handshake invocation so its context.served row is separable from manual
+    // orient rows — the kernel used to coerce the absent path to 'manual-orient', polluting the
+    // proof slice that isolates manual `pb orient --task` rows. session start/close no longer
+    // call runHandshake at all (WP-759/TASK-232, DEC-1736); 'handshake' now covers every other row.
+    await runHandshake({ force: opts.force, apply: opts.apply, dryRun: opts.dryRun, level: opts.level, surfaces: opts.surfaces?.split(','), noPrompt, invocationPath: 'handshake' });
 });
 program
     .command('codex-prep <task...>')
@@ -396,15 +286,16 @@ program
 });
 program
     .command('connect <token>')
-    .description('Redeem an onboarding token and save your API key locally (FEAT-958). Uses CONVEX_SITE_URL if set, otherwise the production gateway. Override with --gateway or PB_CONNECT_GATEWAY_URL. Optional --name sets the key label in workspace settings (useful in non-interactive shells).')
+    .description('Redeem an onboarding token and save your API key locally (FEAT-958). Uses CONVEX_SITE_URL if set, otherwise the production gateway. Override with --gateway or PB_CONNECT_GATEWAY_URL. In a non-interactive shell (e.g. CI), pass --yes to confirm the workspace, optionally with --name to label the key.')
     .option('--gateway <url>', 'Override redeem gateway (default: CONVEX_SITE_URL or production). Use when token came from a different Convex deployment.')
-    .option('--name <label>', 'Optional label for this API key in workspace settings. In non-interactive terminals, use this instead of a prompt.')
+    .option('--name <label>', 'Optional label for this API key in workspace settings. Skips the key-label prompt when set.')
+    .option('-y, --yes', 'Skip the interactive workspace confirmation. Required to connect in a non-interactive shell (e.g. CI).')
     .action(async (token, opts) => {
     if (!token?.trim()) {
         program.commands.find((c) => c.name() === 'connect')?.help();
         return;
     }
-    await runConnect(token.trim(), { gateway: opts.gateway, name: opts.name });
+    await runConnect(token.trim(), { gateway: opts.gateway, name: opts.name, assumeYes: opts.yes });
 });
 program
     .command('login')
@@ -421,28 +312,19 @@ program
     await runDoctor({ fix: opts.fix, dryRun: opts.dryRun });
 });
 program
-    .command('setup')
-    .description('Canonical pb-setup entry (DEC-995): detect surfaces, read state, emit JSON for the skill body.')
+    .command('whoami')
+    .alias('status')
+    .description('Show the active profile + workspace (fast; no session required).')
     .action(async () => {
-    await runSetup();
+    await runWhoami();
 });
 program
-    .command('setup-detect-surfaces')
-    .description('Detect local surface markers and union-merge into manifest.surfaces (STD-235 forward-only)')
-    .action(async () => {
-    const result = await runSetupDetectSurfaces();
-    if (process.stdout.isTTY) {
-        process.stdout.write(formatDetectSurfacesSummary(result) + '\n');
-    }
-    else {
-        process.stderr.write(formatDetectSurfacesSummary(result) + '\n');
-    }
-});
-program
-    .command('setup-state')
-    .description('Emit compact JSON of getPbSetupState (machine-readable, used by the pb-setup skill body)')
-    .action(async () => {
-    await runSetupState();
+    .command('files')
+    .description('Show which .productbrain files are pb-owned vs committed, and what writes each.')
+    .option('--fix', 'Add any exposed pb-owned files to .gitignore (idempotent)')
+    .option('--dry-run', 'With --fix: preview the .gitignore lines without writing')
+    .action(async (opts) => {
+    await runFiles({ fix: opts.fix, dryRun: opts.dryRun });
 });
 // --- Write commands (require active session) ---
 const sessionCmd = program
@@ -450,11 +332,11 @@ const sessionCmd = program
     .description('Manage write sessions (DEC-9: sessions required before write access)');
 sessionCmd
     .command('start')
-    .description('Start a tracked write session (opens session, refreshes context)')
+    .description('Start a tracked write session')
     .option('--json', 'Output machine-readable JSON (deprecated: use global --json flag)')
-    .action(async (opts) => {
-    await runSessionStart({ json: opts.json });
-});
+    .option('--conversation <id>', 'Explicit conversation identity override (WP-479 E2) — takes priority over env-detected channels. Pair with PB_CONVERSATION_ID=<id> so later bare pb commands (orient, capture) attribute to the same conversation — they resolve identity from env only')
+    .option('--role <entry-id>', 'Role to act as this session (DEC-1715) — only needed if you hold more than one; the error lists your roles if omitted. Default: "role" in .productbrain/config.local.json (DEC-1961)').option('--team <entry-id>', 'Team the --role is held in (TASK-801) — only needed if you hold that role in more than one team') // WP-753 O1a same-line (STD-2)
+    .action(async (opts) => { await runSessionStart(opts); });
 sessionCmd
     .command('id')
     .description('Print current session ID to stdout (machine-readable, TEN-707)')
@@ -463,24 +345,48 @@ sessionCmd
 });
 sessionCmd
     .command('close')
-    .description('Close the active session (wrapup, refresh context)')
+    .description('Close the active session (wrapup)')
     .option('--force', 'Clear local session state even if server close fails')
+    .option('--conversation <id>', 'Close the session started with this --conversation <id>, so the next start on it resumes (TEN-4855)')
+    .action(async (opts) => { await runSessionClose(opts); });
+// WP-479 E4: traceback + quota observability.
+sessionCmd
+    .command('list')
+    .description('List active sessions (with quota gauge) + recent non-active ones (WP-479 E4)')
+    .action(async () => {
+    await runSessionList();
+});
+sessionCmd
+    .command('show <id-or-conversation>')
+    .description('Show a conversation\'s full session lineage + governance serves (WP-479 E4)')
+    .action(async (idOrConversation) => {
+    await runSessionShow(idOrConversation);
+});
+// TEN-2189 / WP-456 E2: hard-reset worktree-local session state (no resume marker) + clear the PREVIEW_MODE marker. Recovery path for a session stranded on the wrong workspace after a pb:preview/pb:real binding flip.
+sessionCmd
+    .command('reset')
+    .description('Hard-reset local session state (discard session.json + clear PREVIEW_MODE)')
+    .option('--force', 'Skip the confirmation prompt when an active session is present')
     .action(async (opts) => {
-    await runSessionClose({ force: opts.force });
+    await runSessionReset({ force: opts.force });
 });
 program
     .command('capture [text...]')
     .description('Capture knowledge to the Chain (requires active session)')
     .option('-n, --name <name>', 'Entry name (defaults to capture text)')
-    .option('-d, --description <desc>', 'Entry description (defaults to capture text)')
+    .option('-d, --description <desc>', 'Entry description, in Markdown (defaults to capture text)')
     .option('-c, --collection <slug>', 'Explicit collection (skip auto-classification)')
+    .option('-f, --field <key=value>', 'Set a data field (repeatable; checklist: -f doneWhen="a" -f doneWhen="b", one item per flag)', (val, prev) => [...prev, val], [])
     .option('-l, --link <entry-id>', 'Link new entry to an existing entry (TEN-705)')
-    .option('-t, --type <relation-type>', 'Relation type for --link (default: surfaces_tension_in)')
+    .option('-t, --link-type <relation-type>', 'Relation type for --link — REQUIRED when --link is used (WP-688 S4): no default, the door refuses and lists the source entry\'s legal verbs if omitted')
     .option('--source-ref <ref>', 'Source reference URI (BET-240 E2: e.g. "meeting-2026-03-28.md")')
     .option('--source-excerpt <text>', 'Verbatim source excerpt (BET-240 E2)')
+    .option('--draft', 'Force the entry to draft regardless of workspace governance mode — opt-in override, keeps it draft even in Open mode (TEN-2226 / WP-456 E1)')
     .option('--json', 'Output machine-readable JSON (deprecated: use global --json flag)')
-    .option('--suggest-only', 'Show grounding preview (possible duplicates, related entries) without creating entry (WP-319)')
     .option('--strict', 'Prompt y/N before capturing when a possible duplicate is detected (WP-319)')
+    .option('--owner-role <entry-id>', 'Existing Role entry ID to create AS OWNER of (WP-513 rung 2; you must hold it, and its team is the one you hold it in: root first, else the shallowest)') // WP-753 O1b: --owner-team deleted, default owner resolves from the session's acting role.
+    .option('--team <team-ref>', 'For a role: the team it is born in. For a team: its parent. Defaults to the root team (TASK-681, DEC-1976)')
+    .option('--entry-type <canonical-key>', 'Explicit canonical type for the new entry (e.g. objective, key_result) — bypasses classification; -t/--link-type is the --link relation type (WP-684 TASK-77)')
     .action(async (textParts = [], opts) => {
     const text = textParts.join(' ').trim();
     if (!text && !opts.name) {
@@ -488,116 +394,61 @@ program
         return;
     }
     await runCapture({
-        text: text || opts.name || '',
-        name: opts.name,
-        description: opts.description,
-        collection: opts.collection,
-        link: opts.link,
-        type: opts.type,
-        sourceRef: opts.sourceRef,
-        sourceExcerpt: opts.sourceExcerpt,
-        json: opts.json,
-        suggestOnly: opts.suggestOnly,
-        strict: opts.strict,
+        text: text || opts.name || '', name: opts.name, description: opts.description, collection: opts.collection,
+        field: opts.field, link: opts.link, linkType: opts.linkType, sourceRef: opts.sourceRef, sourceExcerpt: opts.sourceExcerpt,
+        draft: opts.draft, json: opts.json, strict: opts.strict, ownerRole: opts.ownerRole, entryType: opts.entryType, team: opts.team,
     });
 });
 // --- Update command (TEN-703) ---
 program
     .command('update <entry-id>')
     .description('Update fields on an existing Chain entry (requires active session)')
-    .option('-f, --field <key=value>', 'Set a data field (repeatable)', (val, prev) => [...prev, val], [])
+    .option('-f, --field <key=value>', 'Set a data field (repeatable; checklist: -f doneWhen="a" -f doneWhen="b", one item per flag)', (val, prev) => [...prev, val], [])
     .option('--name <name>', 'Update entry name')
-    .option('--status <status>', 'Update entry status (draft | active | deprecated | archived)')
+    .option('--status <status>', 'Update entry status (draft | archived) — accepted is set via `pb entry accept`; active/deprecated are legacy and refused')
     .option('--workflow-status <status>', 'Set workflow status (server-validated)')
-    .option('--note <text>', 'Change note for history')
+    .option('--type <canonical-key>', 'Reclassify a DRAFT entry to another canonical type (immutable once committed — supersede instead)')
+    .option('--note <text>', 'Change note for history').option('--change-reason <text>', 'Why what the entry promises is changing (required for a promise-field change)')
+    .option('--override-reason <text>', 'Typed override (≥12 chars) clearing a steering coherency block — recorded with author attribution (WP-465)')
+    .option('--acknowledge <response>', 'Respond to a coherency challenge: linked | accepted-fix | diverged (WP-465)')
+    .option('--ack-entry <entry-id>', 'Authorizing entry for --acknowledge linked / accepted-fix')
+    .option('--ack-reason <text>', 'Divergence rationale (≥12 chars) for --acknowledge diverged')
+    // Commander camelCases every flag to exactly the UpdateOptions key it feeds, so the options
+    // object spreads straight through. The previous hand-written 1:1 mapping had to be edited twice
+    // per new flag (once here, once in the type) and silently dropped anything you forgot.
     .action(async (entryId, opts) => {
-    await runUpdate({
-        entryId,
-        field: opts.field,
-        name: opts.name,
-        status: opts.status,
-        workflowStatus: opts.workflowStatus,
-        note: opts.note,
-    });
+    await runUpdate({ entryId, ...opts });
 });
-// --- Promote command (Wave 2 CLI Polish) ---
+// --- Restore command (WP-514 review round 2, P1) ---
 program
-    .command('verify <entry-id>')
-    .description('Mark an entry as verified (BET-240: source fidelity trust signal)')
-    .action(async (entryId) => {
+    .command('restore <entry-id>')
+    .description('Restore an archived Chain entry to draft (requires active session + rung-3 authority coverage)')
+    .action(async (entryId) => { await runRestore(entryId); });
+// --- Entry noun-scoped commands (DEC-1574, WP-640 S4) — registerEntryCommands.ts ---
+registerEntryCommands(program);
+registerTensionsCommands(program); // WP-768 L0: same-line combine, module-health shrink-only budget
+// --- Promote command (Wave 2 CLI Polish) ---
+program.command('verify <entry-id>').description('Mark an entry as verified (BET-240: source fidelity trust signal)').action(async (entryId) => {
     if (!entryId?.trim()) {
         program.commands.find((c) => c.name() === 'verify')?.help();
         return;
     }
     await runVerify({ entryId: entryId.trim() });
 });
-program
-    .command('promote <entry-id>')
-    .description('Promote entry from draft to active (commit to SSOT)')
-    .option('-m, --message <text>', 'Commit message')
-    .action(async (entryId, opts) => {
-    await runPromote({ entryId, message: opts.message });
-});
-// --- Relate / Unrelate commands (TEN-704) ---
-program
-    .command('relate <from-id> <type> <to-id>')
-    .description('Add a typed relation between two entries (requires active session)')
-    .option('--if-missing', 'Only create relation if it does not already exist')
-    .action(async (fromId, type, toId, opts) => {
-    await runRelate({ fromId, type, toId, ifMissing: opts.ifMissing });
-});
-program
-    .command('unrelate <from-id> <type> <to-id>')
-    .description('Remove a typed relation between two entries (requires active session)')
-    .action(async (fromId, type, toId) => {
-    await runUnrelate({ fromId, type, toId });
-});
-// --- Ingest command (BET-81) ---
-program
-    .command('ingest <pattern>')
-    .description('Bulk ingest documents to Chain as drafts')
-    .option('--dry-run', 'Stage entries without auto-committing. Shows summary only.')
-    .option('--resume', 'Skip files whose sourceRef is already committed in staging.')
-    .option('--concurrency <n>', 'Process up to N files in parallel (default 1, max 5).', '1')
-    .action(async (pattern, opts) => {
-    const concurrency = parseInt(opts.concurrency ?? '1', 10);
-    if (Number.isNaN(concurrency) || concurrency < 1) {
-        throw new CLIError('--concurrency must be a positive integer.', {
-            code: ErrorCode.VALIDATION_FAILED,
-            category: 'validation',
-        });
-    }
-    await runIngest({
-        pattern,
-        dryRun: opts.dryRun,
-        resume: opts.resume,
-        concurrency,
-    });
-});
-// --- migrate:setup command (WP-345 S0b) ---
-program
-    .command('migrate:setup')
-    .description('Migrate .productbrain/skills|rules|hooks/*.md into the DB setup-assets collection (WP-345)')
-    .option('--dry-run', 'Show what would be migrated without writing to DB.')
-    .option('--cwd <path>', 'Override working directory (default: process.cwd())')
-    .action(async (opts) => {
-    const { runMigrateSetup } = await import('./commands/migrate-setup.js');
-    await runMigrateSetup({ dryRun: opts.dryRun, cwd: opts.cwd });
-});
-// --- setup:ingest command (WP-345 S3) ---
-program
-    .command('setup:ingest <path>')
-    .description('Push a single .productbrain skill/rule/hook file to the DB setup-assets SSOT (WP-345)')
-    .option('--dry-run', 'Show what would be ingested without writing to DB.')
-    .option('--json', 'Output machine-readable JSON (deprecated: use global --json flag)')
-    .action(async (filePath, opts) => {
-    if (!filePath?.trim()) {
-        program.commands.find((c) => c.name() === 'setup:ingest')?.help();
+// TASK-384 S1: distinct from verify (attestation) — the holder of the owning role (else the nearest seated Team Lead) confirms accuracy; no content/version change.
+program.command('still-true <entry-id>').description('Confirm an entry is still true (the holder of the owning role, else the nearest seated Team Lead)').action(async (entryId) => {
+    if (!entryId?.trim()) {
+        program.commands.find((c) => c.name() === 'still-true')?.help();
         return;
     }
-    const { runSetupIngest } = await import('./commands/setup-ingest.js');
-    await runSetupIngest(filePath.trim(), { dryRun: opts.dryRun });
+    await runStillTrue({ entryId: entryId.trim() });
 });
+// registerProposalCommands(program) deleted (WP-776 S2a, DEC-1771) — `pb accept`/`pb reject`/`pb proposals` are gone.
+registerOutcomeCommands(program);
+registerRoleCommands(program); // WP-722 S2 outcome; WP-730 S2 role — registerOutcomeCommands.ts / registerRoleCommands.ts
+// --- Relate / Unrelate commands (TEN-704) — registerEntryCommands.ts (WP-688 S2a: moved off
+// this shrink-only file to fund the --dry-run flag) ---
+registerRelateCommands(program);
 // --- Fields command (BET-181 Slice 2) ---
 program
     .command('fields <collection>')
@@ -620,58 +471,6 @@ program
     }
     await runConstellation({ entryId: entryId.trim() });
 });
-// --- Audit command (BET-182 Slice 2) ---
-program
-    .command('audit <entry-ids...>')
-    .description('Run STD-113 hygiene audit on bet(s) — 13 gates (shaping) / 18 gates (handoff), exit code reflects verdict')
-    .option('--phase <phase>', 'Override phase detection (shaping | handoff)')
-    .option('--gate <name>', 'Run only specified gate(s) (repeatable)', (val, prev) => [...prev, val], [])
-    .option('--fix', 'Auto-execute exact fixes via pb update, rerun once')
-    .option('--verbose', 'Show all gates including PASS detail')
-    .action(async (entryIds, opts) => {
-    await runAudit({
-        entryIds: entryIds.map((id) => id.trim()).filter(Boolean),
-        phase: opts.phase,
-        gate: opts.gate,
-        fix: opts.fix,
-        verbose: opts.verbose,
-    });
-});
-program
-    .command('brand-pack')
-    .description('Internal marketing: structured community copy via OpenRouter (requires OPENROUTER_API_KEY). Forwards args to scripts/brand-pack.mjs')
-    .allowUnknownOption(true)
-    .allowExcessArguments(true)
-    .action(() => {
-    runBrandPack(process.argv);
-});
-// --- Governance proposal commands (BET-221 Slice 3) ---
-program
-    .command('proposals')
-    .description('List open consent proposals with expiry countdown (BET-221)')
-    .action(async () => {
-    await runProposals();
-});
-program
-    .command('accept [proposal-id]')
-    .description('Approve a consent proposal by ID, or --auto to batch-approve all')
-    .option('-a, --auto', 'Auto-approve all open proposals (skip contradictions)')
-    .action(async (proposalId, opts) => {
-    if (!proposalId && !opts.auto) {
-        throw new CLIError('Usage: pb accept <proposal-id> or pb accept --auto', {
-            code: ErrorCode.VALIDATION_FAILED,
-            category: 'validation',
-        });
-    }
-    await runAccept({ proposalId, auto: opts.auto });
-});
-program
-    .command('reject <proposal-id>')
-    .description('Reject a consent proposal with a required reason (BR-7)')
-    .requiredOption('-r, --reason <text>', 'Reason for rejection (required)')
-    .action(async (proposalId, opts) => {
-    await runReject({ proposalId, reason: opts.reason });
-});
 // --- Collections command (BET-280 Slice 1) ---
 const collectionsCmd = program
     .command('collections')
@@ -707,109 +506,16 @@ collectionsCmd
 // --- Workspace operator commands (WP-305 Slice 4) ---
 const workspaceCmd = program
     .command('workspace')
-    .description('Operator commands for workspace health and repair (WP-305)');
+    .description('Operator command for workspace health (WP-305)');
 workspaceCmd
     .command('verify')
     .description('Check workspace health — seeds, collections, glossary (admin only)')
     .action(async () => {
     await runWorkspaceVerify();
 });
-workspaceCmd
-    .command('repair')
-    .description('Backfill missing seeds for the active workspace (admin only)')
-    .action(async () => {
-    await runWorkspaceRepair();
-});
-const authorityDomainsCmd = program
-    .command('authority-domains')
-    .description('Operator commands for WP-354 authority-domain readiness and evidence');
-authorityDomainsCmd
-    .command('propose')
-    .description('Generate authority-domain tag proposals')
-    .option('--dry-run', 'Preview without writing staging proposals')
-    .option('--limit <n>', 'Maximum governance entries to classify')
-    .option('--mock', 'Use deterministic mock classifier')
-    .action(async (opts) => {
-    await runAuthorityDomainsPropose(opts);
-});
-authorityDomainsCmd
-    .command('review')
-    .description('List authority-domain tag proposals')
-    .option('--status <status>', 'pending, committed, rejected, or skipped', 'pending')
-    .option('--limit <n>', 'Maximum proposals to list')
-    .option('--sample <n>', 'Return a stable proposal sample')
-    .option('--stratified', 'Stratify sample across proposed domain and source collection')
-    .action(async (opts) => {
-    await runAuthorityDomainsReview(opts);
-});
-const authorityDomainsSampleCmd = authorityDomainsCmd
-    .command('sample')
-    .description('Manage human-reviewed authority-domain proposal samples');
-authorityDomainsSampleCmd
-    .command('record')
-    .description('Record human-reviewed sample accuracy for authority-domain proposals')
-    .requiredOption('--sample-id <id>', 'Stable sample identifier from the review packet')
-    .option('--run-id <id>', 'Proposal run identifier')
-    .requiredOption('--approved <n>', 'Count of sampled proposals approved as-is')
-    .requiredOption('--rejected <n>', 'Count of sampled proposals rejected')
-    .requiredOption('--corrected <n>', 'Count of sampled proposals corrected to another domain')
-    .action(async (opts) => {
-    await runAuthorityDomainsRecordSample(opts);
-});
-authorityDomainsCmd
-    .command('ratify <proposal-id>')
-    .description('Ratify an authority-domain tag proposal')
-    .option('--note <note>', 'Review note')
-    .action(async (proposalId, opts) => {
-    await runAuthorityDomainsRatify(proposalId, opts);
-});
-authorityDomainsCmd
-    .command('reject <proposal-id>')
-    .description('Reject an authority-domain tag proposal')
-    .option('--reason <reason>', 'Rejection reason')
-    .action(async (proposalId, opts) => {
-    await runAuthorityDomainsReject(proposalId, opts);
-});
-authorityDomainsCmd
-    .command('discard-pending')
-    .description('Reject all pending authority-domain tag proposals after a failed batch diagnosis')
-    .option('--reason <reason>', 'Discard reason')
-    .action(async (opts) => {
-    await runAuthorityDomainsDiscardPending(opts);
-});
-authorityDomainsCmd
-    .command('readiness')
-    .description('Show WP-354 authority-domain readiness, evidence gap, and next action')
-    .action(async () => {
-    await runAuthorityDomainsReadiness();
-});
-authorityDomainsCmd
-    .command('benchmark')
-    .description('Run and persist the WP-354 authority-domain benchmark')
-    .action(async () => {
-    await runAuthorityDomainsBenchmark();
-});
-authorityDomainsCmd
-    .command('activate-cutover')
-    .description('Activate graph retrieval after WP-354 evidence gates pass')
-    .option('--force-pre-production', 'Bypass the permanently-locked valueProof gate (requires --dec-id, DEC-864)')
-    .option('--dec-id <decId>', 'Chain DEC ID authorizing the bypass')
-    .action(async (opts) => {
-    await runAuthorityDomainsActivateCutover({ forcePreProduction: opts.forcePreProduction, decId: opts.decId });
-});
-authorityDomainsCmd
-    .command('deactivate-cutover')
-    .description('Deactivate the active WP-354 authorityDomain cutover for this workspace (DEC-864 rollback).')
-    .option('--clerk-user-id <clerkUserId>', 'Override the Clerk user ID for audit trail')
-    .action(async (opts) => {
-    await runAuthorityDomainsDeactivateCutover({ clerkUserId: opts.clerkUserId });
-});
-authorityDomainsCmd
-    .command('principle-distribution')
-    .description('Pre-merge gate: check governance category match rate for principles entries')
-    .action(async () => {
-    await runAuthorityDomainsPrincipleDistribution();
-});
+// D3a (WP-754/TASK-213): the entire `authority-domains` CLI command tree deleted — its backing
+// HTTP gateway routes (convex/http.ts) and convex/authorityDomains.ts are deleted in this same
+// slice, so every one of these subcommands would call a route that no longer exists.
 // --- Definitions diff command (WP-305 Slice 4) ---
 const definitionsCmd = program
     .command('definitions')
@@ -820,47 +526,6 @@ definitionsCmd
     .action(async (file) => {
     await runDefinitionsDiff({ file });
 });
-// --- Method commands (WP-329 S1: method visibility) ---
-const methodCmd = program
-    .command('method')
-    .description('Inspect published methods (skills + rules) and their per-surface adapter status (WP-329)');
-methodCmd
-    .command('ls')
-    .description('List all methods with version, published status, and adapter presence')
-    .action(async () => {
-    await runMethodList();
-});
-methodCmd
-    .command('show <name>')
-    .description('Show details for one method: frontmatter, Chain entry, and per-adapter fork status')
-    .action(async (name) => {
-    if (!name?.trim()) {
-        program.commands.find((c) => c.name() === 'method')?.help();
-        return;
-    }
-    await runMethodShow({ name: name.trim() });
-});
-methodCmd
-    .command('diff <name>')
-    .description('Show diff between local .productbrain/ source and last-published Chain version (WP-329 S2)')
-    .action(async (name) => {
-    if (!name?.trim()) {
-        program.commands.find((c) => c.name() === 'method')?.help();
-        return;
-    }
-    await runMethodDiff({ name: name.trim() });
-});
-methodCmd
-    .command('publish <name>')
-    .description('Publish a local .productbrain/ method (skill or rule) to the Chain methods collection (WP-329 S3)')
-    .option('--force', 'Publish even when local body matches the last-published version (override D4 no-op guard)')
-    .action(async (name, opts) => {
-    if (!name?.trim()) {
-        program.commands.find((c) => c.name() === 'method')?.help();
-        return;
-    }
-    await runMethodPublish({ name: name.trim(), force: opts.force });
-});
 // --- Profile commands (WP-302 Slice 2) ---
 const profileCmd = program
     .command('profile')
@@ -881,10 +546,11 @@ profileCmd
 });
 profileCmd
     .command('use <name>')
-    .description('Switch active profile (closes any active session). Use --local to pin profile in project config.local.json instead.')
-    .option('--local', 'Write profile pin to .productbrain/config.local.json in the project root (machine-local, gitignored)')
+    .description('Switch profile: reconciles the repo pin + global by default. --local = repo pin only; --global = global only.')
+    .option('--local', 'Write the profile pin only to .productbrain/config.local.json (repo-local, gitignored)')
+    .option('--global', 'Switch only the global active profile (does not change a locally-pinned repo)')
     .action(async (name, opts) => {
-    await runProfileUse({ name, local: opts.local });
+    await runProfileUse({ name, local: opts.local, global: opts.global });
 });
 profileCmd
     .command('delete <name>')
@@ -892,13 +558,21 @@ profileCmd
     .action(async (name) => {
     await runProfileDelete({ name });
 });
+program
+    .command('use <name>')
+    .description('Switch the active workspace profile (alias for `pb profile use`).')
+    .option('--local', 'Write the profile pin only to .productbrain/config.local.json (repo-local, gitignored)')
+    .option('--global', 'Switch only the global active profile (does not change a locally-pinned repo)')
+    .action(async (name, opts) => {
+    await runProfileUse({ name, local: opts.local, global: opts.global });
+});
 // --- Glossary command (WP-302 Slice 4) ---
 program
     .command('glossary')
-    .description('Show key Product Brain CLI terms and definitions')
+    .description('Show the four platform glossary terms; pb search <word> finds your team terms')
     .action(() => {
     if (isJsonMode()) {
-        process.stdout.write(JSON.stringify(GLOSSARY) + '\n');
+        process.stdout.write(JSON.stringify(PLATFORM_GLOSSARY_TERMS) + '\n');
         return;
     }
     const lines = [
@@ -918,8 +592,21 @@ program
     .action(async (opts) => {
     await runUsage({ json: opts.json });
 });
+// --- Proof-run command (WP-459: admin-proof bridge dogfood) ---
+program
+    .command('proof-run <proof-name>')
+    .description('Run an admin-only proof against the seeded preview via the proof bridge (WP-459)')
+    .action(async (proofName) => {
+    await runProofRun({ proofName: proofName.trim() });
+});
 // --- Admin command group (WP-312 S2, FEAT-969) ---
 program.addCommand(createAdminCommand());
+program.addCommand(createFeedbackCommand());
+program.addCommand(createConflictsCommand());
+program.addCommand(createQuestionCommand());
+program.addCommand(createDirectionCommand());
+program.addCommand(createOrganisationCommand());
+program.addCommand(createAcceptPolicyCommand());
 // --- Upgrade command (WP-322 S1: ambient update notification) ---
 program
     .command('upgrade')