oh-my-codex 0.17.2 → 0.18.0

package/dist/scripts/codex-native-hook.js

@@ -1,6 +1,6 @@
 import { execFileSync } from "child_process";
 import { closeSync, existsSync, openSync, readFileSync, readSync } from "fs";
-import { appendFile, mkdir, readFile, readdir, writeFile } from "fs/promises";
+import { appendFile, mkdir, readFile, readdir, stat, writeFile } from "fs/promises";
 import { extname, join, relative, resolve } from "path";
 import { pathToFileURL } from "url";
 import { readModeState, readModeStateForActiveDecision, readModeStateForSession, updateModeState } from "../modes/base.js";
@@ -38,6 +38,7 @@ const TEAM_STOP_BLOCKING_TASK_STATUSES = new Set(["pending", "in_progress", "blo
 const TEAM_WORKER_TERMINAL_RUN_STATES = new Set(["done", "complete", "completed", "failed", "stopped", "cancelled"]);
 const NATIVE_STOP_STATE_FILE = "native-stop-state.json";
 const ORDINARY_STOP_NO_PROGRESS_DEFAULT_MAX_REPEATS = 8;
+const RALPH_ORPHANED_STARTING_STALE_MS = 15 * 60_000;
 const ORDINARY_STOP_NO_PROGRESS_DEFAULT_IDLE_MS = 10 * 60_000;
 const ORDINARY_STOP_NO_PROGRESS_MAX_MESSAGE_LENGTH = 240;
 const STABLE_FINAL_RECOMMENDATION_PATTERNS = [
@@ -344,6 +345,47 @@ async function readActiveAutoresearchState(cwd, sessionId) {
 function isRalphStartingPhase(state) {
     return safeString(state.current_phase ?? state.currentPhase).trim().toLowerCase() === "starting";
 }
+function parseTimestampMs(value) {
+    const text = safeString(value).trim();
+    if (!text)
+        return null;
+    const ms = Date.parse(text);
+    return Number.isFinite(ms) ? ms : null;
+}
+function numericValue(value) {
+    if (typeof value === "number" && Number.isFinite(value))
+        return value;
+    if (typeof value === "string" && value.trim()) {
+        const parsed = Number(value);
+        return Number.isFinite(parsed) ? parsed : null;
+    }
+    return null;
+}
+function hasRalphOwnerHint(state) {
+    return [
+        state.owner_omx_session_id,
+        state.owner_codex_session_id,
+        state.owner_codex_thread_id,
+        state.thread_id,
+        state.tmux_pane_id,
+        state.task_slug,
+    ].some((value) => safeString(value).trim() !== "");
+}
+async function isStaleOrphanedRalphStartingState(state, path, nowMs = Date.now()) {
+    if (!isRalphStartingPhase(state))
+        return false;
+    if (numericValue(state.iteration) !== 0)
+        return false;
+    if (hasRalphOwnerHint(state))
+        return false;
+    const timestampMs = parseTimestampMs(state.updated_at)
+        ?? parseTimestampMs(state.started_at)
+        ?? parseTimestampMs(state.created_at)
+        ?? await stat(path).then((info) => info.mtimeMs, () => null);
+    if (timestampMs === null)
+        return false;
+    return nowMs - timestampMs > RALPH_ORPHANED_STARTING_STALE_MS;
+}
 function hasValue(values, value) {
     return value !== "" && values.some((candidate) => candidate === value);
 }
@@ -410,6 +452,89 @@ async function hasConsistentRalphSkillActivation(stateDir, sessionId) {
         return false;
     return true;
 }
+function isShadowableRalphStartingSeed(state) {
+    if (state.active !== true)
+        return false;
+    if (!isRalphStartingPhase(state))
+        return false;
+    if (state.completion_audit || state.completionAudit)
+        return false;
+    const iteration = numericValue(state.iteration);
+    return iteration === null || iteration <= 0;
+}
+function hasPassingCompletedRalphAudit(state, cwd) {
+    if (!state)
+        return false;
+    if (state.mode && safeString(state.mode) !== "ralph")
+        return false;
+    if (!isRalphCompletePhase(state.current_phase ?? state.currentPhase))
+        return false;
+    if (state.active === true)
+        return false;
+    return evaluateRalphCompletionAuditEvidence(state, cwd).complete === true;
+}
+function shouldRetireShadowedRalphStartingSeed(seedState, completedState, cwd, ownerContext) {
+    if (!isShadowableRalphStartingSeed(seedState))
+        return false;
+    if (!hasPassingCompletedRalphAudit(completedState, cwd))
+        return false;
+    if (!completedState)
+        return false;
+    const completedSessionId = safeString(ownerContext?.completedSessionId ?? completedState.session_id).trim();
+    if (completedSessionId
+        && !activeRalphStateMatchesStopOwner(completedState, {
+            sessionId: completedSessionId,
+            payloadSessionId: safeString(ownerContext?.payloadSessionId).trim(),
+            threadId: safeString(ownerContext?.threadId).trim(),
+            currentNativeSessionId: safeString(ownerContext?.currentNativeSessionId).trim(),
+            tmuxPaneId: safeString(ownerContext?.tmuxPaneId).trim(),
+        })) {
+        return false;
+    }
+    const seedThreadId = safeString(seedState.owner_codex_thread_id ?? seedState.thread_id).trim();
+    const completedThreadId = safeString(completedState?.owner_codex_thread_id ?? completedState?.thread_id).trim();
+    const stopThreadId = safeString(ownerContext?.threadId).trim();
+    if (seedThreadId && completedThreadId && seedThreadId !== completedThreadId)
+        return false;
+    if (seedThreadId && stopThreadId && seedThreadId !== stopThreadId)
+        return false;
+    if (completedThreadId && stopThreadId && completedThreadId !== stopThreadId)
+        return false;
+    const seedPaneId = safeString(seedState.tmux_pane_id).trim();
+    const completedPaneId = safeString(completedState?.tmux_pane_id).trim();
+    const stopPaneId = safeString(ownerContext?.tmuxPaneId).trim();
+    if (seedPaneId && completedPaneId && seedPaneId !== completedPaneId)
+        return false;
+    if (seedPaneId && stopPaneId && seedPaneId !== stopPaneId)
+        return false;
+    if (completedPaneId && stopPaneId && completedPaneId !== stopPaneId)
+        return false;
+    const seedStartedAt = parseTimestampMs(seedState.started_at ?? seedState.startedAt);
+    const completedAt = parseTimestampMs(completedState?.completed_at ?? completedState?.completedAt);
+    if (completedAt === null)
+        return false;
+    if (seedStartedAt !== null && seedStartedAt > completedAt)
+        return false;
+    return true;
+}
+async function retireShadowedRalphStartingSeed(path, seedState, completedSessionId, completedPath, completedState) {
+    const nowIso = new Date().toISOString();
+    const completedAt = safeString(completedState.completed_at ?? completedState.completedAt).trim() || nowIso;
+    const next = {
+        ...seedState,
+        active: false,
+        current_phase: "complete",
+        completed_at: completedAt,
+        stop_reason: "shadowed_by_completed_canonical_ralph",
+        shadowed_by_completed_canonical_ralph: {
+            session_id: completedSessionId,
+            state_path: completedPath,
+            completed_at: completedAt,
+            reconciled_at: nowIso,
+        },
+    };
+    await writeFile(path, JSON.stringify(next, null, 2));
+}
 async function readRalphCompletionAuditBlockState(cwd, stateDir, preferredSessionId, ownerContext) {
     const [rawSessionInfo, usableSessionInfo] = await Promise.all([
         readSessionState(cwd),
@@ -480,6 +605,12 @@ async function readActiveRalphState(cwd, stateDir, preferredSessionId, ownerCont
             safeString(preferredSessionId).trim(),
             currentOmxSessionId,
         ].filter(Boolean))];
+    const completedCanonicalPath = currentOmxSessionId
+        ? getStateFilePath("ralph-state.json", cwd, currentOmxSessionId)
+        : "";
+    const completedCanonicalState = completedCanonicalPath
+        ? await readJsonIfExists(completedCanonicalPath)
+        : null;
     // Ralph Stop stays authoritative-scope-only once the Stop payload is session-bound.
     // That is intentionally stricter than generic state MCP reads: do not scan sibling
     // session scopes or fall back to root when a current/explicit session is in play.
@@ -492,10 +623,27 @@ async function readActiveRalphState(cwd, stateDir, preferredSessionId, ownerCont
         }
         const sessionScopedPath = getStateFilePath("ralph-state.json", cwd, sessionId);
         const sessionScoped = await readJsonIfExists(sessionScopedPath);
-        if (sessionScoped?.active === true
-            && isRalphStartingPhase(sessionScoped)
-            && !(await isVisibleRalphActiveForSession(stateDir, sessionId))) {
-            continue;
+        if (sessionScoped?.active === true) {
+            if (currentOmxSessionId
+                && sessionId !== currentOmxSessionId
+                && completedCanonicalState
+                && shouldRetireShadowedRalphStartingSeed(sessionScoped, completedCanonicalState, cwd, {
+                    completedSessionId: currentOmxSessionId,
+                    payloadSessionId: safeString(ownerContext?.payloadSessionId).trim(),
+                    threadId: safeString(ownerContext?.threadId).trim(),
+                    currentNativeSessionId,
+                    tmuxPaneId: safeString(ownerContext?.tmuxPaneId).trim(),
+                })) {
+                await retireShadowedRalphStartingSeed(sessionScopedPath, sessionScoped, currentOmxSessionId, completedCanonicalPath, completedCanonicalState);
+                continue;
+            }
+            if (await isStaleOrphanedRalphStartingState(sessionScoped, sessionScopedPath)) {
+                continue;
+            }
+            if (isRalphStartingPhase(sessionScoped)
+                && !(await isVisibleRalphActiveForSession(stateDir, sessionId))) {
+                continue;
+            }
         }
         if (sessionScoped?.active === true
             && shouldContinueRun(sessionScoped)
@@ -1345,11 +1493,14 @@ async function buildModeBasedStopOutput(mode, cwd, sessionId) {
     if (!state || !shouldContinueRun(state))
         return null;
     const phase = formatPhase(state.current_phase);
+    const systemMessage = mode === "autopilot" && phase.toLowerCase().replace(/_/g, "-") === "code-review"
+        ? "OMX autopilot is still active (phase: code-review). Run the required $code-review step before completing or clearing Autopilot state."
+        : `OMX ${mode} is still active (phase: ${phase}).`;
     return {
         decision: "block",
         reason: `OMX ${mode} is still active (phase: ${phase}); continue the task and gather fresh verification evidence before stopping.`,
         stopReason: `${mode}_${phase}`,
-        systemMessage: `OMX ${mode} is still active (phase: ${phase}).`,
+        systemMessage,
     };
 }
 export function looksLikeGoalCompletionPrompt(text) {
@@ -1359,6 +1510,11 @@ export function looksLikeGoalCompletionPrompt(text) {
         || /\b(?:ultragoal|performance[-\s]goal|autoresearch[-\s]goal)\b.{0,80}\b(?:complete|checkpoint|finish|close|mark)\b/i.test(text)
         || /(?:^|[.!?]\s+)(?:the\s+)?goal\s+(?:is\s+|now\s+|has\s+been\s+)?(?:complete|completed|finished|closed)(?:\s*(?:[.!?]|$)|\s*[:;]\s*\S|\s*[—–-]\s*\S)/i.test(text);
 }
+function reportsAutoresearchGoalObjectiveMismatch(text) {
+    return /\bautoresearch[-\s]goal\b/i.test(text)
+        && /\b(?:complete|completion|reconciliation)\b/i.test(text)
+        && /objective mismatch/i.test(text);
+}
 async function findActiveGoalWorkflowReconciliationRequirement(cwd) {
     const ultragoal = await readJsonIfExists(join(cwd, ".omx", "ultragoal", "goals.json"));
     const aggregateCompletion = safeObject(ultragoal?.aggregateCompletion);
@@ -1402,10 +1558,17 @@ async function findActiveGoalWorkflowReconciliationRequirement(cwd) {
         const completion = await readJsonIfExists(join(autoresearchRoot, entry.name, "completion.json"));
         const completionVerdict = safeString(completion?.verdict);
         const completionPassed = completion?.passed === true || completionVerdict === "pass";
-        if (mission?.workflow === "autoresearch-goal" && status && status !== "complete" && completionPassed) {
+        if (mission?.workflow === "autoresearch-goal"
+            && status
+            && status !== "complete"
+            && completionPassed) {
             return {
                 workflow: "autoresearch-goal",
                 command: `omx autoresearch-goal complete --slug ${safeString(mission.slug) || entry.name} --codex-goal-json '<get_goal JSON or path>'`,
+                remediation: [
+                    "If that command fails with a Codex goal objective mismatch after a fresh get_goal snapshot, do not repeat the same complete command blindly in this thread.",
+                    "Either retry with a correct fresh snapshot or record an explicit blocked verdict for this autoresearch-goal and continue it from a fresh Codex thread.",
+                ].join(" "),
             };
         }
     }
@@ -1431,6 +1594,9 @@ async function buildGoalWorkflowReconciliationStopOutput(payload, cwd) {
     const requirement = await findActiveGoalWorkflowReconciliationRequirement(cwd);
     if (!requirement)
         return null;
+    if (requirement.workflow === "autoresearch-goal" && reportsAutoresearchGoalObjectiveMismatch(lastAssistantMessage)) {
+        return null;
+    }
     const systemMessage = [
         `OMX ${requirement.workflow} requires get_goal snapshot reconciliation before completion; call get_goal and pass --codex-goal-json to ${requirement.command}.`,
         requirement.remediation,
@@ -1533,7 +1699,7 @@ function readPayloadSessionId(payload) {
     return safeString(payload.session_id ?? payload.sessionId).trim();
 }
 function readPayloadThreadId(payload) {
-    return safeString(payload.thread_id ?? payload.threadId).trim();
+    return safeString(payload.owner_codex_thread_id ?? payload.thread_id ?? payload.threadId).trim();
 }
 function readPayloadTurnId(payload) {
     return safeString(payload.turn_id ?? payload.turnId).trim();
@@ -1608,6 +1774,8 @@ async function readBlockingSkillForStop(cwd, stateDir, sessionId, threadId, requ
         const modeSnapshot = getRunContinuationSnapshot(modeState);
         if (modeSnapshot?.terminal === true)
             continue;
+        if (await shouldIgnoreSessionSkillBlockerForCanonicalInactiveRoot(cwd, stateDir, skill, sessionId, threadId))
+            continue;
         const phase = formatPhase(modeState.current_phase, formatPhase(visibleEntries.find((entry) => entry.skill === skill)?.phase, "planning"));
         if (TERMINAL_MODE_PHASES.has(phase.toLowerCase()) || phase === "completing") {
             continue;
@@ -1648,6 +1816,38 @@ function isTerminalOrInactiveModeState(state) {
     const phase = safeString(state.current_phase ?? state.currentPhase).trim().toLowerCase();
     return phase !== "" && TERMINAL_MODE_PHASES.has(phase);
 }
+function rootSkillStateHasNoActiveSkillForStopContext(rootState, skill, sessionId, threadId) {
+    if (!rootState)
+        return false;
+    return !listActiveSkills(rootState).some((entry) => (entry.skill === skill
+        && matchesSkillStopContext(entry, rootState, sessionId, threadId)));
+}
+function rootModeStateIsCanonicalForStopContext(state, cwd, sessionId, threadId) {
+    if (!modeStateMatchesSkillStopContext(state, cwd, sessionId))
+        return false;
+    const stateSessionId = safeString(state.owner_omx_session_id
+        ?? state.session_id
+        ?? state.codex_session_id
+        ?? state.owner_codex_session_id).trim();
+    if (sessionId && stateSessionId !== sessionId)
+        return false;
+    const stateThreadId = safeString(state.owner_codex_thread_id ?? state.thread_id).trim();
+    if (threadId && stateThreadId && stateThreadId !== threadId)
+        return false;
+    return true;
+}
+async function shouldIgnoreSessionSkillBlockerForCanonicalInactiveRoot(cwd, stateDir, skill, sessionId, threadId) {
+    const rootModeState = await readJsonIfExists(join(stateDir, `${skill}-state.json`));
+    if (!rootModeState)
+        return false;
+    if (!rootModeStateIsCanonicalForStopContext(rootModeState, cwd, sessionId, threadId))
+        return false;
+    if (!isTerminalOrInactiveModeState(rootModeState))
+        return false;
+    const { rootPath } = getSkillActiveStatePathsForStateDir(stateDir);
+    const rootSkillState = await readSkillActiveState(rootPath);
+    return rootSkillStateHasNoActiveSkillForStopContext(rootSkillState, skill, sessionId, threadId);
+}
 async function readSessionScopedModeStateForRootSkill(cwd, stateDir, skill, sessionIds) {
     for (const sessionId of sessionIds) {
         const state = await readStopSessionPinnedState(`${skill}-state.json`, cwd, sessionId, stateDir);