veryfront 0.1.509 → 0.1.511

package/esm/src/agent/veryfront-cloud-agent-service.d.ts

@@ -3,6 +3,7 @@ import { type RunAgentServiceMainOptions } from "./agent-service-bootstrap.js";
 import { type HostedChatRuntimeCreationResult } from "./hosted-chat-runtime-contract.js";
 import type { HostedConversationRootRunContext } from "./conversation-root-run-lifecycle.js";
 import { type AgentRuntimeMessage } from "./agent-runtime-message-adapter.js";
+import type { AgentServiceMcpServerConfig } from "./agent-service-mcp-server-config.js";
 import { type CreateNodeAgentServiceRuntimeInfrastructureOptions } from "./node-agent-service-runtime-infrastructure.js";
 import { type AgentServiceRuntimeBundle, type AgentServiceRuntimeConfig, type StartNodeAgentServiceResult } from "./agent-service-runtime.js";
 import type { PreparedHostedChatExecution } from "./prepared-hosted-chat-execution.js";
@@ -11,13 +12,9 @@ export type NodeVeryfrontCloudAgentServiceProcessTarget = NonNullable<RunAgentSe
     exit?: (code: number) => never | void;
 };
 export type NodeVeryfrontCloudAgentServiceAgentSource = "auto" | "code" | "markdown";
-export type NodeVeryfrontCloudAgentServiceMcpOptions = {
-    /**
-     * Opt in to Studio UI/control-plane MCP tools for trusted Studio-capable clients.
-     * API MCP tools remain part of the Veryfront Cloud service preset.
-     */
-    studio?: boolean;
-};
+export type VeryfrontMcpServerKind = "api" | "studio";
+export type NodeVeryfrontCloudAgentServiceMcpServer = AgentServiceMcpServerConfig;
+export declare function veryfrontMcpServer(kind?: VeryfrontMcpServerKind): AgentServiceMcpServerConfig;
 type AgentServicePathOption = string | URL;
 export type NodeVeryfrontCloudAgentServiceOptions = {
     serviceName: string;
@@ -33,7 +30,11 @@ export type NodeVeryfrontCloudAgentServiceOptions = {
      */
     entrypointUrl?: AgentServicePathOption;
     agentSource?: NodeVeryfrontCloudAgentServiceAgentSource;
-    mcp?: NodeVeryfrontCloudAgentServiceMcpOptions;
+    /**
+     * Remote MCP servers available to the runtime. Defaults to the Veryfront API
+     * MCP server. Pass [] to run without remote MCP tools.
+     */
+    mcpServers?: readonly NodeVeryfrontCloudAgentServiceMcpServer[];
     forwardedConfigNamespace?: string;
     createBashTool?: AgentServiceSandboxToolsOptions["createBashTool"];
     env?: CreateNodeAgentServiceRuntimeInfrastructureOptions["env"];

package/esm/src/agent/veryfront-cloud-agent-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"veryfront-cloud-agent-service.d.ts","sourceRoot":"","sources":["../../../src/src/agent/veryfront-cloud-agent-service.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AA+B3E,OAAO,EAGL,KAAK,0BAA0B,EAChC,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,KAAK,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACzF,OAAO,KAAK,EAAE,gCAAgC,EAAE,MAAM,sCAAsC,CAAC;AAC7F,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AA6B9E,OAAO,EAEL,KAAK,kDAAkD,EACxD,MAAM,gDAAgD,CAAC;AACxD,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,yBAAyB,EAK9B,KAAK,2BAA2B,EACjC,MAAM,4BAA4B,CAAC;AAIpC,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAevF,MAAM,MAAM,2CAA2C,GACnD,WAAW,CAAC,0BAA0B,CAAC,eAAe,CAAC,CAAC,GACxD,WAAW,CAAC,kDAAkD,CAAC,eAAe,CAAC,CAAC,GAChF;IACA,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,KAAK,GAAG,IAAI,CAAC;CACvC,CAAC;AAEJ,MAAM,MAAM,yCAAyC,GAAG,MAAM,GAAG,MAAM,GAAG,UAAU,CAAC;AAErF,MAAM,MAAM,wCAAwC,GAAG;IACrD;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,CAAC;AAEF,KAAK,sBAAsB,GAAG,MAAM,GAAG,GAAG,CAAC;AAE3C,MAAM,MAAM,qCAAqC,GAAG;IAClD,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,OAAO,CAAC,EAAE,sBAAsB,CAAC;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,aAAa,CAAC,EAAE,sBAAsB,CAAC;IACvC,WAAW,CAAC,EAAE,yCAAyC,CAAC;IACxD,GAAG,CAAC,EAAE,wCAAwC,CAAC;IAC/C,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,cAAc,CAAC,EAAE,+BAA+B,CAAC,gBAAgB,CAAC,CAAC;IACnE,GAAG,CAAC,EAAE,kDAAkD,CAAC,KAAK,CAAC,CAAC;IAChE,aAAa,CAAC,EAAE,2CAA2C,CAAC;IAC5D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG,qCAAqC,CAAC;AAQtF,MAAM,MAAM,+CAA+C,GAAG,2BAA2B,GAAG;IAC1F,MAAM,EAAE,yBAAyB,CAAC;IAClC,KAAK,EAAE,+BAA+B,CAAC,OAAO,CAAC,CAAC;IAChD,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,mBAAmB,EAAE,CAAC;IACrC,QAAQ,EAAE,2BAA2B,CAAC,UAAU,CAAC,CAAC;IAClD,cAAc,EAAE,gCAAgC,CAAC;CAClD,CAAC;AAinBF,wBAAsB,2CAA2C,CAC/D,OAAO,EAAE,qCAAqC,GAC7C,OAAO,CAAC,yBAAyB,CAAC,+CAA+C,CAAC,CAAC,CAKrF;AAED,wBAAsB,mCAAmC,CACvD,OAAO,EAAE,qCAAqC,GAC7C,OAAO,CAAC,2BAA2B,CAAC,+CAA+C,CAAC,CAAC,CAQvF;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,qCAAqC,GAC7C,OAAO,CAAC,IAAI,CAAC,CAyCf"}
+{"version":3,"file":"veryfront-cloud-agent-service.d.ts","sourceRoot":"","sources":["../../../src/src/agent/veryfront-cloud-agent-service.ts"],"names":[],"mappings":"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"}

package/esm/src/agent/veryfront-cloud-agent-service.js

@@ -29,6 +29,12 @@ import { createVeryfrontCloudPreparedHostedChatExecutionRuntimeOptions, } from "
 import { prepareVeryfrontCloudHostedChatExecution, } from "./veryfront-cloud-hosted-chat-execution-preparation.js";
 import { applyAgentProjectContextChange } from "./project-context.js";
 import { agentRegistry, getAgent } from "./composition/index.js";
+export function veryfrontMcpServer(kind = "api") {
+    if (kind === "studio") {
+        return { kind: "veryfront-studio" };
+    }
+    return { kind: "veryfront-api" };
+}
 const DEFAULT_FORWARDED_CONFIG_NAMESPACE = "veryfront";
 const DEFAULT_DRAIN_TIMEOUT_MS = 15_000;
 const DEFAULT_HARD_SHUTDOWN_TIMEOUT_MS = 20_000;
@@ -83,6 +89,9 @@ function resolveDefaultProcessTarget() {
     }
     return process;
 }
+function resolveMcpServers(options) {
+    return options.mcpServers ?? [veryfrontMcpServer()];
+}
 async function loadDefaultCreateBashTool() {
     const { createBashTool } = await import("bash-tool");
     return createBashTool;
@@ -232,11 +241,11 @@ function setFilteredTraceAttributes(context, attributes) {
 }
 function getInvokeAgentConfig(context) {
     const config = context.infrastructure.getConfig();
-    const studioMcpUrl = context.options.mcp?.studio ? config.VERYFRONT_STUDIO_MCP_URL : "";
     return {
         apiUrl: config.VERYFRONT_API_URL,
         apiMcpUrl: config.VERYFRONT_MCP_URL,
-        studioMcpUrl,
+        studioMcpUrl: config.VERYFRONT_STUDIO_MCP_URL,
+        mcpServers: resolveMcpServers(context.options),
         enableDurableInvokeAgent: config.VERYFRONT_ENABLE_DURABLE_INVOKE_AGENT,
     };
 }
@@ -297,8 +306,8 @@ function createAgentRuntime(context, options) {
         config: {
             apiUrl: config.VERYFRONT_API_URL,
             apiMcpUrl: config.VERYFRONT_MCP_URL,
-            studioMcpUrl: context.options.mcp?.studio ? config.VERYFRONT_STUDIO_MCP_URL : "",
-            studioMcpEnabled: context.options.mcp?.studio ?? false,
+            studioMcpUrl: config.VERYFRONT_STUDIO_MCP_URL,
+            mcpServers: resolveMcpServers(context.options),
         },
         buildLocalTools: (taskContext) => buildLocalTools(context, options, taskContext),
         refreshSystem,

package/esm/src/utils/version-constant.d.ts

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.509";
+export declare const VERSION = "0.1.511";
 //# sourceMappingURL=version-constant.d.ts.map

package/esm/src/utils/version-constant.js

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.509";
+export const VERSION = "0.1.511";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.509",
+  "version": "0.1.511",
   "description": "The simplest way to build AI-powered apps",
   "keywords": [
     "react",

package/src/deno.js

@@ -1,6 +1,6 @@
 export default {
   "name": "veryfront",
-  "version": "0.1.509",
+  "version": "0.1.511",
   "license": "Apache-2.0",
   "nodeModulesDir": "auto",
   "workspace": [

package/src/src/agent/agent-service-mcp-server-config.ts

@@ -0,0 +1,112 @@
+import type { RemoteMCPToolSourceConfig } from "../tool/index.js";
+import { buildStudioMcpHeaders } from "./live-studio-mcp-tools.js";
+import { clientAllowsStudioMcp, type RuntimeClientProfile } from "./runtime-client-profile.js";
+
+export type AgentServiceVeryfrontApiMcpServerConfig = {
+  kind: "veryfront-api";
+  id?: string;
+};
+
+export type AgentServiceVeryfrontStudioMcpServerConfig = {
+  kind: "veryfront-studio";
+  id?: string;
+};
+
+export type AgentServiceGenericMcpServerConfig = {
+  kind?: "generic";
+  id?: string;
+  endpoint: RemoteMCPToolSourceConfig["endpoint"];
+  headers?: RemoteMCPToolSourceConfig["headers"];
+  fetch?: RemoteMCPToolSourceConfig["fetch"];
+  listMethod?: RemoteMCPToolSourceConfig["listMethod"];
+  callMethod?: RemoteMCPToolSourceConfig["callMethod"];
+};
+
+export type AgentServiceMcpServerConfig =
+  | AgentServiceVeryfrontApiMcpServerConfig
+  | AgentServiceVeryfrontStudioMcpServerConfig
+  | AgentServiceGenericMcpServerConfig;
+
+export type CreateAgentServiceRemoteMcpConfigInput = {
+  server: AgentServiceMcpServerConfig;
+  authToken: string;
+  apiMcpUrl: string;
+  studioMcpUrl?: string | null;
+  clientProfile?: RuntimeClientProfile | null;
+  getProjectId?: () => string | null | undefined;
+  conversationId?: string;
+  defaultSourceId?: string;
+};
+
+export function defaultAgentServiceMcpServers(): AgentServiceMcpServerConfig[] {
+  return [{ kind: "veryfront-api" }];
+}
+
+function createGenericRemoteMcpConfig(
+  server: AgentServiceGenericMcpServerConfig,
+): RemoteMCPToolSourceConfig {
+  const config: RemoteMCPToolSourceConfig = {
+    endpoint: server.endpoint,
+  };
+
+  if (server.id !== undefined) config.id = server.id;
+  if (server.headers !== undefined) config.headers = server.headers;
+  if (server.fetch !== undefined) config.fetch = server.fetch;
+  if (server.listMethod !== undefined) config.listMethod = server.listMethod;
+  if (server.callMethod !== undefined) config.callMethod = server.callMethod;
+
+  return config;
+}
+
+function createVeryfrontApiRemoteMcpConfig(
+  input: Pick<
+    CreateAgentServiceRemoteMcpConfigInput,
+    "apiMcpUrl" | "authToken" | "defaultSourceId"
+  >,
+  server: AgentServiceVeryfrontApiMcpServerConfig,
+): RemoteMCPToolSourceConfig {
+  return {
+    id: server.id ?? input.defaultSourceId ?? "veryfront-mcp",
+    endpoint: input.apiMcpUrl,
+    headers: {
+      Authorization: `Bearer ${input.authToken}`,
+    },
+  };
+}
+
+function createVeryfrontStudioRemoteMcpConfig(
+  input: Pick<
+    CreateAgentServiceRemoteMcpConfigInput,
+    "authToken" | "clientProfile" | "conversationId" | "getProjectId" | "studioMcpUrl"
+  >,
+  server: AgentServiceVeryfrontStudioMcpServerConfig,
+): RemoteMCPToolSourceConfig | null {
+  if (!input.studioMcpUrl || !clientAllowsStudioMcp(input.clientProfile)) {
+    return null;
+  }
+
+  return {
+    id: server.id ?? "studio-mcp",
+    endpoint: input.studioMcpUrl,
+    headers: () =>
+      buildStudioMcpHeaders(
+        input.authToken,
+        input.getProjectId?.() ?? null,
+        input.conversationId,
+      ),
+  };
+}
+
+export function createAgentServiceRemoteMcpConfig(
+  input: CreateAgentServiceRemoteMcpConfigInput,
+): RemoteMCPToolSourceConfig | null {
+  if (input.server.kind === "veryfront-api") {
+    return createVeryfrontApiRemoteMcpConfig(input, input.server);
+  }
+
+  if (input.server.kind === "veryfront-studio") {
+    return createVeryfrontStudioRemoteMcpConfig(input, input.server);
+  }
+
+  return createGenericRemoteMcpConfig(input.server);
+}

package/src/src/agent/default-hosted-chat-runtime.ts

@@ -30,6 +30,7 @@ import {
   prepareHostedChatRuntimeToolAssembly,
   type PrepareHostedChatRuntimeToolAssemblyInput,
 } from "./hosted-chat-runtime-tool-assembly.js";
+import type { AgentServiceMcpServerConfig } from "./agent-service-mcp-server-config.js";
 import {
   createHostedRuntimeStateResolver,
   type HostedRuntimeStateResolverContext,
@@ -45,7 +46,7 @@ export type DefaultHostedChatRuntimeConfig = {
   apiUrl: string;
   apiMcpUrl: string;
   studioMcpUrl?: string | null;
-  studioMcpEnabled?: boolean;
+  mcpServers?: readonly AgentServiceMcpServerConfig[];
 };
 
 export type DefaultHostedChatRuntimeLogger = {
@@ -155,7 +156,7 @@ async function buildToolAssembly(
     apiUrl: input.config.apiUrl,
     apiMcpUrl: input.config.apiMcpUrl,
     studioMcpUrl: input.config.studioMcpUrl,
-    studioMcpEnabled: input.config.studioMcpEnabled,
+    mcpServers: input.config.mcpServers,
     conversationId: input.options.conversationId,
     allowedToolNames: input.options.allowedTools ?? null,
     projectScopedRemoteToolOptions: input.projectScopedRemoteToolOptions,

package/src/src/agent/default-hosted-invoke-agent-tool.ts

@@ -29,6 +29,7 @@ import { startHostedChildForkRuntimeWithHostTools } from "./hosted-child-fork-ru
 import {
   prepareDefaultHostedChildForkSandboxToolSources,
 } from "./hosted-child-fork-tool-sources.js";
+import type { AgentServiceMcpServerConfig } from "./agent-service-mcp-server-config.js";
 import { executeHostedChildForkToolInput } from "./hosted-child-fork-execution-runner.js";
 import { createHostedChildInvokeTool } from "./hosted-child-invoke-tool.js";
 import {
@@ -79,6 +80,7 @@ export type DefaultHostedInvokeAgentConfig = {
   apiUrl: string;
   apiMcpUrl: string;
   studioMcpUrl?: string | null;
+  mcpServers?: readonly AgentServiceMcpServerConfig[];
   enableDurableInvokeAgent?: boolean;
 };
 
@@ -220,6 +222,7 @@ async function prepareForkToolSources<TContext extends DefaultHostedInvokeAgentC
     apiUrl: config.apiUrl,
     apiMcpUrl: config.apiMcpUrl,
     studioMcpUrl: config.studioMcpUrl,
+    mcpServers: config.mcpServers,
     clientProfile: options.context.clientProfile,
     getProjectId: () => options.context.projectId || null,
     conversationId: options.context.conversationId,

package/src/src/agent/hosted-chat-runtime-tool-assembly.ts

@@ -17,6 +17,7 @@ import {
   fetchLatestConversationUserText,
   updateDefaultResearchArtifacts,
 } from "./default-research-artifact-support.js";
+import { type AgentServiceMcpServerConfig } from "./agent-service-mcp-server-config.js";
 import {
   createHostedProjectRemoteToolSources,
   type HostedProjectRemoteToolSourceMutationHandler,
@@ -58,7 +59,7 @@ export type PrepareHostedChatRuntimeToolAssemblyInput<
   apiUrl: string;
   apiMcpUrl: string;
   studioMcpUrl?: string | null;
-  studioMcpEnabled?: boolean;
+  mcpServers?: readonly AgentServiceMcpServerConfig[];
   conversationId?: string;
   allowedToolNames?: HostedChatRuntimeAllowedToolNames;
   projectScopedRemoteToolOptions?: ProjectScopedRemoteToolOptions;
@@ -121,7 +122,7 @@ export async function prepareHostedChatRuntimeToolAssembly<
     authToken: input.taskContext.authToken,
     apiMcpUrl: input.apiMcpUrl,
     studioMcpUrl: input.studioMcpUrl,
-    studioMcpEnabled: input.studioMcpEnabled,
+    mcpServers: input.mcpServers,
     clientProfile: input.taskContext.clientProfile,
     createRemoteToolSource: input.createRemoteToolSource ?? createRemoteMCPToolSource,
     defaultProjectId: () => activeProjectId(input.taskContext),

package/src/src/agent/hosted-child-fork-tool-sources.ts

@@ -5,6 +5,11 @@ import {
   type RemoteMCPToolSourceConfig,
   type RemoteToolSource,
 } from "../tool/index.js";
+import {
+  type AgentServiceMcpServerConfig,
+  createAgentServiceRemoteMcpConfig,
+  defaultAgentServiceMcpServers,
+} from "./agent-service-mcp-server-config.js";
 import {
   type AgentServiceSandboxToolsOptions,
   type AgentServiceSandboxToolsResult,
@@ -31,13 +36,13 @@ export type HostedChildForkToolSourcesLogger = {
 export type PrepareDefaultHostedChildForkToolSourcesInput = {
   authToken: string;
   apiMcpUrl: string;
+  mcpServers?: readonly AgentServiceMcpServerConfig[];
   getProjectId: () => string | null | undefined;
   studioMcpUrl?: string | null;
   clientProfile?: RuntimeClientProfile | null;
   conversationId?: string;
   globalTools?: HostToolSet;
   abortSignal?: AbortSignal;
-  apiSourceId?: string;
   onConfirmedStudioProjectSwitch?: HostedChildProjectSwitchHandler;
   createRemoteToolSource?: (config: RemoteMCPToolSourceConfig) => RemoteToolSource;
   createToolsFromRemoteDefinitions?: typeof createToolsFromRemoteDefinitions;
@@ -73,23 +78,54 @@ export type PrepareDefaultHostedChildForkSandboxToolSourcesInput =
 export async function prepareDefaultHostedChildForkToolSources(
   input: PrepareDefaultHostedChildForkToolSourcesInput,
 ): Promise<DefaultHostedChildForkToolSourcesResult> {
+  throwIfAborted(input.abortSignal);
+
   let closeStudioMcpTools: (() => Promise<void>) | undefined;
   let studioMcpTools: HostToolSet = {};
+  let remoteMcpTools: HostToolSet = {};
   const createLiveStudioTools = input.createLiveStudioTools ?? createLiveStudioMcpTools;
+  const createRemoteToolSource = input.createRemoteToolSource ?? createRemoteMCPToolSource;
+  const materializeRemoteTools = input.createToolsFromRemoteDefinitions ??
+    createToolsFromRemoteDefinitions;
 
   try {
-    const studioTools = await createLiveStudioTools({
-      authToken: input.authToken,
-      clientProfile: input.clientProfile,
-      getProjectId: input.getProjectId,
-      studioMcpUrl: input.studioMcpUrl,
-      ...(input.conversationId ? { conversationId: input.conversationId } : {}),
-      ...(input.createRemoteToolSource
-        ? { createRemoteToolSource: input.createRemoteToolSource }
-        : {}),
-    });
-    studioMcpTools = studioTools.tools;
-    closeStudioMcpTools = studioTools.close;
+    const mcpServers = input.mcpServers ?? defaultAgentServiceMcpServers();
+    for (const server of mcpServers) {
+      if (server.kind === "veryfront-studio") {
+        const studioTools = await createLiveStudioTools({
+          authToken: input.authToken,
+          clientProfile: input.clientProfile,
+          getProjectId: input.getProjectId,
+          studioMcpUrl: input.studioMcpUrl,
+          ...(input.conversationId ? { conversationId: input.conversationId } : {}),
+          ...(input.createRemoteToolSource
+            ? { createRemoteToolSource: input.createRemoteToolSource }
+            : {}),
+        });
+        studioMcpTools = {
+          ...studioMcpTools,
+          ...studioTools.tools,
+        };
+        closeStudioMcpTools = studioTools.close;
+        continue;
+      }
+
+      const remoteConfig = createAgentServiceRemoteMcpConfig({
+        server,
+        authToken: input.authToken,
+        apiMcpUrl: input.apiMcpUrl,
+        defaultSourceId: "veryfront-mcp-fork",
+      });
+      if (!remoteConfig) {
+        continue;
+      }
+      const remoteSource = createRemoteToolSource(remoteConfig);
+      const definitions = await remoteSource.listTools();
+      remoteMcpTools = {
+        ...remoteMcpTools,
+        ...materializeRemoteTools(remoteSource, definitions),
+      };
+    }
   } catch (error) {
     if (input.abortSignal?.aborted || input.isAbortError?.(error)) {
       throw error;
@@ -108,19 +144,6 @@ export async function prepareDefaultHostedChildForkToolSources(
 
   throwIfAborted(input.abortSignal);
 
-  const createRemoteToolSource = input.createRemoteToolSource ?? createRemoteMCPToolSource;
-  const materializeRemoteTools = input.createToolsFromRemoteDefinitions ??
-    createToolsFromRemoteDefinitions;
-  const apiMcpSource = createRemoteToolSource({
-    id: input.apiSourceId ?? "veryfront-mcp-fork",
-    endpoint: input.apiMcpUrl,
-    headers: {
-      Authorization: `Bearer ${input.authToken}`,
-    },
-  });
-  const apiMcpDefinitions = await apiMcpSource.listTools();
-  const apiMcpTools = materializeRemoteTools(apiMcpSource, apiMcpDefinitions);
-
   if (input.onConfirmedStudioProjectSwitch) {
     wrapHostedChildProjectSwitchTool({
       tools: studioMcpTools,
@@ -133,7 +156,7 @@ export async function prepareDefaultHostedChildForkToolSources(
   return {
     ok: true,
     forkTools: buildDefaultHostedChildForkToolSet(
-      apiMcpTools,
+      remoteMcpTools,
       studioMcpTools,
       input.globalTools ?? {},
     ),

package/src/src/agent/hosted-project-remote-tool-source.ts

@@ -8,9 +8,13 @@ import {
   type RemoteToolSource,
   type ToolExecutionContext,
 } from "../tool/index.js";
+import {
+  type AgentServiceMcpServerConfig,
+  createAgentServiceRemoteMcpConfig,
+  defaultAgentServiceMcpServers,
+} from "./agent-service-mcp-server-config.js";
 import { toChildRunToolInputRecord } from "./child-run-execution-support.js";
-import { buildStudioMcpHeaders } from "./live-studio-mcp-tools.js";
-import { clientAllowsStudioMcp, type RuntimeClientProfile } from "./runtime-client-profile.js";
+import type { RuntimeClientProfile } from "./runtime-client-profile.js";
 import { getConfirmedProjectContextSwitchId } from "./project-context.js";
 import {
   getProjectSteeringMutation,
@@ -188,12 +192,10 @@ export type CreateHostedProjectRemoteToolSourcesInput =
     authToken: string;
     apiMcpUrl: string;
     studioMcpUrl?: string | null;
-    studioMcpEnabled?: boolean;
+    mcpServers?: readonly AgentServiceMcpServerConfig[];
     clientProfile?: RuntimeClientProfile | null;
     getProjectId: () => string | null | undefined;
     conversationId?: string;
-    apiSourceId?: string;
-    studioSourceId?: string;
     createRemoteToolSource?: (config: RemoteMCPToolSourceConfig) => RemoteToolSource;
     onStudioProjectSwitch?: HostedProjectRemoteToolSourceProjectSwitchHandler;
   };
@@ -230,41 +232,31 @@ export function createHostedProjectRemoteToolSources(
   input: CreateHostedProjectRemoteToolSourcesInput,
 ): RemoteToolSource[] {
   const createRemoteToolSource = input.createRemoteToolSource ?? createRemoteMCPToolSource;
-  const sources = [
-    createHostedProjectRemoteToolSourceFromConfig(
-      input,
-      createRemoteToolSource({
-        id: input.apiSourceId ?? "veryfront-mcp",
-        endpoint: input.apiMcpUrl,
-        headers: {
-          Authorization: `Bearer ${input.authToken}`,
-        },
-      }),
-    ),
-  ];
+  const sources: RemoteToolSource[] = [];
+  const mcpServers = input.mcpServers ?? defaultAgentServiceMcpServers();
 
-  if (
-    !input.studioMcpEnabled || !input.studioMcpUrl || !clientAllowsStudioMcp(input.clientProfile)
-  ) {
-    return sources;
-  }
+  for (const server of mcpServers) {
+    const remoteConfig = createAgentServiceRemoteMcpConfig({
+      server,
+      authToken: input.authToken,
+      apiMcpUrl: input.apiMcpUrl,
+      studioMcpUrl: input.studioMcpUrl,
+      clientProfile: input.clientProfile,
+      getProjectId: input.getProjectId,
+      conversationId: input.conversationId,
+    });
+    if (!remoteConfig) {
+      continue;
+    }
 
-  sources.push(
-    createHostedProjectRemoteToolSourceFromConfig(
-      input,
-      createRemoteToolSource({
-        id: input.studioSourceId ?? "studio-mcp",
-        endpoint: input.studioMcpUrl,
-        headers: () =>
-          buildStudioMcpHeaders(
-            input.authToken,
-            input.getProjectId() ?? null,
-            input.conversationId,
-          ),
-      }),
-      input.onStudioProjectSwitch,
-    ),
-  );
+    sources.push(
+      createHostedProjectRemoteToolSourceFromConfig(
+        input,
+        createRemoteToolSource(remoteConfig),
+        server.kind === "veryfront-studio" ? input.onStudioProjectSwitch : undefined,
+      ),
+    );
+  }
 
   return sources;
 }

package/src/src/agent/index.ts

@@ -337,13 +337,15 @@ export {
 } from "./agent-service-runtime.js";
 export {
   createNodeVeryfrontCloudAgentServiceRuntime,
-  type NodeVeryfrontCloudAgentServiceMcpOptions,
+  type NodeVeryfrontCloudAgentServiceMcpServer,
   type NodeVeryfrontCloudAgentServiceOptions,
   type NodeVeryfrontCloudAgentServicePreparedExecution,
   type NodeVeryfrontCloudAgentServiceProcessTarget,
   startAgentService,
   startNodeVeryfrontCloudAgentService,
   type VeryfrontCloudAgentServiceOptions,
+  veryfrontMcpServer,
+  type VeryfrontMcpServerKind,
 } from "./veryfront-cloud-agent-service.js";
 export {
   type AgentServiceConfig,

package/src/src/agent/veryfront-cloud-agent-service.ts

@@ -61,6 +61,7 @@ import {
   fetchDefaultHostedProjectSteering,
 } from "./default-hosted-project-steering-refresh.js";
 import { type HostedProjectSkillIdsContext } from "./hosted-project-steering-adapter.js";
+import type { AgentServiceMcpServerConfig } from "./agent-service-mcp-server-config.js";
 import type { RuntimeLoadSkillToolContext } from "./runtime-load-skill-tool.js";
 import type { RuntimeProjectSteeringLookup } from "./runtime-project-skill-catalog.js";
 import type { RuntimeSkillDefinition } from "./runtime-skill-metadata.js";
@@ -113,13 +114,19 @@ export type NodeVeryfrontCloudAgentServiceProcessTarget =
 
 export type NodeVeryfrontCloudAgentServiceAgentSource = "auto" | "code" | "markdown";
 
-export type NodeVeryfrontCloudAgentServiceMcpOptions = {
-  /**
-   * Opt in to Studio UI/control-plane MCP tools for trusted Studio-capable clients.
-   * API MCP tools remain part of the Veryfront Cloud service preset.
-   */
-  studio?: boolean;
-};
+export type VeryfrontMcpServerKind = "api" | "studio";
+
+export type NodeVeryfrontCloudAgentServiceMcpServer = AgentServiceMcpServerConfig;
+
+export function veryfrontMcpServer(
+  kind: VeryfrontMcpServerKind = "api",
+): AgentServiceMcpServerConfig {
+  if (kind === "studio") {
+    return { kind: "veryfront-studio" };
+  }
+
+  return { kind: "veryfront-api" };
+}
 
 type AgentServicePathOption = string | URL;
 
@@ -137,7 +144,11 @@ export type NodeVeryfrontCloudAgentServiceOptions = {
    */
   entrypointUrl?: AgentServicePathOption;
   agentSource?: NodeVeryfrontCloudAgentServiceAgentSource;
-  mcp?: NodeVeryfrontCloudAgentServiceMcpOptions;
+  /**
+   * Remote MCP servers available to the runtime. Defaults to the Veryfront API
+   * MCP server. Pass [] to run without remote MCP tools.
+   */
+  mcpServers?: readonly NodeVeryfrontCloudAgentServiceMcpServer[];
   forwardedConfigNamespace?: string;
   createBashTool?: AgentServiceSandboxToolsOptions["createBashTool"];
   env?: CreateNodeAgentServiceRuntimeInfrastructureOptions["env"];
@@ -239,6 +250,12 @@ function resolveDefaultProcessTarget(): NodeVeryfrontCloudAgentServiceProcessTar
   return process;
 }
 
+function resolveMcpServers(
+  options: Pick<NodeVeryfrontCloudAgentServiceOptions, "mcpServers">,
+): readonly NodeVeryfrontCloudAgentServiceMcpServer[] {
+  return options.mcpServers ?? [veryfrontMcpServer()];
+}
+
 async function loadDefaultCreateBashTool(): Promise<
   AgentServiceSandboxToolsOptions["createBashTool"]
 > {
@@ -466,12 +483,12 @@ function getInvokeAgentConfig(
   context: NodeVeryfrontCloudAgentServiceContext,
 ): DefaultHostedInvokeAgentConfig {
   const config = context.infrastructure.getConfig();
-  const studioMcpUrl = context.options.mcp?.studio ? config.VERYFRONT_STUDIO_MCP_URL : "";
 
   return {
     apiUrl: config.VERYFRONT_API_URL,
     apiMcpUrl: config.VERYFRONT_MCP_URL,
-    studioMcpUrl,
+    studioMcpUrl: config.VERYFRONT_STUDIO_MCP_URL,
+    mcpServers: resolveMcpServers(context.options),
     enableDurableInvokeAgent: config.VERYFRONT_ENABLE_DURABLE_INVOKE_AGENT,
   };
 }
@@ -551,8 +568,8 @@ function createAgentRuntime(
     config: {
       apiUrl: config.VERYFRONT_API_URL,
       apiMcpUrl: config.VERYFRONT_MCP_URL,
-      studioMcpUrl: context.options.mcp?.studio ? config.VERYFRONT_STUDIO_MCP_URL : "",
-      studioMcpEnabled: context.options.mcp?.studio ?? false,
+      studioMcpUrl: config.VERYFRONT_STUDIO_MCP_URL,
+      mcpServers: resolveMcpServers(context.options),
     },
     buildLocalTools: (taskContext) => buildLocalTools(context, options, taskContext),
     refreshSystem,

package/src/src/utils/version-constant.ts

@@ -1,3 +1,3 @@
 // Keep in sync with deno.json version.
 // scripts/release.ts updates this constant during releases.
-export const VERSION = "0.1.509";
+export const VERSION = "0.1.511";