@cat-factory/executor-harness 1.50.0 → 1.50.4

package/dist/agent-runner.js

@@ -39,7 +39,8 @@ function attributeCumulativeUsage(calls, usage) {
  * system-prompt flag — the caller prepends the composed system prompt to it so
  * the role + best-practice context is not lost.
  */
-function streamCli(command, args, prompt, opts, env, secrets, onEvent) {
+function streamCli(cli, prompt, opts, env, secrets, onEvent) {
+    const { command, args } = cli;
     return new Promise((resolve, reject) => {
         if (opts.signal?.aborted) {
             reject(new Error(`${command} aborted before start`));
@@ -271,22 +272,25 @@ export async function runClaudeCode(opts) {
                 : { CLAUDE_CODE_OAUTH_TOKEN: opts.subscriptionToken }),
         };
     try {
-        const { stderrTail } = await streamCli('claude', [
-            '-p',
-            '--output-format',
-            'stream-json',
-            '--verbose',
-            // The per-run container IS the sandbox, and the run is fully headless (no one
-            // to approve a tool call) — so bypass permissions entirely. `acceptEdits`
-            // would auto-accept file edits but still gate Bash, which in `-p` mode is then
-            // denied, leaving the agent unable to run builds/tests/git to verify its work.
-            '--permission-mode',
-            'bypassPermissions',
-            '--model',
-            opts.model,
-            '--append-system-prompt',
-            opts.systemPrompt,
-        ], opts.userPrompt, opts, env, opts.subscriptionToken ? secretsToRedact(opts.subscriptionToken) : [], onEvent);
+        const { stderrTail } = await streamCli({
+            command: 'claude',
+            args: [
+                '-p',
+                '--output-format',
+                'stream-json',
+                '--verbose',
+                // The per-run container IS the sandbox, and the run is fully headless (no one
+                // to approve a tool call) — so bypass permissions entirely. `acceptEdits`
+                // would auto-accept file edits but still gate Bash, which in `-p` mode is then
+                // denied, leaving the agent unable to run builds/tests/git to verify its work.
+                '--permission-mode',
+                'bypassPermissions',
+                '--model',
+                opts.model,
+                '--append-system-prompt',
+                opts.systemPrompt,
+            ],
+        }, opts.userPrompt, opts, env, opts.subscriptionToken ? secretsToRedact(opts.subscriptionToken) : [], onEvent);
         attributeCumulativeUsage(calls, usage);
         return {
             summary,
@@ -472,17 +476,20 @@ export async function runCodex(opts) {
         }
     };
     try {
-        const { stderrTail } = await streamCli('codex', [
-            'exec',
-            '--json',
-            '--skip-git-repo-check',
-            // The per-run container IS the sandbox; let Codex write files and reach the
-            // vendor unrestricted, with no approval prompts (the run is headless).
-            '--dangerously-bypass-approvals-and-sandbox',
-            '--model',
-            opts.model,
-            '-',
-        ], prompt, opts, codexHome ? { CODEX_HOME: codexHome } : {}, opts.subscriptionToken ? secretsToRedact(opts.subscriptionToken) : [], onEvent);
+        const { stderrTail } = await streamCli({
+            command: 'codex',
+            args: [
+                'exec',
+                '--json',
+                '--skip-git-repo-check',
+                // The per-run container IS the sandbox; let Codex write files and reach the
+                // vendor unrestricted, with no approval prompts (the run is headless).
+                '--dangerously-bypass-approvals-and-sandbox',
+                '--model',
+                opts.model,
+                '-',
+            ],
+        }, prompt, opts, codexHome ? { CODEX_HOME: codexHome } : {}, opts.subscriptionToken ? secretsToRedact(opts.subscriptionToken) : [], onEvent);
         // Fallback for a CLI/version that never emits per-turn `last_token_usage`: record a
         // single call from the cumulative total + final text so the run is still observable.
         if (calls.length === 0 && (usage || summary)) {