@openclaw/codex 2026.6.1 → 2026.6.2-beta.1

package/dist/{client-BnOmn0y-.js → client-BFxKzFnH.js}

@@ -1,4 +1,4 @@
-import { d as resolveCodexAppServerRuntimeOptions } from "./config-AlzuNKCY.js";
+import { l as resolveCodexAppServerRuntimeOptions } from "./config-BT6SLiE6.js";
 import { materializeWindowsSpawnProgram, resolveWindowsSpawnProgram } from "openclaw/plugin-sdk/windows-spawn";
 import { OPENCLAW_VERSION, embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import { createInterface } from "node:readline";

package/dist/client-factory-BS9nYX8K.js

@@ -0,0 +1,16 @@
+//#region extensions/codex/src/app-server/client-factory.ts
+let sharedClientModulePromise = null;
+const loadSharedClientModule = async () => {
+	sharedClientModulePromise ??= import("./shared-client-B31-oqN-.js").then((n) => n.c);
+	return await sharedClientModulePromise;
+};
+const defaultLeasedCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config, options) => loadSharedClientModule().then(({ getLeasedSharedCodexAppServerClient }) => getLeasedSharedCodexAppServerClient({
+	startOptions,
+	authProfileId,
+	agentDir,
+	config,
+	onStartedClient: options?.onStartedClient,
+	abandonSignal: options?.abandonSignal
+}));
+//#endregion
+export { defaultLeasedCodexAppServerClientFactory as t };

package/dist/{command-handlers-VhJdcXcI.js → command-handlers-BaBMyAFy.js}

@@ -1,12 +1,12 @@
-import { d as resolveCodexAppServerRuntimeOptions, o as isCodexFastServiceTier } from "./config-AlzuNKCY.js";
-import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-DAJvlyJu.js";
-import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { a as readCodexAppServerBinding, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
-import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-CPtFWp-f.js";
-import { a as buildHelp, c as formatCodexStatus, d as formatModels, f as formatSkills, l as formatComputerUseStatus, m as readString$1, o as formatAccount, p as formatThreads, s as formatCodexDisplayText, u as formatList, v as summarizeCodexAccountUsage } from "./notification-correlation-BykOI_jh.js";
+import { a as isCodexFastServiceTier, l as resolveCodexAppServerRuntimeOptions } from "./config-BT6SLiE6.js";
+import { n as listCodexAppServerModels, t as listAllCodexAppServerModels } from "./models-D8i1zWEu.js";
+import { l as isJsonObject } from "./client-BFxKzFnH.js";
+import { a as readCodexAppServerBinding, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-D8DxeEbf.js";
+import { i as describeControlFailure, r as CODEX_CONTROL_METHODS, t as requestCodexAppServerJson } from "./request-nYrsFNU2.js";
+import { a as buildHelp, c as formatCodexStatus, d as formatModels, f as formatSkills, l as formatComputerUseStatus, m as readString$1, o as formatAccount, p as formatThreads, s as formatCodexDisplayText, u as formatList, v as summarizeCodexAccountUsage } from "./notification-correlation-Bg-AlEEy.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-DMCJlzmz.js";
-import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-CqVPKJPp.js";
-import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-DYLSxIfq.js";
+import { _ as steerCodexConversationTurn, b as readCodexConversationBindingData, d as parseCodexFastModeArg, f as parseCodexPermissionsModeArg, g as setCodexConversationPermissions, h as setCodexConversationModel, m as setCodexConversationFastMode, o as formatCodexCliSessions, p as readCodexConversationActiveTurn, r as startCodexConversationThread, u as formatPermissionsMode, v as stopCodexConversationTurn, x as resolveCodexDefaultWorkspaceDir, y as createCodexCliNodeConversationBindingData } from "./conversation-binding-CMaXGYAc.js";
+import { n as installCodexComputerUse, r as readCodexComputerUseStatus } from "./computer-use-Dhz6SrFx.js";
 import { n as rememberCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { parseStrictPositiveInteger } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";

package/dist/{compact-D1dSrNrT.js → compact-CVPc2Rag.js}

@@ -1,7 +1,8 @@
-import { d as resolveCodexAppServerRuntimeOptions } from "./config-AlzuNKCY.js";
-import { a as readCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
+import { l as resolveCodexAppServerRuntimeOptions } from "./config-BT6SLiE6.js";
+import { a as readCodexAppServerBinding } from "./session-binding-D8DxeEbf.js";
+import { o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-B31-oqN-.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DMCJlzmz.js";
-import { t as defaultCodexAppServerClientFactory } from "./client-factory-3ykiiX2z.js";
+import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-BS9nYX8K.js";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/compact.ts
 const warnedIgnoredCompactionOverrides = /* @__PURE__ */ new Set();
@@ -109,7 +110,8 @@ async function compactCodexNativeThread(params, options = {}) {
 		compacted: false,
 		reason: "auth profile mismatch for session binding"
 	};
-	const client = await (options.clientFactory ?? defaultCodexAppServerClientFactory)(appServer.start, requestedAuthProfileId ?? binding.authProfileId, params.agentDir, params.config);
+	const shouldReleaseDefaultLease = !options.clientFactory;
+	const client = await (options.clientFactory ?? defaultLeasedCodexAppServerClientFactory)(appServer.start, requestedAuthProfileId ?? binding.authProfileId, params.agentDir, params.config);
 	try {
 		await client.request("thread/compact/start", { threadId: binding.threadId });
 		embeddedAgentLog.info("started codex app-server compaction", {
@@ -133,6 +135,8 @@ async function compactCodexNativeThread(params, options = {}) {
 			compacted: false,
 			reason: formatCompactionError(error)
 		};
+	} finally {
+		if (shouldReleaseDefaultLease) releaseLeasedSharedCodexAppServerClient(client);
 	}
 	const resultDetails = {
 		backend: "codex-app-server",

package/dist/{computer-use-DYLSxIfq.js → computer-use-Dhz6SrFx.js}

@@ -1,5 +1,5 @@
-import { d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig } from "./config-AlzuNKCY.js";
-import { i as describeControlFailure, t as requestCodexAppServerJson } from "./request-CPtFWp-f.js";
+import { l as resolveCodexAppServerRuntimeOptions, u as resolveCodexComputerUseConfig } from "./config-BT6SLiE6.js";
+import { i as describeControlFailure, t as requestCodexAppServerJson } from "./request-nYrsFNU2.js";
 import { existsSync } from "node:fs";
 //#region extensions/codex/src/app-server/computer-use.ts
 var CodexComputerUseSetupError = class extends Error {

package/dist/{config-AlzuNKCY.js → config-BT6SLiE6.js}

@@ -13,15 +13,7 @@ const START_OPTIONS_KEY_SECRET = getStartOptionsKeySecret();
 const UNIX_CODEX_REQUIREMENTS_PATH = "/etc/codex/requirements.toml";
 const WINDOWS_CODEX_REQUIREMENTS_SUFFIX = "\\OpenAI\\Codex\\requirements.toml";
 const PLAIN_DECIMAL_NUMBER_RE = /^[+-]?(?:(?:\d+\.?\d*)|(?:\.\d+))$/;
-const CODEX_PLUGINS_MARKETPLACE_NAMES = [
-	"openai-curated",
-	"openai-bundled",
-	"openai-primary-runtime"
-];
 const CODEX_PLUGINS_MARKETPLACE_NAME = "openai-curated";
-function isCodexPluginsMarketplaceName(name) {
-	return name !== void 0 && CODEX_PLUGINS_MARKETPLACE_NAMES.includes(name);
-}
 function shouldAutoApproveCodexAppServerApprovals(appServer) {
 	return appServer.approvalPolicy === "never" && appServer.sandbox === "danger-full-access";
 }
@@ -51,7 +43,7 @@ const codexAppServerServiceTierSchema = z.preprocess((value) => value === null ?
 const codexAppServerExperimentalSchema = z.object({ sandboxExecServer: z.boolean().optional() }).strict();
 const codexPluginEntryConfigSchema = z.object({
 	enabled: z.boolean().optional(),
-	marketplaceName: z.enum(CODEX_PLUGINS_MARKETPLACE_NAMES).optional(),
+	marketplaceName: z.literal(CODEX_PLUGINS_MARKETPLACE_NAME).optional(),
 	pluginName: z.string().trim().min(1).optional(),
 	allow_destructive_actions: z.boolean().optional()
 }).strict();
@@ -130,10 +122,10 @@ function resolveCodexPluginsPolicy(pluginConfig) {
 		enabled,
 		allowDestructiveActions,
 		pluginPolicies: Object.entries(config?.plugins ?? {}).flatMap(([configKey, entry]) => {
-			if (!isCodexPluginsMarketplaceName(entry.marketplaceName) || !entry.pluginName) return [];
+			if (entry.marketplaceName !== "openai-curated" || !entry.pluginName) return [];
 			return [{
 				configKey,
-				marketplaceName: entry.marketplaceName,
+				marketplaceName: CODEX_PLUGINS_MARKETPLACE_NAME,
 				pluginName: entry.pluginName,
 				enabled: enabled && entry.enabled !== false,
 				allowDestructiveActions: entry.allow_destructive_actions ?? allowDestructiveActions
@@ -765,4 +757,4 @@ function splitShellWords(value) {
 	return words;
 }
 //#endregion
-export { isCodexAppServerApprovalPolicyAllowedByRequirements as a, isCodexSandboxExecServerEnabled as c, resolveCodexAppServerRuntimeOptions as d, resolveCodexComputerUseConfig as f, withMcpElicitationsApprovalPolicy as g, shouldAutoApproveCodexAppServerApprovals as h, codexSandboxPolicyForTurn as i, normalizeCodexServiceTier as l, resolveOpenClawExecPolicyForCodexAppServer as m, CODEX_PLUGINS_MARKETPLACE_NAMES as n, isCodexFastServiceTier as o, resolveCodexPluginsPolicy as p, codexAppServerStartOptionsKey as r, isCodexPluginsMarketplaceName as s, CODEX_PLUGINS_MARKETPLACE_NAME as t, readCodexPluginConfig as u };
+export { isCodexFastServiceTier as a, readCodexPluginConfig as c, resolveCodexPluginsPolicy as d, resolveOpenClawExecPolicyForCodexAppServer as f, isCodexAppServerApprovalPolicyAllowedByRequirements as i, resolveCodexAppServerRuntimeOptions as l, withMcpElicitationsApprovalPolicy as m, codexAppServerStartOptionsKey as n, isCodexSandboxExecServerEnabled as o, shouldAutoApproveCodexAppServerApprovals as p, codexSandboxPolicyForTurn as r, normalizeCodexServiceTier as s, CODEX_PLUGINS_MARKETPLACE_NAME as t, resolveCodexComputerUseConfig as u };

package/dist/{conversation-binding-CqVPKJPp.js → conversation-binding-CMaXGYAc.js}

@@ -1,10 +1,10 @@
-import { d as resolveCodexAppServerRuntimeOptions, i as codexSandboxPolicyForTurn, m as resolveOpenClawExecPolicyForCodexAppServer, o as isCodexFastServiceTier } from "./config-AlzuNKCY.js";
-import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-6nrEQZMV.js";
-import { a as readCodexAppServerBinding, i as normalizeCodexAppServerBindingModelProvider, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
-import { r as CODEX_CONTROL_METHODS } from "./request-CPtFWp-f.js";
-import { i as readCodexNotificationTurnId, r as readCodexNotificationThreadId, s as formatCodexDisplayText } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, f as resolveCodexAppServerAuthProfileIdForAgent, i as getLeasedSharedCodexAppServerClient } from "./shared-client-DUWLidr5.js";
+import { a as isCodexFastServiceTier, f as resolveOpenClawExecPolicyForCodexAppServer, l as resolveCodexAppServerRuntimeOptions, r as codexSandboxPolicyForTurn } from "./config-BT6SLiE6.js";
+import { l as isJsonObject } from "./client-BFxKzFnH.js";
+import { t as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-BOYYMjx6.js";
+import { a as readCodexAppServerBinding, i as normalizeCodexAppServerBindingModelProvider, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-D8DxeEbf.js";
+import { r as CODEX_CONTROL_METHODS } from "./request-nYrsFNU2.js";
+import { i as readCodexNotificationTurnId, r as readCodexNotificationThreadId, s as formatCodexDisplayText } from "./notification-correlation-Bg-AlEEy.js";
+import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent } from "./shared-client-B31-oqN-.js";
 import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-DMCJlzmz.js";
 import { resolveTimerTimeoutMs, timestampMsToIsoString } from "openclaw/plugin-sdk/number-runtime";
 import os from "node:os";

package/dist/harness.js

@@ -28,31 +28,31 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-DM53zFlW.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-Wo9uasL_.js");
 			return runCodexAppServerAttempt(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-dIZf9RBV.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-DbYSPUnj.js");
 			return runCodexAppServerSideQuestion(params, {
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
 				nativeHookRelay: { enabled: true }
 			});
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-D1dSrNrT.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-CVPc2Rag.js");
 			return maybeCompactCodexAppServerSession(params, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
 		reset: async (params) => {
 			if (params.sessionFile) {
-				const { clearCodexAppServerBinding } = await import("./session-binding-DWiEGATW.js").then((n) => n.o);
+				const { clearCodexAppServerBinding } = await import("./session-binding-D8DxeEbf.js").then((n) => n.o);
 				await clearCodexAppServerBinding(params.sessionFile);
 			}
 		},
 		dispose: async () => {
-			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-DUWLidr5.js").then((n) => n.s);
+			const { clearSharedCodexAppServerClientAndWait } = await import("./shared-client-B31-oqN-.js").then((n) => n.c);
 			await clearSharedCodexAppServerClientAndWait();
 		}
 	};

package/dist/index.js

@@ -1,12 +1,12 @@
 import { createCodexAppServerAgentHarness } from "./harness.js";
-import { d as resolveCodexAppServerRuntimeOptions, s as isCodexPluginsMarketplaceName, t as CODEX_PLUGINS_MARKETPLACE_NAME, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
+import { c as readCodexPluginConfig, l as resolveCodexAppServerRuntimeOptions, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-BT6SLiE6.js";
 import { buildCodexProvider } from "./provider.js";
-import { v as ensureCodexPluginActivation, x as defaultCodexAppInventoryCache, y as pluginReadParams } from "./thread-lifecycle-6nrEQZMV.js";
+import { v as ensureCodexPluginActivation, x as defaultCodexAppInventoryCache, y as pluginReadParams } from "./thread-lifecycle-BOYYMjx6.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
-import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-CPtFWp-f.js";
-import { s as formatCodexDisplayText } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, f as resolveCodexAppServerAuthProfileIdForAgent, i as getLeasedSharedCodexAppServerClient, n as clearSharedCodexAppServerClientIfCurrentAndWait, p as resolveCodexAppServerFallbackApiKeyCacheKey, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-DUWLidr5.js";
-import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, n as handleCodexConversationInboundClaim, s as listCodexCliSessionsOnNode, t as handleCodexConversationBindingResolved } from "./conversation-binding-CqVPKJPp.js";
+import { i as describeControlFailure, n as buildCodexPluginAppCacheKey, t as requestCodexAppServerJson } from "./request-nYrsFNU2.js";
+import { s as formatCodexDisplayText } from "./notification-correlation-Bg-AlEEy.js";
+import { a as getLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthAccountCacheKey, m as resolveCodexAppServerFallbackApiKeyCacheKey, o as releaseLeasedSharedCodexAppServerClient, p as resolveCodexAppServerAuthProfileIdForAgent, r as clearSharedCodexAppServerClientIfCurrentAndWait } from "./shared-client-B31-oqN-.js";
+import { a as createCodexCliSessionNodeInvokePolicies, c as resolveCodexCliSessionForBindingOnNode, i as createCodexCliSessionNodeHostCommands, l as resumeCodexCliSessionOnNode, n as handleCodexConversationInboundClaim, s as listCodexCliSessionsOnNode, t as handleCodexConversationBindingResolved } from "./conversation-binding-CMaXGYAc.js";
 import { mutateConfigFile } from "openclaw/plugin-sdk/config-mutation";
 import { resolveLivePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { definePluginEntry } from "openclaw/plugin-sdk/plugin-entry";
@@ -48,7 +48,7 @@ async function handleCodexCommand(ctx, options = {}) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-VhJdcXcI.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-BaBMyAFy.js");
 	return handleCodexSubcommand;
 }
 //#endregion
@@ -1341,10 +1341,7 @@ async function requestTargetCodexAppServerJson(params) {
 function hasOpenAiCuratedMarketplace(response) {
 	if (!response || typeof response !== "object" || !("marketplaces" in response)) return false;
 	const marketplaces = response.marketplaces;
-	return Array.isArray(marketplaces) && marketplaces.some((marketplace) => {
-		if (!marketplace || typeof marketplace !== "object") return false;
-		return marketplace.name === "openai-curated";
-	});
+	return Array.isArray(marketplaces) && marketplaces.some((marketplace) => marketplace && typeof marketplace === "object" && marketplace.name === "openai-curated");
 }
 function targetCodexMarketplaceDiscoveryTimeoutMs(env = process.env) {
 	const configured = parseStrictNonNegativeInteger(env[TARGET_CODEX_MARKETPLACE_DISCOVERY_TIMEOUT_ENV]);
@@ -1423,10 +1420,10 @@ function readCodexPluginPolicy(item) {
 	const configKey = item.details?.configKey;
 	const marketplaceName = item.details?.marketplaceName;
 	const pluginName = item.details?.pluginName;
-	if (typeof configKey !== "string" || typeof marketplaceName !== "string" || !isCodexPluginsMarketplaceName(marketplaceName) || typeof pluginName !== "string") return;
+	if (typeof configKey !== "string" || marketplaceName !== "openai-curated" || typeof pluginName !== "string") return;
 	return {
 		configKey,
-		marketplaceName,
+		marketplaceName: CODEX_PLUGINS_MARKETPLACE_NAME,
 		pluginName,
 		enabled: true,
 		allowDestructiveActions: true

package/dist/media-understanding-provider.js

@@ -1,9 +1,9 @@
 import { CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS } from "./provider-catalog.js";
-import { d as resolveCodexAppServerRuntimeOptions } from "./config-AlzuNKCY.js";
+import { l as resolveCodexAppServerRuntimeOptions } from "./config-BT6SLiE6.js";
 import { i as assertCodexTurnStartResponse, l as readCodexTurnCompletedNotification, o as readCodexErrorNotification, r as assertCodexThreadStartResponse } from "./protocol-validators-DIt7cXIp.js";
-import { i as readModelListResult } from "./models-DAJvlyJu.js";
-import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { r as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-6nrEQZMV.js";
+import { i as readModelListResult } from "./models-D8i1zWEu.js";
+import { l as isJsonObject } from "./client-BFxKzFnH.js";
+import { r as buildCodexRuntimeThreadConfig } from "./thread-lifecycle-BOYYMjx6.js";
 import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 import { resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 //#region extensions/codex/media-understanding-provider.ts
@@ -64,7 +64,7 @@ async function runBoundedCodexVisionTurn(params) {
 	const appServer = resolveCodexAppServerRuntimeOptions({ pluginConfig: params.options.pluginConfig });
 	const timeoutMs = resolveTimerTimeoutMs(params.timeoutMs, 100, 100);
 	const ownsClient = !params.options.clientFactory;
-	const client = params.options.clientFactory ? await params.options.clientFactory(appServer.start, params.profile) : await import("./shared-client-DUWLidr5.js").then((n) => n.s).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
+	const client = params.options.clientFactory ? await params.options.clientFactory(appServer.start, params.profile) : await import("./shared-client-B31-oqN-.js").then((n) => n.c).then(({ createIsolatedCodexAppServerClient }) => createIsolatedCodexAppServerClient({
 		startOptions: appServer.start,
 		timeoutMs,
 		authProfileId: params.profile

package/dist/{models-DAJvlyJu.js → models-D8i1zWEu.js}

@@ -40,7 +40,7 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-DUWLidr5.js").then((n) => n.s);
+	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-B31-oqN-.js").then((n) => n.c);
 	const client = useSharedClient ? await getLeasedSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,

package/dist/{native-hook-relay-CIJt8cLN.js → native-hook-relay-CBp3nIGk.js}

@@ -1,6 +1,6 @@
-import { l as isJsonObject } from "./client-BnOmn0y-.js";
-import { S as invalidInlineImageText, w as sanitizeInlineImageDataUrl } from "./thread-lifecycle-6nrEQZMV.js";
-import { s as formatCodexDisplayText } from "./notification-correlation-BykOI_jh.js";
+import { l as isJsonObject } from "./client-BFxKzFnH.js";
+import { S as invalidInlineImageText, w as sanitizeInlineImageDataUrl } from "./thread-lifecycle-BOYYMjx6.js";
+import { s as formatCodexDisplayText } from "./notification-correlation-Bg-AlEEy.js";
 import { addTimerTimeoutGraceMs, finiteSecondsToTimerSafeMilliseconds, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHash } from "node:crypto";
 import { normalizeAgentId } from "openclaw/plugin-sdk/routing";

package/dist/{notification-correlation-BykOI_jh.js → notification-correlation-Bg-AlEEy.js}

@@ -1,4 +1,4 @@
-import { l as isJsonObject } from "./client-BnOmn0y-.js";
+import { l as isJsonObject } from "./client-BFxKzFnH.js";
 import { MAX_DATE_TIMESTAMP_MS, resolveExpiresAtMsFromEpochSeconds } from "openclaw/plugin-sdk/number-runtime";
 import { asFiniteNumber } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/rate-limits.ts

package/dist/provider.js

@@ -1,5 +1,5 @@
 import { CODEX_APP_SERVER_AUTH_MARKER, CODEX_BASE_URL, CODEX_PROVIDER_ID, FALLBACK_CODEX_MODELS, buildCodexModelDefinition, buildCodexProviderConfig } from "./provider-catalog.js";
-import { d as resolveCodexAppServerRuntimeOptions, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
+import { c as readCodexPluginConfig, l as resolveCodexAppServerRuntimeOptions } from "./config-BT6SLiE6.js";
 import { resolveCodexSystemPromptContribution } from "./prompt-overlay.js";
 import { resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
 import { normalizeModelCompat } from "openclaw/plugin-sdk/provider-model-shared";
@@ -123,7 +123,7 @@ async function listModelsBestEffort(params) {
 	}
 }
 async function listCodexAppServerModelsLazy(options) {
-	const { listCodexAppServerModels } = await import("./models-DAJvlyJu.js").then((n) => n.r);
+	const { listCodexAppServerModels } = await import("./models-D8i1zWEu.js").then((n) => n.r);
 	return listCodexAppServerModels(options);
 }
 function normalizeTimeoutMs(value) {

package/dist/{request-CPtFWp-f.js → request-nYrsFNU2.js}

@@ -1,6 +1,6 @@
-import { n as CodexAppServerRpcError } from "./client-BnOmn0y-.js";
-import { b as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-6nrEQZMV.js";
-import { a as releaseLeasedSharedCodexAppServerClient, c as withTimeout, i as getLeasedSharedCodexAppServerClient, m as resolveCodexAppServerHomeDir, r as createIsolatedCodexAppServerClient } from "./shared-client-DUWLidr5.js";
+import { n as CodexAppServerRpcError } from "./client-BFxKzFnH.js";
+import { b as buildCodexAppInventoryCacheKey } from "./thread-lifecycle-BOYYMjx6.js";
+import { a as getLeasedSharedCodexAppServerClient, h as resolveCodexAppServerHomeDir, i as createIsolatedCodexAppServerClient, l as withTimeout, o as releaseLeasedSharedCodexAppServerClient } from "./shared-client-B31-oqN-.js";
 import { t as resolveCodexAppServerDirectSandboxBypassBlock } from "./sandbox-guard-DMCJlzmz.js";
 import { createHash } from "node:crypto";
 //#region extensions/codex/src/app-server/capabilities.ts

package/dist/{run-attempt-DM53zFlW.js → run-attempt-Wo9uasL_.js}

@@ -1,15 +1,15 @@
-import { a as isCodexAppServerApprovalPolicyAllowedByRequirements, c as isCodexSandboxExecServerEnabled, d as resolveCodexAppServerRuntimeOptions, f as resolveCodexComputerUseConfig, g as withMcpElicitationsApprovalPolicy, h as shouldAutoApproveCodexAppServerApprovals, m as resolveOpenClawExecPolicyForCodexAppServer, p as resolveCodexPluginsPolicy, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
+import { c as readCodexPluginConfig, d as resolveCodexPluginsPolicy, f as resolveOpenClawExecPolicyForCodexAppServer, i as isCodexAppServerApprovalPolicyAllowedByRequirements, l as resolveCodexAppServerRuntimeOptions, m as withMcpElicitationsApprovalPolicy, o as isCodexSandboxExecServerEnabled, p as shouldAutoApproveCodexAppServerApprovals, u as resolveCodexComputerUseConfig } from "./config-BT6SLiE6.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse } from "./protocol-validators-DIt7cXIp.js";
-import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, l as isJsonObject, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-BnOmn0y-.js";
-import { A as projectContextEngineAssemblyForCodex, C as sanitizeCodexHistoryImagePayloads, D as normalizeCodexDynamicToolName$1, E as isForcedPrivateQaCodexRuntime, M as resolveCodexContextEngineProjectionReserveTokens, T as filterCodexDynamicTools, _ as shouldBuildCodexPluginThreadConfig, a as buildDeveloperInstructions, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as mergeCodexThreadConfigs, h as buildCodexPluginThreadConfigInputFingerprint, i as buildContextEngineBinding, j as resolveCodexContextEngineProjectionMaxChars, k as resolveCodexDynamicToolsLoadingForModel, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfig, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, p as isCodexAppServerProfilerEnabled, s as buildTurnStartParams, x as defaultCodexAppInventoryCache } from "./thread-lifecycle-6nrEQZMV.js";
-import { a as readCodexAppServerBinding, n as clearCodexAppServerBindingForThread, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
-import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-CPtFWp-f.js";
-import { _ as shouldRefreshCodexRateLimitsForUsageLimitMessage, g as resolveCodexUsageLimitResetAtMs, h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, n as isCodexNotificationForTurn, r as readCodexNotificationThreadId, s as formatCodexDisplayText, t as describeCodexNotificationCorrelation } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, d as resolveCodexAppServerAuthProfileId, f as resolveCodexAppServerAuthProfileIdForAgent, l as refreshCodexAppServerAuthTokens, m as resolveCodexAppServerHomeDir, o as retireSharedCodexAppServerClientIfCurrent, p as resolveCodexAppServerFallbackApiKeyCacheKey, t as clearSharedCodexAppServerClientIfCurrent, u as resolveCodexAppServerAuthAccountCacheKey } from "./shared-client-DUWLidr5.js";
+import { a as isCodexAppServerConnectionClosedError, i as isCodexAppServerApprovalRequest, l as isJsonObject, r as compareCodexAppServerVersions, s as MIN_CODEX_SANDBOX_EXEC_SERVER_APP_SERVER_VERSION } from "./client-BFxKzFnH.js";
+import { A as projectContextEngineAssemblyForCodex, C as sanitizeCodexHistoryImagePayloads, D as normalizeCodexDynamicToolName$1, E as isForcedPrivateQaCodexRuntime, M as resolveCodexContextEngineProjectionReserveTokens, T as filterCodexDynamicTools, _ as shouldBuildCodexPluginThreadConfig, a as buildDeveloperInstructions, c as codexDynamicToolsFingerprint, f as startOrResumeThread, g as mergeCodexThreadConfigs, h as buildCodexPluginThreadConfigInputFingerprint, i as buildContextEngineBinding, j as resolveCodexContextEngineProjectionMaxChars, k as resolveCodexDynamicToolsLoadingForModel, l as isContextEngineBindingCompatible, m as buildCodexPluginThreadConfig, n as areCodexDynamicToolFingerprintsCompatible, o as buildTurnCollaborationMode, p as isCodexAppServerProfilerEnabled, s as buildTurnStartParams, x as defaultCodexAppInventoryCache } from "./thread-lifecycle-BOYYMjx6.js";
+import { a as readCodexAppServerBinding, n as clearCodexAppServerBindingForThread, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-D8DxeEbf.js";
+import { n as buildCodexPluginAppCacheKey, r as CODEX_CONTROL_METHODS } from "./request-nYrsFNU2.js";
+import { _ as shouldRefreshCodexRateLimitsForUsageLimitMessage, g as resolveCodexUsageLimitResetAtMs, h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, n as isCodexNotificationForTurn, r as readCodexNotificationThreadId, s as formatCodexDisplayText, t as describeCodexNotificationCorrelation } from "./notification-correlation-Bg-AlEEy.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-B31-oqN-.js";
 import { i as resolveCodexNativeExecutionPolicy } from "./sandbox-guard-DMCJlzmz.js";
-import { n as defaultLeasedCodexAppServerClientFactory } from "./client-factory-3ykiiX2z.js";
-import { S as withCodexStartupTimeout, _ as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, a as createCodexNativeHookRelay, b as resolveCodexTurnCompletionIdleTimeoutMs, c as scheduleCodexNativeHookRelayUnregister, d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, g as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, n as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, o as resolveCodexNativeHookRelayEvents, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, s as resolveCodexNativeHookRelayTtlMs, u as createCodexDynamicToolBridge, v as resolveCodexStartupTimeoutMs, x as resolveCodexTurnTerminalIdleTimeoutMs, y as resolveCodexTurnAssistantCompletionIdleTimeoutMs } from "./native-hook-relay-CIJt8cLN.js";
-import { t as ensureCodexComputerUse } from "./computer-use-DYLSxIfq.js";
+import { t as defaultLeasedCodexAppServerClientFactory } from "./client-factory-BS9nYX8K.js";
+import { S as withCodexStartupTimeout, _ as resolveCodexPostToolRawAssistantCompletionIdleTimeoutMs, a as createCodexNativeHookRelay, b as resolveCodexTurnCompletionIdleTimeoutMs, c as scheduleCodexNativeHookRelayUnregister, d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, g as CODEX_POST_REASONING_REPLY_IDLE_TIMEOUT_MS, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, n as CODEX_NATIVE_HOOK_RELAY_TTL_GRACE_MS, o as resolveCodexNativeHookRelayEvents, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, s as resolveCodexNativeHookRelayTtlMs, u as createCodexDynamicToolBridge, v as resolveCodexStartupTimeoutMs, x as resolveCodexTurnTerminalIdleTimeoutMs, y as resolveCodexTurnAssistantCompletionIdleTimeoutMs } from "./native-hook-relay-CBp3nIGk.js";
+import { t as ensureCodexComputerUse } from "./computer-use-Dhz6SrFx.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { asDateTimestampMs, parseStrictNonNegativeInteger, resolveTimerTimeoutMs } from "openclaw/plugin-sdk/number-runtime";
 import { createHash, randomUUID } from "node:crypto";
@@ -2665,13 +2665,23 @@ async function startCodexAttemptThread(params) {
 	let releaseSharedClientLease;
 	let startupClientForAbandonedRequestCleanup;
 	let releaseStartupResourcesOnTimeout;
+	let startupAbandoned = false;
+	const startupAbandonController = new AbortController();
+	const abandonStartupAcquire = () => startupAbandonController.abort();
+	params.signal.addEventListener("abort", abandonStartupAcquire, { once: true });
 	try {
 		const startupResult = await withCodexStartupTimeout({
 			timeoutMs: params.startupTimeoutMs,
 			signal: params.signal,
 			onTimeout: async () => {
+				startupAbandoned = true;
+				startupAbandonController.abort();
 				await params.onStartupTimeout();
 				await releaseStartupResourcesOnTimeout?.();
+				releaseSharedClientLease?.();
+				releaseSharedClientLease = void 0;
+				await closeAbandonedStartupClient(startupClientForAbandonedRequestCleanup);
+				startupClientForAbandonedRequestCleanup = void 0;
 			},
 			operation: async () => {
 				const threadConfig = mergeCodexThreadConfigs(params.bundleMcpThreadConfig?.configPatch);
@@ -2710,20 +2720,34 @@ async function startCodexAttemptThread(params) {
 				let attemptedClient;
 				const startupAttempt = async () => {
 					let startupClientLease;
+					let startupClient;
+					let startupAttemptError;
 					let startupAttemptSucceeded = false;
 					try {
-						const startupClient = await params.attemptClientFactory(params.appServer.start, params.startupAuthProfileId, params.agentDir, params.config);
+						startupClient = await params.attemptClientFactory(params.appServer.start, params.startupAuthProfileId, params.agentDir, params.config, {
+							onStartedClient: (client) => {
+								startupClientForAbandonedRequestCleanup = client;
+								if (startupAbandoned || startupAbandonController.signal.aborted) closeAbandonedStartupClient(client);
+							},
+							abandonSignal: startupAbandonController.signal
+						});
+						const activeStartupClient = startupClient;
+						let startupClientLeaseReleased = false;
 						startupClientLease = () => {
-							releaseLeasedSharedCodexAppServerClient(startupClient);
+							if (startupClientLeaseReleased) return;
+							startupClientLeaseReleased = true;
+							releaseLeasedSharedCodexAppServerClient(activeStartupClient);
 						};
 						releaseSharedClientLease = startupClientLease;
-						attemptedClient = startupClient;
-						startupClientForAbandonedRequestCleanup = startupClient;
+						attemptedClient = activeStartupClient;
+						startupClientForAbandonedRequestCleanup = activeStartupClient;
+						if (startupAbandoned) throw new Error("codex app-server startup timed out");
+						if (startupAbandonController.signal.aborted) throw new Error("codex app-server startup aborted");
 						await ensureCodexComputerUse({
-							client: startupClient,
+							client: activeStartupClient,
 							pluginConfig: params.pluginConfig,
 							timeoutMs: params.appServer.requestTimeoutMs,
-							signal: params.signal
+							signal: startupAbandonController.signal
 						});
 						let startupSandboxEnvironment;
 						let startupSandboxEnvironmentAcquired = false;
@@ -2740,14 +2764,14 @@ async function startCodexAttemptThread(params) {
 								nativeToolSurfaceEnabled: params.nativeToolSurfaceEnabled,
 								sandboxExecServerEnabled: params.sandboxExecServerEnabled
 							}) ? await ensureCodexSandboxExecServerEnvironment({
-								client: startupClient,
+								client: activeStartupClient,
 								sandbox: params.sandbox ?? null,
 								appServerStartOptions: params.appServer.start,
 								timeoutMs: params.appServer.requestTimeoutMs,
-								signal: params.signal
+								signal: startupAbandonController.signal
 							}) : void 0;
 							startupSandboxEnvironmentAcquired = Boolean(startupSandboxEnvironment);
-							if (params.signal.aborted) {
+							if (startupAbandonController.signal.aborted) {
 								await releaseStartupSandboxEnvironment();
 								throw new Error("codex app-server startup aborted");
 							}
@@ -2763,8 +2787,8 @@ async function startCodexAttemptThread(params) {
 							nativeToolSurfaceEnabled: params.nativeToolSurfaceEnabled
 						});
 						const startupSandboxPolicy = startupSandboxEnvironment ? resolveCodexExternalSandboxPolicyForOpenClawSandbox(params.sandbox) : void 0;
-						const buildThreadLifecycleParams = () => ({
-							client: startupClient,
+						const buildThreadLifecycleParams = (signal) => ({
+							client: activeStartupClient,
 							params: params.buildAttemptParams(),
 							agentId: params.sessionAgentId,
 							cwd: startupExecutionCwd,
@@ -2782,16 +2806,16 @@ async function startCodexAttemptThread(params) {
 							mcpServersFingerprintEvaluated: params.bundleMcpThreadConfig.evaluated,
 							environmentSelection: startupEnvironmentSelection,
 							contextEngineProjection: params.contextEngineProjection,
-							signal: params.signal,
+							signal,
 							pluginThreadConfig: pluginThreadConfigRequired ? {
 								enabled: true,
 								inputFingerprint: pluginThreadConfigInputFingerprint,
 								enabledPluginConfigKeys,
 								build: () => buildCodexPluginThreadConfig({
 									pluginConfig: pluginThreadConfigPluginConfig,
-									request: (method, requestParams) => startupClient.request(method, requestParams, {
+									request: (method, requestParams) => activeStartupClient.request(method, requestParams, {
 										timeoutMs: params.appServer.requestTimeoutMs,
-										signal: params.signal
+										signal
 									}),
 									appCache: defaultCodexAppInventoryCache,
 									appCacheKey: pluginAppCacheKey
@@ -2799,21 +2823,21 @@ async function startCodexAttemptThread(params) {
 							} : void 0
 						});
 						try {
-							const startupThread = await startOrResumeThread(buildThreadLifecycleParams());
-							if (params.signal.aborted) {
+							const startupThread = await startOrResumeThread(buildThreadLifecycleParams(startupAbandonController.signal));
+							if (startupAbandonController.signal.aborted) {
 								await releaseStartupSandboxEnvironment();
 								throw new Error("codex app-server startup aborted");
 							}
 							startupSandboxEnvironmentAcquired = false;
 							startupAttemptSucceeded = true;
 							return {
-								client: startupClient,
+								client: activeStartupClient,
 								thread: startupThread,
 								sandboxEnvironment: startupSandboxEnvironment,
 								environmentSelection: startupEnvironmentSelection,
 								executionCwd: startupExecutionCwd,
 								sandboxPolicy: startupSandboxPolicy,
-								restartContextEngineCodexThread: () => startOrResumeThread(buildThreadLifecycleParams())
+								restartContextEngineCodexThread: () => startOrResumeThread(buildThreadLifecycleParams(params.signal))
 							};
 						} catch (error) {
 							await releaseStartupSandboxEnvironment();
@@ -2821,10 +2845,23 @@ async function startCodexAttemptThread(params) {
 						} finally {
 							if (releaseStartupResourcesOnTimeout === releaseStartupSandboxEnvironment) releaseStartupResourcesOnTimeout = void 0;
 						}
+					} catch (error) {
+						startupAttemptError = error;
+						throw error;
 					} finally {
 						if (!startupAttemptSucceeded) {
 							if (releaseSharedClientLease === startupClientLease) releaseSharedClientLease = void 0;
 							startupClientLease?.();
+							if (startupAbandoned || params.signal.aborted) {
+								if (startupClientForAbandonedRequestCleanup === startupClient) startupClientForAbandonedRequestCleanup = void 0;
+								await closeAbandonedStartupClient(startupClient);
+							} else if (shouldClearSharedClientAfterStartupRace(startupAttemptError) || shouldClearSharedClientAfterStartupFailure({
+								error: startupAttemptError,
+								spawnedBy: params.spawnedBy
+							})) {
+								if (startupClientForAbandonedRequestCleanup === startupClient) startupClientForAbandonedRequestCleanup = void 0;
+								await evictFailedStartupClient(startupClient);
+							}
 						}
 					}
 				};
@@ -2863,15 +2900,82 @@ async function startCodexAttemptThread(params) {
 			releaseSharedClientLease
 		};
 	} catch (error) {
-		if (params.signal.aborted || shouldClearSharedClientAfterStartupRace(error) || shouldClearSharedClientAfterStartupFailure({
+		if (params.signal.aborted || shouldClearSharedClientAfterStartupAbandon(error)) {
+			releaseSharedClientLease?.();
+			releaseSharedClientLease = void 0;
+			await closeAbandonedStartupClient(startupClientForAbandonedRequestCleanup);
+			startupClientForAbandonedRequestCleanup = void 0;
+		} else if (shouldClearSharedClientAfterStartupRace(error) || shouldClearSharedClientAfterStartupFailure({
 			error,
 			spawnedBy: params.spawnedBy
-		})) clearSharedCodexAppServerClientIfCurrent(startupClientForAbandonedRequestCleanup);
+		})) {
+			releaseSharedClientLease?.();
+			releaseSharedClientLease = void 0;
+			await evictFailedStartupClient(startupClientForAbandonedRequestCleanup);
+			startupClientForAbandonedRequestCleanup = void 0;
+		}
 		throw error;
+	} finally {
+		params.signal.removeEventListener("abort", abandonStartupAcquire);
+	}
+}
+async function closeAbandonedStartupClient(client) {
+	if (!client) return;
+	const unclaimedSharedClient = clearSharedCodexAppServerClientIfCurrentAndUnclaimed(client);
+	if (unclaimedSharedClient.closed) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (unclaimedSharedClient.found) {
+		if (retireSharedCodexAppServerClientIfCurrent(client)?.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
+	if (retiredSharedClient) {
+		if (retiredSharedClient.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (clearSharedCodexAppServerClientIfCurrent(client)) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	await closeClientAndWaitIfAvailable(client);
+}
+async function closeClientAndWaitIfAvailable(client) {
+	const closeable = client;
+	if (typeof closeable.closeAndWait === "function") {
+		await closeable.closeAndWait();
+		return;
 	}
+	closeable.close?.();
+}
+async function evictFailedStartupClient(client) {
+	if (!client) return;
+	const unclaimedSharedClient = clearSharedCodexAppServerClientIfCurrentAndUnclaimed(client);
+	if (unclaimedSharedClient.closed) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (unclaimedSharedClient.found) {
+		if (retireSharedCodexAppServerClientIfCurrent(client)?.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	const retiredSharedClient = retireSharedCodexAppServerClientIfCurrent(client);
+	if (retiredSharedClient) {
+		if (retiredSharedClient.closed) await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	if (clearSharedCodexAppServerClientIfCurrent(client)) {
+		await closeClientAndWaitIfAvailable(client);
+		return;
+	}
+	await closeClientAndWaitIfAvailable(client);
+}
+function shouldClearSharedClientAfterStartupAbandon(error) {
+	return error instanceof Error && (error.message === "codex app-server startup timed out" || error.message === "codex app-server startup aborted");
 }
 function shouldClearSharedClientAfterStartupRace(error) {
-	return error instanceof Error && (error.message === "codex app-server startup timed out" || error.message === "codex app-server startup aborted" || error.message.endsWith(" timed out"));
+	return error instanceof Error && (shouldClearSharedClientAfterStartupAbandon(error) || error.message.endsWith(" timed out"));
 }
 function shouldClearSharedClientAfterStartupFailure(params) {
 	if (!(params.error instanceof Error)) return !params.spawnedBy;

package/dist/{session-binding-DWiEGATW.js → session-binding-D8DxeEbf.js}

@@ -1,5 +1,5 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { l as normalizeCodexServiceTier, s as isCodexPluginsMarketplaceName } from "./config-AlzuNKCY.js";
+import { s as normalizeCodexServiceTier } from "./config-BT6SLiE6.js";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 import fs from "node:fs/promises";
 import { ensureAuthProfileStore, resolveDefaultAgentDir, resolveProviderIdForAuth } from "openclaw/plugin-sdk/agent-runtime";
@@ -135,7 +135,7 @@ function readPluginAppPolicyContext(value) {
 	for (const [appId, rawEntry] of Object.entries(apps)) {
 		if (!rawEntry || typeof rawEntry !== "object" || Array.isArray(rawEntry)) return;
 		const entry = rawEntry;
-		if ("appId" in entry || typeof entry.configKey !== "string" || typeof entry.marketplaceName !== "string" || !isCodexPluginsMarketplaceName(entry.marketplaceName) || typeof entry.pluginName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || !Array.isArray(entry.mcpServerNames) || entry.mcpServerNames.some((serverName) => typeof serverName !== "string")) return;
+		if ("appId" in entry || typeof entry.configKey !== "string" || entry.marketplaceName !== "openai-curated" || typeof entry.pluginName !== "string" || typeof entry.allowDestructiveActions !== "boolean" || !Array.isArray(entry.mcpServerNames) || entry.mcpServerNames.some((serverName) => typeof serverName !== "string")) return;
 		parsedApps[appId] = {
 			configKey: entry.configKey,
 			marketplaceName: entry.marketplaceName,

package/dist/{shared-client-DUWLidr5.js → shared-client-B31-oqN-.js}

@@ -1,6 +1,6 @@
 import { t as __exportAll } from "./rolldown-runtime-8H4AJuhK.js";
-import { d as resolveCodexAppServerRuntimeOptions, r as codexAppServerStartOptionsKey } from "./config-AlzuNKCY.js";
-import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-BnOmn0y-.js";
+import { l as resolveCodexAppServerRuntimeOptions, n as codexAppServerStartOptionsKey } from "./config-BT6SLiE6.js";
+import { c as resolveCodexAppServerSpawnEnv, o as MANAGED_CODEX_APP_SERVER_PACKAGE, t as CodexAppServerClient } from "./client-BFxKzFnH.js";
 import { createRequire } from "node:module";
 import { createHash } from "node:crypto";
 import fsSync, { constants, readFileSync } from "node:fs";
@@ -552,6 +552,7 @@ var shared_client_exports = /* @__PURE__ */ __exportAll({
 	clearSharedCodexAppServerClient: () => clearSharedCodexAppServerClient,
 	clearSharedCodexAppServerClientAndWait: () => clearSharedCodexAppServerClientAndWait,
 	clearSharedCodexAppServerClientIfCurrent: () => clearSharedCodexAppServerClientIfCurrent,
+	clearSharedCodexAppServerClientIfCurrentAndUnclaimed: () => clearSharedCodexAppServerClientIfCurrentAndUnclaimed,
 	clearSharedCodexAppServerClientIfCurrentAndWait: () => clearSharedCodexAppServerClientIfCurrentAndWait,
 	createIsolatedCodexAppServerClient: () => createIsolatedCodexAppServerClient,
 	detachSharedCodexAppServerClientIfCurrent: () => detachSharedCodexAppServerClientIfCurrent,
@@ -571,6 +572,7 @@ function getSharedCodexAppServerClientState() {
 		const clients = keyedState.clients;
 		for (const entry of clients.values()) {
 			entry.activeLeases ??= 0;
+			entry.pendingAcquires ??= 0;
 			entry.closeWhenIdle ??= false;
 		}
 		const nextState = {
@@ -588,6 +590,7 @@ function getSharedCodexAppServerClientState() {
 			client: legacyState.client,
 			promise: legacyState.promise,
 			activeLeases: 0,
+			pendingAcquires: 0,
 			closeWhenIdle: false
 		});
 		legacyState.client?.addCloseHandler((closedClient) => clearSharedClientEntryIfCurrent(legacyKey, closedClient));
@@ -658,9 +661,21 @@ async function acquireSharedCodexAppServerClient(options, leaseOptions) {
 	});
 	const state = getSharedCodexAppServerClientState();
 	const entry = getOrCreateSharedClientEntry(state, key);
+	const releasePendingAcquire = retainPendingSharedClientAcquire(entry);
+	let cleanupAbandonSignal;
+	if (options?.abandonSignal) {
+		const abandon = () => {
+			releasePendingAcquire();
+			closeSharedClientEntryIfUnclaimed(key, entry);
+		};
+		options.abandonSignal.addEventListener("abort", abandon, { once: true });
+		cleanupAbandonSignal = () => options.abandonSignal?.removeEventListener("abort", abandon);
+		if (options.abandonSignal.aborted) abandon();
+	}
 	const sharedPromise = entry.promise ?? (entry.promise = (async () => {
 		const client = CodexAppServerClient.start(startOptions);
 		entry.client = client;
+		options?.onStartedClient?.(client);
 		client.setActiveSharedLeaseCountProviderForUnscopedNotifications(() => entry.activeLeases);
 		client.addCloseHandler((closedClient) => clearSharedClientEntryIfCurrent(key, closedClient));
 		try {
@@ -690,6 +705,9 @@ async function acquireSharedCodexAppServerClient(options, leaseOptions) {
 		const currentEntry = state.clients.get(key);
 		if (currentEntry?.promise === sharedPromise) clearSharedClientEntry(key, currentEntry);
 		throw error;
+	} finally {
+		cleanupAbandonSignal?.();
+		releasePendingAcquire();
 	}
 }
 async function createIsolatedCodexAppServerClient(options) {
@@ -788,6 +806,7 @@ function getOrCreateSharedClientEntry(state, key) {
 	if (!entry) {
 		entry = {
 			activeLeases: 0,
+			pendingAcquires: 0,
 			closeWhenIdle: false
 		};
 		state.clients.set(key, entry);
@@ -804,6 +823,37 @@ function clearSharedClientEntryIfCurrent(key, client) {
 	const state = getSharedCodexAppServerClientState();
 	if (state.clients.get(key)?.client === client) state.clients.delete(key);
 }
+function clearSharedCodexAppServerClientIfCurrentAndUnclaimed(client) {
+	if (!client) return {
+		found: false,
+		closed: false,
+		activeLeases: 0,
+		pendingAcquires: 0
+	};
+	const state = getSharedCodexAppServerClientState();
+	for (const [key, entry] of state.clients) if (entry.client === client) return {
+		found: true,
+		closed: closeSharedClientEntryIfUnclaimed(key, entry),
+		activeLeases: entry.activeLeases,
+		pendingAcquires: entry.pendingAcquires
+	};
+	return {
+		found: false,
+		closed: false,
+		activeLeases: 0,
+		pendingAcquires: 0
+	};
+}
+function retainPendingSharedClientAcquire(entry) {
+	let released = false;
+	entry.pendingAcquires += 1;
+	return () => {
+		if (released) return;
+		released = true;
+		entry.pendingAcquires = Math.max(0, entry.pendingAcquires - 1);
+		closeRetiredSharedClientEntryIfIdle(entry);
+	};
+}
 function retainSharedClientEntry(entry) {
 	let released = false;
 	entry.activeLeases += 1;
@@ -815,15 +865,23 @@ function retainSharedClientEntry(entry) {
 	};
 }
 function closeRetiredSharedClientEntryIfIdle(entry) {
-	if (!entry.closeWhenIdle || entry.activeLeases > 0 || !entry.client) return false;
+	if (!entry.closeWhenIdle || entry.activeLeases > 0 || entry.pendingAcquires > 0 || !entry.client) return false;
 	const client = entry.client;
 	entry.closeWhenIdle = false;
 	entry.client = void 0;
 	client.close();
 	return true;
 }
+function closeSharedClientEntryIfUnclaimed(key, entry) {
+	if (entry.activeLeases > 0 || entry.pendingAcquires > 0) return false;
+	const state = getSharedCodexAppServerClientState();
+	if (state.clients.get(key) !== entry) return false;
+	state.clients.delete(key);
+	entry.client?.close();
+	return Boolean(entry.client);
+}
 function collectSharedClients(state) {
 	return [...new Set([...state.clients.values()].map((entry) => entry.client).filter((client) => Boolean(client)))];
 }
 //#endregion
-export { releaseLeasedSharedCodexAppServerClient as a, withTimeout$1 as c, resolveCodexAppServerAuthProfileId as d, resolveCodexAppServerAuthProfileIdForAgent as f, getLeasedSharedCodexAppServerClient as i, refreshCodexAppServerAuthTokens as l, resolveCodexAppServerHomeDir as m, clearSharedCodexAppServerClientIfCurrentAndWait as n, retireSharedCodexAppServerClientIfCurrent as o, resolveCodexAppServerFallbackApiKeyCacheKey as p, createIsolatedCodexAppServerClient as r, shared_client_exports as s, clearSharedCodexAppServerClientIfCurrent as t, resolveCodexAppServerAuthAccountCacheKey as u };
+export { getLeasedSharedCodexAppServerClient as a, shared_client_exports as c, resolveCodexAppServerAuthAccountCacheKey as d, resolveCodexAppServerAuthProfileId as f, resolveCodexAppServerHomeDir as h, createIsolatedCodexAppServerClient as i, withTimeout$1 as l, resolveCodexAppServerFallbackApiKeyCacheKey as m, clearSharedCodexAppServerClientIfCurrentAndUnclaimed as n, releaseLeasedSharedCodexAppServerClient as o, resolveCodexAppServerAuthProfileIdForAgent as p, clearSharedCodexAppServerClientIfCurrentAndWait as r, retireSharedCodexAppServerClientIfCurrent as s, clearSharedCodexAppServerClientIfCurrent as t, refreshCodexAppServerAuthTokens as u };

package/dist/{side-question-dIZf9RBV.js → side-question-DbYSPUnj.js}

@@ -1,12 +1,12 @@
-import { d as resolveCodexAppServerRuntimeOptions, h as shouldAutoApproveCodexAppServerApprovals, u as readCodexPluginConfig } from "./config-AlzuNKCY.js";
+import { c as readCodexPluginConfig, l as resolveCodexAppServerRuntimeOptions, p as shouldAutoApproveCodexAppServerApprovals } from "./config-BT6SLiE6.js";
 import { a as readCodexDynamicToolCallParams, c as readCodexTurn, i as assertCodexTurnStartResponse, t as assertCodexThreadForkResponse } from "./protocol-validators-DIt7cXIp.js";
-import { i as isCodexAppServerApprovalRequest, l as isJsonObject } from "./client-BnOmn0y-.js";
-import { O as resolveCodexDynamicToolsLoading, T as filterCodexDynamicTools, d as resolveReasoningEffort, g as mergeCodexThreadConfigs, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-6nrEQZMV.js";
-import { a as readCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
-import { h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, r as readCodexNotificationThreadId } from "./notification-correlation-BykOI_jh.js";
-import { a as releaseLeasedSharedCodexAppServerClient, i as getLeasedSharedCodexAppServerClient, l as refreshCodexAppServerAuthTokens } from "./shared-client-DUWLidr5.js";
+import { i as isCodexAppServerApprovalRequest, l as isJsonObject } from "./client-BFxKzFnH.js";
+import { O as resolveCodexDynamicToolsLoading, T as filterCodexDynamicTools, d as resolveReasoningEffort, g as mergeCodexThreadConfigs, r as buildCodexRuntimeThreadConfig, t as CODEX_NATIVE_PERSONALITY_NONE, u as resolveCodexAppServerModelProvider } from "./thread-lifecycle-BOYYMjx6.js";
+import { a as readCodexAppServerBinding } from "./session-binding-D8DxeEbf.js";
+import { h as formatCodexUsageLimitErrorMessage, i as readCodexNotificationTurnId, r as readCodexNotificationThreadId } from "./notification-correlation-Bg-AlEEy.js";
+import { a as getLeasedSharedCodexAppServerClient, o as releaseLeasedSharedCodexAppServerClient, u as refreshCodexAppServerAuthTokens } from "./shared-client-B31-oqN-.js";
 import { n as resolveCodexNativeExecutionBlock } from "./sandbox-guard-DMCJlzmz.js";
-import { d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, t as CODEX_NATIVE_HOOK_RELAY_EVENTS, u as createCodexDynamicToolBridge } from "./native-hook-relay-CIJt8cLN.js";
+import { d as emitDynamicToolErrorDiagnostic, f as emitDynamicToolStartedDiagnostic, h as handleCodexAppServerApprovalRequest, i as buildCodexNativeHookRelayDisabledConfig, l as handleCodexAppServerElicitationRequest, m as filterToolsForVisionInputs, p as emitDynamicToolTerminalDiagnostic, r as buildCodexNativeHookRelayConfig, t as CODEX_NATIVE_HOOK_RELAY_EVENTS, u as createCodexDynamicToolBridge } from "./native-hook-relay-CBp3nIGk.js";
 import { n as rememberCodexRateLimits, t as readRecentCodexRateLimits } from "./rate-limit-cache-N66I-Rd7.js";
 import { buildAgentHookContextChannelFields, embeddedAgentLog, formatErrorMessage, registerNativeHookRelay, resolveAgentDir, resolveAttemptSpawnWorkspaceDir, resolveModelAuthMode, resolveSandboxContext, resolveSessionAgentIds, supportsModelTools } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/side-question.ts

package/dist/{thread-lifecycle-6nrEQZMV.js → thread-lifecycle-BOYYMjx6.js}

@@ -1,9 +1,9 @@
-import { i as codexSandboxPolicyForTurn, n as CODEX_PLUGINS_MARKETPLACE_NAMES, p as resolveCodexPluginsPolicy, s as isCodexPluginsMarketplaceName, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-AlzuNKCY.js";
+import { d as resolveCodexPluginsPolicy, r as codexSandboxPolicyForTurn, t as CODEX_PLUGINS_MARKETPLACE_NAME } from "./config-BT6SLiE6.js";
 import { n as assertCodexThreadResumeResponse, r as assertCodexThreadStartResponse } from "./protocol-validators-DIt7cXIp.js";
-import { a as isCodexAppServerConnectionClosedError, l as isJsonObject, n as CodexAppServerRpcError } from "./client-BnOmn0y-.js";
+import { a as isCodexAppServerConnectionClosedError, l as isJsonObject, n as CodexAppServerRpcError } from "./client-BFxKzFnH.js";
 import { CODEX_GPT5_HEARTBEAT_PROMPT_OVERLAY } from "./prompt-overlay.js";
 import { isModernCodexModel } from "./provider.js";
-import { a as readCodexAppServerBinding, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-DWiEGATW.js";
+import { a as readCodexAppServerBinding, r as isCodexAppServerNativeAuthProfile, s as writeCodexAppServerBinding, t as clearCodexAppServerBinding } from "./session-binding-D8DxeEbf.js";
 import { isFutureDateTimestampMs, resolveDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import crypto from "node:crypto";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
@@ -535,9 +535,18 @@ async function readCodexPluginInventory(params) {
 		}]
 	};
 	const appInventory = readCachedAppInventory(params);
-	const listed = await params.request("plugin/list", { cwds: [] });
-	const marketplaceByName = /* @__PURE__ */ new Map();
-	for (const marketplace of listed.marketplaces) if (isCodexPluginsMarketplaceName(marketplace.name)) marketplaceByName.set(marketplace.name, marketplace);
+	const marketplaceEntry = (await params.request("plugin/list", { cwds: [] })).marketplaces.find((marketplace) => marketplace.name === CODEX_PLUGINS_MARKETPLACE_NAME);
+	if (!marketplaceEntry) return {
+		policy,
+		records: [],
+		diagnostics: policy.pluginPolicies.filter((pluginPolicy) => pluginPolicy.enabled).map((pluginPolicy) => ({
+			code: "marketplace_missing",
+			plugin: pluginPolicy,
+			message: `Codex marketplace ${CODEX_PLUGINS_MARKETPLACE_NAME} was not found.`
+		})),
+		...appInventory ? { appInventory } : {}
+	};
+	const marketplace = marketplaceRef(marketplaceEntry);
 	const diagnostics = [];
 	const records = [];
 	if (appInventory?.state === "missing") diagnostics.push({
@@ -550,22 +559,12 @@ async function readCodexPluginInventory(params) {
 	});
 	for (const pluginPolicy of policy.pluginPolicies) {
 		if (!pluginPolicy.enabled) continue;
-		const marketplaceEntry = marketplaceByName.get(pluginPolicy.marketplaceName);
-		if (!marketplaceEntry) {
-			diagnostics.push({
-				code: "marketplace_missing",
-				plugin: pluginPolicy,
-				message: `Codex marketplace ${pluginPolicy.marketplaceName} was not found.`
-			});
-			continue;
-		}
-		const marketplace = marketplaceRef(marketplaceEntry);
 		const summary = findPluginSummary(marketplaceEntry, pluginPolicy.pluginName);
 		if (!summary) {
 			diagnostics.push({
 				code: "plugin_missing",
 				plugin: pluginPolicy,
-				message: `${pluginPolicy.pluginName} was not found in ${pluginPolicy.marketplaceName}.`
+				message: `${pluginPolicy.pluginName} was not found in ${CODEX_PLUGINS_MARKETPLACE_NAME}.`
 			});
 			continue;
 		}
@@ -604,30 +603,20 @@ async function readCodexPluginInventory(params) {
 	}
 	return {
 		policy,
+		marketplace,
 		records,
 		diagnostics,
 		...appInventory ? { appInventory } : {}
 	};
 }
-function findOpenAiCuratedPluginSummary(listed, pluginName, marketplaceName) {
-	if (marketplaceName) {
-		const marketplaceEntry = listed.marketplaces.find((marketplace) => marketplace.name === marketplaceName);
-		if (!marketplaceEntry) return;
-		const summary = findPluginSummary(marketplaceEntry, pluginName);
-		return summary ? {
-			marketplace: marketplaceRef(marketplaceEntry),
-			summary
-		} : void 0;
-	}
-	for (const allowedName of CODEX_PLUGINS_MARKETPLACE_NAMES) {
-		const marketplaceEntry = listed.marketplaces.find((marketplace) => marketplace.name === allowedName);
-		if (!marketplaceEntry) continue;
-		const summary = findPluginSummary(marketplaceEntry, pluginName);
-		if (summary) return {
-			marketplace: marketplaceRef(marketplaceEntry),
-			summary
-		};
-	}
+function findOpenAiCuratedPluginSummary(listed, pluginName) {
+	const marketplaceEntry = listed.marketplaces.find((marketplace) => marketplace.name === CODEX_PLUGINS_MARKETPLACE_NAME);
+	if (!marketplaceEntry) return;
+	const summary = findPluginSummary(marketplaceEntry, pluginName);
+	return summary ? {
+		marketplace: marketplaceRef(marketplaceEntry),
+		summary
+	} : void 0;
 }
 function pluginReadParams(marketplace, pluginName) {
 	return {
@@ -704,7 +693,7 @@ function pluginNameFromPluginId(pluginId, marketplaceName) {
 }
 function marketplaceRef(marketplace) {
 	return {
-		name: isCodexPluginsMarketplaceName(marketplace.name) ? marketplace.name : CODEX_PLUGINS_MARKETPLACE_NAME,
+		name: CODEX_PLUGINS_MARKETPLACE_NAME,
 		...marketplace.path ? { path: marketplace.path } : {},
 		...!marketplace.path ? { remoteMarketplaceName: marketplace.name } : {}
 	};
@@ -712,12 +701,12 @@ function marketplaceRef(marketplace) {
 //#endregion
 //#region extensions/codex/src/app-server/plugin-activation.ts
 async function ensureCodexPluginActivation(params) {
-	if (!isCodexPluginsMarketplaceName(params.identity.marketplaceName)) return activationFailure(params.identity, "marketplace_missing", { message: "Only " + CODEX_PLUGINS_MARKETPLACE_NAMES.join(" or ") + " plugins can be activated." });
+	if (params.identity.marketplaceName !== "openai-curated") return activationFailure(params.identity, "marketplace_missing", { message: "Only openai-curated plugins can be activated." });
 	const listed = await params.request("plugin/list", { cwds: [] });
-	const resolved = findOpenAiCuratedPluginSummary(listed, params.identity.pluginName, params.identity.marketplaceName);
+	const resolved = findOpenAiCuratedPluginSummary(listed, params.identity.pluginName);
 	if (!resolved) {
-		if (!listed.marketplaces.some((marketplace) => marketplace.name === params.identity.marketplaceName)) return activationFailure(params.identity, "marketplace_missing", { message: `Codex marketplace ${params.identity.marketplaceName} was not found.` });
-		return activationFailure(params.identity, "plugin_missing", { message: `${params.identity.pluginName} was not found in ${params.identity.marketplaceName}.` });
+		if (!listed.marketplaces.some((marketplace) => marketplace.name === "openai-curated")) return activationFailure(params.identity, "marketplace_missing", { message: `Codex marketplace ${CODEX_PLUGINS_MARKETPLACE_NAME} was not found.` });
+		return activationFailure(params.identity, "plugin_missing", { message: `${params.identity.pluginName} was not found in ${CODEX_PLUGINS_MARKETPLACE_NAME}.` });
 	}
 	if (resolved.summary.installed && resolved.summary.enabled && !params.installEvenIfActive) return {
 		identity: params.identity,

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.6.1",
+  "version": "2026.6.2-beta.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@openclaw/codex",
-      "version": "2026.6.1",
+      "version": "2026.6.2-beta.1",
       "dependencies": {
         "@openai/codex": "0.135.0",
         "typebox": "1.1.39",

package/openclaw.plugin.json

@@ -114,7 +114,7 @@
                 },
                 "marketplaceName": {
                   "type": "string",
-                  "enum": ["openai-curated", "openai-bundled", "openai-primary-runtime"]
+                  "enum": ["openai-curated"]
                 },
                 "pluginName": {
                   "type": "string"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openclaw/codex",
-  "version": "2026.6.1",
+  "version": "2026.6.2-beta.1",
   "description": "OpenClaw Codex app-server harness and model provider plugin with a Codex-managed GPT catalog.",
   "repository": {
     "type": "git",
@@ -26,10 +26,10 @@
       "minHostVersion": ">=2026.5.1-beta.1"
     },
     "compat": {
-      "pluginApi": ">=2026.6.1"
+      "pluginApi": ">=2026.6.2-beta.1"
     },
     "build": {
-      "openclawVersion": "2026.6.1"
+      "openclawVersion": "2026.6.2-beta.1"
     },
     "release": {
       "publishToClawHub": true,
@@ -47,7 +47,7 @@
     "README.md"
   ],
   "peerDependencies": {
-    "openclaw": ">=2026.6.1"
+    "openclaw": ">=2026.6.2-beta.1"
   },
   "peerDependenciesMeta": {
     "openclaw": {

package/dist/client-factory-3ykiiX2z.js

@@ -1,20 +0,0 @@
-//#region extensions/codex/src/app-server/client-factory.ts
-let sharedClientModulePromise = null;
-const loadSharedClientModule = async () => {
-	sharedClientModulePromise ??= import("./shared-client-DUWLidr5.js").then((n) => n.s);
-	return await sharedClientModulePromise;
-};
-const defaultCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => loadSharedClientModule().then(({ getSharedCodexAppServerClient }) => getSharedCodexAppServerClient({
-	startOptions,
-	authProfileId,
-	agentDir,
-	config
-}));
-const defaultLeasedCodexAppServerClientFactory = (startOptions, authProfileId, agentDir, config) => loadSharedClientModule().then(({ getLeasedSharedCodexAppServerClient }) => getLeasedSharedCodexAppServerClient({
-	startOptions,
-	authProfileId,
-	agentDir,
-	config
-}));
-//#endregion
-export { defaultLeasedCodexAppServerClientFactory as n, defaultCodexAppServerClientFactory as t };