@openclaw/codex 2026.9.6 → 2026.9.7

package/dist/.setup/shared-client-lifecycle-DJIgqgMw.mjs

@@ -0,0 +1,153 @@
+import { n as defineCodexBuildState } from "./build-state-Da1_z0kd.mjs";
+//#region extensions/codex/src/app-server/shared-client-lifecycle.ts
+/** Client ownership and synchronous retirement, independent of startup/auth execution. */
+const createCodexAppServerStartupLifetime = () => ({
+	controller: new AbortController(),
+	pending: /* @__PURE__ */ new Set()
+});
+function ownCodexStartup(lifetime, operation) {
+	lifetime.pending.add(operation);
+	const release = () => lifetime.pending.delete(operation);
+	operation.then(release, release);
+	return operation;
+}
+const getSharedCodexAppServerClientState = defineCodexBuildState("openclaw.codexAppServerClientState", () => ({
+	clients: /* @__PURE__ */ new Map(),
+	liveClients: /* @__PURE__ */ new Set(),
+	isolatedClients: /* @__PURE__ */ new Set(),
+	entriesByClient: /* @__PURE__ */ new WeakMap(),
+	desktopGenerationDrainChecks: /* @__PURE__ */ new Set(),
+	startup: createCodexAppServerStartupLifetime(),
+	startMetadata: /* @__PURE__ */ new WeakMap()
+}));
+function hasActiveSharedCodexAppServerWork() {
+	const state = getSharedCodexAppServerClientState();
+	if (state.startup.pending.size > 0 || state.startup.controller.signal.aborted) return true;
+	for (const entry of state.clients.values()) if (entry.activeLeases > 0 || entry.pendingAcquires > 0) return true;
+	for (const client of state.liveClients) {
+		const entry = state.entriesByClient.get(client);
+		if (entry && (entry.activeLeases > 0 || entry.pendingAcquires > 0)) return true;
+	}
+	return false;
+}
+function getCurrentSharedClientEntry(client) {
+	const state = getSharedCodexAppServerClientState();
+	const entry = client ? state.entriesByClient.get(client) : void 0;
+	return entry && entry.client === client && state.clients.get(entry.key) === entry ? entry : void 0;
+}
+/**
+* Retires a matching shared client. Default is graceful: detach from the map
+* (future acquisitions get a fresh client) and close once leases drain.
+* `failActiveLeases` is for suspect clients only (timed-out turns): it closes
+* the physical connection immediately so co-leased attempts hit the normal
+* client-closed retry path, and pending acquires reject instead of leasing
+* the poisoned process. Routine cleanup must NOT use it — it would abort
+* healthy sibling turns on a working client.
+*/
+function retireSharedCodexAppServerClientIfCurrent(client, opts) {
+	if (!client) return;
+	const state = getSharedCodexAppServerClientState();
+	const currentEntry = getCurrentSharedClientEntry(client);
+	const entry = currentEntry ?? state.entriesByClient.get(client);
+	if (!entry || entry.client !== client && !entry.closeError) return;
+	if (currentEntry) {
+		state.clients.delete(entry.key);
+		entry.closeWhenIdle = true;
+	}
+	if (opts?.failActiveLeases && (currentEntry || !entry.closeError)) {
+		entry.closeError = /* @__PURE__ */ new Error("codex app-server client is closed");
+		return {
+			activeLeases: entry.activeLeases,
+			closed: closeRetiredSharedClientEntry(entry)
+		};
+	}
+	return {
+		activeLeases: entry.activeLeases,
+		closed: currentEntry ? closeRetiredSharedClientEntryIfIdle(entry) : false
+	};
+}
+/** Gracefully retires exact clients attached to an older desktop generation. */
+function retireSharedCodexAppServerClientsBeforeDesktopGeneration(generation) {
+	const state = getSharedCodexAppServerClientState();
+	for (const entry of state.clients.values()) {
+		const client = entry.client;
+		const attached = client ? state.startMetadata.get(client) : void 0;
+		if (client && attached?.desktopGeneration && attached.desktopGeneration.epoch < generation.epoch) retireSharedCodexAppServerClientIfCurrent(client);
+	}
+}
+function closeRetiredSharedClientEntryIfIdle(entry) {
+	if (!entry.closeWhenIdle || entry.activeLeases > 0 || entry.pendingAcquires > 0 || !entry.client) return false;
+	entry.closeWhenIdle = false;
+	return closeRetiredSharedClientEntry(entry);
+}
+function closeRetiredSharedClientEntry(entry) {
+	const client = entry.client;
+	if (!client) return false;
+	entry.client = void 0;
+	client.close();
+	return true;
+}
+function retirePendingSharedClientEntryIfUnclaimed(entry) {
+	if (entry.activeLeases > 0 || entry.pendingAcquires > 0) return;
+	entry.startupAbort?.abort(/* @__PURE__ */ new Error("Codex app-server startup was abandoned"));
+	entry.closeWhenIdle = true;
+	const state = getSharedCodexAppServerClientState();
+	if (state.clients.get(entry.key) === entry) state.clients.delete(entry.key);
+	if (!entry.client) return;
+	closeRetiredSharedClientEntry(entry);
+}
+/** Failed final claimants join physical cleanup; healthy peers keep their startup. */
+async function waitForUnclaimedSharedClientStartup(entry) {
+	if (!entry.startupTransport || entry.activeLeases > 0 || entry.pendingAcquires > 0) return;
+	await entry.startupTransport.then((client) => client.closeAndWait(), () => {});
+}
+/** Exit registration also observes transports that have already terminated. */
+function waitForCodexAppServerClientExit(client) {
+	const metadata = getSharedCodexAppServerClientState().startMetadata.get(client);
+	const exited = metadata?.transportExit ?? new Promise((resolve) => {
+		client.addTransportExitHandler(() => resolve());
+	});
+	if (metadata) metadata.transportExit = exited;
+	return exited;
+}
+/** Acquire the recorded owner atomically, or join its exit before a replacement writes. */
+async function retainSharedCodexAppServerClientByInstanceId(clientId) {
+	const id = clientId?.trim();
+	if (!id) return;
+	const state = getSharedCodexAppServerClientState();
+	for (const client of state.liveClients) {
+		if (client.getInstanceId() !== id) continue;
+		const entry = state.entriesByClient.get(client);
+		if (entry?.client !== client || entry.closeError || client.getCloseError()) {
+			await waitForCodexAppServerClientExit(client);
+			return;
+		}
+		const release = retainSharedClientEntry(entry);
+		return {
+			client,
+			release: (waitForRetirement = false) => {
+				release();
+				return client.getCloseError() || waitForRetirement && entry.closeWhenIdle ? waitForCodexAppServerClientExit(client) : void 0;
+			}
+		};
+	}
+}
+function notifyDesktopGenerationDrainChecks(state) {
+	for (const check of state.desktopGenerationDrainChecks) check();
+}
+function retainSharedClientEntry(entry, counter = "activeLeases") {
+	let released = false;
+	entry[counter] += 1;
+	return () => {
+		if (released) return;
+		released = true;
+		releaseSharedClientEntry(entry, counter);
+	};
+}
+function releaseSharedClientEntry(entry, counter) {
+	entry[counter] -= 1;
+	closeRetiredSharedClientEntryIfIdle(entry);
+	notifyDesktopGenerationDrainChecks(getSharedCodexAppServerClientState());
+}
+//#endregion
+export { notifyDesktopGenerationDrainChecks as a, retainSharedClientEntry as c, retireSharedCodexAppServerClientIfCurrent as d, retireSharedCodexAppServerClientsBeforeDesktopGeneration as f, hasActiveSharedCodexAppServerWork as i, retainSharedCodexAppServerClientByInstanceId as l, waitForUnclaimedSharedClientStartup as m, getCurrentSharedClientEntry as n, ownCodexStartup as o, waitForCodexAppServerClientExit as p, getSharedCodexAppServerClientState as r, releaseSharedClientEntry as s, createCodexAppServerStartupLifetime as t, retirePendingSharedClientEntryIfUnclaimed as u };

package/dist/.setup/{side-question-BJ1wSDcB.mjs → side-question-C4kCmQy1.mjs}

@@ -1,23 +1,23 @@
-import { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
-import { l as shouldAutoApproveCodexAppServerApprovals, n as hasCodexMcpToolApprovalOverrides, u as withMcpElicitationsApprovalPolicy, y as readCodexRequirementsToml } from "./config-security-BEReZ6go.mjs";
-import { c as isCodexPairedNodeRemoteExecPlacementSandbox, d as readCodexPluginConfig, l as isCodexRemoteExecPlacementSandbox, u as isCodexSandboxExecServerEnabled } from "./config-parsing-CcB9iPoq.mjs";
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { i as resolveCodexAppServerHomeScope, l as resolveCodexModelBackedReviewerPolicyContext } from "./config-options-BvaRs51b.mjs";
-import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-CMU3DUD0.mjs";
-import { i as resolveCodexBindingAppServerConnection, r as requireCodexSupervisionModelSelection } from "./binding-connection-ThoatDcb.mjs";
-import { n as resolveOpenClawExecPolicyForCodexAppServer, t as canUseCodexModelBackedApprovalsReviewerForModel } from "./config-BoTP_mrL.mjs";
-import { Z as resolveCodexAppServerPreparedAuthHandoff, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease, q as readRecentCodexRateLimits, x as withLeasedCodexAppServerClientStartSelectionRetry } from "./shared-client-DA4VR4Eb.mjs";
-import { C as readCodexDynamicToolCallParams, D as handleDynamicToolCallWithTimeout, E as createCodexElicitationResponse, L as resolveCodexToolAbortTerminalReason, S as assertCodexTurnStartResponse, i as isCodexAppServerApprovalRequest, j as resolveDynamicToolCallTimeoutMs, s as isCodexAppServerIndeterminateRequestCancellationError, y as assertCodexThreadForkResponse } from "./client-Cs08OXVQ.mjs";
-import { f as terminateCodexBackgroundTerminals, p as unsubscribeCodexThreadBestEffort, s as interruptCodexTurnAndWaitBestEffort, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-CEv1cKwF.mjs";
-import { t as CodexEphemeralTurn } from "./ephemeral-turn-poidXgek.mjs";
-import { A as emitCodexNativePreToolUseFailureDiagnostic, D as buildCodexNativeHookRelayDisabledConfig, E as buildCodexNativeHookRelayConfig, S as CODEX_NATIVE_HOOK_RELAY_EVENTS, St as refreshCodexPluginAppApprovalPolicy, _ as resolveCodexAppServerRequestModelSelection, dt as resolveCodexDynamicToolsLoading, g as resolveCodexAppServerModelProvider, h as CODEX_NATIVE_PERSONALITY_NONE, p as resolveCodexWebSearchPlan, r as buildCodexRuntimeThreadConfig, xt as mergeCodexThreadConfigs, y as resolveCodexBindingModelProviderFallback } from "./thread-requests-BLvGkP2R.mjs";
-import { M as resolveCodexAppServerReasoningEffort, j as readCodexSupportedReasoningEfforts, o as buildCodexUserInput, r as buildCodexTemporalAdditionalContext } from "./thread-lifecycle-B3mfz1TG.mjs";
-import { o as resolveCodexSessionBinding } from "./session-binding-Cm0apEbd.mjs";
-import { a as refreshCodexThreadPolicy, i as assertCodexSupervisionThreadLineage, n as CodexThreadPolicyHandoffError } from "./thread-policy-DGuQsuFC.mjs";
-import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C2sRMOEY.mjs";
-import { C as shouldEnableCodexAppServerNativeToolSurface, S as resolveCodexSandboxEnvironmentSelection, a as emitDynamicToolStartedDiagnostic, b as resolveCodexExternalSandboxPolicyForOpenClawSandbox, c as ensureCodexSandboxExecServerEnvironment, i as emitDynamicToolErrorDiagnostic, l as releaseCodexSandboxExecServerEnvironment, m as buildDynamicTools, o as emitDynamicToolTerminalDiagnostic, p as CodexNativeToolLifecycleProjector, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, w as shouldRequireCodexSandboxExecServerEnvironment, x as resolveCodexMessageToolProvider } from "./dynamic-tools-BDXl-8Cw.mjs";
-import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-BfE88FZ5.mjs";
-import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, r as resolveCodexEffectiveSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-BI1QK_98.mjs";
+import { v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
+import { c as shouldAutoApproveCodexAppServerApprovals, l as withMcpElicitationsApprovalPolicy, m as readCodexRequirementsToml, n as hasCodexMcpToolApprovalOverrides } from "./config-security-CE-FcGw9.mjs";
+import { c as isCodexPairedNodeRemoteExecPlacementSandbox, d as readCodexPluginConfig, l as isCodexRemoteExecPlacementSandbox, u as isCodexSandboxExecServerEnabled } from "./config-parsing-b088LyhT.mjs";
+import { i as resolveCodexAppServerHomeScope, l as resolveCodexModelBackedReviewerPolicyContext } from "./config-options-CzyWLTJt.mjs";
+import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-B7-X2TgG.mjs";
+import { i as resolveCodexBindingAppServerConnection, r as requireCodexSupervisionModelSelection } from "./binding-connection-DTtN1KrX.mjs";
+import { n as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-DKhXquav.mjs";
+import { X as readRecentCodexRateLimits, b as withLeasedCodexAppServerClientStartSelectionRetry, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease, tt as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-DqyTMYug.mjs";
+import { A as handleDynamicToolCallWithTimeout, B as resolveCodexToolAbortTerminalReason, P as resolveDynamicToolCallTimeoutMs, S as assertCodexTurnStartResponse, i as isCodexAppServerApprovalRequest, k as createCodexElicitationResponse, s as isCodexAppServerIndeterminateRequestCancellationError, w as readCodexDynamicToolCallParams, y as assertCodexThreadForkResponse, z as toCodexDynamicToolProtocolResponse } from "./client-N0JpgSzF.mjs";
+import { f as terminateCodexBackgroundTerminals, p as unsubscribeCodexThreadBestEffort, s as interruptCodexTurnAndWaitBestEffort, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-DOP-cW5j.mjs";
+import { t as CodexEphemeralTurn } from "./ephemeral-turn-CDsPJOa2.mjs";
+import { Ct as refreshCodexPluginAppApprovalPolicy, D as buildCodexNativeHookRelayConfig, M as resolveCodexNativeHookRelayEvents, N as resolveCodexNativeHookRelayTtlMs, O as buildCodexNativeHookRelayDisabledConfig, St as mergeCodexThreadConfigs, ft as resolveCodexDynamicToolsLoading, g as CODEX_NATIVE_PERSONALITY_NONE, p as resolveCodexWebSearchPlan, r as buildCodexRuntimeThreadConfig, y as resolveCodexAppServerThreadModelSelection } from "./thread-requests-B_bRnMGN.mjs";
+import { S as resolveCodexAppServerReasoningEffort, o as buildCodexUserInput, r as buildCodexTemporalAdditionalContext, x as readCodexSupportedReasoningEfforts } from "./thread-lifecycle-DPflntEJ.mjs";
+import { o as resolveCodexSessionBinding } from "./session-binding-DGCYAfvD.mjs";
+import { a as refreshCodexThreadPolicy, i as assertCodexSupervisionThreadLineage, n as CodexThreadPolicyHandoffError } from "./thread-policy-DTd-DtkX.mjs";
+import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DjCz2eOw.mjs";
+import { E as CodexNativeToolLifecycleProjector, a as emitDynamicToolStartedDiagnostic, b as createCodexNativePreToolUseFailureBuffer, c as buildDynamicTools, f as resolveCodexExternalSandboxPolicyForOpenClawSandbox, g as shouldRequireCodexSandboxExecServerEnvironment, h as shouldEnableCodexAppServerNativeToolSurface, i as emitDynamicToolErrorDiagnostic, m as resolveCodexSandboxEnvironmentSelection, o as emitDynamicToolTerminalDiagnostic, p as resolveCodexMessageToolProvider, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, v as ensureCodexSandboxExecServerEnvironment, y as releaseCodexSandboxExecServerEnvironment } from "./dynamic-tools-DzlsLUuS.mjs";
+import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, r as resolveCodexEffectiveSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-Ci_fVX6y.mjs";
+import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-CAxoF-X1.mjs";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
@@ -89,10 +89,6 @@ var CodexSideQuestionTimeoutError = class extends Error {
 		this.name = "TimeoutError";
 	}
 };
-const CODEX_SIDE_NATIVE_HOOK_RELAY_MIN_TTL_MS = 18e5;
-const CODEX_SIDE_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 3e5;
-const CODEX_SIDE_NATIVE_HOOK_RELAY_STARTUP_REQUEST_COUNT = 3;
-const CODEX_SIDE_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS = CODEX_NATIVE_HOOK_RELAY_EVENTS.filter((event) => event !== "permission_request");
 async function runCodexAppServerSideQuestion(params, options) {
 	const bindingIdentity = sessionBindingIdentity({
 		sessionId: params.sessionId,
@@ -144,26 +140,6 @@ async function runCodexAppServerSideQuestion(params, options) {
 		subscriptionProfileRequiredError: "Prepared Codex subscription route requires a scoped native OAuth or token profile.",
 		subscriptionProfileUnusableError: `Prepared Codex auth profile "${preparedRuntimeAuth.plan.forwardedAuthProfileId}" is unusable.`
 	});
-	const modelProvider = supervisionModelSelection ? supervisionModelSelection.modelProvider : resolveCodexAppServerModelProvider({
-		provider: params.provider,
-		authProfileId,
-		authProfileStore: preparedRuntimeAuth.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.cfg
-	}) ?? resolveCodexBindingModelProviderFallback({
-		provider: params.provider,
-		currentModel: params.model,
-		bindingModel: binding.model,
-		bindingModelProvider: binding.modelProvider
-	});
-	const modelSelection = resolveCodexAppServerRequestModelSelection({
-		model: supervisionModelSelection?.model ?? options.runtimeModelId ?? params.model,
-		modelProvider,
-		authProfileId,
-		authProfileStore: preparedRuntimeAuth.authProfileStore,
-		agentDir: params.agentDir,
-		config: params.cfg
-	});
 	const reviewerPolicyContext = resolveCodexModelBackedReviewerPolicyContext({
 		provider: usesSupervisionConnection ? "codex" : params.provider,
 		model: supervisionModelSelection?.model ?? params.model,
@@ -204,6 +180,18 @@ async function runCodexAppServerSideQuestion(params, options) {
 		...reviewerContext,
 		provider: reviewerContext.modelProvider
 	});
+	const modelSelection = supervisionModelSelection ?? resolveCodexAppServerThreadModelSelection({
+		homeScope: appServer.start.homeScope,
+		provider: params.provider,
+		model: params.model,
+		requestModel: options.runtimeModelId ?? params.model,
+		binding,
+		inheritBindingAuthProfile: false,
+		authProfileId,
+		authProfileStore: preparedRuntimeAuth.authProfileStore,
+		agentDir: params.agentDir,
+		config: params.cfg
+	});
 	const sessionPermissionPolicy = resolveCodexEffectiveSessionPermissionPolicy({
 		appServer,
 		permissionMode: params.sessionEntry.permissionMode,
@@ -282,31 +270,14 @@ async function runCodexAppServerSideQuestion(params, options) {
 	let collector;
 	const runAbortController = new AbortController();
 	let nativeToolLifecycleProjector;
-	const pendingNativePreToolUseFailures = [];
-	let nativePreToolUseFailureFallbackActive = false;
 	let nativeToolRunWasAbortedBeforeCleanup;
-	let nativePreToolUseFailureFallbackTerminalReason;
-	const emitNativePreToolUseFailure = (failure) => {
-		emitCodexNativePreToolUseFailureDiagnostic({
-			agentId: sessionAgentId,
-			sessionId: params.sessionId,
-			sessionKey: params.sessionKey,
-			runId: sideRunParams.runId,
-			signal: runAbortController.signal,
-			failure,
-			...nativePreToolUseFailureFallbackActive ? { terminalReason: nativePreToolUseFailureFallbackTerminalReason ?? failure.disposition } : {}
-		});
-	};
-	const flushPendingNativePreToolUseFailures = () => {
-		for (const failure of pendingNativePreToolUseFailures.splice(0)) emitNativePreToolUseFailure(failure);
-	};
-	const activateNativePreToolUseFailureFallback = () => {
-		if (!nativePreToolUseFailureFallbackActive) {
-			nativePreToolUseFailureFallbackTerminalReason = nativeToolRunWasAbortedBeforeCleanup ? resolveCodexToolAbortTerminalReason(runAbortController.signal) : void 0;
-			nativePreToolUseFailureFallbackActive = true;
-		}
-		flushPendingNativePreToolUseFailures();
-	};
+	const nativePreToolUseFailures = createCodexNativePreToolUseFailureBuffer({
+		agentId: sessionAgentId,
+		sessionId: params.sessionId,
+		sessionKey: params.sessionKey,
+		runId: sideRunParams.runId,
+		signal: runAbortController.signal
+	});
 	const abortFromUpstream = () => runAbortController.abort(params.opts?.abortSignal?.reason ?? "codex_side_question_abort");
 	if (params.opts?.abortSignal?.aborted) abortFromUpstream();
 	else params.opts?.abortSignal?.addEventListener("abort", abortFromUpstream, { once: true });
@@ -360,7 +331,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 				toolOverrides: params.sessionEntry.toolOverrides
 			})
 		});
-		const approvalPolicy = hasCodexMcpToolApprovalOverrides(params.cfg?.mcp?.servers, Object.keys(projectedMcpServers), projectedMcpServers) ? withMcpElicitationsApprovalPolicy(appServer.approvalPolicy) : appServer.approvalPolicy;
+		const approvalPolicy = Object.keys(binding.pluginAppPolicyContext?.apps ?? {}).length > 0 || hasCodexMcpToolApprovalOverrides(params.cfg?.mcp?.servers, Object.keys(projectedMcpServers), projectedMcpServers) ? withMcpElicitationsApprovalPolicy(appServer.approvalPolicy) : appServer.approvalPolicy;
 		const sandbox = appServer.sandbox;
 		const nativeProviderWebSearchSupport = resolveCodexWebSearchPlan({
 			config: params.cfg,
@@ -384,8 +355,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		});
 		const handleServerRequest = async (request, _scope, requestSignal, setExecutionTimeoutMs) => {
 			const signal = AbortSignal.any([requestSignal, runAbortController.signal]);
-			if (signal.aborted) return;
-			if (!childThreadId || !turnId) return;
+			if (signal.aborted || !childThreadId || !turnId) return;
 			if (request.method === "mcpServer/elicitation/request") {
 				const approvalResult = await routeCodexAppServerElicitationRequest({
 					requestParams: request.params,
@@ -400,7 +370,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 				});
 				return approvalResult.kind === "handled" ? approvalResult.response : createCodexElicitationResponse("decline", null, { message: "OpenClaw Codex side questions do not support interactive MCP input." });
 			}
-			if (request.method === "item/tool/requestUserInput") return isSideUserInputRequest(request.params, childThreadId, turnId) ? emptySideUserInputResponse() : void 0;
+			if (request.method === "item/tool/requestUserInput") return isSideUserInputRequest(request.params, childThreadId, turnId) ? { answers: {} } : void 0;
 			if (isCodexAppServerApprovalRequest(request.method)) return handleCodexAppServerApprovalRequest({
 				method: request.method,
 				requestParams: request.params,
@@ -445,10 +415,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 					response,
 					durationMs: Math.max(0, Date.now() - toolStartedAt)
 				});
-				return {
-					contentItems: response.contentItems,
-					success: response.success
-				};
+				return toCodexDynamicToolProtocolResponse(response);
 			} catch (error) {
 				emitDynamicToolErrorDiagnostic({
 					...diagnosticContext,
@@ -461,38 +428,45 @@ async function runCodexAppServerSideQuestion(params, options) {
 			}
 		};
 		const serviceTier = binding.serviceTier ?? appServer.serviceTier;
-		const nativeHookRelayEvents = resolveCodexSideNativeHookRelayEvents({
+		const nativeHookRelayEvents = resolveCodexNativeHookRelayEvents({
 			configuredEvents: options.nativeHookRelay?.events,
-			approvalPolicy: appServer.approvalPolicy
+			appServer
 		});
-		nativeHookRelay = options.nativeHookRelay ? registerCodexSideNativeHookRelay({
-			options: options.nativeHookRelay,
-			events: nativeHookRelayEvents,
-			agentId: sessionAgentId,
-			sessionId: params.sessionId,
-			sessionKey: params.sessionKey,
-			config: params.cfg,
-			autoApproveMcpTools,
-			projectedMcpServers,
-			runId: sideRunParams.runId,
-			channelId: buildAgentHookContextChannelFields({
+		if (options.nativeHookRelay && options.nativeHookRelay.enabled !== false) {
+			const channelId = buildAgentHookContextChannelFields({
 				sessionKey: params.sessionKey,
 				messageChannel: params.messageChannel,
 				messageProvider: params.messageProvider,
 				currentChannelId: params.currentChannelId
-			}).channelId,
-			requestTimeoutMs: appServer.requestTimeoutMs,
-			completionTimeoutMs: SIDE_QUESTION_COMPLETION_TIMEOUT_MS,
-			loopDetectionPreToolUseRelay: appServer.loopDetectionPreToolUseRelay,
-			signal: runAbortController.signal,
-			hostCapabilities: sideRunParams.hostCapabilities,
-			assertCurrent,
-			onPreToolUseFailure: (failure) => {
-				if (nativePreToolUseFailureFallbackActive) emitNativePreToolUseFailure(failure);
-				else if (nativeToolLifecycleProjector) nativeToolLifecycleProjector.recordPreToolUseFailure(failure, nativeToolRunWasAbortedBeforeCleanup);
-				else pendingNativePreToolUseFailures.push(failure);
-			}
-		}) : void 0;
+			}).channelId;
+			nativeHookRelay = registerNativeHookRelayForBundledRuntime({
+				provider: "codex",
+				...sessionAgentId ? { agentId: sessionAgentId } : {},
+				sessionId: params.sessionId,
+				...params.sessionKey ? { sessionKey: params.sessionKey } : {},
+				...params.cfg ? { config: params.cfg } : {},
+				autoApproveMcpTools,
+				projectedMcpServers,
+				runId: sideRunParams.runId,
+				...channelId ? { channelId } : {},
+				allowedEvents: nativeHookRelayEvents,
+				preToolUseLoopDetection: appServer.loopDetectionPreToolUseRelay,
+				ttlMs: resolveCodexNativeHookRelayTtlMs({
+					explicitTtlMs: options.nativeHookRelay.ttlMs,
+					attemptTimeoutMs: SIDE_QUESTION_COMPLETION_TIMEOUT_MS,
+					startupTimeoutMs: appServer.requestTimeoutMs * 2,
+					turnStartTimeoutMs: appServer.requestTimeoutMs
+				}),
+				signal: runAbortController.signal,
+				runBeforeToolCall: sideRunParams.hostCapabilities.runBeforeToolCall,
+				assertActive: assertCurrent,
+				onPreToolUseFailure: (failure) => {
+					if (!nativePreToolUseFailures.active && nativeToolLifecycleProjector) nativeToolLifecycleProjector.recordPreToolUseFailure(failure, nativeToolRunWasAbortedBeforeCleanup);
+					else nativePreToolUseFailures.record(failure);
+				},
+				command: { timeoutMs: options.nativeHookRelay.gatewayTimeoutMs }
+			});
+		}
 		await nativeHookRelay?.prepareInvocation();
 		assertCurrent();
 		const nativeHookRelayConfig = nativeHookRelay ? buildCodexNativeHookRelayConfig({
@@ -652,8 +626,8 @@ async function runCodexAppServerSideQuestion(params, options) {
 			...sideRunParams,
 			agentId: sessionAgentId
 		}, sideThreadId, turnId, { runAbortSignal: runAbortController.signal });
-		for (const failure of pendingNativePreToolUseFailures) nativeToolLifecycleProjector.recordPreToolUseFailure(failure);
-		pendingNativePreToolUseFailures.length = 0;
+		for (const failure of nativePreToolUseFailures.pending) nativeToolLifecycleProjector.recordPreToolUseFailure(failure);
+		nativePreToolUseFailures.pending.length = 0;
 		if (!collector) throw new Error("Codex side thread route was not reserved");
 		let result;
 		try {
@@ -701,8 +675,8 @@ async function runCodexAppServerSideQuestion(params, options) {
 				},
 				() => collector?.route.release(),
 				() => nativeToolLifecycleProjector?.finalizeActive(nativeToolRunWasAbortedBeforeCleanup),
-				activateNativePreToolUseFailureFallback,
-				flushPendingNativePreToolUseFailures,
+				() => nativePreToolUseFailures.activateFallback(nativeToolRunWasAbortedBeforeCleanup === true),
+				nativePreToolUseFailures.flush,
 				releaseSandboxEnvironment,
 				() => releaseCodexAppServerClientLease(clientLease),
 				() => nativeHookRelay?.unregister(),
@@ -719,41 +693,6 @@ async function runCodexAppServerSideQuestion(params, options) {
 		});
 	}
 }
-function resolveCodexSideNativeHookRelayEvents(params) {
-	if (params.configuredEvents?.length) return params.configuredEvents;
-	return params.approvalPolicy === "never" ? CODEX_NATIVE_HOOK_RELAY_EVENTS : CODEX_SIDE_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS;
-}
-function registerCodexSideNativeHookRelay(params) {
-	if (params.options.enabled === false) return;
-	return registerNativeHookRelayForBundledRuntime({
-		provider: "codex",
-		...params.agentId ? { agentId: params.agentId } : {},
-		sessionId: params.sessionId,
-		...params.sessionKey ? { sessionKey: params.sessionKey } : {},
-		...params.config ? { config: params.config } : {},
-		autoApproveMcpTools: params.autoApproveMcpTools,
-		projectedMcpServers: params.projectedMcpServers,
-		runId: params.runId,
-		...params.channelId ? { channelId: params.channelId } : {},
-		allowedEvents: params.events,
-		preToolUseLoopDetection: params.loopDetectionPreToolUseRelay,
-		ttlMs: resolveCodexSideNativeHookRelayTtlMs({
-			explicitTtlMs: params.options.ttlMs,
-			requestTimeoutMs: params.requestTimeoutMs,
-			completionTimeoutMs: params.completionTimeoutMs
-		}),
-		signal: params.signal,
-		runBeforeToolCall: params.hostCapabilities.runBeforeToolCall,
-		assertActive: params.assertCurrent,
-		onPreToolUseFailure: params.onPreToolUseFailure,
-		command: { timeoutMs: params.options.gatewayTimeoutMs }
-	});
-}
-function resolveCodexSideNativeHookRelayTtlMs(params) {
-	if (params.explicitTtlMs !== void 0) return params.explicitTtlMs;
-	const relayBudgetMs = params.requestTimeoutMs * CODEX_SIDE_NATIVE_HOOK_RELAY_STARTUP_REQUEST_COUNT + params.completionTimeoutMs + CODEX_SIDE_NATIVE_HOOK_RELAY_TTL_GRACE_MS;
-	return Math.max(CODEX_SIDE_NATIVE_HOOK_RELAY_MIN_TTL_MS, Math.floor(relayBudgetMs));
-}
 function buildSideRunAttemptParams(params, options) {
 	return {
 		params,
@@ -872,9 +811,6 @@ async function createCodexSideToolBridge(input) {
 		webSearchPlan
 	};
 }
-function emptySideUserInputResponse() {
-	return { answers: {} };
-}
 function isSideUserInputRequest(value, threadId, turnId) {
 	return isJsonObject(value) && value.threadId === threadId && value.turnId === turnId;
 }