@decocms/bindings 1.0.1-alpha.21 → 1.0.1-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/bindings",
-  "version": "1.0.1-alpha.21",
+  "version": "1.0.1-alpha.22",
   "type": "module",
   "scripts": {
     "check": "tsc --noEmit",

package/src/core/binder.ts

@@ -129,7 +129,7 @@ export const bindingClient = <TDefinition extends readonly ToolBinder[]>(
   };
 };
 
-export type MCPBindingClient<T extends ReturnType<typeof bindingClient>> =
+export type MCPBindingClient<T extends ReturnType<typeof bindingClient<any>>> =
   ReturnType<T["forConnection"]>;
 
 /**

package/src/core/client/mcp.ts

@@ -59,6 +59,16 @@ export type MCPClientStub<TDefinition extends readonly ToolBinder[]> = {
 };
 
 export type MCPClientFetchStub<TDefinition extends readonly ToolBinder[]> = {
+  listTools: () => Promise<
+    {
+      id: string;
+      inputSchema: z.ZodType;
+      outputSchema: z.ZodType;
+      description: string;
+      execute: (params: any) => Promise<any>;
+    }[]
+  >;
+} & {
   [K in TDefinition[number] as K["name"]]: K["streamable"] extends true
     ? K extends ToolBinder<string, infer TInput, any, true>
       ? (params: TInput, init?: RequestInit) => Promise<Response>

package/src/core/client/proxy.ts

@@ -11,18 +11,33 @@ const safeParse = (content: string) => {
   }
 };
 
-const toolsMap = new Map<
-  string,
-  Promise<
-    Array<{
-      name: string;
-      inputSchema: any;
-      outputSchema?: any;
-      description: string;
-    }>
-  >
->();
+type Tool = {
+  name: string;
+  inputSchema: any;
+  outputSchema?: any;
+  description: string;
+};
 
+const toolsMap = new Map<string, Promise<Array<Tool>>>();
+
+const mapTool = (
+  tool: Tool,
+  callToolFn: (input: any, toolName?: string) => Promise<any>,
+) => {
+  return {
+    ...tool,
+    id: tool.name,
+    inputSchema: tool.inputSchema
+      ? convertJsonSchemaToZod(tool.inputSchema)
+      : undefined,
+    outputSchema: tool.outputSchema
+      ? convertJsonSchemaToZod(tool.outputSchema)
+      : undefined,
+    execute: (input: any) => {
+      return callToolFn(input.context, tool.name);
+    },
+  };
+};
 /**
  * The base fetcher used to fetch the MCP from API.
  */
@@ -47,7 +62,13 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
       if (typeof name !== "string") {
         throw new Error("Name must be a string");
       }
-      async function callToolFn(args: Record<string, unknown>) {
+      if (name === "listTools") {
+        return asCallableTools;
+      }
+      async function callToolFn(
+        args: Record<string, unknown>,
+        toolName = name,
+      ) {
         const debugId = options?.debugId?.();
         const extraHeaders = debugId
           ? { "x-trace-debug-id": debugId }
@@ -55,12 +76,12 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
 
         const { client, callStreamableTool } = await createClient(extraHeaders);
 
-        if (options?.streamable?.[String(name)]) {
-          return callStreamableTool(String(name), args);
+        if (options?.streamable?.[String(toolName)]) {
+          return callStreamableTool(String(toolName), args);
         }
 
         const { structuredContent, isError, content } = await client.callTool({
-          name: String(name),
+          name: String(toolName),
           arguments: args as Record<string, unknown>,
         });
 
@@ -85,7 +106,7 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
           }
 
           throw new Error(
-            `Tool ${String(name)} returned an error: ${JSON.stringify(
+            `Tool ${String(toolName)} returned an error: ${JSON.stringify(
               structuredContent ?? content,
             )}`,
           );
@@ -93,7 +114,7 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
         return structuredContent;
       }
 
-      const listToolsFn = async () => {
+      async function listToolsFn() {
         const { client } = await createClient();
         const { tools } = await client.listTools();
 
@@ -103,7 +124,7 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
           outputSchema?: any;
           description: string;
         }[];
-      };
+      }
 
       async function listToolsOnce() {
         if (!("connection" in options)) {
@@ -125,6 +146,12 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
           return;
         }
       }
+
+      async function asCallableTools() {
+        const tools = (await listToolsOnce()) ?? [];
+        return tools.map((tool) => mapTool(tool, callToolFn));
+      }
+
       callToolFn.asTool = async () => {
         const tools = (await listToolsOnce()) ?? [];
         const tool = tools.find((t) => t.name === name);
@@ -132,19 +159,7 @@ export function createMCPClientProxy<T extends Record<string, unknown>>(
           throw new Error(`Tool ${name} not found`);
         }
 
-        return {
-          ...tool,
-          id: tool.name,
-          inputSchema: tool.inputSchema
-            ? convertJsonSchemaToZod(tool.inputSchema)
-            : undefined,
-          outputSchema: tool.outputSchema
-            ? convertJsonSchemaToZod(tool.outputSchema)
-            : undefined,
-          execute: (input: any) => {
-            return callToolFn(input.context);
-          },
-        };
+        return mapTool(tool, callToolFn);
       };
       return callToolFn;
     },

package/src/well-known/collections.ts

@@ -260,7 +260,7 @@ export interface CollectionBindingOptions {
  * ```
  */
 export function createCollectionBindings<
-  TEntitySchema extends z.AnyZodObject,
+  TEntitySchema extends z.ZodObject<z.ZodRawShape>,
   TName extends string,
 >(
   collectionName: TName,
@@ -329,9 +329,11 @@ type ToolBinding<
  * Type helper to extract the collection binding type
  */
 export type CollectionBinding<
-  TEntitySchema extends z.AnyZodObject,
+  TEntitySchema,
   TUpperName extends Uppercase<string> = Uppercase<string>,
-  TEntity = z.infer<TEntitySchema>,
+  TEntity = TEntitySchema extends z.AnyZodObject
+    ? z.infer<TEntitySchema>
+    : TEntitySchema,
 > = [
   ToolBinding<
     `COLLECTION_${TUpperName}_LIST`,