oh-my-codex 0.17.3 → 0.18.0

package/dist/cli/index.js

@@ -24,6 +24,7 @@ import { stateCommand } from "./state.js";
 import { cleanupCommand, cleanupOmxMcpProcesses, findLaunchSafeCleanupCandidates, } from "./cleanup.js";
 import { exploreCommand } from "./explore.js";
 import { sparkshellCommand } from "./sparkshell.js";
+import { apiCommand } from "./api.js";
 import { agentsInitCommand } from "./agents-init.js";
 import { agentsCommand } from "./agents.js";
 import { sessionCommand } from "./session-search.js";
@@ -51,7 +52,7 @@ import { cleanCodexModelAvailabilityNuxIfNeeded, extractSharedMcpRegistryServers
 import { OMX_FIRST_PARTY_MCP_SERVER_NAMES } from "../config/omx-first-party-mcp.js";
 import { HUD_TMUX_HEIGHT_LINES } from "../hud/constants.js";
 import { OMX_TMUX_HUD_OWNER_ENV } from "../hud/reconcile.js";
-import { createHudWatchPane as createSharedHudWatchPane, killTmuxPane as killSharedTmuxPane, listCurrentWindowHudPaneIds, parsePaneIdFromTmuxOutput, } from "../hud/tmux.js";
+import { createHudWatchPane as createSharedHudWatchPane, killTmuxPane as killSharedTmuxPane, listCurrentWindowHudPaneIds, parsePaneIdFromTmuxOutput, registerHudResizeHook, } from "../hud/tmux.js";
 export { parseTmuxPaneSnapshot, isHudWatchPane, findHudWatchPaneIds } from "../hud/tmux.js";
 rememberOmxLaunchContext();
 import { classifySpawnError, resolveTmuxBinaryForPlatform, spawnPlatformCommandSync, } from "../utils/platform-command.js";
@@ -98,6 +99,7 @@ Usage:
   omx adapt     Scaffold OMX-owned adapter foundations for persistent external targets
   omx resume    Resume a previous interactive Codex session
   omx explore   Default read-only exploration entrypoint (may adaptively use sparkshell backend)
+  omx api       Run native omx-api localhost gateway commands (serve|status|stop|generate)
   omx session   Search prior local session transcripts and history artifacts
   omx agents-init [path]
                 Bootstrap lightweight AGENTS.md files for a repo/subtree
@@ -250,6 +252,7 @@ const NESTED_HELP_COMMANDS = new Set([
     "performance-goal",
     "resume",
     "session",
+    "api",
     "sparkshell",
     "team",
     "tmux-hook",
@@ -843,6 +846,7 @@ export async function main(args) {
         "autoresearch",
         "autoresearch-goal",
         "explore",
+        "api",
         "sparkshell",
         "team",
         "ralph",
@@ -947,6 +951,9 @@ export async function main(args) {
             case "explore":
                 await exploreCommand(args.slice(1));
                 break;
+            case "api":
+                await apiCommand(args.slice(1));
+                break;
             case "exec":
                 if (launchArgs[0] === "inject") {
                     await execInjectCommand(launchArgs);
@@ -1833,10 +1840,16 @@ function withTmuxExtendedKeysLeaseLock(cwd, socketPath, run) {
     }
     throw new Error(`timed out waiting for tmux extended-keys lease lock: ${lockPath}`);
 }
-function buildDetachedSessionLeaderCommand(cwd, sessionName, codexCmd, sessionId, codexHomeOverride, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup) {
+function buildDetachedSessionLeaderCommand(cwd, sessionName, codexCmd, sessionId, codexHomeOverride, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup, parentEnvFilePath) {
     const detachedPostLaunchHelper = sessionId
         ? `${buildDetachedSessionPostLaunchHelperCommand(cwd, sessionId, codexHomeOverride, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup)} >/dev/null 2>&1 || true;`
         : "";
+    const parentEnvSource = parentEnvFilePath && parentEnvFilePath.trim()
+        ? `if [ -r ${quoteShellArg(parentEnvFilePath)} ]; then . ${quoteShellArg(parentEnvFilePath)}; rm -f ${quoteShellArg(parentEnvFilePath)}; fi;`
+        : "";
+    const parentEnvCleanup = parentEnvFilePath && parentEnvFilePath.trim()
+        ? `rm -f ${quoteShellArg(parentEnvFilePath)} 2>/dev/null || true;`
+        : "";
     const wrapped = [
         buildTmuxExtendedKeysAcquireShellSnippet(cwd),
         'exec 3<&0;',
@@ -1850,6 +1863,7 @@ function buildDetachedSessionLeaderCommand(cwd, sessionName, codexCmd, sessionId
         "fi;",
         'exec 3<&- 2>/dev/null || true;',
         buildTmuxExtendedKeysReleaseShellSnippet(cwd),
+        parentEnvCleanup,
         detachedPostLaunchHelper,
         'if [ "$status" -eq 0 ]; then',
         `tmux kill-session -t "${escapeShellDoubleQuotedValue(sessionName)}" >/dev/null 2>&1 || true;`,
@@ -1857,6 +1871,7 @@ function buildDetachedSessionLeaderCommand(cwd, sessionName, codexCmd, sessionId
         "exit $status;",
         "};",
         "trap omx_detached_session_cleanup 0 INT TERM HUP;",
+        parentEnvSource,
         "omx_codex_started_at=$(date +%s 2>/dev/null || printf 0);",
         `${codexCmd} <&3 &`,
         "omx_codex_pid=$!;",
@@ -1997,6 +2012,34 @@ function buildTmuxExtendedKeysAcquireShellSnippet(cwd) {
 function buildTmuxExtendedKeysReleaseShellSnippet(cwd) {
     return `if [ -n "\${OMX_TMUX_EXTENDED_KEYS_LEASE:-}" ]; then ${buildTmuxExtendedKeysHelperCommand(cwd, "release")} "\${OMX_TMUX_EXTENDED_KEYS_LEASE}" >/dev/null 2>&1 || true; fi;`;
 }
+const SHELL_ENV_NAME_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
+export function serializeDetachedSessionParentEnv(env) {
+    const lines = [];
+    for (const key of Object.keys(env).sort()) {
+        if (!SHELL_ENV_NAME_PATTERN.test(key))
+            continue;
+        const value = env[key];
+        if (typeof value !== "string")
+            continue;
+        if (value.includes("\0"))
+            continue;
+        lines.push(`export ${key}=${quoteShellArg(value)}`);
+    }
+    return `${lines.join("\n")}\n`;
+}
+export function detachedSessionParentEnvFilePath(cwd, sessionId) {
+    const safeSessionId = sessionId.replace(/[^A-Za-z0-9_.-]/g, "_");
+    return join(omxRoot(cwd), "runtime", "tmux-env", `${safeSessionId}.env`);
+}
+export function writeDetachedSessionParentEnvFile(cwd, sessionId, env) {
+    const filePath = detachedSessionParentEnvFilePath(cwd, sessionId);
+    mkdirSync(dirname(filePath), { recursive: true, mode: 0o700 });
+    writeFileSync(filePath, serializeDetachedSessionParentEnv(env), {
+        encoding: "utf-8",
+        mode: 0o600,
+    });
+    return filePath;
+}
 export function withTmuxExtendedKeys(cwd, run, execFileSyncImpl = (file, tmuxArgs) => execFileSync(file, tmuxArgs, {
     encoding: "utf-8",
     ...(process.platform === "win32" ? { windowsHide: true } : {}),
@@ -2010,10 +2053,10 @@ export function withTmuxExtendedKeys(cwd, run, execFileSyncImpl = (file, tmuxArg
             releaseTmuxExtendedKeysLease(cwd, leaseHandle, execFileSyncImpl);
     }
 }
-export function buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows = false, sessionId, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup, omxRootOverride, env = process.env, sqliteHomeOverride) {
+export function buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows = false, sessionId, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup, omxRootOverride, env = process.env, sqliteHomeOverride, parentEnvFilePath) {
     const detachedLeaderCmd = nativeWindows
         ? "powershell.exe"
-        : buildDetachedSessionLeaderCommand(cwd, sessionName, codexCmd, sessionId, codexHomeOverride, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup);
+        : buildDetachedSessionLeaderCommand(cwd, sessionName, codexCmd, sessionId, codexHomeOverride, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup, parentEnvFilePath);
     const newSessionArgs = [
         "new-session",
         "-d",
@@ -2249,6 +2292,26 @@ async function readPostLaunchModeStateFile(path, dependencies = {}) {
 function cleanPostLaunchString(value) {
     return typeof value === "string" ? value.trim() : "";
 }
+function isAutopilotReviewPendingPostLaunchState(state) {
+    if (!state || state.active !== true)
+        return false;
+    const mode = cleanPostLaunchString(state.mode).toLowerCase();
+    if (mode && mode !== "autopilot")
+        return false;
+    const phase = cleanPostLaunchString(state.current_phase ?? state.currentPhase)
+        .toLowerCase()
+        .replace(/_/g, "-");
+    if (phase === "code-review" || phase === "review" || phase === "reviewing" || phase === "review-pending") {
+        return true;
+    }
+    const nestedState = state.state && typeof state.state === "object"
+        ? state.state
+        : {};
+    return state.review_pending === true
+        || state.reviewPending === true
+        || nestedState.review_pending === true
+        || nestedState.reviewPending === true;
+}
 function postLaunchUniqueStrings(values) {
     return [...new Set(values.map((value) => value.trim()).filter(Boolean))];
 }
@@ -2336,8 +2399,16 @@ export async function cleanupPostLaunchModeStateFiles(cwd, sessionId, dependenci
     const rootSkillActiveStateBeforeCleanup = sessionId
         ? await readSkillActiveState(getSkillActiveStatePathsForStateDir(rootStateDir).rootPath)
         : null;
+    let preserveSkillActiveForReviewPendingAutopilot = false;
     for (const stateDir of scopedDirs) {
         const files = await readdir(stateDir).catch(() => []);
+        const autopilotPath = join(stateDir, "autopilot-state.json");
+        const autopilotPrecheck = files.includes("autopilot-state.json")
+            ? await readPostLaunchModeStateFile(autopilotPath, dependencies)
+            : null;
+        const preserveReviewPendingAutopilot = autopilotPrecheck?.kind === "ok"
+            && isAutopilotReviewPendingPostLaunchState(autopilotPrecheck.state);
+        preserveSkillActiveForReviewPendingAutopilot ||= preserveReviewPendingAutopilot;
         for (const file of files) {
             if (!file.endsWith("-state.json") || file === "session.json")
                 continue;
@@ -2395,6 +2466,10 @@ export async function cleanupPostLaunchModeStateFiles(cwd, sessionId, dependenci
                 }
                 continue;
             }
+            if (preserveReviewPendingAutopilot
+                && (mode === "autopilot" || mode === SKILL_ACTIVE_STATE_MODE)) {
+                continue;
+            }
             try {
                 const completedAt = now().toISOString();
                 if (mode === SKILL_ACTIVE_STATE_MODE) {
@@ -2433,7 +2508,9 @@ export async function cleanupPostLaunchModeStateFiles(cwd, sessionId, dependenci
     }
     if (sessionId) {
         try {
-            await scrubPostLaunchRootSkillActiveForSession(rootStateDir, sessionId, now().toISOString(), writeFile, rootSkillActiveStateBeforeCleanup);
+            if (!preserveSkillActiveForReviewPendingAutopilot) {
+                await scrubPostLaunchRootSkillActiveForSession(rootStateDir, sessionId, now().toISOString(), writeFile, rootSkillActiveStateBeforeCleanup);
+            }
         }
         catch (err) {
             writeWarn(`[omx] postLaunch: failed to reconcile root skill-active state: ${err instanceof Error ? err.message : err}`);
@@ -2610,6 +2687,9 @@ function runCodex(cwd, args, sessionId, workerDefaultModel, codexHomeOverride, s
         let hudPaneId = null;
         try {
             hudPaneId = createHudWatchPane(cwd, hudCmd);
+            if (hudPaneId && currentPaneId) {
+                registerHudResizeHook(hudPaneId, currentPaneId, HUD_TMUX_HEIGHT_LINES);
+            }
         }
         catch (err) {
             logCliOperationFailure(err);
@@ -2678,8 +2758,18 @@ function runCodex(cwd, args, sessionId, workerDefaultModel, codexHomeOverride, s
         let registeredHookTarget = null;
         let registeredHookName = null;
         let registeredClientAttachedHookName = null;
+        let detachedParentEnvFilePath;
         try {
-            const bootstrapSteps = buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows, sessionId, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup, omxRootOverride, process.env, sqliteHomeOverride);
+            // This path is the user-shell interactive launch: OMX creates a tmux
+            // session and immediately attaches the user's terminal to it. If a tmux
+            // server already exists, `new-session -e` only forwards explicit values,
+            // so provider-specific parent-shell keys would disappear. Source a
+            // private env file inside the leader shell instead of putting every
+            // parent env value on the tmux command line or in logs.
+            if (!nativeWindows) {
+                detachedParentEnvFilePath = writeDetachedSessionParentEnvFile(cwd, sessionId, codexEnvWithNotify);
+            }
+            const bootstrapSteps = buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows, sessionId, projectLocalCodexHomeForCleanup, runtimeCodexHomeForCleanup, omxRootOverride, process.env, sqliteHomeOverride, detachedParentEnvFilePath);
             for (const step of bootstrapSteps) {
                 const output = execTmuxFileSync(step.args, {
                     stdio: "pipe",
@@ -2748,6 +2838,9 @@ function runCodex(cwd, args, sessionId, workerDefaultModel, codexHomeOverride, s
         }
         catch (err) {
             logCliOperationFailure(err);
+            if (detachedParentEnvFilePath) {
+                rmSync(detachedParentEnvFilePath, { force: true });
+            }
             if (createdDetachedSession) {
                 const rollbackSteps = buildDetachedSessionRollbackSteps(sessionName, registeredHookTarget, registeredHookName, registeredClientAttachedHookName);
                 for (const rollbackStep of rollbackSteps) {
@@ -3117,6 +3210,22 @@ function parseWatcherPidFile(content) {
         return Number.isFinite(pid) && pid > 0 ? pid : null;
     }
 }
+const DEFAULT_NOTIFY_FALLBACK_REAP_GRACE_MS = 5000;
+function resolveNotifyFallbackReapGraceMs(env = process.env) {
+    const parsed = Number.parseInt(env.OMX_NOTIFY_FALLBACK_REAP_GRACE_MS || "", 10);
+    if (Number.isFinite(parsed) && parsed >= 0)
+        return parsed;
+    return DEFAULT_NOTIFY_FALLBACK_REAP_GRACE_MS;
+}
+function isWatcherRecordWithinReapGrace(record, nowMs = Date.now(), graceMs = resolveNotifyFallbackReapGraceMs()) {
+    if (graceMs <= 0 || !record.startedAt)
+        return false;
+    const startedMs = Date.parse(record.startedAt);
+    if (!Number.isFinite(startedMs))
+        return false;
+    const ageMs = nowMs - startedMs;
+    return ageMs >= 0 && ageMs < graceMs;
+}
 function parseWatcherPidRecord(content) {
     const trimmed = content.trim();
     if (!trimmed)
@@ -3159,7 +3268,7 @@ function isLikelyOmxWatcherProcess(pid, execFileSyncFn = execFileSync, platform
 export async function reapStaleNotifyFallbackWatcher(pidPath, deps = {}) {
     const exists = deps.exists ?? existsSync;
     if (!exists(pidPath))
-        return;
+        return "missing";
     const { readFile } = await import("fs/promises");
     const readFileImpl = deps.readFile ?? readFile;
     const tryKillPidImpl = deps.tryKillPid ?? tryKillPid;
@@ -3168,9 +3277,15 @@ export async function reapStaleNotifyFallbackWatcher(pidPath, deps = {}) {
     const isWatcherProcessImpl = deps.isWatcherProcess ?? isLikelyOmxWatcherProcess;
     try {
         const record = parseWatcherPidRecord(await readFileImpl(pidPath, "utf-8"));
-        if (record && isWatcherProcessImpl(record.pid)) {
-            tryKillPidImpl(record.pid, "SIGTERM");
+        if (!record)
+            return "invalid";
+        if (!isWatcherProcessImpl(record.pid))
+            return "identity_mismatch";
+        if (isWatcherRecordWithinReapGrace(record, deps.nowMs?.() ?? Date.now(), deps.reapGraceMs ?? resolveNotifyFallbackReapGraceMs())) {
+            return "recent_active";
         }
+        tryKillPidImpl(record.pid, "SIGTERM");
+        return "reaped";
     }
     catch (error) {
         if (!hasErrnoCodeImpl(error, "ESRCH")) {
@@ -3179,6 +3294,7 @@ export async function reapStaleNotifyFallbackWatcher(pidPath, deps = {}) {
                 error: error instanceof Error ? error.message : String(error),
             });
         }
+        return "failed";
     }
 }
 function tryKillPid(pid, signal = "SIGTERM") {
@@ -3196,7 +3312,9 @@ function tryKillPid(pid, signal = "SIGTERM") {
 async function startNotifyFallbackWatcher(cwd, options = {}) {
     const { mkdir, writeFile } = await import("fs/promises");
     const pidPath = notifyFallbackPidPath(cwd);
-    await reapStaleNotifyFallbackWatcher(pidPath);
+    const reapResult = await reapStaleNotifyFallbackWatcher(pidPath);
+    if (reapResult === "recent_active")
+        return;
     if (!shouldEnableNotifyFallbackWatcher(process.env, process.platform))
         return;
     const pkgRoot = getPackageRoot();