diff --git a/src/__tests__/app-server-recovery/CodexAppServerSupervisor.test.ts b/src/__tests__/app-server-recovery/CodexAppServerSupervisor.test.ts index 876198fdd..6f1aaa4c4 100644 --- a/src/__tests__/app-server-recovery/CodexAppServerSupervisor.test.ts +++ b/src/__tests__/app-server-recovery/CodexAppServerSupervisor.test.ts @@ -9,6 +9,15 @@ import {fakeAppServer, fakeSpawner} from "./fake-app-server"; const FAST = {closeGraceMs: 20, drainMs: 1, terminateAfterMs: 20, abandonAfterMs: 20, wedgedAfterMs: 20}; +function writeNodeScript(dir: string, source: string): string { + const script = path.join(dir, "codex"); + fs.writeFileSync(`${script}.js`, source); + const node = `'${process.execPath.replace(/'/g, "'\\''")}'`; + fs.writeFileSync(script, `#!/bin/sh\nexec ${node} "$0.js" "$@"\n`); + fs.chmodSync(script, 0o755); + return script; +} + function supervisorWith(configure?: Parameters[0]) { const initial = fakeAppServer(); const state = {connection: initial.connection, codexPath: undefined, stderr: ""}; @@ -39,11 +48,9 @@ describe("CodexAppServerSupervisor", () => { it.skipIf(process.platform === "win32")("delivers a notification written right before the exit, then disposes", async () => { const dir = fs.mkdtempSync(path.join(os.tmpdir(), "codex-dying-")); - const script = path.join(dir, "codex"); - fs.writeFileSync(script, `#!/usr/bin/env node + const script = writeNodeScript(dir, ` process.stdout.write(JSON.stringify({method: "turn/completed", params: {threadId: "t", turn: {id: "u"}}}) + "\\n", () => process.exit(1)); `); - fs.chmodSync(script, 0o755); const state = {connection: startCodexConnection(script, undefined, undefined, {disposeOnExit: false}), codexPath: script, stderr: ""}; const received: string[] = []; state.connection.connection.onUnhandledNotification((notification) => { @@ -65,14 +72,12 @@ process.stdout.write(JSON.stringify({method: "turn/completed", params: {threadId it.skipIf(process.platform === "win32")("delivers a burst of output written before the exit, up to its last message", async () => { const dir = fs.mkdtempSync(path.join(os.tmpdir(), "codex-burst-")); - const script = path.join(dir, "codex"); - fs.writeFileSync(script, `#!/usr/bin/env node + const script = writeNodeScript(dir, ` let out = ""; for (let i = 0; i < 10000; i++) out += JSON.stringify({method: "item/agentMessage/delta", params: {threadId: "t", delta: "x"}}) + "\\n"; out += JSON.stringify({method: "turn/completed", params: {threadId: "t", turn: {id: "u"}}}) + "\\n"; process.stdout.write(out, () => process.exit(1)); `); - fs.chmodSync(script, 0o755); const state = {connection: startCodexConnection(script, undefined, undefined, {disposeOnExit: false}), codexPath: script, stderr: ""}; let deltas = 0; let completedBeforeDispose = false; @@ -95,14 +100,12 @@ process.stdout.write(out, () => process.exit(1)); it.skipIf(process.platform === "win32")("waits for a backlog that takes longer to handle than the close grace time", async () => { const dir = fs.mkdtempSync(path.join(os.tmpdir(), "codex-backlog-")); - const script = path.join(dir, "codex"); - fs.writeFileSync(script, `#!/usr/bin/env node + const script = writeNodeScript(dir, ` let out = ""; for (let i = 0; i < 2000; i++) out += JSON.stringify({method: "item/agentMessage/delta", params: {threadId: "t", delta: "x"}}) + "\\n"; out += JSON.stringify({method: "turn/completed", params: {threadId: "t", turn: {id: "u"}}}) + "\\n"; process.stdout.write(out, () => process.exit(1)); `); - fs.chmodSync(script, 0o755); const state = {connection: startCodexConnection(script, undefined, undefined, {disposeOnExit: false}), codexPath: script, stderr: ""}; let completed = false; state.connection.connection.onUnhandledNotification((notification) => {