@mastra/deployer 0.10.6-alpha.3 → 0.10.6-alpha.5

package/dist/_tsup-dts-rollup.d.cts

@@ -41,7 +41,7 @@ export declare function aliasHono(): Plugin;
  *
  * This helps identify which dependencies need to be externalized vs bundled.
  */
-declare function analyzeBundle(entry: string, mastraEntry: string, outputDir: string, platform: 'node' | 'browser', logger: IMastraLogger): Promise<{
+declare function analyzeBundle(entries: string[], mastraEntry: string, outputDir: string, platform: 'node' | 'browser', logger: IMastraLogger): Promise<{
     invalidChunks: Set<string>;
     dependencies: Map<string, string>;
     externalDependencies: Set<string>;
@@ -87,7 +87,7 @@ export declare abstract class Bundler extends MastraBundler {
         write: () => Promise<RollupOutput>;
         close: () => Promise<void>;
     }>;
-    protected analyze(entry: string, mastraFile: string, outputDirectory: string): Promise<{
+    protected analyze(entry: string | string[], mastraFile: string, outputDirectory: string): Promise<{
         invalidChunks: Set<string>;
         dependencies: Map<string, string>;
         externalDependencies: Set<string>;

package/dist/_tsup-dts-rollup.d.ts

@@ -41,7 +41,7 @@ export declare function aliasHono(): Plugin;
  *
  * This helps identify which dependencies need to be externalized vs bundled.
  */
-declare function analyzeBundle(entry: string, mastraEntry: string, outputDir: string, platform: 'node' | 'browser', logger: IMastraLogger): Promise<{
+declare function analyzeBundle(entries: string[], mastraEntry: string, outputDir: string, platform: 'node' | 'browser', logger: IMastraLogger): Promise<{
     invalidChunks: Set<string>;
     dependencies: Map<string, string>;
     externalDependencies: Set<string>;
@@ -87,7 +87,7 @@ export declare abstract class Bundler extends MastraBundler {
         write: () => Promise<RollupOutput>;
         close: () => Promise<void>;
     }>;
-    protected analyze(entry: string, mastraFile: string, outputDirectory: string): Promise<{
+    protected analyze(entry: string | string[], mastraFile: string, outputDirectory: string): Promise<{
         invalidChunks: Set<string>;
         dependencies: Map<string, string>;
         externalDependencies: Set<string>;

package/dist/build/analyze.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkTSG63RGL_cjs = require('../chunk-TSG63RGL.cjs');
+var chunkF4JNMQTU_cjs = require('../chunk-F4JNMQTU.cjs');
 
 
 
 Object.defineProperty(exports, "analyzeBundle", {
   enumerable: true,
-  get: function () { return chunkTSG63RGL_cjs.analyzeBundle; }
+  get: function () { return chunkF4JNMQTU_cjs.analyzeBundle; }
 });

package/dist/build/analyze.js

@@ -1 +1 @@
-export { analyzeBundle } from '../chunk-WGJTOVLL.js';
+export { analyzeBundle } from '../chunk-J2V6UIZO.js';

package/dist/build/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-var chunkDBEMB6OV_cjs = require('../chunk-DBEMB6OV.cjs');
-var chunkDTQ7BTPM_cjs = require('../chunk-DTQ7BTPM.cjs');
-var chunkTSG63RGL_cjs = require('../chunk-TSG63RGL.cjs');
+var chunkUTZFG7JQ_cjs = require('../chunk-UTZFG7JQ.cjs');
+var chunkIFU2DUSR_cjs = require('../chunk-IFU2DUSR.cjs');
+var chunkF4JNMQTU_cjs = require('../chunk-F4JNMQTU.cjs');
 var chunkIMGVLBV7_cjs = require('../chunk-IMGVLBV7.cjs');
 var chunk7ICGDVC3_cjs = require('../chunk-7ICGDVC3.cjs');
 
@@ -10,27 +10,27 @@ var chunk7ICGDVC3_cjs = require('../chunk-7ICGDVC3.cjs');
 
 Object.defineProperty(exports, "createWatcher", {
   enumerable: true,
-  get: function () { return chunkDBEMB6OV_cjs.createWatcher; }
+  get: function () { return chunkUTZFG7JQ_cjs.createWatcher; }
 });
 Object.defineProperty(exports, "getServerOptions", {
   enumerable: true,
-  get: function () { return chunkDBEMB6OV_cjs.getServerOptions; }
+  get: function () { return chunkUTZFG7JQ_cjs.getServerOptions; }
 });
 Object.defineProperty(exports, "getWatcherInputOptions", {
   enumerable: true,
-  get: function () { return chunkDBEMB6OV_cjs.getInputOptions; }
+  get: function () { return chunkUTZFG7JQ_cjs.getInputOptions; }
 });
 Object.defineProperty(exports, "writeTelemetryConfig", {
   enumerable: true,
-  get: function () { return chunkDTQ7BTPM_cjs.writeTelemetryConfig; }
+  get: function () { return chunkIFU2DUSR_cjs.writeTelemetryConfig; }
 });
 Object.defineProperty(exports, "analyzeBundle", {
   enumerable: true,
-  get: function () { return chunkTSG63RGL_cjs.analyzeBundle; }
+  get: function () { return chunkF4JNMQTU_cjs.analyzeBundle; }
 });
 Object.defineProperty(exports, "getBundlerOptions", {
   enumerable: true,
-  get: function () { return chunkTSG63RGL_cjs.getBundlerOptions; }
+  get: function () { return chunkF4JNMQTU_cjs.getBundlerOptions; }
 });
 Object.defineProperty(exports, "createBundler", {
   enumerable: true,

package/dist/build/index.js

@@ -1,5 +1,5 @@
-export { createWatcher, getServerOptions, getInputOptions as getWatcherInputOptions } from '../chunk-G7OBNEAD.js';
-export { writeTelemetryConfig } from '../chunk-EXHFPVZH.js';
-export { analyzeBundle, getBundlerOptions } from '../chunk-WGJTOVLL.js';
+export { createWatcher, getServerOptions, getInputOptions as getWatcherInputOptions } from '../chunk-MGULNF6D.js';
+export { writeTelemetryConfig } from '../chunk-KJINZD6K.js';
+export { analyzeBundle, getBundlerOptions } from '../chunk-J2V6UIZO.js';
 export { createBundler, getInputOptions as getBundlerInputOptions } from '../chunk-HHOCIHND.js';
 export { Deps, FileService } from '../chunk-4VKGIENI.js';

package/dist/bundler/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-var chunkVZ6L36CW_cjs = require('../chunk-VZ6L36CW.cjs');
+var chunkQGO33MM3_cjs = require('../chunk-QGO33MM3.cjs');
 
 
 
 Object.defineProperty(exports, "Bundler", {
   enumerable: true,
-  get: function () { return chunkVZ6L36CW_cjs.Bundler; }
+  get: function () { return chunkQGO33MM3_cjs.Bundler; }
 });

package/dist/bundler/index.js

@@ -1 +1 @@
-export { Bundler } from '../chunk-FBZWTLPQ.js';
+export { Bundler } from '../chunk-72MENR23.js';

package/dist/{chunk-FBZWTLPQ.js → chunk-72MENR23.js}

@@ -1,5 +1,5 @@
-import { writeTelemetryConfig } from './chunk-EXHFPVZH.js';
-import { analyzeBundle } from './chunk-WGJTOVLL.js';
+import { writeTelemetryConfig } from './chunk-KJINZD6K.js';
+import { analyzeBundle } from './chunk-J2V6UIZO.js';
 import { createBundler, getInputOptions } from './chunk-HHOCIHND.js';
 import { DepsService, FileService } from './chunk-4VKGIENI.js';
 import { existsSync } from 'fs';
@@ -7,6 +7,7 @@ import { writeFile, stat } from 'fs/promises';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { MastraBundler } from '@mastra/core/bundler';
+import { MastraError, ErrorCategory, ErrorDomain } from '@mastra/core/error';
 import virtual from '@rollup/plugin-virtual';
 import fsExtra, { emptyDir, ensureDir, copy, readJSON } from 'fs-extra/esm';
 import { globby } from 'globby';
@@ -95,11 +96,7 @@ var packWorkspaceDependencies = async ({
         batch.map(async (pkgName) => {
           const dep = workspaceMap.get(pkgName);
           if (!dep) return;
-          try {
-            await depsService.pack({ dir: dep.location, destination: workspaceDirPath });
-          } catch (error) {
-            logger.error(`Failed to package ${pkgName}: ${error}`);
-          }
+          await depsService.pack({ dir: dep.location, destination: workspaceDirPath });
         })
       );
     }
@@ -176,7 +173,13 @@ var Bundler = class extends MastraBundler {
     return createBundler(inputOptions, outputOptions);
   }
   async analyze(entry, mastraFile, outputDirectory) {
-    return await analyzeBundle(entry, mastraFile, join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
+    return await analyzeBundle(
+      [].concat(entry),
+      mastraFile,
+      join(outputDirectory, this.analyzeOutputDir),
+      "node",
+      this.logger
+    );
   }
   async installDependencies(outputDirectory, rootDir = process.cwd()) {
     const deps = new DepsService(rootDir);
@@ -238,14 +241,44 @@ var Bundler = class extends MastraBundler {
   }
   async _bundle(serverFile, mastraEntryFile, outputDirectory, toolsPaths = [], bundleLocation = join(outputDirectory, this.outputDir)) {
     this.logger.info("Start bundling Mastra");
-    const analyzedBundleInfo = await analyzeBundle(
-      serverFile,
-      mastraEntryFile,
-      join(outputDirectory, this.analyzeOutputDir),
-      "node",
-      this.logger
-    );
-    const { externalDependencies } = await writeTelemetryConfig(mastraEntryFile, join(outputDirectory, this.outputDir));
+    let analyzedBundleInfo;
+    try {
+      const resolvedToolsPaths = await this.getToolsInputOptions(toolsPaths);
+      analyzedBundleInfo = await analyzeBundle(
+        [serverFile, ...Object.values(resolvedToolsPaths)],
+        mastraEntryFile,
+        join(outputDirectory, this.analyzeOutputDir),
+        "node",
+        this.logger
+      );
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new MastraError(
+        {
+          id: "DEPLOYER_BUNDLER_ANALYZE_FAILED",
+          text: `Failed to analyze Mastra application: ${message}`,
+          domain: ErrorDomain.DEPLOYER,
+          category: ErrorCategory.SYSTEM
+        },
+        error
+      );
+    }
+    let externalDependencies;
+    try {
+      const result = await writeTelemetryConfig(mastraEntryFile, join(outputDirectory, this.outputDir));
+      externalDependencies = result.externalDependencies;
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new MastraError(
+        {
+          id: "DEPLOYER_BUNDLER_TELEMETRY_FAILED",
+          text: `Failed to write telemetry config: ${message}`,
+          domain: ErrorDomain.DEPLOYER,
+          category: ErrorCategory.SYSTEM
+        },
+        error
+      );
+    }
     const dependenciesToInstall = /* @__PURE__ */ new Map();
     for (const external of externalDependencies) {
       dependenciesToInstall.set(external, "latest");
@@ -284,35 +317,70 @@ var Bundler = class extends MastraBundler {
           logger: this.logger
         });
       } catch (error) {
-        this.logger.error(`Failed to collect workspace dependencies: ${error}`);
-        return;
+        throw new MastraError(
+          {
+            id: "DEPLOYER_BUNDLER_WORKSPACE_DEPS_FAILED",
+            text: `Failed to collect and pack workspace dependencies.`,
+            domain: ErrorDomain.DEPLOYER,
+            category: ErrorCategory.USER
+          },
+          error
+        );
       }
     }
-    await this.writePackageJson(join(outputDirectory, this.outputDir), dependenciesToInstall, resolutions);
-    await this.writeInstrumentationFile(join(outputDirectory, this.outputDir));
-    this.logger.info("Bundling Mastra application");
-    const inputOptions = await this.getBundlerOptions(
-      serverFile,
-      mastraEntryFile,
-      analyzedBundleInfo,
-      toolsPaths
-    );
-    const bundler = await this.createBundler(inputOptions, {
-      dir: bundleLocation,
-      manualChunks: {
-        mastra: ["#mastra"]
-      }
-    });
-    await bundler.write();
-    const toolsInputOptions = Array.from(Object.keys(inputOptions.input || {})).filter((key) => key.startsWith("tools/")).map((key) => `./${key}.mjs`);
-    await writeFile(join(bundleLocation, "tools.mjs"), `export const tools = ${JSON.stringify(toolsInputOptions)};`);
-    this.logger.info("Bundling Mastra done");
-    this.logger.info("Copying public files");
-    await this.copyPublic(dirname(mastraEntryFile), outputDirectory);
-    this.logger.info("Done copying public files");
-    this.logger.info("Installing dependencies");
-    await this.installDependencies(outputDirectory);
-    this.logger.info("Done installing dependencies");
+    try {
+      await this.writePackageJson(join(outputDirectory, this.outputDir), dependenciesToInstall, resolutions);
+      await this.writeInstrumentationFile(join(outputDirectory, this.outputDir));
+      this.logger.info("Bundling Mastra application");
+      const inputOptions = await this.getBundlerOptions(
+        serverFile,
+        mastraEntryFile,
+        analyzedBundleInfo,
+        toolsPaths
+      );
+      const bundler = await this.createBundler(
+        {
+          ...inputOptions,
+          logLevel: inputOptions.logLevel === "silent" ? "warn" : inputOptions.logLevel,
+          onwarn: (warning) => {
+            if (warning.code === "CIRCULAR_DEPENDENCY") {
+              if (warning.ids?.[0]?.includes("node_modules")) {
+                return;
+              }
+              this.logger.warn(`Circular dependency found:
+	${warning.message.replace("Circular dependency: ", "")}`);
+            }
+          }
+        },
+        {
+          dir: bundleLocation,
+          manualChunks: {
+            mastra: ["#mastra"]
+          }
+        }
+      );
+      await bundler.write();
+      const toolsInputOptions = Array.from(Object.keys(inputOptions.input || {})).filter((key) => key.startsWith("tools/")).map((key) => `./${key}.mjs`);
+      await writeFile(join(bundleLocation, "tools.mjs"), `export const tools = ${JSON.stringify(toolsInputOptions)};`);
+      this.logger.info("Bundling Mastra done");
+      this.logger.info("Copying public files");
+      await this.copyPublic(dirname(mastraEntryFile), outputDirectory);
+      this.logger.info("Done copying public files");
+      this.logger.info("Installing dependencies");
+      await this.installDependencies(outputDirectory);
+      this.logger.info("Done installing dependencies");
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new MastraError(
+        {
+          id: "DEPLOYER_BUNDLER_BUNDLE_STAGE_FAILED",
+          text: `Failed during bundler bundle stage: ${message}`,
+          domain: ErrorDomain.DEPLOYER,
+          category: ErrorCategory.SYSTEM
+        },
+        error
+      );
+    }
   }
   async lint(_entryFile, _outputDirectory, toolsPaths) {
     const toolsInputOptions = await this.getToolsInputOptions(toolsPaths);

package/dist/{chunk-TSG63RGL.cjs → chunk-F4JNMQTU.cjs}

@@ -561,9 +561,20 @@ async function validateOutput({
   }
   return result;
 }
-async function analyzeBundle(entry, mastraEntry, outputDir, platform, logger) {
-  const isVirtualFile = entry.includes("\n") || !fs.existsSync(entry);
-  const depsToOptimize = await analyze(entry, mastraEntry, isVirtualFile, platform, logger);
+async function analyzeBundle(entries, mastraEntry, outputDir, platform, logger) {
+  const depsToOptimize = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const isVirtualFile = entry.includes("\n") || !fs.existsSync(entry);
+    const analyzeResult = await analyze(entry, mastraEntry, isVirtualFile, platform, logger);
+    for (const [dep, exports] of analyzeResult.entries()) {
+      if (depsToOptimize.has(dep)) {
+        const existingExports = depsToOptimize.get(dep);
+        depsToOptimize.set(dep, [.../* @__PURE__ */ new Set([...existingExports, ...exports])]);
+      } else {
+        depsToOptimize.set(dep, exports);
+      }
+    }
+  }
   const customExternals = (await getBundlerOptions(mastraEntry, outputDir))?.externals;
   const { output, reverseVirtualReferenceMap, usedExternals } = await bundleExternals(
     depsToOptimize,

package/dist/{chunk-DTQ7BTPM.cjs → chunk-IFU2DUSR.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkTSG63RGL_cjs = require('./chunk-TSG63RGL.cjs');
+var chunkF4JNMQTU_cjs = require('./chunk-F4JNMQTU.cjs');
 var babel = require('@babel/core');
 var rollup = require('rollup');
 var esbuild = require('rollup-plugin-esbuild');
@@ -32,7 +32,7 @@ var commonjs__default = /*#__PURE__*/_interopDefault(commonjs);
 
 // src/build/babel/remove-all-options-telemetry.ts
 function removeAllOptionsExceptTelemetry(result) {
-  return chunkTSG63RGL_cjs.removeAllOptionsFromMastraExcept(result, "telemetry");
+  return chunkF4JNMQTU_cjs.removeAllOptionsFromMastraExcept(result, "telemetry");
 }
 
 // src/build/telemetry.ts
@@ -96,7 +96,7 @@ function getTelemetryBundler(entryFile, result) {
           if (id !== entryFile) {
             return;
           }
-          return chunkTSG63RGL_cjs.recursiveRemoveNonReferencedNodes(code);
+          return chunkF4JNMQTU_cjs.recursiveRemoveNonReferencedNodes(code);
         }
       },
       // let esbuild remove all unused imports

package/dist/{chunk-WGJTOVLL.js → chunk-J2V6UIZO.js}

@@ -533,9 +533,20 @@ async function validateOutput({
   }
   return result;
 }
-async function analyzeBundle(entry, mastraEntry, outputDir, platform, logger) {
-  const isVirtualFile = entry.includes("\n") || !existsSync(entry);
-  const depsToOptimize = await analyze(entry, mastraEntry, isVirtualFile, platform, logger);
+async function analyzeBundle(entries, mastraEntry, outputDir, platform, logger) {
+  const depsToOptimize = /* @__PURE__ */ new Map();
+  for (const entry of entries) {
+    const isVirtualFile = entry.includes("\n") || !existsSync(entry);
+    const analyzeResult = await analyze(entry, mastraEntry, isVirtualFile, platform, logger);
+    for (const [dep, exports] of analyzeResult.entries()) {
+      if (depsToOptimize.has(dep)) {
+        const existingExports = depsToOptimize.get(dep);
+        depsToOptimize.set(dep, [.../* @__PURE__ */ new Set([...existingExports, ...exports])]);
+      } else {
+        depsToOptimize.set(dep, exports);
+      }
+    }
+  }
   const customExternals = (await getBundlerOptions(mastraEntry, outputDir))?.externals;
   const { output, reverseVirtualReferenceMap, usedExternals } = await bundleExternals(
     depsToOptimize,

package/dist/{chunk-EXHFPVZH.js → chunk-KJINZD6K.js}

@@ -1,4 +1,4 @@
-import { recursiveRemoveNonReferencedNodes, removeAllOptionsFromMastraExcept } from './chunk-WGJTOVLL.js';
+import { recursiveRemoveNonReferencedNodes, removeAllOptionsFromMastraExcept } from './chunk-J2V6UIZO.js';
 import * as babel from '@babel/core';
 import { rollup } from 'rollup';
 import esbuild from 'rollup-plugin-esbuild';

package/dist/{chunk-G7OBNEAD.js → chunk-MGULNF6D.js}

@@ -1,4 +1,4 @@
-import { aliasHono, recursiveRemoveNonReferencedNodes, removeAllOptionsFromMastraExcept } from './chunk-WGJTOVLL.js';
+import { aliasHono, recursiveRemoveNonReferencedNodes, removeAllOptionsFromMastraExcept } from './chunk-J2V6UIZO.js';
 import { getInputOptions } from './chunk-HHOCIHND.js';
 import { tsConfigPaths } from './chunk-Z544XXXK.js';
 import { watch, rollup } from 'rollup';

package/dist/{chunk-VZ6L36CW.cjs → chunk-QGO33MM3.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkDTQ7BTPM_cjs = require('./chunk-DTQ7BTPM.cjs');
-var chunkTSG63RGL_cjs = require('./chunk-TSG63RGL.cjs');
+var chunkIFU2DUSR_cjs = require('./chunk-IFU2DUSR.cjs');
+var chunkF4JNMQTU_cjs = require('./chunk-F4JNMQTU.cjs');
 var chunkIMGVLBV7_cjs = require('./chunk-IMGVLBV7.cjs');
 var chunk7ICGDVC3_cjs = require('./chunk-7ICGDVC3.cjs');
 var fs = require('fs');
@@ -9,6 +9,7 @@ var promises = require('fs/promises');
 var path = require('path');
 var url = require('url');
 var bundler = require('@mastra/core/bundler');
+var error = require('@mastra/core/error');
 var virtual = require('@rollup/plugin-virtual');
 var fsExtra = require('fs-extra/esm');
 var globby = require('globby');
@@ -105,11 +106,7 @@ var packWorkspaceDependencies = async ({
         batch.map(async (pkgName) => {
           const dep = workspaceMap.get(pkgName);
           if (!dep) return;
-          try {
-            await depsService.pack({ dir: dep.location, destination: workspaceDirPath });
-          } catch (error) {
-            logger.error(`Failed to package ${pkgName}: ${error}`);
-          }
+          await depsService.pack({ dir: dep.location, destination: workspaceDirPath });
         })
       );
     }
@@ -131,7 +128,7 @@ var Bundler = class extends bundler.MastraBundler {
   }
   async writeInstrumentationFile(outputDirectory) {
     const instrumentationFile = path.join(outputDirectory, "instrumentation.mjs");
-    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-VZ6L36CW.cjs', document.baseURI).href))));
+    const __dirname = path.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('chunk-QGO33MM3.cjs', document.baseURI).href))));
     await fsExtra.copy(path.join(__dirname, "templates", "instrumentation-template.js"), instrumentationFile);
   }
   async writePackageJson(outputDirectory, dependencies, resolutions) {
@@ -186,7 +183,13 @@ var Bundler = class extends bundler.MastraBundler {
     return chunkIMGVLBV7_cjs.createBundler(inputOptions, outputOptions);
   }
   async analyze(entry, mastraFile, outputDirectory) {
-    return await chunkTSG63RGL_cjs.analyzeBundle(entry, mastraFile, path.join(outputDirectory, this.analyzeOutputDir), "node", this.logger);
+    return await chunkF4JNMQTU_cjs.analyzeBundle(
+      [].concat(entry),
+      mastraFile,
+      path.join(outputDirectory, this.analyzeOutputDir),
+      "node",
+      this.logger
+    );
   }
   async installDependencies(outputDirectory, rootDir = process.cwd()) {
     const deps = new chunk7ICGDVC3_cjs.DepsService(rootDir);
@@ -248,14 +251,44 @@ var Bundler = class extends bundler.MastraBundler {
   }
   async _bundle(serverFile, mastraEntryFile, outputDirectory, toolsPaths = [], bundleLocation = path.join(outputDirectory, this.outputDir)) {
     this.logger.info("Start bundling Mastra");
-    const analyzedBundleInfo = await chunkTSG63RGL_cjs.analyzeBundle(
-      serverFile,
-      mastraEntryFile,
-      path.join(outputDirectory, this.analyzeOutputDir),
-      "node",
-      this.logger
-    );
-    const { externalDependencies } = await chunkDTQ7BTPM_cjs.writeTelemetryConfig(mastraEntryFile, path.join(outputDirectory, this.outputDir));
+    let analyzedBundleInfo;
+    try {
+      const resolvedToolsPaths = await this.getToolsInputOptions(toolsPaths);
+      analyzedBundleInfo = await chunkF4JNMQTU_cjs.analyzeBundle(
+        [serverFile, ...Object.values(resolvedToolsPaths)],
+        mastraEntryFile,
+        path.join(outputDirectory, this.analyzeOutputDir),
+        "node",
+        this.logger
+      );
+    } catch (error$1) {
+      const message = error$1 instanceof Error ? error$1.message : String(error$1);
+      throw new error.MastraError(
+        {
+          id: "DEPLOYER_BUNDLER_ANALYZE_FAILED",
+          text: `Failed to analyze Mastra application: ${message}`,
+          domain: error.ErrorDomain.DEPLOYER,
+          category: error.ErrorCategory.SYSTEM
+        },
+        error$1
+      );
+    }
+    let externalDependencies;
+    try {
+      const result = await chunkIFU2DUSR_cjs.writeTelemetryConfig(mastraEntryFile, path.join(outputDirectory, this.outputDir));
+      externalDependencies = result.externalDependencies;
+    } catch (error$1) {
+      const message = error$1 instanceof Error ? error$1.message : String(error$1);
+      throw new error.MastraError(
+        {
+          id: "DEPLOYER_BUNDLER_TELEMETRY_FAILED",
+          text: `Failed to write telemetry config: ${message}`,
+          domain: error.ErrorDomain.DEPLOYER,
+          category: error.ErrorCategory.SYSTEM
+        },
+        error$1
+      );
+    }
     const dependenciesToInstall = /* @__PURE__ */ new Map();
     for (const external of externalDependencies) {
       dependenciesToInstall.set(external, "latest");
@@ -293,36 +326,71 @@ var Bundler = class extends bundler.MastraBundler {
           bundleOutputDir: path.join(outputDirectory, this.outputDir),
           logger: this.logger
         });
-      } catch (error) {
-        this.logger.error(`Failed to collect workspace dependencies: ${error}`);
-        return;
+      } catch (error$1) {
+        throw new error.MastraError(
+          {
+            id: "DEPLOYER_BUNDLER_WORKSPACE_DEPS_FAILED",
+            text: `Failed to collect and pack workspace dependencies.`,
+            domain: error.ErrorDomain.DEPLOYER,
+            category: error.ErrorCategory.USER
+          },
+          error$1
+        );
       }
     }
-    await this.writePackageJson(path.join(outputDirectory, this.outputDir), dependenciesToInstall, resolutions);
-    await this.writeInstrumentationFile(path.join(outputDirectory, this.outputDir));
-    this.logger.info("Bundling Mastra application");
-    const inputOptions = await this.getBundlerOptions(
-      serverFile,
-      mastraEntryFile,
-      analyzedBundleInfo,
-      toolsPaths
-    );
-    const bundler = await this.createBundler(inputOptions, {
-      dir: bundleLocation,
-      manualChunks: {
-        mastra: ["#mastra"]
-      }
-    });
-    await bundler.write();
-    const toolsInputOptions = Array.from(Object.keys(inputOptions.input || {})).filter((key) => key.startsWith("tools/")).map((key) => `./${key}.mjs`);
-    await promises.writeFile(path.join(bundleLocation, "tools.mjs"), `export const tools = ${JSON.stringify(toolsInputOptions)};`);
-    this.logger.info("Bundling Mastra done");
-    this.logger.info("Copying public files");
-    await this.copyPublic(path.dirname(mastraEntryFile), outputDirectory);
-    this.logger.info("Done copying public files");
-    this.logger.info("Installing dependencies");
-    await this.installDependencies(outputDirectory);
-    this.logger.info("Done installing dependencies");
+    try {
+      await this.writePackageJson(path.join(outputDirectory, this.outputDir), dependenciesToInstall, resolutions);
+      await this.writeInstrumentationFile(path.join(outputDirectory, this.outputDir));
+      this.logger.info("Bundling Mastra application");
+      const inputOptions = await this.getBundlerOptions(
+        serverFile,
+        mastraEntryFile,
+        analyzedBundleInfo,
+        toolsPaths
+      );
+      const bundler = await this.createBundler(
+        {
+          ...inputOptions,
+          logLevel: inputOptions.logLevel === "silent" ? "warn" : inputOptions.logLevel,
+          onwarn: (warning) => {
+            if (warning.code === "CIRCULAR_DEPENDENCY") {
+              if (warning.ids?.[0]?.includes("node_modules")) {
+                return;
+              }
+              this.logger.warn(`Circular dependency found:
+	${warning.message.replace("Circular dependency: ", "")}`);
+            }
+          }
+        },
+        {
+          dir: bundleLocation,
+          manualChunks: {
+            mastra: ["#mastra"]
+          }
+        }
+      );
+      await bundler.write();
+      const toolsInputOptions = Array.from(Object.keys(inputOptions.input || {})).filter((key) => key.startsWith("tools/")).map((key) => `./${key}.mjs`);
+      await promises.writeFile(path.join(bundleLocation, "tools.mjs"), `export const tools = ${JSON.stringify(toolsInputOptions)};`);
+      this.logger.info("Bundling Mastra done");
+      this.logger.info("Copying public files");
+      await this.copyPublic(path.dirname(mastraEntryFile), outputDirectory);
+      this.logger.info("Done copying public files");
+      this.logger.info("Installing dependencies");
+      await this.installDependencies(outputDirectory);
+      this.logger.info("Done installing dependencies");
+    } catch (error$1) {
+      const message = error$1 instanceof Error ? error$1.message : String(error$1);
+      throw new error.MastraError(
+        {
+          id: "DEPLOYER_BUNDLER_BUNDLE_STAGE_FAILED",
+          text: `Failed during bundler bundle stage: ${message}`,
+          domain: error.ErrorDomain.DEPLOYER,
+          category: error.ErrorCategory.SYSTEM
+        },
+        error$1
+      );
+    }
   }
   async lint(_entryFile, _outputDirectory, toolsPaths) {
     const toolsInputOptions = await this.getToolsInputOptions(toolsPaths);

package/dist/{chunk-DBEMB6OV.cjs → chunk-UTZFG7JQ.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var chunkTSG63RGL_cjs = require('./chunk-TSG63RGL.cjs');
+var chunkF4JNMQTU_cjs = require('./chunk-F4JNMQTU.cjs');
 var chunkIMGVLBV7_cjs = require('./chunk-IMGVLBV7.cjs');
 var chunk54KOF3NB_cjs = require('./chunk-54KOF3NB.cjs');
 var rollup = require('rollup');
@@ -121,7 +121,7 @@ async function getInputOptions2(entryFile, platform, env) {
       // @ts-ignore
       (plugin) => !plugin || !plugin?.name || plugin.name !== "node-resolve"
     );
-    inputOptions.plugins.push(chunkTSG63RGL_cjs.aliasHono());
+    inputOptions.plugins.push(chunkF4JNMQTU_cjs.aliasHono());
     inputOptions.plugins.push(nodeModulesExtensionResolver());
   }
   return inputOptions;
@@ -141,7 +141,7 @@ async function createWatcher(inputOptions, outputOptions) {
 
 // src/build/babel/remove-all-options-server.ts
 function removeAllOptionsExceptServer(result) {
-  return chunkTSG63RGL_cjs.removeAllOptionsFromMastraExcept(result, "server");
+  return chunkF4JNMQTU_cjs.removeAllOptionsFromMastraExcept(result, "server");
 }
 function getServerOptionsBundler(entryFile, result) {
   return rollup.rollup({
@@ -204,7 +204,7 @@ function getServerOptionsBundler(entryFile, result) {
           if (id !== entryFile) {
             return;
           }
-          return chunkTSG63RGL_cjs.recursiveRemoveNonReferencedNodes(code);
+          return chunkF4JNMQTU_cjs.recursiveRemoveNonReferencedNodes(code);
         }
       },
       // let esbuild remove all unused imports

package/dist/index.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
-var chunkVZ6L36CW_cjs = require('./chunk-VZ6L36CW.cjs');
-var chunkTSG63RGL_cjs = require('./chunk-TSG63RGL.cjs');
+var chunkQGO33MM3_cjs = require('./chunk-QGO33MM3.cjs');
+var chunkF4JNMQTU_cjs = require('./chunk-F4JNMQTU.cjs');
 var chunk7ICGDVC3_cjs = require('./chunk-7ICGDVC3.cjs');
 var babel = require('@babel/core');
 var rollup = require('rollup');
@@ -33,7 +33,7 @@ var esbuild__default = /*#__PURE__*/_interopDefault(esbuild);
 var commonjs__default = /*#__PURE__*/_interopDefault(commonjs);
 
 // src/deploy/base.ts
-var Deployer = class extends chunkVZ6L36CW_cjs.Bundler {
+var Deployer = class extends chunkQGO33MM3_cjs.Bundler {
   deps = new chunk7ICGDVC3_cjs.DepsService();
   constructor(args) {
     super(args.name, "DEPLOYER");
@@ -148,7 +148,7 @@ function getDeployerBundler(entryFile, result) {
           if (id !== entryFile) {
             return;
           }
-          return chunkTSG63RGL_cjs.recursiveRemoveNonReferencedNodes(code);
+          return chunkF4JNMQTU_cjs.recursiveRemoveNonReferencedNodes(code);
         }
       },
       // let esbuild remove all unused imports

package/dist/index.js

@@ -1,5 +1,5 @@
-import { Bundler } from './chunk-FBZWTLPQ.js';
-import { recursiveRemoveNonReferencedNodes } from './chunk-WGJTOVLL.js';
+import { Bundler } from './chunk-72MENR23.js';
+import { recursiveRemoveNonReferencedNodes } from './chunk-J2V6UIZO.js';
 import { DepsService, FileService } from './chunk-4VKGIENI.js';
 export { Deps, FileService, createChildProcessLogger, createPinoStream } from './chunk-4VKGIENI.js';
 import * as babel from '@babel/core';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mastra/deployer",
-  "version": "0.10.6-alpha.3",
+  "version": "0.10.6-alpha.5",
   "description": "",
   "type": "module",
   "files": [
@@ -108,7 +108,7 @@
     "rollup-plugin-node-externals": "^8.0.0",
     "typescript-paths": "^1.5.1",
     "zod": "^3.25.57",
-    "@mastra/server": "^0.10.6-alpha.3"
+    "@mastra/server": "^0.10.6-alpha.5"
   },
   "devDependencies": {
     "@hono/node-server": "^1.14.4",
@@ -128,8 +128,8 @@
     "typescript": "^5.8.3",
     "vitest": "^2.1.9",
     "@internal/lint": "0.0.12",
-    "@mastra/mcp": "^0.10.4-alpha.0",
-    "@mastra/core": "0.10.6-alpha.3"
+    "@mastra/core": "0.10.6-alpha.5",
+    "@mastra/mcp": "^0.10.4-alpha.1"
   },
   "peerDependencies": {
     "@mastra/core": "^0.10.2-alpha.0"