oh-my-codex 0.18.11 → 0.18.13

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":"AA2CA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AA+BtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAwClE,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;AAyZD,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,kBAAkB,GAAG,IAAI,GACvC,MAAM,GAAG,IAAI,CAmBf;AAwoBD,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;AA6+BD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMnE;AAqzDD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CA8TnC;AA6BD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AAyMD,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":"AA2CA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AAgCtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAwClE,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;AAyZD,wBAAgB,2BAA2B,CACzC,aAAa,EAAE,kBAAkB,GAAG,IAAI,GACvC,MAAM,GAAG,IAAI,CAmBf;AAwoBD,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;AA6+BD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMnE;AAg6DD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAoVnC;AA6BD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AAyMD,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAyC3D"}

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

@@ -17,7 +17,7 @@ import { detectKeywords, detectPrimaryKeyword, recordSkillActivation, } from "..
 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 { SLOPPY_FALLBACK_GROUNDING_PATTERNS, SLOPPY_FALLBACK_IMPLEMENTATION_CONTEXT_PATTERNS, SLOPPY_FALLBACK_PHRASE_PATTERNS, buildNativePostToolUseOutput, buildNativePreToolUseOutput, commandInvokesApplyPatch, detectMcpTransportFailure, hasAnyPattern, } from "./codex-native-pre-post.js";
 import { handleTeamWorkerPostToolUseSuccess } from "./notify-hook/team-worker-posttooluse.js";
 import { maybeNudgeLeaderForAllowedWorkerStop } from "./notify-hook/team-worker-stop.js";
 import { resolveCodexExecutionSurface, } from "./codex-execution-surface.js";
@@ -2223,10 +2223,69 @@ function readPreToolUsePathCandidates(payload) {
     ];
     return candidates.map((candidate) => safeString(candidate).trim()).filter(Boolean);
 }
+const APPLY_PATCH_TOOL_NAMES = new Set(["apply_patch", "ApplyPatch"]);
+function isApplyPatchToolName(toolName) {
+    return APPLY_PATCH_TOOL_NAMES.has(toolName);
+}
+function readApplyPatchText(payload) {
+    const input = safeObject(payload.tool_input);
+    for (const key of ["input", "patch", "content", "text", "command"]) {
+        const value = safeString(input[key]).trim();
+        if (value)
+            return value;
+    }
+    return "";
+}
+function extractApplyPatchTargetPaths(patchText) {
+    if (!patchText)
+        return [];
+    const paths = [];
+    for (const match of patchText.matchAll(/^\s*\*\*\*\s+(?:Add|Update|Delete)\s+File:\s*(.+?)\s*$/gm)) {
+        const candidate = safeString(match[1]).trim();
+        if (candidate)
+            paths.push(candidate);
+    }
+    for (const match of patchText.matchAll(/^\s*\*\*\*\s+Move\s+to:\s*(.+?)\s*$/gm)) {
+        const candidate = safeString(match[1]).trim();
+        if (candidate)
+            paths.push(candidate);
+    }
+    return paths;
+}
+function collectImplementationToolPathCandidates(payload, toolName, structuredCandidates) {
+    if (!isApplyPatchToolName(toolName))
+        return structuredCandidates;
+    return [...structuredCandidates, ...extractApplyPatchTargetPaths(readApplyPatchText(payload))];
+}
 function isNullDeviceRedirectTarget(target) {
     const normalized = target.trim().replace(/^['"]|['"]$/g, "").toLowerCase();
     return normalized === "/dev/null" || normalized === "nul";
 }
+// Collects same-command literal variable assignments (`NAME="value"`), skipping
+// any value that involves expansion (`$`, backticks) so unresolved/dynamic
+// targets stay conservatively blocked.
+function extractCommandLiteralAssignments(command) {
+    const assignments = new Map();
+    const pattern = /(?:^|[\n;&|(]|&&|\|\|)\s*([A-Za-z_][A-Za-z0-9_]*)=(?:"([^"$`]*)"|'([^']*)'|([^\s"'$`;&|<>]+))/g;
+    for (const match of command.matchAll(pattern)) {
+        const name = safeString(match[1]).trim();
+        if (!name)
+            continue;
+        const value = match[2] ?? match[3] ?? match[4] ?? "";
+        assignments.set(name, value);
+    }
+    return assignments;
+}
+// Resolves a redirect/tee target of the form `$NAME`/`${NAME}` against
+// same-command literal assignments; non-variable or unresolved targets are
+// returned unchanged so they remain subject to the allowed-path check.
+function resolveCommandRedirectTarget(target, assignments) {
+    const variableMatch = target.match(/^\$\{?([A-Za-z_][A-Za-z0-9_]*)\}?$/);
+    if (!variableMatch)
+        return target;
+    const resolved = assignments.get(safeString(variableMatch[1]));
+    return resolved !== undefined ? resolved : target;
+}
 function extractDeepInterviewCommandRedirectTargets(command) {
     const targets = [];
     for (const match of command.matchAll(/(?:^|[^>])>{1,2}\s*(["']?)([^\s&|;<>]+)\1/g)) {
@@ -2237,7 +2296,7 @@ function extractDeepInterviewCommandRedirectTargets(command) {
     return targets;
 }
 function commandHasDeepInterviewWriteIntent(command) {
-    return /\bapply_patch\b/.test(command)
+    return commandInvokesApplyPatch(command)
         || extractDeepInterviewCommandRedirectTargets(command).length > 0
         || /\btee\s+(?:-a\s+)?[^\s&|;]+/.test(command)
         || /\bsed\s+(?:[^\n;&|]*\s)?-i(?:\b|['"])/.test(command)
@@ -2245,11 +2304,13 @@ function commandHasDeepInterviewWriteIntent(command) {
         || /\b(?:git\s+(?:checkout|switch|restore|reset|apply|am|merge|rebase)|npm\s+(?:install|i|ci)|pnpm\s+(?:install|i)|yarn\s+(?:install|add))\b/.test(command);
 }
 function extractDeepInterviewCommandWriteTargets(command) {
-    const targets = extractDeepInterviewCommandRedirectTargets(command);
+    const assignments = extractCommandLiteralAssignments(command);
+    const targets = extractDeepInterviewCommandRedirectTargets(command)
+        .map((target) => resolveCommandRedirectTarget(target, assignments));
     for (const match of command.matchAll(/\btee\s+(?:-a\s+)?(["']?)([^\s&|;<>]+)\1/g)) {
         const candidate = safeString(match[2]).trim();
         if (candidate)
-            targets.push(candidate);
+            targets.push(resolveCommandRedirectTarget(candidate, assignments));
     }
     return targets;
 }
@@ -2262,21 +2323,45 @@ function isAllowedDeepInterviewBashWrite(cwd, command) {
     return targets.length > 0 && targets.every((target) => isAllowedDeepInterviewArtifactPath(cwd, target));
 }
 async function readActiveDeepInterviewStateForPreToolUse(cwd, stateDir, sessionId, threadId) {
+    const canonicalState = sessionId
+        ? await readVisibleSkillActiveStateForStateDir(stateDir, sessionId)
+        : await readSkillActiveState(join(stateDir, SKILL_ACTIVE_STATE_FILE));
+    if (!canonicalState)
+        return null;
     const modeState = sessionId
         ? await readStopSessionPinnedState("deep-interview-state.json", cwd, sessionId, stateDir)
         : await readJsonIfExists(join(stateDir, "deep-interview-state.json"));
-    if (!isActiveDeepInterviewPhase(modeState) || !modeState)
+    if (isActiveDeepInterviewPhase(modeState) && modeState && modeStateMatchesSkillStopContext(modeState, cwd, sessionId)) {
+        const hasActiveDeepInterviewSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "deep-interview"
+            && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
+        if (hasActiveDeepInterviewSkill)
+            return modeState;
+    }
+    const autopilotState = sessionId
+        ? await readStopSessionPinnedState("autopilot-state.json", cwd, sessionId, stateDir)
+        : await readJsonIfExists(join(stateDir, "autopilot-state.json"));
+    if (!autopilotState || autopilotState.active !== true)
         return null;
-    if (!modeStateMatchesSkillStopContext(modeState, cwd, sessionId))
+    const autopilotMode = safeString(autopilotState.mode).trim();
+    if (autopilotMode && autopilotMode !== "autopilot")
         return null;
-    const canonicalState = sessionId
-        ? await readVisibleSkillActiveStateForStateDir(stateDir, sessionId)
-        : await readSkillActiveState(join(stateDir, SKILL_ACTIVE_STATE_FILE));
-    if (!canonicalState)
+    if (!modeStateMatchesSkillStopContext(autopilotState, cwd, sessionId))
+        return null;
+    const terminalAutopilotRunState = await readCanonicalTerminalRunStateForStop(cwd, sessionId, "autopilot");
+    if (terminalAutopilotRunState)
         return null;
-    const hasActiveDeepInterviewSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "deep-interview"
+    const autopilotStatePhase = safeString(autopilotState.current_phase ?? autopilotState.currentPhase).trim().toLowerCase();
+    const autopilotIsDeepInterview = normalizeAutopilotPhase(autopilotStatePhase) === "deep-interview";
+    const hasDeepInterviewScopedAutopilotSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "autopilot"
+        && normalizeAutopilotPhase(safeString(entry.phase).trim().toLowerCase()) === "deep-interview"
+        && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
+    const hasActiveAutopilotSkill = listActiveSkills(canonicalState).some((entry) => (entry.skill === "autopilot"
         && matchesSkillStopContext(entry, canonicalState, sessionId, threadId)));
-    return hasActiveDeepInterviewSkill ? modeState : null;
+    if (!hasActiveAutopilotSkill)
+        return null;
+    if (!autopilotIsDeepInterview && !hasDeepInterviewScopedAutopilotSkill)
+        return null;
+    return autopilotState;
 }
 async function readActiveRalplanStateForPreToolUse(cwd, stateDir, sessionId, threadId) {
     const modeState = sessionId
@@ -2342,12 +2427,29 @@ async function buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir, reso
     const command = readPreToolUseCommand(payload);
     const pathCandidates = readPreToolUsePathCandidates(payload);
     let blocked = false;
+    let blockedDetail = "implementation/write tools are blocked until an explicit execution handoff workflow is activated";
     if (toolName === "Bash") {
         blocked = !isAllowedRalplanBashWrite(cwd, command);
+        if (blocked) {
+            const targets = extractDeepInterviewCommandWriteTargets(command);
+            const blockedTarget = targets.find((target) => !isAllowedRalplanArtifactPath(cwd, target));
+            blockedDetail = blockedTarget
+                ? `write target ${blockedTarget} is not under allowed planning artifact paths (${RALPLAN_ALLOWED_WRITE_PREFIXES.join(", ")})`
+                : "Bash write intent did not identify an allowed planning artifact path";
+        }
     }
     else if (PLANNING_MODE_IMPLEMENTATION_TOOL_NAMES.has(toolName)) {
-        blocked = pathCandidates.length === 0
-            || !pathCandidates.every((candidate) => isAllowedRalplanArtifactPath(cwd, candidate));
+        if (pathCandidates.length === 0) {
+            blocked = true;
+            blockedDetail = `${toolName} did not include a file path; only planning artifact paths are allowed`;
+        }
+        else {
+            const blockedPath = pathCandidates.find((candidate) => !isAllowedRalplanArtifactPath(cwd, candidate));
+            blocked = blockedPath !== undefined;
+            if (blockedPath !== undefined) {
+                blockedDetail = `path ${blockedPath} is not under allowed planning artifact paths (${RALPLAN_ALLOWED_WRITE_PREFIXES.join(", ")})`;
+            }
+        }
     }
     if (!blocked)
         return null;
@@ -2359,7 +2461,7 @@ async function buildRalplanPreToolUseBoundaryOutput(payload, cwd, stateDir, reso
         : "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.`,
+        reason: `${planningModeLabel} is active (phase: ${phase}); implementation/write tools are blocked until an explicit execution handoff workflow is activated; ${blockedDetail}.`,
         hookSpecificOutput: {
             hookEventName: "PreToolUse",
             additionalContext: `${planningModeDescription}. `
@@ -2383,8 +2485,9 @@ async function buildDeepInterviewPreToolUseBoundaryOutput(payload, cwd, stateDir
         blocked = !isAllowedDeepInterviewBashWrite(cwd, command);
     }
     else if (DEEP_INTERVIEW_IMPLEMENTATION_TOOL_NAMES.has(toolName)) {
-        blocked = pathCandidates.length === 0
-            || !pathCandidates.every((candidate) => isAllowedDeepInterviewArtifactPath(cwd, candidate));
+        const candidates = collectImplementationToolPathCandidates(payload, toolName, pathCandidates);
+        blocked = candidates.length === 0
+            || !candidates.every((candidate) => isAllowedDeepInterviewArtifactPath(cwd, candidate));
     }
     if (!blocked)
         return null;
@@ -3217,18 +3320,35 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     if (hookEventName === "SessionStart" && nativeSessionId) {
         const transcriptPath = safeString(payload.transcript_path ?? payload.transcriptPath).trim();
         const subagentSessionStart = readNativeSubagentSessionStartMetadata(transcriptPath);
-        if (subagentSessionStart && canonicalSessionId) {
+        if (subagentSessionStart) {
+            // A native child/subagent SessionStart carries a parent_thread_id in its
+            // transcript session_meta. Treat it as a child-agent lifecycle event for
+            // notification suppression and subagent tracking even when the canonical
+            // leader session has not been reconciled yet (#2831). A child start must
+            // never promote itself into a root/leader session or emit an independent
+            // session-start notification at session/minimal verbosity.
             isSubagentSessionStart = true;
-            const belongsToCanonicalSession = await nativeSubagentSessionStartBelongsToCanonicalSession(cwd, canonicalSessionId, currentSessionState, subagentSessionStart);
-            if (belongsToCanonicalSession) {
-                resolvedNativeSessionId = nativeSessionId;
-                await recordNativeSubagentSessionStart(cwd, canonicalSessionId, nativeSessionId, subagentSessionStart, transcriptPath);
+            if (canonicalSessionId) {
+                const belongsToCanonicalSession = await nativeSubagentSessionStartBelongsToCanonicalSession(cwd, canonicalSessionId, currentSessionState, subagentSessionStart);
+                if (belongsToCanonicalSession) {
+                    resolvedNativeSessionId = nativeSessionId;
+                    await recordNativeSubagentSessionStart(cwd, canonicalSessionId, nativeSessionId, subagentSessionStart, transcriptPath);
+                }
+                else {
+                    skipCanonicalSessionStartContext = true;
+                    resolvedNativeSessionId =
+                        safeString(currentSessionState?.native_session_id).trim() || nativeSessionId;
+                    await recordIgnoredNativeSubagentSessionStart(cwd, canonicalSessionId, nativeSessionId, subagentSessionStart, transcriptPath);
+                }
             }
             else {
+                // No canonical leader session is resolved in this worktree yet. Still
+                // register the child thread under its parent so its later Stop is
+                // recognized as subagent-scoped, skip leader SessionStart context, and
+                // do not reconcile the child as a new root session.
                 skipCanonicalSessionStartContext = true;
-                resolvedNativeSessionId =
-                    safeString(currentSessionState?.native_session_id).trim() || nativeSessionId;
-                await recordIgnoredNativeSubagentSessionStart(cwd, canonicalSessionId, nativeSessionId, subagentSessionStart, transcriptPath);
+                resolvedNativeSessionId = nativeSessionId;
+                await recordNativeSubagentSessionStart(cwd, canonicalSessionId, nativeSessionId, subagentSessionStart, transcriptPath);
             }
         }
         else {