@openclaw/codex 2026.8.1-beta.3 → 2026.8.2

package/dist/{native-subagent-monitor-GGq3RnOo.js → native-subagent-monitor-vXYUZH37.js}

@@ -1,21 +1,16 @@
-import { H as claimCodexAppServerLiveThread, J as releaseCodexAppServerLiveThread, Y as retainCodexAppServerLiveThread, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
-import { A as shouldSynthesizeToolProgressForItem, B as readNullableString$1, C as isSideEffectingNativeToolItem, D as itemTitle, E as itemStatus, F as readItem, L as readNonEmptyString, M as normalizeOptionalString$1, P as readHookOutputEntries, R as readNonEmptyStringArray, S as isNonSuccessItemStatus, T as itemName, k as shouldRecordNativeToolTranscript, w as itemKind, x as isMutatingNativeToolItem, y as auditNativeToolTerminalStatus } from "./attempt-client-cleanup-URjUlCHg.js";
-import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-CFmsKwr9.js";
-import { n as sanitizeCodexHistoryImagePayloads } from "./image-payload-sanitizer-CnfoUPCE.js";
+import { Ct as retainCodexAppServerLiveThread, Ht as isJsonObject, St as releaseCodexAppServerLiveThread, ht as claimCodexAppServerLiveThread } from "./shared-client-B1tT5U6r.js";
+import { A as shouldRecordNativeToolTranscript, C as isNonSuccessItemStatus, D as itemStatus, E as itemName, F as readHookOutputEntries, I as readItem, N as normalizeOptionalString$1, O as itemTitle, R as readNonEmptyString, S as isMutatingNativeToolItem, T as itemKind, V as readNullableString$1, b as auditNativeToolTerminalStatus, j as shouldSynthesizeToolProgressForItem, w as isSideEffectingNativeToolItem, z as readNonEmptyStringArray } from "./attempt-client-cleanup-CpVfwctT.js";
+import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-LphB8slG.js";
 import { t as resolveCodexLocalRuntimeAttribution } from "./local-runtime-attribution-B_2mnqhb.js";
-import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-C75Yiiwc.js";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-CCWQGlAI.js";
+import { n as readCodexMirroredSessionHistoryMessages } from "./session-history-C5J1AKzG.js";
 import { asFiniteNumber, asNonArrayRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
-import fs from "node:fs/promises";
 import path from "node:path";
 import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, embeddedAgentLog, emitAgentEvent, formatErrorMessage, formatToolAggregate, formatToolProgressOutput, inferToolMetaFromArgs, runAgentHarnessAfterToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { getSessionEntry, parseSqliteSessionFileMarker, resolveTranscriptSessionKeyBySessionId } from "openclaw/plugin-sdk/session-store-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { redactSensitiveFieldValue, redactToolPayloadText } from "openclaw/plugin-sdk/logging-core";
-import { readCodexSessionTranscriptEventsBeforeAdmission } from "openclaw/plugin-sdk/codex-session-transcript-runtime";
-import { readSessionTranscriptEvents } from "openclaw/plugin-sdk/session-transcript-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
-import { buildSessionContext, migrateSessionEntries, parseSessionEntries } from "openclaw/plugin-sdk/agent-sessions";
 import { createAgentHarnessTaskRuntime, deliverAgentHarnessTaskCompletion, isDurableAgentHarnessCompletionDelivery } from "openclaw/plugin-sdk/agent-harness-task-runtime";
 //#region extensions/codex/src/app-server/event-projector-tool-output.ts
 const TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS = 1e4;
@@ -114,7 +109,8 @@ function appendBoundedToolTranscriptText(currentPrefix, delta, originalLength) {
 	};
 	const textBudget = TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS - notice.length;
 	const remaining = Math.max(0, textBudget - currentPrefix.length);
-	const rawPrefix = truncateUtf16Safe(remaining > 0 ? `${currentPrefix}${truncateUtf16Safe(delta, remaining)}` : currentPrefix, textBudget);
+	const prefix = remaining > 0 ? `${currentPrefix}${truncateUtf16Safe(delta, remaining)}` : currentPrefix;
+	const rawPrefix = truncateUtf16Safe(prefix, textBudget);
 	return {
 		text: `${rawPrefix}${notice}`,
 		rawPrefix
@@ -127,7 +123,8 @@ function truncateToolTranscriptText(text, originalLength = text.length) {
 	if (originalLength <= 1e4 && text.length <= 1e4) return text;
 	const notice = toolTranscriptTruncationNotice(originalLength);
 	if (notice.length >= 1e4) return notice.slice(1, 10001);
-	return `${truncateUtf16Safe(text, TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS - notice.length)}${notice}`;
+	const textBudget = TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS - notice.length;
+	return `${truncateUtf16Safe(text, textBudget)}${notice}`;
 }
 function formatToolSummary(toolName, meta) {
 	const trimmedMeta = meta?.trim();
@@ -570,7 +567,7 @@ var CodexToolProgressProjection = class {
 		const args = itemToolArgs(item);
 		if (!toolName || !shouldEmitTranscriptToolProgress(toolName, args)) return;
 		this.resultSummaryItemIds.add(item.id);
-		const meta = this.shouldEmitToolOutput() || !isCommandBearingToolItem(item, args) ? itemMeta(item, this.toolProgressDetailMode()) : void 0;
+		const meta = this.shouldIncludeFormattedMeta(isCommandBearingToolItem(item, args)) ? itemMeta(item, this.toolProgressDetailMode()) : void 0;
 		this.emitToolResultMessage({
 			itemId: item.id,
 			text: formatToolSummary(toolName, meta)
@@ -582,9 +579,10 @@ var CodexToolProgressProjection = class {
 		const toolName = itemName(item);
 		const output = itemOutputText(item, this.output.textByItem);
 		if (!toolName || !output || !shouldEmitTranscriptToolProgress(toolName, itemToolArgs(item))) return;
+		const meta = this.shouldIncludeFormattedMeta(isCommandBearingToolItem(item, itemToolArgs(item))) ? itemMeta(item, this.toolProgressDetailMode()) : void 0;
 		this.emitToolResultMessage({
 			itemId: item.id,
-			text: formatToolOutput(toolName, itemMeta(item, this.toolProgressDetailMode()), output),
+			text: formatToolOutput(toolName, meta, output),
 			finalOutput: true,
 			isError: isNonSuccessItemStatus(itemStatus(item))
 		});
@@ -643,6 +641,7 @@ var CodexToolProgressProjection = class {
 		try {
 			Promise.resolve(this.params.onToolResult?.({
 				text,
+				...(this.params.messageChannel || this.params.messageProvider) && { channelData: { openclawToolProgressId: params.itemId } },
 				...params.isError === true ? { isError: true } : {}
 			})).catch(() => {});
 		} catch {}
@@ -653,11 +652,15 @@ var CodexToolProgressProjection = class {
 	shouldEmitToolOutput() {
 		return typeof this.params.shouldEmitToolOutput === "function" ? this.params.shouldEmitToolOutput() : this.params.verboseLevel === "full";
 	}
+	shouldIncludeFormattedMeta(commandBearing) {
+		const channel = this.params.messageChannel ?? this.params.messageProvider;
+		return !commandBearing || !channel && this.shouldEmitToolOutput();
+	}
 	emitTranscriptToolCallProgress(params) {
 		if (!shouldEmitTranscriptToolProgress(params.name, params.arguments)) return;
 		this.transcriptProgressCallIds.add(params.id);
 		const args = normalizeToolTranscriptArguments(params.arguments);
-		const meta = this.shouldEmitToolOutput() || !isCodexCommandBearingToolCall(params.name, args) ? inferToolMetaFromArgs(params.name, args, { detailMode: this.toolProgressDetailMode() }) : void 0;
+		const meta = this.shouldIncludeFormattedMeta(isCodexCommandBearingToolCall(params.name, args)) ? inferToolMetaFromArgs(params.name, args, { detailMode: this.toolProgressDetailMode() }) : void 0;
 		if (!this.params.onToolResult || !this.shouldEmitToolResult() || this.resultSummaryItemIds.has(params.id) || this.resultOutputStreamedItemIds.has(params.id)) return;
 		this.resultSummaryItemIds.add(params.id);
 		this.emitToolResultMessage({
@@ -717,85 +720,6 @@ var CodexToolProgressProjection = class {
 	}
 };
 //#endregion
-//#region extensions/codex/src/app-server/session-history.ts
-/**
-* Reads OpenClaw session history for Codex transcript mirroring and sanitizes
-* image payloads before replaying messages into the app-server projector.
-*/
-function isMissingFileError(error) {
-	return Boolean(error && typeof error === "object" && "code" in error && error.code === "ENOENT");
-}
-/** Returns sanitized session-context messages for a Codex mirrored session file. */
-async function readCodexMirroredSessionHistoryMessages(target, admission) {
-	try {
-		const entries = await readCodexMirroredSessionEntries(target, admission);
-		if (entries.length === 0) return [];
-		const firstEntry = entries[0];
-		if (firstEntry?.type !== "session") return [];
-		if (typeof firstEntry.id !== "string") return;
-		if (firstEntry.id !== target.sessionId) return [];
-		migrateSessionEntries(entries);
-		return sanitizeCodexHistoryImagePayloads(buildSessionContext(entries.filter((entry) => {
-			return entry !== null && typeof entry === "object" && !Array.isArray(entry) && entry.type !== "session";
-		})).messages, "codex mirrored history");
-	} catch (error) {
-		if (isMissingFileError(error)) return [];
-		return;
-	}
-}
-async function readCodexMirroredSessionEntries(target, admission) {
-	if (target.sessionTarget) {
-		const { agentId, sessionId, sessionKey, storePath } = target.sessionTarget;
-		if (!agentId || !sessionId || !sessionKey || !storePath || sessionId !== target.sessionId || target.agentId !== void 0 && agentId !== target.agentId || target.sessionKey !== void 0 && sessionKey !== target.sessionKey) return [];
-		const transcriptTarget = {
-			agentId,
-			sessionId,
-			sessionKey,
-			storePath
-		};
-		return await (admission ? readCodexSessionTranscriptEventsBeforeAdmission(transcriptTarget, admission) : readSessionTranscriptEvents(transcriptTarget));
-	}
-	const sqliteMarker = parseSqliteSessionFileMarker(target.sessionFile);
-	if (sqliteMarker) {
-		if (sqliteMarker.sessionId !== target.sessionId || target.agentId !== void 0 && sqliteMarker.agentId !== target.agentId) return [];
-		const sessionKey = resolveSqliteMarkerSessionKey(target, sqliteMarker);
-		if (!sessionKey) return [];
-		const transcriptTarget = {
-			agentId: sqliteMarker.agentId,
-			sessionId: sqliteMarker.sessionId,
-			sessionKey,
-			storePath: sqliteMarker.storePath
-		};
-		return await (admission ? readCodexSessionTranscriptEventsBeforeAdmission(transcriptTarget, admission) : readSessionTranscriptEvents(transcriptTarget));
-	}
-	if (admission) {
-		if (admission.sessionId !== target.sessionId || target.agentId !== void 0 && admission.agentId !== target.agentId || target.sessionKey !== void 0 && admission.sessionKey !== target.sessionKey) return [];
-		return await readCodexSessionTranscriptEventsBeforeAdmission({
-			agentId: admission.agentId,
-			sessionId: admission.sessionId,
-			sessionKey: admission.sessionKey,
-			storePath: admission.storePath
-		}, admission);
-	}
-	return parseSessionEntries(await fs.readFile(target.sessionFile, "utf-8"));
-}
-function resolveSqliteMarkerSessionKey(target, marker) {
-	const explicitSessionKey = target.sessionKey?.trim();
-	if (explicitSessionKey) {
-		const explicitEntry = getSessionEntry({
-			agentId: marker.agentId,
-			sessionKey: explicitSessionKey,
-			storePath: marker.storePath
-		});
-		if (explicitEntry) return explicitEntry.sessionId === marker.sessionId ? explicitSessionKey : void 0;
-	}
-	return resolveTranscriptSessionKeyBySessionId({
-		agentId: marker.agentId,
-		sessionId: marker.sessionId,
-		storePath: marker.storePath
-	});
-}
-//#endregion
 //#region extensions/codex/src/app-server/event-projector-tool-transcript.ts
 const ZERO_USAGE = {
 	input: 0,
@@ -866,6 +790,7 @@ var CodexToolTranscriptProjection = class {
 		this.nativeMcpAppResultDetailsAttempted = /* @__PURE__ */ new Set();
 		this.approvalReviewsByCallId = /* @__PURE__ */ new Map();
 		this.rawNativeToolOutputByCallId = /* @__PURE__ */ new Map();
+		this.pendingRawPatchOutputIds = /* @__PURE__ */ new Set();
 		this.codeModeNativePatchInputsByCallId = /* @__PURE__ */ new Map();
 	}
 	get transcriptMessages() {
@@ -969,14 +894,18 @@ var CodexToolTranscriptProjection = class {
 			} catch {
 				return;
 			}
-			if (args) this.recordToolCall({
-				id: callId,
-				name: "apply_patch",
-				arguments: args
-			});
+			if (args) {
+				this.pendingRawPatchOutputIds.add(callId);
+				this.recordToolCall({
+					id: callId,
+					name: "apply_patch",
+					arguments: args
+				});
+			}
 			return;
 		}
 		if (type !== "custom_tool_call_output" && type !== "function_call_output" || this.namesById.get(callId) !== "apply_patch" && !this.codeModeNativePatchInputsByCallId.has(callId)) return;
+		this.pendingRawPatchOutputIds.delete(callId);
 		const text = typeof item.output === "string" ? item.output : Array.isArray(item.output) ? collectDynamicToolContentText(item.output) : "";
 		if (!text.trim()) return;
 		const codeModePatchInput = this.codeModeNativePatchInputsByCallId.get(callId);
@@ -1168,13 +1097,20 @@ var CodexToolTranscriptProjection = class {
 		this.callIds.add(params.id);
 		this.namesById.set(params.id, params.name);
 		this.progress.recordTranscriptCall(params);
-		this.messages.push(attachCodexMirrorIdentity(this.createToolCallMessage(params), `${this.turnId}:tool:${params.id}:call`));
+		const message = attachCodexMirrorIdentity(this.createToolCallMessage(params), `${this.turnId}:tool:${params.id}:call`);
+		this.messages.push(message);
+		this.options.checkpointMessage?.({ read: () => message });
 	}
 	recordToolResult(params) {
 		if (!params.id || !params.name || this.resultIds.has(params.id)) return;
 		this.resultIds.add(params.id);
 		this.progress.recordTranscriptResult(params);
-		this.messages.push(attachCodexMirrorIdentity(this.createToolResultMessage(params), `${this.turnId}:tool:${params.id}:result`));
+		const message = attachCodexMirrorIdentity(this.createToolResultMessage(params), `${this.turnId}:tool:${params.id}:result`);
+		this.messages.push(message);
+		this.options.checkpointMessage?.({
+			read: () => message,
+			ready: () => !this.pendingRawPatchOutputIds.has(params.id)
+		});
 	}
 	recordMissingToolError(missingTranscriptIds, missingTrajectoryIds) {
 		const firstMissingId = missingTranscriptIds.find((id) => Boolean(this.namesById.get(id))) ?? missingTrajectoryIds.find((id) => Boolean(this.trajectoryNamesById.get(id) ?? this.namesById.get(id)));
@@ -1253,10 +1189,34 @@ function resolveStartedAtFromDurationMs(durationMs) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-events.ts
+/** Downstream event consumers must never corrupt the canonical Codex turn projection. */
+function emitCodexAgentEvent(params, event) {
+	try {
+		emitAgentEvent({
+			runId: params.runId,
+			stream: event.stream,
+			data: event.data,
+			...params.sessionKey ? { sessionKey: params.sessionKey } : {}
+		});
+	} catch (error) {
+		embeddedAgentLog.debug("codex app-server global agent event emit failed", { error });
+	}
+	try {
+		const maybePromise = params.onAgentEvent?.(event);
+		Promise.resolve(maybePromise).catch((error) => {
+			embeddedAgentLog.debug("codex app-server agent event handler rejected", { error });
+		});
+	} catch (error) {
+		embeddedAgentLog.debug("codex app-server agent event handler threw", { error });
+	}
+}
 function guardianActionCommand(action) {
 	if (!action) return;
-	const command = readStringField(action, "command");
-	if (command) return command;
+	const directLabel = readStringField(action, "command") ?? readStringField(action, "target") ?? readStringField(action, "toolTitle") ?? readStringField(action, "reason");
+	if (directLabel) return directLabel;
+	const server = readStringField(action, "connectorName") ?? readStringField(action, "server");
+	const tool = readStringField(action, "toolName");
+	if (server && tool) return `${server}/${tool}`;
 	const argv = Array.isArray(action.argv) ? action.argv.filter((value) => typeof value === "string") : [];
 	return argv.length > 0 ? argv.join(" ") : readStringField(action, "program");
 }
@@ -1264,6 +1224,7 @@ function normalizeApprovalReviewStatus(status) {
 	return status === "inProgress" ? "in_progress" : status === "timedOut" ? "timed_out" : status;
 }
 const GUARDIAN_TIMEOUT_WARNING = "Automatic approval review timed out while evaluating the requested approval.";
+const LOG_ONLY_CODEX_WARNING_PATTERNS = [/^Configured service tier `[^`\r\n]+` is not advertised as supported for model `[^`\r\n]+` and will be omitted from requests\.$/, /^Code Mode is enabled in configuration, but model `[^`\r\n]+` does not advertise Code Mode support\. This may degrade model performance\. Disable `features\.code_mode` and `features\.code_mode_only`, or select a model whose metadata enables Code Mode\.$/];
 function projectNormalizedToolItem(params) {
 	const { item } = params;
 	if (!item || !shouldSynthesizeToolProgressForItem(item)) return;
@@ -1310,12 +1271,26 @@ var CodexEventProjection = class {
 	get guardianReviewCount() {
 		return this.reviewCount;
 	}
+	emitCompactionEnd(itemId, completed) {
+		this.emitAgentEvent({
+			stream: "compaction",
+			data: {
+				phase: "end",
+				backend: "codex-app-server",
+				completed,
+				threadId: this.threadId,
+				turnId: this.turnId,
+				itemId
+			}
+		});
+	}
 	handleGuardianReview(method, params) {
 		this.reviewCount += 1;
 		const review = isJsonObject(params.review) ? params.review : void 0;
 		const action = isJsonObject(params.action) ? params.action : void 0;
 		const reviewId = readStringField(params, "reviewId");
 		const targetItemId = readNullableString$1(params, "targetItemId");
+		const command = guardianActionCommand(action);
 		const reviewStatus = review ? readStringField(review, "status") : void 0;
 		const status = normalizeApprovalReviewStatus(reviewStatus);
 		const riskLevel = review ? readStringField(review, "riskLevel") : void 0;
@@ -1324,11 +1299,22 @@ var CodexEventProjection = class {
 		const expectedWarning = status === "timed_out" ? GUARDIAN_TIMEOUT_WARNING : rationale && riskLevel && userAuthorization && (status === "approved" || status === "denied") ? `Automatic approval review ${status} (risk: ${riskLevel}, authorization: ${userAuthorization}): ${rationale}` : void 0;
 		if (Boolean(targetItemId) && Boolean(reviewId) && this.pendingGuardianWarning === expectedWarning) this.pendingGuardianWarning = void 0;
 		else this.flushPendingGuardianWarning();
+		const threadId = readStringField(params, "threadId") ?? this.threadId;
+		const turnId = readStringField(params, "turnId") ?? this.turnId;
+		if (method.endsWith("/started")) this.activeGuardianReview = {
+			reviewId,
+			targetItemId,
+			command,
+			threadId,
+			turnId
+		};
 		this.emitAgentEvent({
 			stream: "codex_app_server.guardian",
 			data: {
 				method,
 				phase: method.endsWith("/started") ? "started" : "completed",
+				threadId,
+				turnId,
 				reviewId,
 				targetItemId,
 				decisionSource: readStringField(params, "decisionSource"),
@@ -1337,7 +1323,7 @@ var CodexEventProjection = class {
 				userAuthorization,
 				rationale,
 				actionType: action ? readStringField(action, "type") : void 0,
-				command: guardianActionCommand(action)
+				command
 			}
 		});
 		if (reviewId && targetItemId && status) {
@@ -1361,6 +1347,7 @@ var CodexEventProjection = class {
 				}
 			});
 		}
+		if (method.endsWith("/completed") && this.activeGuardianReview?.reviewId === reviewId) this.activeGuardianReview = void 0;
 	}
 	handleGuardianWarning(params) {
 		this.flushPendingGuardianWarning();
@@ -1377,6 +1364,30 @@ var CodexEventProjection = class {
 			}
 		});
 	}
+	handleWarning(params) {
+		const message = [readStringField(params, "summary") ?? readStringField(params, "message"), readStringField(params, "details")].filter(Boolean).join("\n");
+		if (LOG_ONLY_CODEX_WARNING_PATTERNS.some((pattern) => pattern.test(message))) embeddedAgentLog.warn(message);
+		else if (message) this.emitAgentEvent({
+			stream: "notice",
+			data: {
+				phase: "warning",
+				message
+			}
+		});
+	}
+	handleModelRerouted(params) {
+		const fromModel = readStringField(params, "fromModel");
+		const toModel = readStringField(params, "toModel");
+		const reason = readStringField(params, "reason");
+		if (fromModel && toModel && fromModel !== toModel) this.emitAgentEvent({
+			stream: "fallback",
+			data: {
+				fromModel,
+				toModel,
+				...reason ? { reason } : {}
+			}
+		});
+	}
 	flushPendingGuardianWarning() {
 		const pending = this.pendingGuardianWarning;
 		if (!pending) return;
@@ -1389,6 +1400,21 @@ var CodexEventProjection = class {
 			}
 		});
 	}
+	handleStrictReviewRequired(params) {
+		this.emitAgentEvent({
+			stream: "codex_app_server.guardian",
+			data: {
+				method: "autoApprovalReview/strictReviewRequired",
+				phase: "strict_review_required",
+				threadId: readStringField(params, "threadId") ?? this.activeGuardianReview?.threadId ?? this.threadId,
+				turnId: readStringField(params, "turnId") ?? this.activeGuardianReview?.turnId ?? this.turnId,
+				reviewId: this.activeGuardianReview?.reviewId,
+				targetItemId: this.activeGuardianReview?.targetItemId,
+				command: this.activeGuardianReview?.command,
+				startedAtMs: asFiniteNumber(params.startedAtMs)
+			}
+		});
+	}
 	handleHook(method, params) {
 		const run = isJsonObject(params.run) ? params.run : void 0;
 		if (!run) return;
@@ -1513,8 +1539,23 @@ function extractCodexNativeSubagentCompletionsFromText(text) {
 }
 const codexNativeSubagentNotifications = {
 	fromNotification: extractCodexNativeSubagentCompletions,
-	fromText: extractCodexNativeSubagentCompletionsFromText
+	fromText: extractCodexNativeSubagentCompletionsFromText,
+	deliveredAgentPaths: readDeliveredNativeCompletionPaths
 };
+/** Reads native delivery receipts, leaving status and result ownership with the child lifecycle. */
+function readDeliveredNativeCompletionPaths(notification) {
+	if (notification.method !== "rawResponseItem/completed") return [];
+	const params = isJsonObject(notification.params) ? notification.params : void 0;
+	const item = isJsonObject(params?.item) ? params.item : void 0;
+	if (!item || readStringField(item, "type") !== "agent_message") return extractCodexNativeSubagentCompletions(notification).map((completion) => completion.agentPath);
+	const author = readStringField(item, "author");
+	const recipient = readStringField(item, "recipient");
+	const content = item.content;
+	if (!author || !recipient || !Array.isArray(content) || content.length !== 1) return [];
+	const part = content[0];
+	if (!isJsonObject(part) || readStringField(part, "type") !== "input_text") return [];
+	return readStringField(part, "text")?.startsWith(`Message Type: FINAL_ANSWER\nTask name: ${recipient}\nSender: ${author}\nPayload:\n`) ? [author] : [];
+}
 function parseCodexNativeSubagentNotificationBody(body) {
 	let payload;
 	try {
@@ -2113,7 +2154,11 @@ var Monitor = class {
 		this.releaseRetainedClient();
 		for (const release of this.parentThreadRetentions.values()) release();
 		this.parentThreadRetentions.clear();
-		for (const state of this.parentStates.values()) state.owners.clear();
+		for (const state of this.parentStates.values()) {
+			state.owners.clear();
+			state.turnIds.clear();
+			this.deliverDetachedCompletions(state);
+		}
 		this.pendingDirectSpawnEvidence.clear();
 		for (const [parentThreadId] of this.parentStates) if (![...this.childStates.values()].some((childState) => childState.parentThreadId === parentThreadId)) this.parentStates.delete(parentThreadId);
 	}
@@ -2126,7 +2171,9 @@ var Monitor = class {
 		if (!state) {
 			state = {
 				parentThreadId,
-				owners: /* @__PURE__ */ new Map()
+				owners: /* @__PURE__ */ new Map(),
+				turnIds: /* @__PURE__ */ new Set(),
+				nativeCompletionReceipts: /* @__PURE__ */ new Set()
 			};
 			this.parentStates.set(parentThreadId, state);
 		}
@@ -2156,6 +2203,7 @@ var Monitor = class {
 				const current = registeredState.owners.get(owner);
 				if (!current || [...registeredState.owners.values()].some((other) => other !== current && other.turnId === turnId)) return;
 				current.turnId = turnId;
+				registeredState.turnIds.add(turnId);
 				this.drainPendingDirectSpawnEvidence(registeredState, current, turnId);
 				this.clearUnconsumablePendingDirectSpawnEvidence();
 			},
@@ -2164,8 +2212,15 @@ var Monitor = class {
 				registered = false;
 				const current = this.parentStates.get(parentThreadId);
 				if (current === registeredState) {
+					const turnId = current.owners.get(owner)?.turnId;
 					current.owners.delete(owner);
+					if (turnId) current.turnIds.delete(turnId);
+					if (current.owners.size === 0) {
+						current.turnIds.clear();
+						current.nativeCompletionReceipts = /* @__PURE__ */ new Set();
+					}
 					this.clearUnconsumablePendingDirectSpawnEvidence();
+					this.deliverDetachedCompletions(current);
 					this.pruneParentIfUnused(current);
 				}
 			}
@@ -2203,6 +2258,11 @@ var Monitor = class {
 		const startedThread = isJsonObject(params?.thread) ? params.thread : void 0;
 		const threadId = readStringField(params, "threadId")?.trim() ?? readStringField(startedThread, "id")?.trim();
 		const threadStatus = isJsonObject(params?.status) ? normalizeIdentifier(readStringField(params.status, "type")) : void 0;
+		const parent = threadId ? this.parentStates.get(threadId) : void 0;
+		if (parent && parent.owners.size > 0 && notification.method === "turn/started") {
+			const turnId = isJsonObject(params?.turn) ? readStringField(params.turn, "id") : void 0;
+			if (turnId) parent.turnIds.add(turnId);
+		}
 		const tracksRecoveryRevision = Boolean(threadId && this.threadStatusRevisions.has(threadId));
 		if (RECOVERY_REVISION_NOTIFICATION_METHODS.has(notification.method) && threadId && tracksRecoveryRevision) this.threadStatusRevisions.get(threadId).value += 1;
 		if (!state && (!threadId || !this.parentStates.has(threadId) && !this.childStates.has(threadId) && !tracksRecoveryRevision)) return;
@@ -2216,23 +2276,30 @@ var Monitor = class {
 		}
 		if (state) this.handleClosedChild(notification, state);
 		const childState = threadId ? this.childStates.get(threadId) : void 0;
-		if (notification.method === "turn/started" && childState) this.resumeChild(childState);
+		if (notification.method === "turn/started" && childState) {
+			childState.nativeCompletionDelivered = false;
+			for (const key of childState.agentPathKeys) state?.nativeCompletionReceipts.delete(key);
+			this.resumeChild(childState);
+		}
+		if (parent && parent.turnIds.has(readStringField(params, "turnId") ?? "")) this.recordNativeCompletionDelivery(parent, notification);
 		if (childState && !childState.terminal) this.emitChildTaskActivity(notification, childState);
 		this.captureChildAssistantMessage(notification);
 		await this.handleChildTurnCompletion(notification);
-		if (notification.method === "thread/status/changed" && threadId && threadStatus) if (threadStatus !== "systemerror") {
-			if (childState) this.clearSystemErrorFallback(childState);
-		} else {
-			if (childState) {
-				this.resumeChild(childState, { scheduleRecovery: false });
-				this.setRecoveryFallback(childState, systemErrorFallbackCompletion(childState.childThreadId), this.now());
+		if (notification.method === "thread/status/changed" && threadId && threadStatus) {
+			if (threadStatus !== "systemerror") {
+				if (childState) this.clearSystemErrorFallback(childState);
+			} else {
+				if (childState) {
+					this.resumeChild(childState, { scheduleRecovery: false });
+					this.setRecoveryFallback(childState, systemErrorFallbackCompletion(childState.childThreadId), this.now());
+				}
+				this.reconcileChildThread(threadId).catch((error) => {
+					this.logRecoveryFailure(threadId, error);
+					return false;
+				}).then((reconciled) => {
+					if (!reconciled && childState && this.childStates.get(threadId) === childState) this.scheduleRecoveryPoll(childState);
+				});
 			}
-			this.reconcileChildThread(threadId).catch((error) => {
-				this.logRecoveryFailure(threadId, error);
-				return false;
-			}).then((reconciled) => {
-				if (!reconciled && childState && this.childStates.get(threadId) === childState) this.scheduleRecoveryPoll(childState);
-			});
 		}
 		await this.handleCompletionNotification(notification);
 	}
@@ -2528,6 +2595,7 @@ var Monitor = class {
 				this.unregisterChild(childState);
 				return false;
 			}
+			if (recovery.agentPath) this.registerAgentPath(childState, recovery.agentPath);
 			if (recovery.threadState === "active") {
 				this.observeActiveChild(childState);
 				return false;
@@ -2593,6 +2661,7 @@ var Monitor = class {
 		}
 		return {
 			parentThreadId: readThreadParentThreadId(thread),
+			agentPath: normalizeOptionalString(readStringField(readThreadSpawnSource(thread), "agent_path")),
 			completion,
 			fallbackCompletion,
 			resumable,
@@ -2624,6 +2693,10 @@ var Monitor = class {
 			this.unregisterChild(childState);
 			return;
 		}
+		if (childState.nativeCompletionDelivered) {
+			this.finishCompletionDelivery(state, childState);
+			return;
+		}
 		childState.pendingCompletion = completion;
 		state.taskRuntime?.setDetachedTaskDeliveryStatusByRunId({
 			runId: codexNativeSubagentRunId(completion.childThreadId),
@@ -2635,6 +2708,7 @@ var Monitor = class {
 	async deliverPendingCompletion(state, childState) {
 		const completion = childState.pendingCompletion;
 		if (!completion || !state.requesterSessionKey || !state.taskRuntimeScope) return;
+		if (state.owners.size > 0) return;
 		if (childState.deliveringCompletion || childState.completionDeliveryTimer) return;
 		childState.deliveringCompletion = true;
 		try {
@@ -2652,13 +2726,7 @@ var Monitor = class {
 			});
 			if (this.childStates.get(childState.childThreadId) !== childState || this.parentStates.get(state.parentThreadId) !== state) return;
 			if (isDurableAgentHarnessCompletionDelivery(delivery)) {
-				childState.pendingCompletion = void 0;
-				childState.completionDeliveryAttempt = 0;
-				state.taskRuntime?.setDetachedTaskDeliveryStatusByRunId({
-					runId: codexNativeSubagentRunId(completion.childThreadId),
-					deliveryStatus: "delivered"
-				});
-				this.unregisterChild(childState);
+				this.finishCompletionDelivery(state, childState);
 				return;
 			}
 			const error = delivery.error ?? "completion delivery did not produce a parent response";
@@ -2686,6 +2754,29 @@ var Monitor = class {
 			childState.deliveringCompletion = false;
 		}
 	}
+	recordNativeCompletionDelivery(state, notification) {
+		for (const agentPath of codexNativeSubagentNotifications.deliveredAgentPaths(notification)) {
+			const key = buildParentAgentPathKey(state.parentThreadId, agentPath);
+			state.nativeCompletionReceipts.add(key);
+			const childThreadId = this.childThreadIdsByAgentPath.get(key);
+			const child = childThreadId ? this.childStates.get(childThreadId) : void 0;
+			if (!child || child.parentThreadId !== state.parentThreadId) continue;
+			child.nativeCompletionDelivered = true;
+			if (child.pendingCompletion && !child.deliveringCompletion) this.finishCompletionDelivery(state, child);
+		}
+	}
+	finishCompletionDelivery(state, child) {
+		child.pendingCompletion = void 0;
+		child.completionDeliveryAttempt = 0;
+		state.taskRuntime?.setDetachedTaskDeliveryStatusByRunId({
+			runId: codexNativeSubagentRunId(child.childThreadId),
+			deliveryStatus: "delivered"
+		});
+		this.unregisterChild(child);
+	}
+	deliverDetachedCompletions(state) {
+		for (const child of this.childStates.values()) if (child.parentThreadId === state.parentThreadId && child.pendingCompletion) this.deliverPendingCompletion(state, child);
+	}
 	scheduleCompletionDeliveryRetry(childState, error) {
 		if (!childState.pendingCompletion || childState.completionDeliveryTimer || this.childStates.get(childState.childThreadId) !== childState) return;
 		if (childState.completionDeliveryAttempt >= this.completionDeliveryMaxRetries) {
@@ -2735,6 +2826,7 @@ var Monitor = class {
 				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				recoveryAttempt: 0,
 				terminal: false,
+				nativeCompletionDelivered: false,
 				settledWithoutCompletion: false,
 				completionDeliveryAttempt: 0,
 				deliveringCompletion: false
@@ -2821,6 +2913,7 @@ var Monitor = class {
 		}
 		this.childThreadIdsByAgentPath.set(key, childState.childThreadId);
 		childState.agentPathKeys.add(key);
+		if (this.parentStates.get(childState.parentThreadId)?.nativeCompletionReceipts.has(key)) childState.nativeCompletionDelivered = true;
 	}
 	unregisterChild(childState, options = {}) {
 		this.releaseDirectChild(childState);
@@ -2970,6 +3063,7 @@ var Monitor = class {
 			const childThreadId = task.runId.slice(13).trim();
 			candidates.set(childThreadId, {
 				parentState: state,
+				nativeCompletionReceipts: state.nativeCompletionReceipts,
 				requesterSessionKey: state.requesterSessionKey,
 				childThreadId,
 				recoveryAttempt: 0,
@@ -3046,6 +3140,8 @@ var Monitor = class {
 				state = {
 					parentThreadId,
 					owners: /* @__PURE__ */ new Map(),
+					turnIds: /* @__PURE__ */ new Set(),
+					nativeCompletionReceipts: /* @__PURE__ */ new Set(),
 					requesterSessionKey: candidate.requesterSessionKey,
 					taskRuntimeScope: candidate.taskRuntimeScope,
 					agentId: candidate.agentId,
@@ -3054,11 +3150,12 @@ var Monitor = class {
 				this.prepareParentTaskRuntime(state);
 				this.parentStates.set(parentThreadId, state);
 			}
-			const childState = this.registerChildThread(state, candidate.childThreadId);
+			const childState = this.registerChildThread(state, candidate.childThreadId, recovery.agentPath ? { agentPath: recovery.agentPath } : {});
 			if (!childState) {
 				this.pruneParentIfUnused(state);
 				return;
 			}
+			if ([...childState.agentPathKeys].some((key) => candidate.nativeCompletionReceipts.has(key))) childState.nativeCompletionDelivered = true;
 			if (recovery.threadState === "active") this.observeActiveChild(childState);
 			if (recovery.threadState === "other") this.clearSystemErrorFallback(childState);
 			if (recovery.resumable) {
@@ -3222,4 +3319,4 @@ function unrefTimer(timer) {
 	if (typeof timer === "object" && timer && "unref" in timer) timer.unref();
 }
 //#endregion
-export { CodexToolProgressProjection as a, isCodexCommandBearingToolCall as c, sanitizeCodexToolResponse as d, readCodexMirroredSessionHistoryMessages as i, resolveCodexToolProgressDetailMode as l, CodexEventProjection as n, shouldEmitTranscriptToolProgress as o, CodexToolTranscriptProjection as r, inferCodexDynamicToolMeta as s, codexNativeSubagentMonitorRuntime as t, sanitizeCodexToolArguments as u };
+export { CodexToolProgressProjection as a, isCodexCommandBearingToolCall as c, sanitizeCodexToolResponse as d, CodexToolTranscriptProjection as i, resolveCodexToolProgressDetailMode as l, CodexEventProjection as n, shouldEmitTranscriptToolProgress as o, emitCodexAgentEvent as r, inferCodexDynamicToolMeta as s, codexNativeSubagentMonitorRuntime as t, sanitizeCodexToolArguments as u };