@openclaw/codex 2026.6.11-beta.2 → 2026.7.1-beta.1

package/dist/{provider-capabilities-D7hnTO76.js → provider-capabilities-CE5k8cmO.js}

@@ -1,15 +1,15 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { C as isForcedPrivateQaCodexRuntime, S as filterCodexDynamicTools, _ as resolveCodexWebSearchPlan, w as normalizeCodexDynamicToolName, x as sanitizeInlineImageDataUrl, y as invalidInlineImageText } from "./thread-lifecycle-DtT3-ehU.js";
-import { c as isTrustedCodexModelBackedOpenAIProvider, u as readCodexPluginConfig } from "./config-CszD0vP3.js";
-import { a as formatCodexDisplayText } from "./app-server-policy-BPTiVNsW.js";
-import { o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-Dtx5i7Ez.js";
-import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-3tnjhjFb.js";
+import { C as isForcedPrivateQaCodexRuntime, S as filterCodexDynamicTools, _ as resolveCodexWebSearchPlan, w as normalizeCodexDynamicToolName, x as sanitizeInlineImageDataUrl, y as invalidInlineImageText } from "./thread-lifecycle-DeSMZSXr.js";
+import { c as isTrustedCodexModelBackedOpenAIProvider, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
+import { a as formatCodexDisplayText } from "./app-server-policy-xi0ZmBGO.js";
+import { o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-rR6TDJA3.js";
+import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-pTY2COoC.js";
 import { addTimerTimeoutGraceMs, finiteSecondsToTimerSafeMilliseconds, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { asOptionalRecord, isRecord, normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";
-import { HEARTBEAT_RESPONSE_TOOL_NAME, buildAgentHookContextChannelFields, buildEmbeddedAttemptToolRunContext, callGatewayTool, consumeAdjustedParamsForToolCall, consumePreExecutionBlockedToolCall, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, embeddedAgentLog, extractMessagingToolSend, extractMessagingToolSendResult, extractToolResultMediaArtifact, filterProviderNormalizableTools, filterToolResultMediaUrls, finalizeToolTerminalPresentation, formatApprovalDisplayPath, getChannelAgentToolMeta, getPluginToolMeta, hasNativeHookRelayInvocation, invokeNativeHookRelay, isMessagingTool, isMessagingToolSendAction, isReplaySafeToolCall, isSubagentSessionKey, isToolResultError, isToolWrappedWithBeforeToolCallHook, normalizeAgentRuntimeTools, normalizeHeartbeatToolResponse, projectRuntimeToolInputSchema, registerNativeHookRelay, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveNativeHookRelayDeferredToolApproval, runAgentHarnessAfterToolCallHook, runBeforeToolCallHook, sanitizeToolResult, setBeforeToolCallDiagnosticsEnabled, supportsModelTools, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
+import { HEARTBEAT_RESPONSE_TOOL_NAME, buildAgentHookContextChannelFields, buildEmbeddedAttemptToolRunContext, callGatewayTool, consumeAdjustedParamsForToolCall, consumePreExecutionBlockedToolCall, createAgentToolResultMiddlewareRunner, createCodexAppServerToolResultExtensionRunner, embeddedAgentLog, extractMessagingToolSend, extractMessagingToolSendResult, extractToolResultMediaArtifact, filterProviderNormalizableTools, filterToolResultMediaUrls, finalizeToolTerminalPresentation, formatApprovalDisplayPath, getChannelAgentToolMeta, getPluginToolMeta, hasNativeHookRelayInvocation, invokeNativeHookRelay, isDeliveredMessageToolOnlySourceReplyResult, isDeliveredMessagingToolResult, isMessagingTool, isMessagingToolSendAction, isReplaySafeToolCall, isSubagentSessionKey, isToolResultError, isToolWrappedWithBeforeToolCallHook, normalizeAgentRuntimeTools, normalizeHeartbeatToolResponse, projectRuntimeToolInputSchema, registerNativeHookRelay, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveNativeHookRelayDeferredToolApproval, runAgentHarnessAfterToolCallHook, runBeforeToolCallHook, sanitizeToolResult, setBeforeToolCallDiagnosticsEnabled, supportsModelTools, wrapToolWithBeforeToolCallHook } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { emitTrustedDiagnosticEvent } from "openclaw/plugin-sdk/diagnostic-runtime";
 import { isToolAllowed } from "openclaw/plugin-sdk/sandbox";
 import { buildExecAutoReviewInputForShellCommand, reviewExecRequestWithConfiguredModel } from "openclaw/plugin-sdk/agent-harness-exec-review-runtime";
@@ -82,8 +82,9 @@ function resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(value, fallback
 	return resolvePositiveIntegerTimeoutMs(value, Math.max(resolvePositiveIntegerTimeoutMs(void 0, fallbackMs), CODEX_POST_TOOL_RAW_ASSISTANT_COMPLETION_IDLE_TIMEOUT_MS));
 }
 /** Resolves the long terminal turn idle timeout. */
-function resolveCodexTurnTerminalIdleTimeoutMs(value) {
-	return resolvePositiveIntegerTimeoutMs(value, CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS);
+function resolveCodexTurnTerminalIdleTimeoutMs(value, runTimeoutOverrideMs) {
+	const explicitRunBudgetMs = resolvePositiveIntegerTimeoutMs(runTimeoutOverrideMs, CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS);
+	return resolvePositiveIntegerTimeoutMs(value, Math.max(CODEX_TURN_TERMINAL_IDLE_TIMEOUT_MS, explicitRunBudgetMs));
 }
 /** Adds gateway grace time to a caller timeout without overflowing invalid values. */
 function resolveCodexGatewayTimeoutWithGraceMs(timeoutMs, graceMs = 1e4) {
@@ -1672,9 +1673,135 @@ function applyCurrentMessageProvider(toolName, args, currentProvider) {
 		provider
 	};
 }
+function normalizeRouteToken(value) {
+	if (typeof value === "number") return Number.isFinite(value) ? String(value) : void 0;
+	const normalized = value?.trim().toLowerCase();
+	return normalized ? normalized : void 0;
+}
+function sourceRouteTokens(hookContext) {
+	const tokens = /* @__PURE__ */ new Set();
+	const currentTarget = normalizeRouteToken(hookContext?.currentMessagingTarget);
+	const currentChannel = normalizeRouteToken(hookContext?.currentChannelId);
+	const currentProvider = normalizeRouteToken(hookContext?.currentChannelProvider);
+	if (currentTarget) tokens.add(currentTarget);
+	if (currentChannel) tokens.add(currentChannel);
+	const channelPrefixIndex = currentChannel?.indexOf(":") ?? -1;
+	if (channelPrefixIndex >= 0 && currentChannel) {
+		const unprefixedChannel = currentChannel.slice(channelPrefixIndex + 1);
+		if (unprefixedChannel) {
+			tokens.add(unprefixedChannel);
+			for (const segment of unprefixedChannel.split(/[;,]/u)) {
+				const token = normalizeRouteToken(segment);
+				if (token) tokens.add(token);
+			}
+		}
+	}
+	if (currentProvider && currentChannel?.startsWith(`${currentProvider}:`)) {
+		const unprefixedChannel = currentChannel.slice(currentProvider.length + 1);
+		if (unprefixedChannel) tokens.add(unprefixedChannel);
+	}
+	return tokens;
+}
+function routeTokenMatchesSource(token, hookContext) {
+	const normalized = normalizeRouteToken(token);
+	return normalized !== void 0 && sourceRouteTokens(hookContext).has(normalized);
+}
+function routeProviderMatchesSource(provider, hookContext) {
+	const normalized = normalizeRouteToken(provider);
+	if (!normalized) return false;
+	const currentProvider = normalizeRouteToken(hookContext?.currentChannelProvider);
+	const currentChannel = normalizeRouteToken(hookContext?.currentChannelId);
+	return currentProvider === normalized || currentChannel?.startsWith(`${normalized}:`) === true;
+}
+function routeTokenMatchesCurrentMessage(token, hookContext) {
+	const normalized = normalizeRouteToken(token);
+	return normalized !== void 0 && normalized === normalizeRouteToken(hookContext?.currentMessageId);
+}
+function readRouteToken(record, key) {
+	const value = record[key];
+	return typeof value === "string" || typeof value === "number" ? value : void 0;
+}
+function explicitRouteTokensMismatchCurrent(args, keys, currentToken) {
+	const normalizedCurrent = normalizeRouteToken(currentToken);
+	if (!normalizedCurrent) return false;
+	return keys.some((key) => {
+		const normalized = normalizeRouteToken(readRouteToken(args, key));
+		return normalized !== void 0 && normalized !== normalizedCurrent;
+	});
+}
+function explicitThreadRouteTargetsNonSource(args, hookContext, messagingTarget) {
+	const normalizedCurrentThread = normalizeRouteToken(hookContext?.currentThreadId);
+	const explicitThreadTokens = [...EXPLICIT_MESSAGE_THREAD_KEYS.map((key) => normalizeRouteToken(readRouteToken(args, key))), normalizeRouteToken(messagingTarget?.threadId)].filter((value) => value !== void 0);
+	if (explicitThreadTokens.length === 0) return false;
+	return normalizedCurrentThread === void 0 || explicitThreadTokens.some((value) => value !== normalizedCurrentThread);
+}
+function replyReceiptMatchesCurrentMessage(value, hookContext, depth = 0) {
+	if (depth > 4 || value === null) return false;
+	if (typeof value === "string") {
+		const trimmed = value.trim();
+		if (!trimmed || !["{", "["].includes(trimmed[0] ?? "")) return false;
+		try {
+			return replyReceiptMatchesCurrentMessage(JSON.parse(trimmed), hookContext, depth + 1);
+		} catch {
+			return false;
+		}
+	}
+	if (typeof value !== "object") return false;
+	if (Array.isArray(value)) return value.some((item) => replyReceiptMatchesCurrentMessage(item, hookContext, depth + 1));
+	const record = value;
+	for (const key of [
+		"repliedTo",
+		"replyTo",
+		"replyToId",
+		"replyToIdFull"
+	]) if (routeTokenMatchesCurrentMessage(typeof record[key] === "string" ? record[key] : void 0, hookContext)) return true;
+	for (const key of [
+		"content",
+		"details",
+		"payload",
+		"receipt",
+		"result",
+		"results",
+		"sendResult",
+		"text"
+	]) if (replyReceiptMatchesCurrentMessage(record[key], hookContext, depth + 1)) return true;
+	return false;
+}
+function hasExplicitNonSourceMessageRoute(args, hookContext, messagingTarget) {
+	const currentProvider = normalizeRouteToken(hookContext?.currentChannelProvider);
+	for (const key of EXPLICIT_MESSAGE_PROVIDER_KEYS) {
+		const provider = normalizeRouteToken(typeof args[key] === "string" ? args[key] : void 0);
+		if (provider && currentProvider !== provider && !routeProviderMatchesSource(provider, hookContext)) return true;
+	}
+	const targetValues = [...EXPLICIT_MESSAGE_TARGET_KEYS.map((key) => typeof args[key] === "string" ? args[key] : void 0), ...Array.isArray(args.targets) ? args.targets.map((value) => typeof value === "string" ? value : void 0) : []].filter((value) => normalizeRouteToken(value) !== void 0);
+	if (explicitThreadRouteTargetsNonSource(args, hookContext, messagingTarget)) return true;
+	if (explicitRouteTokensMismatchCurrent(args, EXPLICIT_MESSAGE_REPLY_KEYS, hookContext?.currentMessageId)) return true;
+	if (messagingTarget?.to !== void 0 && !routeTokenMatchesSource(messagingTarget.to, hookContext)) return true;
+	if (messagingTarget?.to !== void 0) return false;
+	if (targetValues.length === 0) return false;
+	if (targetValues.some((value) => !routeTokenMatchesSource(value, hookContext))) return true;
+	return false;
+}
 /** Namespace attached to OpenClaw-owned dynamic tools exposed to Codex. */
 const CODEX_OPENCLAW_DYNAMIC_TOOL_NAMESPACE = "openclaw";
 const ALWAYS_DIRECT_DYNAMIC_TOOL_NAMES = new Set(["sessions_yield"]);
+const EXPLICIT_MESSAGE_PROVIDER_KEYS = ["channel", "provider"];
+const EXPLICIT_MESSAGE_TARGET_KEYS = [
+	"target",
+	"to",
+	"channelId"
+];
+const EXPLICIT_MESSAGE_THREAD_KEYS = [
+	"threadId",
+	"thread_id",
+	"messageThreadId",
+	"topicId"
+];
+const EXPLICIT_MESSAGE_REPLY_KEYS = [
+	"replyTo",
+	"replyToId",
+	"replyToIdFull"
+];
 const DEFAULT_CODEX_DYNAMIC_TOOL_RESULT_MAX_CHARS = 16e3;
 /**
 * Creates dynamic tool specs and a call handler that executes OpenClaw tools,
@@ -1700,6 +1827,7 @@ function createCodexDynamicToolBridge(params) {
 	emitQuarantinedDynamicToolDiagnostics(quarantinedTools, params.hookContext);
 	const telemetry = {
 		didSendViaMessagingTool: false,
+		didDeliverSourceReplyViaMessageTool: false,
 		messagingToolSentTexts: [],
 		messagingToolSentMediaUrls: [],
 		messagingToolSentTargets: [],
@@ -1827,7 +1955,7 @@ function createCodexDynamicToolBridge(params) {
 					toolCallOrdinal: options?.toolCallOrdinal
 				});
 				const messagingTelemetryArgs = applyCurrentMessageProvider(toolName, executedArgs, params.hookContext?.currentChannelProvider);
-				const messagingTarget = isMessagingTool(toolName) && isMessagingToolSendAction(toolName, executedArgs) ? extractMessagingToolSend(toolName, messagingTelemetryArgs, messagingContext) : void 0;
+				const messagingTarget = isMessagingTool(toolName) ? extractMessagingToolSend(toolName, messagingTelemetryArgs, messagingContext) : void 0;
 				const confirmedMessagingTarget = !rawIsError && messagingTarget ? extractMessagingToolSendResult(messagingTarget, telemetryRawResult) : messagingTarget;
 				collectToolTelemetry({
 					toolName,
@@ -1843,7 +1971,26 @@ function createCodexDynamicToolBridge(params) {
 					contentItems: convertToolContents(result.content, toolResultMaxChars),
 					success: !resultIsError
 				}, terminalType);
-				withDynamicToolTermination(response, rawResult.terminate === true || result.terminate === true || isToolResultYield(rawResult) || isToolResultYield(result));
+				const blocksSourceReplyTermination = hasExplicitNonSourceMessageRoute(executedArgs, params.hookContext, confirmedMessagingTarget);
+				const deliveredSourceReply = isDeliveredMessageToolOnlySourceReplyResult({
+					sourceReplyDeliveryMode: params.hookContext?.sourceReplyDeliveryMode,
+					toolName,
+					args: executedArgs,
+					result,
+					hookResult: rawResult,
+					isError: resultIsError,
+					allowExplicitSourceRoute: !blocksSourceReplyTermination
+				});
+				const receiptConfirmedSourceReply = params.hookContext?.sourceReplyDeliveryMode === "message_tool_only" && toolName === "message" && normalizeRouteToken(typeof executedArgs.action === "string" ? executedArgs.action : void 0) === "reply" && !resultIsError && !blocksSourceReplyTermination && isDeliveredMessagingToolResult({
+					toolName,
+					args: executedArgs,
+					result,
+					hookResult: rawResult,
+					isError: resultIsError
+				}) && (replyReceiptMatchesCurrentMessage(rawResult, params.hookContext) || replyReceiptMatchesCurrentMessage(result, params.hookContext));
+				const toolConfirmedSourceReply = params.hookContext?.sourceReplyDeliveryMode === "message_tool_only" && toolName === "message" && !resultIsError && (rawResult.terminate === true || result.terminate === true);
+				if (deliveredSourceReply || receiptConfirmedSourceReply || toolConfirmedSourceReply) telemetry.didDeliverSourceReplyViaMessageTool = true;
+				withDynamicToolTermination(response, rawResult.terminate === true || result.terminate === true || isToolResultYield(rawResult) || isToolResultYield(result) || deliveredSourceReply || receiptConfirmedSourceReply);
 				const asyncStarted = isAsyncStartedToolResult(rawResult) || isAsyncStartedToolResult(result);
 				withDynamicToolAsyncStarted(response, asyncStarted);
 				return withSideEffectEvidence(response, !(executionPrevented || !asyncStarted && isReplaySafeToolInstance(toolEntry.tool) && isReplaySafeToolCall(toolName, executedArgs)));
@@ -2155,7 +2302,16 @@ function collectToolTelemetry(params) {
 			if (media.audioAsVoice) params.telemetry.toolAudioAsVoice = true;
 		}
 	}
-	if (!isMessagingTool(params.toolName) || !isMessagingToolSendAction(params.toolName, params.args)) return;
+	if (!isMessagingTool(params.toolName)) return;
+	const isMessagingSendAction = isMessagingToolSendAction(params.toolName, params.args);
+	if (!isMessagingSendAction && !params.messagingTarget) return;
+	if (!isMessagingSendAction && !isDeliveredMessagingToolResult({
+		toolName: params.toolName,
+		args: params.args,
+		result: params.result,
+		hookResult: params.mediaTrustResult,
+		isError: params.isError
+	})) return;
 	params.telemetry.didSendViaMessagingTool = true;
 	const sourceReplyPayload = extractInternalSourceReplyPayload(params.result?.details);
 	if (sourceReplyPayload) {
@@ -2223,7 +2379,7 @@ function isCodexToolResultError(result) {
 	if (typeof details.exitCode === "number" && details.exitCode !== 0) return true;
 	if (typeof details.status !== "string") return false;
 	const status = details.status.trim().toLowerCase();
-	return status !== "" && status !== "0" && status !== "ok" && status !== "success" && status !== "completed" && status !== "recorded" && status !== "pending" && status !== "started" && status !== "running" && status !== "yielded";
+	return status !== "" && status !== "0" && status !== "ok" && status !== "success" && status !== "completed" && status !== "recorded" && status !== "created" && status !== "updated" && status !== "accepted" && status !== "found" && status !== "missing" && status !== "pending" && status !== "started" && status !== "running" && status !== "yielded";
 }
 function isToolResultYield(result) {
 	const details = result.details;
@@ -2593,13 +2749,13 @@ async function buildPluginPolicyElicitationResponse(params) {
 	const response = buildElicitationResponse(approvalPrompt, "approved-once");
 	if (isJsonObject(response) && response.action === "accept") {
 		if (mode === "allow") return response;
-		return buildElicitationResponse(approvalPrompt, await requestPluginApprovalOutcome({
+		return buildElicitationResponse(approvalPrompt, oneShotPluginPolicyApprovalOutcome(mode, await requestPluginApprovalOutcome({
 			paramsForRun: params.paramsForRun,
 			title: approvalPrompt.title,
 			description: approvalPrompt.description,
-			allowedDecisions: approvalPrompt.allowedDecisions,
+			allowedDecisions: allowedPluginPolicyApprovalDecisions(mode, approvalPrompt),
 			signal: params.signal
-		}));
+		})));
 	}
 	logPluginElicitationDecline("unmappable_schema", params.requestParams);
 	return declineElicitationResponse();
@@ -2607,6 +2763,14 @@ async function buildPluginPolicyElicitationResponse(params) {
 function resolvePluginDestructiveApprovalMode(entry) {
 	return entry.destructiveApprovalMode ?? (entry.allowDestructiveActions ? "allow" : "deny");
 }
+function allowedPluginPolicyApprovalDecisions(mode, approvalPrompt) {
+	const allowedDecisions = approvalPrompt.allowedDecisions ?? ["allow-once", "deny"];
+	if (mode !== "ask") return allowedDecisions;
+	return allowedDecisions.filter((decision) => decision !== "allow-always");
+}
+function oneShotPluginPolicyApprovalOutcome(mode, outcome) {
+	return mode === "ask" && outcome === "approved-session" ? "approved-once" : outcome;
+}
 function readPluginApprovalElicitation(entry, requestParams) {
 	if (readString(requestParams, "mode") !== "form" || !isJsonObject(requestParams.requestedSchema)) return;
 	const requestedSchema = requestParams.requestedSchema;

package/dist/provider-catalog.js

@@ -39,11 +39,12 @@ const FALLBACK_CODEX_MODELS = [{
 */
 function buildCodexModelDefinition(model) {
 	const id = model.id.trim() || model.model.trim();
+	const supportedReasoningEfforts = model.supportedReasoningEfforts;
 	return {
 		id,
 		name: model.displayName?.trim() || id,
 		api: "openai-chatgpt-responses",
-		reasoning: model.supportedReasoningEfforts.length > 0 || shouldDefaultToReasoningModel(id),
+		reasoning: supportedReasoningEfforts !== void 0 ? supportedReasoningEfforts.length > 0 : shouldDefaultToReasoningModel(id),
 		input: model.inputModalities.includes("image") ? ["text", "image"] : ["text"],
 		cost: {
 			input: 0,
@@ -54,7 +55,8 @@ function buildCodexModelDefinition(model) {
 		contextWindow: DEFAULT_CONTEXT_WINDOW,
 		maxTokens: DEFAULT_MAX_TOKENS,
 		compat: {
-			supportsReasoningEffort: model.supportedReasoningEfforts.length > 0,
+			...supportedReasoningEfforts !== void 0 ? { supportsReasoningEffort: supportedReasoningEfforts.length > 0 } : {},
+			...supportedReasoningEfforts && supportedReasoningEfforts.length > 0 ? { supportedReasoningEfforts: [...supportedReasoningEfforts] } : {},
 			supportsUsageInStreaming: true
 		}
 	};

package/dist/provider.js

@@ -1,2 +1,2 @@
-import { n as buildCodexProviderCatalog, r as isModernCodexModel, t as buildCodexProvider } from "./provider-B-OHpbD3.js";
-export { buildCodexProvider, buildCodexProviderCatalog, isModernCodexModel };
+import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, n as buildCodexProviderCatalog, o as resolveCodexSupportedReasoningEffort, r as isMaxReasoningCodexModel, t as buildCodexProvider } from "./provider-DosqwRb6.js";
+export { buildCodexProvider, buildCodexProviderCatalog, isMaxReasoningCodexModel, isModernCodexModel, readCodexSupportedReasoningEfforts, resolveCodexSupportedReasoningEffort };

package/dist/{request-Dcd452Nk.js → request-BQuSQF29.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { a as getLeasedSharedCodexAppServerClient, i as createIsolatedCodexAppServerClient, l as withTimeout, o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-Dtx5i7Ez.js";
-import { t as resolveCodexAppServerDirectSandboxBypassBlock } from "./sandbox-guard-3tnjhjFb.js";
+import { a as getLeasedSharedCodexAppServerClient, i as createIsolatedCodexAppServerClient, l as withTimeout, o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-rR6TDJA3.js";
+import { t as resolveCodexAppServerDirectSandboxBypassBlock } from "./sandbox-guard-pTY2COoC.js";
 //#region extensions/codex/src/app-server/request.ts
 var request_exports = /* @__PURE__ */ __exportAll({ requestCodexAppServerJson: () => requestCodexAppServerJson });
 async function requestCodexAppServerJson(params) {

package/dist/{run-attempt-CXxtFC9d.js → run-attempt-O3Zs32KI.js}

@@ -1,17 +1,17 @@
 import { n as isJsonObject, t as flattenCodexDynamicToolFunctions } from "./protocol-dh-ETiNd.js";
-import { A as resolveCodexContextEngineProjectionReserveTokens, D as fitCodexProjectedContextForTurnStart, E as resolveCodexDynamicToolsLoadingForRuntime, H as readCodexNotificationTurnId, M as buildCodexPluginThreadConfigInputFingerprint, N as mergeCodexThreadConfigs, O as projectContextEngineAssemblyForCodex, P as shouldBuildCodexPluginThreadConfig, R as defaultCodexAppInventoryCache, V as readCodexNotificationThreadId, _ as resolveCodexWebSearchPlan, a as buildDeveloperInstructions, b as sanitizeCodexHistoryImagePayloads, c as codexDynamicToolsFingerprint, f as resolveCodexAppServerThreadModelSelection, h as startOrResumeThread, i as buildContextEngineBinding, j as buildCodexPluginThreadConfig, k as resolveCodexContextEngineProjectionMaxChars, l as isContextEngineBindingCompatible, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as isCodexAppServerProfilerEnabled, z as describeCodexNotificationCorrelation } from "./thread-lifecycle-DtT3-ehU.js";
-import { C as readCodexNotificationItem, D as updateActiveTurnItemIds, E as shouldDisarmAssistantCompletionIdleWatch, S as isTurnNotification, T as readRawResponseToolCallId, _ as isRawToolOutputCompletionNotification, a as isCodexNotificationOutsideActiveRun, b as isRetryableErrorNotification, c as isCurrentThreadOptionalTurnRequestParams, d as isNativeResponseStreamDeltaNotification, f as isNativeToolProgressNotification, g as isRawReasoningCompletionNotification, h as isRawFunctionToolOutputCompletionNotification, i as isAssistantCompletionReleaseNotification, l as isCurrentThreadTurnRequestParams, m as isRawAssistantProgressNotification, n as describeNotificationActivity, o as isCodexTurnAbortMarkerNotification, p as isPendingOpenClawDynamicToolCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isCurrentApprovalTurnRequestParams, t as codexExecutionToolName, u as isFileChangePatchUpdatedNotification, v as isReasoningItemCompletionNotification, w as readNotificationItemId, x as isTerminalTurnStatus, y as isReasoningProgressNotification } from "./attempt-notifications-BYnndyFl.js";
-import { _ as withMcpElicitationsApprovalPolicy, a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexPluginsPolicy, p as resolveCodexModelBackedReviewerPolicyContext, s as isCodexSandboxExecServerEnabled, u as readCodexPluginConfig } from "./config-CszD0vP3.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-B19q5BIX.js";
-import { i as formatCodexUsageLimitErrorMessage, o as resolveCodexUsageLimitResetAtMs, s as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-B-OHpbD3.js";
-import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, n as CodexAppServerRpcError, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-CLrtWgrD.js";
-import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-HOuPt-E0.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-C9ILt7bl.js";
-import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BPTiVNsW.js";
-import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-Dtx5i7Ez.js";
-import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-Bm6HsGob.js";
-import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-D7hnTO76.js";
-import { t as ensureCodexComputerUse } from "./computer-use-ClrJwoFp.js";
+import { A as resolveCodexContextEngineProjectionReserveTokens, B as describeCodexNotificationCorrelation, D as fitCodexProjectedContextForTurnStart, E as resolveCodexDynamicToolsLoadingForRuntime, F as shouldBuildCodexPluginThreadConfig, H as readCodexNotificationThreadId, M as buildCodexPluginThreadConfig, N as buildCodexPluginThreadConfigInputFingerprint, O as projectContextEngineAssemblyForCodex, P as mergeCodexThreadConfigs, U as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, a as buildDeveloperInstructions, b as sanitizeCodexHistoryImagePayloads, c as codexDynamicToolsFingerprint, f as resolveCodexAppServerThreadModelSelection, h as startOrResumeThread, i as buildContextEngineBinding, k as resolveCodexContextEngineProjectionMaxChars, l as isContextEngineBindingCompatible, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, s as buildTurnStartParams, v as isCodexAppServerProfilerEnabled, z as defaultCodexAppInventoryCache } from "./thread-lifecycle-DeSMZSXr.js";
+import { C as readCodexNotificationItem, D as updateActiveCompletionBlockerItemIds, E as shouldDisarmAssistantCompletionIdleWatch, O as updateActiveTurnItemIds, S as isTurnNotification, T as readRawResponseToolCallId, _ as isRawToolOutputCompletionNotification, a as isCodexNotificationOutsideActiveRun, b as isRetryableErrorNotification, c as isCurrentThreadOptionalTurnRequestParams, d as isNativeResponseStreamDeltaNotification, f as isNativeToolProgressNotification, g as isRawReasoningCompletionNotification, h as isRawFunctionToolOutputCompletionNotification, i as isAssistantCompletionReleaseNotification, l as isCurrentThreadTurnRequestParams, m as isRawAssistantProgressNotification, n as describeNotificationActivity, o as isCodexTurnAbortMarkerNotification, p as isPendingOpenClawDynamicToolCompletionNotification, r as isAssistantCommentaryCompletionNotification, s as isCurrentApprovalTurnRequestParams, t as codexExecutionToolName, u as isFileChangePatchUpdatedNotification, v as isReasoningItemCompletionNotification, w as readNotificationItemId, x as isTerminalTurnStatus, y as isReasoningProgressNotification } from "./attempt-notifications-l9LElGOU.js";
+import { _ as withMcpElicitationsApprovalPolicy, a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, m as resolveCodexPluginsPolicy, p as resolveCodexModelBackedReviewerPolicyContext, s as isCodexSandboxExecServerEnabled, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-CB4mtyrs.js";
+import { l as resolveCodexUsageLimitResetAtMs, s as formatCodexUsageLimitErrorMessage, u as shouldRefreshCodexRateLimitsForUsageLimitMessage } from "./provider-DosqwRb6.js";
+import { a as isCodexAppServerConnectionClosedError, c as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION, i as isCodexAppServerApprovalRequest, n as CodexAppServerRpcError, r as compareCodexAppServerVersions } from "./client-IcTBKEqA.js";
+import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-Cm0Gg7Z1.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-CDioyur-.js";
+import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-xi0ZmBGO.js";
+import { d as resolveCodexAppServerAuthAccountCacheKey, f as resolveCodexAppServerAuthProfileId, h as resolveCodexAppServerHomeDir, m as resolveCodexAppServerFallbackApiKeyCacheKey, n as clearSharedCodexAppServerClientIfCurrentAndUnclaimed, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, s as retireSharedCodexAppServerClientIfCurrent, t as clearSharedCodexAppServerClientIfCurrent, u as refreshCodexAppServerAuthTokens } from "./shared-client-rR6TDJA3.js";
+import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-CwjdQQ4j.js";
+import { A as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as resolveCodexMessageToolProvider, D as shouldWarnCodexDynamicToolBuildStageSummary, E as shouldRequireCodexSandboxExecServerEnvironment, F as resolveCodexTurnTerminalIdleTimeoutMs, I as withCodexStartupTimeout, M as resolveCodexStartupTimeoutMs, N as resolveCodexTurnAssistantCompletionIdleTimeoutMs, P as resolveCodexTurnCompletionIdleTimeoutMs, S as resolveCodexExternalSandboxPolicyForOpenClawSandbox, T as shouldEnableCodexAppServerNativeToolSurface, _ as createCodexDynamicToolBuildStageTracker, a as buildCodexNativeHookRelayConfig, b as resolveCodexAppServerExecutionCwd, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as buildDynamicTools, h as emitDynamicToolTerminalDiagnostic, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, k as handleCodexAppServerApprovalRequest, l as resolveCodexNativeHookRelayTtlMs, m as emitDynamicToolStartedDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as disableCodexPluginThreadConfig, w as resolveCodexSandboxEnvironmentSelection, x as resolveCodexAppServerHookChannelId, y as formatCodexDynamicToolBuildStageSummary } from "./provider-capabilities-CE5k8cmO.js";
+import { t as ensureCodexComputerUse } from "./computer-use-FPGG-mtX.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import fs from "node:fs/promises";
 import path, { posix } from "node:path";
@@ -947,6 +947,7 @@ function applyCodexTurnNotificationState(params) {
 		});
 		params.onReportExecutionNotification(notification);
 		updateActiveTurnItemIds(notification, params.activeTurnItemIds);
+		updateActiveCompletionBlockerItemIds(notification, params.activeCompletionBlockerItemIds);
 		if (notification.method === "item/completed" && params.activeTurnItemIds.size === 0) params.onScheduleTerminalDynamicToolReleaseCheck();
 	}
 	const unblockedAssistantCompletionRelease = isCurrentTurnNotification && turnWatches.isAssistantCompletionIdleWatchArmed() && notification.method === "item/completed" && params.activeTurnItemIds.size === 0;
@@ -2628,6 +2629,7 @@ async function startCodexAttemptThread(params) {
 										timeoutMs: params.appServer.requestTimeoutMs,
 										signal
 									}),
+									configCwd: startupExecutionCwd,
 									appCache: defaultCodexAppInventoryCache,
 									appCacheKey: pluginAppCacheKey
 								})
@@ -2902,7 +2904,7 @@ function createCodexAttemptTurnWatchController(params) {
 	};
 	function scheduleCompletionIdleWatch() {
 		clearCompletionIdleTimer();
-		if (params.isCompleted() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
+		if (params.isCompleted() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0 || params.getActiveCompletionBlockerItemCount() > 0) return;
 		const elapsedMs = Math.max(0, Date.now() - completionLastActivityAt);
 		const delayMs = Math.max(1, (completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs) - elapsedMs);
 		completionIdleTimer = setTimeout(fireCompletionIdleTimeout, delayMs);
@@ -2938,7 +2940,7 @@ function createCodexAttemptTurnWatchController(params) {
 		scheduleTerminalIdleWatch();
 	}
 	function isCompletionIdleTimeoutDueBeforeAttempt(timeoutMs) {
-		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return false;
+		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0 || params.getActiveCompletionBlockerItemCount() > 0) return false;
 		const completionTimeoutMs = completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		if (completionTimeoutMs > timeoutMs) return false;
 		return Math.max(0, Date.now() - completionLastActivityAt) >= completionTimeoutMs;
@@ -3028,7 +3030,7 @@ function createCodexAttemptTurnWatchController(params) {
 		params.onAbort("turn_progress_idle_timeout");
 	}
 	function fireCompletionIdleTimeout() {
-		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0) return;
+		if (params.isCompleted() || params.isTerminalTurnNotificationQueued() || params.signal.aborted || !completionIdleWatchArmed || params.getActiveAppServerTurnRequests() > 0 || params.getActiveCompletionBlockerItemCount() > 0) return;
 		const timeoutMs = completionIdleTimeoutOverrideMs ?? turnCompletionIdleTimeoutMs;
 		const idleMs = Math.max(0, Date.now() - completionLastActivityAt);
 		if (idleMs < timeoutMs) {
@@ -3974,6 +3976,7 @@ var CodexAppServerEventProjector = class {
 			currentAttemptAssistant,
 			...this.lastNativeToolError ? { lastToolError: this.lastNativeToolError } : {},
 			didSendViaMessagingTool: toolTelemetry.didSendViaMessagingTool,
+			didDeliverSourceReplyViaMessageTool: toolTelemetry.didDeliverSourceReplyViaMessageTool === true,
 			messagingToolSentTexts: toolTelemetry.messagingToolSentTexts,
 			messagingToolSentMediaUrls: toolTelemetry.messagingToolSentMediaUrls,
 			messagingToolSentTargets: toolTelemetry.messagingToolSentTargets,
@@ -7112,6 +7115,7 @@ const JWT_VALUE_RE = /\beyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]
 const COOKIE_PAIR_RE = /\b([A-Za-z][A-Za-z0-9_.-]{1,64})=([A-Za-z0-9+/._~%=-]{16,})(?=;|\s|$)/gu;
 const TRAJECTORY_RUNTIME_FILE_MAX_BYTES = 50 * 1024 * 1024;
 const TRAJECTORY_RUNTIME_EVENT_MAX_BYTES = 256 * 1024;
+const TRAJECTORY_RUNTIME_OVERSIZE_PRESERVED_DATA_KEYS = ["usage", "promptCache"];
 /** Resolves secure create/truncate flags for trajectory pointer files. */
 function resolveCodexTrajectoryPointerFlags(constants = fsSync.constants) {
 	const noFollow = constants.O_NOFOLLOW;
@@ -7129,16 +7133,41 @@ function boundedTrajectoryLine(event) {
 	const line = JSON.stringify(event);
 	const bytes = Buffer.byteLength(line, "utf8");
 	if (bytes <= TRAJECTORY_RUNTIME_EVENT_MAX_BYTES) return `${line}\n`;
-	const truncated = JSON.stringify({
-		...event,
-		data: {
-			truncated: true,
-			originalBytes: bytes,
-			limitBytes: TRAJECTORY_RUNTIME_EVENT_MAX_BYTES,
-			reason: "trajectory-event-size-limit"
+	const originalData = event.data && typeof event.data === "object" && !Array.isArray(event.data) ? event.data : {};
+	const originalDataKeys = Object.keys(originalData);
+	const preservedDataKeys = /* @__PURE__ */ new Set();
+	const baseData = {
+		truncated: true,
+		originalBytes: bytes,
+		limitBytes: TRAJECTORY_RUNTIME_EVENT_MAX_BYTES,
+		reason: "trajectory-event-size-limit"
+	};
+	const buildTruncatedLine = (includeDroppedFields) => {
+		const data = { ...baseData };
+		for (const key of TRAJECTORY_RUNTIME_OVERSIZE_PRESERVED_DATA_KEYS) if (preservedDataKeys.has(key)) data[key] = originalData[key];
+		if (includeDroppedFields) {
+			const droppedFields = originalDataKeys.filter((key) => !preservedDataKeys.has(key));
+			if (droppedFields.length > 0) data.droppedFields = droppedFields;
+		}
+		const truncated = JSON.stringify({
+			...event,
+			data
+		});
+		if (Buffer.byteLength(truncated, "utf8") <= TRAJECTORY_RUNTIME_EVENT_MAX_BYTES) return `${truncated}\n`;
+	};
+	let best = buildTruncatedLine(true) ?? buildTruncatedLine(false);
+	if (!best) return;
+	for (const key of TRAJECTORY_RUNTIME_OVERSIZE_PRESERVED_DATA_KEYS) {
+		if (!Object.hasOwn(originalData, key)) continue;
+		preservedDataKeys.add(key);
+		const next = buildTruncatedLine(true) ?? buildTruncatedLine(false);
+		if (next) {
+			best = next;
+			continue;
 		}
-	});
-	if (Buffer.byteLength(truncated, "utf8") <= TRAJECTORY_RUNTIME_EVENT_MAX_BYTES) return `${truncated}\n`;
+		preservedDataKeys.delete(key);
+	}
+	return best;
 }
 function resolveTrajectoryPointerFilePath(sessionFile) {
 	return sessionFile.endsWith(".jsonl") ? `${sessionFile.slice(0, -6)}.trajectory-path.json` : `${sessionFile}.trajectory-path.json`;
@@ -8021,9 +8050,11 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			currentChannelProvider: resolveCodexMessageToolProvider(params),
 			currentChannelId: params.currentChannelId,
 			currentMessagingTarget: params.currentMessagingTarget,
+			currentMessageId: params.currentMessageId,
 			currentThreadId: params.currentThreadTs,
 			replyToMode: params.replyToMode,
 			hasRepliedRef: params.hasRepliedRef,
+			sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
 			onToolOutcome: onCodexToolOutcome,
 			allocateToolOutcomeOrdinal: allocateCodexToolOutcomeOrdinal
 		}
@@ -8193,6 +8224,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		developerInstructions,
 		messages: codexModelInputHistoryMessages,
 		ctx: hookContext,
+		bootstrapContextRunKind: params.bootstrapContextRunKind,
 		..."beforeAgentStartResult" in params ? { beforeAgentStartResult: params.beforeAgentStartResult } : {}
 	});
 	const resolveShiftedPromptInputRange = (prompt, promptInputRange, turnPromptText) => {
@@ -8488,6 +8520,46 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		client = startupResult.client;
 		thread = startupResult.thread;
 		pluginAppServer = startupResult.pluginAppServer;
+		if (thread.lifecycle.action === "started") {
+			const activeThreadReviewerPolicyContext = resolveCodexModelBackedReviewerPolicyContext({
+				provider: params.provider,
+				model: params.modelId,
+				bindingModelProvider: thread.modelProvider,
+				bindingModel: thread.model,
+				nativeAuthProfile: isCodexAppServerNativeAuthProfile({
+					authProfileId: startupAuthProfileId,
+					authProfileStore: params.authProfileStore,
+					agentDir,
+					config: params.config
+				})
+			});
+			const activeThreadAppServer = resolveCodexAppServerForModelProvider({
+				appServer: resolveCodexAppServerRuntimeOptions({
+					pluginConfig,
+					execPolicy,
+					modelProvider: activeThreadReviewerPolicyContext.modelProvider,
+					model: activeThreadReviewerPolicyContext.model,
+					config: params.config,
+					agentDir,
+					openClawSandboxActive: sandbox?.enabled === true
+				}),
+				provider: activeThreadReviewerPolicyContext.modelProvider,
+				model: activeThreadReviewerPolicyContext.model,
+				config: params.config,
+				env: process.env,
+				agentDir
+			});
+			const previousApprovalsReviewer = pluginAppServer.approvalsReviewer;
+			pluginAppServer = {
+				...pluginAppServer,
+				approvalsReviewer: activeThreadAppServer.approvalsReviewer
+			};
+			if (pluginAppServer.approvalsReviewer !== previousApprovalsReviewer) embeddedAgentLog.info("codex app-server approval reviewer updated from active thread model provider", {
+				from: previousApprovalsReviewer,
+				to: pluginAppServer.approvalsReviewer,
+				modelProvider: activeThreadReviewerPolicyContext.modelProvider
+			});
+		}
 		sandboxExecEnvironmentAcquired = Boolean(startupResult.sandboxEnvironment);
 		codexEnvironmentSelection = startupResult.environmentSelection;
 		codexExecutionCwd = startupResult.executionCwd;
@@ -8546,12 +8618,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 	const turnCompletionIdleTimeoutMs = resolveCodexTurnCompletionIdleTimeoutMs(options.turnCompletionIdleTimeoutMs ?? appServer.turnCompletionIdleTimeoutMs);
 	const turnAssistantCompletionIdleTimeoutMs = resolveCodexTurnAssistantCompletionIdleTimeoutMs(options.turnAssistantCompletionIdleTimeoutMs);
 	const postToolRawAssistantCompletionIdleTimeoutMs = resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs(options.postToolRawAssistantCompletionIdleTimeoutMs ?? appServer.postToolRawAssistantCompletionIdleTimeoutMs, turnAssistantCompletionIdleTimeoutMs);
-	const turnTerminalIdleTimeoutMs = resolveCodexTurnTerminalIdleTimeoutMs(options.turnTerminalIdleTimeoutMs);
+	const turnTerminalIdleTimeoutMs = resolveCodexTurnTerminalIdleTimeoutMs(options.turnTerminalIdleTimeoutMs, params.runTimeoutOverrideMs);
 	const turnAttemptIdleTimeoutMs = Math.max(100, Math.floor(params.timeoutMs));
 	let nativeHookRelayLastRenewedAt = 0;
 	let activeAppServerTurnRequests = 0;
 	const pendingOpenClawDynamicToolCompletionIds = /* @__PURE__ */ new Set();
 	const activeTurnItemIds = /* @__PURE__ */ new Set();
+	const activeCompletionBlockerItemIds = /* @__PURE__ */ new Set();
 	let turnCrossedToolHandoff = false;
 	let pendingTerminalDynamicToolRelease;
 	let terminalDynamicToolReleaseCheckScheduled = false;
@@ -8582,6 +8655,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		isTerminalTurnNotificationQueued: () => terminalTurnNotificationQueued,
 		getActiveAppServerTurnRequests: () => activeAppServerTurnRequests,
 		getActiveTurnItemCount: () => activeTurnItemIds.size,
+		getActiveCompletionBlockerItemCount: () => activeCompletionBlockerItemIds.size,
 		turnCompletionIdleTimeoutMs,
 		turnAssistantCompletionIdleTimeoutMs,
 		turnAttemptIdleTimeoutMs,
@@ -8793,6 +8867,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			currentPromptTexts: [codexTurnPromptText],
 			turnWatches,
 			activeTurnItemIds,
+			activeCompletionBlockerItemIds,
 			activeAppServerTurnRequests,
 			pendingOpenClawDynamicToolCompletionIds,
 			turnCrossedToolHandoff,
@@ -9506,12 +9581,13 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		kind: "embedded",
 		queueMessage: async (text, optionsLocal) => activeSteeringQueue.queue(text, optionsLocal),
 		isStreaming: () => !completed && !runAbortController.signal.aborted,
+		isStopped: () => completed || timedOut || runAbortController.signal.aborted,
 		isCompacting: () => projectorRef.current?.isCompacting() ?? false,
 		sourceReplyDeliveryMode: params.sourceReplyDeliveryMode,
 		cancel: () => runAbortController.abort("cancelled"),
 		abort: () => runAbortController.abort("aborted")
 	};
-	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
+	setActiveEmbeddedRun(params.sessionId, handle, params.sessionKey, params.sessionFile);
 	const notifyUserMessagePersisted = createCodexAppServerUserMessagePersistenceNotifier(params);
 	mirrorPromptAtTurnStartBestEffort({
 		params,
@@ -9648,6 +9724,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		});
 		if (activeContextEngine) {
 			const activeContextEnginePluginIdLocal = resolveContextEngineOwnerPluginId(activeContextEngine);
+			const isHeartbeatLifecycleRun = params.bootstrapContextRunKind === "heartbeat" || params.bootstrapContextRunKind === "commitment-only";
 			const finalMessages = await readMirroredSessionHistoryMessages(activeTranscriptTarget) ?? historyMessages.concat(result.messagesSnapshot);
 			await finalizeHarnessContextEngineTurn({
 				contextEngine: activeContextEngine,
@@ -9680,7 +9757,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 				runMaintenance: runHarnessContextEngineMaintenance,
 				config: params.config,
 				warn: (message) => embeddedAgentLog.warn(message),
-				isHeartbeat: params.bootstrapContextRunKind === "heartbeat"
+				isHeartbeat: isHeartbeatLifecycleRun
 			});
 		}
 		runAgentHarnessLlmOutputHook({
@@ -9779,7 +9856,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		runAbortController.signal.removeEventListener("abort", abortListener);
 		params.abortSignal?.removeEventListener("abort", abortFromUpstream);
 		steeringQueueRef.current?.cancel();
-		clearActiveEmbeddedRun(params.sessionId, handle, params.sessionKey);
+		clearActiveEmbeddedRun(params.sessionId, handle, params.sessionKey, params.sessionFile);
 	}
 }
 function readDynamicToolCallParams(value) {

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

@@ -135,6 +135,8 @@ const DIRECT_METHOD_POLICIES = new Map([
 	["account/read", "allowed-control-plane"],
 	["app/list", "allowed-control-plane"],
 	["config/mcpServer/reload", "allowed-control-plane"],
+	["config/read", "allowed-control-plane"],
+	["config/value/write", "allowed-control-plane"],
 	["environment/add", "allowed-control-plane"],
 	["experimentalFeature/enablement/set", "allowed-control-plane"],
 	["feedback/upload", "allowed-control-plane"],

package/dist/{session-binding-HOuPt-E0.js → session-binding-Cm0Gg7Z1.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { l as normalizeCodexServiceTier } from "./config-CszD0vP3.js";
+import { l as normalizeCodexServiceTier } from "./config-C_whBx3M.js";
 import fs from "node:fs/promises";
 import { ensureAuthProfileStore, resolveDefaultAgentDir, resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -221,6 +221,7 @@ function readDestructiveApprovalMode(value, bindingSchemaVersion) {
 	if (value === "deny") return "deny";
 	if (value === "allow") return "allow";
 	if (value === "auto") return bindingSchemaVersion === 1 ? "allow" : "auto";
+	if (value === "ask" && bindingSchemaVersion === 2) return "ask";
 	if (value === "on-request" && bindingSchemaVersion === 1) return "auto";
 	return "invalid";
 }