@xopcai/xopc 0.0.191 → 0.0.192

package/dist/src/agent/embedded/run-for-session.js

@@ -1,5 +1,6 @@
 import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
+import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { init_providers, resolveModel } from "../../providers/index.js";
 import { resolveAgentTurnTimeoutMs } from "../orchestration/run-agent-turn-with-timeout.js";
 import { evaluateContextBudget } from "../memory/context-budget.js";
@@ -47,6 +48,7 @@ async function runEmbeddedTurnForSession(params) {
 	const thinkingLevel = params.thinkingOverride ?? agent.state.thinkingLevel;
 	const workspaceDir = agentManager.getResolvedWorkspaceForSession(sessionKey);
 	const config = params.getConfig?.();
+	const cacheRetention = config ? resolveEffectiveAgentProfileForSession(config, sessionKey).manifest.runtime?.promptCacheRetention : void 0;
 	const configuredTurnTimeoutMs = resolveAgentTurnTimeoutMs(config, sessionKey);
 	const turnTimeoutMs = params.deadlineAtMs === void 0 ? configuredTurnTimeoutMs : Math.max(1, Math.min(configuredTurnTimeoutMs, params.deadlineAtMs - Date.now()));
 	let userMessageForTurn = userMessage;
@@ -113,6 +115,7 @@ async function runEmbeddedTurnForSession(params) {
 					tools,
 					systemPrompt,
 					thinkingLevel,
+					cacheRetention,
 					workspaceDir,
 					sessionStore,
 					timeoutMs: turnTimeoutMs,

package/dist/src/agent/embedded/run-turn.js

@@ -173,7 +173,10 @@ async function runXopcEmbeddedTurn(params) {
 					tools: effectiveContext.tools
 				} } : {}
 			}, "Sending messages to AI");
-			return streamFnWithXopcExtensions(streamModel, effectiveContext, options);
+			return streamFnWithXopcExtensions(streamModel, effectiveContext, {
+				...options,
+				...params.cacheRetention ? { cacheRetention: params.cacheRetention } : {}
+			});
 		};
 		session.agent.streamFunction = loggingStreamFn;
 		if (onEvent) unsubscribe = subscribeEmbeddedSessionEvents(session, (event) => {

package/dist/src/agent/embedded/session-runner.js

@@ -19,16 +19,15 @@ function providerCredentialRevision(providerId) {
 }
 function buildEmbeddedRunnerFingerprint(input) {
 	const tools = [...input.toolNames].sort().join("\0");
-	const promptMarker = `${input.systemPrompt.length}:${input.systemPrompt.slice(0, 128)}`;
-	return [
+	return createHash("sha256").update([
 		input.sessionId,
 		input.workspaceDir,
 		input.modelRef,
 		tools,
-		promptMarker,
+		input.systemPrompt,
 		input.thinkingLevel,
 		input.credentialRevision
-	].join("");
+	].join("\0")).digest("base64url");
 }
 function isEmbeddedSessionRunnerEnabled() {
 	const raw = process.env.XOPC_SESSION_RUNNER?.trim().toLowerCase();

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

@@ -1,5 +1,5 @@
 import type { AgentMessage, AgentToolResult, ThinkingLevel } from '@earendil-works/pi-agent-core';
-import type { AssistantMessageEvent, Model, Api, ImageContent } from '@earendil-works/pi-ai';
+import type { AssistantMessageEvent, Model, Api, CacheRetention, ImageContent } from '@earendil-works/pi-ai';
 import type { SessionStore } from '../../session/store.js';
 export type EmbeddedStreamEvent = {
     type: 'agent_start';
@@ -62,6 +62,14 @@ export type EmbeddedStreamEvent = {
         content: string;
         kind: string;
     }>;
+} | {
+    type: 'memory_candidate';
+    runId?: string;
+    records: Array<{
+        id: string;
+        content: string;
+        kind: string;
+    }>;
 } | {
     type: 'error';
     runId?: string;
@@ -83,6 +91,7 @@ export type RunXopcEmbeddedTurnParams = {
     tools: import('@earendil-works/pi-agent-core').AgentTool[];
     systemPrompt: string;
     thinkingLevel?: ThinkingLevel;
+    cacheRetention?: CacheRetention;
     workspaceDir: string;
     sessionStore: SessionStore;
     timeoutMs: number;

package/dist/src/agent/embedded/xopc-stream-bridge.js

@@ -1,6 +1,7 @@
 import "../../providers/constants.js";
 import { init_providers } from "../../providers/index.js";
 import { createExtensionAwareStreamFn } from "../../providers/extension-stream-bridge.js";
+import { preparePromptCacheContext, withPromptCachePayloadTransform } from "../../providers/prompt-cache-payload.js";
 //#region src/agent/embedded/xopc-stream-bridge.ts
 init_providers();
 /**
@@ -15,8 +16,8 @@ init_providers();
 function wrapStreamFnForXopcExtensions(originalStreamFn) {
 	const extensionStreamFn = createExtensionAwareStreamFn();
 	return ((model, context, options) => {
-		if (model.baseUrl === "extension://provider-plugin") return extensionStreamFn(model, context, options);
-		return originalStreamFn(model, context, options);
+		if (model.baseUrl === "extension://provider-plugin") return extensionStreamFn(model, preparePromptCacheContext(model, context), options);
+		return originalStreamFn(model, preparePromptCacheContext(model, context), withPromptCachePayloadTransform(model, context, options));
 	});
 }
 //#endregion

package/dist/src/agent/external-tools/mcp-provider.d.ts

@@ -25,5 +25,6 @@ export declare class McpToolProvider implements ExternalToolProvider {
     execute(toolRef: string, args: Record<string, unknown>, _approvalId: string | undefined, context: ExternalToolExecutionContext): Promise<AgentToolResult<Record<string, unknown>>>;
     private resolve;
     private isAllowed;
+    private executionSignal;
     private withRuntime;
 }

package/dist/src/agent/external-tools/mcp-provider.js

@@ -1,6 +1,6 @@
 import { resolveEffectiveAgentProfileForSession } from "../../config/agent-profile.js";
 import { externalToolRef, parseExternalToolRef } from "./refs.js";
-import { isMcpCatalogToolDenied, mcpToolPolicyId } from "../mcp/bundle-mcp-policy.js";
+import { isMcpCatalogToolDenied, mcpToolPolicyId, resolveMcpToolPolicy } from "../mcp/bundle-mcp-policy.js";
 import { getOrCreateSessionMcpRuntime } from "../mcp/bundle-mcp-runtime.js";
 //#region src/agent/external-tools/mcp-provider.ts
 function policyToolId(tool) {
@@ -33,9 +33,9 @@ var McpToolProvider = class {
 	async search(_query) {
 		return this.withRuntime(async (runtime) => {
 			return (await runtime.getCatalog()).tools.filter((tool) => this.isAllowed(tool)).map((tool) => ({
-				toolRef: externalToolRef(this.source, tool.serverName, tool.toolName),
+				toolRef: externalToolRef(this.source, tool.safeServerName, tool.toolName),
 				source: this.source,
-				namespace: tool.serverName,
+				namespace: tool.safeServerName,
 				title: tool.title || tool.toolName,
 				summary: tool.description || tool.fallbackDescription
 			}));
@@ -71,7 +71,7 @@ var McpToolProvider = class {
 				if (!hook.allowed) throw new Error(hook.reason ?? "MCP tool call blocked by policy hook.");
 				executionArgs = hook.params ?? args;
 			}
-			const result = await runtime.callTool(tool.serverName, tool.toolName, executionArgs, context.signal);
+			const result = await runtime.callTool(tool.serverName, tool.toolName, executionArgs, this.executionSignal(tool, context.signal));
 			return toAgentToolResult({
 				serverName: tool.serverName,
 				toolName: tool.toolName,
@@ -82,7 +82,7 @@ var McpToolProvider = class {
 	async resolve(runtime, toolRef) {
 		const parsed = parseExternalToolRef(toolRef, this.source);
 		if (!parsed) return void 0;
-		const tool = (await runtime.getCatalog()).tools.find((candidate) => candidate.serverName === parsed.namespace && candidate.toolName === parsed.toolName);
+		const tool = (await runtime.getCatalog()).tools.find((candidate) => candidate.safeServerName === parsed.namespace && candidate.toolName === parsed.toolName);
 		return tool && this.isAllowed(tool) ? tool : void 0;
 	}
 	isAllowed(tool) {
@@ -90,11 +90,26 @@ var McpToolProvider = class {
 		const sessionKey = this.deps.getSessionKey();
 		const profile = cfg && sessionKey ? resolveEffectiveAgentProfileForSession(cfg, sessionKey) : void 0;
 		const policyName = policyToolId(tool);
-		return !profile?.tools.denied.has(policyName) && !isMcpCatalogToolDenied({
+		return !(resolveMcpToolPolicy({
+			serverId: tool.safeServerName,
+			policyToolId: policyName
+		}, profile?.manifest.tools.mcp)?.scope === "readonly" && tool.annotations?.readOnlyHint !== true) && !profile?.tools.denied.has(policyName) && !isMcpCatalogToolDenied({
 			serverId: tool.safeServerName,
 			policyToolId: policyName
 		}, profile?.manifest.tools.mcp);
 	}
+	executionSignal(tool, signal) {
+		const cfg = this.deps.getConfig();
+		const sessionKey = this.deps.getSessionKey();
+		const profile = cfg && sessionKey ? resolveEffectiveAgentProfileForSession(cfg, sessionKey) : void 0;
+		const timeoutMs = resolveMcpToolPolicy({
+			serverId: tool.safeServerName,
+			policyToolId: policyToolId(tool)
+		}, profile?.manifest.tools.mcp)?.limits?.timeoutMs;
+		if (!timeoutMs) return signal;
+		const timeoutSignal = AbortSignal.timeout(timeoutMs);
+		return signal ? AbortSignal.any([signal, timeoutSignal]) : timeoutSignal;
+	}
 	async withRuntime(run) {
 		const cfg = this.deps.getConfig();
 		const sessionKey = this.deps.getSessionKey();

package/dist/src/agent/image/generation/provider-registry.js

@@ -77,6 +77,7 @@ function listImageGenerationProvidersSummary() {
 		credentialMode: resolveImageGenerationCredentialMode(provider),
 		...provider.documentationUrl ? { documentationUrl: provider.documentationUrl } : {},
 		...provider.apiKeyUrl ? { apiKeyUrl: provider.apiKeyUrl } : {},
+		configFields: structuredClone(provider.configFields ?? []),
 		defaultModel: provider.defaultModel,
 		models: [...provider.models],
 		capabilities: provider.capabilities,

package/dist/src/agent/image/generation/providers/dashscope.js

@@ -211,6 +211,26 @@ function buildDashScopeImageGenerationProvider() {
 	return {
 		id: "dashscope",
 		label: "Alibaba Model Studio",
+		documentationUrl: "https://www.alibabacloud.com/help/en/model-studio/wan-image-generation-and-editing-api-reference",
+		apiKeyUrl: "https://dashscope.console.aliyun.com/apiKey",
+		configFields: [{
+			key: "region",
+			label: "Service region",
+			type: "select",
+			required: true,
+			options: [{
+				value: "cn",
+				label: "China"
+			}, {
+				value: "intl",
+				label: "International"
+			}]
+		}, {
+			key: "baseUrl",
+			label: "Base URL",
+			type: "url",
+			placeholder: "https://…"
+		}],
 		defaultModel: DASHSCOPE_DEFAULT_IMAGE_MODEL,
 		models: [...DASHSCOPE_IMAGE_MODELS],
 		capabilities: DASHSCOPE_CAPABILITIES,

package/dist/src/agent/image/generation/providers/fal.d.ts

@@ -1,5 +1,5 @@
 import type { ImageGenerationProvider, ImageGenerationRequest, ImageGenerationResult } from '../types.js';
-export declare const FAL_DEFAULT_IMAGE_MODEL = "fal-ai/flux/schnell";
+export declare const FAL_DEFAULT_IMAGE_MODEL = "fal-ai/flux-2";
 export declare const FAL_IMAGE_MODELS: readonly string[];
 /**
  * Resolve Fal queue base URL precedence:

package/dist/src/agent/image/generation/providers/fal.js

@@ -28,16 +28,14 @@ import "../../../../providers/auth-runtime/index.js";
 init_logger();
 const log = createLogger("ImageGen:Fal");
 const DEFAULT_FAL_QUEUE_BASE_URL = "https://queue.fal.run";
-const FAL_DEFAULT_IMAGE_MODEL = "fal-ai/flux/schnell";
+const FAL_DEFAULT_IMAGE_MODEL = "fal-ai/flux-2";
 const DEFAULT_TIMEOUT_MS = 6e5;
 const DEFAULT_POLL_INTERVAL_MS = 1500;
 const MAX_POLL_INTERVAL_MS = 5e3;
 const FAL_IMAGE_MODELS = [
 	FAL_DEFAULT_IMAGE_MODEL,
-	"fal-ai/flux/dev",
-	"fal-ai/flux-pro/v1.1",
-	"fal-ai/flux-pro/v1.1-ultra",
-	"fal-ai/nano-banana"
+	"fal-ai/flux-2-pro",
+	"fal-ai/nano-banana-2"
 ];
 const FAL_CAPABILITIES = {
 	generate: {
@@ -240,7 +238,7 @@ async function downloadFalImages(params) {
 async function generateFalImages(params) {
 	const { req, apiKey } = params;
 	const baseUrl = resolveFalBaseUrl(req);
-	const model = req.model?.trim() || "fal-ai/flux/schnell";
+	const model = req.model?.trim() || "fal-ai/flux-2";
 	const submitUrl = `${baseUrl}/${model}`;
 	const httpDefaults = resolveProviderHttpRequestConfig({
 		providerId: "fal",
@@ -291,6 +289,14 @@ function buildFalImageGenerationProvider() {
 	return {
 		id: "fal",
 		label: "Fal.ai",
+		documentationUrl: "https://docs.fal.ai/",
+		apiKeyUrl: "https://fal.ai/dashboard/keys",
+		configFields: [{
+			key: "baseUrl",
+			label: "Base URL",
+			type: "url",
+			placeholder: "https://queue.fal.run"
+		}],
 		defaultModel: FAL_DEFAULT_IMAGE_MODEL,
 		models: [...FAL_IMAGE_MODELS],
 		capabilities: FAL_CAPABILITIES,

package/dist/src/agent/image/generation/providers/google.js

@@ -210,6 +210,14 @@ function buildGoogleImageGenerationProvider() {
 	return {
 		id: "google",
 		label: "Google Gemini",
+		documentationUrl: "https://ai.google.dev/gemini-api/docs/image-generation",
+		apiKeyUrl: "https://aistudio.google.com/app/apikey",
+		configFields: [{
+			key: "baseUrl",
+			label: "Base URL",
+			type: "url",
+			placeholder: "https://generativelanguage.googleapis.com"
+		}],
 		defaultModel: GOOGLE_DEFAULT_IMAGE_MODEL,
 		models: [...GOOGLE_IMAGE_MODELS],
 		capabilities: GOOGLE_CAPABILITIES,

package/dist/src/agent/image/generation/providers/minimax.js

@@ -169,6 +169,26 @@ function buildMinimaxImageGenerationProvider() {
 	return {
 		id: "minimax",
 		label: "MiniMax",
+		documentationUrl: "https://platform.minimaxi.com/document/Image%20Generation",
+		apiKeyUrl: "https://platform.minimaxi.com/user-center/basic-information/interface-key",
+		configFields: [{
+			key: "region",
+			label: "Service region",
+			type: "select",
+			required: true,
+			options: [{
+				value: "cn",
+				label: "China"
+			}, {
+				value: "intl",
+				label: "International"
+			}]
+		}, {
+			key: "baseUrl",
+			label: "Base URL",
+			type: "url",
+			placeholder: "https://…"
+		}],
 		defaultModel: MINIMAX_DEFAULT_IMAGE_MODEL,
 		models: [...MINIMAX_IMAGE_MODELS],
 		capabilities: MINIMAX_CAPABILITIES,

package/dist/src/agent/image/generation/providers/openai.js

@@ -17,7 +17,7 @@ import { createOpenAiImagesProvider } from "../openai-images-provider.js";
 */
 const OPENAI_DEFAULT_BASE_URL = "https://api.openai.com/v1";
 /** Image models exposed by the OpenAI Images API. */
-const OPENAI_IMAGE_MODELS = ["gpt-image-2", "gpt-image-1.5"];
+const OPENAI_IMAGE_MODELS = ["gpt-image-2"];
 const OPENAI_DEFAULT_IMAGE_MODEL = OPENAI_IMAGE_MODELS[0];
 const OPENAI_CAPABILITIES = {
 	generate: {
@@ -93,32 +93,42 @@ function buildAzureEndpoint(azure) {
 	};
 }
 function buildOpenAIImageGenerationProvider() {
-	return createOpenAiImagesProvider({
-		id: "openai",
-		label: "OpenAI",
-		defaultModel: OPENAI_DEFAULT_IMAGE_MODEL,
-		models: [...OPENAI_IMAGE_MODELS],
-		capabilities: OPENAI_CAPABILITIES,
-		isConfigured: (ctx) => isProviderApiKeyConfigured({
-			providerId: "openai",
-			cfg: ctx.cfg,
-			agentId: ctx.agentId
-		}),
-		resolveApiKey: (req) => {
-			return resolveAuthProfileForProvider({
+	return {
+		...createOpenAiImagesProvider({
+			id: "openai",
+			label: "OpenAI",
+			defaultModel: OPENAI_DEFAULT_IMAGE_MODEL,
+			models: [...OPENAI_IMAGE_MODELS],
+			capabilities: OPENAI_CAPABILITIES,
+			isConfigured: (ctx) => isProviderApiKeyConfigured({
 				providerId: "openai",
-				cfg: req.cfg,
-				agentId: req.agentId,
-				store: req.authStore
-			}).apiKey ?? null;
-		},
-		resolveEndpoint: (req) => {
-			const azure = resolveAzureSettings(req);
-			if (azure) return buildAzureEndpoint(azure);
-			return { baseUrl: resolveOpenAiBaseUrl(req) };
-		},
-		defaultTimeoutMs: 12e4
-	});
+				cfg: ctx.cfg,
+				agentId: ctx.agentId
+			}),
+			resolveApiKey: (req) => {
+				return resolveAuthProfileForProvider({
+					providerId: "openai",
+					cfg: req.cfg,
+					agentId: req.agentId,
+					store: req.authStore
+				}).apiKey ?? null;
+			},
+			resolveEndpoint: (req) => {
+				const azure = resolveAzureSettings(req);
+				if (azure) return buildAzureEndpoint(azure);
+				return { baseUrl: resolveOpenAiBaseUrl(req) };
+			},
+			defaultTimeoutMs: 12e4
+		}),
+		documentationUrl: "https://platform.openai.com/docs/guides/image-generation",
+		apiKeyUrl: "https://platform.openai.com/api-keys",
+		configFields: [{
+			key: "baseUrl",
+			label: "Base URL",
+			type: "url",
+			placeholder: "https://api.openai.com/v1"
+		}]
+	};
 }
 //#endregion
 export { OPENAI_DEFAULT_IMAGE_MODEL, OPENAI_IMAGE_MODELS, buildOpenAIImageGenerationProvider };

package/dist/src/agent/image/generation/types.d.ts

@@ -48,6 +48,17 @@ export interface ImageGenerationProviderConfiguredContext {
     agentId?: string;
     agentDir?: string;
 }
+export interface ImageGenerationProviderConfigField {
+    key: 'baseUrl' | 'region';
+    label: string;
+    type: 'url' | 'select';
+    required?: boolean;
+    placeholder?: string;
+    options?: Array<{
+        value: string;
+        label: string;
+    }>;
+}
 export interface ImageGenerationProvider {
     id: string;
     label: string;
@@ -55,6 +66,7 @@ export interface ImageGenerationProvider {
     credentialMode?: 'api-key' | 'oauth' | 'none';
     documentationUrl?: string;
     apiKeyUrl?: string;
+    configFields?: ImageGenerationProviderConfigField[];
     defaultModel: string;
     models: string[];
     capabilities: ImageGenerationProviderCapabilities;
@@ -70,6 +82,7 @@ export interface ImageGenerationProviderSummary {
     credentialMode: 'api-key' | 'oauth' | 'none';
     documentationUrl?: string;
     apiKeyUrl?: string;
+    configFields: ImageGenerationProviderConfigField[];
     defaultModel: string;
     models: string[];
     capabilities: ImageGenerationProviderCapabilities;

package/dist/src/agent/mcp/bundle-mcp-gateway.d.ts

@@ -3,6 +3,7 @@ export type McpGatewayToolEntry = {
     name: string;
     shortName: string;
     description: string;
+    readOnly: boolean;
 };
 export type McpGatewayResourceEntry = {
     uri: string;

package/dist/src/agent/mcp/bundle-mcp-gateway.js

@@ -6,7 +6,8 @@ function mapTools(tools, serverId) {
 	return tools.filter((tool) => tool.serverName === serverId).map((tool) => ({
 		name: mcpToolPolicyId(tool.safeServerName, tool.toolName),
 		shortName: tool.toolName,
-		description: tool.description || tool.title || tool.fallbackDescription
+		description: tool.description || tool.title || tool.fallbackDescription,
+		readOnly: tool.annotations?.readOnlyHint === true
 	}));
 }
 function mapResources(resources, serverId) {

package/dist/src/agent/mcp/bundle-mcp-policy.d.ts

@@ -1,5 +1,9 @@
-import type { AgentManifest } from '../../agent-manifest/schema.js';
+import type { AgentManifest, ToolPolicy } from '../../agent-manifest/schema.js';
 export declare function mcpToolPolicyId(serverId: string, toolName: string): string;
+export declare function resolveMcpToolPolicy(identity: {
+    serverId: string;
+    policyToolId: string;
+}, policy: AgentManifest['tools']['mcp']): ToolPolicy | undefined;
 export declare function isMcpCatalogToolDenied(identity: {
     serverId: string;
     policyToolId: string;

package/dist/src/agent/mcp/bundle-mcp-policy.js

@@ -1,10 +1,18 @@
+import { sanitizeServerName } from "./bundle-mcp-names.js";
 //#region src/agent/mcp/bundle-mcp-policy.ts
 function mcpToolPolicyId(serverId, toolName) {
 	return `mcp:${encodeURIComponent(serverId)}:${encodeURIComponent(toolName)}`;
 }
+function resolveMcpToolPolicy(identity, policy) {
+	const toolPolicy = policy?.tools?.[identity.policyToolId];
+	if (toolPolicy) return toolPolicy;
+	const directServerPolicy = policy?.servers?.[identity.serverId];
+	if (directServerPolicy) return directServerPolicy;
+	const usedNames = /* @__PURE__ */ new Set();
+	for (const [serverId, serverPolicy] of Object.entries(policy?.servers ?? {})) if (sanitizeServerName(serverId, usedNames) === identity.serverId) return serverPolicy;
+}
 function isMcpCatalogToolDenied(identity, policy) {
-	if (!policy) return false;
-	return policy.servers?.[identity.serverId]?.mode === "deny" || policy.tools?.[identity.policyToolId]?.mode === "deny";
+	return resolveMcpToolPolicy(identity, policy)?.mode === "deny";
 }
 //#endregion
-export { isMcpCatalogToolDenied, mcpToolPolicyId };
+export { isMcpCatalogToolDenied, mcpToolPolicyId, resolveMcpToolPolicy };

package/dist/src/agent/mcp/bundle-mcp-runtime.js

@@ -2,12 +2,12 @@ import { createLogger } from "../../utils/logger/index.js";
 import { init_logger } from "../../utils/logger.js";
 import { resolveGlobalSingleton } from "../../utils/global-singleton.js";
 import { init_string_coerce, normalizeOptionalString } from "../../utils/string-coerce.js";
+import { sanitizeServerName } from "./bundle-mcp-names.js";
 import { redactSensitiveUrlLikeString } from "../../utils/redact-sensitive-url.js";
 import { loadEmbeddedMcpConfig } from "./embedded-mcp.js";
 import { resolveConnectorSecretReferences } from "../../connectors/secret-store.js";
 import { isMcpConfigRecord } from "./mcp-config-shared.js";
 import { resolveMcpTransport } from "./mcp-transport.js";
-import { sanitizeServerName } from "./bundle-mcp-names.js";
 import crypto from "node:crypto";
 import Ajv2020 from "ajv/dist/2020.js";
 import { Client } from "@modelcontextprotocol/sdk/client/index.js";
@@ -175,7 +175,7 @@ function createSessionMcpRuntime(params) {
 			try {
 				for (const [serverName, rawServer] of Object.entries(loaded.mcpServers)) {
 					failIfDisposed();
-					const resolved = resolveMcpTransport(serverName, await resolveConnectorSecretReferences(rawServer));
+					const resolved = await resolveMcpTransport(serverName, await resolveConnectorSecretReferences(rawServer), params.cfg);
 					if (!resolved) continue;
 					const safeServerName = sanitizeServerName(serverName, usedServerNames);
 					if (safeServerName !== serverName) log.warn({
@@ -229,6 +229,7 @@ function createSessionMcpRuntime(params) {
 								title: tool.title,
 								description: normalizeOptionalString(tool.description) ?? normalizeOptionalString(tool.title),
 								inputSchema: tool.inputSchema,
+								annotations: tool.annotations,
 								fallbackDescription: `Provided by bundle MCP server "${serverName}" (${resolved.description}).`
 							});
 						}

package/dist/src/agent/mcp/bundle-mcp-types.d.ts

@@ -1,4 +1,4 @@
-import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
+import type { CallToolResult, ToolAnnotations } from "@modelcontextprotocol/sdk/types.js";
 import type { JsonSchemaType } from "@modelcontextprotocol/sdk/validation/types.js";
 import type { Config } from "../../config/schema.js";
 export type McpServerCatalog = {
@@ -15,6 +15,7 @@ export type McpCatalogTool = {
     title?: string;
     description?: string;
     inputSchema: JsonSchemaType;
+    annotations?: ToolAnnotations;
     fallbackDescription: string;
 };
 export type McpCatalogResource = {

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

@@ -1,6 +1,6 @@
-import { isMcpCatalogToolDenied, mcpToolPolicyId } from "./bundle-mcp-policy.js";
+import { isMcpCatalogToolDenied, mcpToolPolicyId, resolveMcpToolPolicy } from "./bundle-mcp-policy.js";
 import { loadMergedBundleMcpConfig } from "./bundle-mcp-config.js";
 import { loadEmbeddedMcpConfig } from "./embedded-mcp.js";
 import { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey } from "./bundle-mcp-runtime.js";
 import "./bundle-mcp-tools.js";
-export { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, isMcpCatalogToolDenied, loadEmbeddedMcpConfig, loadMergedBundleMcpConfig, mcpToolPolicyId, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey };
+export { __testing, createSessionMcpRuntime, disposeAllSessionMcpRuntimes, disposeSessionMcpRuntime, getOrCreateSessionMcpRuntime, getSessionMcpRuntimeManager, isMcpCatalogToolDenied, loadEmbeddedMcpConfig, loadMergedBundleMcpConfig, mcpToolPolicyId, resolveMcpToolPolicy, retireSessionMcpRuntime, retireSessionMcpRuntimeForSessionKey };

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

@@ -1,8 +1,8 @@
 import { killProcessTree } from "../../process/kill-tree.js";
 import { spawn } from "node:child_process";
+import { getDefaultEnvironment } from "@modelcontextprotocol/sdk/client/stdio.js";
 import process from "node:process";
 import { PassThrough } from "node:stream";
-import { getDefaultEnvironment } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { ReadBuffer, serializeMessage } from "@modelcontextprotocol/sdk/shared/stdio.js";
 //#region src/agent/mcp/mcp-stdio-transport.ts
 const CLOSE_TIMEOUT_MS = 2e3;

package/dist/src/agent/mcp/mcp-transport.d.ts

@@ -1,4 +1,5 @@
 import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
+import type { Config } from "../../config/schema.js";
 export type ResolvedMcpTransport = {
     transport: Transport;
     description: string;
@@ -7,4 +8,4 @@ export type ResolvedMcpTransport = {
     requestTimeoutMs: number;
     detachStderr?: () => void;
 };
-export declare function resolveMcpTransport(serverName: string, rawServer: unknown): ResolvedMcpTransport | null;
+export declare function resolveMcpTransport(serverName: string, rawServer: unknown, config?: Config): Promise<ResolvedMcpTransport | null>;

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

@@ -1,12 +1,16 @@
+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 { buildRuntimeEnvironment, resolveRuntimeCommand } from "../../runtime-tools/environment.js";
 import { XopcStdioClientTransport } from "./mcp-stdio-transport.js";
 import { resolveMcpTransportConfig } from "./mcp-transport-config.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";
 import { fetch } from "undici";
 //#region src/agent/mcp/mcp-transport.ts
+init_paths_state();
 init_logger();
 init_string_coerce();
 const log = createLogger("Mcp:Transport");
@@ -44,20 +48,34 @@ function buildSseEventSourceFetch(headers) {
 		});
 	};
 }
-function resolveMcpTransport(serverName, rawServer) {
+async function resolveMcpTransport(serverName, rawServer, config) {
 	const resolved = resolveMcpTransportConfig(serverName, rawServer);
 	if (!resolved) return null;
 	if (resolved.kind === "stdio") {
-		const transport = new XopcStdioClientTransport({
+		const command = config ? await resolveRuntimeCommand({
 			command: resolved.command,
+			stateDir: resolveStateDir(),
+			config: config.runtimeTools,
+			allowProvision: true
+		}) : resolved.command;
+		const env = config ? (await buildRuntimeEnvironment({
+			stateDir: resolveStateDir(),
+			config: config.runtimeTools,
+			baseEnv: {
+				...getDefaultEnvironment(),
+				...resolved.env
+			}
+		})).env : resolved.env;
+		const transport = new XopcStdioClientTransport({
+			command,
 			args: resolved.args,
-			env: resolved.env,
+			env,
 			cwd: resolved.cwd,
 			stderr: "pipe"
 		});
 		return {
 			transport,
-			description: resolved.description,
+			description: command === resolved.command ? resolved.description : `${command}${resolved.args?.length ? ` ${resolved.args.join(" ")}` : ""}`,
 			transportType: "stdio",
 			connectionTimeoutMs: resolved.connectionTimeoutMs,
 			requestTimeoutMs: resolved.requestTimeoutMs,