@openclaw/codex 2026.9.5 → 2026.9.6

package/dist/.setup/{side-question-DSCZyoBD.mjs → side-question-BJ1wSDcB.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 { m as sessionBindingIdentity } from "./session-binding-record-BGoz8wOK.mjs";
+import { l as shouldAutoApproveCodexAppServerApprovals, n as hasCodexMcpToolApprovalOverrides, u as withMcpElicitationsApprovalPolicy, y as readCodexRequirementsToml } from "./config-security-BEReZ6go.mjs";
 import { c as isCodexPairedNodeRemoteExecPlacementSandbox, d as readCodexPluginConfig, l as isCodexRemoteExecPlacementSandbox, u as isCodexSandboxExecServerEnabled } from "./config-parsing-CcB9iPoq.mjs";
-import { 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 { i as resolveCodexAppServerHomeScope, l as resolveCodexModelBackedReviewerPolicyContext } from "./config-options-BvaRs51b.mjs";
+import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-CMU3DUD0.mjs";
+import { i as resolveCodexBindingAppServerConnection, r as requireCodexSupervisionModelSelection } from "./binding-connection-ThoatDcb.mjs";
+import { n as resolveOpenClawExecPolicyForCodexAppServer, t as canUseCodexModelBackedApprovalsReviewerForModel } from "./config-BoTP_mrL.mjs";
+import { Z as resolveCodexAppServerPreparedAuthHandoff, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease, q as readRecentCodexRateLimits, x as withLeasedCodexAppServerClientStartSelectionRetry } from "./shared-client-DA4VR4Eb.mjs";
+import { C as readCodexDynamicToolCallParams, D as handleDynamicToolCallWithTimeout, E as createCodexElicitationResponse, L as resolveCodexToolAbortTerminalReason, S as assertCodexTurnStartResponse, i as isCodexAppServerApprovalRequest, j as resolveDynamicToolCallTimeoutMs, s as isCodexAppServerIndeterminateRequestCancellationError, y as assertCodexThreadForkResponse } from "./client-Cs08OXVQ.mjs";
+import { f as terminateCodexBackgroundTerminals, p as unsubscribeCodexThreadBestEffort, s as interruptCodexTurnAndWaitBestEffort, u as retireUnsafeCodexTurnClientBestEffort } from "./attempt-client-cleanup-CEv1cKwF.mjs";
+import { t as CodexEphemeralTurn } from "./ephemeral-turn-poidXgek.mjs";
+import { A as emitCodexNativePreToolUseFailureDiagnostic, D as buildCodexNativeHookRelayDisabledConfig, E as buildCodexNativeHookRelayConfig, S as CODEX_NATIVE_HOOK_RELAY_EVENTS, St as refreshCodexPluginAppApprovalPolicy, _ as resolveCodexAppServerRequestModelSelection, dt as resolveCodexDynamicToolsLoading, g as resolveCodexAppServerModelProvider, h as CODEX_NATIVE_PERSONALITY_NONE, p as resolveCodexWebSearchPlan, r as buildCodexRuntimeThreadConfig, xt as mergeCodexThreadConfigs, y as resolveCodexBindingModelProviderFallback } from "./thread-requests-BLvGkP2R.mjs";
+import { M as resolveCodexAppServerReasoningEffort, j as readCodexSupportedReasoningEfforts, o as buildCodexUserInput, r as buildCodexTemporalAdditionalContext } from "./thread-lifecycle-B3mfz1TG.mjs";
+import { o as resolveCodexSessionBinding } from "./session-binding-Cm0apEbd.mjs";
+import { a as refreshCodexThreadPolicy, i as assertCodexSupervisionThreadLineage, n as CodexThreadPolicyHandoffError } from "./thread-policy-DGuQsuFC.mjs";
+import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-C2sRMOEY.mjs";
+import { C as shouldEnableCodexAppServerNativeToolSurface, S as resolveCodexSandboxEnvironmentSelection, a as emitDynamicToolStartedDiagnostic, b as resolveCodexExternalSandboxPolicyForOpenClawSandbox, c as ensureCodexSandboxExecServerEnvironment, i as emitDynamicToolErrorDiagnostic, l as releaseCodexSandboxExecServerEnvironment, m as buildDynamicTools, o as emitDynamicToolTerminalDiagnostic, p as CodexNativeToolLifecycleProjector, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, w as shouldRequireCodexSandboxExecServerEnvironment, x as resolveCodexMessageToolProvider } from "./dynamic-tools-BDXl-8Cw.mjs";
+import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-BfE88FZ5.mjs";
+import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, r as resolveCodexEffectiveSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-BI1QK_98.mjs";
 import { 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.
 
@@ -279,6 +320,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;
@@ -320,33 +362,25 @@ async function runCodexAppServerSideQuestion(params, options) {
 		});
 		const approvalPolicy = 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]);
@@ -426,14 +460,6 @@ 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({
 			configuredEvents: options.nativeHookRelay?.events,
@@ -580,7 +606,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",
@@ -652,36 +680,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),
+				activateNativePreToolUseFailureFallback,
+				flushPendingNativePreToolUseFailures,
+				releaseSandboxEnvironment,
+				() => releaseCodexAppServerClientLease(clientLease),
+				() => nativeHookRelay?.unregister(),
+				() => runAgentCleanupStep({
 					runId: sideRunParams.runId,
 					sessionId: sideRunParams.sessionId,
 					step: "codex-side-native-hook-relay-release",
@@ -689,9 +714,9 @@ async function runCodexAppServerSideQuestion(params, options) {
 					cleanup: async () => {
 						await nativeHookRelay?.drain();
 					}
-				});
-			}
-		}
+				})
+			]
+		});
 	}
 }
 function resolveCodexSideNativeHookRelayEvents(params) {
@@ -784,136 +809,64 @@ 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
@@ -934,26 +887,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 +897,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 };

package/dist/.setup/{source-Bjp4UQij.mjs → source-CUzJq5WN.mjs}

@@ -1,13 +1,13 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.mjs";
-import { c as CODEX_PLUGINS_MARKETPLACE_NAME, i as pluginReadParams, n as isOpenAiCuratedMarketplace } from "./plugin-inventory-DUle8DLz.mjs";
-import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BOxKP7db.mjs";
-import { o as withCodexAppServerJsonClient } from "./request-BioXJLYa.mjs";
-import "./config-CedDWjM-.mjs";
+import { c as CODEX_PLUGINS_MARKETPLACE_NAME, i as pluginReadParams, n as isOpenAiCuratedMarketplace } from "./plugin-inventory-BoRei8Z4.mjs";
+import { a as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-B2CsSdnV.mjs";
+import { o as withCodexAppServerJsonClient } from "./request-D2L0zMrq.mjs";
+import "./config-BoTP_mrL.mjs";
 import path from "node:path";
 import os from "node:os";
 import fs from "node:fs/promises";
-import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { isPathInside } from "openclaw/plugin-sdk/file-access-runtime";
+import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { readJsonFileWithFallback } from "openclaw/plugin-sdk/json-store";
 //#region extensions/codex/src/migration/helpers.ts
@@ -410,13 +410,13 @@ function sourcePluginAppFactWithInventory(app, info, installedApp) {
 	};
 	if (!installedApp.enabled) return {
 		...app,
-		isAccessible: info.isAccessible,
+		isAccessible: true,
 		isEnabled: false
 	};
 	return {
 		...app,
-		isAccessible: info.isAccessible && installedApp.callable,
-		isEnabled: info.isEnabled,
+		isAccessible: installedApp.callable,
+		isEnabled: installedApp.enabled,
 		...!installedApp.callable ? { isCallable: false } : {}
 	};
 }
@@ -516,4 +516,4 @@ function sanitizePluginName(value) {
 	return value.trim().toLowerCase().replaceAll(/\s+/gu, "-");
 }
 //#endregion
-export { source_exports as a, resolveHomePath as c, hasCodexSource as i, sanitizeName as l, defaultCodexHome as n, exists as o, discoverCodexSource as r, readJsonObject as s, codexPluginMigrationSubscriptionWarning as t };
+export { source_exports as a, sanitizeName as c, hasCodexSource as i, defaultCodexHome as n, exists as o, discoverCodexSource as r, readJsonObject as s, codexPluginMigrationSubscriptionWarning as t };

package/dist/.setup/spawn-error-CL3n6MAa.mjs

@@ -0,0 +1,57 @@
+import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-registration";
+import { resolveGlobalSingleton } from "openclaw/plugin-sdk/global-singleton";
+//#region extensions/codex/src/app-server/spawn-error.ts
+const failures = resolveGlobalSingleton(Symbol.for("openclaw.codexSpawnFailures"), () => ({
+	commands: /* @__PURE__ */ new Map(),
+	errors: /* @__PURE__ */ new WeakMap(),
+	reported: /* @__PURE__ */ new Set()
+}));
+/** Also accepts the command runner's sanitized launch code (without syscall/errno). */
+function codexSpawnFailureReason(error) {
+	if (!(error instanceof Error)) return;
+	const failure = error;
+	if (failure.syscall === void 0 || failure.syscall.startsWith("spawn")) {
+		if (failure.code === "EBADARCH" || failure.errno === -86 || failure.code === "Unknown system error -86") return "is not runnable on this CPU";
+		if (failure.code === "ENOENT") return "or its working directory was not found";
+		if (failure.code === "EACCES") return "is not executable or its working directory is inaccessible";
+	}
+}
+var CodexAppServerSpawnError = class extends Error {
+	constructor(command, reason, cause) {
+		super(`Codex catalog updater cannot run: ${command} ${reason}. Repair the executable or working directory and restart the Gateway.`, { cause });
+		this.command = command;
+		this.name = "CodexAppServerSpawnError";
+		failures.errors.set(this, this);
+	}
+};
+function findCodexAppServerSpawnError(error) {
+	let current = error;
+	const seen = /* @__PURE__ */ new Set();
+	while (current instanceof Error && !seen.has(current)) {
+		const failure = failures.errors.get(current);
+		if (failure) return failure;
+		seen.add(current);
+		current = current.cause;
+	}
+}
+function describeCodexSpawnError(error, command) {
+	const reason = codexSpawnFailureReason(error);
+	return reason ? new CodexAppServerSpawnError(command, reason, error) : error;
+}
+function getCodexAppServerSpawnFailure(command) {
+	return failures.commands.get(command);
+}
+function recordCodexAppServerSpawnFailure(error, command, launchKey) {
+	const described = describeCodexSpawnError(error, command);
+	const failure = findCodexAppServerSpawnError(described);
+	if (failure) failures.commands.set(launchKey, failure);
+	return described;
+}
+function reportCodexCatalogSpawnFailure(failure) {
+	if (!failures.reported.has(failure.command)) {
+		failures.reported.add(failure.command);
+		embeddedAgentLog.warn(failure.message);
+	}
+}
+//#endregion
+export { reportCodexCatalogSpawnFailure as a, recordCodexAppServerSpawnFailure as i, findCodexAppServerSpawnError as n, getCodexAppServerSpawnFailure as r, describeCodexSpawnError as t };

package/dist/.setup/{thread-archive-guard-jmecf6OJ.mjs → thread-archive-guard-C9frICzX.mjs}

@@ -1,4 +1,4 @@
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
 import { normalizeBoundedOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/thread-archive-guard.ts
 const DESCENDANT_PAGE_LIMIT = 100;
@@ -19,11 +19,12 @@ async function assertCodexArchiveDescendantsUnowned(params) {
 	if (!ancestorThreadId) throw new Error("cannot verify Codex archive descendants for an invalid thread id");
 	const seenCursors = /* @__PURE__ */ new Set();
 	const seenThreadIds = /* @__PURE__ */ new Set([ancestorThreadId]);
+	let archived = false;
 	let cursor;
 	for (let pageIndex = 0; pageIndex < MAX_DESCENDANT_PAGES; pageIndex += 1) {
 		const response = await params.listPage({
 			ancestorThreadId,
-			archived: false,
+			archived,
 			limit: DESCENDANT_PAGE_LIMIT,
 			sortKey: "created_at",
 			sortDirection: "desc",
@@ -42,7 +43,13 @@ async function assertCodexArchiveDescendantsUnowned(params) {
 			if (await params.bindingStore.hasOtherThreadOwner(descendantThreadId)) throw new Error("cannot archive a Codex thread while a spawned descendant is owned by an OpenClaw session");
 		}
 		const nextCursor = readNextCursor(response.nextCursor);
-		if (!nextCursor) return;
+		if (!nextCursor) {
+			if (archived) return;
+			archived = true;
+			cursor = void 0;
+			seenCursors.clear();
+			continue;
+		}
 		if (seenCursors.has(nextCursor)) throw new Error("Codex app-server returned a repeated descendant-list cursor");
 		seenCursors.add(nextCursor);
 		cursor = nextCursor;

package/dist/.setup/{thread-history-page-BTx-4xsg.mjs → thread-history-page-DoVpnHim.mjs}

@@ -1,4 +1,4 @@
-import { A as parseTranscriptPage, M as readControlCursor, g as CatalogParamsError } from "./session-catalog-native-projection-ChV3cCtm.mjs";
+import { M as parseTranscriptPage, P as readControlCursor, v as CatalogParamsError } from "./session-catalog-native-projection-DowriLid.mjs";
 //#region extensions/codex/src/app-server/thread-history-page.ts
 const TURN_ITEM_CURSOR_PREFIX = "turn-item:";
 function encodeTurnItemCursor(turnCursor, itemId) {