oh-my-codex 0.16.1 → 0.16.3

package/dist/cli/index.js

@@ -5,7 +5,7 @@
 import { execFileSync, spawn } from "child_process";
 import { basename, dirname, join, posix, win32 } from "path";
 import { existsSync, mkdirSync, readFileSync, rmSync, statSync, writeFileSync } from "fs";
-import { copyFile, cp, lstat, mkdir, readdir, rm, symlink } from "fs/promises";
+import { copyFile, cp, lstat, mkdir, readFile, readdir, rm, symlink, writeFile } from "fs/promises";
 import { constants as osConstants, homedir } from "os";
 import { setup, SETUP_SCOPES } from "./setup.js";
 import { uninstall } from "./uninstall.js";
@@ -46,7 +46,7 @@ import { readSessionState, writeSessionStart, writeSessionEnd, resetSessionMetri
 import { buildClientAttachedReconcileHookName, buildReconcileHudResizeArgs, buildRegisterClientAttachedReconcileArgs, buildRegisterResizeHookArgs, buildResizeHookName, buildResizeHookTarget, buildScheduleDelayedHudResizeArgs, buildUnregisterClientAttachedReconcileArgs, buildUnregisterResizeHookArgs, enableMouseScrolling, isMsysOrGitBash, isNativeWindows, isTmuxAvailable, mitigateCopyModeUnderlineArtifacts, } from "../team/tmux-session.js";
 import { getPackageRoot } from "../utils/package.js";
 import { codexConfigPath, omxRoot, rememberOmxLaunchContext, resolveOmxEntryPath } from "../utils/paths.js";
-import { cleanCodexModelAvailabilityNuxIfNeeded, repairConfigIfNeeded } from "../config/generator.js";
+import { cleanCodexModelAvailabilityNuxIfNeeded, repairConfigIfNeeded, upsertManagedCodexHookTrustState } from "../config/generator.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";
@@ -447,12 +447,20 @@ export async function prepareRuntimeCodexHomeForProjectLaunch(cwd, sessionId, pr
             continue;
         const source = join(projectCodexHome, entry.name);
         const destination = join(runtimeCodexHome, entry.name);
-        if (entry.name === "config.toml") {
+        if (entry.name === "config.toml" || entry.name === "hooks.json") {
             await copyFile(source, destination);
             continue;
         }
         await linkOrCopyCodexHomeEntry(source, destination);
     }
+    const runtimeConfigPath = join(runtimeCodexHome, "config.toml");
+    const runtimeHooksPath = join(runtimeCodexHome, "hooks.json");
+    if (existsSync(runtimeConfigPath) && existsSync(runtimeHooksPath)) {
+        const runtimeConfig = await readFile(runtimeConfigPath, "utf-8");
+        if (runtimeConfig.includes("# OMX-owned Codex hook trust state")) {
+            await writeFile(runtimeConfigPath, upsertManagedCodexHookTrustState(runtimeConfig, getPackageRoot(), runtimeHooksPath), "utf-8");
+        }
+    }
     return runtimeCodexHome;
 }
 function resolveProjectSqliteHomeForLaunch(projectCodexHome, env) {
@@ -658,6 +666,9 @@ function runCodexBlocking(cwd, launchArgs, codexEnv) {
         if (result.signal) {
             console.error(`[omx] codex exited due to signal ${result.signal}`);
         }
+        else if (typeof result.status === "number") {
+            console.error(`[omx] codex exited with code ${result.status}`);
+        }
     }
 }
 export function buildHudPaneCleanupTargets(existingPaneIds, createdPaneId, leaderPaneId) {
@@ -1759,15 +1770,30 @@ function buildDetachedSessionLeaderCommand(cwd, sessionName, codexCmd, sessionId
         'exec 3<&- 2>/dev/null || true;',
         buildTmuxExtendedKeysReleaseShellSnippet(cwd),
         detachedPostLaunchHelper,
-        'if [ "$status" -lt 128 ]; then',
+        'if [ "$status" -eq 0 ]; then',
         `tmux kill-session -t "${escapeShellDoubleQuotedValue(sessionName)}" >/dev/null 2>&1 || true;`,
         "fi;",
         "exit $status;",
         "};",
         "trap omx_detached_session_cleanup 0 INT TERM HUP;",
+        "omx_codex_started_at=$(date +%s 2>/dev/null || printf 0);",
         `${codexCmd} <&3 &`,
         "omx_codex_pid=$!;",
         'wait "$omx_codex_pid";',
+        "omx_codex_status=$?;",
+        "omx_codex_finished_at=$(date +%s 2>/dev/null || printf 0);",
+        'omx_codex_elapsed=$((omx_codex_finished_at - omx_codex_started_at));',
+        'if [ "$omx_codex_status" -eq 0 ] && [ "$omx_codex_elapsed" -le 2 ]; then',
+        'printf "\\n[omx] codex exited immediately with code 0 during startup. The detached tmux session is being kept open so any output above remains visible. Press Enter to close this OMX session.\\n" >&2;',
+        'IFS= read -r _omx_close || true;',
+        'elif [ "$omx_codex_status" -gt 0 ] && [ "$omx_codex_status" -lt 128 ] && [ "$omx_codex_elapsed" -le 2 ]; then',
+        'printf "\\n[omx] codex exited with code %s during startup. The detached tmux session is being kept open so the error above remains visible. Press Enter to close this OMX session.\\n" "$omx_codex_status" >&2;',
+        'IFS= read -r _omx_close || true;',
+        'elif [ "$omx_codex_status" -gt 0 ] && [ "$omx_codex_status" -lt 128 ]; then',
+        'printf "\\n[omx] codex exited with code %s. The detached tmux session is being kept open so the error above remains visible. Press Enter to close this OMX session.\\n" "$omx_codex_status" >&2;',
+        'IFS= read -r _omx_close || true;',
+        "fi;",
+        'exit "$omx_codex_status";',
     ].join(" ");
     return `/bin/sh -c ${quoteShellArg(wrapped)}`;
 }
@@ -2265,6 +2291,10 @@ export async function cleanupPostLaunchModeStateFiles(cwd, sessionId, dependenci
                 result.state.active = false;
                 result.state.current_phase = "cancelled";
                 result.state.completed_at = completedAt;
+                if (mode === "ralph") {
+                    result.state.interrupted_at = completedAt;
+                    result.state.stop_reason = cleanPostLaunchString(result.state.stop_reason) || "session_exit";
+                }
                 await writeFile(path, JSON.stringify(result.state, null, 2));
                 if (isTrackedWorkflowMode(mode)) {
                     await syncCanonicalSkillStateForMode({