mastra 0.4.10-alpha.3 → 0.5.0-alpha.5

package/dist/index.js

@@ -5,7 +5,7 @@ import { DepsService, create, checkPkgJson, checkAndInstallCoreDeps, interactive
 export { create } from './chunk-BY3FZLXQ.js';
 import { Command } from 'commander';
 import { config } from 'dotenv';
-import { join as join$1, dirname, basename } from 'node:path';
+import { join as join$1, dirname } from 'node:path';
 import { getServerOptions, getWatcherInputOptions, writeTelemetryConfig, createWatcher, FileService as FileService$2 } from '@mastra/deployer/build';
 import { Bundler } from '@mastra/deployer/bundler';
 import * as fsExtra2 from 'fs-extra';
@@ -15,7 +15,7 @@ import { FileService, getDeployer } from '@mastra/deployer';
 import { join } from 'path';
 import { isWebContainer } from '@webcontainer/env';
 import { execa } from 'execa';
-import { stat } from 'node:fs/promises';
+import { writeFile } from 'node:fs/promises';
 
 var BuildBundler = class extends Bundler {
   constructor() {
@@ -34,8 +34,8 @@ var BuildBundler = class extends Bundler {
   async prepare(outputDirectory) {
     await super.prepare(outputDirectory);
   }
-  bundle(entryFile, outputDirectory) {
-    return this._bundle(this.getEntry(), entryFile, outputDirectory);
+  bundle(entryFile, outputDirectory, toolsPaths) {
+    return this._bundle(this.getEntry(), entryFile, outputDirectory, toolsPaths);
   }
   getEntry() {
     const __filename = fileURLToPath(import.meta.url);
@@ -43,9 +43,11 @@ var BuildBundler = class extends Bundler {
     return readFileSync(join$1(__dirname, "templates", "dev.entry.js"), "utf8");
   }
 };
-async function build({ dir }) {
+async function build({ dir, tools }) {
   const mastraDir = dir ?? join$1(process.cwd(), "src", "mastra");
   const outputDirectory = join$1(process.cwd(), ".mastra");
+  const defaultToolsPath = join$1(mastraDir, "tools");
+  const discoveredTools = [defaultToolsPath, ...tools ?? []];
   try {
     const fs = new FileService$1();
     const mastraEntryFile = fs.getFirstExistingFile([join$1(mastraDir, "index.ts"), join$1(mastraDir, "index.js")]);
@@ -53,12 +55,12 @@ async function build({ dir }) {
     if (!platformDeployer) {
       const deployer = new BuildBundler();
       await deployer.prepare(outputDirectory);
-      await deployer.bundle(mastraEntryFile, outputDirectory);
+      await deployer.bundle(mastraEntryFile, outputDirectory, discoveredTools);
       return;
     }
     logger.info("Deployer found, preparing deployer build...");
     await platformDeployer.prepare(outputDirectory);
-    await platformDeployer.bundle(mastraEntryFile, outputDirectory);
+    await platformDeployer.bundle(mastraEntryFile, outputDirectory, discoveredTools);
     logger.info("You can now deploy the .mastra/output directory to your target platform.");
   } catch (error) {
     if (error instanceof Error) {
@@ -79,7 +81,7 @@ async function deploy({ dir }) {
     }
     try {
       await deployer.prepare(outputDirectory);
-      await deployer.bundle(mastraEntryFile, outputDirectory);
+      await deployer.bundle(mastraEntryFile, outputDirectory, []);
       try {
         await deployer.deploy(outputDirectory);
       } catch (error) {
@@ -98,7 +100,6 @@ async function deploy({ dir }) {
   }
 }
 var DevBundler = class extends Bundler {
-  mastraToolsPaths = [];
   constructor() {
     super("Dev");
   }
@@ -112,11 +113,6 @@ 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) {
@@ -133,55 +129,9 @@ var DevBundler = class extends Bundler {
     const __dirname = dirname(__filename);
     const envFiles = await this.getEnvFiles();
     const inputOptions = await getWatcherInputOptions(entryFile, "node");
+    const toolsInputOptions = await this.getToolsInputOptions(toolsPaths);
     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 || (await stat(entryFile2)).isDirectory()) {
-            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 outputDir = join$1(outputDirectory, this.outputDir);
     const copyPublic = this.copyPublic.bind(this);
     const watcher = await createWatcher(
@@ -199,16 +149,6 @@ var DevBundler = class extends Bundler {
               }
             }
           },
-          {
-            name: "tools-watcher",
-            buildStart() {
-              if (toolsPaths?.length) {
-                for (const toolPath of toolsPaths) {
-                  this.addWatchFile(toolPath);
-                }
-              }
-            }
-          },
           {
             name: "public-dir-watcher",
             buildStart() {
@@ -217,10 +157,21 @@ var DevBundler = class extends Bundler {
             buildEnd() {
               return copyPublic(dirname(entryFile), outputDirectory);
             }
+          },
+          {
+            name: "tools-watcher",
+            async buildEnd() {
+              const toolsInputOptions2 = Array.from(Object.keys(inputOptions.input || {})).filter((key) => key.startsWith("tools/")).map((key) => `./${key}.mjs`);
+              await writeFile(
+                join$1(outputDir, "tools.mjs"),
+                `export const tools = ${JSON.stringify(toolsInputOptions2)};`
+              );
+            }
           }
         ],
         input: {
-          index: join$1(__dirname, "templates", "dev.entry.js")
+          index: join$1(__dirname, "templates", "dev.entry.js"),
+          ...toolsInputOptions
         }
       },
       {
@@ -466,12 +417,12 @@ program.command("dev").description("Start mastra server").option("-d, --dir <dir
     logger.error(err.message);
   });
 });
-program.command("build").description("Build your Mastra project").option("-d, --dir <path>", "Path to directory").action(async (args) => {
+program.command("build").description("Build your Mastra project").option("-d, --dir <path>", "Path to directory").option("-t, --tools <toolsDirs>", "Comma-separated list of paths to tool files to include").action(async (args) => {
   await analytics.trackCommandExecution({
     command: "mastra build",
     args,
     execution: async () => {
-      await build({ dir: args.dir });
+      await build({ dir: args.dir, tools: args.tools ? args.tools.split(",") : [] });
     },
     origin
   });

package/dist/templates/dev.entry.js

@@ -21,18 +21,20 @@ registerHook(AvailableHooks.ON_GENERATION, ({ input, output, metric, runId, agen
   });
 });
 
-if (mastra.storage) {
-  await mastra.storage.init();
+if (mastra.getStorage()) {
+  // start storage init in the background
+  mastra.getStorage().init();
 }
 
 registerHook(AvailableHooks.ON_EVALUATION, async traceObject => {
-  if (mastra.storage) {
+  const storage = mastra.getStorage();
+  if (storage) {
     // Check for required fields
     const logger = mastra?.getLogger();
     const areFieldsValid = checkEvalStorageFields(traceObject, logger);
     if (!areFieldsValid) return;
 
-    await mastra.storage.insert({
+    await storage.insert({
       tableName: TABLE_EVALS,
       record: {
         input: traceObject.input,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastra",
-  "version": "0.4.10-alpha.3",
+  "version": "0.5.0-alpha.5",
   "license": "Elastic-2.0",
   "description": "cli for mastra",
   "type": "module",
@@ -54,8 +54,8 @@
     "yocto-spinner": "^0.1.2",
     "zod": "^3.24.2",
     "zod-to-json-schema": "^3.24.3",
-    "@mastra/core": "^0.8.4-alpha.2",
-    "@mastra/deployer": "^0.2.10-alpha.3"
+    "@mastra/core": "^0.9.0-alpha.4",
+    "@mastra/deployer": "^0.3.0-alpha.5"
   },
   "devDependencies": {
     "@microsoft/api-extractor": "^7.52.1",
@@ -72,9 +72,9 @@
     "type-fest": "^4.37.0",
     "typescript": "^5.8.2",
     "vitest": "^3.0.9",
+    "@mastra/client-js": "0.1.18-alpha.4",
     "@internal/lint": "0.0.2",
-    "@mastra/playground-ui": "4.0.5-alpha.2",
-    "@mastra/client-js": "0.1.18-alpha.2"
+    "@mastra/playground-ui": "5.0.0-alpha.4"
   },
   "scripts": {
     "build": "npm-run-all --serial build:lib copy-starter-files copy-templates build:playground",