@openclaw/codex 2026.9.5 → 2026.9.7

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

@@ -1,30 +1,71 @@
-import { p as sessionBindingIdentity } from "./session-binding-record-TH3xA0zj.mjs";
-import { E as readCodexRequirementsToml, l as shouldAutoApproveCodexAppServerApprovals, m as isJsonObject, n as hasCodexMcpToolApprovalOverrides, u as withMcpElicitationsApprovalPolicy } from "./config-security-BRQ2mgW9.mjs";
-import { c as isCodexPairedNodeRemoteExecPlacementSandbox, d as readCodexPluginConfig, l as isCodexRemoteExecPlacementSandbox, u as isCodexSandboxExecServerEnabled } from "./config-parsing-CcB9iPoq.mjs";
-import { D as handleDynamicToolCallWithTimeout, E as createCodexElicitationResponse, L as resolveCodexToolAbortTerminalReason, S as readCodexDynamicToolCallParams, i as isCodexAppServerApprovalRequest, j as resolveDynamicToolCallTimeoutMs, s as isCodexAppServerIndeterminateRequestCancellationError, v as assertCodexThreadForkResponse, x as assertCodexTurnStartResponse } from "./client-vXs2929Q.mjs";
-import { i as resolveCodexAppServerHomeScope, l as resolveCodexModelBackedReviewerPolicyContext } from "./config-options-BsanJ8QG.mjs";
-import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-DOEGYRNs.mjs";
-import { i as resolveCodexBindingAppServerConnection, r as requireCodexSupervisionModelSelection } from "./binding-connection-Bm38niE8.mjs";
-import { n as resolveOpenClawExecPolicyForCodexAppServer, t as canUseCodexModelBackedApprovalsReviewerForModel } from "./config-CedDWjM-.mjs";
-import { P as ensureCodexAppServerClientRuntime, Z as resolveCodexAppServerPreparedAuthHandoff, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease, q as readRecentCodexRateLimits, x as withLeasedCodexAppServerClientStartSelectionRetry } from "./shared-client-BpTtuLQ5.mjs";
-import { f as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, o as interruptCodexTurnAndWaitBestEffort } from "./attempt-client-cleanup-BpYKdTA0.mjs";
-import { t as CodexEphemeralTurn } from "./ephemeral-turn-R1gA8Sn6.mjs";
-import { A as resolveCodexBindingModelProviderFallback, D as resolveCodexAppServerModelProvider, E as CODEX_NATIVE_PERSONALITY_NONE, F as CODEX_NATIVE_HOOK_RELAY_EVENTS, H as emitCodexNativePreToolUseFailureDiagnostic, O as resolveCodexAppServerRequestModelSelection, Ot as mergeCodexThreadConfigs, R as buildCodexNativeHookRelayConfig, b as buildCodexRuntimeThreadConfig, c as resolveCodexAppServerReasoningEffort, it as filterCodexDynamicTools, kt as refreshCodexPluginAppApprovalPolicy, o as buildCodexUserInput, r as buildCodexTemporalAdditionalContext, s as readCodexSupportedReasoningEfforts, ut as resolveCodexDynamicToolsLoading, w as resolveCodexWebSearchPlan, z as buildCodexNativeHookRelayDisabledConfig } from "./thread-lifecycle-Cik28qWn.mjs";
-import { o as resolveCodexSessionBinding } from "./session-binding-_0W_fHRr.mjs";
-import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, r as assertCodexSupervisionThreadLineage } from "./thread-policy-Cjs4B8xf.mjs";
-import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-BBP-RbTf.mjs";
-import { C as shouldRequireCodexSandboxExecServerEnvironment, S as shouldEnableCodexAppServerNativeToolSurface, T as filterCodexVisionTools, a as emitDynamicToolStartedDiagnostic, b as resolveCodexNodePlacementToolConstructionPlan, c as ensureCodexSandboxExecServerEnvironment, d as CodexNativeToolLifecycleProjector, i as emitDynamicToolErrorDiagnostic, l as releaseCodexSandboxExecServerEnvironment, o as emitDynamicToolTerminalDiagnostic, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, v as resolveCodexExternalSandboxPolicyForOpenClawSandbox, x as resolveCodexSandboxEnvironmentSelection, y as resolveCodexMessageToolProvider } from "./dynamic-tools-D16lOp67.mjs";
-import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-B8J4Dy-O.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-DhurXY0l.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.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";
 import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
-import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, resolveAgentDir as resolveAgentDir$2, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, runAgentCleanupStep, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage as formatErrorMessage$1, resolveSandboxContext, runAgentCleanupStep } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { loadCodexBundleMcpApprovalConfig, resolveCodexMcpToolOverridesForAgent } from "openclaw/plugin-sdk/codex-mcp-projection";
 import { registerNativeHookRelayForBundledRuntime } from "openclaw/plugin-sdk/native-hook-relay-runtime";
+//#region extensions/codex/src/app-server/side-question-cleanup.ts
+async function cleanupCodexSideQuestion(client, params) {
+	const errors = [];
+	for (const cleanup of [() => cleanupCodexSideThread(client, params), ...params.afterThreadCleanup]) try {
+		const pending = cleanup();
+		if (pending) await pending;
+	} catch (error) {
+		errors.push(error);
+	}
+	if (errors.length === 0) return;
+	if (params.failure) errors.unshift(params.failure.error);
+	if (errors.length === 1) throw errors[0];
+	throw new AggregateError(errors, errors.map(formatErrorMessage).join("; "), { cause: errors[0] });
+}
+async function cleanupCodexSideThread(client, params) {
+	if (!params.threadId) return;
+	if (params.interrupt && params.turnId !== void 0) {
+		if (!await interruptCodexTurnAndWaitBestEffort(client, {
+			threadId: params.threadId,
+			turnId: params.turnId,
+			timeoutMs: params.timeoutMs
+		})) {
+			await retireUnsafeCodexTurnClientBestEffort(client, "side turn interrupt");
+			throw new Error("Codex /btw cleanup could not confirm the side turn stopped; background terminals may still be running.");
+		}
+	}
+	if (params.terminateBackgroundTerminals && params.turnId !== void 0) try {
+		await terminateCodexBackgroundTerminals(client, params.threadId);
+	} catch (error) {
+		await retireUnsafeCodexTurnClientBestEffort(client, "side background terminals");
+		throw error;
+	}
+	if (!await unsubscribeCodexThreadBestEffort(client, {
+		threadId: params.threadId,
+		timeoutMs: params.timeoutMs
+	})) await retireUnsafeCodexTurnClientBestEffort(client, "side thread unsubscribe");
+}
+//#endregion
 //#region extensions/codex/src/app-server/side-question-instructions.ts
 const SIDE_DEVELOPER_INSTRUCTIONS = `You are in a side conversation, not the main thread.
 
@@ -48,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,
@@ -103,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,
@@ -163,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,
@@ -241,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 });
@@ -279,6 +291,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 	let sandboxEnvironmentClient;
 	let nativeHookRelay;
 	const activeDynamicToolCalls = /* @__PURE__ */ new Set();
+	let primaryFailure;
 	const releaseSandboxEnvironment = async () => {
 		if (!sandboxEnvironment) return;
 		const environment = sandboxEnvironment;
@@ -318,40 +331,31 @@ 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,
+			nativeToolSurfaceEnabled
+		}).kind === "native-hosted" ? await resolveCodexProviderWebSearchSupportForClient({
+			client,
+			timeoutMs: appServer.requestTimeoutMs,
+			modelProviderOverride: modelSelection.modelProvider,
+			signal: runAbortController.signal
+		}) : "unsupported";
 		const { toolBridge, webSearchPlan } = await createCodexSideToolBridge({
-			params: effectiveParams,
+			params: sideRunParams,
 			cwd,
+			resolvedWorkspace: effectiveParams.workspaceDir ?? cwd,
 			pluginConfig,
 			sessionAgentId,
 			nativeToolSurfaceEnabled,
-			nativeProviderWebSearchSupport: resolveCodexWebSearchPlan({
-				config: params.cfg,
-				nativeToolSurfaceEnabled
-			}).kind === "native-hosted" ? await resolveCodexProviderWebSearchSupportForClient({
-				client,
-				timeoutMs: appServer.requestTimeoutMs,
-				modelProviderOverride: modelSelection.modelProvider,
-				signal: runAbortController.signal
-			}) : "unsupported",
+			nativeProviderWebSearchSupport,
 			sessionPermissionPolicy,
-			runId,
-			signal: runAbortController.signal
-		});
-		ensureCodexAppServerClientRuntime(client, {
-			agentDir: params.agentDir,
-			authProfileId: startupPreparedAuth?.kind === "api-key" ? void 0 : connection.requestAuthProfileId,
-			...!usesSupervisionConnection ? {
-				authProfileStore: preparedRuntimeAuth.authProfileStore,
-				authMode: startupPreparedAuth?.kind === "api-key" ? "prepared-api-key" : "profile"
-			} : {},
-			config: params.cfg
+			runAbortController
 		});
 		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,
@@ -366,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,
@@ -411,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,
@@ -426,47 +427,46 @@ async function runCodexAppServerSideQuestion(params, options) {
 				activeDynamicToolCalls.delete(toolCall);
 			}
 		};
-		const selectClient = (nextClient) => {
-			client = nextClient;
-			ensureCodexAppServerClientRuntime(client, {
-				agentDir: params.agentDir,
-				authProfileId: connection.requestAuthProfileId,
-				config: params.cfg
-			});
-		};
 		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({
@@ -580,7 +580,9 @@ async function runCodexAppServerSideQuestion(params, options) {
 				}
 				return response.thread.id;
 			}),
-			onClientChange: selectClient
+			onClientChange: (nextClient) => {
+				client = nextClient;
+			}
 		});
 		const effort = usesSupervisionConnection ? void 0 : resolveCodexAppServerReasoningEffort({
 			thinkLevel: params.resolvedThinkLevel ?? "off",
@@ -624,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 {
@@ -652,36 +654,33 @@ async function runCodexAppServerSideQuestion(params, options) {
 			text: result.text,
 			usage: result.usage
 		};
+	} catch (error) {
+		primaryFailure = { error };
+		throw error;
 	} finally {
-		try {
-			nativeToolRunWasAbortedBeforeCleanup = runAbortController.signal.aborted;
-			params.opts?.abortSignal?.removeEventListener("abort", abortFromUpstream);
-			if (!runAbortController.signal.aborted) runAbortController.abort("codex_side_question_finished");
-			await Promise.allSettled(activeDynamicToolCalls);
-			try {
-				await cleanupCodexSideThread(childClient ?? client, {
-					threadId: childThreadId,
-					turnId,
-					interrupt: !collector?.completed,
-					timeoutMs: appServer.requestTimeoutMs
-				});
-			} finally {
-				if (policyWriteUncertain && childClient) await retireUnsafeCodexTurnClientBestEffort(childClient, "side policy handoff");
-				collector?.route.release();
-				try {
-					nativeToolLifecycleProjector?.finalizeActive(nativeToolRunWasAbortedBeforeCleanup);
-				} finally {
-					activateNativePreToolUseFailureFallback();
-				}
-			}
-		} finally {
-			flushPendingNativePreToolUseFailures();
-			try {
-				await releaseSandboxEnvironment();
-			} finally {
-				releaseCodexAppServerClientLease(clientLease);
-				nativeHookRelay?.unregister();
-				await runAgentCleanupStep({
+		nativeToolRunWasAbortedBeforeCleanup = runAbortController.signal.aborted;
+		params.opts?.abortSignal?.removeEventListener("abort", abortFromUpstream);
+		if (!runAbortController.signal.aborted) runAbortController.abort("codex_side_question_finished");
+		await Promise.allSettled(activeDynamicToolCalls);
+		await cleanupCodexSideQuestion(childClient ?? client, {
+			threadId: childThreadId,
+			turnId,
+			interrupt: !(collector?.completed || collector?.route.completed),
+			terminateBackgroundTerminals: nativeToolRunWasAbortedBeforeCleanup,
+			timeoutMs: appServer.requestTimeoutMs,
+			failure: primaryFailure,
+			afterThreadCleanup: [
+				async () => {
+					if (policyWriteUncertain && childClient) await retireUnsafeCodexTurnClientBestEffort(childClient, "side policy handoff");
+				},
+				() => collector?.route.release(),
+				() => nativeToolLifecycleProjector?.finalizeActive(nativeToolRunWasAbortedBeforeCleanup),
+				() => nativePreToolUseFailures.activateFallback(nativeToolRunWasAbortedBeforeCleanup === true),
+				nativePreToolUseFailures.flush,
+				releaseSandboxEnvironment,
+				() => releaseCodexAppServerClientLease(clientLease),
+				() => nativeHookRelay?.unregister(),
+				() => runAgentCleanupStep({
 					runId: sideRunParams.runId,
 					sessionId: sideRunParams.sessionId,
 					step: "codex-side-native-hook-relay-release",
@@ -689,46 +688,11 @@ async function runCodexAppServerSideQuestion(params, options) {
 					cleanup: async () => {
 						await nativeHookRelay?.drain();
 					}
-				});
-			}
-		}
+				})
+			]
+		});
 	}
 }
-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,
@@ -784,144 +748,69 @@ function buildSideRunAttemptParams(params, options) {
 		},
 		onBlockReply: params.opts?.onBlockReply,
 		onPartialReply: params.opts?.onPartialReply,
+		onToolResult: params.opts?.onToolResult,
+		requireExplicitMessageTarget: true,
 		hostCapabilities: params.hostCapabilities,
 		sandbox: params.sandbox
 	};
 }
 async function createCodexSideToolBridge(input) {
-	const runtimeModel = input.params.runtimeModel ?? {
-		id: input.params.model,
-		provider: input.params.provider
-	};
-	const messageToolProvider = resolveCodexMessageToolProvider(input.params);
-	let tools = [];
-	const webFetchHostnameAllowlistRef = {};
-	if (supportsModelTools(runtimeModel)) {
-		const createOpenClawCodingTools = (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools;
-		const sandboxSessionKey = input.params.sandboxSessionKey?.trim() || input.params.sessionKey?.trim() || input.params.sessionId || input.sessionAgentId;
-		const sandbox = input.params.sandbox !== void 0 ? input.params.sandbox : await resolveSandboxContext({
-			config: input.params.cfg,
-			sessionKey: sandboxSessionKey,
-			workspaceDir: input.cwd
-		});
-		const toolConstructionPlan = resolveCodexNodePlacementToolConstructionPlan(sandbox, input.nativeToolSurfaceEnabled);
-		const publishSideToolResult = input.params.opts?.onToolResult;
-		const questionPrompt = publishSideToolResult ? {
-			send: async (payload) => {
-				await publishSideToolResult(payload);
-			},
-			...messageToolProvider ? { messageChannel: messageToolProvider } : {}
-		} : void 0;
-		const allTools = createOpenClawCodingTools({
-			agentId: input.sessionAgentId,
-			requesterThinkingLevel: input.params.resolvedThinkLevel ?? "off",
-			requesterModel: input.params.runtimeModel ? {
-				provider: input.params.runtimeModel.provider,
-				model: input.params.runtimeModel.id
-			} : void 0,
-			sessionKey: sandboxSessionKey,
-			runSessionKey: input.params.sessionKey && input.params.sessionKey !== sandboxSessionKey ? input.params.sessionKey : void 0,
-			sessionId: input.params.sessionId,
-			exec: input.sessionPermissionPolicy && { mode: input.sessionPermissionPolicy.execMode },
-			sessionPermissionPolicy: input.sessionPermissionPolicy,
-			runId: input.runId,
-			agentDir: input.params.agentDir ?? resolveAgentDir$2(input.params.cfg ?? {}, input.sessionAgentId),
-			workspaceDir: input.cwd,
-			spawnWorkspaceDir: resolveAttemptSpawnWorkspaceDir({
-				sandbox,
-				resolvedWorkspace: input.params.workspaceDir ?? input.cwd
-			}),
-			config: input.params.cfg,
-			preparedModelRuntime: input.params.preparedModelRuntime,
-			abortSignal: input.signal,
-			modelProvider: runtimeModel.provider,
-			modelId: input.params.model,
-			modelCompat: runtimeModel.compat && typeof runtimeModel.compat === "object" ? runtimeModel.compat : void 0,
-			modelApi: runtimeModel.api,
-			modelContextWindowTokens: runtimeModel.contextWindow,
-			modelAuthMode: resolveModelAuthMode(runtimeModel.provider, input.params.cfg, void 0, { workspaceDir: input.cwd }),
-			suppressManagedWebSearch: false,
-			webFetchHostnameAllowlistRef,
-			...input.params.messageProvider || input.params.messageChannel ? {
-				messageProvider: messageToolProvider,
-				toolPolicyMessageProvider: input.params.messageProvider ?? input.params.messageChannel
-			} : {},
-			...input.params.chatType ? { chatType: input.params.chatType } : {},
-			...input.params.agentAccountId ? { agentAccountId: input.params.agentAccountId } : {},
-			...input.params.messageTo ? { messageTo: input.params.messageTo } : {},
-			...input.params.messageThreadId !== void 0 ? { messageThreadId: input.params.messageThreadId } : {},
-			...input.params.chatId ? { nativeChannelId: input.params.chatId } : {},
-			...input.params.messageActionTurnCapability ? { messageActionTurnCapability: input.params.messageActionTurnCapability } : {},
-			...input.params.groupId !== void 0 ? { groupId: input.params.groupId } : {},
-			...input.params.groupChannel !== void 0 ? { groupChannel: input.params.groupChannel } : {},
-			...input.params.groupSpace !== void 0 ? { groupSpace: input.params.groupSpace } : {},
-			...input.params.memberRoleIds ? { memberRoleIds: input.params.memberRoleIds } : {},
-			...input.params.spawnedBy !== void 0 ? { spawnedBy: input.params.spawnedBy } : {},
-			...input.params.senderId !== void 0 ? { senderId: input.params.senderId } : {},
-			...input.params.senderName !== void 0 ? { senderName: input.params.senderName } : {},
-			...input.params.senderUsername !== void 0 ? { senderUsername: input.params.senderUsername } : {},
-			...input.params.senderE164 !== void 0 ? { senderE164: input.params.senderE164 } : {},
-			...input.params.senderIsOwner !== void 0 ? { senderIsOwner: input.params.senderIsOwner } : {},
-			...input.params.currentChannelId ? { currentChannelId: input.params.currentChannelId } : {},
-			hookChannelId: buildAgentHookContextChannelFields({
-				sessionKey: input.params.sessionKey,
-				messageChannel: input.params.messageChannel,
-				messageProvider: input.params.messageProvider,
-				currentChannelId: input.params.currentChannelId
-			}).channelId,
-			sandbox,
-			...toolConstructionPlan ? { toolConstructionPlan } : {},
-			...questionPrompt ? { questionPrompt } : {},
-			emitBeforeToolCallDiagnostics: false,
-			modelHasVision: runtimeModel.input?.includes("image") ?? false,
-			requireExplicitMessageTarget: true
-		});
-		const codexFilteredTools = filterCodexDynamicTools(allTools, input.pluginConfig);
-		tools = filterCodexVisionTools(codexFilteredTools, {
-			modelHasVision: runtimeModel.input?.includes("image") ?? false,
-			nativeImageInspectionEnabled: input.nativeToolSurfaceEnabled
-		});
-	}
+	const { params } = input;
+	const sandboxSessionKey = params.sandboxSessionKey?.trim() || params.sessionKey?.trim() || params.sessionId || input.sessionAgentId;
+	const sandbox = params.sandbox !== void 0 ? params.sandbox : await resolveSandboxContext({
+		config: params.config,
+		sessionKey: sandboxSessionKey,
+		workspaceDir: input.cwd
+	});
+	let webSearchAllowed = false;
+	const tools = await buildDynamicTools({
+		params,
+		resolvedWorkspace: input.resolvedWorkspace,
+		effectiveWorkspace: input.cwd,
+		sandboxSessionKey,
+		sandbox,
+		nativeToolSurfaceEnabled: input.nativeToolSurfaceEnabled,
+		nativeProviderWebSearchSupport: input.nativeProviderWebSearchSupport,
+		sessionPermissionPolicy: input.sessionPermissionPolicy,
+		runAbortController: input.runAbortController,
+		sessionAgentId: input.sessionAgentId,
+		policyAgentId: input.sessionAgentId,
+		pluginConfig: input.pluginConfig,
+		onYieldDetected: () => {},
+		onWebSearchPolicyResolved: (allowed) => {
+			webSearchAllowed = allowed;
+		}
+	});
 	const requestedWebSearchPlan = resolveCodexWebSearchPlan({
-		config: input.params.cfg,
+		config: params.config,
 		nativeToolSurfaceEnabled: input.nativeToolSurfaceEnabled,
 		nativeProviderWebSearchSupport: input.nativeProviderWebSearchSupport,
-		webSearchAllowed: tools.some((tool) => tool.name === "web_search")
+		webSearchAllowed
 	});
-	webFetchHostnameAllowlistRef.value = requestedWebSearchPlan.webFetchHostnameAllowlist;
 	const webSearchPlan = requestedWebSearchPlan.kind === "managed" ? resolveCodexWebSearchPlan({
-		config: input.params.cfg,
+		config: params.config,
 		webSearchAllowed: false
 	}) : requestedWebSearchPlan;
-	const exposedTools = input.params.hostCapabilities.bindToolSurface(tools.filter((tool) => tool.name !== "web_search" && tool.name !== "computer"), { cwd: input.cwd });
-	const hookChannelFields = buildAgentHookContextChannelFields({
-		sessionKey: input.params.sessionKey,
-		messageChannel: input.params.messageChannel,
-		messageProvider: input.params.messageProvider,
-		currentChannelId: input.params.currentChannelId
-	});
+	const exposedTools = tools.filter((tool) => tool.name !== "web_search" && tool.name !== "computer");
 	return {
 		toolBridge: createCodexDynamicToolBridge({
 			tools: exposedTools,
-			signal: input.signal,
+			signal: input.runAbortController.signal,
 			loading: resolveCodexDynamicToolsLoading(input.pluginConfig),
 			hookContext: {
 				agentId: input.sessionAgentId,
-				config: input.params.cfg,
-				contextWindowTokens: runtimeModel.contextWindow,
-				sessionId: input.params.sessionId,
-				sessionKey: input.params.sessionKey,
-				runId: input.runId,
-				currentChannelProvider: messageToolProvider,
-				...hookChannelFields
+				config: params.config,
+				contextWindowTokens: params.model.contextWindow,
+				sessionId: params.sessionId,
+				sessionKey: params.sessionKey,
+				runId: params.runId,
+				currentChannelProvider: resolveCodexMessageToolProvider(params),
+				...buildAgentHookContextChannelFields(params)
 			}
 		}),
 		webSearchPlan
 	};
 }
-function emptySideUserInputResponse() {
-	return { answers: {} };
-}
 function isSideUserInputRequest(value, threadId, turnId) {
 	return isJsonObject(value) && value.threadId === threadId && value.turnId === turnId;
 }
@@ -934,26 +823,9 @@ async function forkCodexSideThread(client, params, options) {
 	}
 }
 function isMissingCodexParentThreadError(error) {
-	const message = formatErrorMessage(error);
+	const message = formatErrorMessage$1(error);
 	return message.includes("no rollout found for thread id") || message.includes("includeTurns is unavailable before first user message");
 }
-async function cleanupCodexSideThread(client, params) {
-	if (!params.threadId) return;
-	if (params.interrupt && params.turnId !== void 0) {
-		if (!await interruptCodexTurnAndWaitBestEffort(client, {
-			threadId: params.threadId,
-			turnId: params.turnId,
-			timeoutMs: params.timeoutMs
-		})) {
-			await retireUnsafeCodexTurnClientBestEffort(client, "side turn interrupt");
-			return;
-		}
-	}
-	if (!await unsubscribeCodexThreadBestEffort(client, {
-		threadId: params.threadId,
-		timeoutMs: params.timeoutMs
-	})) await retireUnsafeCodexTurnClientBestEffort(client, "side thread unsubscribe");
-}
 function formatCodexErrorMessage(params, rateLimits) {
 	const error = isJsonObject(params.error) ? params.error : void 0;
 	const message = formatCodexUsageLimitErrorMessage({
@@ -961,7 +833,7 @@ function formatCodexErrorMessage(params, rateLimits) {
 		codexErrorInfo: error?.codexErrorInfo,
 		rateLimits
 	}) ?? (error ? readStringField(error, "message") ?? readStringField(error, "error") : void 0) ?? readStringField(params, "message") ?? "Codex /btw side thread failed.";
-	return new Error(formatErrorMessage(message));
+	return new Error(formatErrorMessage$1(message));
 }
 //#endregion
 export { runCodexAppServerSideQuestion };