@decocms/runtime 0.25.1 → 0.27.0-beta.1

package/dist/resources.d.ts

@@ -4,11 +4,11 @@ declare const ResourcesReadInputSchema: z.ZodObject<{
     name: z.ZodString;
     uri: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     uri: string;
-}, {
     name: string;
+}, {
     uri: string;
+    name: string;
 }>;
 declare const ResourcesReadOutputSchema: z.ZodObject<{
     name: z.ZodString;
@@ -24,25 +24,25 @@ declare const ResourcesReadOutputSchema: z.ZodObject<{
     data: z.ZodString;
     type: z.ZodEnum<["text", "blob"]>;
 }, "strip", z.ZodTypeAny, {
+    uri: string;
     type: "text" | "blob";
     name: string;
     data: string;
-    uri: string;
-    description?: string | undefined;
     mimeType?: string | undefined;
     title?: string | undefined;
+    description?: string | undefined;
     annotations?: Record<string, string> | undefined;
     thumbnail?: string | undefined;
     timestamp?: string | undefined;
     size?: number | undefined;
 }, {
+    uri: string;
     type: "text" | "blob";
     name: string;
     data: string;
-    uri: string;
-    description?: string | undefined;
     mimeType?: string | undefined;
     title?: string | undefined;
+    description?: string | undefined;
     annotations?: Record<string, string> | undefined;
     thumbnail?: string | undefined;
     timestamp?: string | undefined;
@@ -76,21 +76,21 @@ declare const ResourceSearchOutputSchema: z.ZodObject<{
         size: z.ZodOptional<z.ZodNumber>;
         annotations: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
-        name: string;
         uri: string;
-        description?: string | undefined;
+        name: string;
         mimeType?: string | undefined;
         title?: string | undefined;
+        description?: string | undefined;
         annotations?: Record<string, string> | undefined;
         thumbnail?: string | undefined;
         timestamp?: string | undefined;
         size?: number | undefined;
     }, {
-        name: string;
         uri: string;
-        description?: string | undefined;
+        name: string;
         mimeType?: string | undefined;
         title?: string | undefined;
+        description?: string | undefined;
         annotations?: Record<string, string> | undefined;
         thumbnail?: string | undefined;
         timestamp?: string | undefined;
@@ -100,11 +100,11 @@ declare const ResourceSearchOutputSchema: z.ZodObject<{
     nextCursor: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     items: {
-        name: string;
         uri: string;
-        description?: string | undefined;
+        name: string;
         mimeType?: string | undefined;
         title?: string | undefined;
+        description?: string | undefined;
         annotations?: Record<string, string> | undefined;
         thumbnail?: string | undefined;
         timestamp?: string | undefined;
@@ -114,11 +114,11 @@ declare const ResourceSearchOutputSchema: z.ZodObject<{
     nextCursor?: string | undefined;
 }, {
     items: {
-        name: string;
         uri: string;
-        description?: string | undefined;
+        name: string;
         mimeType?: string | undefined;
         title?: string | undefined;
+        description?: string | undefined;
         annotations?: Record<string, string> | undefined;
         thumbnail?: string | undefined;
         timestamp?: string | undefined;
@@ -148,26 +148,26 @@ declare const ResourceCreateInputSchema: z.ZodObject<{
     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
 }, "strip", z.ZodTypeAny, {
     name: string;
-    resourceName: string;
     content: {
         type: "text" | "blob";
         data: string;
         mimeType?: string | undefined;
     };
-    description?: string | undefined;
+    resourceName: string;
     metadata?: Record<string, any> | undefined;
     title?: string | undefined;
+    description?: string | undefined;
 }, {
     name: string;
-    resourceName: string;
     content: {
         type: "text" | "blob";
         data: string;
         mimeType?: string | undefined;
     };
-    description?: string | undefined;
+    resourceName: string;
     metadata?: Record<string, any> | undefined;
     title?: string | undefined;
+    description?: string | undefined;
 }>;
 declare const ResourceCreateOutputSchema: z.ZodObject<{
     name: z.ZodString;
@@ -180,21 +180,21 @@ declare const ResourceCreateOutputSchema: z.ZodObject<{
     size: z.ZodOptional<z.ZodNumber>;
     annotations: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     uri: string;
-    description?: string | undefined;
+    name: string;
     mimeType?: string | undefined;
     title?: string | undefined;
+    description?: string | undefined;
     annotations?: Record<string, string> | undefined;
     thumbnail?: string | undefined;
     timestamp?: string | undefined;
     size?: number | undefined;
 }, {
-    name: string;
     uri: string;
-    description?: string | undefined;
+    name: string;
     mimeType?: string | undefined;
     title?: string | undefined;
+    description?: string | undefined;
     annotations?: Record<string, string> | undefined;
     thumbnail?: string | undefined;
     timestamp?: string | undefined;
@@ -221,10 +221,8 @@ declare const ResourceUpdateInputSchema: z.ZodObject<{
     }>>;
     metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodAny>>;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     uri: string;
-    description?: string | undefined;
-    resourceName?: string | undefined;
+    name: string;
     metadata?: Record<string, any> | undefined;
     content?: {
         type: "text" | "blob";
@@ -232,11 +230,11 @@ declare const ResourceUpdateInputSchema: z.ZodObject<{
         mimeType?: string | undefined;
     } | undefined;
     title?: string | undefined;
-}, {
-    name: string;
-    uri: string;
     description?: string | undefined;
     resourceName?: string | undefined;
+}, {
+    uri: string;
+    name: string;
     metadata?: Record<string, any> | undefined;
     content?: {
         type: "text" | "blob";
@@ -244,6 +242,8 @@ declare const ResourceUpdateInputSchema: z.ZodObject<{
         mimeType?: string | undefined;
     } | undefined;
     title?: string | undefined;
+    description?: string | undefined;
+    resourceName?: string | undefined;
 }>;
 declare const ResourceUpdateOutputSchema: z.ZodObject<{
     name: z.ZodString;
@@ -256,21 +256,21 @@ declare const ResourceUpdateOutputSchema: z.ZodObject<{
     size: z.ZodOptional<z.ZodNumber>;
     annotations: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     uri: string;
-    description?: string | undefined;
+    name: string;
     mimeType?: string | undefined;
     title?: string | undefined;
+    description?: string | undefined;
     annotations?: Record<string, string> | undefined;
     thumbnail?: string | undefined;
     timestamp?: string | undefined;
     size?: number | undefined;
 }, {
-    name: string;
     uri: string;
-    description?: string | undefined;
+    name: string;
     mimeType?: string | undefined;
     title?: string | undefined;
+    description?: string | undefined;
     annotations?: Record<string, string> | undefined;
     thumbnail?: string | undefined;
     timestamp?: string | undefined;
@@ -281,12 +281,12 @@ declare const ResourceDeleteInputSchema: z.ZodObject<{
     uri: z.ZodString;
     force: z.ZodOptional<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     uri: string;
+    name: string;
     force?: boolean | undefined;
 }, {
-    name: string;
     uri: string;
+    name: string;
     force?: boolean | undefined;
 }>;
 declare const ResourceDeleteOutputSchema: z.ZodObject<{
@@ -308,16 +308,16 @@ declare const ResourcesListOutputSchema: z.ZodObject<{
         hasDelete: z.ZodOptional<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         name: string;
-        description: string;
         title: string;
+        description: string;
         icon: string;
         hasCreate?: boolean | undefined;
         hasUpdate?: boolean | undefined;
         hasDelete?: boolean | undefined;
     }, {
         name: string;
-        description: string;
         title: string;
+        description: string;
         icon: string;
         hasCreate?: boolean | undefined;
         hasUpdate?: boolean | undefined;
@@ -326,8 +326,8 @@ declare const ResourcesListOutputSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     resources: {
         name: string;
-        description: string;
         title: string;
+        description: string;
         icon: string;
         hasCreate?: boolean | undefined;
         hasUpdate?: boolean | undefined;
@@ -336,8 +336,8 @@ declare const ResourcesListOutputSchema: z.ZodObject<{
 }, {
     resources: {
         name: string;
-        description: string;
         title: string;
+        description: string;
         icon: string;
         hasCreate?: boolean | undefined;
         hasUpdate?: boolean | undefined;

package/dist/views.d.ts

@@ -18,8 +18,8 @@ declare const ViewsListOutputSchema: z.ZodObject<{
         title: string;
         icon: string;
         id?: string | undefined;
-        name?: string | undefined;
         url?: string | undefined;
+        name?: string | undefined;
         description?: string | undefined;
         resourceName?: string | undefined;
         mimeTypePattern?: string | undefined;
@@ -29,11 +29,11 @@ declare const ViewsListOutputSchema: z.ZodObject<{
         title: string;
         icon: string;
         id?: string | undefined;
-        name?: string | undefined;
         url?: string | undefined;
+        name?: string | undefined;
+        tools?: string[] | undefined;
         description?: string | undefined;
         resourceName?: string | undefined;
-        tools?: string[] | undefined;
         mimeTypePattern?: string | undefined;
         prompt?: string | undefined;
         installBehavior?: "open" | "none" | "autoPin" | undefined;
@@ -44,8 +44,8 @@ declare const ViewsListOutputSchema: z.ZodObject<{
         title: string;
         icon: string;
         id?: string | undefined;
-        name?: string | undefined;
         url?: string | undefined;
+        name?: string | undefined;
         description?: string | undefined;
         resourceName?: string | undefined;
         mimeTypePattern?: string | undefined;
@@ -57,11 +57,11 @@ declare const ViewsListOutputSchema: z.ZodObject<{
         title: string;
         icon: string;
         id?: string | undefined;
-        name?: string | undefined;
         url?: string | undefined;
+        name?: string | undefined;
+        tools?: string[] | undefined;
         description?: string | undefined;
         resourceName?: string | undefined;
-        tools?: string[] | undefined;
         mimeTypePattern?: string | undefined;
         prompt?: string | undefined;
         installBehavior?: "open" | "none" | "autoPin" | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decocms/runtime",
-  "version": "0.25.1",
+  "version": "0.27.0-beta.1",
   "type": "module",
   "scripts": {
     "build": "tsup",
@@ -9,9 +9,11 @@
   "dependencies": {
     "@cloudflare/workers-types": "^4.20250617.0",
     "@deco/mcp": "npm:@jsr/deco__mcp@0.5.5",
+    "@decocms/bindings": "workspace:*",
     "@mastra/cloudflare-d1": "^0.13.4",
     "@mastra/core": "^0.20.2",
     "@modelcontextprotocol/sdk": "^1.19.1",
+    "@ai-sdk/provider": "^2.0.0",
     "bidc": "0.0.3",
     "drizzle-orm": "^0.44.5",
     "jose": "^6.0.11",

package/src/bindings/binder.ts

@@ -1,14 +1,14 @@
 /* oxlint-disable no-explicit-any */
 import { z } from "zod";
 import type { MCPConnection } from "../connection.ts";
-import { createPrivateTool } from "../mastra.ts";
+import { createPrivateTool, createStreamableTool } from "../mastra.ts";
 import {
   createMCPFetchStub,
   type MCPClientFetchStub,
   type ToolBinder,
 } from "../mcp.ts";
-import { CHANNEL_BINDING_SCHEMA } from "./channels.ts";
-import { VIEW_BINDING_SCHEMA } from "./views.ts";
+import { CHANNEL_BINDING } from "./channels.ts";
+import { VIEW_BINDING } from "./views.ts";
 
 // ToolLike is a simplified version of the Tool interface that matches what we need for bindings
 export interface ToolLike<
@@ -75,27 +75,16 @@ export const bindingClient = <TDefinition extends readonly ToolBinder[]>(
     forConnection: (
       mcpConnection: MCPConnection,
     ): MCPClientFetchStub<TDefinition> => {
-      const stub = createMCPFetchStub<TDefinition>({
+      return createMCPFetchStub<TDefinition>({
         connection: mcpConnection,
-      });
-      return new Proxy<MCPClientFetchStub<TDefinition>>(
-        {} as MCPClientFetchStub<TDefinition>,
-        {
-          get(_, name) {
-            if (typeof name !== "string") {
-              throw new Error("Name must be a string");
-            }
-
-            return (args: Record<string, unknown>) => {
-              return (
-                stub[name as keyof MCPClientFetchStub<TDefinition>] as (
-                  args: Record<string, unknown>,
-                ) => Promise<unknown>
-              )(args);
-            };
+        streamable: binder.reduce(
+          (acc, tool) => {
+            acc[tool.name] = tool.streamable === true;
+            return acc;
           },
-        },
-      );
+          {} as Record<string, boolean>,
+        ),
+      });
     },
   };
 };
@@ -103,9 +92,8 @@ export const bindingClient = <TDefinition extends readonly ToolBinder[]>(
 export type MCPBindingClient<T extends ReturnType<typeof bindingClient>> =
   ReturnType<T["forConnection"]>;
 
-export const ChannelBinding = bindingClient(CHANNEL_BINDING_SCHEMA);
-
-export const ViewBinding = bindingClient(VIEW_BINDING_SCHEMA);
+export const ChannelBinding = bindingClient(CHANNEL_BINDING);
+export const ViewBinding = bindingClient(VIEW_BINDING);
 
 export type { Callbacks } from "./channels.ts";
 
@@ -113,8 +101,12 @@ export const impl = <TBinder extends Binder>(
   schema: TBinder,
   implementation: BinderImplementation<TBinder>,
   createToolFn = createPrivateTool,
+  createStreamableToolFn = createStreamableTool,
 ) => {
-  const impl: ReturnType<typeof createToolFn>[] = [];
+  const impl: (
+    | ReturnType<typeof createToolFn>
+    | ReturnType<typeof createStreamableToolFn>
+  )[] = [];
   for (const key in schema) {
     const toolSchema = schema[key];
     const toolImplementation = implementation[key];
@@ -127,17 +119,28 @@ export const impl = <TBinder extends Binder>(
       throw new Error(`Implementation for ${key} is required`);
     }
 
-    const { name, handler, ...toolLike }: ToolLike = {
+    const { name, handler, streamable, ...toolLike } = {
       ...toolSchema,
       ...toolImplementation,
     };
-    impl.push(
-      createToolFn({
-        ...toolLike,
-        id: name,
-        execute: ({ context }) => Promise.resolve(handler(context)),
-      }),
-    );
+    if (streamable) {
+      impl.push(
+        createStreamableToolFn({
+          ...toolLike,
+          streamable,
+          id: name,
+          execute: ({ context }) => Promise.resolve(handler(context)),
+        }),
+      );
+    } else {
+      impl.push(
+        createToolFn({
+          ...toolLike,
+          id: name,
+          execute: ({ context }) => Promise.resolve(handler(context)),
+        }),
+      );
+    }
   }
   return impl;
 };

package/src/bindings/channels.ts

@@ -34,7 +34,7 @@ const listChannelsSchema = z.object({
 export type Callbacks = z.infer<typeof callbacksSchema>;
 export type JoinedChannelPayload = z.infer<typeof joinChannelSchema>;
 export type ListChannelsSchema = z.infer<typeof listChannelsSchema>;
-export const CHANNEL_BINDING_SCHEMA = [
+export const CHANNEL_BINDING = [
   {
     name: "DECO_CHAT_CHANNELS_JOIN" as const,
     inputSchema: joinChannelSchema,

package/src/bindings/index.ts

@@ -1,7 +1,8 @@
-import { CHANNEL_BINDING_SCHEMA } from "./channels.ts";
-import { VIEW_BINDING_SCHEMA } from "./views.ts";
+import { CHANNEL_BINDING } from "./channels.ts";
+import { VIEW_BINDING as VIEWS_BINDING } from "./views.ts";
 
 // Import new Resources 2.0 bindings function
+import { LANGUAGE_MODEL_BINDING } from "@decocms/bindings/llm";
 import { createResourceBindings } from "./resources/bindings.ts";
 
 // Export types and utilities from binder
@@ -35,11 +36,11 @@ export * from "./resources/schemas.ts";
 
 // Export deconfig helpers and types
 export {
-  ResourcePath,
-  ResourceUri,
   getMetadataString as deconfigGetMetadataString,
   getMetadataValue as deconfigGetMetadataValue,
   normalizeDirectory as deconfigNormalizeDirectory,
+  ResourcePath,
+  ResourceUri,
 } from "./deconfig/helpers.ts";
 export { createDeconfigResource } from "./deconfig/index.ts";
 export type {
@@ -52,8 +53,9 @@ export type {
 export { deconfigTools } from "./deconfig/types.ts";
 
 export const WellKnownBindings = {
-  Channel: CHANNEL_BINDING_SCHEMA,
-  View: VIEW_BINDING_SCHEMA,
+  Channel: CHANNEL_BINDING,
+  View: VIEWS_BINDING,
+  LanguageModel: LANGUAGE_MODEL_BINDING,
   // Note: Resources is not included here since it's a generic function
   // Use createResourceBindings(dataSchema) directly for Resources 2.0
 } as const;

package/src/bindings/language-model/ai-sdk.ts

@@ -0,0 +1,87 @@
+import type {
+  LanguageModelV2,
+  LanguageModelV2CallOptions,
+  ProviderV2,
+} from "@ai-sdk/provider";
+import type { LanguageModelBinding } from "@decocms/bindings/llm";
+import { lazy, responseToStream } from "./utils.ts";
+
+const toRegExp = (supportedUrls: Record<string, string[]>) => {
+  return Object.fromEntries(
+    Object.entries(supportedUrls).map(([key, values]) => [
+      key,
+      values.map((v) => new RegExp(v)),
+    ]),
+  );
+};
+
+type LLMBindingClient = ReturnType<
+  (typeof LanguageModelBinding)["forConnection"]
+>;
+
+export interface Provider extends ProviderV2 {
+  listModels: LLMBindingClient["COLLECTION_LLM_LIST"];
+}
+
+/**
+ * Creates a ai-sdk compatible provider for the given binding
+ * @param binding - The binding to create the provider from
+ * @returns The provider
+ */
+export const createProvider = (binding: LLMBindingClient): Provider => {
+  return {
+    imageModel: () => {
+      throw new Error("Image models are not supported by this provider");
+    },
+    textEmbeddingModel: () => {
+      throw new Error(
+        "Text embedding models are not supported by this provider",
+      );
+    },
+    listModels: async () => {
+      return await binding.COLLECTION_LLM_LIST({});
+    },
+    languageModel: (modelId: string): LanguageModelV2 => {
+      const supportedUrls = lazy(() =>
+        binding
+          .LLM_METADATA({ modelId })
+          .then((metadata) => toRegExp(metadata.supportedUrls))
+      );
+
+      return {
+        specificationVersion: "v2" as const,
+        provider: "llm-binding",
+        modelId,
+        supportedUrls,
+        doGenerate: async (options: LanguageModelV2CallOptions) => {
+          const response = await binding.LLM_DO_GENERATE({
+            callOptions: options,
+            modelId,
+          });
+          // Ensure usage fields are always present as required by LanguageModelV2
+          return {
+            ...response,
+            usage: {
+              inputTokens: response.usage.inputTokens ?? undefined,
+              outputTokens: response.usage.outputTokens ?? undefined,
+              totalTokens: response.usage.totalTokens ?? undefined,
+              reasoningTokens: response.usage.reasoningTokens ?? undefined,
+            },
+          };
+        },
+        doStream: async (options: LanguageModelV2CallOptions) => {
+          const response = await binding.LLM_DO_STREAM({
+            callOptions: options,
+            modelId,
+          });
+          return {
+            stream: responseToStream(response),
+            response: {
+              headers: Object.fromEntries(response.headers?.entries() ?? []),
+            },
+          };
+        },
+      };
+    },
+  };
+};

package/src/bindings/language-model/index.ts

@@ -0,0 +1,4 @@
+export * from "@decocms/bindings";
+export { LanguageModelBinding } from "@decocms/bindings/llm";
+export * from "./ai-sdk.ts";
+export * from "./utils.ts";