oh-my-codex 0.19.0 → 0.20.0

package/dist/scripts/codex-native-hook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codex-native-hook.d.ts","sourceRoot":"","sources":["../../src/scripts/codex-native-hook.ts"],"names":[],"mappings":"AA8CA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAiCtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAoDlE,KAAK,kBAAkB,GACnB,cAAc,GACd,YAAY,GACZ,aAAa,GACb,kBAAkB,GAClB,YAAY,GACZ,aAAa,GACb,MAAM,CAAC;AAEX,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEhD,UAAU,yBAAyB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,6BAA6B,CAAC,EAAE,OAAO,2BAA2B,CAAC;CACpE;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AAmfD,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,kBAAkB,GAAG,IAAI,GACvC,MAAM,GAAG,IAAI,CAmBf;AAsxBD,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC/C,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CACzC,GACL,MAAM,GAAG,IAAI,CAuBf;AA2mCD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMnE;AA0lKD,wBAAsB,wCAAwC,CAC5D,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAyCzC;AA20CD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CA4VnC;AA6BD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AAyOD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAyC3D"}
+{"version":3,"file":"codex-native-hook.d.ts","sourceRoot":"","sources":["../../src/scripts/codex-native-hook.ts"],"names":[],"mappings":"AA+CA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAiCtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAyDlE,KAAK,kBAAkB,GACnB,cAAc,GACd,YAAY,GACZ,aAAa,GACb,kBAAkB,GAClB,YAAY,GACZ,aAAa,GACb,MAAM,CAAC;AAEX,KAAK,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEhD,UAAU,yBAAyB;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,6BAA6B,CAAC,EAAE,OAAO,2BAA2B,CAAC;CACpE;AAED,MAAM,WAAW,wBAAwB;IACvC,aAAa,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACpC,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;CAC5C;AAmfD,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,kBAAkB,GAAG,IAAI,GACvC,MAAM,GAAG,IAAI,CAmBf;AAsxBD,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,MAAM,EAChB,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IAC/C,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CACzC,GACL,MAAM,GAAG,IAAI,CAuBf;AA4tCD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMnE;AA0uKD,wBAAsB,wCAAwC,CAC5D,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,CAqDzC;AA83CD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CA6VnC;AA6BD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AAyOD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAyC3D"}

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

@@ -6,7 +6,7 @@ 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 { isTrustedSubagentThread, readSubagentSessionSummary, readSubagentTrackingState, recordSubagentTurnForSession, } from "../subagents/tracker.js";
+import { isTrustedSubagentThread, readSubagentSessionSummary, readSubagentSessionLedger, readSubagentTrackingState, recordSubagentTurnForSession, } from "../subagents/tracker.js";
 import { resolveCanonicalTeamStateRoot, resolveWorkerNotifyTeamStateRootPath } from "../team/state-root.js";
 import { inferTerminalLifecycleOutcome } from "../runtime/run-outcome.js";
 import { appendToLog, isSessionStale, isSessionStateUsable, readSessionState, readUsableSessionState, reconcileNativeSessionStart, } from "../hooks/session.js";
@@ -31,7 +31,7 @@ import { onPreCompact as buildWikiPreCompactContext, onSessionStart as buildWiki
 import { readAutoresearchCompletionStatus, readAutoresearchModeStateForActiveDecision } from "../autoresearch/skill-validation.js";
 import { AGENT_DEFINITIONS } from "../agents/definitions.js";
 import { deriveAutopilotChildPhase, normalizeAutopilotPhase } from "../autopilot/fsm.js";
-import { CONDUCTOR_ORCHESTRATION_METADATA_PREFIXES, LEADER_CONDUCTOR_BLOCK, LEADER_CONDUCTOR_REUSE_AND_LEDGER_GUIDANCE, actionKindForConductorArtifact, authorizeConductorAction, classifyConductorArtifactKind, } from "../leader/contract.js";
+import { CONDUCTOR_ORCHESTRATION_METADATA_PREFIXES, LEADER_CONDUCTOR_BLOCK, LEADER_CONDUCTOR_REUSE_AND_LEDGER_GUIDANCE, NATIVE_SUBAGENT_SUPPORT_BLOCKER_FILE, actionKindForConductorArtifact, authorizeConductorAction, buildUnsupportedNativeSubagentGuidance, classifyConductorArtifactKind, isUnsupportedNativeSubagentEvidence, resolveNativeSubagentSupportStatus, } from "../leader/contract.js";
 import { readRunState } from "../runtime/run-state.js";
 import { evaluateRalphCompletionAuditEvidence, isRalphCompletePhase } from "../ralph/completion-audit.js";
 import { buildCodexGoalTerminalCleanupNotice, } from "../goal-workflows/codex-goal-snapshot.js";
@@ -1463,6 +1463,76 @@ async function ensureOmxLocalIgnoreEntry(cwd) {
     await writeFile(excludePath, next);
     return { changed: true, excludePath };
 }
+function readSessionStartSource(payload) {
+    return safeString(payload?.source ?? payload?.session_start_source ?? payload?.sessionStartSource).trim().toLowerCase();
+}
+function shouldBuildSubagentReopenContext(options) {
+    if (options.hookEventName !== "SessionStart")
+        return false;
+    const source = readSessionStartSource(options.payload);
+    return source === "startup" || source === "resume";
+}
+function formatSubagentLedgerMetadata(entry) {
+    const metadata = [
+        entry.role ? `role: ${entry.role}` : null,
+        entry.laneId ? `lane: ${entry.laneId}` : null,
+        entry.scope ? `scope: ${entry.scope}` : null,
+        entry.status ? `status: ${entry.status}` : null,
+        entry.lastHandoffSummary ? `handoff: ${entry.lastHandoffSummary.slice(0, 120)}` : null,
+        entry.resumeFailureReason ? `last failure: ${entry.resumeFailureReason.slice(0, 120)}` : null,
+    ].filter((item) => Boolean(item));
+    return metadata.length > 0 ? ` (${metadata.join("; ")})` : "";
+}
+async function buildPersistedSubagentReopenContext(cwd, sessionId, options) {
+    if (!shouldBuildSubagentReopenContext(options))
+        return null;
+    const ledger = await readSubagentSessionLedger(cwd, sessionId).catch(() => null);
+    if (!ledger || ledger.savedSubagents.length === 0)
+        return null;
+    const source = readSessionStartSource(options.payload);
+    const reopenTargets = ledger.resumeTargets.filter((entry) => entry.status !== "unavailable");
+    const unavailableTargets = ledger.unavailableSubagents;
+    const failedTargets = ledger.savedSubagents.filter((entry) => entry.resumeFailedAt || entry.resumeFailureReason);
+    const nowIso = new Date().toISOString();
+    await Promise.all(reopenTargets.map((entry) => recordSubagentTurnForSession(cwd, {
+        sessionId,
+        threadId: entry.threadId,
+        kind: "subagent",
+        role: entry.role,
+        laneId: entry.laneId,
+        scope: entry.scope,
+        agentNickname: entry.agentNickname,
+        status: entry.status,
+        resumeRequestedAt: nowIso,
+        preserveCompletionEvidence: true,
+    }).catch(() => null)));
+    const lines = [
+        "[Persisted subagent reopen]",
+        `- SessionStart source: ${source}; saved subagent ids found: ${ledger.savedSubagents.length}.`,
+    ];
+    if (reopenTargets.length > 0) {
+        lines.push("- Reopen these persisted subagents by id before continuing work or spawning any same-role/same-lane replacement:");
+        for (const entry of reopenTargets.slice(0, 12)) {
+            lines.push(`  - resume_agent(${JSON.stringify(entry.agentId)})${formatSubagentLedgerMetadata(entry)}`);
+        }
+        if (reopenTargets.length > 12) {
+            lines.push(`  - ... ${reopenTargets.length - 12} more saved subagent id(s) omitted from this compact SessionStart context; consult .omx/state/subagent-tracking.json before spawning replacements.`);
+        }
+    }
+    else {
+        lines.push("- No compatible saved subagent id is currently marked reopenable; do not spawn a replacement merely because reopen was unavailable.");
+    }
+    lines.push("- Silver rule: when follow-up work targets an existing role/lane, reuse the matching reopened id; avoid duplicate same-type subagent spawns.");
+    lines.push("- If resume_agent fails, surface a clear warning with the id and reason, then continue in the root or another compatible existing lane; do not spawn a new agent solely because reopen failed.");
+    const warningEntries = [...new Map([...unavailableTargets, ...failedTargets].map((entry) => [entry.agentId, entry])).values()];
+    if (warningEntries.length > 0) {
+        lines.push("- Reopen warnings:");
+        for (const entry of warningEntries.slice(0, 8)) {
+            lines.push(`  - ${entry.agentId}${formatSubagentLedgerMetadata(entry)}`);
+        }
+    }
+    return lines.join("\n");
+}
 async function buildSessionStartContext(cwd, sessionId, options = {}) {
     const sections = [];
     sections.push(buildExecutionEnvironmentSection(cwd, {
@@ -1560,6 +1630,13 @@ async function buildSessionStartContext(cwd, sessionId, options = {}) {
     if (subagentSummary && subagentSummary.activeSubagentThreadIds.length > 0) {
         sections.push(`[Subagents]\n- active subagent threads: ${subagentSummary.activeSubagentThreadIds.length}`);
     }
+    const persistedSubagentReopenContext = await buildPersistedSubagentReopenContext(cwd, sessionId, {
+        hookEventName: options.hookEventName,
+        payload: options.payload,
+    });
+    if (persistedSubagentReopenContext) {
+        sections.push(persistedSubagentReopenContext);
+    }
     return sections.length > 0 ? sections.join("\n\n") : null;
 }
 function resolveExecutionEnvironment(cwd, options = {}) {
@@ -1722,6 +1799,17 @@ function buildAutopilotPromptActivationNote(skillState, options = {}) {
     const teamHandoff = readTeamModeConfig(options.cwd).enabled
         ? " (+ $team if needed)"
         : "";
+    const stateDir = getBaseStateDir(options.cwd);
+    const nativeSubagentSupport = resolveNativeSubagentSupportStatus({
+        payload: options.payload,
+        persistedSupportBlocker: readJsonSyncIfExists(nativeSubagentSupportBlockerPath(stateDir)),
+        persistedCapacityBlocker: readJsonSyncIfExists(nativeSubagentCapacityBlockerPath(stateDir)),
+        cwd: options.cwd,
+        sessionId: options.sessionId,
+    });
+    const conductorGuidance = nativeSubagentSupport.status === "unsupported"
+        ? buildUnsupportedNativeSubagentGuidance(nativeSubagentSupport)
+        : `${LEADER_CONDUCTOR_BLOCK} ${LEADER_CONDUCTOR_REUSE_AND_LEDGER_GUIDANCE}`;
     return [
         `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.",
@@ -1733,8 +1821,7 @@ function buildAutopilotPromptActivationNote(skillState, options = {}) {
         "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.",
-        LEADER_CONDUCTOR_BLOCK,
-        LEADER_CONDUCTOR_REUSE_AND_LEDGER_GUIDANCE,
+        conductorGuidance,
     ].filter(Boolean).join(" ");
 }
 function formatExecutionHandoffList(cwd) {
@@ -1761,7 +1848,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, cwd });
+        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer, cwd, payload, sessionId: safeString(skillState?.session_id).trim() });
         return [
             `OMX native UserPromptSubmit continued active workflow skill "${continuedSkill}".`,
             promptPriorityMessage,
@@ -1785,7 +1872,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             ? buildDeepInterviewQuestionBridgeInstruction(cwd, payload)
             : null;
         const deepInterviewConfigPromptActivationNote = buildDeepInterviewConfigInstruction(cwd, skillState);
-        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer: true, cwd });
+        const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { markedQuestionAnswer: true, cwd, payload, sessionId: safeString(skillState?.session_id).trim() });
         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,
@@ -1818,7 +1905,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, { cwd });
+    const autopilotPromptActivationNote = buildAutopilotPromptActivationNote(skillState, { cwd, payload, sessionId: safeString(skillState?.session_id).trim() });
     const combinedTransitionMessage = (() => {
         if (!skillState?.transition_message)
             return null;
@@ -2574,6 +2661,17 @@ function readPayloadTurnId(payload) {
 function nativeSubagentCapacityBlockerPath(stateDir) {
     return join(stateDir, NATIVE_SUBAGENT_CAPACITY_BLOCKER_FILE);
 }
+function nativeSubagentSupportBlockerPath(stateDir) {
+    return join(stateDir, NATIVE_SUBAGENT_SUPPORT_BLOCKER_FILE);
+}
+function readJsonSyncIfExists(path) {
+    try {
+        return JSON.parse(readFileSync(path, "utf-8"));
+    }
+    catch {
+        return null;
+    }
+}
 function stringifyUnknown(value) {
     if (typeof value === "string")
         return value;
@@ -2602,6 +2700,44 @@ function isNativeSubagentCapacityFailure(payload) {
     const toolName = safeString(payload.tool_name).trim();
     return !toolName || /(?:spawn_agent|multi_agent|subagent|collab|agent)/i.test(toolName);
 }
+function nativeSubagentFailureReason(payload) {
+    const evidence = payloadEvidenceText(payload);
+    const toolName = safeString(payload.tool_name).trim();
+    if (toolName && !/(?:spawn_agent|multi_agent|subagent|collab|agent)/i.test(toolName))
+        return null;
+    if (/\bagent thread limit reached\b/i.test(evidence))
+        return null;
+    if (/\bnative subagents? (?:unsupported|disabled|not enabled|unavailable|not found)\b/i.test(evidence))
+        return "native_subagents_unsupported";
+    if (/\bmulti_agent_v1\b/i.test(evidence) && /\b(?:unavailable|unknown tool|disabled|not enabled|not found|unsupported)\b/i.test(evidence))
+        return "multi_agent_v1_unavailable";
+    if (/\b(?:unknown tool|tool not found|not enabled|disabled|unavailable|unsupported)\b/i.test(evidence))
+        return "multi_agent_v1_unavailable";
+    return null;
+}
+function summarizeNativeSubagentSupportFailure(text) {
+    const normalized = text.replace(/\s+/g, " ").trim();
+    return (normalized || "native subagent support unavailable").slice(0, 500);
+}
+async function recordNativeSubagentSupportBlocker(cwd, stateDir, payload) {
+    const reason = nativeSubagentFailureReason(payload);
+    if (!reason)
+        return;
+    const nowIso = new Date().toISOString();
+    await mkdir(stateDir, { recursive: true });
+    await writeFile(nativeSubagentSupportBlockerPath(stateDir), JSON.stringify({
+        schema_version: 1,
+        status: "unsupported",
+        reason,
+        ...(readPayloadSessionId(payload) ? { session_id: readPayloadSessionId(payload) } : {}),
+        ...(readPayloadThreadId(payload) ? { thread_id: readPayloadThreadId(payload) } : {}),
+        ...(readPayloadTurnId(payload) ? { turn_id: readPayloadTurnId(payload) } : {}),
+        ...(safeString(payload.tool_name).trim() ? { tool_name: safeString(payload.tool_name).trim() } : {}),
+        evidence: summarizeNativeSubagentSupportFailure(payloadEvidenceText(payload)),
+        observed_at: nowIso,
+        cwd,
+    }, null, 2));
+}
 function summarizeCapacityFailure(text) {
     const normalized = text.replace(/\s+/g, " ").trim();
     if (!normalized)
@@ -2791,6 +2927,7 @@ const PROTECTED_PLANNING_STATE_FILE_NAMES = new Set([
     "ralplan-state.json",
     "skill-active-state.json",
 ]);
+const RUNTIME_SESSION_ID_SEGMENT_PATTERN = /^[A-Za-z0-9_-]{1,64}$/;
 const PLANNING_MODE_IMPLEMENTATION_TOOL_NAMES = new Set([
     "Write",
     "Edit",
@@ -2821,6 +2958,15 @@ function isActiveDeepInterviewPhase(state) {
         return false;
     return true;
 }
+function isInactiveCompletedDeepInterviewPhase(state) {
+    if (!state || state.active !== false)
+        return false;
+    const mode = safeString(state.mode).trim();
+    if (mode && mode !== "deep-interview")
+        return false;
+    const phase = safeString(state.current_phase ?? state.currentPhase).trim().toLowerCase();
+    return phase === "complete" || phase === "completed";
+}
 function isActiveRalplanPhase(state) {
     if (!state || state.active !== true)
         return false;
@@ -2866,6 +3012,33 @@ function isProtectedPlanningStatePath(relativePath) {
     const fileName = relativePath.split("/").pop() ?? "";
     return PROTECTED_PLANNING_STATE_FILE_NAMES.has(fileName);
 }
+function isAllowedAuthoritativeRuntimePlanningStatePath(cwd, rawPath) {
+    const trimmed = rawPath.trim().replace(/^['"]|['"]$/g, "");
+    if (!trimmed || trimmed.includes("\0"))
+        return false;
+    let targetPath;
+    let baseStateDir;
+    try {
+        targetPath = resolve(cwd, trimmed);
+        baseStateDir = resolve(getBaseStateDir(cwd));
+    }
+    catch {
+        return false;
+    }
+    const localStateDir = resolve(cwd, ".omx", "state");
+    if (baseStateDir === localStateDir)
+        return false;
+    const relativeToBase = relative(baseStateDir, targetPath).replace(/\\/g, "/");
+    if (!relativeToBase || relativeToBase.startsWith("..") || relativeToBase.startsWith("/"))
+        return false;
+    const segments = relativeToBase.split("/");
+    if (segments.length !== 3 || segments[0] !== "sessions")
+        return false;
+    const sessionId = segments[1] ?? "";
+    const fileName = segments[2] ?? "";
+    return RUNTIME_SESSION_ID_SEGMENT_PATTERN.test(sessionId)
+        && PROTECTED_PLANNING_STATE_FILE_NAMES.has(fileName);
+}
 function isPlanningTmpRelativePath(relativePath) {
     return relativePath === ".omx/tmp" || relativePath.startsWith(".omx/tmp/");
 }
@@ -2881,9 +3054,9 @@ function isAllowedPlanningTmpScratchPath(relativePath) {
 function isAllowedPlanningArtifactPath(cwd, rawPath, allowedPrefixes) {
     const relativePath = normalizePlanningArtifactRelativePath(cwd, rawPath);
     if (!relativePath)
-        return false;
+        return isAllowedAuthoritativeRuntimePlanningStatePath(cwd, rawPath);
     if (isProtectedPlanningStatePath(relativePath))
-        return false;
+        return isAllowedAuthoritativeRuntimePlanningStatePath(cwd, rawPath);
     if (isPlanningTmpRelativePath(relativePath)) {
         return allowedPrefixes.includes(".omx/tmp") && isAllowedPlanningTmpScratchPath(relativePath);
     }
@@ -5262,6 +5435,56 @@ function isPackageManagerCommandWord(word) {
     const base = shellWordBaseName(word);
     return base === "npm" || base === "pnpm" || base === "yarn" || base === "npx" || base === "pnpx";
 }
+function isStructuredUltragoalSteeringShellCommand(command) {
+    const segments = splitShellCommandSegments(stripHeredocBodiesForCommandScan(command));
+    let sawStructuredSteer = false;
+    for (const segment of segments) {
+        const words = tokenizeShellWords(segment);
+        let commandStart = true;
+        let inForHeader = false;
+        for (let index = 0; index < words.length; index += 1) {
+            const word = words[index] ?? "";
+            if (!word)
+                continue;
+            if (isShellCommandSeparator(word)) {
+                commandStart = true;
+                continue;
+            }
+            if (inForHeader) {
+                if (word === "do") {
+                    inForHeader = false;
+                    commandStart = true;
+                }
+                continue;
+            }
+            if (isShellGroupingSyntaxWord(word))
+                continue;
+            if (commandStart && isEnvironmentAssignmentWord(word))
+                continue;
+            if (commandStart && CONDUCTOR_BASH_COMPOUND_SYNTAX_WORDS.has(word)) {
+                if (word === "for")
+                    inForHeader = true;
+                continue;
+            }
+            if (commandStart && word.startsWith("-"))
+                continue;
+            if (!commandStart)
+                continue;
+            const commandName = commandNameFromShellWord(word);
+            if (commandName === "read" || commandName === "true" || commandName === ":") {
+                commandStart = false;
+                continue;
+            }
+            if (commandName === "omx" && words[index + 1] === "ultragoal" && words[index + 2] === "steer") {
+                sawStructuredSteer = true;
+                commandStart = false;
+                continue;
+            }
+            return false;
+        }
+    }
+    return sawStructuredSteer;
+}
 function hasDynamicNestedShellExecution(command) {
     const commands = splitShellCommandSegments(stripHeredocBodiesForCommandScan(command));
     for (const segment of commands) {
@@ -5289,13 +5512,13 @@ function hasDynamicNestedShellExecution(command) {
                     return true;
                 if (commandStringIndex !== null) {
                     const nestedCommand = words[commandStringIndex] ?? "";
-                    if (isDynamicNestedCommandString(nestedCommand))
+                    if (isDynamicNestedCommandString(nestedCommand) && !isStructuredUltragoalSteeringShellCommand(nestedCommand))
                         return true;
                 }
             }
             if (word === "eval") {
                 const nestedCommand = words.slice(index + 1).join(" ");
-                if (isDynamicNestedCommandString(nestedCommand))
+                if (isDynamicNestedCommandString(nestedCommand) && !isStructuredUltragoalSteeringShellCommand(nestedCommand))
                     return true;
             }
         }
@@ -6030,6 +6253,8 @@ async function readActiveDeepInterviewStateForPreToolUse(cwd, stateDir, sessionI
         if (hasActiveDeepInterviewSkill)
             return modeState;
     }
+    if (isInactiveCompletedDeepInterviewPhase(modeState))
+        return null;
     const autopilotState = sessionId
         ? await readStopSessionPinnedState("autopilot-state.json", cwd, sessionId, stateDir)
         : await readJsonIfExists(join(stateDir, "autopilot-state.json"));
@@ -6174,7 +6399,7 @@ function buildDeepInterviewBashBlockedDetail(cwd, command) {
 }
 async function buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir, resolvedSessionId) {
     const sessionId = safeString(resolvedSessionId ?? readPayloadSessionId(payload)).trim();
-    if (await hasTrustedTypedSubagentThreadSpawnProvenanceForPreToolUse(payload, cwd, sessionId))
+    if (await hasTrustedTypedSubagentProvenanceForPreToolUse(payload, cwd, sessionId))
         return null;
     const threadId = readPayloadThreadId(payload);
     const activeState = await readActiveRalplanStateForPreToolUse(cwd, stateDir, sessionId, threadId);
@@ -6233,7 +6458,7 @@ async function buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir, reso
 }
 async function buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir, resolvedSessionId) {
     const sessionId = safeString(resolvedSessionId ?? readPayloadSessionId(payload)).trim();
-    if (await hasTrustedTypedSubagentThreadSpawnProvenanceForPreToolUse(payload, cwd, sessionId))
+    if (await hasTrustedTypedSubagentProvenanceForPreToolUse(payload, cwd, sessionId))
         return null;
     const threadId = readPayloadThreadId(payload);
     const activeState = await readActiveDeepInterviewStateForPreToolUse(cwd, stateDir, sessionId, threadId);
@@ -6351,9 +6576,18 @@ async function buildPlanningRootPointerConflictPreToolUseOutput(payload, cwd, st
     }
     return blocked ? buildRalplanRootPointerConflictBlock(ralplanState) : null;
 }
-async function hasTrustedTypedSubagentThreadSpawnProvenanceForPreToolUse(payload, cwd, sessionId) {
+async function hasTrustedTypedSubagentProvenanceForPreToolUse(payload, cwd, sessionId) {
     if (hasTeamWorkerEnvironment())
         return true;
+    if (!isTypedAgentRolePayload(payload))
+        return false;
+    const trackingState = await readSubagentTrackingState(cwd).catch(() => null);
+    const session = trackingState?.sessions?.[sessionId];
+    if (!session)
+        return false;
+    const payloadThreadId = readPayloadThreadId(payload);
+    if (payloadThreadId && isTrustedSubagentThread(session, payloadThreadId))
+        return true;
     const source = safeObject(payload.source);
     const subagent = safeObject(source.subagent);
     const threadSpawn = safeObject(subagent.thread_spawn);
@@ -6363,13 +6597,10 @@ async function hasTrustedTypedSubagentThreadSpawnProvenanceForPreToolUse(payload
         ?? threadSpawn.leaderThreadId).trim();
     if (!parentThreadId)
         return false;
-    if (!isTypedAgentRolePayload(payload))
-        return false;
-    const trackingState = await readSubagentTrackingState(cwd).catch(() => null);
-    const session = trackingState?.sessions?.[sessionId];
-    if (!session)
+    const leaderThreadId = safeString(session.leader_thread_id).trim();
+    if (payloadThreadId && leaderThreadId && payloadThreadId === leaderThreadId)
         return false;
-    return session.leader_thread_id === parentThreadId || parentThreadId in session.threads;
+    return leaderThreadId === parentThreadId || parentThreadId in session.threads;
 }
 function isActiveConductorModeState(state, mode, sessionId) {
     if (!state || state.active !== true)
@@ -6396,7 +6627,7 @@ async function readActiveMainRootConductorStateForPreToolUse(payload, cwd, state
     const threadId = readPayloadThreadId(payload);
     if (!sessionId)
         return null;
-    if (await hasTrustedTypedSubagentThreadSpawnProvenanceForPreToolUse(payload, cwd, sessionId))
+    if (await hasTrustedTypedSubagentProvenanceForPreToolUse(payload, cwd, sessionId))
         return null;
     const canonicalState = await readVisibleSkillActiveStateForStateDir(stateDir, sessionId);
     if (!canonicalState)
@@ -7211,6 +7442,13 @@ export async function buildConductorPreToolUseWriteGuardOutput(payload, cwd, sta
     const activeState = await readActiveMainRootConductorStateForPreToolUse(payload, cwd, stateDir, resolvedSessionId);
     if (!activeState)
         return null;
+    const nativeSubagentSupport = resolveNativeSubagentSupportStatus({
+        payload,
+        persistedSupportBlocker: await readJsonIfExists(nativeSubagentSupportBlockerPath(stateDir)),
+        persistedCapacityBlocker: await readJsonIfExists(nativeSubagentCapacityBlockerPath(stateDir)),
+        cwd,
+        sessionId: resolvedSessionId || readPayloadSessionId(payload),
+    });
     const toolName = safeString(payload.tool_name).trim();
     const command = readPreToolUseCommand(payload);
     const pathCandidates = readPreToolUsePathCandidates(payload);
@@ -7237,6 +7475,9 @@ export async function buildConductorPreToolUseWriteGuardOutput(payload, cwd, sta
     }
     if (!blocked)
         return null;
+    const unsupportedNativeGuidance = isUnsupportedNativeSubagentEvidence(nativeSubagentSupport)
+        ? ` ${buildUnsupportedNativeSubagentGuidance(nativeSubagentSupport)} Treat the active conductor workflow as blocked/cancelled for native delegation recovery; do not call multi_agent_v1.close_agent.`
+        : "";
     return {
         decision: "block",
         reason: `Main-root Conductor mode is active (${activeState.mode} phase: ${formatPhase(activeState.phase, "active")}); direct plan/code writes are blocked and must be delegated; ${blockedDetail}.`,
@@ -7245,7 +7486,8 @@ export async function buildConductorPreToolUseWriteGuardOutput(payload, cwd, sta
             additionalContext: `${LEADER_CONDUCTOR_GOLDEN_RULE} `
                 + "Use specialized agents for source edits and plan/spec authorship. "
                 + `Main-root Conductor may write only orchestration metadata/transport/ledger artifacts under ${CONDUCTOR_ORCHESTRATION_METADATA_PREFIXES.join(", ")}; path location alone is not authorization for substantive deliverables. `
-                + "Autopilot rework and typed subagent/worker lanes are exempt from this guard.",
+                + unsupportedNativeGuidance
+                + " Autopilot rework and typed subagent/worker lanes are exempt from this guard.",
         },
     };
 }
@@ -7380,6 +7622,44 @@ function modeStateHasExplicitMatchingCwd(state, cwd) {
         return false;
     }
 }
+async function clearNativeStopSessionEntries(stateDir, payload, canonicalSessionId) {
+    const statePath = join(stateDir, NATIVE_STOP_STATE_FILE);
+    const state = await readJsonIfExists(statePath);
+    if (!state)
+        return;
+    const sessions = safeObject(state.sessions);
+    const keys = new Set(uniqueNonEmpty([
+        readNativeStopSessionKey(payload, canonicalSessionId),
+        canonicalSessionId,
+        readPayloadSessionId(payload),
+        readPayloadThreadId(payload),
+    ]));
+    let changed = false;
+    for (const key of keys) {
+        if (Object.prototype.hasOwnProperty.call(sessions, key)) {
+            delete sessions[key];
+            changed = true;
+        }
+    }
+    if (!changed)
+        return;
+    await writeFile(statePath, JSON.stringify({ ...state, sessions }, null, 2));
+}
+async function hasAuthoritativeInactiveSkillStopState(cwd, stateDir, skill, sessionId, threadId) {
+    const sessionModeState = await readStopSessionPinnedState(`${skill}-state.json`, cwd, sessionId, stateDir);
+    if (!sessionModeState || !isTerminalOrInactiveModeState(sessionModeState))
+        return false;
+    const canonicalState = await readVisibleSkillActiveStateForStateDir(stateDir, sessionId);
+    if (canonicalState && !rootSkillStateHasNoActiveSkillForStopContext(canonicalState, skill, sessionId, threadId)) {
+        return false;
+    }
+    const rootModeState = await readJsonIfExists(join(stateDir, `${skill}-state.json`));
+    if (!rootModeState)
+        return true;
+    if (!modeStateMatchesSkillStopContext(rootModeState, cwd, sessionId))
+        return true;
+    return isTerminalOrInactiveModeState(rootModeState);
+}
 async function readBlockingSkillForStop(cwd, stateDir, sessionId, threadId, requiredSkill) {
     const canonicalState = await readVisibleSkillActiveStateForStateDir(stateDir, sessionId);
     const visibleEntries = canonicalState ? listActiveSkills(canonicalState) : [];
@@ -8029,6 +8309,9 @@ async function buildStopHookOutput(payload, cwd, stateDir, options = {}) {
     const suppressParentWorkflowStop = shouldSuppressParentWorkflowStopForSideConversation(payload);
     if (canonicalSessionId) {
         await reconcileStaleRootSkillActiveStateForStop(cwd, stateDir, canonicalSessionId);
+        if (await hasAuthoritativeInactiveSkillStopState(cwd, stateDir, "ralplan", canonicalSessionId, threadId)) {
+            await clearNativeStopSessionEntries(stateDir, payload, canonicalSessionId);
+        }
     }
     if (suppressParentWorkflowStop) {
         return null;
@@ -8454,6 +8737,7 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     }
     else if (hookEventName === "PostToolUse") {
         await recordNativeSubagentCapacityBlocker(cwd, stateDir, payload).catch(() => { });
+        await recordNativeSubagentSupportBlocker(cwd, stateDir, payload).catch(() => { });
         if (detectMcpTransportFailure(payload)) {
             await markTeamTransportFailure(cwd, payload);
         }