@openclaw/codex 2026.9.6 → 2026.9.8

package/dist/.setup/{plan-CN3VwfNU.mjs → plan-DPdMk1Oy.mjs}

@@ -1,6 +1,7 @@
-import { c as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-BoRei8Z4.mjs";
-import "./config-BoTP_mrL.mjs";
-import { c as sanitizeName, i as hasCodexSource, n as defaultCodexHome, o as exists, r as discoverCodexSource, s as readJsonObject, t as codexPluginMigrationSubscriptionWarning } from "./source-CUzJq5WN.mjs";
+import { u as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-Cky2XJUw.mjs";
+import { t as isOnlyMigrationKind } from "./scope-DOC1Xjc8.mjs";
+import "./config-DKhXquav.mjs";
+import { i as hasCodexSource, n as defaultCodexHome, o as readJsonObject, r as discoverCodexSource, s as sanitizeName, t as codexPluginMigrationSubscriptionWarning } from "./source-CJis_1EF.mjs";
 import { asBoolean, asOptionalRecord, isRecord, normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
 import { runCommandBuffered } from "openclaw/plugin-sdk/process-runtime";
@@ -11,10 +12,10 @@ import { readSecretFile } from "openclaw/plugin-sdk/secret-file";
 import { fileURLToPath } from "node:url";
 import { loadAuthProfileStoreWithoutExternalProfiles } from "openclaw/plugin-sdk/agent-runtime";
 import { applyAuthProfileConfig, buildApiKeyCredential, buildOauthProviderAuthResult, buildOpenAICodexCredentialExtra, hasUsableOAuthCredential, resolveOpenAICodexAuthIdentity, resolveOpenAICodexImportProfileName, updateAuthProfileStoreWithLock } from "openclaw/plugin-sdk/provider-auth";
-import { extractErrorCode } from "openclaw/plugin-sdk/security-runtime";
+import { extractErrorCode, pathExists } from "openclaw/plugin-sdk/security-runtime";
 import { MIGRATION_REASON_TARGET_EXISTS, createMigrationItem, createMigrationManualItem, hasMigrationConfigPatchConflict, markMigrationItemConflict, markMigrationItemError, markMigrationItemSkipped, mergeMigrationConfigValue, readMigrationConfigPath, resolveMigrationConfigRuntime, summarizeMigrationItems } from "openclaw/plugin-sdk/migration";
 import { resolvePlannedMigrationTargets } from "openclaw/plugin-sdk/migration-runtime";
-import { decodeOpenAICodexJwtPayload } from "openclaw/plugin-sdk/provider-oauth-runtime";
+import { decodeOpenAICodexJwtPayload as decodeOpenAICodexJwtPayload$1 } from "openclaw/plugin-sdk/provider-oauth-runtime";
 //#region extensions/codex/src/migration/auth-profile-target.ts
 const OPENAI_PROVIDER_ID$1 = "openai";
 const LEGACY_CODEX_PROFILE_ID = "openai:default";
@@ -28,7 +29,7 @@ function findMatchingOAuthProfile(store, credential) {
 	}
 }
 function oauthSubject(credential) {
-	const claims = decodeOpenAICodexJwtPayload(credential.access)?.["https://api.openai.com/auth"];
+	const claims = decodeOpenAICodexJwtPayload$1(credential.access)?.["https://api.openai.com/auth"];
 	if (!isRecord(claims)) return;
 	const accountId = normalizeOptionalString(claims.chatgpt_account_id);
 	const userId = normalizeOptionalString(claims.chatgpt_user_id) ?? normalizeOptionalString(claims.user_id);
@@ -96,8 +97,8 @@ async function readCodexCliCredentialsAsync(options) {
 	options.signal?.throwIfAborted();
 	if (!options.allowKeychainPrompt) return;
 	const home = await fs.realpath(options.codexHome).catch(() => path.resolve(options.codexHome));
-	const { CodexAppServerClient } = await import("./client-Cs08OXVQ.mjs").then((n) => n.n);
-	const { resolveManagedCodexPackageEntrypoint, resolveManagedCodexNativeCommand } = await import("./managed-binary-BnshlFag.mjs").then((n) => n.n);
+	const { CodexAppServerClient } = await import("./client-qyUBJlGZ.mjs").then((n) => n.n);
+	const { resolveManagedCodexPackageEntrypoint, resolveManagedCodexNativeCommand } = await import("./managed-binary-kiWRhNRE.mjs").then((n) => n.n);
 	const launcher = resolveManagedCodexPackageEntrypoint(path.dirname(fileURLToPath(import.meta.url)));
 	const command = launcher ? resolveManagedCodexNativeCommand(launcher) : void 0;
 	if (!command) return;
@@ -179,12 +180,8 @@ async function readNativeCredential(client, home, options, signal) {
 	} : void 0;
 }
 function jwtExpiry(token) {
-	try {
-		const exp = asOptionalRecord(JSON.parse(Buffer.from(token.split(".")[1] ?? "", "base64url").toString("utf8")))?.exp;
-		return typeof exp === "number" && Number.isFinite(exp) && exp > 0 ? exp * 1e3 : void 0;
-	} catch {
-		return;
-	}
+	const exp = decodeOpenAICodexJwtPayload$1(token)?.exp;
+	return typeof exp === "number" && Number.isFinite(exp) && exp > 0 ? exp * 1e3 : void 0;
 }
 function parseOAuthCredential(data) {
 	const mode = typeof data.auth_mode === "string" ? data.auth_mode.toLowerCase() : void 0;
@@ -300,15 +297,10 @@ function replaceConfigDraft(draft, next) {
 	for (const key of Object.keys(draft)) delete draft[key];
 	Object.assign(draft, next);
 }
-function existingAuthProfileConfigIsCompatible(existing, profile) {
-	if (existing.provider !== profile.provider || existing.mode !== profile.mode) return false;
-	if (existing.email && profile.email && existing.email !== profile.email) return false;
-	return true;
-}
 function hasAuthProfileConfigConflict(config, profile, overwrite) {
 	if (overwrite) return false;
 	const existing = config.auth?.profiles?.[profile.profileId];
-	return Boolean(existing && !existingAuthProfileConfigIsCompatible(existing, profile));
+	return Boolean(existing && (existing.provider !== profile.provider || existing.mode !== profile.mode || existing.email && profile.email && existing.email !== profile.email));
 }
 function hasCurrentAuthProfileConfigConflict(ctx, profile) {
 	let config = ctx.config;
@@ -334,28 +326,6 @@ function applyDefaultModelIfMissing(cfg) {
 		}
 	};
 }
-function applyOAuthConfigToConfig(cfg, credential, profileId) {
-	let next = mergeMigrationConfigValue(cfg, credential.result.configPatch);
-	const profile = credential.result.profiles[0];
-	if (profile) next = applyAuthProfileConfig(next, {
-		profileId,
-		provider: profile.credential.provider,
-		mode: "oauth",
-		..."email" in profile.credential && profile.credential.email ? { email: profile.credential.email } : {},
-		..."displayName" in profile.credential && profile.credential.displayName ? { displayName: profile.credential.displayName } : {},
-		preferProfileFirst: false
-	});
-	return applyDefaultModelIfMissing(next);
-}
-function applyApiKeyConfigToConfig(cfg, credential, profileId) {
-	return applyAuthProfileConfig(cfg, {
-		profileId,
-		provider: credential.provider,
-		mode: "api_key",
-		displayName: CODEX_IMPORT_DISPLAY_NAME,
-		preferProfileFirst: false
-	});
-}
 function resolveCodexConfigPatchMode(ctx) {
 	const mode = ctx.providerOptions?.configPatchMode;
 	return mode === "none" || mode === "return" ? mode : "apply";
@@ -393,9 +363,8 @@ async function applyCodexAuthProfileConfig(ctx, profile, applyConfig) {
 			base: "runtime",
 			afterWrite: { mode: "auto" },
 			mutate(draft) {
-				const current = draft;
-				if (hasAuthProfileConfigConflict(current, profile, Boolean(ctx.overwrite))) throw new CodexAuthConfigConflict();
-				replaceConfigDraft(draft, applyConfig(current));
+				if (hasAuthProfileConfigConflict(draft, profile, Boolean(ctx.overwrite))) throw new CodexAuthConfigConflict();
+				replaceConfigDraft(draft, applyConfig(draft));
 			}
 		});
 		return "configured";
@@ -403,13 +372,14 @@ async function applyCodexAuthProfileConfig(ctx, profile, applyConfig) {
 		return error instanceof CodexAuthConfigConflict ? "conflict" : "unavailable";
 	}
 }
-async function applyCodexAuthConfig(ctx, credential, profileId) {
-	const profile = authProfileConfigForCredential(credential, profileId);
-	if (!profile) return "unavailable";
-	return applyCodexAuthProfileConfig(ctx, profile, (config) => applyCredentialConfig(config, credential, profileId));
-}
 function applyCredentialConfig(config, credential, profileId) {
-	return credential.kind === "oauth" ? applyOAuthConfigToConfig(config, credential, profileId) : applyApiKeyConfigToConfig(config, credential, profileId);
+	let next = credential.kind === "oauth" ? mergeMigrationConfigValue(config, credential.result.configPatch) : config;
+	const profile = authProfileConfigForCredential(credential, profileId);
+	if (profile) next = applyAuthProfileConfig(next, {
+		...profile,
+		preferProfileFirst: false
+	});
+	return credential.kind === "oauth" ? applyDefaultModelIfMissing(next) : next;
 }
 async function buildCodexAuthItems(params) {
 	const configPatchMode = resolveCodexConfigPatchMode(params.ctx);
@@ -501,8 +471,7 @@ async function applyCodexAuthItem(params) {
 	const credentials = await params.readCredentials();
 	ctx.signal?.throwIfAborted();
 	const credential = credentials.find((candidate) => candidate.provider === provider && candidate.kind === credentialKind && (!sourceProfileId || candidate.profileId === sourceProfileId));
-	if (!credential) return [markMigrationItemSkipped(item, CODEX_REASON_AUTH_NO_LONGER_PRESENT)];
-	if (item.details?.sourceCredentialFingerprint !== sourceCredentialFingerprint(credential)) return [markMigrationItemSkipped(item, CODEX_REASON_AUTH_NO_LONGER_PRESENT)];
+	if (!credential || item.details?.sourceCredentialFingerprint !== sourceCredentialFingerprint(credential)) return [markMigrationItemSkipped(item, CODEX_REASON_AUTH_NO_LONGER_PRESENT)];
 	if (item.details?.legacyNativeHome !== void 0 && (item.details.legacyNativeHome !== source.codexHome || source.codexHome !== defaultCodexHome())) return [markMigrationItemSkipped(item, CODEX_REASON_AUTH_NO_LONGER_PRESENT)];
 	ctx.signal?.throwIfAborted();
 	const oauthProfile = credential.kind === "oauth" ? credential.result.profiles[0] : void 0;
@@ -547,7 +516,7 @@ async function applyCodexAuthItem(params) {
 	if (conflicted) return [markMigrationItemConflict(item, CODEX_REASON_AUTH_PROFILE_EXISTS)];
 	if (unusable) return [markMigrationItemSkipped(item, CODEX_REASON_AUTH_PROFILE_UNUSABLE)];
 	if (!store || !loadAuthProfileStoreWithoutExternalProfiles(targets.agentDir).profiles[profileId]) return [markMigrationItemError(item, CODEX_REASON_AUTH_PROFILE_WRITE_FAILED)];
-	const configResult = configPatchMode !== "apply" ? "unavailable" : await applyCodexAuthConfig(ctx, credential, profileId);
+	const configResult = configPatchMode !== "apply" ? "unavailable" : await applyCodexAuthProfileConfig(ctx, configProfile, (config) => applyCredentialConfig(config, credential, profileId));
 	if (configResult === "conflict") return [markMigrationItemConflict(item, CODEX_REASON_AUTH_PROFILE_EXISTS)];
 	const migratedItem = {
 		...item,
@@ -563,32 +532,28 @@ async function applyCodexAuthItem(params) {
 }
 function buildCodexAuthConfigPatchItems(ctx, item, credential, profileId) {
 	const next = applyCredentialConfig(ctx.config, credential, profileId);
-	const items = [];
-	if (next.auth) items.push(createMigrationItem({
-		id: `${item.id}:config:auth`,
+	return [{
+		suffix: "auth",
+		path: ["auth"],
+		value: next.auth,
+		message: "Configure imported Codex auth profile."
+	}, {
+		suffix: "agents-defaults",
+		path: ["agents", "defaults"],
+		value: next.agents?.defaults,
+		message: "Configure imported Codex models."
+	}].flatMap(({ suffix, path, value, message }) => value ? [createMigrationItem({
+		id: `${item.id}:config:${suffix}`,
 		kind: "config",
 		action: "merge",
 		status: "migrated",
-		target: "auth",
-		message: "Configure imported Codex auth profile.",
+		target: path.join("."),
+		message,
 		details: {
-			path: ["auth"],
-			value: next.auth
-		}
-	}));
-	if (next.agents?.defaults) items.push(createMigrationItem({
-		id: `${item.id}:config:agents-defaults`,
-		kind: "config",
-		action: "merge",
-		status: "migrated",
-		target: "agents.defaults",
-		message: "Configure imported Codex models.",
-		details: {
-			path: ["agents", "defaults"],
-			value: next.agents.defaults
+			path,
+			value
 		}
-	}));
-	return items;
+	})] : []);
 }
 //#endregion
 //#region extensions/codex/src/migration/plan.ts
@@ -689,7 +654,7 @@ async function buildCodexSkillItems(params) {
 	}, /* @__PURE__ */ new Map());
 	return await Promise.all(planned.map(async (item) => {
 		const collision = (resolvedCounts.get(item.name) ?? 0) > 1;
-		const targetExists = await exists(item.target);
+		const targetExists = await pathExists(item.target);
 		const conflict = collision || targetExists && !params.overwrite;
 		return createMigrationItem({
 			id: `skill:${item.name}`,
@@ -714,10 +679,7 @@ function readExistingCodexPluginEntries(config) {
 function hasExistingCodexPluginEntry(existingEntries, configKey, pluginName, nextEntry) {
 	const existingEntry = existingEntries[configKey];
 	if (existingEntry !== void 0) return !isLegacyDestructivePolicyRepair(existingEntry, nextEntry);
-	return Object.values(existingEntries).some((entry) => {
-		if (!isRecord(entry)) return false;
-		return entry.pluginName === pluginName;
-	});
+	return Object.values(existingEntries).some((entry) => isRecord(entry) && entry.pluginName === pluginName);
 }
 function isLegacyDestructivePolicyRepair(existing, nextEntry) {
 	const existingEntry = isRecord(existing) ? existing : void 0;
@@ -742,14 +704,12 @@ function buildPluginItems(ctx, plugins) {
 	for (const plugin of plugins) {
 		if (plugin.migratable && plugin.marketplaceName === "openai-curated" && plugin.pluginName) {
 			const configKey = plugin.pluginName;
+			const allowDestructiveActions = readExistingPluginAllowDestructiveActions(existingPluginEntries[configKey], plugin.pluginName);
 			const plannedEntry = {
 				enabled: true,
 				marketplaceName: CODEX_PLUGINS_MARKETPLACE_NAME,
 				pluginName: plugin.pluginName,
-				...(() => {
-					const allowDestructiveActions = readExistingPluginAllowDestructiveActions(existingPluginEntries[configKey], plugin.pluginName);
-					return allowDestructiveActions ? { allow_destructive_actions: allowDestructiveActions } : {};
-				})()
+				...allowDestructiveActions ? { allow_destructive_actions: allowDestructiveActions } : {}
 			};
 			const conflict = !ctx.overwrite && hasExistingCodexPluginEntry(existingPluginEntries, configKey, plugin.pluginName, plannedEntry);
 			items.push(createMigrationItem({
@@ -768,8 +728,8 @@ function buildPluginItems(ctx, plugins) {
 					pluginName: plugin.pluginName,
 					sourceInstalled: plugin.installed === true,
 					sourceEnabled: plugin.enabled === true,
-					...plannedEntry.allow_destructive_actions === "auto" || plannedEntry.allow_destructive_actions === "ask" ? { allowDestructiveActions: plannedEntry.allow_destructive_actions } : {},
-					...plugin.apps && plugin.apps.length > 0 && !shouldVerifyPluginApps(ctx) ? { sourceAppVerification: CODEX_PLUGIN_SOURCE_APP_VERIFICATION_UNVERIFIED } : {}
+					...allowDestructiveActions ? { allowDestructiveActions } : {},
+					...plugin.apps && plugin.apps.length > 0 && ctx.providerOptions?.verifyPluginApps !== true ? { sourceAppVerification: CODEX_PLUGIN_SOURCE_APP_VERIFICATION_UNVERIFIED } : {}
 				}
 			}));
 			continue;
@@ -802,9 +762,6 @@ function buildPluginItems(ctx, plugins) {
 	}
 	return items;
 }
-function shouldVerifyPluginApps(ctx) {
-	return ctx.providerOptions?.verifyPluginApps === true;
-}
 function readCodexPluginMigrationConfigEntry(item, enabled) {
 	const configKey = item.details?.configKey;
 	const marketplaceName = item.details?.marketplaceName;
@@ -896,14 +853,14 @@ function buildPluginConfigItem(ctx, pluginItems) {
 }
 async function buildCodexMigrationPlan(ctx) {
 	const targets = resolvePlannedMigrationTargets(ctx);
-	const memoryOnly = ctx.itemKinds !== void 0 && ctx.itemKinds.length > 0 && ctx.itemKinds.every((kind) => kind === "memory");
-	const authOnly = ctx.itemKinds !== void 0 && ctx.itemKinds.length > 0 && ctx.itemKinds.every((kind) => kind === "auth");
+	const memoryOnly = isOnlyMigrationKind(ctx, "memory");
+	const authOnly = isOnlyMigrationKind(ctx, "auth");
 	const source = await discoverCodexSource({
 		input: ctx.source,
 		memoryOnly,
 		authOnly,
 		evaluatePluginMigrationEligibility: !memoryOnly && !authOnly,
-		verifyPluginApps: shouldVerifyPluginApps(ctx)
+		verifyPluginApps: ctx.providerOptions?.verifyPluginApps === true
 	});
 	if (!hasCodexSource(source) && !authOnly) throw new Error(`Codex state was not found at ${source.root}. Pass --from <path> if it lives elsewhere.`);
 	const items = [];

package/dist/.setup/{plugin-activation-DT3MNtqj.mjs → plugin-activation-cNHRfaxU.mjs}

@@ -1,12 +1,8 @@
-import { c as CODEX_PLUGINS_MARKETPLACE_NAME, i as pluginReadParams, n as isOpenAiCuratedMarketplace, r as isOpenAiCuratedMarketplaceName, t as findCodexMarketplacePluginSummary } from "./plugin-inventory-BoRei8Z4.mjs";
-import { o as CodexAppServerRpcError } from "./timeout-C910MdAB.mjs";
-import "./config-BoTP_mrL.mjs";
+import { i as listCodexPluginMetadata, n as isOpenAiCuratedMarketplace, o as pluginReadParams, r as isOpenAiCuratedMarketplaceName, t as findCodexMarketplacePluginSummary, u as CODEX_PLUGINS_MARKETPLACE_NAME } from "./plugin-inventory-Cky2XJUw.mjs";
+import { n as CodexAppServerRpcError } from "./rpc-error-BlD2vuzn.mjs";
+import "./config-DKhXquav.mjs";
 import { coerceErrorMessage } from "openclaw/plugin-sdk/error-runtime";
 //#region extensions/codex/src/app-server/plugin-activation.ts
-/**
-* Activates legacy curated Codex plugins while requiring owner-managed
-* installation for every other marketplace.
-*/
 /** Activates legacy curated plugins without granting install authority to other marketplaces. */
 async function ensureCodexPluginActivation(params) {
 	if (params.identity.marketplaceName === "workspace-directory") return activationFailure(params.identity, "disabled", { message: "workspace-directory plugins must be installed and enabled outside OpenClaw before use." });
@@ -14,7 +10,7 @@ async function ensureCodexPluginActivation(params) {
 		const target = params.identity.pluginName.endsWith(`@${params.identity.marketplaceName}`) ? params.identity.pluginName : `${params.identity.pluginName}@${params.identity.marketplaceName}`;
 		return activationFailure(params.identity, "disabled", { message: `${params.identity.marketplaceName} plugins must be installed and enabled by an owner before use. Run /codex plugins install ${target}.` });
 	}
-	const listed = await listCuratedCodexPluginMetadata(params);
+	const listed = await listCodexPluginMetadata(params, CODEX_PLUGINS_MARKETPLACE_NAME);
 	const resolved = findCodexMarketplacePluginSummary(listed, params.identity.marketplaceName, params.identity.pluginName);
 	if (!resolved) {
 		if (!listed.marketplaces.some((marketplace) => isOpenAiCuratedMarketplace(marketplace))) return activationFailure(params.identity, "marketplace_missing", { message: `Codex marketplace ${CODEX_PLUGINS_MARKETPLACE_NAME} was not found.` });
@@ -48,16 +44,7 @@ async function ensureCodexPluginActivation(params) {
 	const refreshDiagnostics = [];
 	let refreshFailed = false;
 	try {
-		const refreshResult = await refreshCodexPluginRuntimeState({
-			request: params.request,
-			appCache: params.appCache,
-			appCacheKey: params.appCacheKey,
-			appInventoryCacheKey: params.appInventoryCacheKey,
-			configCwd: params.configCwd,
-			metadataCache: params.metadataCache,
-			deferAppInventoryRefresh: params.deferAppInventoryRefresh,
-			targetAppIds: params.targetAppIds
-		});
+		const refreshResult = await refreshCodexPluginRuntimeState(params);
 		refreshDiagnostics.push(...refreshResult.diagnostics);
 	} catch (error) {
 		refreshFailed = true;
@@ -74,11 +61,10 @@ async function ensureCodexPluginActivation(params) {
 		diagnostics: [...refreshDiagnostics, ...installResponse.appsNeedingAuth.map((app) => ({ message: `${app.name} requires app authentication before plugin tools are exposed.` }))]
 	};
 }
-/** Refreshes OpenClaw inventories after Codex installs a plugin. */
 async function refreshCodexPluginRuntimeState(params) {
 	const diagnostics = [];
 	if (params.appCacheKey) params.metadataCache?.invalidate(params.appCacheKey);
-	await listCuratedCodexPluginMetadata(params, { forceRefetch: true });
+	await listCodexPluginMetadata(params, CODEX_PLUGINS_MARKETPLACE_NAME, { forceRefetch: true });
 	if (params.appCache && params.appCacheKey) try {
 		await refreshCodexAppRuntimeState({
 			...params,
@@ -102,27 +88,13 @@ async function refreshCodexAppRuntimeState(params) {
 		targetAppIds: params.targetAppIds
 	});
 }
-async function listCuratedCodexPluginMetadata(params, options = {}) {
-	const requestParams = {
-		...params.configCwd ? { cwds: [params.configCwd] } : {},
-		...options.forceRefetch ? { forceRefetch: true } : {}
-	};
-	if (!params.metadataCache || !params.appCacheKey) return await params.request("plugin/list", requestParams);
-	return (await params.metadataCache.load({
-		appCacheKey: params.appCacheKey,
-		queryKind: "curated-global",
-		requestParams,
-		request: async (method, listedParams) => await params.request(method, listedParams),
-		cacheable: (response) => response.marketplaces.some((marketplace) => isOpenAiCuratedMarketplace(marketplace))
-	})).response;
-}
-function activationFailure(identity, reason, diagnostic, extraDiagnostics = []) {
+function activationFailure(identity, reason, diagnostic) {
 	return {
 		identity,
 		ok: false,
 		reason,
 		installAttempted: false,
-		diagnostics: [diagnostic, ...extraDiagnostics]
+		diagnostics: [diagnostic]
 	};
 }
 //#endregion

package/dist/.setup/{plugin-app-cache-key-B2CsSdnV.mjs → plugin-app-cache-key-BL9B5H0L.mjs}

@@ -1,4 +1,4 @@
-import { d as resolveCodexAppServerHomeDir, f as resolveCodexAppServerLocalHomeDir, p as resolveCodexAppServerUserHomeDir } from "./config-security-BEReZ6go.mjs";
+import { n as resolveCodexAppServerLocalHomeDir, r as resolveCodexAppServerUserHomeDir, t as resolveCodexAppServerHomeDir } from "./auth-start-options-BPIPeEX8.mjs";
 import { createRequire } from "node:module";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
@@ -23,15 +23,9 @@ function findCodexAppById(apps, id) {
 }
 //#endregion
 //#region extensions/codex/src/app-server/app-inventory-cache.ts
-/**
-* Process-local cache for Codex app-server app inventories, keyed by runtime
-* identity and safe to refresh in the background.
-*/
-/** Default app inventory cache freshness window. */
 const CODEX_APP_INVENTORY_CACHE_TTL_MS = 36e5;
 const CODEX_APP_READ_BATCH_LIMIT = 100;
 const MAX_SERIALIZED_ERROR_MESSAGE_LENGTH = 500;
-/** In-memory app inventory cache with coalesced refreshes per key. */
 var CodexAppInventoryCache = class {
 	constructor(options = {}) {
 		this.entries = /* @__PURE__ */ new Map();
@@ -41,7 +35,6 @@ var CodexAppInventoryCache = class {
 		this.revision = 0;
 		this.ttlMs = options.ttlMs ?? CODEX_APP_INVENTORY_CACHE_TTL_MS;
 	}
-	/** Reads a snapshot and schedules refresh when missing, stale, or forced. */
 	read(params) {
 		const nowMs = resolveDateTimestampMs(params.nowMs);
 		const entry = this.entries.get(params.key);
@@ -66,10 +59,6 @@ var CodexAppInventoryCache = class {
 			...entry.lastError ? { diagnostic: entry.lastError } : {}
 		};
 	}
-	/** Forces or joins an immediate refresh for a cache key. */
-	refreshNow(params) {
-		return this.refresh(params);
-	}
 	/**
 	* Marks a key stale and records the reason as a diagnostic. A scope names
 	* the app ids the invalidation concerns so a covering targeted refresh can
@@ -77,7 +66,7 @@ var CodexAppInventoryCache = class {
 	*/
 	invalidate(key, reason, nowMs = Date.now(), invalidatedAppIds) {
 		this.revision += 1;
-		this.refreshTokens.set(key, (this.refreshTokens.get(key) ?? 0) + 1);
+		this.refreshTokens.delete(key);
 		this.inFlight.delete(key);
 		const diagnostic = {
 			message: reason,
@@ -95,7 +84,6 @@ var CodexAppInventoryCache = class {
 		} else this.diagnostics.set(key, diagnostic);
 		return this.revision;
 	}
-	/** Clears all cached snapshots, diagnostics, in-flight requests, and revision state. */
 	clear() {
 		this.entries.clear();
 		this.inFlight.clear();
@@ -103,20 +91,18 @@ var CodexAppInventoryCache = class {
 		this.diagnostics.clear();
 		this.revision = 0;
 	}
-	/** Returns the monotonically increasing cache revision. */
 	getRevision() {
 		return this.revision;
 	}
 	scheduleRefresh(params) {
-		const existing = this.inFlight.get(params.key);
-		if (existing && !params.forceRefetch && doesInFlightRefreshCover(existing, params)) return true;
-		this.refresh(params).catch(() => void 0);
+		this.refreshNow(params).catch(() => void 0);
 		return true;
 	}
-	async refresh(params) {
+	/** Forces or joins an immediate refresh for a cache key. */
+	async refreshNow(params) {
 		const existing = this.inFlight.get(params.key);
 		if (existing && !params.forceRefetch && doesInFlightRefreshCover(existing, params)) return existing.promise;
-		const refreshToken = (this.refreshTokens.get(params.key) ?? 0) + 1;
+		const refreshToken = Symbol("app-inventory-refresh");
 		this.refreshTokens.set(params.key, refreshToken);
 		const previousRefresh = params.forceRefetch ? void 0 : existing?.promise;
 		const promise = this.refreshUncoalesced(params, refreshToken, previousRefresh);
@@ -236,7 +222,6 @@ function doesInFlightRefreshCover(existing, params) {
 	const requestedAppIds = new Set(params.targetAppIds?.filter(Boolean).map(codexAppIdentityKey) ?? []);
 	return requestedAppIds.size > 0 && Array.from(requestedAppIds).every((appId) => existing.targetAppIds.has(appId));
 }
-/** Serializes a refresh failure without leaking large or sensitive error data. */
 function serializeCodexAppInventoryError(error) {
 	const record = isRecord(error) ? error : void 0;
 	const data = record && "data" in record ? redactErrorData(record.data) : void 0;
@@ -247,9 +232,7 @@ function serializeCodexAppInventoryError(error) {
 		...data !== void 0 ? { data } : {}
 	};
 }
-/** Shared app inventory cache used by Codex app-server runtime paths. */
 const defaultCodexAppInventoryCache = new CodexAppInventoryCache();
-/** Builds a stable cache key from build versions and runtime identity fields. */
 function buildCodexAppInventoryCacheKey(input, openClawVersion, codexPluginVersion) {
 	return JSON.stringify({
 		openClawVersion,

package/dist/.setup/{plugin-inventory-BoRei8Z4.mjs → plugin-inventory-Cky2XJUw.mjs}

@@ -1,19 +1,14 @@
-import { f as resolveCodexPluginsPolicy } from "./config-parsing-CcB9iPoq.mjs";
-import { c as findCodexAppById } from "./plugin-app-cache-key-B2CsSdnV.mjs";
-import "./config-BoTP_mrL.mjs";
+import { f as resolveCodexPluginsPolicy } from "./config-parsing-b088LyhT.mjs";
+import { c as findCodexAppById } from "./plugin-app-cache-key-BL9B5H0L.mjs";
+import "./config-DKhXquav.mjs";
 import { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/config-contracts.ts
 const CODEX_PLUGINS_MARKETPLACE_NAME = "openai-curated";
 const CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME = "workspace-directory";
 //#endregion
 //#region extensions/codex/src/app-server/plugin-inventory.ts
-/**
-* Reads Codex plugin marketplace state and app inventory to decide which
-* plugin-owned apps can be exposed to a native Codex thread.
-*/
 const CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME = `${CODEX_PLUGINS_MARKETPLACE_NAME}-remote`;
 const CODEX_PLUGINS_API_MARKETPLACE_NAME = "openai-api-curated";
-/** Reads configured Codex plugin state and maps owned apps to readiness diagnostics. */
 async function readCodexPluginInventory(params) {
 	const policy = params.policy ?? resolveCodexPluginsPolicy(params.pluginConfig);
 	if (!policy.enabled) return {
@@ -148,7 +143,6 @@ function pluginReadParams(marketplace, pluginName) {
 		pluginName
 	};
 }
-/** Returns configured plugin keys whose current metadata may still recover. */
 function resolveRecoverableCodexPluginConfigKeys(params) {
 	return params.policy.pluginPolicies.filter((pluginPolicy) => pluginPolicy.enabled && !isSettledMissingPluginPolicy({
 		pluginPolicy,
@@ -157,8 +151,11 @@ function resolveRecoverableCodexPluginConfigKeys(params) {
 		configCwd: params.configCwd
 	})).map((pluginPolicy) => pluginPolicy.configKey).toSorted();
 }
-async function listCodexPluginMetadata(params, marketplaceName) {
-	const requestParams = buildPluginCatalogRequestParams(params, marketplaceName);
+async function listCodexPluginMetadata(params, marketplaceName, options = {}) {
+	const requestParams = {
+		...buildPluginCatalogRequestParams(params, marketplaceName),
+		...options.forceRefetch ? { forceRefetch: true } : {}
+	};
 	if (!params.metadataCache || !params.appCacheKey) return await params.request("plugin/list", requestParams);
 	return (await params.metadataCache.load({
 		appCacheKey: params.appCacheKey,
@@ -233,7 +230,7 @@ async function readPluginDetail(params, marketplace, pluginPolicy, summary, diag
 }
 function resolveAppOwnership(params) {
 	if (params.detail && params.detail.apps.length > 0) return "proven";
-	return (params.appInventory?.snapshot?.apps ?? []).filter((app) => app.pluginDisplayNames.some((displayName) => displayName === params.summary.name)).length > 0 ? "ambiguous" : "none";
+	return (params.appInventory?.snapshot?.apps ?? []).some((app) => app.pluginDisplayNames.includes(params.summary.name)) ? "ambiguous" : "none";
 }
 function resolveOwnedApps(params) {
 	const detailApps = params.detail?.apps ?? [];
@@ -257,15 +254,19 @@ function resolveOwnedApps(params) {
 			enabled: false,
 			needsAuth: true
 		};
-		return Object.assign({
-			id: info.id,
-			name: app.name,
-			accessible: true,
-			enabled: findCodexAppById(installedApps, info.id)?.enabled ?? false,
-			needsAuth: false
-		}, resolveOwnedAppApprovalOverrideKeys(info));
+		return Object.assign(toCodexPluginOwnedAccountApp(info, findCodexAppById(installedApps, info.id)), { name: app.name });
 	}).toSorted((left, right) => left.id.localeCompare(right.id));
 }
+function toCodexPluginOwnedAccountApp(app, installedApp) {
+	return {
+		id: app.id,
+		name: app.name,
+		accessible: true,
+		enabled: installedApp?.enabled ?? false,
+		needsAuth: false,
+		...resolveOwnedAppApprovalOverrideKeys(app)
+	};
+}
 /** Returns current tool keys whose overrides could bypass the requested reviewer. */
 function resolveOwnedAppApprovalOverrideKeys(app) {
 	if (!app.toolSummaries) return {};
@@ -330,9 +331,8 @@ function marketplaceRef(marketplace, name) {
 function isOpenAiCuratedMarketplace(marketplace) {
 	return isOpenAiCuratedMarketplaceName(marketplace.name);
 }
-/** True for all Codex wire aliases of the same OpenAI-curated catalog. */
 function isOpenAiCuratedMarketplaceName(marketplaceName) {
 	return marketplaceName === "openai-curated" || marketplaceName === CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME || marketplaceName === CODEX_PLUGINS_API_MARKETPLACE_NAME;
 }
 //#endregion
-export { readCodexPluginInventory as a, CODEX_PLUGINS_MARKETPLACE_NAME as c, pluginReadParams as i, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as l, isOpenAiCuratedMarketplace as n, resolveOwnedAppApprovalOverrideKeys as o, isOpenAiCuratedMarketplaceName as r, resolveRecoverableCodexPluginConfigKeys as s, findCodexMarketplacePluginSummary as t };
+export { marketplaceRef as a, resolveRecoverableCodexPluginConfigKeys as c, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as d, listCodexPluginMetadata as i, toCodexPluginOwnedAccountApp as l, isOpenAiCuratedMarketplace as n, pluginReadParams as o, isOpenAiCuratedMarketplaceName as r, readCodexPluginInventory as s, findCodexMarketplacePluginSummary as t, CODEX_PLUGINS_MARKETPLACE_NAME as u };

package/dist/.setup/{plugin-marketplace-discovery-CDOi8IFs.mjs → plugin-marketplace-discovery-D_dV9FXa.mjs}

@@ -1,3 +1,4 @@
+import { d as CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN } from "./config-utils-D0CXecki.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/command-authorization.ts
 const CODEX_NATIVE_EXECUTION_AUTH_ERROR = "Only an owner or operator.admin can control Codex native execution.";
@@ -16,7 +17,6 @@ function assertCodexHostOwnerCurrent(ctx) {
 //#region extensions/codex/src/plugin-marketplace-discovery.ts
 /** Read-only discovery of Codex-owned local, curated, and remote plugin marketplaces. */
 const PLUGIN_NAME_PATTERN = /^[A-Za-z0-9_-]+(?:\.[A-Za-z0-9_-]+)*$/;
-const MARKETPLACE_NAME_PATTERN = /^[A-Za-z0-9_-]+$/;
 const MAX_PLUGIN_METADATA_LENGTH = 160;
 const SUPPLEMENTAL_MARKETPLACE_KINDS = [
 	"workspace-directory",
@@ -34,7 +34,7 @@ function parseCodexPluginMarketplaceId(value) {
 	if (separator <= 0 || separator === value.length - 1) return;
 	const pluginName = value.slice(0, separator);
 	const marketplaceName = value.slice(separator + 1);
-	return PLUGIN_NAME_PATTERN.test(pluginName) && MARKETPLACE_NAME_PATTERN.test(marketplaceName) ? {
+	return PLUGIN_NAME_PATTERN.test(pluginName) && CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN.test(marketplaceName) ? {
 		pluginName,
 		marketplaceName
 	} : void 0;
@@ -42,26 +42,25 @@ function parseCodexPluginMarketplaceId(value) {
 /** Lists local/global first and separately requests workspace, shared, and personal catalogs. */
 async function discoverCodexMarketplacePlugins(params) {
 	const requestParams = { cwds: [params.workspaceDir] };
-	const primary = await params.request(requestParams);
-	const warnings = (primary.marketplaceLoadErrors ?? []).map((error) => boundedCatalogText(error.message));
-	const marketplaces = [...primary.marketplaces];
-	try {
-		const supplemental = await params.request({
+	const warnings = [];
+	const marketplaces = [];
+	const readMarketplaces = async (marketplaceKinds) => {
+		const response = await params.request({
 			...requestParams,
-			marketplaceKinds: [...SUPPLEMENTAL_MARKETPLACE_KINDS]
+			...marketplaceKinds ? { marketplaceKinds } : {}
 		});
-		marketplaces.push(...supplemental.marketplaces);
-		warnings.push(...(supplemental.marketplaceLoadErrors ?? []).map((error) => boundedCatalogText(error.message)));
+		marketplaces.push(...response.marketplaces);
+		warnings.push(...(response.marketplaceLoadErrors ?? []).map((error) => boundedCatalogText(error.message)));
+		return response.marketplaces.length > 0;
+	};
+	await readMarketplaces();
+	try {
+		await readMarketplaces([...SUPPLEMENTAL_MARKETPLACE_KINDS]);
 	} catch (error) {
 		let recoveredSupplementalMarketplace = false;
 		for (const kind of SUPPLEMENTAL_MARKETPLACE_KINDS) try {
-			const supplemental = await params.request({
-				...requestParams,
-				marketplaceKinds: [kind]
-			});
-			marketplaces.push(...supplemental.marketplaces);
-			recoveredSupplementalMarketplace ||= supplemental.marketplaces.length > 0;
-			warnings.push(...(supplemental.marketplaceLoadErrors ?? []).map((loadError) => boundedCatalogText(loadError.message)));
+			const found = await readMarketplaces([kind]);
+			recoveredSupplementalMarketplace ||= found;
 		} catch (kindError) {
 			warnings.push(boundedCatalogText(`${kind} marketplace unavailable: ${kindError instanceof Error ? kindError.message : String(kindError)}`));
 		}
@@ -70,7 +69,7 @@ async function discoverCodexMarketplacePlugins(params) {
 	const discovered = /* @__PURE__ */ new Map();
 	const ambiguous = /* @__PURE__ */ new Set();
 	for (const marketplace of marketplaces) {
-		if (!MARKETPLACE_NAME_PATTERN.test(marketplace.name)) continue;
+		if (!CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN.test(marketplace.name)) continue;
 		for (const summary of marketplace.plugins) {
 			const pluginName = pluginSlug(summary, marketplace.name);
 			if (!pluginName) continue;
@@ -129,12 +128,7 @@ function pluginSlug(summary, marketplaceName) {
 }
 function boundedCatalogText(value) {
 	if (typeof value !== "string") return "";
-	let sanitized = "";
-	for (const character of value) {
-		const codePoint = character.codePointAt(0);
-		sanitized += codePoint !== void 0 && (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) ? " " : character;
-	}
-	return sanitized.replace(/\s+/g, " ").trim().slice(0, MAX_PLUGIN_METADATA_LENGTH);
+	return value.replace(/\p{Cc}/gu, " ").replace(/\s+/g, " ").trim().slice(0, MAX_PLUGIN_METADATA_LENGTH);
 }
 //#endregion
 export { CODEX_HOST_INSPECTION_AUTH_ERROR as a, canMutateCodexHost as c, CODEX_FULL_PERMISSIONS_AUTH_ERROR as i, hasCodexAdminScope as l, filterCodexMarketplacePlugins as n, CODEX_NATIVE_EXECUTION_AUTH_ERROR as o, parseCodexPluginMarketplaceId as r, assertCodexHostOwnerCurrent as s, discoverCodexMarketplacePlugins as t };