mastra 0.2.0-alpha.152 → 0.2.0-alpha.155

package/dist/{chunk-6I2TYSHJ.js → chunk-UU6XEV7T.js}

@@ -226,17 +226,29 @@ var logger = createLogger({
 
 // src/commands/init/utils.ts
 var exec = util.promisify(child_process.exec);
+var getAISDKPackage = (llmProvider) => {
+  switch (llmProvider) {
+    case "openai":
+      return "@ai-sdk/openai";
+    case "anthropic":
+      return "@ai-sdk/anthropic";
+    case "groq":
+      return "@ai-sdk/groq";
+    default:
+      return "@ai-sdk/openai";
+  }
+};
 async function writeAgentSample(llmProvider, destPath, addExampleTool) {
   let providerImport = "";
   let modelItem = "";
   if (llmProvider === "openai") {
-    providerImport = `import { openai } from '@ai-sdk/openai';`;
+    providerImport = `import { openai } from '${getAISDKPackage(llmProvider)}';`;
     modelItem = `openai('gpt-4o')`;
   } else if (llmProvider === "anthropic") {
-    providerImport = `import { anthropic } from '@ai-sdk/anthropic';`;
+    providerImport = `import { anthropic } from '${getAISDKPackage(llmProvider)}';`;
     modelItem = `anthropic('claude-3-5-sonnet-20241022')`;
   } else if (llmProvider === "groq") {
-    providerImport = `import { groq } from '@ai-sdk/groq';`;
+    providerImport = `import { groq } from '${getAISDKPackage(llmProvider)}';`;
     modelItem = `groq('llama3-groq-70b-8192-tool-use-preview')`;
   }
   const instructions = `
@@ -277,10 +289,10 @@ async function writeToolSample(destPath) {
   const fileService = new FileService();
   await fileService.copyStarterFile("tools.ts", destPath);
 }
-async function writeCodeSampleForComponents(llmprovider, component, destPath, components) {
+async function writeCodeSampleForComponents(llmprovider, component, destPath, importComponents) {
   switch (component) {
     case "agents":
-      return writeAgentSample(llmprovider, destPath, components.includes("tools"));
+      return writeAgentSample(llmprovider, destPath, importComponents.includes("tools"));
     case "tools":
       return writeToolSample(destPath);
     case "workflows":
@@ -400,10 +412,10 @@ var createMastraDir = async (directory) => {
     return { ok: true, dirPath };
   }
 };
-var writeCodeSample = async (dirPath, component, llmProvider, components) => {
+var writeCodeSample = async (dirPath, component, llmProvider, importComponents) => {
   const destPath = dirPath + `/${component}/index.ts`;
   try {
-    await writeCodeSampleForComponents(llmProvider, component, destPath, components);
+    await writeCodeSampleForComponents(llmProvider, component, destPath, importComponents);
   } catch (err) {
     throw err;
   }
@@ -491,6 +503,7 @@ var checkPkgJson = async () => {
 
 // src/commands/init/init.ts
 var s = p.spinner();
+var exec2 = util.promisify(child_process.exec);
 var init = async ({
   directory,
   addExample = false,
@@ -518,12 +531,14 @@ var init = async ({
     ]);
     if (addExample) {
       await Promise.all([
-        components.map(
+        ...components.map(
           (component) => writeCodeSample(dirPath, component, llmProvider, components)
         )
       ]);
     }
     const key = await getAPIKey(llmProvider || "openai");
+    const aiSdkPackage = getAISDKPackage(llmProvider);
+    await exec2(`npm i ${aiSdkPackage}`);
     s.stop();
     if (!llmApiKey) {
       p.note(`
@@ -544,7 +559,7 @@ var init = async ({
     return { success: false };
   }
 };
-var exec2 = util.promisify(child_process.exec);
+var exec3 = util.promisify(child_process.exec);
 var createMastraProject = async () => {
   p.intro(color2.inverse("Mastra Create"));
   const projectName = await p.text({
@@ -571,17 +586,17 @@ var createMastraProject = async () => {
   }
   process.chdir(projectName);
   s2.message("Creating project");
-  await exec2(`npm init -y`);
-  await exec2(`npm pkg set type="module"`);
+  await exec3(`npm init -y`);
+  await exec3(`npm pkg set type="module"`);
   const depsService = new DepsService();
   await depsService.addScriptsToPackageJson({
     dev: "mastra dev"
   });
   s2.stop("Project created");
   s2.start("Installing npm dependencies");
-  await exec2(`npm i zod`);
-  await exec2(`npm i typescript tsx @types/node --save-dev`);
-  await exec2(`echo '{
+  await exec3(`npm i zod`);
+  await exec3(`npm i typescript tsx @types/node --save-dev`);
+  await exec3(`echo '{
   "compilerOptions": {
     "target": "ES2022",
     "module": "ES2022",
@@ -603,18 +618,19 @@ var createMastraProject = async () => {
 }' > tsconfig.json`);
   s2.stop("NPM dependencies installed");
   s2.start("Installing mastra");
-  await exec2(`npm i -D mastra`);
+  await exec3(`npm i -D mastra`);
   s2.stop("mastra installed");
   s2.start("Installing @mastra/core");
-  await exec2(`npm i @mastra/core@alpha`);
+  await exec3(`npm i @mastra/core@alpha`);
   s2.stop("@mastra/core installed");
   s2.start("Adding .gitignore");
-  await exec2(`echo output.txt >> .gitignore`);
-  await exec2(`echo node_modules >> .gitignore`);
-  await exec2(`echo dist >> .gitignore`);
-  await exec2(`echo .mastra >> .gitignore`);
-  await exec2(`echo .env.development >> .gitignore`);
-  await exec2(`echo .env >> .gitignore`);
+  await exec3(`echo output.txt >> .gitignore`);
+  await exec3(`echo node_modules >> .gitignore`);
+  await exec3(`echo dist >> .gitignore`);
+  await exec3(`echo .mastra >> .gitignore`);
+  await exec3(`echo .env.development >> .gitignore`);
+  await exec3(`echo .env >> .gitignore`);
+  await exec3(`echo *.db >> .gitignore`);
   s2.stop(".gitignore added");
   p.outro("Project created successfully");
   console.log("");

package/dist/commands/create/create.js

@@ -1 +1 @@
-export { create } from '../../chunk-6I2TYSHJ.js';
+export { create } from '../../chunk-UU6XEV7T.js';

package/dist/index.js

@@ -1,8 +1,8 @@
 #! /usr/bin/env node
 import { PosthogAnalytics } from './chunk-K5HPNH5H.js';
 export { PosthogAnalytics } from './chunk-K5HPNH5H.js';
-import { DepsService, create, checkPkgJson, checkAndInstallCoreDeps, interactivePrompt, init, FileService, logger } from './chunk-6I2TYSHJ.js';
-export { create } from './chunk-6I2TYSHJ.js';
+import { DepsService, create, checkPkgJson, checkAndInstallCoreDeps, interactivePrompt, init, FileService, logger } from './chunk-UU6XEV7T.js';
+export { create } from './chunk-UU6XEV7T.js';
 import { Command } from 'commander';
 import 'picocolors';
 import { join, dirname } from 'node:path';
@@ -13,9 +13,7 @@ import { readFileSync } from 'node:fs';
 import { fileURLToPath as fileURLToPath$1 } from 'node:url';
 import { getDeployer, FileService as FileService$2 } from '@mastra/deployer';
 import { join as join$1 } from 'path';
-import 'child_process';
 import { execa } from 'execa';
-import { writeFileSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { MastraBundler } from '@mastra/core/bundler';
 import 'dotenv';
@@ -58,8 +56,8 @@ async function build({ dir }) {
   const mastraDir = dir ?? process.cwd();
   const outputDirectory = join(mastraDir, ".mastra");
   const deployer = new BuildBundler();
-  const fs2 = new FileService();
-  const mastraEntryFile = fs2.getFirstExistingFile([
+  const fs = new FileService();
+  const mastraEntryFile = fs.getFirstExistingFile([
     join(mastraDir, "src", "mastra", "index.ts"),
     join(mastraDir, "src", "mastra", "index.js")
   ]);
@@ -71,8 +69,8 @@ async function deploy({ dir }) {
   let mastraDir = dir || join$1(process.cwd(), "src/mastra");
   try {
     const outputDirectory = join$1(process.cwd(), ".mastra");
-    const fs2 = new FileService();
-    const mastraEntryFile = fs2.getFirstExistingFile([join$1(mastraDir, "index.ts"), join$1(mastraDir, "index.js")]);
+    const fs = new FileService();
+    const mastraEntryFile = fs.getFirstExistingFile([join$1(mastraDir, "index.ts"), join$1(mastraDir, "index.js")]);
     const deployer = await getDeployer(mastraEntryFile, outputDirectory);
     if (!deployer) {
       logger.warn("No deployer found.");
@@ -137,15 +135,25 @@ var DevBundler = class extends MastraBundler {
       join(this.mastraDir, "index.ts"),
       join(this.mastraDir, "index.js")
     ]);
+    const envFiles = await this.getEnvFiles();
     const inputOptions = await getWatcherInputOptions(entryFile, "node");
     const watcher = await createWatcher(
       {
         ...inputOptions,
+        plugins: [
+          // @ts-ignore - types are good
+          ...inputOptions.plugins,
+          {
+            name: "env-watcher",
+            buildStart() {
+              for (const envFile of envFiles) {
+                this.addWatchFile(envFile);
+              }
+            }
+          }
+        ],
         input: {
           index: join(__dirname, "templates", "dev.entry.js")
-        },
-        watch: {
-          include: await this.getEnvFiles()
         }
       },
       {
@@ -250,7 +258,6 @@ async function dev({ port, dir, root }) {
   const bundler = new DevBundler(mastraDir);
   const env = await bundler.loadEnvVars();
   await bundler.prepare(dotMastraPath);
-  writeFileSync(join$1(dotMastraPath, "evals.json"), ``);
   const watcher = await bundler.watch(dotMastraPath);
   await startServer(dotMastraPath, port, env);
   watcher.on("event", (event) => {

package/dist/starter-files/workflow.ts

@@ -60,7 +60,7 @@ const fetchWeather = new Step({
     city: z.string().describe('The city to get the weather for'),
   }),
   execute: async ({ context }) => {
-    const triggerData = context.machineContext?.getStepPayload<{ city: string }>('trigger');
+    const triggerData = context?.getStepPayload<{ city: string }>('trigger');
 
     if (!triggerData) {
       throw new Error('Trigger data not found');
@@ -119,7 +119,7 @@ const planActivities = new Step({
   description: 'Suggests activities based on weather conditions',
   inputSchema: forecastSchema,
   execute: async ({ context, mastra }) => {
-    const forecast = context.machineContext?.getStepPayload<z.infer<typeof forecastSchema>>('fetch-weather');
+    const forecast = context?.getStepPayload<z.infer<typeof forecastSchema>>('fetch-weather');
 
     if (!forecast) {
       throw new Error('Forecast data not found');

package/dist/templates/dev.entry.js

@@ -4,13 +4,12 @@ import { mastra } from '#mastra';
 import { createNodeServer } from '#server';
 import { evaluate } from '@mastra/core/eval';
 import { AvailableHooks, registerHook } from '@mastra/core/hooks';
+import { MastraStorage } from '@mastra/core/storage';
 
 // @ts-ignore
-const evalStore = [];
-// @ts-ignore
-await createNodeServer(mastra, { playground: true, swaggerUI: true, evalStore });
+await createNodeServer(mastra, { playground: true, swaggerUI: true });
 
-registerHook(AvailableHooks.ON_GENERATION, ({ input, output, metric, runId, agentName }) => {
+registerHook(AvailableHooks.ON_GENERATION, ({ input, output, metric, runId, agentName, instructions }) => {
   evaluate({
     agentName,
     input,
@@ -18,9 +17,21 @@ registerHook(AvailableHooks.ON_GENERATION, ({ input, output, metric, runId, agen
     output,
     runId,
     globalRunId: runId,
+    instructions,
   });
 });
 
 registerHook(AvailableHooks.ON_EVALUATION, async traceObject => {
-  evalStore.push(traceObject);
+  if (mastra?.memory?.storage) {
+    await mastra.memory.storage.insert({
+      tableName: MastraStorage.TABLE_EVALS,
+      record: {
+        result: JSON.stringify(traceObject.result),
+        meta: JSON.stringify(traceObject.meta),
+        input: traceObject.input,
+        output: traceObject.output,
+        createdAt: new Date().toISOString(),
+      },
+    });
+  }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastra",
-  "version": "0.2.0-alpha.152",
+  "version": "0.2.0-alpha.155",
   "license": "MIT",
   "description": "cli for mastra",
   "type": "module",
@@ -55,8 +55,8 @@
     "yocto-spinner": "^0.1.1",
     "zod": "^3.24.1",
     "zod-to-json-schema": "^3.24.1",
-    "@mastra/core": "^0.2.0-alpha.95",
-    "@mastra/deployer": "^0.1.0-alpha.44"
+    "@mastra/core": "^0.2.0-alpha.98",
+    "@mastra/deployer": "^0.1.0-alpha.47"
   },
   "devDependencies": {
     "@ai-sdk/openai": "^1.1.9",
@@ -75,7 +75,7 @@
   },
   "scripts": {
     "build": "npm-run-all --serial build:lib copy-starter-files copy-templates build:playground",
-    "build:lib": "tsup-node --config tsup.config.js",
+    "build:lib": "tsup --config tsup.config.js",
     "build:watch": "pnpm run build:lib --watch --onSuccess \"pnpm run copy-starter-files && pnpm run copy-templates\"",
     "copy-starter-files": "cpy \"src/starter-files/**/*\" \"dist/starter-files\"",
     "copy-templates": "cpy \"src/templates/**/*\" \"dist/templates/\"",