@openclaw/codex 2026.9.4 → 2026.9.6

package/dist/{side-question-BGMJQf4U.js → .setup/side-question-BJ1wSDcB.mjs}

@@ -1,40 +1,72 @@
-import { l as sessionBindingIdentity } from "./session-binding-record-Bcvslnhf.js";
-import { b as readCodexRequirementsToml, c as hasCodexMcpToolApprovalOverrides, d as withMcpElicitationsApprovalPolicy, i as resolveCodexAppServerHomeScope, m as resolveCodexModelBackedReviewerPolicyContext, u as shouldAutoApproveCodexAppServerApprovals } from "./config-options-CXMq1T-C.js";
-import { b as isCodexSandboxExecServerEnabled, o as isJsonObject, v as isCodexPairedNodeRemoteExecPlacementSandbox, x as readCodexPluginConfig, y as isCodexRemoteExecPlacementSandbox } from "./protocol-5bh1G-H7.js";
-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-B57KWPQx.js";
-import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-CBMmWBr9.js";
-import { n as resolveOpenClawExecPolicyForCodexAppServer, t as canUseCodexModelBackedApprovalsReviewerForModel } from "./config-oIORaQ5T.js";
-import { i as resolveCodexBindingAppServerConnection, r as requireCodexSupervisionModelSelection } from "./binding-connection-D3udKbIE.js";
-import { Z as readRecentCodexRateLimits, c as getLeasedSharedCodexAppServerClient, m as releaseCodexAppServerClientLease, tt as resolveCodexAppServerPreparedAuthHandoff, x as withLeasedCodexAppServerClientStartSelectionRetry, z as ensureCodexAppServerClientRuntime } from "./shared-client-CscigXXL.js";
-import { d as unsubscribeCodexThreadBestEffort, l as retireUnsafeCodexTurnClientBestEffort, o as interruptCodexTurnAndWaitBestEffort } from "./attempt-client-cleanup-DKHzbwt5.js";
-import { t as CodexEphemeralTurn } from "./ephemeral-turn-D78_VmzO.js";
-import { C as resolveCodexWebSearchPlan, D as resolveCodexAppServerRequestModelSelection, Dt as refreshCodexPluginAppApprovalPolicy, E as resolveCodexAppServerModelProvider, Et as mergeCodexThreadConfigs, L as buildCodexNativeHookRelayConfig, P as CODEX_NATIVE_HOOK_RELAY_EVENTS, R as buildCodexNativeHookRelayDisabledConfig, T as CODEX_NATIVE_PERSONALITY_NONE, V as emitCodexNativePreToolUseFailureDiagnostic, k as resolveCodexBindingModelProviderFallback, lt as resolveCodexDynamicToolsLoading, n as buildCodexTemporalAdditionalContext, o as readCodexSupportedReasoningEfforts, rt as filterCodexDynamicTools, s as resolveCodexAppServerReasoningEffort, y as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-DXl1-I6b.js";
-import { o as resolveCodexSessionBinding } from "./session-binding-CI8UuilT.js";
-import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, r as assertCodexSupervisionThreadLineage } from "./thread-policy-BuEQfE0g.js";
-import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-BxgyoM8M.js";
-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-CmN5RAip.js";
-import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-BvCUL69A.js";
-import { a as resolveCodexAppServerForModelProvider, i as resolveCodexSessionPermissionCwd, n as applyCodexSessionPermissionPolicy, r as resolveCodexEffectiveSessionPermissionPolicy, t as CODEX_SESSION_PERMISSION_EXEC_MODES } from "./session-permission-policy-BBmXA8Eg.js";
+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 { 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, registerNativeHookRelay, resolveAgentDir as resolveAgentDir$2, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, 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 { isDeepStrictEqual } from "node:util";
 import { loadCodexBundleMcpApprovalConfig, resolveCodexMcpToolOverridesForAgent } from "openclaw/plugin-sdk/codex-mcp-projection";
-//#region extensions/codex/src/app-server/side-question.ts
-const SIDE_QUESTION_COMPLETION_TIMEOUT_MS = 6e5;
-var CodexSideQuestionTimeoutError = class extends Error {
-	constructor(..._args) {
-		super(..._args);
-		this.name = "TimeoutError";
+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);
 	}
-};
-const CODEX_SIDE_NATIVE_HOOK_RELAY_MIN_TTL_MS = 18e5;
-const CODEX_SIDE_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 3e5;
-const CODEX_SIDE_NATIVE_HOOK_RELAY_STARTUP_REQUEST_COUNT = 3;
-const CODEX_SIDE_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS = CODEX_NATIVE_HOOK_RELAY_EVENTS.filter((event) => event !== "permission_request");
+	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.
 
 This side conversation is for answering questions and lightweight, non-mutating exploration without disrupting the main thread. Do not present yourself as continuing the main thread's active task.
@@ -48,6 +80,19 @@ External tools may be available according to this thread's current permissions.
 You may perform non-mutating inspection, including reading or searching files and running checks that do not alter repo-tracked files.
 
 Do not modify files, source, git state, permissions, configuration, workspace state, or external state unless the user explicitly requests that mutation in this side conversation. Do not request escalated permissions or broader sandbox access unless the user explicitly requests a mutation that requires it. If the user explicitly requests a mutation, keep it minimal, local to the request, and avoid disrupting the main thread.`;
+//#endregion
+//#region extensions/codex/src/app-server/side-question.ts
+const SIDE_QUESTION_COMPLETION_TIMEOUT_MS = 6e5;
+var CodexSideQuestionTimeoutError = class extends Error {
+	constructor(..._args) {
+		super(..._args);
+		this.name = "TimeoutError";
+	}
+};
+const CODEX_SIDE_NATIVE_HOOK_RELAY_MIN_TTL_MS = 18e5;
+const CODEX_SIDE_NATIVE_HOOK_RELAY_TTL_GRACE_MS = 3e5;
+const CODEX_SIDE_NATIVE_HOOK_RELAY_STARTUP_REQUEST_COUNT = 3;
+const CODEX_SIDE_NATIVE_HOOK_RELAY_EVENTS_WITH_APP_SERVER_APPROVALS = CODEX_NATIVE_HOOK_RELAY_EVENTS.filter((event) => event !== "permission_request");
 async function runCodexAppServerSideQuestion(params, options) {
 	const bindingIdentity = sessionBindingIdentity({
 		sessionId: params.sessionId,
@@ -126,11 +171,12 @@ async function runCodexAppServerSideQuestion(params, options) {
 		bindingModel: binding.model,
 		nativeAuthProfile: usesSupervisionConnection || preparedNativeAuthProfile
 	});
-	const connection = resolveCodexBindingAppServerConnection({
+	const connection = await resolveCodexBindingAppServerConnection({
 		binding,
 		authProfileId,
 		pluginConfig,
 		execPolicy,
+		assertCurrent,
 		modelProvider: reviewerPolicyContext.modelProvider,
 		model: reviewerPolicyContext.model,
 		config: params.cfg,
@@ -222,6 +268,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 	if (nativeExecutionBlock) throw new Error(nativeExecutionBlock);
 	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 = {
+		assertCurrent,
 		startOptions: appServer.start,
 		timeoutMs: appServer.requestTimeoutMs,
 		authRequirement: preparedRuntimeAuth.plan.modelRoute?.authRequirement,
@@ -273,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;
@@ -314,35 +362,27 @@ 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) => {
+		const handleServerRequest = async (request, _scope, requestSignal, setExecutionTimeoutMs) => {
 			const signal = AbortSignal.any([requestSignal, runAbortController.signal]);
 			if (signal.aborted) return;
 			if (!childThreadId || !turnId) return;
@@ -377,8 +417,10 @@ async function runCodexAppServerSideQuestion(params, options) {
 			if (!call || call.threadId !== childThreadId || call.turnId !== turnId) return;
 			const timeoutMs = resolveDynamicToolCallTimeoutMs({
 				call,
-				config: params.cfg
+				config: params.cfg,
+				toolBridge
 			});
+			setExecutionTimeoutMs?.(timeoutMs);
 			const toolStartedAt = Date.now();
 			const diagnosticContext = {
 				call,
@@ -418,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,
@@ -459,6 +493,8 @@ async function runCodexAppServerSideQuestion(params, options) {
 				else pendingNativePreToolUseFailures.push(failure);
 			}
 		}) : void 0;
+		await nativeHookRelay?.prepareInvocation();
+		assertCurrent();
 		const nativeHookRelayConfig = nativeHookRelay ? buildCodexNativeHookRelayConfig({
 			relay: nativeHookRelay,
 			events: nativeHookRelayEvents,
@@ -570,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",
@@ -579,11 +617,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		});
 		const turnResponse = assertCodexTurnStartResponse(await client.request("turn/start", {
 			threadId: sideThreadId,
-			input: [{
-				type: "text",
-				text: params.question.trim(),
-				text_elements: []
-			}],
+			input: buildCodexUserInput(params.question.trim(), params.images),
 			additionalContext: buildCodexTemporalAdditionalContext(sideRunParams, { sessionStatusAvailable: toolBridge.availableTools.some((tool) => tool.name === "session_status") }),
 			...sandboxEnvironment ? {
 				cwd: sandboxEnvironment.cwd,
@@ -640,45 +674,49 @@ async function runCodexAppServerSideQuestion(params, options) {
 			codexErrorInfo: result.turn?.error?.codexErrorInfo ?? null
 		} }, readRecentCodexRateLimits(client));
 		if (result.turn?.status === "interrupted") throw new Error("Codex /btw side thread was interrupted.");
-		const trimmed = result.text;
 		assertCurrent();
-		if (!trimmed) throw new Error("Codex /btw completed without an answer.");
+		if (!result.text) throw new Error("Codex /btw completed without an answer.");
 		return {
-			text: trimmed,
+			text: result.text,
 			usage: result.usage
 		};
+	} catch (error) {
+		primaryFailure = { error };
+		throw error;
 	} finally {
-		try {
-			const runWasAbortedBeforeCleanup = runAbortController.signal.aborted;
-			nativeToolRunWasAbortedBeforeCleanup = runWasAbortedBeforeCleanup;
-			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(runWasAbortedBeforeCleanup);
-				} finally {
-					activateNativePreToolUseFailureFallback();
-				}
-			}
-		} finally {
-			flushPendingNativePreToolUseFailures();
-			try {
-				await releaseSandboxEnvironment();
-			} finally {
-				releaseCodexAppServerClientLease(clientLease);
-				nativeHookRelay?.unregister();
-			}
-		}
+		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",
+					log: embeddedAgentLog,
+					cleanup: async () => {
+						await nativeHookRelay?.drain();
+					}
+				})
+			]
+		});
 	}
 }
 function resolveCodexSideNativeHookRelayEvents(params) {
@@ -687,7 +725,7 @@ function resolveCodexSideNativeHookRelayEvents(params) {
 }
 function registerCodexSideNativeHookRelay(params) {
 	if (params.options.enabled === false) return;
-	return registerNativeHookRelay({
+	return registerNativeHookRelayForBundledRuntime({
 		provider: "codex",
 		...params.agentId ? { agentId: params.agentId } : {},
 		sessionId: params.sessionId,
@@ -771,132 +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);
-			},
-			...input.params.messageChannel ? { messageChannel: input.params.messageChannel } : {}
-		} : void 0;
-		const allTools = createOpenClawCodingTools({
-			agentId: input.sessionAgentId,
-			requesterThinkingLevel: input.params.resolvedThinkLevel ?? "off",
-			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
@@ -917,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({
@@ -944,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/{source-CElXU0Oy.js → .setup/source-CUzJq5WN.mjs}

@@ -1,13 +1,13 @@
-import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { c as CODEX_PLUGINS_MARKETPLACE_NAME, i as pluginReadParams, n as isOpenAiCuratedMarketplace } from "./plugin-inventory-oL4Na1ZG.js";
-import { r as buildCodexPluginAppCacheKey, s as defaultCodexAppInventoryCache } from "./plugin-app-cache-key-d0eKxy7b.js";
-import { o as withCodexAppServerJsonClient } from "./request-B7hEkBGq.js";
-import "./config-oIORaQ5T.js";
+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-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
@@ -120,6 +120,7 @@ async function discoverCodexMemorySources(codexHome) {
 //#region extensions/codex/src/migration/source.ts
 var source_exports = /* @__PURE__ */ __exportAll({
 	codexPluginMigrationSubscriptionWarning: () => codexPluginMigrationSubscriptionWarning,
+	defaultCodexHome: () => defaultCodexHome,
 	discoverCodexSource: () => discoverCodexSource,
 	hasCodexSource: () => hasCodexSource
 });
@@ -409,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 } : {}
 	};
 }
@@ -515,4 +516,4 @@ function sanitizePluginName(value) {
 	return value.trim().toLowerCase().replaceAll(/\s+/gu, "-");
 }
 //#endregion
-export { exists as a, sanitizeName as c, source_exports as i, discoverCodexSource as n, readJsonObject as o, hasCodexSource as r, resolveHomePath 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 };