@openclaw/codex 2026.8.1-beta.3 → 2026.8.1

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

@@ -1,9 +1,9 @@
-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 { Ct as retainCodexAppServerLiveThread, Ht as isJsonObject, St as releaseCodexAppServerLiveThread, ht as claimCodexAppServerLiveThread } from "./shared-client-kNkljY-R.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-CVPvp9dL.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-C75Yiiwc.js";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-D80UZiJ_.js";
 import { asFiniteNumber, asNonArrayRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import fs from "node:fs/promises";
 import path from "node:path";
@@ -12,9 +12,9 @@ import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, embeddedAgentLog, emitAgentEvent, forma
 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 { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 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
@@ -570,7 +570,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 +582,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 +644,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 +655,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({
@@ -866,6 +872,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 +976,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 +1179,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 +1271,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 +1306,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 +1353,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 +1381,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 +1405,7 @@ var CodexEventProjection = class {
 				userAuthorization,
 				rationale,
 				actionType: action ? readStringField(action, "type") : void 0,
-				command: guardianActionCommand(action)
+				command
 			}
 		});
 		if (reviewId && targetItemId && status) {
@@ -1361,6 +1429,7 @@ var CodexEventProjection = class {
 				}
 			});
 		}
+		if (method.endsWith("/completed") && this.activeGuardianReview?.reviewId === reviewId) this.activeGuardianReview = void 0;
 	}
 	handleGuardianWarning(params) {
 		this.flushPendingGuardianWarning();
@@ -1377,6 +1446,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 +1482,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 +1621,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 +2236,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 +2253,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 +2285,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 +2294,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 +2340,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,7 +2358,12 @@ 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);
@@ -2528,6 +2675,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 +2741,7 @@ var Monitor = class {
 		}
 		return {
 			parentThreadId: readThreadParentThreadId(thread),
+			agentPath: normalizeOptionalString(readStringField(readThreadSpawnSource(thread), "agent_path")),
 			completion,
 			fallbackCompletion,
 			resumable,
@@ -2624,6 +2773,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 +2788,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 +2806,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 +2834,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 +2906,7 @@ var Monitor = class {
 				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				recoveryAttempt: 0,
 				terminal: false,
+				nativeCompletionDelivered: false,
 				settledWithoutCompletion: false,
 				completionDeliveryAttempt: 0,
 				deliveringCompletion: false
@@ -2821,6 +2993,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 +3143,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 +3220,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 +3230,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 +3399,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 };

package/dist/{node-exec-server.runtime-Bsu1LdFZ.js → node-exec-server.runtime-DXrqpw1c.js}

@@ -1,6 +1,5 @@
-import { z as closeCodexAppServerTransportAndWait } from "./shared-client-Dw-rzii0.js";
-import { t as createStdioTransport } from "./transport-stdio-DhoGy33Z.js";
-import { n as resolveManagedCodexAppServerStartOptions, r as resolveManagedCodexNativeCommand, t as isManagedCodexDesktopCommand } from "./managed-binary-By4FZC6i.js";
+import { n as resolveManagedCodexAppServerStartOptions, r as resolveManagedCodexNativeCommand, t as isManagedCodexDesktopCommand } from "./managed-binary-ZkGodW19.js";
+import { i as closeCodexAppServerTransportAndWait, t as createStdioTransport } from "./transport-stdio-C7-s9TLG.js";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { mkdir } from "node:fs/promises";
 import path from "node:path";
@@ -125,7 +124,8 @@ async function runCodexNodeExecServer(params) {
 				customAllowedPatterns: [NODE_EXEC_SERVER_PLATFORM_ENVIRONMENT]
 			}).allowed;
 			if (io.signal.aborted) throw nodeExecServerAbortError(io.signal);
-			const child = createStdioTransport({
+			params.assertExecAuthorized();
+			const child = await createStdioTransport({
 				transport: "stdio",
 				command: native,
 				commandSource: "resolved-managed",
@@ -138,7 +138,10 @@ async function runCodexNodeExecServer(params) {
 					...process.platform === "win32" ? { USERPROFILE: dir } : {}
 				},
 				clearEnv: ["NODE_OPTIONS"]
-			}, baseEnv);
+			}, baseEnv, () => {
+				if (io.signal.aborted) throw nodeExecServerAbortError(io.signal);
+				params.assertExecAuthorized();
+			});
 			child.stdin.on("error", (error) => {
 				rejectDisconnected(error);
 			});

package/dist/{plugin-approval-roundtrip-C75Yiiwc.js → plugin-approval-roundtrip-D80UZiJ_.js}

@@ -1,4 +1,4 @@
-import { S as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-Dw-rzii0.js";
+import { F as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-kNkljY-R.js";
 import { isApprovalNotFoundError, toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts