oh-my-codex 0.15.3 → 0.16.0

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

@@ -1,10 +1,10 @@
 import { execFileSync } from "child_process";
 import { closeSync, existsSync, openSync, readFileSync, readSync } from "fs";
 import { mkdir, readFile, readdir, writeFile } from "fs/promises";
-import { join, relative, resolve } from "path";
+import { extname, join, relative, resolve } from "path";
 import { pathToFileURL } from "url";
-import { readModeState, readModeStateForSession, updateModeState } from "../modes/base.js";
-import { listActiveSkills, readVisibleSkillActiveState, } from "../state/skill-active.js";
+import { readModeState, readModeStateForActiveDecision, readModeStateForSession, updateModeState } from "../modes/base.js";
+import { extractSessionIdFromInitializedStatePath, listActiveSkills, readVisibleSkillActiveState, } from "../state/skill-active.js";
 import { readSubagentSessionSummary, recordSubagentTurnForSession, } from "../subagents/tracker.js";
 import { resolveCanonicalTeamStateRoot, resolveWorkerNotifyTeamStateRootPath } from "../team/state-root.js";
 import { appendToLog, isSessionStateUsable, readSessionState, readUsableSessionState, reconcileNativeSessionStart, } from "../hooks/session.js";
@@ -14,14 +14,15 @@ import { findGitLayout } from "../utils/git-layout.js";
 import { getStateFilePath, getStatePath } from "../mcp/state-paths.js";
 import { detectKeywords, detectPrimaryKeyword, recordSkillActivation, } from "../hooks/keyword-detector.js";
 import { detectNativeStopStallPattern, loadAutoNudgeConfig, normalizeAutoNudgeSignatureText, resolveEffectiveAutoNudgeResponse, } from "./notify-hook/auto-nudge.js";
-import { buildNativePostToolUseOutput, buildNativePreToolUseOutput, detectMcpTransportFailure, } from "./codex-native-pre-post.js";
+import { SLOPPY_FALLBACK_GROUNDING_PATTERNS, SLOPPY_FALLBACK_IMPLEMENTATION_CONTEXT_PATTERNS, SLOPPY_FALLBACK_PHRASE_PATTERNS, buildNativePostToolUseOutput, buildNativePreToolUseOutput, detectMcpTransportFailure, hasAnyPattern, } from "./codex-native-pre-post.js";
 import { handleTeamWorkerPostToolUseSuccess } from "./notify-hook/team-worker-posttooluse.js";
+import { maybeNudgeLeaderForAllowedWorkerStop } from "./notify-hook/team-worker-stop.js";
 import { resolveCodexExecutionSurface, } from "./codex-execution-surface.js";
 import { buildNativeHookEvent, } from "../hooks/extensibility/events.js";
-import { dispatchHookEvent } from "../hooks/extensibility/dispatcher.js";
+import { dispatchHookEventRuntime } from "../hooks/extensibility/runtime.js";
 import { reconcileHudForPromptSubmit } from "../hud/reconcile.js";
 import { onSessionStart as buildWikiSessionStartContext } from "../wiki/lifecycle.js";
-import { readAutoresearchCompletionStatus, readAutoresearchModeState } from "../autoresearch/skill-validation.js";
+import { readAutoresearchCompletionStatus, readAutoresearchModeStateForActiveDecision } from "../autoresearch/skill-validation.js";
 import { readRunState } from "../runtime/run-state.js";
 import { getRunContinuationSnapshot, shouldContinueRun } from "../runtime/run-loop.js";
 import { triagePrompt } from "../hooks/triage-heuristic.js";
@@ -32,8 +33,8 @@ import { buildDocumentRefreshAdvisoryOutput, evaluateFinalHandoffDocumentRefresh
 import { buildExecFollowupStopOutput } from "../exec/followup.js";
 const TERMINAL_MODE_PHASES = new Set(["complete", "completed", "failed", "cancelled"]);
 const SKILL_STOP_BLOCKERS = new Set(["ralplan"]);
-const TEAM_TERMINAL_TASK_STATUSES = new Set(["completed", "failed"]);
-const TEAM_WORKER_STOP_ACTIVE_STATES = new Set(["working", "blocked"]);
+const TEAM_STOP_BLOCKING_TASK_STATUSES = new Set(["pending", "in_progress", "blocked"]);
+const TEAM_WORKER_TERMINAL_RUN_STATES = new Set(["done", "complete", "completed", "failed", "stopped", "cancelled"]);
 const NATIVE_STOP_STATE_FILE = "native-stop-state.json";
 const STABLE_FINAL_RECOMMENDATION_PATTERNS = [
     /^\s*(?:launch|release|ship)-?ready\s*:\s*(?:yes|no)\b[^\n\r]*/im,
@@ -160,6 +161,20 @@ async function nativeSubagentSessionStartBelongsToCanonicalSession(cwd, canonica
         return true;
     return summary.allThreadIds.includes(parentThreadId);
 }
+async function isNativeSubagentHook(cwd, canonicalSessionId, nativeSessionId, threadId) {
+    const sessionId = canonicalSessionId.trim();
+    if (!sessionId)
+        return false;
+    const summary = await readSubagentSessionSummary(cwd, sessionId).catch(() => null);
+    if (!summary)
+        return false;
+    const candidateIds = [nativeSessionId, threadId]
+        .map((value) => value.trim())
+        .filter(Boolean);
+    if (candidateIds.length === 0)
+        return false;
+    return candidateIds.some((id) => summary.allSubagentThreadIds.includes(id));
+}
 async function recordIgnoredNativeSubagentSessionStart(cwd, canonicalSessionId, childSessionId, metadata, transcriptPath) {
     await appendToLog(cwd, {
         event: "subagent_session_start_ignored",
@@ -303,7 +318,7 @@ async function readActiveAutoresearchState(cwd, sessionId) {
     const normalizedSessionId = sessionId?.trim() || undefined;
     if (!normalizedSessionId)
         return null;
-    const state = await readAutoresearchModeState(cwd, normalizedSessionId);
+    const state = await readAutoresearchModeStateForActiveDecision(cwd, normalizedSessionId);
     if (state?.active !== true)
         return null;
     if (!isNonTerminalPhase(state.current_phase ?? state.currentPhase ?? 'executing'))
@@ -367,6 +382,18 @@ async function isVisibleRalphActiveForSession(cwd, sessionId) {
     return listActiveSkills(canonicalState).some((entry) => (entry.skill === "ralph"
         && matchesSkillStopContext(entry, canonicalState, sessionId, "")));
 }
+async function hasConsistentRalphSkillActivation(cwd, sessionId) {
+    const canonicalState = await readVisibleSkillActiveState(cwd, sessionId);
+    if (!canonicalState)
+        return true;
+    const initializedMode = safeString(canonicalState.initialized_mode).trim();
+    if (initializedMode && initializedMode !== "ralph")
+        return true;
+    const initializedPathSessionId = extractSessionIdFromInitializedStatePath(canonicalState.initialized_state_path);
+    if (initializedPathSessionId && initializedPathSessionId !== sessionId)
+        return false;
+    return true;
+}
 async function readActiveRalphState(stateDir, preferredSessionId, ownerContext) {
     const cwd = resolve(stateDir, "..", "..");
     const [rawSessionInfo, usableSessionInfo] = await Promise.all([
@@ -407,7 +434,8 @@ async function readActiveRalphState(stateDir, preferredSessionId, ownerContext)
                 threadId: safeString(ownerContext?.threadId).trim(),
                 currentNativeSessionId,
                 tmuxPaneId: safeString(ownerContext?.tmuxPaneId).trim(),
-            })) {
+            })
+            && await hasConsistentRalphSkillActivation(cwd, sessionId)) {
             return { state: sessionScoped, path: sessionScopedPath };
         }
     }
@@ -522,6 +550,182 @@ function tryReadGitValue(cwd, args) {
         return null;
     }
 }
+const SOURCE_DIFF_EXTENSIONS = new Set([
+    ".c",
+    ".cc",
+    ".cjs",
+    ".cpp",
+    ".cs",
+    ".cts",
+    ".go",
+    ".h",
+    ".hpp",
+    ".java",
+    ".js",
+    ".jsx",
+    ".kt",
+    ".mjs",
+    ".mts",
+    ".php",
+    ".py",
+    ".rb",
+    ".rs",
+    ".sh",
+    ".swift",
+    ".ts",
+    ".tsx",
+]);
+function gitOutput(cwd, args) {
+    try {
+        return execFileSync("git", args, {
+            cwd,
+            encoding: "utf-8",
+            stdio: ["ignore", "pipe", "ignore"],
+            windowsHide: true,
+            maxBuffer: 10 * 1024 * 1024,
+        });
+    }
+    catch {
+        return "";
+    }
+}
+function normalizeGitPath(path) {
+    return path.replace(/\\/g, "/").replace(/^\.\//, "");
+}
+function isDiffAuditableSourcePath(path) {
+    const normalized = normalizeGitPath(path).toLowerCase();
+    if (!normalized || normalized.startsWith(".git/") || normalized.startsWith(".omx/"))
+        return false;
+    if (/(^|\/)(?:docs?|documentation|changelog|changeset|\.github)(?:\/|$)/i.test(normalized))
+        return false;
+    if (/(^|\/)(?:__tests__|__test__|test|tests|spec|specs|fixtures?|mocks?)(?:\/|$)/i.test(normalized))
+        return false;
+    if (/(?:^|\/)[^\/]+\.(?:test|spec)\.[^.\/]+$/i.test(normalized))
+        return false;
+    if (/(?:^|\/)(?:readme|changelog|changes|license|notice)(?:\.[^\/]*)?$/i.test(normalized))
+        return false;
+    if (/\.(?:md|mdx|markdown|txt|rst|adoc|ya?ml|json|lock)$/i.test(normalized))
+        return false;
+    return SOURCE_DIFF_EXTENSIONS.has(extname(normalized));
+}
+function isDiffHeaderLine(line) {
+    return line.startsWith("+++") || line.startsWith("---") || line.startsWith("@@") || line.startsWith("diff --git ");
+}
+function isSuspiciousSloppyFallbackAddedLine(line, nearbyContext) {
+    const trimmed = line.trim();
+    if (!trimmed)
+        return false;
+    if (!hasAnyPattern(trimmed, SLOPPY_FALLBACK_PHRASE_PATTERNS))
+        return false;
+    if (!hasAnyPattern(trimmed, SLOPPY_FALLBACK_IMPLEMENTATION_CONTEXT_PATTERNS))
+        return false;
+    if (hasAnyPattern(nearbyContext, SLOPPY_FALLBACK_GROUNDING_PATTERNS))
+        return false;
+    if (/compatib(?:le|ility)|fail-?safe|tested|regression|coverage|because|issue|PR\s*#?\d|#\d/i.test(nearbyContext))
+        return false;
+    return true;
+}
+function collectFindingsFromCandidateLines(path, lines, source) {
+    if (!path || !isDiffAuditableSourcePath(path))
+        return [];
+    const findings = [];
+    for (let index = 0; index < lines.length; index += 1) {
+        const candidate = lines[index];
+        if (!candidate?.added)
+            continue;
+        const nearbyContext = lines
+            .slice(Math.max(0, index - 2), Math.min(lines.length, index + 3))
+            .map((line) => line.text)
+            .join("\n");
+        if (isSuspiciousSloppyFallbackAddedLine(candidate.text, nearbyContext)) {
+            findings.push({ path, line: candidate.text.trim(), source });
+        }
+    }
+    return findings;
+}
+function collectSloppyFallbackFindingsFromPatch(patch, source) {
+    const findings = [];
+    let currentPath = "";
+    let hunkLines = [];
+    const flushHunk = () => {
+        findings.push(...collectFindingsFromCandidateLines(currentPath, hunkLines, source));
+        hunkLines = [];
+    };
+    for (const rawLine of patch.split(/\r?\n/)) {
+        const fileMatch = rawLine.match(/^diff --git a\/(.*?) b\/(.*)$/);
+        if (fileMatch) {
+            flushHunk();
+            currentPath = normalizeGitPath(fileMatch[2] || fileMatch[1] || "");
+            continue;
+        }
+        const renameMatch = rawLine.match(/^\+\+\+ b\/(.*)$/);
+        if (renameMatch) {
+            currentPath = normalizeGitPath(renameMatch[1] || currentPath);
+            continue;
+        }
+        if (rawLine.startsWith("@@")) {
+            flushHunk();
+            continue;
+        }
+        if (!currentPath || !isDiffAuditableSourcePath(currentPath) || isDiffHeaderLine(rawLine))
+            continue;
+        if (rawLine.startsWith("+")) {
+            hunkLines.push({ text: rawLine.slice(1), added: true });
+        }
+        else if (rawLine.startsWith(" ")) {
+            hunkLines.push({ text: rawLine.slice(1), added: false });
+        }
+    }
+    flushHunk();
+    return findings;
+}
+function collectSloppyFallbackFindingsFromUntracked(cwd) {
+    const output = gitOutput(cwd, ["ls-files", "--others", "--exclude-standard", "-z"]);
+    if (!output)
+        return [];
+    const findings = [];
+    for (const rawPath of output.split("\0")) {
+        const path = normalizeGitPath(rawPath.trim());
+        if (!path || !isDiffAuditableSourcePath(path))
+            continue;
+        let content = "";
+        try {
+            content = readFileSync(join(cwd, path), "utf-8");
+        }
+        catch {
+            continue;
+        }
+        findings.push(...collectFindingsFromCandidateLines(path, content.split(/\r?\n/).map((text) => ({ text, added: true })), "untracked"));
+    }
+    return findings;
+}
+function findSloppyFallbackDiffFindings(cwd) {
+    const layout = findGitLayout(cwd);
+    if (!layout)
+        return [];
+    const auditRoot = layout.worktreeRoot;
+    return [
+        ...collectSloppyFallbackFindingsFromPatch(gitOutput(auditRoot, ["diff", "--cached", "--no-ext-diff", "--unified=3"]), "staged"),
+        ...collectSloppyFallbackFindingsFromPatch(gitOutput(auditRoot, ["diff", "--no-ext-diff", "--unified=3"]), "unstaged"),
+        ...collectSloppyFallbackFindingsFromUntracked(auditRoot),
+    ];
+}
+function buildSloppyFallbackDiffStopOutput(findings) {
+    if (findings.length === 0)
+        return null;
+    const preview = findings
+        .slice(0, 3)
+        .map((finding) => `${finding.path} (${finding.source}): ${finding.line}`)
+        .join("; ");
+    const systemMessage = `Sloppy fallback/workaround diff audit detected ungrounded fallback code in added source lines: ${preview}. `
+        + "Continue by replacing the bypass/workaround with a grounded design, or add explicit compatibility/fail-safe/tested/issue rationale near the code if the fallback is intentional.";
+    return {
+        decision: "block",
+        reason: systemMessage,
+        stopReason: "sloppy_fallback_diff_audit",
+        systemMessage,
+    };
+}
 function localExcludeAlreadyIgnoresOmx(cwd) {
     const layout = findGitLayout(cwd);
     if (!layout)
@@ -845,6 +1049,9 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
     const ultraworkPromptActivationNote = skillState?.initialized_mode === "ultrawork"
         ? "Ultrawork protocol: ground the task before editing, define pass/fail acceptance criteria, keep shared-file work local, and use direct-tool plus background evidence lanes only for truly independent work. Direct ultrawork provides lightweight verification only; Ralph owns persistence and the full verified-completion promise."
         : null;
+    const ultragoalPromptActivationNote = match.skill === "ultragoal"
+        ? "Ultragoal protocol: use `omx ultragoal create-goals` / `complete-goals` / `checkpoint` for `.omx/ultragoal` artifacts, then use Codex goal model tools only from the active agent handoff (`get_goal`, `create_goal`, `update_goal`) and never overwrite a different active Codex goal."
+        : null;
     const combinedTransitionMessage = (() => {
         if (!skillState?.transition_message)
             return null;
@@ -872,6 +1079,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
                 ? `planning preserved over simultaneous execution follow-up; deferred skills: ${deferredSkills.join(", ")}.`
                 : null,
             promptPriorityMessage,
+            ultragoalPromptActivationNote,
             skillState.initialized_mode && skillState.initialized_state_path
                 ? `skill: ${skillState.initialized_mode} activated and initial state initialized at ${skillState.initialized_state_path}; write subsequent updates via omx_state MCP.`
                 : null,
@@ -896,6 +1104,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             initializedStateMessage,
             deepInterviewPromptActivationNote,
             ultraworkPromptActivationNote,
+            ultragoalPromptActivationNote,
             buildTeamRuntimeInstruction(cwd, payload),
             buildTeamHelpInstruction(cwd, payload),
             "Follow AGENTS.md routing and preserve workflow transition and planning-safety rules.",
@@ -912,11 +1121,12 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             `skill: ${skillState.initialized_mode} activated and initial state initialized at ${skillState.initialized_state_path}; write subsequent updates via omx_state MCP.`,
             deepInterviewPromptActivationNote,
             ultraworkPromptActivationNote,
+            ultragoalPromptActivationNote,
             ralphPromptActivationNote,
             "Follow AGENTS.md routing and preserve workflow transition and planning-safety rules.",
         ].join(" ");
     }
-    return [detectedKeywordMessage, promptPriorityMessage, "Follow AGENTS.md routing and preserve workflow transition and planning-safety rules."].filter(Boolean).join(" ");
+    return [detectedKeywordMessage, promptPriorityMessage, ultragoalPromptActivationNote, "Follow AGENTS.md routing and preserve workflow transition and planning-safety rules."].filter(Boolean).join(" ");
 }
 function parseTeamWorkerEnv(rawValue) {
     const match = /^([a-z0-9][a-z0-9-]{0,29})\/(worker-\d+)$/.exec(rawValue.trim());
@@ -928,23 +1138,51 @@ function parseTeamWorkerEnv(rawValue) {
     };
 }
 async function resolveTeamStateDirForWorkerContext(cwd, workerContext) {
-    return resolveWorkerNotifyTeamStateRootPath(cwd, workerContext, process.env);
+    const resolved = await resolveWorkerNotifyTeamStateRootPath(cwd, workerContext, process.env).catch(() => null);
+    if (resolved)
+        return resolved;
+    const explicit = safeString(process.env.OMX_TEAM_STATE_ROOT).trim();
+    if (explicit) {
+        const candidate = resolve(cwd, explicit);
+        const workerRoot = join(candidate, "team", workerContext.teamName, "workers", workerContext.workerName);
+        if (existsSync(workerRoot))
+            return candidate;
+        return candidate;
+    }
+    return null;
 }
-async function buildTeamWorkerStopOutput(cwd) {
-    const workerContext = parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_INTERNAL_WORKER || process.env.OMX_TEAM_WORKER));
+async function resolveTeamWorkerStopDecision(cwd) {
+    const workerContext = parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_INTERNAL_WORKER))
+        || parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_WORKER));
     if (!workerContext)
-        return null;
+        return { kind: "unresolved", reason: "missing_worker_context" };
+    const blockWorkerStop = (reasonCode, detail, stateDirForDecision = join(cwd, ".omx", "state")) => ({
+        kind: "blocked",
+        stateDir: stateDirForDecision,
+        workerContext,
+        allowRepeatDuringStopHook: false,
+        output: {
+            decision: "block",
+            reason: `OMX team worker ${workerContext.workerName} Stop cannot be allowed for ${reasonCode}: ${detail}. ` +
+                "Continue the assigned task, repair worker state, or report a concrete blocker before stopping.",
+            stopReason: `team_worker_${workerContext.workerName}_${reasonCode}`,
+            systemMessage: `OMX team worker ${workerContext.workerName} Stop lacks completed task evidence (${reasonCode}).`,
+        },
+    });
     const stateDir = await resolveTeamStateDirForWorkerContext(cwd, workerContext);
-    if (!stateDir)
-        return null;
+    if (!stateDir) {
+        return blockWorkerStop("missing_state_dir", "team state root could not be resolved");
+    }
     const workerRoot = join(stateDir, "team", workerContext.teamName, "workers", workerContext.workerName);
     const [identity, status] = await Promise.all([
         readJsonIfExists(join(workerRoot, "identity.json")),
         readJsonIfExists(join(workerRoot, "status.json")),
     ]);
-    const workerState = safeString(status?.state).trim().toLowerCase();
-    if (!TEAM_WORKER_STOP_ACTIVE_STATES.has(workerState))
-        return null;
+    const workerRunState = safeString(status?.state).trim().toLowerCase();
+    const workerRunStateIsTerminal = TEAM_WORKER_TERMINAL_RUN_STATES.has(workerRunState);
+    if (!identity && !status && !existsSync(workerRoot)) {
+        return blockWorkerStop("missing_worker_state", "worker identity/status state is missing", stateDir);
+    }
     const candidateTaskIds = new Set();
     const currentTaskId = safeString(status?.current_task_id).trim();
     if (currentTaskId)
@@ -955,22 +1193,57 @@ async function buildTeamWorkerStopOutput(cwd) {
         if (normalized)
             candidateTaskIds.add(normalized);
     }
+    const tasksDir = join(stateDir, "team", workerContext.teamName, "tasks");
+    if (existsSync(tasksDir)) {
+        const taskFiles = await readdir(tasksDir).catch(() => []);
+        for (const entry of taskFiles) {
+            if (!/^task-\d+\.json$/.test(entry))
+                continue;
+            const task = await readJsonIfExists(join(tasksDir, entry));
+            const taskOwner = safeString(task?.owner).trim();
+            const taskClaimOwner = safeString(safeObject(task?.claim).owner).trim();
+            if (taskOwner !== workerContext.workerName && taskClaimOwner !== workerContext.workerName)
+                continue;
+            const idFromFile = /^task-(\d+)\.json$/.exec(entry)?.[1] ?? "";
+            const taskId = safeString(task?.id).trim() || idFromFile;
+            if (taskId)
+                candidateTaskIds.add(taskId);
+        }
+    }
+    if (candidateTaskIds.size === 0) {
+        return blockWorkerStop("missing_task_assignment", "no current_task_id or assigned_tasks are recorded", stateDir);
+    }
+    let completedTaskCount = 0;
     for (const taskId of candidateTaskIds) {
         const task = await readJsonIfExists(join(stateDir, "team", workerContext.teamName, "tasks", `task-${taskId}.json`));
         const statusValue = safeString(task?.status).trim().toLowerCase();
-        if (!statusValue || TEAM_TERMINAL_TASK_STATUSES.has(statusValue))
+        if (!statusValue) {
+            return blockWorkerStop(`missing_task_state_${taskId}`, `task ${taskId} has no readable status`, stateDir);
+        }
+        if (statusValue === "completed") {
+            completedTaskCount += 1;
             continue;
+        }
+        if (!TEAM_STOP_BLOCKING_TASK_STATUSES.has(statusValue)) {
+            return blockWorkerStop(`non_completed_task_${taskId}_${statusValue}`, `task ${taskId} is ${statusValue}, not completed`, stateDir);
+        }
         return {
-            decision: "block",
-            reason: `OMX team worker ${workerContext.workerName} is still assigned non-terminal task ${taskId} (${statusValue}); continue the current assigned task or report a concrete blocker before stopping.`,
-            stopReason: `team_worker_${workerContext.workerName}_${taskId}_${statusValue}`,
-            systemMessage: `OMX team worker ${workerContext.workerName} is still assigned task ${taskId} (${statusValue}).`,
+            kind: "blocked",
+            stateDir,
+            workerContext,
+            allowRepeatDuringStopHook: !workerRunStateIsTerminal,
+            output: {
+                decision: "block",
+                reason: `OMX team worker ${workerContext.workerName} is still assigned non-terminal task ${taskId} (${statusValue}); continue the current assigned task or report a concrete blocker before stopping.`,
+                stopReason: `team_worker_${workerContext.workerName}_${taskId}_${statusValue}`,
+                systemMessage: `OMX team worker ${workerContext.workerName} is still assigned task ${taskId} (${statusValue}).`,
+            },
         };
     }
-    return null;
-}
-function hasTeamWorkerContext() {
-    return parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_INTERNAL_WORKER || process.env.OMX_TEAM_WORKER)) !== null;
+    if (completedTaskCount === candidateTaskIds.size) {
+        return { kind: "allowed", stateDir, workerContext };
+    }
+    return blockWorkerStop("missing_completed_task_evidence", "no referenced worker task is completed", stateDir);
 }
 function isStopExempt(payload) {
     const candidates = [
@@ -989,9 +1262,7 @@ function isStopExempt(payload) {
         || value.includes("limit"));
 }
 async function buildModeBasedStopOutput(mode, cwd, sessionId) {
-    const state = sessionId
-        ? await readModeStateForSession(mode, sessionId, cwd)
-        : await readModeState(mode, cwd);
+    const state = await readModeStateForActiveDecision(mode, sessionId?.trim() || undefined, cwd);
     if (!state || !shouldContinueRun(state))
         return null;
     const phase = formatPhase(state.current_phase);
@@ -1002,6 +1273,76 @@ async function buildModeBasedStopOutput(mode, cwd, sessionId) {
         systemMessage: `OMX ${mode} is still active (phase: ${phase}).`,
     };
 }
+function looksLikeGoalCompletionPrompt(text) {
+    return /\b(?:complete|checkpoint|finish|close|mark)\b.{0,80}\b(?:goal|ultragoal|performance-goal|autoresearch-goal)\b/i.test(text)
+        || /\bupdate_goal\s*\(/i.test(text)
+        || /\bomx\s+(?:ultragoal|performance-goal|autoresearch-goal)\s+(?:checkpoint|complete)\b/i.test(text);
+}
+async function findActiveGoalWorkflowReconciliationRequirement(cwd) {
+    const ultragoal = await readJsonIfExists(join(cwd, ".omx", "ultragoal", "goals.json"));
+    const ultragoals = Array.isArray(ultragoal?.goals) ? ultragoal.goals.map(safeObject) : [];
+    const activeUltragoal = ultragoals.find((goal) => safeString(goal.status) === "in_progress" || safeString(goal.id) === safeString(ultragoal?.activeGoalId));
+    if (activeUltragoal) {
+        return {
+            workflow: "ultragoal",
+            command: `omx ultragoal checkpoint --goal-id ${safeString(activeUltragoal.id) || "<goal-id>"} --status complete --codex-goal-json '<get_goal JSON or path>' --evidence '<evidence>'`,
+        };
+    }
+    const performanceRoot = join(cwd, ".omx", "goals", "performance");
+    for (const entry of await readdir(performanceRoot, { withFileTypes: true }).catch(() => [])) {
+        if (!entry.isDirectory())
+            continue;
+        const state = await readJsonIfExists(join(performanceRoot, entry.name, "state.json"));
+        const status = safeString(state?.status);
+        if (state?.workflow === "performance-goal" && status && status !== "complete") {
+            return {
+                workflow: "performance-goal",
+                command: `omx performance-goal complete --slug ${safeString(state.slug) || entry.name} --codex-goal-json '<get_goal JSON or path>' --evidence '<evidence>'`,
+            };
+        }
+    }
+    const autoresearchRoot = join(cwd, ".omx", "goals", "autoresearch");
+    for (const entry of await readdir(autoresearchRoot, { withFileTypes: true }).catch(() => [])) {
+        if (!entry.isDirectory())
+            continue;
+        const mission = await readJsonIfExists(join(autoresearchRoot, entry.name, "mission.json"));
+        const status = safeString(mission?.status);
+        if (mission?.workflow === "autoresearch-goal" && status && status !== "complete") {
+            return {
+                workflow: "autoresearch-goal",
+                command: `omx autoresearch-goal complete --slug ${safeString(mission.slug) || entry.name} --codex-goal-json '<get_goal JSON or path>'`,
+            };
+        }
+    }
+    return null;
+}
+async function buildGoalWorkflowReconciliationPromptWarning(cwd, prompt) {
+    if (!looksLikeGoalCompletionPrompt(prompt))
+        return null;
+    const requirement = await findActiveGoalWorkflowReconciliationRequirement(cwd);
+    if (!requirement)
+        return null;
+    return [
+        `OMX ${requirement.workflow} goal workflow requires Codex goal snapshot reconciliation before completion.`,
+        "Call get_goal, pass the resulting JSON or a path with --codex-goal-json, and do not rely on hooks or shell commands to mutate Codex-owned goal state.",
+        `Required command shape: ${requirement.command}.`,
+    ].join(" ");
+}
+async function buildGoalWorkflowReconciliationStopOutput(payload, cwd) {
+    const lastAssistantMessage = safeString(payload.last_assistant_message ?? payload.lastAssistantMessage);
+    if (!looksLikeGoalCompletionPrompt(lastAssistantMessage))
+        return null;
+    const requirement = await findActiveGoalWorkflowReconciliationRequirement(cwd);
+    if (!requirement)
+        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}. Hooks must not mutate Codex goal state.`;
+    return {
+        decision: "block",
+        reason: systemMessage,
+        stopReason: `${requirement.workflow}_codex_goal_snapshot_required`,
+        systemMessage,
+    };
+}
 async function readTeamModeStateForStop(cwd, sessionId) {
     const normalizedSessionId = safeString(sessionId).trim();
     if (!normalizedSessionId) {
@@ -1170,7 +1511,13 @@ async function readBlockingSkillForStop(cwd, sessionId, threadId, requiredSkill)
             continue;
         }
         if (!canonicalState) {
-            return { skill, phase };
+            return {
+                skill,
+                phase,
+                latestPlanPath: safeString(modeState.latest_plan_path ?? modeState.latestPlanPath).trim() || undefined,
+                planningComplete: modeState.planning_complete === true || modeState.planningComplete === true,
+                runOutcome: safeString(modeState.run_outcome ?? modeState.outcome).trim() || undefined,
+            };
         }
         const blocker = visibleEntries.find((entry) => (entry.skill === skill
             && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
@@ -1179,10 +1526,47 @@ async function readBlockingSkillForStop(cwd, sessionId, threadId, requiredSkill)
         return {
             skill,
             phase: formatPhase(modeState.current_phase ?? blocker.phase ?? canonicalState.phase, "planning"),
+            latestPlanPath: safeString(modeState.latest_plan_path ?? modeState.latestPlanPath).trim() || undefined,
+            planningComplete: modeState.planning_complete === true || modeState.planningComplete === true,
+            runOutcome: safeString(modeState.run_outcome ?? modeState.outcome).trim() || undefined,
         };
     }
     return null;
 }
+function buildRalplanContinuationStatus(blocker, activeSubagentCount) {
+    const phase = blocker.phase || "planning";
+    const artifact = blocker.latestPlanPath
+        ? ` Artifact: ${blocker.latestPlanPath}.`
+        : " Artifact: use the latest `.omx/plans/` ralplan artifact if present.";
+    if (activeSubagentCount > 0) {
+        return {
+            reason: `Status: waiting — ralplan is waiting for ${activeSubagentCount} active native subagent thread(s) to finish (phase: ${phase}). Do not stop silently; wait for the subagent result, then continue from the current ralplan artifact and proceed to the next planning/review step.${artifact}`,
+            stopReasonSuffix: "waiting_subagent",
+            systemMessage: `OMX ralplan status: waiting for ${activeSubagentCount} active native subagent thread(s) at phase ${phase}; after they finish, continue from the current ralplan artifact and state the next status explicitly.`,
+        };
+    }
+    const normalizedPhase = phase.toLowerCase();
+    const normalizedOutcome = (blocker.runOutcome ?? "").toLowerCase();
+    const waitingForInput = normalizedOutcome === "blocked_on_user"
+        || normalizedPhase.includes("blocked")
+        || normalizedPhase.includes("input")
+        || normalizedPhase.includes("question");
+    if (waitingForInput) {
+        return {
+            reason: `Status: waiting_for_input — ralplan is paused for required user/operator input (phase: ${phase}). Ask the missing question or present the review choice explicitly before stopping.${artifact}`,
+            stopReasonSuffix: "waiting_input",
+            systemMessage: `OMX ralplan status: waiting for input at phase ${phase}; ask the required question or present the explicit review choice before stopping.`,
+        };
+    }
+    const completeHint = blocker.planningComplete
+        ? " The planning artifacts are present; if consensus is approved, emit the final complete/approved handoff instead of stopping here."
+        : "";
+    return {
+        reason: `Status: continue_from_artifact — ralplan is still active (phase: ${phase}) and has not emitted a terminal complete/paused/waiting status. Continue from the current ralplan artifact, resolve any review ambiguity conservatively or ask the user if needed, and proceed to the next planning/review step before stopping.${artifact}${completeHint}`,
+        stopReasonSuffix: "continue_artifact",
+        systemMessage: `OMX ralplan status: continue_from_artifact at phase ${phase}; continue from the current ralplan artifact and finish by stating whether ralplan is complete, paused for review, waiting for input, or still continuing.`,
+    };
+}
 async function readStopAutoNudgePhase(cwd, sessionId, threadId) {
     const normalizedSessionId = sessionId.trim();
     if (normalizedSessionId) {
@@ -1251,13 +1635,20 @@ async function buildDeepInterviewQuestionStopOutput(cwd, sessionId, threadId) {
     };
 }
 function resolveRepeatableStopSessionId(payload, canonicalSessionId) {
-    return canonicalSessionId?.trim() || readPayloadSessionId(payload) || "";
+    const inheritedSessionId = safeString(process.env.OMX_SESSION_ID || process.env.CODEX_SESSION_ID).trim();
+    return canonicalSessionId?.trim() || readPayloadSessionId(payload) || inheritedSessionId || "";
+}
+function isStateLevelStopSignatureKind(kind) {
+    return kind === "team-worker-stop" || kind === "team-stop";
 }
 function buildRepeatableStopSignature(payload, kind, detail = "", canonicalSessionId) {
     const sessionId = resolveRepeatableStopSessionId(payload, canonicalSessionId) || "no-session";
     const threadId = readPayloadThreadId(payload) || "no-thread";
-    const turnId = readPayloadTurnId(payload);
     const normalizedDetail = normalizeAutoNudgeSignatureText(detail) || safeString(detail).trim().toLowerCase();
+    if (isStateLevelStopSignatureKind(kind)) {
+        return [kind, sessionId, threadId, normalizedDetail || "no-detail"].join("|");
+    }
+    const turnId = readPayloadTurnId(payload);
     const transcriptPath = safeString(payload.transcript_path ?? payload.transcriptPath).trim() || "no-transcript";
     const lastAssistantMessage = normalizeAutoNudgeSignatureText(payload.last_assistant_message ?? payload.lastAssistantMessage) || "no-message";
     if (turnId) {
@@ -1402,7 +1793,17 @@ async function buildSkillStopOutput(cwd, sessionId, threadId) {
     if (!blocker)
         return null;
     const subagentSummary = await readSubagentSessionSummary(cwd, sessionId).catch(() => null);
-    if (subagentSummary && subagentSummary.activeSubagentThreadIds.length > 0) {
+    const activeSubagentCount = subagentSummary?.activeSubagentThreadIds.length ?? 0;
+    if (blocker.skill === "ralplan") {
+        const status = buildRalplanContinuationStatus(blocker, activeSubagentCount);
+        return {
+            decision: "block",
+            reason: status.reason,
+            stopReason: `skill_${blocker.skill}_${blocker.phase}_${status.stopReasonSuffix}`,
+            systemMessage: status.systemMessage,
+        };
+    }
+    if (activeSubagentCount > 0) {
         return null;
     }
     return {
@@ -1489,7 +1890,7 @@ async function markTeamTransportFailure(cwd, payload) {
         // Canonical team state already carries the preserved failure for coarse-state-missing sessions.
     }
 }
-async function buildStopHookOutput(payload, cwd, stateDir) {
+async function buildStopHookOutput(payload, cwd, stateDir, options = {}) {
     if (isStopExempt(payload)) {
         return null;
     }
@@ -1499,11 +1900,13 @@ async function buildStopHookOutput(payload, cwd, stateDir) {
     const execFollowupOutput = await buildExecFollowupStopOutput(cwd, canonicalSessionId);
     if (execFollowupOutput)
         return execFollowupOutput;
-    const ralphState = await readActiveRalphState(stateDir, canonicalSessionId, {
-        payloadSessionId: sessionId,
-        threadId,
-        tmuxPaneId: safeString(process.env.TMUX_PANE).trim(),
-    });
+    const ralphState = options.skipRalphStopBlock === true
+        ? null
+        : await readActiveRalphState(stateDir, canonicalSessionId, {
+            payloadSessionId: sessionId,
+            threadId,
+            tmuxPaneId: safeString(process.env.TMUX_PANE).trim(),
+        });
     if (!ralphState) {
         const autoresearchState = await readActiveAutoresearchState(cwd, canonicalSessionId);
         if (autoresearchState) {
@@ -1519,9 +1922,22 @@ async function buildStopHookOutput(payload, cwd, stateDir) {
                 }, canonicalSessionId, { allowRepeatDuringStopHook: true });
             }
         }
-        const teamWorkerOutput = await buildTeamWorkerStopOutput(cwd);
-        if (hasTeamWorkerContext() && teamWorkerOutput) {
-            return await returnPersistentStopBlock(payload, stateDir, "team-worker-stop", safeString(teamWorkerOutput.stopReason), teamWorkerOutput, canonicalSessionId, { allowRepeatDuringStopHook: false });
+        const teamWorkerDecision = await resolveTeamWorkerStopDecision(cwd);
+        if (teamWorkerDecision.kind === "blocked") {
+            return await returnPersistentStopBlock(payload, stateDir, "team-worker-stop", safeString(teamWorkerDecision.output.stopReason), teamWorkerDecision.output, canonicalSessionId, { allowRepeatDuringStopHook: teamWorkerDecision.allowRepeatDuringStopHook });
+        }
+        if (teamWorkerDecision.kind === "allowed") {
+            try {
+                await maybeNudgeLeaderForAllowedWorkerStop({
+                    stateDir: teamWorkerDecision.stateDir,
+                    logsDir: join(cwd, ".omx", "logs"),
+                    workerContext: teamWorkerDecision.workerContext,
+                });
+            }
+            catch (err) {
+                void err;
+            }
+            return null;
         }
         const autopilotOutput = await buildModeBasedStopOutput("autopilot", cwd, canonicalSessionId);
         if (autopilotOutput) {
@@ -1562,6 +1978,10 @@ async function buildStopHookOutput(payload, cwd, stateDir) {
             }
         }
         const lastAssistantMessage = safeString(payload.last_assistant_message ?? payload.lastAssistantMessage);
+        const goalWorkflowStopOutput = await buildGoalWorkflowReconciliationStopOutput(payload, cwd);
+        if (goalWorkflowStopOutput) {
+            return await returnPersistentStopBlock(payload, stateDir, "goal-workflow-reconciliation-stop", safeString(goalWorkflowStopOutput.stopReason), goalWorkflowStopOutput, canonicalSessionId, { allowRepeatDuringStopHook: true });
+        }
         const autoNudgeConfig = await loadAutoNudgeConfig();
         const autoNudgePhase = await readStopAutoNudgePhase(cwd, canonicalSessionId, threadId);
         if (autoNudgeConfig.enabled
@@ -1574,6 +1994,11 @@ async function buildStopHookOutput(payload, cwd, stateDir) {
                 systemMessage: "OMX native Stop detected a stall/permission-style handoff and continued the turn automatically.",
             }, canonicalSessionId);
         }
+        const sloppyFallbackDiffFindings = findSloppyFallbackDiffFindings(cwd);
+        const sloppyFallbackDiffOutput = buildSloppyFallbackDiffStopOutput(sloppyFallbackDiffFindings);
+        if (sloppyFallbackDiffOutput) {
+            return await returnPersistentStopBlock(payload, stateDir, "sloppy-fallback-diff-stop", JSON.stringify(sloppyFallbackDiffFindings), sloppyFallbackDiffOutput, canonicalSessionId, { allowRepeatDuringStopHook: true });
+        }
         if (isFinalHandoffDocumentRefreshCandidate(lastAssistantMessage)) {
             const documentRefreshWarning = evaluateFinalHandoffDocumentRefresh(cwd, lastAssistantMessage);
             if (documentRefreshWarning) {
@@ -1601,6 +2026,7 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     const omxEventName = mapCodexHookEventToOmxEvent(hookEventName);
     let skillState = null;
     let triageAdditionalContext = null;
+    let goalWorkflowAdditionalContext = null;
     const nativeSessionId = safeString(payload.session_id ?? payload.sessionId).trim();
     const threadId = safeString(payload.thread_id ?? payload.threadId).trim();
     const turnId = safeString(payload.turn_id ?? payload.turnId).trim();
@@ -1636,7 +2062,8 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         canonicalSessionId = safeString(currentSessionState?.session_id).trim();
     }
     if (hookEventName === "Stop") {
-        const stopCanonicalSessionId = await resolveInternalSessionIdForPayload(cwd, readPayloadSessionId(payload));
+        const inheritedSessionId = safeString(process.env.OMX_SESSION_ID || process.env.CODEX_SESSION_ID).trim();
+        const stopCanonicalSessionId = await resolveInternalSessionIdForPayload(cwd, readPayloadSessionId(payload) || inheritedSessionId);
         if (stopCanonicalSessionId) {
             canonicalSessionId = stopCanonicalSessionId;
         }
@@ -1648,9 +2075,20 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     const eventSessionId = canonicalSessionId || nativeSessionId || undefined;
     const sessionIdForState = canonicalSessionId || nativeSessionId;
     let outputJson = null;
+    const isSubagentPromptSubmit = hookEventName === "UserPromptSubmit"
+        ? await isNativeSubagentHook(cwd, canonicalSessionId, nativeSessionId, threadId)
+        : false;
+    const isSubagentStop = hookEventName === "Stop"
+        ? (await Promise.all([...new Set([
+                canonicalSessionId,
+                safeString(currentSessionState?.session_id).trim(),
+            ].filter(Boolean))]
+            .map((candidateSessionId) => isNativeSubagentHook(cwd, candidateSessionId, nativeSessionId, threadId)))).some(Boolean)
+        : false;
     if (hookEventName === "UserPromptSubmit") {
         const prompt = readPromptText(payload);
-        if (prompt) {
+        goalWorkflowAdditionalContext = await buildGoalWorkflowReconciliationPromptWarning(cwd, prompt).catch(() => null);
+        if (prompt && !isSubagentPromptSubmit) {
             skillState = buildNativeOutsideTmuxTeamPromptBlockState(prompt, cwd, payload, sessionIdForState, threadId || undefined, turnId || undefined) ?? await recordSkillActivation({
                 stateDir,
                 text: prompt,
@@ -1660,7 +2098,7 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
             });
         }
         // --- Triage classifier (advisory-only, non-keyword prompts) ---
-        if (prompt && skillState === null) {
+        if (prompt && skillState === null && !isSubagentPromptSubmit) {
             try {
                 if (readTriageConfig().enabled) {
                     const normalized = prompt.trim().toLowerCase();
@@ -1752,7 +2190,11 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
             turn_id: turnId || undefined,
             mode: safeString(payload.mode).trim() || undefined,
         });
-        await dispatchHookEvent(event, { cwd });
+        await dispatchHookEventRuntime({
+            event,
+            cwd,
+            allowTeamWorkerSideEffects: false,
+        });
     }
     if ((hookEventName === "SessionStart" && !skipCanonicalSessionStartContext) || hookEventName === "UserPromptSubmit") {
         const additionalContext = hookEventName === "SessionStart"
@@ -1762,7 +2204,9 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
                 canonicalSessionId,
                 nativeSessionId: resolvedNativeSessionId || nativeSessionId,
             })
-            : (buildAdditionalContextMessage(readPromptText(payload), skillState, cwd, payload) ?? triageAdditionalContext);
+            : isSubagentPromptSubmit
+                ? null
+                : (buildAdditionalContextMessage(readPromptText(payload), skillState, cwd, payload) ?? goalWorkflowAdditionalContext ?? triageAdditionalContext);
         if (additionalContext) {
             outputJson = {
                 hookSpecificOutput: {
@@ -1783,7 +2227,9 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         await handleTeamWorkerPostToolUseSuccess(payload, cwd);
     }
     else if (hookEventName === "Stop") {
-        outputJson = await buildStopHookOutput(payload, cwd, stateDir);
+        outputJson = await buildStopHookOutput(payload, cwd, stateDir, {
+            skipRalphStopBlock: isSubagentStop,
+        });
     }
     return {
         hookEventName,