@cat-factory/executor-harness 1.50.0 → 1.50.2

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)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cat-factory/executor-harness",
-  "version": "1.50.0",
+  "version": "1.50.2",
   "description": "Container payload: a thin TypeScript wrapper that runs the Pi coding agent against a cloned repo and opens a PR. Runs in the Cloudflare Container (and, in local native mode, as a host process); carries no secrets.",
   "repository": {
     "type": "git",
@@ -26,8 +26,8 @@
     "hono": "^4.12.30",
     "typescript": "7.0.2",
     "vitest": "^4.1.10",
-    "@cat-factory/server": "0.138.7",
-    "@cat-factory/spend": "0.12.62"
+    "@cat-factory/server": "0.138.11",
+    "@cat-factory/spend": "0.12.63"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",

package/src/agent-runner.ts

@@ -118,14 +118,14 @@ function attributeCumulativeUsage(
  * the role + best-practice context is not lost.
  */
 function streamCli(
-  command: string,
-  args: string[],
+  cli: { command: string; args: string[] },
   prompt: string,
   opts: SubscriptionRunOptions,
   env: Record<string, string>,
   secrets: string[],
   onEvent: (event: Record<string, unknown>) => void,
 ): Promise<{ stderrTail: string }> {
+  const { command, args } = cli
   return new Promise((resolve, reject) => {
     if (opts.signal?.aborted) {
       reject(new Error(`${command} aborted before start`))
@@ -374,23 +374,25 @@ export async function runClaudeCode(opts: SubscriptionRunOptions): Promise<PiRun
 
   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,
-      ],
+      {
+        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,
@@ -594,18 +596,20 @@ export async function runCodex(opts: SubscriptionRunOptions): Promise<PiRunOutco
 
   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,
-        '-',
-      ],
+      {
+        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 } : {},