@openclaw/codex 2026.9.1 → 2026.9.2

package/dist/{side-question-BTZAII4l.js → side-question-B6DWAw1A.js}

@@ -1,21 +1,21 @@
-import { $t as isJsonObject, B as isCodexAppServerIndeterminateRequestCancellationError, C as withLeasedCodexAppServerClientStartSelectionRetry, Ct as ensureCodexAppServerClientRuntime, Ft as readRecentCodexRateLimits, L as isCodexAppServerApprovalRequest, Q as assertCodexThreadForkResponse, Wt as resolveCodexAppServerPreparedAuthHandoff, _t as resolveCodexToolAbortTerminalReason, c as getLeasedSharedCodexAppServerClient, dt as resolveDynamicToolCallTimeoutMs, it as readCodexTurn, m as releaseCodexAppServerClientLease, nt as readCodexDynamicToolCallParams, ot as createCodexElicitationResponse, st as handleDynamicToolCallWithTimeout, tt as assertCodexTurnStartResponse } from "./shared-client-DxcfF9KX.js";
-import { C as isCodexPairedNodeRemoteExecPlacementSandbox, E as readCodexPluginConfig, O as resolveOpenClawExecPolicyForCodexAppServer, T as isCodexSandboxExecServerEnabled, d as shouldAutoApproveCodexAppServerApprovals, f as withMcpElicitationsApprovalPolicy, h as resolveCodexModelBackedReviewerPolicyContext, l as hasCodexMcpToolApprovalOverrides, m as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveCodexAppServerHomeScope, w as isCodexRemoteExecPlacementSandbox, y as readCodexRequirementsToml } from "./config-BhmfC1s6.js";
-import { d as sessionBindingIdentity } from "./session-binding-BHuTCRZQ.js";
-import { d as unsubscribeCodexThreadBestEffort, h as isCodexNotificationForTurn, l as retireUnsafeCodexTurnClientBestEffort, s as isCodexAlreadyTerminalInterruptError } from "./attempt-client-cleanup-DYHcRQAa.js";
-import { B as emitCodexNativePreToolUseFailureDiagnostic, Dt as mergeCodexThreadConfigs, E as resolveCodexAppServerRequestModelSelection, I as buildCodexNativeHookRelayConfig, L as buildCodexNativeHookRelayDisabledConfig, N as CODEX_NATIVE_HOOK_RELAY_EVENTS, O as resolveCodexBindingModelProviderFallback, S as resolveCodexWebSearchPlan, St as buildCodexPluginAppsConfigPatchFromPolicyContext, T as resolveCodexAppServerModelProvider, a as readCodexSupportedReasoningEfforts, at as filterCodexDynamicTools, dt as resolveCodexDynamicToolsLoading, o as resolveCodexAppServerReasoningEffort, t as buildCodexTemporalAdditionalContext, v as buildCodexRuntimeThreadConfig, w as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-DAcEJ_Om.js";
-import { s as resolveCodexNativeExecutionBlock } from "./request-DYAI5FQE.js";
-import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, r as assertCodexSupervisionThreadLineage } from "./thread-policy-g4KbJPzp.js";
-import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-CawQJfUS.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-DeWVTCMj.js";
-import { n as resolveCodexBindingAppServerConnection, t as requireCodexSupervisionModelSelection } from "./binding-connection-E6uDsPlx.js";
-import { C as filterCodexVisionTools, T as CodexNativeToolLifecycleProjector, _ as resolveCodexMessageToolProvider, a as emitDynamicToolStartedDiagnostic, b as shouldEnableCodexAppServerNativeToolSurface, c as ensureCodexSandboxExecServerEnvironment, g as resolveCodexExternalSandboxPolicyForOpenClawSandbox, i as emitDynamicToolErrorDiagnostic, l as releaseCodexSandboxExecServerEnvironment, o as emitDynamicToolTerminalDiagnostic, r as routeCodexAppServerElicitationRequest, s as handleCodexAppServerApprovalRequest, t as createCodexDynamicToolBridge, v as resolveCodexNodePlacementToolConstructionPlan, x as shouldRequireCodexSandboxExecServerEnvironment, y as resolveCodexSandboxEnvironmentSelection } from "./dynamic-tools-BU9tmlYm.js";
-import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-DW5p4k9w.js";
+import { l as sessionBindingIdentity } from "./session-binding-record-CyaXZvTe.js";
+import { A as resolveOpenClawExecPolicyForCodexAppServer, B as isJsonObject, D as isCodexSandboxExecServerEnabled, E as isCodexRemoteExecPlacementSandbox, O as readCodexPluginConfig, T as isCodexPairedNodeRemoteExecPlacementSandbox, d as shouldAutoApproveCodexAppServerApprovals, f as withMcpElicitationsApprovalPolicy, h as resolveCodexModelBackedReviewerPolicyContext, l as hasCodexMcpToolApprovalOverrides, m as canUseCodexModelBackedApprovalsReviewerForModel, r as resolveCodexAppServerHomeScope, y as readCodexRequirementsToml } from "./config-CyapYSji.js";
+import { B as isCodexAppServerIndeterminateRequestCancellationError, C as withLeasedCodexAppServerClientStartSelectionRetry, Kt as resolveCodexAppServerPreparedAuthHandoff, L as isCodexAppServerApprovalRequest, Lt as readRecentCodexRateLimits, Tt as ensureCodexAppServerClientRuntime, c as getLeasedSharedCodexAppServerClient, ct as createCodexElicitationResponse, et as assertCodexThreadForkResponse, it as readCodexDynamicToolCallParams, lt as handleDynamicToolCallWithTimeout, m as releaseCodexAppServerClientLease, ot as readCodexTurn, pt as resolveDynamicToolCallTimeoutMs, rt as assertCodexTurnStartResponse, yt as resolveCodexToolAbortTerminalReason } from "./shared-client-CKhX2kFt.js";
+import { l as resolveCodexSessionBinding } from "./session-binding-4Ki04sW-.js";
+import { d as unsubscribeCodexThreadBestEffort, h as isCodexNotificationForTurn, l as retireUnsafeCodexTurnClientBestEffort, o as interruptCodexTurnAndWaitBestEffort } from "./attempt-client-cleanup-Bp1ZOnk2.js";
+import { B as emitCodexNativePreToolUseFailureDiagnostic, Dt as refreshCodexPluginAppApprovalPolicy, E as resolveCodexAppServerRequestModelSelection, Et as mergeCodexThreadConfigs, I as buildCodexNativeHookRelayConfig, L as buildCodexNativeHookRelayDisabledConfig, N as CODEX_NATIVE_HOOK_RELAY_EVENTS, O as resolveCodexBindingModelProviderFallback, S as resolveCodexWebSearchPlan, T as resolveCodexAppServerModelProvider, a as readCodexSupportedReasoningEfforts, at as filterCodexDynamicTools, dt as resolveCodexDynamicToolsLoading, o as resolveCodexAppServerReasoningEffort, t as buildCodexTemporalAdditionalContext, v as buildCodexRuntimeThreadConfig, w as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-DPK30jad.js";
+import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError, o as requireCodexSupervisionModelSelection, r as assertCodexSupervisionThreadLineage, s as resolveCodexBindingAppServerConnection } from "./thread-policy-CTalhWFy.js";
+import { s as resolveCodexNativeExecutionBlock } from "./request-C8H22rPi.js";
+import { n as formatCodexUsageLimitErrorMessage } from "./rate-limits-Fx_l4eNa.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-BaueHmSj.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-BwpvTxaX.js";
+import { n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-BpG9Ltc5.js";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
-import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { randomUUID } from "node:crypto";
+import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
+import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir as resolveAgentDir$1, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { isDeepStrictEqual } from "node:util";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
-import { resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { loadCodexBundleMcpApprovalConfig, resolveCodexMcpToolOverridesForAgent } from "openclaw/plugin-sdk/codex-mcp-projection";
 //#region extensions/codex/src/app-server/side-question.ts
@@ -50,7 +50,15 @@ async function runCodexAppServerSideQuestion(params, options) {
 		agentId: params.agentId,
 		config: params.cfg
 	});
-	const binding = await options.bindingStore.read(bindingIdentity);
+	const hostCapabilities = params.hostCapabilities;
+	const { binding, assertCurrent } = await resolveCodexSessionBinding({
+		bindingStore: options.bindingStore,
+		identity: bindingIdentity,
+		config: params.cfg,
+		storePath: params.storePath,
+		assertCurrent: hostCapabilities.assertActive,
+		signal: params.opts?.abortSignal
+	});
 	if (!binding?.threadId) throw new Error("Codex /btw needs an active Codex thread. Send a normal message first, then try /btw again.");
 	if (isCodexPairedNodeRemoteExecPlacementSandbox(params.sandbox)) throw new Error("Normal Codex turns are supported on nodes, but /btw is not yet bound to the active placement.");
 	const pluginConfig = readCodexPluginConfig(options.pluginConfig);
@@ -262,6 +270,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 	if (params.opts?.abortSignal?.aborted) abortFromUpstream();
 	else params.opts?.abortSignal?.addEventListener("abort", abortFromUpstream, { once: true });
 	let childThreadId;
+	let pluginAppPolicyContext = binding.pluginAppPolicyContext;
 	let childClient;
 	let policyWriteUncertain = false;
 	let turnId;
@@ -280,6 +289,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 	const ensureSandboxEnvironment = async (targetClient) => {
 		if (!sandboxEnvironmentRequired || sandboxEnvironmentClient === targetClient) return;
 		await releaseSandboxEnvironment();
+		assertCurrent();
 		const environment = await ensureCodexSandboxExecServerEnvironment({
 			client: targetClient,
 			sandbox: params.sandbox ?? null,
@@ -298,6 +308,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 		sandboxEnvironmentClient = targetClient;
 	};
 	try {
+		assertCurrent();
 		const autoApproveMcpTools = shouldAutoApproveCodexAppServerApprovals(appServer);
 		const projectedMcpServers = loadCodexBundleMcpApprovalConfig({
 			workspaceDir: agentWorkspaceDir,
@@ -348,7 +359,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 					autoApproveMcpTools,
 					projectedMcpServers,
 					getActiveMcpToolCall: (serverName) => nativeToolLifecycleProjector?.getActiveMcpToolCall(serverName),
-					pluginAppPolicyContext: binding.pluginAppPolicyContext,
+					pluginAppPolicyContext,
 					signal: runAbortController.signal
 				});
 				return approvalResult.kind === "handled" ? approvalResult.response : createCodexElicitationResponse("decline", null, { message: "OpenClaw Codex side questions do not support interactive MCP input." });
@@ -450,6 +461,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			loopDetectionPreToolUseRelay: appServer.loopDetectionPreToolUseRelay,
 			signal: runAbortController.signal,
 			hostCapabilities: sideRunParams.hostCapabilities,
+			assertCurrent,
 			onPreToolUseFailure: (failure) => {
 				if (nativePreToolUseFailureFallbackActive) emitNativePreToolUseFailure(failure);
 				else if (nativeToolLifecycleProjector) nativeToolLifecycleProjector.recordPreToolUseFailure(failure, nativeToolRunWasAbortedBeforeCleanup);
@@ -466,27 +478,54 @@ async function runCodexAppServerSideQuestion(params, options) {
 			nativeCodeModeEnabled: nativeToolSurfaceEnabled,
 			nativeCodeModeOnlyEnabled: appServer.codeModeOnly
 		});
-		const pluginAppsConfigPatch = binding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(binding.pluginAppPolicyContext) : void 0;
-		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, pluginAppsConfigPatch, appServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
 		const sideThreadId = await withLeasedCodexAppServerClientStartSelectionRetry({
 			lease: clientLease,
 			options: clientOptions,
 			signal: runAbortController.signal,
 			run: async (forkClient, requestOptions) => options.bindingStore.withLease(bindingIdentity, async () => {
+				const assertCurrentBinding = () => {
+					assertCurrent();
+					runAbortController.signal.throwIfAborted();
+					if (!isDeepStrictEqual(options.bindingStore.read(bindingIdentity), binding)) throw new Error("Codex side-question binding changed before fork");
+				};
+				const currentRequestOptions = () => {
+					const scoped = requestOptions();
+					return {
+						...scoped,
+						assertCurrent: () => {
+							scoped.assertCurrent();
+							assertCurrentBinding();
+						}
+					};
+				};
+				assertCurrentBinding();
 				if (binding.connectionScope === "supervision") {
-					params.hostCapabilities.assertActive();
 					const { thread } = await forkClient.request("thread/read", {
 						threadId: binding.threadId,
 						includeTurns: false
-					}, requestOptions());
-					params.hostCapabilities.assertActive();
-					if (!isDeepStrictEqual(await options.bindingStore.read(bindingIdentity), binding)) throw new Error("Codex side-question binding changed before fork");
-					params.hostCapabilities.assertActive();
+					}, currentRequestOptions());
+					assertCurrentBinding();
 					assertCodexSupervisionThreadLineage(binding, thread);
 				}
 				await ensureSandboxEnvironment(forkClient);
-				params.hostCapabilities.assertActive();
+				assertCurrentBinding();
 				const executionCwd = sandboxEnvironment?.cwd ?? cwd;
+				let pluginAppsConfigPatch;
+				if (binding.pluginAppPolicyContext) {
+					const refreshed = await refreshCodexPluginAppApprovalPolicy({
+						policyContext: binding.pluginAppPolicyContext,
+						configCwd: executionCwd,
+						request: (method, requestParams) => {
+							assertCurrentBinding();
+							return forkClient.request(method, requestParams, currentRequestOptions());
+						}
+					}).finally(assertCurrentBinding);
+					pluginAppPolicyContext = refreshed.policyContext;
+					pluginAppsConfigPatch = refreshed.configPatch;
+					for (const diagnostic of refreshed.diagnostics) embeddedAgentLog.warn(diagnostic.message);
+				}
+				assertCurrentBinding();
+				const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, pluginAppsConfigPatch, appServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
 				const response = assertCodexThreadForkResponse(await forkCodexSideThread(forkClient, {
 					threadId: binding.threadId,
 					model: modelSelection.model,
@@ -502,7 +541,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 					ephemeral: true,
 					excludeTurns: true,
 					threadSource: "user"
-				}, requestOptions()));
+				}, currentRequestOptions()));
 				if (!response.thread.id.trim() || response.thread.id === binding.threadId) {
 					await retireUnsafeCodexTurnClientBestEffort(forkClient, "unsafe side child identity");
 					throw new Error("Codex side fork returned an unsafe child identity");
@@ -510,6 +549,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 				childThreadId = response.thread.id;
 				childClient = forkClient;
 				try {
+					assertCurrentBinding();
 					if (supervisionModelSelection && (response.model !== supervisionModelSelection.model || response.modelProvider !== supervisionModelSelection.modelProvider)) throw new Error("Codex supervised side thread did not preserve its native model and provider");
 					const scoped = requestOptions();
 					await refreshCodexThreadPolicy({
@@ -519,7 +559,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 						...scoped,
 						signal: runAbortController.signal,
 						assertCurrent: () => {
-							params.hostCapabilities.assertActive();
+							assertCurrent();
 							runAbortController.signal.throwIfAborted();
 							scoped.assertCurrent();
 						}
@@ -566,11 +606,13 @@ async function runCodexAppServerSideQuestion(params, options) {
 			}
 		}, {
 			timeoutMs: appServer.requestTimeoutMs,
-			signal: runAbortController.signal
+			signal: runAbortController.signal,
+			assertCurrent
 		}).catch((error) => {
 			if (isCodexAppServerIndeterminateRequestCancellationError(error)) turnId = "";
 			throw error;
 		})).turn.id;
+		assertCurrent();
 		collector.setTurn(sideThreadId, turnId);
 		nativeToolLifecycleProjector = new CodexNativeToolLifecycleProjector({
 			...sideRunParams,
@@ -591,6 +633,7 @@ async function runCodexAppServerSideQuestion(params, options) {
 			throw error;
 		}
 		const trimmed = text.trim();
+		assertCurrent();
 		if (!trimmed) throw new Error("Codex /btw completed without an answer.");
 		return { text: trimmed };
 	} finally {
@@ -653,7 +696,7 @@ function registerCodexSideNativeHookRelay(params) {
 		}),
 		signal: params.signal,
 		runBeforeToolCall: params.hostCapabilities.runBeforeToolCall,
-		assertActive: params.hostCapabilities.assertActive,
+		assertActive: params.assertCurrent,
 		onPreToolUseFailure: params.onPreToolUseFailure,
 		command: { timeoutMs: params.options.gatewayTimeoutMs }
 	});
@@ -739,6 +782,13 @@ async function createCodexSideToolBridge(input) {
 			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",
@@ -748,7 +798,7 @@ async function createCodexSideToolBridge(input) {
 			exec: input.sessionPermissionPolicy && { mode: input.sessionPermissionPolicy.execMode },
 			sessionPermissionPolicy: input.sessionPermissionPolicy,
 			runId: input.runId,
-			agentDir: input.params.agentDir ?? resolveAgentDir(input.params.cfg ?? {}, input.sessionAgentId),
+			agentDir: input.params.agentDir ?? resolveAgentDir$1(input.params.cfg ?? {}, input.sessionAgentId),
 			workspaceDir: input.cwd,
 			spawnWorkspaceDir: resolveAttemptSpawnWorkspaceDir({
 				sandbox,
@@ -794,6 +844,7 @@ async function createCodexSideToolBridge(input) {
 			}).channelId,
 			sandbox,
 			...toolConstructionPlan ? { toolConstructionPlan } : {},
+			...questionPrompt ? { questionPrompt } : {},
 			emitBeforeToolCallDiagnostics: false,
 			modelHasVision: runtimeModel.input?.includes("image") ?? false,
 			requireExplicitMessageTarget: true
@@ -861,14 +912,12 @@ function isMissingCodexParentThreadError(error) {
 }
 async function cleanupCodexSideThread(client, params) {
 	if (!params.threadId) return;
-	if (params.interrupt && params.turnId !== void 0) try {
-		await client.request("turn/interrupt", {
+	if (params.interrupt && params.turnId !== void 0) {
+		if (!await interruptCodexTurnAndWaitBestEffort(client, {
 			threadId: params.threadId,
-			turnId: params.turnId
-		}, { timeoutMs: params.timeoutMs });
-	} catch (error) {
-		if (!isCodexAlreadyTerminalInterruptError(error)) {
-			embeddedAgentLog.debug("codex /btw side thread interrupt cleanup failed", { error });
+			turnId: params.turnId,
+			timeoutMs: params.timeoutMs
+		})) {
 			await retireUnsafeCodexTurnClientBestEffort(client, "side turn interrupt");
 			return;
 		}