@openclaw/codex 2026.7.2-beta.7 → 2026.8.1-beta.3

package/dist/{side-question-_ulBk1AL.js → side-question-DbXkJZzg.js}

@@ -1,12 +1,15 @@
-import { M as readRecentCodexRateLimits, W as isJsonObject, a as getLeasedSharedCodexAppServerClient, b as isCodexAppServerApprovalRequest, c as releaseCodexAppServerClientLease, h as withLeasedCodexAppServerClientStartSelectionRetry, k as ensureCodexAppServerClientRuntime, z as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-DTbvH-XV.js";
-import { A as resolveOpenClawExecPolicyForCodexAppServer, C as canUseCodexModelBackedApprovalsReviewerForModel, O as readCodexPluginConfig, T as resolveCodexModelBackedReviewerPolicyContext, d as sessionBindingIdentity, h as resolveCodexAppServerHomeScope, x as shouldAutoApproveCodexAppServerApprovals } from "./session-binding-BXpo9ymA.js";
-import { A as resolveCodexDynamicToolsLoading, C as resolveReasoningEffort, G as mergeCodexThreadConfigs, S as resolveCodexBindingModelProviderFallback, T as filterCodexDynamicTools, V as buildCodexPluginAppsConfigPatchFromPolicyContext, b as resolveCodexAppServerRequestModelSelection, g as resolveCodexWebSearchPlan, p as buildCodexRuntimeThreadConfig, v as CODEX_NATIVE_PERSONALITY_NONE, w as readCodexSupportedReasoningEfforts, y as resolveCodexAppServerModelProvider } from "./thread-lifecycle-DF53ogiA.js";
-import { S as readCodexTurn, h as assertCodexThreadForkResponse, v as assertCodexTurnStartResponse, y as readCodexDynamicToolCallParams } from "./transcript-mirror-DzsdNCf5.js";
-import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-CU-gVCCS.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BSaO2JIT.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-NuhpXmPB.js";
-import { a as resolveCodexBindingAppServerConnection, i as requireCodexSupervisionModelSelection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId } from "./notification-correlation-CU6_AnOb.js";
-import { C as filterToolsForVisionInputs, E as CODEX_NATIVE_HOOK_RELAY_EVENTS, F as handleDynamicToolCallWithTimeout, G as resolveCodexToolAbortTerminalReason, O as buildCodexNativeHookRelayConfig, T as CodexNativeToolLifecycleProjector, a as emitDynamicToolStartedDiagnostic, b as shouldEnableCodexAppServerNativeToolSurface, c as resolveCodexProviderWebSearchSupportForClient, i as emitDynamicToolErrorDiagnostic, j as emitCodexNativePreToolUseFailureDiagnostic, k as buildCodexNativeHookRelayDisabledConfig, n as handleCodexAppServerApprovalRequest, o as emitDynamicToolTerminalDiagnostic, r as handleCodexAppServerElicitationRequest, t as createCodexDynamicToolBridge, v as resolveCodexMessageToolProvider, z as resolveDynamicToolCallTimeoutMs } from "./dynamic-tools-D2gYkSBO.js";
+import { A as resolveOpenClawExecPolicyForCodexAppServer, S as resolveCodexModelBackedReviewerPolicyContext, b as canUseCodexModelBackedApprovalsReviewerForModel, f as isCodexPairedNodeRemoteExecPlacementSandbox, h as readCodexPluginConfig, m as isCodexSandboxExecServerEnabled, p as isCodexRemoteExecPlacementSandbox, r as resolveCodexAppServerHomeScope, u as shouldAutoApproveCodexAppServerApprovals } from "./config-CpNeo5AE.js";
+import { A as isCodexAppServerApprovalRequest, N as isCodexAppServerIndeterminateRequestCancellationError, Q as readRecentCodexRateLimits, V as createCodexElicitationResponse, W as ensureCodexAppServerClientRuntime, a as getLeasedSharedCodexAppServerClient, at as resolveCodexAppServerPreparedAuthHandoff, c as releaseCodexAppServerClientLease, h as withLeasedCodexAppServerClientStartSelectionRetry, ut as isJsonObject } from "./shared-client-Dw-rzii0.js";
+import { d as sessionBindingIdentity } from "./session-binding-BTrLf9Qm.js";
+import { d as unsubscribeCodexThreadBestEffort, h as isCodexNotificationForTurn, s as isCodexAlreadyTerminalInterruptError, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-URjUlCHg.js";
+import { l as readCodexTurn, o as assertCodexTurnStartResponse, r as assertCodexThreadForkResponse, s as readCodexDynamicToolCallParams } from "./protocol-validators-VAVyEnDp.js";
+import { G as buildCodexPluginAppsConfigPatchFromPolicyContext, O as filterCodexDynamicTools, P as resolveCodexDynamicToolsLoading, Z as mergeCodexThreadConfigs, _ as resolveCodexAppServerRequestModelSelection, b as resolveReasoningEffort, f as resolveCodexWebSearchPlan, g as resolveCodexAppServerModelProvider, h as CODEX_NATIVE_PERSONALITY_NONE, l as buildCodexRuntimeThreadConfig, x as readCodexSupportedReasoningEfforts, y as resolveCodexBindingModelProviderFallback } from "./thread-lifecycle-DKdrnTMX.js";
+import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-BI1dMHDG.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-bg5QPSVP.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C1qEeZ5C.js";
+import { n as resolveCodexBindingAppServerConnection, t as requireCodexSupervisionModelSelection } from "./binding-connection-DAvZwp96.js";
+import { A as buildCodexNativeHookRelayConfig, C as shouldRequireCodexSandboxExecServerEnvironment, D as CodexNativeToolLifecycleProjector, L as handleDynamicToolCallWithTimeout, N as emitCodexNativePreToolUseFailureDiagnostic, O as CODEX_NATIVE_HOOK_RELAY_EVENTS, S as shouldEnableCodexAppServerNativeToolSurface, T as filterCodexVisionTools, V as resolveDynamicToolCallTimeoutMs, a as emitDynamicToolStartedDiagnostic, b as resolveCodexNodePlacementToolConstructionPlan, d as releaseCodexSandboxExecServerEnvironment, i as emitDynamicToolErrorDiagnostic, j as buildCodexNativeHookRelayDisabledConfig, l as resolveCodexProviderWebSearchSupportForClient, o as emitDynamicToolTerminalDiagnostic, q as resolveCodexToolAbortTerminalReason, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, u as ensureCodexSandboxExecServerEnvironment, v as resolveCodexExternalSandboxPolicyForOpenClawSandbox, x as resolveCodexSandboxEnvironmentSelection, y as resolveCodexMessageToolProvider } from "./dynamic-tools-fJZhl4CE.js";
+import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { randomUUID } from "node:crypto";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
@@ -54,6 +57,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		config: params.cfg
 	}));
 	if (!binding?.threadId) throw new Error("Codex /btw needs an active Codex thread. Send a normal message first, then try /btw again.");
+	if (isCodexPairedNodeRemoteExecPlacementSandbox(params.sandbox)) throw new Error("Normal Codex turns are supported on paired devices, but /btw is not yet bound to the active placement.");
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
 	const { sessionAgentId } = resolveSessionAgentIds({
 		sessionKey: params.sessionKey,
@@ -79,6 +83,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		authProfileStore: preparedRuntimeAuth.authProfileStore,
 		agentDir: params.agentDir,
 		homeScope: resolveCodexAppServerHomeScope({ appServer: pluginConfig.appServer }),
+		requirePreparedAuth: isCodexRemoteExecPlacementSandbox(params.sandbox),
 		config: params.cfg,
 		subscriptionProfileRequiredError: "Prepared Codex subscription route requires a scoped native OAuth or token profile.",
 		subscriptionProfileUnusableError: `Prepared Codex auth profile "${preparedRuntimeAuth.plan.forwardedAuthProfileId}" is unusable.`
@@ -96,7 +101,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		bindingModelProvider: binding.modelProvider
 	});
 	const modelSelection = resolveCodexAppServerRequestModelSelection({
-		model: supervisionModelSelection?.model ?? params.model,
+		model: supervisionModelSelection?.model ?? options.runtimeModelId ?? params.model,
 		modelProvider,
 		authProfileId,
 		authProfileStore: preparedRuntimeAuth.authProfileStore,
@@ -145,16 +150,29 @@ async function runCodexAppServerSideQuestion(params, options) {
 	const sideRunParams = buildSideRunAttemptParams(effectiveParams, {
 		cwd,
 		authProfileId,
-		runId
+		runId,
+		timeoutMs: appServer.requestTimeoutMs
+	});
+	const sandboxExecServerEnabled = isCodexSandboxExecServerEnabled(pluginConfig, params.sandbox);
+	const nativeToolSurfaceEnabled = shouldEnableCodexAppServerNativeToolSurface(sideRunParams, params.sandbox ?? void 0, {
+		agentId: sideRunParams.agentId,
+		sandboxExecServerEnabled
+	});
+	const sandboxEnvironmentRequired = shouldRequireCodexSandboxExecServerEnvironment({
+		sandbox: params.sandbox ?? void 0,
+		nativeToolSurfaceEnabled,
+		sandboxExecServerEnabled
 	});
 	const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
 		config: sideRunParams.config,
 		sessionKey: sideRunParams.sandboxSessionKey?.trim() || sideRunParams.sessionKey,
 		sessionId: sideRunParams.sessionId,
+		agentId: sideRunParams.agentId,
+		sandbox: params.sandbox,
+		sandboxEnvironmentSelected: sandboxEnvironmentRequired,
 		surface: "/btw side-question mode"
 	});
 	if (nativeExecutionBlock) throw new Error(nativeExecutionBlock);
-	const nativeToolSurfaceEnabled = shouldEnableCodexAppServerNativeToolSurface(sideRunParams);
 	if (!nativeToolSurfaceEnabled) throw new Error("Codex-native /btw side-question mode is unavailable because the effective tool policy restricts Codex native tools for this session.");
 	const clientOptions = {
 		startOptions: appServer.start,
@@ -211,9 +229,38 @@ async function runCodexAppServerSideQuestion(params, options) {
 	else params.opts?.abortSignal?.addEventListener("abort", abortFromUpstream, { once: true });
 	let childThreadId;
 	let turnId;
+	let sandboxEnvironment;
+	let sandboxEnvironmentClient;
 	let removeRequestHandler;
 	let nativeHookRelay;
 	const activeDynamicToolCalls = /* @__PURE__ */ new Set();
+	const releaseSandboxEnvironment = async () => {
+		if (!sandboxEnvironment) return;
+		const environment = sandboxEnvironment;
+		sandboxEnvironment = void 0;
+		sandboxEnvironmentClient = void 0;
+		await releaseCodexSandboxExecServerEnvironment(params.sandbox, environment);
+	};
+	const ensureSandboxEnvironment = async (targetClient) => {
+		if (!sandboxEnvironmentRequired || sandboxEnvironmentClient === targetClient) return;
+		await releaseSandboxEnvironment();
+		const environment = await ensureCodexSandboxExecServerEnvironment({
+			client: targetClient,
+			sandbox: params.sandbox ?? null,
+			runtime: options.runtime,
+			appServerStartOptions: appServer.start,
+			timeoutMs: appServer.requestTimeoutMs,
+			signal: runAbortController.signal,
+			onExecutionDisconnect: (error) => {
+				collector.reject(error);
+				embeddedAgentLog.warn(error.message);
+				runAbortController.abort("client_closed");
+			}
+		});
+		if (!environment) throw new Error("Codex app-server did not register an OpenClaw sandbox exec-server environment.");
+		sandboxEnvironment = environment;
+		sandboxEnvironmentClient = targetClient;
+	};
 	try {
 		const modelScopedAppServer = resolveCodexAppServerForModelProvider({
 			appServer,
@@ -261,14 +308,17 @@ async function runCodexAppServerSideQuestion(params, options) {
 		});
 		const registerRequestHandler = (targetClient) => targetClient.addRequestHandler(async (request) => {
 			if (!childThreadId || !turnId) return;
-			if (request.method === "mcpServer/elicitation/request") return handleCodexAppServerElicitationRequest({
-				requestParams: request.params,
-				paramsForRun: sideRunParams,
-				threadId: childThreadId,
-				turnId,
-				pluginAppPolicyContext: binding.pluginAppPolicyContext,
-				signal: runAbortController.signal
-			});
+			if (request.method === "mcpServer/elicitation/request") {
+				const approvalResult = await routeCodexAppServerElicitationRequest({
+					requestParams: request.params,
+					paramsForRun: sideRunParams,
+					threadId: childThreadId,
+					turnId,
+					pluginAppPolicyContext: binding.pluginAppPolicyContext,
+					signal: runAbortController.signal
+				});
+				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 (isCodexAppServerApprovalRequest(request.method)) return handleCodexAppServerApprovalRequest({
 				method: request.method,
@@ -367,6 +417,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			completionTimeoutMs: Math.max(appServer.turnCompletionIdleTimeoutMs, SIDE_QUESTION_COMPLETION_TIMEOUT_MS),
 			loopDetectionPreToolUseRelay: appServer.loopDetectionPreToolUseRelay,
 			signal: runAbortController.signal,
+			hostCapabilities: sideRunParams.hostCapabilities,
 			onPreToolUseFailure: (failure) => {
 				if (nativePreToolUseFailureFallbackActive) emitNativePreToolUseFailure(failure);
 				else if (nativeToolLifecycleProjector) nativeToolLifecycleProjector.recordPreToolUseFailure(failure, nativeToolRunWasAbortedBeforeCleanup);
@@ -377,8 +428,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			relay: nativeHookRelay,
 			events: nativeHookRelayEvents,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec,
-			clearOmittedEvents: true,
-			loopDetectionPreToolUseRelay: appServer.loopDetectionPreToolUseRelay
+			clearOmittedEvents: true
 		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0;
 		const runtimeThreadConfig = buildCodexRuntimeThreadConfig(webSearchPlan.threadConfig, {
 			nativeCodeModeEnabled: nativeToolSurfaceEnabled,
@@ -388,21 +438,25 @@ async function runCodexAppServerSideQuestion(params, options) {
 		const forkResponse = assertCodexThreadForkResponse(await withLeasedCodexAppServerClientStartSelectionRetry({
 			lease: clientLease,
 			options: clientOptions,
-			signal: params.opts?.abortSignal,
-			run: async (forkClient, requestOptions) => await forkCodexSideThread(forkClient, {
-				threadId: binding.threadId,
-				model: modelSelection.model,
-				...modelSelection.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
-				cwd,
-				approvalPolicy,
-				approvalsReviewer: modelScopedAppServer.approvalsReviewer,
-				...modelScopedAppServer.networkProxy ? {} : { sandbox },
-				...serviceTier ? { serviceTier } : {},
-				config: threadConfig,
-				developerInstructions: SIDE_DEVELOPER_INSTRUCTIONS,
-				ephemeral: true,
-				threadSource: "user"
-			}, requestOptions),
+			signal: runAbortController.signal,
+			run: async (forkClient, requestOptions) => {
+				await ensureSandboxEnvironment(forkClient);
+				const executionCwd = sandboxEnvironment?.cwd ?? cwd;
+				return await forkCodexSideThread(forkClient, {
+					threadId: binding.threadId,
+					model: modelSelection.model,
+					...modelSelection.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
+					cwd: executionCwd,
+					approvalPolicy,
+					approvalsReviewer: modelScopedAppServer.approvalsReviewer,
+					...sandboxEnvironment || modelScopedAppServer.networkProxy ? {} : { sandbox },
+					...serviceTier ? { serviceTier } : {},
+					config: threadConfig,
+					developerInstructions: SIDE_DEVELOPER_INSTRUCTIONS,
+					ephemeral: true,
+					threadSource: "user"
+				}, requestOptions);
+			},
 			onClientChange: rebindClientHandlers
 		}));
 		childThreadId = forkResponse.thread.id;
@@ -412,7 +466,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			items: [sideBoundaryPromptItem()]
 		}, {
 			timeoutMs: appServer.requestTimeoutMs,
-			signal: params.opts?.abortSignal
+			signal: runAbortController.signal
 		});
 		const effort = usesSupervisionConnection ? void 0 : resolveReasoningEffort(params.resolvedThinkLevel ?? "off", modelSelection.model, readCodexSupportedReasoningEfforts(params.runtimeModel?.compat));
 		turnId = assertCodexTurnStartResponse(await client.request("turn/start", {
@@ -422,7 +476,11 @@ async function runCodexAppServerSideQuestion(params, options) {
 				text: params.question.trim(),
 				text_elements: []
 			}],
-			cwd,
+			...sandboxEnvironment ? {
+				cwd: sandboxEnvironment.cwd,
+				sandboxPolicy: resolveCodexExternalSandboxPolicyForOpenClawSandbox(params.sandbox ?? void 0),
+				environments: resolveCodexSandboxEnvironmentSelection(sandboxEnvironment, nativeToolSurfaceEnabled)
+			} : { cwd },
 			model: modelSelection.model,
 			...usesSupervisionConnection ? {} : { personality: CODEX_NATIVE_PERSONALITY_NONE },
 			...serviceTier ? { serviceTier } : {},
@@ -439,7 +497,10 @@ async function runCodexAppServerSideQuestion(params, options) {
 			}
 		}, {
 			timeoutMs: appServer.requestTimeoutMs,
-			signal: params.opts?.abortSignal
+			signal: runAbortController.signal
+		}).catch((error) => {
+			if (isCodexAppServerIndeterminateRequestCancellationError(error)) turnId = "";
+			throw error;
 		})).turn.id;
 		collector.setTurn(childThreadId, turnId);
 		nativeToolLifecycleProjector = new CodexNativeToolLifecycleProjector({
@@ -453,7 +514,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		let text;
 		try {
 			text = await collector.wait({
-				signal: params.opts?.abortSignal,
+				signal: runAbortController.signal,
 				timeoutMs: Math.max(appServer.turnCompletionIdleTimeoutMs, SIDE_QUESTION_COMPLETION_TIMEOUT_MS)
 			});
 		} catch (error) {
@@ -488,8 +549,12 @@ async function runCodexAppServerSideQuestion(params, options) {
 			}
 		} finally {
 			flushPendingNativePreToolUseFailures();
-			releaseCodexAppServerClientLease(clientLease);
-			nativeHookRelay?.unregister();
+			try {
+				await releaseSandboxEnvironment();
+			} finally {
+				releaseCodexAppServerClientLease(clientLease);
+				nativeHookRelay?.unregister();
+			}
 		}
 	}
 }
@@ -515,6 +580,8 @@ function registerCodexSideNativeHookRelay(params) {
 			completionTimeoutMs: params.completionTimeoutMs
 		}),
 		signal: params.signal,
+		runBeforeToolCall: params.hostCapabilities.runBeforeToolCall,
+		assertActive: params.hostCapabilities.assertActive,
 		onPreToolUseFailure: params.onPreToolUseFailure,
 		command: { timeoutMs: params.options.gatewayTimeoutMs }
 	});
@@ -535,6 +602,8 @@ function buildSideRunAttemptParams(params, options) {
 			id: params.model,
 			provider: params.provider
 		},
+		prompt: params.question,
+		timeoutMs: options.timeoutMs,
 		sessionId: params.sessionId,
 		sessionFile: params.sessionFile,
 		sessionKey: params.sessionKey,
@@ -568,6 +637,7 @@ function buildSideRunAttemptParams(params, options) {
 		authStorage: params.preparedRuntimeAuth.authStorage,
 		authProfileStore: params.preparedRuntimeAuth.authProfileStore,
 		modelRegistry: params.preparedRuntimeAuth.modelRegistry,
+		preparedModelRuntime: params.preparedModelRuntime,
 		...params.preparedRuntimeAuth.resolvedApiKey ? { resolvedApiKey: params.preparedRuntimeAuth.resolvedApiKey } : {},
 		runId: options.runId,
 		abortSignal: params.opts?.abortSignal,
@@ -575,7 +645,9 @@ function buildSideRunAttemptParams(params, options) {
 			if (event.stream === "approval") params.opts?.onApprovalEvent?.(event.data);
 		},
 		onBlockReply: params.opts?.onBlockReply,
-		onPartialReply: params.opts?.onPartialReply
+		onPartialReply: params.opts?.onPartialReply,
+		hostCapabilities: params.hostCapabilities,
+		sandbox: params.sandbox
 	};
 }
 async function createCodexSideToolBridge(input) {
@@ -585,15 +657,17 @@ async function createCodexSideToolBridge(input) {
 	};
 	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 = await resolveSandboxContext({
+		const sandbox = input.params.sandbox !== void 0 ? input.params.sandbox : await resolveSandboxContext({
 			config: input.params.cfg,
 			sessionKey: sandboxSessionKey,
 			workspaceDir: input.cwd
 		});
-		tools = filterToolsForVisionInputs(filterCodexDynamicTools(createOpenClawCodingTools({
+		const toolConstructionPlan = resolveCodexNodePlacementToolConstructionPlan(sandbox, input.nativeToolSurfaceEnabled);
+		tools = filterCodexVisionTools(filterCodexDynamicTools(createOpenClawCodingTools({
 			agentId: input.sessionAgentId,
 			sessionKey: sandboxSessionKey,
 			runSessionKey: input.params.sessionKey && input.params.sessionKey !== sandboxSessionKey ? input.params.sessionKey : void 0,
@@ -606,6 +680,7 @@ async function createCodexSideToolBridge(input) {
 				resolvedWorkspace: input.params.workspaceDir ?? input.cwd
 			}),
 			config: input.params.cfg,
+			preparedModelRuntime: input.params.preparedModelRuntime,
 			abortSignal: input.signal,
 			modelProvider: runtimeModel.provider,
 			modelId: input.params.model,
@@ -614,6 +689,7 @@ async function createCodexSideToolBridge(input) {
 			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
@@ -642,12 +718,13 @@ async function createCodexSideToolBridge(input) {
 				currentChannelId: input.params.currentChannelId
 			}).channelId,
 			sandbox,
+			...toolConstructionPlan ? { toolConstructionPlan } : {},
 			emitBeforeToolCallDiagnostics: false,
 			modelHasVision: runtimeModel.input?.includes("image") ?? false,
 			requireExplicitMessageTarget: true
 		}), input.pluginConfig), {
 			modelHasVision: runtimeModel.input?.includes("image") ?? false,
-			hasInboundImages: false
+			nativeImageInspectionEnabled: input.nativeToolSurfaceEnabled
 		});
 	}
 	const requestedWebSearchPlan = resolveCodexWebSearchPlan({
@@ -656,11 +733,12 @@ async function createCodexSideToolBridge(input) {
 		nativeProviderWebSearchSupport: input.nativeProviderWebSearchSupport,
 		webSearchAllowed: tools.some((tool) => tool.name === "web_search")
 	});
+	webFetchHostnameAllowlistRef.value = requestedWebSearchPlan.webFetchHostnameAllowlist;
 	const webSearchPlan = requestedWebSearchPlan.kind === "managed" ? resolveCodexWebSearchPlan({
 		config: input.params.cfg,
 		webSearchAllowed: false
 	}) : requestedWebSearchPlan;
-	const exposedTools = tools.filter((tool) => tool.name !== "web_search" && tool.name !== "computer");
+	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,
@@ -716,19 +794,22 @@ function sideBoundaryPromptItem() {
 }
 async function cleanupCodexSideThread(client, params) {
 	if (!params.threadId) return;
-	if (params.interrupt && params.turnId) try {
+	if (params.interrupt && params.turnId !== void 0) try {
 		await client.request("turn/interrupt", {
 			threadId: params.threadId,
 			turnId: params.turnId
 		}, { timeoutMs: params.timeoutMs });
 	} catch (error) {
-		embeddedAgentLog.debug("codex /btw side thread interrupt cleanup failed", { error });
-	}
-	try {
-		await client.request("thread/unsubscribe", { threadId: params.threadId }, { timeoutMs: params.timeoutMs });
-	} catch (error) {
-		embeddedAgentLog.debug("codex /btw side thread unsubscribe cleanup failed", { error });
+		if (!isCodexAlreadyTerminalInterruptError(error)) {
+			embeddedAgentLog.debug("codex /btw side thread interrupt cleanup failed", { error });
+			await retireUnsafeCodexTurnClientBestEffort(client, "side turn interrupt");
+			return;
+		}
 	}
+	if (!await unsubscribeCodexThreadBestEffort(client, {
+		threadId: params.threadId,
+		timeoutMs: params.timeoutMs
+	})) await retireUnsafeCodexTurnClientBestEffort(client, "side thread unsubscribe");
 }
 var CodexSideQuestionCollector = class {
 	constructor(params, readRecentRateLimits) {
@@ -753,7 +834,7 @@ var CodexSideQuestionCollector = class {
 			this.pendingNotifications.push(notification);
 			return;
 		}
-		if (!isNotificationForTurn(params, this.threadId, this.turnId)) return;
+		if (!isCodexNotificationForTurn(params, this.threadId, this.turnId)) return;
 		if (notification.method === "item/agentMessage/delta") {
 			this.appendAssistantDelta(params);
 			return;
@@ -802,7 +883,7 @@ var CodexSideQuestionCollector = class {
 		});
 	}
 	async appendAssistantDelta(params) {
-		const delta = readString(params, "delta") ?? "";
+		const delta = readStringField(params, "delta") ?? "";
 		if (!delta) return;
 		if (!this.assistantStarted) {
 			this.assistantStarted = true;
@@ -845,23 +926,13 @@ var CodexSideQuestionCollector = class {
 function collectAssistantText(turn) {
 	return (turn.items ?? []).filter((item) => item.type === "agentMessage" && typeof item.text === "string").map((item) => item.text.trim()).filter(Boolean).at(-1) ?? "";
 }
-function isNotificationForTurn(params, threadId, turnId) {
-	return readCodexNotificationThreadId(params) === threadId && readNotificationTurnId(params) === turnId;
-}
-function readNotificationTurnId(record) {
-	return readCodexNotificationTurnId(record);
-}
-function readString(record, key) {
-	const value = record[key];
-	return typeof value === "string" ? value : void 0;
-}
 function formatCodexErrorMessage(params, rateLimits) {
 	const error = isJsonObject(params.error) ? params.error : void 0;
 	const message = formatCodexUsageLimitErrorMessage({
-		message: error ? readString(error, "message") : void 0,
+		message: error ? readStringField(error, "message") : void 0,
 		codexErrorInfo: error?.codexErrorInfo,
 		rateLimits
-	}) ?? (error ? readString(error, "message") ?? readString(error, "error") : void 0) ?? readString(params, "message") ?? "Codex /btw side thread failed.";
+	}) ?? (error ? readStringField(error, "message") ?? readStringField(error, "error") : void 0) ?? readStringField(params, "message") ?? "Codex /btw side thread failed.";
 	return new Error(formatErrorMessage(message));
 }
 //#endregion