oh-my-codex 0.18.13 → 0.18.14

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

@@ -18,6 +18,9 @@ const coverageRun = process.env.NODE_V8_COVERAGE ? true : false;
 const skipSlowLifecycleUnderCoverage = coverageRun
     ? 'covered by the team-state-runtime lane; skipped under c8 to keep the coverage gate bounded around slow process-lifecycle waits'
     : false;
+function escapeRegExp(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
 async function initRepo() {
     const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-worktree-repo-'));
     execFileSync('git', ['init'], { cwd, stdio: 'ignore' });
@@ -446,6 +449,7 @@ describe('runtime', () => {
         assert.deepEqual(args, ['--no-alt-screen', '--model', expectedLowComplexityModel()]);
     });
     it('resolveWorkerLaunchArgsFromEnv reads low-complexity model from config when present', async () => {
+        // Intentional legacy model fixture: verifies explicit low-complexity config survives worker launch resolution.
         await withIsolatedDefaultModelEnvAsync(async () => {
             const previousCodexHome = process.env.CODEX_HOME;
             const tempCodexHome = await mkdtemp(join(tmpdir(), 'omx-codex-home-'));
@@ -1242,6 +1246,271 @@ process.on('SIGTERM', () => process.exit(0));`);
         assert.equal(shouldPrekillInteractiveShutdownProcessTrees('leader:0'), false);
         assert.equal(shouldPrekillInteractiveShutdownProcessTrees('omx-team-alpha'), true);
     });
+    it('startTeam tags interactive panes with the derived tmux-pane leader identity when session id is unavailable', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-pane-derived-owner-'));
+        const prevTmux = process.env.TMUX;
+        const prevTmuxPane = process.env.TMUX_PANE;
+        const prevSessionId = process.env.OMX_SESSION_ID;
+        const prevCodexSessionId = process.env.CODEX_SESSION_ID;
+        const prevGenericSessionId = process.env.SESSION_ID;
+        const prevLaunchMode = process.env.OMX_TEAM_WORKER_LAUNCH_MODE;
+        const prevWorkerCli = process.env.OMX_TEAM_WORKER_CLI;
+        const prevSkipReadyWait = process.env.OMX_TEAM_SKIP_READY_WAIT;
+        let runtime = null;
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-pane-derived-owner-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "\${1:-}" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{window_width}"*)
+        echo "120"
+        ;;
+      *)
+        echo "leader: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|send-keys|kill-pane|kill-session)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                binaries: [{
+                        name: 'gemini',
+                        content: '#!/bin/sh\nexit 0\n',
+                    }],
+                env: {
+                    OMX_SESSION_ID: undefined,
+                    CODEX_SESSION_ID: undefined,
+                    SESSION_ID: undefined,
+                },
+            }, async ({ tmuxLogPath }) => {
+                process.env.TMUX = 'leader-session,stub,0';
+                process.env.TMUX_PANE = '%1';
+                process.env.OMX_TEAM_WORKER_LAUNCH_MODE = 'interactive';
+                process.env.OMX_TEAM_WORKER_CLI = 'gemini';
+                process.env.OMX_TEAM_SKIP_READY_WAIT = '1';
+                runtime = await withoutTeamWorkerEnv(() => startTeam('pane-derived-owner', 'derived pane owner', 'executor', 1, [{ subject: 's', description: 'd', owner: 'worker-1' }], cwd));
+                const manifest = JSON.parse(await readFile(join(cwd, '.omx', 'state', 'team', runtime.teamName, 'manifest.v2.json'), 'utf-8'));
+                assert.equal(manifest.leader?.session_id, '%1');
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.match(tmuxLog, /set-option -p -t %1 @omx_pane_instance_id %1/);
+                assert.match(tmuxLog, /set-option -p -t %2 @omx_pane_instance_id %1/);
+                assert.match(tmuxLog, /set-option -p -t %3 @omx_pane_instance_id %1/);
+                assert.match(tmuxLog, /exec env OMX_SESSION_ID='%1' OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%1' .*hud --watch/);
+                await shutdownTeam(runtime.teamName, cwd, { force: true });
+                runtime = null;
+            });
+        }
+        finally {
+            const runtimeToShutdown = runtime;
+            if (runtimeToShutdown) {
+                await shutdownTeam(runtimeToShutdown.teamName, cwd, { force: true }).catch(() => { });
+            }
+            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 prevCodexSessionId === 'string')
+                process.env.CODEX_SESSION_ID = prevCodexSessionId;
+            else
+                delete process.env.CODEX_SESSION_ID;
+            if (typeof prevGenericSessionId === 'string')
+                process.env.SESSION_ID = prevGenericSessionId;
+            else
+                delete process.env.SESSION_ID;
+            if (typeof prevLaunchMode === 'string')
+                process.env.OMX_TEAM_WORKER_LAUNCH_MODE = prevLaunchMode;
+            else
+                delete process.env.OMX_TEAM_WORKER_LAUNCH_MODE;
+            if (typeof prevWorkerCli === 'string')
+                process.env.OMX_TEAM_WORKER_CLI = prevWorkerCli;
+            else
+                delete process.env.OMX_TEAM_WORKER_CLI;
+            if (typeof prevSkipReadyWait === 'string')
+                process.env.OMX_TEAM_SKIP_READY_WAIT = prevSkipReadyWait;
+            else
+                delete process.env.OMX_TEAM_SKIP_READY_WAIT;
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('startTeam keeps logical session id out of team shutdown ownership tags', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-pane-owner-env-isolated-'));
+        const prevTmux = process.env.TMUX;
+        const prevTmuxPane = process.env.TMUX_PANE;
+        const prevSessionId = process.env.OMX_SESSION_ID;
+        const prevLaunchMode = process.env.OMX_TEAM_WORKER_LAUNCH_MODE;
+        const prevWorkerCli = process.env.OMX_TEAM_WORKER_CLI;
+        const prevSkipReadyWait = process.env.OMX_TEAM_SKIP_READY_WAIT;
+        let runtime = null;
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-pane-owner-env-isolated-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "\${1:-}" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{window_width}"*)
+        echo "120"
+        ;;
+      *)
+        echo "leader: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
+    ;;
+  show-option)
+    case "$*" in
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  set-option|resize-pane|select-layout|set-window-option|select-pane|set-hook|run-shell|send-keys|kill-pane|kill-session)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                binaries: [{
+                        name: 'gemini',
+                        content: '#!/bin/sh\nexit 0\n',
+                    }],
+            }, async ({ tmuxLogPath }) => {
+                process.env.TMUX = 'leader-session,stub,0';
+                process.env.TMUX_PANE = '%1';
+                process.env.OMX_SESSION_ID = 'logical-session-from-env';
+                process.env.OMX_TEAM_WORKER_LAUNCH_MODE = 'interactive';
+                process.env.OMX_TEAM_WORKER_CLI = 'gemini';
+                process.env.OMX_TEAM_SKIP_READY_WAIT = '1';
+                runtime = await withoutTeamWorkerEnv(() => startTeam('pane-owner-env-isolated', 'env session must not be pane owner', 'executor', 1, [{ subject: 's', description: 'd', owner: 'worker-1' }], cwd));
+                const manifest = JSON.parse(await readFile(join(cwd, '.omx', 'state', 'team', runtime.teamName, 'manifest.v2.json'), 'utf-8'));
+                assert.equal(manifest.leader?.session_id, 'logical-session-from-env');
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.match(tmuxLog, /set-option -t leader @omx_instance_id logical-session-from-env/);
+                assert.match(tmuxLog, /set-option -p -t %1 @omx_pane_instance_id logical-session-from-env/);
+                assert.match(tmuxLog, /set-option -p -t %2 @omx_pane_instance_id logical-session-from-env/);
+                assert.match(tmuxLog, /set-option -p -t %3 @omx_pane_instance_id logical-session-from-env/);
+                assert.match(tmuxLog, /set-option -p -t %1 @omx_team_pane_owner_id team:pane-owner-env-isolat-[a-f0-9]{8}/);
+                assert.match(tmuxLog, /set-option -p -t %2 @omx_team_pane_owner_id team:pane-owner-env-isolat-[a-f0-9]{8}/);
+                assert.match(tmuxLog, /set-option -p -t %3 @omx_team_pane_owner_id team:pane-owner-env-isolat-[a-f0-9]{8}/);
+                assert.doesNotMatch(tmuxLog, /set-option -p -t %1 @omx_team_pane_owner_id logical-session-from-env/);
+                assert.match(tmuxLog, /exec env OMX_SESSION_ID='logical-session-from-env' OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%1' .*hud --watch/);
+                await shutdownTeam(runtime.teamName, cwd, { force: true });
+                runtime = null;
+            });
+        }
+        finally {
+            const runtimeToShutdown = runtime;
+            if (runtimeToShutdown) {
+                await shutdownTeam(runtimeToShutdown.teamName, cwd, { force: true }).catch(() => { });
+            }
+            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 prevLaunchMode === 'string')
+                process.env.OMX_TEAM_WORKER_LAUNCH_MODE = prevLaunchMode;
+            else
+                delete process.env.OMX_TEAM_WORKER_LAUNCH_MODE;
+            if (typeof prevWorkerCli === 'string')
+                process.env.OMX_TEAM_WORKER_CLI = prevWorkerCli;
+            else
+                delete process.env.OMX_TEAM_WORKER_CLI;
+            if (typeof prevSkipReadyWait === 'string')
+                process.env.OMX_TEAM_SKIP_READY_WAIT = prevSkipReadyWait;
+            else
+                delete process.env.OMX_TEAM_SKIP_READY_WAIT;
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
     it('startTeam accepts native Windows tmux clients even when TMUX env vars are absent', async () => {
         const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-win32-no-env-'));
         const prevTmux = process.env.TMUX;
@@ -1395,10 +1664,12 @@ esac
                 hudPaneId: '%4',
                 resizeHookName: 'resize-hook',
                 resizeHookTarget: 'leader:0',
+                teamPaneOwnerId: 'team:team-pane-persist-race',
             }, workerPaneIds);
             assert.equal(config.tmux_session, 'leader:0');
             assert.equal(config.leader_pane_id, '%1');
             assert.equal(config.hud_pane_id, '%4');
+            assert.equal(config.tmux_pane_owner_id, 'team:team-pane-persist-race');
             assert.deepEqual(workerPaneIds, ['%2', '%3']);
             assert.equal(config.workers[0]?.pane_id, '%2');
             assert.equal(config.workers[1]?.pane_id, '%3');
@@ -3315,6 +3586,10 @@ process.on('SIGTERM', () => process.exit(0));
                 tmuxScript: (tmuxLogPath) => `#!/bin/sh
 set -eu
 printf '%s\\n' "$*" >> "${tmuxLogPath}"
+hud_state="${tmuxLogPath}.hud-state"
+if [ ! -f "$hud_state" ]; then
+  printf 'absent' > "$hud_state"
+fi
 case "\${1:-}" in
   -V)
     echo "tmux 3.4"
@@ -3334,7 +3609,10 @@ case "\${1:-}" in
   list-panes)
     case "$*" in
       *"pane_current_command"* )
-        printf "%%1\\tnode\\t'codex'\\n"
+        printf "%%1\\tnode\\t'codex'\\n%%2\\tgemini\\tgemini\\n"
+        if [ "$(cat "$hud_state")" != "absent" ]; then
+          printf "%%3\\tnode\\texec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%1' node /tmp/bin/omx.js hud --watch\\n"
+        fi
         ;;
       *"#{pane_dead} #{pane_pid}"*)
         echo "1 2000999999"
@@ -3353,13 +3631,38 @@ case "\${1:-}" in
       *" -h "*)
         echo "%2"
         ;;
+      *" -f "*)
+        printf 'team' > "$hud_state"
+        echo "%3"
+        ;;
       *)
+        printf 'standalone' > "$hud_state"
         echo "%3"
         ;;
     esac
     exit 0
     ;;
-  set-hook|run-shell|select-layout|set-window-option|select-pane|send-keys|kill-pane|kill-session)
+  show-option)
+    case "$*" in
+      *"-p -t %1 @omx_team_pane_owner_id"*)
+        echo "team:team-rerun-hud-6aa4d480"
+        ;;
+      *"-p -t %3 @omx_team_pane_owner_id"*)
+        echo "team:team-rerun-hud-6aa4d480"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane)
+    case "$*" in
+      *"%3"*) printf 'absent' > "$hud_state" ;;
+    esac
+    exit 0
+    ;;
+  set-hook|run-shell|select-layout|set-window-option|select-pane|send-keys|kill-session)
     exit 0
     ;;
   *)
@@ -3373,6 +3676,7 @@ esac
 exit 0
 `,
                     }],
+                env: { OMX_SESSION_ID: 'team-rerun-hud-session' },
             }, async ({ tmuxLogPath }) => {
                 process.env.TMUX = 'leader-session,stub,0';
                 process.env.TMUX_PANE = '%1';
@@ -3381,6 +3685,8 @@ exit 0
                 runtime = await withoutTeamWorkerEnv(() => startTeam('team-rerun-hud', 'rerun hud restore', 'explore', 1, [{ subject: 'restore hud', description: 'restore hud', owner: 'worker-1' }], cwd));
                 assert.equal(runtime.config.hud_pane_id, '%3');
                 assert.ok(runtime.config.resize_hook_name);
+                const configBeforeShutdown = await readTeamConfig(runtime.teamName, cwd);
+                assert.equal(configBeforeShutdown?.hud_pane_id, '%3');
                 await shutdownTeam(runtime.teamName, cwd, { force: true });
                 runtime = null;
                 runtime = await withoutTeamWorkerEnv(() => startTeam('team-rerun-hud', 'rerun hud restore', 'explore', 1, [{ subject: 'restore hud again', description: 'restore hud again', owner: 'worker-1' }], cwd));
@@ -3396,7 +3702,7 @@ exit 0
                 assert.equal(tmuxLog.match(/run-shell -b sleep \d+; tmux resize-pane -t %3 -y \d+ >/g)?.length ?? 0, 3);
                 assert.equal(tmuxLog.match(/run-shell tmux resize-pane -t %3 -y \d+ >/g)?.length ?? 0, 3);
                 assert.ok((tmuxLog.match(/select-layout -t leader:0 main-vertical/g)?.length ?? 0) >= 2);
-                assert.match(tmuxLog, /kill-pane -t %3/);
+                assert.equal(tmuxLog.match(/kill-pane -t %3/g)?.length ?? 0, 2);
             });
         }
         finally {
@@ -4896,6 +5202,7 @@ esac
     });
     it('shutdownTeam reconciles persisted worker panes with live tmux panes before teardown', async () => {
         const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-pane-reconcile-'));
+        const powershellWorkerCommand = Buffer.from("$env:OMX_TEAM_INTERNAL_WORKER = 'team-shutdown-pane-reconcile/worker-6'; & '/opt/node.exe' '/tmp/node_modules/@openai/codex/bin/codex.js'", 'utf16le').toString('base64');
         try {
             await withMockTmuxFixture({
                 dirPrefix: 'omx-runtime-shutdown-pane-reconcile-bin-',
@@ -4922,7 +5229,7 @@ case "$1" in
         exit 0
         ;;
       *"-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\\tcodex\\n%%14\\tcodex\\tcodex\\n"
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\texec /bin/sh '/tmp/.omx/state/team/team-shutdown-pane-reconcile/runtime/worker-1-startup.sh'\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-pane-reconcile/worker-2 codex\\n%%15\\tcodex\\tcodex unrelated-not-worker\\n%%16\\tcodex\\tenv OMX_TEAM_WORKER=team-shutdown-pane-reconcile/worker-3 codex\\n%%17\\tcodex\\tworker-wrapper OMX_TEAM_INTERNAL_WORKER='team-shutdown-pane-reconcile/worker-4' codex\\n%%18\\tcodex\\tenv 'OMX_TEAM_INTERNAL_WORKER=team-shutdown-pane-reconcile/worker-5' codex\\n%%19\\tpowershell.exe\\tpowershell.exe -NoLogo -NoProfile -ExecutionPolicy Bypass -EncodedCommand ${powershellWorkerCommand}\\n%%20\\tzsh\\techo 'OMX_TEAM_INTERNAL_WORKER=team-shutdown-pane-reconcile/worker-7'\\n%%21\\tzsh\\tprintf 'OMX_TEAM_INTERNAL_WORKER=team-shutdown-pane-reconcile/worker-8 codex'\\n%%22\\tzsh\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-pane-reconcile/worker-9 bash -lc 'echo codex'\\n"
         if [ -f "$restored_marker" ]; then
           printf "%%44\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n"
         fi
@@ -4938,6 +5245,23 @@ case "$1" in
     printf '%%44\\n'
     exit 0
     ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-pane-reconcile"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-pane-reconcile"
+        ;;
+      *"-p -t %13 @omx_team_pane_owner_id"|*"-p -t %14 @omx_team_pane_owner_id"|*"-p -t %16 @omx_team_pane_owner_id"|*"-p -t %17 @omx_team_pane_owner_id"|*"-p -t %18 @omx_team_pane_owner_id"|*"-p -t %19 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-pane-reconcile"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
   kill-pane)
     if [ "\${3:-}" = "%999" ]; then
       echo "missing pane" >&2
@@ -4953,6 +5277,7 @@ case "$1" in
     ;;
 esac
 `,
+                env: { OMX_SESSION_ID: 'team-shutdown-pane-reconcile-session' },
             }, async ({ tmuxLogPath }) => {
                 await initTeamState('team-shutdown-pane-reconcile', 'shutdown pane reconcile test', 'executor', 2, cwd);
                 const config = await readTeamConfig('team-shutdown-pane-reconcile', cwd);
@@ -4971,7 +5296,15 @@ esac
                 assert.match(tmuxLog, /kill-pane -t %12/);
                 assert.match(tmuxLog, /kill-pane -t %13/);
                 assert.match(tmuxLog, /kill-pane -t %14/);
-                assert.match(tmuxLog, /kill-pane -t %999/);
+                assert.match(tmuxLog, /kill-pane -t %16/);
+                assert.match(tmuxLog, /kill-pane -t %17/);
+                assert.match(tmuxLog, /kill-pane -t %18/);
+                assert.match(tmuxLog, /kill-pane -t %19/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %999/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %15/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %20/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %21/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %22/);
                 assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\{pane_id\}`));
                 assert.doesNotMatch(tmuxLog, /kill-pane -t %44/);
             });
@@ -4980,15 +5313,16 @@ esac
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it('shutdownTeam skips prekill and keeps the leader pane alive on native Windows split-pane shutdown', async () => {
-        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-win32-split-'));
+    it('shutdownTeam preserves unrelated non-worker panes during shared-session shutdown', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-unrelated-pane-'));
+        const teamName = 'team-shutdown-unrelated-pane';
         try {
-            await withNativeWindowsPlatform(async () => {
-                await withMockTmuxFixture({
-                    dirPrefix: 'omx-runtime-shutdown-win32-split-bin-',
-                    tmuxScript: (tmuxLogPath) => `#!/bin/sh
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-unrelated-pane-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
 set -eu
 printf '%s\\n' "$*" >> "${tmuxLogPath}"
+restored_marker="${tmuxLogPath}.restored"
 case "$1" in
   -V)
     echo "tmux 3.4"
@@ -5000,7 +5334,10 @@ case "$1" in
         exit 1
         ;;
       *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
-        printf "%%11\\tpwsh\\tpwsh\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tcodex\\n%%14\\tcodex\\tcodex\\n"
+        printf "%%10\\tzsh\\tzsh\\n%%11\\tnode\\tnode existing-user-work\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-unrelated-pane/worker-1 codex\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-unrelated-pane/worker-2 codex\\n%%15\\tnode\\tnode /tmp/bin/omx.js sidecar --watch\\n"
+        if [ -f "$restored_marker" ]; then
+          printf "%%44\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n"
+        fi
         exit 0
         ;;
       *)
@@ -5009,10 +5346,25 @@ case "$1" in
     esac
     ;;
   split-window)
+    : > "$restored_marker"
     printf '%%44\\n'
     exit 0
     ;;
-  kill-pane|resize-pane|select-pane)
+  show-option)
+    case "$*" in
+      *"-p -t %10 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-unrelated-pane"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-unrelated-pane"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
     exit 0
     ;;
   *)
@@ -5020,48 +5372,47 @@ case "$1" in
     ;;
 esac
 `,
-                }, async ({ tmuxLogPath }) => {
-                    await initTeamState('team-shutdown-win32-split', 'shutdown win32 split test', 'executor', 2, cwd);
-                    const config = await readTeamConfig('team-shutdown-win32-split', cwd);
-                    assert.ok(config);
-                    if (!config)
-                        return;
-                    config.tmux_session = 'leader:0';
-                    config.leader_pane_id = '%11';
-                    config.hud_pane_id = '%12';
-                    config.workers[0].pane_id = '%13';
-                    config.workers[1].pane_id = '%14';
-                    await saveTeamConfig(config, cwd);
-                    await shutdownTeam('team-shutdown-win32-split', cwd, { force: true });
-                    const teamRoot = join(cwd, '.omx', 'state', 'team', 'team-shutdown-win32-split');
-                    assert.equal(existsSync(teamRoot), false);
-                    assert.equal(await readMonitorSnapshot('team-shutdown-win32-split', cwd), null);
-                    const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
-                    assert.doesNotMatch(tmuxLog, /list-panes -t %13 -F #\{pane_pid\}/);
-                    assert.doesNotMatch(tmuxLog, /list-panes -t %14 -F #\{pane_pid\}/);
-                    assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
-                    assert.doesNotMatch(tmuxLog, /kill-session -t leader:0/);
-                    assert.match(tmuxLog, /kill-pane -t %12/);
-                    assert.match(tmuxLog, /kill-pane -t %13/);
-                    assert.match(tmuxLog, /kill-pane -t %14/);
-                    assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`));
-                    assert.match(tmuxLog, new RegExp(`resize-pane -t %44 -y ${HUD_TMUX_TEAM_HEIGHT_LINES}`));
-                    assert.match(tmuxLog, /select-pane -t %11/);
-                });
+                env: { OMX_SESSION_ID: 'team-shutdown-unrelated-pane-session' },
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown unrelated pane test', 'executor', 2, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%10';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%13';
+                config.workers[1].pane_id = '%14';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const teamRoot = join(cwd, '.omx', 'state', 'team', teamName);
+                assert.equal(existsSync(teamRoot), false);
+                assert.equal(await readMonitorSnapshot(teamName, cwd), null);
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %10/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %15/);
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.match(tmuxLog, /kill-pane -t %14/);
+                assert.doesNotMatch(tmuxLog, /kill-session -t leader:0/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %10 -d -P -F #\\{pane_id\\}`));
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %44/);
+                assert.match(tmuxLog, /select-pane -t %10/);
             });
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it('shutdownTeam reconciles stale leader and hud pane ids before native Windows split-pane teardown', async () => {
-        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-win32-stale-topology-'));
-        const teamName = 'team-win32-stale-topo';
+    it('shutdownTeam ignores stale persisted worker pane ids when a shared-session pane lacks worker evidence', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-stale-worker-pane-id-'));
+        const teamName = 'team-stale-worker-pane-id';
         try {
-            await withNativeWindowsPlatform(async () => {
-                await withMockTmuxFixture({
-                    dirPrefix: 'omx-runtime-shutdown-win32-stale-topology-bin-',
-                    tmuxScript: (tmuxLogPath) => `#!/bin/sh
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-stale-worker-pane-id-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
 set -eu
 printf '%s\\n' "$*" >> "${tmuxLogPath}"
 case "$1" in
@@ -5075,7 +5426,7 @@ case "$1" in
         exit 1
         ;;
       *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
-        printf "%%21\\tpwsh\\tpwsh\\n%%22\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%23\\tcodex\\tcodex\\n%%24\\tcodex\\tcodex\\n"
+        printf "%%10\\tzsh\\tzsh\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-stale-worker-pane-id/worker-1 codex\\n%%15\\tcodex\\tcodex unrelated-user-pane\\n"
         exit 0
         ;;
       *)
@@ -5087,7 +5438,21 @@ case "$1" in
     printf '%%44\\n'
     exit 0
     ;;
-  kill-pane|resize-pane|select-pane)
+  show-option)
+    case "$*" in
+      *"-p -t %10 @omx_team_pane_owner_id"*)
+        echo "team:team-stale-worker-pane-id"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-stale-worker-pane-id"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
     exit 0
     ;;
   *)
@@ -5095,42 +5460,38 @@ case "$1" in
     ;;
 esac
 `,
-                }, async ({ tmuxLogPath }) => {
-                    await initTeamState(teamName, 'shutdown win32 stale topology test', 'executor', 2, cwd);
-                    const config = await readTeamConfig(teamName, cwd);
-                    assert.ok(config);
-                    if (!config)
-                        return;
-                    config.tmux_session = 'leader:0';
-                    config.leader_pane_id = '%11';
-                    config.hud_pane_id = '%12';
-                    config.workers[0].pane_id = '%23';
-                    config.workers[1].pane_id = '%24';
-                    await saveTeamConfig(config, cwd);
-                    await shutdownTeam(teamName, cwd, { force: true });
-                    const teamRoot = join(cwd, '.omx', 'state', 'team', teamName);
-                    assert.equal(existsSync(teamRoot), false);
-                    assert.equal(await readMonitorSnapshot(teamName, cwd), null);
-                    const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
-                    assert.doesNotMatch(tmuxLog, /list-panes -t %21 -F #\{pane_pid\}/);
-                    assert.doesNotMatch(tmuxLog, /kill-pane -t %21/);
-                    assert.match(tmuxLog, /kill-pane -t %22/);
-                    assert.match(tmuxLog, /kill-pane -t %23/);
-                    assert.match(tmuxLog, /kill-pane -t %24/);
-                    assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %21 -d -P -F #\\{pane_id\\}`));
-                    assert.match(tmuxLog, /select-pane -t %21/);
-                });
+                env: { OMX_SESSION_ID: 'team-stale-worker-pane-id-session' },
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown stale persisted worker pane id test', 'executor', 2, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%10';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%13';
+                config.workers[1].pane_id = '%15';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %10/);
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %15/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %10 -d -P -F #\\{pane_id\\}`));
             });
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it('shutdownTeam skips prekill and keeps the leader pane alive on shared-session shutdown', async () => {
-        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-shared-session-'));
+    it('shutdownTeam preserves worker-looking panes with a mismatched team owner tag', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-worker-owner-mismatch-'));
+        const teamName = 'team-worker-owner-mismatch';
         try {
             await withMockTmuxFixture({
-                dirPrefix: 'omx-runtime-shutdown-shared-session-bin-',
+                dirPrefix: 'omx-runtime-shutdown-worker-owner-mismatch-bin-',
                 tmuxScript: (tmuxLogPath) => `#!/bin/sh
 set -eu
 printf '%s\\n' "$*" >> "${tmuxLogPath}"
@@ -5145,7 +5506,7 @@ case "$1" in
         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\\tcodex\\n%%14\\tcodex\\tcodex\\n"
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-worker-owner-mismatch/worker-1 codex\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-worker-owner-mismatch/worker-2 codex\\n"
         exit 0
         ;;
       *)
@@ -5157,7 +5518,24 @@ case "$1" in
     printf '%%44\\n'
     exit 0
     ;;
-  kill-pane|resize-pane|select-pane)
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-worker-owner-mismatch"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-worker-owner-mismatch"
+        ;;
+      *"-p -t %14 @omx_team_pane_owner_id"*)
+        echo "team:other-team"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
     exit 0
     ;;
   *)
@@ -5166,8 +5544,8 @@ case "$1" in
 esac
 `,
             }, async ({ tmuxLogPath }) => {
-                await initTeamState('team-shutdown-shared-session', 'shutdown shared session test', 'executor', 2, cwd);
-                const config = await readTeamConfig('team-shutdown-shared-session', cwd);
+                await initTeamState(teamName, 'shutdown worker owner mismatch test', 'executor', 2, cwd);
+                const config = await readTeamConfig(teamName, cwd);
                 assert.ok(config);
                 if (!config)
                     return;
@@ -5177,47 +5555,69 @@ esac
                 config.workers[0].pane_id = '%13';
                 config.workers[1].pane_id = '%14';
                 await saveTeamConfig(config, cwd);
-                await shutdownTeam('team-shutdown-shared-session', cwd, { force: true });
-                const teamRoot = join(cwd, '.omx', 'state', 'team', 'team-shutdown-shared-session');
-                assert.equal(existsSync(teamRoot), false);
-                assert.equal(await readMonitorSnapshot('team-shutdown-shared-session', cwd), null);
+                await shutdownTeam(teamName, cwd, { force: true });
                 const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
-                assert.doesNotMatch(tmuxLog, /list-panes -t %13 -F #\{pane_pid\}/);
-                assert.doesNotMatch(tmuxLog, /list-panes -t %14 -F #\{pane_pid\}/);
                 assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
-                assert.doesNotMatch(tmuxLog, /kill-session -t leader:0/);
                 assert.match(tmuxLog, /kill-pane -t %12/);
                 assert.match(tmuxLog, /kill-pane -t %13/);
-                assert.match(tmuxLog, /kill-pane -t %14/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %14/);
                 assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`));
-                assert.match(tmuxLog, /select-pane -t %11/);
             });
         }
         finally {
             await rm(cwd, { recursive: true, force: true });
         }
     });
-    it('shutdownTeam restores a standalone HUD pane after tearing down the team HUD', async () => {
-        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-restore-hud-'));
+    it('shutdownTeam preserves worker-looking panes when the team owner tag cannot be read', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-worker-owner-read-error-'));
+        const teamName = 'team-worker-owner-read-error';
         try {
             await withMockTmuxFixture({
-                dirPrefix: 'omx-runtime-shutdown-restore-hud-bin-',
+                dirPrefix: 'omx-runtime-shutdown-worker-owner-read-error-bin-',
                 tmuxScript: (tmuxLogPath) => `#!/bin/sh
 set -eu
-printf '%s\n' "$*" >> "${tmuxLogPath}"
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
 case "$1" in
   -V)
     echo "tmux 3.4"
     exit 0
     ;;
   list-panes)
-    exit 1
+    case "$*" in
+      *"-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=team-worker-owner-read-error/worker-1 codex\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-worker-owner-read-error/worker-2 codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
     ;;
   split-window)
-    printf '%%44\n'
+    printf '%%44\\n'
     exit 0
     ;;
-  kill-pane|kill-session|select-pane)
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-worker-owner-read-error"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-worker-owner-read-error"
+        ;;
+      *"-p -t %14 @omx_team_pane_owner_id"*)
+        exit 2
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
     exit 0
     ;;
   *)
@@ -5226,31 +5626,989 @@ case "$1" in
 esac
 `,
             }, async ({ tmuxLogPath }) => {
-                await initTeamState('team-shutdown-restore-hud', 'shutdown restore hud test', 'executor', 2, cwd);
-                const config = await readTeamConfig('team-shutdown-restore-hud', cwd);
+                await initTeamState(teamName, 'shutdown worker owner read error test', 'executor', 2, cwd);
+                const config = await readTeamConfig(teamName, cwd);
                 assert.ok(config);
                 if (!config)
                     return;
                 config.tmux_session = 'leader:0';
                 config.leader_pane_id = '%11';
                 config.hud_pane_id = '%12';
-                config.workers[0].pane_id = '%12';
-                config.workers[1].pane_id = '%13';
+                config.workers[0].pane_id = '%13';
+                config.workers[1].pane_id = '%14';
                 await saveTeamConfig(config, cwd);
-                await shutdownTeam('team-shutdown-restore-hud', cwd, { force: true });
+                await shutdownTeam(teamName, cwd, { force: true });
                 const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
-                assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
                 assert.match(tmuxLog, /kill-pane -t %12/);
                 assert.match(tmuxLog, /kill-pane -t %13/);
-                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\{pane_id\}`));
-                assert.match(tmuxLog, /run-shell -b sleep \d+; tmux resize-pane -t %44 -y \d+ >/);
-                assert.match(tmuxLog, /run-shell tmux resize-pane -t %44 -y \d+ >/);
-                assert.match(tmuxLog, /hud --watch/);
-                assert.match(tmuxLog, /OMX_TMUX_HUD_LEADER_PANE='%11'/);
-                assert.match(tmuxLog, /select-pane -t %11/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %14/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam does not use a detected worker as fallback leader when the shared-session leader is stale', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-stale-leader-worker-'));
+        const teamName = 'team-stale-leader-worker';
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-stale-leader-worker-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tvim notes.md\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv 'OMX_TEAM_INTERNAL_WORKER=team-stale-leader-worker/worker-1' codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-stale-leader-worker"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown stale leader worker test', 'executor', 1, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%10';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %10/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %13/);
+                assert.doesNotMatch(tmuxLog, /split-window/);
+                assert.doesNotMatch(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam does not restore HUD onto a live leader pane without matching ownership tag', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-reused-leader-pane-'));
+        const teamName = 'team-reused-leader-pane';
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-reused-leader-pane-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tvim unrelated-notes.md\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv 'OMX_TEAM_INTERNAL_WORKER=team-reused-leader-pane/worker-1' codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:other-team"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:other-team"
+        ;;
+      *"-p -t %13 @omx_team_pane_owner_id"*)
+        echo "team:team-reused-leader-pane"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                env: { OMX_SESSION_ID: 'expected-team-session' },
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown reused leader pane test', 'executor', 1, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.match(tmuxLog, /show-option -qv -p -t %11 @omx_team_pane_owner_id/);
+                assert.match(tmuxLog, /show-option -qv -p -t %12 @omx_team_pane_owner_id/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.doesNotMatch(tmuxLog, /split-window/);
+                assert.doesNotMatch(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam skips prekill and keeps the leader pane alive on native Windows split-pane shutdown', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-win32-split-'));
+        try {
+            await withNativeWindowsPlatform(async () => {
+                await withMockTmuxFixture({
+                    dirPrefix: 'omx-runtime-shutdown-win32-split-bin-',
+                    tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tpwsh\\tpwsh\\n%%12\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-win32-split/worker-1 codex\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-win32-split/worker-2 codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-win32-split"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-win32-split"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                    env: { OMX_SESSION_ID: 'team-shutdown-win32-split-session' },
+                }, async ({ tmuxLogPath }) => {
+                    await initTeamState('team-shutdown-win32-split', 'shutdown win32 split test', 'executor', 2, cwd);
+                    const config = await readTeamConfig('team-shutdown-win32-split', cwd);
+                    assert.ok(config);
+                    if (!config)
+                        return;
+                    config.tmux_session = 'leader:0';
+                    config.leader_pane_id = '%11';
+                    config.hud_pane_id = '%12';
+                    config.workers[0].pane_id = '%13';
+                    config.workers[1].pane_id = '%14';
+                    await saveTeamConfig(config, cwd);
+                    await shutdownTeam('team-shutdown-win32-split', cwd, { force: true });
+                    const teamRoot = join(cwd, '.omx', 'state', 'team', 'team-shutdown-win32-split');
+                    assert.equal(existsSync(teamRoot), false);
+                    assert.equal(await readMonitorSnapshot('team-shutdown-win32-split', cwd), null);
+                    const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                    assert.doesNotMatch(tmuxLog, /list-panes -t %13 -F #\{pane_pid\}/);
+                    assert.doesNotMatch(tmuxLog, /list-panes -t %14 -F #\{pane_pid\}/);
+                    assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                    assert.doesNotMatch(tmuxLog, /kill-session -t leader:0/);
+                    assert.match(tmuxLog, /kill-pane -t %12/);
+                    assert.match(tmuxLog, /kill-pane -t %13/);
+                    assert.match(tmuxLog, /kill-pane -t %14/);
+                    assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`));
+                    assert.match(tmuxLog, new RegExp(`resize-pane -t %44 -y ${HUD_TMUX_TEAM_HEIGHT_LINES}`));
+                    assert.match(tmuxLog, /select-pane -t %11/);
+                });
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam preserves an unrelated HUD when the leader is live but persisted shared-session HUD is stale', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-win32-stale-topology-'));
+        const teamName = 'team-win32-stale-topo';
+        try {
+            await withNativeWindowsPlatform(async () => {
+                await withMockTmuxFixture({
+                    dirPrefix: 'omx-runtime-shutdown-win32-stale-topology-bin-',
+                    tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tpwsh\\tpwsh\\n%%22\\tnode\\tnode /tmp/bin/omx.js hud --watch\\n%%23\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-win32-stale-topo/worker-1 codex\\n%%24\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-win32-stale-topo/worker-2 codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-win32-stale-topo"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                }, async ({ tmuxLogPath }) => {
+                    await initTeamState(teamName, 'shutdown win32 stale topology test', 'executor', 2, cwd);
+                    const config = await readTeamConfig(teamName, cwd);
+                    assert.ok(config);
+                    if (!config)
+                        return;
+                    config.tmux_session = 'leader:0';
+                    config.leader_pane_id = '%11';
+                    config.hud_pane_id = '%12';
+                    config.workers[0].pane_id = '%23';
+                    config.workers[1].pane_id = '%24';
+                    await saveTeamConfig(config, cwd);
+                    await shutdownTeam(teamName, cwd, { force: true });
+                    const teamRoot = join(cwd, '.omx', 'state', 'team', teamName);
+                    assert.equal(existsSync(teamRoot), false);
+                    assert.equal(await readMonitorSnapshot(teamName, cwd), null);
+                    const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                    assert.doesNotMatch(tmuxLog, /list-panes -t %11 -F #\{pane_pid\}/);
+                    assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                    assert.doesNotMatch(tmuxLog, /kill-pane -t %22/);
+                    assert.match(tmuxLog, /kill-pane -t %23/);
+                    assert.match(tmuxLog, /kill-pane -t %24/);
+                    assert.doesNotMatch(tmuxLog, /split-window/);
+                    assert.doesNotMatch(tmuxLog, /select-pane -t %11/);
+                });
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam skips prekill and keeps the leader pane alive on shared-session shutdown', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-shared-session-'));
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-shared-session-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-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=team-shutdown-shared-session/worker-1 codex\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-shared-session/worker-2 codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-shared-session"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-shared-session"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                env: { OMX_SESSION_ID: 'team-shutdown-shared-session-owner' },
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState('team-shutdown-shared-session', 'shutdown shared session test', 'executor', 2, cwd);
+                const config = await readTeamConfig('team-shutdown-shared-session', cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%13';
+                config.workers[1].pane_id = '%14';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam('team-shutdown-shared-session', cwd, { force: true });
+                const teamRoot = join(cwd, '.omx', 'state', 'team', 'team-shutdown-shared-session');
+                assert.equal(existsSync(teamRoot), false);
+                assert.equal(await readMonitorSnapshot('team-shutdown-shared-session', cwd), null);
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.doesNotMatch(tmuxLog, /list-panes -t %13 -F #\{pane_pid\}/);
+                assert.doesNotMatch(tmuxLog, /list-panes -t %14 -F #\{pane_pid\}/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                assert.doesNotMatch(tmuxLog, /kill-session -t leader:0/);
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.match(tmuxLog, /kill-pane -t %14/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`));
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam restores a standalone HUD pane after tearing down the team HUD', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-restore-hud-'));
+        const leaderPaneCwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-restore-hud-leader-cwd-'));
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-restore-hud-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${leaderPaneCwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\texec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%11' node /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-shutdown-restore-hud/worker-2 codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-restore-hud"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-shutdown-restore-hud"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|kill-session|select-pane)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                env: { OMX_SESSION_ID: 'team-shutdown-restore-hud-session' },
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState('team-shutdown-restore-hud', 'shutdown restore hud test', 'executor', 2, cwd);
+                const config = await readTeamConfig('team-shutdown-restore-hud', cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%12';
+                config.workers[1].pane_id = '%13';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam('team-shutdown-restore-hud', cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                const count = (pattern) => [...tmuxLog.matchAll(pattern)].length;
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\{pane_id\}`));
+                assert.equal(count(/kill-pane -t %12/g), 1);
+                assert.equal(count(new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`, 'g')), 1);
+                assert.match(tmuxLog, /run-shell -b sleep \d+; tmux resize-pane -t %44 -y \d+ >/);
+                assert.match(tmuxLog, /run-shell tmux resize-pane -t %44 -y \d+ >/);
+                assert.match(tmuxLog, /hud --watch/);
+                assert.match(tmuxLog, /OMX_TMUX_HUD_LEADER_PANE='%11'/);
+                assert.match(tmuxLog, /OMX_SESSION_ID='team-shutdown-restore-hud-session'/);
+                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 -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\} -c ${escapeRegExp(cwd)} `));
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %44/);
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+            await rm(leaderPaneCwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam preserves unpersisted legacy worker-looking panes without owner tags', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-unpersisted-legacy-worker-'));
+        const teamName = 'team-unpersisted-legacy-worker';
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-unpersisted-legacy-worker-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${cwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\texec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%11' node /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-unpersisted-legacy-worker/worker-1 codex\\n%%14\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-unpersisted-legacy-worker/worker-2 codex\\n"
+        exit 0
+        ;;
+      *"-t %11 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-unpersisted-legacy-worker"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-unpersisted-legacy-worker"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown unpersisted legacy worker test', 'executor', 2, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%13';
+                config.workers[1].pane_id = '%99';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %14/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %99/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam reclaims a matching-owner live HUD when the persisted HUD id is stale', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-stale-hud-live-owner-'));
+        const teamName = 'team-stale-hud-live-owner';
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-stale-hud-live-owner-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${cwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\texec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%11' node /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-stale-hud-live-owner/worker-1 codex\\n"
+        exit 0
+        ;;
+      *"-t %11 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-stale-hud-live-owner"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        echo "team:team-stale-hud-live-owner"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown stale hud live owner test', 'executor', 1, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%99';
+                config.workers[0].pane_id = '%13';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                const count = (pattern) => [...tmuxLog.matchAll(pattern)].length;
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %11/);
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %99/);
+                assert.equal(count(/kill-pane -t %12/g), 1);
+                assert.equal(count(new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`, 'g')), 1);
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam reclaims a legacy leader-owned HUD pane without a team owner tag', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-legacy-hud-owner-'));
+        const teamName = 'team-legacy-hud-owner';
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-legacy-hud-owner-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${cwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\texec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%11' node /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-legacy-hud-owner/worker-1 codex\\n"
+        exit 0
+        ;;
+      *"-t %11 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-legacy-hud-owner"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        exit 1
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown legacy hud owner test', 'executor', 1, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%13';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`));
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam restores standalone HUD for legacy leaders with only an instance tag', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-legacy-leader-instance-'));
+        const teamName = 'team-legacy-leader-instance';
+        const legacySessionId = 'legacy-leader-session';
+        try {
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-legacy-leader-instance-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  display-message)
+    case "$*" in
+      *"#{pane_current_path}"*)
+        echo "${cwd}"
+        ;;
+    esac
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\texec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%11' node /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-legacy-leader-instance/worker-1 codex\\n"
+        exit 0
+        ;;
+      *"-t %11 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        exit 1
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        exit 1
+        ;;
+      *"-p -t %13 @omx_team_pane_owner_id"*)
+        echo "team:team-legacy-leader-instance"
+        ;;
+      *"-p -t %11 @omx_pane_instance_id"*)
+        echo "${legacySessionId}"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+                env: { OMX_SESSION_ID: legacySessionId },
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown legacy leader instance test', 'executor', 1, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%13';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.match(tmuxLog, /show-option -qv -p -t %11 @omx_team_pane_owner_id/);
+                assert.match(tmuxLog, /show-option -qv -p -t %11 @omx_pane_instance_id/);
+                assert.match(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.match(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`));
+                assert.match(tmuxLog, /select-pane -t %11/);
+            });
+        }
+        finally {
+            await rm(cwd, { recursive: true, force: true });
+        }
+    });
+    it('shutdownTeam preserves a persisted HUD pane when the team owner tag cannot be read', async () => {
+        const cwd = await mkdtemp(join(tmpdir(), 'omx-runtime-shutdown-hud-owner-read-error-'));
+        const teamName = 'team-hud-owner-read-error';
+        const originalWarn = console.warn;
+        const warnings = [];
+        try {
+            console.warn = (message, ...optionalParams) => {
+                warnings.push([message, ...optionalParams].map(String).join(' '));
+            };
+            await withMockTmuxFixture({
+                dirPrefix: 'omx-runtime-shutdown-hud-owner-read-error-bin-',
+                tmuxScript: (tmuxLogPath) => `#!/bin/sh
+set -eu
+printf '%s\\n' "$*" >> "${tmuxLogPath}"
+case "$1" in
+  -V)
+    echo "tmux 3.4"
+    exit 0
+    ;;
+  list-panes)
+    case "$*" in
+      *"-F #{pane_dead} #{pane_pid}"*)
+        exit 1
+        ;;
+      *"-t leader:0 -F #{pane_id}"*"#{pane_current_command}"*)
+        printf "%%11\\tzsh\\tzsh\\n%%12\\tnode\\texec env OMX_TMUX_HUD_OWNER=1 OMX_TMUX_HUD_LEADER_PANE='%%11' node /tmp/bin/omx.js hud --watch\\n%%13\\tcodex\\tenv OMX_TEAM_INTERNAL_WORKER=team-hud-owner-read-error/worker-1 codex\\n"
+        exit 0
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    ;;
+  split-window)
+    printf '%%44\\n'
+    exit 0
+    ;;
+  show-option)
+    case "$*" in
+      *"-p -t %11 @omx_team_pane_owner_id"*)
+        echo "team:team-hud-owner-read-error"
+        ;;
+      *"-p -t %12 @omx_team_pane_owner_id"*)
+        exit 2
+        ;;
+      *"-p -t %13 @omx_team_pane_owner_id"*)
+        echo "team:team-hud-owner-read-error"
+        ;;
+      *)
+        exit 1
+        ;;
+    esac
+    exit 0
+    ;;
+  kill-pane|resize-pane|select-pane|run-shell)
+    exit 0
+    ;;
+  *)
+    exit 0
+    ;;
+esac
+`,
+            }, async ({ tmuxLogPath }) => {
+                await initTeamState(teamName, 'shutdown hud owner read error test', 'executor', 1, cwd);
+                const config = await readTeamConfig(teamName, cwd);
+                assert.ok(config);
+                if (!config)
+                    return;
+                config.tmux_session = 'leader:0';
+                config.leader_pane_id = '%11';
+                config.hud_pane_id = '%12';
+                config.workers[0].pane_id = '%13';
+                await saveTeamConfig(config, cwd);
+                await shutdownTeam(teamName, cwd, { force: true });
+                const tmuxLog = await readFile(tmuxLogPath, 'utf-8');
+                assert.doesNotMatch(tmuxLog, /kill-pane -t %12/);
+                assert.match(tmuxLog, /kill-pane -t %13/);
+                assert.doesNotMatch(tmuxLog, new RegExp(`split-window -v -l ${HUD_TMUX_TEAM_HEIGHT_LINES} -t %11 -d -P -F #\\{pane_id\\}`));
+                assert.match(warnings.join('\n'), /skipped shared-session HUD pane %12 because team owner tag could not be read: tmux show-option exited 2/);
             });
         }
         finally {
+            console.warn = originalWarn;
             await rm(cwd, { recursive: true, force: true });
         }
     });