@openclaw/codex 2026.8.1-beta.2 → 2026.9.1-beta.1

package/dist/{native-subagent-monitor-DyTGmTUx.js → native-subagent-monitor-4Mfq2HDs.js}

@@ -1,8 +1,9 @@
-import { B as claimCodexAppServerLiveThread, K as releaseCodexAppServerLiveThread, ct as isJsonObject, q as retainCodexAppServerLiveThread } from "./shared-client-kIBbGjk4.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-DMLXUfa8.js";
-import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-ClRBije0.js";
+import { $ as releaseCodexAppServerLiveThread, et as retainCodexAppServerLiveThread, q as claimCodexAppServerLiveThread, vt as isJsonObject } from "./shared-client-DKz23hHY.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-bfsmcQ6m.js";
+import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-CFmsKwr9.js";
 import { n as sanitizeCodexHistoryImagePayloads } from "./image-payload-sanitizer-CnfoUPCE.js";
 import { t as resolveCodexLocalRuntimeAttribution } from "./local-runtime-attribution-B_2mnqhb.js";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-bUm777tR.js";
 import { asFiniteNumber, asNonArrayRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -196,7 +197,7 @@ function sanitizeCodexToolArguments(value) {
 }
 /** Sanitizes a Codex dynamic-tool response before diagnostic/event emission. */
 function sanitizeCodexToolResponse(response) {
-	return sanitizeCodexAgentEventRecord(response);
+	return sanitizeCodexAgentEventRecord({ ...response });
 }
 /** Infers compact human-readable tool metadata from Codex dynamic-tool arguments. */
 function inferCodexDynamicToolMeta(call, detailMode) {
@@ -204,17 +205,6 @@ function inferCodexDynamicToolMeta(call, detailMode) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-tool-items.ts
-function nativeToolActionFingerprint(item) {
-	if (item.type === "commandExecution" && typeof item.command === "string") return JSON.stringify({
-		type: item.type,
-		command: item.command,
-		cwd: typeof item.cwd === "string" ? item.cwd : ""
-	});
-	if (item.type === "fileChange") return JSON.stringify({
-		type: item.type,
-		changes: itemFileChanges(item)
-	});
-}
 function isNativePostToolUseRelayItem(item) {
 	switch (item.type) {
 		case "commandExecution":
@@ -434,6 +424,7 @@ var CodexToolProgressProjection = class {
 		this.sideEffectingNativeIds = /* @__PURE__ */ new Set();
 		this.sideEffectingDynamicIds = /* @__PURE__ */ new Set();
 		this.transcriptProgressCallIds = /* @__PURE__ */ new Set();
+		this.approvalTimeoutKinds = /* @__PURE__ */ new Map();
 	}
 	get outputTextByItem() {
 		return this.output.textByItem;
@@ -450,6 +441,10 @@ var CodexToolProgressProjection = class {
 	get hasPotentialSideEffects() {
 		return this.sideEffectingNativeIds.size > 0 || this.sideEffectingDynamicIds.size > 0;
 	}
+	approvalTimeoutExplanation(itemId, status) {
+		const kind = isNonSuccessItemStatus(status) && this.approvalTimeoutKinds.get(itemId);
+		return kind ? codexApprovalTimeoutText(kind) : void 0;
+	}
 	setLastToolError(error) {
 		if (!error) {
 			this.lastNativeToolError = void 0;
@@ -468,9 +463,7 @@ var CodexToolProgressProjection = class {
 			},
 			nativeMutation: {
 				mutatingAction: error.mutatingAction === true,
-				replaySafe: error.mutatingAction !== true,
-				...error.actionFingerprint ? { actionFingerprint: error.actionFingerprint } : {},
-				...error.fileTarget ? { fileTarget: error.fileTarget } : {}
+				replaySafe: error.mutatingAction !== true
 			}
 		});
 		this.lastNativeToolError = terminalResolution?.lastToolError ?? (this.lastNativeToolError?.mutatingAction && error.mutatingAction !== true ? this.lastNativeToolError : error);
@@ -537,9 +530,14 @@ var CodexToolProgressProjection = class {
 	recordNativeToolError(params) {
 		const executionStarted = params.status !== "blocked";
 		const mutatingAction = executionStarted && isMutatingNativeToolItem(params.item);
-		const actionFingerprint = mutatingAction ? nativeToolActionFingerprint(params.item) : void 0;
 		const isFailure = isNonSuccessItemStatus(params.status);
-		const error = isFailure ? itemToolError(params.item, params.status, this.output.textByItem) : void 0;
+		const approvalTimeoutExplanation = this.approvalTimeoutExplanation(params.item.id, params.status);
+		const error = isFailure ? approvalTimeoutExplanation ?? itemToolError(params.item, params.status, this.output.textByItem) : void 0;
+		const failure = error ? {
+			...approvalTimeoutExplanation ? { errorCode: "approval_timeout" } : {},
+			error,
+			...approvalTimeoutExplanation ? { timedOut: true } : {}
+		} : {};
 		const terminalResolution = this.params.observeToolTerminal?.({
 			toolCallId: params.item.id,
 			toolName: params.name,
@@ -547,11 +545,10 @@ var CodexToolProgressProjection = class {
 			...params.meta ? { meta: params.meta } : {},
 			executionStarted,
 			outcome: isFailure ? "failure" : "success",
-			...isFailure ? { failure: error ? { error } : {} } : {},
+			...isFailure ? { failure } : {},
 			nativeMutation: {
 				mutatingAction,
-				replaySafe: !mutatingAction,
-				...actionFingerprint ? { actionFingerprint } : {}
+				replaySafe: !mutatingAction
 			}
 		});
 		if (terminalResolution) {
@@ -561,9 +558,8 @@ var CodexToolProgressProjection = class {
 		if (isFailure) this.lastNativeToolError = {
 			toolName: params.name,
 			...params.meta ? { meta: params.meta } : {},
-			...error ? { error } : {},
-			...mutatingAction ? { mutatingAction: true } : {},
-			...actionFingerprint ? { actionFingerprint } : {}
+			...failure,
+			...mutatingAction ? { mutatingAction: true } : {}
 		};
 		else if (this.lastNativeToolError?.mutatingAction !== true) this.lastNativeToolError = void 0;
 	}
@@ -819,6 +815,10 @@ const MISSING_TOOL_RESULT_ERROR = "OpenClaw recorded a native Codex tool.call wi
 const NATIVE_PATCH_REJECTION_RE = /^\s*patch rejected:\s*writing outside of the project;\s*rejected by user approval settings\s*$/iu;
 const CODE_MODE_NATIVE_PATCH_SOURCE_RE = /^\s*(?:\/\/[^\r\n]*\r?\n\s*)?(?:const|let)\s+([A-Za-z_$][\w$]*)\s*=\s*await\s+tools\.apply_patch\(\s*("(?:\\[\s\S]|[^"\\])*")\s*\)\s*;?\s*text\(\s*\1\s*\)\s*;?\s*$/u;
 const CODE_MODE_NATIVE_PATCH_RESULT_RE = /^\s*Script (completed|failed)\s*\r?\nWall time\s+\d+(?:\.\d+)?\s+seconds\s*\r?\nOutput:\s*([\s\S]*?)\s*$/iu;
+const MAX_TOOL_APPROVAL_REVIEWS = 16;
+function toolApprovalReviewOutcome(state) {
+	return state.denied ? "denied" : state.unresolvedReviewIds === null || state.unresolvedReviewIds.size > 0 ? "reviewing" : "approved";
+}
 function readCodeModeNativePatchInput(source) {
 	if (typeof source !== "string") return;
 	const match = CODE_MODE_NATIVE_PATCH_SOURCE_RE.exec(source);
@@ -864,12 +864,37 @@ var CodexToolTranscriptProjection = class {
 		this.afterToolCallObservedItemIds = /* @__PURE__ */ new Set();
 		this.nativeMcpAppResultDetails = /* @__PURE__ */ new Map();
 		this.nativeMcpAppResultDetailsAttempted = /* @__PURE__ */ new Set();
+		this.approvalReviewsByCallId = /* @__PURE__ */ new Map();
 		this.rawNativeToolOutputByCallId = /* @__PURE__ */ new Map();
 		this.codeModeNativePatchInputsByCallId = /* @__PURE__ */ new Map();
 	}
 	get transcriptMessages() {
 		return this.messages;
 	}
+	recordToolApprovalReview(toolCallId, reviewId, status, review) {
+		const state = this.approvalReviewsByCallId.get(toolCallId) ?? {
+			reviews: [],
+			denied: false,
+			unresolvedReviewIds: /* @__PURE__ */ new Set()
+		};
+		state.reviews = [...state.reviews.filter((candidate) => candidate.id !== reviewId), review].slice(-16);
+		state.denied ||= [
+			"denied",
+			"timed_out",
+			"aborted"
+		].includes(status);
+		const unresolved = state.unresolvedReviewIds;
+		if (status === "in_progress") state.unresolvedReviewIds = unresolved && (unresolved.size < MAX_TOOL_APPROVAL_REVIEWS || unresolved.has(reviewId)) ? unresolved.add(reviewId) : null;
+		else unresolved?.delete(reviewId);
+		this.approvalReviewsByCallId.set(toolCallId, state);
+		return toolApprovalReviewOutcome(state);
+	}
+	finalizeToolApprovalReviews(toolCallId) {
+		const state = this.approvalReviewsByCallId.get(toolCallId);
+		if (!state) return;
+		state.unresolvedReviewIds = /* @__PURE__ */ new Set();
+		return toolApprovalReviewOutcome(state);
+	}
 	recordDynamicToolCall(params) {
 		this.recordToolCall({
 			id: params.callId,
@@ -897,16 +922,21 @@ var CodexToolTranscriptProjection = class {
 		});
 	}
 	recordNativeToolResult(item, details) {
-		if (!item || !shouldRecordNativeToolTranscript(item)) return;
+		if (!item || !shouldRecordNativeToolTranscript(item) || this.resultIds.has(item.id)) return;
 		const name = itemName(item);
-		if (name) this.recordToolResult({
-			id: item.id,
-			name,
-			text: this.rawNativeToolOutputByCallId.get(item.id) ?? itemTranscriptResultText(item, this.progress.outputTextByItem),
-			isError: isNonSuccessItemStatus(itemStatus(item)),
-			details,
-			...item.type === "webSearch" ? { resultContentSource: "network" } : {}
-		});
+		if (name) {
+			const status = itemStatus(item);
+			const approvalTimeoutExplanation = this.progress.approvalTimeoutExplanation(item.id, status);
+			this.recordToolResult({
+				id: item.id,
+				name,
+				text: approvalTimeoutExplanation ?? this.rawNativeToolOutputByCallId.get(item.id) ?? itemTranscriptResultText(item, this.progress.outputTextByItem),
+				isError: isNonSuccessItemStatus(status),
+				details,
+				...item.type === "webSearch" ? { resultContentSource: "network" } : {}
+			});
+			this.progress.approvalTimeoutKinds.delete(item.id);
+		}
 	}
 	recordRawNativeToolItem(item) {
 		const type = typeof item.type === "string" ? item.type : void 0;
@@ -985,11 +1015,24 @@ var CodexToolTranscriptProjection = class {
 			id: callId,
 			name: "apply_patch",
 			text,
-			isError: result.isError === true
+			isError: result.isError
 		}).content;
 	}
 	async recordNativeToolResultWithDetails(item) {
-		this.recordNativeToolResult(item, await this.prepareNativeMcpAppResultDetails(item));
+		const preparedDetails = await this.prepareNativeMcpAppResultDetails(item);
+		const approvalReviewState = item ? this.approvalReviewsByCallId.get(item.id) : void 0;
+		const reviewDetails = approvalReviewState ? {
+			approvalReviews: approvalReviewState.reviews,
+			approvalReviewOutcome: toolApprovalReviewOutcome(approvalReviewState)
+		} : void 0;
+		const details = reviewDetails ? isJsonObject(preparedDetails) ? {
+			...preparedDetails,
+			...reviewDetails
+		} : {
+			...preparedDetails !== void 0 ? { toolDetails: preparedDetails } : {},
+			...reviewDetails
+		} : preparedDetails;
+		this.recordNativeToolResult(item, details);
 	}
 	async prepareNativeMcpAppResultDetails(item) {
 		if (!item || item.type !== "mcpToolCall" || itemStatus(item) === "running") return;
@@ -1025,7 +1068,7 @@ var CodexToolTranscriptProjection = class {
 		}
 		this.trajectoryResultIds.add(params.item.id);
 		const toolResult = itemToolResult(params.item).result;
-		const output = itemOutputText(params.item, this.progress.outputTextByItem);
+		const output = this.progress.approvalTimeoutExplanation(params.item.id, params.status) ?? itemOutputText(params.item, this.progress.outputTextByItem);
 		this.options.trajectoryRecorder?.recordEvent("tool.result", {
 			threadId: this.threadId,
 			turnId: this.turnId,
@@ -1045,7 +1088,7 @@ var CodexToolTranscriptProjection = class {
 		if (!name || status === "running") return;
 		this.afterToolCallObservedItemIds.add(item.id);
 		const result = itemToolResult(item).result;
-		const error = itemToolError(item, status, this.progress.outputTextByItem);
+		const error = this.progress.approvalTimeoutExplanation(item.id, status) ?? itemToolError(item, status, this.progress.outputTextByItem);
 		const startedAt = resolveStartedAtFromDurationMs(item.durationMs);
 		const hookParams = {
 			toolName: name,
@@ -1077,7 +1120,8 @@ var CodexToolTranscriptProjection = class {
 					id,
 					name
 				}),
-				isError: true
+				isError: true,
+				details: { reason: "missing_tool_result" }
 			});
 		}
 		for (const id of missingTrajectoryIds) {
@@ -1139,7 +1183,6 @@ var CodexToolTranscriptProjection = class {
 		if (!name) return;
 		const item = this.trajectoryItemsById.get(firstMissingId);
 		const meta = item ? itemMeta(item, this.progress.toolProgressDetailMode()) : this.progress.getToolMeta(firstMissingId)?.meta;
-		const actionFingerprint = item ? nativeToolActionFingerprint(item) : void 0;
 		this.progress.setLastToolError({
 			toolName: name,
 			...meta ? { meta } : {},
@@ -1147,8 +1190,7 @@ var CodexToolTranscriptProjection = class {
 				id: firstMissingId,
 				name
 			}),
-			...item && isMutatingNativeToolItem(item) ? { mutatingAction: true } : {},
-			...actionFingerprint ? { actionFingerprint } : {}
+			...item && isMutatingNativeToolItem(item) ? { mutatingAction: true } : {}
 		});
 	}
 	shouldEmitAfterToolCallObservation(item) {
@@ -1211,6 +1253,41 @@ 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 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");
+}
+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.";
 function projectNormalizedToolItem(params) {
 	const { item } = params;
 	if (!item || !shouldSynthesizeToolProgressForItem(item)) return;
@@ -1257,32 +1334,146 @@ 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;
+		const userAuthorization = review ? readStringField(review, "userAuthorization") : void 0;
+		const rationale = review ? readNullableString$1(review, "rationale") : void 0;
+		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",
-				reviewId: readStringField(params, "reviewId"),
-				targetItemId: readNullableString$1(params, "targetItemId"),
+				threadId,
+				turnId,
+				reviewId,
+				targetItemId,
 				decisionSource: readStringField(params, "decisionSource"),
-				status: review ? readStringField(review, "status") : void 0,
-				riskLevel: review ? readStringField(review, "riskLevel") : void 0,
-				userAuthorization: review ? readStringField(review, "userAuthorization") : void 0,
-				rationale: review ? readNullableString$1(review, "rationale") : void 0,
-				actionType: action ? readStringField(action, "type") : void 0
+				status: reviewStatus,
+				riskLevel,
+				userAuthorization,
+				rationale,
+				actionType: action ? readStringField(action, "type") : void 0,
+				command
 			}
 		});
+		if (reviewId && targetItemId && status) {
+			const approvalReview = {
+				id: reviewId,
+				label: "Guardian",
+				status,
+				...riskLevel ? { riskLevel } : {},
+				...userAuthorization ? { userAuthorization } : {},
+				...rationale ? { rationale } : {}
+			};
+			const approvalReviewOutcome = this.toolTranscript.recordToolApprovalReview(targetItemId, reviewId, status, approvalReview);
+			this.emitAgentEvent({
+				stream: "tool",
+				data: {
+					phase: "review",
+					toolCallId: targetItemId,
+					hideFromChannelProgress: true,
+					approvalReviewOutcome,
+					review: approvalReview
+				}
+			});
+		}
+		if (method.endsWith("/completed") && this.activeGuardianReview?.reviewId === reviewId) this.activeGuardianReview = void 0;
 	}
 	handleGuardianWarning(params) {
+		this.flushPendingGuardianWarning();
+		const message = readStringField(params, "message");
+		if (message) {
+			this.pendingGuardianWarning = message;
+			return;
+		}
 		this.emitAgentEvent({
 			stream: "codex_app_server.guardian",
 			data: {
 				phase: "warning",
-				message: readStringField(params, "message")
+				message
+			}
+		});
+	}
+	handleWarning(params) {
+		const message = [readStringField(params, "summary") ?? readStringField(params, "message"), readStringField(params, "details")].filter(Boolean).join("\n");
+		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;
+		this.pendingGuardianWarning = void 0;
+		this.emitAgentEvent({
+			stream: "codex_app_server.guardian",
+			data: {
+				phase: "warning",
+				message: pending
+			}
+		});
+	}
+	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)
 			}
 		});
 	}
@@ -1344,6 +1535,8 @@ var CodexEventProjection = class {
 		if (!projection || !params.item) return;
 		const { item } = params;
 		const { name, status, args, meta, event } = projection;
+		const approvalReviewOutcome = params.phase === "result" ? this.toolTranscript.finalizeToolApprovalReviews(item.id) : void 0;
+		if (event && approvalReviewOutcome) event.data.approvalReviewOutcome = approvalReviewOutcome;
 		this.toolTranscript.recordTrajectoryEvent({
 			phase: params.phase,
 			item,
@@ -1408,8 +1601,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 {
@@ -1957,7 +2165,8 @@ function registerMonitor(params) {
 		taskRuntimeScope: params.taskRuntimeScope,
 		agentId: params.agentId,
 		claimDirectChild: params.claimDirectChild,
-		rejectPendingDirectChild: params.rejectPendingDirectChild
+		rejectPendingDirectChild: params.rejectPendingDirectChild,
+		onDirectChildAccepted: params.onDirectChildAccepted
 	});
 }
 var Monitor = class {
@@ -2007,7 +2216,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);
 	}
@@ -2020,7 +2233,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);
 		}
@@ -2030,7 +2245,8 @@ var Monitor = class {
 		const owner = Symbol("codex-native-subagent-owner");
 		state.owners.set(owner, {
 			claimDirectChild: params.claimDirectChild,
-			rejectPendingDirectChild: params.rejectPendingDirectChild
+			rejectPendingDirectChild: params.rejectPendingDirectChild,
+			onDirectChildAccepted: params.onDirectChildAccepted
 		});
 		this.prepareParentTaskRuntime(state);
 		for (const childState of this.childStates.values()) if (childState.parentThreadId === parentThreadId && childState.pendingCompletion) this.deliverPendingCompletion(state, childState);
@@ -2049,6 +2265,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();
 			},
@@ -2057,8 +2274,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);
 				}
 			}
@@ -2096,6 +2320,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;
@@ -2109,8 +2338,13 @@ 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 (childState && !childState.terminal) this.emitChildTaskActivity(notification, childState.childThreadId);
+		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") {
@@ -2129,14 +2363,17 @@ var Monitor = class {
 		}
 		await this.handleCompletionNotification(notification);
 	}
-	emitChildTaskActivity(notification, childThreadId) {
+	emitChildTaskActivity(notification, childState) {
 		const params = isJsonObject(notification.params) ? notification.params : void 0;
 		if (!params) return;
-		const runId = codexNativeSubagentRunId(childThreadId);
+		const owner = {
+			runId: codexNativeSubagentRunId(childState.childThreadId),
+			...childState.agentId ? { agentId: childState.agentId } : {}
+		};
 		if (notification.method === "item/agentMessage/delta") {
 			const delta = readStringField(params, "delta");
 			if (delta) emitAgentEvent({
-				runId,
+				...owner,
 				stream: "assistant",
 				data: { delta }
 			});
@@ -2145,7 +2382,7 @@ var Monitor = class {
 		if (notification.method === "item/reasoning/summaryTextDelta") {
 			const delta = readStringField(params, "delta");
 			if (delta) emitAgentEvent({
-				runId,
+				...owner,
 				stream: "thinking",
 				data: { delta }
 			});
@@ -2154,7 +2391,7 @@ var Monitor = class {
 		if (notification.method !== "item/started" && notification.method !== "item/completed") return;
 		const item = readItem(params.item);
 		if (item?.type === "agentMessage" && notification.method === "item/completed" && item.text) emitAgentEvent({
-			runId,
+			...owner,
 			stream: "assistant",
 			data: { text: item.text }
 		});
@@ -2163,7 +2400,7 @@ var Monitor = class {
 			item
 		});
 		if (projection?.event) emitAgentEvent({
-			runId,
+			...owner,
 			...projection.event
 		});
 	}
@@ -2287,7 +2524,7 @@ var Monitor = class {
 			const childThreadId = thread ? readStringField(thread, "id")?.trim() : void 0;
 			const agentPath = readStringField(readThreadSpawnSource(thread), "agent_path")?.trim();
 			const state = parentThreadId ? this.parentStates.get(parentThreadId) : void 0;
-			if (state && childThreadId && parentThreadId) return this.registerChildThread(parentThreadId, childThreadId, agentPath === void 0 ? {} : { agentPath }) ? state : void 0;
+			if (state && childThreadId && parentThreadId) return this.registerChildThread(state, childThreadId, agentPath === void 0 ? {} : { agentPath }) ? state : void 0;
 			return state;
 		}
 		if (notification.method === "thread/status/changed" || notification.method === "turn/started" || notification.method === "turn/completed" || notification.method === "item/agentMessage/delta") {
@@ -2319,7 +2556,7 @@ var Monitor = class {
 				for (const childThreadId of childThreadIds) accepted = Boolean(isCompletedSpawnAgentTool ? this.registerDirectSpawnChild(state, turnId, {
 					parentThreadId,
 					childThreadId
-				}, owner) : this.registerChildThread(parentThreadId, childThreadId)) && accepted;
+				}, owner) : this.registerChildThread(state, childThreadId)) && accepted;
 				if (!accepted) return;
 			}
 			return state;
@@ -2418,6 +2655,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;
@@ -2483,6 +2721,7 @@ var Monitor = class {
 		}
 		return {
 			parentThreadId: readThreadParentThreadId(thread),
+			agentPath: normalizeOptionalString(readStringField(readThreadSpawnSource(thread), "agent_path")),
 			completion,
 			fallbackCompletion,
 			resumable,
@@ -2514,6 +2753,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),
@@ -2525,6 +2768,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 {
@@ -2542,13 +2786,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";
@@ -2576,6 +2814,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) {
@@ -2596,8 +2857,8 @@ var Monitor = class {
 		}, delayMs);
 		unrefTimer(childState.completionDeliveryTimer);
 	}
-	registerChildThread(parentThreadIdInput, childThreadIdInput, options = {}) {
-		const parentThreadId = parentThreadIdInput.trim();
+	registerChildThread(state, childThreadIdInput, options = {}) {
+		const parentThreadId = state.parentThreadId;
 		const childThreadId = childThreadIdInput.trim();
 		if (!parentThreadId || !childThreadId || this.disposed) return;
 		if (options.claimDirectChild && this.threadStatusRevisions.get(childThreadId)?.terminal) return;
@@ -2620,10 +2881,12 @@ var Monitor = class {
 			childState = {
 				childThreadId,
 				parentThreadId,
+				agentId: state.agentId,
 				agentPathKeys: /* @__PURE__ */ new Set(),
 				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				recoveryAttempt: 0,
 				terminal: false,
+				nativeCompletionDelivered: false,
 				settledWithoutCompletion: false,
 				completionDeliveryAttempt: 0,
 				deliveringCompletion: false
@@ -2637,7 +2900,7 @@ var Monitor = class {
 		}
 		if (options.claimDirectChild && !childState.terminal && !childState.settledWithoutCompletion && !childState.releaseDirectChild) childState.releaseDirectChild = options.claimDirectChild(childThreadId);
 		this.registerAgentPath(childState, childThreadId);
-		this.parentStates.get(parentThreadId)?.mirror?.markAuthoritativeCompletionExpected(childThreadId);
+		state.mirror?.markAuthoritativeCompletionExpected(childThreadId);
 		const agentPath = normalizeOptionalString(options.agentPath);
 		if (agentPath) this.registerAgentPath(childState, agentPath);
 		this.scheduleRecoveryPoll(childState);
@@ -2650,11 +2913,12 @@ var Monitor = class {
 		return owners.length === 1 ? owners[0] : void 0;
 	}
 	registerDirectSpawnChild(state, turnIdInput, evidence, owner) {
-		const childState = this.registerChildThread(state.parentThreadId, evidence.childThreadId, {
+		const childState = this.registerChildThread(state, evidence.childThreadId, {
 			...evidence.agentPath === void 0 ? {} : { agentPath: evidence.agentPath },
 			...owner?.claimDirectChild ? { claimDirectChild: owner.claimDirectChild } : {}
 		});
 		if (!owner) this.bufferPendingDirectSpawnEvidence(turnIdInput, evidence);
+		else if (childState) owner.onDirectChildAccepted?.();
 		return childState;
 	}
 	bufferPendingDirectSpawnEvidence(turnIdInput, evidence) {
@@ -2669,10 +2933,12 @@ var Monitor = class {
 		const pending = this.pendingDirectSpawnEvidence.get(turnId);
 		this.pendingDirectSpawnEvidence.delete(turnId);
 		if (!pending || !owner.claimDirectChild) return;
-		for (const evidence of pending) if (evidence.parentThreadId === state.parentThreadId) this.registerChildThread(state.parentThreadId, evidence.childThreadId, {
-			...evidence.agentPath === void 0 ? {} : { agentPath: evidence.agentPath },
-			claimDirectChild: owner.claimDirectChild
-		});
+		for (const evidence of pending) if (evidence.parentThreadId === state.parentThreadId) {
+			if (this.registerChildThread(state, evidence.childThreadId, {
+				...evidence.agentPath === void 0 ? {} : { agentPath: evidence.agentPath },
+				claimDirectChild: owner.claimDirectChild
+			})) owner.onDirectChildAccepted?.();
+		}
 	}
 	hasUnboundParentOwner(parentThreadId) {
 		return [...parentThreadId ? [this.parentStates.get(parentThreadId)].filter((state) => Boolean(state)) : this.parentStates.values()].some((state) => [...state.owners.values()].some((owner) => owner.turnId === void 0));
@@ -2707,6 +2973,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);
@@ -2856,6 +3123,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,
@@ -2932,6 +3200,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,
@@ -2940,11 +3210,12 @@ var Monitor = class {
 				this.prepareParentTaskRuntime(state);
 				this.parentStates.set(parentThreadId, state);
 			}
-			const childState = this.registerChildThread(parentThreadId, 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) {
@@ -3108,4 +3379,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 { readCodexMirroredSessionHistoryMessages as a, inferCodexDynamicToolMeta as c, sanitizeCodexToolArguments as d, sanitizeCodexToolResponse as f, CodexToolTranscriptProjection as i, isCodexCommandBearingToolCall as l, CodexEventProjection as n, CodexToolProgressProjection as o, emitCodexAgentEvent as r, shouldEmitTranscriptToolProgress as s, codexNativeSubagentMonitorRuntime as t, resolveCodexToolProgressDetailMode as u };