oh-my-codex 0.12.5 → 0.12.6

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

@@ -63,6 +63,10 @@ const VIEWPORT_WITHOUT_VISIBLE_PROMPT_CAPTURE = `╭─────────
 const VIEWPORT_SCROLLBACK_READY_CAPTURE = `${VIEWPORT_WITHOUT_VISIBLE_PROMPT_CAPTURE}
 
 › support lane on multi-image attach`;
+const QUEUED_AFTER_TOOL_CALL_CAPTURE = `• Messages to be submitted after next tool call (press esc to interrupt and send immediately)
+  ↳ Read $OMX_TEAM_STATE_ROOT/team/demo/workers/worker-1/inbox.md, work now, report progress
+
+› Write tests for @filename`;
 async function withMockTmuxFixture(dirPrefix, tmuxScript, run) {
     const fakeBinDir = await mkdtemp(join(tmpdir(), dirPrefix));
     const logPath = join(fakeBinDir, 'tmux.log');
@@ -306,6 +310,111 @@ esac
             assert.ok(acceptIndex < submitIndex, `expected bypass acceptance before worker text:\n${log}`);
         });
     });
+    it('ignores stale queued-next-tool-call banner text that only survives in scrollback history', async () => {
+        await withMockTmuxFixture('omx-tmux-codex-stale-queued-scrollback-', (logPath) => `#!/bin/sh
+set -eu
+state_dir="$(dirname "${logPath}")"
+text_sent_file="$state_dir/text-sent"
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    if printf '%s\n' "$*" | grep -q -- ' -S -80'; then
+      if [ -f "$text_sent_file" ]; then
+        cat <<'EOF'
+${QUEUED_AFTER_TOOL_CALL_CAPTURE}
+EOF
+      else
+        cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+      fi
+    else
+      cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+    fi
+    exit 0
+    ;;
+  send-keys)
+    if [ "\${4:-}" = "-l" ] && [ "\${6:-}" = "check inbox" ]; then
+      : > "$text_sent_file"
+    fi
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+            await sendToWorker('omx-team-x', 1, 'check inbox');
+            const log = await readFile(logPath, 'utf-8');
+            const enterCount = (log.match(/send-keys -t omx-team-x:1 C-m/g) || []).length;
+            assert.equal(enterCount, 2, `expected only the baseline submit presses when the queued banner is stale scrollback:\n${log}`);
+            assert.match(log, /capture-pane -t omx-team-x:1 -p/);
+            assert.match(log, /capture-pane -t omx-team-x:1 -p -S -80/);
+        });
+    });
+    it('keeps nudging Codex when the visible pane still shows a live queued-next-tool-call banner', async () => {
+        await withMockTmuxFixture('omx-tmux-codex-visible-queued-submit-', (logPath) => `#!/bin/sh
+set -eu
+state_dir="$(dirname "${logPath}")"
+text_sent_file="$state_dir/text-sent"
+enter_count_file="$state_dir/enter-count"
+printf '%s\n' "$*" >> "${logPath}"
+case "$1" in
+  capture-pane)
+    enter_count=0
+    if [ -f "$enter_count_file" ]; then
+      enter_count=$(cat "$enter_count_file")
+    fi
+    if printf '%s\n' "$*" | grep -q -- ' -S -80'; then
+      cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+    else
+      if [ "$enter_count" -ge 4 ]; then
+        cat <<'EOF'
+initialized in .
+
+◦ Waiting for background terminal (59s…)
+EOF
+      elif [ -f "$text_sent_file" ]; then
+        cat <<'EOF'
+${QUEUED_AFTER_TOOL_CALL_CAPTURE}
+EOF
+      else
+        cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+      fi
+    fi
+    exit 0
+    ;;
+  send-keys)
+    if [ "\${4:-}" = "-l" ] && [ "\${6:-}" = "check inbox" ]; then
+      : > "$text_sent_file"
+    fi
+    if [ "\${4:-}" = "C-m" ]; then
+      enter_count=0
+      if [ -f "$enter_count_file" ]; then
+        enter_count=$(cat "$enter_count_file")
+      fi
+      enter_count=$((enter_count + 1))
+      printf '%s' "$enter_count" > "$enter_count_file"
+    fi
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+            await sendToWorker('omx-team-x', 1, 'check inbox');
+            const log = await readFile(logPath, 'utf-8');
+            const enterCount = (log.match(/send-keys -t omx-team-x:1 C-m/g) || []).length;
+            assert.ok(enterCount >= 4, `expected extra submit nudges when Codex queues the trigger:\n${log}`);
+        });
+    });
 });
 describe('shouldAttemptAdaptiveRetry', () => {
     it('returns false when adaptive retry is disabled', () => {
@@ -669,6 +778,87 @@ describe('buildWorkerStartupCommand', () => {
                 delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         }
     });
+    it('inherits only allowlisted ambient proxy env vars for tmux startup commands', () => {
+        const prevShell = process.env.SHELL;
+        const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        const prevHttpsProxy = process.env.HTTPS_PROXY;
+        const prevHttpProxy = process.env.HTTP_PROXY;
+        const prevNoProxy = process.env.NO_PROXY;
+        const prevLowerHttpsProxy = process.env.https_proxy;
+        const prevCustom = process.env.AWS_SECRET_ACCESS_KEY;
+        process.env.SHELL = '/bin/bash';
+        process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
+        process.env.HTTPS_PROXY = 'https://upper-proxy.example:443';
+        process.env.HTTP_PROXY = 'http://upper-proxy.example:80';
+        process.env.NO_PROXY = 'localhost,127.0.0.1';
+        process.env.https_proxy = 'https://lower-proxy.example:443';
+        process.env.AWS_SECRET_ACCESS_KEY = 'should-not-inherit';
+        try {
+            const cmd = buildWorkerStartupCommand('alpha', 1, [], '/tmp/project');
+            assert.match(cmd, /HTTPS_PROXY=https:\/\/upper-proxy\.example:443/);
+            assert.match(cmd, /HTTP_PROXY=http:\/\/upper-proxy\.example:80/);
+            assert.match(cmd, /NO_PROXY=localhost,127\.0\.0\.1/);
+            assert.match(cmd, /https_proxy=https:\/\/lower-proxy\.example:443/);
+            assert.doesNotMatch(cmd, /AWS_SECRET_ACCESS_KEY=should-not-inherit/);
+        }
+        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;
+            if (typeof prevHttpsProxy === 'string')
+                process.env.HTTPS_PROXY = prevHttpsProxy;
+            else
+                delete process.env.HTTPS_PROXY;
+            if (typeof prevHttpProxy === 'string')
+                process.env.HTTP_PROXY = prevHttpProxy;
+            else
+                delete process.env.HTTP_PROXY;
+            if (typeof prevNoProxy === 'string')
+                process.env.NO_PROXY = prevNoProxy;
+            else
+                delete process.env.NO_PROXY;
+            if (typeof prevLowerHttpsProxy === 'string')
+                process.env.https_proxy = prevLowerHttpsProxy;
+            else
+                delete process.env.https_proxy;
+            if (typeof prevCustom === 'string')
+                process.env.AWS_SECRET_ACCESS_KEY = prevCustom;
+            else
+                delete process.env.AWS_SECRET_ACCESS_KEY;
+        }
+    });
+    it('preserves explicit worker env precedence over inherited ambient proxy vars', () => {
+        const prevShell = process.env.SHELL;
+        const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        const prevHttpsProxy = process.env.HTTPS_PROXY;
+        process.env.SHELL = '/bin/bash';
+        process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
+        process.env.HTTPS_PROXY = 'https://ambient-proxy.example:443';
+        try {
+            const cmd = buildWorkerStartupCommand('alpha', 1, [], '/tmp/project', { HTTPS_PROXY: 'https://explicit-proxy.example:8443' });
+            assert.match(cmd, /HTTPS_PROXY=https:\/\/explicit-proxy\.example:8443/);
+            assert.doesNotMatch(cmd, /HTTPS_PROXY=https:\/\/ambient-proxy\.example:443/);
+        }
+        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;
+            if (typeof prevHttpsProxy === 'string')
+                process.env.HTTPS_PROXY = prevHttpsProxy;
+            else
+                delete process.env.HTTPS_PROXY;
+        }
+    });
     it('resolves POSIX leader paths before building fish worker startup commands', async () => {
         const fakeBin = await mkdtemp(join(tmpdir(), 'omx-worker-startup-posix-'));
         const prevPath = process.env.PATH;
@@ -1652,6 +1842,26 @@ describe('team worker launch mode helpers', () => {
             await rm(workerCodexHome, { recursive: true, force: true });
         }
     });
+    it('buildWorkerProcessLaunchSpec keeps the worker env contract unchanged for ambient proxy vars', () => {
+        const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        const prevHttpsProxy = process.env.HTTPS_PROXY;
+        process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
+        process.env.HTTPS_PROXY = 'https://ambient-proxy.example:443';
+        try {
+            const spec = buildWorkerProcessLaunchSpec('eta-team', 1, [], '/tmp/workspace', {}, 'codex');
+            assert.equal(spec.env.HTTPS_PROXY, undefined);
+        }
+        finally {
+            if (typeof prevBypass === 'string')
+                process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = prevBypass;
+            else
+                delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+            if (typeof prevHttpsProxy === 'string')
+                process.env.HTTPS_PROXY = prevHttpsProxy;
+            else
+                delete process.env.HTTPS_PROXY;
+        }
+    });
     it('buildWorkerProcessLaunchSpec resolves relative worker CODEX_HOME against the worker cwd', async () => {
         const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         const prevCodexHome = process.env.CODEX_HOME;