oh-my-codex 0.18.2 → 0.18.4

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":"AAwCA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AA6BtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAkClE,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;AA4RD,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;AAm5BD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMnE;AA6lDD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAiRnC;AAOD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AA2ED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuC3D"}
+{"version":3,"file":"codex-native-hook.d.ts","sourceRoot":"","sources":["../../src/scripts/codex-native-hook.ts"],"names":[],"mappings":"AAyCA,OAAO,EAIL,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAC;AA8BtC,OAAO,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAmClE,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;AA4RD,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;AAg8BD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAMnE;AA+mDD,wBAAsB,uBAAuB,CAC3C,OAAO,EAAE,gBAAgB,EACzB,OAAO,GAAE,yBAA8B,GACtC,OAAO,CAAC,wBAAwB,CAAC,CAqRnC;AAOD,wBAAgB,2BAA2B,CACzC,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAGT;AA2ED,wBAAsB,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC,CAuC3D"}

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

@@ -8,11 +8,12 @@ import { SKILL_ACTIVE_STATE_FILE, extractSessionIdFromInitializedStatePath, getS
 import { 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, readTeamManifestV2, readTeamPhase, writeTeamLeaderAttention, writeTeamPhase, } from "../team/state.js";
+import { appendTeamEvent, readTeamLeaderAttention, readTeamConfig, readTeamManifestV2, readTeamPhase, writeTeamLeaderAttention, writeTeamPhase, } from "../team/state.js";
 import { omxNotepadPath, resolveProjectMemoryPath } from "../utils/paths.js";
 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 { 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";
@@ -32,6 +33,7 @@ import { triagePrompt } from "../hooks/triage-heuristic.js";
 import { readTriageConfig } from "../hooks/triage-config.js";
 import { readTriageState, writeTriageState, shouldSuppressFollowup, promptSignature, } from "../hooks/triage-state.js";
 import { isPendingDeepInterviewQuestionEnforcement, reconcileDeepInterviewQuestionEnforcementFromAnsweredRecords, } from "../question/deep-interview.js";
+import { readAutopilotDeepInterviewQuestionWaitState } from "../question/autopilot-wait.js";
 import { buildDocumentRefreshAdvisoryOutput, evaluateFinalHandoffDocumentRefresh, isFinalHandoffDocumentRefreshCandidate, } from "../document-refresh/enforcer.js";
 import { buildExecFollowupStopOutput } from "../exec/followup.js";
 const TERMINAL_MODE_PHASES = new Set(["complete", "completed", "failed", "cancelled"]);
@@ -1389,8 +1391,25 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
     const promptPriorityMessage = buildPromptPriorityMessage(prompt);
     const matches = detectKeywords(prompt);
     const match = detectPrimaryKeyword(prompt);
-    if (!match)
-        return promptPriorityMessage;
+    if (!match) {
+        const continuedSkill = safeString(skillState?.skill).trim();
+        if (!continuedSkill)
+            return promptPriorityMessage;
+        const deepInterviewPromptActivationNote = skillState?.initialized_mode === "deep-interview"
+            ? buildDeepInterviewQuestionBridgeInstruction(cwd, payload)
+            : null;
+        const deepInterviewConfigPromptActivationNote = buildDeepInterviewConfigInstruction(cwd, skillState);
+        return [
+            `OMX native UserPromptSubmit continued active workflow skill "${continuedSkill}".`,
+            promptPriorityMessage,
+            skillState?.initialized_mode && skillState.initialized_state_path
+                ? buildSkillStateCliInstruction(skillState.initialized_mode, skillState.initialized_state_path)
+                : null,
+            deepInterviewPromptActivationNote,
+            deepInterviewConfigPromptActivationNote,
+            "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}.`;
@@ -1407,6 +1426,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
     const deepInterviewPromptActivationNote = skillState?.initialized_mode === "deep-interview"
         ? buildDeepInterviewQuestionBridgeInstruction(cwd, payload)
         : null;
+    const deepInterviewConfigPromptActivationNote = buildDeepInterviewConfigInstruction(cwd, skillState);
     const ultraworkPromptActivationNote = skillState?.initialized_mode === "ultrawork"
         ? "Ultrawork protocol: ground the task before editing, define pass/fail acceptance criteria, keep shared-file work local, and use direct-tool plus background evidence lanes only for truly independent work. Direct ultrawork provides lightweight verification only; Ralph owns persistence and the full verified-completion promise."
         : null;
@@ -1443,6 +1463,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             promptPriorityMessage,
             ultragoalPromptActivationNote,
             autopilotPromptActivationNote,
+            deepInterviewConfigPromptActivationNote,
             skillState.initialized_mode && skillState.initialized_state_path
                 ? buildSkillStateCliInstruction(skillState.initialized_mode, skillState.initialized_state_path)
                 : null,
@@ -1466,6 +1487,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             promptPriorityMessage,
             initializedStateMessage,
             deepInterviewPromptActivationNote,
+            deepInterviewConfigPromptActivationNote,
             ultraworkPromptActivationNote,
             ultragoalPromptActivationNote,
             autopilotPromptActivationNote,
@@ -1484,6 +1506,7 @@ function buildAdditionalContextMessage(prompt, skillState, cwd = process.cwd(),
             promptPriorityMessage,
             buildSkillStateCliInstruction(skillState.initialized_mode, skillState.initialized_state_path),
             deepInterviewPromptActivationNote,
+            deepInterviewConfigPromptActivationNote,
             ultraworkPromptActivationNote,
             ultragoalPromptActivationNote,
             autopilotPromptActivationNote,
@@ -1516,6 +1539,23 @@ async function resolveTeamStateDirForWorkerContext(cwd, workerContext) {
     }
     return null;
 }
+async function isConfirmedTeamWorkerPromptSubmitPane(cwd) {
+    const workerContext = parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_INTERNAL_WORKER))
+        || parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_WORKER));
+    if (!workerContext)
+        return false;
+    const currentPaneId = safeString(process.env.TMUX_PANE).trim();
+    if (!currentPaneId)
+        return false;
+    const config = await readTeamConfig(workerContext.teamName, cwd).catch(() => null);
+    if (!config)
+        return false;
+    const leaderPaneId = safeString(config.leader_pane_id).trim();
+    if (leaderPaneId && leaderPaneId === currentPaneId)
+        return false;
+    const workerPaneId = safeString(config.workers.find((worker) => worker.name === workerContext.workerName)?.pane_id).trim();
+    return workerPaneId !== "" && workerPaneId === currentPaneId;
+}
 async function resolveTeamWorkerStopDecision(cwd) {
     const workerContext = parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_INTERNAL_WORKER))
         || parseTeamWorkerEnv(safeString(process.env.OMX_TEAM_WORKER));
@@ -1630,6 +1670,9 @@ async function buildModeBasedStopOutput(mode, cwd, sessionId) {
     if (await readCanonicalTerminalRunStateForStop(cwd, sessionId, mode)) {
         return null;
     }
+    if (mode === "autopilot" && await readAutopilotDeepInterviewQuestionWaitState(cwd, sessionId)) {
+        return null;
+    }
     const state = await readModeStateForActiveDecision(mode, sessionId?.trim() || undefined, cwd);
     if (!state || !shouldContinueRun(state))
         return null;
@@ -1673,6 +1716,17 @@ function reportsBlockedPerformanceGoalObjectiveMismatch(state) {
     ].join(" ");
     return /objective mismatch/i.test(evidence);
 }
+function reportsBlockedUltragoalCompletedAggregateMicrogoalLoop(goal) {
+    const evidence = [
+        safeString(goal.failureReason),
+        safeString(goal.blockedReason),
+        safeString(goal.evidence),
+    ].join(" ");
+    return /aggregate codex goal/i.test(evidence)
+        && /\bcomplete(?:d)?\b/i.test(evidence)
+        && /microgoal/i.test(evidence)
+        && /\b(?:unreconcilable|mismatch|loop|already complete|already completed|blocks?)\b/i.test(evidence);
+}
 async function findActiveGoalWorkflowReconciliationRequirement(cwd) {
     const ultragoal = await readJsonIfExists(join(cwd, ".omx", "ultragoal", "goals.json"));
     const aggregateCompletion = safeObject(ultragoal?.aggregateCompletion);
@@ -1681,6 +1735,9 @@ async function findActiveGoalWorkflowReconciliationRequirement(cwd) {
     const activeUltragoal = aggregateProductComplete
         ? undefined
         : ultragoals.find((goal) => safeString(goal.status) === "in_progress" || safeString(goal.id) === safeString(ultragoal?.activeGoalId));
+    if (activeUltragoal && reportsBlockedUltragoalCompletedAggregateMicrogoalLoop(activeUltragoal)) {
+        return null;
+    }
     if (activeUltragoal) {
         const goalId = safeString(activeUltragoal.id) || "<goal-id>";
         return {
@@ -2287,6 +2344,9 @@ async function readStopAutoNudgePhase(cwd, stateDir, sessionId, threadId) {
 }
 async function buildDeepInterviewQuestionStopOutput(cwd, stateDir, sessionId, threadId) {
     await reconcileDeepInterviewQuestionEnforcementFromAnsweredRecords(cwd, sessionId);
+    if (await readAutopilotDeepInterviewQuestionWaitState(cwd, sessionId)) {
+        return null;
+    }
     const modeState = await readStopSessionPinnedState("deep-interview-state.json", cwd, sessionId, stateDir);
     if (!modeState)
         return null;
@@ -2980,8 +3040,12 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
                 triageAdditionalContext = null;
             }
         }
-        const reconcileHudForPromptSubmitFn = options.reconcileHudForPromptSubmitFn ?? reconcileHudForPromptSubmit;
-        await reconcileHudForPromptSubmitFn(cwd, { sessionId: canonicalSessionId || sessionIdForState || undefined }).catch(() => { });
+        const skipHudReconcileForTeamWorkerPane = !isSubagentPromptSubmit
+            && await isConfirmedTeamWorkerPromptSubmitPane(cwd).catch(() => false);
+        if (!skipHudReconcileForTeamWorkerPane) {
+            const reconcileHudForPromptSubmitFn = options.reconcileHudForPromptSubmitFn ?? reconcileHudForPromptSubmit;
+            await reconcileHudForPromptSubmitFn(cwd, { sessionId: canonicalSessionId || sessionIdForState || undefined }).catch(() => { });
+        }
     }
     if (omxEventName && !skipCanonicalSessionStartContext && !suppressNoisySubagentLifecycleDispatch) {
         const baseContext = buildBaseContext(cwd, payload, hookEventName, canonicalSessionId);