@openclaw/codex 2026.10.1-beta.2 → 2026.10.5-beta.1

package/dist/.setup/{plugin-approval-roundtrip-CuahdPLC.mjs → plugin-approval-roundtrip-BSV-51ig.mjs}

@@ -1,6 +1,6 @@
-import { pt as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-qhyYWbew.mjs";
-import { isApprovalNotFoundError, toErrorObject } from "openclaw/plugin-sdk/error-runtime";
+import { pt as resolveCodexGatewayTimeoutWithGraceMs } from "./shared-client-ByIwuAC-.mjs";
 import { truncateUtf16Safe } from "openclaw/plugin-sdk/text-utility-runtime";
+import { isApprovalNotFoundError, toErrorObject } from "openclaw/plugin-sdk/error-runtime";
 import { racePromiseWithAbortSignal } from "openclaw/plugin-sdk/time-runtime";
 //#region extensions/codex/src/app-server/plugin-approval-roundtrip.ts
 const DEFAULT_CODEX_APPROVAL_TIMEOUT_MS = 12e4;
@@ -64,7 +64,6 @@ async function waitForPluginApprovalDecision(params) {
 	});
 	return await racePromiseWithAbortSignal(waitPromise, params.signal, ({ reason }) => toErrorObject(reason, "Non-Error rejection"));
 }
-/** Converts a gateway exec approval decision into the app-server approval outcome enum. */
 function mapExecDecisionToOutcome(decision) {
 	switch (decision) {
 		case "allow-once": return "approved-once";
@@ -83,9 +82,8 @@ async function requestPluginApprovalOutcome(params) {
 		const approvalId = requestResult?.id;
 		if (!approvalId) return "unavailable";
 		const approvalResult = approvalRequestExplicitlyUnavailable(requestResult) ? void 0 : await waitForPluginApprovalDecision({
-			hostCapabilities: params.hostCapabilities,
-			approvalId,
-			signal: params.signal
+			...params,
+			approvalId
 		});
 		if (params.signal?.aborted) return "cancelled";
 		if (approvalResult?.terminalReason === "timeout") return "timed-out";

package/dist/.setup/{plugin-inventory-Bf0_piTw.mjs → plugin-inventory-CYgdo14P.mjs}

@@ -1,6 +1,5 @@
-import { f as resolveCodexPluginsPolicy } from "./config-parsing-BQq-CHTF.mjs";
-import { c as findCodexAppById } from "./plugin-app-cache-key-BW8rd98k.mjs";
-import "./config-0Gxk3_eq.mjs";
+import { c as findCodexAppById } from "./plugin-app-cache-key-Bg9DbDI6.mjs";
+import "./config-C1YVVLEA.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";
@@ -9,21 +8,17 @@ const CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME = "workspace-directory";
 //#region extensions/codex/src/app-server/plugin-inventory.ts
 const CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME = `${CODEX_PLUGINS_MARKETPLACE_NAME}-remote`;
 const CODEX_PLUGINS_API_MARKETPLACE_NAME = "openai-api-curated";
+/** Adapts plugin discovery requests to the two app inventory methods and optional thread. */
+function createCodexAppInventoryRequest(params) {
+	return async (method, requestParams) => await params.request(method, params.threadId ? {
+		...requestParams,
+		threadId: params.threadId
+	} : requestParams);
+}
 async function readCodexPluginInventory(params) {
-	const policy = params.policy ?? resolveCodexPluginsPolicy(params.pluginConfig);
-	if (!policy.enabled) return {
-		policy,
-		records: [],
-		diagnostics: [{
-			code: "disabled",
-			message: "Native Codex plugin support is disabled."
-		}]
-	};
+	const { policy } = params;
 	const appInventory = readCachedAppInventory(params);
-	const installedPlugins = await readInstalledCodexPluginMetadata({
-		...params,
-		policy
-	});
+	const installedPlugins = await readInstalledCodexPluginMetadata(params);
 	const pluginCatalogs = /* @__PURE__ */ new Map();
 	const diagnostics = [];
 	const records = [];
@@ -98,7 +93,6 @@ async function readCodexPluginInventory(params) {
 			summary,
 			...detail ? { detail } : {},
 			activationRequired: pluginPolicy.enabled && (unavailableByMarketplacePolicy || !summary.installed || !summary.enabled),
-			authRequired: apps.some((app) => app.needsAuth || !app.accessible),
 			appOwnership,
 			ownedAppIds: Array.from(/* @__PURE__ */ new Set([...ownedAppIds, ...apps.map((app) => app.id)])).toSorted(),
 			apps
@@ -150,19 +144,19 @@ async function listCodexPluginMetadata(params, marketplaceName, options = {}) {
 		...options.forceRefetch ? { forceRefetch: true } : {}
 	};
 	if (!params.metadataCache || !params.appCacheKey) return await params.request("plugin/list", requestParams);
-	return (await params.metadataCache.load({
+	return await params.metadataCache.load({
 		appCacheKey: params.appCacheKey,
 		queryKind: "curated-global",
 		requestParams,
 		catalogScope: pluginMetadataCatalogScope(marketplaceName),
 		request: async (method, listedParams) => await params.request(method, listedParams),
 		cacheable: (response) => response.marketplaces.some((marketplace) => marketplaceMatchesConfiguredName(marketplace, marketplaceName))
-	})).response;
+	});
 }
 async function readInstalledCodexPluginMetadata(params) {
 	const requestParams = params.configCwd ? { cwds: [params.configCwd] } : {};
 	if (!params.metadataCache || !params.appCacheKey) return await params.request("plugin/installed", requestParams);
-	return (await params.metadataCache.load({
+	return await params.metadataCache.load({
 		appCacheKey: params.appCacheKey,
 		queryKind: "installed",
 		requestParams,
@@ -171,12 +165,12 @@ async function readInstalledCodexPluginMetadata(params) {
 			if (!pluginPolicy.enabled && !params.policy.allowAllPlugins) return true;
 			return Boolean(findConfiguredMarketplacePlugin(response, pluginPolicy));
 		})
-	})).response;
+	});
 }
 function isSettledMissingPluginPolicy(params) {
 	const queryKind = params.pluginPolicy.marketplaceName === "workspace-directory" ? "installed" : "curated-global";
 	const requestParams = queryKind === "installed" ? params.configCwd ? { cwds: [params.configCwd] } : {} : buildPluginCatalogRequestParams(params, params.pluginPolicy.marketplaceName);
-	const listed = params.metadataCache.read(params.appCacheKey, queryKind, requestParams, queryKind === "curated-global" ? pluginMetadataCatalogScope(params.pluginPolicy.marketplaceName) : void 0)?.response;
+	const listed = params.metadataCache.read(params.appCacheKey, queryKind, requestParams, queryKind === "curated-global" ? pluginMetadataCatalogScope(params.pluginPolicy.marketplaceName) : void 0);
 	if (!listed) return false;
 	return !findConfiguredMarketplacePlugin(listed, params.pluginPolicy);
 }
@@ -192,32 +186,26 @@ function buildPluginCatalogRequestParams(params, marketplaceName) {
 }
 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.appInventoryCacheKey ?? params.appCacheKey,
-		request,
+		request: createCodexAppInventoryRequest(params),
 		nowMs: params.nowMs,
 		suppressRefresh: params.suppressAppInventoryRefresh
 	});
 }
 async function readPluginDetail(params, marketplace, pluginPolicy, summary, diagnostics) {
-	if (marketplace.remoteMarketplaceName && !summary.remotePluginId) {
+	const unavailable = (message) => {
 		diagnostics.push({
 			code: "plugin_detail_unavailable",
 			plugin: pluginPolicy,
-			message: `${pluginPolicy.pluginName} detail unavailable: Codex did not return a remote plugin id.`
+			message: `${pluginPolicy.pluginName} detail unavailable: ${message()}`
 		});
-		return;
-	}
+	};
+	if (marketplace.remoteMarketplaceName && !summary.remotePluginId) return unavailable(() => "Codex did not return a remote plugin id.");
 	try {
 		return (await params.request("plugin/read", pluginReadParams(marketplace, marketplace.remoteMarketplaceName && summary.remotePluginId ? summary.remotePluginId : pluginPolicy.pluginName))).plugin;
 	} catch (error) {
-		diagnostics.push({
-			code: "plugin_detail_unavailable",
-			plugin: pluginPolicy,
-			message: `${pluginPolicy.pluginName} detail unavailable: ${error instanceof Error ? error.message : String(error)}`
-		});
-		return;
+		return unavailable(() => error instanceof Error ? error.message : String(error));
 	}
 }
 function resolveOwnedApps(params) {
@@ -232,26 +220,23 @@ 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 {
 			id: app.id,
 			name: app.name,
-			accessible: false,
-			enabled: false,
-			needsAuth: true
+			accessible: false
 		};
-		return Object.assign(toCodexPluginOwnedAccountApp(info, findCodexAppById(installedApps, info.id)), { name: app.name });
+		const ownedApp = toCodexPluginOwnedAccountApp(info);
+		ownedApp.name = app.name;
+		return ownedApp;
 	}).toSorted((left, right) => left.id.localeCompare(right.id));
 }
-function toCodexPluginOwnedAccountApp(app, installedApp) {
+function toCodexPluginOwnedAccountApp(app) {
 	return {
 		id: app.id,
 		name: app.name,
 		accessible: true,
-		enabled: installedApp?.enabled ?? false,
-		needsAuth: false,
 		...resolveOwnedAppApprovalOverrideKeys(app)
 	};
 }
@@ -313,4 +298,4 @@ function isOpenAiCuratedMarketplaceName(marketplaceName) {
 	return marketplaceName === "openai-curated" || marketplaceName === CODEX_PLUGINS_REMOTE_MARKETPLACE_NAME || marketplaceName === CODEX_PLUGINS_API_MARKETPLACE_NAME;
 }
 //#endregion
-export { pluginReadParams as a, toCodexPluginOwnedAccountApp as c, marketplaceRef as i, CODEX_PLUGINS_MARKETPLACE_NAME as l, isOpenAiCuratedMarketplaceName as n, readCodexPluginInventory as o, listCodexPluginMetadata as r, resolveRecoverableCodexPluginConfigKeys as s, findCodexMarketplacePluginSummary as t, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as u };
+export { marketplaceRef as a, resolveRecoverableCodexPluginConfigKeys as c, CODEX_PLUGINS_WORKSPACE_MARKETPLACE_NAME as d, listCodexPluginMetadata as i, toCodexPluginOwnedAccountApp as l, findCodexMarketplacePluginSummary as n, pluginReadParams as o, isOpenAiCuratedMarketplaceName as r, readCodexPluginInventory as s, createCodexAppInventoryRequest as t, CODEX_PLUGINS_MARKETPLACE_NAME as u };

package/dist/.setup/{plugin-marketplace-discovery-SQPhSuic.mjs → plugin-marketplace-discovery-BblHM3DU.mjs}

@@ -1,4 +1,4 @@
-import { n as CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN } from "./service-tier-normalization-Cei89SW6.mjs";
+import { t as CODEX_PLUGIN_MARKETPLACE_NAME_PATTERN } from "./config-contracts.shared-D85SGEuq.mjs";
 import { asOptionalRecord } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/plugin-marketplace-discovery.ts
 /** Read-only discovery of Codex-owned local, curated, and remote plugin marketplaces. */
@@ -88,16 +88,13 @@ async function discoverCodexMarketplacePlugins(params) {
 				warnings.push(`Multiple discovered plugins share ${id}; installation requires a unique identity.`);
 				continue;
 			}
-			if (!previous) discovered.set(id, next);
-			else {
-				const preferred = !previous.installed && next.installed || !previous.enabled && next.installed && next.enabled ? next : previous;
-				discovered.set(id, {
-					...preferred,
-					available: previous.available && next.available,
-					...preferred.remotePluginId ? { mustShowInstallationInterstitial: previous.mustShowInstallationInterstitial === true || next.mustShowInstallationInterstitial === true ? true : previous.mustShowInstallationInterstitial === false && next.mustShowInstallationInterstitial === false ? false : null } : {},
-					...previous.installPolicy === "NOT_AVAILABLE" || next.installPolicy === "NOT_AVAILABLE" ? { installPolicy: "NOT_AVAILABLE" } : {}
-				});
+			const preferred = !previous || !previous.installed && next.installed || !previous.enabled && next.installed && next.enabled ? next : previous;
+			if (previous) {
+				preferred.available = previous.available && next.available;
+				if (preferred.remotePluginId) preferred.mustShowInstallationInterstitial = previous.mustShowInstallationInterstitial === true || next.mustShowInstallationInterstitial === true ? true : previous.mustShowInstallationInterstitial === false && next.mustShowInstallationInterstitial === false ? false : null;
+				if (previous.installPolicy === "NOT_AVAILABLE" || next.installPolicy === "NOT_AVAILABLE") preferred.installPolicy = "NOT_AVAILABLE";
 			}
+			discovered.set(id, preferred);
 		}
 	}
 	return {

package/dist/.setup/{plugin-metadata-cache-DWnB7VMj.mjs → plugin-metadata-cache-Bi8TAPwX.mjs}

@@ -16,7 +16,7 @@ var CodexPluginMetadataCache = class {
 			this.entries.delete(entryKey);
 			return;
 		}
-		return entry.snapshot;
+		return entry.response;
 	}
 	/** Returns a fresh snapshot or coalesces one catalog or installed-plugin request. */
 	async load(params) {
@@ -35,16 +35,12 @@ var CodexPluginMetadataCache = class {
 		const promise = (async () => {
 			const method = params.queryKind === "installed" ? "plugin/installed" : "plugin/list";
 			const response = await params.request(method, params.requestParams);
-			const snapshot = {
-				appCacheKey: params.appCacheKey,
-				queryKind: params.queryKind,
-				response
-			};
 			if (generation === (this.generations.get(params.appCacheKey) ?? 0) && clearGeneration === this.clearGeneration && response.marketplaceLoadErrors.length === 0 && (params.cacheable?.(response) ?? true)) this.entries.set(entryKey, {
-				snapshot,
+				appCacheKey: params.appCacheKey,
+				response,
 				expiresAtMs: this.nowMs() + CODEX_PLUGIN_METADATA_CACHE_TTL_MS
 			});
-			return snapshot;
+			return response;
 		})();
 		this.inFlight.set(entryKey, {
 			appCacheKey: params.appCacheKey,
@@ -58,8 +54,7 @@ var CodexPluginMetadataCache = class {
 	}
 	invalidate(appCacheKey) {
 		this.generations.set(appCacheKey, (this.generations.get(appCacheKey) ?? 0) + 1);
-		for (const [entryKey, entry] of this.entries) if (entry.snapshot.appCacheKey === appCacheKey) this.entries.delete(entryKey);
-		for (const [entryKey, pending] of this.inFlight) if (pending.appCacheKey === appCacheKey) this.inFlight.delete(entryKey);
+		for (const cache of [this.entries, this.inFlight]) for (const [entryKey, entry] of cache) if (entry.appCacheKey === appCacheKey) cache.delete(entryKey);
 	}
 	/** Clears snapshots and prevents late in-flight loads from repopulating them. */
 	clear() {