@openclaw/codex 2026.9.7 → 2026.10.1-beta.1

package/dist/.setup/{native-subagent-monitor-Dpsmf2wz.mjs → native-subagent-monitor-CCEFO6qK.mjs}

@@ -1,21 +1,26 @@
-import { c as codexNativeSubagentRunId, d as readNativeSubagentThreadIds, f as readThreadParentThreadId, l as normalizeIdentifier, m as assertHistoryOwnerMatchesRegistration, p as readThreadSpawnSource, t as matchesNativeAssignmentLifecycle, u as readCodexNativeSubagentRunId } from "./native-subagent-pending-assignments-DwkCzLvD.mjs";
+import { c as codexNativeSubagentRunId, d as readNativeSubagentThreadIds, f as readThreadParentThreadId, l as normalizeIdentifier, m as assertHistoryOwnerMatchesRegistration, p as readThreadSpawnSource, t as matchesNativeAssignmentLifecycle, u as readCodexNativeSubagentRunId } from "./native-subagent-pending-assignments-BDqhOdJp.mjs";
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { c as readNonEmptyString, o as readHookOutputEntries, r as normalizeOptionalString$1, s as readItem, u as readNullableString } from "./event-projector-values-DJSz8BTk.mjs";
+import { n as defineCodexBuildState } from "./build-state-CIi3Ckqu.mjs";
+import { a as readHookOutputEntries, o as readItem, s as readNullableString } from "./event-projector-values-DTqZHizf.mjs";
 import { t as attachCodexMirrorIdentity } from "./upstream-prompt-provenance-fXkKbPVC.mjs";
-import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-D83lJWHG.mjs";
-import { K as retainCodexAppServerLiveThread, P as claimCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, pt as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-DqyTMYug.mjs";
-import { A as itemStatus, D as isSideEffectingNativeToolItem, E as isProjectedNativeToolItem, M as matchesCodexSnapshotTurn, O as itemKind, P as unknownItemStatus, S as auditNativeToolTerminalStatus, T as isNonSuccessItemStatus, j as itemTitle, k as itemName, s as interruptCodexTurnAndWaitBestEffort, w as isMutatingNativeToolItem, x as auditNativeToolName } from "./attempt-client-cleanup-DOP-cW5j.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-jo6H8dFr.mjs";
+import { t as readCodexMirroredSessionHistoryMessages } from "./session-history-BogBHKLk.mjs";
+import { K as retainCodexAppServerLiveThread, P as claimCodexAppServerLiveThread, R as hasCodexAppServerLiveThread } from "./shared-client-DJJ3ljH2.mjs";
+import { L as readCodexAppServerWarningMessage } from "./client-CBzEVDyb.mjs";
+import { _ as itemStatus, c as auditNativeToolName, d as isMutatingNativeToolItem, f as isNonSuccessItemStatus, g as itemName, h as itemKind, l as auditNativeToolTerminalStatus, m as isSideEffectingNativeToolItem, p as isProjectedNativeToolItem, v as itemTitle, x as unknownItemStatus, y as matchesCodexSnapshotTurn } from "./turn-router-CX1-EoCp.mjs";
+import { s as interruptCodexTurnAndWaitBestEffort } from "./attempt-client-cleanup-yLjGwbwT.mjs";
+import { n as codexApprovalTimeoutText } from "./plugin-approval-roundtrip-uAR-oQfr.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
 import { asFiniteNumber, asNonArrayRecord, normalizeLowercaseStringOrEmpty, normalizeOptionalString, normalizeTrimmedStringList, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { randomUUID } from "node:crypto";
 import { asDateTimestampMs } from "openclaw/plugin-sdk/number-runtime";
 import path from "node:path";
-import { isApprovalNotFoundError, toErrorObject } from "openclaw/plugin-sdk/error-runtime";
+import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { TOOL_PROGRESS_OUTPUT_MAX_CHARS, embeddedAgentLog, emitAgentEvent, formatErrorMessage as formatErrorMessage$1, inferToolMetaFromArgs, projectAgentActivityItem, projectAgentToolActivity, runAgentHarnessAfterToolCallHook, sanitizeToolArgs } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM, NativeToolOutputAccumulator, TOOL_TRANSCRIPT_OUTPUT_MAX_CHARS, createAgentHarnessToolCallMessage, createAgentHarnessToolResultMessage, formatNativeToolOutput, formatNativeToolSummary, truncateNativeToolTranscriptText } from "openclaw/plugin-sdk/agent-harness-attempt-runtime";
 import { captureAgentHarnessCompletionCustody, createAgentHarnessCompletionEventSink, deliverAgentHarnessCompletion, isDurableAgentHarnessCompletionDelivery } from "openclaw/plugin-sdk/agent-harness-completion";
+import { compileFunction } from "node:vm";
 //#region extensions/codex/src/app-server/native-subagent-model-lookup.ts
 function waitForNativeModelSourceChange(state, signal) {
 	signal?.throwIfAborted();
@@ -736,7 +741,7 @@ var CodexNativeSubagentRecoveryCoordinator = class {
 				const fallback = childState.fallbackCompletion;
 				const state = this.dependencies.parentState(childState.parentThreadId);
 				if (fallback && state && childState.recoveryAttempt >= 2) {
-					await this.dependencies.processCompletion(state, childState, fallback, fallback.completedAt ?? this.dependencies.now());
+					await this.dependencies.processCompletion(state, childState, fallback, fallback.completedAt ?? Date.now());
 					return;
 				}
 				this.scheduleRecoveryPoll(childState);
@@ -1015,17 +1020,13 @@ var CodexNativeSubagentCompletionDelivery = class {
 				result: completion.result,
 				replyInstruction: "Use the Codex native subagent result to continue or wrap up the parent task. If this is a Discord/channel session, send the visible response with the message tool instead of only writing a transcript final answer. Reply in your normal assistant voice and do not expose internal notification markup."
 			});
-			if (!this.dependencies.isCurrentChild(childState) || !this.dependencies.isCurrentParent(state) || this.dependencies.isRetiredParent(state)) return;
+			if (!this.isCurrent(state, childState)) return;
 			if (isDurableAgentHarnessCompletionDelivery(delivery)) childState.nativeCompletionDelivered = true;
 			if (childState.nativeCompletionDelivered) {
 				this.prepareDelivery(state, childState);
 				return;
 			}
-			if (!this.claim(state, childState)) {
-				this.dependencies.unregisterChild(childState);
-				return;
-			}
-			if (delivery.recoveryBlocked) {
+			if (!this.claim(state, childState) || delivery.recoveryBlocked) {
 				this.dependencies.unregisterChild(childState);
 				return;
 			}
@@ -1036,7 +1037,7 @@ var CodexNativeSubagentCompletionDelivery = class {
 			const error = delivery.error ?? "completion delivery did not produce a parent response";
 			this.scheduleRetry(childState, error);
 		} catch (error) {
-			if (!this.dependencies.isCurrentChild(childState) || !this.dependencies.isCurrentParent(state) || this.dependencies.isRetiredParent(state)) return;
+			if (!this.isCurrent(state, childState)) return;
 			if (!this.claim(state, childState)) {
 				this.dependencies.unregisterChild(childState);
 				return;
@@ -1170,13 +1171,8 @@ const CODEX_SUBAGENT_NOTIFICATION_START = "<subagent_notification>";
 const CODEX_SUBAGENT_NOTIFICATION_END = "</subagent_notification>";
 function extractCodexNativeSubagentCompletions(notification) {
 	const params = isJsonObject(notification.params) ? notification.params : void 0;
-	if (!params) return [];
-	const item = isJsonObject(params.item) ? params.item : void 0;
-	if (!item) return [];
-	if (notification.method === "rawResponseItem/completed" && item.role === "user") return readTrustedContextualCompletions(item);
-	return [];
-}
-function readTrustedContextualCompletions(item) {
+	const item = isJsonObject(params?.item) ? params.item : void 0;
+	if (!item || notification.method !== "rawResponseItem/completed" || item.role !== "user") return [];
 	const content = item.content;
 	const metadata = item.internal_chat_message_metadata_passthrough;
 	const kinds = isJsonObject(metadata) ? metadata.content_item_kinds : void 0;
@@ -1262,11 +1258,6 @@ function isNoFinalCompletion(completion) {
 function buildCodexNativeSubagentAgentPathKey(parentThreadId, agentPath) {
 	return `${parentThreadId}\0${agentPath}`;
 }
-function resolveCodexNativeSubagentReceiptOwner(params) {
-	const { state, known } = params;
-	if (known?.parent === state) return known.deliveryReceipts;
-	return state.deliveryReceipts;
-}
 function registerCodexNativeSubagentReceiptAlias(params) {
 	const { state, childThreadId, agentPath, known, aliases } = params;
 	if (known?.parent !== state) return [];
@@ -1416,8 +1407,9 @@ var CodexNativeSubagentHistoryRecovery = class {
 			threadState: "unavailable",
 			observedPendingTurns: []
 		};
+		const rawTurns = Array.isArray(thread.turns) ? thread.turns : [];
 		if (options.predecessorNativeTurnId) {
-			const turns = Array.isArray(thread.turns) ? thread.turns.filter(isJsonObject) : [];
+			const turns = rawTurns.filter(isJsonObject);
 			const predecessor = turns.findIndex((turn) => readStringField(turn, "id") === options.predecessorNativeTurnId);
 			const target = turns.findIndex((turn) => readStringField(turn, "id") === assignment.nativeTurnId);
 			if (predecessor < 0 || target <= predecessor || !["completed", "failed"].includes(readStringField(turns[predecessor], "status") ?? "")) return {
@@ -1426,23 +1418,9 @@ var CodexNativeSubagentHistoryRecovery = class {
 				observedPendingTurns: []
 			};
 		}
-		const firstObserved = options.observedTurns?.[0];
-		const observedPredecessor = options.resumeInterrupted && firstObserved?.state && firstObserved.state !== "active" && !firstObserved.startObserved ? firstObserved.turnId : void 0;
 		let initialTurnId;
 		if (options.initialAssignment && !assignment.nativeTurnId && !recordedCompletion) {
-			if (readStringField(thread, "forkedFromId")) return {
-				parentThreadId: readThreadParentThreadId(thread),
-				resumable: false,
-				threadState: "unavailable",
-				observedPendingTurns: []
-			};
-			for (const turn of Array.isArray(thread.turns) ? thread.turns : []) {
-				const id = readStringField(turn, "id");
-				if (id) {
-					initialTurnId = id;
-					break;
-				}
-			}
+			initialTurnId = readStringField(thread, "forkedFromId") ? void 0 : readStringField(rawTurns.find((turn) => readStringField(turn, "id")), "id");
 			if (!initialTurnId) return {
 				parentThreadId: readThreadParentThreadId(thread),
 				resumable: false,
@@ -1450,11 +1428,11 @@ var CodexNativeSubagentHistoryRecovery = class {
 				observedPendingTurns: []
 			};
 		}
-		const turnId = assignment.nativeTurnId ?? initialTurnId ?? observedPredecessor;
-		const pendingTurnIds = /* @__PURE__ */ new Set([...this.queries.getPendingTurnIds(childThreadId), ...options.observedTurns?.map((turn) => turn.turnId) ?? []]);
+		const turnId = assignment.nativeTurnId ?? initialTurnId;
+		const pendingTurnIds = new Set(this.queries.getPendingTurnIds(childThreadId));
 		const unresolvedAssignment = options.resumeInterrupted && !turnId && pendingTurnIds.size > 0;
 		const observedPendingTurns = [];
-		for (const turn of Array.isArray(thread.turns) ? thread.turns : []) {
+		for (const turn of rawTurns) {
 			const pendingTurnId = readStringField(turn, "id");
 			if (pendingTurnId && pendingTurnIds.has(pendingTurnId)) observedPendingTurns.push({
 				turnId: pendingTurnId,
@@ -1470,7 +1448,7 @@ var CodexNativeSubagentHistoryRecovery = class {
 		let threadState = threadStatus === "active" ? "active" : threadStatus === "systemerror" ? "system_error" : threadStatus ? "other" : "unavailable";
 		if (unresolvedAssignment) threadState = "unavailable";
 		else if (turnId) {
-			const turns = Array.isArray(thread.turns) ? thread.turns.filter(isJsonObject) : [];
+			const turns = rawTurns.filter(isJsonObject);
 			let index = turns.findIndex((turn) => readStringField(turn, "id") === turnId);
 			while (options.resumeInterrupted && index >= 0 && index + 1 < turns.length && normalizeIdentifier(readStringField(turns[index], "status")) === "interrupted") index += 1;
 			const turn = turns[index];
@@ -1481,7 +1459,7 @@ var CodexNativeSubagentHistoryRecovery = class {
 			resumable = turnStatus === "interrupted";
 			threadState = turnStatus === "inprogress" ? "active" : turnStatus ? "other" : "unavailable";
 		} else if (threadStatus === "active") {
-			const turn = Array.isArray(thread.turns) ? thread.turns.at(-1) : void 0;
+			const turn = rawTurns.at(-1);
 			if (normalizeIdentifier(readStringField(turn, "status")) === "inprogress") {
 				nativeTurnId = readStringField(turn, "id");
 				nativeTurnState = "active";
@@ -1534,7 +1512,6 @@ var CodexNativeSubagentHistoryRecovery = class {
 		return {
 			parentThreadId: readThreadParentThreadId(thread),
 			agentPath: normalizeOptionalString(readStringField(readThreadSpawnSource(thread), "agent_path")),
-			assignmentTurnId: turnId,
 			nativeTurnId,
 			nativeTurnState,
 			observedPendingTurns,
@@ -1765,13 +1742,10 @@ async function prepareNativeModelToolInput(request, dependencies) {
 		assertCurrent();
 		const nativeParentThreadId = readThreadParentThreadId(thread);
 		if (!dependencies.prepareReceiver(state, thread.id, nativeParentThreadId)) throw new Error("Codex native input receiver cannot retain this sender's admitted source");
-		if (!dependencies.knownChildren.has(thread.id) && !dependencies.parents.has(thread.id)) {
-			const metadata = isJsonObject(thread) ? thread : void 0;
-			dependencies.registerChildThread(state, thread.id, {
-				nativeParentThreadId: readThreadParentThreadId(metadata),
-				agentPath: readStringField(readThreadSpawnSource(metadata), "agent_path")
-			});
-		}
+		if (!dependencies.knownChildren.has(thread.id) && !dependencies.parents.has(thread.id)) dependencies.registerChildThread(state, thread.id, {
+			nativeParentThreadId,
+			agentPath: readStringField(readThreadSpawnSource(thread), "agent_path")
+		});
 		const currentState = dependencies.parents.get(request.threadId) ?? dependencies.knownChildren.get(request.threadId)?.parent;
 		const currentOwner = currentState && resolveNativeModelParentOwner(currentState, request.turnId, request.threadId, dependencies.children, dependencies.knownChildren);
 		if (!currentOwner || currentOwner.modelExecutionSettled || currentOwner.modelExecutionCancelled) throw new Error("Codex native input requires its exact admitted sender turn");
@@ -1859,7 +1833,7 @@ const defaultNativeSubagentMonitorRuntime = {
 	createAgentHarnessCompletionEventSink
 };
 function createCodexNativeSubagentMonitorRuntime(Monitor) {
-	const monitors = /* @__PURE__ */ new WeakMap();
+	const monitors = defineCodexBuildState("openclaw.codexNativeSubagentMonitors", () => /* @__PURE__ */ new WeakMap())();
 	async function registerMonitor({ client, runtime, retainClient, retainParentThread, ...registration }) {
 		let monitor = monitors.get(client);
 		if (!monitor) {
@@ -2106,7 +2080,7 @@ async function registerNativeSubagentParent(input, dependencies) {
 		state.assignmentStore ??= params.assignmentStore;
 		state.owners.set(ownerKey, owner);
 		state.preparing = void 0;
-		for (const child of dependencies.children.values()) if (child.parentThreadId === parentThreadId && child.pendingCompletion) dependencies.deliverPending(state, child);
+		dependencies.deliverDetached(state);
 		dependencies.submissions.restore(state, owner);
 	} catch (error) {
 		releaseRootModelBinding();
@@ -2807,19 +2781,24 @@ function sanitizeCodexToolArguments(value) {
 	return sanitizeCodexAgentEventRecord(value);
 }
 //#endregion
-//#region extensions/codex/src/app-server/event-projector-tool-items.ts
-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;
-function readCodeModeNativePatchInput(source) {
-	if (typeof source !== "string") return;
-	const match = CODE_MODE_NATIVE_PATCH_SOURCE_RE.exec(source);
-	if (!match?.[2]) return;
-	try {
-		const patch = JSON.parse(match[2]);
-		return typeof patch === "string" && /^\*\*\* Begin Patch\r?\n[\s\S]*\r?\n\*\*\* End Patch(?:\r?\n)?$/u.test(patch) ? patch : void 0;
-	} catch {
-		return;
-	}
+//#region extensions/codex/src/app-server/web-search-item.ts
+function projectCodexWebSearchItem(item) {
+	const action = isJsonObject(item.action) ? item.action : void 0;
+	const actionType = normalizeOptionalString(action?.type);
+	const queries = actionType === "search" ? normalizeTrimmedStringList(action?.queries) : [];
+	const query = normalizeOptionalString(item.query) ?? (actionType === "search" ? normalizeOptionalString(action?.query) : void 0) ?? queries[0];
+	const url = normalizeOptionalString(action?.url);
+	const pattern = normalizeOptionalString(action?.pattern);
+	return {
+		...query ? { query } : {},
+		...queries.length > 0 ? { queries } : {},
+		...actionType && actionType !== "search" ? { action: actionType } : {},
+		...url ? { url } : {},
+		...pattern ? { pattern } : {}
+	};
 }
+//#endregion
+//#region extensions/codex/src/app-server/event-projector-tool-items.ts
 function readInterceptedNativePatchInput(command) {
 	if (typeof command !== "string") return;
 	const lines = command.replace(/\r\n?/gu, "\n").split("\n");
@@ -2874,19 +2853,8 @@ function isCommandBearingToolItem(item, args) {
 	return typeof args?.command === "string" && args.command.trim().length > 0;
 }
 function webSearchToolArgs(item) {
-	const action = isJsonObject(item.action) ? item.action : void 0;
-	const actionType = action ? readNonEmptyString(action, "type") : void 0;
-	const queries = action && actionType === "search" ? normalizeTrimmedStringList(action.queries) : [];
-	const query = normalizeOptionalString$1(item.query) ?? (action && actionType === "search" ? readNonEmptyString(action, "query") : void 0) ?? queries[0];
-	const url = action ? readNonEmptyString(action, "url") : void 0;
-	const pattern = action ? readNonEmptyString(action, "pattern") : void 0;
-	const args = {};
-	if (query) args.query = query;
-	if (queries.length > 0) args.queries = queries;
-	if (actionType && actionType !== "search") args.action = actionType;
-	if (url) args.url = url;
-	if (pattern) args.pattern = pattern;
-	if (!query && !url && !pattern) args.queryUnavailable = true;
+	const args = projectCodexWebSearchItem(item);
+	if (!args.query && !args.url && !args.pattern) args.queryUnavailable = true;
 	return sanitizeCodexAgentEventRecord(args);
 }
 function itemToolResult(item) {
@@ -2920,7 +2888,7 @@ function itemFileChangeRecords(item) {
 }
 function itemFileChanges(item) {
 	return itemFileChangeRecords(item).flatMap((change) => {
-		const path = normalizeOptionalString$1(change.path);
+		const path = normalizeOptionalString(change.path);
 		if (!path || change.kind === void 0) return [];
 		return [{
 			path,
@@ -2930,7 +2898,7 @@ function itemFileChanges(item) {
 }
 function fileChangeKindType(kind) {
 	if (typeof kind === "string") return kind;
-	return isJsonObject(kind) ? normalizeOptionalString$1(kind.type) : void 0;
+	return isJsonObject(kind) ? normalizeOptionalString(kind.type) : void 0;
 }
 function countFileContentLines(content) {
 	if (!content) return 0;
@@ -2977,7 +2945,7 @@ function truncateFileChangeDiffAtLineBoundary(diff, maxChars) {
 function itemFileChangesForTranscript(item) {
 	let remainingDiffChars = 1e4;
 	return itemFileChangeRecords(item).flatMap((change) => {
-		const path = normalizeOptionalString$1(change.path);
+		const path = normalizeOptionalString(change.path);
 		if (!path || change.kind === void 0) return [];
 		const result = {
 			path,
@@ -3031,124 +2999,6 @@ function stringifyJsonValue(value) {
 	}
 }
 //#endregion
-//#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts
-const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 12e4;
-const MAX_PLUGIN_APPROVAL_TITLE_LENGTH = 80;
-const MAX_PLUGIN_APPROVAL_DESCRIPTION_LENGTH = 512;
-const ANSI_OSC_SEQUENCE_RE = new RegExp(String.raw`(?:\u001b]|\u009d)[^\u001b\u009c\u0007]*(?:\u0007|\u001b\\|\u009c)`, "g");
-const ANSI_CONTROL_SEQUENCE_RE = new RegExp(String.raw`(?:\u001b\[[0-?]*[ -/]*[@-~]|\u009b[0-?]*[ -/]*[@-~]|\u001b[@-Z\\-_])`, "g");
-const CONTROL_CHARACTER_RE = new RegExp(String.raw`[\u0000-\u001f\u007f-\u009f]+`, "g");
-const INVISIBLE_FORMATTING_CONTROL_RE = new RegExp(String.raw`[\u00ad\u034f\u061c\u200b-\u200f\u202a-\u202e\u2060-\u206f\ufeff\ufe00-\ufe0f\u{e0100}-\u{e01ef}]`, "gu");
-const DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE = new RegExp(String.raw`(?:\u001b\][^\u001b\u009c\u0007]*|\u009d[^\u001b\u009c\u0007]*|\u001b\[[0-?]*[ -/]*|\u009b[0-?]*[ -/]*|\u001b)$`);
-const CODEX_APPROVAL_TIMEOUT_SUBJECTS = {
-	command: "Command approval",
-	"file-change": "File change approval",
-	permissions: "Permission approval",
-	other: "Approval"
-};
-function codexApprovalTimeoutText(kind) {
-	return `${CODEX_APPROVAL_TIMEOUT_SUBJECTS[kind]} timed out before an operator responded.`;
-}
-/** Starts a two-phase plugin approval request through the OpenClaw gateway. */
-async function requestPluginApproval(params) {
-	const timeoutMs = DEFAULT_CODEX_APPROVAL_TIMEOUT_MS;
-	return params.hostCapabilities.requestApproval({
-		signal: params.signal,
-		title: truncateCodexApprovalDisplayText(params.title, MAX_PLUGIN_APPROVAL_TITLE_LENGTH),
-		description: truncateCodexApprovalDisplayText(params.description, MAX_PLUGIN_APPROVAL_DESCRIPTION_LENGTH),
-		severity: params.severity,
-		toolName: params.toolName,
-		toolCallId: params.toolCallId,
-		...params.mcpTool ? {
-			mcpTool: params.mcpTool,
-			isMcpToolApprovalActive: params.isMcpToolApprovalActive
-		} : {},
-		timeoutMs,
-		transportTimeoutMs: resolveCodexGatewayTimeoutWithGraceMs(timeoutMs),
-		...params.allowedDecisions ? { allowedDecisions: params.allowedDecisions } : {}
-	});
-}
-/** Detects the gateway's explicit null-decision marker for unavailable approvals. */
-function approvalRequestExplicitlyUnavailable(result) {
-	if (result === null || result === void 0 || typeof result !== "object") return false;
-	let descriptor;
-	try {
-		descriptor = Object.getOwnPropertyDescriptor(result, "decision");
-	} catch {
-		return false;
-	}
-	return descriptor !== void 0 && "value" in descriptor && descriptor.value === null;
-}
-/** Waits for the gateway's final approval decision, respecting turn aborts. */
-async function waitForPluginApprovalDecision(params) {
-	const timeoutMs = DEFAULT_CODEX_APPROVAL_TIMEOUT_MS;
-	const waitPromise = params.hostCapabilities.waitForApproval({
-		approvalId: params.approvalId,
-		timeoutMs,
-		transportTimeoutMs: resolveCodexGatewayTimeoutWithGraceMs(timeoutMs),
-		signal: params.signal
-	}).catch((error) => {
-		if (isApprovalNotFoundError(error)) return;
-		throw error;
-	});
-	if (!params.signal) return await waitPromise;
-	let onAbort;
-	const abortPromise = new Promise((_, reject) => {
-		if (params.signal.aborted) {
-			reject(toErrorObject(params.signal.reason, "Non-Error rejection"));
-			return;
-		}
-		onAbort = () => reject(toErrorObject(params.signal.reason, "Non-Error rejection"));
-		params.signal.addEventListener("abort", onAbort, { once: true });
-	});
-	try {
-		return await Promise.race([waitPromise, abortPromise]);
-	} finally {
-		if (onAbort) params.signal.removeEventListener("abort", onAbort);
-	}
-}
-/** Converts a gateway exec approval decision into the app-server approval outcome enum. */
-function mapExecDecisionToOutcome(decision) {
-	switch (decision) {
-		case "allow-once": return "approved-once";
-		case "allow-always": return "approved-session";
-		case "deny": return "denied";
-		default: return "unavailable";
-	}
-}
-/** Runs one complete host approval request and maps transport failures to a closed outcome. */
-async function requestPluginApprovalOutcome(params) {
-	try {
-		const requestResult = await requestPluginApproval({
-			...params,
-			severity: "warning"
-		});
-		const approvalId = requestResult?.id;
-		if (!approvalId) return "unavailable";
-		const approvalResult = approvalRequestExplicitlyUnavailable(requestResult) ? void 0 : await waitForPluginApprovalDecision({
-			hostCapabilities: params.hostCapabilities,
-			approvalId,
-			signal: params.signal
-		});
-		if (params.signal?.aborted) return "cancelled";
-		if (approvalResult?.terminalReason === "timeout") return "timed-out";
-		const decision = approvalResult?.decision;
-		return mapExecDecisionToOutcome(decision === "allow-always" && params.allowedDecisions?.includes("allow-always") === false ? "allow-once" : decision);
-	} catch {
-		return params.signal?.aborted ? "cancelled" : "denied";
-	}
-}
-function truncateCodexApprovalDisplayText(value, maxLength) {
-	return value.length <= maxLength ? value : `${truncateUtf16Safe(value, maxLength - 3)}...`;
-}
-function stripDanglingCodexApprovalTerminalSequence(value) {
-	return value.replace(DANGLING_TERMINAL_SEQUENCE_SUFFIX_RE, "");
-}
-function sanitizeCodexApprovalVisibleText(value, options = {}) {
-	const terminalSafe = value.replace(ANSI_OSC_SEQUENCE_RE, "").replace(ANSI_CONTROL_SEQUENCE_RE, "");
-	return (options.stripDanglingTerminalSequence ? stripDanglingCodexApprovalTerminalSequence(terminalSafe) : terminalSafe).replace(INVISIBLE_FORMATTING_CONTROL_RE, " ").replace(CONTROL_CHARACTER_RE, " ").replace(/\s+/g, " ").trim();
-}
-//#endregion
 //#region extensions/codex/src/app-server/event-projector-tool-progress.ts
 const TRANSCRIPT_PROGRESS_SUPPRESSED_TOOL_NAMES = /* @__PURE__ */ new Set([
 	"message",
@@ -3169,7 +3019,6 @@ var CodexToolProgressProjection = class {
 		this.echoesByItem = /* @__PURE__ */ new Map();
 		this.resultSummaryItemIds = /* @__PURE__ */ new Set();
 		this.resultOutputItemIds = /* @__PURE__ */ new Set();
-		this.resultOutputStreamedItemIds = /* @__PURE__ */ new Set();
 		this.transcriptProgressSuppressedIds = /* @__PURE__ */ new Set();
 		this.resultOutputDeltaState = /* @__PURE__ */ new Map();
 		this.output = new NativeToolOutputAccumulator("Codex");
@@ -3267,7 +3116,6 @@ var CodexToolProgressProjection = class {
 		const reachedLimit = delta.length > remainingChars || state.chars >= TOOL_PROGRESS_OUTPUT_MAX_CHARS || state.messages >= MAX_TOOL_OUTPUT_DELTA_MESSAGES_PER_ITEM;
 		if (reachedLimit) state.truncated = true;
 		this.resultOutputDeltaState.set(itemId, state);
-		this.resultOutputStreamedItemIds.add(itemId);
 		this.emitToolResultMessage({
 			itemId,
 			text: formatNativeToolOutput(toolName, void 0, reachedLimit ? `${chunk}\n...(truncated)...` : chunk)
@@ -3326,7 +3174,7 @@ var CodexToolProgressProjection = class {
 	emitToolResultOutput(item) {
 		if (!item || item.type === "dynamicToolCall") return;
 		if (!this.params.onToolResult || !this.shouldEmitToolOutput()) return;
-		if (this.resultOutputItemIds.has(item.id) || this.resultOutputStreamedItemIds.has(item.id)) return;
+		if (this.resultOutputItemIds.has(item.id) || this.resultOutputDeltaState.has(item.id)) return;
 		const toolName = itemName(item);
 		const output = itemOutputText(item, this.output.textByItem);
 		if (!toolName || !output || !shouldEmitTranscriptToolProgress(toolName)) return;
@@ -3408,7 +3256,7 @@ var CodexToolProgressProjection = class {
 		this.transcriptProgressCallIds.add(params.id);
 		const args = asNonArrayRecord(params.arguments);
 		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;
+		if (!this.params.onToolResult || !this.shouldEmitToolResult() || this.resultSummaryItemIds.has(params.id) || this.resultOutputDeltaState.has(params.id)) return;
 		this.resultSummaryItemIds.add(params.id);
 		this.emitToolResultMessage({
 			itemId: params.id,
@@ -3427,7 +3275,7 @@ var CodexToolProgressProjection = class {
 			name: params.name,
 			arguments: {}
 		});
-		if (!this.params.onToolResult || !this.shouldEmitToolOutput() || this.resultOutputItemIds.has(params.id) || this.resultOutputStreamedItemIds.has(params.id)) return;
+		if (!this.params.onToolResult || !this.shouldEmitToolOutput() || this.resultOutputItemIds.has(params.id) || this.resultOutputDeltaState.has(params.id)) return;
 		const text = params.text?.trim();
 		if (text) this.emitToolResultMessage({
 			itemId: params.id,
@@ -3472,6 +3320,67 @@ var CodexToolProgressProjection = class {
 	}
 };
 //#endregion
+//#region extensions/codex/src/app-server/event-projector-code-mode.ts
+const IDENTIFIER = /[A-Za-z_$][\w$]*/u.source;
+const STRING = /"(?:\\[\s\S]|[^"\\])*"|'(?:\\[\s\S]|[^'\\])*'|`(?:\\[\s\S]|[^`\\])*`/u.source;
+const SCALAR = `(?:${STRING}|-?(?:0|[1-9]\\d*)(?:\\.\\d+)?(?:[eE][+-]?\\d+)?|true|false|null)`;
+const PROPERTY = `(?:${IDENTIFIER}|${STRING})\\s*:\\s*${SCALAR}`;
+const INPUT = `(?:${STRING}|\\{\\s*(?:${PROPERTY}(?:\\s*,\\s*${PROPERTY})*\\s*,?)?\\s*\\})`;
+const NATIVE_CALL = `await\\s+tools\\.(?<tool>apply_patch|exec_command)\\(\\s*(?<input>${INPUT}|${IDENTIFIER})\\s*\\)`;
+const SEPARATOR = `\\s*(?:;|[\\r\\n])\\s*`;
+const WRAPPER = new RegExp(`^\\s*(?://[^\\r\\n]*\\r?\\n\\s*)*(?:(?:const|let)\\s+(?<inputName>${IDENTIFIER})\\s*=\\s*(?<literal>${INPUT})${SEPARATOR})?(?:text\\(\\s*${NATIVE_CALL}\\s*\\)|(?:const|let)\\s+(?<resultName>${IDENTIFIER})\\s*=\\s*await\\s+tools\\.(?<boundTool>apply_patch|exec_command)\\(\\s*(?<boundInput>${INPUT}|${IDENTIFIER})\\s*\\)${SEPARATOR}text\\(\\s*\\k<resultName>\\s*\\))\\s*;?\\s*$`, "u");
+function readStringLiteral(literal) {
+	const quote = literal[0];
+	let body = literal.slice(1, -1);
+	if (quote !== "`" && /[\r\n]/u.test(body) || quote === "`" && body.includes("${")) throw new Error("not a static string");
+	if (quote === "`") body = body.replace(/\r\n?/gu, "\n");
+	return JSON.parse(`"${body.replace(/\\[\s\S]|["\r\n\t]/gu, (token) => token === "\\'" || token === "\\`" ? token.slice(1) : token.startsWith("\\") ? token : JSON.stringify(token).slice(1, -1))}"`);
+}
+function readLiteral(input) {
+	if (!input.startsWith("{")) return readStringLiteral(input);
+	const properties = new RegExp(`(${IDENTIFIER}|${STRING})\\s*:\\s*(${SCALAR})`, "gu");
+	const entries = [];
+	for (const match of input.matchAll(properties)) {
+		const key = /^["'`]/u.test(match[1]) ? readStringLiteral(match[1]) : match[1];
+		if (key === "__proto__") return;
+		const value = match[2];
+		entries.push([key, /^["'`]/u.test(value) ? readStringLiteral(value) : JSON.parse(value)]);
+	}
+	return Object.fromEntries(entries);
+}
+/** A literal input binding, one awaited native call, and its unmodified text output. */
+function readCodeModeNativeCall(source) {
+	if (typeof source !== "string") return;
+	const match = WRAPPER.exec(source)?.groups;
+	if (!match || [match.inputName, match.resultName].some((name) => name === "tools" || name === "text") || match.inputName && match.inputName === match.resultName) return;
+	const operand = match.input ?? match.boundInput;
+	if (!operand || match.inputName && operand !== match.inputName) return;
+	try {
+		compileFunction(`"use strict"; return async () => {\n${source}\n};`);
+		const input = readLiteral(match.literal ?? operand);
+		const tool = match.tool ?? match.boundTool;
+		if (tool === "apply_patch" && typeof input === "string" && /^\*\*\* Begin Patch\r?\n[\s\S]*\r?\n\*\*\* End Patch(?:\r?\n)?$/u.test(input)) return {
+			name: "apply_patch",
+			arguments: { input }
+		};
+		if (tool === "exec_command" && isJsonObject(input) && typeof input.cmd === "string" && (input.workdir === void 0 || typeof input.workdir === "string")) return {
+			name: "bash",
+			arguments: {
+				command: input.cmd,
+				...typeof input.workdir === "string" ? { cwd: input.workdir } : {}
+			}
+		};
+	} catch {}
+}
+function codeModeCommandFailed(output) {
+	try {
+		const result = JSON.parse(output);
+		return isJsonObject(result) && typeof result.output === "string" && typeof result.wall_time_seconds === "number" && typeof result.exit_code === "number" && Number.isInteger(result.exit_code) && result.exit_code !== 0 && result.session_id === void 0;
+	} catch {
+		return false;
+	}
+}
+//#endregion
 //#region extensions/codex/src/app-server/local-runtime-attribution.ts
 const OPENAI_PROVIDER_ID = "openai";
 const OPENAI_RESPONSES_API = "openai-responses";
@@ -3491,6 +3400,7 @@ function resolveCodexLocalRuntimeAttribution(params) {
 //#region extensions/codex/src/app-server/event-projector-tool-transcript.ts
 const MISSING_TOOL_RESULT_ERROR = "OpenClaw recorded a native Codex tool.call without a matching tool.result before the turn completed.";
 const NATIVE_PATCH_REJECTION_RE = /^\s*patch rejected:\s*writing outside of the project;\s*rejected by user approval settings\s*$/iu;
+const NATIVE_COMMAND_WORKSPACE_REJECTION_RE = /^\s*command rejected:\s*writing outside of the project;\s*rejected by user approval settings\s*$/iu;
 const CODE_MODE_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) {
@@ -3512,12 +3422,11 @@ var CodexToolTranscriptProjection = class {
 		this.trajectoryItemsById = /* @__PURE__ */ new Map();
 		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.pendingRawOutputIds = /* @__PURE__ */ new Set();
 		this.rawCallsById = /* @__PURE__ */ new Map();
-		this.codeModeNativePatchInputsByCallId = /* @__PURE__ */ new Map();
+		this.codeModeNativeCallsByCallId = /* @__PURE__ */ new Map();
 	}
 	get transcriptMessages() {
 		return this.messages;
@@ -3564,31 +3473,39 @@ var CodexToolTranscriptProjection = class {
 		});
 	}
 	recordNativeToolCall(item) {
-		if (!item || !isProjectedNativeToolItem(item)) return;
-		const name = itemName(item);
-		if (name) this.recordToolCall({
+		if (item) {
+			const call = this.nativeTranscriptCall(item);
+			if (!call) return;
+			const name = call.name;
+			for (const pending of this.codeModeNativeCallsByCallId.values()) if (pending.call.name === name) pending.nativeItemObserved = true;
+			this.recordToolCall(call);
+		}
+	}
+	recordNativeToolResult(item, details) {
+		if (!item || this.resultIds.has(item.id)) return;
+		const call = this.nativeTranscriptCall(item);
+		if (!call) return;
+		const status = itemStatus(item);
+		const approvalTimeoutExplanation = this.progress.approvalTimeoutExplanation(item.id, status);
+		this.recordToolResult({
 			id: item.id,
-			name,
-			arguments: itemToolArgs(item)
+			name: call.name,
+			text: approvalTimeoutExplanation ?? this.rawNativeToolOutputByCallId.get(item.id) ?? itemTranscriptResultText(item, this.progress.outputTextByItem),
+			isError: isNonSuccessItemStatus(status),
+			...item.type === "commandExecution" && item.aggregatedOutput == null && this.progress.isOutputTruncated(item.id) ? { captureTruncated: true } : {},
+			details,
+			...item.type === "webSearch" ? { resultContentSource: "network" } : {}
 		});
+		this.progress.approvalTimeoutKinds.delete(item.id);
 	}
-	recordNativeToolResult(item, details) {
-		if (!item || !isProjectedNativeToolItem(item) || this.resultIds.has(item.id)) return;
+	nativeTranscriptCall(item) {
+		if (item.type === "collabAgentToolCall" || item.type === "subAgentActivity") return this.rawCallsById.get(item.id);
 		const name = itemName(item);
-		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),
-				...item.type === "commandExecution" && item.aggregatedOutput == null && this.progress.isOutputTruncated(item.id) ? { captureTruncated: true } : {},
-				details,
-				...item.type === "webSearch" ? { resultContentSource: "network" } : {}
-			});
-			this.progress.approvalTimeoutKinds.delete(item.id);
-		}
+		return isProjectedNativeToolItem(item) && name ? {
+			id: item.id,
+			name,
+			arguments: itemToolArgs(item)
+		} : void 0;
 	}
 	recordRawNativeToolItem(item) {
 		const type = readStringField(item, "type");
@@ -3606,8 +3523,11 @@ var CodexToolTranscriptProjection = class {
 			let args;
 			if (type === "custom_tool_call" && item.name === "apply_patch" && typeof item.input === "string") args = { input: item.input };
 			else if (type === "custom_tool_call" && item.name === "exec") {
-				const input = readCodeModeNativePatchInput(item.input);
-				if (input) this.codeModeNativePatchInputsByCallId.set(callId, input);
+				const call = readCodeModeNativeCall(item.input);
+				if (call) this.codeModeNativeCallsByCallId.set(callId, {
+					call,
+					nativeItemObserved: false
+				});
 				return;
 			} else if (type === "function_call" && typeof item.arguments === "string") try {
 				const parsed = JSON.parse(item.arguments);
@@ -3645,20 +3565,19 @@ var CodexToolTranscriptProjection = class {
 		this.rawNativeToolOutputByCallId.set(callId, text);
 		const rawCall = this.rawCallsById.get(callId);
 		const responseText = typeof item.output === "string" ? item.output : collectDynamicToolContentText(item.output);
-		const execution = rawCall?.name === "exec" ? CODE_MODE_RESULT_RE.exec(responseText) : null;
-		const codeModePatchInput = this.codeModeNativePatchInputsByCallId.get(callId);
-		if (codeModePatchInput) {
-			this.codeModeNativePatchInputsByCallId.delete(callId);
-			if (execution?.[1]?.toLowerCase() === "failed") {
-				const failure = execution[2]?.replace(/^Script error:\s*/iu, "").trim() || text;
+		const execution = rawCall?.name === "exec" || rawCall?.name === "wait" ? CODE_MODE_RESULT_RE.exec(responseText) : null;
+		const codeModeCall = this.codeModeNativeCallsByCallId.get(callId);
+		this.codeModeNativeCallsByCallId.delete(callId);
+		if (codeModeCall && !codeModeCall.nativeItemObserved) {
+			if (execution?.[1]?.toLowerCase() === "failed" || execution?.[1]?.toLowerCase() === "completed" && codeModeCall.call.name === "bash" && codeModeCommandFailed(execution[2] ?? "")) {
+				const failure = execution?.[2]?.replace(/^Script error:\s*/iu, "").trim() || text;
 				this.recordToolCall({
 					id: callId,
-					name: "apply_patch",
-					arguments: { input: codeModePatchInput }
+					...codeModeCall.call
 				});
 				this.recordToolResult({
 					id: callId,
-					name: "apply_patch",
+					name: codeModeCall.call.name,
 					text: failure,
 					isError: true
 				});
@@ -3668,13 +3587,31 @@ var CodexToolTranscriptProjection = class {
 		const result = this.messages.find((message) => message.role === "toolResult" && message.toolCallId === callId);
 		if (!result) {
 			if (!this.namesById.has(callId) && rawCall) {
-				this.recordToolCall(rawCall);
+				const isCommandFallback = type === "function_call_output" && rawCall.name === "exec_command";
+				const name = isCommandFallback ? "bash" : rawCall.name;
+				let args = rawCall.arguments;
+				if (isCommandFallback && isJsonObject(args) && typeof args.arguments === "string") try {
+					const parsed = JSON.parse(args.arguments);
+					if (isJsonObject(parsed)) {
+						const cwd = readStringField(parsed, "workdir") ?? readStringField(parsed, "cwd");
+						args = {
+							command: readStringField(parsed, "cmd") ?? readStringField(parsed, "command"),
+							...cwd !== void 0 ? { cwd } : {}
+						};
+					}
+				} catch {}
+				const commandWorkspaceRejected = isCommandFallback && NATIVE_COMMAND_WORKSPACE_REJECTION_RE.test(text);
+				this.recordToolCall({
+					...rawCall,
+					name,
+					arguments: args
+				});
 				this.recordToolResult({
 					id: callId,
-					name: rawCall.name,
+					name,
 					text,
-					isError: execution?.[1]?.toLowerCase() === "failed",
-					...!execution ? { outcomeUnknown: true } : {}
+					isError: commandWorkspaceRejected || execution?.[1]?.toLowerCase() === "failed",
+					...!execution && !commandWorkspaceRejected ? { outcomeUnknown: true } : {}
 				});
 			} else if (this.namesById.get(callId) === "apply_patch" && NATIVE_PATCH_REJECTION_RE.test(text)) this.recordToolResult({
 				id: callId,
@@ -3717,8 +3654,8 @@ var CodexToolTranscriptProjection = class {
 	async prepareNativeMcpAppResultDetails(item) {
 		if (!item || item.type !== "mcpToolCall" || itemStatus(item) === "running") return;
 		if (this.nativeMcpAppResultDetails.has(item.id)) return this.nativeMcpAppResultDetails.get(item.id);
-		if (this.nativeMcpAppResultDetailsAttempted.has(item.id) || !this.options.prepareNativeMcpAppResultDetails) return;
-		this.nativeMcpAppResultDetailsAttempted.add(item.id);
+		if (!this.options.prepareNativeMcpAppResultDetails) return;
+		this.nativeMcpAppResultDetails.set(item.id, void 0);
 		try {
 			const details = await this.options.prepareNativeMcpAppResultDetails(item);
 			if (details !== void 0) this.nativeMcpAppResultDetails.set(item.id, details);
@@ -3787,32 +3724,27 @@ var CodexToolTranscriptProjection = class {
 	}
 	synthesizeMissingToolResults(params) {
 		if (!params.synthesize) return;
-		const missingTranscriptIds = [...this.namesById.keys()].filter((id) => !this.resultIds.has(id));
-		const missingTrajectoryIds = [...this.trajectoryNamesById.keys()].filter((id) => !this.trajectoryResultIds.has(id));
-		if (missingTranscriptIds.length === 0 && missingTrajectoryIds.length === 0) return;
-		for (const id of missingTranscriptIds) {
-			const name = this.namesById.get(id) ?? this.trajectoryNamesById.get(id);
-			if (name) {
-				const processId = params.retainedCommands?.get(id);
-				this.recordToolResult({
+		const missingTranscript = [...this.namesById].filter(([id]) => !this.resultIds.has(id));
+		const missingTrajectory = [...this.trajectoryNamesById].filter(([id]) => !this.trajectoryResultIds.has(id));
+		if (missingTranscript.length === 0 && missingTrajectory.length === 0) return;
+		for (const [id, name] of missingTranscript) {
+			const processId = params.retainedCommands?.get(id);
+			this.recordToolResult({
+				id,
+				name,
+				text: processId ? formatRetainedCommandResult(processId) : formatMissingToolResultError({
 					id,
-					name,
-					text: processId ? formatRetainedCommandResult(processId) : formatMissingToolResultError({
-						id,
-						name
-					}),
-					isError: !processId,
-					...processId ? { outcomeUnknown: true } : {},
-					details: processId ? {
-						status: "running",
-						processId
-					} : { reason: "missing_tool_result" }
-				});
-			}
+					name
+				}),
+				isError: !processId,
+				...processId ? { outcomeUnknown: true } : {},
+				details: processId ? {
+					status: "running",
+					processId
+				} : { reason: "missing_tool_result" }
+			});
 		}
-		for (const id of missingTrajectoryIds) {
-			const name = this.trajectoryNamesById.get(id) ?? this.namesById.get(id);
-			if (!name) continue;
+		for (const [id, name] of missingTrajectory) {
 			this.trajectoryResultIds.add(id);
 			const processId = params.retainedCommands?.get(id);
 			const text = processId ? formatRetainedCommandResult(processId) : formatMissingToolResultError({
@@ -3838,11 +3770,11 @@ var CodexToolTranscriptProjection = class {
 			});
 		}
 		if (params.terminalDisposition === "tool_error") {
-			this.recordMissingToolError(missingTranscriptIds, missingTrajectoryIds);
+			this.recordMissingToolError([...missingTranscript, ...missingTrajectory]);
 			return;
 		}
 		if (params.terminalDisposition === "diagnostic_only") return;
-		const missingCount = (/* @__PURE__ */ new Set([...missingTranscriptIds, ...missingTrajectoryIds])).size;
+		const missingCount = new Set([...missingTranscript, ...missingTrajectory].map(([id]) => id)).size;
 		return missingCount === 1 ? MISSING_TOOL_RESULT_ERROR : `${MISSING_TOOL_RESULT_ERROR} missingToolResultCount=${missingCount}`;
 	}
 	async readMirroredSessionMessages(signal) {
@@ -3873,11 +3805,11 @@ var CodexToolTranscriptProjection = class {
 			ready: () => !this.pendingRawOutputIds.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)));
-		if (!firstMissingId) return;
-		const name = this.namesById.get(firstMissingId) ?? this.trajectoryNamesById.get(firstMissingId);
-		if (!name) return;
+	recordMissingToolError(missing) {
+		const first = missing.find(([, name]) => Boolean(name));
+		if (!first || !first[0]) return;
+		const [firstMissingId, recordedName] = first;
+		const name = this.namesById.get(firstMissingId) ?? recordedName;
 		const item = this.trajectoryItemsById.get(firstMissingId);
 		const meta = item ? itemMeta(item, this.progress.toolProgressDetailMode()) : this.progress.getToolMeta(firstMissingId)?.meta;
 		this.progress.setLastToolError({
@@ -3968,7 +3900,6 @@ 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 || !isProjectedNativeToolItem(item)) return;
@@ -4113,9 +4044,8 @@ 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({
+		const message = readCodexAppServerWarningMessage(params);
+		if (message) this.emitAgentEvent({
 			stream: "notice",
 			data: {
 				phase: "warning",
@@ -4534,7 +4464,6 @@ var Monitor = class {
 		this.childThreadIdsByAgentPath = /* @__PURE__ */ new Map();
 		this.parentThreadRetentions = /* @__PURE__ */ new Map();
 		this.disposed = false;
-		this.now = options.now ?? Date.now;
 		this.interruptModelExecution = options.interruptModelExecution;
 		this.admissionCustody = new CodexNativeSubagentAdmissionCustody({
 			parentState: (id) => this.parentStates.get(id),
@@ -4554,7 +4483,7 @@ var Monitor = class {
 			currentChild: (id) => this.currentChild(id),
 			isRegisteredChild: (child) => this.childStates.get(child.runId) === child,
 			captureForget: options.captureChildThreadForget,
-			releaseDirectChild: (child) => releaseNativeDirectChild(child),
+			releaseDirectChild: releaseNativeDirectChild,
 			clearRecoveryTimers: (child) => this.recovery.clearRecoveryTimers(child),
 			markTerminalRevision: (id) => this.recovery.markTerminalRevision(id),
 			unregisterChild: (child) => this.unregisterChild(child, { retainSubscription: false }),
@@ -4572,7 +4501,6 @@ var Monitor = class {
 		});
 		this.completionDelivery = new CodexNativeSubagentCompletionDelivery({
 			deliver: (params) => runtime.deliverAgentHarnessCompletion(params),
-			now: this.now,
 			retryDelaysMs: options.completionDeliveryRetryDelaysMs,
 			maxRetries: options.completionDeliveryMaxRetries,
 			isCurrentChild: (child) => this.childStates.get(child.runId) === child,
@@ -4603,10 +4531,8 @@ var Monitor = class {
 			isRegisteredChild: (child) => this.childStates.get(child.runId) === child,
 			currentChild: (id) => this.currentChild(id),
 			parentState: (id) => this.parentStates.get(id),
-			isRetiredParent: (state) => this.retiredParentStates.has(state),
 			reconcileChildState: (child) => this.reconcileChildState(child),
 			processCompletion: (state, child, completion, eventAt) => this.processCompletion(state, child, completion, eventAt),
-			now: this.now,
 			recoveryPollDelaysMs: options.recoveryPollDelaysMs
 		});
 		this.removeNotificationHandler = client.addNotificationHandler(async (notification) => {
@@ -4677,7 +4603,7 @@ var Monitor = class {
 				if (this.retiredParentStates.has(state) || !this.disposed && this.parentStates.get(state.parentThreadId) !== state) throw new Error("Native assignment parent is no longer current.");
 				state.assignmentStore?.assertCurrent();
 			},
-			isCurrent: (state) => !this.disposed && !this.retiredParentStates.has(state) && this.parentStates.get(state.parentThreadId) === state,
+			isCurrent: (state) => this.isCurrentParent(state),
 			readHistory: async (assignment) => {
 				const revision = this.recovery.retainThreadStatusRevision(assignment.childThreadId);
 				try {
@@ -4798,14 +4724,12 @@ var Monitor = class {
 	registerParent(params) {
 		return registerNativeSubagentParent(params, {
 			states: this.parentStates,
-			children: this.childStates,
 			isClosed: () => this.disposed,
 			isRetired: (state) => this.retiredParentStates.has(state),
 			runtime: this.runtime,
 			submissions: this.submissions,
 			assignments: this.assignments,
 			closes: this.childCloses,
-			deliverPending: (state, child) => this.completionDelivery.deliverPending(state, child),
 			deliverDetached: (state) => this.completionDelivery.deliverDetached(state, this.childStates.values()),
 			drainAdmissions: (state, owner, turnId) => this.drainPendingChildAdmissionEvidence(state, owner, turnId, true),
 			clearAdmissions: () => this.clearUnconsumablePendingChildAdmissionEvidence(),
@@ -4993,7 +4917,7 @@ var Monitor = class {
 			} else {
 				if (childState) {
 					this.resumeChild(childState, { scheduleRecovery: false });
-					this.recovery.setRecoveryFallback(childState, systemErrorFallbackCompletion(childState.childThreadId), this.now());
+					this.recovery.setRecoveryFallback(childState, systemErrorFallbackCompletion(childState.childThreadId), Date.now());
 				}
 				this.reconcileChildThread(threadId).catch((error) => {
 					logRecoveryFailure(threadId, error);
@@ -5092,7 +5016,7 @@ var Monitor = class {
 			return;
 		}
 		this.resumeChild(childState, { scheduleRecovery: false });
-		this.recovery.setRecoveryFallback(childState, completion, this.now());
+		this.recovery.setRecoveryFallback(childState, completion, Date.now());
 		await this.recovery.reconcileRegisteredChild(childState).catch((error) => {
 			logRecoveryFailure(childState.childThreadId, error);
 			return false;
@@ -5145,7 +5069,7 @@ var Monitor = class {
 		const completion = recovery.completion;
 		if (completion && !isNoFinalCompletion(completion)) return this.processCompletion(state, child, completion, completion.completedAt);
 		const fallback = completion ?? recovery.fallbackCompletion;
-		if (fallback) this.recovery.setRecoveryFallback(child, fallback, fallback.completedAt ?? this.now());
+		if (fallback) this.recovery.setRecoveryFallback(child, fallback, fallback.completedAt ?? Date.now());
 	}
 	recordRecoveredChildTurn(state, child, recovery) {
 		const known = this.knownChildren.get(child.childThreadId);
@@ -5176,7 +5100,7 @@ var Monitor = class {
 		this.submissions.observeKnownChild(child.childThreadId);
 		return this.admitFollowupChild(known, child.childThreadId);
 	}
-	async processCompletion(state, childState, completion, eventAt = this.now()) {
+	async processCompletion(state, childState, completion, eventAt = Date.now()) {
 		if (childState.terminal) return;
 		const acceptedCompletion = childState.modelExecution?.executionOwner.modelExecutionCancelled || childState.nativeTurnId && childState.cancelledModelTurnId === childState.nativeTurnId ? {
 			childThreadId: childState.childThreadId,
@@ -5206,11 +5130,8 @@ var Monitor = class {
 		this.completionDelivery.applyReceipts(state, runIds, this.childStates);
 	}
 	resolveChildReceiptOwner(state, childThreadId) {
-		return resolveCodexNativeSubagentReceiptOwner({
-			state,
-			childThreadId,
-			known: this.knownChildren.get(childThreadId)
-		});
+		const known = this.knownChildren.get(childThreadId);
+		return known?.parent === state ? known.deliveryReceipts : state.deliveryReceipts;
 	}
 	prepareReceiverChild(state, threadId, nativeParentThreadId) {
 		const known = this.knownChildren.get(threadId);
@@ -5602,44 +5523,40 @@ var Monitor = class {
 		}
 	}
 	restoreKnownChild(state, assignment, observedTurns = []) {
-		const current = assignment;
-		const terminal = false;
-		const nativeParentThreadId = state.parentThreadId;
-		const currentIndex = observedTurns.findIndex((turn) => turn.turnId === current.nativeTurnId);
-		const pendingTurns = observedTurns.filter((turn, index) => index > currentIndex && turn.turnId !== current.nativeTurnId).map((turn, index, turns) => ({
+		const currentIndex = observedTurns.findIndex((turn) => turn.turnId === assignment.nativeTurnId);
+		const pendingTurns = observedTurns.filter((turn, index) => index > currentIndex && turn.turnId !== assignment.nativeTurnId).map((turn, index, turns) => ({
 			turnId: turn.turnId,
 			state: turn.state === "active" && index < turns.length - 1 ? void 0 : turn.state
 		}));
 		const previous = this.knownChildren.get(assignment.childThreadId);
 		const previousRunId = previous?.assignment.runId;
 		const retainedPending = previous?.pendingTurns.filter((pending) => pending.modelSource) ?? [];
-		const mergedPending = pendingTurns;
 		for (const retained of retainedPending) {
-			const recovered = mergedPending.find((pending) => pending.turnId === retained.turnId);
+			const recovered = pendingTurns.find((pending) => pending.turnId === retained.turnId);
 			if (recovered) {
 				recovered.modelSource = retained.modelSource;
 				recovered.completionCustody = retained.completionCustody;
 				retained.completionCustody = void 0;
-			} else mergedPending.push(retained);
+			} else pendingTurns.push(retained);
 		}
-		for (const pending of previous?.pendingTurns ?? []) if (!mergedPending.includes(pending)) releaseCompletionCustody(pending);
+		for (const pending of previous?.pendingTurns ?? []) if (!pendingTurns.includes(pending)) releaseCompletionCustody(pending);
 		this.knownChildren.set(assignment.childThreadId, {
 			configurationQualification: previous?.configurationQualification,
 			parent: state,
-			nativeParentThreadId: this.childStates.get(current.runId)?.nativeParentThreadId ?? nativeParentThreadId,
+			nativeParentThreadId: this.childStates.get(assignment.runId)?.nativeParentThreadId ?? state.parentThreadId,
 			deliveryReceipts: this.resolveChildReceiptOwner(state, assignment.childThreadId),
 			assignment: {
-				...current,
-				terminal
+				...assignment,
+				terminal: false
 			},
-			turnId: pendingTurns.at(-1)?.turnId ?? current.nativeTurnId,
-			observedTurns: new Map([...new Set([current.nativeTurnId, ...observedTurns.map((turn) => turn.turnId)].filter((id) => Boolean(id)))].map((turnId) => [turnId, pendingTurns.some((turn) => turn.turnId === turnId) ? { awaitingInteraction: true } : {}])),
-			pendingTurns: mergedPending,
+			turnId: pendingTurns.at(-1)?.turnId ?? assignment.nativeTurnId,
+			observedTurns: new Map([...new Set([assignment.nativeTurnId, ...observedTurns.map((turn) => turn.turnId)].filter((id) => Boolean(id)))].map((turnId) => [turnId, pendingTurns.some((turn) => turn.turnId === turnId) ? { awaitingInteraction: true } : {}])),
+			pendingTurns,
 			agentPaths: this.knownChildren.get(assignment.childThreadId)?.agentPaths ?? /* @__PURE__ */ new Set([assignment.childThreadId])
 		});
-		if (previousRunId !== current.runId) this.refreshWaitDependency(state, assignment.childThreadId);
+		if (previousRunId !== assignment.runId) this.refreshWaitDependency(state, assignment.childThreadId);
 	}
 };
 const codexNativeSubagentMonitorRuntime = createCodexNativeSubagentMonitorRuntime(Monitor);
 //#endregion
-export { waitForPluginApprovalDecision as _, CodexToolTranscriptProjection as a, sanitizeCodexAgentEventRecord as b, shouldEmitTranscriptToolProgress as c, mapExecDecisionToOutcome as d, requestPluginApproval as f, truncateCodexApprovalDisplayText as g, stripDanglingCodexApprovalTerminalSequence as h, emitCodexAgentEvent as i, approvalRequestExplicitlyUnavailable as l, sanitizeCodexApprovalVisibleText as m, native_subagent_monitor_exports as n, resolveCodexLocalRuntimeAttribution as o, requestPluginApprovalOutcome as p, CodexEventProjection as r, CodexToolProgressProjection as s, codexNativeSubagentMonitorRuntime as t, codexApprovalTimeoutText as u, isCodexCommandBearingToolCall as v, sanitizeCodexToolArguments as x, resolveCodexToolProgressDetailMode as y };
+export { CodexToolTranscriptProjection as a, shouldEmitTranscriptToolProgress as c, resolveCodexToolProgressDetailMode as d, sanitizeCodexAgentEventRecord as f, emitCodexAgentEvent as i, projectCodexWebSearchItem as l, native_subagent_monitor_exports as n, resolveCodexLocalRuntimeAttribution as o, sanitizeCodexToolArguments as p, CodexEventProjection as r, CodexToolProgressProjection as s, codexNativeSubagentMonitorRuntime as t, isCodexCommandBearingToolCall as u };