oh-my-codex 0.18.6 → 0.18.8

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

@@ -4,8 +4,9 @@ import { appendFile, mkdir, readFile, readdir, stat, writeFile } from "fs/promis
 import { extname, join, relative, resolve } from "path";
 import { pathToFileURL } from "url";
 import { readModeStateForActiveDecision, readModeStateForSession, updateModeState } from "../modes/base.js";
+import { redactAuthSecrets } from "../auth/redact.js";
 import { SKILL_ACTIVE_STATE_FILE, extractSessionIdFromInitializedStatePath, getSkillActiveStatePathsForStateDir, listActiveSkills, readSkillActiveState, readVisibleSkillActiveStateForStateDir, } from "../state/skill-active.js";
-import { readSubagentSessionSummary, readSubagentTrackingState, recordSubagentTurnForSession, } from "../subagents/tracker.js";
+import { isTrustedSubagentThread, readSubagentSessionSummary, readSubagentTrackingState, recordSubagentTurnForSession, } from "../subagents/tracker.js";
 import { resolveCanonicalTeamStateRoot, resolveWorkerNotifyTeamStateRootPath } from "../team/state-root.js";
 import { appendToLog, isSessionStateUsable, readSessionState, readUsableSessionState, reconcileNativeSessionStart, } from "../hooks/session.js";
 import { appendTeamEvent, readTeamLeaderAttention, readTeamConfig, readTeamManifestV2, readTeamPhase, writeTeamLeaderAttention, writeTeamPhase, } from "../team/state.js";
@@ -14,6 +15,7 @@ import { findGitLayout } from "../utils/git-layout.js";
 import { getBaseStateDir, getStateFilePath, getStatePath } from "../mcp/state-paths.js";
 import { detectKeywords, detectPrimaryKeyword, recordSkillActivation, } from "../hooks/keyword-detector.js";
 import { buildDeepInterviewConfigInstruction } from "../hooks/deep-interview-config-instruction.js";
+import { readTeamModeConfig } from "../config/team-mode.js";
 import { detectNativeStopStallPattern, loadAutoNudgeConfig, normalizeAutoNudgeSignatureText, resolveEffectiveAutoNudgeResponse, } from "./notify-hook/auto-nudge.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";
@@ -36,6 +38,7 @@ import { isPendingDeepInterviewQuestionEnforcement, reconcileDeepInterviewQuesti
 import { readAutopilotDeepInterviewQuestionWaitState } from "../question/autopilot-wait.js";
 import { buildDocumentRefreshAdvisoryOutput, evaluateFinalHandoffDocumentRefresh, isFinalHandoffDocumentRefreshCandidate, } from "../document-refresh/enforcer.js";
 import { buildExecFollowupStopOutput } from "../exec/followup.js";
+import { MAX_NATIVE_STDIN_JSON_BYTES, extractRawCodexHookEventName, } from "./hook-payload-guard.js";
 const TERMINAL_MODE_PHASES = new Set(["complete", "completed", "failed", "cancelled"]);
 const SKILL_STOP_BLOCKERS = new Set(["ralplan"]);
 const TEAM_STOP_BLOCKING_TASK_STATUSES = new Set(["pending", "in_progress", "blocked"]);
@@ -45,6 +48,7 @@ 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 OMX_OWNER_SESSION_ID_PATTERN = /^omx-[A-Za-z0-9_-]{1,60}$/;
 const STABLE_FINAL_RECOMMENDATION_PATTERNS = [
     /^\s*(?:launch|release|ship)-?ready\s*:\s*(?:yes|no)\b[^\n\r]*/im,
     /^\s*ready to release\s*:\s*(?:yes|no)\b[^\n\r]*/im,
@@ -71,6 +75,25 @@ function safeString(value) {
 function safeObject(value) {
     return value && typeof value === "object" ? value : {};
 }
+function resolveHudReconcileSessionId(currentSessionState, canonicalSessionId, sessionIdForState) {
+    const ownerOmxSessionId = safeString(currentSessionState?.owner_omx_session_id).trim();
+    if (OMX_OWNER_SESSION_ID_PATTERN.test(ownerOmxSessionId))
+        return ownerOmxSessionId;
+    return canonicalSessionId || sessionIdForState || undefined;
+}
+function resolveHudReconcileSessionIds(currentSessionState, canonicalSessionId, sessionIdForState, nativeSessionId) {
+    const ownerOmxSessionId = safeString(currentSessionState?.owner_omx_session_id).trim();
+    return uniqueNonEmpty([
+        resolveHudReconcileSessionId(currentSessionState, canonicalSessionId, sessionIdForState),
+        canonicalSessionId ?? undefined,
+        sessionIdForState ?? undefined,
+        nativeSessionId ?? undefined,
+        safeString(currentSessionState?.session_id),
+        safeString(currentSessionState?.native_session_id),
+        OMX_OWNER_SESSION_ID_PATTERN.test(ownerOmxSessionId) ? ownerOmxSessionId : undefined,
+        safeString(currentSessionState?.owner_codex_session_id),
+    ]);
+}
 function safeContextSnippet(value, maxLength = 300) {
     const text = safeString(value).replace(/\s+/g, " ").trim();
     if (text.length <= maxLength)
@@ -134,18 +157,25 @@ function readNativeSubagentSessionStartMetadata(transcriptPath) {
     }
 }
 async function recordNativeSubagentSessionStart(cwd, canonicalSessionId, childSessionId, metadata, transcriptPath) {
+    const parentThreadId = metadata.parentThreadId.trim();
+    const childThreadId = childSessionId.trim();
     const trackingSessionIds = [...new Set([
             canonicalSessionId.trim(),
-            metadata.parentThreadId.trim(),
+            parentThreadId,
         ].filter(Boolean))];
     for (const sessionId of trackingSessionIds) {
+        if (parentThreadId && parentThreadId !== childThreadId) {
+            await recordSubagentTurnForSession(cwd, {
+                sessionId,
+                threadId: parentThreadId,
+                kind: 'leader',
+            }).catch(() => { });
+        }
         await recordSubagentTurnForSession(cwd, {
             sessionId,
-            threadId: metadata.parentThreadId,
-        }).catch(() => { });
-        await recordSubagentTurnForSession(cwd, {
-            sessionId,
-            threadId: childSessionId,
+            threadId: childThreadId,
+            kind: 'subagent',
+            ...(parentThreadId && parentThreadId !== childThreadId ? { leaderThreadId: parentThreadId } : {}),
             mode: metadata.agentRole,
         }).catch(() => { });
     }
@@ -176,17 +206,42 @@ async function nativeSubagentSessionStartBelongsToCanonicalSession(cwd, canonica
         return true;
     return summary.allThreadIds.includes(parentThreadId);
 }
-async function isNativeSubagentHook(cwd, canonicalSessionId, nativeSessionId, threadId) {
-    const candidateIds = [nativeSessionId, threadId]
+async function isNativeSubagentHook(cwd, canonicalSessionId, nativeSessionId, threadId, canonicalLeaderNativeSessionId = "") {
+    const nativeId = nativeSessionId.trim();
+    const promptThreadId = threadId.trim();
+    const candidateIds = [nativeId, promptThreadId]
         .map((value) => value.trim())
         .filter(Boolean);
     if (candidateIds.length === 0)
         return false;
     const sessionId = canonicalSessionId.trim();
-    if (sessionId) {
-        const summary = await readSubagentSessionSummary(cwd, sessionId).catch(() => null);
-        if (summary && candidateIds.some((id) => summary.allSubagentThreadIds.includes(id))) {
-            return true;
+    const currentLeaderNativeSessionId = canonicalLeaderNativeSessionId.trim();
+    const summary = sessionId
+        ? await readSubagentSessionSummary(cwd, sessionId).catch(() => null)
+        : null;
+    const currentLeaderIds = new Set([
+        currentLeaderNativeSessionId,
+        summary?.leaderThreadId?.trim(),
+    ].filter(Boolean));
+    if (summary
+        && candidateIds.some((id) => !currentLeaderIds.has(id) && summary.allSubagentThreadIds.includes(id))) {
+        return true;
+    }
+    // Native UserPromptSubmit can carry a per-turn thread_id that differs from
+    // the long-lived native session id.  Treat the current canonical native
+    // session as the leader before consulting stale/global tracker state.
+    if (sessionId
+        && currentLeaderNativeSessionId
+        && (nativeId === currentLeaderNativeSessionId
+            || (!nativeId && promptThreadId === currentLeaderNativeSessionId))) {
+        return false;
+    }
+    if (summary) {
+        const leaderThreadId = summary.leaderThreadId?.trim();
+        if (leaderThreadId
+            && (nativeId === leaderThreadId
+                || (!nativeId && promptThreadId === leaderThreadId))) {
+            return false;
         }
     }
     // Native Codex resume can report the child native session as the canonical
@@ -199,7 +254,7 @@ async function isNativeSubagentHook(cwd, canonicalSessionId, nativeSessionId, th
     const trackingState = await readSubagentTrackingState(cwd).catch(() => null);
     if (!trackingState)
         return false;
-    return Object.values(trackingState.sessions).some((session) => (candidateIds.some((id) => session.threads[id]?.kind === "subagent")));
+    return Object.values(trackingState.sessions).some((session) => (candidateIds.some((id) => isTrustedSubagentThread(session, id))));
 }
 function shouldSuppressSubagentLifecycleHookDispatch() {
     const config = getNotificationConfig();
@@ -1343,6 +1398,8 @@ function buildTeamHelpInstruction(cwd, payload) {
     }).teamHelpInstruction;
 }
 function buildNativeOutsideTmuxTeamPromptBlockState(prompt, cwd, payload, sessionId, threadId, turnId) {
+    if (!readTeamModeConfig(cwd).enabled)
+        return null;
     const match = detectPrimaryKeyword(prompt);
     if (match?.skill !== "team")
         return null;
@@ -1374,23 +1431,37 @@ function buildNativeOutsideTmuxTeamPromptBlockState(prompt, cwd, payload, sessio
 function buildSkillStateCliInstruction(mode, statePath) {
     return `skill: ${mode} activated and initial state initialized at ${statePath}; use CLI-first state updates via \`omx state write/read/clear --input '<json>' --json\`; use omx_state MCP only when explicit MCP compatibility is enabled.`;
 }
-function buildAutopilotPromptActivationNote(skillState) {
+function buildAutopilotPromptActivationNote(skillState, options = {}) {
     if (skillState?.initialized_mode !== "autopilot")
         return null;
+    const teamHandoff = readTeamModeConfig(options.cwd).enabled
+        ? " (+ $team if needed)"
+        : "";
     return [
-        "Autopilot protocol: the durable default chain is $deep-interview -> $ralplan -> $ultragoal (+ $team if needed) -> $code-review -> $ultraqa (deep-interview -> ralplan -> ultragoal -> code-review -> ultraqa).",
+        `Autopilot protocol: the durable default chain is $deep-interview -> $ralplan -> $ultragoal${teamHandoff} -> $code-review -> $ultraqa (deep-interview -> ralplan -> ultragoal -> code-review -> ultraqa).`,
         "Start/resume at current_phase=deep-interview unless the task is clear and bounded; if deep-interview is intentionally skipped, persist and state an explicit deep_interview_gate.skip_reason before moving to ralplan.",
+        "Deep-interview is a structured question chain, not a one-question gate: after an omx question answer, re-score ambiguity against the active threshold, treat max_rounds as a cap, and crystallize once ambiguity is at or below threshold and readiness gates pass.",
+        options.markedQuestionAnswer
+            ? "This turn is a marked omx question answer. Treat ordinary selected option/freeform answer text as interview input, then re-score. Do not close merely because the first question was answered; if ambiguity is at or below threshold and readiness gates pass, write interview_complete evidence and hand off. Ask another deep-interview follow-up only when a readiness gate remains unresolved and the answer would materially change execution."
+            : null,
+        "Do not advance from deep-interview to ralplan merely because the first question was answered; persist explicit interview_complete evidence before setting current_phase=ralplan, and do advance when threshold plus readiness gates are satisfied.",
         "The ralplan phase is not complete until Planner output has been reviewed sequentially by Architect and then Critic; do not hand off to Ultragoal or implementation until the ralplan state/artifact records both ralplan_architect_review and ralplan_critic_review with approval or an explicit blocker.",
         "Do not silently fall back to ordinary $plan/ralplan-only handling; keep autopilot-state.json, skill-active-state.json, HUD/statusline, and Codex goal-mode handoff guidance visible while the workflow is active.",
         "When Codex goal tools are available, call get_goal/create_goal only from the active thread handoff and treat the active goal as the completion contract until code-review and ultraqa are clean.",
-    ].join(" ");
+    ].filter(Boolean).join(" ");
+}
+function formatExecutionHandoffList(cwd) {
+    return readTeamModeConfig(cwd).enabled
+        ? "`$ultragoal`, `$team`, or `$ralph`"
+        : "`$ultragoal` or `$ralph`";
 }
 function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(), payload) {
     if (!prompt)
         return null;
     const promptPriorityMessage = buildPromptPriorityMessage(prompt);
-    const matches = detectKeywords(prompt);
-    const match = detectPrimaryKeyword(prompt);
+    const teamMode = readTeamModeConfig(cwd);
+    const matches = detectKeywords(prompt).filter((entry) => teamMode.enabled || entry.skill !== "team");
+    const match = matches[0] ?? null;
     if (!match) {
         const continuedSkill = safeString(skillState?.skill).trim();
         if (!continuedSkill)
@@ -1399,6 +1470,8 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             ? buildDeepInterviewQuestionBridgeInstruction(cwd, payload)
             : null;
         const deepInterviewConfigPromptActivationNote = buildDeepInterviewConfigInstruction(cwd, skillState);
+        const markedQuestionAnswer = /^\s*\[omx question answered\]/i.test(prompt);
+        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer, cwd });
         return [
             `OMX native UserPromptSubmit continued active workflow skill "${continuedSkill}".`,
             promptPriorityMessage,
@@ -1407,12 +1480,34 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
                 : null,
             deepInterviewPromptActivationNote,
             deepInterviewConfigPromptActivationNote,
+            autopilotPromptActivationNote,
             "Follow AGENTS.md routing and preserve workflow transition and planning-safety rules.",
         ].filter(Boolean).join(" ");
     }
     const detectedKeywordMessage = matches.length > 1
         ? `OMX native UserPromptSubmit detected workflow keywords ${matches.map((entry) => `"${entry.keyword}" -> ${entry.skill}`).join(", ")}.`
         : `OMX native UserPromptSubmit detected workflow keyword "${match.keyword}" -> ${match.skill}.`;
+    const continuedSkill = safeString(skillState?.skill).trim();
+    if (continuedSkill
+        && continuedSkill !== match.skill
+        && /^\s*\[omx question answered\]/i.test(prompt)) {
+        const deepInterviewPromptActivationNote = skillState?.initialized_mode === "deep-interview"
+            ? buildDeepInterviewQuestionBridgeInstruction(cwd, payload)
+            : null;
+        const deepInterviewConfigPromptActivationNote = buildDeepInterviewConfigInstruction(cwd, skillState);
+        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer: true, cwd });
+        return [
+            `OMX native UserPromptSubmit continued active workflow skill "${continuedSkill}"; workflow-like tokens inside the marked omx question answer are treated as answer text, not a new workflow activation.`,
+            promptPriorityMessage,
+            skillState?.initialized_mode && skillState.initialized_state_path
+                ? buildSkillStateCliInstruction(skillState.initialized_mode, skillState.initialized_state_path)
+                : null,
+            deepInterviewPromptActivationNote,
+            deepInterviewConfigPromptActivationNote,
+            autopilotPromptActivationNote,
+            "Follow AGENTS.md routing and preserve workflow transition and planning-safety rules.",
+        ].filter(Boolean).join(" ");
+    }
     const activeSkills = Array.isArray(skillState?.active_skills)
         ? skillState.active_skills.map((entry) => entry.skill)
         : [];
@@ -1433,7 +1528,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
     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. Ultragoal does not call `/goal clear`; for multiple sequential ultragoal runs in one Codex session/thread, manually clear the completed Codex goal in the UI before creating the next aggregate goal."
         : null;
-    const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState);
+    const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { cwd });
     const combinedTransitionMessage = (() => {
         if (!skillState?.transition_message)
             return null;
@@ -1942,8 +2037,10 @@ function readPayloadThreadId(payload) {
 function readPayloadTurnId(payload) {
     return safeString(payload.turn_id ?? payload.turnId).trim();
 }
-async function resolveInternalSessionIdForPayload(cwd, payloadSessionId) {
-    const currentSession = await readUsableSessionState(cwd);
+async function resolveInternalSessionIdForPayload(cwd, payloadSessionId, stateDir) {
+    const currentSession = stateDir
+        ? await readUsableSessionStateFromStateDir(cwd, stateDir)
+        : await readUsableSessionState(cwd);
     const canonicalSessionId = safeString(currentSession?.session_id).trim();
     if (!canonicalSessionId)
         return payloadSessionId;
@@ -1956,6 +2053,19 @@ async function resolveInternalSessionIdForPayload(cwd, payloadSessionId) {
         return canonicalSessionId;
     return payloadSessionId;
 }
+async function readUsableSessionStateFromStateDir(cwd, stateDir) {
+    const sessionPath = join(stateDir, "session.json");
+    if (!existsSync(sessionPath))
+        return null;
+    try {
+        const content = await readFile(sessionPath, "utf-8");
+        const state = JSON.parse(content);
+        return isSessionStateUsable(state, cwd) ? state : null;
+    }
+    catch {
+        return null;
+    }
+}
 async function readStopSessionPinnedState(fileName, cwd, sessionId, stateDir) {
     const statePath = stateDir && sessionId
         ? join(stateDir, "sessions", sessionId, fileName)
@@ -1968,13 +2078,31 @@ const DEEP_INTERVIEW_ALLOWED_WRITE_PREFIXES = [
     ".omx/specs",
     ".omx/state",
 ];
-const DEEP_INTERVIEW_IMPLEMENTATION_TOOL_NAMES = new Set([
+const RALPLAN_ALLOWED_WRITE_PREFIXES = [
+    ".omx/context",
+    ".omx/plans",
+    ".omx/specs",
+    ".omx/state",
+];
+const PLANNING_MODE_IMPLEMENTATION_TOOL_NAMES = new Set([
     "Write",
     "Edit",
     "MultiEdit",
+    "NotebookEdit",
     "apply_patch",
     "ApplyPatch",
 ]);
+const DEEP_INTERVIEW_IMPLEMENTATION_TOOL_NAMES = PLANNING_MODE_IMPLEMENTATION_TOOL_NAMES;
+const RALPLAN_EXECUTION_HANDOFF_SKILLS = new Set([
+    // Autopilot is intentionally excluded: it supervises planning phases such as
+    // ralplan/replan and is not by itself an execution authorization.
+    "autoresearch",
+    "ralph",
+    "team",
+    "ultragoal",
+    "ultrawork",
+    "ultraqa",
+]);
 function isActiveDeepInterviewPhase(state) {
     if (!state || state.active !== true)
         return false;
@@ -1986,7 +2114,31 @@ function isActiveDeepInterviewPhase(state) {
         return false;
     return true;
 }
-function isAllowedDeepInterviewArtifactPath(cwd, rawPath) {
+function isActiveRalplanPhase(state) {
+    if (!state || state.active !== true)
+        return false;
+    const mode = safeString(state.mode).trim();
+    if (mode && mode !== "ralplan")
+        return false;
+    const phase = safeString(state.current_phase ?? state.currentPhase).trim().toLowerCase();
+    if (phase && (TERMINAL_MODE_PHASES.has(phase) || phase === "completing"))
+        return false;
+    return true;
+}
+function isActiveAutopilotRalplanPhase(state) {
+    if (!state || state.active !== true)
+        return false;
+    const mode = safeString(state.mode).trim();
+    if (mode && mode !== "autopilot")
+        return false;
+    const phase = safeString(state.current_phase ?? state.currentPhase).trim().toLowerCase();
+    return phase === "ralplan" || phase === "replan" || phase === "autopilot:replan";
+}
+function hasExplicitExecutionHandoffSkill(state, sessionId, threadId) {
+    return listActiveSkills(state ?? {}).some((entry) => (RALPLAN_EXECUTION_HANDOFF_SKILLS.has(entry.skill)
+        && matchesSkillStopContext(entry, state ?? {}, sessionId, threadId)));
+}
+function isAllowedPlanningArtifactPath(cwd, rawPath, allowedPrefixes) {
     const trimmed = rawPath.trim().replace(/^['"]|['"]$/g, "");
     if (!trimmed || trimmed.includes("\0"))
         return false;
@@ -2000,7 +2152,13 @@ function isAllowedDeepInterviewArtifactPath(cwd, rawPath) {
     }
     if (!relativePath || relativePath.startsWith("..") || relativePath.startsWith("/"))
         return false;
-    return DEEP_INTERVIEW_ALLOWED_WRITE_PREFIXES.some((prefix) => (relativePath === prefix || relativePath.startsWith(`${prefix}/`)));
+    return allowedPrefixes.some((prefix) => (relativePath === prefix || relativePath.startsWith(`${prefix}/`)));
+}
+function isAllowedDeepInterviewArtifactPath(cwd, rawPath) {
+    return isAllowedPlanningArtifactPath(cwd, rawPath, DEEP_INTERVIEW_ALLOWED_WRITE_PREFIXES);
+}
+function isAllowedRalplanArtifactPath(cwd, rawPath) {
+    return isAllowedPlanningArtifactPath(cwd, rawPath, RALPLAN_ALLOWED_WRITE_PREFIXES);
 }
 function readPreToolUseCommand(payload) {
     const toolInput = safeObject(payload.tool_input);
@@ -2059,13 +2217,91 @@ async function readActiveDeepInterviewStateForPreToolUse(cwd, stateDir, sessionI
         ? await readVisibleSkillActiveStateForStateDir(stateDir, sessionId)
         : await readSkillActiveState(join(stateDir, SKILL_ACTIVE_STATE_FILE));
     if (!canonicalState)
-        return modeState;
+        return null;
     const hasActiveDeepInterviewSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "deep-interview"
         && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
     return hasActiveDeepInterviewSkill ? modeState : null;
 }
-async function buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir) {
-    const sessionId = readPayloadSessionId(payload);
+async function readActiveRalplanStateForPreToolUse(cwd, stateDir, sessionId, threadId) {
+    const modeState = sessionId
+        ? await readStopSessionPinnedState("ralplan-state.json", cwd, sessionId, stateDir)
+        : await readJsonIfExists(join(stateDir, "ralplan-state.json"));
+    const canonicalState = sessionId
+        ? await readVisibleSkillActiveStateForStateDir(stateDir, sessionId)
+        : await readSkillActiveState(join(stateDir, SKILL_ACTIVE_STATE_FILE));
+    if (isActiveRalplanPhase(modeState) && modeState && modeStateMatchesSkillStopContext(modeState, cwd, sessionId)) {
+        if (hasExplicitExecutionHandoffSkill(canonicalState, sessionId, threadId))
+            return null;
+        if (!canonicalState)
+            return null;
+        const hasActiveRalplanSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "ralplan"
+            && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
+        if (hasActiveRalplanSkill)
+            return modeState;
+    }
+    const autopilotState = sessionId
+        ? await readStopSessionPinnedState("autopilot-state.json", cwd, sessionId, stateDir)
+        : await readJsonIfExists(join(stateDir, "autopilot-state.json"));
+    if (!isActiveAutopilotRalplanPhase(autopilotState) || !autopilotState)
+        return null;
+    if (!modeStateMatchesSkillStopContext(autopilotState, cwd, sessionId))
+        return null;
+    const terminalAutopilotRunState = await readCanonicalTerminalRunStateForStop(cwd, sessionId, "autopilot");
+    if (terminalAutopilotRunState)
+        return null;
+    if (!canonicalState)
+        return null;
+    const hasActiveAutopilotSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "autopilot"
+        && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
+    return hasActiveAutopilotSkill ? autopilotState : null;
+}
+function isAllowedRalplanBashWrite(cwd, command) {
+    if (!commandHasDeepInterviewWriteIntent(command))
+        return true;
+    if (/\bomx\s+(?:state\s+(?:write|read|clear)|question)\b/.test(command))
+        return true;
+    const targets = extractDeepInterviewCommandWriteTargets(command);
+    return targets.length > 0 && targets.every((target) => isAllowedRalplanArtifactPath(cwd, target));
+}
+async function buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir, resolvedSessionId) {
+    const sessionId = safeString(resolvedSessionId ?? readPayloadSessionId(payload)).trim();
+    const threadId = readPayloadThreadId(payload);
+    const activeState = await readActiveRalplanStateForPreToolUse(cwd, stateDir, sessionId, threadId);
+    if (!activeState)
+        return null;
+    const toolName = safeString(payload.tool_name).trim();
+    const command = readPreToolUseCommand(payload);
+    const pathCandidates = readPreToolUsePathCandidates(payload);
+    let blocked = false;
+    if (toolName === "Bash") {
+        blocked = !isAllowedRalplanBashWrite(cwd, command);
+    }
+    else if (PLANNING_MODE_IMPLEMENTATION_TOOL_NAMES.has(toolName)) {
+        blocked = pathCandidates.length === 0
+            || !pathCandidates.every((candidate) => isAllowedRalplanArtifactPath(cwd, candidate));
+    }
+    if (!blocked)
+        return null;
+    const phase = formatPhase(activeState.current_phase ?? activeState.currentPhase, "planning");
+    const activeMode = safeString(activeState.mode).trim().toLowerCase();
+    const planningModeLabel = activeMode === "autopilot" ? "Autopilot planning" : "Ralplan";
+    const planningModeDescription = activeMode === "autopilot"
+        ? "Autopilot is supervising a planning phase"
+        : "Ralplan is consensus-planning mode";
+    return {
+        decision: "block",
+        reason: `${planningModeLabel} is active (phase: ${phase}); implementation/write tools are blocked until an explicit execution handoff workflow is activated.`,
+        hookSpecificOutput: {
+            hookEventName: "PreToolUse",
+            additionalContext: `${planningModeDescription}. `
+                + "Write only planning artifacts under `.omx/context/`, `.omx/plans/`, `.omx/specs/`, or required `.omx/state/` files. "
+                + "Do not edit implementation files or run implementation-focused writes from planning phases. "
+                + `To execute, first process an explicit handoff such as ${formatExecutionHandoffList(cwd)}, which must emit terminal planning state before implementation begins.`,
+        },
+    };
+}
+async function buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir, resolvedSessionId) {
+    const sessionId = safeString(resolvedSessionId ?? readPayloadSessionId(payload)).trim();
     const threadId = readPayloadThreadId(payload);
     const activeState = await readActiveDeepInterviewStateForPreToolUse(cwd, stateDir, sessionId, threadId);
     if (!activeState)
@@ -2089,7 +2325,7 @@ async function buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir
         reason: `Deep-interview is active (phase: ${phase}); implementation/write tools are blocked until an explicit handoff workflow is activated.`,
         hookSpecificOutput: {
             hookEventName: "PreToolUse",
-            additionalContext: "Deep-interview is requirements/spec mode. Treat detailed user answers as interview/spec material, not implicit implementation authorization. You may write only deep-interview artifacts under `.omx/context/`, `.omx/interviews/`, `.omx/specs/`, or required `.omx/state/` files. To implement, first ask for or process an explicit transition such as `$ralplan`, `$autopilot`, `$ralph`, `$team`, or `$ultragoal`.",
+            additionalContext: `Deep-interview is requirements/spec mode. Treat detailed user answers as interview/spec material, not implicit implementation authorization. You may write only deep-interview artifacts under \`.omx/context/\`, \`.omx/interviews/\`, \`.omx/specs/\`, or required \`.omx/state/\` files. To implement, first ask for or process an explicit transition such as \`$ralplan\`, \`$autopilot\`, ${formatExecutionHandoffList(cwd)}.`,
         },
     };
 }
@@ -2278,7 +2514,7 @@ async function reconcileStaleRootSkillActiveStateForStop(cwd, stateDir, sessionI
     }
     await writeFile(rootPath, JSON.stringify(nextRoot, null, 2));
 }
-function buildRalplanContinuationStatus(blocker, activeSubagentCount) {
+function buildRalplanContinuationStatus(blocker, activeSubagentCount, cwd) {
     const phase = blocker.phase || "planning";
     const artifact = blocker.latestPlanPath
         ? ` Artifact: ${blocker.latestPlanPath}.`
@@ -2304,12 +2540,12 @@ function buildRalplanContinuationStatus(blocker, activeSubagentCount) {
         };
     }
     const completeHint = blocker.planningComplete
-        ? " The planning artifacts are present; if consensus is approved, emit the final complete/approved handoff instead of stopping here."
+        ? ` The planning artifacts are present; if consensus is approved, emit terminal ralplan complete/approved handoff state and stop planning. Implementation must wait for an explicit ${formatExecutionHandoffList(cwd).replaceAll("`", "")} handoff.`
         : "";
     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}`,
+        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; do not begin implementation from ralplan.${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.`,
+        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; do not begin implementation from ralplan.`,
     };
 }
 async function readStopAutoNudgePhase(cwd, stateDir, sessionId, threadId) {
@@ -2463,6 +2699,9 @@ function readIsoTimeMs(value) {
     return Number.isFinite(parsed) ? parsed : null;
 }
 async function maybeBuildOrdinaryStopNoProgressOutput(payload, stateDir, canonicalSessionId) {
+    const lastAssistantMessage = safeString(payload.last_assistant_message ?? payload.lastAssistantMessage).trim();
+    if (!lastAssistantMessage)
+        return null;
     const statePath = join(stateDir, NATIVE_STOP_STATE_FILE);
     const state = await readJsonIfExists(statePath) ?? {};
     const sessions = safeObject(state.sessions);
@@ -2492,9 +2731,6 @@ async function maybeBuildOrdinaryStopNoProgressOutput(payload, stateDir, canonic
     };
     await mkdir(stateDir, { recursive: true });
     await writeFile(statePath, JSON.stringify({ ...state, sessions }, null, 2));
-    const stopHookActive = payload.stop_hook_active === true || payload.stopHookActive === true;
-    if (!stopHookActive)
-        return null;
     const maxRepeats = parseBoundedPositiveInteger(process.env.OMX_NATIVE_STOP_NO_PROGRESS_MAX_REPEATS, ORDINARY_STOP_NO_PROGRESS_DEFAULT_MAX_REPEATS);
     const idleMs = parseBoundedNonNegativeInteger(process.env.OMX_NATIVE_STOP_NO_PROGRESS_IDLE_MS, ORDINARY_STOP_NO_PROGRESS_DEFAULT_IDLE_MS);
     const firstSeenMs = readIsoTimeMs(firstSeenAt) ?? Date.now();
@@ -2624,7 +2860,7 @@ async function buildSkillStopOutput(cwd, stateDir, sessionId, threadId) {
     const subagentSummary = await readSubagentSessionSummary(cwd, sessionId).catch(() => null);
     const activeSubagentCount = subagentSummary?.activeSubagentThreadIds.length ?? 0;
     if (blocker.skill === "ralplan") {
-        const status = buildRalplanContinuationStatus(blocker, activeSubagentCount);
+        const status = buildRalplanContinuationStatus(blocker, activeSubagentCount, cwd);
         return {
             decision: "block",
             reason: status.reason,
@@ -2878,10 +3114,20 @@ async function buildStopHookOutput(payload, cwd, stateDir, options = {}) {
 export async function dispatchCodexNativeHook(payload, options = {}) {
     const hookEventName = readHookEventName(payload);
     const cwd = options.cwd ?? (safeString(payload.cwd).trim() || process.cwd());
+    if (hookEventName === "Stop" && !hasNativeStopRuntimeSurface(cwd)) {
+        return {
+            hookEventName,
+            omxEventName: mapCodexHookEventToOmxEvent(hookEventName),
+            skillState: null,
+            outputJson: null,
+        };
+    }
     // Native hooks must use the same authoritative runtime state root as HUD/MCP
     // when boxed/team roots are active; do not bypass it with cwd/.omx/state.
     const stateDir = getBaseStateDir(cwd);
-    await mkdir(stateDir, { recursive: true });
+    if (hookEventName !== "Stop") {
+        await mkdir(stateDir, { recursive: true });
+    }
     const omxEventName = mapCodexHookEventToOmxEvent(hookEventName);
     let skillState = null;
     let triageAdditionalContext = null;
@@ -2938,14 +3184,16 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     const sessionIdForState = canonicalSessionId || nativeSessionId;
     let outputJson = null;
     const isSubagentPromptSubmit = hookEventName === "UserPromptSubmit"
-        ? await isNativeSubagentHook(cwd, canonicalSessionId, nativeSessionId, threadId)
+        ? await isNativeSubagentHook(cwd, canonicalSessionId, nativeSessionId, threadId, safeString(currentSessionState?.native_session_id).trim())
         : 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)
+            .map((candidateSessionId) => isNativeSubagentHook(cwd, candidateSessionId, nativeSessionId, threadId, candidateSessionId === safeString(currentSessionState?.session_id).trim()
+            ? safeString(currentSessionState?.native_session_id).trim()
+            : "")))).some(Boolean)
         : false;
     const suppressNoisySubagentLifecycleDispatch = (isSubagentSessionStart || isSubagentStop)
         && shouldSuppressSubagentLifecycleHookDispatch();
@@ -3040,11 +3288,14 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
                 triageAdditionalContext = null;
             }
         }
+        const skipHudReconcileForDoctorSmoke = process.env.OMX_NATIVE_HOOK_DOCTOR_SMOKE === "1";
         const skipHudReconcileForTeamWorkerPane = !isSubagentPromptSubmit
             && await isConfirmedTeamWorkerPromptSubmitPane(cwd).catch(() => false);
-        if (!skipHudReconcileForTeamWorkerPane) {
+        if (!skipHudReconcileForDoctorSmoke && !skipHudReconcileForTeamWorkerPane) {
             const reconcileHudForPromptSubmitFn = options.reconcileHudForPromptSubmitFn ?? reconcileHudForPromptSubmit;
-            await reconcileHudForPromptSubmitFn(cwd, { sessionId: canonicalSessionId || sessionIdForState || undefined }).catch(() => { });
+            const hudSessionId = resolveHudReconcileSessionId(currentSessionState, canonicalSessionId, sessionIdForState);
+            const hudSessionIds = resolveHudReconcileSessionIds(currentSessionState, canonicalSessionId, sessionIdForState, nativeSessionId);
+            await reconcileHudForPromptSubmitFn(cwd, { sessionId: hudSessionId, sessionIds: hudSessionIds }).catch(() => { });
         }
     }
     if (omxEventName && !skipCanonicalSessionStartContext && !suppressNoisySubagentLifecycleDispatch) {
@@ -3100,7 +3351,12 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         }
     }
     else if (hookEventName === "PreToolUse") {
-        outputJson = await buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir)
+        const payloadSessionId = readPayloadSessionId(payload);
+        const preToolUseSessionId = payloadSessionId
+            ? await resolveInternalSessionIdForPayload(cwd, payloadSessionId, stateDir)
+            : "";
+        outputJson = await buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir, preToolUseSessionId)
+            ?? await buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir, preToolUseSessionId)
             ?? buildNativePreToolUseOutput(payload);
     }
     else if (hookEventName === "PostToolUse") {
@@ -3122,6 +3378,28 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         outputJson,
     };
 }
+function hasNativeStopRuntimeSurface(cwd) {
+    if (existsSync(join(cwd, ".omx")))
+        return true;
+    if (findGitLayout(cwd))
+        return true;
+    const omxRoot = safeString(process.env.OMX_ROOT).trim();
+    if (omxRoot && existsSync(join(omxRoot, ".omx")))
+        return true;
+    const stateRoot = safeString(process.env.OMX_STATE_ROOT).trim();
+    if (stateRoot && existsSync(stateRoot))
+        return true;
+    return [
+        process.env.OMX_SESSION_ID,
+        process.env.OMX_TEAM_INTERNAL_WORKER,
+        process.env.OMX_TEAM_WORKER,
+        process.env.OMX_TEAM_STATE_ROOT,
+        process.env.OMX_TEAM_LEADER_CWD,
+        process.env.OMX_NOTIFY_HOOK_TRUSTED_MANAGED_CWD,
+        process.env.OMX_TMUX_HUD_OWNER,
+        process.env.OMX_TMUX_HUD_LEADER_PANE,
+    ].some((value) => safeString(value).trim() !== "");
+}
 export function isCodexNativeHookMainModule(moduleUrl, argv1) {
     if (!argv1)
         return false;
@@ -3129,30 +3407,129 @@ export function isCodexNativeHookMainModule(moduleUrl, argv1) {
 }
 async function readStdinJson() {
     const chunks = [];
+    let totalBytes = 0;
+    let oversized = false;
     for await (const chunk of process.stdin) {
-        chunks.push(Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk)));
+        const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk));
+        totalBytes += buffer.byteLength;
+        if (totalBytes > MAX_NATIVE_STDIN_JSON_BYTES) {
+            const remaining = Math.max(0, MAX_NATIVE_STDIN_JSON_BYTES - (totalBytes - buffer.byteLength));
+            if (remaining > 0)
+                chunks.push(Buffer.from(buffer.subarray(0, remaining)));
+            oversized = true;
+            process.stdin.destroy();
+            break;
+        }
+        chunks.push(buffer);
     }
     const raw = Buffer.concat(chunks).toString("utf-8").trim();
+    const rawHookEventName = extractRawCodexHookEventName(raw);
+    if (oversized) {
+        return {
+            payload: {},
+            parseError: null,
+            rawInput: raw,
+            oversized: true,
+            rawHookEventName,
+        };
+    }
     if (!raw) {
-        return { payload: {}, parseError: null };
+        return { payload: {}, parseError: null, rawInput: raw, oversized: false, rawHookEventName };
     }
     try {
         return {
             payload: safeObject(JSON.parse(raw)),
             parseError: null,
+            rawInput: raw,
+            oversized: false,
+            rawHookEventName,
         };
     }
     catch (error) {
         return {
             payload: {},
             parseError: error instanceof Error ? error : new Error(String(error)),
+            rawInput: raw,
+            oversized: false,
+            rawHookEventName,
         };
     }
 }
+function inferHookEventNameFromMalformedInput(raw) {
+    const match = raw.match(/(?:\"|['"])?hook[_-]?event[_-]?name(?:\"|['"])?\s*:\s*(?:\"|['"])?(SessionStart|PreToolUse|PostToolUse|UserPromptSubmit|PreCompact|PostCompact|Stop)\b/i);
+    const value = match?.[1];
+    if (!value)
+        return null;
+    return readHookEventName({ hook_event_name: value });
+}
+function buildMalformedStdinHookOutput(parseError, rawInput) {
+    const reason = "OMX native hook received malformed JSON input. Preserve runtime state, inspect the emitting hook payload yourself, and retry with valid JSON.";
+    const systemMessage = `${reason} stdin JSON parsing failed inside codex-native-hook: ${parseError.message}.`;
+    if (inferHookEventNameFromMalformedInput(rawInput) === "Stop") {
+        return {
+            decision: "block",
+            reason,
+            stopReason: "native_hook_stdin_parse_error",
+            systemMessage,
+        };
+    }
+    return {
+        continue: false,
+        stopReason: "native_hook_stdin_parse_error",
+        systemMessage,
+    };
+}
+async function buildOversizedStopActiveWorkflowOutput(cwd) {
+    const currentSession = await readUsableSessionState(cwd);
+    const currentSessionId = safeString(currentSession?.session_id).trim()
+        || safeString(process.env.OMX_SESSION_ID || process.env.CODEX_SESSION_ID).trim();
+    if (!currentSessionId)
+        return null;
+    if (await readCanonicalTerminalRunStateForStop(cwd, currentSessionId, "autopilot"))
+        return null;
+    const autopilotState = await readModeStateForActiveDecision("autopilot", currentSessionId, cwd);
+    if (!autopilotState || !shouldContinueRun(autopilotState))
+        return null;
+    const phase = formatPhase(autopilotState.current_phase);
+    const reason = `OMX native Stop received oversized stdin before parsing while the current session has active OMX autopilot state (phase: ${phase}); continue once with a compact response or reduce hook payload size so normal Stop gates can run.`;
+    return {
+        decision: "block",
+        reason,
+        stopReason: "native_stop_stdin_oversized_active_workflow",
+        systemMessage: "OMX native Stop rejected oversized stdin before parsing; active current-session workflow state is present, so Stop is blocked instead of silently allowing termination.",
+    };
+}
+async function buildOversizedStdinHookOutput(rawHookEventName, cwd) {
+    if (rawHookEventName === "Stop") {
+        return await buildOversizedStopActiveWorkflowOutput(cwd) ?? {};
+    }
+    const systemMessage = `OMX native hook rejected oversized stdin JSON before parsing; maxBytes=${MAX_NATIVE_STDIN_JSON_BYTES}.`;
+    return {
+        continue: false,
+        stopReason: "native_hook_stdin_oversized",
+        systemMessage,
+    };
+}
 function writeNativeHookJsonStdout(output) {
     process.stdout.write(`${JSON.stringify(output)}\n`);
 }
-async function logNativeHookCliError(cwd, type, error, payload = {}) {
+function redactMalformedHookPreview(rawInput) {
+    const withoutControls = rawInput.replace(/[\u0000-\u001f\u007f-\u009f]/g, "");
+    const withoutAuthSecrets = redactAuthSecrets(withoutControls);
+    return withoutAuthSecrets
+        .replace(/(["']?(?:prompt|user_prompt|input|text)["']?\s*:\s*)(["'])(?:\\.|(?!\2)[^\\])*\2/gi, "$1$2[REDACTED]$2")
+        .replace(/(["']?(?:prompt|user_prompt|input|text)["']?\s*:\s*)(["'])(?:\\.|[^\\])*$/gi, "$1$2[REDACTED]$2")
+        .replace(/(["']?(?:prompt|user_prompt|input|text)["']?\s*:\s*)(?!["'])[^,}]*/gi, "$1[REDACTED]");
+}
+function buildRawInputLogFields(rawInput) {
+    if (!rawInput)
+        return {};
+    return {
+        raw_input_length: Buffer.byteLength(rawInput, "utf-8"),
+        raw_input_prefix: redactMalformedHookPreview(rawInput).slice(0, 240),
+    };
+}
+async function logNativeHookCliError(cwd, type, error, payload = {}, details = {}) {
     const logsDir = join(cwd || process.cwd(), ".omx", "logs");
     await mkdir(logsDir, { recursive: true }).catch(() => { });
     const logPath = join(logsDir, `native-hook-${new Date().toISOString().split("T")[0]}.jsonl`);
@@ -3164,6 +3541,7 @@ async function logNativeHookCliError(cwd, type, error, payload = {}) {
         thread_id: readPayloadThreadId(payload) || undefined,
         turn_id: readPayloadTurnId(payload) || undefined,
         error: error instanceof Error ? error.message : String(error),
+        ...details,
     }) + "\n").catch(() => { });
 }
 function isStopDispatchFailureTestTrigger(payload) {
@@ -3186,17 +3564,14 @@ function buildStopDispatchFailureOutput(error) {
     };
 }
 export async function runCodexNativeHookCli() {
-    const { payload, parseError } = await readStdinJson();
+    const { payload, parseError, rawInput, oversized, rawHookEventName } = await readStdinJson();
+    if (oversized) {
+        writeNativeHookJsonStdout(await buildOversizedStdinHookOutput(rawHookEventName, process.cwd()));
+        return;
+    }
     if (parseError) {
-        await logNativeHookCliError(process.cwd(), "native_hook_stdin_parse_error", parseError);
-        writeNativeHookJsonStdout({
-            decision: "block",
-            reason: "OMX native hook received malformed JSON input. Preserve runtime state, inspect the emitting hook payload yourself, and retry with valid JSON.",
-            hookSpecificOutput: {
-                hookEventName: "Unknown",
-                additionalContext: `stdin JSON parsing failed inside codex-native-hook: ${parseError.message}. Emit valid JSON from the native hook caller before retrying.`,
-            },
-        });
+        await logNativeHookCliError(process.cwd(), "native_hook_stdin_parse_error", parseError, {}, buildRawInputLogFields(rawInput));
+        writeNativeHookJsonStdout(buildMalformedStdinHookOutput(parseError, rawInput));
         return;
     }
     try {