@decocms/runtime 0.28.1 → 1.0.0-alpha.10

package/src/mastra.ts

@@ -6,18 +6,10 @@ import {
   Tool,
   type ToolAction,
   type ToolExecutionContext,
-  type Workflow,
 } from "@mastra/core";
 import { RuntimeContext } from "@mastra/core/di";
-import {
-  createWorkflow,
-  createStep as mastraCreateStep,
-  type DefaultEngineType,
-  type ExecuteFunction,
-  type Step as MastraStep,
-} from "@mastra/core/workflows";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
-import { z } from "zod/v3";
+import { z } from "zod";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import type { DefaultEnv } from "./index.ts";
 import {
@@ -35,9 +27,6 @@ import {
 } from "./resources.ts";
 import { createStateValidationTool, State } from "./state.ts";
 import { ViewsListOutputSchema } from "./views.ts";
-export { createWorkflow };
-
-export { cloneStep, cloneWorkflow } from "@mastra/core/workflows";
 
 export const createRuntimeContext = (prev?: RuntimeContext<AppContext>) => {
   const runtimeContext = new RuntimeContext<AppContext>();
@@ -207,111 +196,6 @@ export type ExecWithContext<TF extends (...args: any[]) => any> = (
   },
 ) => ReturnType<TF>;
 
-export interface Step<
-  TStepId extends string = string,
-  // @ts-expect-error - TState is not a ZodObject
-  TState extends z.ZodObject<any> = z.ZodObject<any, z.$strip>,
-  TSchemaIn extends z.ZodType<any> = z.ZodType<any>,
-  TSchemaOut extends z.ZodType<any> = z.ZodType<any>,
-  TResumeSchema extends z.ZodType<any> = z.ZodType<any>,
-  TSuspendSchema extends z.ZodType<any> = z.ZodType<any>,
-  TEngineType = any,
-> extends Omit<
-    MastraStep<
-      TStepId,
-      TState,
-      TSchemaIn,
-      TSchemaOut,
-      TResumeSchema,
-      TSuspendSchema,
-      TEngineType
-    >,
-    "execute"
-  > {
-  execute: ExecWithContext<
-    ExecuteFunction<
-      z.infer<TState>,
-      z.infer<TSchemaIn>,
-      z.infer<TSchemaOut>,
-      z.infer<TResumeSchema>,
-      z.infer<TSuspendSchema>,
-      TEngineType
-    >
-  >;
-}
-export function createStepFromTool<
-  TSchemaIn extends z.ZodType<any>,
-  TSchemaOut extends z.ZodType<any>,
-  TSuspendSchema extends z.ZodType<any>,
-  TResumeSchema extends z.ZodType<any>,
-  TContext extends ToolExecutionContext<
-    TSchemaIn,
-    TSuspendSchema,
-    TResumeSchema
-  >,
->(
-  tool: Tool<TSchemaIn, TSchemaOut, TSuspendSchema, TResumeSchema, TContext> & {
-    inputSchema: TSchemaIn;
-    outputSchema: TSchemaOut;
-    execute: (context: TContext) => Promise<any>;
-  },
-): Step<
-  string,
-  // @ts-expect-error - TSchemaIn is not a ZodType
-  TSchemaIn,
-  TSchemaOut,
-  z.ZodType<any>,
-  z.ZodType<any>,
-  DefaultEngineType
-> {
-  // @ts-expect-error - TSchemaIn is not a ZodType
-  return mastraCreateStep(tool);
-}
-
-export function createStep<
-  TStepId extends string,
-  TStepInput extends z.ZodType<any>,
-  TStepOutput extends z.ZodType<any>,
-  TResumeSchema extends z.ZodType<any>,
-  TSuspendSchema extends z.ZodType<any>,
->(opts: {
-  id: TStepId;
-  description?: string;
-  inputSchema: TStepInput;
-  outputSchema: TStepOutput;
-  resumeSchema?: TResumeSchema;
-  suspendSchema?: TSuspendSchema;
-  execute: ExecWithContext<
-    // @ts-expect-error - TStepInput is not a ZodObject
-    ExecuteFunction<
-      z.infer<TStepInput>,
-      z.infer<TStepOutput>,
-      z.infer<TResumeSchema>,
-      z.infer<TSuspendSchema>,
-      DefaultEngineType
-    >
-  >;
-}): Step<
-  TStepId,
-  // @ts-expect-error - TStepInput is not a ZodObject
-  TStepInput,
-  TStepOutput,
-  TResumeSchema,
-  TSuspendSchema,
-  DefaultEngineType
-> {
-  // @ts-expect-error - TStepInput is not a ZodObject
-  return mastraCreateStep({
-    ...opts,
-    execute: (input) => {
-      return opts.execute({
-        ...input,
-        runtimeContext: createRuntimeContext(input.runtimeContext),
-      });
-    },
-  });
-}
-
 export interface ViewExport {
   title: string;
   icon: string;
@@ -392,13 +276,6 @@ export interface CreateMCPServerOptions<
     | ((
         env: Env & DefaultEnv<TSchema>,
       ) => CreatedTool[] | Promise<CreatedTool[]>);
-  workflows?: Array<
-    (
-      env: Env & DefaultEnv<TSchema>,
-    ) => // this is a workaround to allow workflows to be thenables
-      | Promise<{ workflow: ReturnType<typeof createWorkflow> }>
-      | ReturnType<typeof createWorkflow>
-  >;
 }
 
 export type Fetch<TEnv = any> = (
@@ -441,89 +318,6 @@ const decoChatOAuthToolsFor = <TSchema extends z.ZodTypeAny = never>({
   ];
 };
 
-const createWorkflowTools = <TEnv = any, TSchema extends z.ZodTypeAny = never>(
-  workflow: ReturnType<typeof createWorkflow>,
-  bindings: TEnv & DefaultEnv<TSchema>,
-) => {
-  const startTool = createTool({
-    id: `DECO_CHAT_WORKFLOWS_START_${workflow.id}`,
-    description: workflow.description ?? `Start workflow ${workflow.id}`,
-    inputSchema:
-      workflow.inputSchema && "shape" in workflow.inputSchema
-        ? workflow.inputSchema
-        : z.object({}),
-    outputSchema: z.object({
-      id: z.string(),
-    }),
-    execute: async (args) => {
-      const store = State.getStore();
-      const runId =
-        store?.req?.headers.get("x-deco-chat-run-id") ?? crypto.randomUUID();
-      const workflowDO = bindings.DECO_WORKFLOW_DO.get(
-        bindings.DECO_WORKFLOW_DO.idFromName(runId),
-      );
-
-      using result = await workflowDO.start({
-        workflowId: workflow.id,
-        args: args.context,
-        runId,
-        ctx: bindings.DECO_REQUEST_CONTEXT,
-      });
-      return { id: result.runId };
-    },
-  });
-
-  const cancelTool = createTool({
-    id: `DECO_CHAT_WORKFLOWS_CANCEL_${workflow.id}`,
-    description: `Cancel ${workflow.description ?? `workflow ${workflow.id}`}`,
-    inputSchema: z.object({ runId: z.string() }),
-    outputSchema: z.object({ cancelled: z.boolean() }),
-    execute: async (args) => {
-      const runId = args.context.runId;
-      const workflowDO = bindings.DECO_WORKFLOW_DO.get(
-        bindings.DECO_WORKFLOW_DO.idFromName(runId),
-      );
-
-      using _ = await workflowDO.cancel({
-        workflowId: workflow.id,
-        runId,
-        ctx: bindings.DECO_REQUEST_CONTEXT,
-      });
-
-      return { cancelled: true };
-    },
-  });
-
-  const resumeTool = createTool({
-    id: `DECO_CHAT_WORKFLOWS_RESUME_${workflow.id}`,
-    description: `Resume ${workflow.description ?? `workflow ${workflow.id}`}`,
-    inputSchema: z.object({
-      runId: z.string(),
-      stepId: z.string(),
-      resumeData: z.any(),
-    }),
-    outputSchema: z.object({ resumed: z.boolean() }),
-    execute: async (args) => {
-      const runId = args.context.runId;
-      const workflowDO = bindings.DECO_WORKFLOW_DO.get(
-        bindings.DECO_WORKFLOW_DO.idFromName(runId),
-      );
-
-      using _ = await workflowDO.resume({
-        workflowId: workflow.id,
-        runId,
-        resumeData: args.context.resumeData,
-        stepId: args.context.stepId,
-        ctx: bindings.DECO_REQUEST_CONTEXT,
-      });
-
-      return { resumed: true };
-    },
-  });
-
-  return [startTool, cancelTool, resumeTool];
-};
-
 type CallTool = (opts: {
   toolCallId: string;
   toolCallInput: any;
@@ -534,10 +328,6 @@ export type MCPServer<TEnv = any, TSchema extends z.ZodTypeAny = never> = {
   callTool: CallTool;
 };
 
-export const isWorkflow = (value: any): value is Workflow => {
-  return value && !(value instanceof Promise);
-};
-
 export const createMCPServer = <
   TEnv = any,
   TSchema extends z.ZodTypeAny = never,
@@ -706,24 +496,6 @@ export const createMCPServer = <
           };
     const tools = await toolsFn(bindings);
 
-    // since mastra workflows are thenables, we need to await and add as a prop
-    const workflows = await Promise.all(
-      options.workflows?.map(async (workflow) => {
-        const workflowResult = workflow(bindings);
-        if (isWorkflow(workflowResult)) {
-          return { workflow: workflowResult };
-        }
-
-        return await workflowResult;
-      }) ?? [],
-    ).then((w) => w.map((w) => w.workflow));
-
-    const workflowTools =
-      workflows?.flatMap((workflow) =>
-        createWorkflowTools(workflow, bindings),
-      ) ?? [];
-
-    tools.push(...workflowTools);
     tools.push(...decoChatOAuthToolsFor<TSchema>(options.oauth));
     tools.push(createStateValidationTool(options.oauth?.state));
 

package/src/mcp.ts

@@ -1,8 +1,6 @@
 /* oxlint-disable no-explicit-any */
-import { env } from "cloudflare:workers";
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { MCPConnection } from "./connection.ts";
-import type { DefaultEnv } from "./index.ts";
 import { createMCPClientProxy } from "./proxy.ts";
 import type { ToolBinder } from "@decocms/bindings";
 
@@ -69,9 +67,11 @@ export const MCPClient = new Proxy(
     forWorkspace: (
       workspace: string,
       token?: string,
+      decoCmsApiUrl?: string,
     ) => MCPClientFetchStub<typeof workspaceTools>;
     forConnection: <TDefinition extends readonly ToolBinder[]>(
       connection: MCPConnectionProvider,
+      decoCmsApiUrl?: string,
     ) => MCPClientFetchStub<TDefinition>;
   },
   {
@@ -81,20 +81,21 @@ export const MCPClient = new Proxy(
       }
 
       if (name === "forWorkspace") {
-        return (workspace: string, token?: string) =>
+        return (workspace: string, token?: string, decoCmsApiUrl?: string) =>
           createMCPFetchStub<[]>({
             workspace,
             token,
-            decoCmsApiUrl: (env as DefaultEnv).DECO_API_URL,
+            decoCmsApiUrl,
           });
       }
       if (name === "forConnection") {
         return <TDefinition extends readonly ToolBinder[]>(
           connection: MCPConnectionProvider,
+          decoCmsApiUrl?: string,
         ) =>
           createMCPFetchStub<TDefinition>({
             connection,
-            decoCmsApiUrl: (env as DefaultEnv).DECO_API_URL,
+            decoCmsApiUrl,
           });
       }
       return global[name as keyof typeof global];
@@ -104,11 +105,6 @@ export const MCPClient = new Proxy(
 
 export type { ToolBinder };
 
-export const isStreamableToolBinder = (
-  toolBinder: ToolBinder,
-): toolBinder is ToolBinder<string, any, any, true> => {
-  return toolBinder.streamable === true;
-};
 export type MCPClientStub<TDefinition extends readonly ToolBinder[]> = {
   [K in TDefinition[number] as K["name"]]: K extends ToolBinder<
     string,

package/src/proxy.ts

@@ -53,14 +53,6 @@ function supportsToolNameInPath(url: string): boolean {
 export function createMCPClientProxy<T extends Record<string, unknown>>(
   options?: CreateStubAPIOptions,
 ): T {
-  if (typeof options?.connection === "function") {
-    // [DEPRECATED] Passing a function as 'connection' is deprecated and will be removed in a future release.
-    // Please provide a connection object instead.
-    throw new Error(
-      "Deprecation Notice: Passing a function as 'connection' is deprecated and will be removed in a future release. Please provide a connection object instead.",
-    );
-  }
-
   const mcpPath = options?.mcpPath ?? "/mcp";
 
   const connection: MCPConnection = options?.connection || {

package/src/resources.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v3";
+import { z } from "zod";
 import mimeDb from "mime-db";
 
 type MimeDb = Record<string, { extensions?: string[] }>;

package/src/state.ts

@@ -1,5 +1,5 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-import { z } from "zod/v3";
+import { z } from "zod";
 import type { AppContext } from "./mastra.ts";
 import { createTool } from "./mastra.ts";
 

package/src/views.ts

@@ -1,4 +1,4 @@
-import { z } from "zod/v3";
+import { z } from "zod";
 
 const installBehavior = z.enum(["none", "open", "autoPin"]);
 

package/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "types": ["@cloudflare/workers-types"]
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist", "scripts/**/*"]
+}

package/dist/admin.d.ts

@@ -1,5 +0,0 @@
-declare const requestMissingScopes: ({ scopes }: {
-    scopes: string[];
-}) => void;
-
-export { requestMissingScopes };

package/dist/admin.js

@@ -1,21 +0,0 @@
-import './chunk-I7BWSAN6.js';
-import { createChannel } from 'bidc';
-
-var requestMissingScopes = ({ scopes }) => {
-  try {
-    const channel = createChannel();
-    channel.send({
-      type: "request_missing_scopes",
-      payload: {
-        scopes
-      }
-    });
-    channel.cleanup();
-  } catch (error) {
-    console.error("Failed to request missing scopes", error);
-  }
-};
-
-export { requestMissingScopes };
-//# sourceMappingURL=admin.js.map
-//# sourceMappingURL=admin.js.map

package/dist/admin.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/admin.ts"],"names":[],"mappings":";;;AAEO,IAAM,oBAAA,GAAuB,CAAC,EAAE,MAAA,EAAO,KAA4B;AACxE,EAAA,IAAI;AACF,IAAA,MAAM,UAAU,aAAA,EAAc;AAC9B,IAAA,OAAA,CAAQ,IAAA,CAAK;AAAA,MACX,IAAA,EAAM,wBAAA;AAAA,MACN,OAAA,EAAS;AAAA,QACP;AAAA;AACF,KACD,CAAA;AACD,IAAA,OAAA,CAAQ,OAAA,EAAQ;AAAA,EAClB,SAAS,KAAA,EAAO;AACd,IAAA,OAAA,CAAQ,KAAA,CAAM,oCAAoC,KAAK,CAAA;AAAA,EACzD;AACF","file":"admin.js","sourcesContent":["import { createChannel } from \"bidc\";\n\nexport const requestMissingScopes = ({ scopes }: { scopes: string[] }) => {\n  try {\n    const channel = createChannel();\n    channel.send({\n      type: \"request_missing_scopes\",\n      payload: {\n        scopes,\n      },\n    });\n    channel.cleanup();\n  } catch (error) {\n    console.error(\"Failed to request missing scopes\", error);\n  }\n};\n"]}

package/dist/bindings/deconfig/index.d.ts

@@ -1,12 +0,0 @@
-export { D as DeconfigClient, i as DeconfigResource, b as DeconfigResourceOptions, E as EnhancedResourcesTools, N as NotFoundError, h as RESOURCE_WATCH_BASE_PATHNAME, R as ResourcesBinding, d as ResourcesTools, U as UserInputError, W as WatchOptions, a as createDeconfigResource } from '../../index-xKtm7A7B.js';
-import '@mastra/core';
-import '../../index-LOfgE9a_.js';
-import '@cloudflare/workers-types';
-import 'zod/v3';
-import '@mastra/core/di';
-import '@mastra/core/workflows';
-import '../../resources.js';
-import '../../mcp-87iLaW9V.js';
-import '@decocms/bindings/connection';
-import '@decocms/bindings';
-import 'zod';

package/dist/bindings/deconfig/index.js

@@ -1,10 +0,0 @@
-export { DeconfigResource, NotFoundError, RESOURCE_WATCH_BASE_PATHNAME, UserInputError, createDeconfigResource } from '../../chunk-SHQSNOFL.js';
-import '../../chunk-5EYZ2LVM.js';
-import '../../chunk-3AWMDSOH.js';
-import '../../chunk-UHR3BLMF.js';
-import '../../chunk-UIJGM3NV.js';
-import '../../chunk-L4OT2YDO.js';
-import '../../chunk-7ITSLORK.js';
-import '../../chunk-I7BWSAN6.js';
-//# sourceMappingURL=index.js.map
-//# sourceMappingURL=index.js.map

package/dist/bindings/deconfig/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":[],"names":[],"mappings":"","file":"index.js"}