oh-my-codex 0.18.13 → 0.18.15

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

@@ -35,6 +35,18 @@ function withMockedExistsSync(mock, fn) {
         syncBuiltinESMExports();
     }
 }
+function withMockedStatSync(mock, fn) {
+    const original = fs.statSync;
+    fs.statSync = mock;
+    syncBuiltinESMExports();
+    try {
+        return fn();
+    }
+    finally {
+        fs.statSync = original;
+        syncBuiltinESMExports();
+    }
+}
 function escapeRegExp(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }
@@ -3219,6 +3231,9 @@ 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, /set-option -p -t %1 @omx_team_pane_owner_id team:pane-tags/);
+                assert.match(tmuxLog, /set-option -p -t %2 @omx_team_pane_owner_id team:pane-tags/);
+                assert.match(tmuxLog, /set-option -p -t %3 @omx_team_pane_owner_id team:pane-tags/);
                 assert.match(tmuxLog, /exec env OMX_SESSION_ID='omx-pane-scope' OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%1' .*hud --watch/);
             });
         }
@@ -3242,6 +3257,202 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('does not reuse the Team pane owner token as the HUD logical session id', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-team-hud-session-boundary-'));
+        const prevTmux = process.env.TMUX;
+        const prevTmuxPane = process.env.TMUX_PANE;
+        const prevSessionId = process.env.OMX_SESSION_ID;
+        const prevWorkerCli = process.env.OMX_TEAM_WORKER_CLI;
+        try {
+            await withMockTmuxFixture('omx-tmux-hud-session-boundary-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{window_width}"*)
+        echo "120"
+        ;;
+      *)
+        echo "shared:0 %1"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-t %2 -F #{pane_pid}"*)
+        echo "2000002222"
+        ;;
+      *"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-option|resize-pane|select-layout|set-window-option|select-pane|set-hook|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 = '1';
+                process.env.TMUX_PANE = '%1';
+                delete process.env.OMX_SESSION_ID;
+                process.env.OMX_TEAM_WORKER_CLI = 'gemini';
+                const session = createTeamSession('HUD Session Boundary', 1, cwd, [], undefined, {
+                    teamPaneOwnerId: 'team:explicit-owner-boundary',
+                });
+                assert.equal(session.hudPaneId, '%3');
+                assert.equal(session.teamPaneOwnerId, 'team:explicit-owner-boundary');
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                assert.match(tmuxLog, /set-option -p -t %1 @omx_team_pane_owner_id team:explicit-owner-boundary/);
+                assert.match(tmuxLog, /set-option -p -t %2 @omx_team_pane_owner_id team:explicit-owner-boundary/);
+                assert.match(tmuxLog, /set-option -p -t %3 @omx_team_pane_owner_id team:explicit-owner-boundary/);
+                assert.match(tmuxLog, /exec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%1' .*hud --watch/);
+                assert.doesNotMatch(tmuxLog, /OMX_SESSION_ID='team:explicit-owner-boundary'/);
+            });
+        }
+        finally {
+            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 prevSessionId === 'string')
+                process.env.OMX_SESSION_ID = prevSessionId;
+            else
+                delete process.env.OMX_SESSION_ID;
+            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 });
+        }
+    });
+    it('removes only HUD panes owned by the current leader during team startup', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-team-owned-hud-startup-'));
+        const prevTmux = process.env.TMUX;
+        const prevTmuxPane = process.env.TMUX_PANE;
+        const prevSessionId = process.env.OMX_SESSION_ID;
+        const prevWorkerCli = process.env.OMX_TEAM_WORKER_CLI;
+        try {
+            await withMockTmuxFixture('omx-tmux-owned-hud-startup-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{window_width}"*)
+        echo "120"
+        ;;
+      *)
+        echo "shared:0 %1"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"pane_current_command"*)
+        printf "%%1\\tnode\\t'codex'\\n"
+        printf "%%7\\tnode\\t'codex neighbor'\\n"
+        printf "%%2\\tnode\\texec env OMX_SESSION_ID='leader-session-a' OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%1' node /tmp/bin/omx.js hud --watch\\n"
+        printf "%%8\\tnode\\texec env OMX_SESSION_ID='neighbor-session' OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%7' node /tmp/bin/omx.js hud --watch\\n"
+        ;;
+      *)
+        printf "%%1\\n%%7\\n%%2\\n%%8\\n"
+        ;;
+    esac
+    exit 0
+    ;;
+  split-window)
+    case "$*" in
+      *" -h "*)
+        echo "%3"
+        ;;
+      *)
+        echo "%4"
+        ;;
+    esac
+    exit 0
+    ;;
+  set-option|resize-pane|select-layout|set-window-option|select-pane|set-hook|run-shell|send-keys|kill-pane)
+    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 = 'shared-session,stub,0';
+                process.env.TMUX_PANE = '%1';
+                process.env.OMX_SESSION_ID = 'leader-session-a';
+                process.env.OMX_TEAM_WORKER_CLI = 'gemini';
+                const session = createTeamSession('Owned HUD Startup', 1, cwd);
+                assert.equal(session.leaderPaneId, '%1');
+                assert.equal(session.hudPaneId, '%4');
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                assert.match(tmuxLog, /kill-pane -t %2/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %8/);
+                assert.match(tmuxLog, /split-window -v -f -l 3 -t shared:0 -d -P -F #\{pane_id\}/);
+            });
+        }
+        finally {
+            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 prevSessionId === 'string')
+                process.env.OMX_SESSION_ID = prevSessionId;
+            else
+                delete process.env.OMX_SESSION_ID;
+            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 });
+        }
+    });
     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;
@@ -3911,6 +4122,307 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
+    it('restores standalone HUD panes from the live leader pane cwd with explicit session ownership', async () => {
+        const teamLaunchCwd = await mkdtemp(join(tmpdir(), 'omx-standalone-team-launch-cwd-'));
+        const leaderPaneCwd = await mkdtemp(join(tmpdir(), 'omx-standalone-leader-pane-cwd-'));
+        try {
+            await withMockTmuxFixture('omx-tmux-leader-cwd-standalone-hud-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${leaderPaneCwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  split-window)
+    echo "%44"
+    exit 0
+    ;;
+  run-shell|select-pane|resize-pane|set-hook)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                const paneId = restoreStandaloneHudPane('%11', teamLaunchCwd, {
+                    sessionId: 'current-session-for-hud',
+                });
+                assert.equal(paneId, '%44');
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                assert.match(tmuxLog, /display-message -p -t %11 #\{pane_current_path\}/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\} -c ${escapeRegExp(leaderPaneCwd)} `));
+                assert.doesNotMatch(tmuxLog, new RegExp(`split-window .* -c ${escapeRegExp(teamLaunchCwd)} `));
+                assert.match(tmuxLog, /exec env OMX_SESSION_ID='current-session-for-hud' OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%11' .*hud --watch/);
+            });
+        }
+        finally {
+            await rm(teamLaunchCwd, { recursive: true, force: true });
+            await rm(leaderPaneCwd, { recursive: true, force: true });
+        }
+    });
+    it('falls back to the team launch cwd when the live leader pane cwd is unusable', async () => {
+        const teamLaunchCwd = await mkdtemp(join(tmpdir(), 'omx-standalone-team-launch-cwd-fallback-'));
+        const deletedLeaderPaneCwd = await mkdtemp(join(tmpdir(), 'omx-standalone-deleted-leader-pane-cwd-'));
+        await rm(deletedLeaderPaneCwd, { recursive: true, force: true });
+        try {
+            await withMockTmuxFixture('omx-tmux-deleted-leader-cwd-standalone-hud-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${deletedLeaderPaneCwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  split-window)
+    case "$*" in
+      *"-c ${teamLaunchCwd} "*)
+        echo "%44"
+        exit 0
+        ;;
+      *"-c ${deletedLeaderPaneCwd} "*)
+        echo "deleted cwd should not be used" >&2
+        exit 1
+        ;;
+      *)
+        echo "unexpected cwd: $*" >&2
+        exit 1
+        ;;
+    esac
+    ;;
+  run-shell|select-pane|resize-pane|set-hook)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                const paneId = restoreStandaloneHudPane('%11', teamLaunchCwd, {
+                    sessionId: 'current-session-for-hud',
+                });
+                assert.equal(paneId, '%44');
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                assert.match(tmuxLog, /display-message -p -t %11 #\{pane_current_path\}/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\} -c ${escapeRegExp(teamLaunchCwd)} `));
+                assert.doesNotMatch(tmuxLog, new RegExp(`split-window .* -c ${escapeRegExp(deletedLeaderPaneCwd)} `));
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(teamLaunchCwd, { recursive: true, force: true });
+        }
+    });
+    it('keeps MSYS drive-style live leader cwd candidates without raw stat prefiltering', async () => {
+        const liveLeaderCwd = '/c/live';
+        const fallbackCwd = 'C:\\fallback';
+        const fakeCygpathDir = await mkdtemp(join(tmpdir(), 'omx-msys-live-cygpath-'));
+        const previousPath = process.env.PATH;
+        const previousMsystem = process.env.MSYSTEM;
+        const previousOstype = process.env.OSTYPE;
+        const previousWsl = process.env.WSL_DISTRO_NAME;
+        const previousWslInterop = process.env.WSL_INTEROP;
+        const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');
+        const statCalls = [];
+        try {
+            const cygpathPath = join(fakeCygpathDir, 'cygpath');
+            await writeFile(cygpathPath, '#!/bin/sh\nprintf "%s\\n" "$2"\n');
+            await chmod(cygpathPath, 0o755);
+            process.env.PATH = `${fakeCygpathDir}:${previousPath ?? ''}`;
+            process.env.MSYSTEM = 'MINGW64';
+            process.env.OSTYPE = 'msys';
+            delete process.env.WSL_DISTRO_NAME;
+            delete process.env.WSL_INTEROP;
+            Object.defineProperty(process, 'platform', { value: 'win32', configurable: true });
+            await withMockTmuxFixture('omx-tmux-msys-live-cwd-standalone-hud-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${liveLeaderCwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  split-window)
+    case "$*" in
+      *"-c ${liveLeaderCwd} "*)
+        echo "%44"
+        exit 0
+        ;;
+      *"-c ${fallbackCwd} "*)
+        echo "fallback cwd should not be used when MSYS live cwd succeeds" >&2
+        exit 1
+        ;;
+      *)
+        echo "unexpected cwd: $*" >&2
+        exit 1
+        ;;
+    esac
+    ;;
+  run-shell|select-pane|resize-pane|set-hook)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                const paneId = withMockedStatSync(((pathLike) => {
+                    const value = String(pathLike);
+                    statCalls.push(value);
+                    if (value === fallbackCwd)
+                        return { isDirectory: () => true };
+                    return { isDirectory: () => false };
+                }), () => restoreStandaloneHudPane('%11', fallbackCwd, { sessionId: 'current-session-for-hud' }));
+                assert.equal(paneId, '%44');
+                assert.equal(statCalls.includes(liveLeaderCwd), false);
+                assert.equal(statCalls.includes(fallbackCwd), true);
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                assert.match(tmuxLog, /display-message -p -t %11 #\{pane_current_path\}/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\} -c ${escapeRegExp(liveLeaderCwd)} `));
+                assert.doesNotMatch(tmuxLog, new RegExp(`split-window .* -c ${escapeRegExp(fallbackCwd)} `));
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            if (originalPlatform)
+                Object.defineProperty(process, 'platform', originalPlatform);
+            if (typeof previousPath === 'string')
+                process.env.PATH = previousPath;
+            else
+                delete process.env.PATH;
+            if (typeof previousMsystem === 'string')
+                process.env.MSYSTEM = previousMsystem;
+            else
+                delete process.env.MSYSTEM;
+            if (typeof previousOstype === 'string')
+                process.env.OSTYPE = previousOstype;
+            else
+                delete process.env.OSTYPE;
+            if (typeof previousWsl === 'string')
+                process.env.WSL_DISTRO_NAME = previousWsl;
+            else
+                delete process.env.WSL_DISTRO_NAME;
+            if (typeof previousWslInterop === 'string')
+                process.env.WSL_INTEROP = previousWslInterop;
+            else
+                delete process.env.WSL_INTEROP;
+            await rm(fakeCygpathDir, { recursive: true, force: true });
+        }
+    });
+    it('falls back after an unusable MSYS drive-style live leader cwd split attempt fails', async () => {
+        const liveLeaderCwd = '/c/deleted-live';
+        const fallbackCwd = 'C:\\fallback';
+        const fakeCygpathDir = await mkdtemp(join(tmpdir(), 'omx-msys-deleted-live-cygpath-'));
+        const previousPath = process.env.PATH;
+        const previousMsystem = process.env.MSYSTEM;
+        const previousOstype = process.env.OSTYPE;
+        const previousWsl = process.env.WSL_DISTRO_NAME;
+        const previousWslInterop = process.env.WSL_INTEROP;
+        const originalPlatform = Object.getOwnPropertyDescriptor(process, 'platform');
+        const statCalls = [];
+        try {
+            const cygpathPath = join(fakeCygpathDir, 'cygpath');
+            await writeFile(cygpathPath, '#!/bin/sh\nprintf "%s\\n" "$2"\n');
+            await chmod(cygpathPath, 0o755);
+            process.env.PATH = `${fakeCygpathDir}:${previousPath ?? ''}`;
+            process.env.MSYSTEM = 'MINGW64';
+            process.env.OSTYPE = 'msys';
+            delete process.env.WSL_DISTRO_NAME;
+            delete process.env.WSL_INTEROP;
+            Object.defineProperty(process, 'platform', { value: 'win32', configurable: true });
+            await withMockTmuxFixture('omx-tmux-msys-deleted-live-cwd-standalone-hud-', (logPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${logPath}"
+case "\${1:-}" in
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${liveLeaderCwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  split-window)
+    case "$*" in
+      *"-c ${liveLeaderCwd} "*)
+        echo "deleted live cwd cannot be used" >&2
+        exit 1
+        ;;
+      *"-c ${fallbackCwd} "*)
+        echo "%44"
+        exit 0
+        ;;
+      *)
+        echo "unexpected cwd: $*" >&2
+        exit 1
+        ;;
+    esac
+    ;;
+  run-shell|select-pane|resize-pane|set-hook)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`, async ({ logPath }) => {
+                const paneId = withMockedStatSync(((pathLike) => {
+                    const value = String(pathLike);
+                    statCalls.push(value);
+                    if (value === fallbackCwd)
+                        return { isDirectory: () => true };
+                    return { isDirectory: () => false };
+                }), () => restoreStandaloneHudPane('%11', fallbackCwd, { sessionId: 'current-session-for-hud' }));
+                assert.equal(paneId, '%44');
+                assert.equal(statCalls.includes(liveLeaderCwd), false);
+                assert.equal(statCalls.includes(fallbackCwd), true);
+                const tmuxLog = await readFile(logPath, 'utf-8');
+                const liveAttemptIndex = tmuxLog.indexOf(`-c ${liveLeaderCwd} `);
+                const fallbackAttemptIndex = tmuxLog.indexOf(`-c ${fallbackCwd} `);
+                assert.ok(liveAttemptIndex >= 0, 'deleted MSYS live cwd should still be attempted');
+                assert.ok(fallbackAttemptIndex > liveAttemptIndex, 'fallback should be attempted after live split failure');
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            if (originalPlatform)
+                Object.defineProperty(process, 'platform', originalPlatform);
+            if (typeof previousPath === 'string')
+                process.env.PATH = previousPath;
+            else
+                delete process.env.PATH;
+            if (typeof previousMsystem === 'string')
+                process.env.MSYSTEM = previousMsystem;
+            else
+                delete process.env.MSYSTEM;
+            if (typeof previousOstype === 'string')
+                process.env.OSTYPE = previousOstype;
+            else
+                delete process.env.OSTYPE;
+            if (typeof previousWsl === 'string')
+                process.env.WSL_DISTRO_NAME = previousWsl;
+            else
+                delete process.env.WSL_DISTRO_NAME;
+            if (typeof previousWslInterop === 'string')
+                process.env.WSL_INTEROP = previousWslInterop;
+            else
+                delete process.env.WSL_INTEROP;
+            await rm(fakeCygpathDir, { recursive: true, force: true });
+        }
+    });
     it('restores standalone HUD panes with an absolute OMX entry path after cwd drift', async () => {
         const cwd = await mkdtemp(join(tmpdir(), 'omx-standalone-relative-hud-'));
         const startupCwd = await mkdtemp(join(tmpdir(), 'omx-standalone-relative-start-'));