veryfront 0.1.510 → 0.1.512

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

@@ -14,12 +14,12 @@ import { buildAgentRunTraceAttributes, buildExecuteToolTraceAttributes, filterAg
 import { runAgentServiceMain, } from "./agent-service-bootstrap.js";
 import { loadAgentServiceEnvFiles } from "./agent-service-env-files.js";
 import { createHostedFormInputTool } from "./hosted-form-input-tool.js";
-import { createHostedAgentProjectSteering } from "./hosted-agent-project-steering.js";
+import { createHostedAgentProjectSteering, } from "./hosted-agent-project-steering.js";
 import { createLiveStudioMcpTools } from "./live-studio-mcp-tools.js";
 import { createDefaultHostedChatRuntime, } from "./default-hosted-chat-runtime.js";
 import { createDefaultHostedInvokeAgentTool } from "./default-hosted-invoke-agent-tool.js";
 import { createDefaultHostedProjectSteeringRefresh, fetchDefaultHostedProjectSteering, } from "./default-hosted-project-steering-refresh.js";
-import { loadRuntimeAgentMarkdownDefinitionFromFile, resolveRuntimeAgentDefinitionsDir, } from "./runtime-agent-definition-files.js";
+import { listRuntimeAgentMarkdownDefinitionIds } from "./runtime-agent-definition-files.js";
 import { buildVeryfrontCloudRuntimeInstructions, } from "./veryfront-cloud-runtime-system-messages.js";
 import { createNodeAgentServiceRuntimeInfrastructure, } from "./node-agent-service-runtime-infrastructure.js";
 import { createAgentServiceRuntime, startAgentServiceRuntime, startNodeAgentService, } from "./agent-service-runtime.js";
@@ -127,20 +127,14 @@ function createNodeVeryfrontCloudAgentServiceContext(options) {
     function trace(operationName, operation) {
         return infrastructure.tracer.trace(operationName, operation);
     }
-    const projectSteering = createHostedAgentProjectSteering({
-        baseDir: resolveBaseDir(options),
-        agentId: options.agentId,
-        getApiUrl: () => infrastructure.getConfig().VERYFRONT_API_URL,
-        logger: infrastructure.logger,
-        trace,
-    });
     return {
         options,
         processTarget,
         projectDir: resolveProjectDir(options),
         infrastructure,
         trace,
-        projectSteering,
+        defaultAgentId: null,
+        projectSteeringByAgentId: new Map(),
         tracker: createDetachedRunTracker(),
         discoveryResult: null,
         agentConfig: null,
@@ -160,21 +154,11 @@ async function createRuntimeAgentDefinitionFromCodeAgent(codeAgent) {
         maxSteps: codeAgent.config.maxSteps,
     };
 }
-function getMarkdownAgentConfig(context) {
-    return context.projectSteering.getAgentConfig();
+function getMarkdownAgentConfig(context, agentId) {
+    return getProjectSteering(context, agentId).getAgentConfig();
 }
 function loadMarkdownAgentConfig(context, agentId) {
-    if (agentId === context.options.agentId) {
-        return getMarkdownAgentConfig(context);
-    }
-    const agentsDir = resolveRuntimeAgentDefinitionsDir({
-        baseDir: resolveBaseDir(context.options),
-        id: agentId,
-    });
-    return loadRuntimeAgentMarkdownDefinitionFromFile({
-        agentsDir,
-        id: agentId,
-    });
+    return getMarkdownAgentConfig(context, agentId);
 }
 async function resolveAgentConfig(context, agentId) {
     const cachedAgentConfig = context.agentConfigs.get(agentId);
@@ -213,28 +197,89 @@ async function discoverProjectPrimitives(context) {
     });
     context.discoveryResult = await discoverAll(discoveryOptions);
 }
+function getDiscoveredCodeAgentIds(context) {
+    return [...(context.discoveryResult?.agents.keys() ?? [])].sort((left, right) => left.localeCompare(right));
+}
+function getDiscoveredMarkdownAgentIds(context) {
+    return listRuntimeAgentMarkdownDefinitionIds({
+        baseDir: resolveBaseDir(context.options),
+    });
+}
+function describeAgentIdCandidates(input) {
+    const ids = [...new Set([...input.codeAgentIds, ...input.markdownAgentIds])]
+        .sort((left, right) => left.localeCompare(right));
+    return ids.length > 0 ? ids.join(", ") : "none";
+}
+function resolveSingleAgentId(input) {
+    if (input.source === "code") {
+        return input.codeAgentIds.length === 1 ? input.codeAgentIds[0] ?? null : null;
+    }
+    if (input.source === "markdown") {
+        return input.markdownAgentIds.length === 1 ? input.markdownAgentIds[0] ?? null : null;
+    }
+    const candidateIds = [...new Set([...input.codeAgentIds, ...input.markdownAgentIds])];
+    return candidateIds.length === 1 ? candidateIds[0] ?? null : null;
+}
+function resolveDefaultAgentId(context) {
+    if (context.options.agentId) {
+        return context.options.agentId;
+    }
+    const source = context.options.agentSource ?? "auto";
+    const codeAgentIds = getDiscoveredCodeAgentIds(context);
+    const markdownAgentIds = getDiscoveredMarkdownAgentIds(context);
+    const agentId = resolveSingleAgentId({ codeAgentIds, markdownAgentIds, source });
+    if (agentId) {
+        return agentId;
+    }
+    throw new Error([
+        "agentId is required when agent discovery does not resolve to exactly one agent.",
+        `Discovered agents: ${describeAgentIdCandidates({ codeAgentIds, markdownAgentIds })}.`,
+    ].join(" "));
+}
 async function initializeNodeVeryfrontCloudAgentServiceContext(context) {
     await discoverProjectPrimitives(context);
-    context.agentConfig = await resolveAgentConfig(context, context.options.agentId);
+    context.defaultAgentId = resolveDefaultAgentId(context);
+    context.agentConfig = await resolveAgentConfig(context, context.defaultAgentId);
+}
+function getDefaultAgentId(context) {
+    if (!context.defaultAgentId) {
+        throw new Error("Agent service context has not been initialized.");
+    }
+    return context.defaultAgentId;
+}
+function getProjectSteering(context, agentId = getDefaultAgentId(context)) {
+    const cachedProjectSteering = context.projectSteeringByAgentId.get(agentId);
+    if (cachedProjectSteering) {
+        return cachedProjectSteering;
+    }
+    const projectSteering = createHostedAgentProjectSteering({
+        baseDir: resolveBaseDir(context.options),
+        agentId,
+        getApiUrl: () => context.infrastructure.getConfig().VERYFRONT_API_URL,
+        logger: context.infrastructure.logger,
+        trace: context.trace,
+    });
+    context.projectSteeringByAgentId.set(agentId, projectSteering);
+    return projectSteering;
 }
 function getDiscoveredHostTools() {
     return Object.fromEntries([...toolRegistry.getAll()].sort(([left], [right]) => left.localeCompare(right)));
 }
 function getProjectInstructions(context, lookup) {
     return context.trace("chat.getProjectInstructions", async () => {
-        return await context.projectSteering.getProjectInstructions(lookup);
+        return await getProjectSteering(context).getProjectInstructions(lookup);
     });
 }
 function getSkillsConfig(context, lookup) {
     return context.trace("chat.getSkillsConfig", async () => {
-        return await context.projectSteering.getSkillsConfig(lookup);
+        return await getProjectSteering(context).getSkillsConfig(lookup);
     });
 }
 function createLoadSkillTool(context, toolContext) {
-    return context.projectSteering.createLoadSkillTool(toolContext);
+    return getProjectSteering(context).createLoadSkillTool(toolContext);
 }
 async function refreshProjectSkillIds(context, skillContext) {
-    await context.projectSteering.refreshProjectSkillIds(skillContext);
+    await getProjectSteering(context).refreshProjectSkillIds(skillContext);
 }
 function setFilteredTraceAttributes(context, attributes) {
     context.infrastructure.setActiveSpanAttributes(filterAgentTraceAttributes(attributes));
@@ -381,7 +426,7 @@ async function prepareChatExecution(context, req) {
     const { userId, authToken, projectId, conversationId, upstreamParentConversationId, upstreamParentRunId, spawnedFromToolCallId, } = req;
     const config = context.infrastructure.getConfig();
     setPrepareChatExecutionStartAttributes(context, { projectId, userId });
-    const agentConfig = await resolveAgentConfig(context, req.agentId ?? context.options.agentId);
+    const agentConfig = await resolveAgentConfig(context, req.agentId ?? getDefaultAgentId(context));
     const { effectiveMessages, rootRunContext, runtime: { agent, runtimeKind, modelId, cleanup }, finalMessages, } = await prepareVeryfrontCloudHostedChatExecution({
         request: req,
         agentConfig,

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

@@ -1,2 +1,2 @@
-export declare const VERSION = "0.1.510";
+export declare const VERSION = "0.1.512";
 //# 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.510";
+export const VERSION = "0.1.512";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "veryfront",
-  "version": "0.1.510",
+  "version": "0.1.512",
   "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.510",
+  "version": "0.1.512",
   "license": "Apache-2.0",
   "nodeModulesDir": "auto",
   "workspace": [

package/src/deps/esm.sh/@types/react-dom@19.2.3/client.d.ts

@@ -4,7 +4,7 @@
 
 // See https://github.com/facebook/react/blob/main/packages/react-dom/client.js to see how the exports are declared,
 
-import React = require("https://esm.sh/@types/react@19.2.3/index.d.ts");
+import React = require("https://esm.sh/@types/react@19.2.14/index.d.ts");
 
 export {};
 

package/src/deps/esm.sh/@types/{react@19.2.3 → react@19.2.14}/global.d.ts

@@ -18,6 +18,7 @@ interface KeyboardEvent extends Event {}
 interface MouseEvent extends Event {}
 interface TouchEvent extends Event {}
 interface PointerEvent extends Event {}
+interface SubmitEvent extends Event {}
 interface ToggleEvent extends Event {}
 interface TransitionEvent extends Event {}
 interface UIEvent extends Event {}

package/src/deps/esm.sh/@types/{react@19.2.3 → react@19.2.14}/index.d.ts

@@ -16,6 +16,7 @@ type NativeKeyboardEvent = KeyboardEvent;
 type NativeMouseEvent = MouseEvent;
 type NativeTouchEvent = TouchEvent;
 type NativePointerEvent = PointerEvent;
+type NativeSubmitEvent = SubmitEvent;
 type NativeToggleEvent = ToggleEvent;
 type NativeTransitionEvent = TransitionEvent;
 type NativeUIEvent = UIEvent;
@@ -225,12 +226,20 @@ declare namespace React {
 
     type ComponentState = any;
 
+    interface DO_NOT_USE_OR_YOU_WILL_BE_FIRED_EXPERIMENTAL_KEY_TYPES {}
+
     /**
      * A value which uniquely identifies a node among items in an array.
      *
      * @see {@link https://react.dev/learn/rendering-lists#keeping-list-items-in-order-with-key React Docs}
      */
-    type Key = string | number | bigint;
+    type Key =
+        | string
+        | number
+        | bigint
+        | DO_NOT_USE_OR_YOU_WILL_BE_FIRED_EXPERIMENTAL_KEY_TYPES[
+            keyof DO_NOT_USE_OR_YOU_WILL_BE_FIRED_EXPERIMENTAL_KEY_TYPES
+        ];
 
     /**
      * @internal The props any component can receive.
@@ -1884,7 +1893,7 @@ declare namespace React {
      *
      * @param callback A synchronous, void callback that will execute as a single, complete React commit.
      *
-     * @see https://reactjs.org/blog/2019/02/06/react-v16.8.0.html#testing-hooks
+     * @see {@link https://reactjs.org/blog/2019/02/06/react-v16.8.0.html#testing-hooks}
      */
     // NOTES
     // - the order of these signatures matters - typescript will check the signatures in source order.
@@ -1926,7 +1935,31 @@ declare namespace React {
         reducer: (state: State, action: Action) => State,
     ): [State, (action: Action) => void];
 
-    export type Usable<T> = PromiseLike<T> | Context<T>;
+    interface UntrackedReactPromise<T> extends PromiseLike<T> {
+        status?: void;
+    }
+
+    export interface PendingReactPromise<T> extends PromiseLike<T> {
+        status: "pending";
+    }
+
+    export interface FulfilledReactPromise<T> extends PromiseLike<T> {
+        status: "fulfilled";
+        value: T;
+    }
+
+    export interface RejectedReactPromise<T> extends PromiseLike<T> {
+        status: "rejected";
+        reason: unknown;
+    }
+
+    export type ReactPromise<T> =
+        | UntrackedReactPromise<T>
+        | PendingReactPromise<T>
+        | FulfilledReactPromise<T>
+        | RejectedReactPromise<T>;
+
+    export type Usable<T> = ReactPromise<T> | Context<T>;
 
     export function use<T>(usable: Usable<T>): T;
 
@@ -2041,15 +2074,28 @@ declare namespace React {
         target: EventTarget & Target;
     }
 
+    /**
+     * @deprecated FormEvent doesn't actually exist.
+     *             You probably meant to use {@link ChangeEvent}, {@link InputEvent}, {@link SubmitEvent}, or just {@link SyntheticEvent} instead
+     *             depending on the event type.
+     */
     interface FormEvent<T = Element> extends SyntheticEvent<T> {
     }
 
     interface InvalidEvent<T = Element> extends SyntheticEvent<T> {
-        target: EventTarget & T;
     }
 
-    interface ChangeEvent<T = Element> extends SyntheticEvent<T> {
-        target: EventTarget & T;
+    /**
+     * change events bubble in React so their target is generally unknown.
+     * Only for form elements we know their target type because form events can't
+     * be nested.
+     * This type exists purely to narrow `target` for form elements. It doesn't
+     * reflect a DOM event. Change events are just fired as standard {@link SyntheticEvent}.
+     */
+    interface ChangeEvent<CurrentTarget = Element, Target = Element> extends SyntheticEvent<CurrentTarget> {
+        // TODO: This is wrong for change event handlers on arbitrary. Should
+        // be EventTarget & Target, but kept for backward compatibility until React 20.
+        target: EventTarget & CurrentTarget;
     }
 
     interface InputEvent<T = Element> extends SyntheticEvent<T, NativeInputEvent> {
@@ -2119,6 +2165,13 @@ declare namespace React {
         shiftKey: boolean;
     }
 
+    interface SubmitEvent<T = Element> extends SyntheticEvent<T, NativeSubmitEvent> {
+        // `submitter` is available in react@canary
+        // submitter: HTMLElement | null;
+        // SubmitEvents are always targetted at HTMLFormElements.
+        target: EventTarget & HTMLFormElement;
+    }
+
     interface TouchEvent<T = Element> extends UIEvent<T, NativeTouchEvent> {
         altKey: boolean;
         changedTouches: TouchList;
@@ -2174,11 +2227,19 @@ declare namespace React {
     type CompositionEventHandler<T = Element> = EventHandler<CompositionEvent<T>>;
     type DragEventHandler<T = Element> = EventHandler<DragEvent<T>>;
     type FocusEventHandler<T = Element> = EventHandler<FocusEvent<T>>;
+    /**
+     * @deprecated FormEventHandler doesn't actually exist.
+     *             You probably meant to use {@link ChangeEventHandler}, {@link InputEventHandler}, {@link SubmitEventHandler}, or just {@link EventHandler} instead
+     *             depending on the event type.
+     */
     type FormEventHandler<T = Element> = EventHandler<FormEvent<T>>;
-    type ChangeEventHandler<T = Element> = EventHandler<ChangeEvent<T>>;
+    type ChangeEventHandler<CurrentTarget = Element, Target = Element> = EventHandler<
+        ChangeEvent<CurrentTarget, Target>
+    >;
     type InputEventHandler<T = Element> = EventHandler<InputEvent<T>>;
     type KeyboardEventHandler<T = Element> = EventHandler<KeyboardEvent<T>>;
     type MouseEventHandler<T = Element> = EventHandler<MouseEvent<T>>;
+    type SubmitEventHandler<T = Element> = EventHandler<SubmitEvent<T>>;
     type TouchEventHandler<T = Element> = EventHandler<TouchEvent<T>>;
     type PointerEventHandler<T = Element> = EventHandler<PointerEvent<T>>;
     type UIEventHandler<T = Element> = EventHandler<UIEvent<T>>;
@@ -2232,19 +2293,19 @@ declare namespace React {
         onBlur?: FocusEventHandler<T> | undefined;
         onBlurCapture?: FocusEventHandler<T> | undefined;
 
-        // Form Events
-        onChange?: FormEventHandler<T> | undefined;
-        onChangeCapture?: FormEventHandler<T> | undefined;
+        // form related Events
+        onChange?: ChangeEventHandler<T> | undefined;
+        onChangeCapture?: ChangeEventHandler<T> | undefined;
         onBeforeInput?: InputEventHandler<T> | undefined;
-        onBeforeInputCapture?: FormEventHandler<T> | undefined;
-        onInput?: FormEventHandler<T> | undefined;
-        onInputCapture?: FormEventHandler<T> | undefined;
-        onReset?: FormEventHandler<T> | undefined;
-        onResetCapture?: FormEventHandler<T> | undefined;
-        onSubmit?: FormEventHandler<T> | undefined;
-        onSubmitCapture?: FormEventHandler<T> | undefined;
-        onInvalid?: FormEventHandler<T> | undefined;
-        onInvalidCapture?: FormEventHandler<T> | undefined;
+        onBeforeInputCapture?: InputEventHandler<T> | undefined;
+        onInput?: InputEventHandler<T> | undefined;
+        onInputCapture?: InputEventHandler<T> | undefined;
+        onReset?: ReactEventHandler<T> | undefined;
+        onResetCapture?: ReactEventHandler<T> | undefined;
+        onSubmit?: SubmitEventHandler<T> | undefined;
+        onSubmitCapture?: SubmitEventHandler<T> | undefined;
+        onInvalid?: ReactEventHandler<T> | undefined;
+        onInvalidCapture?: ReactEventHandler<T> | undefined;
 
         // Image Events
         onLoad?: ReactEventHandler<T> | undefined;
@@ -2788,7 +2849,7 @@ declare namespace React {
 
         // Living Standard
         /**
-         * @see https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/inert
+         * @see {@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/inert}
          */
         inert?: boolean | undefined;
         /**
@@ -3251,7 +3312,9 @@ declare namespace React {
         value?: string | readonly string[] | number | undefined;
         width?: number | string | undefined;
 
-        onChange?: ChangeEventHandler<T> | undefined;
+        // No other element dispatching change events can be nested in a <input>
+        // so we know the target will be a HTMLInputElement.
+        onChange?: ChangeEventHandler<T, HTMLInputElement> | undefined;
     }
 
     interface KeygenHTMLAttributes<T> extends HTMLAttributes<T> {
@@ -3416,7 +3479,9 @@ declare namespace React {
         required?: boolean | undefined;
         size?: number | undefined;
         value?: string | readonly string[] | number | undefined;
-        onChange?: ChangeEventHandler<T> | undefined;
+        // No other element dispatching change events can be nested in a <select>
+        // so we know the target will be a HTMLSelectElement.
+        onChange?: ChangeEventHandler<T, HTMLSelectElement> | undefined;
     }
 
     interface SourceHTMLAttributes<T> extends HTMLAttributes<T> {
@@ -3468,7 +3533,9 @@ declare namespace React {
         value?: string | readonly string[] | number | undefined;
         wrap?: string | undefined;
 
-        onChange?: ChangeEventHandler<T> | undefined;
+        // No other element dispatching change events can be nested in a <textarea>
+        // so we know the target will be a HTMLTextAreaElement.
+        onChange?: ChangeEventHandler<T, HTMLTextAreaElement> | undefined;
     }
 
     interface TdHTMLAttributes<T> extends HTMLAttributes<T> {
@@ -3540,6 +3607,9 @@ declare namespace React {
         method?: string | undefined;
         min?: number | string | undefined;
         name?: string | undefined;
+        nonce?: string | undefined;
+        part?: string | undefined;
+        slot?: string | undefined;
         style?: CSSProperties | undefined;
         target?: string | undefined;
         type?: string | undefined;
@@ -4057,7 +4127,6 @@ declare namespace React {
          * Captures which component contained the exception, and its ancestors.
          */
         componentStack?: string | null;
-        digest?: string | null;
     }
 
     // Keep in sync with JSX namespace in ./jsx-runtime.d.ts and ./jsx-dev-runtime.d.ts

package/src/deps/esm.sh/react-dom@19.2.4/client.d.ts

@@ -4,7 +4,7 @@
 
 // See https://github.com/facebook/react/blob/main/packages/react-dom/client.js to see how the exports are declared,
 
-import React = require("https://esm.sh/@types/react@19.2.3/index.d.ts");
+import React = require("https://esm.sh/@types/react@19.2.14/index.d.ts");
 
 export {};
 

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,7 +30,7 @@ import {
   prepareHostedChatRuntimeToolAssembly,
   type PrepareHostedChatRuntimeToolAssemblyInput,
 } from "./hosted-chat-runtime-tool-assembly.js";
-import type { HostedProjectMcpServerConfig } from "./hosted-project-remote-tool-source.js";
+import type { AgentServiceMcpServerConfig } from "./agent-service-mcp-server-config.js";
 import {
   createHostedRuntimeStateResolver,
   type HostedRuntimeStateResolverContext,
@@ -46,7 +46,7 @@ export type DefaultHostedChatRuntimeConfig = {
   apiUrl: string;
   apiMcpUrl: string;
   studioMcpUrl?: string | null;
-  mcpServers?: readonly HostedProjectMcpServerConfig[];
+  mcpServers?: readonly AgentServiceMcpServerConfig[];
 };
 
 export type DefaultHostedChatRuntimeLogger = {

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

@@ -29,7 +29,7 @@ import { startHostedChildForkRuntimeWithHostTools } from "./hosted-child-fork-ru
 import {
   prepareDefaultHostedChildForkSandboxToolSources,
 } from "./hosted-child-fork-tool-sources.js";
-import type { HostedProjectMcpServerConfig } from "./hosted-project-remote-tool-source.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 {
@@ -80,7 +80,7 @@ export type DefaultHostedInvokeAgentConfig = {
   apiUrl: string;
   apiMcpUrl: string;
   studioMcpUrl?: string | null;
-  mcpServers?: readonly HostedProjectMcpServerConfig[];
+  mcpServers?: readonly AgentServiceMcpServerConfig[];
   enableDurableInvokeAgent?: boolean;
 };
 

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

@@ -17,9 +17,9 @@ import {
   fetchLatestConversationUserText,
   updateDefaultResearchArtifacts,
 } from "./default-research-artifact-support.js";
+import { type AgentServiceMcpServerConfig } from "./agent-service-mcp-server-config.js";
 import {
   createHostedProjectRemoteToolSources,
-  type HostedProjectMcpServerConfig,
   type HostedProjectRemoteToolSourceMutationHandler,
   type HostedProjectRemoteToolSourcePrepareToolInput,
   type HostedProjectRemoteToolSourceProjectSwitchHandler,
@@ -59,7 +59,7 @@ export type PrepareHostedChatRuntimeToolAssemblyInput<
   apiUrl: string;
   apiMcpUrl: string;
   studioMcpUrl?: string | null;
-  mcpServers?: readonly HostedProjectMcpServerConfig[];
+  mcpServers?: readonly AgentServiceMcpServerConfig[];
   conversationId?: string;
   allowedToolNames?: HostedChatRuntimeAllowedToolNames;
   projectScopedRemoteToolOptions?: ProjectScopedRemoteToolOptions;