@openclaw/codex 2026.10.1-beta.2 → 2026.10.5-beta.1

package/dist/.setup/{client-C8lgBOoO.mjs → client-y7nO6X9c.mjs}

@@ -1,22 +1,22 @@
-import { a as readCodexCatalogDecodeRoute, c as isRpcResponse, i as listenCodexAppServerLines, n as projectCodexCatalogMessage, o as CodexAppServerMessageDecoder, r as createCodexAppServerMessageWriter, s as redactCodexAppServerLinePreview } from "./client-catalog-response-Bqp7WG51.mjs";
+import { a as readCodexCatalogDecodeRoute, c as isRpcResponse, i as listenCodexAppServerLines, n as projectCodexCatalogMessage, o as CodexAppServerMessageDecoder, r as createCodexAppServerMessageWriter, s as redactCodexAppServerLinePreview } from "./client-catalog-response-DsbEAtpd.mjs";
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { c as MIN_SUPPORTED_CODEX_APP_SERVER_VERSION, s as CODEX_APP_SERVER_VERSION } from "./managed-binary-C1VFoVPf.mjs";
-import { a as closeCodexAppServerTransportAndWait, c as getCodexAppServerRegisteredTransportIdentity, i as closeCodexAppServerTransport, o as hasCodexAppServerNaturalExit, t as createStdioTransport } from "./transport-stdio-a0HDa2Mj.mjs";
-import { i as CodexAppServerScopedRequestRejectedError, n as CodexAppServerLocalRequestCancellationError, o as isCodexAppServerOverloadError, r as CodexAppServerRpcError, t as CODEX_APP_SERVER_OVERLOADED_ERROR_CODE } from "./rpc-error-hmWM21RB.mjs";
-import { f as recordCodexCatalogResponseSource, i as reuseCodexCatalogPreview, o as closeCodexCatalogClientSource, s as codexCatalogSourceForClient } from "./session-catalog-native-projection-D6IiLtMb.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
+import { c as MIN_SUPPORTED_CODEX_APP_SERVER_VERSION, s as CODEX_APP_SERVER_VERSION } from "./managed-binary-BtIjV7yN.mjs";
+import { a as closeCodexAppServerTransport, l as getCodexAppServerRegisteredTransportIdentity, o as closeCodexAppServerTransportAndWait, s as hasCodexAppServerNaturalExit, t as createStdioTransport } from "./transport-stdio-CRWTkKOn.mjs";
+import { i as CodexAppServerScopedRequestRejectedError, n as CodexAppServerLocalRequestCancellationError, o as isCodexAppServerOverloadError, r as CodexAppServerRpcError, t as CODEX_APP_SERVER_OVERLOADED_ERROR_CODE } from "./rpc-error-C98SHchT.mjs";
+import { n as codexCatalogSourceForClient, s as recordCodexCatalogResponseSource, t as closeCodexCatalogClientSource } from "./session-catalog-source-CygTGmrb.mjs";
+import { i as reuseCodexCatalogPreview } from "./session-catalog-native-projection-rCKnZud1.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-DWzK-k0n.mjs";
 import { codexCatalogPageWorkerEntrypoint } from "../catalog-page-worker-entrypoint.js";
-import { t as createWebSocketTransport } from "./transport-websocket-zqJ0Cmtn.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
+import { t as createWebSocketTransport } from "./transport-websocket-DIyPfkHo.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-DD-enC8w.mjs";
 import { isRecord, normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { randomUUID } from "node:crypto";
 import { normalizeJsonSchemaForTypeBox } from "openclaw/plugin-sdk/json-schema-runtime";
 import { addSafeTimeoutDelayGraceMs, addTimerTimeoutGraceMs, parseStrictNonNegativeInteger } from "openclaw/plugin-sdk/number-runtime";
+import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import path from "node:path";
 import { coerceErrorMessage, toStringifiedError } from "openclaw/plugin-sdk/error-runtime";
-import { sliceUtf16Safe, truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
-import { hasPendingInternalDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { OPENCLAW_VERSION, embeddedAgentLog, formatToolExecutionErrorMessage, normalizeQuestionTimeoutSeconds, resolveToolExecutionErrorKind } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { sleepWithAbort } from "openclaw/plugin-sdk/runtime-env";
@@ -30,8 +30,9 @@ const CATALOG_WORKER_IDLE_MS = 6e4;
 const runInCatalogWorkerContext = AsyncLocalStorage.snapshot();
 /** Late responses retain their decode route after cancellation removes the waiter. */
 function codexCatalogRequestId(method, params, sequence, catalogPreview) {
-	const kind = catalogPreview ? method === "thread/list" ? "list" : method === "thread/read" && isJsonObject(params) && params.includeTurns !== true ? "thread" : void 0 : void 0;
-	return kind ? Number.MAX_SAFE_INTEGER - 2 * sequence - (kind === "thread" ? 1 : 0) : sequence;
+	if (!catalogPreview) return sequence;
+	const thread = method === "thread/read" && isJsonObject(params) && params.includeTurns !== true;
+	return method === "thread/list" || thread ? Number.MAX_SAFE_INTEGER - 2 * sequence - (thread ? 1 : 0) : sequence;
 }
 /** Each physical client owns one decoder, including incomplete-line recovery state. */
 var CodexCatalogWorker = class {
@@ -43,7 +44,7 @@ var CodexCatalogWorker = class {
 	get continuation() {
 		return this.continuationRoute;
 	}
-	async decode(line, route, attempts, projections) {
+	async decode(line, route, attempts) {
 		if (this.closed) return;
 		if (!this.continuationRoute && route !== "unresolved" && line.byteLength <= INLINE_CATALOG_MAX_BYTES) {
 			let parsed;
@@ -54,7 +55,7 @@ var CodexCatalogWorker = class {
 				await Promise.resolve();
 				if (this.closed) return;
 				const attempt = attempts.get(route.id);
-				const projection = attempt ? projections.get(attempt) : void 0;
+				const projection = attempt?.catalogProjection;
 				return projectCodexCatalogMessage(parsed, {
 					route,
 					remainingRows: attempt ? projection?.remainingRows : 0
@@ -70,6 +71,7 @@ var CodexCatalogWorker = class {
 			if (this.closed) return;
 			this.pool = new WorkerTaskPool({
 				workerUrl: resolveRuntimeWorkerUrl(codexCatalogPageWorkerEntrypoint),
+				workerClass: "singleton",
 				maxWorkers: 1,
 				maxPendingTasks: 1,
 				maxPendingBytes: Number.MAX_SAFE_INTEGER,
@@ -78,16 +80,16 @@ var CodexCatalogWorker = class {
 			});
 		}
 		const attempt = route === "unresolved" ? void 0 : attempts.get(route.id);
-		const remainingRows = attempt ? projections.get(attempt)?.remainingRows : 0;
+		const remainingRows = attempt ? attempt.catalogProjection?.remainingRows : 0;
 		let catalogRows;
 		if (route === "unresolved") {
 			catalogRows = /* @__PURE__ */ new Map();
 			for (const [id, pending] of attempts) {
-				const projection = projections.get(pending);
+				const projection = pending.catalogProjection;
 				if (typeof id === "number" && projection) catalogRows.set(id, projection.remainingRows);
 			}
 		}
-		const bytes = line.byteOffset === 0 && line.byteLength === line.buffer.byteLength && line.buffer instanceof ArrayBuffer ? new Uint8Array(line.buffer) : Uint8Array.from(line);
+		const bytes = line.byteLength === line.buffer.byteLength && line.buffer instanceof ArrayBuffer ? new Uint8Array(line.buffer) : Uint8Array.from(line);
 		const decoded = await this.pool.run({
 			bytes,
 			route,
@@ -314,8 +316,8 @@ var CodexAppServerVersionError = class extends Error {
 	constructor(detectedVersion) {
 		const detected = detectedVersion ? `detected ${detectedVersion}` : "OpenClaw could not determine the running Codex version";
 		super(`Codex app-server ${MIN_SUPPORTED_CODEX_APP_SERVER_VERSION} or newer is required, but ${detected}. Update the configured Codex app-server binary, or remove custom command overrides to use the managed binary.`);
-		this.name = "CodexAppServerVersionError";
 		this.detectedVersion = detectedVersion;
+		this.name = "CodexAppServerVersionError";
 	}
 };
 function assertSupportedCodexAppServerVersion(response) {
@@ -381,7 +383,7 @@ var CodexAppServerNotifications = class {
 //#endregion
 //#region extensions/codex/src/app-server/client-response.ts
 /** Settles one wire attempt and reports newly observed native execution. */
-function dispatchCodexAppServerResponse(response, attempts, catalogResponses, source, previewStates) {
+function dispatchCodexAppServerResponse(response, attempts, source, previewStates) {
 	const pending = attempts.get(response.id);
 	if (!pending) return false;
 	attempts.delete(response.id);
@@ -391,7 +393,7 @@ function dispatchCodexAppServerResponse(response, attempts, catalogResponses, so
 		return false;
 	}
 	const nativeExecution = pending.method === "thread/backgroundTerminals/list" && isJsonObject(response.result) && Array.isArray(response.result.data) && response.result.data.length > 0;
-	const cache = catalogResponses.get(pending)?.preview;
+	const cache = pending.catalogProjection?.preview;
 	if (cache && previewStates && isJsonObject(response.result) && Array.isArray(response.result.data)) try {
 		for (const [index, row] of response.result.data.entries()) if (isJsonObject(row) && typeof row.id === "string" && row.ephemeral !== true) {
 			const preview = reuseCodexCatalogPreview({
@@ -500,16 +502,13 @@ function createCodexRequestAttempt(params) {
 				let timer;
 				let removeAbort;
 				const waiterAttachedAtMs = diagnostics && observe ? performance.now() : 0;
-				const cleanup = () => {
+				const detach = (waiterOutcome) => {
+					if (!waiter) return false;
+					waiter = void 0;
 					clearTimeout(timer);
 					timer = void 0;
 					removeAbort?.();
 					removeAbort = void 0;
-				};
-				const detach = (waiterOutcome) => {
-					if (!waiter) return false;
-					waiter = void 0;
-					cleanup();
 					if (!params.retainWritten || !mayHaveWritten) finish(mayHaveWritten ? "correlation-closed" : "not-written");
 					observeAttempt({
 						kind: "waiter",
@@ -623,20 +622,18 @@ function failedToolResult(message, status = "failed") {
 //#endregion
 //#region extensions/codex/src/app-server/tool-abort-terminal-reason.ts
 /** Leaf helper shared by native and dynamic tool diagnostics. */
-const CODEX_TIMEOUT_ABORT_REASONS = /* @__PURE__ */ new Set([
-	"codex_startup_timeout",
-	"turn_completion_idle_timeout",
-	"turn_progress_idle_timeout",
-	"turn_terminal_idle_timeout"
+const CODEX_ABORT_TERMINAL_REASONS = /* @__PURE__ */ new Map([
+	["codex_startup_timeout", "timed_out"],
+	["turn_completion_idle_timeout", "timed_out"],
+	["turn_progress_idle_timeout", "timed_out"],
+	["turn_terminal_idle_timeout", "timed_out"],
+	["client_closed", "failed"]
 ]);
 /** Preserves timeout provenance when an enclosing run aborts an active tool. */
 function resolveCodexToolAbortTerminalReason(signal) {
 	try {
 		const reason = signal.reason;
-		if (typeof reason === "string") {
-			if (CODEX_TIMEOUT_ABORT_REASONS.has(reason)) return "timed_out";
-			return reason === "client_closed" ? "failed" : "cancelled";
-		}
+		if (typeof reason === "string") return CODEX_ABORT_TERMINAL_REASONS.get(reason) ?? "cancelled";
 		if (reason && typeof reason === "object") {
 			const record = reason;
 			if (record.name === "TimeoutError" || record.reason === "timeout") return "timed_out";
@@ -707,151 +704,150 @@ function formatDynamicToolTimeoutDetails(params) {
 	};
 }
 async function handleDynamicToolCallWithTimeout(params) {
-	return await runWithAsyncWorkResources((onAcquired) => executeDynamicToolCallWithTimeout(params, (release) => onAcquired({
-		release,
-		releaseBeforeResultWhenIdle: true
-	})));
-}
-async function executeDynamicToolCallWithTimeout(params, retainCleanup) {
-	let didNotifyAgentToolResult = false;
-	const conservativeRaceResponses = /* @__PURE__ */ new WeakSet();
-	const finalizeTerminal = (response) => {
-		const executionSnapshot = params.toolBridge.consumeToolExecutionSnapshot?.(params.call.callId);
-		const ownerKey = params.toolBridge.sideEffectOwnerKeyForTool?.(params.call.tool);
-		const observedExecutionStarted = executionSnapshot?.executionStarted ?? (conservativeRaceResponses.has(response) ? void 0 : response.executionStarted);
-		const terminalResolution = params.observeToolTerminal?.({
-			toolCallId: params.call.callId,
-			toolName: params.call.tool,
-			result: copyInternalToolResultState(response, {
-				...response,
-				details: response.transcriptDetails
-			}),
-			arguments: response.executedArguments ?? executionSnapshot?.executedArguments ?? params.call.arguments,
-			...params.toolMeta ? { meta: params.toolMeta } : {},
-			...ownerKey ? { ownerMutation: { ownerKey } } : {},
-			replaySafe: ownerKey ? false : response.replaySafe,
-			...observedExecutionStarted !== void 0 ? { executionStarted: observedExecutionStarted } : {},
-			outcome: response.success ? "success" : "failure",
-			...!response.success ? { failure: { error: readDynamicToolResponseText(response) } } : {}
-		});
-		if (terminalResolution) {
-			response.terminalResolution = terminalResolution;
-			response.executionStarted = terminalResolution.executionStarted;
-			response.executedArguments = terminalResolution.executedArguments ?? response.executedArguments;
-			response.sideEffectEvidence = terminalResolution.sideEffectEvidence || void 0;
+	return await runWithAsyncWorkResources(async (onAcquired) => {
+		let didNotifyAgentToolResult = false;
+		const conservativeRaceResponses = /* @__PURE__ */ new WeakSet();
+		const finalizeTerminal = (response) => {
+			const executionSnapshot = params.toolBridge.consumeToolExecutionSnapshot?.(params.call.callId);
+			const ownerKey = params.toolBridge.sideEffectOwnerKeyForTool?.(params.call.tool);
+			const observedExecutionStarted = executionSnapshot?.executionStarted ?? (conservativeRaceResponses.has(response) ? void 0 : response.executionStarted);
+			const terminalResolution = params.observeToolTerminal?.({
+				toolCallId: params.call.callId,
+				toolName: params.call.tool,
+				result: copyInternalToolResultState(response, {
+					...response,
+					details: response.transcriptDetails
+				}),
+				arguments: response.executedArguments ?? executionSnapshot?.executedArguments ?? params.call.arguments,
+				...params.toolMeta ? { meta: params.toolMeta } : {},
+				...ownerKey ? { ownerMutation: { ownerKey } } : {},
+				replaySafe: ownerKey ? false : response.replaySafe,
+				...observedExecutionStarted !== void 0 ? { executionStarted: observedExecutionStarted } : {},
+				outcome: response.success ? "success" : "failure",
+				...!response.success ? { failure: { error: readDynamicToolResponseText(response) } } : {}
+			});
+			if (terminalResolution) {
+				response.terminalResolution = terminalResolution;
+				response.executionStarted = terminalResolution.executionStarted;
+				response.executedArguments = terminalResolution.executedArguments ?? response.executedArguments;
+				response.sideEffectEvidence = terminalResolution.sideEffectEvidence || void 0;
+			}
+			return response;
+		};
+		const createFailedAfterPossibleDispatch = (message, terminalReason) => {
+			const response = createFailedDynamicToolResponse(message, {
+				executionStarted: true,
+				sideEffectEvidence: true,
+				terminalReason
+			});
+			conservativeRaceResponses.add(response);
+			return response;
+		};
+		const notifyAgentToolResult = (event) => {
+			if (didNotifyAgentToolResult) return;
+			didNotifyAgentToolResult = true;
+			try {
+				params.onAgentToolResult?.(event);
+			} catch (error) {
+				const message = formatToolExecutionErrorMessage(error, "Unknown error");
+				embeddedAgentLog.warn(`onAgentToolResult handler failed: tool=${params.call.tool} error=${message}`);
+			}
+		};
+		const notifyFailedToolResult = (message, terminalReason = "failed") => {
+			notifyAgentToolResult({
+				toolName: params.call.tool,
+				result: failedToolResult(message, terminalReason),
+				isError: true
+			});
+		};
+		if (params.signal.aborted) {
+			const message = "OpenClaw dynamic tool call aborted before execution.";
+			const terminalReason = resolveCodexToolAbortTerminalReason(params.signal);
+			params.onFallbackSelected?.();
+			notifyFailedToolResult(message, terminalReason);
+			return finalizeTerminal(createFailedDynamicToolResponse(message, {
+				executionStarted: false,
+				terminalReason
+			}));
 		}
-		return response;
-	};
-	const createFailedAfterPossibleDispatch = (message, terminalReason) => {
-		const response = createFailedDynamicToolResponse(message, {
-			executionStarted: true,
-			sideEffectEvidence: true,
-			terminalReason
+		const controller = new AbortController();
+		let timeout;
+		let timedOut = false;
+		let toolCallSettled = false;
+		let completedSuccessfully = false;
+		let operationReleased = false;
+		let resolveAbort;
+		const abortFromRun = () => {
+			const message = "OpenClaw dynamic tool call aborted.";
+			const terminalReason = resolveCodexToolAbortTerminalReason(params.signal);
+			controller.abort(params.signal.reason ?? /* @__PURE__ */ new Error(message));
+			if (toolCallSettled) return;
+			params.onFallbackSelected?.();
+			notifyFailedToolResult(message, terminalReason);
+			resolveAbort?.(createFailedAfterPossibleDispatch(message, terminalReason));
+		};
+		const releaseOperation = () => {
+			if (operationReleased) return;
+			operationReleased = true;
+			params.signal.removeEventListener("abort", abortFromRun);
+			if (!controller.signal.aborted) controller.abort(/* @__PURE__ */ new Error("OpenClaw dynamic tool call finished."));
+		};
+		onAcquired({
+			release: releaseOperation,
+			releaseBeforeResultWhenIdle: true
+		});
+		const abortPromise = new Promise((resolve) => {
+			resolveAbort = resolve;
+		});
+		const timeoutPromise = new Promise((resolve) => {
+			const { timeoutMs } = params;
+			timeout = setTimeout(() => {
+				timedOut = true;
+				const timeoutDetails = formatDynamicToolTimeoutDetails({
+					call: params.call,
+					timeoutMs
+				});
+				params.onFallbackSelected?.();
+				controller.abort(new Error(timeoutDetails.responseMessage));
+				params.onTimeout?.();
+				embeddedAgentLog.warn("codex dynamic tool call timed out", {
+					...timeoutDetails.meta,
+					consoleMessage: timeoutDetails.consoleMessage
+				});
+				notifyFailedToolResult(timeoutDetails.responseMessage, "timed_out");
+				resolve(createFailedAfterPossibleDispatch(timeoutDetails.responseMessage, "timed_out"));
+			}, timeoutMs);
+			timeout.unref?.();
 		});
-		conservativeRaceResponses.add(response);
-		return response;
-	};
-	const notifyAgentToolResult = (event) => {
-		if (didNotifyAgentToolResult) return;
-		didNotifyAgentToolResult = true;
 		try {
-			params.onAgentToolResult?.(event);
+			params.signal.addEventListener("abort", abortFromRun, { once: true });
+			if (params.signal.aborted) abortFromRun();
+			const response = await Promise.race([
+				params.toolBridge.handleToolCall(params.call, {
+					signal: controller.signal,
+					onAgentToolResult: notifyAgentToolResult,
+					toolCallOrdinal: params.toolCallOrdinal,
+					retainExecutionSnapshot: true
+				}),
+				abortPromise,
+				timeoutPromise
+			]);
+			if (!response.success && !didNotifyAgentToolResult) notifyFailedToolResult(readDynamicToolResponseText(response), response.diagnosticTerminalReason ?? "failed");
+			const terminal = finalizeTerminal(response);
+			completedSuccessfully = terminal.success;
+			return terminal;
 		} catch (error) {
-			const message = formatToolExecutionErrorMessage(error, "Unknown error");
-			embeddedAgentLog.warn(`onAgentToolResult handler failed: tool=${params.call.tool} error=${message}`);
+			const terminalReason = params.signal.aborted ? resolveCodexToolAbortTerminalReason(params.signal) : resolveToolExecutionErrorKind(error);
+			const message = formatToolExecutionErrorMessage(error, "OpenClaw dynamic tool call failed.");
+			notifyFailedToolResult(message, terminalReason);
+			return finalizeTerminal(createFailedAfterPossibleDispatch(message, terminalReason));
+		} finally {
+			clearTimeout(timeout);
+			toolCallSettled = true;
+			resolveAbort = void 0;
+			if (!completedSuccessfully || timedOut || controller.signal.aborted) releaseOperation();
 		}
-	};
-	const notifyFailedToolResult = (message, terminalReason = "failed") => {
-		notifyAgentToolResult({
-			toolName: params.call.tool,
-			result: failedToolResult(message, terminalReason),
-			isError: true
-		});
-	};
-	if (params.signal.aborted) {
-		const message = "OpenClaw dynamic tool call aborted before execution.";
-		const terminalReason = resolveCodexToolAbortTerminalReason(params.signal);
-		params.onFallbackSelected?.();
-		notifyFailedToolResult(message, terminalReason);
-		return finalizeTerminal(createFailedDynamicToolResponse(message, {
-			executionStarted: false,
-			terminalReason
-		}));
-	}
-	const controller = new AbortController();
-	let timeout;
-	let timedOut = false;
-	let toolCallSettled = false;
-	let completedSuccessfully = false;
-	let operationReleased = false;
-	let resolveAbort;
-	const abortFromRun = () => {
-		const message = "OpenClaw dynamic tool call aborted.";
-		const terminalReason = resolveCodexToolAbortTerminalReason(params.signal);
-		controller.abort(params.signal.reason ?? /* @__PURE__ */ new Error(message));
-		if (toolCallSettled) return;
-		params.onFallbackSelected?.();
-		notifyFailedToolResult(message, terminalReason);
-		resolveAbort?.(createFailedAfterPossibleDispatch(message, terminalReason));
-	};
-	const releaseOperation = () => {
-		if (operationReleased) return;
-		operationReleased = true;
-		params.signal.removeEventListener("abort", abortFromRun);
-		if (!controller.signal.aborted) controller.abort(/* @__PURE__ */ new Error("OpenClaw dynamic tool call finished."));
-	};
-	retainCleanup(releaseOperation);
-	const abortPromise = new Promise((resolve) => {
-		resolveAbort = resolve;
 	});
-	const timeoutPromise = new Promise((resolve) => {
-		const { timeoutMs } = params;
-		timeout = setTimeout(() => {
-			timedOut = true;
-			const timeoutDetails = formatDynamicToolTimeoutDetails({
-				call: params.call,
-				timeoutMs
-			});
-			params.onFallbackSelected?.();
-			controller.abort(new Error(timeoutDetails.responseMessage));
-			params.onTimeout?.();
-			embeddedAgentLog.warn("codex dynamic tool call timed out", {
-				...timeoutDetails.meta,
-				consoleMessage: timeoutDetails.consoleMessage
-			});
-			notifyFailedToolResult(timeoutDetails.responseMessage, "timed_out");
-			resolve(createFailedAfterPossibleDispatch(timeoutDetails.responseMessage, "timed_out"));
-		}, timeoutMs);
-		timeout.unref?.();
-	});
-	try {
-		params.signal.addEventListener("abort", abortFromRun, { once: true });
-		if (params.signal.aborted) abortFromRun();
-		const response = await Promise.race([
-			params.toolBridge.handleToolCall(params.call, {
-				signal: controller.signal,
-				onAgentToolResult: notifyAgentToolResult,
-				toolCallOrdinal: params.toolCallOrdinal,
-				retainExecutionSnapshot: true
-			}),
-			abortPromise,
-			timeoutPromise
-		]);
-		if (!response.success && !didNotifyAgentToolResult) notifyFailedToolResult(readDynamicToolResponseText(response), response.diagnosticTerminalReason ?? "failed");
-		const terminal = finalizeTerminal(response);
-		completedSuccessfully = terminal.success;
-		return terminal;
-	} catch (error) {
-		const terminalReason = params.signal.aborted ? resolveCodexToolAbortTerminalReason(params.signal) : resolveToolExecutionErrorKind(error);
-		const message = formatToolExecutionErrorMessage(error, "OpenClaw dynamic tool call failed.");
-		notifyFailedToolResult(message, terminalReason);
-		return finalizeTerminal(createFailedAfterPossibleDispatch(message, terminalReason));
-	} finally {
-		if (timeout) clearTimeout(timeout);
-		toolCallSettled = true;
-		resolveAbort = void 0;
-		if (!completedSuccessfully || timedOut || controller.signal.aborted) releaseOperation();
-	}
 }
 function readDynamicToolResponseText(response) {
 	return response.contentItems.flatMap((item) => item.type === "inputText" && typeof item.text === "string" ? [item.text] : []).join("\n").trim() || "OpenClaw dynamic tool call failed.";
@@ -863,7 +859,6 @@ function toCodexDynamicToolProtocolResponse(response) {
 		success: response.success
 	};
 }
-/** Adds async-started progress details when a tool result continues out of band. */
 function toCodexDynamicToolProgressResponse(response, protocolResponse) {
 	const transcriptDetails = isJsonObject(response.transcriptDetails) ? response.transcriptDetails : void 0;
 	const mcpAppPreview = isJsonObject(transcriptDetails?.mcpAppPreview) ? transcriptDetails.mcpAppPreview : void 0;
@@ -877,37 +872,6 @@ function toCodexDynamicToolProgressResponse(response, protocolResponse) {
 		} : { mcpAppPreview }
 	};
 }
-function shouldReleaseTurnAfterTerminalDynamicTool(state) {
-	return !state.completed && !state.aborted && state.responseSuccess && !state.currentTurnHadNonTerminalDynamicToolResult && state.activeAppServerTurnRequests === 0 && state.activeTurnItemIdsCount === 0 && state.pendingOpenClawDynamicToolCompletionIdsCount === 0;
-}
-function resolveTerminalDynamicToolBatchAction(state) {
-	if (state.activeAppServerTurnRequests > 0 || state.activeTurnItemIdsCount > 0 || state.pendingOpenClawDynamicToolCompletionIdsCount > 0) return "wait";
-	if (state.currentTurnHadNonTerminalDynamicToolResult) return "clear-nonterminal-batch";
-	if (state.hasPendingTerminalDynamicToolRelease) return "release-pending-terminal";
-	return "idle";
-}
-function isDynamicToolTerminalDiagnosticEvent(event) {
-	return event.type === "tool.execution.completed" || event.type === "tool.execution.error" || event.type === "tool.execution.blocked";
-}
-function isMatchingDynamicToolTerminalDiagnostic(params) {
-	if (params.event.toolCallId !== params.call.callId || params.event.toolName !== params.call.tool) return false;
-	if (params.runId !== void 0) return params.event.runId === params.runId;
-	if (params.sessionId !== void 0) return params.event.sessionId === params.sessionId;
-	if (params.sessionKey !== void 0) return params.event.sessionKey === params.sessionKey;
-	return params.event.runId === void 0 && params.event.sessionId === void 0 && params.event.sessionKey === void 0;
-}
-function hasPendingDynamicToolTerminalDiagnostic(params) {
-	return hasPendingInternalDiagnosticEvent((event) => {
-		if (!isDynamicToolTerminalDiagnosticEvent(event)) return false;
-		return isMatchingDynamicToolTerminalDiagnostic({
-			event,
-			call: params.call,
-			runId: params.runId,
-			sessionId: params.sessionId,
-			sessionKey: params.sessionKey
-		});
-	});
-}
 function resolveDynamicToolCallTimeoutMs(params) {
 	const args = isJsonObject(params.call.arguments) ? params.call.arguments : void 0;
 	if (params.call.tool === "node_exec") {
@@ -3661,7 +3625,7 @@ var CodexServerRequests = class {
 					method: request.method,
 					timeoutMs
 				});
-				deadline.resolve(timeoutServerRequestResponse(timeoutMs));
+				deadline.resolve(failedToolResponse(`OpenClaw dynamic tool call timed out after ${timeoutMs}ms before sending a response to Codex.`));
 				controller.abort(/* @__PURE__ */ new Error("codex app-server server request timed out"));
 			}, timeoutMs);
 			timeout.unref?.();
@@ -3712,13 +3676,7 @@ var CodexServerRequests = class {
 	}
 };
 function defaultServerRequestResponse(request) {
-	if (request.method === "item/tool/call") return {
-		contentItems: [{
-			type: "inputText",
-			text: "OpenClaw did not register a handler for this app-server tool call."
-		}],
-		success: false
-	};
+	if (request.method === "item/tool/call") return failedToolResponse("OpenClaw did not register a handler for this app-server tool call.");
 	if (request.method === "item/commandExecution/requestApproval" || request.method === "item/fileChange/requestApproval") return { decision: "decline" };
 	if (request.method === "item/permissions/requestApproval") return {
 		permissions: {},
@@ -3728,11 +3686,11 @@ function defaultServerRequestResponse(request) {
 	if (request.method === "mcpServer/elicitation/request") return createCodexElicitationResponse("decline", null, { message: "OpenClaw has no interactive handler for this elicitation." });
 	return {};
 }
-function timeoutServerRequestResponse(timeoutMs) {
+function failedToolResponse(text) {
 	return {
 		contentItems: [{
 			type: "inputText",
-			text: `OpenClaw dynamic tool call timed out after ${timeoutMs}ms before sending a response to Codex.`
+			text
 		}],
 		success: false
 	};
@@ -3753,6 +3711,12 @@ var client_exports = /* @__PURE__ */ __exportAll({
 const CODEX_APP_SERVER_STDERR_TAIL_MAX = 2e3;
 const CODEX_APP_SERVER_OVERLOAD_MAX_RETRIES = 3;
 const CODEX_APP_SERVER_OVERLOAD_RETRY_BASE_MS = 50;
+function remainingRequestTime(method, signal, deadline) {
+	if (signal?.aborted) throw new CodexAppServerLocalRequestCancellationError(method, "aborted", false, signal.reason);
+	const remainingMs = deadline === void 0 ? void 0 : deadline - performance.now();
+	if (remainingMs !== void 0 && remainingMs <= 0) throw new CodexAppServerLocalRequestCancellationError(method, "timed out", false);
+	return remainingMs;
+}
 function isCodexAppServerRequestTimeoutError(error) {
 	return error instanceof Error && "code" in error && error.code === "CODEX_APP_SERVER_LOCAL_REQUEST_CANCELLED" && "reason" in error && error.reason === "timed out";
 }
@@ -3766,15 +3730,18 @@ var CodexAppServerIndeterminateTransportError = class extends Error {
 };
 /** True when a local cancellation can leave an app-server request in flight. */
 function isCodexAppServerIndeterminateRequestCancellationError(error) {
-	return error instanceof Error && "code" in error && error.code === "CODEX_APP_SERVER_LOCAL_REQUEST_CANCELLED" && "mayHaveWritten" in error && error.mayHaveWritten === true;
+	return hasRequestWriteState(error, "CODEX_APP_SERVER_LOCAL_REQUEST_CANCELLED", true);
 }
 /** True when local cancellation happened before a request write was attempted. */
 function isCodexAppServerPrewriteRequestCancellationError(error) {
-	return error instanceof Error && "code" in error && error.code === "CODEX_APP_SERVER_LOCAL_REQUEST_CANCELLED" && "mayHaveWritten" in error && error.mayHaveWritten === false;
+	return hasRequestWriteState(error, "CODEX_APP_SERVER_LOCAL_REQUEST_CANCELLED", false);
 }
 /** True when transport failure cannot prove a written request stopped running. */
 function isCodexAppServerIndeterminateTransportError(error) {
-	return error instanceof Error && "code" in error && error.code === "CODEX_APP_SERVER_REQUEST_TRANSPORT_INDETERMINATE" && "mayHaveWritten" in error && error.mayHaveWritten === true;
+	return hasRequestWriteState(error, "CODEX_APP_SERVER_REQUEST_TRANSPORT_INDETERMINATE", true);
+}
+function hasRequestWriteState(error, code, written) {
+	return error instanceof Error && "code" in error && error.code === code && "mayHaveWritten" in error && error.mayHaveWritten === written;
 }
 function isCodexAppServerConnectionClosedError(error) {
 	if (!(error instanceof Error)) return false;
@@ -3787,7 +3754,6 @@ var CodexAppServerClient = class CodexAppServerClient {
 		this.decoder = new CodexAppServerMessageDecoder(logCodexAppServerParseFailure);
 		this.catalogWorker = new CodexCatalogWorker();
 		this.pending = /* @__PURE__ */ new Map();
-		this.catalogResponses = /* @__PURE__ */ new WeakMap();
 		this.serverRequests = new CodexServerRequests((response) => this.writeMessage(response));
 		this.notificationDispatch = new CodexAppServerNotifications();
 		this.closeHandlers = /* @__PURE__ */ new Set();
@@ -3983,9 +3949,7 @@ var CodexAppServerClient = class CodexAppServerClient {
 	async requestWithOverloadRetry(method, params, options, onWriteStateChange, onResponse) {
 		const deadline = options.timeoutMs !== void 0 && Number.isFinite(options.timeoutMs) ? performance.now() + options.timeoutMs : void 0;
 		for (let retry = 0;; retry += 1) {
-			if (options.signal?.aborted) throw new CodexAppServerLocalRequestCancellationError(method, "aborted", false, options.signal?.reason);
-			const remainingTimeoutMs = deadline === void 0 ? void 0 : deadline - performance.now();
-			if (remainingTimeoutMs !== void 0 && remainingTimeoutMs <= 0) throw new CodexAppServerLocalRequestCancellationError(method, "timed out", false);
+			const remainingTimeoutMs = remainingRequestTime(method, options.signal, deadline);
 			try {
 				return await this.requestOnce(method, params, {
 					...options,
@@ -4000,14 +3964,12 @@ var CodexAppServerClient = class CodexAppServerClient {
 		}
 	}
 	async waitForOverloadRetry(method, backoffMs, deadline, signal) {
-		if (signal?.aborted) throw new CodexAppServerLocalRequestCancellationError(method, "aborted", false, signal?.reason);
-		const remainingMs = deadline === void 0 ? void 0 : deadline - performance.now();
-		if (remainingMs !== void 0 && remainingMs <= 0) throw new CodexAppServerLocalRequestCancellationError(method, "timed out", false);
+		const remainingMs = remainingRequestTime(method, signal, deadline);
 		const delayMs = remainingMs === void 0 ? backoffMs : Math.min(backoffMs, remainingMs);
 		try {
 			await sleepWithAbort(delayMs, signal, { ref: false });
 		} catch (error) {
-			if (signal?.aborted) throw new CodexAppServerLocalRequestCancellationError(method, "aborted", false, signal.reason);
+			remainingRequestTime(method, signal);
 			throw error;
 		}
 	}
@@ -4041,18 +4003,17 @@ var CodexAppServerClient = class CodexAppServerClient {
 			localError: (error, written) => written && !isCodexAppServerIndeterminateRequestCancellationError(error) && !isCodexAppServerIndeterminateTransportError(error) ? new CodexAppServerIndeterminateTransportError(method, error) : error
 		});
 		this.pending.set(id, attempt);
-		if (options.catalogPreview) this.catalogResponses.set(attempt, {
+		if (options.catalogPreview) attempt.catalogProjection = {
 			preview: options.catalogPreviewCache,
 			remainingRows: options.catalogRows
-		});
+		};
 		const result = attempt.wait({
 			...options,
 			overloadAttemptOrdinal
 		}, deadline);
 		dispatchCodexRequestAttempt(attempt, options, () => {
 			if (this.closed) throw this.closeError ?? /* @__PURE__ */ new Error("codex app-server client is closed");
-			if (options.signal?.aborted) throw new CodexAppServerLocalRequestCancellationError(method, "aborted", false, options.signal.reason);
-			if (deadline !== void 0 && performance.now() >= deadline) throw new CodexAppServerLocalRequestCancellationError(method, "timed out", false);
+			remainingRequestTime(method, options.signal, deadline);
 		}, () => {
 			this.writeMessage(message, (error) => attempt.failLocal(error), () => {
 				attempt.markWritten();
@@ -4124,13 +4085,9 @@ var CodexAppServerClient = class CodexAppServerClient {
 		}
 		this.privateTransportSecrets.add(secret);
 	}
-	redactPrivateText(text) {
-		let redacted = text;
-		for (const secret of this.privateTransportSecrets) redacted = redacted.replaceAll(secret, "[REDACTED]");
-		return redacted;
-	}
 	redactPrivateStderr(chunk) {
-		const text = this.redactPrivateText(this.privateStderrPending + chunk);
+		let text = this.privateStderrPending + chunk;
+		for (const secret of this.privateTransportSecrets) text = text.replaceAll(secret, "[REDACTED]");
 		let held = 0;
 		for (const secret of this.privateTransportSecrets) for (let length = 1; length < secret.length; length++) if (text.endsWith(secret.slice(0, length))) held = Math.max(held, length);
 		this.privateStderrPending = held ? text.slice(-held) : "";
@@ -4140,7 +4097,7 @@ var CodexAppServerClient = class CodexAppServerClient {
 		if (this.closed || !parsed || typeof parsed !== "object") return;
 		const message = parsed;
 		if (isRpcResponse(message)) {
-			this.handleResponse(message, previewStates);
+			this.nativeExecutionObserved = dispatchCodexAppServerResponse(message, this.pending, codexCatalogSourceForClient(this), previewStates) || this.nativeExecutionObserved;
 			return;
 		}
 		if (!("method" in message)) return;
@@ -4158,15 +4115,12 @@ var CodexAppServerClient = class CodexAppServerClient {
 		});
 	}
 	async decodeCatalogLine(line, route) {
-		const decoded = await this.catalogWorker.decode(line, route, this.pending, this.catalogResponses);
+		const decoded = await this.catalogWorker.decode(line, route, this.pending);
 		if (!decoded || this.closed) return;
 		for (const failure of decoded.failures) logCodexAppServerParseFailure(failure.value, failure.error, failure.fragmentCount);
 		if (decoded.projectionError) this.pending.get(decoded.projectionError.id)?.reject(decoded.projectionError.error, false);
 		else if (decoded.message) this.handleParsedMessage(decoded.message, decoded.previewStates);
 	}
-	handleResponse(response, previewStates) {
-		this.nativeExecutionObserved = dispatchCodexAppServerResponse(response, this.pending, this.catalogResponses, codexCatalogSourceForClient(this), previewStates) || this.nativeExecutionObserved;
-	}
 	handleNotification(notification) {
 		const params = notification.params;
 		if (notification.method === "serverRequest/resolved") this.serverRequests.resolve(params);
@@ -4190,10 +4144,6 @@ var CodexAppServerClient = class CodexAppServerClient {
 			embeddedAgentLog.warn("codex catalog worker shutdown failed", { error: closeError });
 		});
 		this.serverRequestsClosed = this.serverRequests.close(error);
-		this.rejectPendingRequests(error);
-		return true;
-	}
-	rejectPendingRequests(error) {
 		for (const pending of this.pending.values()) pending.close(error);
 		this.pending.clear();
 		for (const handler of this.closeHandlers) try {
@@ -4201,6 +4151,7 @@ var CodexAppServerClient = class CodexAppServerClient {
 		} catch (closeError) {
 			embeddedAgentLog.warn("codex app-server close handler failed", { error: closeError });
 		}
+		return true;
 	}
 };
 const CODEX_APP_SERVER_APPROVAL_REQUEST_METHODS = /* @__PURE__ */ new Set([
@@ -4212,4 +4163,4 @@ function isCodexAppServerApprovalRequest(method) {
 	return CODEX_APP_SERVER_APPROVAL_REQUEST_METHODS.has(method);
 }
 //#endregion
-export { resolveTerminalDynamicToolBatchAction as A, getCodexAppServerClientInstanceId as B, resolveCodexThreadRolloutPath as C, isDynamicToolTerminalDiagnosticEvent as D, hasPendingDynamicToolTerminalDiagnostic as E, createFailedDynamicToolResponse as F, resolveCodexAppServerClientInstanceId as H, failedToolResult as I, readCodexAppServerWarningMessage as L, toCodexDynamicToolProgressResponse as M, toCodexDynamicToolProtocolResponse as N, isMatchingDynamicToolTerminalDiagnostic as O, resolveCodexToolAbortTerminalReason as P, isUnsupportedCodexAppServerVersionError as R, readSupervisionResponseThreadId as S, handleDynamicToolCallWithTimeout as T, isCodexAppServerBrokenPipeError as V, assertCodexTurnStartResponse as _, isCodexAppServerIndeterminateRequestCancellationError as a, readCodexErrorNotification as b, isCodexAppServerRequestTimeoutError as c, assertCodexModelListResponse as d, assertCodexPassiveTurnItems as f, assertCodexThreadStartResponse as g, assertCodexThreadResumeResponse as h, isCodexAppServerConnectionClosedError as i, shouldReleaseTurnAfterTerminalDynamicTool as j, resolveDynamicToolCallTimeoutMs as k, CodexServerRequestResolvedError as l, assertCodexThreadForkResponse as m, client_exports as n, isCodexAppServerIndeterminateTransportError as o, assertCodexThreadAcceptsDirectInput as p, isCodexAppServerApprovalRequest as r, isCodexAppServerPrewriteRequestCancellationError as s, CodexAppServerClient as t, CodexThreadDirectInputError as u, assertExactSupervisionModelSelection as v, createCodexElicitationResponse as w, readCodexTurnCompletedNotification as x, readCodexDynamicToolCallParams as y, CODEX_APP_SERVER_OPT_OUT_NOTIFICATION_METHODS as z };
+export { createFailedDynamicToolResponse as A, resolveCodexThreadRolloutPath as C, toCodexDynamicToolProgressResponse as D, resolveDynamicToolCallTimeoutMs as E, getCodexAppServerClientInstanceId as F, isCodexAppServerBrokenPipeError as I, resolveCodexAppServerClientInstanceId as L, readCodexAppServerWarningMessage as M, isUnsupportedCodexAppServerVersionError as N, toCodexDynamicToolProtocolResponse as O, CODEX_APP_SERVER_OPT_OUT_NOTIFICATION_METHODS as P, readSupervisionResponseThreadId as S, handleDynamicToolCallWithTimeout as T, assertCodexTurnStartResponse as _, isCodexAppServerIndeterminateRequestCancellationError as a, readCodexErrorNotification as b, isCodexAppServerRequestTimeoutError as c, assertCodexModelListResponse as d, assertCodexPassiveTurnItems as f, assertCodexThreadStartResponse as g, assertCodexThreadResumeResponse as h, isCodexAppServerConnectionClosedError as i, failedToolResult as j, resolveCodexToolAbortTerminalReason as k, CodexServerRequestResolvedError as l, assertCodexThreadForkResponse as m, client_exports as n, isCodexAppServerIndeterminateTransportError as o, assertCodexThreadAcceptsDirectInput as p, isCodexAppServerApprovalRequest as r, isCodexAppServerPrewriteRequestCancellationError as s, CodexAppServerClient as t, CodexThreadDirectInputError as u, assertExactSupervisionModelSelection as v, createCodexElicitationResponse as w, readCodexTurnCompletedNotification as x, readCodexDynamicToolCallParams as y };