oh-my-codex 0.14.4 → 0.15.1

package/dist/team/__tests__/tmux-session.test.js

@@ -6,7 +6,7 @@ import { PassThrough } from 'node:stream';
 import { chmod, mkdir, mkdtemp, readFile, rm, writeFile } from 'fs/promises';
 import { join } from 'path';
 import { tmpdir } from 'os';
-import { buildClientAttachedReconcileHookName, assertTeamWorkerCliBinaryAvailable, buildWorkerProcessLaunchSpec, buildReconcileHudResizeArgs, buildRegisterClientAttachedReconcileArgs, buildRegisterResizeHookArgs, buildResizeHookName, buildResizeHookTarget, buildScheduleDelayedHudResizeArgs, buildUnregisterClientAttachedReconcileArgs, buildUnregisterResizeHookArgs, buildWorkerStartupCommand, buildHudPaneTarget, chooseTeamLeaderPaneId, createTeamSession, enableMouseScrolling, isMsysOrGitBash, isNativeWindows, isTmuxAvailable, restoreStandaloneHudPane, translatePathForMsys, isWsl2, isWorkerAlive, killWorker, killWorkerByPaneId, teardownWorkerPanes, listTeamSessions, resolveTeamWorkerCli, resolveTeamWorkerLaunchMode, resolveWorkerCliForSend, resolveTeamWorkerCliPlan, buildWorkerSubmitPlan, sanitizeTeamName, shouldAttemptAdaptiveRetry, sendToWorker, sendToWorkerStdin, sleepFractionalSeconds, translateWorkerLaunchArgsForCli, waitForWorkerReady, paneIsBootstrapping, dismissTrustPromptIfPresent, mitigateCopyModeUnderlineArtifacts, } from '../tmux-session.js';
+import { buildClientAttachedReconcileHookName, assertTeamWorkerCliBinaryAvailable, buildWorkerProcessLaunchSpec, buildReconcileHudResizeArgs, buildRegisterClientAttachedReconcileArgs, buildRegisterResizeHookArgs, buildResizeHookName, buildResizeHookTarget, buildScheduleDelayedHudResizeArgs, buildUnregisterClientAttachedReconcileArgs, buildUnregisterResizeHookArgs, buildWorkerStartupCommand, buildHudPaneTarget, chooseTeamLeaderPaneId, createTeamSession, enableMouseScrolling, isMsysOrGitBash, isNativeWindows, isTmuxAvailable, restoreStandaloneHudPane, translatePathForMsys, isWsl2, isWorkerAlive, killWorker, killWorkerByPaneId, teardownWorkerPanes, listTeamSessions, resolveTeamWorkerCli, resolveTeamWorkerLaunchMode, resolveWorkerCliForSend, resolveTeamWorkerCliPlan, buildWorkerSubmitPlan, sanitizeTeamName, shouldAttemptAdaptiveRetry, sendToWorker, sendToWorkerStdin, sleepFractionalSeconds, translateWorkerLaunchArgsForCli, waitForWorkerReady, waitForWorkerReadyAsync, paneIsBootstrapping, dismissTrustPromptIfPresent, mitigateCopyModeUnderlineArtifacts, } from '../tmux-session.js';
 import { HUD_RESIZE_RECONCILE_DELAY_SECONDS, HUD_TMUX_TEAM_HEIGHT_LINES } from '../../hud/constants.js';
 import * as tmuxSessionModule from '../tmux-session.js';
 import { OMX_ENTRY_PATH_ENV, OMX_STARTUP_CWD_ENV } from '../../utils/paths.js';
@@ -773,6 +773,28 @@ describe('buildWorkerStartupCommand', () => {
                 delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         }
     });
+    it('accepts MacPorts zsh as a supported worker shell without falling back', () => {
+        const prevShell = process.env.SHELL;
+        const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        process.env.SHELL = '/opt/local/bin/zsh';
+        process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
+        try {
+            const cmd = withMockedExistsSync((candidate) => candidate === '/opt/local/bin/zsh', () => buildWorkerStartupCommand('alpha', 2));
+            assert.match(cmd, /'\/opt\/local\/bin\/zsh' -c/);
+            assert.doesNotMatch(cmd, /'\/bin\/sh' -c/);
+            assert.match(cmd, /source ~\/\.zshrc/);
+        }
+        finally {
+            if (typeof prevShell === 'string')
+                process.env.SHELL = prevShell;
+            else
+                delete process.env.SHELL;
+            if (typeof prevBypass === 'string')
+                process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = prevBypass;
+            else
+                delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        }
+    });
     it('uses bash with ~/.bashrc and preserves launch args', () => {
         const prevShell = process.env.SHELL;
         process.env.SHELL = '/bin/bash';
@@ -1907,6 +1929,48 @@ describe('team worker launch mode helpers', () => {
             await rm(fakeRoot, { recursive: true, force: true });
         }
     });
+    it('buildWorkerProcessLaunchSpec preserves ambient CODEX_HOME so Codex workers keep provider websocket metadata', async () => {
+        const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        const prevCodexHome = process.env.CODEX_HOME;
+        const prevProviderEnv = process.env.CUSTOM_PROVIDER_API_KEY;
+        const codexHome = await mkdtemp(join(tmpdir(), 'omx-team-provider-websocket-'));
+        process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
+        process.env.CODEX_HOME = codexHome;
+        process.env.CUSTOM_PROVIDER_API_KEY = 'test-secret';
+        try {
+            await writeFile(join(codexHome, 'config.toml'), [
+                'model = "gpt-5.5"',
+                'model_provider = "custom_provider"',
+                '',
+                '[model_providers.custom_provider]',
+                'name = "custom_provider"',
+                'base_url = "http://localhost:3000/v1"',
+                'wire_api = "responses"',
+                'supports_websockets = true',
+                'requires_openai_auth = true',
+                'env_key = "CUSTOM_PROVIDER_API_KEY"',
+                '',
+            ].join('\n'));
+            const spec = buildWorkerProcessLaunchSpec('websocket-team', 1, [], '/tmp/workspace', {}, 'codex');
+            assert.equal(spec.env.CODEX_HOME, codexHome);
+            assert.equal(spec.env.CUSTOM_PROVIDER_API_KEY, 'test-secret');
+        }
+        finally {
+            if (typeof prevBypass === 'string')
+                process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = prevBypass;
+            else
+                delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+            if (typeof prevCodexHome === 'string')
+                process.env.CODEX_HOME = prevCodexHome;
+            else
+                delete process.env.CODEX_HOME;
+            if (typeof prevProviderEnv === 'string')
+                process.env.CUSTOM_PROVIDER_API_KEY = prevProviderEnv;
+            else
+                delete process.env.CUSTOM_PROVIDER_API_KEY;
+            await rm(codexHome, { recursive: true, force: true });
+        }
+    });
     it('buildWorkerProcessLaunchSpec injects the active provider env_key from CODEX_HOME config.toml', async () => {
         const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         const prevCodexHome = process.env.CODEX_HOME;
@@ -1946,6 +2010,60 @@ describe('team worker launch mode helpers', () => {
             await rm(codexHome, { recursive: true, force: true });
         }
     });
+    it('buildWorkerProcessLaunchSpec uses CLI model_provider override for Codex provider env injection', async () => {
+        const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        const prevCodexHome = process.env.CODEX_HOME;
+        const prevDefaultProviderEnv = process.env.DEFAULT_PROVIDER_API_KEY;
+        const prevCheapProviderEnv = process.env.CHEAP_PROVIDER_API_KEY;
+        const codexHome = await mkdtemp(join(tmpdir(), 'omx-team-provider-cli-override-'));
+        process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
+        process.env.CODEX_HOME = codexHome;
+        process.env.DEFAULT_PROVIDER_API_KEY = 'default-secret';
+        process.env.CHEAP_PROVIDER_API_KEY = 'cheap-secret';
+        try {
+            await writeFile(join(codexHome, 'config.toml'), [
+                'model_provider = "default_provider"',
+                '',
+                '[model_providers.default_provider]',
+                'name = "default_provider"',
+                'base_url = "http://localhost:3000/v1"',
+                'wire_api = "responses"',
+                'requires_openai_auth = true',
+                'env_key = "DEFAULT_PROVIDER_API_KEY"',
+                '',
+                '[model_providers.cheapRouter]',
+                'name = "cheapRouter"',
+                'base_url = "http://localhost:4000/v1"',
+                'wire_api = "responses"',
+                'requires_openai_auth = true',
+                'env_key = "CHEAP_PROVIDER_API_KEY"',
+                '',
+            ].join('\n'));
+            const spec = buildWorkerProcessLaunchSpec('provider-override-team', 1, ['-c', 'model_provider="cheapRouter"', '--model', 'gpt-5.5'], '/tmp/workspace', {}, 'codex');
+            assert.equal(spec.env.CHEAP_PROVIDER_API_KEY, 'cheap-secret');
+            assert.equal(spec.env.DEFAULT_PROVIDER_API_KEY, undefined);
+            assert.deepEqual(spec.args.slice(0, 4), ['-c', 'model_provider="cheapRouter"', '--model', 'gpt-5.5']);
+        }
+        finally {
+            if (typeof prevBypass === 'string')
+                process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = prevBypass;
+            else
+                delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+            if (typeof prevCodexHome === 'string')
+                process.env.CODEX_HOME = prevCodexHome;
+            else
+                delete process.env.CODEX_HOME;
+            if (typeof prevDefaultProviderEnv === 'string')
+                process.env.DEFAULT_PROVIDER_API_KEY = prevDefaultProviderEnv;
+            else
+                delete process.env.DEFAULT_PROVIDER_API_KEY;
+            if (typeof prevCheapProviderEnv === 'string')
+                process.env.CHEAP_PROVIDER_API_KEY = prevCheapProviderEnv;
+            else
+                delete process.env.CHEAP_PROVIDER_API_KEY;
+            await rm(codexHome, { recursive: true, force: true });
+        }
+    });
     it('buildWorkerProcessLaunchSpec does not inject the active provider env_key for non-codex workers', async () => {
         const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         const prevCodexHome = process.env.CODEX_HOME;
@@ -1968,6 +2086,7 @@ describe('team worker launch mode helpers', () => {
             ].join('\n'));
             const spec = buildWorkerProcessLaunchSpec('delta-team', 1, [], '/tmp/workspace', {}, 'claude');
             assert.equal(spec.workerCli, 'claude');
+            assert.equal(spec.env.CODEX_HOME, undefined);
             assert.equal(spec.env.CUSTOM_PROVIDER_API_KEY, undefined);
         }
         finally {
@@ -2294,7 +2413,7 @@ EOF
     ;;
 esac
 `, async ({ logPath }) => {
-            assert.equal(waitForWorkerReady('omx-team-x', 1, 1_000), true);
+            assert.equal(waitForWorkerReady('omx-team-x', 1, 5_000), true);
             const log = await readFile(logPath, 'utf-8');
             assert.match(log, /send-keys -t omx-team-x:1 -l -- 2/);
             assert.match(log, /send-keys -t omx-team-x:1 C-m/);
@@ -2337,6 +2456,186 @@ esac
         });
     });
 });
+describe('waitForWorkerReadyAsync parity', () => {
+    it('uses visible capture-pane argv without tail flags', async () => {
+        await withMockTmuxFixture('omx-tmux-worker-ready-async-visible-capture-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+            assert.equal(await waitForWorkerReadyAsync('omx-team-x', 1, 1_000), true);
+            const log = await readFile(logPath, 'utf-8');
+            assert.match(log, /capture-pane -t omx-team-x:1 -p/);
+            assert.doesNotMatch(log, /capture-pane -t omx-team-x:1 -p -S/);
+        });
+    });
+    it('falls back to recent scrollback only when visible slice shows a live Codex viewport', async () => {
+        await withMockTmuxFixture('omx-tmux-worker-ready-async-scrollback-fallback-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    if printf '%s\n' "$*" | grep -q -- ' -S -80'; then
+      cat <<'EOF'
+${VIEWPORT_SCROLLBACK_READY_CAPTURE}
+EOF
+    else
+      cat <<'EOF'
+${VIEWPORT_WITHOUT_VISIBLE_PROMPT_CAPTURE}
+EOF
+    fi
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+            assert.equal(await waitForWorkerReadyAsync('omx-team-x', 1, 1_000), true);
+            const log = await readFile(logPath, 'utf-8');
+            assert.match(log, /capture-pane -t omx-team-x:1 -p/);
+            assert.match(log, /capture-pane -t omx-team-x:1 -p -S -80/);
+        });
+        await withMockTmuxFixture('omx-tmux-worker-ready-async-no-scrollback-status-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    printf 'gpt-5 50%% left\n'
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+            assert.equal(await waitForWorkerReadyAsync('omx-team-x', 1, 250), false);
+            const log = await readFile(logPath, 'utf-8');
+            assert.match(log, /capture-pane -t omx-team-x:1 -p/);
+            assert.doesNotMatch(log, /capture-pane -t omx-team-x:1 -p -S -80/);
+        });
+    });
+    it('auto-accepts trust prompts and then observes readiness', async () => {
+        const previousAutoTrust = process.env.OMX_TEAM_AUTO_TRUST;
+        delete process.env.OMX_TEAM_AUTO_TRUST;
+        try {
+            await withMockTmuxFixture('omx-tmux-worker-ready-async-trust-', (logPath) => `#!/bin/sh
+set -eu
+state_dir="$(dirname "${logPath}")"
+accepted_file="$state_dir/accepted"
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    if [ -f "$accepted_file" ]; then
+      cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+    else
+      cat <<'EOF'
+Do you trust the contents of this directory?
+Press enter to continue
+EOF
+    fi
+    exit 0
+    ;;
+  send-keys)
+    if [ "\${4:-}" = "C-m" ]; then
+      : > "$accepted_file"
+    fi
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                assert.equal(await waitForWorkerReadyAsync('omx-team-x', 1, 5_000), true);
+                const log = await readFile(logPath, 'utf-8');
+                assert.match(log, /send-keys -t omx-team-x:1 C-m/);
+            });
+        }
+        finally {
+            if (typeof previousAutoTrust === 'string')
+                process.env.OMX_TEAM_AUTO_TRUST = previousAutoTrust;
+            else
+                delete process.env.OMX_TEAM_AUTO_TRUST;
+        }
+    });
+    it('auto-accepts the Claude bypass prompt and then observes readiness', async () => {
+        const previousAutoAccept = process.env.OMX_TEAM_AUTO_ACCEPT_BYPASS;
+        delete process.env.OMX_TEAM_AUTO_ACCEPT_BYPASS;
+        try {
+            await withMockTmuxFixture('omx-tmux-worker-ready-async-claude-bypass-', (logPath) => `#!/bin/sh
+set -eu
+state_dir="$(dirname "${logPath}")"
+accepted_file="$state_dir/accepted"
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    if [ -f "$accepted_file" ]; then
+      cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+    else
+      cat <<'EOF'
+${CLAUDE_BYPASS_PROMPT_CAPTURE}
+EOF
+    fi
+    exit 0
+    ;;
+  send-keys)
+    if [ "\${4:-}" = "-l" ] && [ "\${6:-}" = "2" ]; then
+      : > "$accepted_file"
+    fi
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                assert.equal(await waitForWorkerReadyAsync('omx-team-x', 1, 5_000), true);
+                const log = await readFile(logPath, 'utf-8');
+                assert.match(log, /send-keys -t omx-team-x:1 -l -- 2/);
+            });
+        }
+        finally {
+            if (typeof previousAutoAccept === 'string')
+                process.env.OMX_TEAM_AUTO_ACCEPT_BYPASS = previousAutoAccept;
+            else
+                delete process.env.OMX_TEAM_AUTO_ACCEPT_BYPASS;
+        }
+    });
+    it('returns false on timeout or tmux command failure', async () => {
+        await withMockTmuxFixture('omx-tmux-worker-ready-async-capture-failure-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    exit 1
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async () => {
+            assert.equal(await waitForWorkerReadyAsync('omx-team-x', 1, 1), false);
+        });
+        await withEmptyPath(async () => {
+            assert.equal(await waitForWorkerReadyAsync('omx-team-x', 1, 1), false);
+        });
+    });
+});
 describe('native Windows HUD reconciliation', () => {
     it('allows team startup on native Windows when current tmux client is reachable without TMUX env vars', async () => {
         const cwd = await mkdtemp(join(tmpdir(), 'omx-team-win32-no-env-'));