@openclaw/codex 2026.7.2-beta.5 → 2026.7.2-beta.7

package/dist/effective-mcp-catalog-Bbd98Inw.js

@@ -0,0 +1,114 @@
+import { d as retainSharedCodexAppServerClientByInstanceId } from "./shared-client-DTbvH-XV.js";
+import { d as sessionBindingIdentity } from "./session-binding-BXpo9ymA.js";
+import { assignMcpCatalogSafeServerNames } from "openclaw/plugin-sdk/agent-harness-runtime";
+//#region extensions/codex/src/app-server/effective-mcp-catalog.ts
+const MCP_STATUS_PAGE_SIZE = 100;
+const MCP_STATUS_MAX_PAGES = 100;
+function asRecord(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function readString(value) {
+	return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function catalogTool(params) {
+	const raw = asRecord(params.raw);
+	const description = readString(raw?.description);
+	return {
+		serverName: params.serverName,
+		safeServerName: params.safeServerName,
+		toolName: params.toolName,
+		...readString(raw?.title) ? { title: readString(raw?.title) } : {},
+		...description ? { description } : {},
+		inputSchema: asRecord(raw?.inputSchema) ?? { type: "object" },
+		fallbackDescription: description ?? params.toolName,
+		...params.deniedBySession ? { deniedBySession: true } : {}
+	};
+}
+/** Converts Codex's thread-scoped status response into OpenClaw's MCP catalog shape. */
+function buildCodexEffectiveMcpCatalog(statuses, toolOverrides) {
+	const orderedStatuses = [...new Map(statuses.map((status) => [status.name, status])).values()].toSorted((left, right) => left.name.localeCompare(right.name));
+	const safeNames = assignMcpCatalogSafeServerNames(orderedStatuses.map((status) => status.name));
+	const serverEntries = [];
+	const tools = [];
+	const sessionDeniedTools = [];
+	for (const status of orderedStatuses) {
+		const safeServerName = safeNames.get(status.name) ?? status.name;
+		const denialMap = toolOverrides?.mcpToolsDeny;
+		const deniedNames = new Set(denialMap && Object.hasOwn(denialMap, status.name) ? denialMap[status.name] : []);
+		const observedNames = /* @__PURE__ */ new Set();
+		for (const [toolName, raw] of Object.entries(status.tools).toSorted(([left], [right]) => left.localeCompare(right))) {
+			observedNames.add(toolName);
+			const deniedBySession = deniedNames.has(toolName) ? true : void 0;
+			const tool = catalogTool({
+				serverName: status.name,
+				safeServerName,
+				toolName,
+				raw,
+				...deniedBySession ? { deniedBySession } : {}
+			});
+			if (deniedBySession) sessionDeniedTools.push(tool);
+			else tools.push(tool);
+		}
+		for (const toolName of [...deniedNames].toSorted()) {
+			if (observedNames.has(toolName)) continue;
+			sessionDeniedTools.push(catalogTool({
+				serverName: status.name,
+				safeServerName,
+				toolName,
+				deniedBySession: true
+			}));
+		}
+		serverEntries.push([status.name, {
+			serverName: status.name,
+			safeServerName,
+			launchSummary: "Codex native MCP connection",
+			toolCount: observedNames.size + [...deniedNames].filter((name) => !observedNames.has(name)).length
+		}]);
+	}
+	return {
+		version: 1,
+		generatedAt: Date.now(),
+		servers: Object.fromEntries(serverEntries),
+		tools,
+		...sessionDeniedTools.length > 0 ? { sessionDeniedTools } : {}
+	};
+}
+async function listCodexMcpServerStatuses(client, threadId) {
+	const statuses = [];
+	const seenCursors = /* @__PURE__ */ new Set();
+	let cursor;
+	for (let page = 0; page < MCP_STATUS_MAX_PAGES; page += 1) {
+		const response = await client.request("mcpServerStatus/list", {
+			threadId,
+			detail: "toolsAndAuthOnly",
+			limit: MCP_STATUS_PAGE_SIZE,
+			...cursor ? { cursor } : {}
+		});
+		statuses.push(...response.data);
+		cursor = response.nextCursor;
+		if (!cursor) return statuses;
+		if (seenCursors.has(cursor)) throw new Error("Codex mcpServerStatus/list repeated its pagination cursor");
+		seenCursors.add(cursor);
+	}
+	throw new Error("Codex mcpServerStatus/list exceeded the bounded page limit");
+}
+/** Loads MCP inventory only from the already-bound Codex process and thread. */
+async function loadCodexEffectiveMcpCatalog(params, options) {
+	const binding = await options.bindingStore.read(sessionBindingIdentity({
+		agentId: params.agentId,
+		sessionId: params.sessionId,
+		sessionKey: params.sessionKey,
+		config: params.config
+	}));
+	if (!binding?.clientId) return;
+	const retained = retainSharedCodexAppServerClientByInstanceId(binding.clientId);
+	if (!retained) return;
+	try {
+		const allowedServerNames = new Set(params.mcpServerNames);
+		return buildCodexEffectiveMcpCatalog((await listCodexMcpServerStatuses(retained.client, binding.threadId)).filter((status) => allowedServerNames.has(status.name)), params.toolOverrides);
+	} finally {
+		retained.release();
+	}
+}
+//#endregion
+export { loadCodexEffectiveMcpCatalog };

package/dist/{event-projector-usage-tvgb1NCX.js → event-projector-usage-Xp4AlR2k.js}

@@ -1,5 +1,5 @@
-import { V as isJsonObject } from "./shared-client-BVKE40c-.js";
-import { it as readNonNegativeInteger, ot as readNumber } from "./thread-lifecycle-DRg_FdzC.js";
+import { W as isJsonObject } from "./shared-client-DTbvH-XV.js";
+import { at as readNonNegativeInteger, ct as readString, st as readNumber } from "./thread-lifecycle-DF53ogiA.js";
 import { normalizeUsage } from "openclaw/plugin-sdk/agent-harness-runtime";
 //#region extensions/codex/src/app-server/event-projector-usage.ts
 function readTokenCount(record, key) {
@@ -65,5 +65,22 @@ function normalizeCodexResponseTokenUsage(record) {
 		}
 	};
 }
+var CodexResponseCompletionProjection = class {
+	constructor() {
+		this.responseIds = /* @__PURE__ */ new Set();
+	}
+	get modelIterations() {
+		return this.responseIds.size;
+	}
+	clear() {
+		this.usage = void 0;
+	}
+	record(params) {
+		const responseId = readString(params, "responseId");
+		if (responseId) this.responseIds.add(responseId);
+		const usage = isJsonObject(params.usage) ? params.usage : void 0;
+		this.usage = usage ? normalizeCodexResponseTokenUsage(usage) : void 0;
+	}
+};
 //#endregion
-export { projectCodexThreadUsageUpdate as n, normalizeCodexResponseTokenUsage as t };
+export { normalizeCodexResponseTokenUsage as n, projectCodexThreadUsageUpdate as r, CodexResponseCompletionProjection as t };

package/dist/harness.js

@@ -35,7 +35,7 @@ function createCodexAppServerAgentHarness(options) {
 		...sessionCatalogControl && sessionRuntime ? { sessionFork: {
 			upstreamKinds: ["codex-app-server"],
 			fork: async (params) => {
-				const { forkCodexUpstreamSession } = await import("./upstream-session-fork-_Vrz4WJr.js");
+				const { forkCodexUpstreamSession } = await import("./upstream-session-fork-Dy4Xvuoj.js");
 				return await forkCodexUpstreamSession(params, {
 					bindingStore: options.bindingStore,
 					control: sessionCatalogControl,
@@ -50,13 +50,17 @@ function createCodexAppServerAgentHarness(options) {
 			return fingerprintCodexAppServerAuthBinding(params);
 		} },
 		runtimeArtifact: { validate: async (binding) => {
-			const { validateCodexAppServerRuntimeArtifact } = await import("./runtime-artifact-C2ITXdhM.js");
+			const { validateCodexAppServerRuntimeArtifact } = await import("./runtime-artifact-CmtG_t1L.js");
 			return validateCodexAppServerRuntimeArtifact(binding);
 		} },
 		fetchUsageSnapshot: async (ctx) => {
-			const { fetchCodexAppServerUsageSnapshot } = await import("./usage-UpVbdX5G.js");
+			const { fetchCodexAppServerUsageSnapshot } = await import("./usage-CQ6GhD5-.js");
 			return await fetchCodexAppServerUsageSnapshot(ctx, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
+		loadMcpToolCatalog: async (params) => {
+			const { loadCodexEffectiveMcpCatalog } = await import("./effective-mcp-catalog-Bbd98Inw.js");
+			return await loadCodexEffectiveMcpCatalog(params, { bindingStore: options.bindingStore });
+		},
 		supports: (ctx) => {
 			const provider = ctx.provider.trim().toLowerCase();
 			if (!providerIds.has(provider)) return {
@@ -95,7 +99,7 @@ function createCodexAppServerAgentHarness(options) {
 			};
 		},
 		runAttempt: async (params) => {
-			const { runCodexAppServerAttempt } = await import("./run-attempt-C5GTPJOE.js");
+			const { runCodexAppServerAttempt } = await import("./run-attempt-CY9WlDLc.js");
 			return runCodexAppServerAttempt(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
@@ -103,11 +107,11 @@ function createCodexAppServerAgentHarness(options) {
 			});
 		},
 		finalizeSettledTurn: async (params) => {
-			const { runCodexSettledTurnFinalization } = await import("./settled-turn-finalizer-CA_2QXIE.js");
+			const { runCodexSettledTurnFinalization } = await import("./settled-turn-finalizer-CXY2Z9dT.js");
 			return runCodexSettledTurnFinalization(params, { pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig });
 		},
 		runSideQuestion: async (params) => {
-			const { runCodexAppServerSideQuestion } = await import("./side-question-CO12sHxo.js");
+			const { runCodexAppServerSideQuestion } = await import("./side-question-_ulBk1AL.js");
 			return runCodexAppServerSideQuestion(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
@@ -115,14 +119,14 @@ function createCodexAppServerAgentHarness(options) {
 			});
 		},
 		compact: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-dEN49UH6.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-D_uvHurS.js");
 			return maybeCompactCodexAppServerSession(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig
 			});
 		},
 		compactAfterContextEngine: async (params) => {
-			const { maybeCompactCodexAppServerSession } = await import("./compact-dEN49UH6.js");
+			const { maybeCompactCodexAppServerSession } = await import("./compact-D_uvHurS.js");
 			return maybeCompactCodexAppServerSession(params, {
 				bindingStore: options.bindingStore,
 				pluginConfig: options?.resolvePluginConfig?.() ?? options?.pluginConfig,
@@ -131,7 +135,7 @@ function createCodexAppServerAgentHarness(options) {
 		},
 		reset: async (params) => {
 			if (params.sessionId) {
-				const { reclaimCurrentCodexSessionGeneration, sessionBindingIdentity } = await import("./session-binding-DlVQ-Pxs.js").then((n) => n.u);
+				const { reclaimCurrentCodexSessionGeneration, sessionBindingIdentity } = await import("./session-binding-BXpo9ymA.js").then((n) => n.f);
 				const identity = sessionBindingIdentity({
 					agentId: params.agentId,
 					sessionId: params.sessionId,

package/dist/index.js

@@ -1,24 +1,22 @@
 import { registerCodexCliMetadata } from "./cli-metadata.js";
 import { createCodexAppServerAgentHarness } from "./harness.js";
-import { N as resolveCodexAppServerAuthProfileIdForAgent, P as resolveCodexAppServerFallbackApiKeyCacheKey, R as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, V as isJsonObject, a as getLeasedSharedCodexAppServerClient, c as releaseCodexAppServerClientLease, j as resolveCodexAppServerAuthAccountCacheKey, l as releaseLeasedSharedCodexAppServerClient, m as withLeasedCodexAppServerClientStartSelectionRetry, r as clearSharedCodexAppServerClientIfCurrentAndWait } from "./shared-client-BVKE40c-.js";
-import { D as resolveOpenClawExecPolicyForCodexAppServer, T as readCodexPluginConfig, _ as assertCodexAppServerConnectionSecurity, b as canUseCodexModelBackedApprovalsReviewerForModel, d as codexAppServerStartOptionsKey, f as codexSandboxPolicyForTurn, g as resolveCodexSupervisionAppServerRuntimeOptions, k as CODEX_PLUGINS_MARKETPLACE_NAME, l as sessionBindingIdentity, n as assertCodexBindingMayBeReplaced, o as isCodexAppServerNativeAuthProfile, p as resolveCodexAppServerRuntimeOptions, s as normalizeCodexAppServerBindingModelProvider } from "./session-binding-DlVQ-Pxs.js";
+import { I as resolveCodexAppServerAuthProfileIdForAgent, L as resolveCodexAppServerFallbackApiKeyCacheKey, P as resolveCodexAppServerAuthAccountCacheKey, V as CODEX_INTERACTIVE_THREAD_SOURCE_KINDS, W as isJsonObject, a as getLeasedSharedCodexAppServerClient, c as releaseCodexAppServerClientLease, h as withLeasedCodexAppServerClientStartSelectionRetry, l as releaseLeasedSharedCodexAppServerClient, r as clearSharedCodexAppServerClientIfCurrentAndWait } from "./shared-client-DTbvH-XV.js";
+import { A as resolveOpenClawExecPolicyForCodexAppServer, C as canUseCodexModelBackedApprovalsReviewerForModel, M as CODEX_PLUGINS_MARKETPLACE_NAME, O as readCodexPluginConfig, b as assertCodexAppServerConnectionSecurity, d as sessionBindingIdentity, g as resolveCodexAppServerRuntimeOptions, m as codexSandboxPolicyForTurn, n as assertCodexBindingMayBeReplaced, o as isCodexAppServerNativeAuthProfile, p as codexAppServerStartOptionsKey, s as normalizeCodexAppServerBindingModelProvider, y as resolveCodexSupervisionAppServerRuntimeOptions } from "./session-binding-BXpo9ymA.js";
 import { n as CODEX_APP_SERVER_BINDING_NAMESPACE, t as CODEX_APP_SERVER_BINDING_MAX_ENTRIES } from "./session-binding-meta-B7aEMU7g.js";
-import { n as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, u as unsubscribeCodexThreadBestEffort } from "./attempt-client-cleanup-Ia52yRWc.js";
-import { J as pluginReadParams, _ as CODEX_NATIVE_PERSONALITY_NONE, c as resumeCodexAppServerThread, q as ensureCodexPluginActivation, y as resolveCodexAppServerRequestModelSelection } from "./thread-lifecycle-DRg_FdzC.js";
-import { i as assertCodexThreadStartResponse } from "./protocol-validators-Dm4eXZmt.js";
-import { i as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DSXX-rXO.js";
+import { J as isOpenAiCuratedMarketplace, Y as pluginReadParams, _t as unsubscribeCodexThreadBestEffort, b as resolveCodexAppServerRequestModelSelection, dt as CODEX_APP_SERVER_UNSUBSCRIBE_TIMEOUT_MS, l as resumeCodexAppServerThread, q as ensureCodexPluginActivation, v as CODEX_NATIVE_PERSONALITY_NONE } from "./thread-lifecycle-DF53ogiA.js";
+import { _ as assertCodexThreadStartResponse } from "./transcript-mirror-DzsdNCf5.js";
+import { i as defaultCodexAppInventoryCache, r as buildCodexPluginAppCacheKey } from "./plugin-app-cache-key-DztPafOA.js";
 import { t as isIncognitoSessionKey } from "./incognito-session-ET_ufDH-.js";
 import { buildCodexMediaUnderstandingProvider } from "./media-understanding-provider.js";
-import { n as CODEX_REALTIME_OFFER_PATH, t as configureCodexRealtimeBrowserSession } from "./realtime-voice-api-BPcA1uN9.js";
-import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-BHRSI6Cn.js";
-import { r as formatCodexDisplayText } from "./command-formatters-ico4ZFnk.js";
-import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BmDgseo_.js";
-import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-D1Wky__S.js";
-import { d as CODEX_NATIVE_EXECUTION_AUTH_ERROR, f as canMutateCodexHost, u as trackCodexConversationActiveTurn } from "./conversation-control-DE7d9DOj.js";
+import { n as describeControlFailure, t as CODEX_CONTROL_METHODS } from "./capabilities-BFDTVYr4.js";
+import { r as formatCodexDisplayText } from "./command-formatters-C336eRVS.js";
+import { t as resolveCodexAppServerForModelProvider } from "./app-server-policy-BSaO2JIT.js";
+import { n as resolveCodexNativeExecutionBlock, r as resolveCodexNativeSandboxBlock } from "./sandbox-guard-NuhpXmPB.js";
+import { d as CODEX_NATIVE_EXECUTION_AUTH_ERROR, f as canMutateCodexHost, u as trackCodexConversationActiveTurn } from "./conversation-control-xsIeXbo4.js";
 import { a as readCodexConversationBindingDataRecord, i as readCodexConversationBindingData, o as resolveCodexDefaultWorkspaceDir, r as createCodexConversationBindingData } from "./conversation-binding-data-BHRpYbX3.js";
-import { a as resolveCodexBindingAppServerConnection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId } from "./notification-correlation-Bj_Ak_jI.js";
-import { d as createCodexCliSessionNodeHostCommands, f as createCodexCliSessionNodeInvokePolicies, g as resumeCodexCliSessionOnNode, h as resolveCodexCliSessionForBindingOnNode, i as createCodexSessionCatalogNodeInvokePolicies, m as listCodexCliSessionsOnNode, n as createCodexSessionCatalogControl, o as codexControlRequest, r as createCodexSessionCatalogNodeHostCommands, t as codexSessionCatalogRuntime, u as assertCodexArchiveDescendantsUnowned } from "./session-catalog-CP2oCcEb.js";
-import { r as requestCodexAppServerJson } from "./request-CXpPennK.js";
+import { a as resolveCodexBindingAppServerConnection, n as readCodexNotificationThreadId, r as readCodexNotificationTurnId } from "./notification-correlation-CU6_AnOb.js";
+import { d as createCodexCliSessionNodeHostCommands, f as createCodexCliSessionNodeInvokePolicies, g as resumeCodexCliSessionOnNode, h as resolveCodexCliSessionForBindingOnNode, i as createCodexSessionCatalogNodeInvokePolicies, m as listCodexCliSessionsOnNode, n as createCodexSessionCatalogControl, o as codexControlRequest, r as createCodexSessionCatalogNodeHostCommands, t as codexSessionCatalogRuntime, u as assertCodexArchiveDescendantsUnowned } from "./session-catalog-DyOgR4WH.js";
+import { i as withCodexAppServerJsonClient, r as requestCodexAppServerJson } from "./request-qKh331yu.js";
 import { t as createCodexWebSearchProviderBase } from "./web-search-provider.shared-BrZmlqyR.js";
 import { mutateConfigFile } from "openclaw/plugin-sdk/config-mutation";
 import { normalizePluginsConfig, resolveEffectiveEnableState, resolveLivePluginConfigObject, resolvePluginConfigObject } from "openclaw/plugin-sdk/plugin-config-runtime";
@@ -49,7 +47,7 @@ import { createLazyRuntimeModule } from "openclaw/plugin-sdk/lazy-runtime";
 /** Defers schema compilation and auth loading until the first binding operation. */
 function createLazyCodexAppServerBindingStore(state) {
 	let resolved;
-	const store = () => resolved ??= import("./session-binding-DlVQ-Pxs.js").then((n) => n.u).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
+	const store = () => resolved ??= import("./session-binding-BXpo9ymA.js").then((n) => n.f).then(({ createCodexAppServerBindingStore }) => createCodexAppServerBindingStore(state));
 	return {
 		read: async (identity) => (await store()).read(identity),
 		hasOtherThreadOwner: async (threadId, currentIdentity) => (await store()).hasOtherThreadOwner(threadId, currentIdentity),
@@ -77,7 +75,7 @@ async function handleCodexCommand(ctx, options) {
 	}
 }
 async function loadDefaultCodexSubcommandHandler() {
-	const { handleCodexSubcommand } = await import("./command-handlers-CRmnwI2N.js");
+	const { handleCodexSubcommand } = await import("./command-handlers-DAHUSry9.js");
 	return handleCodexSubcommand;
 }
 //#endregion
@@ -1085,7 +1083,7 @@ function sanitizeAppsNeedingAuth(apps) {
 	return apps.map((app) => ({
 		id: app.id,
 		name: app.name,
-		needsAuth: app.needsAuth
+		needsAuth: true
 	}));
 }
 //#endregion
@@ -1525,23 +1523,35 @@ function personalAgentsSkillsDir() {
 	return path.join(resolveUserHomeDir(), ".agents", "skills");
 }
 async function discoverInstalledCuratedPlugins(codexHome, options = {}) {
-	const requestOptions = { startOptions: sourceCodexAppServerStartOptions(codexHome) };
+	const startOptions = sourceCodexAppServerStartOptions(codexHome);
 	try {
-		const marketplace = (await requestSourceCodexAppServerJson(requestOptions, {
-			method: "plugin/list",
-			requestParams: { cwds: [] }
-		})).marketplaces.find((entry) => entry.name === CODEX_PLUGINS_MARKETPLACE_NAME);
-		if (!marketplace) return {
-			plugins: [],
-			error: `Codex marketplace ${CODEX_PLUGINS_MARKETPLACE_NAME} was not found in source plugin inventory.`
-		};
-		const plugins = marketplace.plugins.filter((plugin) => plugin.installed).map((plugin) => buildInstalledPluginSource(plugin)).filter((plugin) => plugin !== void 0);
-		return { plugins: (options.evaluatePluginMigrationEligibility === true ? await withPluginMigrationEligibility({
-			plugins,
-			marketplace: marketplaceRef(marketplace),
-			requestOptions,
-			verifyPluginApps: options.verifyPluginApps === true
-		}) : plugins).toSorted((a, b) => (a.pluginName ?? a.name).localeCompare(b.pluginName ?? b.name)) };
+		return await withCodexAppServerJsonClient({
+			timeoutMs: 6e4,
+			startOptions,
+			authProfileId: null,
+			isolated: true
+		}, async (request) => {
+			const requestOptions = {
+				startOptions,
+				request
+			};
+			const response = await request({
+				method: "plugin/installed",
+				requestParams: { cwds: [] }
+			});
+			const curatedSyncRoot = path.join(codexHome, ".tmp", "plugins");
+			const curatedMarketplaceErrors = response.marketplaceLoadErrors.filter((error) => isPathInside(curatedSyncRoot, error.marketplacePath));
+			if (curatedMarketplaceErrors.length > 0) return {
+				plugins: [],
+				error: curatedMarketplaceErrors.map((error) => error.message).join("; ")
+			};
+			const installed = discoverInstalledCuratedPluginSources(response);
+			return { plugins: (options.evaluatePluginMigrationEligibility === true ? await withPluginMigrationEligibility({
+				plugins: installed,
+				requestOptions,
+				verifyPluginApps: options.verifyPluginApps === true
+			}) : installed.map(({ plugin }) => plugin)).toSorted((left, right) => (left.pluginName ?? left.name).localeCompare(right.pluginName ?? right.name)) };
+		});
 	} catch (error) {
 		return {
 			plugins: [],
@@ -1567,16 +1577,6 @@ function sourceCodexAppServerStartOptions(codexHome) {
 		}
 	};
 }
-async function requestSourceCodexAppServerJson(options, params) {
-	return await requestCodexAppServerJson({
-		method: params.method,
-		requestParams: params.requestParams,
-		timeoutMs: 6e4,
-		startOptions: options.startOptions,
-		authProfileId: null,
-		isolated: true
-	});
-}
 function buildInstalledPluginSource(plugin) {
 	const pluginName = pluginNameFromSummary(plugin);
 	if (!pluginName) return;
@@ -1590,6 +1590,27 @@ function buildInstalledPluginSource(plugin) {
 		enabled: plugin.enabled
 	};
 }
+function discoverInstalledCuratedPluginSources(response) {
+	const installedByName = /* @__PURE__ */ new Map();
+	for (const marketplace of response.marketplaces) {
+		if (!isOpenAiCuratedMarketplace(marketplace)) continue;
+		const remote = !marketplace.path;
+		for (const summary of marketplace.plugins) {
+			if (!summary.installed) continue;
+			const plugin = buildInstalledPluginSource(summary);
+			if (!plugin?.pluginName) continue;
+			const existing = installedByName.get(plugin.pluginName);
+			if (existing && (!remote || existing.remote)) continue;
+			installedByName.set(plugin.pluginName, {
+				plugin,
+				marketplace: marketplaceRef(marketplace),
+				...remote ? { readPluginName: summary.remotePluginId?.trim() || void 0 } : { readPluginName: plugin.pluginName },
+				remote
+			});
+		}
+	}
+	return Array.from(installedByName.values());
+}
 function marketplaceRef(marketplace) {
 	return {
 		name: CODEX_PLUGINS_MARKETPLACE_NAME,
@@ -1600,7 +1621,7 @@ function marketplaceRef(marketplace) {
 async function withPluginMigrationEligibility(params) {
 	const pending = [];
 	const evaluated = [];
-	for (const plugin of params.plugins) {
+	for (const { plugin, marketplace, readPluginName } of params.plugins) {
 		if (plugin.enabled !== true) {
 			evaluated.push({
 				...plugin,
@@ -1610,7 +1631,7 @@ async function withPluginMigrationEligibility(params) {
 			});
 			continue;
 		}
-		const detail = await readPluginDetail(params.requestOptions, params.marketplace, plugin);
+		const detail = await readPluginDetail(params.requestOptions, marketplace, plugin, readPluginName);
 		if (!detail.ok) {
 			evaluated.push({
 				...plugin,
@@ -1638,25 +1659,27 @@ async function withPluginMigrationEligibility(params) {
 	}
 	if (pending.length === 0) return evaluated;
 	let sourceAccount;
+	let sourceAccountError;
 	try {
 		sourceAccount = await readSourceCodexAccount(params.requestOptions);
+		if (sourceAccount === "missing") sourceAccountError = "Codex app-server did not report an authenticated source account.";
 	} catch (error) {
-		if (!params.verifyPluginApps) {
-			const message = error instanceof Error ? error.message : String(error);
-			for (const { plugin, apps } of pending) evaluated.push({
-				...plugin,
-				migratable: false,
-				migrationBlock: {
-					code: "codex_account_unavailable",
-					apps,
-					error: message
-				},
-				message: `Codex plugin "${plugin.pluginName ?? plugin.name}" owns apps, but the source Codex app-server account could not be read: ${message}`
-			});
-			return evaluated;
-		}
+		sourceAccountError = error instanceof Error ? error.message : String(error);
 	}
-	if (sourceAccount && sourceAccount !== "chatgpt") {
+	if (sourceAccountError && !params.verifyPluginApps) {
+		for (const { plugin, apps } of pending) evaluated.push({
+			...plugin,
+			migratable: false,
+			migrationBlock: {
+				code: "codex_account_unavailable",
+				apps,
+				error: sourceAccountError
+			},
+			message: `Codex plugin "${plugin.pluginName ?? plugin.name}" owns apps, but the source Codex app-server account could not be read: ${sourceAccountError}`
+		});
+		return evaluated;
+	}
+	if (sourceAccount === "non_chatgpt") {
 		for (const { plugin, apps } of pending) evaluated.push({
 			...plugin,
 			migratable: false,
@@ -1691,8 +1714,9 @@ async function withPluginMigrationEligibility(params) {
 	});
 	if (!snapshot) return evaluated;
 	const appInfoById = new Map(snapshot.apps.map((app) => [app.id, app]));
+	const installedAppsById = new Map(snapshot.installedApps.map((app) => [app.id, app]));
 	for (const { plugin, apps: declaredApps } of pending) {
-		const apps = declaredApps.map((app) => sourcePluginAppFactWithInventory(app, appInfoById.get(app.id))).toSorted((left, right) => left.id.localeCompare(right.id));
+		const apps = declaredApps.map((app) => sourcePluginAppFactWithInventory(app, appInfoById.get(app.id), installedAppsById.get(app.id))).toSorted((left, right) => left.id.localeCompare(right.id));
 		const blockCode = migrationBlockCodeForApps(apps);
 		if (!blockCode) {
 			evaluated.push({
@@ -1715,20 +1739,29 @@ async function withPluginMigrationEligibility(params) {
 	return evaluated;
 }
 async function readSourceCodexAccount(options) {
-	const response = await requestSourceCodexAppServerJson(options, {
+	const response = await options.request({
 		method: "account/read",
 		requestParams: { refreshToken: false }
 	});
 	if (!response.account || typeof response.account !== "object" || Array.isArray(response.account)) return "missing";
-	return response.account.type === "chatgpt" ? "chatgpt" : "non_chatgpt";
+	switch (response.account.type) {
+		case "chatgpt": return "chatgpt";
+		case "apiKey":
+		case "amazonBedrock": return "non_chatgpt";
+		default: return "missing";
+	}
 }
-async function readPluginDetail(options, marketplace, plugin) {
+async function readPluginDetail(options, marketplace, plugin, readPluginName) {
+	if (!readPluginName) return {
+		ok: false,
+		error: `Codex remote plugin "${plugin.pluginName ?? plugin.name}" has no readable remote plugin id.`
+	};
 	try {
 		return {
 			ok: true,
-			detail: (await requestSourceCodexAppServerJson(options, {
+			detail: (await options.request({
 				method: "plugin/read",
-				requestParams: pluginReadParams(marketplace, plugin.pluginName ?? plugin.name)
+				requestParams: pluginReadParams(marketplace, readPluginName)
 			})).plugin
 		};
 	} catch (error) {
@@ -1740,7 +1773,7 @@ async function readPluginDetail(options, marketplace, plugin) {
 }
 async function refreshSourceAppInventory(options) {
 	const key = buildCodexPluginAppCacheKey({ appServer: { start: options.startOptions } });
-	const request = async (method, requestParams) => await requestSourceCodexAppServerJson(options, {
+	const request = async (method, requestParams) => await options.request({
 		method,
 		requestParams
 	});
@@ -1753,16 +1786,29 @@ async function refreshSourceAppInventory(options) {
 function sourcePluginAppFact(app) {
 	return {
 		id: app.id,
-		name: app.name,
-		needsAuth: app.needsAuth
+		name: app.name
 	};
 }
-function sourcePluginAppFactWithInventory(app, info) {
-	if (!info) return app;
-	return {
+function sourcePluginAppFactWithInventory(app, info, installedApp) {
+	if (!installedApp) return app;
+	if (!info) return installedApp.enabled ? {
+		...app,
+		isAccessible: false,
+		isEnabled: true
+	} : {
+		...app,
+		isEnabled: false
+	};
+	if (!installedApp.enabled) return {
 		...app,
 		isAccessible: info.isAccessible,
-		isEnabled: info.isEnabled
+		isEnabled: false
+	};
+	return {
+		...app,
+		isAccessible: info.isAccessible && installedApp.callable,
+		isEnabled: info.isEnabled,
+		...!installedApp.callable ? { isCallable: false } : {}
 	};
 }
 function migrationBlockCodeForApps(apps) {
@@ -1771,7 +1817,7 @@ function migrationBlockCodeForApps(apps) {
 	if (apps.some((app) => app.isAccessible === void 0 || app.isEnabled === void 0)) return "app_missing";
 }
 function appInventoryBlockMessage(plugin, apps, code) {
-	const status = code === "app_inaccessible" ? "inaccessible" : code === "app_disabled" ? "disabled" : "missing";
+	const status = code === "app_inaccessible" ? apps.some((app) => app.isCallable === false) ? "not callable" : "inaccessible" : code === "app_disabled" ? "disabled" : "missing";
 	const blocking = apps.find((app) => code === "app_inaccessible" ? app.isAccessible === false : code === "app_disabled" ? app.isEnabled === false : app.isAccessible === void 0 || app.isEnabled === void 0) ?? apps[0];
 	const appLabel = blocking ? ` app "${blocking.name}"` : " an owned app";
 	return `Codex plugin "${plugin.pluginName ?? plugin.name}" owns${appLabel} but the source app inventory reports it is ${status}; authenticate or enable the app in Codex before migrating it to OpenClaw.`;
@@ -1783,11 +1829,16 @@ function codexSubscriptionRequiredMessage(plugin) {
 	return `Codex plugin "${plugin.pluginName ?? plugin.name}" owns apps, but ${codexPluginMigrationSubscriptionWarning()}`;
 }
 function pluginNameFromSummary(summary) {
-	const candidates = [summary.id, summary.name];
+	const candidates = [summary.name, summary.id];
 	for (const candidate of candidates) {
 		const trimmed = candidate.trim();
 		if (!trimmed) continue;
-		const normalized = ((trimmed.endsWith(`@openai-curated`) ? trimmed.slice(0, -`@${CODEX_PLUGINS_MARKETPLACE_NAME}`.length) : trimmed).split("/").at(-1)?.trim())?.toLowerCase().replaceAll(/\s+/gu, "-");
+		const marketplaceSuffix = [
+			`@${CODEX_PLUGINS_MARKETPLACE_NAME}-remote`,
+			`@openai-api-curated`,
+			`@${CODEX_PLUGINS_MARKETPLACE_NAME}`
+		].find((suffix) => trimmed.endsWith(suffix));
+		const normalized = ((marketplaceSuffix ? trimmed.slice(0, -marketplaceSuffix.length) : trimmed).split("/").at(-1)?.trim())?.toLowerCase().replaceAll(/\s+/gu, "-");
 		if (normalized) return normalized;
 	}
 }
@@ -3670,7 +3721,7 @@ function createCodexSupervisionTools(options) {
 }
 //#endregion
 //#region extensions/codex/src/web-search-provider.ts
-const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./web-search-provider.runtime-CaQMYDbp.js"));
+const loadCodexWebSearchRuntime = createLazyRuntimeModule(() => import("./web-search-provider.runtime-CCFhg2z5.js"));
 const CodexWebSearchSchema = {
 	type: "object",
 	properties: { query: {
@@ -3729,34 +3780,6 @@ var codex_default = definePluginEntry({
 			return livePluginConfig;
 		};
 		const resolveCurrentPluginConfig = () => resolvePluginConfig(resolveCurrentConfig);
-		if (api.registrationMode === "full") {
-			const realtimeBrowserSession = configureCodexRealtimeBrowserSession({
-				getConfig: resolveCurrentConfig,
-				getPluginConfig: resolveCurrentPluginConfig
-			});
-			api.registerHttpRoute({
-				path: CODEX_REALTIME_OFFER_PATH,
-				auth: "plugin",
-				match: "exact",
-				handler: realtimeBrowserSession.handler
-			});
-			api.registerService({
-				id: "codex-oauth-realtime-browser-session-warmup",
-				start: () => {
-					realtimeBrowserSession.warmup().catch((error) => {
-						api.logger.debug?.(`Codex OAuth realtime warmup unavailable: ${error instanceof Error ? error.message : String(error)}`);
-					});
-				}
-			});
-			api.lifecycle.registerRuntimeLifecycle({
-				id: "codex-oauth-realtime-browser-session",
-				description: "Release Codex OAuth realtime browser sessions when the plugin stops",
-				cleanup: async ({ reason }) => {
-					if (reason === "reset" || reason === "delete") return;
-					await realtimeBrowserSession.cleanup();
-				}
-			});
-		}
 		let bindingStateStore;
 		const openBindingStateStore = () => bindingStateStore ??= api.runtime.state.openSyncKeyedStore({
 			namespace: CODEX_APP_SERVER_BINDING_NAMESPACE,
@@ -3888,7 +3911,7 @@ var codex_default = definePluginEntry({
 			if (!previousSessionId || !sessionId || previousSessionId === sessionId) return;
 			const config = resolveCurrentConfig();
 			const sessionKey = ctx.sessionKey?.trim();
-			const { sessionBindingIdentity } = await import("./session-binding-DlVQ-Pxs.js").then((n) => n.u);
+			const { sessionBindingIdentity } = await import("./session-binding-BXpo9ymA.js").then((n) => n.f);
 			const identity = sessionBindingIdentity({
 				sessionId,
 				...sessionKey ? { sessionKey } : {},
@@ -3906,7 +3929,7 @@ var codex_default = definePluginEntry({
 			if (endedSessionKey && nextSessionKey && nextSessionKey !== endedSessionKey) return;
 			if (event.nextSessionId?.trim() === event.sessionId.trim()) return;
 			const config = resolveCurrentConfig();
-			const { sessionBindingIdentity } = await import("./session-binding-DlVQ-Pxs.js").then((n) => n.u);
+			const { sessionBindingIdentity } = await import("./session-binding-BXpo9ymA.js").then((n) => n.f);
 			await bindingStore.retireSessionGeneration(sessionBindingIdentity({
 				sessionId: event.sessionId,
 				...sessionKey ? { sessionKey } : {},

package/dist/media-understanding-provider.js

@@ -1,4 +1,4 @@
-import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-FEbUXoYT.js";
+import { t as runBoundedCodexAppServerTurn } from "./bounded-turn-D2ZAgZVz.js";
 import { validateJsonSchemaValue } from "openclaw/plugin-sdk/json-schema-runtime";
 //#region extensions/codex/media-understanding-provider.ts
 /**

package/dist/{models-BA01NEez.js → models-BBMKU4jA.js}

@@ -1,4 +1,4 @@
-import { c as readCodexModelListResponse } from "./protocol-validators-Dm4eXZmt.js";
+import { x as readCodexModelListResponse } from "./transcript-mirror-DzsdNCf5.js";
 import { uniqueStrings } from "openclaw/plugin-sdk/string-coerce-runtime";
 //#region extensions/codex/src/app-server/models.ts
 /**
@@ -40,7 +40,7 @@ async function listAllCodexAppServerModels(options = {}) {
 async function withCodexAppServerModelClient(options, run) {
 	const timeoutMs = options.timeoutMs ?? 2500;
 	const useSharedClient = options.sharedClient !== false;
-	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-BVKE40c-.js").then((n) => n.p);
+	const { createIsolatedCodexAppServerClient, getLeasedSharedCodexAppServerClient, releaseLeasedSharedCodexAppServerClient } = await import("./shared-client-DTbvH-XV.js").then((n) => n.m);
 	const client = useSharedClient ? await getLeasedSharedCodexAppServerClient({
 		startOptions: options.startOptions,
 		timeoutMs,