@codemoot/cli 0.2.10 → 0.2.12

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 CodeMoot Contributors
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/dist/index.js

@@ -538,6 +538,7 @@ import {
   preflightTokenCheck
 } from "@codemoot/core";
 import chalk4 from "chalk";
+import { writeFileSync } from "fs";
 async function debateStartCommand(topic, options) {
   let db;
   try {
@@ -560,7 +561,8 @@ async function debateStartCommand(topic, options) {
       status: "running",
       sessionIds: {},
       resumeStats: { attempted: 0, succeeded: 0, fallbacks: 0 },
-      maxRounds: options.maxRounds ?? 5
+      maxRounds: options.maxRounds ?? 5,
+      defaultTimeout: options.timeout
     });
     const output = {
       debateId,
@@ -605,9 +607,10 @@ async function debateTurnCommand(debateId, prompt, options) {
     }
     const rawRound = options.round ?? criticRow.round + 1;
     const newRound = Number.isFinite(rawRound) && rawRound > 0 ? rawRound : criticRow.round + 1;
-    const rawTimeout = options.timeout ?? 600;
-    const timeout = (Number.isFinite(rawTimeout) && rawTimeout > 0 ? rawTimeout : 600) * 1e3;
     const proposerStateForLimit = store.loadState(debateId, "proposer");
+    const storedTimeout = proposerStateForLimit?.defaultTimeout;
+    const rawTimeout = options.timeout ?? storedTimeout ?? 600;
+    const timeout = (Number.isFinite(rawTimeout) && rawTimeout > 0 ? rawTimeout : 600) * 1e3;
     const rawMax = proposerStateForLimit?.maxRounds ?? 5;
     const maxRounds = Number.isFinite(rawMax) && rawMax > 0 ? rawMax : 5;
     if (newRound > maxRounds) {
@@ -626,10 +629,16 @@ async function debateTurnCommand(debateId, prompt, options) {
           status: "active"
         });
       }
+      if (options.output && existing.responseText) {
+        writeFileSync(options.output, existing.responseText, "utf-8");
+        console.error(chalk4.dim(`Full response written to ${options.output}`));
+      }
       const output = {
         debateId,
         round: newRound,
         response: existing.responseText?.slice(0, 2e3) ?? "",
+        responseTruncated: (existing.responseText?.length ?? 0) > 2e3,
+        responseFile: options.output ?? void 0,
         sessionId: existing.sessionId,
         resumed: false,
         cached: true,
@@ -671,10 +680,16 @@ async function debateTurnCommand(debateId, prompt, options) {
     if (!msgStore.markRunning(msgId)) {
       const recheckRow = msgStore.getByRound(debateId, newRound, "critic");
       if (recheckRow?.status === "completed") {
+        if (options.output && recheckRow.responseText) {
+          writeFileSync(options.output, recheckRow.responseText, "utf-8");
+          console.error(chalk4.dim(`Full response written to ${options.output}`));
+        }
         const output = {
           debateId,
           round: newRound,
           response: recheckRow.responseText?.slice(0, 2e3) ?? "",
+          responseTruncated: (recheckRow.responseText?.length ?? 0) > 2e3,
+          responseFile: options.output ?? void 0,
           sessionId: recheckRow.sessionId,
           resumed: false,
           cached: true,
@@ -702,14 +717,20 @@ async function debateTurnCommand(debateId, prompt, options) {
     const completedHistory = msgStore.getHistory(debateId).filter((m) => m.status === "completed");
     const maxContext = adapter.capabilities.maxContextTokens;
     const preflight = preflightTokenCheck(completedHistory, prompt, maxContext);
-    if (preflight.shouldStop) {
-      console.error(chalk4.yellow(`  Token budget at ${Math.round(preflight.utilizationRatio * 100)}% (${preflight.totalTokensUsed}/${maxContext}). Consider completing this debate.`));
+    if (preflight.shouldStop && !options.force) {
+      console.error(chalk4.red(`Token budget at ${Math.round(preflight.utilizationRatio * 100)}% (${preflight.totalTokensUsed}/${maxContext}). Debate blocked \u2014 use --force to override.`));
+      db.close();
+      process.exit(1);
+    } else if (preflight.shouldStop && options.force) {
+      console.error(chalk4.yellow(`  Token budget at ${Math.round(preflight.utilizationRatio * 100)}% (${preflight.totalTokensUsed}/${maxContext}) \u2014 forced past budget limit.`));
     } else if (preflight.shouldSummarize) {
       console.error(chalk4.yellow(`  Token budget at ${Math.round(preflight.utilizationRatio * 100)}%. Older rounds will be summarized on resume failure.`));
     }
     const overflowCheck = sessionMgr.preCallOverflowCheck(unifiedSession.id);
     if (overflowCheck.rolled) {
       console.error(chalk4.yellow(`  ${overflowCheck.message}`));
+      console.error(chalk4.yellow("  Warning: Session rolled over \u2014 previous conversation context has been lost."));
+      sessionMgr.updateThreadId(unifiedSession.id, null);
       existingSessionId = void 0;
     }
     try {
@@ -781,11 +802,16 @@ async function debateTurnCommand(debateId, prompt, options) {
         proposerState.resumeStats = stats;
         store.saveState(debateId, "proposer", proposerState);
       }
+      if (options.output) {
+        writeFileSync(options.output, result.text, "utf-8");
+        console.error(chalk4.dim(`Full response written to ${options.output}`));
+      }
       const output = {
         debateId,
         round: newRound,
         response: result.text.slice(0, 2e3),
         responseTruncated: result.text.length > 2e3,
+        responseFile: options.output ?? void 0,
         sessionId: result.sessionId,
         resumed,
         cached: false,
@@ -800,7 +826,7 @@ Round ${newRound} \u2014 Stance: ${verdict.stance}`));
       for (const line of previewLines) {
         console.error(chalk4.dim(`  ${line.trim().slice(0, 120)}`));
       }
-      console.error(chalk4.dim(`Duration: ${(result.durationMs / 1e3).toFixed(1)}s | Tokens: ${result.usage?.totalTokens ?? "?"} | Resumed: ${resumed}`));
+      console.error(chalk4.dim(`Duration: ${(result.durationMs / 1e3).toFixed(1)}s | Output: ${result.usage?.outputTokens ?? "?"} tokens | Input: ${result.usage?.inputTokens ?? "?"} (includes sandbox) | Resumed: ${resumed}`));
       console.log(JSON.stringify(output, null, 2));
     } catch (error) {
       msgStore.markFailed(msgId, error instanceof Error ? error.message : String(error));
@@ -813,6 +839,10 @@ Round ${newRound} \u2014 Stance: ${verdict.stance}`));
     process.exit(1);
   }
 }
+async function debateNextCommand(debateId, options) {
+  const prompt = "Continue your analysis. Respond to the previous round's arguments and refine your position.";
+  return debateTurnCommand(debateId, prompt, options);
+}
 async function debateStatusCommand(debateId) {
   let db;
   try {
@@ -893,7 +923,7 @@ async function debateListCommand(options) {
     process.exit(1);
   }
 }
-async function debateHistoryCommand(debateId) {
+async function debateHistoryCommand(debateId, options = {}) {
   let db;
   try {
     const dbPath = getDbPath();
@@ -937,6 +967,29 @@ async function debateHistoryCommand(debateId) {
         completedAt: m.completedAt ? new Date(m.completedAt).toISOString() : null
       }))
     };
+    if (options.output) {
+      const fullOutput = {
+        ...output,
+        messages: history.map((m) => ({
+          round: m.round,
+          role: m.role,
+          bridge: m.bridge,
+          model: m.model,
+          status: m.status,
+          stance: m.stance,
+          confidence: m.confidence,
+          durationMs: m.durationMs,
+          sessionId: m.sessionId,
+          promptText: m.promptText,
+          responseText: m.responseText ?? null,
+          error: m.error,
+          createdAt: new Date(m.createdAt).toISOString(),
+          completedAt: m.completedAt ? new Date(m.completedAt).toISOString() : null
+        }))
+      };
+      writeFileSync(options.output, JSON.stringify(fullOutput, null, 2), "utf-8");
+      console.error(chalk4.dim(`Full history written to ${options.output}`));
+    }
     console.log(JSON.stringify(output, null, 2));
     db.close();
   } catch (error) {
@@ -1199,8 +1252,8 @@ Scan complete in ${(durationMs / 1e3).toFixed(1)}s`));
       durationMs
     });
     if (options.output) {
-      const { writeFileSync: writeFileSync4 } = await import("fs");
-      writeFileSync4(options.output, JSON.stringify(report, null, 2), "utf-8");
+      const { writeFileSync: writeFileSync5 } = await import("fs");
+      writeFileSync5(options.output, JSON.stringify(report, null, 2), "utf-8");
       console.error(chalk5.green(`  Findings written to ${options.output}`));
     }
     const reportJson = JSON.stringify(report, null, 2);
@@ -1618,7 +1671,7 @@ async function eventsCommand(options) {
 
 // src/commands/fix.ts
 import { execFileSync as execFileSync2, execSync as execSync3 } from "child_process";
-import { readFileSync as readFileSync2, writeFileSync } from "fs";
+import { readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
 import { resolve } from "path";
 import {
   DEFAULT_RULES,
@@ -1666,7 +1719,7 @@ function applyFix(fix, projectDir) {
     const trimmedOld = fix.oldCode.trim();
     if (content.includes(trimmedOld)) {
       const updated = content.replace(trimmedOld, fix.newCode.trim());
-      writeFileSync(filePath, updated, "utf-8");
+      writeFileSync2(filePath, updated, "utf-8");
       return true;
     }
     return false;
@@ -1676,7 +1729,7 @@ function applyFix(fix, projectDir) {
   const newLines = fix.newCode.trim().split("\n");
   const oldLineCount = Math.max(1, newLines.length);
   lines.splice(lineIdx, oldLineCount, ...newLines);
-  writeFileSync(filePath, lines.join("\n"), "utf-8");
+  writeFileSync2(filePath, lines.join("\n"), "utf-8");
   return true;
 }
 async function fixCommand(fileOrGlob, options) {
@@ -1777,11 +1830,26 @@ ${fixOutputContract}`,
     const timeoutMs = options.timeout * 1e3;
     const progress = createProgressCallbacks("fix-review");
     console.error(chalk9.dim("  GPT reviewing..."));
-    const reviewResult = await adapter.callWithResume(reviewPrompt, {
-      sessionId: threadId,
-      timeout: timeoutMs,
-      ...progress
-    });
+    let reviewResult;
+    try {
+      reviewResult = await adapter.callWithResume(reviewPrompt, {
+        sessionId: threadId,
+        timeout: timeoutMs,
+        ...progress
+      });
+    } catch (err) {
+      if (threadId) {
+        console.error(chalk9.yellow("  Clearing stale codex thread ID after failure."));
+        sessionMgr.updateThreadId(session2.id, null);
+        threadId = void 0;
+      }
+      throw err;
+    }
+    const resumed = threadId && reviewResult.sessionId === threadId;
+    if (threadId && !resumed) {
+      threadId = void 0;
+      sessionMgr.updateThreadId(session2.id, null);
+    }
     if (reviewResult.sessionId) {
       threadId = reviewResult.sessionId;
       sessionMgr.updateThreadId(session2.id, reviewResult.sessionId);
@@ -1999,7 +2067,7 @@ Initialized with '${presetName}' preset`));
 }
 
 // src/commands/install-skills.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
 import { dirname, join as join5 } from "path";
 import chalk11 from "chalk";
 var SKILLS = [
@@ -2449,7 +2517,7 @@ async function installSkillsCommand(options) {
       continue;
     }
     mkdirSync2(dir, { recursive: true });
-    writeFileSync2(fullPath, skill.content, "utf-8");
+    writeFileSync3(fullPath, skill.content, "utf-8");
     console.error(chalk11.green(`  OK   ${skill.path}`));
     installed++;
   }
@@ -2467,7 +2535,7 @@ async function installSkillsCommand(options) {
         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");
+        writeFileSync3(claudeMdPath, before.trimEnd() + "\n" + CLAUDE_MD_SECTION + after, "utf-8");
         console.error(chalk11.green("  OK   CLAUDE.md (updated CodeMoot section)"));
         installed++;
       } else {
@@ -2475,12 +2543,12 @@ async function installSkillsCommand(options) {
         skipped++;
       }
     } else {
-      writeFileSync2(claudeMdPath, existing.trimEnd() + "\n" + CLAUDE_MD_SECTION, "utf-8");
+      writeFileSync3(claudeMdPath, existing.trimEnd() + "\n" + CLAUDE_MD_SECTION, "utf-8");
       console.error(chalk11.green("  OK   CLAUDE.md (appended CodeMoot section)"));
       installed++;
     }
   } else {
-    writeFileSync2(claudeMdPath, `# Project Instructions
+    writeFileSync3(claudeMdPath, `# Project Instructions
 ${CLAUDE_MD_SECTION}`, "utf-8");
     console.error(chalk11.green("  OK   CLAUDE.md (created with CodeMoot section)"));
     installed++;
@@ -2502,7 +2570,7 @@ ${CLAUDE_MD_SECTION}`, "utf-8");
           ...existing.hooks,
           PostToolUse: [...otherHooks, ...HOOKS_CONFIG.hooks.PostToolUse]
         };
-        writeFileSync2(settingsPath, JSON.stringify(existing, null, 2), "utf-8");
+        writeFileSync3(settingsPath, JSON.stringify(existing, null, 2), "utf-8");
         console.error(chalk11.green("  OK   .claude/settings.json (added post-commit hint hook)"));
         installed++;
       }
@@ -2513,7 +2581,7 @@ ${CLAUDE_MD_SECTION}`, "utf-8");
     }
   } else {
     mkdirSync2(settingsDir, { recursive: true });
-    writeFileSync2(settingsPath, JSON.stringify(HOOKS_CONFIG, null, 2), "utf-8");
+    writeFileSync3(settingsPath, JSON.stringify(HOOKS_CONFIG, null, 2), "utf-8");
     console.error(chalk11.green("  OK   .claude/settings.json (created with post-commit hook)"));
     installed++;
   }
@@ -2811,7 +2879,7 @@ async function jobsStatusCommand(jobId) {
 }
 
 // src/commands/plan.ts
-import { readFileSync as readFileSync4, writeFileSync as writeFileSync3 } from "fs";
+import { readFileSync as readFileSync4, writeFileSync as writeFileSync4 } from "fs";
 import {
   ModelRegistry as ModelRegistry4,
   Orchestrator,
@@ -2928,7 +2996,7 @@ async function planGenerateCommand(task, options) {
       maxRounds: options.rounds
     });
     if (options.output) {
-      writeFileSync3(options.output, result.finalOutput, "utf-8");
+      writeFileSync4(options.output, result.finalOutput, "utf-8");
       console.error(chalk15.green(`Plan saved to ${options.output}`));
     }
     printSessionSummary(result);
@@ -3079,7 +3147,7 @@ Verdict: ${verdict.toUpperCase()} (${score ?? "?"}/10)`));
     };
     console.log(JSON.stringify(output, null, 2));
     if (options.output) {
-      writeFileSync3(options.output, JSON.stringify(output, null, 2), "utf-8");
+      writeFileSync4(options.output, JSON.stringify(output, null, 2), "utf-8");
       console.error(chalk15.green(`Review saved to ${options.output}`));
     }
     db.close();
@@ -3297,11 +3365,22 @@ ${fileContents}`,
     }
     const timeoutMs = (options.timeout ?? 600) * 1e3;
     const progress = createProgressCallbacks("review");
-    const result = await adapter.callWithResume(prompt, {
-      sessionId: sessionThreadId,
-      timeout: timeoutMs,
-      ...progress
-    });
+    let result;
+    try {
+      result = await adapter.callWithResume(prompt, {
+        sessionId: sessionThreadId,
+        timeout: timeoutMs,
+        ...progress
+      });
+    } catch (err) {
+      if (sessionThreadId) {
+        sessionMgr.updateThreadId(session2.id, null);
+      }
+      throw err;
+    }
+    if (sessionThreadId && result.sessionId !== sessionThreadId) {
+      sessionMgr.updateThreadId(session2.id, null);
+    }
     if (result.sessionId) {
       sessionMgr.updateThreadId(session2.id, result.sessionId);
     }
@@ -3985,11 +4064,17 @@ var plan = program.command("plan").description("Plan generation and review \u201
 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);
+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).option("--timeout <seconds>", "Default timeout for debate turns in seconds", (v) => {
+  if (!/^\d+$/.test(v)) throw new InvalidArgumentError("Timeout must be a positive integer");
+  const n = Number.parseInt(v, 10);
+  if (n <= 0) throw new InvalidArgumentError("Timeout must be a positive integer");
+  return n;
+}).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)).option("--output <file>", "Write full untruncated response to file").option("--force", "Continue past token budget limit", false).action(debateTurnCommand);
+debate.command("next").description("Continue debate with auto-generated prompt").argument("<debate-id>", "Debate ID").option("--timeout <seconds>", "Timeout in seconds", (v) => Number.parseInt(v, 10)).option("--output <file>", "Write full untruncated response to file").option("--force", "Continue past token budget limit", false).action(debateNextCommand);
 debate.command("status").description("Show debate status and session info").argument("<debate-id>", "Debate ID").action(debateStatusCommand);
 debate.command("list").description("List all debates").option("--status <status>", "Filter by status (active|completed|stale)").option("--limit <n>", "Max results", (v) => Number.parseInt(v, 10), 20).action(debateListCommand);
-debate.command("history").description("Show full message history with token budget").argument("<debate-id>", "Debate ID").action(debateHistoryCommand);
+debate.command("history").description("Show full message history with token budget").argument("<debate-id>", "Debate ID").option("--output <file>", "Write full untruncated history to file").action(debateHistoryCommand);
 debate.command("complete").description("Mark a debate as completed").argument("<debate-id>", "Debate ID").action(debateCompleteCommand);
 var build = program.command("build").description("Automated build loop: debate \u2192 plan \u2192 implement \u2192 review \u2192 fix");
 build.command("start").description("Start a new build session").argument("<task>", "Task description").option("--max-rounds <n>", "Max debate rounds", (v) => Number.parseInt(v, 10), 5).option("--allow-dirty", "Allow starting with dirty working tree (auto-stashes)").action(buildStartCommand);