@decocms/bindings 1.0.9 → 1.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/bindings",
-  "version": "1.0.9",
+  "version": "1.1.0",
   "type": "module",
   "scripts": {
     "check": "tsc --noEmit",

package/src/core/client/mcp-client.ts

@@ -9,7 +9,6 @@ import {
 import { WebSocketClientTransport } from "@modelcontextprotocol/sdk/client/websocket.js";
 import { RequestOptions } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import {
-  CallToolRequest,
   Implementation,
   ListToolsRequest,
   ListToolsResult,
@@ -43,15 +42,15 @@ class Client extends BaseClient {
     return result;
   }
 }
-type CallToolResponse = Awaited<ReturnType<Client["callTool"]>>;
 export interface ServerClient {
   client: {
-    callTool: (params: CallToolRequest["params"]) => Promise<CallToolResponse>;
+    callTool: Client["callTool"];
     listTools: () => Promise<ListToolsResult>;
   };
   callStreamableTool: (
     tool: string,
     args: Record<string, unknown>,
+    signal?: AbortSignal,
   ) => Promise<Response>;
 }
 export const createServerClient = async (
@@ -74,7 +73,7 @@ export const createServerClient = async (
 
   return {
     client,
-    callStreamableTool: (tool, args) => {
+    callStreamableTool: (tool, args, signal) => {
       if (mcpServer.connection.type !== "HTTP") {
         throw new Error("HTTP connection required");
       }
@@ -101,6 +100,7 @@ export const createServerClient = async (
         redirect: "manual",
         body: JSON.stringify(args),
         headers,
+        signal,
       });
     },
   };

package/src/core/client/proxy.ts

@@ -67,8 +67,16 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
       }
       async function callToolFn(
         args: Record<string, unknown>,
-        toolName = name,
+        toolNameOrRequestInit?: string | symbol | RequestInit,
       ) {
+        let toolName: string | symbol;
+        let requestInit: RequestInit | undefined;
+        if (typeof toolNameOrRequestInit === "object") {
+          toolName = name;
+          requestInit = toolNameOrRequestInit;
+        } else {
+          toolName ??= name;
+        }
         const debugId = options?.debugId?.();
         const extraHeaders = debugId
           ? { "x-trace-debug-id": debugId }
@@ -77,13 +85,21 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
         const { client, callStreamableTool } = await createClient(extraHeaders);
 
         if (options?.streamable?.[String(toolName)]) {
-          return callStreamableTool(String(toolName), args);
+          return callStreamableTool(
+            String(toolName),
+            args,
+            requestInit?.signal ?? undefined,
+          );
         }
 
-        const { structuredContent, isError, content } = await client.callTool({
-          name: String(toolName),
-          arguments: args as Record<string, unknown>,
-        });
+        const { structuredContent, isError, content } = await client.callTool(
+          {
+            name: String(toolName),
+            arguments: args as Record<string, unknown>,
+          },
+          undefined,
+          { signal: requestInit?.signal ?? undefined },
+        );
 
         if (isError) {
           const maybeErrorMessage = (content as { text: string }[])?.[0]?.text;