oh-my-codex 0.18.7 → 0.18.9

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

@@ -15,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";
@@ -26,6 +27,7 @@ import { getNotificationConfig, getVerbosity } from "../notifications/config.js"
 import { reconcileHudForPromptSubmit } from "../hud/reconcile.js";
 import { onPreCompact as buildWikiPreCompactContext, onSessionStart as buildWikiSessionStartContext, } from "../wiki/lifecycle.js";
 import { readAutoresearchCompletionStatus, readAutoresearchModeStateForActiveDecision } from "../autoresearch/skill-validation.js";
+import { normalizeAutopilotPhase } from "../autopilot/fsm.js";
 import { readRunState } from "../runtime/run-state.js";
 import { evaluateRalphCompletionAuditEvidence, isRalphCompletePhase } from "../ralph/completion-audit.js";
 import { getRunContinuationSnapshot, shouldContinueRun } from "../runtime/run-loop.js";
@@ -80,6 +82,19 @@ function resolveHudReconcileSessionId(currentSessionState, canonicalSessionId, s
         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)
@@ -1384,6 +1399,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;
@@ -1418,8 +1435,11 @@ function buildSkillStateCliInstruction(mode, statePath) {
 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
@@ -1431,12 +1451,18 @@ function buildAutopilotPromptActivationNote(skillState, options = {}) {
         "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.",
     ].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)
@@ -1446,7 +1472,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             : null;
         const deepInterviewConfigPromptActivationNote = buildDeepInterviewConfigInstruction(cwd, skillState);
         const markedQuestionAnswer = /^\s*\[omx question answered\]/i.test(prompt);
-        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer });
+        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer, cwd });
         return [
             `OMX native UserPromptSubmit continued active workflow skill "${continuedSkill}".`,
             promptPriorityMessage,
@@ -1470,7 +1496,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             ? buildDeepInterviewQuestionBridgeInstruction(cwd, payload)
             : null;
         const deepInterviewConfigPromptActivationNote = buildDeepInterviewConfigInstruction(cwd, skillState);
-        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer: true });
+        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,
@@ -1503,7 +1529,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;
@@ -2012,8 +2038,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;
@@ -2026,6 +2054,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)
@@ -2054,7 +2095,8 @@ const PLANNING_MODE_IMPLEMENTATION_TOOL_NAMES = new Set([
 ]);
 const DEEP_INTERVIEW_IMPLEMENTATION_TOOL_NAMES = PLANNING_MODE_IMPLEMENTATION_TOOL_NAMES;
 const RALPLAN_EXECUTION_HANDOFF_SKILLS = new Set([
-    "autopilot",
+    // Autopilot is intentionally excluded: it supervises planning phases such as
+    // ralplan/replan and is not by itself an execution authorization.
     "autoresearch",
     "ralph",
     "team",
@@ -2084,14 +2126,11 @@ function isActiveRalplanPhase(state) {
         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";
+function isAutopilotRalplanLikePhase(phase) {
+    return normalizeAutopilotPhase(phase) === "ralplan";
+}
+function canAutopilotSkillMirrorSupplyRalplanPhase(phase) {
+    return phase === "" || normalizeAutopilotPhase(phase) === "ralplan";
 }
 function hasExplicitExecutionHandoffSkill(state, sessionId, threadId) {
     return listActiveSkills(state ?? {}).some((entry) => (RALPLAN_EXECUTION_HANDOFF_SKILLS.has(entry.skill)
@@ -2176,7 +2215,7 @@ 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;
@@ -2192,7 +2231,7 @@ async function readActiveRalplanStateForPreToolUse(cwd, stateDir, sessionId, thr
         if (hasExplicitExecutionHandoffSkill(canonicalState, sessionId, threadId))
             return null;
         if (!canonicalState)
-            return modeState;
+            return null;
         const hasActiveRalplanSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "ralplan"
             && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
         if (hasActiveRalplanSkill)
@@ -2201,7 +2240,10 @@ async function readActiveRalplanStateForPreToolUse(cwd, stateDir, sessionId, thr
     const autopilotState = sessionId
         ? await readStopSessionPinnedState("autopilot-state.json", cwd, sessionId, stateDir)
         : await readJsonIfExists(join(stateDir, "autopilot-state.json"));
-    if (!isActiveAutopilotRalplanPhase(autopilotState) || !autopilotState)
+    if (!autopilotState || autopilotState.active !== true)
+        return null;
+    const autopilotMode = safeString(autopilotState.mode).trim();
+    if (autopilotMode && autopilotMode !== "autopilot")
         return null;
     if (!modeStateMatchesSkillStopContext(autopilotState, cwd, sessionId))
         return null;
@@ -2209,9 +2251,19 @@ async function readActiveRalplanStateForPreToolUse(cwd, stateDir, sessionId, thr
     if (terminalAutopilotRunState)
         return null;
     if (!canonicalState)
-        return autopilotState;
+        return null;
     const hasActiveAutopilotSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "autopilot"
         && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
+    if (!hasActiveAutopilotSkill)
+        return null;
+    const autopilotStatePhase = safeString(autopilotState.current_phase ?? autopilotState.currentPhase).trim().toLowerCase();
+    if (!canAutopilotSkillMirrorSupplyRalplanPhase(autopilotStatePhase))
+        return null;
+    const hasRalplanScopedAutopilotSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "autopilot"
+        && isAutopilotRalplanLikePhase(safeString(entry.phase).trim().toLowerCase())
+        && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
+    if (!isAutopilotRalplanLikePhase(autopilotStatePhase) && !hasRalplanScopedAutopilotSkill)
+        return null;
     return hasActiveAutopilotSkill ? autopilotState : null;
 }
 function isAllowedRalplanBashWrite(cwd, command) {
@@ -2222,8 +2274,8 @@ function isAllowedRalplanBashWrite(cwd, command) {
     const targets = extractDeepInterviewCommandWriteTargets(command);
     return targets.length > 0 && targets.every((target) => isAllowedRalplanArtifactPath(cwd, target));
 }
-async function buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir) {
-    const sessionId = readPayloadSessionId(payload);
+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)
@@ -2242,17 +2294,25 @@ async function buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir) {
     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: `Ralplan is active (phase: ${phase}); implementation/write tools are blocked until an explicit execution handoff workflow is activated.`,
+        reason: `${planningModeLabel} is active (phase: ${phase}); implementation/write tools are blocked until an explicit execution handoff workflow is activated.`,
         hookSpecificOutput: {
             hookEventName: "PreToolUse",
-            additionalContext: "Ralplan is consensus-planning mode. 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 ralplan. To execute, first process an explicit handoff such as `$ultragoal`, `$team`, or `$ralph`, which must emit terminal ralplan state before implementation begins.",
+            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) {
-    const sessionId = readPayloadSessionId(payload);
+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)
@@ -2276,7 +2336,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)}.`,
         },
     };
 }
@@ -2465,7 +2525,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}.`
@@ -2491,7 +2551,7 @@ function buildRalplanContinuationStatus(blocker, activeSubagentCount) {
         };
     }
     const completeHint = blocker.planningComplete
-        ? " 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 $ultragoal, $team, or $ralph handoff."
+        ? ` 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; do not begin implementation from ralplan.${artifact}${completeHint}`,
@@ -2650,6 +2710,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);
@@ -2679,9 +2742,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();
@@ -2811,7 +2871,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,
@@ -3076,7 +3136,9 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     // 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;
@@ -3237,12 +3299,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;
             const hudSessionId = resolveHudReconcileSessionId(currentSessionState, canonicalSessionId, sessionIdForState);
-            await reconcileHudForPromptSubmitFn(cwd, { sessionId: hudSessionId }).catch(() => { });
+            const hudSessionIds = resolveHudReconcileSessionIds(currentSessionState, canonicalSessionId, sessionIdForState, nativeSessionId);
+            await reconcileHudForPromptSubmitFn(cwd, { sessionId: hudSessionId, sessionIds: hudSessionIds }).catch(() => { });
         }
     }
     if (omxEventName && !skipCanonicalSessionStartContext && !suppressNoisySubagentLifecycleDispatch) {
@@ -3298,8 +3362,12 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         }
     }
     else if (hookEventName === "PreToolUse") {
-        outputJson = await buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir)
-            ?? await buildRalplanPreToolUseBoundaryOutput(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") {