oh-my-codex 0.18.7 → 0.18.8

package/dist/hud/__tests__/reconcile.test.js

@@ -84,6 +84,139 @@ describe('reconcileHudForPromptSubmit', () => {
         assert.equal(resized.length, 1);
         assert.equal(resized[0]?.heightLines, HUD_TMUX_HEIGHT_LINES);
     });
+    it('reaps orphaned same-session HUD panes whose leader pane was destroyed, then recreates a single HUD', async () => {
+        // Regression for the "team mode leaves only stacked HUD strips" bug: the leader
+        // pane (%21) was destroyed but its owner-tagged HUD panes remained, all pointing
+        // at the dead leader id. They match neither findHudWatchPaneIds (leader mismatch)
+        // nor findLegacyFocusedHudWatchPaneIds (they carry owner metadata), so each prompt
+        // submit previously appended a fresh HUD instead of reclaiming the orphans.
+        const killed = [];
+        const created = [];
+        const orphan = (paneId) => ({
+            paneId,
+            currentCommand: 'node',
+            startCommand: `exec env OMX_SESSION_ID='sess-a' OMX_TMUX_HUD_OWNER='1' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%21' node omx hud --watch --preset=focused`,
+        });
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%33', OMX_SESSION_ID: 'sess-a', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => [
+                // %33 is the current (live) leader pane; %21 is gone from the window.
+                { paneId: '%33', currentCommand: 'codex', startCommand: 'codex' },
+                orphan('%34'),
+                orphan('%42'),
+                orphan('%47'),
+            ],
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            resizeTmuxPane: () => true,
+            createHudWatchPane: (_cwd, cmd, options) => {
+                created.push({ cmd, options });
+                return '%50';
+            },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        // All three dead-leader orphans are reaped, then exactly one fresh HUD is created.
+        assert.deepEqual(killed.sort(), ['%34', '%42', '%47']);
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%50');
+        assert.equal(created.length, 1);
+        assert.equal(created[0]?.options?.targetPaneId, '%33');
+        assert.match(created[0]?.cmd || '', new RegExp(`${OMX_TMUX_HUD_LEADER_PANE_ENV}='%33'`));
+    });
+    it('reaps orphaned HUD panes tagged with an equivalent native session id', async () => {
+        // #2684 lets HUD dedupe treat the OMX owner id and Codex native session id as
+        // equivalent. Orphan reaping must use the same identity set so a canonical
+        // owner reconcile still reclaims dead-leader HUDs tagged with the native id.
+        const killed = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'codex-native-uuid', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            sessionId: 'omx-owner-abc',
+            sessionIds: ['omx-owner-abc', 'codex-native-uuid'],
+            listCurrentWindowPanes: () => [
+                { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                {
+                    paneId: '%2',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='codex-native-uuid' OMX_TMUX_HUD_OWNER='1' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%21' node omx hud --watch`,
+                },
+            ],
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            resizeTmuxPane: () => true,
+            createHudWatchPane: () => '%9',
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.deepEqual(killed, ['%2']);
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%9');
+    });
+    it('does not reap an orphaned HUD pane that belongs to a different session', async () => {
+        // A HUD owned by another session's leader (which may live in a different tmux
+        // window we cannot see here) must survive even when that leader is absent.
+        const killed = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-a', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => [
+                { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                {
+                    paneId: '%4',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-b' OMX_TMUX_HUD_OWNER='1' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%5' node omx hud --watch`,
+                },
+            ],
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            resizeTmuxPane: () => true,
+            createHudWatchPane: () => '%9',
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        // sess-b orphan is left untouched; this session simply creates its own HUD.
+        assert.deepEqual(killed, []);
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%9');
+    });
+    it('reaps a same-session orphan whose recorded leader is itself another HUD pane', async () => {
+        // Review follow-up (#2682): when a HUD pane was mistakenly used as a leader, an
+        // orphan can name another HUD pane as its leader. That referenced HUD must not
+        // count as a live leader, or the orphan survives while the referenced HUD is
+        // reaped — leaving a dangling strip that still never matches the real pane.
+        const killed = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-a', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => [
+                { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                {
+                    // orphan whose recorded leader (%3) is itself another HUD pane
+                    paneId: '%2',
+                    currentCommand: 'node',
+                    startCommand: `exec env OMX_SESSION_ID='sess-a' OMX_TMUX_HUD_OWNER='1' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%3' node omx hud --watch --preset=focused`,
+                },
+                {
+                    // the referenced HUD %3, itself orphaned (its leader %21 is gone)
+                    paneId: '%3',
+                    currentCommand: 'node',
+                    startCommand: `exec env OMX_SESSION_ID='sess-a' OMX_TMUX_HUD_OWNER='1' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%21' node omx hud --watch --preset=focused`,
+                },
+            ],
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            resizeTmuxPane: () => true,
+            createHudWatchPane: () => '%9',
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        // Both HUD-led and dead-leader orphans are reaped; a single fresh HUD is created.
+        assert.deepEqual(killed.sort(), ['%2', '%3']);
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%9');
+    });
     it('prefers an explicit session override when recreating HUD', async () => {
         const created = [];
         const result = await reconcileHudForPromptSubmit('/repo', {
@@ -128,6 +261,87 @@ describe('reconcileHudForPromptSubmit', () => {
         assert.equal(created.length, 1);
         assert.match(created[0]?.cmd || '', /^exec env OMX_SESSION_ID='sess boxed' OMX_TMUX_HUD_OWNER='1' OMX_TMUX_HUD_LEADER_PANE='%1' OMX_ROOT='\/tmp\/boxed root\/it'\\''s\/\$\(literal\)' '.*' '.*omx\.js' hud --watch/);
     });
+    it('forwards OMX_STATE_ROOT when recreating HUD with shell-safe quoting', async () => {
+        const created = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: {
+                TMUX: '1',
+                TMUX_PANE: '%1',
+                OMX_SESSION_ID: 'sess-a',
+                OMX_STATE_ROOT: '/boxed state/root',
+                [OMX_TMUX_HUD_OWNER_ENV]: '1',
+            },
+            listCurrentWindowPanes: () => [{ paneId: '%1', currentCommand: 'codex', startCommand: 'codex' }],
+            createHudWatchPane: (_cwd, hudCmd) => {
+                created.push(hudCmd);
+                return '%9';
+            },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+            resizeTmuxPane: () => true,
+            readHudConfig: async () => ({ preset: 'focused', git: { display: 'branch' }, statusLine: { preset: 'focused' } }),
+            readAllState: async () => ({
+                version: null,
+                gitBranch: null,
+                ralph: null,
+                ultragoal: null,
+                ultrawork: null,
+                autopilot: null,
+                ralplan: null,
+                deepInterview: null,
+                autoresearch: null,
+                ultraqa: null,
+                team: null,
+                metrics: null,
+                hudNotify: null,
+                session: null,
+            }),
+        });
+        assert.equal(result.status, 'recreated');
+        assert.match(created[0] ?? '', /OMX_STATE_ROOT='\/boxed state\/root'/);
+        assert.doesNotMatch(created[0] ?? '', /OMX_ROOT=/);
+    });
+    it('forwards OMX_TEAM_STATE_ROOT before boxed roots when recreating HUD', async () => {
+        const created = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: {
+                TMUX: '1',
+                TMUX_PANE: '%1',
+                OMX_SESSION_ID: 'sess-a',
+                OMX_ROOT: '/boxed-root',
+                OMX_STATE_ROOT: '/boxed-state-root',
+                OMX_TEAM_STATE_ROOT: '/team-state-root',
+                [OMX_TMUX_HUD_OWNER_ENV]: '1',
+            },
+            listCurrentWindowPanes: () => [{ paneId: '%1', currentCommand: 'codex', startCommand: 'codex' }],
+            createHudWatchPane: (_cwd, hudCmd) => {
+                created.push(hudCmd);
+                return '%9';
+            },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+            resizeTmuxPane: () => true,
+            readHudConfig: async () => ({ preset: 'focused', git: { display: 'branch' }, statusLine: { preset: 'focused' } }),
+            readAllState: async () => ({
+                version: null,
+                gitBranch: null,
+                ralph: null,
+                ultragoal: null,
+                ultrawork: null,
+                autopilot: null,
+                ralplan: null,
+                deepInterview: null,
+                autoresearch: null,
+                ultraqa: null,
+                team: null,
+                metrics: null,
+                hudNotify: null,
+                session: null,
+            }),
+        });
+        assert.equal(result.status, 'recreated');
+        assert.match(created[0] ?? '', /OMX_TEAM_STATE_ROOT='\/team-state-root'/);
+        assert.doesNotMatch(created[0] ?? '', /OMX_ROOT=/);
+        assert.doesNotMatch(created[0] ?? '', /OMX_STATE_ROOT=/);
+    });
     it('targets the emitting pane window when listing and creating HUD panes', async () => {
         const listArgs = [];
         const created = [];
@@ -147,9 +361,138 @@ describe('reconcileHudForPromptSubmit', () => {
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'recreated');
-        assert.deepEqual(listArgs, ['%leader']);
+        assert.deepEqual(listArgs, ['%leader', '%leader']);
         assert.equal(created[0]?.options?.targetPaneId, '%leader');
     });
+    it('keeps prompt-submit HUD recreation scoped to the emitting pane in multi-pane windows', async () => {
+        const created = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%right', OMX_SESSION_ID: 'sess-right', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => [
+                { paneId: '%left', currentCommand: 'codex', startCommand: 'codex' },
+                { paneId: '%right', currentCommand: 'codex', startCommand: 'codex' },
+            ],
+            createHudWatchPane: (_cwd, _cmd, options) => {
+                created.push({ options });
+                return '%hud-right';
+            },
+            resizeTmuxPane: () => true,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'recreated');
+        assert.equal(created[0]?.options?.targetPaneId, '%right');
+        assert.equal(Object.hasOwn(created[0]?.options ?? {}, 'fullWidth'), false);
+    });
+    it('collapses same-owner HUD panes that appear during the create race window', async () => {
+        const killed = [];
+        const resized = [];
+        let listCount = 0;
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-race', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => {
+                listCount += 1;
+                if (listCount === 1) {
+                    return [
+                        { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                    ];
+                }
+                return [
+                    { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                    {
+                        paneId: '%8',
+                        currentCommand: 'node',
+                        startCommand: `exec env OMX_SESSION_ID='sess-race' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' /node /omx.js hud --watch`,
+                    },
+                    {
+                        paneId: '%9',
+                        currentCommand: 'node',
+                        startCommand: `exec env OMX_SESSION_ID='sess-race' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' /node /omx.js hud --watch --preset=focused`,
+                    },
+                ];
+            },
+            createHudWatchPane: () => '%9',
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            resizeTmuxPane: (paneId, heightLines) => {
+                resized.push({ paneId, heightLines });
+                return true;
+            },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'replaced_duplicates');
+        assert.equal(result.paneId, '%9');
+        assert.equal(result.duplicateCount, 1);
+        assert.deepEqual(killed, ['%8']);
+        assert.deepEqual(resized, [{ paneId: '%9', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+    });
+    it('keeps an observed same-owner HUD when the returned create pane is absent from the post-create scan', async () => {
+        const killed = [];
+        const resized = [];
+        let listCount = 0;
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-race', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => {
+                listCount += 1;
+                if (listCount === 1)
+                    return [{ paneId: '%1', currentCommand: 'codex', startCommand: 'codex' }];
+                return [
+                    { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                    {
+                        paneId: '%8',
+                        currentCommand: 'node',
+                        startCommand: `exec env OMX_SESSION_ID='sess-race' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' /node /omx.js hud --watch`,
+                    },
+                ];
+            },
+            createHudWatchPane: () => '%9',
+            killTmuxPane: (paneId) => { killed.push(paneId); return true; },
+            resizeTmuxPane: (paneId, heightLines) => { resized.push({ paneId, heightLines }); return true; },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%8');
+        assert.equal(result.duplicateCount, 0);
+        assert.deepEqual(killed, []);
+        assert.deepEqual(resized, [{ paneId: '%8', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+    });
+    it('kills post-create duplicate HUD panes even when the keeper cannot be resized', async () => {
+        const killed = [];
+        const registered = [];
+        let listCount = 0;
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-race', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => {
+                listCount += 1;
+                if (listCount === 1)
+                    return [{ paneId: '%1', currentCommand: 'codex', startCommand: 'codex' }];
+                return [
+                    { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                    {
+                        paneId: '%8',
+                        currentCommand: 'node',
+                        startCommand: `exec env OMX_SESSION_ID='sess-race' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' /node /omx.js hud --watch`,
+                    },
+                    {
+                        paneId: '%9',
+                        currentCommand: 'node',
+                        startCommand: `exec env OMX_SESSION_ID='sess-race' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' /node /omx.js hud --watch`,
+                    },
+                ];
+            },
+            createHudWatchPane: () => '%9',
+            killTmuxPane: (paneId) => { killed.push(paneId); return true; },
+            resizeTmuxPane: () => false,
+            registerHudResizeHook: (paneId) => { registered.push(paneId); return true; },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'failed');
+        assert.equal(result.paneId, '%9');
+        assert.equal(result.duplicateCount, 1);
+        assert.deepEqual(killed, ['%8']);
+        assert.deepEqual(registered, []);
+    });
     it('kills duplicate HUD panes and reuses one existing pane', async () => {
         const killed = [];
         const resized = [];
@@ -190,6 +533,164 @@ describe('reconcileHudForPromptSubmit', () => {
         assert.deepEqual(resized, [{ paneId: '%2', heightLines: HUD_TMUX_HEIGHT_LINES }]);
         assert.deepEqual(created, []);
     });
+    it('deduplicates same-leader HUD panes tagged with equivalent owner and canonical session ids', async () => {
+        const killed = [];
+        const resized = [];
+        const created = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'codex-native-uuid', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            sessionId: 'omx-owner-abc',
+            sessionIds: ['omx-owner-abc', 'codex-native-uuid'],
+            listCurrentWindowPanes: () => [
+                { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                {
+                    paneId: '%2',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='omx-owner-abc' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                },
+                {
+                    paneId: '%3',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='codex-native-uuid' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                },
+                {
+                    // Same equivalent session, but its recorded leader is itself a HUD pane;
+                    // the orphan reaper should remove it before normal same-leader dedupe.
+                    paneId: '%4',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='codex-native-uuid' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%4' node omx hud --watch`,
+                },
+            ],
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            createHudWatchPane: (_cwd, cmd) => {
+                created.push({ cmd });
+                return '%9';
+            },
+            resizeTmuxPane: (paneId, heightLines) => {
+                resized.push({ paneId, heightLines });
+                return true;
+            },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'replaced_duplicates');
+        assert.equal(result.paneId, '%2');
+        assert.equal(result.duplicateCount, 1);
+        assert.deepEqual(killed, ['%4', '%3']);
+        assert.deepEqual(resized, [{ paneId: '%2', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+        assert.deepEqual(created, []);
+    });
+    it('reuses and deduplicates legacy unowned focused HUD watch panes before recreating', async () => {
+        const killed = [];
+        const resized = [];
+        const created = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-a', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => [
+                { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                { paneId: '%2', currentCommand: 'node', startCommand: 'node /tmp/bin/omx.js hud --watch --preset=focused' },
+                { paneId: '%3', currentCommand: 'node', startCommand: 'node /tmp/bin/omx.js hud --watch --preset=focused' },
+                { paneId: '%4', currentCommand: 'node', startCommand: 'node /tmp/bin/omx.js hud --watch --preset=minimal' },
+                { paneId: '%5', currentCommand: 'node', startCommand: 'node /tmp/bin/omx.js hud --tmux --preset=focused' },
+            ],
+            killTmuxPane: (paneId) => { killed.push(paneId); return true; },
+            createHudWatchPane: () => { created.push('create'); return '%9'; },
+            resizeTmuxPane: (paneId, heightLines) => { resized.push({ paneId, heightLines }); return true; },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'replaced_duplicates');
+        assert.equal(result.paneId, '%2');
+        assert.equal(result.duplicateCount, 1);
+        assert.deepEqual(killed, ['%3']);
+        assert.deepEqual(resized, [{ paneId: '%2', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+        assert.deepEqual(created, []);
+    });
+    it('treats an extra legacy focused pane as stale when an owned HUD already exists', async () => {
+        const killed = [];
+        const resized = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-a', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => [
+                { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                {
+                    paneId: '%2',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch --preset=focused`,
+                },
+                { paneId: '%3', currentCommand: 'node', startCommand: 'node /tmp/bin/omx.js hud --watch --preset=focused' },
+            ],
+            killTmuxPane: (paneId) => { killed.push(paneId); return true; },
+            resizeTmuxPane: (paneId, heightLines) => { resized.push({ paneId, heightLines }); return true; },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'replaced_duplicates');
+        assert.equal(result.paneId, '%2');
+        assert.equal(result.duplicateCount, 1);
+        assert.deepEqual(killed, ['%3']);
+        assert.deepEqual(resized, [{ paneId: '%2', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+    });
+    it('deduplicates legacy focused panes that appear during the prompt-submit create race', async () => {
+        const killed = [];
+        const resized = [];
+        let listCount = 0;
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-race', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => {
+                listCount += 1;
+                if (listCount === 1)
+                    return [{ paneId: '%1', currentCommand: 'codex', startCommand: 'codex' }];
+                return [
+                    { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                    { paneId: '%8', currentCommand: 'node', startCommand: 'node /tmp/bin/omx.js hud --watch --preset=focused' },
+                    {
+                        paneId: '%9',
+                        currentCommand: 'node',
+                        startCommand: `exec env OMX_SESSION_ID='sess-race' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' /node /omx.js hud --watch --preset=focused`,
+                    },
+                ];
+            },
+            createHudWatchPane: () => '%9',
+            killTmuxPane: (paneId) => { killed.push(paneId); return true; },
+            resizeTmuxPane: (paneId, heightLines) => { resized.push({ paneId, heightLines }); return true; },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'replaced_duplicates');
+        assert.equal(result.paneId, '%9');
+        assert.equal(result.duplicateCount, 1);
+        assert.deepEqual(killed, ['%8']);
+        assert.deepEqual(resized, [{ paneId: '%9', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+    });
+    it('kills existing duplicate HUD panes even when the keeper cannot be resized', async () => {
+        const killed = [];
+        const registered = [];
+        const result = await reconcileHudForPromptSubmit('/repo', {
+            env: { TMUX: '1', TMUX_PANE: '%1', OMX_SESSION_ID: 'sess-a', [OMX_TMUX_HUD_OWNER_ENV]: '1' },
+            listCurrentWindowPanes: () => [
+                { paneId: '%1', currentCommand: 'codex', startCommand: 'codex' },
+                {
+                    paneId: '%8',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                },
+                {
+                    paneId: '%9',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                },
+            ],
+            killTmuxPane: (paneId) => { killed.push(paneId); return true; },
+            resizeTmuxPane: () => false,
+            registerHudResizeHook: (paneId) => { registered.push(paneId); return true; },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'failed');
+        assert.equal(result.paneId, '%8');
+        assert.equal(result.duplicateCount, 1);
+        assert.deepEqual(killed, ['%9']);
+        assert.deepEqual(registered, []);
+    });
     it('does not resize, kill, or reuse another active leader session HUD in the same tmux window', async () => {
         const killed = [];
         const resized = [];
@@ -246,6 +747,11 @@ describe('reconcileHudForPromptSubmit', () => {
                 {
                     paneId: '%4',
                     currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-b' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                },
+                {
+                    paneId: '%5',
+                    currentCommand: 'node',
                     startCommand: `env OMX_SESSION_ID='sess-b' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%5' node omx hud --watch`,
                 },
             ],
@@ -384,7 +890,7 @@ describe('reconcileHudForPromptSubmit', () => {
         assert.equal(result.status, 'resized');
         assert.deepEqual(resized, [{ paneId: '%2', heightLines: HUD_TMUX_ULTRAGOAL_HEIGHT_LINES }]);
     });
-    it('resizes an existing owner-tagged same-leader HUD pane instead of creating a duplicate during prompt revive', async () => {
+    it('recreates instead of reusing a leader-only HUD pane when reviving with a canonical session id', async () => {
         const resized = [];
         const created = [];
         const result = await reconcileHudForPromptSubmit('/repo', {
@@ -407,10 +913,10 @@ describe('reconcileHudForPromptSubmit', () => {
             },
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
-        assert.equal(result.status, 'resized');
-        assert.equal(result.paneId, '%2');
-        assert.deepEqual(created, []);
-        assert.deepEqual(resized, [{ paneId: '%2', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%9');
+        assert.deepEqual(created, ['create']);
+        assert.deepEqual(resized, [{ paneId: '%9', heightLines: HUD_TMUX_HEIGHT_LINES }]);
     });
     it('deduplicates same-leader HUD panes without creating a new pane when session id is unavailable', async () => {
         const killed = [];
@@ -476,15 +982,15 @@ describe('reconcileHudForPromptSubmit', () => {
                 },
             ],
             resizeTmuxPane: () => true,
-            registerHudResizeHook: (hudPaneId, currentPaneId, heightLines) => {
-                registered.push({ hudPaneId, currentPaneId, heightLines });
+            registerHudResizeHook: (hudPaneId, leaderPaneId, heightLines) => {
+                registered.push({ hudPaneId, leaderPaneId, heightLines });
                 return true;
             },
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(registered.length, 1);
         assert.equal(registered[0]?.hudPaneId, '%2');
-        assert.equal(registered[0]?.currentPaneId, '%1');
+        assert.equal(registered[0]?.leaderPaneId, '%1');
         assert.equal(registered[0]?.heightLines, HUD_TMUX_HEIGHT_LINES);
     });
     it('registers client-resized hook scoped from the emitting pane after creating a new HUD pane', async () => {
@@ -496,15 +1002,15 @@ describe('reconcileHudForPromptSubmit', () => {
             ],
             createHudWatchPane: () => '%9',
             resizeTmuxPane: () => true,
-            registerHudResizeHook: (hudPaneId, currentPaneId, heightLines) => {
-                registered.push({ hudPaneId, currentPaneId, heightLines });
+            registerHudResizeHook: (hudPaneId, leaderPaneId, heightLines) => {
+                registered.push({ hudPaneId, leaderPaneId, heightLines });
                 return true;
             },
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(registered.length, 1);
         assert.equal(registered[0]?.hudPaneId, '%9');
-        assert.equal(registered[0]?.currentPaneId, '%1');
+        assert.equal(registered[0]?.leaderPaneId, '%1');
         assert.equal(registered[0]?.heightLines, HUD_TMUX_HEIGHT_LINES);
     });
     it('keeps the resize hook on the reused duplicate keeper pane', async () => {
@@ -520,14 +1026,14 @@ describe('reconcileHudForPromptSubmit', () => {
             killTmuxPane: () => true,
             createHudWatchPane: () => '%9',
             resizeTmuxPane: () => true,
-            unregisterHudResizeHook: (currentPaneId) => { unregistered.push(currentPaneId); return true; },
-            registerHudResizeHook: (hudPaneId, currentPaneId) => { registered.push({ hudPaneId, currentPaneId }); return true; },
+            unregisterHudResizeHook: (leaderPaneId) => { unregistered.push(leaderPaneId); return true; },
+            registerHudResizeHook: (hudPaneId, leaderPaneId) => { registered.push({ hudPaneId, leaderPaneId }); return true; },
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.deepEqual(unregistered, []);
         assert.equal(registered.length, 1);
         assert.equal(registered[0]?.hudPaneId, '%2');
-        assert.equal(registered[0]?.currentPaneId, '%1');
+        assert.equal(registered[0]?.leaderPaneId, '%1');
     });
 });
 //# sourceMappingURL=reconcile.test.js.map