oh-my-codex 0.21.11 → 0.21.13

package/dist/hud/__tests__/spawn-reconcile-with-timeout.test.js

@@ -0,0 +1,175 @@
+import { strict as assert } from 'node:assert';
+import { test } from 'node:test';
+import { spawn } from 'node:child_process';
+import { mkdtemp, readFile, rm, writeFile } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { spawnReconcileWithTimeout } from '../spawn-reconcile-with-timeout.js';
+test('spawnReconcileWithTimeout passes reconcile authority to the child', async () => {
+    const testDir = await mkdtemp(join(tmpdir(), 'omx-hud-reconcile-success-'));
+    try {
+        const entry = join(testDir, 'reconcile.mjs');
+        const reportPath = join(testDir, 'report.json');
+        await writeFile(entry, [
+            "import { writeFileSync } from 'node:fs';",
+            'writeFileSync(process.env.OMX_TEST_REPORT, JSON.stringify({ args: process.argv.slice(2), repair: process.env.OMX_HUD_WATCH_REPAIR, pane: process.env.TMUX_PANE, leaderPid: process.env.OMX_HUD_WATCH_LEADER_PID }));',
+        ].join('\n'));
+        const completed = await spawnReconcileWithTimeout({
+            omxBinary: entry,
+            cwd: testDir,
+            env: { ...process.env, OMX_TEST_REPORT: reportPath },
+            timeoutMs: 5_000,
+            leaderPaneId: '%1',
+            leaderPanePid: '101',
+            keepAlive: true,
+        });
+        assert.equal(completed, true);
+        assert.deepEqual(JSON.parse(await readFile(reportPath, 'utf8')), {
+            args: ['hud', '--reconcile-tmux'],
+            repair: '1',
+            pane: '%1',
+            leaderPid: '101',
+        });
+    }
+    finally {
+        await rm(testDir, { recursive: true, force: true });
+    }
+});
+test('spawnReconcileWithTimeout kills a hung child and its process tree', async () => {
+    const testDir = await mkdtemp(join(tmpdir(), 'omx-hud-reconcile-timeout-'));
+    const childPidPath = join(testDir, 'child.pid');
+    const grandchildPidPath = join(testDir, 'grandchild.pid');
+    const markerPath = join(testDir, 'grandchild-survived');
+    try {
+        const entry = join(testDir, 'hung-reconcile.mjs');
+        await writeFile(entry, [
+            "import { spawn } from 'node:child_process';",
+            "import { writeFileSync } from 'node:fs';",
+            'writeFileSync(process.env.OMX_TEST_CHILD_PID, String(process.pid));',
+            `const grandchild = spawn(process.execPath, ['-e', 'setTimeout(() => require("node:fs").writeFileSync(process.env.OMX_TEST_MARKER, "alive"), 1200); setInterval(() => {}, 1000);'], { stdio: 'ignore', env: process.env });`,
+            'writeFileSync(process.env.OMX_TEST_GRANDCHILD_PID, String(grandchild.pid));',
+            'setInterval(() => {}, 1000);',
+        ].join('\n'));
+        const startedAt = Date.now();
+        const completed = await spawnReconcileWithTimeout({
+            omxBinary: entry,
+            cwd: testDir,
+            env: {
+                ...process.env,
+                OMX_TEST_CHILD_PID: childPidPath,
+                OMX_TEST_GRANDCHILD_PID: grandchildPidPath,
+                OMX_TEST_MARKER: markerPath,
+            },
+            timeoutMs: 500,
+            keepAlive: true,
+        });
+        assert.equal(completed, false);
+        assert.ok(Date.now() - startedAt < 7_000, 'the hung reconcile is bounded');
+        assert.ok((await readFile(childPidPath, 'utf8')).trim().length > 0, 'reconcile child started');
+        assert.ok((await readFile(grandchildPidPath, 'utf8')).trim().length > 0, 'reconcile grandchild started');
+        await new Promise((resolve) => setTimeout(resolve, 1_300));
+        await assert.rejects(readFile(markerPath), { code: 'ENOENT' }, 'the grandchild was killed with the reconcile child');
+    }
+    finally {
+        for (const pidPath of [childPidPath, grandchildPidPath]) {
+            const pid = Number(await readFile(pidPath, 'utf8').catch(() => ''));
+            if (Number.isSafeInteger(pid) && pid > 0) {
+                try {
+                    process.kill(pid, 'SIGKILL');
+                }
+                catch {
+                    // The timeout may already have killed the process.
+                }
+            }
+        }
+        await rm(testDir, { recursive: true, force: true });
+    }
+});
+test('spawnReconcileWithTimeout kills its detached child when the wrapper receives SIGTERM', async () => {
+    if (process.platform === 'win32')
+        return;
+    const testDir = await mkdtemp(join(tmpdir(), 'omx-hud-reconcile-sigterm-'));
+    const entry = join(testDir, 'hung-reconcile.mjs');
+    const wrapper = join(testDir, 'reconcile-wrapper.mjs');
+    const childPidPath = join(testDir, 'child.pid');
+    const markerPath = join(testDir, 'child-survived');
+    let wrapperProcess;
+    let childPid = 0;
+    try {
+        await writeFile(entry, [
+            "import { writeFileSync } from 'node:fs';",
+            'writeFileSync(process.env.OMX_TEST_CHILD_PID, String(process.pid));',
+            'setTimeout(() => writeFileSync(process.env.OMX_TEST_MARKER, "alive"), 1_500);',
+            'setInterval(() => {}, 1_000);',
+        ].join('\n'));
+        await writeFile(wrapper, [
+            `import { spawnReconcileWithTimeout } from '${new URL('../spawn-reconcile-with-timeout.js', import.meta.url).href}';`,
+            'await spawnReconcileWithTimeout({',
+            '  omxBinary: process.env.OMX_TEST_ENTRY,',
+            '  cwd: process.env.OMX_TEST_DIR,',
+            '  env: process.env,',
+            '  timeoutMs: 5_000,',
+            '  keepAlive: true,',
+            '});',
+        ].join('\n'));
+        const childWrapper = spawn(process.execPath, [wrapper], {
+            cwd: testDir,
+            env: {
+                ...process.env,
+                OMX_TEST_ENTRY: entry,
+                OMX_TEST_DIR: testDir,
+                OMX_TEST_CHILD_PID: childPidPath,
+                OMX_TEST_MARKER: markerPath,
+            },
+            stdio: 'ignore',
+        });
+        wrapperProcess = childWrapper;
+        const deadline = Date.now() + 3_000;
+        while (Date.now() < deadline && childPid === 0) {
+            const pid = await readFile(childPidPath, 'utf8').catch(() => '');
+            childPid = Number(pid.trim()) || 0;
+            if (childPid === 0)
+                await new Promise((resolve) => setTimeout(resolve, 10));
+        }
+        assert.ok(childPid > 0, 'the detached reconcile child started');
+        const closed = new Promise((resolve, reject) => {
+            childWrapper.once('error', reject);
+            childWrapper.once('close', (code, signal) => resolve({ code, signal }));
+        });
+        assert.equal(childWrapper.kill('SIGTERM'), true);
+        const result = await closed;
+        assert.equal(result.signal, null);
+        assert.equal(result.code, 0);
+        await new Promise((resolve) => setTimeout(resolve, 1_800));
+        await assert.rejects(readFile(markerPath), { code: 'ENOENT' }, 'the detached child was killed with its wrapper');
+    }
+    finally {
+        wrapperProcess?.kill('SIGKILL');
+        if (childPid > 0) {
+            try {
+                process.kill(-childPid, 'SIGKILL');
+            }
+            catch {
+                // The wrapper signal handler may already have killed the reconcile process group.
+            }
+        }
+        await rm(testDir, { recursive: true, force: true });
+    }
+});
+test('spawnReconcileWithTimeout returns false when the reconcile child fails', async () => {
+    const testDir = await mkdtemp(join(tmpdir(), 'omx-hud-reconcile-error-'));
+    try {
+        const result = await spawnReconcileWithTimeout({
+            omxBinary: join(testDir, 'missing-entry.mjs'),
+            cwd: testDir,
+            env: process.env,
+            timeoutMs: 5_000,
+            keepAlive: true,
+        });
+        assert.equal(result, false);
+    }
+    finally {
+        await rm(testDir, { recursive: true, force: true });
+    }
+});
+//# sourceMappingURL=spawn-reconcile-with-timeout.test.js.map

package/dist/hud/__tests__/spawn-reconcile-with-timeout.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"spawn-reconcile-with-timeout.test.js","sourceRoot":"","sources":["../../../src/hud/__tests__/spawn-reconcile-with-timeout.test.ts"],"names":[],"mappings":"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"}

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

@@ -2,7 +2,7 @@ import { describe, it } from 'node:test';
 import assert from 'node:assert/strict';
 import { execFileSync } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { mkdtemp, mkdir, rm, stat, writeFile } from 'node:fs/promises';
+import { mkdtemp, mkdir, rename, rm, stat, utimes, writeFile } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { basename, join, relative } from 'node:path';
 import { renderHud } from '../render.js';
@@ -297,6 +297,207 @@ describe('buildGitBranchLabel', () => {
         });
     });
 });
+function countingGitRunner(state) {
+    const calls = [];
+    const runner = (_cwd, args) => {
+        const command = args.join(' ');
+        calls.push(command);
+        if (command === 'rev-parse --abbrev-ref HEAD')
+            return state.branch;
+        if (command === 'remote get-url origin')
+            return state.remoteUrl;
+        throw new Error('Unexpected command: git ' + command);
+    };
+    return { runner, calls };
+}
+function remoteConfig(url) {
+    return ['[remote "origin"]', `  url = ${url}`, ''].join('\n');
+}
+async function createPlainGitDirFixture(cwd, branch, url) {
+    const gitDir = join(cwd, '.git');
+    await mkdir(gitDir, { recursive: true });
+    await writeFile(join(gitDir, 'HEAD'), `ref: refs/heads/${branch}\n`);
+    await writeFile(join(gitDir, 'config'), remoteConfig(url));
+}
+// git replaces HEAD and config by renaming a freshly written <file>.lock over them.
+async function rewriteLikeGit(path, content) {
+    await writeFile(`${path}.lock`, content);
+    await rename(`${path}.lock`, path);
+}
+describe('buildGitBranchLabel caching', () => {
+    it('reuses the label while HEAD and config are unchanged', async () => {
+        await withTempRepo('omx-hud-label-cache-hit-', async (cwd) => {
+            await createPlainGitDirFixture(cwd, 'main', 'https://github.com/acme/first-repo.git');
+            const { runner, calls } = countingGitRunner({ branch: 'main', remoteUrl: 'https://github.com/acme/first-repo.git' });
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(calls.length, 2);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(calls.length, 2);
+        });
+    });
+    it('recomputes an unchanged label once the cache entry is 30 seconds old', async (t) => {
+        await withTempRepo('omx-hud-label-cache-ttl-', async (cwd) => {
+            await createPlainGitDirFixture(cwd, 'main', 'https://github.com/acme/first-repo.git');
+            const state = { branch: 'main', remoteUrl: 'https://github.com/acme/first-repo.git' };
+            const { runner, calls } = countingGitRunner(state);
+            let now = 1_700_000_000_000;
+            t.mock.method(Date, 'now', () => now);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            // A change the fingerprint cannot see, such as an insteadOf rule in the global config.
+            state.remoteUrl = 'https://github.com/acme/rewritten-repo.git';
+            now += 29_999;
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(calls.length, 2);
+            now += 1;
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'rewritten-repo/main');
+            assert.equal(calls.length, 4);
+        });
+    });
+    it('recomputes after a backward clock adjustment', async (t) => {
+        await withTempRepo('omx-hud-label-cache-clock-back-', async (cwd) => {
+            await createPlainGitDirFixture(cwd, 'main', 'https://github.com/acme/first-repo.git');
+            const state = { branch: 'main', remoteUrl: 'https://github.com/acme/first-repo.git' };
+            const { runner, calls } = countingGitRunner(state);
+            let now = 1_700_000_000_000;
+            t.mock.method(Date, 'now', () => now);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(calls.length, 2);
+            // Simulate a backward clock adjustment (e.g., NTP correction)
+            now -= 5_000;
+            // A change the fingerprint cannot see. The cache should be invalidated
+            // even though the age is negative, preventing stale labels during time adjustments.
+            state.remoteUrl = 'https://github.com/acme/rewritten-repo.git';
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'rewritten-repo/main');
+            assert.equal(calls.length, 4);
+        });
+    });
+    it('recomputes after HEAD is replaced, even with the same size and mtime', async () => {
+        await withTempRepo('omx-hud-label-cache-head-', async (cwd) => {
+            await createPlainGitDirFixture(cwd, 'main', 'https://github.com/acme/first-repo.git');
+            const headPath = join(cwd, '.git', 'HEAD');
+            const fixedSeconds = 1_700_000_000;
+            await utimes(headPath, fixedSeconds, fixedSeconds);
+            const state = { branch: 'main', remoteUrl: 'https://github.com/acme/first-repo.git' };
+            const { runner, calls } = countingGitRunner(state);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            const before = await stat(headPath);
+            state.branch = 'next';
+            await writeFile(`${headPath}.lock`, 'ref: refs/heads/next\n');
+            await utimes(`${headPath}.lock`, fixedSeconds, fixedSeconds);
+            await rename(`${headPath}.lock`, headPath);
+            const after = await stat(headPath);
+            assert.equal(after.size, before.size);
+            assert.equal(after.mtimeMs, before.mtimeMs);
+            assert.notEqual(after.ino, before.ino);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/next');
+            assert.equal(calls.length, 4);
+        });
+    });
+    it('recomputes after the remote url in config changes', async () => {
+        await withTempRepo('omx-hud-label-cache-remote-', async (cwd) => {
+            await createPlainGitDirFixture(cwd, 'main', 'https://github.com/acme/first-repo.git');
+            const state = { branch: 'main', remoteUrl: 'https://github.com/acme/first-repo.git' };
+            const { runner, calls } = countingGitRunner(state);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            state.remoteUrl = 'https://github.com/acme/renamed-repository.git';
+            await rewriteLikeGit(join(cwd, '.git', 'config'), remoteConfig(state.remoteUrl));
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'renamed-repository/main');
+            assert.equal(calls.length, 4);
+        });
+    });
+    it('recomputes after the common-dir config of a worktree changes', async () => {
+        await withTempRepo('omx-hud-label-cache-worktree-', async (cwd) => {
+            await createWorktreePointerFixture(cwd);
+            const state = { branch: 'worktree-branch', remoteUrl: 'git@github.com:acme/worktree-repo.git' };
+            const { runner, calls } = countingGitRunner(state);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'worktree-repo/worktree-branch');
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'worktree-repo/worktree-branch');
+            assert.equal(calls.length, 2);
+            state.remoteUrl = 'git@github.com:acme/moved-repository.git';
+            await rewriteLikeGit(join(cwd, '.git-admin', 'config'), remoteConfig(state.remoteUrl));
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'moved-repository/worktree-branch');
+            assert.equal(calls.length, 4);
+        });
+    });
+    it('keeps one cached label per git display config', async () => {
+        await withTempRepo('omx-hud-label-cache-config-', async (cwd) => {
+            await createPlainGitDirFixture(cwd, 'main', 'https://github.com/acme/first-repo.git');
+            const { runner, calls } = countingGitRunner({ branch: 'main', remoteUrl: 'https://github.com/acme/first-repo.git' });
+            const branchOnly = { preset: 'focused', git: { display: 'branch' }, statusLine: { preset: 'focused' } };
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(buildGitBranchLabel(cwd, branchOnly, runner), 'main');
+            assert.equal(calls.length, 3);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(buildGitBranchLabel(cwd, branchOnly, runner), 'main');
+            assert.equal(calls.length, 3);
+        });
+    });
+    it('does not cache when there is no git layout', async () => {
+        await withTempRepo('omx-hud-label-cache-nogit-', async (cwd) => {
+            const { runner, calls } = countingGitRunner({ branch: 'main', remoteUrl: 'https://github.com/acme/first-repo.git' });
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+            assert.equal(calls.length, 4);
+        });
+    });
+    it('does not cache a null label', async () => {
+        await withTempRepo('omx-hud-label-cache-null-', async (cwd) => {
+            await createPlainGitDirFixture(cwd, 'main', 'https://github.com/acme/first-repo.git');
+            const state = { branch: null, remoteUrl: 'https://github.com/acme/first-repo.git' };
+            const { runner, calls } = countingGitRunner(state);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), null);
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), null);
+            assert.equal(calls.length, 2);
+            // The first commit creates refs/heads/main without touching HEAD or config.
+            state.branch = 'main';
+            assert.equal(buildGitBranchLabel(cwd, undefined, runner), 'first-repo/main');
+        });
+    });
+    it('shows a branch switch and a remote change from real git on the next call', { skip: process.platform === 'win32' }, async () => {
+        await withTempRepo('omx-hud-label-cache-realgit-', async (cwd) => {
+            initGitRepo(cwd);
+            assert.equal(buildGitBranchLabel(cwd), 'origin-repo/safe-branch');
+            execFileSync('git', ['checkout', '-b', 'other-branch'], { cwd, stdio: 'ignore' });
+            assert.equal(buildGitBranchLabel(cwd), 'origin-repo/other-branch');
+            execFileSync('git', ['remote', 'set-url', 'origin', 'https://github.com/acme/renamed-repo.git'], { cwd, stdio: 'ignore' });
+            assert.equal(buildGitBranchLabel(cwd), 'renamed-repo/other-branch');
+            execFileSync('git', ['checkout', '--detach'], { cwd, stdio: 'ignore' });
+            assert.equal(buildGitBranchLabel(cwd), 'renamed-repo/HEAD');
+        });
+    });
+    it('shows a branch switch in a reftable repository and its linked worktree', { skip: process.platform === 'win32' }, async (t) => {
+        await withTempRepo('omx-hud-label-cache-reftable-', async (cwd) => {
+            try {
+                execFileSync('git', ['init', '--ref-format=reftable'], { cwd, stdio: 'ignore' });
+            }
+            catch {
+                t.skip('git does not support --ref-format=reftable');
+                return;
+            }
+            const git = (dir, ...args) => execFileSync('git', args, { cwd: dir, stdio: 'ignore' });
+            git(cwd, 'config', 'user.email', 'test@example.com');
+            git(cwd, 'config', 'user.name', 'Test User');
+            git(cwd, 'remote', 'add', 'origin', 'https://github.com/acme/reftable-repo.git');
+            git(cwd, 'checkout', '-b', 'first-branch');
+            git(cwd, 'commit', '--allow-empty', '-m', 'init');
+            const headPath = join(cwd, '.git', 'HEAD');
+            const headBefore = await stat(headPath);
+            assert.equal(buildGitBranchLabel(cwd), 'reftable-repo/first-branch');
+            git(cwd, 'checkout', '-b', 'second-branch');
+            const headAfter = await stat(headPath);
+            assert.equal(headAfter.ino, headBefore.ino);
+            assert.equal(headAfter.mtimeMs, headBefore.mtimeMs);
+            assert.equal(buildGitBranchLabel(cwd), 'reftable-repo/second-branch');
+            const worktree = join(cwd, 'linked');
+            git(cwd, 'worktree', 'add', '-b', 'linked-branch', worktree);
+            assert.equal(buildGitBranchLabel(worktree), 'reftable-repo/linked-branch');
+            git(worktree, 'checkout', '-b', 'linked-next');
+            assert.equal(buildGitBranchLabel(worktree), 'reftable-repo/linked-next');
+            assert.equal(buildGitBranchLabel(cwd), 'reftable-repo/second-branch');
+        });
+    });
+});
 describe('readUltragoalState', { concurrency: false }, () => {
     it('summarizes active ultragoal progress from goals.json', async () => {
         await withTempRepo('omx-hud-ultragoal-', async (cwd) => {