@openclaw/codex 2026.6.33 → 2026.6.35

package/dist/provider-catalog.js

@@ -6,44 +6,85 @@ const CODEX_BASE_URL = "https://chatgpt.com/backend-api";
 /** Synthetic auth marker understood by Codex app-server runtime paths. */
 const CODEX_APP_SERVER_AUTH_MARKER = "codex-app-server";
 const DEFAULT_CONTEXT_WINDOW = 272e3;
+const DEFAULT_RUNTIME_CONTEXT_TOKENS = 272e3;
 const DEFAULT_MAX_TOKENS = 128e3;
+const KNOWN_CONTEXT_WINDOW_BY_MODEL_ID = Object.freeze({
+	"gpt-5.6-sol": 372e3,
+	"gpt-5.6-terra": 372e3,
+	"gpt-5.6-luna": 372e3
+});
 /** Offline fallback catalog used when live app-server discovery is unavailable. */
-const FALLBACK_CODEX_MODELS = [{
-	id: "gpt-5.5",
-	model: "gpt-5.5",
-	displayName: "gpt-5.5",
-	description: "Latest frontier agentic coding model.",
-	isDefault: true,
-	inputModalities: ["text", "image"],
-	supportedReasoningEfforts: [
-		"low",
-		"medium",
-		"high",
-		"xhigh"
-	]
-}, {
-	id: "gpt-5.4-mini",
-	model: "gpt-5.4-mini",
-	displayName: "GPT-5.4-Mini",
-	description: "Smaller frontier agentic coding model.",
-	inputModalities: ["text", "image"],
-	supportedReasoningEfforts: [
-		"low",
-		"medium",
-		"high",
-		"xhigh"
-	]
-}];
+const FALLBACK_CODEX_MODELS = [
+	{
+		id: "gpt-5.6-sol",
+		model: "gpt-5.6-sol",
+		displayName: "GPT-5.6 Sol",
+		description: "Latest frontier agentic coding model.",
+		isDefault: true,
+		contextWindow: 372e3,
+		inputModalities: ["text", "image"],
+		supportedReasoningEfforts: [
+			"low",
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		]
+	},
+	{
+		id: "gpt-5.6-luna",
+		model: "gpt-5.6-luna",
+		displayName: "GPT-5.6 Luna",
+		description: "High-throughput frontier agentic coding model.",
+		contextWindow: 372e3,
+		inputModalities: ["text", "image"],
+		supportedReasoningEfforts: [
+			"low",
+			"medium",
+			"high",
+			"xhigh",
+			"max"
+		]
+	},
+	{
+		id: "gpt-5.5",
+		model: "gpt-5.5",
+		displayName: "GPT-5.5",
+		description: "Previous frontier agentic coding model.",
+		inputModalities: ["text", "image"],
+		supportedReasoningEfforts: [
+			"low",
+			"medium",
+			"high",
+			"xhigh"
+		]
+	},
+	{
+		id: "gpt-5.4-mini",
+		model: "gpt-5.4-mini",
+		displayName: "GPT-5.4-Mini",
+		description: "Smaller frontier agentic coding model.",
+		inputModalities: ["text", "image"],
+		supportedReasoningEfforts: [
+			"low",
+			"medium",
+			"high",
+			"xhigh"
+		]
+	}
+];
 /**
 * Converts a Codex app-server model record into OpenClaw provider model config.
 */
 function buildCodexModelDefinition(model) {
 	const id = model.id.trim() || model.model.trim();
+	const supportedReasoningEfforts = model.supportedReasoningEfforts;
+	const contextWindow = model.contextWindow ?? KNOWN_CONTEXT_WINDOW_BY_MODEL_ID[id] ?? DEFAULT_CONTEXT_WINDOW;
 	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,
@@ -51,10 +92,12 @@ function buildCodexModelDefinition(model) {
 			cacheRead: 0,
 			cacheWrite: 0
 		},
-		contextWindow: DEFAULT_CONTEXT_WINDOW,
+		contextWindow,
+		contextTokens: Math.min(contextWindow, DEFAULT_RUNTIME_CONTEXT_TOKENS),
 		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-J2nTGL8Q.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-CojmGiaW.js";
+export { buildCodexProvider, buildCodexProviderCatalog, isMaxReasoningCodexModel, isModernCodexModel, readCodexSupportedReasoningEfforts, resolveCodexSupportedReasoningEffort };

package/dist/{run-attempt-CDCK3aeX.js → run-attempt-Do5QKTZ-.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-DXrm-WWA.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-Dl3RWAT-.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-BDghpA0C.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-Bzk6P-cp.js";
 import { a as isCodexAppServerApprovalPolicyAllowedByRequirements, d as resolveCodexComputerUseConfig, f as resolveCodexModelBackedReviewerPolicyContext, g as withMcpElicitationsApprovalPolicy, h as shouldAutoApproveCodexAppServerApprovals, l as readCodexPluginConfig, m as resolveOpenClawExecPolicyForCodexAppServer, p as resolveCodexPluginsPolicy, s as isCodexSandboxExecServerEnabled, u as resolveCodexAppServerRuntimeOptions } from "./config-DfV7hMHu.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-J2nTGL8Q.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-CojmGiaW.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-DsqoRGhJ.js";
 import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding, r as clearCodexAppServerBindingForThread } from "./session-binding-CP5b8iN1.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-BwzTPSGU.js";
-import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BaB2492Z.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS, t as buildCodexAppServerRuntimeFingerprint } from "./plugin-app-cache-key-D5ckrLBm.js";
+import { a as formatCodexDisplayText, n as resolveCodexAppServerForOpenClawToolPolicy, t as resolveCodexAppServerForModelProvider } from "./app-server-policy-UdM9fipd.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-Ll9fWpy9.js";
 import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-E-67xUhS.js";
-import { A as resolveCodexAppServerExecutionCwd, B as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as emitDynamicToolErrorDiagnostic, D as createCodexDynamicToolBuildStageTracker, E as buildDynamicTools, F as shouldEnableCodexAppServerNativeToolSurface, G as resolveCodexTurnTerminalIdleTimeoutMs, H as resolveCodexStartupTimeoutMs, I as shouldRequireCodexSandboxExecServerEnvironment, K as withCodexStartupTimeout, L as shouldWarnCodexDynamicToolBuildStageSummary, M as resolveCodexExternalSandboxPolicyForOpenClawSandbox, N as resolveCodexMessageToolProvider, O as disableCodexPluginThreadConfig, P as resolveCodexSandboxEnvironmentSelection, S as toCodexDynamicToolProtocolResponse, T as emitDynamicToolTerminalDiagnostic, U as resolveCodexTurnAssistantCompletionIdleTimeoutMs, V as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, W as resolveCodexTurnCompletionIdleTimeoutMs, _ as resolveDynamicToolCallTimeoutMs, a as buildCodexNativeHookRelayConfig, b as shouldReleaseTurnAfterTerminalDynamicTool, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as isMatchingDynamicToolTerminalDiagnostic, h as isDynamicToolTerminalDiagnosticEvent, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexAppServerHookChannelId, k as formatCodexDynamicToolBuildStageSummary, l as resolveCodexNativeHookRelayTtlMs, m as hasPendingDynamicToolTerminalDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as handleDynamicToolCallWithTimeout, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as resolveTerminalDynamicToolBatchAction, w as emitDynamicToolStartedDiagnostic, x as toCodexDynamicToolProgressResponse, y as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult, z as handleCodexAppServerApprovalRequest } from "./provider-capabilities-B3pUz-8b.js";
-import { t as ensureCodexComputerUse } from "./computer-use-B_iZKrBI.js";
+import { A as resolveCodexAppServerExecutionCwd, B as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, C as emitDynamicToolErrorDiagnostic, D as createCodexDynamicToolBuildStageTracker, E as buildDynamicTools, F as shouldEnableCodexAppServerNativeToolSurface, G as resolveCodexTurnTerminalIdleTimeoutMs, H as resolveCodexStartupTimeoutMs, I as shouldRequireCodexSandboxExecServerEnvironment, K as withCodexStartupTimeout, L as shouldWarnCodexDynamicToolBuildStageSummary, M as resolveCodexExternalSandboxPolicyForOpenClawSandbox, N as resolveCodexMessageToolProvider, O as disableCodexPluginThreadConfig, P as resolveCodexSandboxEnvironmentSelection, S as toCodexDynamicToolProtocolResponse, T as emitDynamicToolTerminalDiagnostic, U as resolveCodexTurnAssistantCompletionIdleTimeoutMs, V as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, W as resolveCodexTurnCompletionIdleTimeoutMs, _ as resolveDynamicToolCallTimeoutMs, a as buildCodexNativeHookRelayConfig, b as shouldReleaseTurnAfterTerminalDynamicTool, c as resolveCodexNativeHookRelayEvents, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, g as isMatchingDynamicToolTerminalDiagnostic, h as isDynamicToolTerminalDiagnosticEvent, i as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, j as resolveCodexAppServerHookChannelId, k as formatCodexDynamicToolBuildStageSummary, l as resolveCodexNativeHookRelayTtlMs, m as hasPendingDynamicToolTerminalDiagnostic, o as buildCodexNativeHookRelayDisabledConfig, p as handleDynamicToolCallWithTimeout, s as createCodexNativeHookRelay, t as resolveCodexProviderWebSearchSupport, u as scheduleCodexNativeHookRelayUnregister, v as resolveTerminalDynamicToolBatchAction, w as emitDynamicToolStartedDiagnostic, x as toCodexDynamicToolProgressResponse, y as shouldBlockTerminalReleaseForNonTerminalDynamicToolResult, z as handleCodexAppServerApprovalRequest } from "./provider-capabilities-Cu8jJpp3.js";
+import { t as ensureCodexComputerUse } from "./computer-use-XfHZnTBE.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";
@@ -5501,7 +5501,14 @@ var CodexNativeSubagentTaskMirror = class {
 			this.handleThreadStatusChanged(params);
 			return;
 		}
-		if (notification.method === "item/started" || notification.method === "item/completed") this.handleCollabAgentItem(params);
+		if (notification.method === "item/started" || notification.method === "item/completed") {
+			const item = isJsonObject(params.item) ? params.item : void 0;
+			if (notification.method === "item/completed" && item && readString$3(item, "type") === "subAgentActivity") {
+				this.handleSubagentActivityItem(params);
+				return;
+			}
+			this.handleCollabAgentItem(params);
+		}
 	}
 	handleThreadStarted(params) {
 		const notification = readThreadStartedNotification(params);
@@ -5615,31 +5622,56 @@ var CodexNativeSubagentTaskMirror = class {
 			this.applyCollabAgentStatus(threadId, toolCallStatus, state?.message);
 		}
 	}
+	handleSubagentActivityItem(params) {
+		const item = isJsonObject(params.item) ? params.item : void 0;
+		if (!item || readString$3(item, "type") !== "subAgentActivity" || readString$3(params, "threadId") !== this.params.parentThreadId) return;
+		const threadId = trimOptional(readString$3(item, "agentThreadId"));
+		if (!threadId || normalizeSubagentActivityKind(readString$3(item, "kind")) !== "started") return;
+		const agentPath = trimOptional(readString$3(item, "agentPath"));
+		const eventAt = this.now();
+		this.createRunningTask({
+			threadId,
+			label: "Codex subagent",
+			task: agentPath ? `Codex native subagent ${agentPath}` : "Codex native subagent",
+			startedAt: eventAt,
+			progressSummary: "Codex native subagent started."
+		});
+	}
 	createTaskFromCollabSpawnItem(threadId, item) {
-		const normalizedThreadId = threadId.trim();
-		if (!normalizedThreadId || this.mirroredThreadIds.has(normalizedThreadId)) return;
-		this.mirroredThreadIds.add(normalizedThreadId);
 		const prompt = trimOptional(readString$3(item, "prompt"));
-		const runId = codexNativeSubagentRunId(normalizedThreadId);
+		const eventAt = this.now();
+		this.createRunningTask({
+			threadId,
+			label: "Codex subagent",
+			task: prompt ?? "Codex native subagent",
+			startedAt: eventAt,
+			progressSummary: "Codex native subagent spawned."
+		});
+	}
+	createRunningTask(params) {
+		const threadId = params.threadId.trim();
+		if (!threadId || this.mirroredThreadIds.has(threadId)) return;
+		this.mirroredThreadIds.add(threadId);
+		const runId = codexNativeSubagentRunId(threadId);
 		const createdAt = this.now();
 		if (!this.runtime.tryCreateRunningTaskRun({
 			sourceId: runId,
 			agentId: this.params.agentId,
 			runId,
-			label: "Codex subagent",
-			task: prompt ?? "Codex native subagent",
+			label: params.label,
+			task: params.task,
 			notifyPolicy: "silent",
 			deliveryStatus: "not_applicable",
 			preferMetadata: true,
-			startedAt: createdAt,
+			startedAt: params.startedAt,
 			lastEventAt: createdAt,
-			progressSummary: "Codex native subagent spawned."
+			progressSummary: params.progressSummary
 		})) {
-			this.mirroredThreadIds.delete(normalizedThreadId);
-			this.failedMirrorThreadIds.add(normalizedThreadId);
+			this.mirroredThreadIds.delete(threadId);
+			this.failedMirrorThreadIds.add(threadId);
 			return;
 		}
-		this.failedMirrorThreadIds.delete(normalizedThreadId);
+		this.failedMirrorThreadIds.delete(threadId);
 		this.terminalRunIds.delete(runId);
 		this.authoritativeRunIds.delete(runId);
 	}
@@ -5761,6 +5793,9 @@ function readNullableString(value, key) {
 function normalizeToolName$1(value) {
 	return value?.replace(/[^a-z0-9]/giu, "").toLowerCase();
 }
+function normalizeSubagentActivityKind(value) {
+	return value?.replace(/[^a-z]/giu, "").toLowerCase() === "started" ? "started" : void 0;
+}
 function normalizeCollabToolCallStatus(value) {
 	const key = value?.replace(/[^a-z0-9]/giu, "").toLowerCase();
 	if (key === "completed" || key === "succeeded" || key === "success") return "completed";
@@ -5842,6 +5877,7 @@ function registerCodexNativeSubagentMonitor(params) {
 		taskRuntimeScope: params.taskRuntimeScope,
 		agentId: params.agentId
 	});
+	return monitor;
 }
 /** Tracks native subagent thread notifications, transcript completions, and task delivery. */
 var CodexNativeSubagentMonitor = class {
@@ -5868,6 +5904,13 @@ var CodexNativeSubagentMonitor = class {
 		this.childThreadIdsByAgentPath.clear();
 		this.transcriptPathsByChildThreadId.clear();
 	}
+	deferUntilParentSettles(parentThreadId, callback) {
+		const normalizedParentThreadId = parentThreadId.trim();
+		const state = this.parentStates.get(normalizedParentThreadId);
+		if (!state || !this.hasUnsettledChildren(normalizedParentThreadId)) return false;
+		state.deferredSettlement = callback;
+		return true;
+	}
 	configure(options) {
 		const codexHome = normalizeOptionalString(options.codexHome);
 		if (codexHome) this.codexHome = codexHome;
@@ -5905,10 +5948,29 @@ var CodexNativeSubagentMonitor = class {
 				error: formatErrorMessage(error)
 			});
 		}
+		this.markChildTurnStarted(notification);
+		await this.handleChildSystemError(notification);
 		this.captureChildAssistantMessage(notification);
 		await this.handleChildTurnCompletion(notification);
 		await this.handleCompletionNotification(notification);
 	}
+	markChildTurnStarted(notification) {
+		if (notification.method !== "turn/started") return;
+		const childThreadId = readString$2(isJsonObject(notification.params) ? notification.params : void 0, "threadId")?.trim();
+		const childState = childThreadId ? this.childStates.get(childThreadId) : void 0;
+		if (childState) childState.settledWithoutCompletion = false;
+	}
+	async handleChildSystemError(notification) {
+		if (notification.method !== "thread/status/changed") return;
+		const params = isJsonObject(notification.params) ? notification.params : void 0;
+		if (readString$2(isJsonObject(params?.status) ? params.status : void 0, "type") !== "systemError") return;
+		const childThreadId = readString$2(params, "threadId")?.trim();
+		const childState = childThreadId ? this.childStates.get(childThreadId) : void 0;
+		if (childState) {
+			childState.settledWithoutCompletion = true;
+			await this.flushDeferredParentSettlements(childState.parentThreadId);
+		}
+	}
 	ensureParentTaskRuntime(state) {
 		if (state.taskRuntime || !state.requesterSessionKey || !state.taskRuntimeScope) return;
 		state.taskRuntime = this.runtime.createAgentHarnessTaskRuntime({
@@ -5945,6 +6007,12 @@ var CodexNativeSubagentMonitor = class {
 			const parentThreadId = item ? (readString$2(item, "senderThreadId") ?? readString$2(params, "threadId"))?.trim() : void 0;
 			const state = parentThreadId ? this.parentStates.get(parentThreadId) : void 0;
 			if (state && parentThreadId) {
+				if (notification.method === "item/completed" && readString$2(item, "type") === "subAgentActivity") {
+					const childThreadId = readString$2(item, "agentThreadId")?.trim();
+					const agentPath = readString$2(item, "agentPath");
+					if (childThreadId) this.registerChildThread(parentThreadId, childThreadId, agentPath === void 0 ? {} : { agentPath });
+					return state;
+				}
 				const childThreadIds = normalizeToolName(readString$2(item, "tool")) === "spawnagent" ? new Set([...readStringArray(item?.receiverThreadIds), ...readObjectStringKeys(item?.agentsStates)]) : new Set(readStringArray(item?.receiverThreadIds));
 				for (const childThreadId of childThreadIds) this.registerChildThread(parentThreadId, childThreadId);
 			}
@@ -6031,6 +6099,8 @@ var CodexNativeSubagentMonitor = class {
 		if (childState && turn && readString$2(turn, "status") === "interrupted") {
 			const turnId = readString$2(turn, "id");
 			if (turnId) childState.assistantMessagesByTurn.delete(turnId);
+			childState.settledWithoutCompletion = true;
+			await this.flushDeferredParentSettlements(childState.parentThreadId);
 			return;
 		}
 		if (childState && turn) this.captureChildTurnAssistantMessages(childState, turn);
@@ -6084,7 +6154,10 @@ var CodexNativeSubagentMonitor = class {
 				childState.noFinalCompletionFallbackTimer = void 0;
 			}
 		}
-		if (!state.requesterSessionKey) return;
+		if (!state.requesterSessionKey) {
+			await this.flushDeferredParentSettlements(state.parentThreadId);
+			return;
+		}
 		const completionKey = buildCompletionDedupeKey(state.parentThreadId, completion);
 		if (state.deliveredCompletionKeys.has(completionKey)) return;
 		const deliveryState = childState ?? this.ensureChildState(state.parentThreadId, completion.childThreadId);
@@ -6137,6 +6210,7 @@ var CodexNativeSubagentMonitor = class {
 			});
 		} finally {
 			childState.deliveringCompletionKey = void 0;
+			await this.flushDeferredParentSettlements(state.parentThreadId);
 		}
 	}
 	markCompletionDeliveryPending(completion, error) {
@@ -6169,6 +6243,28 @@ var CodexNativeSubagentMonitor = class {
 		}, delayMs);
 		unrefTimer(childState.completionDeliveryTimer);
 	}
+	hasUnsettledChildren(parentThreadId) {
+		for (const childState of this.childStates.values()) if (childState.parentThreadId === parentThreadId && (childState.pendingCompletion !== void 0 || childState.deliveringCompletionKey !== void 0 || !childState.transcriptTerminal && !childState.settledWithoutCompletion)) return true;
+		return false;
+	}
+	async flushDeferredParentSettlements(parentThreadId) {
+		if (this.hasUnsettledChildren(parentThreadId)) return;
+		const state = this.parentStates.get(parentThreadId);
+		const callback = state?.deferredSettlement;
+		if (!state || !callback) return;
+		state.deferredSettlement = void 0;
+		await this.runDeferredParentSettlement(parentThreadId, callback);
+	}
+	async runDeferredParentSettlement(parentThreadId, callback) {
+		try {
+			await callback();
+		} catch (error) {
+			embeddedAgentLog.warn("Failed to finish deferred Codex app-server cleanup", {
+				parentThreadId,
+				error: formatErrorMessage(error)
+			});
+		}
+	}
 	finalizeCompletionTask(completion, eventAt) {
 		const taskRuntime = this.getTaskRuntimeForChild(completion.childThreadId);
 		if (!taskRuntime) return;
@@ -6209,7 +6305,8 @@ var CodexNativeSubagentMonitor = class {
 				assistantMessagesByTurn: /* @__PURE__ */ new Map(),
 				transcriptPollAttempt: 0,
 				transcriptTerminal: false,
-				completionDeliveryAttempt: 0
+				completionDeliveryAttempt: 0,
+				settledWithoutCompletion: false
 			};
 			this.childStates.set(normalizedChildThreadId, childState);
 		}
@@ -8151,6 +8248,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		trajectoryEndRecorded = true;
 	};
 	let nativeHookRelay;
+	const nativeSubagentMonitorRef = {};
 	let releaseSharedClientLease;
 	let sharedCodexClientRetiredForOneShotCleanup = false;
 	const releaseSharedClientLeaseOnce = () => {
@@ -8665,7 +8763,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		return notificationQueue;
 	};
 	const nativeSubagentCodexHome = appServer.start.transport === "stdio" ? appServer.start.env?.CODEX_HOME ?? resolveCodexAppServerHomeDir(agentDir) : void 0;
-	registerCodexNativeSubagentMonitor({
+	nativeSubagentMonitorRef.current = registerCodexNativeSubagentMonitor({
 		client,
 		parentThreadId: thread.threadId,
 		requesterSessionKey: params.sessionKey,
@@ -9536,7 +9634,14 @@ async function runCodexAppServerAttempt(params, options = {}) {
 			}
 		});
 		if (!timedOut && !runAbortController.signal.aborted) await steeringQueueRef.current?.flushPending();
-		if (!timedOut) await unsubscribeCodexThreadBestEffort(client, {
+		const yieldedOneShotCleanupDeferred = !timedOut && params.cleanupBundleMcpOnRunEnd === true && yieldDetected && nativeSubagentMonitorRef.current?.deferUntilParentSettles(thread.threadId, async () => {
+			await unsubscribeCodexThreadBestEffort(client, {
+				threadId: thread.threadId,
+				timeoutMs: 5e3
+			});
+			await releaseSharedClientLeaseAndRetireOneShotClient();
+		});
+		if (!timedOut && !yieldedOneShotCleanupDeferred) await unsubscribeCodexThreadBestEffort(client, {
 			threadId: thread.threadId,
 			timeoutMs: CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS
 		});
@@ -9545,7 +9650,7 @@ async function runCodexAppServerAttempt(params, options = {}) {
 		notificationCleanup();
 		requestCleanup();
 		closeCleanup?.();
-		await releaseSharedClientLeaseAndRetireOneShotClient();
+		if (!yieldedOneShotCleanupDeferred) await releaseSharedClientLeaseAndRetireOneShotClient();
 		if (nativeHookRelay) if (shouldDelayNativeHookRelayUnregister) scheduleCodexNativeHookRelayUnregister({
 			relay: nativeHookRelay,
 			hookTimeoutSec: options.nativeHookRelay?.hookTimeoutSec

package/dist/{side-question-DJ4g2wVk.js → side-question-DUp0Z5_n.js}

@@ -1,14 +1,14 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { H as readCodexNotificationTurnId, N as mergeCodexThreadConfigs, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, V as readCodexNotificationThreadId, _ as resolveCodexWebSearchPlan, d as resolveCodexAppServerRequestModelSelection, m as resolveReasoningEffort, p as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-DXrm-WWA.js";
+import { H as readCodexNotificationTurnId, N as mergeCodexThreadConfigs, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, V as readCodexNotificationThreadId, _ as resolveCodexWebSearchPlan, d as resolveCodexAppServerRequestModelSelection, m as resolveReasoningEffort, p as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-BDghpA0C.js";
 import { f as resolveCodexModelBackedReviewerPolicyContext, h as shouldAutoApproveCodexAppServerApprovals, l as readCodexPluginConfig, m as resolveOpenClawExecPolicyForCodexAppServer, n as canUseCodexModelBackedApprovalsReviewerForModel, u as resolveCodexAppServerRuntimeOptions } from "./config-DfV7hMHu.js";
-import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-B19q5BIX.js";
-import { i as formatCodexUsageLimitErrorMessage } from "./provider-J2nTGL8Q.js";
+import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-CB4mtyrs.js";
+import { a as readCodexSupportedReasoningEfforts, s as formatCodexUsageLimitErrorMessage } from "./provider-CojmGiaW.js";
 import { i as isCodexAppServerApprovalRequest } from "./client-DsqoRGhJ.js";
 import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding } from "./session-binding-CP5b8iN1.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BaB2492Z.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-UdM9fipd.js";
 import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-Ll9fWpy9.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-3tnjhjFb.js";
-import { C as emitDynamicToolErrorDiagnostic, F as shouldEnableCodexAppServerNativeToolSurface, N as resolveCodexMessageToolProvider, R as filterToolsForVisionInputs, T as emitDynamicToolTerminalDiagnostic, _ as resolveDynamicToolCallTimeoutMs, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as handleDynamicToolCallWithTimeout, r as CODEX_NATIVE_HOOK_RELAY_EVENTS, w as emitDynamicToolStartedDiagnostic, z as handleCodexAppServerApprovalRequest } from "./provider-capabilities-B3pUz-8b.js";
+import { C as emitDynamicToolErrorDiagnostic, F as shouldEnableCodexAppServerNativeToolSurface, N as resolveCodexMessageToolProvider, R as filterToolsForVisionInputs, T as emitDynamicToolTerminalDiagnostic, _ as resolveDynamicToolCallTimeoutMs, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as handleDynamicToolCallWithTimeout, r as CODEX_NATIVE_HOOK_RELAY_EVENTS, w as emitDynamicToolStartedDiagnostic, z as handleCodexAppServerApprovalRequest } from "./provider-capabilities-Cu8jJpp3.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-C7qmZ0Jh.js";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
@@ -291,7 +291,7 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			timeoutMs: appServer.requestTimeoutMs,
 			signal: params.opts?.abortSignal
 		});
-		const effort = resolveReasoningEffort(params.resolvedThinkLevel ?? "off", modelSelection.model);
+		const effort = resolveReasoningEffort(params.resolvedThinkLevel ?? "off", modelSelection.model, readCodexSupportedReasoningEfforts(params.runtimeModel?.compat));
 		turnId = assertCodexTurnStartResponse(await client.request("turn/start", {
 			threadId: childThreadId,
 			input: [{

package/dist/{thread-lifecycle-DXrm-WWA.js → thread-lifecycle-BDghpA0C.js}

@@ -1,8 +1,8 @@
 import { n as isJsonObject, t as flattenCodexDynamicToolFunctions } from "./protocol-dh-ETiNd.js";
 import { i as codexSandboxPolicyForTurn, p as resolveCodexPluginsPolicy, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-DfV7hMHu.js";
-import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-B19q5BIX.js";
+import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-CB4mtyrs.js";
 import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY } from "./prompt-overlay.js";
-import { r as isModernCodexModel } from "./provider-J2nTGL8Q.js";
+import { a as readCodexSupportedReasoningEfforts, i as isModernCodexModel, o as resolveCodexSupportedReasoningEffort, r as isMaxReasoningCodexModel } from "./provider-CojmGiaW.js";
 import { a as isCodexAppServerConnectionClosedError, n as CodexAppServerRpcError } from "./client-DsqoRGhJ.js";
 import { i as isCodexAppServerNativeAuthProfile, l as writeCodexAppServerBinding, n as clearCodexAppServerBinding, o as readCodexAppServerBinding } from "./session-binding-CP5b8iN1.js";
 import "node:fs/promises";
@@ -2082,7 +2082,7 @@ function buildTurnStartParams(params, options) {
 		model: modelSelection.model,
 		personality: CODEX_NATIVE_PERSONALITY_NONE,
 		...options.appServer.serviceTier !== void 0 ? { serviceTier: options.appServer.serviceTier } : {},
-		effort: resolveReasoningEffort(params.thinkLevel, modelSelection.model),
+		effort: resolveReasoningEffort(params.thinkLevel, modelSelection.model, readCodexSupportedReasoningEfforts(params.model?.compat)),
 		...options.environmentSelection ? { environments: options.environmentSelection } : {},
 		collaborationMode: buildTurnCollaborationMode(params, {
 			model: modelSelection.model,
@@ -2108,7 +2108,7 @@ function buildTurnCollaborationMode(params, options = {}) {
 		mode: "default",
 		settings: {
 			model,
-			reasoning_effort: resolveReasoningEffort(params.thinkLevel, model),
+			reasoning_effort: resolveReasoningEffort(params.thinkLevel, model, readCodexSupportedReasoningEfforts(params.model?.compat)),
 			developer_instructions: buildTurnScopedCollaborationInstructions(params, options)
 		}
 	};
@@ -2259,9 +2259,15 @@ function resolveCodexAppServerModelProvider(params) {
 	if (isCodexAppServerNativeAuthProfile(params) && normalizedLower === "openai") return;
 	return normalizedLower === "openai" ? "openai" : normalized;
 }
-function resolveReasoningEffort(thinkLevel, modelId) {
+function resolveReasoningEffort(thinkLevel, modelId, supportedReasoningEfforts) {
+	if (thinkLevel === "off" || thinkLevel === "adaptive") return null;
+	if (supportedReasoningEfforts) return resolveCodexSupportedReasoningEffort({
+		requested: thinkLevel,
+		supportedReasoningEfforts
+	}) ?? null;
 	if (thinkLevel === "minimal") return isModernCodexModel(modelId) ? "low" : "minimal";
 	if (thinkLevel === "low" || thinkLevel === "medium" || thinkLevel === "high" || thinkLevel === "xhigh") return thinkLevel;
+	if (thinkLevel === "max" && isMaxReasoningCodexModel(modelId)) return "max";
 	return null;
 }
 //#endregion

package/dist/{web-search-provider.runtime-3WDe3iwG.js → web-search-provider.runtime-D-v5Y41V.js}

@@ -1,6 +1,6 @@
 import { n as isJsonObject } from "./protocol-dh-ETiNd.js";
-import { g as buildCodexNativeWebSearchThreadConfig } from "./thread-lifecycle-DXrm-WWA.js";
-import { n as runBoundedCodexAppServerTurn } from "./media-understanding-provider-S-u-JwTs.js";
+import { g as buildCodexNativeWebSearchThreadConfig } from "./thread-lifecycle-BDghpA0C.js";
+import { n as runBoundedCodexAppServerTurn } from "./media-understanding-provider-5YQx83ng.js";
 import { readStringParam, resolveSearchTimeoutSeconds, wrapWebContent } from "openclaw/plugin-sdk/provider-web-search";
 //#region extensions/codex/src/web-search-provider.runtime.ts
 async function executeCodexWebSearchProviderTool(ctx, args, executionContext, options) {