oh-my-codex 0.17.3 → 0.18.0

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, waitForWorkerReadyAsync, paneIsBootstrapping, classifyWorkerStartupInjectSafety, checkWorkerStartupInjectSafety, dismissTrustPromptIfPresent, evaluateStartupDirectTriggerSafetyCapture, mitigateCopyModeUnderlineArtifacts, } from '../tmux-session.js';
+import { buildClientAttachedReconcileHookName, assertTeamWorkerCliBinaryAvailable, buildWorkerProcessLaunchSpec, buildReconcileHudResizeArgs, buildRegisterClientAttachedReconcileArgs, buildRegisterResizeHookArgs, buildResizeHookName, buildResizeHookTarget, buildScheduleDelayedHudResizeArgs, buildUnregisterClientAttachedReconcileArgs, buildUnregisterResizeHookArgs, buildWorkerStartupCommand, shouldSourceTeamWorkerShellRc, 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, classifyWorkerStartupInjectSafety, checkWorkerStartupInjectSafety, dismissTrustPromptIfPresent, evaluateStartupDirectTriggerSafetyCapture, 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';
@@ -133,18 +133,19 @@ describe('HUD resize hook command builders', () => {
         assert.equal(buildHudPaneTarget('%41'), '%41');
         assert.equal(buildHudPaneTarget('41'), '%41');
     });
-    it('buildRegisterResizeHookArgs uses window target and numeric client-resized hook slot', () => {
+    it('buildRegisterResizeHookArgs uses window target and numeric window-resized hook slot', () => {
         const args = buildRegisterResizeHookArgs('my-session:0', 'omx_resize_team_session_0_1', '%1');
         assert.equal(args[0], 'set-hook');
-        assert.equal(args[1], '-t');
-        assert.equal(args[2], 'my-session:0');
-        assert.match(args[3] ?? '', /^client-resized\[\d+\]$/);
-        assert.equal(args[4], `run-shell -b 'tmux resize-pane -t %1 -y ${HUD_TMUX_TEAM_HEIGHT_LINES} >/dev/null 2>&1 || true'`);
+        assert.equal(args[1], '-w');
+        assert.equal(args[2], '-t');
+        assert.equal(args[3], 'my-session:0');
+        assert.match(args[4] ?? '', /^window-resized\[\d+\]$/);
+        assert.equal(args[5], `run-shell -b 'tmux resize-pane -t %1 -y ${HUD_TMUX_TEAM_HEIGHT_LINES} >/dev/null 2>&1 || true; sleep ${HUD_RESIZE_RECONCILE_DELAY_SECONDS}; tmux resize-pane -t %1 -y ${HUD_TMUX_TEAM_HEIGHT_LINES} >/dev/null 2>&1 || true'`);
     });
     it('buildUnregisterResizeHookArgs removes the exact numeric hook slot', () => {
         const registered = buildRegisterResizeHookArgs('my-session:0', 'omx_resize_team_session_0_1', '%1');
         const unregistered = buildUnregisterResizeHookArgs('my-session:0', 'omx_resize_team_session_0_1');
-        assert.deepEqual(unregistered, ['set-hook', '-u', '-t', 'my-session:0', registered[3]]);
+        assert.deepEqual(unregistered, ['set-hook', '-u', '-w', '-t', 'my-session:0', registered[4]]);
     });
     it('buildClientAttachedReconcileHookName normalizes all segments into collision-safe tokens', () => {
         const name = buildClientAttachedReconcileHookName('Team A', 'Session:Main', '0', '%12');
@@ -169,7 +170,7 @@ describe('HUD resize hook command builders', () => {
         const longName = 'omx_resize_' + 'a'.repeat(200);
         const resizeArgs = buildRegisterResizeHookArgs('sess:0', longName, '%1');
         const attachedArgs = buildRegisterClientAttachedReconcileArgs('sess:0', longName, '%1');
-        const resizeSlot = resizeArgs[3] ?? '';
+        const resizeSlot = resizeArgs[4] ?? '';
         const attachedSlot = attachedArgs[3] ?? '';
         const resizeIndex = Number((resizeSlot.match(/\[(\d+)\]/) ?? [])[1]);
         const attachedIndex = Number((attachedSlot.match(/\[(\d+)\]/) ?? [])[1]);
@@ -182,7 +183,7 @@ describe('HUD resize hook command builders', () => {
         const name = 'omx_resize_team_session_0_1';
         const a = buildRegisterResizeHookArgs('s:0', name, '%1');
         const b = buildRegisterResizeHookArgs('s:0', name, '%1');
-        assert.equal(a[3], b[3]);
+        assert.equal(a[4], b[4]);
         const c = buildRegisterClientAttachedReconcileArgs('s:0', name, '%1');
         const d = buildRegisterClientAttachedReconcileArgs('s:0', name, '%1');
         assert.equal(c[3], d[3]);
@@ -209,8 +210,8 @@ describe('HUD resize hook command builders', () => {
             const resizeArgs = buildRegisterResizeHookArgs('my-session:0', 'omx_resize_team_session_0_1', '%1');
             const delayedArgs = buildScheduleDelayedHudResizeArgs('%1');
             const reconcileArgs = buildReconcileHudResizeArgs('%1');
-            assert.match(resizeArgs[4] ?? '', new RegExp(escapeRegExp(tmuxPath)));
-            assert.doesNotMatch(resizeArgs[4] ?? '', /^run-shell -b 'tmux resize-pane/);
+            assert.match(resizeArgs[5] ?? '', new RegExp(escapeRegExp(tmuxPath)));
+            assert.doesNotMatch(resizeArgs[5] ?? '', /^run-shell -b 'tmux resize-pane/);
             assert.match(delayedArgs[2] ?? '', new RegExp(escapeRegExp(tmuxPath)));
             assert.doesNotMatch(delayedArgs[2] ?? '', /sleep \d+; tmux resize-pane/);
             assert.match(reconcileArgs[1] ?? '', new RegExp(escapeRegExp(tmuxPath)));
@@ -480,6 +481,51 @@ esac
             assert.ok(enterCount >= 4, `expected repeated submit nudges before failing closed on stuck queued banner:\n${log}`);
         });
     });
+    it('does not confirm delivery while a wrapped hyphenated trigger remains as an unsent draft', async () => {
+        const trigger = 'Read .omx/state/team/team-x/workers/worker-1/inbox.md';
+        await withMockTmuxFixture('omx-tmux-codex-wrapped-trigger-draft-', (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 [ -f "$text_sent_file" ]; then
+      cat <<'EOF'
+${READY_HELPER_CAPTURE}
+
+› Read .omx/state/team/team-x/workers/worker-
+  1/inbox.md
+EOF
+    else
+      cat <<'EOF'
+${READY_HELPER_CAPTURE}
+EOF
+    fi
+    exit 0
+    ;;
+  send-keys)
+    if [ "\${4:-}" = "-l" ] && [ "\${6:-}" = "${trigger}" ]; then
+      : > "$text_sent_file"
+    fi
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+            await assert.rejects(() => sendToWorker('omx-team-x', 1, trigger), /submit_failed/);
+            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 repeated submit nudges before failing on the still-visible wrapped draft:\n${log}`);
+        });
+    });
+});
+describe('sendToWorker adaptive retry matching', () => {
+    it('recognizes hyphen-wrapped trigger drafts as still visible', () => {
+        assert.equal(shouldAttemptAdaptiveRetry('auto', true, true, `${READY_HELPER_CAPTURE}\n\n› Read .omx/state/team/team-x/workers/worker-\n  1/inbox.md`, 'Read .omx/state/team/team-x/workers/worker-1/inbox.md'), true);
+    });
 });
 describe('startup direct trigger safety', () => {
     it('classifies ready panes as safe and blocks trust, bypass, bootstrapping, and active-task captures', () => {
@@ -781,7 +827,7 @@ describe('buildWorkerStartupCommand', () => {
                 delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         }
     });
-    it('uses zsh with ~/.zshrc and non-login shell exec semantics', () => {
+    it('uses zsh without sourcing ~/.zshrc by default and keeps non-login exec semantics', () => {
         const prevShell = process.env.SHELL;
         process.env.SHELL = '/bin/zsh';
         const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
@@ -791,7 +837,7 @@ describe('buildWorkerStartupCommand', () => {
             assert.match(cmd, /OMX_TEAM_WORKER=alpha\/worker-2/);
             assert.match(cmd, /'\/bin\/zsh' -c/);
             assert.doesNotMatch(cmd, /'\/bin\/zsh' -lc\b/);
-            assert.match(cmd, /source ~\/\.zshrc/);
+            assert.doesNotMatch(cmd, /source ~\/\.zshrc/);
             assert.match(cmd, /exec .*codex/);
         }
         finally {
@@ -814,7 +860,7 @@ describe('buildWorkerStartupCommand', () => {
             const cmd = withMockedExistsSync((candidate) => candidate === '/opt/homebrew/bin/zsh', () => buildWorkerStartupCommand('alpha', 2));
             assert.match(cmd, /'\/opt\/homebrew\/bin\/zsh' -c/);
             assert.doesNotMatch(cmd, /'\/bin\/sh' -c/);
-            assert.match(cmd, /source ~\/\.zshrc/);
+            assert.doesNotMatch(cmd, /source ~\/\.zshrc/);
         }
         finally {
             if (typeof prevShell === 'string')
@@ -836,7 +882,7 @@ describe('buildWorkerStartupCommand', () => {
             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/);
+            assert.doesNotMatch(cmd, /source ~\/\.zshrc/);
         }
         finally {
             if (typeof prevShell === 'string')
@@ -849,14 +895,14 @@ describe('buildWorkerStartupCommand', () => {
                 delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         }
     });
-    it('uses bash with ~/.bashrc and preserves launch args', () => {
+    it('prevents issue #2358 bash rc fan-out by default and preserves launch args', () => {
         const prevShell = process.env.SHELL;
         process.env.SHELL = '/bin/bash';
         const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
         try {
             const cmd = buildWorkerStartupCommand('alpha', 1, ['--model', 'gpt-5']);
-            assert.match(cmd, /source ~\/\.bashrc/);
+            assert.doesNotMatch(cmd, /source ~\/\.bashrc/);
             assert.match(cmd, /exec .*codex/);
             assert.match(cmd, /--model/);
             assert.match(cmd, /gpt-5/);
@@ -872,6 +918,37 @@ describe('buildWorkerStartupCommand', () => {
                 delete process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
         }
     });
+    it('sources worker shell rc files only when explicitly opted in', () => {
+        const prevShell = process.env.SHELL;
+        const prevBypass = process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT;
+        const prevSourceRc = process.env.OMX_TMUX_SOURCE_SHELL_RC;
+        process.env.SHELL = '/bin/bash';
+        process.env.OMX_BYPASS_DEFAULT_SYSTEM_PROMPT = '0';
+        try {
+            delete process.env.OMX_TMUX_SOURCE_SHELL_RC;
+            assert.equal(shouldSourceTeamWorkerShellRc(process.env), false);
+            assert.doesNotMatch(buildWorkerStartupCommand('alpha', 1, ['--model', 'gpt-5']), /source ~\/\.bashrc/);
+            process.env.OMX_TMUX_SOURCE_SHELL_RC = '1';
+            assert.equal(shouldSourceTeamWorkerShellRc(process.env), true);
+            assert.match(buildWorkerStartupCommand('alpha', 1, ['--model', 'gpt-5']), /source ~\/\.bashrc/);
+            delete process.env.OMX_TMUX_SOURCE_SHELL_RC;
+            assert.match(buildWorkerStartupCommand('alpha', 1, ['--model', 'gpt-5'], process.cwd(), { OMX_TMUX_SOURCE_SHELL_RC: '1' }), /source ~\/\.bashrc/, 'per-worker explicit opt-in should be honored');
+        }
+        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 prevSourceRc === 'string')
+                process.env.OMX_TMUX_SOURCE_SHELL_RC = prevSourceRc;
+            else
+                delete process.env.OMX_TMUX_SOURCE_SHELL_RC;
+        }
+    });
     it('injects canonical team state env vars when provided', () => {
         const prevShell = process.env.SHELL;
         process.env.SHELL = '/bin/bash';
@@ -1763,7 +1840,7 @@ describe('buildWorkerStartupCommand', () => {
         try {
             const cmd = withMockedExistsSync((candidate) => candidate === '/opt/custom/fish' || candidate === '/bin/bash', () => buildWorkerStartupCommand('alpha', 1, [], process.cwd()));
             assert.match(cmd, /\/bin\/bash\b/, 'must fall back to bash when zsh is unavailable');
-            assert.match(cmd, /\.bashrc/, 'must source bash rc file for bash fallback');
+            assert.doesNotMatch(cmd, /\.bashrc/, 'must not source bash rc file for bash fallback by default');
             assert.doesNotMatch(cmd, /fish/, 'must not launch unsupported fish shell');
         }
         finally {
@@ -3090,7 +3167,7 @@ esac
                 assert.equal(session.resizeHookTarget, null);
                 const tmuxLog = await readFile(logPath, 'utf-8');
                 assert.match(tmuxLog, new RegExp(`resize-pane -t %3 -y ${HUD_TMUX_TEAM_HEIGHT_LINES}`));
-                assert.doesNotMatch(tmuxLog, /set-hook -t leader:0 client-resized\[\d+\]/);
+                assert.doesNotMatch(tmuxLog, /set-hook -w -t leader:0 window-resized\[\d+\]/);
                 assert.doesNotMatch(tmuxLog, /set-hook -t leader:0 client-attached\[\d+\]/);
                 assert.doesNotMatch(tmuxLog, /run-shell -b sleep \d+; tmux resize-pane -t %3 -y \d+ >/);
                 assert.doesNotMatch(tmuxLog, /run-shell tmux resize-pane -t %3 -y \d+ >/);