@openclaw/codex 2026.7.2-beta.5 → 2026.8.1-beta.2

package/dist/{computer-use-BjGylO-E.js → plugin-metadata-cache-CNJPj4_b.js}

@@ -1,9 +1,91 @@
-import { C as isCodexAppServerIndeterminateTransportError, H as resolveFirstExistingMacOSDesktopCodexBundledMarketplacePath, S as isCodexAppServerIndeterminateRequestCancellationError, a as getLeasedSharedCodexAppServerClient, g as acquireCodexNativeConfigFence, l as releaseLeasedSharedCodexAppServerClient, u as resolveCodexNativeConfigFenceKey, x as isCodexAppServerConnectionClosedError } from "./shared-client-BVKE40c-.js";
-import { h as resolveCodexComputerUseConfig, p as resolveCodexAppServerRuntimeOptions } from "./session-binding-DlVQ-Pxs.js";
-import { n as describeControlFailure } from "./capabilities-BHRSI6Cn.js";
-import { r as requestCodexAppServerJson } from "./request-CXpPennK.js";
+import { g as resolveCodexAppServerRuntimeOptions, v as resolveCodexComputerUseConfig } from "./session-binding-DPxIvMgE.js";
+import { M as isCodexAppServerConnectionClosedError, N as isCodexAppServerIndeterminateRequestCancellationError, P as isCodexAppServerIndeterminateTransportError, a as getLeasedSharedCodexAppServerClient, l as releaseLeasedSharedCodexAppServerClient, lt as resolveFirstExistingMacOSDesktopCodexBundledMarketplacePath, u as resolveCodexNativeConfigFenceKey, v as acquireCodexNativeConfigFence } from "./shared-client-kIBbGjk4.js";
+import { n as describeControlFailure } from "./capabilities-CybGI1oz.js";
+import { r as requestCodexAppServerJson } from "./request-BRl5_UfX.js";
 import { existsSync } from "node:fs";
 import { runExec } from "openclaw/plugin-sdk/process-runtime";
+//#region extensions/codex/src/app-server/computer-use-process-repair.ts
+const COMPUTER_USE_PROCESS_LIST_TIMEOUT_MS = 2e3;
+const COMPUTER_USE_PROCESS_LIST_MAX_BUFFER_BYTES = 5 * 1024 * 1024;
+function scopedRepairUnavailableStatus() {
+	return {
+		attempted: false,
+		killedPids: [],
+		warnings: ["Computer Use auto-repair skipped because no scoped Codex app-server process was available."],
+		message: "Computer Use stale child repair requires a scoped local app-server PID."
+	};
+}
+async function killStaleComputerUseMcpChildren(options = {}) {
+	if (process.platform !== "darwin") return {
+		attempted: true,
+		killedPids: [],
+		warnings: [`Computer Use stale child repair is currently macOS-only, not ${process.platform}.`],
+		message: "Computer Use stale child repair skipped on this platform."
+	};
+	if (!options.ancestorPid || !Number.isSafeInteger(options.ancestorPid) || options.ancestorPid <= 0) return scopedRepairUnavailableStatus();
+	let stdout;
+	try {
+		stdout = (await runExec("/bin/ps", ["-axo", "pid=,ppid=,command="], {
+			logOutput: false,
+			maxBuffer: COMPUTER_USE_PROCESS_LIST_MAX_BUFFER_BYTES,
+			timeoutMs: COMPUTER_USE_PROCESS_LIST_TIMEOUT_MS
+		})).stdout;
+	} catch (error) {
+		return {
+			attempted: true,
+			killedPids: [],
+			warnings: [`Could not list processes for Computer Use repair: ${describeControlFailure(error)}`],
+			message: "Computer Use stale child repair could not inspect running processes."
+		};
+	}
+	const killedPids = [];
+	const warnings = [];
+	const processInfos = parsePsOutput(stdout);
+	for (const processInfo of processInfos) {
+		if (!isStaleComputerUseMcpChild(processInfo.command)) continue;
+		if (!isDescendantOfPid(processInfo.pid, options.ancestorPid, processInfos)) continue;
+		try {
+			process.kill(processInfo.pid, "SIGTERM");
+			killedPids.push(processInfo.pid);
+		} catch (error) {
+			warnings.push(`Could not terminate stale Computer Use MCP child pid ${processInfo.pid}: ${describeControlFailure(error)}`);
+		}
+	}
+	return {
+		attempted: true,
+		killedPids,
+		warnings,
+		message: killedPids.length === 0 ? "No stale Computer Use MCP children were found under the scoped Codex app-server process." : `Terminated ${killedPids.length} stale Computer Use MCP child process${killedPids.length === 1 ? "" : "es"} under the scoped Codex app-server process.`
+	};
+}
+function parsePsOutput(stdout) {
+	return stdout.split(/\r?\n/u).flatMap((line) => {
+		const match = /^\s*(\d+)\s+(\d+)\s+(.+)$/u.exec(line);
+		if (!match) return [];
+		return [{
+			pid: Number(match[1]),
+			ppid: Number(match[2]),
+			command: match[3] ?? ""
+		}];
+	}).filter((processInfo) => Number.isSafeInteger(processInfo.pid) && processInfo.pid > 0 && Number.isSafeInteger(processInfo.ppid) && processInfo.ppid >= 0);
+}
+function isStaleComputerUseMcpChild(command) {
+	return command.includes("SkyComputerUseClient") && /(?:^|\s)mcp(?:\s|$)/u.test(command);
+}
+function isDescendantOfPid(pid, ancestorPid, processInfos) {
+	const parents = new Map(processInfos.map((processInfo) => [processInfo.pid, processInfo.ppid]));
+	const seen = /* @__PURE__ */ new Set();
+	let current = pid;
+	while (!seen.has(current)) {
+		seen.add(current);
+		const parent = parents.get(current);
+		if (!parent || parent <= 0) return false;
+		if (parent === ancestorPid) return true;
+		current = parent;
+	}
+	return false;
+}
+//#endregion
 //#region extensions/codex/src/app-server/computer-use.ts
 /**
 * Computer Use plugin/MCP readiness checks and optional install flow for Codex
@@ -20,6 +102,8 @@ const CURATED_MARKETPLACE_POLL_INTERVAL_MS = 2e3;
 const COMPUTER_USE_MARKETPLACE_NAME_PRIORITY = [
 	"openai-bundled",
 	"openai-curated",
+	"openai-api-curated",
+	"openai-curated-remote",
 	"local"
 ];
 const COMPUTER_USE_LIVE_TEST_RETRY_COUNT = 1;
@@ -179,18 +263,8 @@ async function ensureComputerUsePlugin(params) {
 				config: params.config,
 				plugin,
 				tools: [],
-				reason: pluginSetupReason(plugin, params.marketplace),
-				message: pluginSetupMessage(params.config, plugin, params.marketplace)
-			})
-		};
-		if (params.marketplace.kind === "remote") return {
-			ok: false,
-			status: statusFromPlugin({
-				config: params.config,
-				plugin,
-				tools: [],
-				reason: "remote_install_unsupported",
-				message: remoteInstallUnsupportedMessage(plugin, params.marketplace)
+				reason: pluginSetupReason(plugin),
+				message: pluginSetupMessage(params.config, plugin)
 			})
 		};
 		await params.request("plugin/install", pluginRequestParams(params.marketplace, params.config.pluginName));
@@ -203,8 +277,8 @@ async function ensureComputerUsePlugin(params) {
 			config: params.config,
 			plugin,
 			tools: [],
-			reason: pluginSetupReason(plugin, params.marketplace),
-			message: pluginSetupMessage(params.config, plugin, params.marketplace)
+			reason: pluginSetupReason(plugin),
+			message: pluginSetupMessage(params.config, plugin)
 		})
 	};
 	return {
@@ -326,14 +400,6 @@ async function runCodexComputerUseLiveTest(params) {
 async function cleanupComputerUseProbeThread(request, threadId, config) {
 	await Promise.allSettled([request("thread/unsubscribe", { threadId }, { timeoutMs: config.liveTestTimeoutMs }), request("thread/archive", { threadId }, { timeoutMs: config.liveTestTimeoutMs })]);
 }
-function scopedRepairUnavailableStatus() {
-	return {
-		attempted: false,
-		killedPids: [],
-		warnings: ["Computer Use auto-repair skipped because no scoped Codex app-server process was available."],
-		message: "Computer Use stale child repair requires a scoped local app-server PID."
-	};
-}
 async function resolveMarketplaceRef(params) {
 	let preferredMarketplaceName = params.config.marketplaceName;
 	if (params.config.marketplaceSource && params.allowAdd) {
@@ -390,17 +456,22 @@ function resolveBundledComputerUseMarketplacePath(params) {
 	return resolveFirstExistingMacOSDesktopCodexBundledMarketplacePath({ candidates: params.defaultBundledMarketplacePathCandidates });
 }
 function findComputerUseMarketplaces(listed, pluginName) {
-	return listed.marketplaces.filter((marketplace) => marketplace.plugins.some((plugin) => plugin.name === pluginName || plugin.id === pluginName || plugin.id === `${pluginName}@${marketplace.name}`)).map((marketplace) => {
-		if (marketplace.path) return {
+	return listed.marketplaces.flatMap((marketplace) => {
+		const plugin = marketplace.plugins.find((candidate) => candidate.name === pluginName || candidate.id === pluginName || candidate.id === `${pluginName}@${marketplace.name}`);
+		if (!plugin) return [];
+		if (marketplace.path) return [{
 			kind: "local",
 			name: marketplace.name,
 			path: marketplace.path
-		};
-		return {
+		}];
+		const remotePluginId = plugin.remotePluginId?.trim();
+		if (!remotePluginId) return [];
+		return [{
 			kind: "remote",
 			name: marketplace.name,
-			remoteMarketplaceName: marketplace.name
-		};
+			remoteMarketplaceName: marketplace.name,
+			remotePluginId
+		}];
 	});
 }
 function chooseKnownComputerUseMarketplace(candidates) {
@@ -452,25 +523,21 @@ async function reloadMcpServers(request) {
 	await request("config/mcpServer/reload", void 0);
 }
 function pluginRequestParams(marketplace, pluginName) {
-	return {
-		...marketplace.kind === "local" ? { marketplacePath: marketplace.path } : {},
-		...marketplace.kind === "remote" ? { remoteMarketplaceName: marketplace.remoteMarketplaceName } : {},
+	return marketplace.kind === "local" ? {
+		marketplacePath: marketplace.path,
 		pluginName
+	} : {
+		remoteMarketplaceName: marketplace.remoteMarketplaceName,
+		pluginName: marketplace.remotePluginId
 	};
 }
-function pluginSetupReason(plugin, marketplace) {
-	if (marketplace.kind === "remote") return "remote_install_unsupported";
+function pluginSetupReason(plugin) {
 	return plugin.summary.installed ? "plugin_disabled" : "plugin_not_installed";
 }
-function pluginSetupMessage(config, plugin, marketplace) {
-	if (marketplace.kind === "remote") return remoteInstallUnsupportedMessage(plugin, marketplace);
+function pluginSetupMessage(config, plugin) {
 	if (!plugin.summary.installed) return "Computer Use is available but not installed. Run /codex computer-use install or enable computerUse.autoInstall.";
 	return `Computer Use is installed, but the ${config.pluginName} plugin is disabled. Run /codex computer-use install or enable computerUse.autoInstall to re-enable it.`;
 }
-function remoteInstallUnsupportedMessage(plugin, marketplace) {
-	const marketplaceName = marketplace.name ?? plugin.marketplaceName;
-	return `Computer Use is ${plugin.summary.installed ? "installed but disabled" : "available"} in remote Codex marketplace ${marketplaceName}, but Codex app-server does not support remote plugin install yet. Configure computerUse.marketplaceSource or computerUse.marketplacePath for a local marketplace, then run /codex computer-use install.`;
-}
 function statusFromPlugin(params) {
 	return {
 		enabled: true,
@@ -592,75 +659,6 @@ function pluginWarnings(plugin) {
 	if (source && typeof source === "object" && "type" in source && source.type === "remote") warnings.push("Computer Use plugin is resolved from a remote marketplace; live local bundles are preferred.");
 	return warnings;
 }
-async function killStaleComputerUseMcpChildren(options = {}) {
-	if (process.platform !== "darwin") return {
-		attempted: true,
-		killedPids: [],
-		warnings: [`Computer Use stale child repair is currently macOS-only, not ${process.platform}.`],
-		message: "Computer Use stale child repair skipped on this platform."
-	};
-	if (!options.ancestorPid || !Number.isSafeInteger(options.ancestorPid) || options.ancestorPid <= 0) return scopedRepairUnavailableStatus();
-	let stdout;
-	try {
-		stdout = (await runExec("/bin/ps", ["-axo", "pid=,ppid=,command="], {
-			logOutput: false,
-			maxBuffer: 5 * 1024 * 1024
-		})).stdout;
-	} catch (error) {
-		return {
-			attempted: true,
-			killedPids: [],
-			warnings: [`Could not list processes for Computer Use repair: ${describeControlFailure(error)}`],
-			message: "Computer Use stale child repair could not inspect running processes."
-		};
-	}
-	const killedPids = [];
-	const warnings = [];
-	const processInfos = parsePsOutput(stdout);
-	for (const processInfo of processInfos) {
-		if (!isStaleComputerUseMcpChild(processInfo.command)) continue;
-		if (!isDescendantOfPid(processInfo.pid, options.ancestorPid, processInfos)) continue;
-		try {
-			process.kill(processInfo.pid, "SIGTERM");
-			killedPids.push(processInfo.pid);
-		} catch (error) {
-			warnings.push(`Could not terminate stale Computer Use MCP child pid ${processInfo.pid}: ${describeControlFailure(error)}`);
-		}
-	}
-	return {
-		attempted: true,
-		killedPids,
-		warnings,
-		message: killedPids.length === 0 ? "No stale Computer Use MCP children were found under the scoped Codex app-server process." : `Terminated ${killedPids.length} stale Computer Use MCP child process${killedPids.length === 1 ? "" : "es"} under the scoped Codex app-server process.`
-	};
-}
-function parsePsOutput(stdout) {
-	return stdout.split(/\r?\n/u).flatMap((line) => {
-		const match = /^\s*(\d+)\s+(\d+)\s+(.+)$/u.exec(line);
-		if (!match) return [];
-		return [{
-			pid: Number(match[1]),
-			ppid: Number(match[2]),
-			command: match[3] ?? ""
-		}];
-	}).filter((processInfo) => Number.isSafeInteger(processInfo.pid) && processInfo.pid > 0 && Number.isSafeInteger(processInfo.ppid) && processInfo.ppid >= 0);
-}
-function isStaleComputerUseMcpChild(command) {
-	return command.includes("SkyComputerUseClient") && /(?:^|\s)mcp(?:\s|$)/u.test(command);
-}
-function isDescendantOfPid(pid, ancestorPid, processInfos) {
-	const parents = new Map(processInfos.map((processInfo) => [processInfo.pid, processInfo.ppid]));
-	const seen = /* @__PURE__ */ new Set();
-	let current = pid;
-	while (!seen.has(current)) {
-		seen.add(current);
-		const parent = parents.get(current);
-		if (!parent || parent <= 0) return false;
-		if (parent === ancestorPid) return true;
-		current = parent;
-	}
-	return false;
-}
 function createComputerUseRequest(params) {
 	if (params.request) return params.request;
 	if (params.client) return async (method, requestParams, options) => await params.client.request(method, requestParams, {
@@ -692,4 +690,104 @@ function resolveComputerUseConfig(params) {
 	});
 }
 //#endregion
-export { runCodexComputerUseLiveTest as a, readCodexComputerUseStatus as i, installCodexComputerUse as n, killStaleComputerUseMcpChildren as r, ensureCodexComputerUse as t };
+//#region extensions/codex/src/app-server/plugin-metadata-cache.ts
+const CODEX_PLUGIN_METADATA_CACHE_TTL_MS = 3600 * 1e3;
+/** Process-local plugin metadata cache with coalesced loads per query. */
+var CodexPluginMetadataCache = class {
+	constructor(nowMs = Date.now) {
+		this.nowMs = nowMs;
+		this.entries = /* @__PURE__ */ new Map();
+		this.inFlight = /* @__PURE__ */ new Map();
+		this.generations = /* @__PURE__ */ new Map();
+		this.clearGeneration = 0;
+	}
+	/** Returns a fresh cached snapshot without issuing a request. */
+	read(appCacheKey, queryKind, requestParams, catalogScope) {
+		const entryKey = buildMetadataCacheEntryKey(appCacheKey, queryKind, requestParams, catalogScope);
+		const entry = this.entries.get(entryKey);
+		if (!entry) return;
+		if (entry.expiresAtMs <= this.nowMs()) {
+			this.entries.delete(entryKey);
+			return;
+		}
+		return entry.snapshot;
+	}
+	/** Returns a fresh snapshot or coalesces one catalog or installed-plugin request. */
+	async load(params) {
+		const entryKey = buildMetadataCacheEntryKey(params.appCacheKey, params.queryKind, params.requestParams, params.catalogScope);
+		const cached = this.read(params.appCacheKey, params.queryKind, params.requestParams, params.catalogScope);
+		if (cached) return cached;
+		const pending = this.inFlight.get(entryKey);
+		if (pending) try {
+			return await pending.promise;
+		} catch {
+			if (this.inFlight.get(entryKey) === pending) this.inFlight.delete(entryKey);
+			return await this.load(params);
+		}
+		const generation = this.generations.get(params.appCacheKey) ?? 0;
+		const clearGeneration = this.clearGeneration;
+		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 && !hasMarketplaceLoadErrors(response) && (params.cacheable?.(response) ?? true)) this.entries.set(entryKey, {
+				snapshot,
+				expiresAtMs: this.nowMs() + CODEX_PLUGIN_METADATA_CACHE_TTL_MS
+			});
+			return snapshot;
+		})();
+		this.inFlight.set(entryKey, {
+			appCacheKey: params.appCacheKey,
+			promise
+		});
+		try {
+			return await promise;
+		} finally {
+			if (this.inFlight.get(entryKey)?.promise === promise) this.inFlight.delete(entryKey);
+		}
+	}
+	/** Invalidates all plugin metadata queries for one app-server runtime. */
+	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);
+	}
+	/** Clears snapshots and prevents late in-flight loads from repopulating them. */
+	clear() {
+		this.clearGeneration += 1;
+		this.generations.clear();
+		this.entries.clear();
+		this.inFlight.clear();
+	}
+};
+/** Shared plugin metadata cache used by Codex app-server runtime paths. */
+const defaultCodexPluginMetadataCache = new CodexPluginMetadataCache();
+function hasMarketplaceLoadErrors(response) {
+	return response.marketplaceLoadErrors.length > 0;
+}
+function buildMetadataCacheEntryKey(appCacheKey, queryKind, requestParams, catalogScope) {
+	if (queryKind !== "installed") {
+		const listParams = requestParams;
+		const entry = [
+			appCacheKey,
+			queryKind,
+			listParams?.cwds ?? [],
+			Array.from(new Set(listParams?.marketplaceKinds ?? [])).toSorted(),
+			...catalogScope ? [catalogScope] : []
+		];
+		return JSON.stringify(entry);
+	}
+	const installedParams = requestParams;
+	return JSON.stringify([
+		appCacheKey,
+		queryKind,
+		installedParams?.cwds ?? [],
+		Array.from(new Set(installedParams?.installSuggestionPluginNames ?? [])).toSorted()
+	]);
+}
+//#endregion
+export { runCodexComputerUseLiveTest as a, readCodexComputerUseStatus as i, ensureCodexComputerUse as n, killStaleComputerUseMcpChildren as o, installCodexComputerUse as r, defaultCodexPluginMetadataCache as t };