oh-my-codex 0.19.0 → 0.19.1

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":"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;AAymKD,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;AA83CD,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"}

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

@@ -2821,6 +2821,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;
@@ -6030,6 +6039,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 +6185,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 +6244,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 +6362,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 +6383,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 +6413,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)
@@ -7380,6 +7397,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 +8084,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;