mastra 0.1.57-alpha.88 → 0.1.57-alpha.89

package/dist/commands/deploy/cloudflare/index.d.ts

@@ -2,6 +2,10 @@ import { Deployer } from '../deployer.js';
 export declare class CloudflareDeployer extends Deployer {
     name: string;
     installCli(): Promise<void>;
+    build({ dir }: {
+        dir: string;
+        useBanner: boolean;
+    }): Promise<void>;
     writePkgJson(): Promise<void>;
     writeFiles(): void;
     deployCommand({ scope }: {

package/dist/commands/deploy/cloudflare/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/cloudflare/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,qBAAa,kBAAmB,SAAQ,QAAQ;IAC9C,IAAI,SAAgB;IAEd,UAAU;IAMV,YAAY;IA2BlB,UAAU,IAAI,IAAI;IA+BZ,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAajE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/deploy/cloudflare/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,qBAAa,kBAAmB,SAAQ,QAAQ;IAC9C,IAAI,SAAgB;IAEd,UAAU;IAMV,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,OAAO,CAAA;KAAE;IAIlD,YAAY;IA2ClB,UAAU,IAAI,IAAI;IAgCZ,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;CAajE"}

package/dist/commands/deploy/cloudflare/index.js

@@ -1,5 +1,5 @@
 import { execa } from 'execa';
-import { writeFileSync } from 'fs';
+import { readFileSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { DepsService } from '../../../services/service.deps.js';
 import { Deployer } from '../deployer.js';
@@ -14,7 +14,25 @@ export class CloudflareDeployer extends Deployer {
         const depsService = new DepsService();
         await depsService.installPackages(['wrangler -g']);
     }
+    async build({ dir }) {
+        super.build({ dir, useBanner: false });
+    }
     async writePkgJson() {
+        let projectPkg = {
+            dependencies: {},
+        };
+        try {
+            projectPkg = JSON.parse(readFileSync(join(this.dotMastraPath, '..', 'package.json'), 'utf-8'));
+        }
+        catch (_e) {
+            // no-op
+        }
+        const mastraDeps = Object.entries(projectPkg.dependencies)
+            .filter(([name]) => name.startsWith('@mastra'))
+            .reduce((acc, [name, version]) => {
+            acc[name] = version;
+            return acc;
+        }, {});
         writeFileSync(join(this.dotMastraPath, 'package.json'), JSON.stringify({
             name: 'server',
             version: '1.0.0',
@@ -26,7 +44,7 @@ export class CloudflareDeployer extends Deployer {
             author: '',
             license: 'ISC',
             dependencies: {
-                '@mastra/core': '0.1.27-alpha.18',
+                ...mastraDeps,
                 'itty-router': '5.0.18',
                 superjson: '^2.2.2',
                 'zod-to-json-schema': '^3.24.1',
@@ -37,26 +55,27 @@ export class CloudflareDeployer extends Deployer {
         const envVars = this.getEnvVars();
         // TODO ENV KEYS
         writeFileSync(join(this.dotMastraPath, 'wrangler.toml'), `
-        name = "mastra"
-        main = "index.mjs"  # Your main worker file
-        compatibility_date = "2024-12-02"
-        compatibility_flags = ["nodejs_compat"]
-        
-        [build]
-        command = "npm install" 
-        
-        [[build.upload]]
-        type = "javascript_module"
-        main = "mastra.mjs"
-        
-        [observability.logs]
-        enabled = true
-        
-        [vars]
-        ${Object.entries(envVars || {})
+name = "mastra"
+main = "index.mjs"  # Your main worker file
+compatibility_date = "2024-12-02"
+compatibility_flags = ["nodejs_compat"]
+find_additional_modules = true
+
+[build]
+command = "npm install" 
+
+[[build.upload]]
+type = "javascript_module"
+main = "mastra.mjs"
+
+[observability.logs]
+enabled = true
+
+[vars]
+${Object.entries(envVars || {})
             ?.map(([key, value]) => `${key} = "${value}"`)
             .join('\n')}
-        `),
+`),
             writeFileSync(join(this.dotMastraPath, 'index.mjs'), WORKER);
     }
     async deployCommand({ scope }) {

package/dist/commands/deploy/deployer.d.ts

@@ -10,8 +10,9 @@ export declare abstract class Deployer {
     protected getEnvFiles(): string[];
     getEnvVars(): Record<string, string>;
     protected parseEnvFile(filePath: string): string[];
-    build({ dir }: {
+    build({ dir, useBanner }: {
         dir: string;
+        useBanner?: boolean;
     }): Promise<void>;
     writePkgJson(): void;
     writeFiles(): void;

package/dist/commands/deploy/deployer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deployer.ts"],"names":[],"mappings":"AAMA,8BAAsB,QAAQ;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAM;gBAEN,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;IAMlC,UAAU;IAIV,OAAO;IASb,SAAS,CAAC,WAAW,IAAI,MAAM,EAAE;IAOjC,UAAU;IAkBV,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAS5C,KAAK,CAAC,EAAE,GAAG,EAAE,EAAE;QAAE,GAAG,EAAE,MAAM,CAAA;KAAE;IAQpC,YAAY;IAIZ,UAAU;IAIJ,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAItG,MAAM,CAAC,EACX,KAAK,EACL,MAAM,EACN,GAAG,EACH,WAAW,GACZ,EAAE;QACD,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;CAUF"}
+{"version":3,"file":"deployer.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deployer.ts"],"names":[],"mappings":"AAMA,8BAAsB,QAAQ;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAM;gBAEN,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE;IAMlC,UAAU;IAIV,OAAO;IASb,SAAS,CAAC,WAAW,IAAI,MAAM,EAAE;IAOjC,UAAU;IAkBV,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE;IAS5C,KAAK,CAAC,EAAE,GAAG,EAAE,SAAgB,EAAE,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,OAAO,CAAA;KAAE;IAQ3E,YAAY;IAIZ,UAAU;IAIJ,aAAa,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE;IAItG,MAAM,CAAC,EACX,KAAK,EACL,MAAM,EACN,GAAG,EACH,WAAW,GACZ,EAAE;QACD,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB;CAUF"}

package/dist/commands/deploy/deployer.js

@@ -49,11 +49,11 @@ export class Deployer {
             .filter(line => line && !line.startsWith('#'))
             .filter(line => line.includes('=')); // Only include valid KEY=value pairs
     }
-    async build({ dir }) {
+    async build({ dir, useBanner = true }) {
         if (!existsSync(this.dotMastraPath)) {
             mkdirSync(this.dotMastraPath);
         }
-        await bundle(dir);
+        await bundle(dir, { useBanner });
     }
     writePkgJson() {
         console.log('Writing package.json...');

package/dist/templates/worker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/templates/worker.ts"],"names":[],"mappings":"AA0CA,UAAU,gBAAgB;IACxB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACvC,sBAAsB,IAAI,IAAI,CAAC;CAChC;;mBAshCsB,OAAO,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,gBAAgB;;AADlF,wBAQE"}
+{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/templates/worker.ts"],"names":[],"mappings":"AA8CA,UAAU,gBAAgB;IACxB,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACvC,sBAAsB,IAAI,IAAI,CAAC;CAChC;;mBA4hCsB,OAAO,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,gBAAgB;;AADlF,wBAQE"}

package/dist/templates/worker.js

@@ -1,9 +1,11 @@
 import { AutoRouter } from 'itty-router';
-import { join } from 'path';
+// import { join } from 'path';
 import { stringify } from 'superjson';
 import { pathToFileURL } from 'url';
 import zodToJsonSchema from 'zod-to-json-schema';
-const { mastra } = await import(join(process.cwd(), 'mastra.mjs'));
+// // @ts-ignore
+// import { mastra } from './mastra.mjs';
+// const { mastra } = await import(join(process.cwd(), 'mastra.mjs'));
 const mastraToolsPaths = process.env.MASTRA_TOOLS_PATH;
 const toolImports = mastraToolsPaths
     ? await Promise.all(mastraToolsPaths.split(',').map(async (toolPath) => {
@@ -16,7 +18,13 @@ const tools = toolImports.reduce((acc, toolModule) => {
     });
     return acc;
 }, {});
+async function addMastra(request) {
+    // @ts-ignore
+    const { mastra } = await import('./mastra.mjs');
+    request.mastra = mastra;
+}
 const router = AutoRouter();
+router.all('*', addMastra);
 const validateBody = async (body) => {
     const errorResponse = Object.entries(body).reduce((acc, [key, value]) => {
         if (!value) {
@@ -34,7 +42,7 @@ router.get('/', () => {
         headers: { 'Content-Type': 'text/plain' },
     });
 });
-router.get('/api/agents', async () => {
+router.get('/api/agents', async ({ mastra }) => {
     try {
         const agents = mastra.getAgents();
         const serializedAgents = Object.entries(agents).reduce((acc, [_id, _agent]) => {
@@ -71,7 +79,7 @@ router.get('/api/agents', async () => {
         });
     }
 });
-router.get('/api/agents/:agentId', ({ params }) => {
+router.get('/api/agents/:agentId', ({ params, mastra }) => {
     try {
         const agentId = decodeURIComponent(params.agentId);
         const agent = mastra.getAgent(agentId);
@@ -104,7 +112,7 @@ router.get('/api/agents/:agentId', ({ params }) => {
         });
     }
 });
-router.post('/api/agents/:agentId/generate', async ({ params, json }) => {
+router.post('/api/agents/:agentId/generate', async ({ params, json, mastra }) => {
     try {
         const agentId = decodeURIComponent(params.agentId);
         const agent = mastra.getAgent(agentId);
@@ -144,7 +152,7 @@ router.post('/api/agents/:agentId/generate', async ({ params, json }) => {
         });
     }
 });
-router.post('/api/agents/:agentId/stream', async ({ params, json }) => {
+router.post('/api/agents/:agentId/stream', async ({ params, json, mastra }) => {
     try {
         const agentId = decodeURIComponent(params.agentId);
         const agent = mastra.getAgent(agentId);
@@ -186,7 +194,7 @@ router.post('/api/agents/:agentId/stream', async ({ params, json }) => {
         });
     }
 });
-router.post('/api/agents/:agentId/text-object', async ({ params, json }) => {
+router.post('/api/agents/:agentId/text-object', async ({ params, json, mastra }) => {
     try {
         const agentId = decodeURIComponent(params.agentId);
         const agent = mastra.getAgent(agentId);
@@ -229,7 +237,7 @@ router.post('/api/agents/:agentId/text-object', async ({ params, json }) => {
         });
     }
 });
-router.post('/api/agents/:agentId/stream-object', async ({ params, json }) => {
+router.post('/api/agents/:agentId/stream-object', async ({ params, json, mastra }) => {
     try {
         const agentId = decodeURIComponent(params.agentId);
         const agent = mastra.getAgent(agentId);
@@ -274,7 +282,7 @@ router.post('/api/agents/:agentId/stream-object', async ({ params, json }) => {
         });
     }
 });
-router.post('/api/agents/:agentId/tools/:toolId/execute', async ({ params, json }) => {
+router.post('/api/agents/:agentId/tools/:toolId/execute', async ({ params, json, mastra }) => {
     try {
         const agentId = decodeURIComponent(params.agentId);
         const toolId = decodeURIComponent(params.toolId);
@@ -305,7 +313,7 @@ router.post('/api/agents/:agentId/tools/:toolId/execute', async ({ params, json
         });
     }
 });
-router.get('/api/workflows', async () => {
+router.get('/api/workflows', async ({ mastra }) => {
     try {
         const workflows = mastra.getWorkflows({ serialized: true });
         return new Response(JSON.stringify(workflows), {
@@ -325,7 +333,7 @@ router.get('/api/workflows', async () => {
         });
     }
 });
-router.get('/api/workflows/:workflowId', async ({ params }) => {
+router.get('/api/workflows/:workflowId', async ({ params, mastra }) => {
     try {
         const workflowId = decodeURIComponent(params.workflowId);
         const workflow = mastra.getWorkflow(workflowId);
@@ -364,7 +372,7 @@ router.get('/api/workflows/:workflowId', async ({ params }) => {
         });
     }
 });
-router.post('/workflows/:workflowId/execute', async ({ params, json }) => {
+router.post('/workflows/:workflowId/execute', async ({ params, json, mastra }) => {
     try {
         const workflowId = decodeURIComponent(params.workflowId);
         const workflow = mastra.getWorkflow(workflowId);
@@ -387,7 +395,7 @@ router.post('/workflows/:workflowId/execute', async ({ params, json }) => {
         });
     }
 });
-router.get('/api/memory/status', async () => {
+router.get('/api/memory/status', async ({ mastra }) => {
     try {
         const memory = mastra.memory;
         if (!memory) {
@@ -414,7 +422,7 @@ router.get('/api/memory/status', async () => {
         });
     }
 });
-router.get('/api/memory/threads', async ({ query }) => {
+router.get('/api/memory/threads', async ({ query, mastra }) => {
     try {
         const { resourceid } = query;
         const memory = mastra.memory;
@@ -444,7 +452,7 @@ router.get('/api/memory/threads', async ({ query }) => {
         });
     }
 });
-router.get('/api/memory/threads/:threadId', async ({ params }) => {
+router.get('/api/memory/threads/:threadId', async ({ params, mastra }) => {
     try {
         const threadId = decodeURIComponent(params.threadId);
         const memory = mastra.memory;
@@ -482,7 +490,7 @@ router.get('/api/memory/threads/:threadId', async ({ params }) => {
         });
     }
 });
-router.post('/api/memory/threads', async ({ json }) => {
+router.post('/api/memory/threads', async ({ json, mastra }) => {
     try {
         const memory = mastra.memory;
         const { title, metadata, resourceid, threadId } = await json();
@@ -521,7 +529,7 @@ router.post('/api/memory/threads', async ({ json }) => {
         });
     }
 });
-router.patch('/api/memory/threads/:threadId', async ({ params, json }) => {
+router.patch('/api/memory/threads/:threadId', async ({ params, json, mastra }) => {
     try {
         const threadId = decodeURIComponent(params.threadId);
         const memory = mastra.memory;
@@ -570,7 +578,7 @@ router.patch('/api/memory/threads/:threadId', async ({ params, json }) => {
         });
     }
 });
-router.delete('/api/memory/threads/:threadId', async ({ params }) => {
+router.delete('/api/memory/threads/:threadId', async ({ params, mastra }) => {
     try {
         const threadId = decodeURIComponent(params.threadId);
         const memory = mastra.memory;
@@ -609,7 +617,7 @@ router.delete('/api/memory/threads/:threadId', async ({ params }) => {
         });
     }
 });
-router.get('/api/memory/threads/:threadId/messages', async ({ params }) => {
+router.get('/api/memory/threads/:threadId/messages', async ({ params, mastra }) => {
     try {
         const threadId = decodeURIComponent(params.threadId);
         const memory = mastra.memory;
@@ -648,7 +656,7 @@ router.get('/api/memory/threads/:threadId/messages', async ({ params }) => {
         });
     }
 });
-router.get('/api/memory/threads/:threadId/context-window', async ({ params, query }) => {
+router.get('/api/memory/threads/:threadId/context-window', async ({ params, query, mastra }) => {
     try {
         const threadId = decodeURIComponent(params.threadId);
         const { startDate, endDate, format } = query;
@@ -688,7 +696,7 @@ router.get('/api/memory/threads/:threadId/context-window', async ({ params, quer
         });
     }
 });
-router.post('/api/memory/save-messages', async ({ json }) => {
+router.post('/api/memory/save-messages', async ({ json, mastra }) => {
     try {
         const memory = mastra.memory;
         const { messages } = await json();
@@ -742,7 +750,7 @@ router.post('/api/memory/save-messages', async ({ json }) => {
         });
     }
 });
-router.post('/api/memory/threads/:threadId/tool-result', async ({ params, json }) => {
+router.post('/api/memory/threads/:threadId/tool-result', async ({ params, json, mastra }) => {
     try {
         const threadId = decodeURIComponent(params.threadId);
         const memory = mastra.memory;
@@ -791,7 +799,7 @@ router.post('/api/memory/threads/:threadId/tool-result', async ({ params, json }
         });
     }
 });
-router.post('/api/memory/validate-tool-call-args', async ({ json }) => {
+router.post('/api/memory/validate-tool-call-args', async ({ json, mastra }) => {
     try {
         const memory = mastra.memory;
         const { hashedArgs } = await json();
@@ -830,7 +838,7 @@ router.post('/api/memory/validate-tool-call-args', async ({ json }) => {
         });
     }
 });
-router.post('/api/syncs/:syncId/execute', async ({ params, json }) => {
+router.post('/api/syncs/:syncId/execute', async ({ params, json, mastra }) => {
     try {
         const syncId = decodeURIComponent(params.syncId);
         const { runId, params: syncParams } = await json();
@@ -861,7 +869,7 @@ router.post('/api/syncs/:syncId/execute', async ({ params, json }) => {
         });
     }
 });
-router.get('/api/logs', async () => {
+router.get('/api/logs', async ({ mastra }) => {
     try {
         const logs = await mastra.getLogs();
         return new Response(JSON.stringify(logs), {
@@ -881,7 +889,7 @@ router.get('/api/logs', async () => {
         });
     }
 });
-router.get('/api/logs/:runId', async ({ params }) => {
+router.get('/api/logs/:runId', async ({ params, mastra }) => {
     try {
         const runId = decodeURIComponent(params.runId);
         const logs = await mastra.getLogsByRunId(runId);
@@ -951,7 +959,7 @@ router.get('/api/tools/:toolId', async ({ params }) => {
         });
     }
 });
-router.post('/api/tools/:toolId/execute', async ({ params, json }) => {
+router.post('/api/tools/:toolId/execute', async ({ params, json, mastra }) => {
     try {
         const toolId = decodeURIComponent(params.toolId);
         const tool = Object.values(tools || {}).find((tool) => tool.id === toolId);

package/dist/utils/bundle.d.ts

@@ -20,30 +20,15 @@ export declare function bundleServer(entryPoint: string): Promise<esbuild.BuildR
     logOverride: {
         'commonjs-variable-in-esm': "silent";
     };
+    plugins: {
+        name: string;
+        setup(build: any): void;
+    }[];
 }>>;
-export declare function bundle(dirPath: string, options?: {
+export declare function bundle(dirPath: string, { useBanner, ...options }?: {
     outfile?: string;
     entryFile?: string;
     buildName?: string;
-}): Promise<esbuild.BuildResult<{
-    entryPoints: string[];
-    bundle: true;
-    platform: "node";
-    format: "esm";
-    outfile: string;
-    target: string;
-    sourcemap: true;
-    minify: true;
-    metafile: true;
-    logLevel: "error";
-    mainFields: string[];
-    conditions: string[];
-    banner: {
-        js: string;
-    };
-    logOverride: {
-        'commonjs-variable-in-esm': "silent";
-    };
-    external: string[];
-}>>;
+    useBanner?: boolean;
+}): Promise<esbuild.BuildResult<esbuild.BuildOptions>>;
 //# sourceMappingURL=bundle.d.ts.map

package/dist/utils/bundle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/utils/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAanC,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;IAwFpD;AAED,wBAAsB,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;IAuGnH"}
+{"version":3,"file":"bundle.d.ts","sourceRoot":"","sources":["../../src/utils/bundle.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAcnC,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;qBAYlC,GAAG;;IAyGrB;AAED,wBAAsB,MAAM,CAC1B,OAAO,EAAE,MAAM,EACf,EACE,SAAgB,EAChB,GAAG,OAAO,EACX,GAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,OAAO,CAAA;CAAO,sDA4G1F"}

package/dist/utils/bundle.js

@@ -13,6 +13,27 @@ export async function bundleServer(entryPoint) {
         upsertMastraDir();
         const outfile = join(process.cwd(), '.mastra', 'server.mjs');
         const cliNodeModules = join(path.dirname(path.dirname(__dirname)), 'node_modules');
+        let missingMastraDependency = false;
+        const externalIfMissingPlugin = {
+            name: 'external-if-missing',
+            setup(build) {
+                build.onResolve({ filter: /^.*$/ }, (args) => {
+                    if (!args.importer.endsWith('.mastra/index.mjs'))
+                        return;
+                    try {
+                        const resolvedPath = import.meta.resolve(args.path);
+                        if (!resolvedPath || resolvedPath.includes('_npx/')) {
+                            missingMastraDependency = true;
+                            return { path: args.path, external: true };
+                        }
+                    }
+                    catch (e) {
+                        missingMastraDependency = true;
+                        return { path: args.path, external: true };
+                    }
+                });
+            },
+        };
         const result = await esbuild.build({
             entryPoints: [entryPoint],
             bundle: true,
@@ -76,7 +97,12 @@ export async function bundleServer(entryPoint) {
             logOverride: {
                 'commonjs-variable-in-esm': 'silent',
             },
+            plugins: [externalIfMissingPlugin],
         });
+        if (missingMastraDependency) {
+            console.error(`Missing Mastra dependency. Please install the mastra package in your project or globally using npm i -g mastra`);
+            process.exit(1);
+        }
         // Output build metadata
         await esbuild.analyzeMetafile(result.metafile);
         return result;
@@ -93,14 +119,14 @@ export async function bundleServer(entryPoint) {
         process.exit(1);
     }
 }
-export async function bundle(dirPath, options) {
+export async function bundle(dirPath, { useBanner = true, ...options } = {}) {
     try {
         // Ensure .mastra directory exists
         upsertMastraDir();
         const fileService = new FileService();
         const entryPoint = fileService.getFirstExistingFile([join(dirPath, `${options?.entryFile || 'index'}.ts`)]);
         const outfile = options?.outfile || join(process.cwd(), '.mastra', 'mastra.mjs');
-        const result = await esbuild.build({
+        const esbuildConfig = {
             entryPoints: [entryPoint],
             bundle: true,
             platform: 'node',
@@ -113,16 +139,6 @@ export async function bundle(dirPath, options) {
             logLevel: 'error',
             mainFields: ['module', 'main'],
             conditions: ['import', 'node'],
-            banner: {
-                js: `
-          import { createRequire } from "module";
-          import { fileURLToPath } from 'url';
-          import path from 'path';
-          const require = createRequire(import.meta.url);
-          const __filename = fileURLToPath(import.meta.url);
-          const __dirname = path.dirname(__filename);
-        `,
-            },
             logOverride: {
                 'commonjs-variable-in-esm': 'silent',
             },
@@ -174,7 +190,19 @@ export async function bundle(dirPath, options) {
                 '@mastra/rag',
                 '@mastra/stabilityai',
             ],
-        });
+        };
+        if (useBanner) {
+            esbuildConfig.banner = {
+                js: `
+          import { createRequire } from "module";
+          import { fileURLToPath } from 'url';
+          import path from 'path';
+          const require = createRequire(String(pathToFileURL(__filename)));
+          const __dirname = path.dirname(__filename);
+        `,
+            };
+        }
+        const result = await esbuild.build(esbuildConfig);
         // Log build results
         logger.success(`${options?.buildName} Build completed successfully`);
         // Output build metadata

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mastra",
-  "version": "0.1.57-alpha.88",
+  "version": "0.1.57-alpha.89",
   "license": "MIT",
   "description": "cli for mastra",
   "type": "module",
@@ -121,7 +121,7 @@
     "build": "npm-run-all build:tsc copy-starter-files build:playground",
     "build:tsc": "tsc",
     "build:dev": "npx tsc --watch",
-    "copy-starter-files": "cpy src/starter-files dist/",
+    "copy-starter-files": "cpy 'src/starter-files/**/*' dist/starter-files",
     "build:playground": "cd src/playground && vite build",
     "dev:playground": "cd src/playground && vite",
     "init": "npx tsx src/index.ts init",