oh-my-codex 0.21.13 → 0.21.15

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

@@ -7,7 +7,7 @@ import { fileURLToPath, 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 { fenceNativeSubagentAuthorities, forceGlobalAuthorityDenial, consumeDirectChildReopenContext, isTrustedSubagentThread, readSubagentSessionSummary, readSubagentTrackingState, recordNativeSubagentAuthorityObservation, recordSubagentTurnForSession, repairPersistedRootIdentity, quarantinePersistedRootAuthority, revokeNativeSubagentAuthorities, resolveInstalledRoleName, } from "../subagents/tracker.js";
+import { fenceNativeSubagentAuthorities, forceGlobalAuthorityDenial, consumeDirectChildReopenContext, isTrustedSubagentThread, readSubagentSessionSummary, readSubagentTrackingState, recordNativeSubagentAuthorityObservation, recordSubagentTurnForSession, recordSubagentTurnForSessionPartitions, repairPersistedRootIdentity, quarantinePersistedRootAuthority, revokeNativeSubagentAuthorities, resolveInstalledRoleName, } from "../subagents/tracker.js";
 import { readRoleRoutingMarker, writeRoleRoutingMarker } from "../subagents/role-routing-marker.js";
 import { reconcileRalplanAdvisory, observeRalplanAdvisoryPrompt, } from "../ralplan/advisory.js";
 import { activateOrResumeRalplanAdvisory } from "../ralplan/advisory-activation.js";
@@ -39,6 +39,7 @@ import { dispatchHookEventRuntime } from "../hooks/extensibility/runtime.js";
 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 { sessionModelInstructionsPath } from "../hooks/agents-overlay.js";
 import { readAutoresearchCompletionStatus, readAutoresearchModeStateForActiveDecision } from "../autoresearch/skill-validation.js";
 import { deriveAutopilotChildPhase, normalizeAutopilotPhase } from "../autopilot/fsm.js";
 import { CONDUCTOR_ORCHESTRATION_METADATA_PREFIXES, LEADER_CONDUCTOR_BLOCK, LEADER_CONDUCTOR_REUSE_AND_LEDGER_GUIDANCE, NATIVE_SUBAGENT_SUPPORT_BLOCKER_FILE, actionKindForConductorArtifact, authorizeConductorAction, buildRoleRoutingUnavailableGuidance, buildUnsupportedNativeSubagentGuidance, canonicalizeNativeCollaborationToolName, classifyConductorArtifactKind, parseNativeSubagentResultDisposition, resolveNativeSubagentSupportStatus } from "../leader/contract.js";
@@ -449,6 +450,7 @@ function readHookEventName(payload) {
         || raw === "UserPromptSubmit"
         || raw === "PreCompact"
         || raw === "PostCompact"
+        || raw === "SubagentStop"
         || raw === "Stop") {
         return raw;
     }
@@ -472,6 +474,8 @@ export function mapCodexHookEventToOmxEvent(hookEventName) {
             return "pre-compact";
         case "PostCompact":
             return "post-compact";
+        case "SubagentStop":
+            return "subagent-stop";
         case "Stop":
             return "stop";
         default:
@@ -605,9 +609,11 @@ function sanitizePayloadForHookContext(payload, hookEventName, canonicalSessionI
         delete sanitized.text;
         return sanitized;
     }
-    if (hookEventName === "Stop") {
+    if (hookEventName === "Stop" || hookEventName === "SubagentStop") {
         delete sanitized.stop_hook_active;
         delete sanitized.stopHookActive;
+    }
+    if (hookEventName === "Stop") {
         delete sanitized.sessionId;
         sanitized.session_id = canonicalSessionId.trim() || safeString(payload.session_id ?? payload.sessionId).trim();
     }
@@ -1789,6 +1795,21 @@ async function buildPersistedSubagentReopenContext(cwd, sessionId, options) {
 }
 async function buildSessionStartContext(cwd, sessionId, options = {}) {
     const sections = [];
+    let startupInstructions = "";
+    const startupFile = process.env.OMX_STARTUP_MODEL_INSTRUCTIONS_FILE;
+    if (readSessionStartSource(options.payload) === "startup" && startupFile
+        && resolve(startupFile) === sessionModelInstructionsPath(cwd, sessionId)) {
+        try {
+            startupInstructions = await readFile(startupFile, "utf-8");
+        }
+        catch {
+            // Missing launch evidence must preserve hook-delivered memory.
+        }
+    }
+    const startupMemory = startupInstructions.match(/(?:^|\n)\*\*Project Context:\*\*\r?\n([\s\S]*?)(?=\r?\n\r?\n|$)/)?.[1] ?? "";
+    const alreadyInStartupInstructions = (label, value) => startupMemory.split(/\r?\n/).some(line => line.trim().replace(/\s+/g, " ") === `- ${label}: ${value}`);
+    const startupPriority = startupInstructions.match(/(?:^|\n)\*\*Priority Notes:\*\*\r?\n([\s\S]*?)(?=\r?\n\r?\n|$)/)?.[1]
+        .replace(/\s+/g, " ").trim();
     sections.push(buildExecutionEnvironmentSection(cwd, {
         hookEventName: options.hookEventName,
         payload: options.payload,
@@ -1831,16 +1852,16 @@ async function buildSessionStartContext(cwd, sessionId, options = {}) {
         const summary = [];
         const relativeMemoryPath = relative(cwd, projectMemoryPath).replace(/\\/g, "/");
         summary.push(`- source: ${relativeMemoryPath === "project-memory.json" ? "project-memory.json" : ".omx/project-memory.json"}`);
-        if (techStack)
+        if (techStack && !alreadyInStartupInstructions("Stack", techStack))
             summary.push(`- stack: ${techStack}`);
-        if (conventions)
+        if (conventions && !alreadyInStartupInstructions("Conventions", conventions))
             summary.push(`- conventions: ${conventions}`);
-        if (build)
+        if (build && !alreadyInStartupInstructions("Build", build))
             summary.push(`- build: ${build}`);
         if (directives.length > 0) {
             const firstDirective = directives[0];
             const directive = safeContextSnippet(firstDirective.directive);
-            if (directive)
+            if (directive && !alreadyInStartupInstructions("Directive", directive))
                 summary.push(`- directive: ${directive}`);
         }
         if (notes.length > 0) {
@@ -1867,7 +1888,7 @@ async function buildSessionStartContext(cwd, sessionId, options = {}) {
                     .map((line) => line.trim())
                     .filter(Boolean)
                     .join(" ");
-                if (section) {
+                if (section && startupPriority !== section.replace(/\s+/g, " ")) {
                     sections.push(`[Priority notes]\n- ${section.slice(0, 220)}`);
                 }
             }
@@ -20952,6 +20973,75 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
     const cwd = options.cwd ?? (safeString(payload.cwd).trim() || process.cwd());
     const reconcileAdvisory = options.reconcileRalplanAdvisoryFn ?? reconcileRalplanAdvisory;
     const omxEventName = mapCodexHookEventToOmxEvent(hookEventName);
+    if (hookEventName === "SubagentStop") {
+        // This event names the parent session and child agent separately; it is not a leader Stop.
+        const parentSessionId = readStrictStopPayloadSessionId(payload);
+        const agentId = normalizeSessionId(safeString(payload.agent_id).trim());
+        let sessionId = null;
+        let pluginDiscoveryCwd;
+        if (parentSessionId && agentId && agentId !== parentSessionId) {
+            const authoritativeTeamWorker = hasRawTeamWorkerDeclaration()
+                ? await resolveAuthoritativeTeamWorkerContext(cwd)
+                : null;
+            if (authoritativeTeamWorker) {
+                // Team workers can own child agents without the shared leader pointer or tracker summary.
+                sessionId = parentSessionId;
+                pluginDiscoveryCwd = authoritativeTeamWorker.canonicalLeaderCwd;
+            }
+            else {
+                const pointer = await readSessionPointer(resolveSessionPointerContext(cwd));
+                if (pointer.status === "usable" && pointer.state && !sessionPointerAliases(pointer.state).has(agentId)) {
+                    const candidateSessionId = pointer.state.session_id;
+                    const summary = await readSubagentSessionSummary(cwd, candidateSessionId);
+                    if (payloadMatchesSessionPointer(parentSessionId, pointer.state)
+                        || summary?.allThreadIds.includes(parentSessionId)) {
+                        sessionId = candidateSessionId;
+                    }
+                }
+            }
+        }
+        if (sessionId && agentId) {
+            try {
+                await recordSubagentTurnForSessionPartitions(cwd, {
+                    sessionId,
+                    threadId: agentId,
+                    turnId: readPayloadTurnId(payload) || undefined,
+                    kind: "subagent",
+                    mode: safeString(payload.agent_type).trim() || undefined,
+                    completed: true,
+                    completionSource: "native_stop_event",
+                });
+            }
+            catch (error) {
+                await logNativeHookCliError(cwd, "native_subagent_completion_tracking_error", error, payload, { agent_id: agentId });
+                return { hookEventName, omxEventName, skillState: null, outputJson: null };
+            }
+            if (!shouldSuppressSubagentLifecycleHookDispatch()) {
+                try {
+                    await dispatchHookEventRuntime({
+                        event: buildNativeHookEvent(omxEventName, {
+                            ...buildBaseContext(cwd, payload, hookEventName, sessionId),
+                            native_session_id: agentId,
+                            codex_session_id: agentId,
+                            omx_session_id: sessionId,
+                        }, {
+                            session_id: sessionId,
+                            thread_id: agentId,
+                            turn_id: readPayloadTurnId(payload) || undefined,
+                            mode: safeString(payload.agent_type).trim() || undefined,
+                        }),
+                        cwd,
+                        ...(pluginDiscoveryCwd ? { pluginDiscoveryCwd } : {}),
+                        allowTeamWorkerSideEffects: false,
+                    });
+                }
+                catch (error) {
+                    await logNativeHookCliError(cwd, "native_subagent_completion_dispatch_error", error, payload, { agent_id: agentId });
+                }
+            }
+        }
+        return { hookEventName, omxEventName, skillState: null, outputJson: null };
+    }
     // #3497 / C1 boundary: documented-leader PreToolUse hard gate removed.
     if (hookEventName === "PreToolUse" && safeString(payload.tool_name).trim() === "Bash") {
         void payload;
@@ -21100,7 +21190,18 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
             // never promote itself into a root/leader session or emit an independent
             // session-start notification at session/minimal verbosity.
             isSubagentSessionStart = true;
-            if (canonicalSessionId) {
+            if (authoritativeTeamWorker && authoritativeWorkerPayloadSessionId === nativeSessionId) {
+                // A Team worker shares the leader pointer but owns its native child tree.
+                // Retain descriptive child records under the transcript's immediate parent
+                // without letting this child inherit the leader's session scope.
+                canonicalSessionId = "";
+                resolvedNativeSessionId = nativeSessionId;
+                skipCanonicalSessionStartContext = true;
+                allowImplicitSessionSideEffects = false;
+                recordedNativeSubagentSessionStart = true;
+                await recordNativeSubagentSessionStart(cwd, subagentSessionStart.parentThreadId, nativeSessionId, subagentSessionStart, transcriptPath, "", "absent", implicatedChildThreadIds);
+            }
+            else if (canonicalSessionId) {
                 const belongsToCanonicalSession = await nativeSubagentSessionStartBelongsToCanonicalSession(cwd, canonicalSessionId, currentSessionState, subagentSessionStart);
                 if (belongsToCanonicalSession) {
                     resolvedNativeSessionId = nativeSessionId;
@@ -21569,6 +21670,8 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         && /^[ \t]*omx[ \t]+cancel\b/.test(readPreToolUseCommand(payload));
     if (omxEventName && !bypassGenericPreToolUsePluginDispatch && allowImplicitSessionSideEffects && allowGlobalSideEffects && !skipCanonicalSessionStartContext && !suppressNoisySubagentLifecycleDispatch) {
         const baseContext = buildBaseContext(cwd, payload, hookEventName, canonicalSessionId);
+        if (isSubagentStop)
+            baseContext.is_subagent_stop = true;
         if (resolvedNativeSessionId) {
             baseContext.native_session_id = resolvedNativeSessionId;
             baseContext.codex_session_id = resolvedNativeSessionId;
@@ -21585,6 +21688,7 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
         await dispatchHookEventRuntime({
             event,
             cwd,
+            pluginDiscoveryCwd: authoritativeTeamWorkerEvidence?.canonicalLeaderCwd,
             allowTeamWorkerSideEffects: false,
         });
     }
@@ -21730,6 +21834,7 @@ export async function dispatchCodexNativeHook(payload, options = {}) {
                     await recordSubagentTurnForSession(cwd, {
                         sessionId: canonicalSessionId.trim(),
                         threadId: threadId.trim(),
+                        turnId: readPayloadTurnId(payload) || undefined,
                         completed: true,
                         completionSource: 'native_stop_event',
                         timestamp: new Date().toISOString(),
@@ -21832,8 +21937,10 @@ async function readStdinJson() {
         };
     }
 }
-function inferHookEventNameFromMalformedInput(raw) {
-    const match = raw.match(/(?:\"|['"])?hook[_-]?event[_-]?name(?:\"|['"])?\s*:\s*(?:\"|['"])?(SessionStart|PreToolUse|PostToolUse|UserPromptSubmit|PreCompact|PostCompact|Stop)\b/i);
+function inferHookEventNameFromMalformedInput(raw, rawHookEventName) {
+    if (rawHookEventName)
+        return rawHookEventName;
+    const match = raw.match(/(?:\"|['"])?hook[_-]?event[_-]?name(?:\"|['"])?\s*:\s*(?:\"|['"])?(SessionStart|PreToolUse|PostToolUse|UserPromptSubmit|PreCompact|PostCompact|SubagentStop|Stop)\b/i);
     const value = match?.[1];
     if (!value)
         return null;
@@ -21849,13 +21956,15 @@ function buildUnparseablePreToolUseDenyOutput(reason, systemMessage) {
         },
     };
 }
-function buildMalformedStdinHookOutput(parseError, rawInput, cwd = process.cwd()) {
+function buildMalformedStdinHookOutput(parseError, rawInput, cwd = process.cwd(), rawHookEventName) {
     const reason = "OMX native hook received malformed JSON input. Preserve runtime state, inspect the emitting hook payload yourself, and retry with valid JSON.";
     const systemMessage = `${reason} stdin JSON parsing failed inside codex-native-hook: ${parseError.message}.`;
-    const inferredHookEventName = inferHookEventNameFromMalformedInput(rawInput);
+    const inferredHookEventName = inferHookEventNameFromMalformedInput(rawInput, rawHookEventName);
     if (inferredHookEventName === "PreToolUse") {
         return buildUnparseablePreToolUseDenyOutput(reason, systemMessage);
     }
+    if (inferredHookEventName === "SubagentStop")
+        return {};
     if (inferredHookEventName === "Stop" || (!inferredHookEventName && hasNativeStopRuntimeSurface(cwd))) {
         return {
             decision: "block",
@@ -21895,6 +22004,8 @@ function buildOversizedStopInactiveWorkflowOutput() {
 }
 async function buildOversizedStdinHookOutput(rawHookEventName, cwd) {
     const systemMessage = `OMX native hook rejected oversized stdin JSON before parsing; maxBytes=${MAX_NATIVE_STDIN_JSON_BYTES}.`;
+    if (rawHookEventName === "SubagentStop")
+        return {};
     if (rawHookEventName === "PreToolUse") {
         return buildUnparseablePreToolUseDenyOutput(systemMessage, systemMessage);
     }
@@ -21974,7 +22085,7 @@ export async function runCodexNativeHookCli() {
     }
     if (parseError) {
         await logNativeHookCliError(process.cwd(), "native_hook_stdin_parse_error", parseError, {}, buildRawInputLogFields(rawInput));
-        writeNativeHookJsonStdout(buildMalformedStdinHookOutput(parseError, rawInput, process.cwd()));
+        writeNativeHookJsonStdout(buildMalformedStdinHookOutput(parseError, rawInput, process.cwd(), rawHookEventName));
         return;
     }
     try {