mastra 0.2.9-alpha.9 → 0.3.0

package/dist/index.js

@@ -4,10 +4,10 @@ export { PosthogAnalytics } from './chunk-SLGHDOYI.js';
 import { DepsService, create, checkPkgJson, checkAndInstallCoreDeps, interactivePrompt, init, logger, FileService as FileService$1 } from './chunk-UHTCQK5H.js';
 export { create } from './chunk-UHTCQK5H.js';
 import { Command } from 'commander';
-import { join as join$1, dirname } from 'node:path';
+import { join as join$1, dirname, basename } from 'node:path';
 import { getWatcherInputOptions, writeTelemetryConfig, createWatcher, FileService as FileService$2 } from '@mastra/deployer/build';
 import { Bundler } from '@mastra/deployer/bundler';
-import * as fsExtra from 'fs-extra';
+import * as fsExtra2 from 'fs-extra';
 import { readFileSync } from 'node:fs';
 import { fileURLToPath } from 'node:url';
 import { join } from 'path';
@@ -33,7 +33,7 @@ var BuildBundler = class extends Bundler {
     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, {
+    await fsExtra2.copy(join$1(dirname(__dirname), "src/playground/dist"), playgroundServePath, {
       overwrite: true
     });
   }
@@ -93,6 +93,7 @@ async function deploy({ dir }) {
   }
 }
 var DevBundler = class extends Bundler {
+  mastraToolsPaths = [];
   constructor() {
     super("Dev");
   }
@@ -106,6 +107,11 @@ var DevBundler = class extends Bundler {
     }
     return Promise.resolve([]);
   }
+  async loadEnvVars() {
+    const superEnvVars = await super.loadEnvVars();
+    superEnvVars.set("MASTRA_TOOLS_PATH", this.mastraToolsPaths.join(","));
+    return superEnvVars;
+  }
   async writePackageJson() {
   }
   async prepare(outputDirectory) {
@@ -113,17 +119,64 @@ var DevBundler = class extends Bundler {
     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, {
+    await fsExtra2.copy(join$1(dirname(__dirname), "src/playground/dist"), playgroundServePath, {
       overwrite: true
     });
   }
-  async watch(entryFile, outputDirectory) {
+  async watch(entryFile, outputDirectory, toolsPaths) {
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = dirname(__filename);
     const envFiles = await this.getEnvFiles();
     const inputOptions = await getWatcherInputOptions(entryFile, "node");
     await writeTelemetryConfig(entryFile, join$1(outputDirectory, this.outputDir));
     await this.writeInstrumentationFile(join$1(outputDirectory, this.outputDir));
+    if (toolsPaths?.length) {
+      for (const toolPath of toolsPaths) {
+        if (await fsExtra2.pathExists(toolPath)) {
+          const toolName = basename(toolPath);
+          const toolOutputPath = join$1(outputDirectory, this.outputDir, "tools", toolName);
+          const fileService = new FileService();
+          const entryFile2 = fileService.getFirstExistingFile([
+            join$1(toolPath, "index.ts"),
+            join$1(toolPath, "index.js"),
+            toolPath
+            // if toolPath itself is a file
+          ]);
+          if (!entryFile2) {
+            this.logger.warn(`No entry file found in ${toolPath}, skipping...`);
+            continue;
+          }
+          const toolInputOptions = await getWatcherInputOptions(entryFile2, "node");
+          const watcher2 = await createWatcher(
+            {
+              ...toolInputOptions,
+              input: {
+                index: entryFile2
+              }
+            },
+            {
+              dir: toolOutputPath
+            }
+          );
+          await new Promise((resolve, reject) => {
+            const cb = (event) => {
+              if (event.code === "BUNDLE_END") {
+                watcher2.off("event", cb);
+                resolve(void 0);
+              }
+              if (event.code === "ERROR") {
+                watcher2.off("event", cb);
+                reject(event);
+              }
+            };
+            watcher2.on("event", cb);
+          });
+          this.mastraToolsPaths.push(join$1(toolOutputPath, "index.mjs"));
+        } else {
+          this.logger.warn(`Tool path ${toolPath} does not exist, skipping...`);
+        }
+      }
+    }
     const watcher = await createWatcher(
       {
         ...inputOptions,
@@ -138,6 +191,16 @@ var DevBundler = class extends Bundler {
                 this.addWatchFile(envFile);
               }
             }
+          },
+          {
+            name: "tools-watcher",
+            buildStart() {
+              if (toolsPaths?.length) {
+                for (const toolPath of toolsPaths) {
+                  this.addWatchFile(toolPath);
+                }
+              }
+            }
           }
         ],
         input: {
@@ -227,7 +290,7 @@ var startServer = async (dotMastraPath, port, env) => {
     if (execaError.stdout) logger.debug("Server output:", { stdout: execaError.stdout });
   }
 };
-async function rebundleAndRestart(dotMastraPath, port, bundler) {
+async function rebundleAndRestart(dotMastraPath, port, bundler, tools) {
   if (isRestarting) {
     return;
   }
@@ -235,7 +298,7 @@ async function rebundleAndRestart(dotMastraPath, port, bundler) {
   try {
     if (currentServerProcess) {
       logger.debug("Stopping current server...");
-      currentServerProcess.kill("SIGKILL");
+      currentServerProcess.kill("SIGINT");
     }
     const env = await bundler.loadEnvVars();
     await startServer(join(dotMastraPath, "output"), port, env);
@@ -243,16 +306,18 @@ async function rebundleAndRestart(dotMastraPath, port, bundler) {
     isRestarting = false;
   }
 }
-async function dev({ port, dir, root }) {
+async function dev({ port, dir, root, tools }) {
   const rootDir = root || process.cwd();
   const mastraDir = join(rootDir, dir || "src/mastra");
   const dotMastraPath = join(rootDir, ".mastra");
+  const defaultToolsPath = join(mastraDir, "tools");
+  const discoveredTools = [defaultToolsPath, ...tools || []];
   const fileService = new FileService();
   const entryFile = fileService.getFirstExistingFile([join(mastraDir, "index.ts"), join(mastraDir, "index.js")]);
   const bundler = new DevBundler();
-  const env = await bundler.loadEnvVars();
   await bundler.prepare(dotMastraPath);
-  const watcher = await bundler.watch(entryFile, dotMastraPath);
+  const watcher = await bundler.watch(entryFile, dotMastraPath, discoveredTools);
+  const env = await bundler.loadEnvVars();
   await startServer(join(dotMastraPath, "output"), port, env);
   watcher.on("event", (event) => {
     if (event.code === "BUNDLE_END") {
@@ -356,7 +421,8 @@ program.command("dev").description("Start mastra server").option("-d, --dir <dir
   dev({
     port: args?.port ? parseInt(args.port) : 4111,
     dir: args?.dir,
-    root: args?.root
+    root: args?.root,
+    tools: args?.tools ? args.tools.split(",") : []
   }).catch((err) => {
     logger.error(err.message);
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastra",
-  "version": "0.2.9-alpha.9",
+  "version": "0.3.0",
   "license": "ISC",
   "description": "cli for mastra",
   "type": "module",
@@ -35,47 +35,46 @@
   "author": "",
   "dependencies": {
     "@clack/prompts": "^0.8.2",
-    "@dagrejs/dagre": "^1.1.4",
     "@lukeed/uuid": "^2.0.1",
     "@opentelemetry/instrumentation": "^0.57.2",
-    "@swc/core": "^1.9.3",
+    "@swc/core": "^1.11.8",
     "chokidar": "^4.0.3",
     "commander": "^12.1.0",
-    "dotenv": "^16.3.1",
-    "execa": "^9.3.1",
+    "dotenv": "^16.4.7",
+    "execa": "^9.5.2",
     "fs-extra": "^11.3.0",
-    "json-schema-to-zod": "^2.5.0",
+    "json-schema-to-zod": "^2.6.0",
     "picocolors": "^1.1.1",
-    "posthog-node": "^4.3.1",
-    "prettier": "^3.3.3",
+    "posthog-node": "^4.10.1",
+    "prettier": "^3.5.3",
     "prompt": "^1.3.0",
-    "shiki": "^1.24.2",
+    "shiki": "^1.29.2",
     "superjson": "^2.2.2",
-    "swr": "^2.2.5",
+    "swr": "^2.3.3",
     "tcp-port-used": "^1.0.2",
-    "yocto-spinner": "^0.1.1",
-    "zod": "^3.24.1",
-    "zod-to-json-schema": "^3.24.1",
-    "@mastra/core": "^0.5.0-alpha.9",
-    "@mastra/deployer": "^0.1.8-alpha.9"
+    "yocto-spinner": "^0.1.2",
+    "zod": "^3.24.2",
+    "zod-to-json-schema": "^3.24.3",
+    "@mastra/core": "^0.5.0",
+    "@mastra/deployer": "^0.1.8"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.49.2",
+    "@microsoft/api-extractor": "^7.52.1",
     "@types/express": "^5.0.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.13.1",
-    "@types/prompt": "^1.1.8",
+    "@types/node": "^22.13.10",
+    "@types/prompt": "^1.1.9",
     "@types/tcp-port-used": "^1.0.4",
     "cpy-cli": "^5.0.0",
-    "eslint": "^9.20.1",
-    "memfs": "^4.14.0",
+    "eslint": "^9.22.0",
+    "memfs": "^4.17.0",
     "npm-run-all": "^4.1.5",
-    "rollup": "^4.30.1",
-    "tsup": "^8.3.5",
-    "type-fest": "^4.30.0",
-    "typescript": "^5.7.3",
-    "vitest": "^3.0.4",
-    "@internal/lint": "0.0.0"
+    "rollup": "^4.35.0",
+    "tsup": "^8.4.0",
+    "type-fest": "^4.37.0",
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.8",
+    "@internal/lint": "0.0.1"
   },
   "scripts": {
     "build": "npm-run-all --serial build:lib copy-starter-files copy-templates build:playground",