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

package/dist/{managed-binary-By4FZC6i.js → managed-binary-DFYK4DWq.js}

@@ -4,14 +4,51 @@ import path from "node:path";
 import { constants, existsSync, readFileSync, realpathSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { expectDefined } from "openclaw/plugin-sdk/expect-runtime";
+//#region extensions/codex/src/app-server/desktop-app-paths.ts
+/** Shared path candidates for Codex's macOS desktop app bundle. */
+const MACOS_DESKTOP_CODEX_APP_PATH_CANDIDATES = [{
+	appName: "ChatGPT.app",
+	appBundlePath: "/Applications/ChatGPT.app",
+	appServerCommandPath: "/Applications/ChatGPT.app/Contents/Resources/codex",
+	bundledMarketplacePath: "/Applications/ChatGPT.app/Contents/Resources/plugins/openai-bundled",
+	computerUseServiceAppPaths: ["/Applications/ChatGPT.app/Contents/Resources/cua_node/lib/node_modules/@oai/sky/Codex Computer Use.app", "/Applications/ChatGPT.app/Contents/Resources/plugins/openai-bundled/plugins/computer-use/Codex Computer Use.app"]
+}, {
+	appName: "Codex.app",
+	appBundlePath: "/Applications/Codex.app",
+	appServerCommandPath: "/Applications/Codex.app/Contents/Resources/codex",
+	bundledMarketplacePath: "/Applications/Codex.app/Contents/Resources/plugins/openai-bundled",
+	computerUseServiceAppPaths: ["/Applications/Codex.app/Contents/Resources/plugins/openai-bundled/plugins/computer-use/Codex Computer Use.app", "/Applications/Codex.app/Contents/Resources/cua_node/lib/node_modules/@oai/sky/Codex Computer Use.app"]
+}];
+function resolveMacOSDesktopCodexAppPathCandidates(platform = process.platform) {
+	return platform === "darwin" ? MACOS_DESKTOP_CODEX_APP_PATH_CANDIDATES : [];
+}
+function resolveMacOSDesktopCodexAppServerCommandCandidates(platform = process.platform) {
+	return resolveMacOSDesktopCodexAppPathCandidates(platform).map((candidate) => candidate.appServerCommandPath);
+}
+function resolveMacOSDesktopCodexBundledMarketplaceCandidates(platform = process.platform) {
+	return resolveMacOSDesktopCodexAppPathCandidates(platform).map((candidate) => candidate.bundledMarketplacePath);
+}
+function resolveMacOSDesktopCodexComputerUseServiceAppCandidates(platform = process.platform, appServerCommand) {
+	if (platform !== "darwin") return [];
+	const candidates = resolveMacOSDesktopCodexAppPathCandidates(platform);
+	const matchingCandidate = appServerCommand ? candidates.find((candidate) => path.resolve(candidate.appServerCommandPath) === path.resolve(appServerCommand)) : void 0;
+	const orderedCandidates = matchingCandidate ? [matchingCandidate, ...candidates.filter((candidate) => candidate !== matchingCandidate)] : candidates;
+	return [...new Set(orderedCandidates.flatMap((candidate) => candidate.computerUseServiceAppPaths))];
+}
+function resolveFirstExistingMacOSDesktopCodexBundledMarketplacePath(params = {}) {
+	const candidates = params.candidates ?? resolveMacOSDesktopCodexBundledMarketplaceCandidates(params.platform);
+	const pathExists = params.pathExists ?? existsSync;
+	return candidates.find((candidate) => pathExists(candidate));
+}
+//#endregion
 //#region extensions/codex/src/app-server/version.ts
 /**
 * Version and package pins for the managed Codex app-server runtime.
 */
 /** Exact Codex app-server version shipped by the OpenClaw Codex bridge. */
-const CODEX_APP_SERVER_VERSION = "0.149.1";
+const CODEX_APP_SERVER_VERSION = "0.150.1";
 /** Inclusive runtime compatibility floor for external app-server binaries. */
-const MIN_SUPPORTED_CODEX_APP_SERVER_VERSION = "0.147.0";
+const MIN_SUPPORTED_CODEX_APP_SERVER_VERSION = "0.149.0";
 /** npm package name for the managed Codex app-server binary. */
 const MANAGED_CODEX_APP_SERVER_PACKAGE = "@openai/codex";
 //#endregion
@@ -22,7 +59,6 @@ const MANAGED_CODEX_APP_SERVER_PACKAGE = "@openai/codex";
 */
 const CODEX_PLUGIN_ROOT = resolveDefaultCodexPluginRoot(path.dirname(fileURLToPath(import.meta.url)));
 let registeredCodexPluginRoot;
-const MACOS_DESKTOP_CODEX_APP_SERVER_COMMANDS = ["/Applications/ChatGPT.app/Contents/Resources/codex", "/Applications/Codex.app/Contents/Resources/codex"];
 /** Records the process-stable plugin root prepared by OpenClaw's plugin loader. */
 function setManagedCodexPluginRoot(pluginRoot) {
 	registeredCodexPluginRoot = pluginRoot;
@@ -62,9 +98,9 @@ function resolveManagedCodexNativeCommand(command, options = {}) {
 		if (pathExists(candidate)) return candidate;
 	}
 }
-/** Returns whether a resolved managed command is owned by the macOS desktop app. */
+/** Returns whether a command is one of the standard macOS desktop app executables. */
 function isManagedCodexDesktopCommand(command, platform = process.platform) {
-	return platform === "darwin" && MACOS_DESKTOP_CODEX_APP_SERVER_COMMANDS.some((candidate) => candidate === command);
+	return platform === "darwin" && resolveMacOSDesktopCodexAppServerCommandCandidates(platform).some((candidate) => candidate === command);
 }
 function resolveManagedCodexPackageRootForCommand(command, platform) {
 	const pathApi = pathForPlatform(platform);
@@ -126,7 +162,7 @@ function resolveManagedCodexAppServerCommandCandidates(pluginRoot, platform, man
 	return [...new Set(orderedCommandPaths)];
 }
 function resolveDesktopCodexAppServerCommandCandidates(platform) {
-	return platform === "darwin" ? [...MACOS_DESKTOP_CODEX_APP_SERVER_COMMANDS] : [];
+	return resolveMacOSDesktopCodexAppServerCommandCandidates(platform);
 }
 function resolveDefaultCodexPluginRoot(moduleDir) {
 	const moduleBaseName = path.basename(moduleDir);
@@ -209,4 +245,4 @@ async function commandPathExists(filePath, platform) {
 	}
 }
 //#endregion
-export { CODEX_APP_SERVER_VERSION as a, setManagedCodexPluginRoot as i, resolveManagedCodexAppServerStartOptions as n, MIN_SUPPORTED_CODEX_APP_SERVER_VERSION as o, resolveManagedCodexNativeCommand as r, isManagedCodexDesktopCommand as t };
+export { CODEX_APP_SERVER_VERSION as a, resolveMacOSDesktopCodexAppPathCandidates as c, setManagedCodexPluginRoot as i, resolveMacOSDesktopCodexBundledMarketplaceCandidates as l, resolveManagedCodexAppServerStartOptions as n, MIN_SUPPORTED_CODEX_APP_SERVER_VERSION as o, resolveManagedCodexNativeCommand as r, resolveFirstExistingMacOSDesktopCodexBundledMarketplacePath as s, isManagedCodexDesktopCommand as t, resolveMacOSDesktopCodexComputerUseServiceAppCandidates as u };

package/dist/media-understanding-provider.js

@@ -1,4 +1,4 @@
-import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-4BjrZEwW.js";
+import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-B7iBUcuP.js";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 //#region extensions/codex/media-understanding-provider.ts

package/dist/{model-catalog-CmGoqVKB.js → model-catalog-i9rNBthX.js}

@@ -1,7 +1,7 @@
-import { r as buildCodexRuntimeModelParams } from "./harness-DoKQcF8n.js";
-import { h as readCodexPluginConfig } from "./config-CpNeo5AE.js";
-import { t as listAllCodexAppServerModels } from "./models-CZw1wClT.js";
-import { r as requestOptions } from "./command-rpc-xUIIonsO.js";
+import { r as buildCodexRuntimeModelParams } from "./harness-Csz0F-DK.js";
+import { h as readCodexPluginConfig } from "./config-giW8X0QA.js";
+import { t as listAllCodexAppServerModels } from "./models-TS3HBU-q.js";
+import { r as requestOptions } from "./command-rpc-CCeCkf_v.js";
 //#region extensions/codex/src/app-server/model-catalog.ts
 const OPENAI_CODEX_BASE_URL = "https://chatgpt.com/backend-api/codex";
 const DEFAULT_MODEL_DISCOVERY_TIMEOUT_MS = 2500;

package/dist/{models-CZw1wClT.js → models-TS3HBU-q.js}

@@ -1,4 +1,4 @@
-import { t as assertCodexModelListResponse } from "./protocol-validators-VAVyEnDp.js";
+import { t as assertCodexModelListResponse } from "./protocol-validators-VeJxxJ0U.js";
 import { normalizeOptionalString, uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/models.ts
 /**
@@ -40,7 +40,7 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-Dw-rzii0.js").then((n) => n.m);
+	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-DKz23hHY.js").then((n) => n.y);
 	const client = useSharedClient ? await getLeasedSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,
@@ -96,7 +96,8 @@ function readCodexModel(value) {
 		isDefault: value.isDefault,
 		inputModalities: value.inputModalities,
 		supportedReasoningEfforts: readReasoningEfforts(value.supportedReasoningEfforts),
-		...normalizeOptionalString(value.defaultReasoningEffort) ? { defaultReasoningEffort: normalizeOptionalString(value.defaultReasoningEffort) } : {}
+		...normalizeOptionalString(value.defaultReasoningEffort) ? { defaultReasoningEffort: normalizeOptionalString(value.defaultReasoningEffort) } : {},
+		...value.multiAgentVersion !== void 0 ? { multiAgentVersion: value.multiAgentVersion } : {}
 	};
 }
 function readReasoningEfforts(value) {

package/dist/{native-subagent-monitor-GGq3RnOo.js → native-subagent-monitor-4Mfq2HDs.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 { $ 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-C75Yiiwc.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";
@@ -1253,10 +1253,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");
 }
@@ -1310,12 +1334,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 +1362,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 +1386,7 @@ var CodexEventProjection = class {
 				userAuthorization,
 				rationale,
 				actionType: action ? readStringField(action, "type") : void 0,
-				command: guardianActionCommand(action)
+				command
 			}
 		});
 		if (reviewId && targetItemId && status) {
@@ -1361,6 +1410,7 @@ var CodexEventProjection = class {
 				}
 			});
 		}
+		if (method.endsWith("/completed") && this.activeGuardianReview?.reviewId === reviewId) this.activeGuardianReview = void 0;
 	}
 	handleGuardianWarning(params) {
 		this.flushPendingGuardianWarning();
@@ -1377,6 +1427,29 @@ var CodexEventProjection = class {
 			}
 		});
 	}
+	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;
@@ -1389,6 +1462,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 +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 {
@@ -2113,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);
 	}
@@ -2126,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);
 		}
@@ -2156,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();
 			},
@@ -2164,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);
 				}
 			}
@@ -2203,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;
@@ -2216,7 +2338,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 +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;
@@ -2593,6 +2721,7 @@ var Monitor = class {
 		}
 		return {
 			parentThreadId: readThreadParentThreadId(thread),
+			agentPath: normalizeOptionalString(readStringField(readThreadSpawnSource(thread), "agent_path")),
 			completion,
 			fallbackCompletion,
 			resumable,
@@ -2624,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),
@@ -2635,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 {
@@ -2652,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";
@@ -2686,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) {
@@ -2735,6 +2886,7 @@ var Monitor = class {
 				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				recoveryAttempt: 0,
 				terminal: false,
+				nativeCompletionDelivered: false,
 				settledWithoutCompletion: false,
 				completionDeliveryAttempt: 0,
 				deliveringCompletion: false
@@ -2821,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);
@@ -2970,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,
@@ -3046,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,
@@ -3054,11 +3210,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 +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 };

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

@@ -1,6 +1,6 @@
-import { z as closeCodexAppServerTransportAndWait } from "./shared-client-Dw-rzii0.js";
+import { W as closeCodexAppServerTransportAndWait } from "./shared-client-DKz23hHY.js";
+import { n as resolveManagedCodexAppServerStartOptions, r as resolveManagedCodexNativeCommand, t as isManagedCodexDesktopCommand } from "./managed-binary-DFYK4DWq.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 { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { mkdir } from "node:fs/promises";
 import path from "node:path";

package/dist/{plugin-app-cache-key-DMNQ8Zi8.js → plugin-app-cache-key-C1CAdfcP.js}

@@ -1,5 +1,5 @@
-import { x as resolveCodexAppServerUserHomeDir } from "./config-CpNeo5AE.js";
-import { ft as resolveCodexAppServerHomeDir, pt as resolveCodexAppServerLocalHomeDir } from "./shared-client-Dw-rzii0.js";
+import { S as resolveCodexAppServerUserHomeDir } from "./config-giW8X0QA.js";
+import { St as resolveCodexAppServerLocalHomeDir, xt as resolveCodexAppServerHomeDir } from "./shared-client-DKz23hHY.js";
 import { createRequire } from "node:module";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { readPluginPackageVersion } from "openclaw/plugin-sdk/extension-shared";
@@ -348,7 +348,10 @@ function buildCodexPluginAppCacheKey(params) {
 		accountId: params.accountId,
 		envApiKeyFingerprint: params.envApiKeyFingerprint,
 		appServerVersion: params.appServerVersion ?? params.runtimeIdentity?.serverVersion,
-		runtimeIdentity: params.runtimeIdentity
+		runtimeIdentity: params.desktopGenerationFingerprint ? {
+			...params.runtimeIdentity,
+			desktopGeneration: params.desktopGenerationFingerprint
+		} : params.runtimeIdentity
 	}, OPENCLAW_VERSION, CODEX_PLUGIN_VERSION);
 }
 /** Builds a durable thread-binding fingerprint for one initialized app-server runtime. */

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

@@ -1,4 +1,4 @@
-import { S as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-Dw-rzii0.js";
+import { D as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-DKz23hHY.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