@openclaw/codex 2026.9.5 → 2026.9.7

package/dist/.setup/{upstream-session-fork-D3UKxgVD.mjs → upstream-session-fork-CBeVjBpT.mjs}

@@ -1,35 +1,35 @@
-import { p as sessionBindingIdentity } from "./session-binding-record-TH3xA0zj.mjs";
-import { m as isJsonObject, p as flattenCodexDynamicToolFunctions } from "./config-security-BRQ2mgW9.mjs";
-import { d as readCodexPluginConfig } from "./config-parsing-CcB9iPoq.mjs";
-import { _ as assertCodexThreadAcceptsDirectInput, v as assertCodexThreadForkResponse } from "./client-vXs2929Q.mjs";
-import { s as assertCodexModelBackedReviewerEffectiveConfig } from "./config-options-BsanJ8QG.mjs";
-import { n as withCodexAppServerThreadMutation } from "./incognito-session-uhrBF6wJ.mjs";
-import { i as readUpstreamUserText, r as readMirrorIdentity } from "./upstream-prompt-provenance-LphB8slG.mjs";
-import { i as projectCodexUserItemText } from "./transcript-history-projection-DHNBDhCU.mjs";
+import { i as isJsonObject, r as flattenCodexDynamicToolFunctions } from "./protocol-CANUwXJ3.mjs";
+import { v as sessionBindingIdentity } from "./session-binding-record-Oe9L-CNY.mjs";
+import { d as readCodexPluginConfig } from "./config-parsing-b088LyhT.mjs";
+import { s as assertCodexModelBackedReviewerEffectiveConfig } from "./config-options-CzyWLTJt.mjs";
+import { t as withCodexAppServerThreadMutation } from "./thread-ownership-queue-Dp24d7-F.mjs";
+import { i as readUpstreamUserText, r as readMirrorIdentity } from "./upstream-prompt-provenance-fXkKbPVC.mjs";
+import { r as projectCodexUserItemText } from "./transcript-history-projection-DRSifI-1.mjs";
 import { n as codexUpstreamBaseline, t as codexLastTerminalTurnId } from "./session-upstream-marker-D15C9NHp.mjs";
-import { r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BOxKP7db.mjs";
-import { c as readCodexSessionMeta } from "./session-catalog-events-jMcYfQyd.mjs";
-import { t as CodexAppServerScopedRequestRejectedError } from "./request-BioXJLYa.mjs";
-import { n as resolveOpenClawExecPolicyForCodexAppServer } from "./config-CedDWjM-.mjs";
-import { r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-CeAhl_h4.mjs";
-import { a as fingerprintCodexMirrorSourceMessage, c as readCodexMirrorSourceFingerprint } from "./transcript-mirror-attestation-CzM-94NC.mjs";
-import { I as hasCodexAppServerLiveThread, M as claimCodexAppServerLiveThread, f as readCodexAppServerClientDesktopGenerationFingerprint } from "./shared-client-BpTtuLQ5.mjs";
-import { At as shouldBuildCodexPluginThreadConfig, B as buildCodexNativeHookRelayId, K as checkCodexThreadAppAvailability, L as assertCodexNativeHookRelayAllowed, Ot as mergeCodexThreadConfigs, Q as resolveCodexNativeSkillIsolation, R as buildCodexNativeHookRelayConfig, T as buildDeveloperInstructions, U as resolveCodexNativeHookRelayEvents, X as parseCodexNativeToolCatalog, Z as applyCodexNativeSkillIsolation, et as codexDynamicToolsFingerprint, nt as fingerprintJsonObject, rt as fingerprintUserMcpServersConfigPatch, w as resolveCodexWebSearchPlan, wt as buildCodexPluginThreadConfig, x as buildCodexThreadConfiguration } from "./thread-lifecycle-Cik28qWn.mjs";
-import "./session-binding-_0W_fHRr.mjs";
-import { i as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError } from "./thread-policy-Cjs4B8xf.mjs";
-import "./thread-ownership-skomxnIt.mjs";
-import { n as resolveCodexNativeExecutionPolicy } from "./native-execution-policy-YBMHSzC4.mjs";
-import { l as isCodexDynamicToolExcluded, n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-B8J4Dy-O.mjs";
-import { o as prepareCodexWorkspaceDeveloperInstructions } from "./attempt-context-VXVwTCfS.mjs";
-import { n as prepareCodexSessionInitialization } from "./session-initialization-DH1z6fXn.mjs";
-import { createImportedCodexSession } from "./session-history-import-JHXT5Xfi.mjs";
+import { r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-BL9B5H0L.mjs";
+import { n as readCodexSessionMeta } from "./session-catalog-provenance-DoAvktcj.mjs";
+import { t as CodexAppServerScopedRequestRejectedError } from "./request-BHZ1nz8d.mjs";
+import { r as resolveOpenClawExecPolicyForCodexAppServer } from "./config-DKhXquav.mjs";
+import { r as resolveCodexSupervisionAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
+import { a as fingerprintCodexMirrorSourceMessage, c as readCodexMirrorSourceFingerprint } from "./transcript-mirror-attestation-YSegaktH.mjs";
+import { P as claimCodexAppServerLiveThread, R as hasCodexAppServerLiveThread, f as readCodexAppServerClientDesktopGenerationFingerprint } from "./shared-client-DqyTMYug.mjs";
+import { l as isCodexAppServerOverloadError, u as isCodexAppServerPrewriteRequestCancellationError, v as assertCodexThreadAcceptsDirectInput, y as assertCodexThreadForkResponse } from "./client-N0JpgSzF.mjs";
+import { D as buildCodexNativeHookRelayConfig, E as assertCodexNativeHookRelayAllowed, H as applyCodexNativeSkillIsolation, I as checkCodexThreadAppAvailability, K as codexDynamicToolsFingerprint, M as resolveCodexNativeHookRelayEvents, St as mergeCodexThreadConfigs, U as resolveCodexNativeSkillIsolation, V as parseCodexNativeToolCatalog, X as fingerprintJsonObject, Z as fingerprintUserMcpServersConfigPatch, a as buildCodexThreadConfiguration, h as buildDeveloperInstructions, ht as buildCodexPluginThreadConfig, k as buildCodexNativeHookRelayId, p as resolveCodexWebSearchPlan, wt as shouldBuildCodexPluginThreadConfig } from "./thread-requests-B_bRnMGN.mjs";
+import "./session-binding-DGCYAfvD.mjs";
+import { a as refreshCodexThreadPolicy, n as CodexThreadPolicyHandoffError } from "./thread-policy-DTd-DtkX.mjs";
+import "./thread-ownership-roNP0l1c.mjs";
+import { n as resolveCodexNativeExecutionPolicy } from "./native-execution-policy-BxZJy5mP.mjs";
+import { l as prepareCodexWorkspaceDeveloperInstructions } from "./attempt-workspace-context-C5HigshI.mjs";
+import { d as isCodexDynamicToolExcluded, n as resolveCodexProviderWebSearchSupportForClient } from "./provider-capabilities-CAxoF-X1.mjs";
+import { n as prepareCodexSessionInitialization } from "./session-initialization-6aveB9qb.mjs";
+import { createImportedCodexSession } from "./session-history-import-WhX-X33a.mjs";
 import { isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { randomUUID } from "node:crypto";
 import { isDeepStrictEqual } from "node:util";
 import path from "node:path";
 import { lstat } from "node:fs/promises";
-import { constants, createZstdDecompress } from "node:zlib";
 import { root } from "openclaw/plugin-sdk/file-access-runtime";
+import { constants, createZstdDecompress } from "node:zlib";
 import { resolveAgentWorkspaceDir } from "openclaw/plugin-sdk/agent-runtime";
 import { loadCodexBundleMcpThreadConfig } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { loadExecApprovals } from "openclaw/plugin-sdk/exec-approvals-runtime";
@@ -259,7 +259,7 @@ async function prepareCanonicalCodexFork(params) {
 	const nativeSkillIsolation = await resolveCodexNativeSkillIsolation({
 		client: context.client,
 		cwd,
-		codexHome: appServer.start.env?.CODEX_HOME,
+		codexHome: appServer.start.codexHome ?? appServer.start.env?.CODEX_HOME,
 		home: appServer.start.env?.HOME,
 		userProfile: appServer.start.env?.USERPROFILE
 	});
@@ -375,15 +375,15 @@ function resolveCodexUpstreamForkBoundaryFromTurns(params) {
 			if (item.type !== "userMessage") continue;
 			const isSteer = userMessagesInTurn > 0;
 			userMessagesInTurn += 1;
+			const local = params.localPrefix[localIndex];
+			const identity = local && readMirrorIdentity(local.message);
+			const matchesIdentity = identity === `${turn.id}:${item.id}` || !isSteer && identity === `${turn.id}:prompt`;
+			if (!matchedPrefix && !matchesIdentity) continue;
 			const nativeText = textOnlyMessage(item.content);
 			if (nativeText === void 0) return failure("drift-mismatch", "A message before the fork point contains images or attachments that cannot be verified across OpenClaw and Codex. Fork from a text-only span instead.");
-			const local = params.localPrefix[localIndex];
 			const upstreamText = local && readUpstreamUserText(local.message);
 			const text = upstreamText ? nativeText : projectCodexUserItemText(item);
 			if (!text) continue;
-			const identity = local && readMirrorIdentity(local.message);
-			const matchesIdentity = identity === `${turn.id}:${item.id}` || !isSteer && identity === `${turn.id}:prompt`;
-			if (!matchedPrefix && !matchesIdentity) continue;
 			matchedPrefix = true;
 			const localText = textOnlyMessage(local && "content" in local.message ? local.message.content : void 0);
 			const upstreamPromptVerified = !upstreamText || local?.message.role === "user" && readCodexMirrorSourceFingerprint(local.message) === fingerprintCodexMirrorSourceMessage(local.message);
@@ -567,6 +567,7 @@ async function forkCanonicalCodexSession(params) {
 						}
 					});
 					const assertCurrent = () => {
+						fork.assertCurrent();
 						initialization.assertCurrent();
 						if (ownership && !subscriptionReleased) ownership.assertCurrent();
 					};
@@ -797,16 +798,23 @@ async function forkCodexUpstreamSession(params, options) {
 				code: precheck.code,
 				message: precheck.message
 			};
-			const rawResponse = await control.forkThread({
-				threadId: sourceThreadId,
-				beforeTurnId: resolved.boundary.beforeTurnId,
-				...params.sandbox === "required" ? { sandbox: "workspace-write" } : {},
-				excludeTurns: true
-			});
-			const response = assertCodexThreadForkResponse(rawResponse);
-			const threadId = response.thread.id.trim();
-			if (!threadId) throw new Error("Codex thread/fork response did not include a thread id");
-			if (threadId === sourceThreadId || threadId === sourceBinding?.threadId) throw new Error("Codex thread/fork response reused the source thread id");
+			let response;
+			let threadId;
+			try {
+				const rawResponse = await control.forkThread({
+					threadId: sourceThreadId,
+					beforeTurnId: resolved.boundary.beforeTurnId,
+					...params.sandbox === "required" ? { sandbox: "workspace-write" } : {},
+					excludeTurns: true
+				}, params.assertCurrent);
+				response = assertCodexThreadForkResponse(rawResponse);
+				threadId = response.thread.id.trim();
+				if (!threadId) throw new Error("Codex thread/fork response did not include a thread id");
+				if (threadId === sourceThreadId || threadId === sourceBinding?.threadId) throw new Error("Codex thread/fork response reused the source thread id");
+			} catch (error) {
+				if (!(error instanceof CodexAppServerScopedRequestRejectedError) && !isCodexAppServerPrewriteRequestCancellationError(error) && !isCodexAppServerOverloadError(error)) control.retireConnection?.();
+				throw error;
+			}
 			const forkedThreadId = threadId;
 			try {
 				const connectionFingerprint = normalizeOptionalString(control.connectionFingerprint);

package/dist/.setup/{usage-BOgBEKso.mjs → usage-BMzNxeR_.mjs}

@@ -1,7 +1,7 @@
-import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-DOEGYRNs.mjs";
-import { n as readCodexAppServerUsage } from "./request-BioXJLYa.mjs";
-import "./config-CedDWjM-.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-CeAhl_h4.mjs";
+import { t as buildCodexAppServerUsageSnapshot } from "./rate-limits-B7-X2TgG.mjs";
+import { n as readCodexAppServerUsage } from "./request-BHZ1nz8d.mjs";
+import "./config-DKhXquav.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./config-runtime-C0NbLms1.mjs";
 import { CODEX_APP_SERVER_AUTH_MARKER } from "openclaw/plugin-sdk/agent-runtime";
 //#region extensions/codex/src/app-server/usage.ts
 /** Handles the synthetic usage credential for a Codex-backed OpenAI route. */
@@ -10,6 +10,7 @@ async function fetchCodexAppServerUsageSnapshot(ctx, options = {}) {
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: options.pluginConfig });
 	const usage = await (options.readUsage ?? readCodexAppServerUsage)({
 		timeoutMs: ctx.timeoutMs,
+		signal: ctx.signal,
 		agentDir: ctx.agentDir,
 		...ctx.authProfileId ? { authProfileId: ctx.authProfileId } : {},
 		config: ctx.config,

package/dist/.setup/{usage-limit-error-C0ow7DOc.mjs → usage-limit-error-QXerDo3i.mjs}

@@ -1,15 +1,11 @@
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-DOEGYRNs.mjs";
-import { t as CODEX_CONTROL_METHODS } from "./capabilities-_vXcZGSx.mjs";
-import { J as rememberCodexRateLimitsRead, K as readCodexRateLimitsRevision, q as readRecentCodexRateLimits } from "./shared-client-BpTtuLQ5.mjs";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { a as shouldRefreshCodexRateLimitsForUsageLimitMessage, i as resolveCodexUsageLimitResetAtMs, n as formatCodexUsageLimitErrorMessage } from "./rate-limits-B7-X2TgG.mjs";
+import { t as CODEX_CONTROL_METHODS } from "./capabilities-B3WEZl4e.mjs";
+import { X as readRecentCodexRateLimits, Y as readCodexRateLimitsRevision, Z as rememberCodexRateLimitsRead } from "./shared-client-DqyTMYug.mjs";
 import { readStringField } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { markAuthProfileBlockedUntil } from "openclaw/plugin-sdk/agent-runtime";
 import { embeddedAgentLog, formatErrorMessage } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/usage-limit-error.ts
-/**
-* Enriches Codex usage-limit failures with current rate-limit information and
-* marks blocked auth profiles when Codex exposes a reset time.
-*/
 const CODEX_USAGE_LIMIT_RATE_LIMIT_REFRESH_TIMEOUT_MS = 5e3;
 var CodexUsageLimitPromptError = class extends Error {
 	constructor(..._args) {
@@ -39,7 +35,6 @@ function resolveCodexPromptError(source) {
 		...info === "serverOverloaded" ? { code: "OVERLOADED" } : {}
 	});
 }
-/** Marks a Codex auth profile blocked until the reset time advertised by rate limits. */
 async function markCodexAuthProfileBlockedFromRateLimits(params) {
 	const authProfileId = params.authProfileId?.trim();
 	if (!authProfileId || !params.params.authProfileStore) return;
@@ -62,7 +57,6 @@ async function markCodexAuthProfileBlockedFromRateLimits(params) {
 		});
 	}
 }
-/** Formats a turn-start usage-limit error, refreshing rate limits when needed. */
 async function formatCodexTurnStartUsageLimitError(params) {
 	return refreshCodexUsageLimitError({
 		client: params.client,
@@ -71,7 +65,6 @@ async function formatCodexTurnStartUsageLimitError(params) {
 		signal: params.signal
 	});
 }
-/** Refreshes a generic prompt usage-limit message into a reset-aware message. */
 async function refreshCodexUsageLimitPromptError(params) {
 	if (!shouldRefreshCodexRateLimitsForUsageLimitMessage(params.message)) return;
 	return refreshCodexUsageLimitError({
@@ -87,15 +80,7 @@ async function refreshCodexUsageLimitPromptError(params) {
 }
 async function refreshCodexUsageLimitError(params) {
 	const initialMessage = formatCodexUsageLimitErrorMessage(params.source);
-	if (!shouldRefreshCodexRateLimitsForUsageLimitMessage(initialMessage)) return initialMessage ? {
-		message: initialMessage,
-		...params.source.rateLimitsTrustedForProfile ? { rateLimitsForProfile: params.source.rateLimits } : {}
-	} : void 0;
-	const rateLimits = await readCodexRateLimitsFromAppServerForUsageLimitError({
-		client: params.client,
-		timeoutMs: params.timeoutMs,
-		signal: params.signal
-	});
+	const rateLimits = shouldRefreshCodexRateLimitsForUsageLimitMessage(initialMessage) ? await readCodexRateLimitsFromAppServerForUsageLimitError(params) : void 0;
 	if (!rateLimits) return initialMessage ? {
 		message: initialMessage,
 		...params.source.rateLimitsTrustedForProfile ? { rateLimitsForProfile: params.source.rateLimits } : {}

package/dist/.setup/{web-search-provider.runtime-CTGuJt6i.mjs → web-search-provider.runtime-P77OUeoo.mjs}

@@ -1,7 +1,7 @@
-import { m as isJsonObject } from "./config-security-BRQ2mgW9.mjs";
-import { C as buildCodexNativeWebSearchThreadConfig } from "./thread-lifecycle-Cik28qWn.mjs";
-import { runBoundedCodexAppServerTurn } from "./bounded-turn-BtlZcivC.mjs";
-import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { i as isJsonObject } from "./protocol-CANUwXJ3.mjs";
+import { f as buildCodexNativeWebSearchThreadConfig } from "./thread-requests-B_bRnMGN.mjs";
+import { runBoundedCodexAppServerTurn } from "./bounded-turn-CbjoN2OW.mjs";
+import { normalizeOptionalString, normalizeTrimmedStringList } from "openclaw/plugin-sdk/string-coerce-runtime";
 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) {
@@ -13,6 +13,7 @@ async function executeCodexWebSearchProviderTool(ctx, args, executionContext, op
 		modelProvider: "openai",
 		timeoutMs: resolveSearchTimeoutSeconds(ctx.searchConfig) * 1e3,
 		signal: executionContext?.signal,
+		assertCurrent: executionContext?.assertCurrent,
 		agentDir: ctx.agentDir,
 		options,
 		taskLabel: "hosted search",
@@ -45,11 +46,11 @@ async function executeCodexWebSearchProviderTool(ctx, args, executionContext, op
 }
 function summarizeCodexWebSearchItem(item) {
 	const action = isJsonObject(item.action) ? item.action : void 0;
-	const actionType = readNonEmptyString(action, "type");
-	const queries = actionType === "search" ? readNonEmptyStringArray(action, "queries") : [];
-	const query = normalizeOptionalString(item.query) ?? (actionType === "search" ? readNonEmptyString(action, "query") : void 0) ?? queries[0];
-	const url = readNonEmptyString(action, "url");
-	const pattern = readNonEmptyString(action, "pattern");
+	const actionType = normalizeOptionalString(action?.type);
+	const queries = actionType === "search" ? normalizeTrimmedStringList(action?.queries) : [];
+	const query = normalizeOptionalString(item.query) ?? (actionType === "search" ? normalizeOptionalString(action?.query) : void 0) ?? queries[0];
+	const url = normalizeOptionalString(action?.url);
+	const pattern = normalizeOptionalString(action?.pattern);
 	return {
 		...query ? { query } : {},
 		...queries.length > 0 ? { queries } : {},
@@ -58,16 +59,5 @@ function summarizeCodexWebSearchItem(item) {
 		...pattern ? { pattern } : {}
 	};
 }
-function readNonEmptyString(record, key) {
-	return record ? normalizeOptionalString(record[key]) : void 0;
-}
-function readNonEmptyStringArray(record, key) {
-	const value = record?.[key];
-	if (!Array.isArray(value)) return [];
-	return value.flatMap((entry) => {
-		const normalized = normalizeOptionalString(entry);
-		return normalized ? [normalized] : [];
-	});
-}
 //#endregion
 export { executeCodexWebSearchProviderTool };

package/dist/api.js

@@ -1,11 +1,14 @@
-import { a as resolveCodexAppServerStartOptionsForAgent } from "./.setup/config-options-BsanJ8QG.mjs";
-import { i as resolveManagedCodexNativeCommand, r as resolveManagedCodexAppServerStartOptions, t as isManagedCodexDesktopCommand } from "./.setup/managed-binary-DP6Rib3P.mjs";
-import { t as CODEX_APP_SERVER_VERSION } from "./.setup/version-CoqzXPgK.mjs";
-import "./.setup/config-CedDWjM-.mjs";
-import { n as resolveCodexAppServerRuntimeOptions } from "./.setup/config-runtime-CeAhl_h4.mjs";
+import { d as readCodexPluginConfig } from "./.setup/config-parsing-b088LyhT.mjs";
+import { a as resolveCodexAppServerStartOptionsForAgent } from "./.setup/config-options-CzyWLTJt.mjs";
+import { i as resolveManagedCodexNativeCommand, r as resolveManagedCodexAppServerStartOptions, s as CODEX_APP_SERVER_VERSION, t as isManagedCodexDesktopCommand } from "./.setup/managed-binary-kiWRhNRE.mjs";
+import { t as codexNativeProfileRecoveryHealthCheck } from "./.setup/auth-profile-health-oHizqgye.mjs";
+import { n as findCodexAppServerSpawnError, t as describeCodexSpawnError } from "./.setup/spawn-error-CL3n6MAa.mjs";
+import "./.setup/config-DKhXquav.mjs";
+import { n as resolveCodexAppServerRuntimeOptions } from "./.setup/config-runtime-C0NbLms1.mjs";
 import { listAgentIds, resolveAgentDir } from "openclaw/plugin-sdk/agent-scope-runtime";
 import { runUtf8CommandWithTimeout } from "openclaw/plugin-sdk/process-runtime";
 import path from "node:path";
+import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 import { fileURLToPath } from "node:url";
 import { resolveDefaultModelForAgent } from "openclaw/plugin-sdk/agent-runtime";
 import { resolveEffectiveAgentRuntime } from "openclaw/plugin-sdk/command-auth-native";
@@ -24,9 +27,6 @@ function managedCodexFinding(params) {
 		...params.fixHint ? { fixHint: params.fixHint } : {}
 	};
 }
-function readErrorMessage(error) {
-	return error instanceof Error ? error.message : String(error);
-}
 function parseCodexVersion(output) {
 	return /(?:^|\s)(\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?)(?:\s|$)/u.exec(output)?.[1];
 }
@@ -67,7 +67,7 @@ function createCodexManagedAppServerHealthCheck(params) {
 			const isFinalization = ctx.mode === "fix" && env.OPENCLAW_UPDATE_POST_CORE === "1";
 			const versionFailureSeverity = isFinalization ? "warning" : "error";
 			const versionFailureHint = isFinalization ? "Codex readiness will be rechecked by its plugin after restart; inspect the Codex plugin if the warning persists." : void 0;
-			let resolved;
+			const candidates = [];
 			for (const agentId of listAgentIds(ctx.cfg)) {
 				const model = resolveDefaultModelForAgent({
 					cfg: ctx.cfg,
@@ -79,16 +79,23 @@ function createCodexManagedAppServerHealthCheck(params) {
 					modelId: model.model,
 					agentId
 				}) !== "codex") continue;
-				const agentStart = resolveAgentStartOptions({
+				candidates.push(resolveAgentStartOptions({
 					startOptions: start,
 					agentDir: resolveAgentDir(ctx.cfg, agentId, env),
 					env
-				});
+				}));
+			}
+			if (ctx.cfg.plugins?.entries?.codex?.enabled === true && readCodexPluginConfig(pluginConfig).sessionCatalog?.enabled !== false) candidates.push({
+				...start,
+				managedCommandOrder: "package-only"
+			});
+			let resolved;
+			for (const candidate of candidates) {
 				try {
-					resolved = await resolveStartOptions(agentStart, { pluginRoot: params.pluginRoot });
+					resolved = await resolveStartOptions(candidate, { pluginRoot: params.pluginRoot });
 				} catch (error) {
 					return [managedCodexFinding({
-						message: `Managed Codex app-server could not be resolved: ${readErrorMessage(error)}`,
+						message: `Managed Codex app-server could not be resolved: ${coerceErrorMessage(error)}`,
 						path: params.pluginRoot,
 						requirement: `an executable Codex ${CODEX_APP_SERVER_VERSION} managed artifact`,
 						fixHint: "Reinstall the staged OpenClaw package with its @openai/codex platform dependency, then rerun the candidate check."
@@ -109,16 +116,17 @@ function createCodexManagedAppServerHealthCheck(params) {
 			try {
 				output = await (params.deps?.runVersionCommand ? params.deps.runVersionCommand(nativeCommand) : runVersionCommand(nativeCommand, env));
 			} catch (error) {
+				const spawnFailure = findCodexAppServerSpawnError(describeCodexSpawnError(error, nativeCommand));
 				return [managedCodexFinding({
-					message: `Managed Codex app-server version check failed: ${readErrorMessage(error)}`,
-					severity: versionFailureSeverity,
+					message: spawnFailure?.message ?? `Managed Codex app-server version check failed: ${coerceErrorMessage(error)}`,
+					severity: spawnFailure && resolved.managedCommandOrder === "package-only" ? "warning" : versionFailureSeverity,
 					path: nativeCommand,
 					requirement: `Codex ${CODEX_APP_SERVER_VERSION} must report its version within ${CODEX_VERSION_TIMEOUT_MS} ms`,
 					fixHint: versionFailureHint ?? "Repair or reinstall the staged OpenClaw package, then rerun the candidate check before cutover."
 				})];
 			}
 			const detectedVersion = parseCodexVersion(`${output.stdout}\n${output.stderr}`);
-			if (detectedVersion !== "0.154.0") return [managedCodexFinding({
+			if (detectedVersion !== "0.158.0") return [managedCodexFinding({
 				severity: versionFailureSeverity,
 				message: detectedVersion ? `Managed Codex app-server version mismatch: expected ${CODEX_APP_SERVER_VERSION}, detected ${detectedVersion}.` : `Managed Codex app-server did not report a parseable version; expected ${CODEX_APP_SERVER_VERSION}.`,
 				path: nativeCommand,
@@ -144,6 +152,7 @@ function registerCodexManagedAppServerDoctorChecks(host) {
 		...host,
 		pluginRoot: CODEX_PLUGIN_ROOT
 	});
+	if (!host.getHealthCheck(codexNativeProfileRecoveryHealthCheck.id)) host.registerHealthCheck(codexNativeProfileRecoveryHealthCheck);
 }
 //#endregion
 export { CODEX_MANAGED_APP_SERVER_CHECK_ID, registerCodexManagedAppServerDoctorChecks };

package/dist/catalog-page-worker-entrypoint.js

@@ -0,0 +1,12 @@
+//#region extensions/codex/catalog-page-worker-entrypoint.ts
+const codexCatalogPageWorkerEntrypoint = {
+	currentModuleUrl: import.meta.url,
+	sourceWorkerName: "catalog-page.worker",
+	distWorkerPath: "extensions/codex/catalog-page.worker.js",
+	package: {
+		name: "@openclaw/codex",
+		distWorkerPath: "catalog-page.worker.js"
+	}
+};
+//#endregion
+export { codexCatalogPageWorkerEntrypoint };

package/dist/catalog-page.worker.js

@@ -0,0 +1,9 @@
+import { t as createCodexCatalogDecoder } from "./.setup/client-catalog-response-5HHLdcde.mjs";
+import { serveWorkerTasks } from "openclaw/plugin-sdk/worker-task-server";
+//#region extensions/codex/catalog-page.worker.ts
+const decode = createCodexCatalogDecoder();
+serveWorkerTasks((input) => {
+	return decode(input);
+});
+//#endregion
+export {};

package/dist/cli-metadata.js

@@ -2,7 +2,7 @@ import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
 //#region extensions/codex/cli-metadata.ts
 function registerCodexCliMetadata(api) {
 	api.registerCli(async ({ program }) => {
-		const { registerCodexSessionCli } = await import("./.setup/session-cli-DIj-IE-E.mjs");
+		const { registerCodexSessionCli } = await import("./.setup/session-cli-Cn_nCqfq.mjs");
 		registerCodexSessionCli(program);
 	}, { descriptors: [{
 		name: "codex",

package/dist/doctor-contract-api.js

@@ -114,6 +114,11 @@ function hasRetiredApprovalPolicy(value) {
 	const approvalPolicy = asNullableRecord(value)?.approvalPolicy;
 	return approvalPolicy === "on-failure" || approvalPolicy === "untrusted";
 }
+function hasBlankNetworkProxyOptionalFields(value) {
+	const appServer = asNullableRecord(value);
+	const networkProxy = asNullableRecord(appServer?.networkProxy);
+	return networkProxy?.enabled === true && [networkProxy.profileName, appServer?.remoteWorkspaceRoot].some((field) => typeof field === "string" && !field.trim());
+}
 const RETIRED_TURN_IDLE_TIMEOUT_KEYS = [
 	"turnCompletionIdleTimeoutMs",
 	"turnAssistantCompletionIdleTimeoutMs",
@@ -167,10 +172,21 @@ const legacyConfigRules = [
 		],
 		message: "Codex app-server turn idle timeouts are retired; native Codex owns provider liveness and turn completion. The existing agents.defaults.timeoutSeconds run limit remains unchanged. Run \"openclaw doctor --fix\" to remove the old settings.",
 		match: hasRetiredTurnIdleTimeout
+	},
+	{
+		path: [
+			"plugins",
+			"entries",
+			"codex",
+			"config",
+			"appServer"
+		],
+		message: "Blank plugins.entries.codex.config.appServer.networkProxy.profileName or appServer.remoteWorkspaceRoot must be removed to use the defaults with network restrictions. Run \"openclaw doctor --fix\".",
+		match: hasBlankNetworkProxyOptionalFields
 	}
 ];
 /**
-* Removes retired Codex plugin config keys while preserving unrelated config.
+* Repairs legacy Codex plugin config while preserving unrelated config.
 */
 function normalizeCompatibilityConfig({ cfg }) {
 	const rawEntry = asNullableRecord(cfg.plugins?.entries?.codex);
@@ -181,7 +197,8 @@ function normalizeCompatibilityConfig({ cfg }) {
 	const shouldRewriteDestructivePolicy = hasLegacyPluginDestructivePolicy(rawCodexPlugins);
 	const shouldRewriteApprovalPolicy = hasRetiredApprovalPolicy(rawAppServer);
 	const shouldRemoveTurnIdleTimeouts = hasRetiredTurnIdleTimeout(rawAppServer);
-	if (!rawPluginConfig || !shouldRemoveDynamicToolsProfile && !shouldRewriteDestructivePolicy && !shouldRewriteApprovalPolicy && !shouldRemoveTurnIdleTimeouts) return {
+	const shouldRemoveBlankNetworkProxyFields = hasBlankNetworkProxyOptionalFields(rawAppServer);
+	if (!rawPluginConfig || !shouldRemoveDynamicToolsProfile && !shouldRewriteDestructivePolicy && !shouldRewriteApprovalPolicy && !shouldRemoveTurnIdleTimeouts && !shouldRemoveBlankNetworkProxyFields) return {
 		config: cfg,
 		changes: []
 	};
@@ -216,6 +233,21 @@ function normalizeCompatibilityConfig({ cfg }) {
 			changes.push(`Removed retired plugins.entries.codex.config.appServer.${key}; native Codex owns provider liveness and turn completion. agents.defaults.timeoutSeconds was not changed.`);
 		}
 	}
+	if (nextAppServer && shouldRemoveBlankNetworkProxyFields) {
+		const nextNetworkProxy = asNullableRecord(nextAppServer.networkProxy);
+		for (const [target, key, configPath] of [[
+			nextNetworkProxy,
+			"profileName",
+			"networkProxy.profileName"
+		], [
+			nextAppServer,
+			"remoteWorkspaceRoot",
+			"remoteWorkspaceRoot"
+		]]) if (target && typeof target[key] === "string" && !target[key].trim()) {
+			delete target[key];
+			changes.push(`Removed blank plugins.entries.codex.config.appServer.${configPath}; the default now applies.`);
+		}
+	}
 	if (shouldRewriteApprovalPolicy) {
 		if (nextAppServer?.approvalPolicy === "on-failure" || nextAppServer?.approvalPolicy === "untrusted") nextAppServer.approvalPolicy = "on-request";
 		changes.push("Renamed retired plugins.entries.codex.config.appServer.approvalPolicy to \"on-request\".");
@@ -225,11 +257,21 @@ function normalizeCompatibilityConfig({ cfg }) {
 		changes
 	};
 }
-const stateMigrations = [{
-	id: "codex-app-server-sidecars-to-plugin-state",
-	label: "Codex app-server thread bindings",
-	detectLegacyState: async (params) => (await import("./.setup/session-binding-sidecars-CKYEcfNn.mjs")).detectLegacySessionBindingSidecars(params),
-	migrateLegacyState: async (params) => (await import("./.setup/session-binding-sidecars-CKYEcfNn.mjs")).migrateLegacySessionBindingSidecars(params)
-}, codexOrphanedSessionBindingMigration];
+const stateMigrations = [
+	{
+		id: "codex-app-server-sidecars-to-plugin-state",
+		label: "Codex app-server thread bindings",
+		detectLegacyState: async (params) => (await import("./.setup/session-binding-sidecars-jo6H8dFr.mjs")).detectLegacySessionBindingSidecars(params),
+		migrateLegacyState: async (params) => (await import("./.setup/session-binding-sidecars-jo6H8dFr.mjs")).migrateLegacySessionBindingSidecars(params)
+	},
+	{
+		id: "codex-native-task-assignments",
+		label: "Codex native pending assignments",
+		collectBackupResources: async (params) => (await import("./.setup/native-task-assignments-DMQ0g3hu.mjs")).codexNativeTaskAssignmentMigration.collectBackupResources(params),
+		detectLegacyState: async (params) => (await import("./.setup/native-task-assignments-DMQ0g3hu.mjs")).codexNativeTaskAssignmentMigration.detectLegacyState(params),
+		migrateLegacyState: async (params) => (await import("./.setup/native-task-assignments-DMQ0g3hu.mjs")).codexNativeTaskAssignmentMigration.migrateLegacyState(params)
+	},
+	codexOrphanedSessionBindingMigration
+];
 //#endregion
 export { legacyConfigRules, normalizeCompatibilityConfig, stateMigrations };