oh-my-codex 0.11.11 → 0.11.13

package/dist/cli/index.js

@@ -15,7 +15,7 @@ import { hudCommand } from "../hud/index.js";
 import { teamCommand } from "./team.js";
 import { ralphCommand } from "./ralph.js";
 import { askCommand } from "./ask.js";
-import { cleanupCommand } from "./cleanup.js";
+import { cleanupCommand, cleanupOmxMcpProcesses, findLaunchSafeCleanupCandidates, } from "./cleanup.js";
 import { exploreCommand } from "./explore.js";
 import { sparkshellCommand } from "./sparkshell.js";
 import { agentsInitCommand } from "./agents-init.js";
@@ -28,7 +28,7 @@ import { maybeCheckAndPromptUpdate } from "./update.js";
 import { maybePromptGithubStar } from "./star-prompt.js";
 import { generateOverlay, removeSessionModelInstructionsFile, resolveSessionOrchestrationMode, sessionModelInstructionsPath, writeSessionModelInstructionsFile, } from "../hooks/agents-overlay.js";
 import { readSessionState, writeSessionStart, writeSessionEnd, resetSessionMetrics, } from "../hooks/session.js";
-import { buildClientAttachedReconcileHookName, buildReconcileHudResizeArgs, buildRegisterClientAttachedReconcileArgs, buildRegisterResizeHookArgs, buildResizeHookName, buildResizeHookTarget, buildScheduleDelayedHudResizeArgs, buildUnregisterClientAttachedReconcileArgs, buildUnregisterResizeHookArgs, enableMouseScrolling, isNativeWindows, isTmuxAvailable, } from "../team/tmux-session.js";
+import { buildClientAttachedReconcileHookName, buildReconcileHudResizeArgs, buildRegisterClientAttachedReconcileArgs, buildRegisterResizeHookArgs, buildResizeHookName, buildResizeHookTarget, buildScheduleDelayedHudResizeArgs, buildUnregisterClientAttachedReconcileArgs, buildUnregisterResizeHookArgs, enableMouseScrolling, isMsysOrGitBash, isNativeWindows, isTmuxAvailable, } from "../team/tmux-session.js";
 import { getPackageRoot } from "../utils/package.js";
 import { codexConfigPath } from "../utils/paths.js";
 import { repairConfigIfNeeded } from "../config/generator.js";
@@ -40,13 +40,16 @@ import { collectInheritableTeamWorkerArgs as collectInheritableTeamWorkerArgsSha
 import { parseWorktreeMode, planWorktreeTarget, ensureWorktree, } from "../team/worktree.js";
 import { OMX_NOTIFY_TEMP_CONTRACT_ENV, parseNotifyTempContractFromArgs, serializeNotifyTempContract, } from "../notifications/temp-contract.js";
 export function resolveNotifyFallbackWatcherScript(pkgRoot = getPackageRoot()) {
-    return join(pkgRoot, "dist", "scripts", "notify-fallback-watcher.js");
+    return resolveDistScript(pkgRoot, "notify-fallback-watcher.js");
 }
 export function resolveHookDerivedWatcherScript(pkgRoot = getPackageRoot()) {
-    return join(pkgRoot, "dist", "scripts", "hook-derived-watcher.js");
+    return resolveDistScript(pkgRoot, "hook-derived-watcher.js");
 }
 export function resolveNotifyHookScript(pkgRoot = getPackageRoot()) {
-    return join(pkgRoot, "dist", "scripts", "notify-hook.js");
+    return resolveDistScript(pkgRoot, "notify-hook.js");
+}
+function resolveDistScript(pkgRoot, scriptName) {
+    return join(pkgRoot, "dist", "scripts", scriptName);
 }
 const HELP = `
 oh-my-codex (omx) - Multi-agent orchestration for Codex CLI
@@ -1023,6 +1026,9 @@ export function buildTmuxSessionName(cwd, sessionId) {
     const name = `omx-${dirToken}-${branchToken}-${sessionToken}`;
     return name.length > 120 ? name.slice(0, 120) : name;
 }
+export function buildDetachedTmuxSessionName(cwd, sessionId) {
+    return buildTmuxSessionName(cwd, sessionId);
+}
 function parsePaneIdFromTmuxOutput(rawOutput) {
     const paneId = rawOutput.split("\n")[0]?.trim() || "";
     return paneId.startsWith("%") ? paneId : null;
@@ -1054,7 +1060,7 @@ function buildDetachedSessionLeaderCommand(sessionName, codexCmd) {
     const wrapped = [`trap '${cleanupTrap}' 0 INT TERM HUP;`, codexCmd].join(" ");
     return `/bin/sh -lc ${quoteShellArg(wrapped)}`;
 }
-export function buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows = false) {
+export function buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows = false, sessionId) {
     const detachedLeaderCmd = nativeWindows
         ? "powershell.exe"
         : buildDetachedSessionLeaderCommand(sessionName, codexCmd);
@@ -1071,6 +1077,7 @@ export function buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, h
         ...(workerLaunchArgs
             ? ["-e", `${TEAM_WORKER_LAUNCH_ARGS_ENV}=${workerLaunchArgs}`]
             : []),
+        ...(sessionId ? ["-e", `OMX_SESSION_ID=${sessionId}`] : []),
         ...(codexHomeOverride ? ["-e", `CODEX_HOME=${codexHomeOverride}`] : []),
         ...(notifyTempContractRaw
             ? ["-e", `${OMX_NOTIFY_TEMP_CONTRACT_ENV}=${notifyTempContractRaw}`]
@@ -1186,20 +1193,43 @@ export function buildNotifyFallbackWatcherEnv(env = process.env, options = {}) {
     return {
         ...nextEnv,
         ...(options.codexHomeOverride ? { CODEX_HOME: options.codexHomeOverride } : {}),
+        ...(options.sessionId ? { OMX_SESSION_ID: options.sessionId } : {}),
         OMX_HUD_AUTHORITY: options.enableAuthority ? "1" : "0",
     };
 }
+export async function cleanupLaunchOrphanedMcpProcesses(dependencies = {}) {
+    return cleanupOmxMcpProcesses([], {
+        ...dependencies,
+        selectCandidates: dependencies.selectCandidates ?? findLaunchSafeCleanupCandidates,
+        writeLine: dependencies.writeLine ?? (() => { }),
+    });
+}
 /**
  * preLaunch: Prepare environment before Codex starts.
- * 1. Generate runtime overlay + write session-scoped model instructions file
- * 2. Write session.json
+ * 1. Best-effort launch-safe orphan cleanup for detached OMX MCP processes
+ * 2. Generate runtime overlay + write session-scoped model instructions file
+ * 3. Write session.json
  *
- * Automatic stale-session cleanup is intentionally disabled here. Destructive
- * cleanup must be explicit via `omx cleanup` so normal launches never reap
- * files or processes from other OMX sessions.
+ * Automatic broad stale-session cleanup remains disabled here. Only detached
+ * OMX MCP processes without a live Codex ancestor are reaped so new launches
+ * do not accumulate stale processes from prior crashed/closed sessions.
  */
 async function preLaunch(cwd, sessionId, notifyTempContract, codexHomeOverride, enableNotifyFallbackAuthority = false) {
-    // 1. Generate runtime overlay + write session-scoped model instructions file
+    // 1. Best-effort launch-safe orphan cleanup
+    try {
+        const cleanup = await cleanupLaunchOrphanedMcpProcesses();
+        if (cleanup.terminatedCount > 0) {
+            console.log(`[omx] Reaped ${cleanup.terminatedCount} orphaned OMX MCP process(es) before launch.`);
+        }
+        if (cleanup.failedPids.length > 0) {
+            console.warn(`[omx] Failed to reap ${cleanup.failedPids.length} orphaned OMX MCP process(es); continuing launch.`);
+        }
+    }
+    catch (err) {
+        process.stderr.write(`[cli/index] operation failed: ${err}\n`);
+        // Non-fatal
+    }
+    // 2. Generate runtime overlay + write session-scoped model instructions file
     const orchestrationMode = await resolveSessionOrchestrationMode(cwd, sessionId);
     const overlay = await generateOverlay(cwd, sessionId, { orchestrationMode });
     const launchAppendix = await readLaunchAppendInstructions();
@@ -1209,18 +1239,18 @@ async function preLaunch(cwd, sessionId, notifyTempContract, codexHomeOverride,
 ${launchAppendix}`
         : overlay;
     await writeSessionModelInstructionsFile(cwd, sessionId, sessionInstructions);
-    // 2. Write session state
+    // 3. Write session state
     await resetSessionMetrics(cwd);
     await writeSessionStart(cwd, sessionId);
-    // 3. Start notify fallback watcher (best effort)
+    // 4. Start notify fallback watcher (best effort)
     try {
-        await startNotifyFallbackWatcher(cwd, { codexHomeOverride, enableAuthority: enableNotifyFallbackAuthority });
+        await startNotifyFallbackWatcher(cwd, { codexHomeOverride, enableAuthority: enableNotifyFallbackAuthority, sessionId });
     }
     catch (err) {
         process.stderr.write(`[cli/index] operation failed: ${err}\n`);
         // Non-fatal
     }
-    // 4. Start derived watcher (best effort, opt-in)
+    // 5. Start derived watcher (best effort, opt-in)
     try {
         await startHookDerivedWatcher(cwd);
     }
@@ -1228,7 +1258,7 @@ ${launchAppendix}`
         process.stderr.write(`[cli/index] operation failed: ${err}\n`);
         // Non-fatal
     }
-    // 5. Emit temp notification startup summary + warnings, then send session-start lifecycle notification (best effort)
+    // 6. Emit temp notification startup summary + warnings, then send session-start lifecycle notification (best effort)
     try {
         if (notifyTempContract?.active) {
             process.env[OMX_NOTIFY_TEMP_CONTRACT_ENV] =
@@ -1257,7 +1287,7 @@ ${launchAppendix}`
         process.stderr.write(`[cli/index] operation failed: ${err}\n`);
         // Non-fatal: notification failures must never block launch
     }
-    // 6. Dispatch native hook event (best effort)
+    // 7. Dispatch native hook event (best effort)
     try {
         await emitNativeHookEvent(cwd, "session-start", {
             session_id: sessionId,
@@ -1289,9 +1319,10 @@ function runCodex(cwd, args, sessionId, workerDefaultModel, codexHomeOverride, n
     const codexBaseEnv = codexHomeOverride
         ? { ...process.env, CODEX_HOME: codexHomeOverride }
         : process.env;
+    const codexEnvWithSession = { ...codexBaseEnv, OMX_SESSION_ID: sessionId };
     const codexEnv = workerLaunchArgs
-        ? { ...codexBaseEnv, [TEAM_WORKER_LAUNCH_ARGS_ENV]: workerLaunchArgs }
-        : codexBaseEnv;
+        ? { ...codexEnvWithSession, [TEAM_WORKER_LAUNCH_ARGS_ENV]: workerLaunchArgs }
+        : codexEnvWithSession;
     const codexEnvWithNotify = notifyTempContractRaw
         ? { ...codexEnv, [OMX_NOTIFY_TEMP_CONTRACT_ENV]: notifyTempContractRaw }
         : codexEnv;
@@ -1365,14 +1396,13 @@ function runCodex(cwd, args, sessionId, workerDefaultModel, codexHomeOverride, n
         const detachedWindowsCodexCmd = nativeWindows
             ? buildWindowsPromptCommand("codex", launchArgs)
             : null;
-        const tmuxSessionId = `omx-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
-        const sessionName = buildTmuxSessionName(cwd, tmuxSessionId);
+        const sessionName = buildDetachedTmuxSessionName(cwd, sessionId);
         let createdDetachedSession = false;
         let registeredHookTarget = null;
         let registeredHookName = null;
         let registeredClientAttachedHookName = null;
         try {
-            const bootstrapSteps = buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows);
+            const bootstrapSteps = buildDetachedSessionBootstrapSteps(sessionName, cwd, codexCmd, hudCmd, workerLaunchArgs, codexHomeOverride, notifyTempContractRaw, nativeWindows, sessionId);
             for (const step of bootstrapSteps) {
                 const output = execFileSync("tmux", step.args, {
                     stdio: "pipe",
@@ -1570,7 +1600,7 @@ async function postLaunch(cwd, sessionId, codexHomeOverride, enableNotifyFallbac
     }
     // 0. Flush fallback watcher once to reduce race with fast codex exit.
     try {
-        await flushNotifyFallbackOnce(cwd, { codexHomeOverride, enableAuthority: enableNotifyFallbackAuthority });
+        await flushNotifyFallbackOnce(cwd, { codexHomeOverride, enableAuthority: enableNotifyFallbackAuthority, sessionId });
     }
     catch (err) {
         process.stderr.write(`[cli/index] operation failed: ${err}\n`);
@@ -1704,6 +1734,66 @@ function notifyFallbackPidPath(cwd) {
 function hookDerivedWatcherPidPath(cwd) {
     return join(cwd, ".omx", "state", "hook-derived-watcher.pid");
 }
+export function shouldDetachBackgroundHelper(env = process.env, platform = process.platform) {
+    // The long-running watcher/helper itself must stay detached so it can
+    // survive parent loss. Windows Git Bash/MSYS uses a short hidden bootstrap
+    // process so the detached helper is created without stealing focus.
+    void env;
+    void platform;
+    return true;
+}
+export function resolveBackgroundHelperLaunchMode(env = process.env, platform = process.platform) {
+    return platform === "win32" && isMsysOrGitBash(env, platform)
+        ? "windows-msys-bootstrap"
+        : "direct-detached";
+}
+export function buildWindowsMsysBackgroundHelperBootstrapScript(helperArgs, cwd) {
+    const helperArgsLiteral = JSON.stringify(helperArgs);
+    const cwdLiteral = JSON.stringify(cwd);
+    return [
+        "const { spawn } = require('child_process');",
+        `const child = spawn(process.execPath, ${helperArgsLiteral}, { cwd: ${cwdLiteral}, detached: true, stdio: 'ignore', windowsHide: true, env: process.env });`,
+        "if (!child.pid) process.exit(1);",
+        "process.stdout.write(String(child.pid));",
+        "child.unref();",
+    ].join("");
+}
+async function launchBackgroundHelper(helperArgs, options) {
+    const launchMode = resolveBackgroundHelperLaunchMode(options.env, process.platform);
+    if (launchMode === "windows-msys-bootstrap") {
+        const { spawnSync } = await import("child_process");
+        const bootstrap = spawnSync(process.execPath, [
+            "-e",
+            buildWindowsMsysBackgroundHelperBootstrapScript(helperArgs, options.cwd),
+        ], {
+            cwd: options.cwd,
+            encoding: "utf-8",
+            stdio: ["ignore", "pipe", "pipe"],
+            windowsHide: true,
+            env: options.env,
+        });
+        if (bootstrap.error) {
+            throw bootstrap.error;
+        }
+        if (bootstrap.status !== 0) {
+            const detail = (bootstrap.stderr || bootstrap.stdout || "").trim();
+            throw new Error(detail || `background helper bootstrap exited ${bootstrap.status}`);
+        }
+        const helperPid = Number.parseInt((bootstrap.stdout || "").trim(), 10);
+        return Number.isFinite(helperPid) && helperPid > 0
+            ? helperPid
+            : undefined;
+    }
+    const child = spawn(process.execPath, helperArgs, {
+        cwd: options.cwd,
+        detached: shouldDetachBackgroundHelper(options.env, process.platform),
+        stdio: "ignore",
+        windowsHide: true,
+        env: options.env,
+    });
+    child.unref();
+    return child.pid;
+}
 function parseWatcherPidFile(content) {
     const trimmed = content.trim();
     if (!trimmed)
@@ -1766,30 +1856,44 @@ async function startNotifyFallbackWatcher(cwd, options = {}) {
             error: error instanceof Error ? error.message : String(error),
         });
     });
-    const child = spawn(process.execPath, [
-        watcherScript,
-        "--cwd",
-        cwd,
-        "--notify-script",
-        notifyScript,
-        "--pid-file",
-        pidPath,
-        "--parent-pid",
-        String(process.pid),
-        ...(process.env.OMX_NOTIFY_FALLBACK_MAX_LIFETIME_MS
-            ? ["--max-lifetime-ms", process.env.OMX_NOTIFY_FALLBACK_MAX_LIFETIME_MS]
-            : []),
-    ], {
-        cwd,
-        detached: true,
-        stdio: "ignore",
-        env: buildNotifyFallbackWatcherEnv(process.env, {
-            codexHomeOverride: options.codexHomeOverride,
-            enableAuthority: options.enableAuthority === true,
-        }),
+    const watcherEnv = buildNotifyFallbackWatcherEnv(process.env, {
+        codexHomeOverride: options.codexHomeOverride,
+        enableAuthority: options.enableAuthority === true,
+        sessionId: options.sessionId,
     });
-    child.unref();
-    await writeFile(pidPath, JSON.stringify({ pid: child.pid, started_at: new Date().toISOString() }, null, 2)).catch((error) => {
+    let watcherPid;
+    try {
+        watcherPid = await launchBackgroundHelper([
+            watcherScript,
+            "--cwd",
+            cwd,
+            "--notify-script",
+            notifyScript,
+            "--pid-file",
+            pidPath,
+            "--parent-pid",
+            String(process.pid),
+            ...(process.env.OMX_NOTIFY_FALLBACK_MAX_LIFETIME_MS
+                ? [
+                    "--max-lifetime-ms",
+                    process.env.OMX_NOTIFY_FALLBACK_MAX_LIFETIME_MS,
+                ]
+                : []),
+        ], {
+            cwd,
+            env: watcherEnv,
+        });
+    }
+    catch (error) {
+        console.warn("[omx] warning: failed to launch notify fallback watcher", {
+            cwd,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return;
+    }
+    if (!watcherPid)
+        return;
+    await writeFile(pidPath, JSON.stringify({ pid: watcherPid, started_at: new Date().toISOString() }, null, 2)).catch((error) => {
         console.warn("[omx] warning: failed to write notify fallback watcher pid file", {
             path: pidPath,
             error: error instanceof Error ? error.message : String(error),
@@ -1825,14 +1929,23 @@ async function startHookDerivedWatcher(cwd) {
             error: error instanceof Error ? error.message : String(error),
         });
     });
-    const child = spawn(process.execPath, [watcherScript, "--cwd", cwd], {
-        cwd,
-        detached: true,
-        stdio: "ignore",
-        env: process.env,
-    });
-    child.unref();
-    await writeFile(pidPath, JSON.stringify({ pid: child.pid, started_at: new Date().toISOString() }, null, 2)).catch((error) => {
+    let watcherPid;
+    try {
+        watcherPid = await launchBackgroundHelper([watcherScript, "--cwd", cwd], {
+            cwd,
+            env: process.env,
+        });
+    }
+    catch (error) {
+        console.warn("[omx] warning: failed to launch hook-derived watcher", {
+            cwd,
+            error: error instanceof Error ? error.message : String(error),
+        });
+        return;
+    }
+    if (!watcherPid)
+        return;
+    await writeFile(pidPath, JSON.stringify({ pid: watcherPid, started_at: new Date().toISOString() }, null, 2)).catch((error) => {
         console.warn("[omx] warning: failed to write hook-derived watcher pid file", {
             path: pidPath,
             error: error instanceof Error ? error.message : String(error),
@@ -1900,9 +2013,11 @@ async function flushNotifyFallbackOnce(cwd, options = {}) {
         cwd,
         stdio: "ignore",
         timeout: 3000,
+        windowsHide: true,
         env: buildNotifyFallbackWatcherEnv(process.env, {
             codexHomeOverride: options.codexHomeOverride,
             enableAuthority: options.enableAuthority === true,
+            sessionId: options.sessionId,
         }),
     });
 }
@@ -1918,6 +2033,7 @@ async function flushHookDerivedWatcherOnce(cwd) {
         cwd,
         stdio: "ignore",
         timeout: 3000,
+        windowsHide: true,
         env: {
             ...process.env,
             OMX_HOOK_DERIVED_SIGNALS: "1",