@openclaw/codex 2026.6.8 → 2026.6.9-beta.1

package/dist/{sandbox-guard-C-Yv9uwY.js → sandbox-guard-3tnjhjFb.js}

@@ -10,18 +10,27 @@ const TRAILING_DASH_PATTERN = /-+$/;
 function resolveCodexNativeExecutionPolicy(params) {
 	const config = params.config ?? {};
 	const sessionKey = params.sessionKey?.trim() || params.sessionId?.trim() || void 0;
-	const sessionEntry = params.sessionEntry ?? (params.readRuntimeSessionEntry && sessionKey ? readRuntimeSessionEntryBestEffort(sessionKey) : void 0);
+	const agentId = resolvePolicyAgentId({
+		config,
+		sessionKey,
+		agentId: params.agentId
+	});
+	const canReadSessionEntry = params.readRuntimeSessionEntry && shouldReadRuntimeSessionEntry({
+		config,
+		sessionKey,
+		agentId: params.agentId
+	});
+	const sessionEntry = params.sessionEntry ?? (canReadSessionEntry && sessionKey ? readRuntimeSessionEntryBestEffort({
+		sessionKey,
+		agentId
+	}) : void 0);
 	const sandboxAvailable = params.sandboxAvailable ?? (sessionKey ? resolveSandboxRuntimeStatus({
 		cfg: config,
 		sessionKey
 	}).sandboxed : false);
 	const agentExec = resolvePolicyAgentExec({
 		config,
-		agentId: resolvePolicyAgentId({
-			config,
-			sessionKey,
-			agentId: params.agentId
-		})
+		agentId
 	});
 	const globalExec = config.tools?.exec;
 	const requestedExecHost = normalizeExecTarget(params.execOverrides?.host) ?? normalizeExecTarget(sessionEntry?.execHost) ?? normalizeExecTarget(agentExec?.host) ?? normalizeExecTarget(globalExec?.host) ?? "auto";
@@ -57,8 +66,7 @@ function resolvePolicyAgentId(params) {
 	if (explicitAgentId) return explicitAgentId;
 	const sessionAgentId = parseAgentIdFromSessionKey(params.sessionKey);
 	if (sessionAgentId) return sessionAgentId;
-	const agents = listAgentEntries(params.config);
-	return normalizeAgentId((agents.find((entry) => entry?.default) ?? agents[0])?.id);
+	return resolveDefaultPolicyAgentId(listAgentEntries(params.config));
 }
 function resolvePolicyAgentExec(params) {
 	return listAgentEntries(params.config).find((entry) => normalizeAgentId(entry?.id) === params.agentId)?.tools?.exec;
@@ -73,6 +81,23 @@ function parseAgentIdFromSessionKey(sessionKey) {
 	if (parts.length < 3 || parts[0] !== "agent" || !parts[2]) return;
 	return normalizeAgentIdOrDefault(parts[1]);
 }
+function shouldReadRuntimeSessionEntry(params) {
+	if (!params.sessionKey) return false;
+	const explicitAgentId = normalizeAgentIdOrDefault(params.agentId);
+	if (!explicitAgentId) return true;
+	const sessionAgentId = parseAgentIdFromSessionKey(params.sessionKey);
+	if (!sessionAgentId) return isDefaultAgentSessionKeyForAgent({
+		config: params.config,
+		agentId: explicitAgentId
+	});
+	return sessionAgentId === explicitAgentId;
+}
+function isDefaultAgentSessionKeyForAgent(params) {
+	return normalizeAgentId(params.agentId) === resolveDefaultPolicyAgentId(listAgentEntries(params.config));
+}
+function resolveDefaultPolicyAgentId(agents) {
+	return normalizeAgentId((agents.find((entry) => entry?.default) ?? agents[0])?.id);
+}
 function normalizeAgentIdOrDefault(value) {
 	const normalized = normalizeAgentId(value);
 	return normalized === DEFAULT_AGENT_ID && !(value ?? "").trim() ? void 0 : normalized;
@@ -92,10 +117,11 @@ function resolveEffectiveExecHost(params) {
 	if (params.requestedExecHost === "auto") return params.sandboxAvailable ? "sandbox" : "gateway";
 	return params.requestedExecHost;
 }
-function readRuntimeSessionEntryBestEffort(sessionKey) {
+function readRuntimeSessionEntryBestEffort(params) {
 	try {
 		return getSessionEntry({
-			sessionKey,
+			sessionKey: params.sessionKey,
+			agentId: params.agentId,
 			hydrateSkillPromptRefs: false
 		});
 	} catch {
@@ -229,6 +255,7 @@ function resolveCodexNativeNodeExecBlock(params) {
 	const policy = resolveCodexNativeExecutionPolicy({
 		config: params.config,
 		sessionKey,
+		agentId: params.agentId,
 		readRuntimeSessionEntry: Boolean(sessionKey)
 	});
 	if (policy.nativeToolSurfaceAllowed) return;

package/dist/{session-binding-ElbcSq2o.js → session-binding-BRUi8y6E.js}

@@ -1,8 +1,8 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { l as normalizeCodexServiceTier } from "./config-DJXpBkGf.js";
+import { l as normalizeCodexServiceTier } from "./config-BksX0T33.js";
+import fs from "node:fs/promises";
 import { ensureAuthProfileStore, resolveDefaultAgentDir, resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
-import fs from "node:fs/promises";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { withFileLock } from "openclaw/plugin-sdk/file-lock";
 //#region extensions/codex/src/app-server/session-binding.ts
@@ -78,10 +78,11 @@ async function readCodexAppServerBinding(sessionFile, lookup = {}) {
 	}
 	try {
 		const parsed = JSON.parse(raw);
-		if (parsed.schemaVersion !== 1 || typeof parsed.threadId !== "string") return;
+		const schemaVersion = parsed.schemaVersion === 1 || parsed.schemaVersion === 2 ? parsed.schemaVersion : void 0;
+		if (schemaVersion === void 0 || typeof parsed.threadId !== "string") return;
 		const authProfileId = typeof parsed.authProfileId === "string" ? parsed.authProfileId : void 0;
 		return {
-			schemaVersion: 1,
+			schemaVersion: 2,
 			threadId: parsed.threadId,
 			sessionFile,
 			cwd: typeof parsed.cwd === "string" ? parsed.cwd : "",
@@ -95,14 +96,18 @@ async function readCodexAppServerBinding(sessionFile, lookup = {}) {
 			approvalPolicy: readApprovalPolicy(parsed.approvalPolicy),
 			sandbox: readSandboxMode(parsed.sandbox),
 			serviceTier: readServiceTier(parsed.serviceTier),
+			networkProxyProfileName: typeof parsed.networkProxyProfileName === "string" ? parsed.networkProxyProfileName : void 0,
+			networkProxyConfigFingerprint: typeof parsed.networkProxyConfigFingerprint === "string" ? parsed.networkProxyConfigFingerprint : void 0,
 			dynamicToolsFingerprint: typeof parsed.dynamicToolsFingerprint === "string" ? parsed.dynamicToolsFingerprint : void 0,
 			dynamicToolsContainDeferred: typeof parsed.dynamicToolsContainDeferred === "boolean" ? parsed.dynamicToolsContainDeferred : void 0,
+			webSearchThreadConfigFingerprint: typeof parsed.webSearchThreadConfigFingerprint === "string" ? parsed.webSearchThreadConfigFingerprint : void 0,
 			userMcpServersFingerprint: typeof parsed.userMcpServersFingerprint === "string" ? parsed.userMcpServersFingerprint : void 0,
 			mcpServersFingerprint: typeof parsed.mcpServersFingerprint === "string" ? parsed.mcpServersFingerprint : void 0,
 			nativeHookRelayGeneration: typeof parsed.nativeHookRelayGeneration === "string" && parsed.nativeHookRelayGeneration.trim() ? parsed.nativeHookRelayGeneration : void 0,
+			appServerRuntimeFingerprint: typeof parsed.appServerRuntimeFingerprint === "string" && parsed.appServerRuntimeFingerprint.trim() ? parsed.appServerRuntimeFingerprint : void 0,
 			pluginAppsFingerprint: typeof parsed.pluginAppsFingerprint === "string" ? parsed.pluginAppsFingerprint : void 0,
 			pluginAppsInputFingerprint: typeof parsed.pluginAppsInputFingerprint === "string" ? parsed.pluginAppsInputFingerprint : void 0,
-			pluginAppPolicyContext: readPluginAppPolicyContext(parsed.pluginAppPolicyContext),
+			pluginAppPolicyContext: readPluginAppPolicyContext(parsed.pluginAppPolicyContext, schemaVersion),
 			contextEngine: readContextEngineBinding(parsed.contextEngine),
 			environmentSelectionFingerprint: typeof parsed.environmentSelectionFingerprint === "string" ? parsed.environmentSelectionFingerprint : void 0,
 			createdAt: typeof parsed.createdAt === "string" ? parsed.createdAt : (/* @__PURE__ */ new Date()).toISOString(),
@@ -121,7 +126,7 @@ async function writeCodexAppServerBinding(sessionFile, binding, lookup = {}) {
 	await withCodexAppServerBindingLock(sessionFile, async () => {
 		const now = (/* @__PURE__ */ new Date()).toISOString();
 		const payload = {
-			schemaVersion: 1,
+			schemaVersion: 2,
 			sessionFile,
 			threadId: binding.threadId,
 			cwd: binding.cwd,
@@ -135,11 +140,15 @@ async function writeCodexAppServerBinding(sessionFile, binding, lookup = {}) {
 			approvalPolicy: binding.approvalPolicy,
 			sandbox: binding.sandbox,
 			serviceTier: binding.serviceTier,
+			networkProxyProfileName: binding.networkProxyProfileName,
+			networkProxyConfigFingerprint: binding.networkProxyConfigFingerprint,
 			dynamicToolsFingerprint: binding.dynamicToolsFingerprint,
 			dynamicToolsContainDeferred: binding.dynamicToolsContainDeferred,
+			webSearchThreadConfigFingerprint: binding.webSearchThreadConfigFingerprint,
 			userMcpServersFingerprint: binding.userMcpServersFingerprint,
 			mcpServersFingerprint: binding.mcpServersFingerprint,
 			nativeHookRelayGeneration: binding.nativeHookRelayGeneration,
+			appServerRuntimeFingerprint: binding.appServerRuntimeFingerprint,
 			pluginAppsFingerprint: binding.pluginAppsFingerprint,
 			pluginAppsInputFingerprint: binding.pluginAppsInputFingerprint,
 			pluginAppPolicyContext: binding.pluginAppPolicyContext,
@@ -173,7 +182,7 @@ function readContextEngineProjectionBinding(value) {
 		fingerprint: typeof record.fingerprint === "string" ? record.fingerprint : void 0
 	};
 }
-function readPluginAppPolicyContext(value) {
+function readPluginAppPolicyContext(value, bindingSchemaVersion) {
 	if (!value || typeof value !== "object" || Array.isArray(value)) return;
 	const record = value;
 	if (typeof record.fingerprint !== "string") return;
@@ -183,12 +192,14 @@ function readPluginAppPolicyContext(value) {
 	for (const [appId, rawEntry] of Object.entries(apps)) {
 		if (!rawEntry || typeof rawEntry !== "object" || Array.isArray(rawEntry)) return;
 		const entry = rawEntry;
-		if ("appId" in entry || typeof entry.configKey !== "string" || entry.marketplaceName !== "openai-curated" || typeof entry.pluginName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || !Array.isArray(entry.mcpServerNames) || entry.mcpServerNames.some((serverName) => typeof serverName !== "string")) return;
+		const destructiveApprovalMode = readDestructiveApprovalMode(entry.destructiveApprovalMode, bindingSchemaVersion);
+		if ("appId" in entry || typeof entry.configKey !== "string" || entry.marketplaceName !== "openai-curated" || typeof entry.pluginName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || destructiveApprovalMode === "invalid" || !Array.isArray(entry.mcpServerNames) || entry.mcpServerNames.some((serverName) => typeof serverName !== "string")) return;
 		parsedApps[appId] = {
 			configKey: entry.configKey,
 			marketplaceName: entry.marketplaceName,
 			pluginName: entry.pluginName,
 			allowDestructiveActions: entry.allowDestructiveActions,
+			...destructiveApprovalMode ? { destructiveApprovalMode } : {},
 			mcpServerNames: entry.mcpServerNames
 		};
 	}
@@ -205,6 +216,14 @@ function readPluginAppPolicyContext(value) {
 		pluginAppIds: parsedPluginAppIds
 	};
 }
+function readDestructiveApprovalMode(value, bindingSchemaVersion) {
+	if (value === void 0) return;
+	if (value === "deny") return "deny";
+	if (value === "allow") return "allow";
+	if (value === "auto") return bindingSchemaVersion === 1 ? "allow" : "auto";
+	if (value === "on-request" && bindingSchemaVersion === 1) return "auto";
+	return "invalid";
+}
 /** Removes the Codex app-server binding sidecar if present. */
 async function clearCodexAppServerBinding(sessionFile, _lookup = {}) {
 	if (!await codexAppServerBindingSidecarExists(sessionFile)) return;

package/dist/{shared-client-jFMumCOe.js → shared-client-Bg5d7VV9.js}

@@ -1,13 +1,13 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { d as resolveCodexAppServerRuntimeOptions, r as codexAppServerStartOptionsKey } from "./config-DJXpBkGf.js";
-import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-DovmVtbr.js";
+import { d as resolveCodexAppServerRuntimeOptions, r as codexAppServerStartOptionsKey } from "./config-BksX0T33.js";
+import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-m7XiCQpO.js";
 import { createRequire } from "node:module";
+import fs, { access } from "node:fs/promises";
+import path from "node:path";
 import { createHash } from "node:crypto";
 import fsSync, { constants, readFileSync } from "node:fs";
 import os from "node:os";
-import path from "node:path";
 import { ensureAuthProfileStore, findPersistedAuthProfileCredential, loadAuthProfileStoreForSecretsRuntime, refreshOAuthCredentialForRuntime, resolveApiKeyForProfile, resolveAuthProfileOrder, resolveDefaultAgentDir, resolvePersistedAuthProfileOwnerAgentDir, resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
-import fs, { access } from "node:fs/promises";
 import { isDeepStrictEqual } from "node:util";
 import { hasUsableOAuthCredential } from "openclaw/plugin-sdk/provider-auth";
 import { fileURLToPath } from "node:url";

package/dist/{side-question-DqKLfWMB.js → side-question-BdYL4kj1.js}

@@ -1,14 +1,14 @@
-import { d as resolveCodexAppServerRuntimeOptions, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, n as canUseCodexModelBackedApprovalsReviewerForModel, p as resolveCodexModelBackedReviewerPolicyContext, u as readCodexPluginConfig } from "./config-DJXpBkGf.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-B48C6S9O.js";
-import { t as isJsonObject } from "./protocol-oeJQu4rs.js";
-import { i as formatCodexUsageLimitErrorMessage } from "./provider-C5P6352f.js";
-import { i as isCodexAppServerApprovalRequest } from "./client-DovmVtbr.js";
-import { A as resolveCodexDynamicToolsLoading, D as filterCodexDynamicTools, d as resolveCodexAppServerRequestModelSelection, f as resolveCodexBindingModelProviderFallback, p as resolveReasoningEffort, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider, v as mergeCodexThreadConfigs } from "./thread-lifecycle-cban34w3.js";
-import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding } from "./session-binding-ElbcSq2o.js";
-import { a as resolveCodexAppServerForModelProvider, i as readCodexNotificationTurnId, r as readCodexNotificationThreadId } from "./notification-correlation-BGoG0N90.js";
-import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-jFMumCOe.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C-Yv9uwY.js";
-import { d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, t as CODEX_NATIVE_HOOK_RELAY_EVENTS, u as createCodexDynamicToolBridge } from "./native-hook-relay-C3i3FYtc.js";
+import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
+import { B as readCodexNotificationThreadId, M as mergeCodexThreadConfigs, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, V as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, d as resolveCodexAppServerRequestModelSelection, m as resolveReasoningEffort, p as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-CbJqqnEw.js";
+import { d as resolveCodexAppServerRuntimeOptions, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, n as canUseCodexModelBackedApprovalsReviewerForModel, p as resolveCodexModelBackedReviewerPolicyContext, u as readCodexPluginConfig } from "./config-BksX0T33.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-B19q5BIX.js";
+import { i as formatCodexUsageLimitErrorMessage } from "./provider-qJygHQx4.js";
+import { i as isCodexAppServerApprovalRequest } from "./client-m7XiCQpO.js";
+import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding } from "./session-binding-BRUi8y6E.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-KpyUye2D.js";
+import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-Bg5d7VV9.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-3tnjhjFb.js";
+import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-BOvTfMhF.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -52,13 +52,6 @@ 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.");
-	const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
-		config: params.cfg,
-		sessionKey: params.sessionKey,
-		sessionId: params.sessionId,
-		surface: "/btw side-question mode"
-	});
-	if (nativeExecutionBlock) throw new Error(nativeExecutionBlock);
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
 	const { sessionAgentId } = resolveSessionAgentIds({
 		sessionKey: params.sessionKey,
@@ -108,6 +101,20 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 		config: params.cfg,
 		agentDir: params.agentDir
 	});
+	const cwd = binding.cwd || params.workspaceDir || process.cwd();
+	const sideRunParams = buildSideRunAttemptParams(params, {
+		cwd,
+		authProfileId
+	});
+	const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
+		config: sideRunParams.config,
+		sessionKey: sideRunParams.sandboxSessionKey?.trim() || sideRunParams.sessionKey,
+		sessionId: sideRunParams.sessionId,
+		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 client = await getLeasedSharedCodexAppServerClient({
 		startOptions: appServer.start,
 		timeoutMs: appServer.requestTimeoutMs,
@@ -126,11 +133,6 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 	let removeRequestHandler;
 	let nativeHookRelay;
 	try {
-		const cwd = binding.cwd || params.workspaceDir || process.cwd();
-		const sideRunParams = buildSideRunAttemptParams(params, {
-			cwd,
-			authProfileId
-		});
 		const modelScopedAppServer = resolveCodexAppServerForModelProvider({
 			appServer,
 			provider: reviewerPolicyContext.modelProvider,
@@ -148,11 +150,21 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 		});
 		const approvalPolicy = useModelScopedPolicy ? modelScopedAppServer.approvalPolicy : binding.approvalPolicy ?? modelScopedAppServer.approvalPolicy;
 		const sandbox = useModelScopedPolicy ? modelScopedAppServer.sandbox : binding.sandbox ?? modelScopedAppServer.sandbox;
-		const toolBridge = await createCodexSideToolBridge({
+		const { toolBridge, webSearchPlan } = await createCodexSideToolBridge({
 			params,
 			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",
 			signal: runAbortController.signal
 		});
 		removeRequestHandler = client.addRequestHandler(async (request) => {
@@ -183,6 +195,7 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 				internalExecAutoReview: modelScopedAppServer.approvalsReviewer === "user",
 				autoApprove: shouldAutoApproveCodexAppServerApprovals({
 					approvalPolicy,
+					networkProxy: modelScopedAppServer.networkProxy,
 					sandbox
 				}),
 				signal: runAbortController.signal
@@ -255,8 +268,11 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec,
 			clearOmittedEvents: true
 		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0;
-		const runtimeThreadConfig = buildCodexRuntimeThreadConfig(void 0, { nativeCodeModeOnlyEnabled: appServer.codeModeOnly });
-		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig) ?? runtimeThreadConfig;
+		const runtimeThreadConfig = buildCodexRuntimeThreadConfig(webSearchPlan.threadConfig, {
+			nativeCodeModeEnabled: nativeToolSurfaceEnabled,
+			nativeCodeModeOnlyEnabled: appServer.codeModeOnly
+		});
+		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, modelScopedAppServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
 		childThreadId = assertCodexThreadForkResponse(await forkCodexSideThread(client, {
 			threadId: binding.threadId,
 			model: modelSelection.model,
@@ -265,7 +281,7 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			cwd,
 			approvalPolicy,
 			approvalsReviewer: modelScopedAppServer.approvalsReviewer,
-			sandbox,
+			...modelScopedAppServer.networkProxy ? {} : { sandbox },
 			...serviceTier ? { serviceTier } : {},
 			config: threadConfig,
 			developerInstructions: SIDE_DEVELOPER_INSTRUCTIONS,
@@ -375,10 +391,25 @@ function buildSideRunAttemptParams(params, options) {
 		sessionId: params.sessionId,
 		sessionFile: params.sessionFile,
 		sessionKey: params.sessionKey,
+		...params.sandboxSessionKey ? { sandboxSessionKey: params.sandboxSessionKey } : {},
 		agentId: params.agentId,
 		...params.messageChannel ? { messageChannel: params.messageChannel } : {},
 		...params.messageProvider ? { messageProvider: params.messageProvider } : {},
+		...params.agentAccountId ? { agentAccountId: params.agentAccountId } : {},
+		...params.messageTo ? { messageTo: params.messageTo } : {},
+		...params.messageThreadId !== void 0 ? { messageThreadId: params.messageThreadId } : {},
+		...params.groupId !== void 0 ? { groupId: params.groupId } : {},
+		...params.groupChannel !== void 0 ? { groupChannel: params.groupChannel } : {},
+		...params.groupSpace !== void 0 ? { groupSpace: params.groupSpace } : {},
+		...params.memberRoleIds ? { memberRoleIds: params.memberRoleIds } : {},
+		...params.spawnedBy !== void 0 ? { spawnedBy: params.spawnedBy } : {},
+		...params.senderId !== void 0 ? { senderId: params.senderId } : {},
+		...params.senderName !== void 0 ? { senderName: params.senderName } : {},
+		...params.senderUsername !== void 0 ? { senderUsername: params.senderUsername } : {},
+		...params.senderE164 !== void 0 ? { senderE164: params.senderE164 } : {},
+		...params.senderIsOwner !== void 0 ? { senderIsOwner: params.senderIsOwner } : {},
 		...params.currentChannelId ? { currentChannelId: params.currentChannelId } : {},
+		...params.toolsAllow ? { toolsAllow: params.toolsAllow } : {},
 		workspaceDir: options.cwd,
 		authProfileId: options.authProfileId,
 		authProfileIdSource: params.authProfileIdSource,
@@ -401,10 +432,11 @@ async function createCodexSideToolBridge(input) {
 		id: input.params.model,
 		provider: input.params.provider
 	};
+	const messageToolProvider = resolveCodexMessageToolProvider(input.params);
 	let tools = [];
 	if (supportsModelTools(runtimeModel)) {
 		const createOpenClawCodingTools = (await import("openclaw/plugin-sdk/agent-harness")).createOpenClawCodingTools;
-		const sandboxSessionKey = input.params.sessionKey?.trim() || input.params.sessionId || input.sessionAgentId;
+		const sandboxSessionKey = input.params.sandboxSessionKey?.trim() || input.params.sessionKey?.trim() || input.params.sessionId || input.sessionAgentId;
 		const sandbox = await resolveSandboxContext({
 			config: input.params.cfg,
 			sessionKey: sandboxSessionKey,
@@ -430,7 +462,24 @@ async function createCodexSideToolBridge(input) {
 			modelApi: runtimeModel.api,
 			modelContextWindowTokens: runtimeModel.contextWindow,
 			modelAuthMode: resolveModelAuthMode(runtimeModel.provider, input.params.cfg, void 0, { workspaceDir: input.cwd }),
-			...input.params.messageProvider || input.params.messageChannel ? { messageProvider: input.params.messageProvider ?? input.params.messageChannel } : {},
+			suppressManagedWebSearch: false,
+			...input.params.messageProvider || input.params.messageChannel ? {
+				messageProvider: messageToolProvider,
+				toolPolicyMessageProvider: input.params.messageProvider ?? input.params.messageChannel
+			} : {},
+			...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.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,
@@ -447,25 +496,40 @@ async function createCodexSideToolBridge(input) {
 			hasInboundImages: false
 		});
 	}
+	const requestedWebSearchPlan = resolveCodexWebSearchPlan({
+		config: input.params.cfg,
+		nativeToolSurfaceEnabled: input.nativeToolSurfaceEnabled,
+		nativeProviderWebSearchSupport: input.nativeProviderWebSearchSupport,
+		webSearchAllowed: tools.some((tool) => tool.name === "web_search")
+	});
+	const webSearchPlan = requestedWebSearchPlan.kind === "managed" ? resolveCodexWebSearchPlan({
+		config: input.params.cfg,
+		webSearchAllowed: false
+	}) : requestedWebSearchPlan;
+	const exposedTools = tools.filter((tool) => tool.name !== "web_search");
 	const hookChannelFields = buildAgentHookContextChannelFields({
 		sessionKey: input.params.sessionKey,
 		messageChannel: input.params.messageChannel,
 		messageProvider: input.params.messageProvider,
 		currentChannelId: input.params.currentChannelId
 	});
-	return createCodexDynamicToolBridge({
-		tools,
-		signal: input.signal,
-		loading: resolveCodexDynamicToolsLoading(input.pluginConfig),
-		hookContext: {
-			agentId: input.sessionAgentId,
-			config: input.params.cfg,
-			sessionId: input.params.sessionId,
-			sessionKey: input.params.sessionKey,
-			runId: input.params.opts?.runId ?? `codex-btw:${input.params.sessionId}`,
-			...hookChannelFields
-		}
-	});
+	return {
+		toolBridge: createCodexDynamicToolBridge({
+			tools: exposedTools,
+			signal: input.signal,
+			loading: resolveCodexDynamicToolsLoading(input.pluginConfig),
+			hookContext: {
+				agentId: input.sessionAgentId,
+				config: input.params.cfg,
+				sessionId: input.params.sessionId,
+				sessionKey: input.params.sessionKey,
+				runId: input.params.opts?.runId ?? `codex-btw:${input.params.sessionId}`,
+				currentChannelProvider: messageToolProvider,
+				...hookChannelFields
+			}
+		}),
+		webSearchPlan
+	};
 }
 async function handleSideDynamicToolCallWithTimeout(params) {
 	if (params.signal.aborted) return failedSideDynamicToolResponse("OpenClaw dynamic tool call aborted before execution.");