@openclaw/codex 2026.9.4 → 2026.9.6

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

@@ -1,4 +1,4 @@
-import { c as resolveCodexAppServerLocalHomeDir, l as resolveCodexAppServerUserHomeDir, s as resolveCodexAppServerHomeDir } from "./protocol-5bh1G-H7.js";
+import { d as resolveCodexAppServerHomeDir, f as resolveCodexAppServerLocalHomeDir, p as resolveCodexAppServerUserHomeDir } from "./config-security-BEReZ6go.mjs";
 import { createRequire } from "node:module";
 import { isRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 import { createHash } from "node:crypto";
@@ -6,6 +6,22 @@ import { OPENCLAW_VERSION, embeddedAgentLog } from "openclaw/plugin-sdk/agent-ha
 import { isFutureDateTimestampMs, resolveDateTimestampMs, resolveExpiresAtMsFromDurationMs } from "openclaw/plugin-sdk/number-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 import { readPluginPackageVersion } from "openclaw/plugin-sdk/extension-shared";
+//#region extensions/codex/src/app-server/app-identity.ts
+/**
+* Apps SDK manifests and installed Codex connections can name the same app
+* with asdk_app_ and legacy connector_ prefixes. Only the shared 128-bit ID
+* establishes equivalence; display names never establish app ownership.
+* Keep the installed ID for native config and calls. This comparison bridge
+* can retire when installed inventories consistently return Apps SDK IDs.
+*/
+function codexAppIdentityKey(id) {
+	return id.replace(/^connector_([a-f0-9]{32})$/, "asdk_app_$1");
+}
+/** Resolves a declared app against account-authorized runtime metadata. */
+function findCodexAppById(apps, id) {
+	return apps.find((app) => app.id === id) ?? apps.find((app) => codexAppIdentityKey(app.id) === codexAppIdentityKey(id));
+}
+//#endregion
 //#region extensions/codex/src/app-server/app-inventory-cache.ts
 /**
 * Process-local cache for Codex app-server app inventories, keyed by runtime
@@ -69,7 +85,7 @@ var CodexAppInventoryCache = class {
 		};
 		const entry = this.entries.get(key);
 		if (entry) {
-			const scope = invalidatedAppIds?.filter(Boolean) ?? [];
+			const scope = invalidatedAppIds?.filter(Boolean).map(codexAppIdentityKey) ?? [];
 			if (!entry.invalidated) entry.invalidatedAppIds = scope.length ? [...scope].toSorted() : void 0;
 			else if (entry.invalidatedAppIds && scope.length) entry.invalidatedAppIds = Array.from(/* @__PURE__ */ new Set([...entry.invalidatedAppIds, ...scope])).toSorted();
 			else entry.invalidatedAppIds = void 0;
@@ -106,7 +122,7 @@ var CodexAppInventoryCache = class {
 		const promise = this.refreshUncoalesced(params, refreshToken, previousRefresh);
 		const currentRefresh = {
 			promise,
-			targetAppIds: new Set(params.targetAppIds?.filter(Boolean) ?? [])
+			targetAppIds: new Set(params.targetAppIds?.filter(Boolean).map(codexAppIdentityKey) ?? [])
 		};
 		this.inFlight.set(params.key, currentRefresh);
 		try {
@@ -133,7 +149,7 @@ var CodexAppInventoryCache = class {
 				key: params.key,
 				apps: inventory.apps,
 				installedApps: inventory.installedApps,
-				...params.targetAppIds?.some(Boolean) ? { targetAppIds: Array.from(new Set(params.targetAppIds.filter(Boolean))).toSorted() } : {},
+				...params.targetAppIds?.some(Boolean) ? { targetAppIds: Array.from(new Set(params.targetAppIds.filter(Boolean).map(codexAppIdentityKey))).toSorted() } : {},
 				fetchedAtMs: nowMs,
 				expiresAtMs,
 				revision: this.revision
@@ -191,13 +207,13 @@ function resolvePublishedInventorySnapshot(existing, snapshot, nowMs) {
 }
 /** Replaces refreshed target rows in place, deletes vanished ones, appends new ones. */
 function mergeRefreshedRows(existingRows, refreshedRows, refreshedTargetIds) {
-	const refreshedById = new Map(refreshedRows.map((row) => [row.id, row]));
-	const existingIds = new Set(existingRows.map((row) => row.id));
+	const refreshedById = new Map(refreshedRows.map((row) => [codexAppIdentityKey(row.id), row]));
+	const existingIds = new Set(existingRows.map((row) => codexAppIdentityKey(row.id)));
 	return [...existingRows.flatMap((row) => {
-		if (!refreshedTargetIds.has(row.id)) return [row];
-		const refreshed = refreshedById.get(row.id);
+		if (!refreshedTargetIds.has(codexAppIdentityKey(row.id))) return [row];
+		const refreshed = refreshedById.get(codexAppIdentityKey(row.id));
 		return refreshed ? [refreshed] : [];
-	}), ...refreshedRows.filter((row) => !existingIds.has(row.id))];
+	}), ...refreshedRows.filter((row) => !existingIds.has(codexAppIdentityKey(row.id)))];
 }
 /**
 * A refresh retires exactly the invalidation scope it re-read: a complete
@@ -217,7 +233,7 @@ function resolveRemainingInvalidationScope(existing, snapshot) {
 }
 function doesInFlightRefreshCover(existing, params) {
 	if (existing.targetAppIds.size === 0) return true;
-	const requestedAppIds = new Set(params.targetAppIds?.filter(Boolean) ?? []);
+	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. */
@@ -257,8 +273,8 @@ function normalizeRuntimeIdentityForCacheKey(value) {
 }
 async function readInstalledApps(request, options) {
 	const installed = await request("app/installed", { forceRefresh: options.forceRefresh });
-	const targetIds = new Set((options.targetAppIds ?? []).filter(Boolean));
-	const apps = targetIds.size === 0 ? installed.apps : installed.apps.filter((app) => targetIds.has(app.id));
+	const targetIds = new Set((options.targetAppIds ?? []).filter(Boolean).map(codexAppIdentityKey));
+	const apps = targetIds.size === 0 ? installed.apps : installed.apps.filter((app) => targetIds.has(codexAppIdentityKey(app.id)));
 	if (apps.length === 0) return {
 		apps: [],
 		installedApps: []
@@ -271,23 +287,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
 	};
@@ -335,14 +335,6 @@ function isSensitiveErrorDataKey(key) {
 */
 const require = createRequire(import.meta.url);
 const CODEX_PLUGIN_VERSION = readPluginPackageVersion({ require });
-let catalogConnectionHomes = /* @__PURE__ */ new Map();
-function catalogConnectionHomeKey(fingerprint, agentDir) {
-	return `${agentDir ?? ""}\0${fingerprint}`;
-}
-/** Replaces the lifecycle-owned catalog connection snapshot used by supervised bindings. */
-function replaceCodexCatalogConnectionHomes(homes) {
-	catalogConnectionHomes = new Map(homes.map((home) => [catalogConnectionHomeKey(home.fingerprint, home.agentDir), home.codexHome]));
-}
 /** Builds the full app inventory cache key for Codex plugin/app discovery. */
 function buildCodexPluginAppCacheKey(params) {
 	return buildCodexAppInventoryCacheKey({
@@ -379,12 +371,8 @@ function buildCodexAppServerConnectionFingerprint(appServer, agentDir) {
 		cwd: appServer.start.cwd ?? null
 	});
 }
-/** Looks up a snapshotted catalog store without repeating filesystem discovery on a run. */
-function resolveCodexCatalogConnectionHome(fingerprint, agentDir) {
-	return catalogConnectionHomes.get(catalogConnectionHomeKey(fingerprint, 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;
@@ -403,7 +391,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;
 }
@@ -424,4 +412,4 @@ function fingerprintCodexPluginAppCacheCredentials(startOptions) {
 	return `sha256:${hash.digest("hex")}`;
 }
 //#endregion
-export { resolveCodexCatalogConnectionHome as a, serializeCodexAppInventoryError as c, replaceCodexCatalogConnectionHomes as i, buildCodexAppServerRuntimeFingerprint as n, CodexAppInventoryCache as o, buildCodexPluginAppCacheKey as r, defaultCodexAppInventoryCache as s, buildCodexAppServerConnectionFingerprint as t };
+export { defaultCodexAppInventoryCache as a, findCodexAppById as c, CodexAppInventoryCache as i, buildCodexAppServerRuntimeFingerprint as n, serializeCodexAppInventoryError as o, buildCodexPluginAppCacheKey as r, codexAppIdentityKey as s, buildCodexAppServerConnectionFingerprint as t };

package/dist/{plugin-approval-roundtrip-Bz3FT8W5.js → .setup/plugin-approval-roundtrip-C0MZzCuP.mjs}

@@ -1,4 +1,4 @@
-import { P as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-CscigXXL.js";
+import { it as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-DA4VR4Eb.mjs";
 import { isApprovalNotFoundError, toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
 //#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts

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

@@ -1,5 +1,6 @@
-import { S as resolveCodexPluginsPolicy } from "./protocol-5bh1G-H7.js";
-import "./config-oIORaQ5T.js";
+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 { embeddedAgentLog } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/config-contracts.ts
 const CODEX_PLUGINS_MARKETPLACE_NAME = "openai-curated";
@@ -109,12 +110,20 @@ async function readCodexPluginInventory(params) {
 			activationRequired: pluginPolicy.enabled && (unavailableByMarketplacePolicy || !summary.installed || !summary.enabled),
 			authRequired: apps.some((app) => app.needsAuth || !app.accessible),
 			appOwnership,
-			ownedAppIds,
+			ownedAppIds: Array.from(/* @__PURE__ */ new Set([...ownedAppIds, ...apps.map((app) => app.id)])).toSorted(),
 			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 } : {}
@@ -195,7 +204,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
@@ -237,9 +246,10 @@ function resolveOwnedApps(params) {
 		});
 		return [];
 	}
-	const appInfoById = new Map((params.appInventory?.snapshot?.apps ?? []).map((app) => [app.id, app]));
+	const appInfos = params.appInventory?.snapshot?.apps ?? [];
+	const installedApps = params.appInventory?.snapshot?.installedApps ?? [];
 	return detailApps.map((app) => {
-		const info = appInfoById.get(app.id);
+		const info = findCodexAppById(appInfos, app.id);
 		if (!info) return {
 			id: app.id,
 			name: app.name,
@@ -248,11 +258,11 @@ function resolveOwnedApps(params) {
 			needsAuth: true
 		};
 		return Object.assign({
-			id: app.id,
+			id: info.id,
 			name: app.name,
-			accessible: info.isAccessible,
-			enabled: info.isEnabled,
-			needsAuth: !info.isAccessible
+			accessible: true,
+			enabled: findCodexAppById(installedApps, info.id)?.enabled ?? false,
+			needsAuth: false
 		}, resolveOwnedAppApprovalOverrideKeys(info));
 	}).toSorted((left, right) => left.id.localeCompare(right.id));
 }

package/dist/{plugin-marketplace-discovery-P-Vndfqq.js → .setup/plugin-marketplace-discovery-CDOi8IFs.mjs}

@@ -9,6 +9,9 @@ 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. */
@@ -134,4 +137,4 @@ function boundedCatalogText(value) {
 	return sanitized.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 };