mastra 0.10.3 → 0.10.4-alpha.1

package/dist/{chunk-LDPP24SN.js → chunk-MKPHGZFU.js}

@@ -1,7 +1,7 @@
 import * as p from '@clack/prompts';
 import color2 from 'picocolors';
-import child_process from 'node:child_process';
-import util from 'node:util';
+import child_process from 'child_process';
+import util from 'util';
 import * as fs3 from 'fs';
 import fs3__default, { existsSync } from 'fs';
 import fs4 from 'fs/promises';
@@ -146,7 +146,7 @@ function getPackageManagerInstallCommand(pm) {
       return "install";
   }
 }
-var args = ["-y", "@mastra/mcp-docs-server@latest"];
+var args = ["-y", "@mastra/mcp-docs-server"];
 var createMcpConfig = (editor) => {
   if (editor === "vscode") {
     return {
@@ -165,10 +165,7 @@ var createMcpConfig = (editor) => {
   }
   return {
     mcpServers: {
-      mastra: process.platform === `win32` ? {
-        command: "cmd",
-        args: ["/c", "npx", ...args]
-      } : {
+      mastra: {
         command: "npx",
         args
       }

package/dist/commands/create/create.js

@@ -1 +1 @@
-export { create } from '../../chunk-LDPP24SN.js';
+export { create } from '../../chunk-MKPHGZFU.js';

package/dist/index.js

@@ -1,30 +1,35 @@
 #! /usr/bin/env node
 import { PosthogAnalytics } from './chunk-7OXWUU2Q.js';
 export { PosthogAnalytics } from './chunk-7OXWUU2Q.js';
-import { DepsService, create, checkPkgJson, checkAndInstallCoreDeps, interactivePrompt, init, logger, FileService } from './chunk-LDPP24SN.js';
-export { create } from './chunk-LDPP24SN.js';
+import { DepsService, create, checkPkgJson, checkAndInstallCoreDeps, interactivePrompt, init, logger, FileService } from './chunk-MKPHGZFU.js';
+export { create } from './chunk-MKPHGZFU.js';
 import { Command } from 'commander';
 import { config } from 'dotenv';
-import { join as join$1, dirname } from 'node:path';
+import { join, dirname } from 'path';
 import { getServerOptions, FileService as FileService$2, getWatcherInputOptions, writeTelemetryConfig, createWatcher } from '@mastra/deployer/build';
 import { Bundler } from '@mastra/deployer/bundler';
 import { getDeployer, FileService as FileService$1 } from '@mastra/deployer';
-import { join } from 'path';
 import { isWebContainer } from '@webcontainer/env';
 import { execa } from 'execa';
-import { writeFile } from 'node:fs/promises';
-import { fileURLToPath } from 'node:url';
+import getPort from 'get-port';
+import { writeFile } from 'fs/promises';
+import { fileURLToPath } from 'url';
 import * as fsExtra from 'fs-extra';
 import fs, { readFileSync } from 'fs';
 import stripJsonComments from 'strip-json-comments';
 import { spawn } from 'child_process';
 
 var BuildBundler = class extends Bundler {
-  constructor() {
+  customEnvFile;
+  constructor(customEnvFile) {
     super("Build");
+    this.customEnvFile = customEnvFile;
   }
   getEnvFiles() {
     const possibleFiles = [".env.production", ".env.local", ".env"];
+    if (this.customEnvFile) {
+      possibleFiles.unshift(this.customEnvFile);
+    }
     try {
       const fileService = new FileService$2();
       const envFile = fileService.getFirstExistingFile(possibleFiles);
@@ -99,18 +104,23 @@ var BuildBundler = class extends Bundler {
     await super.lint(entryFile, outputDirectory, toolsPaths);
   }
 };
-async function build({ dir: dir2, tools, root }) {
+async function build({
+  dir: dir2,
+  tools,
+  root,
+  env
+}) {
   const rootDir = root || process.cwd();
-  const mastraDir = dir2 ? dir2.startsWith("/") ? dir2 : join$1(rootDir, dir2) : join$1(rootDir, "src", "mastra");
-  const outputDirectory = join$1(rootDir, ".mastra");
-  const defaultToolsPath = join$1(mastraDir, "tools/**/*");
+  const mastraDir = dir2 ? dir2.startsWith("/") ? dir2 : join(rootDir, dir2) : join(rootDir, "src", "mastra");
+  const outputDirectory = join(rootDir, ".mastra");
+  const defaultToolsPath = join(mastraDir, "tools/**/*");
   const discoveredTools = [defaultToolsPath, ...tools ?? []];
   try {
     const fs2 = new FileService();
-    const mastraEntryFile = fs2.getFirstExistingFile([join$1(mastraDir, "index.ts"), join$1(mastraDir, "index.js")]);
+    const mastraEntryFile = fs2.getFirstExistingFile([join(mastraDir, "index.ts"), join(mastraDir, "index.js")]);
     const platformDeployer = await getDeployer(mastraEntryFile, outputDirectory);
     if (!platformDeployer) {
-      const deployer = new BuildBundler();
+      const deployer = new BuildBundler(env);
       await deployer.prepare(outputDirectory);
       await deployer.bundle(mastraEntryFile, outputDirectory, discoveredTools);
       logger.info(`Build successful, you can now deploy the .mastra/output directory to your target platform.`);
@@ -162,11 +172,16 @@ async function deploy({ dir: dir2 }) {
   }
 }
 var DevBundler = class extends Bundler {
-  constructor() {
+  customEnvFile;
+  constructor(customEnvFile) {
     super("Dev");
+    this.customEnvFile = customEnvFile;
   }
   getEnvFiles() {
     const possibleFiles = [".env.development", ".env.local", ".env"];
+    if (this.customEnvFile) {
+      possibleFiles.unshift(this.customEnvFile);
+    }
     try {
       const fileService = new FileService$1();
       const envFile = fileService.getFirstExistingFile(possibleFiles);
@@ -175,14 +190,12 @@ var DevBundler = class extends Bundler {
     }
     return Promise.resolve([]);
   }
-  async writePackageJson() {
-  }
   async prepare(outputDirectory) {
     await super.prepare(outputDirectory);
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = dirname(__filename);
-    const playgroundServePath = join$1(outputDirectory, this.outputDir, "playground");
-    await fsExtra.copy(join$1(dirname(__dirname), "src/playground/dist"), playgroundServePath, {
+    const playgroundServePath = join(outputDirectory, this.outputDir, "playground");
+    await fsExtra.copy(join(dirname(__dirname), "src/playground/dist"), playgroundServePath, {
       overwrite: true
     });
   }
@@ -194,9 +207,13 @@ var DevBundler = class extends Bundler {
       "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV || "development")
     });
     const toolsInputOptions = await this.getToolsInputOptions(toolsPaths);
-    await writeTelemetryConfig(entryFile, join$1(outputDirectory, this.outputDir));
-    await this.writeInstrumentationFile(join$1(outputDirectory, this.outputDir));
-    const outputDir = join$1(outputDirectory, this.outputDir);
+    const outputDir = join(outputDirectory, this.outputDir);
+    await writeTelemetryConfig(entryFile, outputDir);
+    await this.writeInstrumentationFile(outputDir);
+    await this.writePackageJson(outputDir, /* @__PURE__ */ new Map(), {});
+    this.logger.info("Installing dependencies");
+    await this.installDependencies(outputDirectory);
+    this.logger.info("Done installing dependencies");
     const copyPublic = this.copyPublic.bind(this);
     const watcher = await createWatcher(
       {
@@ -216,7 +233,7 @@ var DevBundler = class extends Bundler {
           {
             name: "public-dir-watcher",
             buildStart() {
-              this.addWatchFile(join$1(dirname(entryFile), "public"));
+              this.addWatchFile(join(dirname(entryFile), "public"));
             },
             buildEnd() {
               return copyPublic(dirname(entryFile), outputDirectory);
@@ -226,12 +243,12 @@ var DevBundler = class extends Bundler {
             name: "tools-watcher",
             async buildEnd() {
               const toolsInputPaths = Array.from(Object.keys(toolsInputOptions || {})).filter((key) => key.startsWith("tools/")).map((key) => `./${key}.mjs`);
-              await writeFile(join$1(outputDir, "tools.mjs"), `export const tools = ${JSON.stringify(toolsInputPaths)};`);
+              await writeFile(join(outputDir, "tools.mjs"), `export const tools = ${JSON.stringify(toolsInputPaths)};`);
             }
           }
         ],
         input: {
-          index: join$1(__dirname, "templates", "dev.entry.js"),
+          index: join(__dirname, "templates", "dev.entry.js"),
           ...toolsInputOptions
         }
       },
@@ -265,9 +282,9 @@ var DevBundler = class extends Bundler {
 // src/commands/dev/dev.ts
 var currentServerProcess;
 var isRestarting = false;
-var errorRestartCount = 0;
 var ON_ERROR_MAX_RESTARTS = 3;
-var startServer = async (dotMastraPath, port, env) => {
+var startServer = async (dotMastraPath, port, env, errorRestartCount = 0) => {
+  let serverIsReady = false;
   try {
     logger.info("[Mastra Dev] - Starting server...");
     const commands = [];
@@ -282,22 +299,12 @@ var startServer = async (dotMastraPath, port, env) => {
         NODE_ENV: "production",
         ...Object.fromEntries(env),
         MASTRA_DEV: "true",
-        PORT: port.toString() || process.env.PORT || "4111",
+        PORT: port.toString(),
         MASTRA_DEFAULT_STORAGE_URL: `file:${join(dotMastraPath, "..", "mastra.db")}`
       },
-      stdio: "inherit",
+      stdio: ["inherit", "inherit", "inherit", "ipc"],
       reject: false
     });
-    currentServerProcess.on("close", (code) => {
-      if (!code) {
-        logger.info("Server exited, restarting...");
-        setTimeout(() => {
-          if (!isRestarting) {
-            startServer(dotMastraPath, port, env);
-          }
-        }, 1e3);
-      }
-    });
     if (currentServerProcess?.exitCode && currentServerProcess?.exitCode !== 0) {
       if (!currentServerProcess) {
         throw new Error(`Server failed to start`);
@@ -306,35 +313,37 @@ var startServer = async (dotMastraPath, port, env) => {
         `Server failed to start with error: ${currentServerProcess.stderr || currentServerProcess.stdout}`
       );
     }
-    await new Promise((resolve) => setTimeout(resolve, 1e3));
-    try {
-      await fetch(`http://localhost:${port}/__refresh`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        }
-      });
-    } catch {
-      await new Promise((resolve) => setTimeout(resolve, 1500));
-      try {
-        await fetch(`http://localhost:${port}/__refresh`, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/json"
+    currentServerProcess.on("message", async (message) => {
+      if (message?.type === "server-ready") {
+        serverIsReady = true;
+        try {
+          await fetch(`http://localhost:${port}/__refresh`, {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/json"
+            }
+          });
+        } catch {
+          await new Promise((resolve) => setTimeout(resolve, 1500));
+          try {
+            await fetch(`http://localhost:${port}/__refresh`, {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json"
+              }
+            });
+          } catch {
           }
-        });
-      } catch {
+        }
       }
-    }
-    if (currentServerProcess.exitCode !== null) {
-      throw new Error(
-        `Server failed to start with error: ${currentServerProcess.stderr || currentServerProcess.stdout}`
-      );
-    }
+    });
   } catch (err) {
     const execaError = err;
     if (execaError.stderr) logger.error("Server error output:", { stderr: execaError.stderr });
     if (execaError.stdout) logger.debug("Server output:", { stdout: execaError.stdout });
+    if (!serverIsReady) {
+      throw err;
+    }
     setTimeout(() => {
       if (!isRestarting) {
         errorRestartCount++;
@@ -345,7 +354,7 @@ var startServer = async (dotMastraPath, port, env) => {
         logger.error(
           `Attempting to restart server after error... (Attempt ${errorRestartCount}/${ON_ERROR_MAX_RESTARTS})`
         );
-        startServer(dotMastraPath, port, env);
+        startServer(dotMastraPath, port, env, errorRestartCount);
       }
     }, 1e3);
   }
@@ -370,9 +379,9 @@ async function dev({
   port,
   dir: dir2,
   root,
-  tools
+  tools,
+  env
 }) {
-  errorRestartCount = 0;
   const rootDir = root || process.cwd();
   const mastraDir = dir2 ? dir2.startsWith("/") ? dir2 : join(process.cwd(), dir2) : join(process.cwd(), "src", "mastra");
   const dotMastraPath = join(rootDir, ".mastra");
@@ -380,17 +389,25 @@ async function dev({
   const discoveredTools = [defaultToolsPath, ...tools || []];
   const fileService = new FileService$1();
   const entryFile = fileService.getFirstExistingFile([join(mastraDir, "index.ts"), join(mastraDir, "index.js")]);
-  const bundler = new DevBundler();
+  const bundler = new DevBundler(env);
   await bundler.prepare(dotMastraPath);
   const watcher = await bundler.watch(entryFile, dotMastraPath, discoveredTools);
-  const env = await bundler.loadEnvVars();
+  const loadedEnv = await bundler.loadEnvVars();
   const serverOptions = await getServerOptions(entryFile, join(dotMastraPath, "output"));
-  const startPort = port ?? serverOptions?.port ?? 4111;
-  await startServer(join(dotMastraPath, "output"), startPort, env);
+  let portToUse = port ?? serverOptions?.port ?? process.env.PORT;
+  if (!portToUse || isNaN(Number(portToUse))) {
+    const portList = Array.from({ length: 21 }, (_, i) => 4111 + i);
+    portToUse = String(
+      await getPort({
+        port: portList
+      })
+    );
+  }
+  await startServer(join(dotMastraPath, "output"), Number(portToUse), loadedEnv);
   watcher.on("event", (event) => {
     if (event.code === "BUNDLE_END") {
       logger.info("[Mastra Dev] - Bundling finished, restarting server...");
-      rebundleAndRestart(dotMastraPath, startPort, bundler);
+      rebundleAndRestart(dotMastraPath, Number(portToUse), bundler);
     }
   });
   process.on("SIGINT", () => {
@@ -720,7 +737,7 @@ program.command("lint").description("Lint your Mastra project").option("-d, --di
     origin
   });
 });
-program.command("dev").description("Start mastra server").option("-d, --dir <dir>", "Path to your mastra folder").option("-r, --root <root>", "Path to your root folder").option("-t, --tools <toolsDirs>", "Comma-separated list of paths to tool files to include").option("-p, --port <port>", "deprecated: Port number for the development server (defaults to 4111)").action((args) => {
+program.command("dev").description("Start mastra server").option("-d, --dir <dir>", "Path to your mastra folder").option("-r, --root <root>", "Path to your root folder").option("-t, --tools <toolsDirs>", "Comma-separated list of paths to tool files to include").option("-p, --port <port>", "deprecated: Port number for the development server (defaults to 4111)").option("-e, --env <env>", "Custom env file to include in the dev server").action((args) => {
   analytics.trackCommand({
     command: "dev",
     origin
@@ -732,12 +749,13 @@ program.command("dev").description("Start mastra server").option("-d, --dir <dir
     port: args?.port ? parseInt(args.port) : null,
     dir: args?.dir,
     root: args?.root,
-    tools: args?.tools ? args.tools.split(",") : []
+    tools: args?.tools ? args.tools.split(",") : [],
+    env: args?.env
   }).catch((err) => {
     logger.error(err.message);
   });
 });
-program.command("build").description("Build your Mastra project").option("-d, --dir <path>", "Path to your Mastra Folder").option("-r, --root <path>", "Path to your root folder").option("-t, --tools <toolsDirs>", "Comma-separated list of paths to tool files to include").action(async (args) => {
+program.command("build").description("Build your Mastra project").option("-d, --dir <path>", "Path to your Mastra Folder").option("-r, --root <path>", "Path to your root folder").option("-t, --tools <toolsDirs>", "Comma-separated list of paths to tool files to include").option("-e, --env <env>", "Custom env file to include in the build").action(async (args) => {
   await analytics.trackCommandExecution({
     command: "mastra build",
     args,
@@ -745,7 +763,8 @@ program.command("build").description("Build your Mastra project").option("-d, --
       await build({
         dir: args?.dir,
         root: args?.root,
-        tools: args?.tools ? args.tools.split(",") : []
+        tools: args?.tools ? args.tools.split(",") : [],
+        env: args?.env
       });
     },
     origin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastra",
-  "version": "0.10.3",
+  "version": "0.10.4-alpha.1",
   "license": "Elastic-2.0",
   "description": "cli for mastra",
   "type": "module",
@@ -39,9 +39,10 @@
     "@opentelemetry/instrumentation": "^0.57.2",
     "@webcontainer/env": "^1.1.1",
     "commander": "^12.1.0",
-    "dotenv": "^16.4.7",
+    "dotenv": "^16.5.0",
     "execa": "^9.5.2",
     "fs-extra": "^11.3.0",
+    "get-port": "^7.1.0",
     "json-schema-to-zod": "^2.6.0",
     "picocolors": "^1.1.1",
     "posthog-node": "4.16.0",
@@ -54,32 +55,32 @@
     "swr": "^2.3.3",
     "tcp-port-used": "^1.0.2",
     "yocto-spinner": "^0.1.2",
-    "zod": "^3.24.3",
+    "zod": "^3.25.56",
     "zod-to-json-schema": "^3.24.5",
-    "@mastra/deployer": "^0.10.3",
-    "@mastra/mcp": "^0.10.2",
-    "@mastra/loggers": "^0.10.1"
+    "@mastra/deployer": "^0.10.4-alpha.1",
+    "@mastra/loggers": "^0.10.2-alpha.0",
+    "@mastra/mcp": "^0.10.3-alpha.0"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.52.5",
+    "@microsoft/api-extractor": "^7.52.8",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.17.27",
+    "@types/node": "^20.17.57",
     "@types/prompt": "^1.1.9",
     "@types/shell-quote": "^1.7.5",
     "@types/tcp-port-used": "^1.0.4",
     "cpy-cli": "^5.0.0",
-    "eslint": "^9.23.0",
+    "eslint": "^9.28.0",
     "memfs": "^4.17.0",
     "npm-run-all2": "^7.0.2",
-    "rollup": "^4.40.1",
-    "tsup": "^8.4.0",
+    "rollup": "^4.41.1",
+    "tsup": "^8.5.0",
     "type-fest": "^4.37.0",
     "typescript": "^5.8.2",
-    "vitest": "^3.1.2",
+    "vitest": "^3.2.2",
     "@internal/lint": "0.0.10",
-    "@mastra/client-js": "0.10.2",
-    "@mastra/playground-ui": "5.1.3",
-    "@mastra/core": "0.10.3"
+    "@mastra/client-js": "0.10.3-alpha.1",
+    "@mastra/core": "0.10.4-alpha.1",
+    "@mastra/playground-ui": "5.1.4-alpha.1"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"