@openclaw/codex 2026.9.8 → 2026.10.1-beta.2

package/dist/.setup/{attempt-client-cleanup-B-S7ngS_.mjs → turn-router-sS69wYnI.mjs}

@@ -1,21 +1,18 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { d as retireSharedCodexAppServerClientIfCurrent } from "./shared-client-lifecycle-7xgtlo15.mjs";
-import { n as CodexAppServerRpcError } from "./rpc-error-BlD2vuzn.mjs";
 import { n as waitForPromiseOrAbort, t as abortReason } from "./timeout-CXOfNoaX.mjs";
-import { J as unsubscribeCodexAppServerLiveThread, ft as isCodexAppServerStartupError, u as isCodexAppServerStartSelectionChangedError } from "./shared-client-CJCTeFpQ.mjs";
-import { E as readCodexTurnCompletedNotification, a as isCodexAppServerBrokenPipeError, d as isCodexAppServerRequestTimeoutError, l as isCodexAppServerOverloadError } from "./client-qyUBJlGZ.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-jo6H8dFr.mjs";
+import { x as readCodexTurnCompletedNotification } from "./client-C8lgBOoO.mjs";
 import { normalizeOptionalString, readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { AsyncResource } from "node:async_hooks";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
 import { sanitizeTerminalText } from "openclaw/plugin-sdk/text-chunking";
-import { AgentHarnessPreflightError, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { redactSensitiveText } from "openclaw/plugin-sdk/logging-core";
 //#region extensions/codex/src/app-server/event-projector-items.ts
 const itemStatuses = /* @__PURE__ */ new Map([
 	["completed", "completed"],
 	["failed", "failed"],
 	["error", "failed"],
+	["interrupted", "failed"],
 	["declined", "blocked"],
 	["inProgress", "running"],
 	["in_progress", "running"],
@@ -144,6 +141,15 @@ function readCodexNotificationThreadId(record) {
 function readCodexNotificationTurnId(record) {
 	return (isJsonObject(record.turn) ? normalizeOptionalString(record.turn.id) : void 0) ?? normalizeOptionalString(record.turnId);
 }
+function readCodexNotificationScope(value) {
+	if (!isJsonObject(value)) return {};
+	const threadId = readCodexNotificationThreadId(value);
+	const turnId = readCodexNotificationTurnId(value);
+	return {
+		...threadId ? { threadId } : {},
+		...turnId ? { turnId } : {}
+	};
+}
 //#endregion
 //#region extensions/codex/src/app-server/event-projector-diagnostics.ts
 function redactCodexEventKind(method) {
@@ -192,6 +198,52 @@ var CodexProjectionDiagnostics = class {
 	}
 };
 //#endregion
+//#region extensions/codex/src/app-server/mcp-request-route.ts
+/** Subscope of the physical client router; there is no independent connection or registry. */
+var CodexMcpRequestRoutes = class {
+	constructor() {
+		this.routes = /* @__PURE__ */ new Map();
+	}
+	hasSiblingWork(threadId) {
+		return [...this.routes.values()].some((route) => route.threadId !== threadId);
+	}
+	async run(options, operation) {
+		options.signal?.throwIfAborted();
+		const key = JSON.stringify([options.threadId, options.serverName]);
+		if (this.routes.has(key)) throw new Error("An MCP App call is already pending for this server in the conversation");
+		const route = {
+			threadId: options.threadId,
+			controller: new AbortController(),
+			onRequest: AsyncResource.bind(options.onRequest)
+		};
+		const abort = () => route.controller.abort(options.signal?.reason);
+		options.signal?.addEventListener("abort", abort, { once: true });
+		this.routes.set(key, route);
+		try {
+			return await operation();
+		} finally {
+			options.signal?.removeEventListener("abort", abort);
+			this.routes.delete(key);
+			route.controller.abort(/* @__PURE__ */ new Error("MCP App call ended"));
+		}
+	}
+	route(request, scope, signal, setExecutionTimeoutMs) {
+		if (scope.turnId || request.method !== "mcpServer/elicitation/request" || !isJsonObject(request.params) || typeof request.params.serverName !== "string") return;
+		const route = this.routes.get(JSON.stringify([scope.threadId, request.params.serverName]));
+		if (!route) return;
+		return (async () => {
+			const requestSignal = AbortSignal.any([signal, route.controller.signal]);
+			requestSignal.throwIfAborted();
+			const result = await route.onRequest(request, scope, requestSignal, setExecutionTimeoutMs);
+			return requestSignal.aborted ? void 0 : result;
+		})();
+	}
+	close(error) {
+		for (const route of this.routes.values()) route.controller.abort(error);
+		this.routes.clear();
+	}
+};
+//#endregion
 //#region extensions/codex/src/app-server/turn-router.ts
 const DEFAULT_PREBIND_NOTIFICATION_LIMIT = 256;
 const DEFAULT_GLOBAL_WARNING_LIMIT = 32;
@@ -209,18 +261,23 @@ function getCodexAppServerTurnRouter(client) {
 }
 var ClientTurnRouter = class {
 	hasSiblingWork(threadId) {
-		for (const routedThreadId of this.routes.keys()) if (routedThreadId !== threadId) return true;
-		for (const watchedThreadId of this.nativeTurnCompletionWatchers.keys()) if (watchedThreadId !== threadId) return true;
+		if (this.mcpRequests.hasSiblingWork(threadId)) return true;
+		for (const threads of [this.routes, this.nativeTurnCompletionWatchers]) for (const siblingThreadId of threads.keys()) if (siblingThreadId !== threadId) return true;
 		return false;
 	}
 	constructor(client) {
 		this.routes = /* @__PURE__ */ new Map();
+		this.mcpRequests = new CodexMcpRequestRoutes();
 		this.globalWarnings = [];
 		this.nativeTurnCompletionWatchers = /* @__PURE__ */ new Map();
 		client.addNotificationHandler((notification) => this.routeNotification(notification));
 		client.addRequestHandler((request, signal, setExecutionTimeoutMs) => this.routeRequest(request, signal, setExecutionTimeoutMs));
 		client.addCloseHandler((closedClient) => this.dispose(closedClient.getCloseError()));
 	}
+	async withMcpToolCall(options, run) {
+		this.assertActive();
+		return await this.mcpRequests.run(options, run);
+	}
 	reserveThread(options) {
 		this.assertActive();
 		const threadId = requireId(options.threadId, "thread id");
@@ -315,6 +372,7 @@ var ClientTurnRouter = class {
 		if (this.closeError) return;
 		const closeError = cause ? new Error("codex app-server turn router closed", { cause }) : /* @__PURE__ */ new Error("codex app-server turn router closed");
 		this.closeError = closeError;
+		this.mcpRequests.close(closeError);
 		for (const route of this.routes.values()) this.release(route, closeError);
 		for (const watchers of this.nativeTurnCompletionWatchers.values()) for (const watcher of watchers) watcher.finish(false);
 	}
@@ -383,7 +441,7 @@ var ClientTurnRouter = class {
 	}
 	routeNotification(notification) {
 		if (this.closeError) return;
-		const scope = readScope(notification.params);
+		const scope = readCodexNotificationScope(notification.params);
 		if (!scope.threadId && (notification.method === "configWarning" || notification.method === "warning")) {
 			if (this.globalWarnings.length === DEFAULT_GLOBAL_WARNING_LIMIT) this.globalWarnings.shift();
 			this.globalWarnings.push(notification);
@@ -443,8 +501,13 @@ var ClientTurnRouter = class {
 	}
 	async routeRequest(request, signal = new AbortController().signal, setExecutionTimeoutMs) {
 		if (this.closeError || signal.aborted) return;
-		const scope = readScope(request.params);
+		const scope = readCodexNotificationScope(request.params);
 		if (!scope.threadId) return;
+		const manual = this.mcpRequests.route(request, {
+			threadId: scope.threadId,
+			...scope.turnId ? { turnId: scope.turnId } : {}
+		}, signal, setExecutionTimeoutMs);
+		if (manual) return await manual;
 		const route = this.routes.get(scope.threadId);
 		if (!route) return;
 		const requestSignal = AbortSignal.any([signal, route.controller.signal]);
@@ -477,7 +540,7 @@ var ClientTurnRouter = class {
 		const handler = route.handlers?.onNotification;
 		if (!handler) return;
 		for (const pending of route.pending.splice(0)) {
-			if (route.gate !== "bound" && (pending.notification.method === "configWarning" || pending.notification.method === "warning" && !readScope(pending.notification.params).threadId)) {
+			if (route.gate !== "bound" && (pending.notification.method === "configWarning" || pending.notification.method === "warning" && !readCodexNotificationScope(pending.notification.params).threadId)) {
 				route.pending.push(pending);
 				continue;
 			}
@@ -562,168 +625,10 @@ var ClientTurnRouter = class {
 		if (route.released && !this.canDrainClosedTurn(route, completedTurnId)) throw route.released;
 	}
 };
-function readScope(value) {
-	if (!isJsonObject(value)) return {};
-	const threadId = readCodexNotificationThreadId(value);
-	const turnId = readCodexNotificationTurnId(value);
-	return {
-		...threadId ? { threadId } : {},
-		...turnId ? { turnId } : {}
-	};
-}
 function requireId(value, label) {
 	const normalized = value.trim();
 	if (!normalized) throw new Error(`codex app-server ${label} must not be empty`);
 	return normalized;
 }
 //#endregion
-//#region extensions/codex/src/app-server/attempt-client-cleanup.ts
-var attempt_client_cleanup_exports = /* @__PURE__ */ __exportAll({
-	CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS: () => CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS,
-	CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS: () => CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS,
-	CodexAppServerUnsafeSubscriptionError: () => CodexAppServerUnsafeSubscriptionError,
-	assertCodexThreadResumeSubscription: () => assertCodexThreadResumeSubscription,
-	closeCodexStartupClientBestEffort: () => closeCodexStartupClientBestEffort,
-	interruptCodexTurnAndWaitBestEffort: () => interruptCodexTurnAndWaitBestEffort,
-	isCodexAppServerUnsafeSubscriptionError: () => isCodexAppServerUnsafeSubscriptionError,
-	isCodexNoActiveTurnInterruptError: () => isCodexNoActiveTurnInterruptError,
-	retireUnsafeCodexTurnClientBestEffort: () => retireUnsafeCodexTurnClientBestEffort,
-	shouldRetireCodexStartupClient: () => shouldRetireCodexStartupClient,
-	terminateCodexBackgroundTerminals: () => terminateCodexBackgroundTerminals,
-	unsubscribeCodexThreadBestEffort: () => unsubscribeCodexThreadBestEffort
-});
-const CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS = 5e3;
-const CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS = 5e3;
-const CODEX_NO_ACTIVE_TURN_ERROR_CODE = -32600;
-const CODEX_NO_ACTIVE_TURN_ERROR_MESSAGE = "no active turn to interrupt";
-/** Codex also reports this before an accepted turn publishes its start event. */
-function isCodexNoActiveTurnInterruptError(error) {
-	return error instanceof CodexAppServerRpcError && error.code === CODEX_NO_ACTIVE_TURN_ERROR_CODE && error.message === CODEX_NO_ACTIVE_TURN_ERROR_MESSAGE;
-}
-/** Raised when a thread subscription may be live on a client OpenClaw no longer controls. */
-var CodexAppServerUnsafeSubscriptionError = class extends Error {
-	constructor(message, options) {
-		super(message, options);
-		this.name = "CodexAppServerUnsafeSubscriptionError";
-	}
-};
-function isCodexAppServerUnsafeSubscriptionError(error) {
-	return error instanceof CodexAppServerUnsafeSubscriptionError;
-}
-function assertCodexThreadResumeSubscription(requestedThreadId, returnedThreadId) {
-	if (returnedThreadId !== requestedThreadId) throw new CodexAppServerUnsafeSubscriptionError(`Codex thread/resume returned ${returnedThreadId} for ${requestedThreadId}`);
-}
-async function closeCodexStartupClientBestEffort(client) {
-	if (!client) return;
-	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
-	if (!retiredSharedClient || retiredSharedClient.closed) await client.closeAndWait();
-}
-/** Retires an unsafe turn client without replacing an already-authoritative failure. */
-async function retireUnsafeCodexTurnClientBestEffort(client, operation) {
-	try {
-		await closeCodexStartupClientBestEffort(client);
-	} catch (error) {
-		embeddedAgentLog.debug("codex app-server unsafe turn client retirement failed", {
-			operation,
-			error
-		});
-		try {
-			client.close();
-		} catch (closeError) {
-			embeddedAgentLog.debug("codex app-server unsafe turn client close failed", {
-				operation,
-				error: closeError
-			});
-		}
-	}
-}
-/** Sends a bounded turn interrupt and waits for Codex to confirm terminal abort handling. */
-async function interruptCodexTurnAndWaitBestEffort(client, params) {
-	const timeoutMs = params.timeoutMs && Number.isFinite(params.timeoutMs) && params.timeoutMs > 0 ? params.timeoutMs : CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS;
-	const requestParams = {
-		threadId: params.threadId,
-		turnId: params.turnId
-	};
-	let cancelWatch;
-	try {
-		if (!params.turnId) {
-			await client.request("turn/interrupt", requestParams, { timeoutMs });
-			return true;
-		}
-		const deadline = Date.now() + timeoutMs;
-		const started = createDeferred();
-		const completion = getCodexAppServerTurnRouter(client).watchNativeTurnCompletion({
-			threadId: params.threadId,
-			turnId: params.turnId,
-			timeoutMs,
-			onStarted: () => started.resolve(true)
-		});
-		cancelWatch = completion.cancel;
-		if (completion.state !== "pending") return await completion.completion;
-		const requestInterrupt = async () => {
-			try {
-				await client.request("turn/interrupt", requestParams, {
-					timeoutMs: Math.max(1, deadline - Date.now()),
-					signal: completion.settledSignal
-				});
-				return true;
-			} catch (error) {
-				if (completion.state === "confirmed") return true;
-				if (isCodexNoActiveTurnInterruptError(error)) return false;
-				throw error;
-			}
-		};
-		if (!await requestInterrupt()) {
-			if (await Promise.race([completion.completion.then(() => false), started.promise]) && completion.state === "pending" && Date.now() < deadline) await requestInterrupt();
-		}
-		return await completion.completion;
-	} catch (error) {
-		embeddedAgentLog.debug("codex app-server turn interrupt failed during abort", { error });
-		return false;
-	} finally {
-		cancelWatch?.();
-	}
-}
-/** Stops native terminals on the cancelled thread without retiring peer threads. */
-async function terminateCodexBackgroundTerminals(client, threadId, oneShotCliRun = false, waitForNativeItems) {
-	const options = {
-		timeoutMs: CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS,
-		signal: AbortSignal.timeout(CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS)
-	};
-	try {
-		const { data } = await client.request("thread/backgroundTerminals/list", { threadId }, options);
-		for (const { processId } of data) await client.request("thread/backgroundTerminals/terminate", {
-			threadId,
-			processId
-		}, options);
-		if (data.length > 0) {
-			if ((await client.request("thread/backgroundTerminals/list", {
-				threadId,
-				limit: 1
-			}, options)).data.length > 0) throw new Error("native background terminals remain running");
-			if (oneShotCliRun) throw new Error("native terminal termination did not confirm process cleanup");
-		}
-		await waitForNativeItems?.(options.signal);
-	} catch (cause) {
-		throw new Error("Codex background-terminal cleanup failed; inspect the thread's running terminals before starting more work.", { cause });
-	}
-}
-async function unsubscribeCodexThreadBestEffort(client, params) {
-	try {
-		await unsubscribeCodexAppServerLiveThread(client, params.threadId, params.timeoutMs, params.assertCurrent);
-		return true;
-	} catch (error) {
-		params.assertCurrent?.();
-		embeddedAgentLog.debug("codex app-server thread unsubscribe cleanup failed", {
-			threadId: params.threadId,
-			error
-		});
-		return false;
-	}
-}
-function shouldRetireCodexStartupClient(error, spawnedBy, signal) {
-	if (signal.aborted || isCodexAppServerStartupError(error) || isCodexAppServerRequestTimeoutError(error)) return true;
-	return !isCodexAppServerStartSelectionChangedError(error) && !isCodexAppServerOverloadError(error) && !(error instanceof AgentHarnessPreflightError && error.scope === void 0) && (isCodexAppServerBrokenPipeError(error) || !spawnedBy);
-}
-//#endregion
-export { itemStatus as A, auditNativeToolUnfinishedStatus as C, isSideEffectingNativeToolItem as D, isProjectedNativeToolItem as E, matchesCodexSnapshotTurn as M, shouldClearTerminalPresentationForNativeItem as N, itemKind as O, unknownItemStatus as P, auditNativeToolTerminalStatus as S, isNonSuccessItemStatus as T, CodexProjectionDiagnostics as _, attempt_client_cleanup_exports as a, readCodexNotificationTurnId as b, isCodexAppServerUnsafeSubscriptionError as c, shouldRetireCodexStartupClient as d, terminateCodexBackgroundTerminals as f, hasCodexAppServerSiblingRouteWork as g, getCodexAppServerTurnRouter as h, assertCodexThreadResumeSubscription as i, itemTitle as j, itemName as k, isCodexNoActiveTurnInterruptError as l, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as m, CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS as n, closeCodexStartupClientBestEffort as o, unsubscribeCodexThreadBestEffort as p, CodexAppServerUnsafeSubscriptionError as r, interruptCodexTurnAndWaitBestEffort as s, CODEX_APP_SERVER_INTERRUPT_TIMEOUT_MS as t, retireUnsafeCodexTurnClientBestEffort as u, isCodexNotificationForTurn as v, isMutatingNativeToolItem as w, auditNativeToolName as x, readCodexNotificationThreadId as y };
+export { itemStatus as _, isCodexNotificationForTurn as a, shouldClearTerminalPresentationForNativeItem as b, auditNativeToolName as c, isMutatingNativeToolItem as d, isNonSuccessItemStatus as f, itemName as g, itemKind as h, CodexProjectionDiagnostics as i, auditNativeToolTerminalStatus as l, isSideEffectingNativeToolItem as m, getCodexAppServerTurnRouter as n, readCodexNotificationThreadId as o, isProjectedNativeToolItem as p, hasCodexAppServerSiblingRouteWork as r, readCodexNotificationTurnId as s, CODEX_APP_SERVER_NATIVE_TURN_WAIT_TIMEOUT_MS as t, auditNativeToolUnfinishedStatus as u, itemTitle as v, unknownItemStatus as x, matchesCodexSnapshotTurn as y };

package/dist/.setup/{upstream-session-fork-gkdRj2yH.mjs → upstream-session-fork-ChSld66u.mjs}

@@ -1,37 +1,39 @@
 import { i as isJsonObject, r as flattenCodexDynamicToolFunctions } from "./protocol-CANUwXJ3.mjs";
-import { v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
-import { d as readCodexPluginConfig } from "./config-parsing-b088LyhT.mjs";
-import { s as assertCodexModelBackedReviewerEffectiveConfig } from "./config-options-CzyWLTJt.mjs";
+import { m as sessionBindingIdentity } from "./session-binding-record-BZB8RgcF.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-BQq-CHTF.mjs";
+import { s as assertCodexModelBackedReviewerEffectiveConfig } from "./config-options-HG_Rr3W_.mjs";
 import { t as withCodexAppServerThreadMutation } from "./thread-ownership-queue-Dp24d7-F.mjs";
+import { i as CodexAppServerScopedRequestRejectedError, o as isCodexAppServerOverloadError } from "./rpc-error-hmWM21RB.mjs";
 import { i as readUpstreamUserText, r as readMirrorIdentity } from "./upstream-prompt-provenance-fXkKbPVC.mjs";
-import { r as projectCodexUserItemText } from "./transcript-history-projection-DRSifI-1.mjs";
+import { r as projectCodexUserItemText } from "./transcript-history-projection-B9a7HwUV.mjs";
 import { n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-D15C9NHp.mjs";
-import { r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BL9B5H0L.mjs";
-import { n as readCodexSessionMeta } from "./session-catalog-provenance-DoAvktcj.mjs";
-import { t as CodexAppServerScopedRequestRejectedError } from "./request-BZOfsSXW.mjs";
-import { r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-DKhXquav.mjs";
-import { r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
+import { r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BW8rd98k.mjs";
+import { n as readCodexSessionMeta } from "./session-catalog-provenance-CmsOE5mh.mjs";
+import "./request-jSbhc1sg.mjs";
+import { r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-0Gxk3_eq.mjs";
+import { r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
 import { a as fingerprintCodexMirrorSourceMessage, c as readCodexMirrorSourceFingerprint } from "./transcript-mirror-attestation-YSegaktH.mjs";
-import { P as claimCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, f as readCodexAppServerClientDesktopGenerationFingerprint } from "./shared-client-CJCTeFpQ.mjs";
-import { l as isCodexAppServerOverloadError, u as isCodexAppServerPrewriteRequestCancellationError, v as assertCodexThreadAcceptsDirectInput, y as assertCodexThreadForkResponse } from "./client-qyUBJlGZ.mjs";
-import { D as buildCodexNativeHookRelayConfig, E as assertCodexNativeHookRelayAllowed, H as applyCodexNativeSkillIsolation, I as checkCodexThreadAppAvailability, K as codexDynamicToolsFingerprint, M as resolveCodexNativeHookRelayEvents, St as mergeCodexThreadConfigs, U as resolveCodexNativeSkillIsolation, V as parseCodexNativeToolCatalog, X as fingerprintJsonObject, Z as fingerprintUserMcpServersConfigPatch, a as buildCodexThreadConfiguration, h as buildDeveloperInstructions, ht as buildCodexPluginThreadConfig, k as buildCodexNativeHookRelayId, p as resolveCodexWebSearchPlan, wt as shouldBuildCodexPluginThreadConfig } from "./thread-requests-OWGOiDaV.mjs";
-import "./session-binding-DGCYAfvD.mjs";
-import { a as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError } from "./thread-policy-gNPzzpVp.mjs";
-import "./thread-ownership-B6pPt21M.mjs";
-import { n as resolveCodexNativeExecutionPolicy } from "./native-execution-policy-BxZJy5mP.mjs";
-import { l as prepareCodexWorkspaceDeveloperInstructions } from "./attempt-workspace-context-BJ5Z_olH.mjs";
-import { d as isCodexDynamicToolExcluded, n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-DG5qbsUZ.mjs";
-import { n as prepareCodexSessionInitialization } from "./session-initialization-6aveB9qb.mjs";
-import { createImportedCodexSession } from "./session-history-import-WhX-X33a.mjs";
-import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { P as claimCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, f as readCodexAppServerClientDesktopGenerationFingerprint } from "./shared-client-qhyYWbew.mjs";
+import { m as assertCodexThreadForkResponse, p as assertCodexThreadAcceptsDirectInput, s as isCodexAppServerPrewriteRequestCancellationError } from "./client-C8lgBOoO.mjs";
+import { A as buildCodexNativeHookRelayId, Ct as mergeCodexThreadConfigs, D as assertCodexNativeHookRelayAllowed, H as parseCodexNativeToolCatalog, L as checkCodexThreadAppAvailability, N as resolveCodexNativeHookRelayEvents, O as buildCodexNativeHookRelayConfig, Q as fingerprintUserMcpServersConfigPatch, Tt as shouldBuildCodexPluginThreadConfig, U as applyCodexNativeSkillIsolation, W as resolveCodexNativeSkillIsolation, Z as fingerprintJsonObject, a as buildCodexThreadConfiguration, g as buildDeveloperInstructions, gt as buildCodexPluginThreadConfig, m as resolveCodexWebSearchPlan, q as codexDynamicToolsFingerprint } from "./thread-requests-CL1e8Wmx.mjs";
+import "./session-binding-Ce7BqiPN.mjs";
+import { n as CodexThreadPolicyHandoffError, o as refreshCodexThreadPolicy } from "./thread-policy-DoNxbhqt.mjs";
+import "./thread-ownership-DwuSrt3s.mjs";
+import { n as resolveCodexNativeExecutionPolicy } from "./native-execution-policy-ClzpdG3D.mjs";
+import { l as isCodexDynamicToolExcluded } from "./shell-dynamic-tools-D3Brj3g9.mjs";
+import { c as prepareCodexWorkspaceDeveloperInstructions } from "./attempt-workspace-context-BY0jprWJ.mjs";
+import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-D68Whix6.mjs";
+import { n as prepareCodexSessionInitialization } from "./session-initialization-D6dtFQkE.mjs";
+import { createImportedCodexSession } from "./session-history-import-NWKPa4ZO.mjs";
+import { isRecord, normalizeOptionalString, readNonBlankString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import path from "node:path";
 import { lstat } from "node:fs/promises";
 import { root } from "openclaw/plugin-sdk/file-access-runtime";
 import { constants, createZstdDecompress } from "node:zlib";
-import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { loadCodexBundleMcpThreadConfig } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { buildCodexUserMcpServersThreadConfigPatchForRuntime, resolveCodexMcpToolOverridesForAgent } from "openclaw/plugin-sdk/codex-mcp-projection";
@@ -726,19 +728,18 @@ async function forkCanonicalCodexSession(params) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/upstream-session-fork.ts
-function readConnectionFingerprint(ref) {
-	if (!isRecord(ref)) return;
-	return typeof ref.connectionFingerprint === "string" && ref.connectionFingerprint.trim() ? ref.connectionFingerprint : void 0;
+function unavailable(message) {
+	return {
+		status: "failed",
+		code: "upstream-unavailable",
+		message
+	};
 }
 async function forkCodexUpstreamSession(params, options) {
 	try {
-		const sourceFingerprint = params.upstream.kind === "codex-app-server" ? readConnectionFingerprint(params.upstream.ref) : void 0;
+		const sourceFingerprint = params.upstream.kind === "codex-app-server" && isRecord(params.upstream.ref) ? readNonBlankString(params.upstream.ref.connectionFingerprint) : void 0;
 		const requestControl = sourceFingerprint ? await options.controlFactory.forUpstream(params.source.agentId, sourceFingerprint) : void 0;
-		if (!sourceFingerprint || !requestControl) return {
-			status: "failed",
-			code: "upstream-unavailable",
-			message: "This Codex thread is not available on the current connection. Reconnect to its host and try again."
-		};
+		if (!sourceFingerprint || !requestControl) return unavailable("This Codex thread is not available on the current connection. Reconnect to its host and try again.");
 		return await requestControl.withPinnedConnection(async (control) => {
 			const sourceBinding = options.bindingStore.read(sessionBindingIdentity({
 				...params.source,
@@ -759,11 +760,7 @@ async function forkCodexUpstreamSession(params, options) {
 					throw new Error("Codex fork cleanup could not be verified; inspect the retained native thread before retrying.", { cause });
 				}
 			});
-			if (sourceFingerprint !== control.connectionFingerprint || supervised && (sourceBinding.supervisionSourceThreadId !== params.upstream.threadId || (sourceBinding.pendingSupervisionBranch?.connectionFingerprint ?? sourceBinding.appServerRuntimeFingerprint) !== sourceFingerprint)) return {
-				status: "failed",
-				code: "upstream-unavailable",
-				message: "This Codex thread is not available on the current connection. Reconnect to its host and try again."
-			};
+			if (sourceFingerprint !== control.connectionFingerprint || supervised && (sourceBinding.supervisionSourceThreadId !== params.upstream.threadId || (sourceBinding.pendingSupervisionBranch?.connectionFingerprint ?? sourceBinding.appServerRuntimeFingerprint) !== sourceFingerprint)) return unavailable("This Codex thread is not available on the current connection. Reconnect to its host and try again.");
 			const resolved = await resolveCodexUpstreamForkBoundary({
 				...params.source,
 				threadId: sourceThreadId,
@@ -884,19 +881,11 @@ async function forkCodexUpstreamSession(params, options) {
 				};
 			} catch (error) {
 				if (!initializerOwnsFork) await options.bindingStore.withThreadArchiveFence(() => archiveFreshFork(forkedThreadId));
-				return {
-					status: "failed",
-					code: "upstream-unavailable",
-					message: error instanceof Error ? error.message : "The Codex fork could not be imported. Refresh sessions and try again."
-				};
+				return unavailable(error instanceof Error ? error.message : "The Codex fork could not be imported. Refresh sessions and try again.");
 			}
 		});
 	} catch (error) {
-		return {
-			status: "failed",
-			code: "upstream-unavailable",
-			message: error instanceof Error ? error.message : "The Codex thread could not be forked. Check that Codex is available, then try again."
-		};
+		return unavailable(error instanceof Error ? error.message : "The Codex thread could not be forked. Check that Codex is available, then try again.");
 	}
 }
 //#endregion

package/dist/.setup/{usage-CApUvLOV.mjs → usage-D8e8Xiqf.mjs}

@@ -1,7 +1,7 @@
-import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-B7-X2TgG.mjs";
-import { n as readCodexAppServerUsage } from "./request-BZOfsSXW.mjs";
-import "./config-DKhXquav.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
+import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-CMPy24F5.mjs";
+import { t as readCodexAppServerUsage } from "./request-jSbhc1sg.mjs";
+import "./config-0Gxk3_eq.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
 import { CODEX_APP_SERVER_AUTH_MARKER } from "openclaw/plugin-sdk/agent-runtime";
 //#region extensions/codex/src/app-server/usage.ts
 /** Handles the synthetic usage credential for a Codex-backed OpenAI route. */

package/dist/.setup/{usage-limit-error-wSMQkbpV.mjs → usage-limit-error-GbT-5NcW.mjs}

@@ -1,10 +1,10 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-B7-X2TgG.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-B3WEZl4e.mjs";
-import { X as readRecentCodexRateLimits, Y as readCodexRateLimitsRevision, Z as rememberCodexRateLimitsRead } from "./shared-client-CJCTeFpQ.mjs";
+import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-CMPy24F5.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-kQntafj_.mjs";
+import { X as readRecentCodexRateLimits, Y as readCodexRateLimitsRevision, Z as rememberCodexRateLimitsRead } from "./shared-client-qhyYWbew.mjs";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { markAuthProfileBlockedUntil } from "openclaw/plugin-sdk/agent-runtime";
 import { embeddedAgentLog, formatErrorMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { markAuthProfileBlockedUntil } from "openclaw/plugin-sdk/agent-runtime";
 //#region extensions/codex/src/app-server/usage-limit-error.ts
 const CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS = 5e3;
 var CodexUsageLimitPromptError = class extends Error {

package/dist/.setup/{web-search-provider.runtime-UKgeiBUG.mjs → web-search-provider.runtime-dL2GD1Kl.mjs}

@@ -1,7 +1,6 @@
-import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { f as buildCodexNativeWebSearchThreadConfig } from "./thread-requests-OWGOiDaV.mjs";
-import { runBoundedCodexAppServerTurn } from "./bounded-turn-BNunZPtz.mjs";
-import { normalizeOptionalString, normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { p as buildCodexNativeWebSearchThreadConfig } from "./thread-requests-CL1e8Wmx.mjs";
+import { l as projectCodexWebSearchItem } from "./native-subagent-monitor-BUYOUp9X.mjs";
+import { runBoundedCodexAppServerTurn } from "./bounded-turn-pGsfXcmH.mjs";
 import { readStringParam, resolveSearchTimeoutSeconds, wrapWebContent } from "openclaw/plugin-sdk/provider-web-search";
 //#region extensions/codex/src/web-search-provider.runtime.ts
 async function executeCodexWebSearchProviderTool(ctx, args, executionContext, options) {
@@ -27,7 +26,7 @@ async function executeCodexWebSearchProviderTool(ctx, args, executionContext, op
 		isolation: "private-stdio",
 		threadConfig: buildCodexNativeWebSearchThreadConfig(ctx.config)
 	});
-	const searches = result.items.filter((item) => item.type === "webSearch").map(summarizeCodexWebSearchItem);
+	const searches = result.items.filter((item) => item.type === "webSearch").map(projectCodexWebSearchItem);
 	if (searches.length === 0) throw new Error("Codex hosted search completed without invoking web search.");
 	return {
 		query,
@@ -44,20 +43,5 @@ async function executeCodexWebSearchProviderTool(ctx, args, executionContext, op
 		searches
 	};
 }
-function summarizeCodexWebSearchItem(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
 export { executeCodexWebSearchProviderTool };

package/dist/.setup/websocket-data-XlRvt8Ys.mjs

@@ -0,0 +1,6 @@
+//#region extensions/codex/src/app-server/websocket-data.ts
+function codexWebSocketDataToBuffer(data) {
+	return Array.isArray(data) ? Buffer.concat(data) : Buffer.isBuffer(data) ? data : data instanceof Uint8Array ? Buffer.from(data.buffer, data.byteOffset, data.byteLength) : Buffer.from(data);
+}
+//#endregion
+export { codexWebSocketDataToBuffer as t };