baro-ai 0.43.0 → 0.43.2

package/dist/cli.mjs

@@ -10753,10 +10753,9 @@ function extractVerdictJson(text) {
 }
 
 // ../baro-orchestrator/src/codex-one-shot.ts
-import { execFile as execFile3 } from "child_process";
-import { promisify as promisify3 } from "util";
-var execFileAsync2 = promisify3(execFile3);
+import { spawn } from "child_process";
 async function runCodexOneShot(opts) {
+  const label = opts.label ?? "codex";
   const args = ["exec", "--json"];
   if (opts.skipGitRepoCheck) args.push("--skip-git-repo-check");
   if (opts.bypassSandbox !== false) {
@@ -10764,43 +10763,111 @@ async function runCodexOneShot(opts) {
   }
   if (opts.model) args.push("--model", opts.model);
   args.push(opts.prompt);
-  const { stdout } = await execFileAsync2(opts.codexBin ?? "codex", args, {
-    cwd: opts.cwd,
-    timeout: opts.timeoutMs ?? 18e4,
-    maxBuffer: opts.maxBuffer ?? 16 * 1024 * 1024
-  });
-  let result = "";
-  for (const rawLine of stdout.split("\n")) {
-    const line = rawLine.trim();
-    if (!line) continue;
-    let event;
+  const timeoutMs = opts.timeoutMs ?? 6e5;
+  return await new Promise((resolve4, reject) => {
+    let proc;
     try {
-      event = JSON.parse(line);
-    } catch {
-      continue;
+      proc = spawn(opts.codexBin ?? "codex", args, {
+        cwd: opts.cwd,
+        stdio: ["ignore", "pipe", "pipe"]
+      });
+    } catch (e) {
+      reject(e instanceof Error ? e : new Error(String(e)));
+      return;
     }
-    if (event.type === "turn.completed") {
-      const usage = event.usage;
-      if (usage) {
-        process.stderr.write(
-          `[codex] usage: in=${usage.input_tokens ?? 0} out=${usage.output_tokens ?? 0}
-`
-        );
+    let agentMessage = "";
+    let stdoutBuffer = "";
+    const eventTypesSeen = [];
+    const itemTypesSeen = [];
+    let timedOut = false;
+    const startedAt = Date.now();
+    const timer = setTimeout(() => {
+      timedOut = true;
+      try {
+        proc.kill("SIGTERM");
+      } catch {
       }
-      continue;
-    }
-    if (event.type !== "item.completed") continue;
-    const item = event.item;
-    if (!item) continue;
-    if (item.type === "agent_message" && typeof item.text === "string") {
-      result = result ? `${result}
+    }, timeoutMs);
+    proc.stdout.setEncoding("utf8");
+    proc.stdout.on("data", (chunk) => {
+      stdoutBuffer += chunk;
+      let nl;
+      while ((nl = stdoutBuffer.indexOf("\n")) >= 0) {
+        const line = stdoutBuffer.slice(0, nl).trim();
+        stdoutBuffer = stdoutBuffer.slice(nl + 1);
+        if (!line) continue;
+        let event;
+        try {
+          event = JSON.parse(line);
+        } catch {
+          continue;
+        }
+        const type = typeof event.type === "string" ? event.type : "";
+        if (type) eventTypesSeen.push(type);
+        if (type === "turn.completed") {
+          const usage = event.usage;
+          if (usage) {
+            process.stderr.write(
+              `[${label}] usage: in=${usage.input_tokens ?? 0} out=${usage.output_tokens ?? 0}
+`
+            );
+          }
+          continue;
+        }
+        if (type === "item.completed") {
+          const item = event.item;
+          if (item) {
+            const innerType = typeof item.type === "string" ? item.type : "?";
+            itemTypesSeen.push(innerType);
+            if (item.type === "agent_message" && typeof item.text === "string") {
+              agentMessage = agentMessage ? `${agentMessage}
 ${item.text}` : item.text;
-    }
-  }
-  if (!result.trim()) {
-    throw new Error("runCodexOneShot: codex produced no agent_message");
-  }
-  return result;
+            } else if (innerType === "command_execution") {
+              const cmd = typeof item.command === "string" ? item.command.slice(0, 120) : "?";
+              process.stderr.write(`[${label}] $ ${cmd}
+`);
+            }
+          }
+          continue;
+        }
+      }
+    });
+    proc.stderr.setEncoding("utf8");
+    proc.stderr.on("data", (chunk) => {
+      const trimmed = chunk.trimEnd();
+      if (trimmed) {
+        process.stderr.write(`[${label}/stderr] ${trimmed}
+`);
+      }
+    });
+    proc.on("error", (err) => {
+      clearTimeout(timer);
+      reject(err);
+    });
+    proc.on("exit", (code, signal) => {
+      clearTimeout(timer);
+      const elapsedMs = Date.now() - startedAt;
+      if (agentMessage.trim()) {
+        resolve4(agentMessage);
+        return;
+      }
+      const ctx = [
+        `elapsed=${elapsedMs}ms`,
+        `exit=${code}`,
+        signal ? `signal=${signal}` : null,
+        timedOut ? `timedOut=true (cap=${timeoutMs}ms)` : null,
+        `events=${eventTypesSeen.length}`,
+        `items=${itemTypesSeen.length}`,
+        eventTypesSeen.length > 0 ? `event_types=[${[...new Set(eventTypesSeen)].join(",")}]` : null,
+        itemTypesSeen.length > 0 ? `item_types=[${[...new Set(itemTypesSeen)].join(",")}]` : null
+      ].filter((x) => x !== null).join(" ");
+      reject(
+        new Error(
+          `runCodexOneShot: codex produced no agent_message (${ctx})`
+        )
+      );
+    });
+  });
 }
 
 // ../baro-orchestrator/src/participants/critic-codex.ts
@@ -10815,7 +10882,7 @@ var CriticCodex = class extends BaseObserver {
       maxEmissionsPerAgent: opts.maxEmissionsPerAgent ?? 2,
       model: opts.model,
       codexBin: opts.codexBin ?? "codex",
-      timeoutMs: opts.timeoutMs ?? 6e4,
+      timeoutMs: opts.timeoutMs ?? 18e4,
       targets: opts.targets
     };
   }
@@ -10880,17 +10947,13 @@ ${userPrompt}`;
     try {
       const text = await runCodexOneShot({
         prompt,
-        // Critic doesn't operate on the worktree — but Codex
-        // still insists on running inside a git repo unless we
-        // skip the check. Pass through skipGitRepoCheck so the
-        // critic can be invoked from anywhere (including baro's
-        // own cwd that may not be the story worktree).
         cwd: process.cwd(),
         skipGitRepoCheck: true,
         bypassSandbox: true,
         model: this.opts.model,
         codexBin: this.opts.codexBin,
-        timeoutMs: this.opts.timeoutMs
+        timeoutMs: this.opts.timeoutMs,
+        label: "codex-critic"
       });
       const verdictJson = extractVerdictJson(text.trim());
       const parsed = JSON.parse(verdictJson);
@@ -11084,9 +11147,9 @@ var CriticOpenAI = class extends BaseObserver {
 };
 
 // ../baro-orchestrator/src/participants/finalizer.ts
-import { execFile as execFile4 } from "child_process";
-import { promisify as promisify4 } from "util";
-var execFileAsync3 = promisify4(execFile4);
+import { execFile as execFile3 } from "child_process";
+import { promisify as promisify3 } from "util";
+var execFileAsync2 = promisify3(execFile3);
 var Finalizer = class extends BaseObserver {
   opts;
   envRef = null;
@@ -11335,7 +11398,7 @@ var Finalizer = class extends BaseObserver {
   async collectCommitsSinceBase() {
     if (!this.baseSha) return [];
     try {
-      const { stdout } = await execFileAsync3(
+      const { stdout } = await execFileAsync2(
         "git",
         ["log", `${this.baseSha}..HEAD`, "--pretty=format:%H%x09%s"],
         { cwd: this.opts.cwd }
@@ -11351,7 +11414,7 @@ var Finalizer = class extends BaseObserver {
   async collectFileStats() {
     if (!this.baseSha) return { created: 0, modified: 0 };
     try {
-      const { stdout } = await execFileAsync3(
+      const { stdout } = await execFileAsync2(
         "git",
         ["diff", "--name-status", this.baseSha, "HEAD"],
         { cwd: this.opts.cwd }
@@ -11370,7 +11433,7 @@ var Finalizer = class extends BaseObserver {
   }
   async detectBranch() {
     try {
-      const { stdout } = await execFileAsync3(
+      const { stdout } = await execFileAsync2(
         "git",
         ["branch", "--show-current"],
         { cwd: this.opts.cwd }
@@ -11382,7 +11445,7 @@ var Finalizer = class extends BaseObserver {
   }
   async detectDefaultBaseBranch() {
     try {
-      const { stdout } = await execFileAsync3(
+      const { stdout } = await execFileAsync2(
         "gh",
         ["repo", "view", "--json", "defaultBranchRef", "--jq", ".defaultBranchRef.name"],
         { cwd: this.opts.cwd }
@@ -11392,7 +11455,7 @@ var Finalizer = class extends BaseObserver {
     } catch {
     }
     try {
-      const { stdout } = await execFileAsync3(
+      const { stdout } = await execFileAsync2(
         "git",
         ["symbolic-ref", "--short", "refs/remotes/origin/HEAD"],
         { cwd: this.opts.cwd }
@@ -11480,7 +11543,7 @@ var Finalizer = class extends BaseObserver {
   }
   async hasGhBinary() {
     try {
-      await execFileAsync3("gh", ["--version"], { cwd: this.opts.cwd });
+      await execFileAsync2("gh", ["--version"], { cwd: this.opts.cwd });
       return true;
     } catch {
       return false;
@@ -11488,7 +11551,7 @@ var Finalizer = class extends BaseObserver {
   }
   async openPr(args) {
     try {
-      const { stdout } = await execFileAsync3(
+      const { stdout } = await execFileAsync2(
         "gh",
         [
           "pr",
@@ -11926,7 +11989,7 @@ function extractPath(item) {
 import { setTimeout as setTimeoutPromise } from "timers/promises";
 
 // ../baro-orchestrator/src/participants/codex-cli-participant.ts
-import { spawn } from "child_process";
+import { spawn as spawn2 } from "child_process";
 
 // ../baro-orchestrator/src/codex-stream-mapper.ts
 function mapCodexEvent(agentId, event) {
@@ -12148,7 +12211,7 @@ var CodexCliParticipant = class _CodexCliParticipant extends BaseObserver {
     const args = this.buildArgs();
     let proc;
     try {
-      proc = spawn(this.options.codexBin, args, {
+      proc = spawn2(this.options.codexBin, args, {
         cwd: this.options.cwd,
         stdio: ["ignore", "pipe", "pipe"]
       });
@@ -13293,7 +13356,7 @@ function sleep2(ms) {
 import { setTimeout as setTimeoutPromise2 } from "timers/promises";
 
 // ../baro-orchestrator/src/participants/claude-cli-participant.ts
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 
 // ../baro-orchestrator/src/stream-json-mapper.ts
 function mapClaudeEvent(agentId, event) {
@@ -13466,7 +13529,7 @@ var ClaudeCliParticipant = class _ClaudeCliParticipant extends BaseObserver {
     const args = this.buildArgs();
     let proc;
     try {
-      proc = spawn2(this.options.claudeBin, args, {
+      proc = spawn3(this.options.claudeBin, args, {
         cwd: this.options.cwd,
         stdio: ["pipe", "pipe", "pipe"]
       });
@@ -14001,9 +14064,9 @@ var StoryFactory = class extends BaseObserver {
 };
 
 // ../baro-orchestrator/src/participants/surgeon.ts
-import { execFile as execFile5 } from "child_process";
-import { promisify as promisify5 } from "util";
-var execFileAsync4 = promisify5(execFile5);
+import { execFile as execFile4 } from "child_process";
+import { promisify as promisify4 } from "util";
+var execFileAsync3 = promisify4(execFile4);
 var SURGEON_SYSTEM_PROMPT = `You are the Surgeon \u2014 an autonomous planner that adapts a software-project
 DAG when stories fail. Given:
 1. A snapshot of the current PRD (project, story list with dependencies +
@@ -14109,7 +14172,7 @@ var Surgeon = class extends BaseObserver {
     const snap = this.opts.snapshot();
     const prompt = buildSurgeonPrompt(snap, failure);
     try {
-      const { stdout } = await execFileAsync4(
+      const { stdout } = await execFileAsync3(
         this.opts.claudeBin,
         [
           "--print",
@@ -14222,7 +14285,7 @@ var SurgeonCodex = class extends BaseObserver {
       model: opts.model,
       maxReplans: opts.maxReplans ?? 10,
       codexBin: opts.codexBin ?? "codex",
-      timeoutMs: opts.timeoutMs ?? 12e4,
+      timeoutMs: opts.timeoutMs ?? 3e5,
       snapshot: opts.snapshot
     };
   }
@@ -14259,7 +14322,8 @@ ${userPrompt}`;
         bypassSandbox: true,
         model: this.opts.model,
         codexBin: this.opts.codexBin,
-        timeoutMs: this.opts.timeoutMs
+        timeoutMs: this.opts.timeoutMs,
+        label: "codex-surgeon"
       });
       const verdictText = text.trim();
       if (!verdictText) throw new Error("empty result");