oh-my-codex 0.16.2 → 0.16.3

package/dist/team/__tests__/runtime.test.js

@@ -296,6 +296,10 @@ if (stateRoot && teamName && workerName) {
 }
 `;
     await writeFile(binaryPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 ${bootstrap}
 ${scriptBody}
 `, { mode: 0o755 });
@@ -329,6 +333,22 @@ async function withPromptModeCodexEnv(binDir, extraEnv, run) {
         }
     }
 }
+function fakeCodexShellScript(body) {
+    return `#!/bin/sh
+if [ "\${1:-}" = "--version" ] || [ "\${1:-}" = "-V" ]; then
+  echo "codex 0.0.0-test"
+  exit 0
+fi
+${body}`;
+}
+function fakeCodexNodeScript(body) {
+    return `#!/usr/bin/env node
+if (process.argv.includes('--version') || process.argv.includes('-V')) {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
+${body}`;
+}
 function teamStateTestPath(cwd, ...parts) {
     const stateRoot = process.env.OMX_TEAM_STATE_ROOT ?? join(cwd, '.omx', 'state');
     return join(stateRoot, ...parts);
@@ -727,7 +747,7 @@ describe('runtime', () => {
 set -eu
 printf '%s\\n' "$*" >> "${tmuxLogPath}"
 case "$1" in
-  -V)
+  --version|-V)
     echo "tmux 3.4"
     exit 0
     ;;
@@ -787,7 +807,7 @@ esac
                 binaries: [
                     {
                         name: 'codex',
-                        content: '#!/bin/sh\nsleep 30\n',
+                        content: fakeCodexShellScript('sleep 30\n'),
                     },
                 ],
             }, async () => {
@@ -942,7 +962,7 @@ esac
                 binaries: [
                     {
                         name: 'codex',
-                        content: '#!/bin/sh\nsleep 30\n',
+                        content: fakeCodexShellScript('sleep 30\n'),
                     },
                 ],
             }, async ({ tmuxLogPath }) => {
@@ -1452,7 +1472,7 @@ EOF
     ;;
 esac
 `,
-                binaries: [{ name: 'codex', content: '#!/bin/sh\nexit 0\n' }],
+                binaries: [{ name: 'codex', content: fakeCodexShellScript('exit 0\n') }],
             }, async ({ tmuxLogPath }) => {
                 delete process.env.TMUX;
                 process.env.TMUX_PANE = '%1';
@@ -1581,7 +1601,7 @@ EOF
     ;;
 esac
 `,
-                binaries: [{ name: 'codex', content: '#!/bin/sh\nexit 0\n' }],
+                binaries: [{ name: 'codex', content: fakeCodexShellScript('exit 0\n') }],
             }, async () => {
                 delete process.env.TMUX;
                 process.env.TMUX_PANE = '%1';
@@ -1698,7 +1718,7 @@ case "$1" in
     ;;
 esac
 `,
-                binaries: [{ name: 'codex', content: '#!/usr/bin/env node\nprocess.stdin.resume();\n' }],
+                binaries: [{ name: 'codex', content: fakeCodexNodeScript('process.stdin.resume();\n') }],
             }, async () => {
                 delete process.env.TMUX;
                 process.env.TMUX_PANE = '%1';
@@ -1820,7 +1840,7 @@ case "$1" in
     ;;
 esac
 `,
-                binaries: [{ name: 'codex', content: '#!/usr/bin/env node\nprocess.stdin.resume();\n' }],
+                binaries: [{ name: 'codex', content: fakeCodexNodeScript('process.stdin.resume();\n') }],
             }, async () => {
                 delete process.env.TMUX;
                 process.env.TMUX_PANE = '%1';
@@ -1966,7 +1986,7 @@ case "$1" in
     ;;
 esac
 `,
-                binaries: [{ name: 'codex', content: '#!/usr/bin/env node\nprocess.stdin.resume();\n' }],
+                binaries: [{ name: 'codex', content: fakeCodexNodeScript('process.stdin.resume();\n') }],
             }, async () => {
                 delete process.env.TMUX;
                 process.env.TMUX_PANE = '%1';
@@ -2108,11 +2128,10 @@ esac
                 binaries: [
                     {
                         name: 'codex',
-                        content: `#!/usr/bin/env node
-process.stdin.resume();
+                        content: fakeCodexNodeScript(`process.stdin.resume();
 setTimeout(() => process.exit(0), 30000);
 process.on('SIGTERM', () => process.exit(0));
-`,
+`),
                     },
                 ],
             }, async () => {
@@ -2215,7 +2234,7 @@ process.on('SIGTERM', () => process.exit(0));
 set -eu
 order_file="${cwd}/dead-pane-order.log"
 case "$1" in
-  -V)
+  --version|-V)
     echo "tmux 3.4"
     exit 0
     ;;
@@ -2268,14 +2287,14 @@ case "$1" in
     ;;
 esac
 `,
-                binaries: [{ name: 'codex', content: '#!/usr/bin/env node\nprocess.stdin.resume();\n' }],
+                binaries: [{ name: 'codex', content: fakeCodexNodeScript('setTimeout(() => process.exit(0), 100);\n') }],
             }, async () => {
                 delete process.env.TMUX;
                 process.env.TMUX_PANE = '%1';
                 process.env.OMX_TEAM_WORKER_LAUNCH_MODE = 'interactive';
                 process.env.OMX_TEAM_WORKER_CLI = 'codex';
-                process.env.OMX_TEAM_READY_TIMEOUT_MS = '300';
-                process.env.OMX_TEAM_STARTUP_EVIDENCE_TIMEOUT_MS = '50';
+                process.env.OMX_TEAM_READY_TIMEOUT_MS = '5000';
+                process.env.OMX_TEAM_STARTUP_EVIDENCE_TIMEOUT_MS = '500';
                 process.env.OMX_TEAM_STARTUP_DISPATCH_RETRIES = '1';
                 receiptFailer = setInterval(() => {
                     void (async () => {
@@ -2418,7 +2437,7 @@ case "$1" in
     ;;
 esac
 `,
-                binaries: [{ name: 'codex', content: '#!/usr/bin/env node\nprocess.stdin.resume();\n' }],
+                binaries: [{ name: 'codex', content: fakeCodexNodeScript('process.stdin.resume();\n') }],
             }, async () => {
                 delete process.env.TMUX;
                 process.env.TMUX_PANE = '%1';
@@ -2564,11 +2583,10 @@ esac
                 binaries: [
                     {
                         name: 'codex',
-                        content: `#!/usr/bin/env node
-process.stdin.resume();
+                        content: fakeCodexNodeScript(`process.stdin.resume();
 setTimeout(() => process.exit(0), 30000);
 process.on('SIGTERM', () => process.exit(0));
-`,
+`),
                     },
                 ],
             }, async () => {
@@ -2842,6 +2860,10 @@ sleep 5
         const fakeCodexPath = join(binDir, 'codex');
         await mkdir(binDir, { recursive: true });
         await writeFile(fakeCodexPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 process.exit(0);
 `, { mode: 0o755 });
         const prevPath = process.env.PATH;
@@ -2894,6 +2916,10 @@ process.exit(0);
         await writeFile(join(promptsDir, 'test-engineer.md'), '<identity>Test Engineer</identity>');
         await writeFile(join(promptsDir, 'writer.md'), '<identity>You are Writer.</identity>');
         await writeFile(fakeCodexPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 const fs = require('fs');
 const path = require('path');
 const worker = String(process.env.OMX_TEAM_WORKER || 'unknown').replace(/[^a-zA-Z0-9_-]+/g, '__');
@@ -3016,6 +3042,10 @@ process.on('SIGTERM', () => process.exit(0));
         await mkdir(promptsDir, { recursive: true });
         await writeFile(join(promptsDir, 'writer.md'), '<identity>You are Writer.</identity>');
         await writeFile(fakeCodexPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 const fs = require('fs');
 const path = require('path');
 const worker = String(process.env.OMX_TEAM_WORKER || 'unknown').replace(/[^a-zA-Z0-9_-]+/g, '__');
@@ -3106,6 +3136,10 @@ process.on('SIGTERM', () => process.exit(0));
         const fakeCodexPath = join(binDir, 'codex');
         await mkdir(binDir, { recursive: true });
         await writeFile(fakeCodexPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 process.stdin.resume();
 setTimeout(() => process.exit(0), 5000);
 process.on('SIGTERM', () => process.exit(0));
@@ -3273,6 +3307,10 @@ exit 0
         const envLogPath = join(logDir, 'env.json');
         await mkdir(binDir, { recursive: true });
         await writeFile(fakeCodexPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 const fs = require('fs');
 const path = require('path');
 const logDir = process.env.OMX_TEST_LOG_DIR;
@@ -3359,6 +3397,10 @@ process.on('SIGTERM', () => process.exit(0));
         const fakeCodexPath = join(binDir, 'codex');
         await mkdir(binDir, { recursive: true });
         await writeFile(fakeCodexPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 process.stdin.resume();
 setTimeout(() => process.exit(0), 5000);
 process.on('SIGTERM', () => process.exit(0));
@@ -3415,6 +3457,10 @@ process.on('SIGTERM', () => process.exit(0));
         const logDir = await mkdtemp(join(tmpdir(), 'omx-runtime-prompt-logs-'));
         const envLogPath = join(logDir, 'env.json');
         await writeFile(fakeCodexPath, `#!/usr/bin/env node
+if (process.argv[2] === '--version') {
+  console.log('codex 0.0.0-test');
+  process.exit(0);
+}
 const fs = require('fs');
 const path = require('path');
 const logDir = process.env.OMX_TEST_LOG_DIR;
@@ -5450,6 +5496,53 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('startTeam injects approved handoff context into ready approved worker inboxes', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-approved-handoff-'));
+        const binDir = join(cwd, 'bin');
+        const fakeCodexPath = join(binDir, 'codex');
+        const approvedTask = 'Execute approved issue 1314 handoff plan';
+        await mkdir(binDir, { recursive: true });
+        await mkdir(join(cwd, '.omx', 'plans'), { recursive: true });
+        const prdPath = join(cwd, '.omx', 'plans', 'prd-issue-1314-handoff.md');
+        const testSpecPath = join(cwd, '.omx', 'plans', 'test-spec-issue-1314-handoff.md');
+        await writeFile(prdPath, [
+            '# Approved plan',
+            '',
+            buildContextPackOutcome(canonicalContextPackRelativePath('issue-1314-handoff')),
+            '',
+            `Launch via omx team 1:executor "${approvedTask}"`,
+        ].join('\n'));
+        await writeFile(testSpecPath, '# Test spec\n');
+        await writeReadyContextPack(cwd, 'issue-1314-handoff', prdPath, testSpecPath);
+        await writeFile(join(cwd, '.omx', 'plans', 'repo-context-issue-1314-handoff.md'), 'Read the approved repository slice first.\n');
+        await writeFakePromptWorkerBinary(fakeCodexPath, `setTimeout(() => {}, 5000);`);
+        let runtime = null;
+        try {
+            runtime = await withPromptModeCodexEnv(binDir, {}, () => withoutTeamWorkerEnv(() => startTeam('team-approved-handoff', 'approved handoff context test', 'executor', 1, [{ subject: 's', description: 'd', owner: 'worker-1' }], cwd, {
+                approvedExecution: {
+                    prd_path: prdPath,
+                    task: approvedTask,
+                    command: `omx team 1:executor "${approvedTask}"`,
+                },
+            })));
+            const inbox = await readFile(join(cwd, '.omx', 'state', 'team', runtime.teamName, 'workers', 'worker-1', 'inbox.md'), 'utf-8');
+            assert.match(inbox, /## Approved Handoff Context/);
+            assert.match(inbox, new RegExp(`Approved plan: ${prdPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`));
+            assert.match(inbox, new RegExp(`Test specs: ${testSpecPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`));
+            assert.match(inbox, /Approved repository context summary source: .*repo-context-issue-1314-handoff\.md/);
+            assert.match(inbox, /Read the approved repository slice first\./);
+            assert.match(inbox, /Build refs \(read first\): src\/build-1\.ts/);
+            assert.match(inbox, /Verify refs: src\/verify-2\.ts/);
+            assert.match(inbox, /Scope refs: src\/scope-0\.ts/);
+            assert.doesNotMatch(inbox, /query the canonical pack|Context pack index/);
+        }
+        finally {
+            if (runtime) {
+                await shutdownTeam(runtime.teamName, cwd, { force: true }).catch(() => { });
+            }
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it('startTeam keeps explicit plan-only approved bindings on the generic path', async () => {
         const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-approved-binding-plan-only-'));
         const binDir = join(cwd, 'bin');
@@ -5470,6 +5563,8 @@ esac
             })));
             const bindingPath = join(runtime.config.team_state_root ?? join(cwd, '.omx', 'state'), 'team', runtime.teamName, 'approved-execution.json');
             assert.equal(existsSync(bindingPath), false);
+            const inbox = await readFile(join(cwd, '.omx', 'state', 'team', runtime.teamName, 'workers', 'worker-1', 'inbox.md'), 'utf-8');
+            assert.doesNotMatch(inbox, /## Approved Handoff Context/);
         }
         finally {
             if (runtime) {
@@ -5654,6 +5749,65 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('assignTask injects approved handoff context when the persisted approved binding remains ready', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-approved-followup-'));
+        const approvedTask = 'Execute approved issue 1320 plan';
+        try {
+            await initTeamState('team-approved-followup', 'assignment test', 'executor', 1, cwd);
+            const manifestPath = teamStateTestPath(cwd, 'team', 'team-approved-followup', 'manifest.v2.json');
+            const manifest = JSON.parse(await readFile(manifestPath, 'utf-8'));
+            manifest.policy = { ...(manifest.policy || {}), dispatch_ack_timeout_ms: 250 };
+            await writeFile(manifestPath, JSON.stringify(manifest, null, 2));
+            const plansDir = join(cwd, '.omx', 'plans');
+            await mkdir(plansDir, { recursive: true });
+            const prdPath = join(plansDir, 'prd-issue-1320.md');
+            const testSpecPath = join(plansDir, 'test-spec-issue-1320.md');
+            await writeFile(prdPath, [
+                '# Approved plan',
+                '',
+                buildContextPackOutcome(canonicalContextPackRelativePath('issue-1320')),
+                '',
+                `Launch via omx team 1:executor "${approvedTask}"`,
+            ].join('\n'));
+            await writeFile(testSpecPath, '# Test spec\n');
+            await writeReadyContextPack(cwd, 'issue-1320', prdPath, testSpecPath);
+            await writeFile(join(plansDir, 'repo-context-issue-1320.md'), 'Follow the approved repository slice before broader repo exploration.\n');
+            await writePersistedApprovedTeamExecutionBinding('team-approved-followup', cwd, {
+                prd_path: prdPath,
+                task: approvedTask,
+                command: `omx team 1:executor "${approvedTask}"`,
+            });
+            const task = await createTask('team-approved-followup', { subject: 'Implement approved follow-up', description: 'Implement approved follow-up', status: 'pending' }, cwd);
+            const assignPromise = assignTask('team-approved-followup', 'worker-1', task.id, cwd);
+            const deadline = Date.now() + 2_000;
+            let delivered = false;
+            while (Date.now() < deadline && !delivered) {
+                const requests = await listDispatchRequests('team-approved-followup', cwd, { kind: 'inbox', to_worker: 'worker-1' });
+                if (!requests.some((request) => request.status === 'pending')) {
+                    await new Promise((resolve) => setTimeout(resolve, 20));
+                    continue;
+                }
+                await markPendingInboxDispatchesDelivered('team-approved-followup', cwd, {
+                    toWorker: 'worker-1',
+                    lastReason: 'test_delivered_receipt',
+                });
+                delivered = true;
+            }
+            assert.ok(delivered, 'expected follow-up inbox dispatch request to be queued');
+            await assignPromise;
+            const inbox = await readFile(join(cwd, '.omx', 'state', 'team', 'team-approved-followup', 'workers', 'worker-1', 'inbox.md'), 'utf-8');
+            assert.match(inbox, /## Approved Handoff Context/);
+            assert.match(inbox, new RegExp(`Approved plan: ${prdPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}`));
+            assert.match(inbox, /Build refs \(read first\): src\/build-1\.ts/);
+            assert.match(inbox, /Verify refs: src\/verify-2\.ts/);
+            assert.match(inbox, /Scope refs: src\/scope-0\.ts/);
+            assert.match(inbox, /Follow the approved repository slice before broader repo exploration\./);
+            assert.doesNotMatch(inbox, /query the canonical pack|Context pack index/);
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it('monitorTeam does not re-notify already-notified mailbox messages (issue #116)', async () => {
         // Regression: deliverPendingMailboxMessages used to re-notify every 15 s via shouldRetry.
         // After the fix it must NOT re-notify messages that already have notified_at set.