@codemoot/cli 0.2.6 → 0.2.8

package/dist/index.js

@@ -13,11 +13,13 @@ import { join as join2 } from "path";
 
 // src/progress.ts
 import chalk from "chalk";
-var THROTTLE_MS = 3e3;
+var THROTTLE_MS = 3e4;
+var MAX_CARRY_OVER = 64 * 1024;
 function createProgressCallbacks(label = "codex") {
   let lastActivityAt = 0;
   let lastMessage = "";
   let carryOver = "";
+  let droppedEvents = 0;
   function printActivity(msg) {
     const now = Date.now();
     if (msg === lastMessage && now - lastActivityAt < THROTTLE_MS) return;
@@ -25,9 +27,20 @@ function createProgressCallbacks(label = "codex") {
     lastMessage = msg;
     console.error(chalk.dim(`  [${label}] ${msg}`));
   }
+  function parseLine(line) {
+    const trimmed = line.trim();
+    if (!trimmed) return;
+    try {
+      const event = JSON.parse(trimmed);
+      formatEvent(event, printActivity);
+    } catch {
+      droppedEvents++;
+    }
+  }
   return {
     onSpawn(pid, command) {
-      console.error(chalk.dim(`  [${label}] Started (PID: ${pid}, cmd: ${command})`));
+      const exe = command.replace(/^"([^"]+)".*/, "$1").split(/[\s/\\]+/).pop() ?? command;
+      console.error(chalk.dim(`  [${label}] Started (PID: ${pid}, cmd: ${exe})`));
     },
     onStderr(_chunk) {
     },
@@ -35,18 +48,26 @@ function createProgressCallbacks(label = "codex") {
       const data = carryOver + chunk;
       const lines = data.split("\n");
       carryOver = lines.pop() ?? "";
+      if (carryOver.length > MAX_CARRY_OVER) {
+        carryOver = "";
+        droppedEvents++;
+      }
       for (const line of lines) {
-        const trimmed = line.trim();
-        if (!trimmed) continue;
-        try {
-          const event = JSON.parse(trimmed);
-          formatEvent(event, printActivity);
-        } catch {
-        }
+        parseLine(line);
+      }
+    },
+    onClose() {
+      if (carryOver.trim()) {
+        parseLine(carryOver);
+        carryOver = "";
+      }
+      if (droppedEvents > 0) {
+        console.error(chalk.dim(`  [${label}] ${droppedEvents} event(s) dropped (parse errors or buffer overflow)`));
+        droppedEvents = 0;
       }
     },
     onHeartbeat(elapsedSec) {
-      if (elapsedSec % 30 === 0) {
+      if (elapsedSec % 60 === 0) {
         printActivity(`${elapsedSec}s elapsed...`);
       }
     }
@@ -74,15 +95,6 @@ function formatEvent(event, print) {
       }
       return;
     }
-    if (item.type === "agent_message") {
-      const text = String(item.text ?? "");
-      const firstLine = text.split("\n").find((l) => l.trim().length > 10);
-      if (firstLine) {
-        const preview = firstLine.trim().slice(0, 80);
-        print(`Response: ${preview}${firstLine.trim().length > 80 ? "..." : ""}`);
-      }
-      return;
-    }
   }
   if (type === "turn.completed") {
     const usage = event.usage;
@@ -382,9 +394,9 @@ async function buildReviewCommand(buildId) {
       try {
         const tmpIndex = join2(projectDir, ".git", "codemoot-review-index");
         try {
-          execSync(`git read-tree HEAD`, { cwd: projectDir, encoding: "utf-8", env: { ...process.env, GIT_INDEX_FILE: tmpIndex } });
-          execSync("git add -A", { cwd: projectDir, encoding: "utf-8", env: { ...process.env, GIT_INDEX_FILE: tmpIndex } });
-          diff = execFileSync("git", ["diff", "--cached", "--", run.baselineRef], { cwd: projectDir, encoding: "utf-8", maxBuffer: 1024 * 1024, env: { ...process.env, GIT_INDEX_FILE: tmpIndex } });
+          execFileSync("git", ["read-tree", "HEAD"], { cwd: projectDir, encoding: "utf-8", env: { ...process.env, GIT_INDEX_FILE: tmpIndex } });
+          execFileSync("git", ["add", "-A"], { cwd: projectDir, encoding: "utf-8", env: { ...process.env, GIT_INDEX_FILE: tmpIndex } });
+          diff = execFileSync("git", ["diff", "--cached", run.baselineRef, "--"], { cwd: projectDir, encoding: "utf-8", maxBuffer: 1024 * 1024, env: { ...process.env, GIT_INDEX_FILE: tmpIndex } });
         } finally {
           try {
             unlinkSync(tmpIndex);
@@ -495,7 +507,7 @@ Review for:
     }
     const output = {
       buildId,
-      review: result.text,
+      review: result.text.slice(0, 2e3),
       verdict: approved ? "approved" : "needs_revision",
       sessionId: result.sessionId,
       resumed: existingSession ? result.sessionId === existingSession : false,
@@ -617,7 +629,7 @@ async function debateTurnCommand(debateId, prompt, options) {
       const output = {
         debateId,
         round: newRound,
-        response: existing.responseText,
+        response: existing.responseText?.slice(0, 2e3) ?? "",
         sessionId: existing.sessionId,
         resumed: false,
         cached: true,
@@ -662,7 +674,7 @@ async function debateTurnCommand(debateId, prompt, options) {
         const output = {
           debateId,
           round: newRound,
-          response: recheckRow.responseText,
+          response: recheckRow.responseText?.slice(0, 2e3) ?? "",
           sessionId: recheckRow.sessionId,
           resumed: false,
           cached: true,
@@ -772,7 +784,8 @@ async function debateTurnCommand(debateId, prompt, options) {
       const output = {
         debateId,
         round: newRound,
-        response: result.text,
+        response: result.text.slice(0, 2e3),
+        responseTruncated: result.text.length > 2e3,
         sessionId: result.sessionId,
         resumed,
         cached: false,
@@ -1190,7 +1203,9 @@ Scan complete in ${(durationMs / 1e3).toFixed(1)}s`));
       writeFileSync4(options.output, JSON.stringify(report, null, 2), "utf-8");
       console.error(chalk5.green(`  Findings written to ${options.output}`));
     }
-    console.log(JSON.stringify(report, null, 2));
+    const reportJson = JSON.stringify(report, null, 2);
+    console.log(reportJson.length > 2e3 ? `${reportJson.slice(0, 2e3)}
+... (truncated, ${reportJson.length} chars total \u2014 use --output to save full report)` : reportJson);
     db.close();
   } catch (error) {
     db?.close();
@@ -2078,6 +2093,59 @@ Ask if user wants to fix and re-review. If yes:
 - **No arg size limits**: Content is piped via stdin, not passed as CLI args.
 - **Presets**: Use --preset for specialized reviews (security-audit, performance, quick-scan, pre-commit, api-review).
 - **Background mode**: Add --background to enqueue and continue working.
+- **Output capped**: JSON \`review\` field is capped to 2KB to prevent terminal crashes. Full text is stored in session_events.
+- **Progress**: Heartbeat every 60s, throttled to 30s intervals. No agent_message dumps.
+`
+  },
+  {
+    path: ".claude/skills/plan-review/SKILL.md",
+    description: "/plan-review \u2014 GPT review of execution plans",
+    content: `---
+name: plan-review
+description: Send execution plans to GPT for structured review via Codex CLI. Use when you have a written plan and want independent validation before implementation.
+user-invocable: true
+---
+
+# /plan-review \u2014 GPT Review of Execution Plans
+
+## Usage
+\`/plan-review <plan-file-or-description>\`
+
+## Description
+Sends a Claude-authored execution plan to GPT via \`codemoot plan review\` for structured critique. GPT returns ISSUE (HIGH/MEDIUM/LOW) and SUGGEST lines with file-level references.
+
+## Instructions
+
+### Step 1: Prepare the plan
+- If the user provides a file path, use it directly
+- If reviewing the current conversation's plan, write to a temp file first
+
+### Step 2: Run plan review
+\`\`\`bash
+codemoot plan review <plan-file> [--phase N] [--build BUILD_ID] [--timeout ms] [--output file]
+\`\`\`
+
+### Step 3: Parse and present output
+JSON output includes: \`verdict\`, \`score\`, \`issues[]\` (severity + message), \`suggestions[]\`.
+
+Present as:
+\`\`\`
+## GPT Plan Review
+**Score**: X/10 | **Verdict**: APPROVED/NEEDS_REVISION
+### Issues
+- [HIGH] description
+### Suggestions
+- suggestion text
+\`\`\`
+
+### Step 4: If NEEDS_REVISION
+Fix HIGH issues, revise the plan, re-run. Session resume gives GPT context of prior review.
+
+### Important Notes
+- **Session resume**: GPT remembers prior reviews via thread resume
+- **Codebase access**: GPT reads actual project files to verify plan references
+- **Output capped**: JSON \`review\` field is capped to 2KB. Use \`--output\` for full text
+- **Zero API cost**: Uses ChatGPT subscription via Codex CLI
 `
   },
   {
@@ -2149,6 +2217,8 @@ Present: final position, agreements, disagreements, stats.
 3. State persisted to SQLite
 4. Zero API cost (ChatGPT subscription)
 5. 600s default timeout per turn
+6. JSON \`response\` field capped to 2KB \u2014 check \`responseTruncated\` boolean
+7. Progress heartbeat every 60s, throttled to 30s intervals
 `
   },
   {
@@ -2181,6 +2251,14 @@ Use /debate protocol. Loop until GPT says STANCE: SUPPORT.
 - Send detailed implementation plan to GPT
 - Revise on OPPOSE/UNCERTAIN \u2014 never skip
 
+### Phase 1.25: Plan Review (Recommended)
+Before user approval, validate the plan with GPT:
+\`\`\`bash
+codemoot plan review /path/to/plan.md --build BUILD_ID
+\`\`\`
+GPT reviews the plan against actual codebase, returns ISSUE/SUGGEST lines.
+Fix HIGH issues before presenting to user.
+
 ### Phase 1.5: User Approval Gate
 Present agreed plan. Wait for explicit approval via AskUserQuestion.
 \`\`\`bash
@@ -2271,25 +2349,31 @@ For Claude/GPT disagreements, optionally debate via \`codemoot debate turn\`.
     content: `# Codex Liaison Agent
 
 ## Role
-Specialized teammate that communicates with GPT via Codex CLI to get independent reviews and iterate until quality reaches 9.5/10.
+Specialized teammate that communicates with GPT via codemoot CLI to get independent reviews and iterate until quality threshold is met.
 
 ## How You Work
-1. Send content to GPT via \`codex exec\` for review
-2. Parse feedback and score
-3. If score < 9.5: revise and re-submit
-4. Loop until 9.5/10 or max 7 iterations
+1. Send content to GPT via \`codemoot review\` or \`codemoot plan review\`
+2. Parse JSON output for score, verdict, findings
+3. If NEEDS_REVISION: fix issues and re-submit (session resume retains context)
+4. Loop until APPROVED or max iterations
 5. Report final version back to team lead
 
-## Calling Codex CLI
+## Available Commands
 \`\`\`bash
-codex exec --skip-git-repo-check -o ".codex-liaison-output.txt" "PROMPT_HERE"
+codemoot review <file-or-glob>           # Code review
+codemoot review --diff HEAD~3..HEAD      # Diff review
+codemoot plan review <plan-file>         # Plan review
+codemoot debate turn DEBATE_ID "prompt"  # Debate turn
+codemoot fix <file-or-glob>              # Autofix loop
 \`\`\`
 
 ## Important Rules
-- NEVER fabricate GPT's responses
+- NEVER fabricate GPT's responses \u2014 always parse actual JSON output
 - NEVER skip iterations if GPT says NEEDS_REVISION
 - Use your own judgment when GPT's feedback conflicts with project requirements
-- 9.5/10 threshold is strict
+- JSON \`review\`/\`response\` fields are capped to 2KB; use \`--output\` for full text
+- All commands use session resume \u2014 GPT retains context across calls
+- Zero API cost (ChatGPT subscription via Codex CLI)
 `
   }
 ];
@@ -2313,6 +2397,8 @@ This project uses [CodeMoot](https://github.com/katarmal-ram/codemoot) for Claud
 - \`codemoot fix <file>\` \u2014 Autofix loop: review \u2192 apply fixes \u2192 re-review
 - \`codemoot debate start "topic"\` \u2014 Multi-round Claude vs GPT debate
 - \`codemoot cleanup\` \u2014 Scan for unused deps, dead code, duplicates
+- \`codemoot plan generate "task"\` \u2014 Generate plans via multi-model loop
+- \`codemoot plan review <plan-file>\` \u2014 GPT review of execution plans
 - \`codemoot shipit --profile safe\` \u2014 Composite workflow (lint+test+review)
 - \`codemoot cost\` \u2014 Token usage dashboard
 - \`codemoot doctor\` \u2014 Check prerequisites
@@ -2320,6 +2406,7 @@ This project uses [CodeMoot](https://github.com/katarmal-ram/codemoot) for Claud
 ### Slash Commands
 - \`/codex-review\` \u2014 Quick GPT review (uses codemoot review internally)
 - \`/debate\` \u2014 Start a Claude vs GPT debate
+- \`/plan-review\` \u2014 GPT review of execution plans
 - \`/build\` \u2014 Full build loop: debate \u2192 plan \u2192 implement \u2192 GPT review \u2192 fix
 - \`/cleanup\` \u2014 Bidirectional AI slop scanner
 
@@ -2376,8 +2463,9 @@ async function installSkillsCommand(options) {
       if (options.force) {
         const markerIdx = existing.indexOf(marker);
         const before = existing.slice(0, markerIdx);
-        const afterMarker = existing.slice(markerIdx + marker.length);
-        const nextHeadingMatch = afterMarker.match(/\n#{1,2} (?!#)(?!CodeMoot)/);
+        const sectionEnd = existing.indexOf(CLAUDE_MD_SECTION.trimEnd(), markerIdx);
+        const afterMarker = sectionEnd >= 0 ? existing.slice(sectionEnd + CLAUDE_MD_SECTION.trimEnd().length) : existing.slice(markerIdx + marker.length);
+        const nextHeadingMatch = sectionEnd >= 0 ? null : afterMarker.match(/\n#{1,6} (?!CodeMoot)/);
         const after = nextHeadingMatch ? afterMarker.slice(nextHeadingMatch.index) : "";
         writeFileSync2(claudeMdPath, before.trimEnd() + "\n" + CLAUDE_MD_SECTION + after, "utf-8");
         console.error(chalk11.green("  OK   CLAUDE.md (updated CodeMoot section)"));
@@ -2432,7 +2520,7 @@ ${CLAUDE_MD_SECTION}`, "utf-8");
   console.error("");
   console.error(chalk11.cyan(`  Installed: ${installed}, Skipped: ${skipped}`));
   console.error("");
-  console.error(chalk11.dim("  Slash commands: /codex-review, /debate, /build, /cleanup"));
+  console.error(chalk11.dim("  Slash commands: /codex-review, /debate, /plan-review, /build, /cleanup"));
   console.error(chalk11.dim("  CLAUDE.md: Claude now knows about codemoot commands & sessions"));
   console.error(chalk11.dim("  Hook: Post-commit hint to run codemoot review"));
   console.error("");
@@ -2723,8 +2811,15 @@ async function jobsStatusCommand(jobId) {
 }
 
 // src/commands/plan.ts
-import { writeFileSync as writeFileSync3 } from "fs";
-import { ModelRegistry as ModelRegistry4, Orchestrator, loadConfig as loadConfig6, openDatabase as openDatabase9 } from "@codemoot/core";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import {
+  ModelRegistry as ModelRegistry4,
+  Orchestrator,
+  SessionManager as SessionManager7,
+  buildHandoffEnvelope as buildHandoffEnvelope4,
+  loadConfig as loadConfig6,
+  openDatabase as openDatabase9
+} from "@codemoot/core";
 import chalk15 from "chalk";
 
 // src/render.ts
@@ -2819,19 +2914,14 @@ function printSessionSummary(result) {
 }
 
 // src/commands/plan.ts
-async function planCommand(task, options) {
+async function planGenerateCommand(task, options) {
+  let db;
   try {
     const config = loadConfig6();
     const projectDir = process.cwd();
     const registry = ModelRegistry4.fromConfig(config, projectDir);
-    const health = await registry.healthCheckAll();
-    for (const [alias, hasKey] of health) {
-      if (!hasKey) {
-        console.warn(chalk15.yellow(`Warning: No API key for model "${alias}"`));
-      }
-    }
     const dbPath = getDbPath();
-    const db = openDatabase9(dbPath);
+    db = openDatabase9(dbPath);
     const orchestrator = new Orchestrator({ registry, db, config });
     orchestrator.on("event", (event) => renderEvent(event, config));
     const result = await orchestrator.plan(task, {
@@ -2839,22 +2929,172 @@ async function planCommand(task, options) {
     });
     if (options.output) {
       writeFileSync3(options.output, result.finalOutput, "utf-8");
-      console.log(chalk15.green(`Plan saved to ${options.output}`));
+      console.error(chalk15.green(`Plan saved to ${options.output}`));
     }
     printSessionSummary(result);
     db.close();
     process.exit(result.status === "completed" ? 0 : 2);
   } catch (error) {
+    db?.close();
+    console.error(chalk15.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
+    process.exit(1);
+  }
+}
+async function planReviewCommand(planFile, options) {
+  let db;
+  try {
+    let planContent;
+    if (planFile === "-") {
+      const chunks = [];
+      for await (const chunk of process.stdin) {
+        chunks.push(chunk);
+      }
+      planContent = Buffer.concat(chunks).toString("utf-8");
+    } else {
+      planContent = readFileSync4(planFile, "utf-8");
+    }
+    if (!planContent.trim()) {
+      console.error(chalk15.red("Plan file is empty."));
+      process.exit(1);
+    }
+    const config = loadConfig6();
+    const projectDir = process.cwd();
+    const registry = ModelRegistry4.fromConfig(config, projectDir);
+    const adapter = registry.tryGetAdapter("codex-reviewer") ?? registry.tryGetAdapter("codex-architect");
+    if (!adapter) {
+      console.error(chalk15.red("No codex adapter found in config. Run: codemoot init"));
+      process.exit(1);
+    }
+    const dbPath = getDbPath();
+    db = openDatabase9(dbPath);
+    const sessionMgr = new SessionManager7(db);
+    const session2 = sessionMgr.resolveActive("plan-review");
+    const overflowCheck = sessionMgr.preCallOverflowCheck(session2.id);
+    if (overflowCheck.rolled) {
+      console.error(chalk15.yellow(`  ${overflowCheck.message}`));
+    }
+    const currentSession = sessionMgr.get(session2.id);
+    const threadId = overflowCheck.rolled ? void 0 : currentSession?.codexThreadId ?? void 0;
+    const phaseContext = options.phase ? `
+This is Phase ${options.phase} of a multi-phase plan.` : "";
+    const buildContext = options.build ? `
+Build ID: ${options.build}` : "";
+    const prompt = buildHandoffEnvelope4({
+      command: "plan-review",
+      task: `Review the following execution plan for completeness, correctness, and feasibility. Read relevant codebase files to verify the plan's assumptions.${phaseContext}${buildContext}
+
+PLAN:
+${planContent.slice(0, 5e4)}
+
+Review criteria:
+1. Are all files/functions mentioned actually present in the codebase?
+2. Are there missing steps or dependencies between phases?
+3. Are there architectural concerns or better approaches?
+4. Is the scope realistic for the described phases?
+5. Are there security or performance concerns?
+
+Output format:
+- For each issue, output: ISSUE: [HIGH|MEDIUM|LOW] <description>
+- For each suggestion, output: SUGGEST: <description>
+- End with: VERDICT: APPROVED or VERDICT: NEEDS_REVISION
+- End with: SCORE: X/10`,
+      constraints: [
+        "Verify file paths and function names against the actual codebase before flagging issues.",
+        "Be specific \u2014 reference exact files and line numbers when possible.",
+        "Focus on feasibility, not style preferences."
+      ],
+      resumed: Boolean(threadId)
+    });
+    const timeoutMs = (options.timeout ?? 300) * 1e3;
+    const progress = createProgressCallbacks("plan-review");
+    console.error(chalk15.cyan("Sending plan to codex for review..."));
+    const result = await adapter.callWithResume(prompt, {
+      sessionId: threadId,
+      timeout: timeoutMs,
+      ...progress
+    });
+    if (result.sessionId) {
+      sessionMgr.updateThreadId(session2.id, result.sessionId);
+    }
+    sessionMgr.addUsageFromResult(session2.id, result.usage, prompt, result.text);
+    sessionMgr.recordEvent({
+      sessionId: session2.id,
+      command: "plan",
+      subcommand: "review",
+      promptPreview: `Plan review: ${planFile}${options.phase ? ` (phase ${options.phase})` : ""}`,
+      responsePreview: result.text.slice(0, 500),
+      promptFull: prompt,
+      responseFull: result.text,
+      usageJson: JSON.stringify(result.usage),
+      durationMs: result.durationMs,
+      codexThreadId: result.sessionId
+    });
+    const tail = result.text.slice(-500);
+    const verdictMatch = tail.match(/VERDICT:\s*(APPROVED|NEEDS_REVISION)/i);
+    const scoreMatch = tail.match(/SCORE:\s*(\d+)\/10/);
+    const verdict = verdictMatch ? verdictMatch[1].toLowerCase() : "unknown";
+    const score = scoreMatch ? Number.parseInt(scoreMatch[1], 10) : null;
+    const issues = [];
+    const suggestions = [];
+    for (const line of result.text.split("\n")) {
+      const issueMatch = line.match(/^[-*]?\s*ISSUE:\s*\[(HIGH|MEDIUM|LOW)]\s*(.*)/i);
+      if (issueMatch) {
+        issues.push({ severity: issueMatch[1].toLowerCase(), message: issueMatch[2].trim() });
+      }
+      const suggestMatch = line.match(/^[-*]?\s*SUGGEST:\s*(.*)/i);
+      if (suggestMatch) {
+        suggestions.push(suggestMatch[1].trim());
+      }
+    }
+    const verdictColor = verdict === "approved" ? chalk15.green : chalk15.red;
+    console.error(verdictColor(`
+Verdict: ${verdict.toUpperCase()} (${score ?? "?"}/10)`));
+    if (issues.length > 0) {
+      console.error(chalk15.yellow(`Issues (${issues.length}):`));
+      for (const issue of issues) {
+        const sevColor = issue.severity === "high" ? chalk15.red : issue.severity === "medium" ? chalk15.yellow : chalk15.dim;
+        console.error(`  ${sevColor(issue.severity.toUpperCase())} ${issue.message}`);
+      }
+    }
+    if (suggestions.length > 0) {
+      console.error(chalk15.cyan(`Suggestions (${suggestions.length}):`));
+      for (const s of suggestions) {
+        console.error(`  ${chalk15.dim("\u2192")} ${s}`);
+      }
+    }
+    console.error(chalk15.dim(`Duration: ${(result.durationMs / 1e3).toFixed(1)}s | Tokens: ${result.usage.totalTokens}`));
+    const output = {
+      planFile,
+      phase: options.phase ?? null,
+      buildId: options.build ?? null,
+      verdict,
+      score,
+      issues,
+      suggestions,
+      review: result.text.slice(0, 2e3),
+      sessionId: result.sessionId,
+      resumed: threadId ? result.sessionId === threadId : false,
+      usage: result.usage,
+      durationMs: result.durationMs
+    };
+    console.log(JSON.stringify(output, null, 2));
+    if (options.output) {
+      writeFileSync3(options.output, JSON.stringify(output, null, 2), "utf-8");
+      console.error(chalk15.green(`Review saved to ${options.output}`));
+    }
+    db.close();
+  } catch (error) {
+    db?.close();
     console.error(chalk15.red(`Error: ${error instanceof Error ? error.message : String(error)}`));
     process.exit(1);
   }
 }
 
 // src/commands/review.ts
-import { loadConfig as loadConfig7, ModelRegistry as ModelRegistry5, BINARY_SNIFF_BYTES, REVIEW_DIFF_MAX_CHARS as REVIEW_DIFF_MAX_CHARS3, SessionManager as SessionManager7, JobStore as JobStore3, openDatabase as openDatabase10, buildHandoffEnvelope as buildHandoffEnvelope4, getReviewPreset } from "@codemoot/core";
+import { loadConfig as loadConfig7, ModelRegistry as ModelRegistry5, BINARY_SNIFF_BYTES, REVIEW_DIFF_MAX_CHARS as REVIEW_DIFF_MAX_CHARS3, SessionManager as SessionManager8, JobStore as JobStore3, openDatabase as openDatabase10, buildHandoffEnvelope as buildHandoffEnvelope5, getReviewPreset } from "@codemoot/core";
 import chalk16 from "chalk";
 import { execFileSync as execFileSync3, execSync as execSync4 } from "child_process";
-import { closeSync, globSync, openSync, readFileSync as readFileSync4, readSync, statSync, existsSync as existsSync4 } from "fs";
+import { closeSync, globSync, openSync, readFileSync as readFileSync5, readSync, statSync, existsSync as existsSync4 } from "fs";
 import { resolve as resolve2 } from "path";
 var MAX_FILE_SIZE = 100 * 1024;
 var MAX_TOTAL_SIZE = 200 * 1024;
@@ -2916,7 +3156,7 @@ async function reviewCommand(fileOrGlob, options) {
       return;
     }
     const db = openDatabase10(getDbPath());
-    const sessionMgr = new SessionManager7(db);
+    const sessionMgr = new SessionManager8(db);
     const session2 = options.session ? sessionMgr.get(options.session) : sessionMgr.resolveActive("review");
     if (!session2) {
       console.error(chalk16.red(options.session ? `Session not found: ${options.session}` : "No active session. Run: codemoot init"));
@@ -2956,7 +3196,7 @@ async function reviewCommand(fileOrGlob, options) {
           process.exit(1);
         }
       }
-      prompt = buildHandoffEnvelope4({
+      prompt = buildHandoffEnvelope5({
         command: "review",
         task: `TASK: ${instruction}
 
@@ -2985,7 +3225,7 @@ Start by listing candidate files, then inspect them thoroughly.`,
         db.close();
         process.exit(0);
       }
-      prompt = buildHandoffEnvelope4({
+      prompt = buildHandoffEnvelope5({
         command: "review",
         task: `Review the following code changes.
 
@@ -3031,7 +3271,7 @@ ${diff.slice(0, REVIEW_DIFF_MAX_CHARS3)}`,
           console.error(chalk16.yellow(`Skipping ${filePath} (binary file)`));
           continue;
         }
-        const content = readFileSync4(filePath, "utf-8");
+        const content = readFileSync5(filePath, "utf-8");
         const relativePath = filePath.replace(projectDir, "").replace(/\\/g, "/").replace(/^\//, "");
         files.push({ path: relativePath, content });
         totalSize += stat.size;
@@ -3043,7 +3283,7 @@ ${diff.slice(0, REVIEW_DIFF_MAX_CHARS3)}`,
       }
       const fileContents = files.map((f) => `--- ${f.path} ---
 ${f.content}`).join("\n\n");
-      prompt = buildHandoffEnvelope4({
+      prompt = buildHandoffEnvelope5({
         command: "review",
         task: `Review the following code files.
 
@@ -3098,7 +3338,7 @@ ${fileContents}`,
       findings,
       verdict: verdictMatch ? verdictMatch[1].toLowerCase() : "unknown",
       score: scoreMatch ? Number.parseInt(scoreMatch[1], 10) : null,
-      review: result.text,
+      review: result.text.slice(0, 2e3),
       sessionId: session2.id,
       codexThreadId: result.sessionId,
       resumed: sessionThreadId ? result.sessionId === sessionThreadId : false,
@@ -3566,7 +3806,7 @@ import {
   JobStore as JobStore5,
   ModelRegistry as ModelRegistry7,
   REVIEW_DIFF_MAX_CHARS as REVIEW_DIFF_MAX_CHARS4,
-  buildHandoffEnvelope as buildHandoffEnvelope5,
+  buildHandoffEnvelope as buildHandoffEnvelope6,
   loadConfig as loadConfig10,
   openDatabase as openDatabase13
 } from "@codemoot/core";
@@ -3630,7 +3870,7 @@ async function workerCommand(options) {
         const focus = payload.focus ?? "all";
         const focusConstraint = focus === "all" ? "Review for: correctness, bugs, security, performance, code quality" : `Focus specifically on: ${focus}`;
         if (payload.prompt) {
-          prompt = buildHandoffEnvelope5({
+          prompt = buildHandoffEnvelope6({
             command: "review",
             task: `TASK: ${payload.prompt}
 
@@ -3651,7 +3891,7 @@ Start by listing candidate files, then inspect them thoroughly.`,
             encoding: "utf-8",
             maxBuffer: 1024 * 1024
           });
-          prompt = buildHandoffEnvelope5({
+          prompt = buildHandoffEnvelope6({
             command: "review",
             task: `Review these code changes.
 
@@ -3661,14 +3901,14 @@ ${diff.slice(0, REVIEW_DIFF_MAX_CHARS4)}`,
             resumed: false
           });
         } else if (payload.files && Array.isArray(payload.files)) {
-          prompt = buildHandoffEnvelope5({
+          prompt = buildHandoffEnvelope6({
             command: "review",
             task: `Review these files: ${payload.files.join(", ")}. Read each file and report issues.`,
             constraints: [focusConstraint],
             resumed: false
           });
         } else {
-          prompt = buildHandoffEnvelope5({
+          prompt = buildHandoffEnvelope6({
             command: "review",
             task: "Review the codebase for issues. Start by listing key files.",
             constraints: [focusConstraint],
@@ -3676,7 +3916,7 @@ ${diff.slice(0, REVIEW_DIFF_MAX_CHARS4)}`,
           });
         }
       } else if (job.type === "cleanup") {
-        prompt = buildHandoffEnvelope5({
+        prompt = buildHandoffEnvelope6({
           command: "cleanup",
           task: `Scan ${cwd} for: unused dependencies, dead code, duplicates, hardcoded values. Report findings with confidence levels.`,
           constraints: [`Scope: ${payload.scope ?? "all"}`],
@@ -3741,7 +3981,9 @@ program.command("cleanup").description("Scan codebase for AI slop: security vuln
   if (!/^\d+$/.test(v)) throw new InvalidArgumentError("Must be a non-negative integer");
   return Number.parseInt(v, 10);
 }, 10).option("--host-findings <path>", "JSON file with host AI findings for 3-way merge").option("--output <path>", "Write findings report to JSON file").option("--background", "Enqueue cleanup and return immediately").option("--no-gitignore", "Skip .gitignore rules (scan everything)").option("--quiet", "Suppress human-readable summary").action(cleanupCommand);
-program.command("plan").description("Generate a plan using architect + reviewer loop").argument("<task>", "Task to plan").option("--rounds <n>", "Max plan-review rounds", (v) => Number.parseInt(v, 10), 3).option("--output <file>", "Save plan to file").action(planCommand);
+var plan = program.command("plan").description("Plan generation and review \u2014 write plans, get GPT review");
+plan.command("generate").description("Generate a plan using architect + reviewer loop").argument("<task>", "Task to plan").option("--rounds <n>", "Max plan-review rounds", (v) => Number.parseInt(v, 10), 3).option("--output <file>", "Save plan to file").action(planGenerateCommand);
+plan.command("review").description("Send a host-authored plan to codex for review").argument("<plan-file>", "Plan file to review (use - for stdin)").option("--build <id>", "Link review to a build ID").option("--phase <id>", 'Phase identifier (e.g. "1", "setup")').option("--timeout <seconds>", "Review timeout", (v) => Number.parseInt(v, 10), 300).option("--output <file>", "Save review result to file").action(planReviewCommand);
 var debate = program.command("debate").description("Multi-model debate with session persistence");
 debate.command("start").description("Start a new debate").argument("<topic>", "Debate topic or question").option("--max-rounds <n>", "Max debate rounds", (v) => Number.parseInt(v, 10), 5).action(debateStartCommand);
 debate.command("turn").description("Send a prompt to GPT and get critique (with session resume)").argument("<debate-id>", "Debate ID from start command").argument("<prompt>", "Prompt to send to GPT").option("--round <n>", "Round number", (v) => Number.parseInt(v, 10)).option("--timeout <seconds>", "Timeout in seconds", (v) => Number.parseInt(v, 10), 600).action(debateTurnCommand);