@mastra/deployer 0.10.1-alpha.0 → 0.10.1-alpha.1

package/dist/_tsup-dts-rollup.d.cts

@@ -727,6 +727,8 @@ export declare function streamGenerateHandler(c: Context): Promise<Response | un
 
 export declare function streamGenerateHandler_alias_1(c: Context): Promise<Response | undefined>;
 
+export declare function streamWorkflowHandler(c: Context): Promise<Response>;
+
 declare type TransitiveDependencyResult = {
     resolutions: Record<string, string>;
     usedWorkspacePackages: Set<string>;

package/dist/_tsup-dts-rollup.d.ts

@@ -727,6 +727,8 @@ export declare function streamGenerateHandler(c: Context): Promise<Response | un
 
 export declare function streamGenerateHandler_alias_1(c: Context): Promise<Response | undefined>;
 
+export declare function streamWorkflowHandler(c: Context): Promise<Response>;
+
 declare type TransitiveDependencyResult = {
     resolutions: Record<string, string>;
     usedWorkspacePackages: Set<string>;

package/dist/bundler/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkU7N6PH2I_cjs = require('../chunk-U7N6PH2I.cjs');
+var chunkPJB6TDF7_cjs = require('../chunk-PJB6TDF7.cjs');
 
 
 
 Object.defineProperty(exports, "Bundler", {
   enumerable: true,
-  get: function () { return chunkU7N6PH2I_cjs.Bundler; }
+  get: function () { return chunkPJB6TDF7_cjs.Bundler; }
 });

package/dist/bundler/index.js

@@ -1 +1 @@
-export { Bundler } from '../chunk-SC6Y2LQ4.js';
+export { Bundler } from '../chunk-DGNRILK6.js';

package/dist/{chunk-SC6Y2LQ4.js → chunk-DGNRILK6.js}

@@ -9,6 +9,7 @@ import { fileURLToPath } from 'node:url';
 import { MastraBundler } from '@mastra/core/bundler';
 import virtual from '@rollup/plugin-virtual';
 import fsExtra, { emptyDir, ensureDir, copy, readJSON } from 'fs-extra/esm';
+import { globby } from 'globby';
 import resolveFrom from 'resolve-from';
 import slugify from '@sindresorhus/slugify';
 import { findWorkspaces, findWorkspacesRoot } from 'find-workspaces';
@@ -203,22 +204,25 @@ var Bundler = class extends MastraBundler {
   async getToolsInputOptions(toolsPaths) {
     const inputs = {};
     for (const toolPath of toolsPaths) {
-      if (await fsExtra.pathExists(toolPath)) {
-        const fileService = new FileService();
-        const entryFile = fileService.getFirstExistingFile([
-          join(toolPath, "index.ts"),
-          join(toolPath, "index.js"),
-          toolPath
-          // if toolPath itself is a file
-        ]);
-        if (!entryFile || (await stat(entryFile)).isDirectory()) {
-          this.logger.warn(`No entry file found in ${toolPath}, skipping...`);
-          continue;
+      const expandedPaths = await globby(toolPath, {});
+      for (const path of expandedPaths) {
+        if (await fsExtra.pathExists(path)) {
+          const fileService = new FileService();
+          const entryFile = fileService.getFirstExistingFile([
+            join(path, "index.ts"),
+            join(path, "index.js"),
+            path
+            // if path itself is a file
+          ]);
+          if (!entryFile || (await stat(entryFile)).isDirectory()) {
+            this.logger.warn(`No entry file found in ${path}, skipping...`);
+            continue;
+          }
+          const uniqueToolID = crypto.randomUUID();
+          inputs[`tools/${uniqueToolID}`] = entryFile;
+        } else {
+          this.logger.warn(`Tool path ${path} does not exist, skipping...`);
         }
-        const uniqueToolID = crypto.randomUUID();
-        inputs[`tools/${uniqueToolID}`] = entryFile;
-      } else {
-        this.logger.warn(`Tool path ${toolPath} does not exist, skipping...`);
       }
     }
     return inputs;

package/dist/{chunk-U7N6PH2I.cjs → chunk-PJB6TDF7.cjs}

@@ -11,6 +11,7 @@ var url = require('url');
 var bundler = require('@mastra/core/bundler');
 var virtual = require('@rollup/plugin-virtual');
 var fsExtra = require('fs-extra/esm');
+var globby = require('globby');
 var resolveFrom = require('resolve-from');
 var slugify = require('@sindresorhus/slugify');
 var findWorkspaces = require('find-workspaces');
@@ -130,7 +131,7 @@ var Bundler = class extends bundler.MastraBundler {
   }
   async writeInstrumentationFile(outputDirectory) {
     const instrumentationFile = path.join(outputDirectory, "instrumentation.mjs");
-    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-U7N6PH2I.cjs', document.baseURI).href))));
+    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-PJB6TDF7.cjs', document.baseURI).href))));
     await fsExtra.copy(path.join(__dirname, "templates", "instrumentation-template.js"), instrumentationFile);
   }
   async writePackageJson(outputDirectory, dependencies, resolutions) {
@@ -213,22 +214,25 @@ var Bundler = class extends bundler.MastraBundler {
   async getToolsInputOptions(toolsPaths) {
     const inputs = {};
     for (const toolPath of toolsPaths) {
-      if (await fsExtra__default.default.pathExists(toolPath)) {
-        const fileService = new chunk4VC5Z4YR_cjs.FileService();
-        const entryFile = fileService.getFirstExistingFile([
-          path.join(toolPath, "index.ts"),
-          path.join(toolPath, "index.js"),
-          toolPath
-          // if toolPath itself is a file
-        ]);
-        if (!entryFile || (await promises.stat(entryFile)).isDirectory()) {
-          this.logger.warn(`No entry file found in ${toolPath}, skipping...`);
-          continue;
+      const expandedPaths = await globby.globby(toolPath, {});
+      for (const path$1 of expandedPaths) {
+        if (await fsExtra__default.default.pathExists(path$1)) {
+          const fileService = new chunk4VC5Z4YR_cjs.FileService();
+          const entryFile = fileService.getFirstExistingFile([
+            path.join(path$1, "index.ts"),
+            path.join(path$1, "index.js"),
+            path$1
+            // if path itself is a file
+          ]);
+          if (!entryFile || (await promises.stat(entryFile)).isDirectory()) {
+            this.logger.warn(`No entry file found in ${path$1}, skipping...`);
+            continue;
+          }
+          const uniqueToolID = crypto.randomUUID();
+          inputs[`tools/${uniqueToolID}`] = entryFile;
+        } else {
+          this.logger.warn(`Tool path ${path$1} does not exist, skipping...`);
         }
-        const uniqueToolID = crypto.randomUUID();
-        inputs[`tools/${uniqueToolID}`] = entryFile;
-      } else {
-        this.logger.warn(`Tool path ${toolPath} does not exist, skipping...`);
       }
     }
     return inputs;

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkU7N6PH2I_cjs = require('./chunk-U7N6PH2I.cjs');
+var chunkPJB6TDF7_cjs = require('./chunk-PJB6TDF7.cjs');
 var chunkOJY5LJPT_cjs = require('./chunk-OJY5LJPT.cjs');
 var chunk4VC5Z4YR_cjs = require('./chunk-4VC5Z4YR.cjs');
 var babel = require('@babel/core');
@@ -33,7 +33,7 @@ var esbuild__default = /*#__PURE__*/_interopDefault(esbuild);
 var commonjs__default = /*#__PURE__*/_interopDefault(commonjs);
 
 // src/deploy/base.ts
-var Deployer = class extends chunkU7N6PH2I_cjs.Bundler {
+var Deployer = class extends chunkPJB6TDF7_cjs.Bundler {
   deps = new chunk4VC5Z4YR_cjs.DepsService();
   constructor(args) {
     super(args.name, "DEPLOYER");

package/dist/index.js

@@ -1,4 +1,4 @@
-import { Bundler } from './chunk-SC6Y2LQ4.js';
+import { Bundler } from './chunk-DGNRILK6.js';
 import { recursiveRemoveNonReferencedNodes } from './chunk-W46BY5GT.js';
 import { DepsService, FileService } from './chunk-UV4RQQ3R.js';
 export { Deps, FileService, createChildProcessLogger, createPinoStream } from './chunk-UV4RQQ3R.js';

package/dist/server/index.cjs

@@ -4180,16 +4180,16 @@ function watchWorkflowHandler(c2) {
             workflowId,
             runId
           });
+          const reader = result.getReader();
           stream4.onAbort(() => {
-            if (!result.locked) {
-              return result.cancel();
-            }
+            void reader.cancel("request aborted");
           });
-          for await (const chunk of result) {
-            await stream4.write(chunk.toString() + "");
+          let chunkResult;
+          while ((chunkResult = await reader.read()) && !chunkResult.done) {
+            await stream4.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
-          console.log(err);
+          mastra.getLogger().error("Error in watch stream: " + (err?.message ?? "Unknown error"));
         }
       },
       async (err) => {
@@ -4200,6 +4200,46 @@ function watchWorkflowHandler(c2) {
     return handleError(error, "Error watching workflow");
   }
 }
+async function streamWorkflowHandler(c2) {
+  try {
+    const mastra = c2.get("mastra");
+    const logger2 = mastra.getLogger();
+    const workflowId = c2.req.param("workflowId");
+    const runtimeContext = c2.get("runtimeContext");
+    const { inputData, runtimeContext: runtimeContextFromRequest } = await c2.req.json();
+    const runId = c2.req.query("runId");
+    return streaming.stream(
+      c2,
+      async (stream4) => {
+        try {
+          const result = workflows.streamWorkflowHandler({
+            mastra,
+            workflowId,
+            runId,
+            inputData,
+            runtimeContext,
+            runtimeContextFromRequest
+          });
+          const reader = result.stream.getReader();
+          stream4.onAbort(() => {
+            void reader.cancel("request aborted");
+          });
+          let chunkResult;
+          while ((chunkResult = await reader.read()) && !chunkResult.done) {
+            await stream4.write(JSON.stringify(chunkResult.value) + "");
+          }
+        } catch (err) {
+          console.log(err);
+        }
+      },
+      async (err) => {
+        logger2.error("Error in workflow stream: " + err?.message);
+      }
+    );
+  } catch (error) {
+    return handleError(error, "Error streaming workflow");
+  }
+}
 async function resumeAsyncWorkflowHandler(c2) {
   try {
     const mastra = c2.get("mastra");
@@ -5501,7 +5541,7 @@ async function createHonoServer(mastra, options = {}) {
     executeAgentToolHandler
   );
   app.post(
-    "/api/mcp/:serverId/mcp",
+    "/api/servers/:serverId/mcp",
     bodyLimit.bodyLimit(bodyLimitOptions),
     h({
       description: "Send a message to an MCP server using Streamable HTTP",
@@ -5528,8 +5568,8 @@ async function createHonoServer(mastra, options = {}) {
     }),
     getMcpServerMessageHandler
   );
-  const mcpSseBasePath = "/api/mcp/:serverId/sse";
-  const mcpSseMessagePath = "/api/mcp/:serverId/messages";
+  const mcpSseBasePath = "/api/servers/:serverId/sse";
+  const mcpSseMessagePath = "/api/servers/:serverId/messages";
   app.get(
     mcpSseBasePath,
     h({
@@ -6286,7 +6326,7 @@ async function createHonoServer(mastra, options = {}) {
         {
           name: "runId",
           in: "query",
-          required: false,
+          required: true,
           schema: { type: "string" }
         }
       ],
@@ -6299,6 +6339,53 @@ async function createHonoServer(mastra, options = {}) {
     }),
     watchLegacyWorkflowHandler
   );
+  app.post(
+    "/api/workflows/:workflowId/stream",
+    h({
+      description: "Stream workflow in real-time",
+      parameters: [
+        {
+          name: "workflowId",
+          in: "path",
+          required: true,
+          schema: { type: "string" }
+        },
+        {
+          name: "runId",
+          in: "query",
+          required: false,
+          schema: { type: "string" }
+        }
+      ],
+      requestBody: {
+        required: true,
+        content: {
+          "application/json": {
+            schema: {
+              type: "object",
+              properties: {
+                inputData: { type: "object" },
+                runtimeContext: {
+                  type: "object",
+                  description: "Runtime context for the workflow execution"
+                }
+              }
+            }
+          }
+        }
+      },
+      responses: {
+        200: {
+          description: "vNext workflow run started"
+        },
+        404: {
+          description: "vNext workflow not found"
+        }
+      },
+      tags: ["vNextWorkflows"]
+    }),
+    streamWorkflowHandler
+  );
   app.get(
     "/api/workflows",
     h({
@@ -7011,7 +7098,7 @@ async function createNodeServer(mastra, options = {}) {
     {
       fetch: app.fetch,
       port,
-      hostname: serverOptions?.host
+      hostname: serverOptions?.host ?? "localhost"
     },
     () => {
       const logger2 = mastra.getLogger();

package/dist/server/index.js

@@ -32,7 +32,7 @@ import { getTelemetryHandler as getTelemetryHandler$1, storeTelemetryHandler as
 import { executeAgentToolHandler as executeAgentToolHandler$1, getToolsHandler as getToolsHandler$1, getToolByIdHandler as getToolByIdHandler$1, executeToolHandler as executeToolHandler$1 } from '@mastra/server/handlers/tools';
 import { upsertVectors as upsertVectors$1, createIndex as createIndex$1, queryVectors as queryVectors$1, listIndexes as listIndexes$1, describeIndex as describeIndex$1, deleteIndex as deleteIndex$1 } from '@mastra/server/handlers/vector';
 import { getSpeakersHandler as getSpeakersHandler$1, generateSpeechHandler, transcribeSpeechHandler } from '@mastra/server/handlers/voice';
-import { getWorkflowsHandler as getWorkflowsHandler$1, getWorkflowByIdHandler as getWorkflowByIdHandler$1, getWorkflowRunsHandler as getWorkflowRunsHandler$1, resumeWorkflowHandler as resumeWorkflowHandler$1, resumeAsyncWorkflowHandler as resumeAsyncWorkflowHandler$1, createWorkflowRunHandler as createWorkflowRunHandler$1, startAsyncWorkflowHandler as startAsyncWorkflowHandler$1, startWorkflowRunHandler as startWorkflowRunHandler$1, watchWorkflowHandler as watchWorkflowHandler$1 } from '@mastra/server/handlers/workflows';
+import { streamWorkflowHandler as streamWorkflowHandler$1, getWorkflowsHandler as getWorkflowsHandler$1, getWorkflowByIdHandler as getWorkflowByIdHandler$1, getWorkflowRunsHandler as getWorkflowRunsHandler$1, resumeWorkflowHandler as resumeWorkflowHandler$1, resumeAsyncWorkflowHandler as resumeAsyncWorkflowHandler$1, createWorkflowRunHandler as createWorkflowRunHandler$1, startAsyncWorkflowHandler as startAsyncWorkflowHandler$1, startWorkflowRunHandler as startWorkflowRunHandler$1, watchWorkflowHandler as watchWorkflowHandler$1 } from '@mastra/server/handlers/workflows';
 
 // src/server/index.ts
 var RequestError = class extends Error {
@@ -4174,16 +4174,16 @@ function watchWorkflowHandler(c2) {
             workflowId,
             runId
           });
+          const reader = result.getReader();
           stream4.onAbort(() => {
-            if (!result.locked) {
-              return result.cancel();
-            }
+            void reader.cancel("request aborted");
           });
-          for await (const chunk of result) {
-            await stream4.write(chunk.toString() + "");
+          let chunkResult;
+          while ((chunkResult = await reader.read()) && !chunkResult.done) {
+            await stream4.write(JSON.stringify(chunkResult.value) + "");
           }
         } catch (err) {
-          console.log(err);
+          mastra.getLogger().error("Error in watch stream: " + (err?.message ?? "Unknown error"));
         }
       },
       async (err) => {
@@ -4194,6 +4194,46 @@ function watchWorkflowHandler(c2) {
     return handleError(error, "Error watching workflow");
   }
 }
+async function streamWorkflowHandler(c2) {
+  try {
+    const mastra = c2.get("mastra");
+    const logger2 = mastra.getLogger();
+    const workflowId = c2.req.param("workflowId");
+    const runtimeContext = c2.get("runtimeContext");
+    const { inputData, runtimeContext: runtimeContextFromRequest } = await c2.req.json();
+    const runId = c2.req.query("runId");
+    return stream(
+      c2,
+      async (stream4) => {
+        try {
+          const result = streamWorkflowHandler$1({
+            mastra,
+            workflowId,
+            runId,
+            inputData,
+            runtimeContext,
+            runtimeContextFromRequest
+          });
+          const reader = result.stream.getReader();
+          stream4.onAbort(() => {
+            void reader.cancel("request aborted");
+          });
+          let chunkResult;
+          while ((chunkResult = await reader.read()) && !chunkResult.done) {
+            await stream4.write(JSON.stringify(chunkResult.value) + "");
+          }
+        } catch (err) {
+          console.log(err);
+        }
+      },
+      async (err) => {
+        logger2.error("Error in workflow stream: " + err?.message);
+      }
+    );
+  } catch (error) {
+    return handleError(error, "Error streaming workflow");
+  }
+}
 async function resumeAsyncWorkflowHandler(c2) {
   try {
     const mastra = c2.get("mastra");
@@ -5495,7 +5535,7 @@ async function createHonoServer(mastra, options = {}) {
     executeAgentToolHandler
   );
   app.post(
-    "/api/mcp/:serverId/mcp",
+    "/api/servers/:serverId/mcp",
     bodyLimit(bodyLimitOptions),
     h({
       description: "Send a message to an MCP server using Streamable HTTP",
@@ -5522,8 +5562,8 @@ async function createHonoServer(mastra, options = {}) {
     }),
     getMcpServerMessageHandler
   );
-  const mcpSseBasePath = "/api/mcp/:serverId/sse";
-  const mcpSseMessagePath = "/api/mcp/:serverId/messages";
+  const mcpSseBasePath = "/api/servers/:serverId/sse";
+  const mcpSseMessagePath = "/api/servers/:serverId/messages";
   app.get(
     mcpSseBasePath,
     h({
@@ -6280,7 +6320,7 @@ async function createHonoServer(mastra, options = {}) {
         {
           name: "runId",
           in: "query",
-          required: false,
+          required: true,
           schema: { type: "string" }
         }
       ],
@@ -6293,6 +6333,53 @@ async function createHonoServer(mastra, options = {}) {
     }),
     watchLegacyWorkflowHandler
   );
+  app.post(
+    "/api/workflows/:workflowId/stream",
+    h({
+      description: "Stream workflow in real-time",
+      parameters: [
+        {
+          name: "workflowId",
+          in: "path",
+          required: true,
+          schema: { type: "string" }
+        },
+        {
+          name: "runId",
+          in: "query",
+          required: false,
+          schema: { type: "string" }
+        }
+      ],
+      requestBody: {
+        required: true,
+        content: {
+          "application/json": {
+            schema: {
+              type: "object",
+              properties: {
+                inputData: { type: "object" },
+                runtimeContext: {
+                  type: "object",
+                  description: "Runtime context for the workflow execution"
+                }
+              }
+            }
+          }
+        }
+      },
+      responses: {
+        200: {
+          description: "vNext workflow run started"
+        },
+        404: {
+          description: "vNext workflow not found"
+        }
+      },
+      tags: ["vNextWorkflows"]
+    }),
+    streamWorkflowHandler
+  );
   app.get(
     "/api/workflows",
     h({
@@ -7005,7 +7092,7 @@ async function createNodeServer(mastra, options = {}) {
     {
       fetch: app.fetch,
       port,
-      hostname: serverOptions?.host
+      hostname: serverOptions?.host ?? "localhost"
     },
     () => {
       const logger2 = mastra.getLogger();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer",
-  "version": "0.10.1-alpha.0",
+  "version": "0.10.1-alpha.1",
   "description": "",
   "type": "module",
   "files": [
@@ -100,6 +100,7 @@
     "esbuild": "^0.25.1",
     "find-workspaces": "^0.3.1",
     "fs-extra": "^11.3.0",
+    "globby": "^14.1.0",
     "hono": "^4.7.4",
     "resolve-from": "^5.0.0",
     "rollup": "^4.35.0",
@@ -107,7 +108,7 @@
     "rollup-plugin-node-externals": "^8.0.0",
     "typescript-paths": "^1.5.1",
     "zod": "^3.24.3",
-    "@mastra/server": "^0.10.0"
+    "@mastra/server": "^0.10.1-alpha.0"
   },
   "devDependencies": {
     "@hono/node-server": "^1.13.8",
@@ -127,8 +128,8 @@
     "typescript": "^5.8.2",
     "vitest": "^2.1.9",
     "@internal/lint": "0.0.6",
-    "@mastra/mcp": "^0.10.0",
-    "@mastra/core": "0.10.1-alpha.0"
+    "@mastra/mcp": "^0.10.1-alpha.0",
+    "@mastra/core": "0.10.1-alpha.1"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.0"