oh-my-codex 0.18.6 → 0.18.8

package/dist/hud/authority.js

@@ -1,55 +1,362 @@
 import { spawnSync } from 'node:child_process';
-import { mkdir, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
+import { randomUUID } from 'node:crypto';
+import { existsSync } from 'node:fs';
+import { mkdir, readFile, rename, rm, stat, writeFile } from 'node:fs/promises';
+import { dirname, join } from 'node:path';
 import { getPackageRoot } from '../utils/package.js';
+class AuthorityStateReadError extends Error {
+    path;
+    cause;
+    constructor(path, cause) {
+        super(`failed to read HUD authority state: ${cause instanceof Error ? cause.message : String(cause)}`);
+        this.path = path;
+        this.cause = cause;
+    }
+}
+function isDeletedCwdMarkerPath(path) {
+    const currentPath = path.trim();
+    return /(?:^|\s)\(deleted\)\s*$/.test(currentPath) && !existsSync(currentPath);
+}
 async function defaultRunProcess(nodePath, args, options) {
     const result = spawnSync(nodePath, args, {
         cwd: options.cwd,
         env: options.env,
         encoding: 'utf-8',
-        stdio: 'ignore',
+        stdio: ['ignore', 'pipe', 'pipe'],
         timeout: options.timeoutMs,
         windowsHide: true,
     });
     if (result.status !== 0) {
-        throw new Error((result.stderr || result.stdout || '').trim() || `hud authority tick failed with status ${result.status ?? 'unknown'}`);
+        const output = [result.error?.message, result.stderr, result.stdout]
+            .map((value) => value?.trim() ?? '')
+            .filter(Boolean)
+            .join('\n')
+            .trim();
+        const suffix = result.signal
+            ? `signal ${result.signal}`
+            : `status ${result.status ?? 'unknown'}`;
+        throw new Error(output ? `hud authority tick failed with ${suffix}: ${output}` : `hud authority tick failed with ${suffix}`);
+    }
+    if (result.error) {
+        throw new Error(`hud authority tick failed: ${result.error.message}`);
+    }
+}
+function asPositiveNumber(value, fallback) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
+}
+function asNonNegativeNumber(value, fallback) {
+    const parsed = Number(value);
+    return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
+}
+function parseIsoMs(value) {
+    if (typeof value !== 'string' || !value.trim())
+        return null;
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+function isNotFoundError(error) {
+    return typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT';
+}
+function isAuthorityStatus(value) {
+    return value === 'spawned' || value === 'skipped' || value === 'failed' || value === 'locked';
+}
+function validateAuthorityState(value) {
+    if (typeof value !== 'object' || value === null) {
+        throw new Error('authority state must be an object');
+    }
+    const state = value;
+    if (state.owner !== 'hud')
+        throw new Error('authority state owner must be hud');
+    if (typeof state.pid !== 'number' || !Number.isInteger(state.pid) || state.pid <= 0) {
+        throw new Error('authority state pid must be a positive integer');
+    }
+    if (typeof state.cwd !== 'string' || !state.cwd)
+        throw new Error('authority state cwd must be a non-empty string');
+    if (parseIsoMs(state.heartbeat_at) === null)
+        throw new Error('authority state heartbeat_at must be a valid ISO timestamp');
+    if (parseIsoMs(state.next_allowed_at) === null)
+        throw new Error('authority state next_allowed_at must be a valid ISO timestamp');
+    if (typeof state.cooldown_ms !== 'number' || !Number.isFinite(state.cooldown_ms) || state.cooldown_ms < 0) {
+        throw new Error('authority state cooldown_ms must be a non-negative number');
+    }
+    if (typeof state.jitter_ms !== 'number' || !Number.isFinite(state.jitter_ms) || state.jitter_ms < 0) {
+        throw new Error('authority state jitter_ms must be a non-negative number');
+    }
+    if (typeof state.skip_count !== 'number' || !Number.isInteger(state.skip_count) || state.skip_count < 0) {
+        throw new Error('authority state skip_count must be a non-negative integer');
+    }
+    if (!isAuthorityStatus(state.last_status))
+        throw new Error('authority state last_status is invalid');
+    if (typeof state.last_reason !== 'string' || !state.last_reason) {
+        throw new Error('authority state last_reason must be a non-empty string');
     }
+    return state;
+}
+async function readAuthorityState(path) {
+    try {
+        return validateAuthorityState(JSON.parse(await readFile(path, 'utf-8')));
+    }
+    catch (error) {
+        if (isNotFoundError(error))
+            return null;
+        throw new AuthorityStateReadError(path, error);
+    }
+}
+async function writeAuthorityState(path, state) {
+    const tempPath = `${path}.${process.pid}.${Date.now()}.${Math.random().toString(36).slice(2)}.tmp`;
+    try {
+        await mkdir(dirname(path), { recursive: true }).catch(() => { });
+        await writeFile(tempPath, JSON.stringify(state, null, 2));
+        await rename(tempPath, path);
+        return true;
+    }
+    catch {
+        await rm(tempPath, { force: true }).catch(() => { });
+        return false;
+    }
+}
+async function writeAuthorityStateUnlessNewerCooldown(path, state) {
+    const currentState = await readAuthorityState(path).catch(() => null);
+    const currentNextAllowedMs = parseIsoMs(currentState?.next_allowed_at);
+    const candidateNextAllowedMs = parseIsoMs(state.next_allowed_at);
+    if (currentNextAllowedMs !== null && candidateNextAllowedMs !== null && currentNextAllowedMs > candidateNextAllowedMs) {
+        return true;
+    }
+    return writeAuthorityState(path, state);
+}
+async function tryCreateAuthorityLock(lockPath, nowMs) {
+    const token = randomUUID();
+    let createdDir = false;
+    try {
+        await mkdir(lockPath, { recursive: false });
+        createdDir = true;
+        await writeFile(join(lockPath, 'owner.json'), JSON.stringify({
+            token,
+            pid: process.pid,
+            acquired_at: new Date(nowMs).toISOString(),
+        }, null, 2));
+        return { path: lockPath, token };
+    }
+    catch {
+        if (createdDir)
+            await rm(lockPath, { recursive: true, force: true }).catch(() => { });
+        return null;
+    }
+}
+async function readAuthorityLockOwner(lockPath) {
+    return readFile(join(lockPath, 'owner.json'), 'utf-8')
+        .then((content) => JSON.parse(content))
+        .catch(() => null);
+}
+async function restoreMovedLock(fromPath, toPath) {
+    const restored = await rename(fromPath, toPath).then(() => true).catch(() => false);
+    if (!restored)
+        await rm(fromPath, { recursive: true, force: true }).catch(() => { });
+}
+async function acquireAuthorityLock(lockPath, staleMs, nowMs) {
+    const created = await tryCreateAuthorityLock(lockPath, nowMs);
+    if (created)
+        return created;
+    const observedOwner = await readAuthorityLockOwner(lockPath);
+    const lockStat = await stat(lockPath).catch(() => null);
+    if (!lockStat || nowMs - lockStat.mtimeMs <= staleMs)
+        return null;
+    const reapPath = `${lockPath}.stale.${process.pid}.${nowMs}.${randomUUID()}`;
+    try {
+        await rename(lockPath, reapPath);
+    }
+    catch {
+        return null;
+    }
+    const reapedOwner = await readAuthorityLockOwner(reapPath);
+    const reapedStat = await stat(reapPath).catch(() => null);
+    const reapedObservedLock = observedOwner?.token === reapedOwner?.token
+        && reapedStat?.mtimeMs === lockStat.mtimeMs
+        && nowMs - reapedStat.mtimeMs > staleMs;
+    if (!reapedObservedLock) {
+        await restoreMovedLock(reapPath, lockPath);
+        return null;
+    }
+    await rm(reapPath, { recursive: true, force: true }).catch(() => { });
+    return tryCreateAuthorityLock(lockPath, nowMs);
+}
+async function releaseAuthorityLock(lock) {
+    const releasePath = `${lock.path}.release.${process.pid}.${Date.now()}.${lock.token}`;
+    try {
+        await rename(lock.path, releasePath);
+    }
+    catch {
+        return;
+    }
+    const releaseOwner = await readAuthorityLockOwner(releasePath);
+    if (releaseOwner?.token === lock.token) {
+        await rm(releasePath, { recursive: true, force: true }).catch(() => { });
+        return;
+    }
+    await restoreMovedLock(releasePath, lock.path);
+}
+function buildAuthorityState(cwd, nowMs, cooldownMs, jitterMs, overrides) {
+    return {
+        owner: 'hud',
+        pid: process.pid,
+        cwd,
+        heartbeat_at: new Date(nowMs).toISOString(),
+        cooldown_ms: cooldownMs,
+        jitter_ms: jitterMs,
+        skip_count: 0,
+        last_status: 'spawned',
+        last_reason: 'spawned',
+        ...overrides,
+    };
+}
+async function writeRateLimitSkipState(path, ownerPath, cwd, nowMs, cooldownMs, fallbackJitterMs, previousState, reason) {
+    const skippedState = buildAuthorityState(cwd, nowMs, cooldownMs, previousState.jitter_ms ?? fallbackJitterMs, {
+        last_spawn_at: previousState.last_spawn_at,
+        last_skip_at: new Date(nowMs).toISOString(),
+        next_allowed_at: previousState.next_allowed_at,
+        skip_count: (previousState.skip_count ?? 0) + 1,
+        last_status: 'skipped',
+        last_reason: reason,
+        last_error: previousState.last_error,
+    });
+    await writeAuthorityState(ownerPath, skippedState);
+    await writeAuthorityStateUnlessNewerCooldown(path, skippedState);
+}
+async function writeInvalidStateDiagnostic(path, ownerPath, cwd, nowMs, cooldownMs, jitterMs, error) {
+    const failedState = buildAuthorityState(cwd, nowMs, cooldownMs, jitterMs, {
+        last_skip_at: new Date(nowMs).toISOString(),
+        next_allowed_at: new Date(nowMs + cooldownMs + jitterMs).toISOString(),
+        last_status: 'failed',
+        last_reason: 'invalid_authority_state',
+        last_error: error instanceof Error ? error.message : String(error),
+    });
+    const ownerWritten = await writeAuthorityState(ownerPath, failedState);
+    const stateWritten = await writeAuthorityState(path, failedState);
+    return ownerWritten || stateWritten;
 }
 export async function runHudAuthorityTick(options, deps = {}) {
     const cwd = options.cwd;
+    if (isDeletedCwdMarkerPath(cwd))
+        return;
     const nodePath = options.nodePath ?? process.execPath;
     const packageRoot = options.packageRoot ?? getPackageRoot();
     const pollMs = Math.max(1, options.pollMs ?? 75);
     const timeoutMs = Math.max(100, options.timeoutMs ?? 5_000);
+    const minIntervalMs = Math.max(250, asPositiveNumber(options.minIntervalMs ?? options.env?.OMX_HUD_AUTHORITY_MIN_INTERVAL_MS ?? process.env.OMX_HUD_AUTHORITY_MIN_INTERVAL_MS, 5_000));
+    const jitterMaxMs = Math.max(0, asNonNegativeNumber(options.jitterMs ?? options.env?.OMX_HUD_AUTHORITY_JITTER_MS ?? process.env.OMX_HUD_AUTHORITY_JITTER_MS, 250));
+    const nowMs = deps.nowMs?.() ?? Date.now();
+    const random = deps.random ?? Math.random;
+    const jitterMs = jitterMaxMs > 0 ? Math.floor(random() * (jitterMaxMs + 1)) : 0;
     const watcherScript = join(packageRoot, 'dist', 'scripts', 'notify-fallback-watcher.js');
     const notifyScript = join(packageRoot, 'dist', 'scripts', 'notify-hook.js');
-    const authorityOwnerPath = join(cwd, '.omx', 'state', 'notify-fallback-authority-owner.json');
+    const authorityStateDir = join(cwd, '.omx', 'state');
+    const authorityOwnerPath = join(authorityStateDir, 'notify-fallback-authority-owner.json');
+    const authorityStatePath = join(authorityStateDir, 'notify-fallback-authority-state.json');
+    const authorityLockPath = join(authorityStateDir, 'notify-fallback-authority.lock');
     const runProcess = deps.runProcess ?? defaultRunProcess;
-    await mkdir(join(cwd, '.omx', 'state'), { recursive: true }).catch(() => { });
-    await writeFile(authorityOwnerPath, JSON.stringify({
-        owner: 'hud',
-        pid: process.pid,
-        cwd,
-        heartbeat_at: new Date().toISOString(),
-    }, null, 2)).catch(() => { });
-    await runProcess(nodePath, [
-        watcherScript,
-        '--once',
-        '--authority-only',
-        '--cwd',
-        cwd,
-        '--notify-script',
-        notifyScript,
-        '--poll-ms',
-        String(pollMs),
-    ], {
-        cwd,
-        env: {
-            ...process.env,
-            ...(options.env ?? {}),
-            OMX_HUD_AUTHORITY: '1',
-        },
-        timeoutMs,
+    await mkdir(authorityStateDir, { recursive: true }).catch(() => { });
+    let previousState;
+    try {
+        previousState = await readAuthorityState(authorityStatePath);
+    }
+    catch (error) {
+        if (!(await writeInvalidStateDiagnostic(authorityStatePath, authorityOwnerPath, cwd, nowMs, minIntervalMs, jitterMs, error))) {
+            throw new Error('failed to persist HUD authority invalid-state diagnostic');
+        }
+        return;
+    }
+    const previousNextAllowedMs = parseIsoMs(previousState?.next_allowed_at);
+    if (previousState && previousNextAllowedMs !== null && nowMs < previousNextAllowedMs) {
+        await writeRateLimitSkipState(authorityStatePath, authorityOwnerPath, cwd, nowMs, minIntervalMs, jitterMs, previousState, 'rate_limited');
+        return;
+    }
+    const lock = await acquireAuthorityLock(authorityLockPath, timeoutMs + minIntervalMs, nowMs);
+    if (!lock) {
+        const latestState = await readAuthorityState(authorityStatePath).catch(() => null);
+        const diagnosticState = latestState ?? previousState;
+        const lockedState = buildAuthorityState(cwd, nowMs, minIntervalMs, diagnosticState?.jitter_ms ?? jitterMs, {
+            last_spawn_at: diagnosticState?.last_spawn_at,
+            last_skip_at: new Date(nowMs).toISOString(),
+            next_allowed_at: diagnosticState?.next_allowed_at,
+            skip_count: (diagnosticState?.skip_count ?? 0) + 1,
+            last_status: 'locked',
+            last_reason: 'spawn_lock_active',
+            last_error: diagnosticState?.last_error,
+        });
+        await writeAuthorityState(authorityOwnerPath, lockedState);
+        return;
+    }
+    await deps.onLockAcquired?.();
+    let lockedState;
+    try {
+        lockedState = await readAuthorityState(authorityStatePath);
+    }
+    catch (error) {
+        const diagnosticWritten = await writeInvalidStateDiagnostic(authorityStatePath, authorityOwnerPath, cwd, nowMs, minIntervalMs, jitterMs, error);
+        await releaseAuthorityLock(lock);
+        if (!diagnosticWritten)
+            throw new Error('failed to persist HUD authority rate-limit state');
+        return;
+    }
+    const lockedNextAllowedMs = parseIsoMs(lockedState?.next_allowed_at);
+    if (lockedState && lockedNextAllowedMs !== null && nowMs < lockedNextAllowedMs) {
+        await writeRateLimitSkipState(authorityStatePath, authorityOwnerPath, cwd, nowMs, minIntervalMs, jitterMs, lockedState, 'rate_limited_after_lock');
+        await releaseAuthorityLock(lock);
+        return;
+    }
+    const nextAllowedAt = new Date(nowMs + minIntervalMs + jitterMs).toISOString();
+    const spawnedState = buildAuthorityState(cwd, nowMs, minIntervalMs, jitterMs, {
+        last_spawn_at: new Date(nowMs).toISOString(),
+        next_allowed_at: nextAllowedAt,
+        skip_count: previousState?.skip_count ?? 0,
+        last_status: 'spawned',
+        last_reason: 'spawned',
     });
+    await writeAuthorityState(authorityOwnerPath, spawnedState);
+    if (!(await writeAuthorityState(authorityStatePath, spawnedState))) {
+        await releaseAuthorityLock(lock);
+        throw new Error('failed to persist HUD authority rate-limit state');
+    }
+    try {
+        await runProcess(nodePath, [
+            watcherScript,
+            '--once',
+            '--authority-only',
+            '--cwd',
+            cwd,
+            '--notify-script',
+            notifyScript,
+            '--poll-ms',
+            String(pollMs),
+        ], {
+            cwd,
+            env: {
+                ...process.env,
+                ...(options.env ?? {}),
+                OMX_HUD_AUTHORITY: '1',
+                OMX_HUD_AUTHORITY_MIN_INTERVAL_MS: String(minIntervalMs),
+                OMX_HUD_AUTHORITY_JITTER_MS: String(jitterMaxMs),
+            },
+            timeoutMs,
+        });
+    }
+    catch (error) {
+        const failedAt = deps.nowMs?.() ?? Date.now();
+        const failedState = buildAuthorityState(cwd, failedAt, minIntervalMs, jitterMs, {
+            last_spawn_at: spawnedState.last_spawn_at,
+            next_allowed_at: nextAllowedAt,
+            skip_count: previousState?.skip_count ?? 0,
+            last_status: 'failed',
+            last_reason: 'child_failed',
+            last_error: error instanceof Error ? error.message : String(error),
+        });
+        await writeAuthorityState(authorityOwnerPath, failedState);
+        await writeAuthorityState(authorityStatePath, failedState);
+        throw error;
+    }
+    finally {
+        await releaseAuthorityLock(lock);
+    }
 }
 //# sourceMappingURL=authority.js.map

package/dist/hud/authority.js.map

@@ -1 +1 @@
-{"version":3,"file":"authority.js","sourceRoot":"","sources":["../../src/hud/authority.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authority.js","sourceRoot":"","sources":["../../src/hud/authority.ts"],"names":[],"mappings":"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"}

package/dist/hud/index.d.ts

@@ -9,6 +9,7 @@
  *   omx hud --tmux       Open HUD in a tmux split pane (auto-detects orientation)
  */
 import type { HudFlags, HudPreset, HudRenderContext, ResolvedHudConfig } from './types.js';
+import { buildHudRuntimeEnv } from './tmux.js';
 export declare const HUD_USAGE: string;
 type SleepFn = (ms: number, signal?: AbortSignal) => Promise<void>;
 export declare function watchRenderLoop(render: () => Promise<void>, options?: {
@@ -20,6 +21,7 @@ export declare function watchRenderLoop(render: () => Promise<void>, options?: {
 interface RunWatchModeDependencies {
     isTTY: boolean;
     env: NodeJS.ProcessEnv;
+    resolveWatchCwdFn: (launchCwd: string) => string;
     readAllStateFn: (cwd: string, config?: ResolvedHudConfig) => Promise<HudRenderContext>;
     readHudConfigFn: (cwd: string) => Promise<ResolvedHudConfig>;
     renderHudFn: (ctx: HudRenderContext, preset: HudPreset, options?: {
@@ -30,13 +32,29 @@ interface RunWatchModeDependencies {
         cwd: string;
     }) => Promise<void>;
     resizeTmuxPaneFn: (paneId: string, heightLines: number) => boolean;
-    registerHudResizeHookFn: (hudPaneId: string, currentPaneId: string | undefined, heightLines: number) => boolean;
+    registerHudResizeHookFn: (hudPaneId: string, leaderPaneId: string | undefined, heightLines: number) => boolean;
     writeStdout: (text: string) => void;
     writeStderr: (text: string) => void;
     registerSigint: (handler: () => void) => void | (() => void);
     setIntervalFn: (handler: () => void, intervalMs: number) => ReturnType<typeof setInterval>;
     clearIntervalFn: (timer: ReturnType<typeof setInterval>) => void;
 }
+export interface ResolveHudWatchCwdDependencies {
+    getCwd?: () => string;
+    realpath?: (path: string) => string;
+    readProcCwd?: () => string | null | undefined;
+}
+/**
+ * Resolve the cwd a long-running HUD watch should read on this frame.
+ *
+ * tmux launches HUD with both a real cwd and a shell PWD string. If that
+ * directory is later renamed and the original pathname is reused by a fresh
+ * OMX run, the old HUD process can keep reading the reused launch path and
+ * display the new run's state. Compare the launch path to the process' live
+ * cwd inode/path each tick; when they diverge, follow the live cwd instead of
+ * the stale launch path.
+ */
+export declare function resolveHudWatchCwd(launchCwd: string, deps?: ResolveHudWatchCwdDependencies): string;
 /**
  * Backward-compatible watch mode runner used by tests.
  */
@@ -51,6 +69,6 @@ export declare function shellEscape(s: string): string;
  * passed as a literal argument to tmux (no shell expansion).  `omxBin` is
  * shell-escaped inside the command string that tmux will execute in a shell.
  */
-export declare function buildTmuxSplitArgs(cwd: string, omxBin: string, preset?: string, sessionId?: string, omxRoot?: string, leaderPaneId?: string, heightLines?: number): string[];
+export declare function buildTmuxSplitArgs(cwd: string, omxBin: string, preset?: string, sessionId?: string, omxRoot?: string, leaderPaneId?: string, heightLines?: number, rootEnv?: Parameters<typeof buildHudRuntimeEnv>[0]): string[];
 export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/hud/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hud/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/hud/index.ts"],"names":[],"mappings":"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"}