oh-my-codex 0.18.0 → 0.18.2

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

@@ -133,19 +133,18 @@ describe('HUD resize hook command builders', () => {
         assert.equal(buildHudPaneTarget('%41'), '%41');
         assert.equal(buildHudPaneTarget('41'), '%41');
     });
-    it('buildRegisterResizeHookArgs uses window target and numeric window-resized hook slot', () => {
+    it('buildRegisterResizeHookArgs uses target and numeric client-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], '-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'`);
+        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; 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', '-w', '-t', 'my-session:0', registered[4]]);
+        assert.deepEqual(unregistered, ['set-hook', '-u', '-t', 'my-session:0', registered[3]]);
     });
     it('buildClientAttachedReconcileHookName normalizes all segments into collision-safe tokens', () => {
         const name = buildClientAttachedReconcileHookName('Team A', 'Session:Main', '0', '%12');
@@ -170,7 +169,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[4] ?? '';
+        const resizeSlot = resizeArgs[3] ?? '';
         const attachedSlot = attachedArgs[3] ?? '';
         const resizeIndex = Number((resizeSlot.match(/\[(\d+)\]/) ?? [])[1]);
         const attachedIndex = Number((attachedSlot.match(/\[(\d+)\]/) ?? [])[1]);
@@ -183,7 +182,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[4], b[4]);
+        assert.equal(a[3], b[3]);
         const c = buildRegisterClientAttachedReconcileArgs('s:0', name, '%1');
         const d = buildRegisterClientAttachedReconcileArgs('s:0', name, '%1');
         assert.equal(c[3], d[3]);
@@ -210,8 +209,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[5] ?? '', new RegExp(escapeRegExp(tmuxPath)));
-            assert.doesNotMatch(resizeArgs[5] ?? '', /^run-shell -b 'tmux resize-pane/);
+            assert.match(resizeArgs[4] ?? '', new RegExp(escapeRegExp(tmuxPath)));
+            assert.doesNotMatch(resizeArgs[4] ?? '', /^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)));
@@ -2944,7 +2943,7 @@ esac
                 assert.match(tmuxLog, /set-option -p -t %1 @omx_pane_instance_id omx-pane-scope/);
                 assert.match(tmuxLog, /set-option -p -t %2 @omx_pane_instance_id omx-pane-scope/);
                 assert.match(tmuxLog, /set-option -p -t %3 @omx_pane_instance_id omx-pane-scope/);
-                assert.match(tmuxLog, /OMX_TMUX_HUD_OWNER=1 .*hud --watch/);
+                assert.match(tmuxLog, /exec env OMX_TMUX_HUD_OWNER=1 .*hud --watch/);
             });
         }
         finally {
@@ -2967,6 +2966,119 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('uses tmux 3.2a-compatible client-resized hook registration for team HUD resize', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-team-resize-hook-fallback-'));
+        const prevTmux = process.env.TMUX;
+        const prevTmuxPane = process.env.TMUX_PANE;
+        const prevWorkerCli = process.env.OMX_TEAM_WORKER_CLI;
+        const prevWarn = console.warn;
+        const warnings = [];
+        try {
+            await withMockTmuxFixture('omx-tmux-resize-hook-fallback-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  -V)
+    echo "tmux 3.2a"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{window_width}"*)
+        echo "120"
+        ;;
+      *)
+        echo "leader:0 %1"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"pane_current_command"*)
+        printf "%%1\tnode\t'codex'\n"
+        ;;
+      *)
+        printf "%%1\n"
+        ;;
+    esac
+    exit 0
+    ;;
+  split-window)
+    case "$*" in
+      *" -h "*)
+        echo "%2"
+        ;;
+      *)
+        echo "%3"
+        ;;
+    esac
+    exit 0
+    ;;
+  set-hook)
+    case "$*" in
+      *"window-resized["*)
+        echo "invalid option: window-resized[]" >&2
+        exit 1
+        ;;
+      *" -w "*)
+        echo "invalid option: -w" >&2
+        exit 1
+        ;;
+      *)
+        exit 0
+        ;;
+    esac
+    ;;
+  set-option|resize-pane|select-layout|set-window-option|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                const fakeBinDir = join(logPath, '..');
+                const geminiPath = join(fakeBinDir, 'gemini');
+                await writeFile(geminiPath, '#!/bin/sh\nexit 0\n');
+                await chmod(geminiPath, 0o755);
+                process.env.TMUX = 'leader-session,stub,0';
+                process.env.TMUX_PANE = '%1';
+                process.env.OMX_TEAM_WORKER_CLI = 'gemini';
+                console.warn = (...args) => { warnings.push(args.map(String).join(' ')); };
+                const session = createTeamSession('Resize Hook Fallback', 1, cwd);
+                assert.equal(session.hudPaneId, '%3');
+                assert.ok(session.resizeHookName);
+                assert.equal(session.resizeHookTarget, 'leader:0');
+                assert.equal(warnings.join('\n'), '');
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                assert.match(tmuxLog, /set-hook -t leader:0 client-resized\[\d+\]/);
+                assert.doesNotMatch(tmuxLog, /window-resized\[/);
+                assert.doesNotMatch(tmuxLog, /set-hook -w /);
+                assert.match(tmuxLog, /set-hook -t leader:0 client-attached\[\d+\]/);
+                assert.match(tmuxLog, new RegExp(`run-shell -b sleep ${HUD_RESIZE_RECONCILE_DELAY_SECONDS}; .*resize-pane -t %3 -y ${HUD_TMUX_TEAM_HEIGHT_LINES}`));
+                assert.match(tmuxLog, new RegExp(`run-shell .*resize-pane -t %3 -y ${HUD_TMUX_TEAM_HEIGHT_LINES}`));
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %2/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %3/);
+            });
+        }
+        finally {
+            console.warn = prevWarn;
+            if (typeof prevTmux === 'string')
+                process.env.TMUX = prevTmux;
+            else
+                delete process.env.TMUX;
+            if (typeof prevTmuxPane === 'string')
+                process.env.TMUX_PANE = prevTmuxPane;
+            else
+                delete process.env.TMUX_PANE;
+            if (typeof prevWorkerCli === 'string')
+                process.env.OMX_TEAM_WORKER_CLI = prevWorkerCli;
+            else
+                delete process.env.OMX_TEAM_WORKER_CLI;
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
 });
 describe('native Windows HUD reconciliation', () => {
     it('allows team startup on native Windows when current tmux client is reachable without TMUX env vars', async () => {
@@ -3167,7 +3279,8 @@ 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 -w -t leader:0 window-resized\[\d+\]/);
+                assert.doesNotMatch(tmuxLog, /set-hook -w /);
+                assert.doesNotMatch(tmuxLog, /window-resized\[/);
                 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+ >/);
@@ -3428,7 +3541,7 @@ esac
                 const tmuxLog = await readFile(logPath, 'utf-8');
                 assert.match(tmuxLog, new RegExp(escapeRegExp(launcherPath)));
                 assert.doesNotMatch(tmuxLog, /'dist\/cli\/omx\.js' hud --watch/);
-                assert.match(tmuxLog, /OMX_TMUX_HUD_OWNER=1 .*hud --watch/);
+                assert.match(tmuxLog, /exec env OMX_TMUX_HUD_OWNER=1 .*hud --watch/);
             });
         }
         finally {
@@ -3471,7 +3584,7 @@ esac
                 const tmuxLog = await readFile(logPath, 'utf-8');
                 assert.match(tmuxLog, /dist\/cli\/omx\.js' hud --watch/);
                 assert.doesNotMatch(tmuxLog, /\/tmp\/codex-host-binary' hud --watch/);
-                assert.match(tmuxLog, /OMX_TMUX_HUD_OWNER=1 .*hud --watch/);
+                assert.match(tmuxLog, /exec env OMX_TMUX_HUD_OWNER=1 .*hud --watch/);
             });
         }
         finally {
@@ -3479,6 +3592,41 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('restores standalone HUD panes with OMX_ROOT forwarded and shell-escaped', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-standalone-root-hud-'));
+        const previousOmxRoot = process.env.OMX_ROOT;
+        try {
+            await withMockTmuxFixture('omx-tmux-root-standalone-hud-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  split-window)
+    echo "%44"
+    exit 0
+    ;;
+  run-shell|select-pane|resize-pane|set-hook)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                process.env.OMX_ROOT = "/tmp/boxed root/it's/$(literal)";
+                const paneId = restoreStandaloneHudPane('%11', cwd);
+                assert.equal(paneId, '%44');
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                assert.match(tmuxLog, /exec env OMX_TMUX_HUD_OWNER=1 OMX_ROOT='\/tmp\/boxed root\/it'\\''s\/\$\(literal\)' .*hud --watch/);
+            });
+        }
+        finally {
+            if (typeof previousOmxRoot === 'string')
+                process.env.OMX_ROOT = previousOmxRoot;
+            else
+                delete process.env.OMX_ROOT;
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
 });
 describe('dismissTrustPromptIfPresent capture shape', () => {
     it('uses visible capture-pane argv without tail flags', async () => {