@copilotkit/runtime 1.8.7 → 1.8.8-next.1

package/dist/lib/integrations/node-http/index.mjs

@@ -1,6 +1,6 @@
 import {
   copilotRuntimeNodeHttpEndpoint
-} from "../../../chunk-D453SZIW.mjs";
+} from "../../../chunk-HBCCZQBE.mjs";
 import "../../../chunk-EY6RUVB7.mjs";
 import "../../../chunk-5BIEM2UU.mjs";
 import "../../../chunk-SHBDMA63.mjs";

package/dist/{shared-350db43f.d.ts → shared-32a46e93.d.ts}

@@ -137,6 +137,7 @@ interface MCPTool {
         parameters?: {
             properties?: Record<string, any>;
             required?: string[];
+            jsonSchema?: Record<string, any>;
         };
     };
     /** The function to call to execute the tool on the MCP server. */
@@ -162,10 +163,10 @@ interface MCPEndpointConfig {
 }
 /**
  * Extracts CopilotKit-compatible parameters from an MCP tool schema.
- * @param toolSchema The schema object from an MCPTool.
+ * @param toolOrSchema The schema object from an MCPTool or the full MCPTool object.
  * @returns An array of Parameter objects.
  */
-declare function extractParametersFromSchema(toolSchema?: MCPTool["schema"]): Parameter[];
+declare function extractParametersFromSchema(toolOrSchema?: MCPTool | MCPTool["schema"]): Parameter[];
 /**
  * Converts a map of MCPTools into an array of CopilotKit Actions.
  * @param mcpTools A record mapping tool names to MCPTool objects.
@@ -305,18 +306,18 @@ interface CopilotRuntimeConstructorParams<T extends Parameter[] | [] = []> {
      * Requires providing the `createMCPClient` function during instantiation.
      * @experimental
      */
-    mcpEndpoints?: MCPEndpointConfig[];
+    mcpServers?: MCPEndpointConfig[];
     /**
      * A function that creates an MCP client instance for a given endpoint configuration.
      * This function is responsible for using the appropriate MCP client library
      * (e.g., `@copilotkit/runtime`, `ai`) to establish a connection.
-     * Required if `mcpEndpoints` is provided.
+     * Required if `mcpServers` is provided.
      *
      * ```typescript
      * import { experimental_createMCPClient } from "ai"; // Import from vercel ai library
      * // ...
      * const runtime = new CopilotRuntime({
-     *   mcpEndpoints: [{ endpoint: "..." }],
+     *   mcpServers: [{ endpoint: "..." }],
      *   async createMCPClient(config) {
      *     return await experimental_createMCPClient({
      *       transport: {
@@ -343,7 +344,7 @@ declare class CopilotRuntime<const T extends Parameter[] | [] = []> {
     private delegateAgentProcessingToServiceAdapter;
     private observability?;
     private availableAgents;
-    private readonly mcpEndpointsConfig?;
+    private readonly mcpServersConfig?;
     private mcpActionCache;
     private readonly createMCPClientImpl?;
     constructor(params?: CopilotRuntimeConstructorParams<T>);

package/package.json

@@ -9,7 +9,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.7",
+  "version": "1.8.8-next.1",
   "sideEffects": false,
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -63,7 +63,7 @@
     "rxjs": "^7.8.1",
     "type-graphql": "2.0.0-rc.1",
     "zod": "^3.23.3",
-    "@copilotkit/shared": "1.8.7"
+    "@copilotkit/shared": "1.8.8-next.1"
   },
   "keywords": [
     "copilotkit",

package/src/lib/runtime/copilot-runtime.ts

@@ -228,19 +228,19 @@ export interface CopilotRuntimeConstructorParams<T extends Parameter[] | [] = []
    * Requires providing the `createMCPClient` function during instantiation.
    * @experimental
    */
-  mcpEndpoints?: MCPEndpointConfig[];
+  mcpServers?: MCPEndpointConfig[];
 
   /**
    * A function that creates an MCP client instance for a given endpoint configuration.
    * This function is responsible for using the appropriate MCP client library
    * (e.g., `@copilotkit/runtime`, `ai`) to establish a connection.
-   * Required if `mcpEndpoints` is provided.
+   * Required if `mcpServers` is provided.
    *
    * ```typescript
    * import { experimental_createMCPClient } from "ai"; // Import from vercel ai library
    * // ...
    * const runtime = new CopilotRuntime({
-   *   mcpEndpoints: [{ endpoint: "..." }],
+   *   mcpServers: [{ endpoint: "..." }],
    *   async createMCPClient(config) {
    *     return await experimental_createMCPClient({
    *       transport: {
@@ -270,7 +270,7 @@ export class CopilotRuntime<const T extends Parameter[] | [] = []> {
   private availableAgents: Pick<AgentWithEndpoint, "name" | "id">[];
 
   // +++ MCP Properties +++
-  private readonly mcpEndpointsConfig?: MCPEndpointConfig[];
+  private readonly mcpServersConfig?: MCPEndpointConfig[];
   private mcpActionCache = new Map<string, Action<any>[]>();
   // --- MCP Properties ---
 
@@ -303,18 +303,14 @@ export class CopilotRuntime<const T extends Parameter[] | [] = []> {
     this.observability = params?.observability_c;
     this.agents = params?.agents ?? {};
     // +++ MCP Initialization +++
-    this.mcpEndpointsConfig = params?.mcpEndpoints;
+    this.mcpServersConfig = params?.mcpServers;
     this.createMCPClientImpl = params?.createMCPClient;
 
-    // Validate: If mcpEndpoints are provided, createMCPClient must also be provided
-    if (
-      this.mcpEndpointsConfig &&
-      this.mcpEndpointsConfig.length > 0 &&
-      !this.createMCPClientImpl
-    ) {
+    // Validate: If mcpServers are provided, createMCPClient must also be provided
+    if (this.mcpServersConfig && this.mcpServersConfig.length > 0 && !this.createMCPClientImpl) {
       throw new CopilotKitMisuseError({
         message:
-          "MCP Integration Error: `mcpEndpoints` were provided, but the `createMCPClient` function was not passed to the CopilotRuntime constructor. " +
+          "MCP Integration Error: `mcpServers` were provided, but the `createMCPClient` function was not passed to the CopilotRuntime constructor. " +
           "Please provide an implementation for `createMCPClient`.",
       });
     }
@@ -323,7 +319,7 @@ export class CopilotRuntime<const T extends Parameter[] | [] = []> {
     if (
       params?.actions &&
       (params?.remoteEndpoints?.some((e) => e.type === EndpointType.LangGraphPlatform) ||
-        this.mcpEndpointsConfig?.length)
+        this.mcpServersConfig?.length)
     ) {
       console.warn(
         "Local 'actions' defined in CopilotRuntime might not be available to remote agents (LangGraph, MCP). Consider defining actions closer to the agent implementation if needed.",
@@ -343,8 +339,16 @@ export class CopilotRuntime<const T extends Parameter[] | [] = []> {
       return messages; // No MCP tools for this specific request
     }
 
-    // Filter only MCP actions and format instructions
-    const mcpToolInstructions = mcpActionsForRequest
+    // Create a map to deduplicate tools by name (keeping the last one if duplicates exist)
+    const uniqueMcpTools = new Map<string, Action<any>>();
+
+    // Add all MCP tools to the map with their names as keys
+    mcpActionsForRequest.forEach((action) => {
+      uniqueMcpTools.set(action.name, action);
+    });
+
+    // Format instructions from the unique tools map
+    const mcpToolInstructions = Array.from(uniqueMcpTools.values())
       .map((action) => {
         const paramsString =
           action.parameters && action.parameters.length > 0
@@ -1110,19 +1114,29 @@ please use an LLM adapter instead.`,
     const requestSpecificMCPActions: Action<any>[] = [];
     if (this.createMCPClientImpl) {
       // 1. Determine effective MCP endpoints for this request
-      const baseEndpoints = this.mcpEndpointsConfig || [];
-      // Assuming frontend passes config via properties.mcpEndpoints
-      const requestEndpoints = (graphqlContext.properties?.mcpEndpoints ||
+      const baseEndpoints = this.mcpServersConfig || [];
+      // Assuming frontend passes config via properties.mcpServers
+      const requestEndpoints = (graphqlContext.properties?.mcpServers ||
+        graphqlContext.properties?.mcpEndpoints ||
         []) as MCPEndpointConfig[];
 
       // Merge and deduplicate endpoints based on URL
       const effectiveEndpointsMap = new Map<string, MCPEndpointConfig>();
-      [...baseEndpoints, ...requestEndpoints].forEach((ep) => {
+
+      // First add base endpoints (from runtime configuration)
+      [...baseEndpoints].forEach((ep) => {
         if (ep && ep.endpoint) {
-          // Basic validation
           effectiveEndpointsMap.set(ep.endpoint, ep);
         }
       });
+
+      // Then add request endpoints (from frontend), which will override duplicates
+      [...requestEndpoints].forEach((ep) => {
+        if (ep && ep.endpoint) {
+          effectiveEndpointsMap.set(ep.endpoint, ep);
+        }
+      });
+
       const effectiveEndpoints = Array.from(effectiveEndpointsMap.values());
 
       // 2. Fetch/Cache actions for effective endpoints
@@ -1134,14 +1148,10 @@ please use an LLM adapter instead.`,
           // Not cached, fetch now
           let client: MCPClient | null = null;
           try {
-            console.log(`MCP: Cache miss. Fetching tools for endpoint: ${endpointUrl}`);
             client = await this.createMCPClientImpl(config);
             const tools = await client.tools();
             actionsForEndpoint = convertMCPToolsToActions(tools, endpointUrl);
             this.mcpActionCache.set(endpointUrl, actionsForEndpoint); // Store in cache
-            console.log(
-              `MCP: Fetched and cached ${actionsForEndpoint.length} tools for ${endpointUrl}`,
-            );
           } catch (error) {
             console.error(
               `MCP: Failed to fetch tools from endpoint ${endpointUrl}. Skipping. Error:`,

package/src/lib/runtime/mcp-tools-utils.ts

@@ -10,6 +10,7 @@ export interface MCPTool {
     parameters?: {
       properties?: Record<string, any>;
       required?: string[];
+      jsonSchema?: Record<string, any>;
     };
   };
   /** The function to call to execute the tool on the MCP server. */
@@ -36,13 +37,23 @@ export interface MCPEndpointConfig {
 
 /**
  * Extracts CopilotKit-compatible parameters from an MCP tool schema.
- * @param toolSchema The schema object from an MCPTool.
+ * @param toolOrSchema The schema object from an MCPTool or the full MCPTool object.
  * @returns An array of Parameter objects.
  */
-export function extractParametersFromSchema(toolSchema?: MCPTool["schema"]): Parameter[] {
+export function extractParametersFromSchema(
+  toolOrSchema?: MCPTool | MCPTool["schema"],
+): Parameter[] {
   const parameters: Parameter[] = [];
-  const properties = toolSchema?.parameters?.properties;
-  const requiredParams = new Set(toolSchema?.parameters?.required || []);
+
+  // Handle either full tool object or just schema
+  const schema =
+    "schema" in (toolOrSchema || {})
+      ? (toolOrSchema as MCPTool).schema
+      : (toolOrSchema as MCPTool["schema"]);
+
+  const toolParameters = schema?.parameters || schema?.parameters?.jsonSchema;
+  const properties = toolParameters?.properties;
+  const requiredParams = new Set(toolParameters?.required || []);
 
   if (!properties) {
     return parameters;
@@ -80,7 +91,7 @@ export function convertMCPToolsToActions(
   const actions: Action<any>[] = [];
 
   for (const [toolName, tool] of Object.entries(mcpTools)) {
-    const parameters = extractParametersFromSchema(tool.schema);
+    const parameters = extractParametersFromSchema(tool);
 
     const handler = async (params: any): Promise<any> => {
       try {