@monoes/monomindcli 2.9.21 → 2.9.23

package/dist/src/orgrt/codex-runner.js

@@ -2,36 +2,144 @@
 /**
  * CodexAgentRunner — AgentRunner impl backed by the Codex CLI (subprocess).
  *
- * Architectural pattern: SAME as KimiCodeAgentRunner — spawn the vendor's CLI
- * binary, parse its JSONL stream, normalize to AgentMessage. No SDK dependency
- * (the @openai/codex-sdk package would add ~100MB; we use the CLI directly
- * like we do for kimi).
+ * Architectural pattern: SAME as KimiCodeAgentRunner/AntigravityAgentRunner —
+ * spawn the vendor's CLI binary, parse its JSONL stream, normalize to
+ * AgentMessage. No SDK dependency (the @openai/codex-sdk package would add
+ * ~100MB; we use the CLI directly like we do for kimi).
  *
  * Auth: inherited from ~/.codex/auth.json (created by `codex login`). The
  * ChatGPT subscription flows through this credential cache. No env vars.
  *
+ * Streaming / liveness — WHY INCREMENTAL (#204):
+ *   This runner originally buffered ALL of stdout until the codex subprocess
+ *   exited, then parsed the whole batch. session.ts races the FIRST pull from
+ *   this runner against a 4-minute silent-stream watchdog (SILENT_SESSION_MS),
+ *   so any turn longer than 4 minutes yielded zero messages in time — abort,
+ *   retry, kill, circuit breaker, stalled org. Same bug class as the
+ *   kimi/antigravity runners had (#204 audit). This runner now parses stdout
+ *   LINE BY LINE as data arrives: a liveness `tool_use` message is yielded
+ *   the moment the subprocess spawns (deterministically winning the
+ *   first-pull race regardless of model-thinking latency), assistant text is
+ *   yielded as each `agent_message` item lands (codex sends whole items, not
+ *   per-token deltas — no accumulation needed, unlike agy), and codex's own
+ *   `command_execution` items are forwarded as `tool_use` liveness messages
+ *   at their `item.started` boundary. Tool_call fences are still collected
+ *   from the raw texts and parsed at end of turn (fence parsing needs the
+ *   complete text).
+ *
  * Org tools (org_send, knowledge_search, ask_human, …) — FENCE PROTOCOL:
- *   Same approach as kimi/opencode. Tools are rendered INTO the first prompt;
- *   the model emits ```tool_call fences; this runner parses them out of the
- *   agent_message text, executes the real OrgToolDef handlers in-process
- *   (gated through canUseTool), and feeds results back as the next prompt.
+ *   Same approach as kimi/opencode/antigravity. Tools are rendered INTO the
+ *   first prompt; the model emits ```tool_call fences; this runner parses
+ *   them out of the agent_message text, executes the real OrgToolDef handlers
+ *   in-process (gated through canUseTool), and feeds results back as the
+ *   next prompt.
+ *
+ * Subprocess protocol — REWRITTEN against openai/codex's own Rust source
+ * (issue #178). This runner previously assumed a "thread.started" /
+ * "item.completed" event shape sourced from `openai/codex/sdk/typescript`,
+ * which turned out to be a DIFFERENT wire format than what `codex exec
+ * --json` actually emits. Confirmed two ways: (1) live output from an
+ * installed codex v0.21.0 (`brew install codex`) showed events shaped like
+ * `{"id":"1","msg":{"type":"task_started"}}` — nothing resembling
+ * "thread.started"; (2) cross-checked against
+ * `codex-rs/protocol/src/protocol.rs`'s `EventMsg` enum
+ * (`#[serde(tag = "type", rename_all = "snake_case")]`) and
+ * `codex-rs/protocol/src/legacy_events.rs`, which is EXACTLY this wire
+ * format and is explicitly comment-labeled "v1 wire format" (still the
+ * live default for `--json`, not a deprecated relic).
+ *
+ *   - Invocation: `codex exec --json [--model X] [--cd Y]
+ *                 [--skip-git-repo-check] [--sandbox danger-full-access]
+ *                 [resume <sessionId> "<prompt>"]`. `--experimental-json`
+ *     (the old flag name) doesn't exist in v0.21.0 — confirmed live
+ *     ("unexpected argument '--experimental-json' found"); `--json` is
+ *     correct in both v0.21.0 and the current v0.147.0 (where
+ *     `--experimental-json` IS an alias again, per current
+ *     `codex-rs/exec/src/cli.rs` — but v0.21.0 predates that alias).
+ *   - `resume` is a SUBCOMMAND of `exec`, not a positional after other exec
+ *     flags in isolation — `codex exec resume <sessionId> ["<prompt>"]`,
+ *     with `exec`'s own global flags (--json, --model, --sandbox, etc.)
+ *     specified BEFORE the `resume` token. Confirmed live (v0.147.0 AND
+ *     v0.149.0) that this exact arg order parses cleanly. v0.21.0 has no
+ *     `resume` subcommand at all (confirmed live: "resume" was consumed as
+ *     the PROMPT text itself, then the actual session id was rejected as an
+ *     unexpected extra positional) — so resume silently can't work
+ *     pre-~v0.12x. This runner doesn't detect codex's version; if resume
+ *     fails on an old install, each turn falls back to a fresh (contextless)
+ *     session rather than erroring — a real limitation, not fixed here.
+ *   - JSONL on stdout, one event per line. Confirmed real EventMsg variants
+ *     (source: `EventMsg` enum + each variant's struct, all in
+ *     `protocol.rs`):
+ *       {"type":"session_configured","session_id":"...","thread_id":"...",
+ *        "model":"...",...}                            — session/thread id
+ *       {"type":"task_started"}                          — turn started
+ *       {"type":"agent_message","message":"...","phase":...}
+ *                                                         — assistant text
+ *       {"type":"token_count","info":{"last_token_usage":
+ *        {"input_tokens":N,"output_tokens":N,"reasoning_output_tokens":N,
+ *         "total_tokens":N,...},"total_token_usage":{...}},...}
+ *                       — `last_token_usage` is per-TURN (not cumulative);
+ *                         `total_token_usage` IS cumulative — use the former
+ *       {"type":"task_complete","turn_id":"...",
+ *        "last_agent_message":"...","error":{"message":"..."}|absent,...}
+ *       {"type":"error","message":"...",...}
+ *   - NO per-token streaming in this event set (whole agent_message events
+ *     only, unlike the discarded thread/item assumption).
+ *   - Session ID: captured from `session_configured.session_id` (or
+ *     `.thread_id` — both present, same value in observed live output),
+ *     NOT from a "thread.started" event, which doesn't exist in THIS
+ *     (legacy) protocol variant — see the CURRENT shape below, where it does.
+ *   - stderr is human diagnostics; buffer and surface on non-zero exit only.
+ *
+ * WIRE-FORMAT UPDATE (#178 follow-up, #204) — live-verified 2026-08-22
+ * against an authenticated codex v0.149.0 (`codex login status` →
+ * "Logged in using ChatGPT"), three real `codex exec --json` invocations:
+ *
+ *   1. Plain turn (`"reply with exactly the word: pong"`):
+ *      {"type":"thread.started","thread_id":"01a02a2f-...-...-...-..."}
+ *      {"type":"turn.started"}
+ *      {"type":"item.completed","item":{"id":"item_0","type":"agent_message","text":"pong"}}
+ *      {"type":"turn.completed","usage":{"input_tokens":13085,"cached_input_tokens":9984,
+ *       "cache_write_input_tokens":0,"output_tokens":5,"reasoning_output_tokens":0}}
+ *   2. Turn with a shell tool call (`"run: echo hello-from-codex-shell"`) — adds:
+ *      {"type":"item.started","item":{"id":"item_1","type":"command_execution",
+ *       "command":"...","aggregated_output":"","exit_code":null,"status":"in_progress"}}
+ *      {"type":"item.completed","item":{"id":"item_1","type":"command_execution",
+ *       "command":"...","aggregated_output":"hello-from-codex-shell\n","exit_code":0,
+ *       "status":"completed"}}
+ *   3. `codex exec resume <threadId> "..."` × 3 in the same thread — confirms
+ *      (a) `resume` still works exactly as documented above, (b)
+ *      `turn.completed.usage.input_tokens` stays roughly flat across resumed
+ *      turns (13097 → 13112) rather than growing cumulatively, consistent
+ *      with per-turn (not cumulative) usage — same inference as legacy
+ *      `token_count.info.last_token_usage` vs `total_token_usage`, though
+ *      this wasn't cross-checked against Rust source (no `codex-rs` checkout
+ *      in this environment) the way the legacy shape originally was.
+ *
+ * NONE of `session_configured` / `task_started` / `agent_message` (top-level)
+ * / `token_count` / `task_complete` — the shape this runner was originally
+ * written against — appeared in ANY of the above. This runner was silently
+ * broken against any codex install emitting the current shape: every switch
+ * branch missed, so assistant text/inputTokens/outputTokens/threadId all
+ * stayed at their zero-values for every single turn, producing no assistant
+ * text, no token accounting, and no session resumption — while `exitCode`
+ * was still 0, so nothing surfaced as an error either.
  *
- * Subprocess protocol (byte-accurate from openai/codex/sdk/typescript/src):
- *   - Subcommand: `codex exec --experimental-json [--model X] [--cd Y]
- *                  [--skip-git-repo-check] [--sandbox danger-full-access]
- *                  [resume <thread_id>] "<prompt>"`
- *   - JSONL on stdout, one event per line
- *   - 8 event types: thread.started, turn.started, turn.completed,
- *     turn.failed, item.started, item.updated, item.completed, error
- *   - Assistant text arrives via item.completed with item.type === 'agent_message'
- *   - NO per-token streaming (whole items only)
- *   - Resume: positional `resume <thread_id>` (NOT a flag)
- *   - Session ID captured from thread.started.thread_id
- *   - stderr is human diagnostics; buffer and surface on non-zero exit only
+ * Both shapes are now parsed (see CURRENT vs LEGACY branches in
+ * `handleEvent` below). The legacy shape is kept because there's no live
+ * evidence it was ever wrong for the v0.147.0 install it was verified
+ * against — only that a newer install (v0.149.0) has since moved to the
+ * item-based shape. Error/failure item types (e.g. a possible
+ * `turn.failed`) were NOT observed live and are not guessed at here — an
+ * error turn was only ever seen as a non-zero exit with a plain-text stderr
+ * message (e.g. `resume`ing an unknown thread id → exit 1, no JSON on
+ * stdout at all), which the existing `outcome.exitCode !== 0` handling
+ * already covers unchanged.
  */
 import { spawn } from 'node:child_process';
 import { buildToolProtocol, parseToolCalls, executeToolCall, formatToolResults, MAX_TOOL_ROUNDS, TOOL_CALL_RE } from './tool-fence.js';
-const TURN_TIMEOUT_MS = 2 * 60 * 60 * 1000; // 2 hours, matching kimi runner
+import { classifyStderr } from './kimicode-runner.js';
+const TURN_TIMEOUT_MS = 2 * 60 * 60 * 1000; // 2 hours, matching kimi/antigravity runners
 export class CodexAgentRunner {
     codexBin;
     constructor(codexBin) {
@@ -46,9 +154,9 @@ export class CodexAgentRunner {
                 let nextPrompt = text;
                 let turnInputTokens = 0;
                 let turnOutputTokens = 0;
-                // Tool-call loop (same shape as KimiCodeAgentRunner): keep driving
-                // the same codex session until a turn produces no tool_call fences
-                // (or the round cap hits).
+                // Tool-call loop (same shape as KimiCodeAgentRunner/AntigravityAgentRunner):
+                // keep driving the same codex session until a turn produces no
+                // tool_call fences (or the round cap hits).
                 for (let round = 0; round <= MAX_TOOL_ROUNDS; round++) {
                     // Prepend system prompt + tool protocol on first turn only (when
                     // there's no thread to resume). Subsequent turns in the same
@@ -56,22 +164,44 @@ export class CodexAgentRunner {
                     const promptWithSystem = (round === 0 && !threadId)
                         ? `${args.systemPrompt}${buildToolProtocol(args.tools)}\n\n---\n\n${nextPrompt}`
                         : nextPrompt;
-                    const outcome = await this.runTurn(bin, promptWithSystem, threadId, args);
+                    // Filled in by streamTurn as the subprocess runs and when it exits.
+                    const outcome = {
+                        exitCode: 1, stderrTail: '', timedOut: false, inputTokens: 0, outputTokens: 0,
+                    };
+                    // Raw assistant texts (fences intact) for end-of-turn tool-call
+                    // parsing — fence parsing needs the complete text, so fences are
+                    // collected here while the stripped prose streams out live below.
+                    const rawTexts = [];
+                    for await (const ev of this.streamTurn(bin, promptWithSystem, threadId, args, outcome)) {
+                        if (ev.threadId)
+                            threadId = ev.threadId;
+                        if (ev.kind === 'assistant' && ev.rawText !== undefined) {
+                            rawTexts.push(ev.rawText);
+                            // Yield assistant prose AS IT ARRIVES (per agent_message item,
+                            // not after process exit): a codex turn can run many minutes,
+                            // and session.ts's watchdog must see messages DURING the turn.
+                            // Note this means partial output may already be yielded when a
+                            // turn later exits non-zero — preferable to losing it entirely.
+                            if (ev.text)
+                                yield { type: 'assistant', session_id: threadId, text: ev.text };
+                        }
+                        else if (ev.kind === 'tool') {
+                            // Liveness for codex's own tool activity (or the spawn-time
+                            // yield): session.ts never renders tool_use as chat — it only
+                            // feeds the StateDetector ('tool-call' state) and refreshes
+                            // last-activity.
+                            yield { type: 'tool_use', session_id: threadId, text: ev.toolName };
+                        }
+                    }
                     if (outcome.threadId)
                         threadId = outcome.threadId;
                     if (outcome.exitCode !== 0 || outcome.error) {
-                        throw new Error(`CodexAgentRunner: codex exec failed (exit ${outcome.exitCode})` +
-                            (outcome.error ? `: ${outcome.error}` : '') +
-                            (outcome.stderrTail ? `\nstderr: ${outcome.stderrTail.slice(-500)}` : ''));
-                    }
-                    for (const t of outcome.texts) {
-                        if (t.trim())
-                            yield { type: 'assistant', session_id: threadId, text: t };
+                        throw turnError(outcome, round, bin);
                     }
                     turnInputTokens += outcome.inputTokens;
                     turnOutputTokens += outcome.outputTokens;
                     const malformed = [];
-                    const calls = parseToolCalls(outcome.rawTexts, (raw, err) => malformed.push(`[monomind] ignored malformed tool_call fence (${err}): ${raw.slice(0, 200)}`));
+                    const calls = parseToolCalls(rawTexts, (raw, err) => malformed.push(`[monomind] ignored malformed tool_call fence (${err}): ${raw.slice(0, 200)}`));
                     for (const note of malformed) {
                         yield { type: 'assistant', session_id: threadId, text: note };
                     }
@@ -111,106 +241,207 @@ export class CodexAgentRunner {
             throw err;
         }
     }
-    /** Run one `codex exec` invocation and normalize its JSONL output. */
-    runTurn(bin, prompt, threadId, args) {
-        return new Promise((resolve, reject) => {
-            // ARG ORDER (byte-accurate from codex SDK source):
-            //   codex exec --experimental-json [--model X] [--cd Y]
-            //              [--skip-git-repo-check] [--sandbox danger-full-access]
-            //              [resume <threadId>] "<prompt>"
-            const cliArgs = ['exec', '--experimental-json'];
-            if (args.model)
-                cliArgs.push('--model', args.model);
-            cliArgs.push('--cd', args.cwd);
-            cliArgs.push('--skip-git-repo-check');
-            cliArgs.push('--sandbox', 'danger-full-access');
-            if (threadId) {
-                cliArgs.push('resume', threadId);
+    /**
+     * Run one `codex exec` invocation and stream its JSONL output
+     * INCREMENTALLY: each parsed event is yielded as soon as its line arrives
+     * on stdout (see the header's "Streaming / liveness" note for why
+     * buffering until process exit was a bug, #204). End-of-turn facts (exit
+     * code, stderr tail, thread id, usage, error, timeout flag) are written
+     * into `outcome`, which the caller reads after this generator completes.
+     */
+    async *streamTurn(bin, prompt, threadId, args, outcome) {
+        // ARG ORDER — see file header for the live-verified citation:
+        //   codex exec --json [--model X] [--cd Y]
+        //              [--skip-git-repo-check] [--sandbox danger-full-access]
+        //              [resume <threadId>] "<prompt>"
+        const cliArgs = ['exec', '--json'];
+        if (args.model)
+            cliArgs.push('--model', args.model);
+        cliArgs.push('--cd', args.cwd);
+        cliArgs.push('--skip-git-repo-check');
+        cliArgs.push('--sandbox', 'danger-full-access');
+        if (threadId) {
+            cliArgs.push('resume', threadId);
+        }
+        cliArgs.push(prompt);
+        const child = spawn(bin, cliArgs, {
+            cwd: args.cwd,
+            env: { ...process.env, ...args.env },
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        let stderrTail = '';
+        child.stderr?.on('data', (c) => {
+            stderrTail = (stderrTail + c.toString()).slice(-4000);
+        });
+        // Arm the turn timeout BEFORE consuming stdout — a hung CLI must be
+        // killed while we're still reading, not after it finishes.
+        let timedOut = false;
+        const KILL_GRACE_MS = 5000;
+        let killTimer;
+        const timer = setTimeout(() => {
+            timedOut = true;
+            child.kill('SIGTERM');
+            // A wedged CLI that ignores SIGTERM must not leak a zombie per turn:
+            // escalate to SIGKILL after a short grace period.
+            killTimer = setTimeout(() => { try {
+                child.kill('SIGKILL');
             }
-            cliArgs.push(prompt);
-            const child = spawn(bin, cliArgs, {
-                cwd: args.cwd,
-                env: { ...process.env, ...args.env },
-                stdio: ['ignore', 'pipe', 'pipe'],
-            });
-            let stderrTail = '';
-            child.stderr?.on('data', (c) => {
-                stderrTail = (stderrTail + c.toString()).slice(-4000);
-            });
-            // Arm the turn timeout BEFORE consuming stdout.
-            let timedOut = false;
-            const KILL_GRACE_MS = 5000;
-            let killTimer;
-            const timer = setTimeout(() => {
-                timedOut = true;
-                child.kill('SIGTERM');
-                killTimer = setTimeout(() => { try {
-                    child.kill('SIGKILL');
-                }
-                catch { /* already gone */ } }, KILL_GRACE_MS);
-                killTimer.unref?.();
-            }, TURN_TIMEOUT_MS);
-            const exitPromise = new Promise((res, rej) => {
-                child.on('error', rej);
-                child.on('close', (code) => res(code ?? 1));
-            });
-            exitPromise.catch(() => { });
-            (async () => {
-                const events = [];
-                let buf = '';
-                for await (const chunk of child.stdout) {
-                    buf += chunk.toString();
-                    const parts = buf.split('\n');
-                    buf = parts.pop() ?? '';
-                    for (const line of parts) {
-                        const trimmed = line.trim();
-                        if (!trimmed || !trimmed.startsWith('{'))
-                            continue;
-                        try {
-                            events.push(JSON.parse(trimmed));
-                        }
-                        catch { /* skip */ }
-                    }
-                }
-                if (buf.trim()) {
+            catch { /* already gone */ } }, KILL_GRACE_MS);
+            killTimer.unref?.();
+        }, TURN_TIMEOUT_MS);
+        // Attach the exit promise BEFORE consuming stdout: on a spawn failure
+        // (ENOENT, bad binary) the 'error' event fires almost immediately — if
+        // no listener is attached yet it escapes as an unhandled 'error' event
+        // and crashes the process instead of reaching our catch block.
+        const exitPromise = new Promise((res, rej) => {
+            child.on('error', rej);
+            child.on('close', (code) => res(code ?? 1));
+        });
+        // Prevent an unhandled-rejection crash if the stdout loop below throws
+        // before we await exitPromise (the await still sees the rejection).
+        exitPromise.catch(() => { });
+        let lastThreadId = threadId;
+        // Normalize one parsed wire event: capture the thread id from ANY event
+        // that carries it (resume needs it on the next turn), record
+        // error/usage state, and return the CodexStreamEvent to yield (or null).
+        const handleEvent = (ev) => {
+            if ((ev.type === 'session_configured' || ev.type === 'thread.started')
+                && (ev.session_id || ev.thread_id)) {
+                // LEGACY: session_configured.session_id/.thread_id
+                // CURRENT: thread.started.thread_id
+                lastThreadId = ev.session_id ?? ev.thread_id;
+                return null;
+            }
+            if (ev.type === 'agent_message' && ev.message) {
+                // LEGACY: top-level agent_message.message — whole message, no delta
+                // accumulation needed.
+                const stripped = ev.message.replace(TOOL_CALL_RE, '').trim();
+                return { kind: 'assistant', rawText: ev.message, text: stripped || undefined, threadId: lastThreadId };
+            }
+            if (ev.type === 'item.completed' && ev.item?.type === 'agent_message' && ev.item.text) {
+                // CURRENT: item.completed with item.type === 'agent_message' — same
+                // whole-message shape as legacy, different envelope.
+                const stripped = ev.item.text.replace(TOOL_CALL_RE, '').trim();
+                return { kind: 'assistant', rawText: ev.item.text, text: stripped || undefined, threadId: lastThreadId };
+            }
+            if (ev.type === 'item.started' && ev.item?.type === 'command_execution') {
+                // CURRENT: liveness for codex's own shell tool calls — mirrors
+                // agy's 'tool' step_type forwarding (header's "Streaming / liveness"
+                // note). Only item.started fires this (not item.completed too) to
+                // avoid a duplicate liveness ping per command.
+                return { kind: 'tool', toolName: (ev.item.command ?? 'shell').slice(0, 200), threadId: lastThreadId };
+            }
+            if (ev.type === 'token_count' && ev.info?.last_token_usage) {
+                // LEGACY: last_token_usage is per-TURN; total_token_usage is
+                // cumulative for the whole session — using the latter here would
+                // over-report on every turn after the first.
+                outcome.inputTokens = ev.info.last_token_usage.input_tokens ?? 0;
+                outcome.outputTokens = ev.info.last_token_usage.output_tokens ?? 0;
+                return null;
+            }
+            if (ev.type === 'turn.completed' && ev.usage) {
+                // CURRENT: turn.completed.usage — observed to stay roughly flat
+                // across resumed turns rather than accumulate, i.e. per-turn like
+                // legacy's last_token_usage (see file header).
+                outcome.inputTokens = ev.usage.input_tokens ?? 0;
+                outcome.outputTokens = ev.usage.output_tokens ?? 0;
+                return null;
+            }
+            if (ev.type === 'task_complete') {
+                // LEGACY only — CURRENT has no observed equivalent completion event
+                // carrying an error; see file header on error handling.
+                if (ev.error)
+                    outcome.error = ev.error.message;
+                // last_agent_message is a convenience summary already covered by the
+                // agent_message events collected above — not surfaced again here to
+                // avoid duplicating the same text.
+                return null;
+            }
+            if (ev.type === 'error' && ev.message) {
+                outcome.error = ev.message;
+                return null;
+            }
+            return null;
+        };
+        try {
+            // Immediate liveness yield: session.ts races the FIRST pull against a
+            // 4-minute silent-stream watchdog, and codex's first event can itself
+            // take minutes (long thinking chains, large file reads). Yielding at
+            // spawn wins that race deterministically instead of depending on
+            // codex's latency.
+            yield { kind: 'tool', toolName: 'turn started', threadId };
+            let buf = '';
+            for await (const chunk of child.stdout) {
+                buf += chunk.toString();
+                const parts = buf.split('\n');
+                buf = parts.pop() ?? '';
+                for (const line of parts) {
+                    const trimmed = line.trim();
+                    if (!trimmed || !trimmed.startsWith('{'))
+                        continue;
+                    let ev;
                     try {
-                        events.push(JSON.parse(buf.trim()));
-                    }
-                    catch { /* skip */ }
-                }
-                return events;
-            })()
-                .then((events) => exitPromise.finally(() => { clearTimeout(timer); if (killTimer)
-                clearTimeout(killTimer); }).then((exitCode) => ({ events, exitCode })))
-                .then(({ events, exitCode }) => {
-                const outcome = {
-                    texts: [], rawTexts: [], threadId, exitCode, stderrTail, timedOut,
-                    inputTokens: 0, outputTokens: 0,
-                };
-                for (const ev of events) {
-                    if (ev.type === 'thread.started' && ev.thread_id) {
-                        outcome.threadId = ev.thread_id;
-                    }
-                    else if (ev.type === 'item.completed' && ev.item?.type === 'agent_message' && ev.item.text) {
-                        outcome.rawTexts.push(ev.item.text);
-                    }
-                    else if (ev.type === 'turn.completed' && ev.usage) {
-                        outcome.inputTokens = ev.usage.input_tokens ?? 0;
-                        outcome.outputTokens = ev.usage.output_tokens ?? 0;
-                    }
-                    else if (ev.type === 'turn.failed' && ev.error) {
-                        outcome.error = ev.error.message;
+                        ev = JSON.parse(trimmed);
                     }
-                    else if (ev.type === 'error' && ev.message) {
-                        outcome.error = ev.message;
+                    catch {
+                        continue;
                     }
+                    const out = handleEvent(ev);
+                    if (out)
+                        yield out;
                 }
-                // Strip tool_call fences for bus-visible text (shared regex with
-                // kimi/opencode/antigravity — keeps fence-parsing logic in one place).
-                outcome.texts = outcome.rawTexts.map(t => t.replace(TOOL_CALL_RE, '').trim());
-                resolve(outcome);
-            }, reject);
-        });
+            }
+            const tail = buf.trim();
+            if (tail && tail.startsWith('{')) {
+                try {
+                    const out = handleEvent(JSON.parse(tail));
+                    if (out)
+                        yield out;
+                }
+                catch { /* not JSON, skip */ }
+            }
+        }
+        finally {
+            clearTimeout(timer);
+            if (killTimer)
+                clearTimeout(killTimer);
+            // If the consumer abandons this stream mid-turn (session.ts's silent
+            // abort calls iterator.return(), the mailbox closes, or an error is
+            // thrown downstream), don't leak the CLI subprocess.
+            if (child.exitCode === null && !child.killed) {
+                try {
+                    child.kill('SIGTERM');
+                }
+                catch { /* already gone */ }
+            }
+        }
+        const exitCode = await exitPromise;
+        outcome.threadId = lastThreadId;
+        outcome.exitCode = exitCode;
+        outcome.stderrTail = stderrTail;
+        outcome.timedOut = timedOut;
+    }
+}
+/** Build the actionable error for a failed codex turn. */
+function turnError(outcome, round, bin) {
+    if (outcome.timedOut) {
+        return new Error(`CodexAgentRunner: codex turn (tool round ${round}) exceeded the ${Math.round(TURN_TIMEOUT_MS / 60000)}min ` +
+            `turn timeout and was killed.${outcome.stderrTail ? ` stderr: ${outcome.stderrTail.slice(-500)}` : ''}`);
+    }
+    // Fatal provider errors (auth/permission/quota — classified from the error
+    // field AND stderr): report what actually happened, and tag the error so
+    // the daemon does NOT restart into the same guaranteed failure (a restart
+    // on quota exhaustion can only hang or fail again).
+    const cls = classifyStderr(`${outcome.error ?? ''}\n${outcome.stderrTail}`);
+    if (cls.fatal) {
+        const err = new Error(`CodexAgentRunner: FATAL provider error (${cls.label}) on turn ${round} — not retrying.` +
+            (outcome.error ? ` error: ${outcome.error}` : '') +
+            (outcome.stderrTail ? ` stderr: ${outcome.stderrTail.slice(-500)}` : ''));
+        err.fatal = true;
+        return err;
     }
+    return new Error(`CodexAgentRunner: codex exec failed (exit ${outcome.exitCode})` +
+        (outcome.error ? `: ${outcome.error}` : '') +
+        (outcome.stderrTail ? `\nstderr: ${outcome.stderrTail.slice(-500)}` : ''));
 }
 //# sourceMappingURL=codex-runner.js.map

package/dist/src/orgrt/codex-runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"codex-runner.js","sourceRoot":"","sources":["../../../src/orgrt/codex-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"codex-runner.js","sourceRoot":"","sources":["../../../src/orgrt/codex-runner.ts"],"names":[],"mappings":"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"}

package/dist/src/orgrt/copilot-runner.d.ts

@@ -0,0 +1,14 @@
+import type { AgentRunner, AgentRunArgs, AgentMessage } from './agent-runner.js';
+/** Pure NDJSON parser — exported for unit testing against fixture lines
+ *  (copilot-runner.test.ts). */
+export declare function parseCopilotEvents(lines: string[]): {
+    texts: string[];
+    rawTexts: string[];
+};
+export declare class CopilotAgentRunner implements AgentRunner {
+    private copilotBin?;
+    constructor(copilotBin?: string | undefined);
+    run(args: AgentRunArgs): AsyncIterable<AgentMessage>;
+    private runTurn;
+}
+//# sourceMappingURL=copilot-runner.d.ts.map

package/dist/src/orgrt/copilot-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"copilot-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/copilot-runner.ts"],"names":[],"mappings":"AAyDA,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AA+BjF;gCACgC;AAChC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAqB3F;AAaD,qBAAa,kBAAmB,YAAW,WAAW;IACxC,OAAO,CAAC,UAAU,CAAC;IAA/B,YAAoB,UAAU,CAAC,EAAE,MAAM,YAAA,EAAI;IAEpC,GAAG,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,CA+D1D;IAED,OAAO,CAAC,OAAO;CAgFhB"}