@xopcai/xopc 0.0.320 → 0.0.323

package/dist/src/agent/mcp/mcp-stdio-transport.js

@@ -1,5 +1,7 @@
 import { terminateProcess } from "../../process/kill-tree.js";
+import { containedPath } from "../../extensions/agent-plugins/validation.js";
 import { spawn } from "node:child_process";
+import { mkdir } from "node:fs/promises";
 import { getDefaultEnvironment } from "@modelcontextprotocol/sdk/client/stdio.js";
 import process from "node:process";
 import { PassThrough } from "node:stream";
@@ -24,6 +26,14 @@ var XopcStdioClientTransport = class {
 	}
 	async start() {
 		if (this.process) throw new Error("XopcStdioClientTransport already started; Client.connect() starts transports automatically.");
+		if (this.serverParams.pluginDataDir) {
+			const data = this.serverParams.pluginDataDir;
+			await mkdir(data, {
+				recursive: true,
+				mode: 448
+			});
+			if (this.serverParams.cwd) containedPath(this.serverParams.cwd.startsWith(data) ? data : this.serverParams.env?.PLUGIN_ROOT ?? data, this.serverParams.cwd);
+		}
 		await new Promise((resolve, reject) => {
 			const baseEnv = {
 				...getDefaultEnvironment(),

package/dist/src/agent/mcp/mcp-transport.js

@@ -2,11 +2,13 @@ import { init_paths_state, resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
+import { McpOAuthStore } from "./oauth/mcp-oauth-store.js";
+import { pluginOAuthScope } from "../../extensions/agent-plugins/auth.js";
 import { buildRuntimeEnvironment, resolveRuntimeCommand } from "../../runtime-tools/environment.js";
 import { XopcStdioClientTransport } from "./mcp-stdio-transport.js";
 import { resolveMcpTransportConfig } from "./mcp-transport-config.js";
-import { McpOAuthStore } from "./oauth/mcp-oauth-store.js";
 import { XopcMcpOAuthClientProvider } from "./oauth/mcp-oauth-provider.js";
+import { createPluginHttpFetch } from "./plugin-http-fetch.js";
 import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 import { getDefaultEnvironment } from "@modelcontextprotocol/sdk/client/stdio.js";
@@ -64,6 +66,7 @@ function buildScopedHttpFetch(serverUrl, headers) {
 async function resolveMcpTransport(serverName, rawServer, config, options = {}) {
 	const resolved = resolveMcpTransportConfig(serverName, rawServer);
 	if (!resolved) return null;
+	const plugin = rawServer && typeof rawServer === "object" ? rawServer.xopcPlugin : void 0;
 	if (resolved.kind === "stdio") {
 		const command = config ? await resolveRuntimeCommand({
 			command: resolved.command,
@@ -84,7 +87,8 @@ async function resolveMcpTransport(serverName, rawServer, config, options = {})
 			args: resolved.args,
 			env,
 			cwd: resolved.cwd,
-			stderr: "pipe"
+			stderr: "pipe",
+			pluginDataDir: plugin?.dataDir
 		});
 		return {
 			transport,
@@ -100,7 +104,7 @@ async function resolveMcpTransport(serverName, rawServer, config, options = {})
 		const oauthEnabled = Boolean(resolved.auth);
 		let oauthProvider = options.oauthProvider;
 		if (resolved.auth && !oauthProvider) {
-			const store = options.oauthStore ?? new McpOAuthStore();
+			const store = options.oauthStore ?? new McpOAuthStore(pluginOAuthScope(rawServer));
 			if ((await store.load(serverUrl))?.tokens) oauthProvider = new XopcMcpOAuthClientProvider({
 				serverUrl,
 				clientId: resolved.auth.clientId,
@@ -110,8 +114,8 @@ async function resolveMcpTransport(serverName, rawServer, config, options = {})
 		return {
 			transport: new StreamableHTTPClientTransport(serverUrl, {
 				authProvider: oauthProvider,
-				requestInit: !oauthEnabled && resolved.headers ? { headers: resolved.headers } : void 0,
-				fetch: oauthEnabled ? buildScopedHttpFetch(serverUrl, resolved.headers ?? {}) : fetchWithUndici
+				requestInit: !plugin && !oauthEnabled && resolved.headers ? { headers: resolved.headers } : void 0,
+				fetch: plugin ? createPluginHttpFetch(serverUrl, resolved.headers ?? {}) : oauthEnabled ? buildScopedHttpFetch(serverUrl, resolved.headers ?? {}) : fetchWithUndici
 			}),
 			description: resolved.description,
 			transportType: "streamable-http",
@@ -123,9 +127,9 @@ async function resolveMcpTransport(serverName, rawServer, config, options = {})
 	const hasHeaders = Object.keys(headers).length > 0;
 	return {
 		transport: new SSEClientTransport(new URL(resolved.url), {
-			requestInit: hasHeaders ? { headers } : void 0,
-			fetch: fetchWithUndici,
-			eventSourceInit: { fetch: buildSseEventSourceFetch(headers) }
+			requestInit: !plugin && hasHeaders ? { headers } : void 0,
+			fetch: plugin ? createPluginHttpFetch(new URL(resolved.url), headers) : fetchWithUndici,
+			eventSourceInit: { fetch: plugin ? createPluginHttpFetch(new URL(resolved.url), headers) : buildSseEventSourceFetch(headers) }
 		}),
 		description: resolved.description,
 		transportType: "sse",

package/dist/src/agent/mcp/oauth/index.js

@@ -1,5 +1,5 @@
-import { McpAuthorizationRequiredError, isMcpAuthorizationError } from "./mcp-oauth-errors.js";
 import { McpOAuthStore, canonicalMcpServerUrl, mcpOAuthServerKey } from "./mcp-oauth-store.js";
+import { McpAuthorizationRequiredError, isMcpAuthorizationError } from "./mcp-oauth-errors.js";
 import { XopcMcpOAuthClientProvider } from "./mcp-oauth-provider.js";
 import { McpOAuthSession } from "./mcp-oauth-session.js";
 import { McpOAuthManager, getMcpOAuthManager } from "./mcp-oauth-manager.js";

package/dist/src/agent/mcp/oauth/mcp-oauth-manager.d.ts

@@ -15,11 +15,16 @@ type StartMcpOAuthParams = {
 export declare class McpOAuthManager {
     private readonly store;
     private readonly sessionsByServerUrl;
+    private readonly pending;
+    private cancelling;
     constructor(store?: McpOAuthStore);
     status(serverId: string, rawServer: unknown): Promise<McpOAuthStatus>;
     start(params: StartMcpOAuthParams): Promise<McpOAuthStatus>;
+    cancelPending(): Promise<void>;
+    private startSession;
     disconnect(serverId: string, rawServer: unknown): Promise<McpOAuthStatus>;
+    submitCallback(serverId: string, rawServer: unknown, callbackUrl: string): Promise<McpOAuthStatus>;
     private finishAuthorization;
 }
-export declare function getMcpOAuthManager(): McpOAuthManager;
+export declare function getMcpOAuthManager(rawServer?: unknown): McpOAuthManager;
 export {};

package/dist/src/agent/mcp/oauth/mcp-oauth-manager.js

@@ -2,10 +2,12 @@ import { createLogger } from "../../../utils/logger/index.js";
 import { init_logger } from "../../../utils/logger.js";
 import { init_global_singleton, resolveGlobalSingleton } from "../../../utils/global-singleton.js";
 import { resolveConnectorSecretReferences } from "../../../connectors/secret-store.js";
+import { recordPluginMcpHealth } from "../../../extensions/agent-plugins/health.js";
 import { redactSensitiveUrlLikeString } from "../../../utils/redact-sensitive-url.js";
+import { McpOAuthStore, canonicalMcpServerUrl } from "./mcp-oauth-store.js";
+import { pluginOAuthScope } from "../../../extensions/agent-plugins/auth.js";
 import { resolveMcpTransportConfig } from "../mcp-transport-config.js";
 import { isMcpAuthorizationError } from "./mcp-oauth-errors.js";
-import { McpOAuthStore, canonicalMcpServerUrl } from "./mcp-oauth-store.js";
 import { XopcMcpOAuthClientProvider } from "./mcp-oauth-provider.js";
 import { resolveMcpTransport } from "../mcp-transport.js";
 import { disposeAllSessionMcpRuntimes } from "../bundle-mcp-runtime.js";
@@ -49,6 +51,8 @@ function isAuthorizing(snapshot) {
 var McpOAuthManager = class {
 	store;
 	sessionsByServerUrl = /* @__PURE__ */ new Map();
+	pending = /* @__PURE__ */ new Set();
+	cancelling = false;
 	constructor(store = new McpOAuthStore()) {
 		this.store = store;
 	}
@@ -83,7 +87,28 @@ var McpOAuthManager = class {
 		};
 	}
 	async start(params) {
+		if (this.cancelling) throw new Error("OAuth connections are being cleared");
+		const task = this.startSession(params);
+		this.pending.add(task);
+		try {
+			return await task;
+		} finally {
+			this.pending.delete(task);
+		}
+	}
+	async cancelPending() {
+		this.cancelling = true;
+		try {
+			await Promise.all([...this.sessionsByServerUrl.values()].map((session) => session.close()));
+			await Promise.allSettled([...this.pending]);
+			this.sessionsByServerUrl.clear();
+		} finally {
+			this.cancelling = false;
+		}
+	}
+	async startSession(params) {
 		const rawServer = await resolveConnectorSecretReferences(params.rawServer);
+		if (this.cancelling) throw new Error("OAuth connections are being cleared");
 		const resolvedConfig = resolveMcpTransportConfig(params.serverId, rawServer);
 		if (!resolvedConfig || resolvedConfig.kind !== "http" || !resolvedConfig.auth) throw new Error(`MCP server "${params.serverId}" is not configured for OAuth`);
 		const serverUrl = new URL(resolvedConfig.url);
@@ -139,23 +164,39 @@ var McpOAuthManager = class {
 		const client = createClient();
 		try {
 			await connectClient(client, resolved);
+			if (session.snapshot().status === "cancelled") {
+				await this.store.delete(serverUrl);
+				await closeConnection(client, resolved);
+				return {
+					configured: true,
+					status: "disconnected"
+				};
+			}
 			session.complete();
+			recordPluginMcpHealth(rawServer, "ready");
 			await closeConnection(client, resolved);
 			await disposeAllSessionMcpRuntimes();
 		} catch (error) {
-			if (!isMcpAuthorizationError(error) || !session.snapshot().authorizationUrl) {
+			if (session.snapshot().status === "cancelled") {
+				await this.store.delete(serverUrl);
+				await closeConnection(client, resolved);
+			} else if (!isMcpAuthorizationError(error) || !session.snapshot().authorizationUrl) {
 				session.fail(error);
 				await closeConnection(client, resolved);
-			} else this.finishAuthorization({
-				session,
-				provider,
-				client,
-				resolved,
-				params: {
-					...params,
-					rawServer
-				}
-			});
+			} else {
+				const task = this.finishAuthorization({
+					session,
+					provider,
+					client,
+					resolved,
+					params: {
+						...params,
+						rawServer
+					}
+				});
+				this.pending.add(task);
+				task.finally(() => this.pending.delete(task));
+			}
 		}
 		return this.status(params.serverId, params.rawServer);
 	}
@@ -167,12 +208,21 @@ var McpOAuthManager = class {
 		this.sessionsByServerUrl.delete(conversationId);
 		if (session) await session.close();
 		await this.store.delete(resolved.url);
+		recordPluginMcpHealth(rawServer, "authorization_required");
 		await disposeAllSessionMcpRuntimes();
 		return {
 			configured: true,
 			status: "disconnected"
 		};
 	}
+	async submitCallback(serverId, rawServer, callbackUrl) {
+		const resolved = resolveMcpTransportConfig(serverId, rawServer);
+		if (!resolved || resolved.kind !== "http") throw new Error("Unknown OAuth server");
+		const session = this.sessionsByServerUrl.get(canonicalMcpServerUrl(resolved.url));
+		if (!session) throw new Error("OAuth session not found");
+		session.submitCallback(callbackUrl);
+		return this.status(serverId, rawServer);
+	}
 	async finishAuthorization(context) {
 		const { session, provider, client, resolved, params } = context;
 		try {
@@ -195,7 +245,12 @@ var McpOAuthManager = class {
 			} finally {
 				await closeConnection(authenticatedClient, authenticated);
 			}
+			if (session.snapshot().status === "cancelled") {
+				await this.store.delete(session.serverUrl);
+				return;
+			}
 			session.complete();
+			recordPluginMcpHealth(params.rawServer, "ready");
 			await disposeAllSessionMcpRuntimes();
 		} catch (error) {
 			if (session.snapshot().status === "cancelled") {
@@ -213,8 +268,9 @@ var McpOAuthManager = class {
 		}
 	}
 };
-function getMcpOAuthManager() {
-	return resolveGlobalSingleton(MCP_OAUTH_MANAGER_KEY, () => new McpOAuthManager());
+function getMcpOAuthManager(rawServer) {
+	const scope = pluginOAuthScope(rawServer);
+	return resolveGlobalSingleton(scope ? Symbol.for(`xopc.mcpOAuthManager:${scope}`) : MCP_OAUTH_MANAGER_KEY, () => new McpOAuthManager(new McpOAuthStore(scope)));
 }
 //#endregion
 export { McpOAuthManager, getMcpOAuthManager };

package/dist/src/agent/mcp/oauth/mcp-oauth-provider.js

@@ -1,5 +1,5 @@
-import { McpAuthorizationRequiredError } from "./mcp-oauth-errors.js";
 import { McpOAuthStore } from "./mcp-oauth-store.js";
+import { McpAuthorizationRequiredError } from "./mcp-oauth-errors.js";
 //#region src/agent/mcp/oauth/mcp-oauth-provider.ts
 var XopcMcpOAuthClientProvider = class {
 	store;

package/dist/src/agent/mcp/oauth/mcp-oauth-session.d.ts

@@ -19,6 +19,8 @@ export declare class McpOAuthSession {
     get redirectUrl(): URL;
     start(): Promise<void>;
     setAuthorizationUrl(url: URL): void;
+    /** Remote Gateway users can submit the browser's loopback callback URL over the authenticated API. */
+    submitCallback(url: string): void;
     waitForCode(): Promise<string>;
     complete(): void;
     fail(error: unknown): void;

package/dist/src/agent/mcp/oauth/mcp-oauth-session.js

@@ -110,6 +110,18 @@ var McpOAuthSession = class {
 		this.authorizationUrlValue = url.toString();
 		this.statusValue = "waiting_browser";
 	}
+	/** Remote Gateway users can submit the browser's loopback callback URL over the authenticated API. */
+	submitCallback(url) {
+		const callback = new URL(url);
+		if (callback.origin !== this.redirectUrl.origin || callback.pathname !== CALLBACK_PATH || callback.searchParams.get("state") !== this.state) throw new Error("MCP OAuth callback mismatch");
+		if (this.statusValue !== "waiting_browser" || this.callbackConsumed || Date.now() >= this.expiresAt) throw new Error("MCP OAuth session is not waiting for a callback");
+		const code = callback.searchParams.get("code");
+		if (!code || callback.searchParams.has("error")) throw new Error("MCP OAuth authorization code is missing or denied");
+		this.callbackConsumed = true;
+		this.statusValue = "exchanging_code";
+		this.settleCode?.({ code });
+		this.settleCode = void 0;
+	}
 	async waitForCode() {
 		const result = await this.codePromise;
 		if (result.error) throw result.error;

package/dist/src/agent/mcp/oauth/mcp-oauth-store.d.ts

@@ -2,7 +2,10 @@ import type { McpOAuthRecord } from './mcp-oauth-types.js';
 export declare function canonicalMcpServerUrl(input: string | URL): string;
 export declare function mcpOAuthServerKey(input: string | URL): string;
 export declare class McpOAuthStore {
+    private readonly identityScope?;
+    constructor(identityScope?: string);
     pathFor(serverUrl: string | URL): string;
+    deleteScope(): Promise<void>;
     load(serverUrlInput: string | URL): Promise<McpOAuthRecord | undefined>;
     update(serverUrlInput: string | URL, update: (current: McpOAuthRecord | undefined) => McpOAuthRecord | undefined): Promise<McpOAuthRecord | undefined>;
     delete(serverUrl: string | URL): Promise<void>;

package/dist/src/agent/mcp/oauth/mcp-oauth-store.js

@@ -1,5 +1,6 @@
-import { init_write_file_atomic, writeTextAtomic } from "../../../infra/write-file-atomic.js";
 import { init_paths, resolveMcpOAuthPath } from "../../../config/paths.js";
+import { init_write_file_atomic, writeTextAtomic } from "../../../infra/write-file-atomic.js";
+import { dirname, join } from "node:path";
 import { createHash } from "node:crypto";
 import { readFile, rm } from "node:fs/promises";
 //#region src/agent/mcp/oauth/mcp-oauth-store.ts
@@ -41,8 +42,19 @@ async function serializeWrite(key, operation) {
 	}
 }
 var McpOAuthStore = class {
+	constructor(identityScope) {
+		this.identityScope = identityScope;
+	}
 	pathFor(serverUrl) {
-		return resolveMcpOAuthPath(mcpOAuthServerKey(serverUrl));
+		const endpoint = mcpOAuthServerKey(serverUrl);
+		return this.identityScope ? join(dirname(resolveMcpOAuthPath(endpoint)), createHash("sha256").update(this.identityScope).digest("hex"), `${endpoint}.json`) : resolveMcpOAuthPath(endpoint);
+	}
+	async deleteScope() {
+		if (!this.identityScope) throw new Error("Cannot remove unscoped MCP credentials");
+		await rm(dirname(this.pathFor("https://scope.invalid")), {
+			recursive: true,
+			force: true
+		});
 	}
 	async load(serverUrlInput) {
 		const serverUrl = canonicalMcpServerUrl(serverUrlInput);

package/dist/src/agent/mcp/plugin-http-fetch.d.ts

@@ -0,0 +1,2 @@
+import type { FetchLike } from '@modelcontextprotocol/sdk/shared/transport.js';
+export declare function createPluginHttpFetch(endpoint: URL, configuredHeaders: Record<string, string>): FetchLike;

package/dist/src/agent/mcp/plugin-http-fetch.js

@@ -0,0 +1,56 @@
+import { BlockList, isIP } from "node:net";
+import { Agent, fetch } from "undici";
+import { lookup } from "node:dns";
+//#region src/agent/mcp/plugin-http-fetch.ts
+const blocked = new BlockList();
+for (const [network, prefix] of [
+	["0.0.0.0", 8],
+	["10.0.0.0", 8],
+	["100.64.0.0", 10],
+	["127.0.0.0", 8],
+	["169.254.0.0", 16],
+	["172.16.0.0", 12],
+	["192.168.0.0", 16],
+	["224.0.0.0", 4],
+	["240.0.0.0", 4]
+]) blocked.addSubnet(network, prefix);
+for (const [network, prefix] of [
+	["::", 128],
+	["::1", 128],
+	["fc00::", 7],
+	["fe80::", 10],
+	["ff00::", 8]
+]) blocked.addSubnet(network, prefix, "ipv6");
+const isBlocked = (address) => blocked.check(address, isIP(address) === 6 ? "ipv6" : "ipv4");
+const loopback = (host) => host === "localhost" || host === "[::1]" || /^127(?:\.\d{1,3}){3}$/.test(host);
+const publicDispatcher = new Agent({ connect: { lookup(host, options, callback) {
+	lookup(host, {
+		...options,
+		all: true
+	}, (error, addresses) => {
+		if (error) return callback(error, []);
+		if (!addresses.length || addresses.some((entry) => isBlocked(entry.address))) return callback(/* @__PURE__ */ new Error("Plugin MCP cannot access private network addresses"), []);
+		if (options.all) callback(null, addresses);
+		else callback(null, addresses[0].address, addresses[0].family);
+	});
+} } });
+function createPluginHttpFetch(endpoint, configuredHeaders) {
+	return async (input, init) => {
+		const url = new URL(input);
+		if (!["https:", "http:"].includes(url.protocol) || url.username || url.password || url.hash) throw new Error("Invalid plugin MCP request URL");
+		const local = loopback(endpoint.hostname) && url.origin === endpoint.origin;
+		if (!local && url.protocol !== "https:") throw new Error("Plugin MCP requires HTTPS");
+		const address = url.hostname.replace(/^\[|\]$/g, "");
+		if (!local && isIP(address) && isBlocked(address)) throw new Error("Plugin MCP cannot access private network addresses");
+		const headers = new Headers(url.origin === endpoint.origin ? configuredHeaders : void 0);
+		new Headers(init?.headers).forEach((value, key) => headers.set(key, value));
+		return await fetch(url, {
+			...init,
+			headers,
+			redirect: "error",
+			...local ? {} : { dispatcher: publicDispatcher }
+		});
+	};
+}
+//#endregion
+export { createPluginHttpFetch };

package/dist/src/agent/service/process-direct-streaming.js

@@ -1,3 +1,5 @@
+import { parseUserTurnDocument, renderUserTurnDocument } from "../../../packages/gateway-contract/src/user-turn-document.js";
+import { init_src } from "../../../packages/gateway-contract/src/index.js";
 import { getClarificationResumeInput } from "../../storage/sqlite/clarification-wait-repository.js";
 import { getConnectionResumeInput, init_connection_wait_repository } from "../../storage/sqlite/connection-wait-repository.js";
 import { init_agent_scope, resolveDefaultAgentId } from "../agent-scope.js";
@@ -21,6 +23,7 @@ import { isSuccessfulWebchatTtsToolEvent } from "./webchat-tts.js";
 //#region src/agent/service/process-direct-streaming.ts
 init_agent_session_key();
 init_agent_scope();
+init_src();
 init_connection_wait_repository();
 const MAX_BUFFERED_STREAM_EVENTS = 512;
 const LOSSY_STREAM_EVENT_TYPES = new Set([
@@ -235,6 +238,17 @@ async function* runProcessDirectStreaming(deps, input) {
 				}
 				signal.addEventListener("abort", armAbort, { once: true });
 			}
+			const sourceContexts = [...input.sourceContexts ?? []];
+			if (deps.sourceContextResolver) {
+				const metadata = await deps.sessionStore.getMetadata(conversationId).catch(() => null);
+				const sourceBinding = metadata?.customData && typeof metadata.customData === "object" ? metadata.customData.sourceBinding : void 0;
+				if (isSessionSourceBinding(sourceBinding)) {
+					const sourceContext = await deps.sourceContextResolver(sourceBinding, conversationId);
+					if (sourceContext && !sourceContexts.some((context) => context.kind === sourceContext.kind && context.sourceId === sourceContext.sourceId)) sourceContexts.push(sourceContext);
+				}
+			}
+			const userTurnDocument = parseUserTurnDocument(mergedUserText);
+			const authoredText = userTurnDocument ? renderUserTurnDocument(userTurnDocument, (refId) => sourceContexts.find((context) => context.refId === refId)?.title ?? null) : mergedUserText;
 			const slash = await tryRunSlashCommand(deps, {
 				conversationId,
 				channel,
@@ -242,7 +256,7 @@ async function* runProcessDirectStreaming(deps, input) {
 				senderId: context.senderId,
 				isGroup: context.isGroup,
 				inboundMetadata: context.metadata
-			}, mergedUserText, {
+			}, authoredText, {
 				skipResetCommands: resetTriggeredAtInit,
 				emitEvent: (event) => {
 					pushVisible({
@@ -274,25 +288,26 @@ async function* runProcessDirectStreaming(deps, input) {
 				});
 				return;
 			}
-			const skillTurn = deps.agentManager.prepareSkillTurn(conversationId, mergedUserText);
+			const skillTurn = deps.agentManager.prepareSkillTurn(conversationId, authoredText);
 			const textForAgent = skillTurn.text;
-			const userMessage = await deps.buildTranscriptUserMessage(textForAgent, prepared, conversationId, { suppressMediaPromptUris });
-			const sourceContexts = [...input.sourceContexts ?? []];
-			if (deps.sourceContextResolver) {
-				const metadata = await deps.sessionStore.getMetadata(conversationId).catch(() => null);
-				const sourceBinding = metadata?.customData && typeof metadata.customData === "object" ? metadata.customData.sourceBinding : void 0;
-				if (isSessionSourceBinding(sourceBinding)) {
-					const sourceContext = await deps.sourceContextResolver(sourceBinding, conversationId);
-					if (sourceContext && !sourceContexts.some((context) => context.kind === sourceContext.kind && context.sourceId === sourceContext.sourceId)) sourceContexts.push(sourceContext);
+			const builtUserMessage = await deps.buildTranscriptUserMessage(textForAgent, prepared, conversationId, { suppressMediaPromptUris });
+			const userMessage = userTurnDocument ? {
+				...builtUserMessage,
+				metadata: {
+					...builtUserMessage.metadata ?? {},
+					userTurnDocument
 				}
-			}
+			} : builtUserMessage;
 			if (channel === "webchat" && !isInternalResume) {
 				pushVisible({
 					type: "user_message",
 					timestamp: userMessage.timestamp ?? Date.now(),
 					content: readAgentMessageContent(userMessage),
 					media: userMessage.media,
-					metadata: sourceContexts.length > 0 ? { sourceContexts: sourceContexts.map(summarizeSourceContext) } : void 0
+					metadata: sourceContexts.length > 0 || userTurnDocument ? {
+						...sourceContexts.length > 0 ? { sourceContexts: sourceContexts.map(summarizeSourceContext) } : {},
+						...userTurnDocument ? { userTurnDocument } : {}
+					} : void 0
 				});
 				if (textForAgent.trim()) deps.enqueueProvisionalSessionTitle?.(conversationId, textForAgent);
 			}

package/dist/src/agent/service.js

@@ -2,11 +2,11 @@ import { createLogger } from "../utils/logger/index.js";
 import { init_logger } from "../utils/logger.js";
 import { parseNoteAttachmentTarget } from "../notes/attachment-ref.js";
 import { getAgentDefaultModelRef, init_schema } from "../config/schema.js";
+import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { init_agent_scope, resolveAgentHomeDir, resolveDefaultAgentId } from "./agent-scope.js";
 import { init_agent_session_key, resolveAgentIdFromConversationId } from "../routing/agent-session-key.js";
-import { init_providers, resolveModel } from "../providers/index.js";
-import { applyConfigOverrides } from "../config/runtime-overrides.js";
 import { extractProfileAgentId } from "../config/agent-profile.js";
+import { init_providers, resolveModel } from "../providers/index.js";
 import { extractTextContent } from "./context/workspace.js";
 import { effectiveWorkspacePathForSession } from "../session/session-workspace.js";
 import { getProjectForSession } from "../projects/workspace.js";
@@ -240,6 +240,7 @@ var AgentService = class {
 			getProjectService: config.getProjectService,
 			getWorkDiscovery: config.getWorkDiscovery,
 			getLocalAppService: config.getLocalAppService,
+			getChatPreviewService: config.getChatPreviewService,
 			dispatchTaskEvents: config.dispatchTaskEvents,
 			dispatchTaskRuns: config.dispatchTaskRuns,
 			getWorkflowRunService: config.getWorkflowRunService,

package/dist/src/agent/service.types.d.ts

@@ -7,6 +7,7 @@ import type { ExtensionRegistryImpl as ExtensionRegistry } from '../extensions/i
 import type { NotesService } from '../notes/index.js';
 import type { ProjectService } from '../projects/index.js';
 import type { LocalAppService } from '../local-apps/index.js';
+import type { ChatPreviewService } from '../chat-previews/index.js';
 import type { GatewayClarifyRequestFn } from './tools/clarify-tool.js';
 import type { AgentSourceContextResolver } from './source-context/types.js';
 import type { EndpointToolRuntime } from '../endpoint-tools/index.js';
@@ -37,6 +38,7 @@ export interface AgentServiceConfig {
     getProjectService?: () => ProjectService | undefined;
     getWorkDiscovery?: () => import('../work-discovery/service.js').WorkDiscoveryService | undefined;
     getLocalAppService?: () => LocalAppService | undefined;
+    getChatPreviewService?: () => ChatPreviewService | undefined;
     dispatchTaskEvents?: () => void;
     dispatchTaskRuns?: () => void;
     /**

package/dist/src/agent/session/session-inspector.js

@@ -1,8 +1,8 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_workspace_defaults, resolveDefaultAgentWorkspaceDir } from "../../config/workspace-defaults.js";
-import { init_providers, resolveModel } from "../../providers/index.js";
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
+import { init_providers, resolveModel } from "../../providers/index.js";
 import { getExecutionEnvironmentForSession } from "../../execution-environments/subject.js";
 import { effectiveWorkspacePathForSession, projectWorkspacePath } from "../../session/session-workspace.js";
 import { getProjectForSession } from "../../projects/workspace.js";

package/dist/src/agent/skills/hub-lock.js

@@ -1,5 +1,5 @@
-import { init_write_file_atomic, writeTextAtomicSync } from "../../infra/write-file-atomic.js";
 import { init_paths, resolveSkillsLockPath } from "../../config/paths.js";
+import { init_write_file_atomic, writeTextAtomicSync } from "../../infra/write-file-atomic.js";
 import { existsSync, readFileSync } from "node:fs";
 //#region src/agent/skills/hub-lock.ts
 /**

package/dist/src/agent/skills/hub-pull.js

@@ -8,8 +8,8 @@ import { basename, dirname, join, normalize, resolve, sep } from "node:path";
 import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
 import { execFileSync } from "node:child_process";
-import { fetch } from "undici";
 import AdmZip from "adm-zip";
+import { fetch } from "undici";
 //#region src/agent/skills/hub-pull.ts
 /**
 * CLI / hub: install or update skills from git or archive (zip / tar.gz) into ~/.xopc/skills.

package/dist/src/agent/skills/index.js

@@ -131,7 +131,14 @@ function discoverAndMergeSkills(sources, maxSkillFileBytes, limits = {}, initial
 	const discoveredSkills = [];
 	const diagnostics = [...initialDiagnostics];
 	for (const source of sources) {
-		const discovered = discoverSkills(source, maxSkillFileBytes, limits.maxSkillsLoadedPerSource, limits.maxCandidatesPerRoot);
+		const discovered = source.skillFiles ? {
+			skills: source.skillFiles.slice(0, limits.maxSkillsLoadedPerSource).flatMap((path) => {
+				const result = loadSkillFromFile(path, source, source.rootDir, maxSkillFileBytes);
+				if (result.diagnostic) diagnostics.push(result.diagnostic);
+				return result.skill ? [result.skill] : [];
+			}),
+			diagnostics: []
+		} : discoverSkills(source, maxSkillFileBytes, limits.maxSkillsLoadedPerSource, limits.maxCandidatesPerRoot);
 		diagnostics.push(...discovered.diagnostics);
 		for (const skill of discovered.skills) {
 			discoveredSkills.push(skill);

package/dist/src/agent/skills/skill-manager.d.ts

@@ -19,6 +19,7 @@ export declare class SkillManager {
     private workspace;
     private bundledSkillsDir;
     private version;
+    private pluginRevision;
     private loadedAt;
     private reloadInProgress;
     private reloadPending;
@@ -60,6 +61,7 @@ export declare class SkillManager {
      * Get all loaded skills
      */
     getSkills(): Skill[];
+    private refreshPlugins;
     getDiagnostics(): SkillDiagnostic[];
     getVersion(): string;
     getLoadedAt(): number;

package/dist/src/agent/skills/skill-manager.js

@@ -2,6 +2,7 @@ import { resolveStateDir } from "../../config/paths-state.js";
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { init_paths, resolveBundledSkillsDir } from "../../config/paths.js";
+import { AgentPluginStore } from "../../extensions/agent-plugins/store.js";
 import { createSkillConfigManager, isSkillEnabled } from "./config.js";
 import { formatSkillsForPrompt, selectSkillsVisibleInPrompt } from "./format-skills-prompt.js";
 import { createSkillLoader } from "./index.js";
@@ -22,6 +23,7 @@ var SkillManager = class {
 	workspace;
 	bundledSkillsDir;
 	version = 0;
+	pluginRevision = "";
 	loadedAt = 0;
 	reloadInProgress = false;
 	reloadPending = false;
@@ -73,6 +75,7 @@ var SkillManager = class {
 			try {
 				const result = load();
 				this.applyLoadResult(result);
+				this.pluginRevision = new AgentPluginStore().revisionKey();
 				this.lastReloadOk = true;
 				this.lastReloadError = void 0;
 				log.info({
@@ -117,6 +120,7 @@ var SkillManager = class {
 	* Get the skill prompt to append to system prompt
 	*/
 	getPrompt() {
+		this.refreshPlugins();
 		return this.skillPrompt;
 	}
 	/**
@@ -140,8 +144,12 @@ var SkillManager = class {
 	* Get all loaded skills
 	*/
 	getSkills() {
+		this.refreshPlugins();
 		return [...this.skills];
 	}
+	refreshPlugins() {
+		if (!this.reloadInProgress && this.pluginRevision !== new AgentPluginStore().revisionKey()) this.reload();
+	}
 	getDiagnostics() {
 		return this.skillLoader.getDiagnostics();
 	}