@openclaw/codex 2026.10.2 → 2026.10.5-beta.2

package/dist/.setup/{command-rpc-M4gYsRiV.mjs → command-rpc-HtQjCQBg.mjs}

@@ -1,21 +1,21 @@
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { o as isCodexAppServerOverloadError, r as CodexAppServerRpcError } from "./rpc-error-hmWM21RB.mjs";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-kQntafj_.mjs";
-import { a as withCodexAppServerJsonClient, r as requestCodexAppServerJson } from "./request-CZkKkN6c.mjs";
-import "./config-0Gxk3_eq.mjs";
-import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
+import { o as isCodexAppServerOverloadError, r as CodexAppServerRpcError } from "./rpc-error-C98SHchT.mjs";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-DbOzOglY.mjs";
+import { a as withCodexAppServerJsonClient, r as requestCodexAppServerJson } from "./request-6piO0U_P.mjs";
+import "./config-C1YVVLEA.mjs";
+import { n as resolveCodexAppServerRuntimeOptions, r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-DWzK-k0n.mjs";
 import { a as resolveCodexAppServerAuthProfileStore, r as resolveCodexAppServerAuthProfileId } from "./auth-profile-CgHQ8Vot.mjs";
-import { tt as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-5NUq43f3.mjs";
-import { a as isCodexAppServerIndeterminateRequestCancellationError, o as isCodexAppServerIndeterminateTransportError } from "./client-ChJtGEdJ.mjs";
-import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-DPUGAWP2.mjs";
-import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-BoMwpuPN.mjs";
-import { r as listCodexAppServerModels } from "./models-DaW-7tld.mjs";
-import { o as createCodexSessionGenerationSupersededError } from "./session-binding-Ce7BqiPN.mjs";
-import { t as resumeCodexAppServerThread } from "./thread-resume-buZujRcC.mjs";
-import { t as __exportAll } from "./session-binding-sidecars-BrdV95Fg.mjs";
+import { tt as resolveCodexAppServerPreparedAuthHandoff } from "./shared-client-BjiqpbC5.mjs";
+import { a as isCodexAppServerIndeterminateRequestCancellationError, o as isCodexAppServerIndeterminateTransportError } from "./client-zrCKOu_E.mjs";
+import { o as closeCodexStartupClientBestEffort } from "./attempt-client-cleanup-CxX4cTSi.mjs";
+import { r as prepareCodexAppServerAuthBinding } from "./auth-binding-BaxlhaNx.mjs";
+import { r as listCodexAppServerModels } from "./models-Dph0RqpR.mjs";
+import { n as createCodexSessionGenerationSupersededError } from "./session-binding-JEHNMPsr.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-BXY_6o6Z.mjs";
+import { t as __exportAll } from "./session-binding-sidecars-DD-enC8w.mjs";
 import { resolveAgentDir, resolveSessionAgentIdsStrict } from "openclaw/plugin-sdk/agent-scope-runtime";
-import { prepareAgentRuntimeAuth } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
+import { prepareAgentRuntimeAuth } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { getSessionEntry, resolveStorePath } from "openclaw/plugin-sdk/session-store-runtime";
 import { resolveSessionModelRef } from "openclaw/plugin-sdk/model-session-runtime";
 import { resolveApiKeyForProvider } from "openclaw/plugin-sdk/provider-auth-runtime";
@@ -214,12 +214,13 @@ async function readCodexStatusProbes(pluginConfig, config, agentDir) {
 		config,
 		agentDir
 	};
+	const probe = (method, params) => safeCodexControlRequest(pluginConfig, method, params, options);
 	const [models, account, limits, mcps, skills] = await Promise.all([
 		safeValue(() => listCodexAppServerModels(requestOptions(pluginConfig, 20, config, agentDir))),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.account, { refreshToken: false }, options),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.rateLimits, void 0, options),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }, options),
-		safeCodexControlRequest(pluginConfig, CODEX_CONTROL_METHODS.listSkills, {}, options)
+		probe(CODEX_CONTROL_METHODS.account, { refreshToken: false }),
+		probe(CODEX_CONTROL_METHODS.rateLimits, void 0),
+		probe(CODEX_CONTROL_METHODS.listMcpServers, { limit: 100 }),
+		probe(CODEX_CONTROL_METHODS.listSkills, {})
 	]);
 	return {
 		models,

package/dist/.setup/{compact-D3JNLG_b.mjs → compact-Do9HPeDr.mjs}

@@ -1,30 +1,30 @@
 import { n as readCodexRuntimeModelId } from "./model-runtime-BdqzOMkU.mjs";
 import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
-import { m as sessionBindingIdentity } from "./session-binding-record-BZB8RgcF.mjs";
-import { E as waitForCodexAppServerClientExit, S as retainSharedCodexAppServerClientByInstanceId } from "./auth-cache-key-BE1HXsNo.mjs";
+import { m as sessionBindingIdentity } from "./session-binding-record-DU_0biMD.mjs";
+import { E as waitForCodexAppServerClientExit, S as retainSharedCodexAppServerClientByInstanceId } from "./auth-cache-key-tENCQOub.mjs";
 import { t as CODEX_APP_SERVER_BINDING_GUARDED_REQUEST_TIMEOUT_MS } from "./session-binding-meta-Lkm5Lpf4.mjs";
-import { i as CodexAppServerScopedRequestRejectedError, r as CodexAppServerRpcError } from "./rpc-error-hmWM21RB.mjs";
-import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-C-08ez1w.mjs";
-import { F as consumeCodexAppServerLiveThread, K as retainCodexAppServerLiveThread, M as getCodexInferenceThreadQualification, U as protectCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientIfCurrent, q as revertCodexAppServerLiveThreadInstructions, s as createIsolatedCodexAppServerClient } from "./shared-client-5NUq43f3.mjs";
+import { i as CodexAppServerScopedRequestRejectedError, r as CodexAppServerRpcError } from "./rpc-error-C98SHchT.mjs";
+import { i as resolveCodexBindingAppServerConnection } from "./binding-connection-B7HAAZSI.mjs";
+import { F as consumeCodexAppServerLiveThread, K as retainCodexAppServerLiveThread, M as getCodexInferenceThreadQualification, U as protectCodexAppServerLiveThread, _ as retainSharedCodexAppServerClientIfCurrent, q as revertCodexAppServerLiveThreadInstructions, s as createIsolatedCodexAppServerClient } from "./shared-client-BjiqpbC5.mjs";
 import "./responses-oauth-twnuTaAa.mjs";
-import { a as isCodexAppServerIndeterminateRequestCancellationError, s as isCodexAppServerPrewriteRequestCancellationError } from "./client-ChJtGEdJ.mjs";
-import { o as readCodexNotificationThreadId, s as readCodexNotificationTurnId } from "./turn-router-BOKSJmfw.mjs";
-import { c as isCodexNoActiveTurnInterruptError, f as unsubscribeCodexThreadBestEffort, o as closeCodexStartupClientBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-DPUGAWP2.mjs";
-import { n as readCodexThreadContextSnapshot, s as readCodexNotificationItem } from "./event-projector-usage-03R0I2dM.mjs";
-import { r as resolveCodexSessionBinding } from "./session-binding-Ce7BqiPN.mjs";
-import { t as codexNativeSubagentMonitorRuntime } from "./native-subagent-monitor-wh_-K3Vo.mjs";
-import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-VtqLex1l.mjs";
-import { t as resumeCodexAppServerThread } from "./thread-resume-buZujRcC.mjs";
-import { s as withCodexAppServerThreadMutationHold, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-T7T_iffm.mjs";
-import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-WqE8yPge.mjs";
+import { a as isCodexAppServerIndeterminateRequestCancellationError, s as isCodexAppServerPrewriteRequestCancellationError } from "./client-zrCKOu_E.mjs";
+import { c as readCodexNotificationTurnId, s as readCodexNotificationThreadId } from "./turn-router-D8DLkZgH.mjs";
+import { c as isCodexNoActiveTurnInterruptError, f as unsubscribeCodexThreadBestEffort, o as closeCodexStartupClientBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CxX4cTSi.mjs";
+import { n as readCodexThreadContextSnapshot, s as readCodexNotificationItem } from "./event-projector-usage-BpKfdoTm.mjs";
+import { i as resolveCodexSessionBinding } from "./session-binding-JEHNMPsr.mjs";
+import { s as withCodexAppServerThreadMutationHold, t as isSameCodexAppServerThreadOwner } from "./thread-ownership-5X4197vk.mjs";
 import { t as persistCodexContextCompactionActivity } from "./context-compaction-activity-CMla5FPJ.mjs";
+import { t as codexNativeSubagentMonitorRuntime } from "./native-subagent-monitor-D5O_o07p.mjs";
+import { t as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DIImwCy1.mjs";
+import { i as assertCodexSupervisionThreadLineage } from "./thread-policy-BEecBTJM.mjs";
+import { t as resumeCodexAppServerThread } from "./thread-resume-BXY_6o6Z.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { isIncognitoSessionKey } from "openclaw/plugin-sdk/session-key-runtime";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { createDeferred } from "openclaw/plugin-sdk/extension-shared";
+import { resolveAgentDir } from "openclaw/plugin-sdk/agent-runtime";
 import { AgentHarnessSessionSupersededError, embeddedAgentLog, resolveCompactionTimeoutMs } from "openclaw/plugin-sdk/agent-harness-runtime";
-import { resolveAgentDir as resolveAgentDir$1 } from "openclaw/plugin-sdk/agent-runtime";
 import { runWithAsyncWorkResources } from "openclaw/plugin-sdk/agent-harness-tool-runtime";
 import { createNativeSessionBindingAuthority } from "openclaw/plugin-sdk/agent-harness-session-runtime";
 import { createDedupeCache } from "openclaw/plugin-sdk/dedupe-runtime";
@@ -86,19 +86,8 @@ const warnedIgnoredCompactionOverrides = createDedupeCache({
 	maxSize: 4096
 });
 function warnIfIgnoringOpenClawCompactionOverrides(params) {
-	const ignoredConfig = readIgnoredCompactionOverridePaths(params);
-	if (ignoredConfig.length === 0) return;
-	const warningKey = ignoredConfig.join("\0");
-	if (warnedIgnoredCompactionOverrides.check(warningKey)) return;
-	embeddedAgentLog.warn("ignoring OpenClaw compaction overrides for Codex app-server compaction; Codex uses native server-side compaction", {
-		sessionId: params.sessionId,
-		sessionKey: params.sessionKey,
-		ignoredConfig
-	});
-}
-function readIgnoredCompactionOverridePaths(params) {
 	const compaction = asOptionalRecord(params.config?.agents?.defaults?.compaction);
-	return [
+	const ignoredConfig = [
 		"model",
 		"thinkingLevel",
 		"provider"
@@ -106,15 +95,13 @@ function readIgnoredCompactionOverridePaths(params) {
 		const value = compaction?.[field];
 		return typeof value === "string" && value.trim() ? [`agents.defaults.compaction.${field}`] : [];
 	});
-}
-function resolveCodexCompactionExecutionBlock(params) {
-	return resolveCodexNativeExecutionBlock({
-		config: params.config,
-		sessionKey: params.sandboxSessionKey ?? params.sessionKey,
+	if (ignoredConfig.length === 0) return;
+	const warningKey = ignoredConfig.join("\0");
+	if (warnedIgnoredCompactionOverrides.check(warningKey)) return;
+	embeddedAgentLog.warn("ignoring OpenClaw compaction overrides for Codex app-server compaction; Codex uses native server-side compaction", {
 		sessionId: params.sessionId,
-		agentId: params.sandboxAgentId ?? params.agentId,
-		sandbox: params.sandbox,
-		surface: "native compaction"
+		sessionKey: params.sessionKey,
+		ignoredConfig
 	});
 }
 //#endregion
@@ -245,20 +232,11 @@ function watchCodexNativeCompactionCompletion(params) {
 		if (notification.method !== "turn/completed" || !compactionTurnId || notificationTurnId !== compactionTurnId) return;
 		const turn = isJsonObject(notification.params.turn) ? notification.params.turn : void 0;
 		const status = typeof turn?.status === "string" ? turn.status : void 0;
-		if (admissionFailure) {
-			fail(admissionFailure);
-			return;
-		}
-		if (status !== "completed") {
-			fail(`codex app-server compaction turn ended with status ${status ?? "unknown"}`);
-			return;
-		}
-		const incompleteReason = !compactionItemId ? "codex app-server compaction turn completed without a compaction item" : !compactionItemCompleted ? "codex app-server compaction turn completed before its compaction item" : void 0;
-		if (incompleteReason) {
-			fail(incompleteReason);
-			return;
-		}
-		complete();
+		if (admissionFailure) fail(admissionFailure);
+		else if (status !== "completed") fail(`codex app-server compaction turn ended with status ${status ?? "unknown"}`);
+		else if (!compactionItemId) fail("codex app-server compaction turn completed without a compaction item");
+		else if (!compactionItemCompleted) fail("codex app-server compaction turn completed before its compaction item");
+		else complete();
 	});
 	removeCloseHandler = params.client.addCloseHandler(() => {
 		retireUnconfirmed("codex app-server closed before native compaction completed");
@@ -365,7 +343,14 @@ async function maybeCompactCodexAppServerSession(params, options) {
 			}
 		});
 	}
-	const nativeExecutionBlock = resolveCodexCompactionExecutionBlock(params);
+	const nativeExecutionBlock = resolveCodexNativeExecutionBlock({
+		config: params.config,
+		sessionKey: params.sandboxSessionKey ?? params.sessionKey,
+		sessionId: params.sessionId,
+		agentId: params.sandboxAgentId ?? params.agentId,
+		sandbox: params.sandbox,
+		surface: "native compaction"
+	});
 	if (nativeExecutionBlock) return {
 		ok: false,
 		compacted: false,
@@ -377,7 +362,7 @@ async function maybeCompactCodexAppServerSession(params, options) {
 		agentId: params.agentId,
 		config: params.config
 	});
-	const abortedResult = (attempt, expectedThreadId, currentThreadId = expectedThreadId) => options.allowNonManualNativeRequest ? skippedCodexNativeCompactionResult(attempt, {
+	const abortedResult = (attempt, expectedThreadId, currentThreadId) => options.allowNonManualNativeRequest ? skippedCodexNativeCompactionResult(attempt, {
 		reason: "codex app-server compaction aborted before native compaction",
 		code: "aborted_before_native_compaction",
 		request: options.nativeCompactionRequest ?? "after_context_engine",
@@ -401,7 +386,8 @@ async function maybeCompactCodexAppServerSession(params, options) {
 		});
 	} catch (error) {
 		if (!params.abortSignal?.aborted) throw error;
-		return abortedResult(params, options.bindingStore.read(bindingIdentity)?.threadId);
+		const threadId = options.bindingStore.read(bindingIdentity)?.threadId;
+		return abortedResult(params, threadId, threadId);
 	}
 	const { binding: initialBinding, authority } = resolvedBinding;
 	const assertCurrent = authority.assertCurrent;
@@ -437,7 +423,7 @@ async function maybeCompactCodexAppServerSession(params, options) {
 			pluginConfig: options.pluginConfig,
 			config,
 			assertCurrent,
-			agentDir: resolveAgentDir$1(config, bindingIdentity.agentId)
+			agentDir: resolveAgentDir(config, bindingIdentity.agentId)
 		});
 	} catch (error) {
 		return {
@@ -618,13 +604,7 @@ async function maybeCompactCodexAppServerSession(params, options) {
 							if (!options.allowNonManualNativeRequest) attempt.abortSignal.throwIfAborted();
 							return {
 								started: false,
-								result: skippedCodexNativeCompactionResult(attempt, {
-									reason: "codex app-server compaction aborted before native compaction",
-									code: "aborted_before_native_compaction",
-									request: options.nativeCompactionRequest ?? "after_context_engine",
-									expectedThreadId: binding.threadId,
-									currentThreadId: currentBinding?.threadId
-								})
+								result: abortedResult(attempt, binding.threadId, currentBinding?.threadId)
 							};
 						}
 						assertCurrent();

package/dist/.setup/{computer-use-CF0jsDi1.mjs → computer-use-CeF5GuCX.mjs}

@@ -1,13 +1,13 @@
 import { t as resolveCodexAppServerHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
-import { o as resolveCodexComputerUseConfig } from "./config-options-HG_Rr3W_.mjs";
-import { d as resolveMacOSDesktopCodexBundledMarketplaceCandidates, t as isManagedCodexDesktopCommand } from "./managed-binary-C1VFoVPf.mjs";
-import { n as describeControlFailure } from "./capabilities-kQntafj_.mjs";
-import { n as requestCodexAppServerClientJson } from "./request-CZkKkN6c.mjs";
-import "./config-0Gxk3_eq.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-cUYrqu_a.mjs";
-import { $ as reconcileCodexComputerUseStartArtifacts, O as acquireCodexNativeConfigFence, at as isLegacyCodexComputerUsePluginDisabled, b as withLeasedCodexAppServerClientStartSelectionRetry, c as getLeasedSharedCodexAppServerClient, ct as assertNotSymlink, d as readCodexAppServerClientDesktopGeneration, g as resolveCodexNativeConfigFenceKey, h as releaseLeasedSharedCodexAppServerClient, it as hasLegacyCodexComputerUseMcpPolicy, nt as resolveBundledComputerUseMarketplacePath, ot as resolveManagedCodexComputerUseConfig, p as readCodexAppServerClientProcessIdentity, rt as resolveClientManagedBundledMarketplacePath, st as ensureCodexComputerUseSharedPluginCache, t as assertCodexAppServerClientStartSelectionCurrent, u as isCodexAppServerStartSelectionChangedError, y as waitForCodexAppServerClientDesktopGenerationDrain } from "./shared-client-5NUq43f3.mjs";
-import { a as isCodexAppServerIndeterminateRequestCancellationError, i as isCodexAppServerConnectionClosedError, o as isCodexAppServerIndeterminateTransportError } from "./client-ChJtGEdJ.mjs";
-import { l as retireUnsafeCodexTurnClientBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-DPUGAWP2.mjs";
+import { o as resolveCodexComputerUseConfig } from "./config-options-DDzeNQ8m.mjs";
+import { d as resolveMacOSDesktopCodexBundledMarketplaceCandidates, t as isManagedCodexDesktopCommand } from "./managed-binary-BtIjV7yN.mjs";
+import { n as describeControlFailure } from "./capabilities-DbOzOglY.mjs";
+import { n as requestCodexAppServerClientJson } from "./request-6piO0U_P.mjs";
+import "./config-C1YVVLEA.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-DWzK-k0n.mjs";
+import { $ as reconcileCodexComputerUseStartArtifacts, O as acquireCodexNativeConfigFence, at as isLegacyCodexComputerUsePluginDisabled, b as withLeasedCodexAppServerClientStartSelectionRetry, c as getLeasedSharedCodexAppServerClient, ct as assertNotSymlink, d as readCodexAppServerClientDesktopGeneration, g as resolveCodexNativeConfigFenceKey, h as releaseLeasedSharedCodexAppServerClient, it as hasLegacyCodexComputerUseMcpPolicy, nt as resolveBundledComputerUseMarketplacePath, ot as resolveManagedCodexComputerUseConfig, p as readCodexAppServerClientProcessIdentity, rt as resolveClientManagedBundledMarketplacePath, st as ensureCodexComputerUseSharedPluginCache, t as assertCodexAppServerClientStartSelectionCurrent, u as isCodexAppServerStartSelectionChangedError, y as waitForCodexAppServerClientDesktopGenerationDrain } from "./shared-client-BjiqpbC5.mjs";
+import { a as isCodexAppServerIndeterminateRequestCancellationError, i as isCodexAppServerConnectionClosedError, o as isCodexAppServerIndeterminateTransportError } from "./client-zrCKOu_E.mjs";
+import { l as retireUnsafeCodexTurnClientBestEffort, r as CodexAppServerUnsafeSubscriptionError } from "./attempt-client-cleanup-CxX4cTSi.mjs";
 import path from "node:path";
 import fs from "node:fs/promises";
 import { toErrorObject } from "openclaw/plugin-sdk/error-runtime";
@@ -33,7 +33,7 @@ function createComputerUseRequest(params) {
 	});
 }
 const COMPUTER_USE_LIVE_TEST_RETRY_COUNT = 1;
-const COMPUTER_USE_LIVE_TEST_THREAD_NAME = "OpenClaw Computer Use readiness probe";
+const COMPUTER_USE_LIVE_TEST_THREAD_NAME = "OpenClaw Computer Use readiness check";
 const COMPUTER_USE_LIST_APPS_TOOL = "list_apps";
 const COMPUTER_USE_UNIFIED_JS_TOOL = "js";
 const COMPUTER_USE_UNIFIED_JS_PROBE = "await cua.listApps();";
@@ -41,7 +41,13 @@ async function runCodexComputerUseLiveTest(params) {
 	const startedAt = Date.now();
 	let lastError;
 	let repair;
-	const probe = resolveComputerUseLiveTestProbe(params.tools);
+	const probe = params.tools?.includes(COMPUTER_USE_UNIFIED_JS_TOOL) && !params.tools.includes(COMPUTER_USE_LIST_APPS_TOOL) ? {
+		tool: COMPUTER_USE_UNIFIED_JS_TOOL,
+		arguments: { code: COMPUTER_USE_UNIFIED_JS_PROBE }
+	} : {
+		tool: COMPUTER_USE_LIST_APPS_TOOL,
+		arguments: {}
+	};
 	const liveTestStatus = (attempts, error) => ({
 		status: error === void 0 ? "passed" : "failed",
 		ok: error === void 0,
@@ -69,15 +75,9 @@ async function runCodexComputerUseLiveTest(params) {
 				tool: probe.tool,
 				arguments: probe.arguments
 			}, { timeoutMs: params.config.toolCallTimeoutMs })).isError === true) throw new Error(`Computer Use readiness tool ${params.config.mcpServerName}.${probe.tool} returned an error result`);
-			outcome = {
-				ok: true,
-				liveTest: liveTestStatus(attempt + 1)
-			};
+			outcome = { liveTest: liveTestStatus(attempt + 1) };
 		} catch (error) {
-			outcome = {
-				ok: false,
-				error
-			};
+			outcome = { error };
 		}
 		let cleanupError;
 		if (threadId) try {
@@ -85,9 +85,9 @@ async function runCodexComputerUseLiveTest(params) {
 		} catch (error) {
 			cleanupError = toErrorObject(error, "Computer Use readiness cleanup failed");
 		}
-		if (!outcome.ok && (params.signal?.aborted || isCodexAppServerStartSelectionChangedError(outcome.error))) throw toErrorObject(outcome.error, "Computer Use live test failed");
+		if ("error" in outcome && (params.signal?.aborted || isCodexAppServerStartSelectionChangedError(outcome.error))) throw toErrorObject(outcome.error, "Computer Use live test failed");
 		if (cleanupError) throw cleanupError;
-		if (outcome.ok) return {
+		if ("liveTest" in outcome) return {
 			liveTest: outcome.liveTest,
 			...repair ? { repair } : {}
 		};
@@ -99,16 +99,6 @@ async function runCodexComputerUseLiveTest(params) {
 		...repair ? { repair } : {}
 	};
 }
-function resolveComputerUseLiveTestProbe(tools) {
-	if (tools?.includes(COMPUTER_USE_UNIFIED_JS_TOOL) && !tools.includes(COMPUTER_USE_LIST_APPS_TOOL)) return {
-		tool: COMPUTER_USE_UNIFIED_JS_TOOL,
-		arguments: { code: COMPUTER_USE_UNIFIED_JS_PROBE }
-	};
-	return {
-		tool: COMPUTER_USE_LIST_APPS_TOOL,
-		arguments: {}
-	};
-}
 async function repairComputerUseMcpRuntime(request, config) {
 	try {
 		await request("config/mcpServer/reload", void 0, { timeoutMs: config.liveTestTimeoutMs });
@@ -222,29 +212,27 @@ async function readCodexComputerUseStatus(params = {}) {
 async function ensureCodexComputerUse(params = {}) {
 	const config = resolveComputerUseConfig(params);
 	if (!config.enabled) return unavailableStatus(config, "disabled", "Computer Use is disabled.");
-	const status = await inspectCodexComputerUse({
-		...params,
+	const inspection = {
 		computerUseConfig: config,
 		runLiveTest: config.strictReadiness,
-		installMode: "none",
 		refreshSharedCache: config.autoInstall
+	};
+	let status = await inspectCodexComputerUse({
+		...params,
+		...inspection,
+		installMode: "none"
 	});
-	if (status.ready) return status;
-	if (config.autoInstall) {
+	if (!status.ready && config.autoInstall) {
 		if (config.marketplaceSource) throw new CodexComputerUseSetupError(unavailableStatus(config, "auto_install_blocked", "Computer Use auto-install only uses marketplaces Codex app-server has already discovered. Run /codex computer-use install to install from a configured marketplace source."));
-		const installedStatus = await inspectCodexComputerUse({
+		status = await inspectCodexComputerUse({
 			...params,
-			computerUseConfig: config,
-			runLiveTest: config.strictReadiness,
-			installMode: "automatic",
-			refreshSharedCache: true
+			...inspection,
+			installMode: "automatic"
 		});
-		if (!installedStatus.ready) throw new CodexComputerUseSetupError(installedStatus);
-		return installedStatus;
 	}
-	throw new CodexComputerUseSetupError(status);
+	if (!status.ready) throw new CodexComputerUseSetupError(status);
+	return status;
 }
-/** Forces Computer Use plugin installation and returns the ready status. */
 async function installCodexComputerUse(params = {}) {
 	const config = resolveComputerUseConfig({
 		...params,
@@ -376,9 +364,7 @@ async function inspectCodexComputerUse(params) {
 }
 async function inspectCodexComputerUseWithoutFence(params) {
 	const request = createComputerUseRequest(params);
-	if (params.installMode !== "none") {
-		if (!resolveCodexComputerUseConfig({ pluginConfig: params.pluginConfig }).autoInstall) await prepareExplicitManagedComputerUseInstall(params);
-	}
+	if (params.installMode !== "none" && !resolveCodexComputerUseConfig({ pluginConfig: params.pluginConfig }).autoInstall) await prepareExplicitManagedComputerUseInstall(params);
 	const managedMarketplacePath = await resolveClientManagedBundledMarketplacePath(params.client?.getRuntimeIdentity()?.codexHome, params.agentDir);
 	const managedCodexHome = managedMarketplacePath ? params.client?.getRuntimeIdentity()?.codexHome : void 0;
 	let computerUseConfig = await resolveManagedCodexComputerUseConfig(params.computerUseConfig, managedMarketplacePath);
@@ -400,14 +386,8 @@ async function inspectCodexComputerUseWithoutFence(params) {
 		managedCodexHome
 	});
 	if (!marketplace.marketplace) return unavailableStatus(computerUseConfig, "marketplace_missing", marketplace.message ?? `No Codex marketplace containing ${computerUseConfig.pluginName} is registered. Configure computerUse.marketplaceSource or computerUse.marketplacePath, then run /codex computer-use install.`);
-	const pluginInspection = await ensureComputerUsePlugin({
-		request,
-		config: computerUseConfig,
-		marketplace: marketplace.marketplace,
-		nativeDisableStatus,
-		installPlugin: params.installMode !== "none"
-	});
-	if (!pluginInspection.ok) return pluginInspection.status;
+	const pluginInspection = await ensureComputerUsePlugin(marketplace.marketplace, params.installMode !== "none");
+	if ("status" in pluginInspection) return pluginInspection.status;
 	if (params.refreshSharedCache && computerUseConfig !== params.computerUseConfig && managedCodexHome && managedMarketplacePath && params.agentDir && params.client) {
 		const client = params.client;
 		await ensureCodexComputerUseSharedPluginCache({
@@ -421,16 +401,74 @@ async function inspectCodexComputerUseWithoutFence(params) {
 			}
 		});
 	}
-	return await readComputerUseTools({
-		request,
-		client: params.client,
-		signal: params.signal,
-		config: computerUseConfig,
-		plugin: pluginInspection.plugin,
-		runLiveTest: params.runLiveTest,
-		installPlugin: params.installMode !== "none",
-		releaseNativeConfigFence: params.releaseNativeConfigFence
-	});
+	return await readComputerUseTools(pluginInspection.plugin, params.installMode !== "none");
+	async function ensureComputerUsePlugin(source, installPlugin) {
+		let plugin = await readComputerUsePlugin(request, source, computerUseConfig.pluginName);
+		if (nativeDisableStatus) {
+			const nativeConfig = await request("config/read", { includeLayers: false });
+			if (isLegacyCodexComputerUsePluginDisabled(nativeConfig.config)) return { status: nativeDisableStatus };
+		}
+		if (installPlugin && (!plugin.summary.installed || !plugin.summary.enabled)) {
+			await request("plugin/install", pluginRequestParams(source, computerUseConfig.pluginName));
+			await request("config/mcpServer/reload", void 0);
+			plugin = await readComputerUsePlugin(request, source, computerUseConfig.pluginName);
+		}
+		if (!plugin.summary.installed || !plugin.summary.enabled) return { status: statusFromPlugin({
+			config: computerUseConfig,
+			plugin,
+			tools: [],
+			reason: plugin.summary.installed ? "plugin_disabled" : "plugin_not_installed",
+			message: plugin.summary.installed ? `Computer Use is installed, but the ${computerUseConfig.pluginName} plugin is disabled. Run /codex computer-use install or enable computerUse.autoInstall to re-enable it.` : "Computer Use is available but not installed. Run /codex computer-use install or enable computerUse.autoInstall."
+		}) };
+		return { plugin };
+	}
+	async function readComputerUseTools(plugin, installPlugin) {
+		const { client, signal, runLiveTest, releaseNativeConfigFence } = params;
+		let server = await readMcpServerStatus(request, computerUseConfig.mcpServerName);
+		let tools = Object.keys(server?.tools ?? {}).toSorted();
+		if ((!server || tools.length === 0) && installPlugin) {
+			await request("config/mcpServer/reload", void 0);
+			server = await readMcpServerStatus(request, computerUseConfig.mcpServerName);
+			tools = Object.keys(server?.tools ?? {}).toSorted();
+		}
+		if (!server || tools.length === 0) return statusFromPlugin({
+			config: computerUseConfig,
+			plugin,
+			tools,
+			reason: "mcp_missing",
+			message: server ? `Computer Use is installed, but the ${computerUseConfig.mcpServerName} MCP server exposes no tools.` : `Computer Use is installed, but the ${computerUseConfig.mcpServerName} MCP server is not available.`
+		});
+		const status = statusFromPlugin({
+			config: computerUseConfig,
+			plugin,
+			tools,
+			reason: "ready",
+			message: "Computer Use is ready."
+		});
+		if (!runLiveTest) return status;
+		releaseNativeConfigFence?.();
+		const { liveTest, repair } = await runCodexComputerUseLiveTest({
+			request,
+			client,
+			signal,
+			config: computerUseConfig,
+			tools
+		});
+		const compatibilityStartupAllowed = !liveTest.ok && !computerUseConfig.strictReadiness;
+		return {
+			...status,
+			ready: liveTest.ok,
+			reason: liveTest.ok ? "ready" : "live_test_failed",
+			liveTest,
+			...repair ? { repair } : {},
+			warnings: [
+				...status.warnings,
+				...repair?.warnings ?? [],
+				...compatibilityStartupAllowed ? ["Computer Use live test failed, but compatibility startup remains enabled; set computerUse.strictReadiness to true to fail closed."] : []
+			],
+			message: liveTest.ok ? "Computer Use is ready." : compatibilityStartupAllowed ? `${liveTest.message} Startup is allowed because computerUse.strictReadiness is false.` : liveTest.message
+		};
+	}
 }
 async function prepareExplicitManagedComputerUseInstall(params) {
 	const context = params.explicitManagedInstall;
@@ -477,81 +515,6 @@ async function resolveExplicitManagedComputerUseInstallContext(params) {
 		desktopGeneration
 	};
 }
-async function ensureComputerUsePlugin(params) {
-	let plugin = await readComputerUsePlugin(params.request, params.marketplace, params.config.pluginName);
-	if (params.nativeDisableStatus) {
-		const nativeConfig = await params.request("config/read", { includeLayers: false });
-		if (isLegacyCodexComputerUsePluginDisabled(nativeConfig.config)) return {
-			ok: false,
-			status: params.nativeDisableStatus
-		};
-	}
-	if (params.installPlugin && (!plugin.summary.installed || !plugin.summary.enabled)) {
-		await params.request("plugin/install", pluginRequestParams(params.marketplace, params.config.pluginName));
-		await params.request("config/mcpServer/reload", void 0);
-		plugin = await readComputerUsePlugin(params.request, params.marketplace, params.config.pluginName);
-	}
-	if (!plugin.summary.installed || !plugin.summary.enabled) return {
-		ok: false,
-		status: statusFromPlugin({
-			config: params.config,
-			plugin,
-			tools: [],
-			reason: plugin.summary.installed ? "plugin_disabled" : "plugin_not_installed",
-			message: plugin.summary.installed ? `Computer Use is installed, but the ${params.config.pluginName} plugin is disabled. Run /codex computer-use install or enable computerUse.autoInstall to re-enable it.` : "Computer Use is available but not installed. Run /codex computer-use install or enable computerUse.autoInstall."
-		})
-	};
-	return {
-		ok: true,
-		plugin
-	};
-}
-async function readComputerUseTools(params) {
-	let server = await readMcpServerStatus(params.request, params.config.mcpServerName);
-	let tools = Object.keys(server?.tools ?? {}).toSorted();
-	if ((!server || tools.length === 0) && params.installPlugin) {
-		await params.request("config/mcpServer/reload", void 0);
-		server = await readMcpServerStatus(params.request, params.config.mcpServerName);
-		tools = Object.keys(server?.tools ?? {}).toSorted();
-	}
-	if (!server || tools.length === 0) return statusFromPlugin({
-		config: params.config,
-		plugin: params.plugin,
-		tools,
-		reason: "mcp_missing",
-		message: server ? `Computer Use is installed, but the ${params.config.mcpServerName} MCP server exposes no tools.` : `Computer Use is installed, but the ${params.config.mcpServerName} MCP server is not available.`
-	});
-	const status = statusFromPlugin({
-		config: params.config,
-		plugin: params.plugin,
-		tools,
-		reason: "ready",
-		message: "Computer Use is ready."
-	});
-	if (!params.runLiveTest) return status;
-	params.releaseNativeConfigFence?.();
-	const { liveTest, repair } = await runCodexComputerUseLiveTest({
-		request: params.request,
-		client: params.client,
-		signal: params.signal,
-		config: params.config,
-		tools
-	});
-	const compatibilityStartupAllowed = !liveTest.ok && !params.config.strictReadiness;
-	return {
-		...status,
-		ready: liveTest.ok,
-		reason: liveTest.ok ? "ready" : "live_test_failed",
-		liveTest,
-		...repair ? { repair } : {},
-		warnings: [
-			...status.warnings,
-			...repair?.warnings ?? [],
-			...compatibilityStartupAllowed ? ["Computer Use live test failed, but compatibility startup remains enabled; set computerUse.strictReadiness to true to fail closed."] : []
-		],
-		message: liveTest.ok ? "Computer Use is ready." : compatibilityStartupAllowed ? `${liveTest.message} Startup is allowed because computerUse.strictReadiness is false.` : liveTest.message
-	};
-}
 async function resolveMarketplaceRef(params) {
 	let preferredMarketplaceName = params.config.marketplaceName;
 	if (params.config.marketplaceSource && params.allowAdd) {
@@ -612,12 +575,8 @@ async function migrateLegacyBundledMarketplaceSource(params) {
 	await params.request("marketplace/remove", { marketplaceName: BUNDLED_MARKETPLACE_NAME });
 }
 async function listComputerUseMarketplaceCandidates(request, config) {
-	return findComputerUseMarketplaces(await request("plugin/list", { cwds: [] }), config.pluginName);
-}
-async function codexNativePluginsDisabled(request) {
-	return (await request("experimentalFeature/list", {})).data.find(({ name }) => name === "plugins")?.enabled === false;
-}
-function findComputerUseMarketplaces(listed, pluginName) {
+	const listed = await request("plugin/list", { cwds: [] });
+	const { pluginName } = config;
 	return listed.marketplaces.flatMap((marketplace) => {
 		const plugin = marketplace.plugins.find((candidate) => candidate.name === pluginName || candidate.id === pluginName || candidate.id === `${pluginName}@${marketplace.name}`);
 		if (!plugin) return [];
@@ -635,6 +594,9 @@ function findComputerUseMarketplaces(listed, pluginName) {
 		}];
 	});
 }
+async function codexNativePluginsDisabled(request) {
+	return (await request("experimentalFeature/list", {})).data.find(({ name }) => name === "plugins")?.enabled === false;
+}
 function chooseKnownComputerUseMarketplace(candidates) {
 	for (const marketplaceName of COMPUTER_USE_MARKETPLACE_NAME_PRIORITY) {
 		const candidate = candidates.find((marketplace) => marketplace.name === marketplaceName);