oh-my-codex 0.20.2 → 0.20.5

package/dist/cli/__tests__/team.test.js

@@ -1145,8 +1145,14 @@ describe('teamCommand shutdown --force parsing', () => {
         try {
             process.chdir(wd);
             await mkdir(join(wd, '.omx', 'state'), { recursive: true });
-            await writeFile(join(wd, '.omx', 'state', 'session.json'), JSON.stringify({ session_id: 'sess-team-shutdown-state' }));
+            await writeFile(join(wd, '.omx', 'state', 'session.json'), JSON.stringify({ session_id: 'sess-team-shutdown-state', cwd: wd, state_root: join(wd, '.omx', 'state') }));
             await initTeamState('team-shutdown-mode-state', 'persist cancelled team mode state after shutdown', 'executor', 1, wd);
+            const config = await readTeamConfig('team-shutdown-mode-state', wd);
+            assert.ok(config);
+            if (!config)
+                return;
+            config.tmux_session = '';
+            await saveTeamConfig(config, wd);
             console.log = (...args) => logs.push(args.map(String).join(' '));
             console.warn = (...args) => warns.push(args.map(String).join(' '));
             await teamCommand(['shutdown', 'team-shutdown-mode-state', '--force']);
@@ -1183,6 +1189,12 @@ describe('teamCommand shutdown --force parsing', () => {
                 team_name: teamName,
             }, null, 2));
             await initTeamState(teamName, 'persist cancelled session-scoped team mode state after shutdown', 'executor', 1, wd);
+            const config = await readTeamConfig(teamName, wd);
+            assert.ok(config);
+            if (!config)
+                return;
+            config.tmux_session = '';
+            await saveTeamConfig(config, wd);
             await teamCommand(['shutdown', teamName, '--force']);
             const scopedState = JSON.parse(await readFile(join(scopedStateDir, 'team-state.json'), 'utf-8'));
             assert.equal(scopedState.active, false);
@@ -1213,6 +1225,12 @@ describe('teamCommand shutdown --force parsing', () => {
                 team_name: teamName,
             }, null, 2));
             await initTeamState(teamName, 'shutdown should not create scoped team mode state from a root-only mode state', 'executor', 1, wd);
+            const config = await readTeamConfig(teamName, wd);
+            assert.ok(config);
+            if (!config)
+                return;
+            config.tmux_session = '';
+            await saveTeamConfig(config, wd);
             await teamCommand(['shutdown', teamName, '--force']);
             assert.equal(existsSync(scopedStatePath), false);
             const rootState = JSON.parse(await readFile(join(stateDir, 'team-state.json'), 'utf-8'));
@@ -1245,6 +1263,12 @@ describe('teamCommand shutdown --force parsing', () => {
                 team_name: teamName,
             }, null, 2));
             await initTeamState(teamName, 'shutdown should ignore stale session.json when only root team mode state exists', 'executor', 1, wd);
+            const config = await readTeamConfig(teamName, wd);
+            assert.ok(config);
+            if (!config)
+                return;
+            config.tmux_session = '';
+            await saveTeamConfig(config, wd);
             await teamCommand(['shutdown', teamName, '--force']);
             assert.equal(existsSync(scopedStatePath), false);
             const rootState = JSON.parse(await readFile(join(stateDir, 'team-state.json'), 'utf-8'));
@@ -1266,6 +1290,8 @@ describe('teamCommand shutdown --force parsing', () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-team-shutdown-shared-cli-'));
         const binDir = join(wd, 'bin');
         const tmuxLogPath = join(wd, 'tmux.log');
+        const killedHudPanePath = join(wd, 'killed-hud-pane');
+        const restoredHudPanePath = join(wd, 'restored-hud-pane');
         const tmuxPath = join(binDir, 'tmux');
         const previousPath = process.env.PATH;
         await mkdir(binDir, { recursive: true });
@@ -1279,15 +1305,27 @@ case "$1" in
     ;;
   list-panes)
     case "$*" in
+      "list-panes -a -F #{pane_id}\t#{pane_dead}\t#{pane_pid}")
+        printf "%%11\t0\t1111\n"
+        [ -f "${killedHudPanePath}" ] || printf "%%12\t0\t1212\n"
+        [ -f "${wd}/killed-pane-%13" ] || printf "%%13\t0\t1313\n"
+        [ -f "${wd}/killed-pane-%14" ] || printf "%%14\t0\t1414\n"
+        [ ! -f "${restoredHudPanePath}" ] || printf "%%44\t0\t4444\n"
+        exit 0
+        ;;
+
       *"-F #{pane_dead} #{pane_pid}"*)
         exit 1
         ;;
-      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
-        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=shared-shutdown-cli/worker-1 codex\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=shared-shutdown-cli/worker-2 codex\\n"
+      *"-F #{pane_id}\t#{pane_current_command}\t#{pane_start_command}"*)
+        printf "%%11\tzsh\tzsh\n%%12\tnode\tnode /tmp/bin/omx.js hud --watch\n%%13\tcodex\tenv OMX_TEAM_INTERNAL_WORKER=shared-shutdown-cli/worker-1 codex\n%%14\tcodex\tenv OMX_TEAM_INTERNAL_WORKER=shared-shutdown-cli/worker-2 codex\n"
+        if [ -f "${restoredHudPanePath}" ]; then
+          printf "%%44\tnode\tenv OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE=%%11 node /tmp/bin/omx.js hud --watch\n"
+        fi
         exit 0
         ;;
-      *"-t leader:0 -F #{pane_id}"*)
-        printf "%%11\\n%%12\\n%%13\\n%%14\\n"
+      *"-F #{pane_id}"*)
+        printf "%%11\n%%12\n%%13\n%%14\n"
         exit 0
         ;;
       *)
@@ -1296,7 +1334,8 @@ case "$1" in
     esac
     ;;
   split-window)
-    printf '%%44\\n'
+    : > "${restoredHudPanePath}"
+    printf '%%44\n'
     exit 0
     ;;
   show-option)
@@ -1307,6 +1346,15 @@ case "$1" in
       *"-p -t %12 @omx_team_pane_owner_id"*)
         echo "team:shared-shutdown-cli"
         ;;
+      *"-p -t %13 @omx_team_pane_owner_id"*)
+        echo "team:shared-shutdown-cli"
+        ;;
+      *"-p -t %14 @omx_team_pane_owner_id"*)
+        echo "team:shared-shutdown-cli"
+        ;;
+      *"-p -t %44 @omx_team_pane_owner_id"*)
+        echo "team:shared-shutdown-cli"
+        ;;
       *)
         exit 1
         ;;
@@ -1314,6 +1362,10 @@ case "$1" in
     exit 0
     ;;
   kill-pane)
+    case "$3" in
+      %12) : > "${killedHudPanePath}" ;;
+      %13|%14) : > "${wd}/killed-pane-$3" ;;
+    esac
     # Shared-session runtime coverage should validate pane-targeted teardown
     # only. Detached leader-wrapper signal behavior is covered separately in
     # cli/index detached-session tests.
@@ -1336,9 +1388,14 @@ esac
                 return;
             config.tmux_session = 'leader:0';
             config.leader_pane_id = '%11';
+            config.leader_pane_pid = 1111;
             config.hud_pane_id = '%12';
+            config.hud_pane_pid = 1212;
+            config.tmux_pane_owner_id = 'team:shared-shutdown-cli';
             config.workers[0].pane_id = '%13';
+            config.workers[0].pid = 1313;
             config.workers[1].pane_id = '%14';
+            config.workers[1].pid = 1414;
             await saveTeamConfig(config, wd);
             const result = await runNodeCli(['team', 'shutdown', 'shared-shutdown-cli', '--force'], {
                 cwd: wd,
@@ -1357,6 +1414,16 @@ esac
             assert.match(tmuxLog, /kill-pane -t %13/);
             assert.match(tmuxLog, /kill-pane -t %14/);
             assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+            const tmuxCommands = tmuxLog.trim().split('\n').filter(Boolean);
+            const exactGlobalPaneProof = /^list-panes -a -F #\{pane_id\}\t#\{pane_dead\}\t#\{pane_pid\}$/;
+            for (const paneId of ['%12', '%13', '%14']) {
+                const killIndex = tmuxCommands.indexOf(`kill-pane -t ${paneId}`);
+                assert.ok(killIndex > 2, `expected teardown for ${paneId}`);
+                assert.match(tmuxCommands[killIndex - 3] ?? '', exactGlobalPaneProof, `${paneId} teardown must begin with a fresh exact global proof`);
+                assert.equal(tmuxCommands[killIndex - 2], `show-option -qv -p -t ${paneId} @omx_team_pane_owner_id`, `${paneId} teardown must include adjacent owner authorization`);
+                assert.match(tmuxCommands[killIndex - 1] ?? '', exactGlobalPaneProof, `${paneId} teardown must end with a final exact global PID proof`);
+            }
+            assert.doesNotMatch(tmuxLog, /list-panes -t %(12|13|14)\b/, 'explicit teardown panes must not use target-scoped fallback proof');
         }
         finally {
             if (typeof previousPath === 'string')
@@ -1373,9 +1440,29 @@ esac
             await withTempTmuxSession(async (fixture) => {
                 const teamName = 'shared-shutdown-in-pane';
                 const teamStateRoot = join(wd, '.omx', 'state');
+                const runtimeDir = join(teamStateRoot, 'team', teamName, 'runtime');
+                const workerPaneOneScript = join(runtimeDir, 'worker-1-startup.sh');
+                const workerPaneTwoScript = join(runtimeDir, 'worker-2-startup.sh');
+                await mkdir(runtimeDir, { recursive: true });
+                await writeFile(workerPaneOneScript, '#!/bin/sh\nexec sleep 300\n');
+                await writeFile(workerPaneTwoScript, '#!/bin/sh\nexec sleep 300\n');
+                await chmod(workerPaneOneScript, 0o755);
+                await chmod(workerPaneTwoScript, 0o755);
                 const hudPaneId = runFixtureTmux(fixture, ['split-window', '-d', '-P', '-F', '#{pane_id}', '-t', fixture.windowTarget, 'sleep 300']);
-                const workerPaneOne = runFixtureTmux(fixture, ['split-window', '-d', '-P', '-F', '#{pane_id}', '-t', fixture.windowTarget, 'sleep 300']);
-                const workerPaneTwo = runFixtureTmux(fixture, ['split-window', '-d', '-P', '-F', '#{pane_id}', '-t', fixture.windowTarget, 'sleep 300']);
+                const workerPaneOne = runFixtureTmux(fixture, ['split-window', '-d', '-P', '-F', '#{pane_id}', '-t', fixture.windowTarget, workerPaneOneScript]);
+                const workerPaneTwo = runFixtureTmux(fixture, ['split-window', '-d', '-P', '-F', '#{pane_id}', '-t', fixture.windowTarget, workerPaneTwoScript]);
+                const leaderPanePid = Number(runFixtureTmux(fixture, ['display-message', '-p', '-t', fixture.leaderPaneId, '#{pane_pid}']));
+                const hudPanePid = Number(runFixtureTmux(fixture, ['display-message', '-p', '-t', hudPaneId, '#{pane_pid}']));
+                const workerPaneOnePid = Number(runFixtureTmux(fixture, ['display-message', '-p', '-t', workerPaneOne, '#{pane_pid}']));
+                const workerPaneTwoPid = Number(runFixtureTmux(fixture, ['display-message', '-p', '-t', workerPaneTwo, '#{pane_pid}']));
+                assert.ok(leaderPanePid > 0);
+                assert.ok(hudPanePid > 0);
+                assert.ok(workerPaneOnePid > 0);
+                assert.ok(workerPaneTwoPid > 0);
+                const paneOwnerId = 'team:shared-shutdown-in-pane';
+                for (const paneId of [fixture.leaderPaneId, hudPaneId, workerPaneOne, workerPaneTwo]) {
+                    runFixtureTmux(fixture, ['set-option', '-p', '-t', paneId, '@omx_team_pane_owner_id', paneOwnerId]);
+                }
                 await initTeamState(teamName, 'shared shutdown in-pane test', 'executor', 2, wd);
                 const config = await readTeamConfig(teamName, wd);
                 assert.ok(config);
@@ -1383,9 +1470,14 @@ esac
                     return;
                 config.tmux_session = fixture.windowTarget;
                 config.leader_pane_id = fixture.leaderPaneId;
+                config.leader_pane_pid = leaderPanePid;
                 config.hud_pane_id = hudPaneId;
+                config.hud_pane_pid = hudPanePid;
+                config.tmux_pane_owner_id = paneOwnerId;
                 config.workers[0].pane_id = workerPaneOne;
+                config.workers[0].pid = workerPaneOnePid;
                 config.workers[1].pane_id = workerPaneTwo;
+                config.workers[1].pid = workerPaneTwoPid;
                 await saveTeamConfig(config, wd);
                 const result = await runNodeCli(['team', 'shutdown', teamName, '--force'], {
                     cwd: wd,
@@ -1898,6 +1990,7 @@ describe('teamCommand status', () => {
     it('prints pane ids and raw inspect hints when tmux panes are recorded', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-team-status-panes-'));
         const previousCwd = process.cwd();
+        const previousPath = process.env.PATH;
         const logs = [];
         const originalLog = console.log;
         try {
@@ -2005,6 +2098,20 @@ describe('teamCommand status', () => {
             }));
             await writeFile(join(wd, '.omx', 'state', 'team', 'pane-team', 'config.json'), `${JSON.stringify(config, null, 2)}\n`);
             await writeFile(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+            const tmuxPath = join(wd, 'tmux');
+            await writeFile(tmuxPath, `#!/bin/sh
+if [ "$1" = "display-message" ]; then
+  case "$4" in
+    %21) printf '%%21\\t1\\t101\\t${config.tmux_pane_owner_id}\\n' ;;
+    %22) printf '%%22\\t1\\t102\\t${config.tmux_pane_owner_id}\\n' ;;
+    *) exit 1 ;;
+  esac
+  exit 0
+fi
+exit 1
+`);
+            await chmod(tmuxPath, 0o755);
+            process.env.PATH = `${wd}:${previousPath ?? ''}`;
             console.log = (...args) => logs.push(args.map(String).join(' '));
             await withoutTeamTestWorkerEnv(() => teamCommand(['status', 'pane-team']));
             const output = logs.join('\n');
@@ -2026,6 +2133,10 @@ describe('teamCommand status', () => {
             assert.match(modelInspectOutput, /inspect_summary: [\s\S]*command=omx sparkshell --tmux-pane %21 --tail-lines 400/);
         }
         finally {
+            if (typeof previousPath === 'string')
+                process.env.PATH = previousPath;
+            else
+                delete process.env.PATH;
             console.log = originalLog;
             process.chdir(previousCwd);
             await rm(wd, { recursive: true, force: true });
@@ -2035,10 +2146,12 @@ describe('teamCommand status', () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-team-status-json-'));
         const previousCwd = process.cwd();
         const previousTeamStateRoot = process.env.OMX_TEAM_STATE_ROOT;
+        const previousPath = process.env.PATH;
         const logs = [];
         const originalLog = console.log;
         try {
             delete process.env.OMX_TEAM_STATE_ROOT;
+            process.env.PATH = wd;
             process.chdir(wd);
             const config = await withoutTeamTestWorkerEnv(() => initTeamState('pane-json-team', 'inspect worker panes', 'executor', 1, wd));
             await withoutTeamTestWorkerEnv(() => createTask('pane-json-team', {
@@ -2102,6 +2215,15 @@ describe('teamCommand status', () => {
             }));
             await writeFile(join(wd, '.omx', 'state', 'team', 'pane-json-team', 'config.json'), `${JSON.stringify(config, null, 2)}\n`);
             await writeFile(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+            const tmuxPath = join(wd, 'tmux');
+            await writeFile(tmuxPath, `#!/bin/sh
+if [ "$1" = "display-message" ] && [ "$4" = "%41" ]; then
+  printf '%%41\\t1\\t201\\t${config.tmux_pane_owner_id}\\n'
+  exit 0
+fi
+exit 1
+`);
+            await chmod(tmuxPath, 0o755);
             console.log = (...args) => logs.push(args.map(String).join(' '));
             await withoutTeamTestWorkerEnv(() => teamCommand(['status', 'pane-json-team', '--json']));
             const payload = JSON.parse(logs.at(-1) ?? '{}');
@@ -2265,6 +2387,10 @@ describe('teamCommand status', () => {
                 process.env.OMX_TEAM_STATE_ROOT = previousTeamStateRoot;
             else
                 delete process.env.OMX_TEAM_STATE_ROOT;
+            if (typeof previousPath === 'string')
+                process.env.PATH = previousPath;
+            else
+                delete process.env.PATH;
             console.log = originalLog;
             process.chdir(previousCwd);
             await rm(wd, { recursive: true, force: true });
@@ -2520,12 +2646,14 @@ describe('teamCommand status', () => {
     it('supports custom tail lines for generated raw inspect commands', async () => {
         const wd = await mkdtemp(join(tmpdir(), 'omx-team-status-tail-lines-'));
         const previousCwd = process.cwd();
+        const previousPath = process.env.PATH;
         const logs = [];
         const originalLog = console.log;
         try {
             process.chdir(wd);
             const config = await withoutTeamTestWorkerEnv(() => initTeamState('pane-tail-team', 'inspect worker panes', 'executor', 1, wd));
             config.workers[0].pane_id = '%51';
+            config.workers[0].pid = process.pid;
             const manifestPath = join(wd, '.omx', 'state', 'team', 'pane-tail-team', 'manifest.v2.json');
             const manifest = JSON.parse(await readFile(manifestPath, 'utf-8'));
             manifest.workers = config.workers.map((worker) => ({
@@ -2534,6 +2662,16 @@ describe('teamCommand status', () => {
             }));
             await writeFile(join(wd, '.omx', 'state', 'team', 'pane-tail-team', 'config.json'), `${JSON.stringify(config, null, 2)}\n`);
             await writeFile(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);
+            const tmuxPath = join(wd, 'tmux');
+            await writeFile(tmuxPath, `#!/bin/sh
+if [ "$1" = "display-message" ] && [ "$4" = "%51" ]; then
+  printf '%%51\\t0\\t${process.pid}\\t${config.tmux_pane_owner_id}\\n'
+  exit 0
+fi
+exit 1
+`);
+            await chmod(tmuxPath, 0o755);
+            process.env.PATH = `${wd}:${previousPath ?? ''}`;
             console.log = (...args) => logs.push(args.map(String).join(' '));
             await withoutTeamTestWorkerEnv(() => teamCommand(['status', 'pane-tail-team', '--tail-lines', '600']));
             assert.match(logs.join('\n'), /inspect_worker-1: tmux capture-pane -p -t %51 -S -600/);
@@ -2547,6 +2685,10 @@ describe('teamCommand status', () => {
             assert.equal(payload.panes?.sparkshell_commands?.['worker-1'], 'omx sparkshell --tmux-pane %51 --tail-lines 550');
         }
         finally {
+            if (typeof previousPath === 'string')
+                process.env.PATH = previousPath;
+            else
+                delete process.env.PATH;
             console.log = originalLog;
             process.chdir(previousCwd);
             await rm(wd, { recursive: true, force: true });