@openclaw/codex 2026.9.5 → 2026.9.7

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

@@ -1,4 +1,4 @@
-import { _ as resolveCodexAppServerUserHomeDir, g as resolveCodexAppServerLocalHomeDir, h as resolveCodexAppServerHomeDir } from "./config-security-BRQ2mgW9.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,
@@ -287,23 +270,7 @@ async function readInstalledApps(request, options) {
 	return {
 		apps: apps.flatMap((installedApp) => {
 			const metadata = metadataById.get(installedApp.id);
-			if (!metadata) return [];
-			return [{
-				id: installedApp.id,
-				name: metadata.name,
-				description: metadata.description ?? null,
-				logoUrl: metadata.iconUrl ?? null,
-				logoUrlDark: metadata.iconUrlDark ?? null,
-				distributionChannel: metadata.distributionChannel ?? null,
-				branding: null,
-				appMetadata: null,
-				labels: null,
-				installUrl: metadata.installUrl ?? null,
-				isAccessible: true,
-				isEnabled: installedApp.enabled,
-				pluginDisplayNames: metadata.pluginDisplayNames,
-				...metadata.toolSummaries ? { toolSummaries: metadata.toolSummaries } : {}
-			}];
+			return metadata ? [metadata] : [];
 		}),
 		installedApps: apps
 	};
@@ -388,7 +355,7 @@ function buildCodexAppServerConnectionFingerprint(appServer, agentDir) {
 	});
 }
 function resolveCodexAppServerConnectionHome(start, agentDir) {
-	const configured = start.env?.CODEX_HOME?.trim();
+	const configured = start.codexHome ?? start.env?.CODEX_HOME?.trim();
 	if (configured) return configured;
 	if (start.transport === "unix" && (!start.url || start.url === "unix://")) return resolveCodexAppServerUserHomeDir(start.env ?? process.env);
 	if (start.transport !== "stdio") return null;
@@ -407,7 +374,7 @@ function resolveCodexPluginAppCacheEndpoint(appServer) {
 }
 /** Resolves the CODEX_HOME value that scopes local app-server inventory. */
 function resolveCodexPluginAppCacheCodexHome(appServer, agentDir) {
-	const configuredCodexHome = appServer.start.env?.CODEX_HOME?.trim();
+	const configuredCodexHome = appServer.start.codexHome ?? appServer.start.env?.CODEX_HOME?.trim();
 	if (configuredCodexHome) return configuredCodexHome;
 	return appServer.start.transport === "stdio" && agentDir ? resolveCodexAppServerHomeDir(agentDir) : void 0;
 }

package/dist/.setup/{plugin-inventory-DUle8DLz.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-BOxKP7db.mjs";
-import "./config-CedDWjM-.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 {
@@ -114,8 +109,16 @@ async function readCodexPluginInventory(params) {
 			apps
 		});
 	}
+	const missingKeys = /* @__PURE__ */ new Set();
+	for (const diagnostic of diagnostics) if (diagnostic.code === "plugin_missing" || diagnostic.code === "marketplace_missing") {
+		if (diagnostic.plugin) missingKeys.add(diagnostic.plugin.configKey);
+		embeddedAgentLog.error(diagnostic.message, { code: diagnostic.code });
+	}
 	return {
-		policy,
+		policy: {
+			...policy,
+			pluginPolicies: policy.pluginPolicies.filter((plugin) => !missingKeys.has(plugin.configKey))
+		},
 		records,
 		diagnostics,
 		...appInventory ? { appInventory } : {}
@@ -140,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,
@@ -149,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,
@@ -196,7 +201,7 @@ function readCachedAppInventory(params) {
 	if (!params.appCache || !params.appCacheKey) return;
 	const request = async (method, requestParams) => await params.request(method, requestParams);
 	return params.appCache.read({
-		key: params.appCacheKey,
+		key: params.appInventoryCacheKey ?? params.appCacheKey,
 		request,
 		nowMs: params.nowMs,
 		suppressRefresh: params.suppressAppInventoryRefresh
@@ -225,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 ?? [];
@@ -239,6 +244,7 @@ function resolveOwnedApps(params) {
 		return [];
 	}
 	const appInfos = params.appInventory?.snapshot?.apps ?? [];
+	const installedApps = params.appInventory?.snapshot?.installedApps ?? [];
 	return detailApps.map((app) => {
 		const info = findCodexAppById(appInfos, app.id);
 		if (!info) return {
@@ -248,15 +254,19 @@ function resolveOwnedApps(params) {
 			enabled: false,
 			needsAuth: true
 		};
-		return Object.assign({
-			id: info.id,
-			name: app.name,
-			accessible: info.isAccessible,
-			enabled: info.isEnabled,
-			needsAuth: !info.isAccessible
-		}, 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 {};
@@ -321,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-P-Vndfqq.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.";
@@ -9,11 +10,13 @@ function hasCodexAdminScope(ctx) {
 function canMutateCodexHost(ctx) {
 	return ctx.senderIsOwner === true || hasCodexAdminScope(ctx);
 }
+function assertCodexHostOwnerCurrent(ctx) {
+	if (!hasCodexAdminScope(ctx)) ctx.assertOwnerCurrent?.();
+}
 //#endregion
 //#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",
@@ -31,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;
@@ -39,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)}`));
 		}
@@ -67,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;
@@ -126,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, hasCodexAdminScope as c, CODEX_FULL_PERMISSIONS_AUTH_ERROR as i, filterCodexMarketplacePlugins as n, CODEX_NATIVE_EXECUTION_AUTH_ERROR as o, parseCodexPluginMarketplaceId as r, canMutateCodexHost as s, discoverCodexMarketplacePlugins as t };
+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 };