oh-my-codex 0.18.9 → 0.18.11

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

@@ -1,8 +1,10 @@
 import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { OMX_TMUX_HUD_OWNER_ENV, reconcileHudForPromptSubmit } from '../reconcile.js';
-import { HUD_TMUX_HEIGHT_LINES, HUD_TMUX_ULTRAGOAL_HEIGHT_LINES } from '../constants.js';
+import { HUD_TMUX_HEIGHT_LINES, HUD_TMUX_ULTRAGOAL_HEIGHT_LINES, HUD_TMUX_MIN_LAUNCH_WINDOW_HEIGHT_LINES } from '../constants.js';
 import { OMX_TMUX_HUD_LEADER_PANE_ENV } from '../tmux.js';
+const noOpRegisterHudResizeHook = () => true;
+const noOpUnregisterHudResizeHook = () => true;
 describe('reconcileHudForPromptSubmit', () => {
     it('skips reconciliation outside tmux', async () => {
         const result = await reconcileHudForPromptSubmit('/tmp', {
@@ -49,6 +51,8 @@ describe('reconcileHudForPromptSubmit', () => {
                 resized.push({ paneId, heightLines });
                 return true;
             },
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'skipped_no_session_id');
@@ -230,6 +234,8 @@ describe('reconcileHudForPromptSubmit', () => {
                 return '%9';
             },
             resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'recreated');
@@ -255,6 +261,8 @@ describe('reconcileHudForPromptSubmit', () => {
                 return '%9';
             },
             resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'recreated');
@@ -358,6 +366,8 @@ describe('reconcileHudForPromptSubmit', () => {
                 return '%hud';
             },
             resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'recreated');
@@ -646,6 +656,8 @@ describe('reconcileHudForPromptSubmit', () => {
                 resized.push({ paneId, heightLines });
                 return true;
             },
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'replaced_duplicates');
@@ -839,6 +851,8 @@ describe('reconcileHudForPromptSubmit', () => {
                 created.push({ cmd, options });
                 return '%4';
             },
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'recreated');
@@ -882,6 +896,8 @@ describe('reconcileHudForPromptSubmit', () => {
             },
             createHudWatchPane: () => '%9',
             resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'replaced_duplicates');
@@ -955,6 +971,7 @@ describe('reconcileHudForPromptSubmit', () => {
                 resized.push({ paneId, heightLines });
                 return true;
             },
+            registerHudResizeHook: noOpRegisterHudResizeHook,
             resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
         });
         assert.equal(result.status, 'resized');
@@ -1090,6 +1107,254 @@ describe('reconcileHudForPromptSubmit', () => {
         assert.deepEqual(created, []);
         assert.deepEqual(resized, [{ paneId: '%2', heightLines: HUD_TMUX_HEIGHT_LINES }]);
     });
+    it('leaves an existing full-width bottom HUD pane unchanged when geometry and height are healthy', async () => {
+        const killed = [];
+        const created = [];
+        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', paneLeft: 0, paneTop: 0, paneWidth: 160, paneHeight: 50 - HUD_TMUX_HEIGHT_LINES, paneBottom: 49 - HUD_TMUX_HEIGHT_LINES, windowWidth: 160, windowHeight: 50 },
+                {
+                    paneId: '%2',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                    paneLeft: 0,
+                    paneTop: 50 - HUD_TMUX_HEIGHT_LINES,
+                    paneWidth: 160,
+                    paneHeight: HUD_TMUX_HEIGHT_LINES,
+                    paneBottom: 49,
+                    windowWidth: 160,
+                    windowHeight: 50,
+                },
+            ],
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            createHudWatchPane: (_cwd, _cmd, options) => {
+                created.push({ options });
+                return '%9';
+            },
+            resizeTmuxPane: (paneId, heightLines) => {
+                resized.push({ paneId, heightLines });
+                return true;
+            },
+            registerHudResizeHook: noOpRegisterHudResizeHook,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'unchanged');
+        assert.deepEqual(killed, []);
+        assert.deepEqual(created, []);
+        assert.deepEqual(resized, []);
+    });
+    it('recreates a single owned HUD pane when tmux layout narrows it below the window width', async () => {
+        const killed = [];
+        const resized = [];
+        const created = [];
+        const registered = [];
+        const unregistered = [];
+        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', paneLeft: 0, paneTop: 0, paneWidth: 80, paneHeight: 50, paneBottom: 49, windowWidth: 160, windowHeight: 50 },
+                {
+                    paneId: '%2',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                    paneLeft: 80,
+                    paneTop: 0,
+                    paneWidth: 80,
+                    paneHeight: 50,
+                    paneBottom: 49,
+                    windowWidth: 160,
+                    windowHeight: 50,
+                },
+                { paneId: '%3', currentCommand: 'codex', startCommand: 'codex', paneLeft: 0, paneTop: 25, paneWidth: 80, paneHeight: 25, paneBottom: 49, windowWidth: 160, windowHeight: 50 },
+            ],
+            unregisterHudResizeHook: (currentPaneId) => {
+                unregistered.push(currentPaneId);
+                return true;
+            },
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            createHudWatchPane: (_cwd, _cmd, options) => {
+                created.push({ options });
+                return '%9';
+            },
+            resizeTmuxPane: (paneId, heightLines) => {
+                resized.push({ paneId, heightLines });
+                return true;
+            },
+            registerHudResizeHook: (hudPaneId, currentPaneId, heightLines) => {
+                registered.push({ hudPaneId, currentPaneId, heightLines });
+                return true;
+            },
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%9');
+        assert.equal(result.duplicateCount, 0);
+        assert.deepEqual(unregistered, ['%1']);
+        assert.deepEqual(killed, ['%2']);
+        assert.equal(created.length, 1);
+        assert.equal(created[0]?.options?.fullWidth, true);
+        assert.equal(created[0]?.options?.targetPaneId, '%1');
+        assert.equal(created[0]?.options?.heightLines, HUD_TMUX_HEIGHT_LINES);
+        assert.deepEqual(resized, [{ paneId: '%9', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+        assert.deepEqual(registered, [{ hudPaneId: '%9', currentPaneId: '%1', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+    });
+    it('recreates a single owned HUD pane when tmux layout moves it away from the bottom', async () => {
+        const killed = [];
+        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', paneLeft: 0, paneTop: 3, paneWidth: 160, paneHeight: 47, paneBottom: 49, windowWidth: 160, windowHeight: 50 },
+                {
+                    paneId: '%2',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                    paneLeft: 0,
+                    paneTop: 0,
+                    paneWidth: 160,
+                    paneHeight: 3,
+                    paneBottom: 2,
+                    windowWidth: 160,
+                    windowHeight: 50,
+                },
+                { paneId: '%3', currentCommand: 'codex', startCommand: 'codex', paneLeft: 80, paneTop: 3, paneWidth: 80, paneHeight: 47, paneBottom: 49, windowWidth: 160, windowHeight: 50 },
+            ],
+            unregisterHudResizeHook: () => true,
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            createHudWatchPane: (_cwd, _cmd, options) => {
+                created.push({ options });
+                return '%9';
+            },
+            resizeTmuxPane: () => true,
+            registerHudResizeHook: () => true,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'recreated');
+        assert.deepEqual(killed, ['%2']);
+        assert.equal(created[0]?.options?.fullWidth, true);
+        assert.equal(created[0]?.options?.targetPaneId, '%1');
+    });
+    it('keeps a geometrically healthy duplicate HUD pane instead of preserving a malformed first duplicate', 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', paneLeft: 0, paneTop: 0, paneWidth: 160, paneHeight: 47, paneBottom: 46, windowWidth: 160, windowHeight: 50 },
+                {
+                    paneId: '%bad',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                    paneLeft: 80,
+                    paneTop: 0,
+                    paneWidth: 80,
+                    paneHeight: 50,
+                    paneBottom: 49,
+                    windowWidth: 160,
+                    windowHeight: 50,
+                },
+                {
+                    paneId: '%good',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                    paneLeft: 0,
+                    paneTop: 47,
+                    paneWidth: 160,
+                    paneHeight: 3,
+                    paneBottom: 49,
+                    windowWidth: 160,
+                    windowHeight: 50,
+                },
+            ],
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            createHudWatchPane: (_cwd, _cmd, options) => {
+                created.push({ options });
+                return '%new';
+            },
+            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, '%good');
+        assert.deepEqual(killed, ['%bad']);
+        assert.deepEqual(resized, [{ paneId: '%good', heightLines: HUD_TMUX_HEIGHT_LINES }]);
+        assert.deepEqual(created, []);
+    });
+    it('recreates duplicate HUD panes when every duplicate has malformed topology', async () => {
+        const unregistered = [];
+        const killed = [];
+        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', paneLeft: 0, paneTop: 0, paneWidth: 80, paneHeight: 50, paneBottom: 49, windowWidth: 160, windowHeight: 50 },
+                {
+                    paneId: '%bad-a',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                    paneLeft: 80,
+                    paneTop: 0,
+                    paneWidth: 80,
+                    paneHeight: 50,
+                    paneBottom: 49,
+                    windowWidth: 160,
+                    windowHeight: 50,
+                },
+                {
+                    paneId: '%bad-b',
+                    currentCommand: 'node',
+                    startCommand: `env OMX_SESSION_ID='sess-a' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch`,
+                    paneLeft: 0,
+                    paneTop: 0,
+                    paneWidth: 160,
+                    paneHeight: 3,
+                    paneBottom: 2,
+                    windowWidth: 160,
+                    windowHeight: 50,
+                },
+            ],
+            unregisterHudResizeHook: (leaderPaneId) => {
+                unregistered.push(leaderPaneId);
+                return true;
+            },
+            killTmuxPane: (paneId) => {
+                killed.push(paneId);
+                return true;
+            },
+            createHudWatchPane: (_cwd, _cmd, options) => {
+                created.push({ options });
+                return '%new';
+            },
+            resizeTmuxPane: () => true,
+            registerHudResizeHook: () => true,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+        });
+        assert.equal(result.status, 'replaced_duplicates');
+        assert.equal(result.paneId, '%new');
+        assert.deepEqual(unregistered, ['%1']);
+        assert.deepEqual(killed, ['%bad-a', '%bad-b']);
+        assert.equal(created.length, 1);
+        assert.equal(created[0]?.options?.fullWidth, true);
+        assert.equal(created[0]?.options?.targetPaneId, '%1');
+    });
     it('registers client-resized hook scoped from the emitting pane after resizing an existing HUD pane', async () => {
         const registered = [];
         await reconcileHudForPromptSubmit('/repo', {
@@ -1123,6 +1388,7 @@ describe('reconcileHudForPromptSubmit', () => {
             ],
             createHudWatchPane: () => '%9',
             resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
             registerHudResizeHook: (hudPaneId, leaderPaneId, heightLines) => {
                 registered.push({ hudPaneId, leaderPaneId, heightLines });
                 return true;
@@ -1157,4 +1423,104 @@ describe('reconcileHudForPromptSubmit', () => {
         assert.equal(registered[0]?.leaderPaneId, '%1');
     });
 });
+describe('reconcileHudForPromptSubmit cramped-window guard (#2754)', () => {
+    const crampedHeight = HUD_TMUX_MIN_LAUNCH_WINDOW_HEIGHT_LINES - 1;
+    const roomyHeight = HUD_TMUX_MIN_LAUNCH_WINDOW_HEIGHT_LINES;
+    it('does not create a HUD split on prompt submit when the existing window is too cramped', async () => {
+        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' },
+            ],
+            createHudWatchPane: (_cwd, cmd) => {
+                created.push(cmd);
+                return '%9';
+            },
+            resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+            readCurrentWindowSize: () => ({ width: 160, height: crampedHeight }),
+        });
+        assert.equal(result.status, 'skipped_window_too_cramped');
+        assert.equal(result.paneId, null);
+        assert.deepEqual(created, []);
+    });
+    it('creates the HUD on prompt submit when the existing window has room', async () => {
+        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' },
+            ],
+            createHudWatchPane: (_cwd, cmd) => {
+                created.push(cmd);
+                return '%9';
+            },
+            resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+            readCurrentWindowSize: () => ({ width: 160, height: roomyHeight }),
+        });
+        assert.equal(result.status, 'recreated');
+        assert.equal(result.paneId, '%9');
+        assert.equal(created.length, 1);
+    });
+    it('creates the HUD on prompt submit when the window height is unknown', async () => {
+        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' },
+            ],
+            createHudWatchPane: (_cwd, cmd) => {
+                created.push(cmd);
+                return '%9';
+            },
+            resizeTmuxPane: () => true,
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+            readCurrentWindowSize: () => ({ width: null, height: null }),
+        });
+        assert.equal(result.status, 'recreated');
+        assert.equal(created.length, 1);
+    });
+    it('keeps an existing HUD pane even when the window is cramped', async () => {
+        const created = [];
+        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: `exec env OMX_SESSION_ID='sess-a' OMX_TMUX_HUD_OWNER='1' ${OMX_TMUX_HUD_LEADER_PANE_ENV}='%1' node omx hud --watch --preset=focused`,
+                },
+            ],
+            createHudWatchPane: (_cwd, cmd) => {
+                created.push(cmd);
+                return '%9';
+            },
+            resizeTmuxPane: (paneId, lines) => {
+                resized.push({ paneId, lines });
+                return true;
+            },
+            unregisterHudResizeHook: noOpUnregisterHudResizeHook,
+            registerHudResizeHook: noOpRegisterHudResizeHook,
+            resolveOmxCliEntryPath: () => '/repo/dist/cli/omx.js',
+            readCurrentWindowSize: () => ({ width: 160, height: crampedHeight }),
+        });
+        // The cramped guard only blocks fresh creation; an already-present HUD pane
+        // is kept (resized) rather than removed.
+        assert.equal(result.status, 'resized');
+        assert.equal(result.paneId, '%2');
+        assert.deepEqual(created, []);
+        assert.equal(resized[0]?.paneId, '%2');
+        assert.equal(resized[0]?.lines, HUD_TMUX_HEIGHT_LINES);
+    });
+});
 //# sourceMappingURL=reconcile.test.js.map