@xopcai/xopc 0.0.396 → 0.0.397

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

@@ -1,3 +1,8 @@
+import { McpOAuthConfigSchema, init_schema } from "../../config/schema.js";
+import { pluginAuthorizations, safeAuthorizationUrl } from "./setup-contract.js";
+import { normalizePluginMcpServer } from "./mcp-format.js";
+import { pluginResources } from "./resources.js";
+import { collectPluginSkillFiles, readPluginLayout } from "./formats.js";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { existsSync, lstatSync, readFileSync, readdirSync, realpathSync, statSync } from "node:fs";
 import { createHash } from "node:crypto";
@@ -5,6 +10,7 @@ import { z } from "zod";
 import yaml from "js-yaml";
 import { validateHeaderName, validateHeaderValue } from "node:http";
 //#region src/extensions/agent-plugins/validation.ts
+init_schema();
 const PLUGIN_SCHEMA = "https://agent-plugins.org/schemas/1.0.0/plugin.schema.json";
 const MCP_SCHEMA = "https://agent-plugins.org/schemas/1.0.0/mcp.schema.json";
 const pluginName = z.string().min(1).max(64).regex(/^(?!.*(?:--|\.\.))[a-z0-9](?:[a-z0-9.-]*[a-z0-9])?$/);
@@ -34,7 +40,17 @@ const serverSchema = z.discriminatedUnion("type", [z.strictObject({
 }), z.strictObject({
 	type: z.literal("streamable-http"),
 	url: z.string().min(1),
-	headers: strings.optional()
+	headers: strings.optional(),
+	oauth: McpOAuthConfigSchema.omit({ clientSecret: true }).optional(),
+	connectionAuth: z.strictObject({
+		mode: z.enum([
+			"none",
+			"oauth",
+			"api-key"
+		]),
+		headerName: z.string().optional(),
+		prefix: z.string().optional()
+	}).optional()
 })]);
 function containedPath(root, path) {
 	const base = resolve(root);
@@ -67,7 +83,7 @@ function readPackageFile(root, path) {
 	return readFileSync(safe, "utf8");
 }
 function expandPluginVariables(value, root, data) {
-	return value.replace(/\$\{PLUGIN_(ROOT|DATA)\}/g, (_, key) => key === "ROOT" ? root : data);
+	return value.replace(/\$\{(?:CLAUDE_)?PLUGIN_(ROOT|DATA)\}/g, (_, key) => key === "ROOT" ? root : data);
 }
 function resolvePluginCwd(cwd, root, data) {
 	if (cwd === void 0) return root;
@@ -80,7 +96,7 @@ function validatePluginServer(raw, root, data) {
 	if (server.type === "stdio") {
 		if (server.command.startsWith("./")) {
 			if (!statSync(containedPath(root, resolve(root, server.command))).isFile()) throw new Error("MCP command must be a file");
-		} else if (!/^[^\s/\\:;|&<>`$\x00-\x1f]+$/.test(server.command)) throw new Error("MCP command must be one bare executable or ./package-path");
+		} else if (!/^\$\{PLUGIN_RESOURCES\}\/[a-z][a-z0-9.-]{0,63}$/.test(server.command) && !/^[^\s/\\:;|&<>`$\x00-\x1f]+$/.test(server.command)) throw new Error("MCP command must be one bare executable or ./package-path");
 		for (const key of Object.keys(server.env ?? {})) {
 			if (["PLUGIN_ROOT", "PLUGIN_DATA"].includes(process.platform === "win32" ? key.toUpperCase() : key)) throw new Error("Reserved plugin environment variable");
 			if (!key || /[=\0]/.test(key)) throw new Error("Invalid environment name");
@@ -96,6 +112,16 @@ function validatePluginServer(raw, root, data) {
 		const url = new URL(server.url);
 		const loopback = url.hostname === "localhost" || url.hostname === "[::1]" || /^127(?:\.\d{1,3}){3}$/.test(url.hostname);
 		if (!["https:", "http:"].includes(url.protocol) || url.protocol === "http:" && !loopback || url.username || url.password || server.url.includes("#")) throw new Error("Remote MCP requires HTTPS (HTTP is allowed on loopback), without user information or fragments");
+		if (server.connectionAuth?.headerName) {
+			validateHeaderName(server.connectionAuth.headerName);
+			if ([
+				"host",
+				"cookie",
+				"content-length",
+				"connection",
+				"transfer-encoding"
+			].includes(server.connectionAuth.headerName.toLowerCase())) throw new Error("Unsupported authentication header");
+		}
 		const names = /* @__PURE__ */ new Set();
 		for (const [key, value] of Object.entries(server.headers ?? {})) {
 			validateHeaderName(key);
@@ -106,15 +132,19 @@ function validatePluginServer(raw, root, data) {
 	}
 	return server;
 }
-function inspectAgentPlugin(rootDir, dataDir = join(rootDir, ".inspection-data")) {
+function inspectAgentPlugin(rootDir, dataDir = join(rootDir, ".inspection-data"), importManifest) {
 	const root = realpathSync(rootDir);
 	if (existsSync(join(root, "xopc.extension.json"))) throw new Error("This package is a native xopc extension");
 	if (existsSync(join(root, "package.json"))) {
 		if (JSON.parse(readPackageFile(root, join(root, "package.json")))?.xopc?.extension) throw new Error("This package is a native xopc extension");
 	}
-	const raw = JSON.parse(readPackageFile(root, join(root, "plugin.json")));
+	const layout = readPluginLayout(root, (path) => readPackageFile(root, path), (path) => containedPath(root, path), importManifest);
+	const raw = layout.manifest;
 	if (!raw || typeof raw !== "object" || Array.isArray(raw)) throw new Error("Plugin manifest must be an object");
-	const diagnostics = [];
+	const diagnostics = layout.compatibility.filter((item) => item.support !== "supported").map((item) => ({
+		component: item.component,
+		message: item.message
+	}));
 	const cleaned = { ...raw };
 	for (const key of Object.keys(cleaned)) if (!Object.hasOwn(manifestSchema.shape, key)) {
 		diagnostics.push({
@@ -130,21 +160,34 @@ function inspectAgentPlugin(rootDir, dataDir = join(rootDir, ".inspection-data")
 		});
 		delete cleaned.extensions;
 	}
+	const manifest = manifestSchema.parse(cleaned);
 	const result = {
-		manifest: manifestSchema.parse(cleaned),
+		layout,
+		manifest,
 		rootDir: root,
 		skills: [],
 		servers: Object.create(null),
 		capabilities: [],
 		diagnostics
 	};
+	const report = (item) => {
+		const existing = layout.compatibility.findIndex((value) => value.component === item.component);
+		if (existing >= 0) layout.compatibility[existing] = item;
+		else layout.compatibility.push(item);
+	};
 	const attempt = (component, fn) => {
 		try {
 			fn();
 		} catch (error) {
+			const message = error instanceof Error ? error.message : String(error);
 			diagnostics.push({
 				component,
-				message: error instanceof Error ? error.message : String(error)
+				message
+			});
+			report({
+				component,
+				support: "invalid",
+				message
 			});
 		}
 	};
@@ -153,47 +196,119 @@ function inspectAgentPlugin(rootDir, dataDir = join(rootDir, ".inspection-data")
 			lstatSync(path);
 			return true;
 		} catch (error) {
-			if (error.code === "ENOENT") return false;
+			if (["ENOENT", "ENOTDIR"].includes(error.code ?? "")) return false;
 			throw error;
 		}
 	};
-	const skillsDir = join(root, "skills");
-	if (present(skillsDir)) attempt("skills", () => {
-		const safe = containedPath(root, skillsDir);
-		if (!statSync(safe).isDirectory()) throw new Error("skills must be a directory");
-		for (const name of readdirSync(safe).sort()) attempt(`skill:${name}`, () => {
-			const dir = containedPath(root, join(safe, name));
-			if (!statSync(dir).isDirectory() || !present(join(dir, "SKILL.md"))) return;
-			const filePath = containedPath(root, join(dir, "SKILL.md"));
-			const match = readPackageFile(root, filePath).match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/);
+	const seenSkills = /* @__PURE__ */ new Set();
+	for (const skillsDir of layout.skillRoots) attempt("skills", () => {
+		const files = layout.dialect === "portable" ? readdirSync(skillsDir).sort().map((name) => join(skillsDir, name, "SKILL.md")).filter(present) : collectPluginSkillFiles(skillsDir, (path) => containedPath(root, path));
+		for (const file of files) attempt(`skill:${file.slice(root.length + 1)}`, () => {
+			const filePath = containedPath(root, file);
+			const content = readPackageFile(root, filePath);
+			const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/);
 			if (!match) throw new Error("Skill requires YAML frontmatter");
-			const metadata = z.object({
+			const parsed = yaml.load(match[1], { schema: yaml.JSON_SCHEMA });
+			const metadata = (layout.dialect === "portable" ? z.object({
 				name: z.string().min(1).max(64).regex(/^[a-z0-9]+(?:-[a-z0-9]+)*$/),
 				description: z.string().min(1).max(1024),
 				license: z.string().optional(),
 				compatibility: z.string().min(1).max(500).optional(),
 				metadata: strings.optional(),
 				"allowed-tools": z.string().optional()
-			}).parse(yaml.load(match[1], { schema: yaml.JSON_SCHEMA }));
-			if (metadata.name !== name || !metadata.description.trim()) throw new Error("Skill name must match its directory and description must not be blank");
+			}) : z.object({
+				name: z.string().min(1).max(64).optional(),
+				description: z.string().min(1).max(1024)
+			})).parse(parsed);
+			const name = metadata.name ?? dirname(filePath).split(/[\\/]/).pop();
+			if (layout.dialect === "portable" && metadata.name !== dirname(filePath).split(/[\\/]/).pop()) throw new Error("Skill name must match its directory");
+			if (!metadata.description.trim() || seenSkills.has(name)) throw new Error("Blank description or duplicate skill name");
+			seenSkills.add(name);
 			result.skills.push({
 				name,
 				filePath
 			});
+			const references = [...new Set(content.match(/\bmcp__[A-Za-z0-9_-]+__[A-Za-z0-9_-]+|\bfunctions\.(?:exec_command|apply_patch|spawn_agent|send_input|wait_agent)|\$\{(?:CLAUDE_)?PLUGIN_(?:ROOT|DATA|RESOURCES)\}/g) ?? [])].slice(0, 20);
+			const message = references.length ? `Host-specific references need execution verification: ${references.join(", ")}` : "Skill format accepted; business execution is not verified.";
+			report({
+				component: `skill:${name}`,
+				support: references.length ? "needs_adapter" : "supported",
+				message
+			});
+			if (references.length) diagnostics.push({
+				component: `skill:${name}`,
+				message
+			});
 		});
 	});
-	const mcpPath = join(root, "mcp.json");
-	if (present(mcpPath)) attempt("mcp", () => {
-		const mcp = z.strictObject({
+	for (const rawConfig of layout.mcpConfigs) attempt("mcp", () => {
+		const mcp = layout.dialect === "portable" && present(join(root, "mcp.json")) ? z.strictObject({
 			$schema: z.literal(MCP_SCHEMA),
 			mcpServers: z.record(z.string(), z.unknown())
-		}).parse(JSON.parse(readPackageFile(root, mcpPath)));
-		for (const [name, rawServer] of Object.entries(mcp.mcpServers)) attempt(`mcp:${name}`, () => {
+		}).parse(rawConfig) : z.object({ mcpServers: z.record(z.string(), z.unknown()) }).parse(rawConfig);
+		for (const [name, value] of Object.entries(mcp.mcpServers)) attempt(`mcp:${name}`, () => {
+			delete result.servers[name];
+			let incomplete = false;
+			const rawServer = normalizePluginMcpServer(value, layout.dialect !== "portable", (message) => {
+				incomplete = true;
+				diagnostics.push({
+					component: `mcp:${name}`,
+					message
+				});
+			});
 			result.servers[name] = validatePluginServer(rawServer, root, dataDir);
+			report({
+				component: `mcp:${name}`,
+				support: incomplete ? "needs_adapter" : "supported",
+				message: incomplete ? "Some MCP declarations require adaptation." : "MCP configuration accepted; connection and tools require setup."
+			});
 		});
 	});
 	for (const skill of result.skills) result.capabilities.push(`content.skills:${skill.name}`);
-	for (const [name, server] of Object.entries(result.servers)) result.capabilities.push(server.type === "stdio" ? `runtime.mcp.stdio:${name}:${JSON.stringify(server)}` : `network.mcp:${name}:${server.type}:${server.url}:${JSON.stringify(server.headers ?? {})}`);
+	for (const [name, server] of Object.entries(result.servers)) result.capabilities.push(server.type === "stdio" ? `runtime.mcp.stdio:${name}:${JSON.stringify(server)}` : `network.mcp:${name}:${server.type}:${server.url}:${JSON.stringify(server.headers ?? {})}:${JSON.stringify(server.oauth ?? {})}:${JSON.stringify(server.connectionAuth ?? {})}`);
+	attempt("resources", () => {
+		result.resources = pluginResources(result);
+		for (const resource of result.resources) {
+			const supported = (!resource.platform || resource.platform === process.platform) && (!resource.arch || resource.arch === process.arch);
+			report({
+				component: `resource:${resource.id}`,
+				support: supported ? "supported" : "unsupported",
+				message: supported ? "Pinned resource declaration accepted." : "Resource does not support this host platform or architecture."
+			});
+			if (!supported) diagnostics.push({
+				component: `resource:${resource.id}`,
+				message: "Resource does not support this host platform or architecture."
+			});
+			result.capabilities.push(`${resource.executable ? "runtime.resource" : "network.resource"}:${resource.id}:${resource.url}:${resource.sha256}:${resource.maxBytes}:${resource.platform ?? "any"}:${resource.arch ?? "any"}`);
+		}
+	});
+	attempt("authorizations", () => {
+		const declarations = pluginAuthorizations(manifest);
+		const ids = /* @__PURE__ */ new Set();
+		for (const authorization of declarations) {
+			if (ids.has(authorization.id) || authorization.servers.some((name) => !result.servers[name])) throw new Error("Invalid or duplicate authorization target");
+			ids.add(authorization.id);
+			const methods = /* @__PURE__ */ new Set();
+			for (const method of authorization.methods) {
+				if (methods.has(method.id)) throw new Error("Duplicate authorization method");
+				methods.add(method.id);
+				if (method.helpUrl) safeAuthorizationUrl(method.helpUrl);
+				if ((method.type === "form" || method.type === "cli") && method.fields.some((key) => !layout.userConfig[key])) throw new Error("Authorization field is not declared in userConfig");
+				if (method.type === "oauth" && (!authorization.servers.includes(method.server) || result.servers[method.server]?.type === "stdio")) throw new Error("OAuth requires a remote MCP server");
+				if (method.type === "cli") {
+					validatePluginServer({
+						type: "stdio",
+						...method.login
+					}, root, dataDir);
+					validatePluginServer({
+						type: "stdio",
+						...method.check
+					}, root, dataDir);
+					result.capabilities.push(`runtime.authorization:${authorization.id}:${JSON.stringify(method)}`);
+				}
+			}
+		}
+	});
 	result.capabilities.sort();
 	return result;
 }

package/dist/src/extensions/sdk/index.js

@@ -7,8 +7,8 @@ import { DEFAULT_SECURITY_CONFIG, checkExtensionDirSafety, checkExtensionPathSaf
 import { SlotRegistry, getSlotRegistry, registerSlotType } from "../slots.js";
 import { ExtensionDiagnostics, ExtensionLoaderCacheImpl, getExtensionCache, getExtensionDiagnostics } from "../diagnostics.js";
 import { ExtensionHookRunner, createHookContext, isHookEvent } from "../hooks.js";
-import { defineChannelPluginEntry } from "./channel-entry.js";
 import { registerExtensionCliProgram } from "./channel-helpers.js";
+import { defineChannelPluginEntry } from "./channel-entry.js";
 import { lazyFunction, lazyModule } from "./lazy.js";
 import { createMockExtensionApi, createTestGateway } from "./testing.js";
 //#region src/extensions/sdk/index.ts

package/dist/src/gateway/hono/app.js

@@ -7,10 +7,10 @@ import { resolveGatewayEffectiveHost } from "../../config/gateway-bind.js";
 import { loadTunnelState } from "../../tunnel/tunnel-state.js";
 import { resolveReverseProxyPublicUrl } from "../public-url.js";
 import { maxSessionInputRequestBodyBytes } from "../chat-limits.js";
-import { BROWSER_EXTENSION_ID } from "../../browser/extension-identity.js";
 import { isLoopbackIpAddress, isTrustedProxyAddress } from "../client-ip.js";
 import { buildGatewayConsoleCspHeader } from "../security/csp.js";
 import { checkBrowserOrigin, isChromeExtensionOrigin } from "../security/origin-check.js";
+import { BROWSER_EXTENSION_ID } from "../../browser/extension-identity.js";
 import { auth } from "./middleware/auth.js";
 import { gatewayScopes } from "./middleware/scopes.js";
 import { createChannelRateLimitMiddleware, createChatRateLimitMiddleware, createMediaRateLimitMiddleware, createStrictRateLimitMiddleware, createTaskRateLimitMiddleware, createXopcCloudPollRateLimitMiddleware } from "./middleware/strict-rate-limit.js";

package/dist/src/gateway/hono/routes/agent-plugins.js

@@ -1,17 +1,28 @@
+import { getWorkspacePath } from "../../../config/workspace-path-helpers.js";
+import { PluginSelectionRequired } from "../../../extensions/agent-plugins/source-catalog.js";
 import { AgentPluginStore } from "../../../extensions/agent-plugins/store.js";
 import { savePluginAuthBinding } from "../../../extensions/agent-plugins/auth.js";
 import { evictAllEmbeddedSessionRunners } from "../../../agent/embedded/session-runner.js";
 import { withAgentPluginSource } from "../../../extensions/agent-plugins/sources.js";
+import { getGatewayPrincipal } from "../../security/gateway-principal.js";
 import { agentPluginInventoryRow } from "../../../extensions/agent-plugins/inventory.js";
+import { cancelPluginCliAuthorizations } from "../../../extensions/agent-plugins/cli-authorization.js";
+import { PluginSetupService, setupActionSchema } from "../../../extensions/agent-plugins/setup.js";
 import { removePluginCredentials } from "../../../extensions/agent-plugins/credentials.js";
 import { z } from "zod";
 //#region src/gateway/hono/routes/agent-plugins.ts
 const sourceBody = z.strictObject({
 	source: z.string().min(1),
-	reviewHash: z.string().optional()
+	reviewHash: z.string().optional(),
+	setup: z.boolean().optional()
 });
+function setupOwner(c) {
+	const principal = getGatewayPrincipal(c);
+	return principal.kind === "owner" ? "gateway-owner" : principal.principalId;
+}
 function registerAgentPluginRoutes(app, deps) {
 	const store = new AgentPluginStore();
+	const setup = new PluginSetupService(store);
 	const refresh = async () => {
 		evictAllEmbeddedSessionRunners();
 		deps.service.marketplace.reloadSkills();
@@ -21,9 +32,16 @@ function registerAgentPluginRoutes(app, deps) {
 			const body = sourceBody.parse(await c.req.json());
 			return c.json({
 				ok: true,
-				payload: await withAgentPluginSource(body.source, deps.service.currentConfig, (source) => store.inspect(source))
+				payload: await withAgentPluginSource(body.source, deps.service.currentConfig, (source, _provenance, resolvedCommit, importManifest) => ({
+					...store.inspect(source, body.source, importManifest),
+					resolvedCommit
+				}))
 			});
 		} catch (error) {
+			if (error instanceof PluginSelectionRequired) return c.json({
+				ok: true,
+				payload: { candidates: error.candidates }
+			});
 			return c.json({
 				ok: false,
 				error: error instanceof Error ? error.message : String(error)
@@ -33,15 +51,18 @@ function registerAgentPluginRoutes(app, deps) {
 	app.post("/api/extensions/install", deps.strictRateLimitMiddleware, async (c) => {
 		try {
 			const body = sourceBody.parse(await c.req.json());
-			const plugin = await withAgentPluginSource(body.source, deps.service.currentConfig, (source, provenance) => store.install(source, {
+			const plugin = await withAgentPluginSource(body.source, deps.service.currentConfig, (source, provenance, resolvedCommit, importManifest) => store.install(source, {
 				reviewHash: body.reviewHash,
 				sourceLabel: body.source,
-				provenance
+				provenance,
+				resolvedCommit,
+				importManifest
 			}));
+			if (body.setup && plugin.readiness !== "blocked") setup.create(plugin.id, setupOwner(c));
 			await refresh();
 			return c.json({
 				ok: true,
-				payload: agentPluginInventoryRow(plugin)
+				payload: agentPluginInventoryRow(store.get(plugin.id))
 			});
 		} catch (error) {
 			return c.json({
@@ -52,7 +73,7 @@ function registerAgentPluginRoutes(app, deps) {
 	});
 	app.get("/api/extensions/agent-plugins/:id", (c) => {
 		try {
-			const plugin = store.get(c.req.param("id"));
+			const plugin = store.pending(c.req.param("id")) ?? store.get(c.req.param("id"));
 			return plugin ? c.json({
 				ok: true,
 				payload: agentPluginInventoryRow(plugin)
@@ -67,9 +88,91 @@ function registerAgentPluginRoutes(app, deps) {
 			}, 400);
 		}
 	});
+	app.get("/api/extensions/agent-plugins/:id/setup", (c) => {
+		try {
+			const id = c.req.param("id"), job = setup.get(id, setupOwner(c));
+			const plugin = store.pending(id) ?? store.get(id);
+			return c.json({
+				ok: true,
+				payload: job?.packageRevision === plugin?.receipt.revision ? job : null
+			});
+		} catch {
+			return c.json({
+				ok: false,
+				error: "Setup unavailable"
+			}, 403);
+		}
+	});
+	app.get("/api/extensions/agent-plugins/:id/setup/reusable", async (c) => {
+		try {
+			return c.json({
+				ok: true,
+				payload: await setup.reusableConnections(c.req.param("id"), setupOwner(c), deps.service.currentConfig)
+			});
+		} catch {
+			return c.json({
+				ok: false,
+				error: "Reusable connections unavailable"
+			}, 400);
+		}
+	});
+	app.post("/api/extensions/agent-plugins/:id/setup", deps.strictRateLimitMiddleware, async (c) => {
+		try {
+			const id = c.req.param("id"), owner = setupOwner(c);
+			const body = await c.req.json();
+			if (body.action === "start") return c.json({
+				ok: true,
+				payload: setup.create(id, owner)
+			});
+			const action = setupActionSchema.parse(body);
+			if (action.action === "prepare") return c.json({
+				ok: true,
+				payload: setup.startPrepare(id, owner, action.expectedRevision, deps.service.currentConfig, getWorkspacePath(deps.service.currentConfig) || process.cwd(), action.idempotencyKey)
+			});
+			const job = await setup.act(id, owner, action, deps.service.currentConfig, getWorkspacePath(deps.service.currentConfig) || process.cwd());
+			await refresh();
+			return c.json({
+				ok: true,
+				payload: job
+			});
+		} catch (error) {
+			return c.json({
+				ok: false,
+				error: error instanceof Error ? error.message : "Setup failed"
+			}, 400);
+		}
+	});
+	app.get("/api/extensions/agent-plugins/:id/setup/auth/:server", async (c) => {
+		try {
+			const result = await setup.authorization(c.req.param("id"), setupOwner(c), c.req.param("server"), deps.service.currentConfig);
+			return c.json({
+				ok: true,
+				payload: result ?? null
+			});
+		} catch {
+			return c.json({
+				ok: false,
+				error: "Authorization unavailable"
+			}, 400);
+		}
+	});
+	app.post("/api/extensions/agent-plugins/:id/setup/auth/:server/redirect", deps.strictRateLimitMiddleware, async (c) => {
+		try {
+			const body = z.strictObject({ url: z.string().max(16384) }).parse(await c.req.json());
+			if (!setup.redirect(c.req.param("id"), setupOwner(c), c.req.param("server"), body.url, deps.service.currentConfig)) throw new Error("Callback does not match this sign-in");
+			return c.json({ ok: true });
+		} catch {
+			return c.json({
+				ok: false,
+				error: "Invalid sign-in callback"
+			}, 400);
+		}
+	});
 	app.post("/api/extensions/agent-plugins/:id/activation", deps.strictRateLimitMiddleware, async (c) => {
 		try {
 			const body = z.strictObject({ enabled: z.boolean() }).parse(await c.req.json());
+			const job = setup.get(c.req.param("id"), setupOwner(c));
+			if (body.enabled && job?.packageRevision === store.receipt(c.req.param("id"))?.revision && job.state !== "completed") throw new Error("Finish plugin setup before enabling");
 			const plugin = store.setEnabled(c.req.param("id"), body.enabled);
 			await refresh();
 			return c.json({
@@ -86,17 +189,21 @@ function registerAgentPluginRoutes(app, deps) {
 	app.post("/api/extensions/agent-plugins/:id/update", deps.strictRateLimitMiddleware, async (c) => {
 		try {
 			const body = sourceBody.parse(await c.req.json());
-			const plugin = await withAgentPluginSource(body.source, deps.service.currentConfig, (source, provenance) => store.install(source, {
+			const plugin = await withAgentPluginSource(body.source, deps.service.currentConfig, (source, provenance, resolvedCommit, importManifest) => store.install(source, {
 				reviewHash: body.reviewHash,
 				replace: true,
 				expectedId: c.req.param("id"),
+				stage: body.setup,
 				sourceLabel: body.source,
-				provenance
+				provenance,
+				resolvedCommit,
+				importManifest
 			}));
+			if (body.setup && plugin.readiness !== "blocked") setup.create(plugin.id, setupOwner(c));
 			await refresh();
 			return c.json({
 				ok: true,
-				payload: agentPluginInventoryRow(plugin)
+				payload: agentPluginInventoryRow(store.pending(plugin.id) ?? store.get(plugin.id))
 			});
 		} catch (error) {
 			return c.json({
@@ -131,7 +238,10 @@ function registerAgentPluginRoutes(app, deps) {
 					prefix: z.string().optional()
 				})).max(20).optional()
 			}).parse(await c.req.json());
+			const owner = setupOwner(c);
+			setup.get(c.req.param("id"), owner);
 			await savePluginAuthBinding(store, c.req.param("id"), c.req.param("server"), body);
+			setup.invalidateConnection(c.req.param("id"), owner, c.req.param("server"));
 			await refresh();
 			return c.json({ ok: true });
 		} catch (error) {
@@ -143,6 +253,7 @@ function registerAgentPluginRoutes(app, deps) {
 	});
 	app.delete("/api/extensions/agent-plugins/:id", deps.strictRateLimitMiddleware, async (c) => {
 		try {
+			cancelPluginCliAuthorizations(c.req.param("id"));
 			const body = z.strictObject({
 				removeData: z.boolean().optional(),
 				removeCredentials: z.boolean().optional()

package/dist/src/gateway/hono/routes/browser-install.js

@@ -1,5 +1,5 @@
-import { acquireBrowserInstallLock, cancelBrowserInstall } from "../../../browser/install-lock.js";
 import { createGatewayRouteLogger } from "../lib/route-logger.js";
+import { acquireBrowserInstallLock, cancelBrowserInstall } from "../../../browser/install-lock.js";
 import { runPlaywrightChromiumInstallWithProgress } from "../../../browser/providers/playwright-install.js";
 import { streamSSE } from "hono/streaming";
 //#region src/gateway/hono/routes/browser-install.ts

package/dist/src/gateway/hono/routes/composer-history.js

@@ -1,24 +1,42 @@
+import { conversationIdSchema } from "../../../../packages/gateway-contract/src/conversation-identity.js";
+import { init_src } from "../../../../packages/gateway-contract/src/index.js";
 import { appendComposerInputHistory, clearComposerInputHistory, listComposerInputHistory } from "../../../storage/sqlite/composer-input-history-repository.js";
+import { getSessionMetadata } from "../../../storage/sqlite/session-read-repository.js";
+import { init_session_repository } from "../../../storage/sqlite/session-repository.js";
 import { init_sqlite } from "../../../storage/sqlite/index.js";
 //#region src/gateway/hono/routes/composer-history.ts
+init_src();
 init_sqlite();
+init_session_repository();
 const MAX_TEXT_LENGTH = 1e5;
 function registerComposerHistoryRoutes(authenticated, deps) {
 	authenticated.get("/api/composer-history", (c) => {
-		return c.json({ items: listComposerInputHistory() });
+		const conversationId = c.req.query("conversationId");
+		if (!conversationId || !conversationIdSchema.safeParse(conversationId).success) return c.json({ error: "valid conversationId is required" }, 400);
+		if (!getSessionMetadata(conversationId)) return c.json({ error: "conversation not found" }, 404);
+		return c.json({ items: listComposerInputHistory(conversationId) });
 	});
 	authenticated.post("/api/composer-history", deps.chatRateLimitMiddleware, async (c) => {
 		const body = await c.req.json().catch(() => null);
+		const conversationId = body?.conversationId;
+		if (typeof conversationId !== "string" || !conversationIdSchema.safeParse(conversationId).success) return c.json({ error: "valid conversationId is required" }, 400);
+		if (!getSessionMetadata(conversationId)) return c.json({ error: "conversation not found" }, 404);
 		const text = body && typeof body === "object" && typeof body.text === "string" ? body.text.trim() : "";
 		if (!text) return c.json({ error: "text is required" }, 400);
 		if (text.length > MAX_TEXT_LENGTH) return c.json({ error: "text is too long" }, 413);
-		const result = appendComposerInputHistory(text);
+		const result = appendComposerInputHistory(conversationId, text);
 		if (result.inserted) deps.service.emit("composer-history.appended", result.item);
 		return c.json(result);
 	});
 	authenticated.delete("/api/composer-history", deps.strictRateLimitMiddleware, (c) => {
-		const cleared = clearComposerInputHistory();
-		if (cleared > 0) deps.service.emit("composer-history.cleared", { cleared });
+		const conversationId = c.req.query("conversationId");
+		if (!conversationId || !conversationIdSchema.safeParse(conversationId).success) return c.json({ error: "valid conversationId is required" }, 400);
+		if (!getSessionMetadata(conversationId)) return c.json({ error: "conversation not found" }, 404);
+		const cleared = clearComposerInputHistory(conversationId);
+		if (cleared > 0) deps.service.emit("composer-history.cleared", {
+			conversationId,
+			cleared
+		});
 		return c.json({
 			ok: true,
 			cleared

package/dist/src/gateway/hono/routes/mcp.js

@@ -2,6 +2,7 @@ import { getWorkspacePath } from "../../../config/workspace-path-helpers.js";
 import { isManagedConnectorServer } from "../../../connectors/materialize.js";
 import { loadMergedMcpConfig } from "../../../agent/mcp/config.js";
 import { getGatewayPrincipal } from "../../security/gateway-principal.js";
+import { resolveMcpSetupConfig } from "../../../agent/mcp/effective-server.js";
 import { discoverMcpTools } from "../../../agent/mcp/tool-catalog.js";
 import { cancelMcpAuthorization, getMcpAuthorization, probeMcpConnection, startMcpAuthorization, submitMcpRedirect } from "../../../agent/mcp/connection-setup.js";
 import { McpConnectionDrafts, McpDraftError, mcpConfigRevision } from "../../../agent/mcp/connection-drafts.js";
@@ -66,8 +67,8 @@ function registerMcpRoutes(app, deps) {
 		});
 	}));
 	app.post("/api/mcp/servers/:id/probe", deps.strictRateLimitMiddleware, async (c) => {
-		const config = deps.service.currentConfig;
 		const id = c.req.param("id");
+		const config = resolveMcpSetupConfig(deps.service.currentConfig, id);
 		if (!Object.hasOwn(config.mcp?.servers ?? {}, id)) return c.json({
 			ok: false,
 			error: "MCP server not found."
@@ -79,8 +80,8 @@ function registerMcpRoutes(app, deps) {
 		});
 	});
 	app.post("/api/mcp/servers/:id/auth", deps.strictRateLimitMiddleware, async (c) => {
-		const config = deps.service.currentConfig;
 		const id = c.req.param("id");
+		const config = resolveMcpSetupConfig(deps.service.currentConfig, id);
 		if (!Object.hasOwn(config.mcp?.servers ?? {}, id)) return c.json({
 			ok: false,
 			error: "MCP server not found."
@@ -129,8 +130,8 @@ function registerMcpRoutes(app, deps) {
 		}, 404);
 	});
 	app.post("/api/mcp/servers/:id/tools", deps.strictRateLimitMiddleware, async (c) => {
-		const cfg = deps.service.currentConfig;
 		const id = c.req.param("id");
+		const cfg = resolveMcpSetupConfig(deps.service.currentConfig, id);
 		if (!Object.hasOwn(cfg.mcp?.servers ?? {}, id)) return c.json({
 			ok: false,
 			error: "MCP server not found."
@@ -155,7 +156,8 @@ function registerMcpRoutes(app, deps) {
 		const cfg = deps.service.currentConfig;
 		const merged = loadMergedMcpConfig({
 			workspaceDir: getWorkspacePath(cfg) || "./workspace",
-			cfg
+			cfg,
+			scope: "management"
 		});
 		return c.json({
 			ok: true,

package/dist/src/gateway/service.js

@@ -81,9 +81,6 @@ import "../infra/bus/index.js";
 import { collectMediaUrisFromMessages, deleteMediaUris } from "../media/session-references.js";
 import { AgentService } from "../agent/service.js";
 import { bootstrapApplicationStateSync } from "../bootstrap/application-state.js";
-import { setPairingBroadcastSink } from "../channels/pairing/pairing-events.js";
-import { registerClarificationChannelRuntime } from "./clarify-runtime.js";
-import { ChannelManager } from "../channels/manager.js";
 import { ChatPreviewService } from "../chat-previews/service.js";
 import "../chat-previews/index.js";
 import { configureGatewayHttpProxy } from "../infra/http-proxy-env.js";
@@ -109,6 +106,7 @@ import { HomeIntelligenceHost } from "../home-intelligence/host.js";
 import { HomeSnapshotBuilder } from "../home-intelligence/snapshot.js";
 import { assertGatewayAuthConfigured, extractToken, resolveGatewayAuth, validateToken } from "./auth.js";
 import { prepareAutomationAgentSession } from "./automation-agent-session.js";
+import { registerClarificationChannelRuntime } from "./clarify-runtime.js";
 import { stopTailscaleExposure } from "./tailscale-lifecycle.js";
 import { getGatewayFileSpaceService } from "./file-space-service.js";
 import { reconcileHomeIntelligenceAutomation } from "./home-intelligence-automation-reconciler.js";
@@ -122,6 +120,8 @@ import { WorkDiscoveryService } from "../work-discovery/service.js";
 import { buildVoiceMemoryContext } from "../voice/realtime/memory-context.js";
 import { buildVoicePersonaContext } from "../voice/realtime/persona-context.js";
 import { voiceMemoryBudget, voicePersonaBudget } from "../voice/realtime/conversation-context.js";
+import { setPairingBroadcastSink } from "../channels/pairing/pairing-events.js";
+import { ChannelManager } from "../channels/manager.js";
 import "../notes/index.js";
 import { buildWorkflowChildTools } from "../agent/workflow/workflow-child-tools.js";
 import { WorkflowRunService } from "../workflows/service/workflow-run-service.js";
@@ -1572,6 +1572,8 @@ var GatewayService = class {
 		await flushTracing();
 		if (!this.running) return;
 		this.stopping = true;
+		const { cancelAllPluginCliAuthorizations } = await import("../extensions/agent-plugins/cli-authorization.js");
+		cancelAllPluginCliAuthorizations();
 		this.taskAllocationDispatcher?.stop();
 		this.taskRunDispatcher?.stop();
 		if (this.taskRunDispatchTimer) {