@xopcai/xopc 0.0.396 → 0.0.398

package/dist/src/automations/service/action-executor.js

@@ -1,9 +1,9 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { normalizeAgentId } from "../../agent-catalog/id.js";
-import { init_agent_scope } from "../../agent/agent-scope.js";
 import { init_session_key, resolveConversationId } from "../../routing/session-key.js";
 import { init_model_usage, withModelUsageOrigin } from "../../providers/model-usage.js";
+import { normalizeAgentId } from "../../agent-catalog/id.js";
+import { init_agent_scope } from "../../agent/agent-scope.js";
 import { resolveAutomationTimeoutSeconds } from "../domain/defaults.js";
 //#region src/automations/service/action-executor.ts
 init_model_usage();

package/dist/src/bootstrap/application-state.js

@@ -1,9 +1,9 @@
 import { requireXopcDatabase } from "../storage/sqlite/connection.js";
 import { init_sqlite } from "../storage/sqlite/index.js";
 import { AgentCatalogService } from "../agent-catalog/service.js";
+import { ensureStarterAgentsInitialized } from "../agent/starter-agents.js";
 import { cutoverLegacyAgentConfig } from "../agent-catalog/migrations/legacy-config-cutover.js";
 import "../agent-catalog/index.js";
-import { ensureStarterAgentsInitialized } from "../agent/starter-agents.js";
 import { migrateIdentityMarkdownToCatalog } from "../agent-catalog/migrations/identity-markdown-cutover.js";
 import { migrateCloudPublicModelsSync } from "../migrations/cloud-public-models.js";
 import { runBootstrapMigrationsSync } from "../migrations/runner.js";

package/dist/src/capabilities/runtime/dispatcher.js

@@ -1,7 +1,7 @@
 import { SqliteCommitEffectError, init_transaction } from "../../storage/sqlite/transaction.js";
-import { OperationConflictError, executeAtomicOperation } from "./atomic-operations.js";
 import { CapabilityError } from "./errors.js";
 import { executeExternalOperation } from "./external-operations.js";
+import { OperationConflictError, executeAtomicOperation } from "./atomic-operations.js";
 import { createHash } from "node:crypto";
 import { z } from "zod";
 //#region src/capabilities/runtime/dispatcher.ts

package/dist/src/capabilities/runtime/product.js

@@ -1,6 +1,5 @@
 import { CapabilityError } from "./errors.js";
 import { CapabilityDispatcher } from "./dispatcher.js";
-import { registerAgentCapabilities } from "../../agent-catalog/capabilities.js";
 import { registerLocalAppReadCapabilities } from "../../local-apps/capabilities/read.js";
 import { registerNoteReadCapabilities } from "../../notes/capabilities/read.js";
 import { registerNoteWriteCapabilities } from "../../notes/capabilities/write.js";
@@ -17,6 +16,7 @@ import { registerAutomationDraftCapabilities } from "../../automations/capabilit
 import { registerTaskWriteCapabilities } from "../../tasks/capabilities/write.js";
 import { registerSettingsCapability } from "./settings.js";
 import { registerAppContextCapability } from "./app-context.js";
+import { registerAgentCapabilities } from "../../agent-catalog/capabilities.js";
 //#region src/capabilities/runtime/product.ts
 function createProductDispatcher(getNotes, taskWrites) {
 	const dispatcher = new CapabilityDispatcher();

package/dist/src/chat-commands/agent-edit.js

@@ -1,6 +1,6 @@
+import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
 import { normalizeAgentId } from "../agent-catalog/id.js";
 import { init_agent_scope, resolveAgentProfileDir } from "../agent/agent-scope.js";
-import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
 import { WORKSPACE_FILES, init_paths } from "../config/paths.js";
 import { commandRegistry } from "./registry.js";
 import { join } from "node:path";

package/dist/src/cli/commands/agent.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
-import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
 import { init_agent_session_key, resolveAgentMainConversationId } from "../../routing/agent-session-key.js";
+import { init_agent_scope, resolveDefaultAgentId } from "../../agent/agent-scope.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
 import { ExtensionLoader } from "../../extensions/loader.js";

package/dist/src/cli/commands/agents.js

@@ -1,8 +1,8 @@
 import { normalizeAgentId, validateAgentIdForNewAgent } from "../../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
 import { init_agent_scope, resolveAgentDir, resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../../agent/agent-scope.js";
-import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { resolveEffectiveAgentConfigForAgent } from "../../config/agent-profile.js";
+import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { colors } from "../utils/colors.js";
 //#region src/cli/commands/agents.ts
 init_repository();

package/dist/src/cli/commands/doctor/checks/database-schema.js

@@ -53,7 +53,7 @@ async function checkDatabaseSchema(ctx) {
 		id: "database-schema",
 		label: "Database schema",
 		status: "pass",
-		message: `SQLite schema v${status.dbVersion} (current release v256).`,
+		message: `SQLite schema v${status.dbVersion} (current release v257).`,
 		hints: []
 	};
 }

package/dist/src/cli/commands/extension-agent-plugin.js

@@ -1,24 +1,35 @@
+import { getWorkspacePath } from "../../config/workspace-path-helpers.js";
+import { pluginAuthorizations } from "../../extensions/agent-plugins/setup-contract.js";
+import { PLUGIN_MANIFEST_PATHS } from "../../extensions/agent-plugins/formats.js";
+import { pluginServerId } from "../../extensions/agent-plugins/validation.js";
+import { isGitPluginSource } from "../../extensions/agent-plugins/source-catalog.js";
 import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
 import { loadConfig } from "../../config/loader.js";
 import { getContextWithOpts } from "../context.js";
 import { isAgentPluginArchive, withAgentPluginSource } from "../../extensions/agent-plugins/sources.js";
+import { PluginSetupService } from "../../extensions/agent-plugins/setup.js";
 import { removePluginCredentials } from "../../extensions/agent-plugins/credentials.js";
 import { join, resolve } from "node:path";
 import { existsSync, readFileSync, statSync } from "node:fs";
+import { readFile } from "node:fs/promises";
 import { confirm } from "@inquirer/prompts";
 //#region src/cli/commands/extension-agent-plugin.ts
 function isAgentPluginSource(source) {
-	if (source.startsWith("https://")) return true;
+	if (source.startsWith("https://") || isGitPluginSource(source) || source.includes("#plugin=")) return true;
 	const path = resolve(source);
 	if (existsSync(join(path, "package.json"))) {
 		if (JSON.parse(readFileSync(join(path, "package.json"), "utf8"))?.xopc?.extension) return false;
 	}
-	return existsSync(path) && (statSync(path).isFile() && /\.zip$/i.test(path) && statSync(path).size <= 50 * 1024 * 1024 && isAgentPluginArchive(readFileSync(path)) || existsSync(join(path, "plugin.json")) && !existsSync(join(path, "xopc.extension.json")));
+	return existsSync(path) && (statSync(path).isFile() && /\.zip$/i.test(path) && statSync(path).size <= 50 * 1024 * 1024 && isAgentPluginArchive(readFileSync(path)) || [
+		...PLUGIN_MANIFEST_PATHS,
+		".agents/plugins/marketplace.json",
+		".claude-plugin/marketplace.json"
+	].some((file) => existsSync(join(path, file))) && !existsSync(join(path, "xopc.extension.json")));
 }
 async function installAgentPluginFromCli(source, options) {
 	const store = new AgentPluginStore();
 	const cfg = loadConfig(getContextWithOpts().configPath);
-	const plan = await withAgentPluginSource(source, cfg, (local) => store.inspect(local));
+	const plan = await withAgentPluginSource(source, cfg, (local, _p, _commit, importManifest) => store.inspect(local, source, importManifest));
 	console.log(JSON.stringify({
 		format: "agent-plugin",
 		name: plan.manifest.name,
@@ -34,22 +45,96 @@ async function installAgentPluginFromCli(source, options) {
 			default: false
 		})) return;
 	}
-	const plugin = await withAgentPluginSource(source, cfg, (local, provenance) => store.install(local, {
+	const plugin = await withAgentPluginSource(source, cfg, (local, provenance, resolvedCommit, importManifest) => store.install(local, {
 		reviewHash: plan.reviewHash,
 		replace: options.force,
+		stage: options.force,
 		expectedId: options.expectedId,
-		sourceLabel: source.startsWith("https://") || source.startsWith("store:") ? source : resolve(source),
-		provenance
+		sourceLabel: source,
+		provenance,
+		resolvedCommit,
+		importManifest
 	}));
+	if (plugin.readiness !== "blocked") new PluginSetupService(store).create(plugin.id, "gateway-owner");
 	console.log(`Installed plugin:${plugin.id} (${plugin.receipt.enabled ? "enabled" : "disabled"}).`);
+	if (plugin.readiness !== "blocked") console.log(`Continue with: xopc extensions setup plugin:${plugin.id} --prepare`);
 	return plugin;
 }
 function addAgentPluginLifecycleCommands(command) {
+	command.command("setup").argument("<id>", "plugin:<id>").option("--prepare", "Prepare resources and check tools").option("--authorize <server>", "Authorize a plugin account or show native MCP sign-in instructions").option("--method <id>", "Choose one of the account authorization methods").option("--skip-auth", "Finish installation and authorize later in plugin details").option("--complete", "Finish setup and enable globally for all agents").option("--workspace <paths...>", "Restrict the plugin to these workspace paths").option("--config-file <path>", "Read typed user configuration from a JSON file").option("--allow-partial", "Enable available components after reviewing compatibility limits").option("--cancel", "Cancel preparation").action(async (raw, options) => {
+		const store = new AgentPluginStore(), setup = new PluginSetupService(store), id = raw.replace(/^plugin:/, "");
+		const cfg = loadConfig(getContextWithOpts().configPath), workspace = getWorkspacePath(cfg) || process.cwd(), owner = "gateway-owner";
+		let job = setup.create(id, owner);
+		const declaration = pluginAuthorizations((store.pending(id) ?? store.get(id)).manifest).find((value) => value.id === options.authorize);
+		const method = declaration?.methods.find((value) => value.id === (options.method ?? declaration.methods[0]?.id));
+		if (options.configFile) job = await setup.act(id, owner, {
+			action: "configure",
+			expectedRevision: job.revision,
+			values: JSON.parse(await readFile(options.configFile, "utf8")),
+			...method?.type === "form" ? {
+				authorization: declaration.id,
+				method: method.id
+			} : {}
+		}, cfg, workspace);
+		if (options.prepare || declaration) job = await setup.act(id, owner, {
+			action: "prepare",
+			expectedRevision: job.revision
+		}, cfg, workspace);
+		if (options.authorize) if (declaration) {
+			if (!method) throw new Error("Unknown authorization method");
+			if (method.type !== "form") {
+				job = await setup.act(id, owner, {
+					action: "authorize",
+					expectedRevision: job.revision,
+					server: declaration.id,
+					method: method.id
+				}, cfg, workspace);
+				let lastUrl = "";
+				for (;;) {
+					const attempt = await setup.authorization(id, owner, declaration.id, cfg);
+					if (!attempt) throw new Error("Sign-in is unavailable. Retry authorization.");
+					const url = "challenge" in attempt ? attempt.challenge?.url : "authorizationUrl" in attempt ? attempt.authorizationUrl : void 0;
+					if (url && url !== lastUrl) {
+						console.log(`Complete sign-in: ${url}`);
+						lastUrl = url;
+					}
+					if (attempt.state === "connected") break;
+					if (["cancelled", "error"].includes(attempt.state)) throw new Error("Sign-in did not complete. Retry authorization.");
+					await new Promise((resolve) => setTimeout(resolve, 1e3));
+				}
+				job = await setup.act(id, owner, {
+					action: "prepare",
+					expectedRevision: job.revision
+				}, cfg, workspace);
+			} else if (!options.configFile) throw new Error("Provide credential fields with --config-file");
+		} else {
+			if (!job.connections.some((c) => c.name === options.authorize)) throw new Error("Unknown plugin MCP server");
+			console.log(`Sign in with: xopc mcp login ${pluginServerId(id, options.authorize)}`);
+		}
+		if (options.complete) job = await setup.act(id, owner, {
+			action: "complete",
+			expectedRevision: job.revision,
+			workspacePaths: options.workspace,
+			allowPartial: options.allowPartial === true
+		}, cfg, workspace);
+		if (options.skipAuth) job = await setup.act(id, owner, {
+			action: "defer",
+			expectedRevision: job.revision
+		}, cfg, workspace);
+		if (options.cancel) job = await setup.act(id, owner, {
+			action: "cancel",
+			expectedRevision: job.revision
+		}, cfg, workspace);
+		console.log(JSON.stringify(job, null, 2));
+	});
 	command.command("rollback").argument("<id>", "plugin:<name>").action((raw) => {
 		console.log(JSON.stringify(new AgentPluginStore().rollback(raw.replace(/^plugin:/, "")), null, 2));
 	});
 	for (const action of ["enable", "disable"]) command.command(action).argument("<id>", "plugin:<name>").action((raw) => {
-		const plugin = new AgentPluginStore().setEnabled(raw.replace(/^plugin:/, ""), action === "enable");
+		const store = new AgentPluginStore(), id = raw.replace(/^plugin:/, "");
+		const job = new PluginSetupService(store).get(id, "gateway-owner");
+		if (action === "enable" && job && job.state !== "completed") throw new Error("Finish plugin setup before enabling");
+		const plugin = store.setEnabled(id, action === "enable");
 		console.log(`${plugin.id}: ${action}d`);
 	});
 	command.command("remove").argument("<id>", "plugin:<name>").option("--remove-data", "Also remove persistent plugin data").option("--remove-credentials", "Also delete local credentials").action(async (raw, options) => {

package/dist/src/cli/commands/extension-marketplace.js

@@ -224,7 +224,7 @@ async function installExtensionFromStoreWithLock(params) {
 	}
 }
 function createExtensionInstallCommand() {
-	return new Command("install").description("Install a native extension or portable Agent Plugin from an explicit source").argument("<target>", "store:<id>, npm:<package>, local directory, or Agent Plugin ZIP / HTTPS ZIP URL").option("-f, --force", "Replace an existing store or local extension with the same manifest id", false).option("-y, --yes", "Skip interactive install confirmation", false).action(async (target, opts) => {
+	return new Command("install").description("Install a native extension or Codex, Claude or portable Agent Plugin").argument("<target>", "store:<id>, npm:<package>, Git / marketplace source, directory or plugin ZIP").option("-f, --force", "Replace an existing store or local extension with the same manifest id", false).option("-y, --yes", "Skip interactive install confirmation", false).action(async (target, opts) => {
 		if (isAgentPluginSource(target)) {
 			await installAgentPluginFromCli(target, opts);
 			return;

package/dist/src/cli/commands/extension.js

@@ -78,7 +78,7 @@ function createExtensionInspectCommand() {
 		try {
 			if (extensionId.startsWith("plugin:") || extensionId.startsWith("store:") || isAgentPluginSource(extensionId)) {
 				const store = new AgentPluginStore();
-				const result = extensionId.startsWith("plugin:") ? store.get(extensionId.slice(7)) : await withAgentPluginSource(extensionId, loadConfig(getContextWithOpts().configPath), (source) => store.inspect(source));
+				const result = extensionId.startsWith("plugin:") ? store.get(extensionId.slice(7)) : await withAgentPluginSource(extensionId, loadConfig(getContextWithOpts().configPath), (source, _p, _commit, importManifest) => store.inspect(source, extensionId, importManifest));
 				if (!result) throw new Error("Plugin not installed");
 				console.log(JSON.stringify(result, null, 2));
 				return;

package/dist/src/cli/commands/mcp.js

@@ -3,6 +3,7 @@ import { loadConfig } from "../../config/loader.js";
 import { register } from "../registry.js";
 import { createGatewayHttpClientFromConfig } from "../../mcp/gateway-http-client.js";
 import { createCapabilityMcpServer } from "../../mcp/capability-server.js";
+import { resolveMcpSetupConfig } from "../../agent/mcp/effective-server.js";
 import { join } from "node:path";
 import { chmodSync, existsSync, readFileSync, writeFileSync } from "node:fs";
 import { main } from "@earendil-works/pi-coding-agent";
@@ -18,24 +19,25 @@ function createMcpCommand(ctx) {
 	]) {
 		const native = command.command(action).description(`Use pi's native MCP ${action}`);
 		if (action !== "list") native.argument("<server>", "Configured MCP server ID");
-		if (action === "list") native.option("--json", "Print pi MCP diagnostics as JSON");
+		if (action === "list") native.option("--json", "Print pi MCP diagnostics as JSON").option("--agent <id>", "Include plugins bound to this agent");
 		if (action === "login") native.option("--timeout <seconds>", "Browser sign-in timeout in seconds");
 		native.action(async (serverOrOptions, loginOptions) => {
 			const server = typeof serverOrOptions === "string" ? serverOrOptions : void 0;
 			const options = typeof serverOrOptions === "string" ? loginOptions : serverOrOptions;
-			const mcp = await prepareNativeMcpConfig(loadConfig(ctx.configPath), ctx.workspacePath || process.cwd());
+			const config = loadConfig(ctx.configPath);
+			const mcp = await prepareNativeMcpConfig(server ? resolveMcpSetupConfig(config, server) : config, ctx.workspacePath || process.cwd(), options?.agent);
 			if (mcp.errors.length) throw new Error(mcp.errors.join("\n"));
 			const path = join(getNativePiAgentDir(), "mcp.json");
 			if (existsSync(path) && JSON.parse(readFileSync(path, "utf8")).xopcGenerated !== true) throw new Error("The pi directory contains a user-managed mcp.json. Use a dedicated PI_CODING_AGENT_DIR for xopc.");
 			if (existsSync(path)) chmodSync(path, 384);
 			writeFileSync(path, JSON.stringify({
 				xopcGenerated: true,
-				mcpServers: Object.fromEntries(mcp.servers.map((entry) => [entry.name, entry.config]))
+				mcpServers: Object.fromEntries(mcp.servers.filter((entry) => !server || entry.name === server).map((entry) => [mcp.credentialAliases?.[entry.name] ?? entry.name, entry.config]))
 			}), { mode: 384 });
 			await main([
 				"mcp",
 				action,
-				...server ? [server] : [],
+				...server ? [mcp.credentialAliases?.[server] ?? server] : [],
 				...action === "list" && options?.json ? ["--json"] : [],
 				...action === "login" && loginOptions?.timeout ? ["--timeout", loginOptions.timeout] : []
 			]);

package/dist/src/cli/commands/models.js

@@ -1,11 +1,11 @@
 import { creditDecimal } from "../../../packages/gateway-contract/src/cloud-credits.js";
 import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
-import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { getAgentDefaultModelRef, init_schema } from "../../config/schema.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { getAllModels, getAvailableModels, getConfiguredProviders, getProviderAuthState, getProviderDisplayName, init_providers, isProviderConfigured, providerSupportsApiKey, providerSupportsOAuth, resolveModel } from "../../providers/index.js";
 import { XopcCloudAccountService } from "../../providers/xopc-cloud-account-service.js";
+import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { listImageProviderSpecs } from "../../../packages/image-providers/src/catalog.js";
 import "../../../packages/image-providers/src/index.js";
 import { loadConfig } from "../../config/loader.js";

package/dist/src/cli/commands/onboard/model.js

@@ -1,5 +1,4 @@
 import { AgentCatalogRepository, init_repository } from "../../../agent-catalog/repository.js";
-import { AgentCatalogService } from "../../../agent-catalog/service.js";
 import { ConfigSchema, getAgentDefaultModelRef, init_schema } from "../../../config/schema.js";
 import { resolveModelsJsonPath } from "../../../config/paths.js";
 import { init_models_json, loadModelsJson, saveModelsJson } from "../../../config/models-json.js";
@@ -7,6 +6,7 @@ import { getApiKeyFromEnv } from "../../../providers/env-keys.js";
 import { getModelRegistry } from "../../../providers/model-registry.js";
 import { CredentialResolver, init_credentials } from "../../../auth/credentials.js";
 import { getAllProviders, getModelsByProvider, getProviderDisplayName, init_providers, providerSupportsApiKey, providerSupportsOAuth } from "../../../providers/index.js";
+import { AgentCatalogService } from "../../../agent-catalog/service.js";
 import { prepareUpdateGlobalDefaults } from "../../../gateway/global-defaults-admin.js";
 import { discoverProviderModels, isProviderApiDiscoverable } from "../../../providers/model-discovery.js";
 import { getXopcCloudCatalogCoordinator } from "../../../providers/xopc-cloud-catalog-coordinator.js";

package/dist/src/cli/utils/init-workspace-core.js

@@ -1,6 +1,6 @@
 import { AgentCatalogRepository, init_repository } from "../../agent-catalog/repository.js";
-import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { ConfigSchema, init_schema } from "../../config/schema.js";
+import { AgentCatalogService } from "../../agent-catalog/service.js";
 import { assertConfigRewriteSafeForRunningGateway, saveConfig } from "../../config/loader.js";
 import { ensureStarterAgentsInitialized } from "../../agent/starter-agents.js";
 import { bootstrapApplicationStateSync } from "../../bootstrap/application-state.js";

package/dist/src/config/agent-model-intents.js

@@ -1,6 +1,6 @@
+import { getModelUsageOrigin, init_model_usage } from "../providers/model-usage.js";
 import { ModelIntentSchema } from "../agent-config/schema.js";
 import { init_agent_config } from "../agent-config/index.js";
-import { getModelUsageOrigin, init_model_usage } from "../providers/model-usage.js";
 import { resolveEffectiveAgentConfigForAgent } from "./agent-profile.js";
 import { init_schema, parseModelRef } from "./schema.js";
 //#region src/config/agent-model-intents.ts

package/dist/src/config/agent-profile.js

@@ -1,10 +1,10 @@
+import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";
+import { init_session_key } from "../routing/session-key.js";
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
 import { normalizeAgentId } from "../agent-catalog/id.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
 import { init_agent_scope, resolveAgentWorkspaceDir } from "../agent/agent-scope.js";
-import { getConversationRouting } from "../storage/sqlite/conversation-repository.js";
-import { init_session_key } from "../routing/session-key.js";
 import { agentExists, getDefaultAgentId, init_resolve_route } from "../routing/resolve-route.js";
 //#region src/config/agent-profile.ts
 init_agent_config();

package/dist/src/config/loader.js

@@ -1,7 +1,7 @@
 import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
-import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
 import { ConfigSchema, init_schema } from "./schema.js";
+import { init_write_file_atomic, writeTextAtomic } from "../infra/write-file-atomic.js";
 import { init_paths, resolveConfigPath } from "./paths.js";
 import { init_resolution, setActivePlatformDiscovery } from "../platform/resolution.js";
 import { assertChannelPluginConfigs } from "./validate-channel-configs.js";

package/dist/src/config/models-json.js

@@ -1,6 +1,6 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
-import { init_write_file_atomic, writeTextAtomicSync } from "../infra/write-file-atomic.js";
 import { ComputerProfileSchema, init_src } from "../../packages/computer-control-contract/src/index.js";
+import { init_write_file_atomic, writeTextAtomicSync } from "../infra/write-file-atomic.js";
 import { init_paths, resolveModelsJsonPath } from "./paths.js";
 import { init_model_policy, isComputerModel } from "../computer/model-policy.js";
 import { assertCurrentModelProvider, init_provider_policy } from "../providers/provider-policy.js";

package/dist/src/config/schema.js

@@ -1,10 +1,10 @@
 import { __esmMin } from "../../_virtual/_rolldown/runtime.js";
+import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config } from "../user-context/config.js";
+import { getModelUsageOrigin, init_model_usage } from "../providers/model-usage.js";
 import { AgentModelsOverrideSchema, ImageGenerationRouteSchema, ModelRouteSchema } from "../agent-config/schema.js";
 import { resolveEffectiveAgentConfig } from "../agent-config/resolver.js";
 import { init_agent_config } from "../agent-config/index.js";
 import { AgentCatalogRepository, init_repository } from "../agent-catalog/repository.js";
-import { DEFAULT_CONTEXT_COMPACTION_POLICY, UserContextConfigSchema, init_config } from "../user-context/config.js";
-import { getModelUsageOrigin, init_model_usage } from "../providers/model-usage.js";
 import { TracingConfigSchema, init_config as init_config$1 } from "../observability/config.js";
 import { OutboundProxySchema, init_outbound_proxy } from "./outbound-proxy.js";
 import { ComputerConfigSchema, init_config as init_config$2 } from "../computer/config.js";

package/dist/src/extensions/agent-plugins/auth.d.ts

@@ -9,6 +9,11 @@ declare const bindingSchema: z.ZodObject<{
     }>;
     identityScope: z.ZodLiteral<"owner">;
     endpointFingerprint: z.ZodString;
+    oauthReference: z.ZodOptional<z.ZodObject<{
+        sourceServerId: z.ZodString;
+        credentialId: z.ZodString;
+        fingerprint: z.ZodString;
+    }, z.core.$strict>>;
     fields: z.ZodArray<z.ZodObject<{
         target: z.ZodEnum<{
             headers: "headers";
@@ -23,7 +28,7 @@ export type PluginAuthBinding = z.infer<typeof bindingSchema>;
 export declare const pluginCredentialProviderPrefix: (id: string) => string;
 export declare const parsePluginAuthBinding: (value: unknown) => PluginAuthBinding;
 export declare function pluginEndpointFingerprint(server: PluginServer): string;
-export declare function readPluginAuthBinding(store: AgentPluginStore, id: string, name: string, server: PluginServer): PluginAuthBinding | undefined;
+export declare function readPluginAuthBinding(store: AgentPluginStore, id: string, name: string, server: PluginServer, revision?: string): PluginAuthBinding | undefined;
 export declare function savePluginAuthBinding(store: AgentPluginStore, id: string, name: string, input: {
     mode: PluginAuthBinding['mode'];
     secrets?: Array<{
@@ -33,5 +38,6 @@ export declare function savePluginAuthBinding(store: AgentPluginStore, id: strin
         prefix?: string;
     }>;
 }): Promise<void>;
+export declare function savePluginOAuthReference(store: AgentPluginStore, id: string, name: string, reference: NonNullable<PluginAuthBinding['oauthReference']>): void;
 export declare function applyPluginAuthBinding(raw: Record<string, unknown>, binding: PluginAuthBinding | undefined): Record<string, unknown>;
 export {};

package/dist/src/extensions/agent-plugins/auth.js

@@ -1,5 +1,5 @@
 import { init_paths_state, resolveStateDir } from "../../config/paths-state.js";
-import { init_write_file_atomic, writeTextAtomic } from "../../infra/write-file-atomic.js";
+import { init_write_file_atomic, writeTextAtomic, writeTextAtomicSync } from "../../infra/write-file-atomic.js";
 import { CredentialResolver, init_credentials } from "../../auth/credentials.js";
 import { isDangerousHostEnvVarName } from "../../infra/host-env-security.js";
 import { pluginName } from "./validation.js";
@@ -17,6 +17,11 @@ const bindingSchema = z.strictObject({
 	mode: z.enum(["auto", "api-key"]),
 	identityScope: z.literal("owner"),
 	endpointFingerprint: z.string(),
+	oauthReference: z.strictObject({
+		sourceServerId: z.string(),
+		credentialId: z.string().regex(/^mcp_draft_[a-f0-9]{32}$/),
+		fingerprint: z.string()
+	}).optional(),
 	fields: z.array(z.strictObject({
 		target: z.enum(["headers", "env"]),
 		key: z.string(),
@@ -28,19 +33,36 @@ const hash = (value) => createHash("sha256").update(value).digest("hex");
 const pluginCredentialProviderPrefix = (id) => `plugin-${hash(id).slice(0, 16)}-`;
 const parsePluginAuthBinding = (value) => bindingSchema.parse(value);
 function pluginEndpointFingerprint(server) {
-	return hash(server.type === "stdio" ? JSON.stringify(server) : new URL(server.url).toString());
+	return hash(server.type === "stdio" ? JSON.stringify(server) : JSON.stringify([
+		new URL(server.url).toString(),
+		server.oauth ?? null,
+		server.connectionAuth ?? null
+	]));
 }
-function bindingPath(store, id, name) {
-	return join(store.stateDir, "plugin-auth", pluginName.parse(id), `${hash(name)}.json`);
+function bindingPath(store, id, name, revision) {
+	return join(store.stateDir, "plugin-auth", pluginName.parse(id), `${hash(name)}${revision ? `-${z.string().uuid().parse(revision)}` : ""}.json`);
 }
-function readPluginAuthBinding(store, id, name, server) {
-	const path = bindingPath(store, id, name);
-	if (!existsSync(path)) return void 0;
-	const binding = bindingSchema.parse(JSON.parse(readFileSync(path, "utf8")));
-	return binding.endpointFingerprint === pluginEndpointFingerprint(server) ? binding : void 0;
+function readPluginAuthBinding(store, id, name, server, revision) {
+	const current = store.receipt(id);
+	const targetRevision = revision ?? current?.revision;
+	const revisions = [...new Set([
+		targetRevision,
+		current?.revision,
+		current?.previous?.revision
+	].filter((value) => !!value))];
+	for (const candidate of [...revisions.map((value) => bindingPath(store, id, name, value)), bindingPath(store, id, name)]) {
+		if (!existsSync(candidate)) continue;
+		const binding = bindingSchema.parse(JSON.parse(readFileSync(candidate, "utf8")));
+		const fingerprint = pluginEndpointFingerprint(server);
+		const legacy = server.type !== "stdio" && !server.oauth && !server.connectionAuth && binding.endpointFingerprint === hash(new URL(server.url).toString());
+		if (binding.endpointFingerprint !== fingerprint && !legacy) continue;
+		if (legacy) binding.endpointFingerprint = fingerprint;
+		if (targetRevision && candidate !== bindingPath(store, id, name, targetRevision)) writeTextAtomicSync(bindingPath(store, id, name, targetRevision), JSON.stringify(binding));
+		return binding;
+	}
 }
 async function savePluginAuthBinding(store, id, name, input) {
-	const plugin = store.get(id);
+	const plugin = store.pending(id) ?? store.get(id);
 	const server = plugin?.servers[name];
 	if (!server || plugin?.readiness === "blocked") throw new Error("Plugin MCP server unavailable");
 	const endpointFingerprint = pluginEndpointFingerprint(server);
@@ -67,6 +89,7 @@ async function savePluginAuthBinding(store, id, name, input) {
 		const provider = `${pluginCredentialProviderPrefix(id)}${hash(JSON.stringify([
 			"owner",
 			id,
+			plugin.receipt.revision,
 			name,
 			endpointFingerprint,
 			field.target,
@@ -87,7 +110,21 @@ async function savePluginAuthBinding(store, id, name, input) {
 		endpointFingerprint,
 		fields
 	});
-	await writeTextAtomic(bindingPath(store, id, name), JSON.stringify(binding));
+	await writeTextAtomic(bindingPath(store, id, name, plugin.receipt.revision), JSON.stringify(binding));
+}
+function savePluginOAuthReference(store, id, name, reference) {
+	const plugin = store.pending(id) ?? store.get(id);
+	const server = plugin?.servers[name];
+	if (!server || !plugin || plugin.readiness === "blocked") throw new Error("Plugin MCP server unavailable");
+	const binding = bindingSchema.parse({
+		serverName: name,
+		mode: "auto",
+		identityScope: "owner",
+		endpointFingerprint: pluginEndpointFingerprint(server),
+		fields: [],
+		oauthReference: reference
+	});
+	writeTextAtomicSync(bindingPath(store, id, name, plugin.receipt.revision), JSON.stringify(binding));
 }
 function applyPluginAuthBinding(raw, binding) {
 	if (!binding) return raw;
@@ -103,8 +140,12 @@ function applyPluginAuthBinding(raw, binding) {
 		} };
 		result[field.target] = values;
 	}
+	if (binding.oauthReference) {
+		result.xopcOAuthCredentialId = binding.oauthReference.credentialId;
+		result.xopcPluginOAuthReference = binding.oauthReference;
+	}
 	result.xopcAuthRevision = hash(JSON.stringify(binding));
 	return result;
 }
 //#endregion
-export { applyPluginAuthBinding, parsePluginAuthBinding, pluginCredentialProviderPrefix, pluginEndpointFingerprint, readPluginAuthBinding, savePluginAuthBinding };
+export { applyPluginAuthBinding, parsePluginAuthBinding, pluginCredentialProviderPrefix, pluginEndpointFingerprint, readPluginAuthBinding, savePluginAuthBinding, savePluginOAuthReference };

package/dist/src/extensions/agent-plugins/branding.d.ts

@@ -0,0 +1,12 @@
+import { type PluginManifest } from './validation.js';
+export declare function pluginLocalizations(manifest: PluginManifest): {
+    [k: string]: {
+        description?: string;
+        displayName: string;
+    };
+};
+/** Inline bounded package assets so authenticated and offline inventories need no extra fetch. */
+export declare function pluginBranding(root: string, manifest: PluginManifest): {
+    iconUrl: string;
+    iconSha256: string;
+};

package/dist/src/extensions/agent-plugins/branding.js

@@ -0,0 +1,54 @@
+import { containedPath } from "./validation.js";
+import { extname, resolve } from "node:path";
+import { readFileSync, statSync } from "node:fs";
+import { createHash } from "node:crypto";
+//#region src/extensions/agent-plugins/branding.ts
+function pluginLocalizations(manifest) {
+	const extension = manifest.extensions?.["ai.xopc"];
+	return Object.fromEntries(["en", "zh-CN"].flatMap((locale) => {
+		const value = extension?.localizations?.[locale];
+		return typeof value?.displayName === "string" && value.displayName.trim() ? [[locale, {
+			displayName: value.displayName,
+			...typeof value.description === "string" ? { description: value.description } : {}
+		}]] : [];
+	}));
+}
+/** Inline bounded package assets so authenticated and offline inventories need no extra fetch. */
+function pluginBranding(root, manifest) {
+	const icon = (manifest.extensions?.["ai.xopc"])?.branding?.icon;
+	if (typeof icon !== "string" || !icon || icon.includes("\0")) return void 0;
+	try {
+		const file = containedPath(root, resolve(root, icon));
+		const info = statSync(file);
+		if (!info.isFile() || info.size < 1 || info.size > 128 * 1024) return void 0;
+		const type = extname(file).toLowerCase();
+		const mime = {
+			".svg": "image/svg+xml",
+			".png": "image/png",
+			".webp": "image/webp"
+		}[type];
+		if (!mime) return void 0;
+		const bytes = readFileSync(file);
+		if (type === ".svg") {
+			const source = bytes.toString("utf8");
+			if (!/<svg\b/i.test(source) || /<(?:script|foreignObject|iframe|object|embed)\b|\son[a-z]+\s*=|(?:href|src)\s*=\s*["']\s*(?:https?:|\/\/|data:)/i.test(source)) return void 0;
+		} else if (type === ".png" ? !bytes.subarray(0, 8).equals(Buffer.from([
+			137,
+			80,
+			78,
+			71,
+			13,
+			10,
+			26,
+			10
+		])) : bytes.subarray(0, 4).toString() !== "RIFF" || bytes.subarray(8, 12).toString() !== "WEBP") return void 0;
+		return {
+			iconUrl: `data:${mime};base64,${bytes.toString("base64")}`,
+			iconSha256: createHash("sha256").update(bytes).digest("hex")
+		};
+	} catch {
+		return;
+	}
+}
+//#endregion
+export { pluginBranding, pluginLocalizations };