@openclaw/codex 2026.7.1 → 2026.7.2-beta.2

package/dist/{side-question-N4OaDer2.js → side-question-DqDvIwSU.js}

@@ -1,14 +1,12 @@
-import { r as isJsonObject } from "./protocol-2POPqAY4.js";
-import { _ as shouldAutoApproveCodexAppServerApprovals, d as resolveCodexAppServerRuntimeOptions, g as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexModelBackedReviewerPolicyContext, n as canUseCodexModelBackedApprovalsReviewerForModel, u as readCodexPluginConfig } from "./config-CYEDnLJ2.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-dZQ-UTOa.js";
-import { C as filterCodexDynamicTools, E as resolveCodexDynamicToolsLoading, H as mergeCodexThreadConfigs, d as resolveCodexAppServerModelProvider, f as resolveCodexAppServerRequestModelSelection, h as resolveReasoningEffort, m as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, v as resolveCodexWebSearchPlan, z as buildCodexPluginAppsConfigPatchFromPolicyContext } from "./thread-lifecycle-qWE88Dn2.js";
-import { a as readCodexSupportedReasoningEfforts, c as formatCodexUsageLimitErrorMessage } from "./provider-zjPfx5Fs.js";
-import { a as getLeasedSharedCodexAppServerClient, d as isCodexAppServerApprovalRequest, h as readRecentCodexRateLimits, o as releaseLeasedSharedCodexAppServerClient, p as ensureCodexAppServerClientRuntime } from "./shared-client-4ICy3U6d.js";
-import { i as isCodexAppServerNativeAuthProfile, s as sessionBindingIdentity } from "./session-binding-C1ZXdP-x.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-C968Kgin.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DA2TQfZW.js";
-import { n as readCodexNotificationThreadId, r as readCodexNotificationTurnId } from "./notification-correlation-Bo7KB3ks.js";
-import { D as emitDynamicToolStartedDiagnostic, E as emitDynamicToolErrorDiagnostic, I as resolveCodexMessageToolProvider, O as emitDynamicToolTerminalDiagnostic, R as shouldEnableCodexAppServerNativeToolSurface, T as createCodexDynamicToolBridge, U as handleCodexAppServerApprovalRequest, V as filterToolsForVisionInputs, Z as handleDynamicToolCallWithTimeout, _ as buildCodexNativeHookRelayDisabledConfig, g as buildCodexNativeHookRelayConfig, i as CodexNativeToolLifecycleProjector, m as CODEX_NATIVE_HOOK_RELAY_EVENTS, n as resolveCodexProviderWebSearchSupportForClient, st as resolveCodexToolAbortTerminalReason, tt as resolveDynamicToolCallTimeoutMs, w as handleCodexAppServerElicitationRequest, y as emitCodexNativePreToolUseFailureDiagnostic } from "./provider-capabilities-CDnHbmUZ.js";
+import { B as isCodexAppServerApprovalRequest, T as resolveCodexAppServerPreparedAuthHandoff, Z as isJsonObject, a as getLeasedSharedCodexAppServerClient, g as ensureCodexAppServerClientRuntime, p as withLeasedCodexAppServerClientStartSelectionRetry, s as releaseCodexAppServerClientLease, v as readRecentCodexRateLimits } from "./shared-client-JiAnW6pc.js";
+import { D as resolveOpenClawExecPolicyForCodexAppServer, O as shouldAutoApproveCodexAppServerApprovals, c as sessionBindingIdentity, p as canUseCodexModelBackedApprovalsReviewerForModel, w as resolveCodexModelBackedReviewerPolicyContext, y as readCodexPluginConfig } from "./session-binding-h1mmCGnl.js";
+import { f as assertCodexTurnStartResponse, g as readCodexTurn, l as assertCodexThreadForkResponse, p as readCodexDynamicToolCallParams } from "./transcript-mirror-D9rTxx2P.js";
+import { E as resolveCodexDynamicToolsLoading, J as mergeCodexThreadConfigs, W as buildCodexPluginAppsConfigPatchFromPolicyContext, _ as resolveCodexBindingModelProviderFallback, d as resolveCodexWebSearchPlan, h as resolveCodexAppServerRequestModelSelection, l as buildCodexRuntimeThreadConfig, m as resolveCodexAppServerModelProvider, p as CODEX_NATIVE_PERSONALITY_NONE, v as resolveReasoningEffort, x as filterCodexDynamicTools, y as readCodexSupportedReasoningEfforts } from "./thread-lifecycle-CN_pPtPh.js";
+import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-DyXaYAxU.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-Scc-Wevo.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-D1Wky__S.js";
+import { a as resolveCodexBindingAppServerConnection, i as requireCodexSupervisionModelSelection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId } from "./notification-correlation-KmfV4EkP.js";
+import { A as CODEX_NATIVE_HOOK_RELAY_EVENTS, F as emitCodexNativePreToolUseFailureDiagnostic, M as buildCodexNativeHookRelayConfig, N as buildCodexNativeHookRelayDisabledConfig, S as filterToolsForVisionInputs, U as resolveDynamicToolCallTimeoutMs, Y as resolveCodexToolAbortTerminalReason, _ as resolveCodexMessageToolProvider, a as emitDynamicToolStartedDiagnostic, c as resolveCodexProviderWebSearchSupportForClient, i as emitDynamicToolErrorDiagnostic, k as CodexNativeToolLifecycleProjector, n as handleCodexAppServerApprovalRequest, o as emitDynamicToolTerminalDiagnostic, r as handleCodexAppServerElicitationRequest, t as createCodexDynamicToolBridge, y as shouldEnableCodexAppServerNativeToolSurface, z as handleDynamicToolCallWithTimeout } from "./dynamic-tools-C_1tEs34.js";
 import { randomUUID } from "node:crypto";
 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";
@@ -67,10 +65,27 @@ async function runCodexAppServerSideQuestion(params, options) {
 		config: params.cfg,
 		agentId: sessionAgentId
 	});
-	const authProfileId = params.authProfileId ?? binding.authProfileId;
-	const modelProvider = resolveCodexAppServerModelProvider({
+	const usesSupervisionConnection = binding.connectionScope === "supervision";
+	const supervisionModelSelection = usesSupervisionConnection ? requireCodexSupervisionModelSelection(binding) : void 0;
+	const preparedRuntimeAuth = params.preparedRuntimeAuth;
+	const { authProfileId, nativeAuthProfile: preparedNativeAuthProfile, preparedAuth: startupPreparedAuth } = usesSupervisionConnection ? {
+		authProfileId: void 0,
+		nativeAuthProfile: true,
+		preparedAuth: void 0
+	} : await resolveCodexAppServerPreparedAuthHandoff({
+		authRequirement: preparedRuntimeAuth.plan.modelRoute?.authRequirement,
+		resolvedApiKey: preparedRuntimeAuth.resolvedApiKey,
+		authProfileId: preparedRuntimeAuth.plan.forwardedAuthProfileId,
+		authProfileStore: preparedRuntimeAuth.authProfileStore,
+		agentDir: params.agentDir,
+		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.`
+	});
+	const modelProvider = supervisionModelSelection ? supervisionModelSelection.modelProvider : resolveCodexAppServerModelProvider({
 		provider: params.provider,
 		authProfileId,
+		authProfileStore: preparedRuntimeAuth.authProfileStore,
 		agentDir: params.agentDir,
 		config: params.cfg
 	}) ?? resolveCodexBindingModelProviderFallback({
@@ -80,24 +95,23 @@ async function runCodexAppServerSideQuestion(params, options) {
 		bindingModelProvider: binding.modelProvider
 	});
 	const modelSelection = resolveCodexAppServerRequestModelSelection({
-		model: params.model,
+		model: supervisionModelSelection?.model ?? params.model,
 		modelProvider,
 		authProfileId,
+		authProfileStore: preparedRuntimeAuth.authProfileStore,
 		agentDir: params.agentDir,
 		config: params.cfg
 	});
 	const reviewerPolicyContext = resolveCodexModelBackedReviewerPolicyContext({
-		provider: params.provider,
-		model: params.model,
+		provider: usesSupervisionConnection ? "codex" : params.provider,
+		model: supervisionModelSelection?.model ?? params.model,
 		bindingModelProvider: binding.modelProvider,
 		bindingModel: binding.model,
-		nativeAuthProfile: isCodexAppServerNativeAuthProfile({
-			authProfileId,
-			agentDir: params.agentDir,
-			config: params.cfg
-		})
+		nativeAuthProfile: usesSupervisionConnection || preparedNativeAuthProfile
 	});
-	const appServer = resolveCodexAppServerRuntimeOptions({
+	const connection = resolveCodexBindingAppServerConnection({
+		binding,
+		authProfileId,
 		pluginConfig,
 		execPolicy,
 		modelProvider: reviewerPolicyContext.modelProvider,
@@ -105,9 +119,29 @@ async function runCodexAppServerSideQuestion(params, options) {
 		config: params.cfg,
 		agentDir: params.agentDir
 	});
+	const appServer = connection.appServer;
 	const cwd = binding.cwd || params.workspaceDir || process.cwd();
 	const runId = params.opts?.runId ?? randomUUID();
-	const sideRunParams = buildSideRunAttemptParams(params, {
+	const effectiveParams = supervisionModelSelection ? {
+		...params,
+		provider: supervisionModelSelection.modelProvider,
+		model: supervisionModelSelection.model,
+		runtimeModel: {
+			id: supervisionModelSelection.model,
+			name: supervisionModelSelection.model,
+			provider: supervisionModelSelection.modelProvider,
+			api: "openai-chatgpt-responses",
+			reasoning: true,
+			input: ["text", "image"],
+			cost: {
+				input: 0,
+				output: 0,
+				cacheRead: 0,
+				cacheWrite: 0
+			}
+		}
+	} : params;
+	const sideRunParams = buildSideRunAttemptParams(effectiveParams, {
 		cwd,
 		authProfileId,
 		runId
@@ -121,13 +155,17 @@ async function runCodexAppServerSideQuestion(params, options) {
 	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({
+	const clientOptions = {
 		startOptions: appServer.start,
 		timeoutMs: appServer.requestTimeoutMs,
-		authProfileId,
+		authRequirement: preparedRuntimeAuth.plan.modelRoute?.authRequirement,
+		...startupPreparedAuth ? { preparedAuth: startupPreparedAuth } : { authProfileId: connection.clientAuthProfileId },
 		agentDir: params.agentDir,
-		config: params.cfg
-	});
+		config: params.cfg,
+		...params.opts?.abortSignal ? { abandonSignal: params.opts.abortSignal } : {}
+	};
+	let client = await getLeasedSharedCodexAppServerClient(clientOptions);
+	const clientLease = { client };
 	const collector = new CodexSideQuestionCollector(params, () => readRecentCodexRateLimits(client));
 	const runAbortController = new AbortController();
 	let nativeToolLifecycleProjector;
@@ -157,7 +195,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		}
 		flushPendingNativePreToolUseFailures();
 	};
-	const removeNotificationHandler = client.addNotificationHandler((notification) => {
+	const handleNotification = (notification) => {
 		collector.handleNotification(notification);
 		if (notification.method !== "item/started" && notification.method !== "item/completed" && notification.method !== "rawResponseItem/completed" && notification.method !== "turn/completed") return;
 		if (!nativeToolLifecycleProjector) {
@@ -165,7 +203,8 @@ async function runCodexAppServerSideQuestion(params, options) {
 			return;
 		}
 		nativeToolLifecycleProjector.handleNotification(notification);
-	});
+	};
+	let removeNotificationHandler = client.addNotificationHandler(handleNotification);
 	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 });
@@ -192,7 +231,7 @@ 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, webSearchPlan } = await createCodexSideToolBridge({
-			params,
+			params: effectiveParams,
 			cwd,
 			pluginConfig,
 			sessionAgentId,
@@ -211,10 +250,14 @@ async function runCodexAppServerSideQuestion(params, options) {
 		});
 		ensureCodexAppServerClientRuntime(client, {
 			agentDir: params.agentDir,
-			authProfileId,
+			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
 		});
-		removeRequestHandler = client.addRequestHandler(async (request) => {
+		const registerRequestHandler = (targetClient) => targetClient.addRequestHandler(async (request) => {
 			if (!childThreadId || !turnId) return;
 			if (request.method === "mcpServer/elicitation/request") return handleCodexAppServerElicitationRequest({
 				requestParams: request.params,
@@ -232,9 +275,6 @@ async function runCodexAppServerSideQuestion(params, options) {
 				threadId: childThreadId,
 				turnId,
 				nativeHookRelay,
-				execPolicy,
-				execReviewerAgentId: sessionAgentId,
-				internalExecAutoReview: modelScopedAppServer.approvalsReviewer === "user",
 				autoApprove: shouldAutoApproveCodexAppServerApprovals({
 					approvalPolicy,
 					networkProxy: modelScopedAppServer.networkProxy,
@@ -264,7 +304,8 @@ async function runCodexAppServerSideQuestion(params, options) {
 					call,
 					toolBridge,
 					signal: runAbortController.signal,
-					timeoutMs
+					timeoutMs,
+					observeToolTerminal: sideRunParams.observeToolTerminal
 				});
 				emitDynamicToolTerminalDiagnostic({
 					...diagnosticContext,
@@ -284,6 +325,19 @@ async function runCodexAppServerSideQuestion(params, options) {
 				throw error;
 			}
 		});
+		removeRequestHandler = registerRequestHandler(client);
+		const rebindClientHandlers = (nextClient) => {
+			removeRequestHandler?.();
+			removeNotificationHandler();
+			client = nextClient;
+			ensureCodexAppServerClientRuntime(client, {
+				agentDir: params.agentDir,
+				authProfileId: connection.requestAuthProfileId,
+				config: params.cfg
+			});
+			removeNotificationHandler = client.addNotificationHandler(handleNotification);
+			removeRequestHandler = registerRequestHandler(client);
+		};
 		const serviceTier = binding.serviceTier ?? appServer.serviceTier;
 		const nativeHookRelayEvents = resolveCodexSideNativeHookRelayEvents({
 			configuredEvents: options.nativeHookRelay?.events,
@@ -305,6 +359,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			}).channelId,
 			requestTimeoutMs: appServer.requestTimeoutMs,
 			completionTimeoutMs: Math.max(appServer.turnCompletionIdleTimeoutMs, SIDE_QUESTION_COMPLETION_TIMEOUT_MS),
+			loopDetectionPreToolUseRelay: appServer.loopDetectionPreToolUseRelay,
 			signal: runAbortController.signal,
 			onPreToolUseFailure: (failure) => {
 				if (nativePreToolUseFailureFallbackActive) emitNativePreToolUseFailure(failure);
@@ -316,31 +371,36 @@ async function runCodexAppServerSideQuestion(params, options) {
 			relay: nativeHookRelay,
 			events: nativeHookRelayEvents,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec,
-			clearOmittedEvents: true
+			clearOmittedEvents: true,
+			loopDetectionPreToolUseRelay: appServer.loopDetectionPreToolUseRelay
 		}) : options.nativeHookRelay?.enabled === false ? buildCodexNativeHookRelayDisabledConfig() : void 0;
 		const runtimeThreadConfig = buildCodexRuntimeThreadConfig(webSearchPlan.threadConfig, {
 			nativeCodeModeEnabled: nativeToolSurfaceEnabled,
 			nativeCodeModeOnlyEnabled: appServer.codeModeOnly
 		});
 		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, binding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(binding.pluginAppPolicyContext) : void 0, modelScopedAppServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
-		childThreadId = assertCodexThreadForkResponse(await forkCodexSideThread(client, {
-			threadId: binding.threadId,
-			model: modelSelection.model,
-			...modelSelection.modelProvider ? { modelProvider: modelSelection.modelProvider } : {},
-			personality: CODEX_NATIVE_PERSONALITY_NONE,
-			cwd,
-			approvalPolicy,
-			approvalsReviewer: modelScopedAppServer.approvalsReviewer,
-			...modelScopedAppServer.networkProxy ? {} : { sandbox },
-			...serviceTier ? { serviceTier } : {},
-			config: threadConfig,
-			developerInstructions: SIDE_DEVELOPER_INSTRUCTIONS,
-			ephemeral: true,
-			threadSource: "user"
-		}, {
-			timeoutMs: appServer.requestTimeoutMs,
-			signal: params.opts?.abortSignal
-		})).thread.id;
+		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),
+			onClientChange: rebindClientHandlers
+		}));
+		childThreadId = forkResponse.thread.id;
+		if (supervisionModelSelection && (forkResponse.model !== supervisionModelSelection.model || forkResponse.modelProvider !== supervisionModelSelection.modelProvider)) throw new Error("Codex supervised side thread did not preserve its native model and provider");
 		await client.request("thread/inject_items", {
 			threadId: childThreadId,
 			items: [sideBoundaryPromptItem()]
@@ -348,7 +408,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			timeoutMs: appServer.requestTimeoutMs,
 			signal: params.opts?.abortSignal
 		});
-		const effort = resolveReasoningEffort(params.resolvedThinkLevel ?? "off", modelSelection.model, readCodexSupportedReasoningEfforts(params.runtimeModel?.compat));
+		const effort = usesSupervisionConnection ? void 0 : resolveReasoningEffort(params.resolvedThinkLevel ?? "off", modelSelection.model, readCodexSupportedReasoningEfforts(params.runtimeModel?.compat));
 		turnId = assertCodexTurnStartResponse(await client.request("turn/start", {
 			threadId: childThreadId,
 			input: [{
@@ -358,15 +418,17 @@ async function runCodexAppServerSideQuestion(params, options) {
 			}],
 			cwd,
 			model: modelSelection.model,
-			personality: CODEX_NATIVE_PERSONALITY_NONE,
+			...usesSupervisionConnection ? {} : { personality: CODEX_NATIVE_PERSONALITY_NONE },
 			...serviceTier ? { serviceTier } : {},
-			effort,
-			collaborationMode: {
-				mode: "default",
-				settings: {
-					model: modelSelection.model,
-					reasoning_effort: effort,
-					developer_instructions: null
+			...usesSupervisionConnection ? {} : {
+				effort,
+				collaborationMode: {
+					mode: "default",
+					settings: {
+						model: modelSelection.model,
+						reasoning_effort: effort,
+						developer_instructions: null
+					}
 				}
 			}
 		}, {
@@ -419,7 +481,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			}
 		} finally {
 			flushPendingNativePreToolUseFailures();
-			releaseLeasedSharedCodexAppServerClient(client);
+			releaseCodexAppServerClientLease(clientLease);
 			nativeHookRelay?.unregister();
 		}
 	}
@@ -439,6 +501,7 @@ function registerCodexSideNativeHookRelay(params) {
 		runId: params.runId,
 		...params.channelId ? { channelId: params.channelId } : {},
 		allowedEvents: params.events,
+		preToolUseLoopDetection: params.loopDetectionPreToolUseRelay,
 		ttlMs: resolveCodexSideNativeHookRelayTtlMs({
 			explicitTtlMs: params.options.ttlMs,
 			requestTimeoutMs: params.requestTimeoutMs,
@@ -472,9 +535,12 @@ function buildSideRunAttemptParams(params, options) {
 		agentId: params.agentId,
 		...params.messageChannel ? { messageChannel: params.messageChannel } : {},
 		...params.messageProvider ? { messageProvider: params.messageProvider } : {},
+		...params.chatType ? { chatType: params.chatType } : {},
 		...params.agentAccountId ? { agentAccountId: params.agentAccountId } : {},
 		...params.messageTo ? { messageTo: params.messageTo } : {},
 		...params.messageThreadId !== void 0 ? { messageThreadId: params.messageThreadId } : {},
+		...params.chatId ? { chatId: params.chatId } : {},
+		...params.messageActionTurnCapability ? { messageActionTurnCapability: params.messageActionTurnCapability } : {},
 		...params.groupId !== void 0 ? { groupId: params.groupId } : {},
 		...params.groupChannel !== void 0 ? { groupChannel: params.groupChannel } : {},
 		...params.groupSpace !== void 0 ? { groupSpace: params.groupSpace } : {},
@@ -489,12 +555,13 @@ function buildSideRunAttemptParams(params, options) {
 		...params.toolsAllow ? { toolsAllow: params.toolsAllow } : {},
 		workspaceDir: options.cwd,
 		authProfileId: options.authProfileId,
-		authProfileIdSource: params.authProfileIdSource,
+		authProfileIdSource: options.authProfileId ? params.preparedRuntimeAuth.plan.forwardedAuthProfileSource : void 0,
 		thinkLevel: params.resolvedThinkLevel ?? "off",
 		resolvedReasoningLevel: params.resolvedReasoningLevel,
-		authStorage: void 0,
-		authProfileStore: void 0,
-		modelRegistry: void 0,
+		authStorage: params.preparedRuntimeAuth.authStorage,
+		authProfileStore: params.preparedRuntimeAuth.authProfileStore,
+		modelRegistry: params.preparedRuntimeAuth.modelRegistry,
+		...params.preparedRuntimeAuth.resolvedApiKey ? { resolvedApiKey: params.preparedRuntimeAuth.resolvedApiKey } : {},
 		runId: options.runId,
 		abortSignal: params.opts?.abortSignal,
 		onAgentEvent: (event) => {
@@ -544,9 +611,12 @@ async function createCodexSideToolBridge(input) {
 				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 } : {},
@@ -583,7 +653,7 @@ async function createCodexSideToolBridge(input) {
 		config: input.params.cfg,
 		webSearchAllowed: false
 	}) : requestedWebSearchPlan;
-	const exposedTools = tools.filter((tool) => tool.name !== "web_search");
+	const exposedTools = tools.filter((tool) => tool.name !== "web_search" && tool.name !== "computer");
 	const hookChannelFields = buildAgentHookContextChannelFields({
 		sessionKey: input.params.sessionKey,
 		messageChannel: input.params.messageChannel,