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

package/dist/{shared-client-Dtx5i7Ez.js → shared-client-rR6TDJA3.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { d as resolveCodexAppServerRuntimeOptions, r as codexAppServerStartOptionsKey } from "./config-CszD0vP3.js";
-import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-CLrtWgrD.js";
+import { d as resolveCodexAppServerRuntimeOptions, r as codexAppServerStartOptionsKey } from "./config-C_whBx3M.js";
+import { l as resolveCodexAppServerSpawnEnv, o as isUnsupportedCodexAppServerVersionError, s as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-IcTBKEqA.js";
 import { createRequire } from "node:module";
 import fs, { access } from "node:fs/promises";
 import path from "node:path";
@@ -511,6 +511,7 @@ function resolveChatgptAccountId(profileId, credential) {
 * the Codex plugin before stdio startup.
 */
 const CODEX_PLUGIN_ROOT = resolveDefaultCodexPluginRoot(path.dirname(fileURLToPath(import.meta.url)));
+const MACOS_DESKTOP_CODEX_APP_SERVER_COMMAND = "/Applications/Codex.app/Contents/Resources/codex";
 /** Rewrites managed stdio start options to point at an executable Codex binary path. */
 async function resolveManagedCodexAppServerStartOptions(startOptions, options = {}) {
 	if (startOptions.transport !== "stdio" || startOptions.commandSource !== "managed") return startOptions;
@@ -520,15 +521,18 @@ async function resolveManagedCodexAppServerStartOptions(startOptions, options =
 		pluginRoot: options.pluginRoot
 	});
 	const pathExists = options.pathExists ?? commandPathExists;
-	const commandPath = await findManagedCodexAppServerCommandPath({
+	const commandPaths = await findManagedCodexAppServerCommandPaths({
 		candidateCommandPaths: paths.candidateCommandPaths,
 		pathExists,
 		platform
 	});
+	const commandPath = commandPaths[0];
+	const managedFallbackCommandPaths = commandPaths.slice(1);
 	return {
 		...startOptions,
 		command: commandPath,
-		commandSource: "resolved-managed"
+		commandSource: "resolved-managed",
+		...managedFallbackCommandPaths.length > 0 ? { managedFallbackCommandPaths } : {}
 	};
 }
 /** Returns the preferred and fallback managed Codex binary paths for a plugin root. */
@@ -544,7 +548,14 @@ function resolveManagedCodexAppServerCommandCandidates(pluginRoot, platform) {
 	const pathApi = pathForPlatform(platform);
 	const commandName = platform === "win32" ? "codex.cmd" : "codex";
 	const roots = resolveManagedCodexAppServerCandidateRoots(pluginRoot, platform);
-	return [...new Set([...roots.map((root) => pathApi.join(root, "node_modules", ".bin", commandName)), ...resolveManagedCodexPackageBinCandidates(roots, platform)])];
+	return [...new Set([
+		...resolveDesktopCodexAppServerCommandCandidates(platform),
+		...roots.map((root) => pathApi.join(root, "node_modules", ".bin", commandName)),
+		...resolveManagedCodexPackageBinCandidates(roots, platform)
+	])];
+}
+function resolveDesktopCodexAppServerCommandCandidates(platform) {
+	return platform === "darwin" ? [MACOS_DESKTOP_CODEX_APP_SERVER_COMMAND] : [];
 }
 function resolveDefaultCodexPluginRoot(moduleDir) {
 	const moduleBaseName = path.basename(moduleDir);
@@ -610,8 +621,10 @@ function isDistExtensionRoot(pluginRoot, platform) {
 function pathForPlatform(platform) {
 	return platform === "win32" ? path.win32 : path.posix;
 }
-async function findManagedCodexAppServerCommandPath(params) {
-	for (const commandPath of params.candidateCommandPaths) if (await params.pathExists(commandPath, params.platform)) return commandPath;
+async function findManagedCodexAppServerCommandPaths(params) {
+	const commandPaths = [];
+	for (const commandPath of params.candidateCommandPaths) if (await params.pathExists(commandPath, params.platform)) commandPaths.push(commandPath);
+	if (commandPaths.length > 0) return commandPaths;
 	throw new Error([
 		`Managed Codex app-server binary was not found for ${MANAGED_CODEX_APP_SERVER_PACKAGE}.`,
 		"Reinstall or update OpenClaw, or run pnpm install in a source checkout.",
@@ -779,25 +792,21 @@ async function acquireSharedCodexAppServerClient(options, leaseOptions) {
 		if (options.abandonSignal.aborted) abandon();
 	}
 	const sharedPromise = entry.promise ?? (entry.promise = (async () => {
-		const client = CodexAppServerClient.start(startOptions);
+		const client = await startInitializedCodexAppServerClient({
+			startOptions,
+			agentDir,
+			authProfileId: usesNativeAuth ? null : authProfileId,
+			config: options?.config,
+			onStartedClient: (startedClient) => {
+				entry.client = startedClient;
+				startedClient.setActiveSharedLeaseCountProviderForUnscopedNotifications(() => entry.activeLeases);
+				options?.onStartedClient?.(startedClient);
+			}
+		});
 		entry.client = client;
-		options?.onStartedClient?.(client);
 		client.setActiveSharedLeaseCountProviderForUnscopedNotifications(() => entry.activeLeases);
 		client.addCloseHandler((closedClient) => clearSharedClientEntryIfCurrent(key, closedClient));
-		try {
-			await client.initialize();
-			await applyCodexAppServerAuthProfile({
-				client,
-				agentDir,
-				authProfileId: usesNativeAuth ? null : authProfileId,
-				startOptions,
-				config: options?.config
-			});
-			return client;
-		} catch (error) {
-			client.close();
-			throw error;
-		}
+		return client;
 	})());
 	try {
 		const client = await withTimeout$1(sharedPromise, options?.timeoutMs ?? 0, "codex app-server initialize timed out");
@@ -819,33 +828,75 @@ async function acquireSharedCodexAppServerClient(options, leaseOptions) {
 /** Starts a non-shared Codex app-server client owned entirely by the caller. */
 async function createIsolatedCodexAppServerClient(options) {
 	const { agentDir, usesNativeAuth, authProfileId, authProfileStore, startOptions } = await resolveCodexAppServerClientStartContext(options);
-	const client = CodexAppServerClient.start(startOptions);
-	if (authProfileId) client.addRequestHandler(async (request) => {
-		if (request.method !== "account/chatgptAuthTokens/refresh") return;
-		return await refreshCodexAppServerAuthTokens({
-			agentDir,
-			authProfileId,
-			...authProfileStore ? { authProfileStore } : {},
-			config: options?.config
-		});
+	return await startInitializedCodexAppServerClient({
+		startOptions,
+		agentDir,
+		authProfileId: usesNativeAuth ? null : authProfileId,
+		authProfileStore,
+		config: options?.config,
+		timeoutMs: options?.timeoutMs,
+		onStartedClient: options?.onStartedClient
 	});
-	const initialize = client.initialize();
-	try {
-		await withTimeout$1(initialize, options?.timeoutMs ?? 0, "codex app-server initialize timed out");
-		await applyCodexAppServerAuthProfile({
-			client,
-			agentDir,
-			authProfileId: usesNativeAuth ? null : authProfileId,
-			startOptions,
-			config: options?.config,
-			...authProfileStore ? { authProfileStore } : {}
+}
+async function startInitializedCodexAppServerClient(params) {
+	const startOptionsCandidates = resolveManagedFallbackStartOptions(params.startOptions);
+	for (let index = 0; index < startOptionsCandidates.length; index += 1) {
+		const startOptions = startOptionsCandidates[index];
+		const client = CodexAppServerClient.start(startOptions);
+		params.onStartedClient?.(client);
+		const initialize = client.initialize();
+		try {
+			await withTimeout$1(initialize, params.timeoutMs ?? 0, "codex app-server initialize timed out");
+		} catch (error) {
+			client.close();
+			initialize.catch(() => void 0);
+			if (shouldTryManagedFallbackStartOption(error, startOptions, index, startOptionsCandidates)) continue;
+			throw error;
+		}
+		if (params.authProfileId) client.addRequestHandler(async (request) => {
+			if (request.method !== "account/chatgptAuthTokens/refresh") return;
+			return await refreshCodexAppServerAuthTokens({
+				agentDir: params.agentDir,
+				authProfileId: params.authProfileId,
+				...params.authProfileStore ? { authProfileStore: params.authProfileStore } : {},
+				config: params.config
+			});
 		});
-		return client;
-	} catch (error) {
-		client.close();
-		initialize.catch(() => void 0);
-		throw error;
+		try {
+			await applyCodexAppServerAuthProfile({
+				client,
+				agentDir: params.agentDir,
+				authProfileId: params.authProfileId,
+				startOptions,
+				config: params.config,
+				...params.authProfileStore ? { authProfileStore: params.authProfileStore } : {}
+			});
+			return client;
+		} catch (error) {
+			client.close();
+			throw error;
+		}
 	}
+	throw new Error("Managed Codex app-server fallback candidates were exhausted.");
+}
+function resolveManagedFallbackStartOptions(startOptions) {
+	const commands = [startOptions.command, ...startOptions.managedFallbackCommandPaths ?? []];
+	const candidates = [];
+	for (let index = 0; index < commands.length; index += 1) {
+		const command = commands[index];
+		const managedFallbackCommandPaths = commands.slice(index + 1);
+		const candidate = {
+			...startOptions,
+			command
+		};
+		if (managedFallbackCommandPaths.length === 0) delete candidate.managedFallbackCommandPaths;
+		else candidate.managedFallbackCommandPaths = managedFallbackCommandPaths;
+		candidates.push(candidate);
+	}
+	return candidates;
+}
+function shouldTryManagedFallbackStartOption(error, startOptions, index, startOptionsCandidates) {
+	return startOptions.commandSource === "resolved-managed" && index < startOptionsCandidates.length - 1 && isUnsupportedCodexAppServerVersionError(error);
 }
 /** Clears and closes all shared clients for deterministic tests. */
 function resetSharedCodexAppServerClientForTests() {

package/dist/{side-question-C-DhgJOd.js → side-question-DDVgFmpv.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-DtT3-ehU.js";
-import { d as resolveCodexAppServerRuntimeOptions, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, n as canUseCodexModelBackedApprovalsReviewerForModel, p as resolveCodexModelBackedReviewerPolicyContext, u as readCodexPluginConfig } from "./config-CszD0vP3.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-B-OHpbD3.js";
-import { i as isCodexAppServerApprovalRequest } from "./client-CLrtWgrD.js";
-import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding } from "./session-binding-HOuPt-E0.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BPTiVNsW.js";
-import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-Dtx5i7Ez.js";
-import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-3tnjhjFb.js";
-import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-D7hnTO76.js";
+import { H as readCodexNotificationThreadId, P as mergeCodexThreadConfigs, S as filterCodexDynamicTools, T as resolveCodexDynamicToolsLoading, U as readCodexNotificationTurnId, _ as resolveCodexWebSearchPlan, d as resolveCodexAppServerRequestModelSelection, j as buildCodexPluginAppsConfigPatchFromPolicyContext, m as resolveReasoningEffort, p as resolveCodexBindingModelProviderFallback, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-DeSMZSXr.js";
+import { d as resolveCodexAppServerRuntimeOptions, g as shouldAutoApproveCodexAppServerApprovals, h as resolveOpenClawExecPolicyForCodexAppServer, n as canUseCodexModelBackedApprovalsReviewerForModel, p as resolveCodexModelBackedReviewerPolicyContext, u as readCodexPluginConfig } from "./config-C_whBx3M.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-DosqwRb6.js";
+import { i as isCodexAppServerApprovalRequest } from "./client-IcTBKEqA.js";
+import { i as isCodexAppServerNativeAuthProfile, o as readCodexAppServerBinding } from "./session-binding-Cm0Gg7Z1.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-xi0ZmBGO.js";
+import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-rR6TDJA3.js";
+import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-pTY2COoC.js";
+import { C as resolveCodexMessageToolProvider, O as filterToolsForVisionInputs, T as shouldEnableCodexAppServerNativeToolSurface, a as buildCodexNativeHookRelayConfig, d as handleCodexAppServerElicitationRequest, f as createCodexDynamicToolBridge, h as emitDynamicToolTerminalDiagnostic, k as handleCodexAppServerApprovalRequest, m as emitDynamicToolStartedDiagnostic, n as resolveCodexProviderWebSearchSupportForClient, o as buildCodexNativeHookRelayDisabledConfig, p as emitDynamicToolErrorDiagnostic, r as CODEX_NATIVE_HOOK_RELAY_EVENTS } from "./provider-capabilities-CE5k8cmO.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";
@@ -272,7 +272,7 @@ async function runCodexAppServerSideQuestion(params, options = {}) {
 			nativeCodeModeEnabled: nativeToolSurfaceEnabled,
 			nativeCodeModeOnlyEnabled: appServer.codeModeOnly
 		});
-		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, modelScopedAppServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
+		const threadConfig = mergeCodexThreadConfigs(nativeHookRelayConfig, runtimeThreadConfig, binding.pluginAppPolicyContext ? buildCodexPluginAppsConfigPatchFromPolicyContext(binding.pluginAppPolicyContext) : void 0, modelScopedAppServer.networkProxy?.configPatch) ?? runtimeThreadConfig;
 		childThreadId = assertCodexThreadForkResponse(await forkCodexSideThread(client, {
 			threadId: binding.threadId,
 			model: modelSelection.model,
@@ -298,7 +298,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: [{