@openclaw/codex 2026.6.11 → 2026.7.1-beta.2

package/dist/{protocol-validators-B19q5BIX.js → protocol-validators-CJiWigAJ.js}

@@ -1,3 +1,4 @@
+import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { Compile } from "typebox/compile";
 //#region extensions/codex/src/app-server/protocol-generated/json/DynamicToolCallParams.json
 var DynamicToolCallParams_default = {
@@ -642,6 +643,16 @@ var ThreadResumeResponse_default = {
 			],
 			"type": "string"
 		},
+		"LegacyAppPathString": { "type": "string" },
+		"McpToolCallAppContext": {
+			"properties": {
+				"connectorId": { "type": "string" },
+				"linkId": { "type": ["string", "null"] },
+				"resourceUri": { "type": ["string", "null"] }
+			},
+			"required": ["connectorId"],
+			"type": "object"
+		},
 		"McpToolCallError": {
 			"properties": { "message": { "type": "string" } },
 			"required": ["message"],
@@ -716,6 +727,15 @@ var ThreadResumeResponse_default = {
 				"type": "string"
 			}]
 		},
+		"MultiAgentMode": {
+			"description": "Controls whether the model receives multi-agent delegation instructions and, when it does, whether it should only spawn sub-agents after an explicit user request or may delegate proactively when doing so would help. `none` leaves the multi-agent tools available without injecting delegation instructions.",
+			"enum": [
+				"none",
+				"explicitRequestOnly",
+				"proactive"
+			],
+			"type": "string"
+		},
 		"NetworkAccess": {
 			"enum": ["restricted", "enabled"],
 			"type": "string"
@@ -996,6 +1016,11 @@ var ThreadResumeResponse_default = {
 					"description": "Usually the first user message in the thread, if available.",
 					"type": "string"
 				},
+				"recencyAt": {
+					"description": "Unix timestamp (in seconds) used for thread recency ordering.",
+					"format": "int64",
+					"type": ["integer", "null"]
+				},
 				"sessionId": {
 					"description": "Session id shared by threads that belong to the same session tree.",
 					"type": "string"
@@ -1172,7 +1197,7 @@ var ThreadResumeResponse_default = {
 						"type": "array"
 					},
 					"cwd": {
-						"allOf": [{ "$ref": "#/definitions/AbsolutePathBuf" }],
+						"allOf": [{ "$ref": "#/definitions/LegacyAppPathString" }],
 						"description": "The command's working directory."
 					},
 					"durationMs": {
@@ -1237,6 +1262,7 @@ var ThreadResumeResponse_default = {
 			},
 			{
 				"properties": {
+					"appContext": { "anyOf": [{ "$ref": "#/definitions/McpToolCallAppContext" }, { "type": "null" }] },
 					"arguments": true,
 					"durationMs": {
 						"description": "The duration of the MCP tool call in milliseconds.",
@@ -1245,7 +1271,10 @@ var ThreadResumeResponse_default = {
 					},
 					"error": { "anyOf": [{ "$ref": "#/definitions/McpToolCallError" }, { "type": "null" }] },
 					"id": { "type": "string" },
-					"mcpAppResourceUri": { "type": ["string", "null"] },
+					"mcpAppResourceUri": {
+						"description": "Deprecated: use `appContext.resourceUri` instead.",
+						"type": ["string", "null"]
+					},
 					"pluginId": { "type": ["string", "null"] },
 					"result": { "anyOf": [{ "$ref": "#/definitions/McpToolCallResult" }, { "type": "null" }] },
 					"server": { "type": "string" },
@@ -1819,12 +1848,17 @@ var ThreadResumeResponse_default = {
 		},
 		"instructionSources": {
 			"default": [],
-			"description": "Instruction source files currently loaded for this thread.",
-			"items": { "$ref": "#/definitions/AbsolutePathBuf" },
+			"description": "Environment-native paths to instruction source files currently loaded for this thread.",
+			"items": { "$ref": "#/definitions/LegacyAppPathString" },
 			"type": "array"
 		},
 		"model": { "type": "string" },
 		"modelProvider": { "type": "string" },
+		"multiAgentMode": {
+			"allOf": [{ "$ref": "#/definitions/MultiAgentMode" }],
+			"default": "explicitRequestOnly",
+			"description": "@deprecated Always `explicitRequestOnly`. Use `reasoningEffort` for Ultra behavior."
+		},
 		"reasoningEffort": { "anyOf": [{ "$ref": "#/definitions/ReasoningEffort" }, { "type": "null" }] },
 		"runtimeWorkspaceRoots": {
 			"default": [],
@@ -2218,6 +2252,16 @@ var ThreadStartResponse_default = {
 			],
 			"type": "string"
 		},
+		"LegacyAppPathString": { "type": "string" },
+		"McpToolCallAppContext": {
+			"properties": {
+				"connectorId": { "type": "string" },
+				"linkId": { "type": ["string", "null"] },
+				"resourceUri": { "type": ["string", "null"] }
+			},
+			"required": ["connectorId"],
+			"type": "object"
+		},
 		"McpToolCallError": {
 			"properties": { "message": { "type": "string" } },
 			"required": ["message"],
@@ -2292,6 +2336,15 @@ var ThreadStartResponse_default = {
 				"type": "string"
 			}]
 		},
+		"MultiAgentMode": {
+			"description": "Controls whether the model receives multi-agent delegation instructions and, when it does, whether it should only spawn sub-agents after an explicit user request or may delegate proactively when doing so would help. `none` leaves the multi-agent tools available without injecting delegation instructions.",
+			"enum": [
+				"none",
+				"explicitRequestOnly",
+				"proactive"
+			],
+			"type": "string"
+		},
 		"NetworkAccess": {
 			"enum": ["restricted", "enabled"],
 			"type": "string"
@@ -2572,6 +2625,11 @@ var ThreadStartResponse_default = {
 					"description": "Usually the first user message in the thread, if available.",
 					"type": "string"
 				},
+				"recencyAt": {
+					"description": "Unix timestamp (in seconds) used for thread recency ordering.",
+					"format": "int64",
+					"type": ["integer", "null"]
+				},
 				"sessionId": {
 					"description": "Session id shared by threads that belong to the same session tree.",
 					"type": "string"
@@ -2748,7 +2806,7 @@ var ThreadStartResponse_default = {
 						"type": "array"
 					},
 					"cwd": {
-						"allOf": [{ "$ref": "#/definitions/AbsolutePathBuf" }],
+						"allOf": [{ "$ref": "#/definitions/LegacyAppPathString" }],
 						"description": "The command's working directory."
 					},
 					"durationMs": {
@@ -2813,6 +2871,7 @@ var ThreadStartResponse_default = {
 			},
 			{
 				"properties": {
+					"appContext": { "anyOf": [{ "$ref": "#/definitions/McpToolCallAppContext" }, { "type": "null" }] },
 					"arguments": true,
 					"durationMs": {
 						"description": "The duration of the MCP tool call in milliseconds.",
@@ -2821,7 +2880,10 @@ var ThreadStartResponse_default = {
 					},
 					"error": { "anyOf": [{ "$ref": "#/definitions/McpToolCallError" }, { "type": "null" }] },
 					"id": { "type": "string" },
-					"mcpAppResourceUri": { "type": ["string", "null"] },
+					"mcpAppResourceUri": {
+						"description": "Deprecated: use `appContext.resourceUri` instead.",
+						"type": ["string", "null"]
+					},
 					"pluginId": { "type": ["string", "null"] },
 					"result": { "anyOf": [{ "$ref": "#/definitions/McpToolCallResult" }, { "type": "null" }] },
 					"server": { "type": "string" },
@@ -3378,12 +3440,17 @@ var ThreadStartResponse_default = {
 		"cwd": { "$ref": "#/definitions/AbsolutePathBuf" },
 		"instructionSources": {
 			"default": [],
-			"description": "Instruction source files currently loaded for this thread.",
-			"items": { "$ref": "#/definitions/AbsolutePathBuf" },
+			"description": "Environment-native paths to instruction source files currently loaded for this thread.",
+			"items": { "$ref": "#/definitions/LegacyAppPathString" },
 			"type": "array"
 		},
 		"model": { "type": "string" },
 		"modelProvider": { "type": "string" },
+		"multiAgentMode": {
+			"allOf": [{ "$ref": "#/definitions/MultiAgentMode" }],
+			"default": "explicitRequestOnly",
+			"description": "@deprecated Always `explicitRequestOnly`. Use `reasoningEffort` for Ultra behavior."
+		},
 		"reasoningEffort": { "anyOf": [{ "$ref": "#/definitions/ReasoningEffort" }, { "type": "null" }] },
 		"runtimeWorkspaceRoots": {
 			"default": [],
@@ -3709,6 +3776,16 @@ var TurnCompletedNotification_default = {
 			],
 			"type": "string"
 		},
+		"LegacyAppPathString": { "type": "string" },
+		"McpToolCallAppContext": {
+			"properties": {
+				"connectorId": { "type": "string" },
+				"linkId": { "type": ["string", "null"] },
+				"resourceUri": { "type": ["string", "null"] }
+			},
+			"required": ["connectorId"],
+			"type": "object"
+		},
 		"McpToolCallError": {
 			"properties": { "message": { "type": "string" } },
 			"required": ["message"],
@@ -3986,7 +4063,7 @@ var TurnCompletedNotification_default = {
 						"type": "array"
 					},
 					"cwd": {
-						"allOf": [{ "$ref": "#/definitions/AbsolutePathBuf" }],
+						"allOf": [{ "$ref": "#/definitions/LegacyAppPathString" }],
 						"description": "The command's working directory."
 					},
 					"durationMs": {
@@ -4051,6 +4128,7 @@ var TurnCompletedNotification_default = {
 			},
 			{
 				"properties": {
+					"appContext": { "anyOf": [{ "$ref": "#/definitions/McpToolCallAppContext" }, { "type": "null" }] },
 					"arguments": true,
 					"durationMs": {
 						"description": "The duration of the MCP tool call in milliseconds.",
@@ -4059,7 +4137,10 @@ var TurnCompletedNotification_default = {
 					},
 					"error": { "anyOf": [{ "$ref": "#/definitions/McpToolCallError" }, { "type": "null" }] },
 					"id": { "type": "string" },
-					"mcpAppResourceUri": { "type": ["string", "null"] },
+					"mcpAppResourceUri": {
+						"description": "Deprecated: use `appContext.resourceUri` instead.",
+						"type": ["string", "null"]
+					},
 					"pluginId": { "type": ["string", "null"] },
 					"result": { "anyOf": [{ "$ref": "#/definitions/McpToolCallResult" }, { "type": "null" }] },
 					"server": { "type": "string" },
@@ -4860,6 +4941,16 @@ var TurnStartResponse_default = {
 			],
 			"type": "string"
 		},
+		"LegacyAppPathString": { "type": "string" },
+		"McpToolCallAppContext": {
+			"properties": {
+				"connectorId": { "type": "string" },
+				"linkId": { "type": ["string", "null"] },
+				"resourceUri": { "type": ["string", "null"] }
+			},
+			"required": ["connectorId"],
+			"type": "object"
+		},
 		"McpToolCallError": {
 			"properties": { "message": { "type": "string" } },
 			"required": ["message"],
@@ -5137,7 +5228,7 @@ var TurnStartResponse_default = {
 						"type": "array"
 					},
 					"cwd": {
-						"allOf": [{ "$ref": "#/definitions/AbsolutePathBuf" }],
+						"allOf": [{ "$ref": "#/definitions/LegacyAppPathString" }],
 						"description": "The command's working directory."
 					},
 					"durationMs": {
@@ -5202,6 +5293,7 @@ var TurnStartResponse_default = {
 			},
 			{
 				"properties": {
+					"appContext": { "anyOf": [{ "$ref": "#/definitions/McpToolCallAppContext" }, { "type": "null" }] },
 					"arguments": true,
 					"durationMs": {
 						"description": "The duration of the MCP tool call in milliseconds.",
@@ -5210,7 +5302,10 @@ var TurnStartResponse_default = {
 					},
 					"error": { "anyOf": [{ "$ref": "#/definitions/McpToolCallError" }, { "type": "null" }] },
 					"id": { "type": "string" },
-					"mcpAppResourceUri": { "type": ["string", "null"] },
+					"mcpAppResourceUri": {
+						"description": "Deprecated: use `appContext.resourceUri` instead.",
+						"type": ["string", "null"]
+					},
 					"pluginId": { "type": ["string", "null"] },
 					"result": { "anyOf": [{ "$ref": "#/definitions/McpToolCallResult" }, { "type": "null" }] },
 					"server": { "type": "string" },
@@ -5722,9 +5817,6 @@ function compileCodexSchema(schema) {
 		errors: (value) => [...validator.Errors(value)]
 	};
 }
-function isRecord(value) {
-	return Boolean(value && typeof value === "object" && !Array.isArray(value));
-}
 const schemaMapKeywords = new Set([
 	"$defs",
 	"definitions",

package/dist/{provider-capabilities-D7hnTO76.js → provider-capabilities-wqedK49Z.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-D6R40plk.js";
+import { c as isTrustedCodexModelBackedOpenAIProvider, u as readCodexPluginConfig } from "./config-C_whBx3M.js";
+import { a as formatCodexDisplayText } from "./app-server-policy-B7hqD3Xj.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,139 @@ 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 ALWAYS_DIRECT_DYNAMIC_TOOL_NAMES = new Set([
+	"agents_list",
+	"sessions_spawn",
+	"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 +1831,7 @@ function createCodexDynamicToolBridge(params) {
 	emitQuarantinedDynamicToolDiagnostics(quarantinedTools, params.hookContext);
 	const telemetry = {
 		didSendViaMessagingTool: false,
+		didDeliverSourceReplyViaMessageTool: false,
 		messagingToolSentTexts: [],
 		messagingToolSentMediaUrls: [],
 		messagingToolSentTargets: [],
@@ -1827,7 +1959,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 +1975,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 +2306,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 +2383,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 +2753,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 +2767,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
 		}
 	};