create-mastra 0.0.0-monorepo-binary-20251013210052 → 0.0.0-netlify-no-bundle-20251127120354

package/dist/index.js

@@ -1,25 +1,25 @@
 #! /usr/bin/env node
 import { Command } from 'commander';
 import { randomUUID } from 'node:crypto';
-import * as fs4__default from 'node:fs';
-import fs4__default__default, { existsSync, readFileSync, writeFileSync } from 'node:fs';
+import * as fs3__default from 'node:fs';
+import fs3__default__default, { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import os from 'node:os';
 import path3, { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { PostHog } from 'posthog-node';
+import fs4 from 'node:fs/promises';
 import util, { stripVTControlCharacters } from 'node:util';
 import y$1, { stdout, stdin } from 'node:process';
 import * as g from 'node:readline';
 import g__default from 'node:readline';
 import { Writable } from 'node:stream';
-import fs5 from 'node:fs/promises';
 import child_process from 'node:child_process';
 import tty from 'node:tty';
-import pino from 'pino';
-import pretty from 'pino-pretty';
-import { execa } from 'execa';
 import fsExtra, { readJSON, ensureFile, writeJSON } from 'fs-extra/esm';
 import prettier from 'prettier';
+import { execa } from 'execa';
+import pino from 'pino';
+import pretty from 'pino-pretty';
 import fsExtra$1 from 'fs-extra';
 
 var __filename = fileURLToPath(import.meta.url);
@@ -422,7 +422,7 @@ ${color2.gray(d)}  ${t}
 `):process.stdout.write(`${w}  ${l}
 `),E(),s();};return {start:H,stop:N,message:(m="")=>{l=R(m??l);}}},Ce=async(t,n)=>{const r={},i=Object.keys(t);for(const s of i){const c=t[s],a=await c({results:r})?.catch(l=>{throw l});if(typeof n?.onCancel=="function"&&pD(a)){r[s]="canceled",n.onCancel({results:r});continue}r[s]=a;}return r};
 
-var shellQuote$1 = {};
+var shellQuote = {};
 
 var quote;
 var hasRequiredQuote;
@@ -688,16 +688,16 @@ function requireParse () {
 var hasRequiredShellQuote;
 
 function requireShellQuote () {
-	if (hasRequiredShellQuote) return shellQuote$1;
+	if (hasRequiredShellQuote) return shellQuote;
 	hasRequiredShellQuote = 1;
 
-	shellQuote$1.quote = requireQuote();
-	shellQuote$1.parse = requireParse();
-	return shellQuote$1;
+	shellQuote.quote = requireQuote();
+	shellQuote.parse = requireParse();
+	return shellQuote;
 }
 
 var shellQuoteExports = requireShellQuote();
-var shellQuote = /*@__PURE__*/getDefaultExportFromCjs(shellQuoteExports);
+var shellQuote2 = /*@__PURE__*/getDefaultExportFromCjs(shellQuoteExports);
 
 // eslint-disable-next-line no-warning-comments
 // TODO: Use a better method when it's added to Node.js (https://github.com/nodejs/node/pull/40240)
@@ -887,6 +887,7 @@ class YoctoSpinner {
 	#exitHandlerBound;
 	#isInteractive;
 	#lastSpinnerFrameTime = 0;
+	#isSpinning = false;
 
 	constructor(options = {}) {
 		const spinner = options.spinner ?? defaultSpinner;
@@ -908,13 +909,17 @@ class YoctoSpinner {
 			return this;
 		}
 
+		this.#isSpinning = true;
 		this.#hideCursor();
 		this.#render();
 		this.#subscribeToProcessEvents();
 
-		this.#timer = setInterval(() => {
-			this.#render();
-		}, this.#interval);
+		// Only start the timer in interactive mode
+		if (this.#isInteractive) {
+			this.#timer = setInterval(() => {
+				this.#render();
+			}, this.#interval);
+		}
 
 		return this;
 	}
@@ -924,8 +929,12 @@ class YoctoSpinner {
 			return this;
 		}
 
-		clearInterval(this.#timer);
-		this.#timer = undefined;
+		this.#isSpinning = false;
+		if (this.#timer) {
+			clearInterval(this.#timer);
+			this.#timer = undefined;
+		}
+
 		this.#showCursor();
 		this.clear();
 		this.#unsubscribeFromProcessEvents();
@@ -958,7 +967,7 @@ class YoctoSpinner {
 	}
 
 	get isSpinning() {
-		return this.#timer !== undefined;
+		return this.#isSpinning;
 	}
 
 	get text() {
@@ -1095,11 +1104,11 @@ var MastraLogger = class {
   }
   trackException(_error) {
   }
-  async getLogs(transportId, params) {
+  async listLogs(transportId, params) {
     if (!transportId || !this.transports.has(transportId)) {
       return { logs: [], total: 0, page: params?.page ?? 1, perPage: params?.perPage ?? 100, hasMore: false };
     }
-    return this.transports.get(transportId).getLogs(params) ?? {
+    return this.transports.get(transportId).listLogs(params) ?? {
       logs: [],
       total: 0,
       page: params?.page ?? 1,
@@ -1107,7 +1116,7 @@ var MastraLogger = class {
       hasMore: false
     };
   }
-  async getLogsByRunId({
+  async listLogsByRunId({
     transportId,
     runId,
     fromDate,
@@ -1120,7 +1129,7 @@ var MastraLogger = class {
     if (!transportId || !this.transports.has(transportId) || !runId) {
       return { logs: [], total: 0, page: page ?? 1, perPage: perPage ?? 100, hasMore: false };
     }
-    return this.transports.get(transportId).getLogsByRunId({ runId, fromDate, toDate, logLevel, filters, page, perPage }) ?? {
+    return this.transports.get(transportId).listLogsByRunId({ runId, fromDate, toDate, logLevel, filters, page, perPage }) ?? {
       logs: [],
       total: 0,
       page: page ?? 1,
@@ -1178,183 +1187,8 @@ var PinoLogger = class extends MastraLogger {
   }
 };
 
-function getPackageManager() {
-  const userAgent = process.env.npm_config_user_agent || "";
-  const execPath = process.env.npm_execpath || "";
-  if (userAgent.includes("yarn")) {
-    return "yarn";
-  }
-  if (userAgent.includes("pnpm")) {
-    return "pnpm";
-  }
-  if (userAgent.includes("npm")) {
-    return "npm";
-  }
-  if (execPath.includes("yarn")) {
-    return "yarn";
-  }
-  if (execPath.includes("pnpm")) {
-    return "pnpm";
-  }
-  if (execPath.includes("npm")) {
-    return "npm";
-  }
-  return "npm";
-}
-var logger = new PinoLogger({
-  name: "Mastra CLI",
-  level: "info"
-});
-var exec = util.promisify(child_process.exec);
-async function cloneTemplate(options) {
-  const { template, projectName, targetDir } = options;
-  const projectPath = targetDir ? path3.resolve(targetDir, projectName) : path3.resolve(projectName);
-  const spinner5 = yoctoSpinner({ text: `Cloning template "${template.title}"...` }).start();
-  try {
-    if (await directoryExists(projectPath)) {
-      spinner5.error(`Directory ${projectName} already exists`);
-      throw new Error(`Directory ${projectName} already exists`);
-    }
-    await cloneRepositoryWithoutGit(template.githubUrl, projectPath);
-    await updatePackageJson(projectPath, projectName);
-    const envExamplePath = path3.join(projectPath, ".env.example");
-    if (await fileExists(envExamplePath)) {
-      await fs5.copyFile(envExamplePath, path3.join(projectPath, ".env"));
-    }
-    spinner5.success(`Template "${template.title}" cloned successfully to ${projectName}`);
-    return projectPath;
-  } catch (error) {
-    spinner5.error(`Failed to clone template: ${error instanceof Error ? error.message : "Unknown error"}`);
-    throw error;
-  }
-}
-async function directoryExists(dirPath) {
-  try {
-    const stat = await fs5.stat(dirPath);
-    return stat.isDirectory();
-  } catch {
-    return false;
-  }
-}
-async function fileExists(filePath) {
-  try {
-    const stat = await fs5.stat(filePath);
-    return stat.isFile();
-  } catch {
-    return false;
-  }
-}
-async function cloneRepositoryWithoutGit(repoUrl, targetPath) {
-  await fs5.mkdir(targetPath, { recursive: true });
-  try {
-    const degitRepo = repoUrl.replace("https://github.com/", "");
-    const degitCommand = shellQuote.quote(["npx", "degit", degitRepo, targetPath]);
-    await exec(degitCommand, {
-      cwd: process.cwd()
-    });
-  } catch {
-    try {
-      const gitCommand = shellQuote.quote(["git", "clone", repoUrl, targetPath]);
-      await exec(gitCommand, {
-        cwd: process.cwd()
-      });
-      const gitDir = path3.join(targetPath, ".git");
-      if (await directoryExists(gitDir)) {
-        await fs5.rm(gitDir, { recursive: true, force: true });
-      }
-    } catch (gitError) {
-      throw new Error(`Failed to clone repository: ${gitError instanceof Error ? gitError.message : "Unknown error"}`);
-    }
-  }
-}
-async function updatePackageJson(projectPath, projectName) {
-  const packageJsonPath = path3.join(projectPath, "package.json");
-  try {
-    const packageJsonContent = await fs5.readFile(packageJsonPath, "utf-8");
-    const packageJson = JSON.parse(packageJsonContent);
-    packageJson.name = projectName;
-    await fs5.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
-  } catch (error) {
-    logger.warn(`Could not update package.json: ${error instanceof Error ? error.message : "Unknown error"}`);
-  }
-}
-async function installDependencies(projectPath, packageManager) {
-  const spinner5 = yoctoSpinner({ text: "Installing dependencies..." }).start();
-  try {
-    const pm = packageManager || getPackageManager();
-    const installCommand = shellQuote.quote([pm, "install"]);
-    await exec(installCommand, {
-      cwd: projectPath
-    });
-    spinner5.success("Dependencies installed successfully");
-  } catch (error) {
-    spinner5.error(`Failed to install dependencies: ${error instanceof Error ? error.message : "Unknown error"}`);
-    throw error;
-  }
-}
-var TEMPLATES_API_URL = process.env.MASTRA_TEMPLATES_API_URL || "https://mastra.ai/api/templates.json";
-async function loadTemplates() {
-  try {
-    const response = await fetch(TEMPLATES_API_URL);
-    if (!response.ok) {
-      throw new Error(`Failed to fetch templates: ${response.statusText}`);
-    }
-    const templates = await response.json();
-    return templates;
-  } catch (error) {
-    console.error("Error loading templates:", error);
-    throw new Error("Failed to load templates. Please check your internet connection and try again.");
-  }
-}
-function pluralize(count, singular, plural) {
-  return count === 1 ? singular : plural || `${singular}s`;
-}
-async function selectTemplate(templates) {
-  const choices = templates.map((template) => {
-    const parts = [];
-    if (template.agents?.length) {
-      parts.push(`${template.agents.length} ${pluralize(template.agents.length, "agent")}`);
-    }
-    if (template.tools?.length) {
-      parts.push(`${template.tools.length} ${pluralize(template.tools.length, "tool")}`);
-    }
-    if (template.workflows?.length) {
-      parts.push(`${template.workflows.length} ${pluralize(template.workflows.length, "workflow")}`);
-    }
-    if (template.mcp?.length) {
-      parts.push(`${template.mcp.length} ${pluralize(template.mcp.length, "MCP server")}`);
-    }
-    if (template.networks?.length) {
-      parts.push(`${template.networks.length} ${pluralize(template.networks.length, "agent network")}`);
-    }
-    return {
-      value: template,
-      label: template.title,
-      hint: parts.join(", ") || "Template components"
-    };
-  });
-  const selected = await ve({
-    message: "Select a template:",
-    options: choices
-  });
-  if (pD(selected)) {
-    return null;
-  }
-  return selected;
-}
-function findTemplateByName(templates, templateName) {
-  let template = templates.find((t) => t.slug === templateName);
-  if (template) return template;
-  const slugWithPrefix = `template-${templateName}`;
-  template = templates.find((t) => t.slug === slugWithPrefix);
-  if (template) return template;
-  template = templates.find((t) => t.title.toLowerCase() === templateName.toLowerCase());
-  if (template) return template;
-  return null;
-}
-function getDefaultProjectName(template) {
-  return template.slug.replace(/^template-/, "");
-}
+var package_default = {
+  version: "1.0.0-beta.4"};
 function getPackageManagerAddCommand(pm) {
   switch (pm) {
     case "npm":
@@ -1377,7 +1211,7 @@ var DepsService = class {
   findLockFile(dir) {
     const lockFiles = ["pnpm-lock.yaml", "package-lock.json", "yarn.lock", "bun.lock"];
     for (const file of lockFiles) {
-      if (fs4__default__default.existsSync(path3.join(dir, file))) {
+      if (fs3__default__default.existsSync(path3.join(dir, file))) {
         return file;
       }
     }
@@ -1416,11 +1250,11 @@ var DepsService = class {
     try {
       const packageJsonPath = path3.join(process.cwd(), "package.json");
       try {
-        await fs5.access(packageJsonPath);
+        await fs4.access(packageJsonPath);
       } catch {
         return "No package.json file found in the current directory";
       }
-      const packageJson = JSON.parse(await fs5.readFile(packageJsonPath, "utf-8"));
+      const packageJson = JSON.parse(await fs4.readFile(packageJsonPath, "utf-8"));
       for (const dependency of dependencies) {
         if (!packageJson.dependencies || !packageJson.dependencies[dependency]) {
           return `Please install ${dependency} before running this command (${this.packageManager} install ${dependency})`;
@@ -1435,7 +1269,7 @@ var DepsService = class {
   async getProjectName() {
     try {
       const packageJsonPath = path3.join(process.cwd(), "package.json");
-      const packageJson = await fs5.readFile(packageJsonPath, "utf-8");
+      const packageJson = await fs4.readFile(packageJsonPath, "utf-8");
       const pkg = JSON.parse(packageJson);
       return pkg.name;
     } catch (err) {
@@ -1443,126 +1277,14 @@ var DepsService = class {
     }
   }
   async addScriptsToPackageJson(scripts) {
-    const packageJson = JSON.parse(await fs5.readFile("package.json", "utf-8"));
+    const packageJson = JSON.parse(await fs4.readFile("package.json", "utf-8"));
     packageJson.scripts = {
       ...packageJson.scripts,
       ...scripts
     };
-    await fs5.writeFile("package.json", JSON.stringify(packageJson, null, 2));
-  }
-};
-var args = ["-y", "@mastra/mcp-docs-server"];
-var createMcpConfig = (editor) => {
-  if (editor === "vscode") {
-    return {
-      servers: {
-        mastra: process.platform === `win32` ? {
-          command: "cmd",
-          args: ["/c", "npx", ...args],
-          type: "stdio"
-        } : {
-          command: "npx",
-          args,
-          type: "stdio"
-        }
-      }
-    };
+    await fs4.writeFile("package.json", JSON.stringify(packageJson, null, 2));
   }
-  return {
-    mcpServers: {
-      mastra: {
-        command: "npx",
-        args
-      }
-    }
-  };
 };
-function makeConfig(original, editor) {
-  if (editor === "vscode") {
-    return {
-      ...original,
-      servers: {
-        ...original?.servers || {},
-        ...createMcpConfig(editor).servers
-      }
-    };
-  }
-  return {
-    ...original,
-    mcpServers: {
-      ...original?.mcpServers || {},
-      ...createMcpConfig(editor).mcpServers
-    }
-  };
-}
-async function writeMergedConfig(configPath, editor) {
-  const configExists = existsSync(configPath);
-  const config = makeConfig(configExists ? await readJSON(configPath) : {}, editor);
-  await ensureFile(configPath);
-  await writeJSON(configPath, config, {
-    spaces: 2
-  });
-}
-var windsurfGlobalMCPConfigPath = path3.join(os.homedir(), ".codeium", "windsurf", "mcp_config.json");
-var cursorGlobalMCPConfigPath = path3.join(os.homedir(), ".cursor", "mcp.json");
-path3.join(process.cwd(), ".vscode", "mcp.json");
-var vscodeGlobalMCPConfigPath = path3.join(
-  os.homedir(),
-  process.platform === "win32" ? path3.join("AppData", "Roaming", "Code", "User", "settings.json") : process.platform === "darwin" ? path3.join("Library", "Application Support", "Code", "User", "settings.json") : path3.join(".config", "Code", "User", "settings.json")
-);
-async function installMastraDocsMCPServer({ editor, directory }) {
-  if (editor === `cursor`) {
-    await writeMergedConfig(path3.join(directory, ".cursor", "mcp.json"), "cursor");
-  }
-  if (editor === `vscode`) {
-    await writeMergedConfig(path3.join(directory, ".vscode", "mcp.json"), "vscode");
-  }
-  if (editor === `cursor-global`) {
-    const alreadyInstalled = await globalMCPIsAlreadyInstalled(editor);
-    if (alreadyInstalled) {
-      return;
-    }
-    await writeMergedConfig(cursorGlobalMCPConfigPath, "cursor-global");
-  }
-  if (editor === `windsurf`) {
-    const alreadyInstalled = await globalMCPIsAlreadyInstalled(editor);
-    if (alreadyInstalled) {
-      return;
-    }
-    await writeMergedConfig(windsurfGlobalMCPConfigPath, editor);
-  }
-}
-async function globalMCPIsAlreadyInstalled(editor) {
-  let configPath = ``;
-  if (editor === "windsurf") {
-    configPath = windsurfGlobalMCPConfigPath;
-  } else if (editor === "cursor-global") {
-    configPath = cursorGlobalMCPConfigPath;
-  } else if (editor === "vscode") {
-    configPath = vscodeGlobalMCPConfigPath;
-  }
-  if (!configPath || !existsSync(configPath)) {
-    return false;
-  }
-  try {
-    const configContents = await readJSON(configPath);
-    if (!configContents) return false;
-    if (editor === "vscode") {
-      if (!configContents.servers) return false;
-      const hasMastraMCP2 = Object.values(configContents.servers).some(
-        (server) => server?.args?.find((arg) => arg?.includes(`@mastra/mcp-docs-server`))
-      );
-      return hasMastraMCP2;
-    }
-    if (!configContents?.mcpServers) return false;
-    const hasMastraMCP = Object.values(configContents.mcpServers).some(
-      (server) => server?.args?.find((arg) => arg?.includes(`@mastra/mcp-docs-server`))
-    );
-    return hasMastraMCP;
-  } catch {
-    return false;
-  }
-}
 var EnvService = class {
 };
 var FileEnvService = class extends EnvService {
@@ -1573,7 +1295,7 @@ var FileEnvService = class extends EnvService {
   }
   readFile(filePath) {
     return new Promise((resolve, reject) => {
-      fs4__default.readFile(filePath, "utf8", (err, data) => {
+      fs3__default.readFile(filePath, "utf8", (err, data) => {
         if (err) reject(err);
         else resolve(data);
       });
@@ -1581,7 +1303,7 @@ var FileEnvService = class extends EnvService {
   }
   writeFile({ filePath, data }) {
     return new Promise((resolve, reject) => {
-      fs4__default.writeFile(filePath, data, "utf8", (err) => {
+      fs3__default.writeFile(filePath, data, "utf8", (err) => {
         if (err) reject(err);
         else resolve();
       });
@@ -1636,8 +1358,8 @@ var FileService = class {
     const __filename = fileURLToPath(import.meta.url);
     const __dirname = path3.dirname(__filename);
     const filePath = path3.resolve(__dirname, "starter-files", inputFile);
-    const fileString = fs4__default__default.readFileSync(filePath, "utf8");
-    if (fs4__default__default.existsSync(outputFilePath) && !replaceIfExists) {
+    const fileString = fs3__default__default.readFileSync(filePath, "utf8");
+    if (fs3__default__default.existsSync(outputFilePath) && !replaceIfExists) {
       console.info(`${outputFilePath} already exists`);
       return false;
     }
@@ -1652,7 +1374,7 @@ var FileService = class {
   }
   getFirstExistingFile(files) {
     for (const f of files) {
-      if (fs4__default__default.existsSync(f)) {
+      if (fs3__default__default.existsSync(f)) {
         return f;
       }
     }
@@ -1662,30 +1384,151 @@ var FileService = class {
     filePath,
     replacements
   }) {
-    let fileContent = fs4__default__default.readFileSync(filePath, "utf8");
+    let fileContent = fs3__default__default.readFileSync(filePath, "utf8");
     replacements.forEach(({ search, replace }) => {
       fileContent = fileContent.replaceAll(search, replace);
     });
-    fs4__default__default.writeFileSync(filePath, fileContent);
+    fs3__default__default.writeFileSync(filePath, fileContent);
   }
 };
-var exec2 = util.promisify(child_process.exec);
+var createArgs = (versionTag) => {
+  const packageName = versionTag ? `@mastra/mcp-docs-server@${versionTag}` : "@mastra/mcp-docs-server";
+  return ["-y", packageName];
+};
+var createMcpConfig = (editor, versionTag) => {
+  const args = createArgs(versionTag);
+  if (editor === "vscode") {
+    return {
+      servers: {
+        mastra: process.platform === `win32` ? {
+          command: "cmd",
+          args: ["/c", "npx", ...args],
+          type: "stdio"
+        } : {
+          command: "npx",
+          args,
+          type: "stdio"
+        }
+      }
+    };
+  }
+  return {
+    mcpServers: {
+      mastra: {
+        command: "npx",
+        args
+      }
+    }
+  };
+};
+function makeConfig(original, editor, versionTag) {
+  if (editor === "vscode") {
+    return {
+      ...original,
+      servers: {
+        ...original?.servers || {},
+        ...createMcpConfig(editor, versionTag).servers
+      }
+    };
+  }
+  return {
+    ...original,
+    mcpServers: {
+      ...original?.mcpServers || {},
+      ...createMcpConfig(editor, versionTag).mcpServers
+    }
+  };
+}
+async function writeMergedConfig(configPath, editor, versionTag) {
+  const configExists = existsSync(configPath);
+  const config = makeConfig(configExists ? await readJSON(configPath) : {}, editor, versionTag);
+  await ensureFile(configPath);
+  await writeJSON(configPath, config, {
+    spaces: 2
+  });
+}
+var windsurfGlobalMCPConfigPath = path3.join(os.homedir(), ".codeium", "windsurf", "mcp_config.json");
+var cursorGlobalMCPConfigPath = path3.join(os.homedir(), ".cursor", "mcp.json");
+path3.join(process.cwd(), ".vscode", "mcp.json");
+var vscodeGlobalMCPConfigPath = path3.join(
+  os.homedir(),
+  process.platform === "win32" ? path3.join("AppData", "Roaming", "Code", "User", "settings.json") : process.platform === "darwin" ? path3.join("Library", "Application Support", "Code", "User", "settings.json") : path3.join(".config", "Code", "User", "settings.json")
+);
+async function installMastraDocsMCPServer({
+  editor,
+  directory,
+  versionTag
+}) {
+  if (editor === `cursor`) {
+    await writeMergedConfig(path3.join(directory, ".cursor", "mcp.json"), "cursor", versionTag);
+  }
+  if (editor === `vscode`) {
+    await writeMergedConfig(path3.join(directory, ".vscode", "mcp.json"), "vscode", versionTag);
+  }
+  if (editor === `cursor-global`) {
+    const alreadyInstalled = await globalMCPIsAlreadyInstalled(editor, versionTag);
+    if (alreadyInstalled) {
+      return;
+    }
+    await writeMergedConfig(cursorGlobalMCPConfigPath, "cursor-global", versionTag);
+  }
+  if (editor === `windsurf`) {
+    const alreadyInstalled = await globalMCPIsAlreadyInstalled(editor, versionTag);
+    if (alreadyInstalled) {
+      return;
+    }
+    await writeMergedConfig(windsurfGlobalMCPConfigPath, editor, versionTag);
+  }
+}
+async function globalMCPIsAlreadyInstalled(editor, versionTag) {
+  let configPath = ``;
+  if (editor === "windsurf") {
+    configPath = windsurfGlobalMCPConfigPath;
+  } else if (editor === "cursor-global") {
+    configPath = cursorGlobalMCPConfigPath;
+  } else if (editor === "vscode") {
+    configPath = vscodeGlobalMCPConfigPath;
+  }
+  if (!configPath || !existsSync(configPath)) {
+    return false;
+  }
+  try {
+    const configContents = await readJSON(configPath);
+    if (!configContents) return false;
+    const expectedPackage = versionTag ? `@mastra/mcp-docs-server@${versionTag}` : "@mastra/mcp-docs-server";
+    if (editor === "vscode") {
+      if (!configContents.servers) return false;
+      const hasMastraMCP2 = Object.values(configContents.servers).some(
+        (server) => server?.args?.find((arg) => arg === expectedPackage)
+      );
+      return hasMastraMCP2;
+    }
+    if (!configContents?.mcpServers) return false;
+    const hasMastraMCP = Object.values(configContents.mcpServers).some(
+      (server) => server?.args?.find((arg) => arg === expectedPackage)
+    );
+    return hasMastraMCP;
+  } catch {
+    return false;
+  }
+}
+var exec = util.promisify(child_process.exec);
 var getModelIdentifier = (llmProvider) => {
-  if (llmProvider === "openai") {
-    return `'openai/gpt-4o-mini'`;
-  } else if (llmProvider === "anthropic") {
-    return `'anthropic/claude-3-5-sonnet-20241022'`;
+  let model = "openai/gpt-4o";
+  if (llmProvider === "anthropic") {
+    model = "anthropic/claude-sonnet-4-5";
   } else if (llmProvider === "groq") {
-    return `'groq/llama-3.3-70b-versatile'`;
+    model = "groq/llama-3.3-70b-versatile";
   } else if (llmProvider === "google") {
-    return `'google/gemini-2.5-pro'`;
+    model = "google/gemini-2.5-pro";
   } else if (llmProvider === "cerebras") {
-    return `'cerebras/llama-3.3-70b'`;
+    model = "cerebras/llama-3.3-70b";
   } else if (llmProvider === "mistral") {
-    return `'mistral/mistral-medium-2508'`;
+    model = "mistral/mistral-medium-2508";
   }
+  return model;
 };
-async function writeAgentSample(llmProvider, destPath, addExampleTool) {
+async function writeAgentSample(llmProvider, destPath, addExampleTool, addScorers) {
   const modelString = getModelIdentifier(llmProvider);
   const instructions = `
       You are a helpful weather assistant that provides accurate weather information and can help planning activities based on the weather.
@@ -1706,14 +1549,40 @@ import { Agent } from '@mastra/core/agent';
 import { Memory } from '@mastra/memory';
 import { LibSQLStore } from '@mastra/libsql';
 ${addExampleTool ? `import { weatherTool } from '../tools/weather-tool';` : ""}
+${addScorers ? `import { scorers } from '../scorers/weather-scorer';` : ""}
 
 export const weatherAgent = new Agent({
+  id: 'weather-agent',
   name: 'Weather Agent',
   instructions: \`${instructions}\`,
-  model: ${modelString},
+  model: '${modelString}',
   ${addExampleTool ? "tools: { weatherTool }," : ""}
+  ${addScorers ? `scorers: {
+    toolCallAppropriateness: {
+      scorer: scorers.toolCallAppropriatenessScorer,
+      sampling: {
+        type: 'ratio',
+        rate: 1,
+      },
+    },
+    completeness: {
+      scorer: scorers.completenessScorer,
+      sampling: {
+        type: 'ratio',
+        rate: 1,
+      },
+    },
+    translation: {
+      scorer: scorers.translationScorer,
+      sampling: {
+        type: 'ratio',
+        rate: 1,
+      },
+    },
+  },` : ""}
   memory: new Memory({
     storage: new LibSQLStore({
+      id: "memory-storage",
       url: "file:../mastra.db", // path is relative to the .mastra/output directory
     })
   })
@@ -1723,8 +1592,8 @@ export const weatherAgent = new Agent({
     parser: "typescript",
     singleQuote: true
   });
-  await fs5.writeFile(destPath, "");
-  await fs5.writeFile(destPath, formattedContent);
+  await fs4.writeFile(destPath, "");
+  await fs4.writeFile(destPath, formattedContent);
 }
 async function writeWorkflowSample(destPath) {
   const content = `import { createStep, createWorkflow } from '@mastra/core/workflows';
@@ -1917,20 +1786,115 @@ export { weatherWorkflow };`;
     semi: true,
     singleQuote: true
   });
-  await fs5.writeFile(destPath, formattedContent);
+  await fs4.writeFile(destPath, formattedContent);
 }
 async function writeToolSample(destPath) {
   const fileService = new FileService();
   await fileService.copyStarterFile("tools.ts", destPath);
 }
+async function writeScorersSample(llmProvider, destPath) {
+  const modelString = getModelIdentifier(llmProvider);
+  const content = `import { z } from 'zod';
+import { createToolCallAccuracyScorerCode } from '@mastra/evals/scorers/prebuilt';
+import { createCompletenessScorer } from '@mastra/evals/scorers/prebuilt';
+import { getAssistantMessageFromRunOutput, getUserMessageFromRunInput } from '@mastra/evals/scorers/utils';
+import { createScorer } from '@mastra/core/evals';
+
+export const toolCallAppropriatenessScorer = createToolCallAccuracyScorerCode({
+  expectedTool: 'weatherTool',
+  strictMode: false,
+});
+
+export const completenessScorer = createCompletenessScorer();
+
+// Custom LLM-judged scorer: evaluates if non-English locations are translated appropriately
+export const translationScorer = createScorer({
+  id: 'translation-quality-scorer',
+  name: 'Translation Quality',
+  description: 'Checks that non-English location names are translated and used correctly',
+  type: 'agent',
+  judge: {
+    model: '${modelString}',
+    instructions:
+      'You are an expert evaluator of translation quality for geographic locations. ' +
+      'Determine whether the user text mentions a non-English location and whether the assistant correctly uses an English translation of that location. ' +
+      'Be lenient with transliteration differences and diacritics. ' +
+      'Return only the structured JSON matching the provided schema.',
+  },
+})
+  .preprocess(({ run }) => {
+    const userText = getUserMessageFromRunInput(run.input) || '';
+    const assistantText = getAssistantMessageFromRunOutput(run.output) || '';
+    return { userText, assistantText };
+  })
+  .analyze({
+    description: 'Extract location names and detect language/translation adequacy',
+    outputSchema: z.object({
+      nonEnglish: z.boolean(),
+      translated: z.boolean(),
+      confidence: z.number().min(0).max(1).default(1),
+      explanation: z.string().default(''),
+    }),
+    createPrompt: ({ results }) => \`
+            You are evaluating if a weather assistant correctly handled translation of a non-English location.
+            User text:
+            """
+            \${results.preprocessStepResult.userText}
+            """
+            Assistant response:
+            """
+            \${results.preprocessStepResult.assistantText}
+            """
+            Tasks:
+            1) Identify if the user mentioned a location that appears non-English.
+            2) If non-English, check whether the assistant used a correct English translation of that location in its response.
+            3) Be lenient with transliteration differences (e.g., accents/diacritics).
+            Return JSON with fields:
+            {
+            "nonEnglish": boolean,
+            "translated": boolean,
+            "confidence": number, // 0-1
+            "explanation": string
+            }
+        \`,
+  })
+  .generateScore(({ results }) => {
+    const r = (results as any)?.analyzeStepResult || {};
+    if (!r.nonEnglish) return 1; // If not applicable, full credit
+    if (r.translated) return Math.max(0, Math.min(1, 0.7 + 0.3 * (r.confidence ?? 1)));
+    return 0; // Non-English but not translated
+  })
+  .generateReason(({ results, score }) => {
+    const r = (results as any)?.analyzeStepResult || {};
+    return \`Translation scoring: nonEnglish=\${r.nonEnglish ?? false}, translated=\${r.translated ?? false}, confidence=\${r.confidence ?? 0}. Score=\${score}. \${r.explanation ?? ''}\`;
+  });
+
+export const scorers = {
+  toolCallAppropriatenessScorer,
+  completenessScorer,
+  translationScorer,
+};`;
+  const formattedContent = await prettier.format(content, {
+    parser: "typescript",
+    singleQuote: true
+  });
+  await fs4.writeFile(destPath, formattedContent);
+}
 async function writeCodeSampleForComponents(llmprovider, component, destPath, importComponents) {
   switch (component) {
     case "agents":
-      return writeAgentSample(llmprovider, destPath, importComponents.includes("tools"));
+      return writeAgentSample(
+        llmprovider,
+        destPath,
+        importComponents.includes("tools"),
+        importComponents.includes("scorers")
+      );
     case "tools":
       return writeToolSample(destPath);
     case "workflows":
       return writeWorkflowSample(destPath);
+    case "scorers":
+      return writeScorersSample(llmprovider, destPath);
     default:
       return "";
   }
@@ -1943,39 +1907,44 @@ var writeIndexFile = async ({
   dirPath,
   addAgent,
   addExample,
-  addWorkflow
+  addWorkflow,
+  addScorers
 }) => {
   const indexPath = dirPath + "/index.ts";
   const destPath = path3.join(indexPath);
   try {
-    await fs5.writeFile(destPath, "");
+    await fs4.writeFile(destPath, "");
     const filteredExports = [
       addWorkflow ? `workflows: { weatherWorkflow },` : "",
-      addAgent ? `agents: { weatherAgent },` : ""
+      addAgent ? `agents: { weatherAgent },` : "",
+      addScorers ? `scorers: { toolCallAppropriatenessScorer, completenessScorer, translationScorer },` : ""
     ].filter(Boolean);
     if (!addExample) {
-      await fs5.writeFile(
+      await fs4.writeFile(
         destPath,
         `
-import { Mastra } from '@mastra/core';
+import { Mastra } from '@mastra/core/mastra';
 
 export const mastra = new Mastra()
         `
       );
       return;
     }
-    await fs5.writeFile(
+    await fs4.writeFile(
       destPath,
       `
 import { Mastra } from '@mastra/core/mastra';
 import { PinoLogger } from '@mastra/loggers';
 import { LibSQLStore } from '@mastra/libsql';
+import { Observability } from '@mastra/observability';
 ${addWorkflow ? `import { weatherWorkflow } from './workflows/weather-workflow';` : ""}
 ${addAgent ? `import { weatherAgent } from './agents/weather-agent';` : ""}
+${addScorers ? `import { toolCallAppropriatenessScorer, completenessScorer, translationScorer } from './scorers/weather-scorer';` : ""}
 
 export const mastra = new Mastra({
   ${filteredExports.join("\n  ")}
   storage: new LibSQLStore({
+    id: "mastra-storage",
     // stores observability, scores, ... into memory storage, if it needs to persist, change to file:../mastra.db
     url: ":memory:",
   }),
@@ -1983,14 +1952,10 @@ export const mastra = new Mastra({
     name: 'Mastra',
     level: 'info',
   }),
-  telemetry: {
-    // Telemetry is deprecated and will be removed in the Nov 4th release
-    enabled: false, 
-  },
-  observability: {
-    // Enables DefaultExporter and CloudExporter for AI tracing
-    default: { enabled: true }, 
-  },
+  observability: new Observability({
+    // Enables DefaultExporter and CloudExporter for tracing
+    default: { enabled: true },
+    }),
 });
 `
     );
@@ -1998,7 +1963,6 @@ export const mastra = new Mastra({
     throw err;
   }
 };
-yoctoSpinner({ text: "Installing Mastra core dependencies\n" });
 var getAPIKey = async (provider) => {
   let key = "OPENAI_API_KEY";
   switch (provider) {
@@ -2024,15 +1988,15 @@ var getAPIKey = async (provider) => {
 var writeAPIKey = async ({ provider, apiKey }) => {
   const envFileName = apiKey ? ".env" : ".env.example";
   const key = await getAPIKey(provider);
-  const escapedKey = shellQuote.quote([key]);
-  const escapedApiKey = shellQuote.quote([apiKey ? apiKey : "your-api-key"]);
-  await exec2(`echo ${escapedKey}=${escapedApiKey} >> ${envFileName}`);
+  const escapedKey = shellQuote2.quote([key]);
+  const escapedApiKey = shellQuote2.quote([apiKey ? apiKey : "your-api-key"]);
+  await exec(`echo ${escapedKey}=${escapedApiKey} >> ${envFileName}`);
 };
 var createMastraDir = async (directory) => {
   let dir = directory.trim().split("/").filter((item) => item !== "");
   const dirPath = path3.join(process.cwd(), ...dir, "mastra");
   try {
-    await fs5.access(dirPath);
+    await fs4.access(dirPath);
     return { ok: false };
   } catch {
     await fsExtra.ensureDir(dirPath);
@@ -2055,8 +2019,8 @@ var LLM_PROVIDERS = [
   { value: "cerebras", label: "Cerebras" },
   { value: "mistral", label: "Mistral" }
 ];
-var interactivePrompt = async (args2 = {}) => {
-  const { skip = {}, options: { showBanner = true } = {} } = args2;
+var interactivePrompt = async (args = {}) => {
+  const { skip = {}, options: { showBanner = true } = {} } = args;
   if (showBanner) {
     Ie(color2.inverse(" Mastra Init "));
   }
@@ -2094,46 +2058,29 @@ var interactivePrompt = async (args2 = {}) => {
         return void 0;
       },
       configureEditorWithDocsMCP: async () => {
-        const windsurfIsAlreadyInstalled = await globalMCPIsAlreadyInstalled(`windsurf`);
-        const cursorIsAlreadyInstalled = await globalMCPIsAlreadyInstalled(`cursor`);
-        const vscodeIsAlreadyInstalled = await globalMCPIsAlreadyInstalled(`vscode`);
         const editor = await ve({
           message: `Make your IDE into a Mastra expert? (Installs Mastra's MCP server)`,
           options: [
             { value: "skip", label: "Skip for now", hint: "default" },
             {
               value: "cursor",
-              label: "Cursor (project only)",
-              hint: cursorIsAlreadyInstalled ? `Already installed globally` : void 0
+              label: "Cursor (project only)"
             },
             {
               value: "cursor-global",
-              label: "Cursor (global, all projects)",
-              hint: cursorIsAlreadyInstalled ? `Already installed` : void 0
+              label: "Cursor (global, all projects)"
             },
             {
               value: "windsurf",
-              label: "Windsurf",
-              hint: windsurfIsAlreadyInstalled ? `Already installed` : void 0
+              label: "Windsurf"
             },
             {
               value: "vscode",
-              label: "VSCode",
-              hint: vscodeIsAlreadyInstalled ? `Already installed` : void 0
+              label: "VSCode"
             }
           ]
         });
         if (editor === `skip`) return void 0;
-        if (editor === `windsurf` && windsurfIsAlreadyInstalled) {
-          M.message(`
-Windsurf is already installed, skipping.`);
-          return void 0;
-        }
-        if (editor === `vscode` && vscodeIsAlreadyInstalled) {
-          M.message(`
-VSCode is already installed, skipping.`);
-          return void 0;
-        }
         if (editor === `cursor`) {
           M.message(
             `
@@ -2142,19 +2089,19 @@ Note: you will need to go into Cursor Settings -> MCP Settings and manually enab
           );
         }
         if (editor === `cursor-global`) {
-          const confirm2 = await ve({
+          const confirm = await ve({
             message: `Global install will add/update ${cursorGlobalMCPConfigPath} and make the Mastra docs MCP server available in all your Cursor projects. Continue?`,
             options: [
               { value: "yes", label: "Yes, I understand" },
               { value: "skip", label: "No, skip for now" }
             ]
           });
-          if (confirm2 !== `yes`) {
+          if (confirm !== `yes`) {
             return void 0;
           }
         }
         if (editor === `windsurf`) {
-          const confirm2 = await ve({
+          const confirm = await ve({
             message: `Windsurf only supports a global MCP config (at ${windsurfGlobalMCPConfigPath}) is it ok to add/update that global config?
 This means the Mastra docs MCP server will be available in all your Windsurf projects.`,
             options: [
@@ -2162,7 +2109,7 @@ This means the Mastra docs MCP server will be available in all your Windsurf pro
               { value: "skip", label: "No, skip for now" }
             ]
           });
-          if (confirm2 !== `yes`) {
+          if (confirm !== `yes`) {
             return void 0;
           }
         }
@@ -2178,16 +2125,230 @@ This means the Mastra docs MCP server will be available in all your Windsurf pro
   );
   return mastraProject;
 };
+function getPackageManager() {
+  const userAgent = process.env.npm_config_user_agent || "";
+  const execPath = process.env.npm_execpath || "";
+  if (userAgent.includes("bun")) {
+    return "bun";
+  }
+  if (userAgent.includes("yarn")) {
+    return "yarn";
+  }
+  if (userAgent.includes("pnpm")) {
+    return "pnpm";
+  }
+  if (userAgent.includes("npm")) {
+    return "npm";
+  }
+  if (execPath.includes("bun")) {
+    return "bun";
+  }
+  if (execPath.includes("yarn")) {
+    return "yarn";
+  }
+  if (execPath.includes("pnpm")) {
+    return "pnpm";
+  }
+  if (execPath.includes("npm")) {
+    return "npm";
+  }
+  return "npm";
+}
+var logger = createLogger(false);
+function createLogger(debug = false) {
+  return new PinoLogger({
+    name: "Mastra CLI",
+    level: debug ? "debug" : "info"
+  });
+}
+var exec2 = util.promisify(child_process.exec);
+async function cloneTemplate(options) {
+  const { template, projectName, targetDir, branch, llmProvider } = options;
+  const projectPath = targetDir ? path3.resolve(targetDir, projectName) : path3.resolve(projectName);
+  const spinner4 = yoctoSpinner({ text: `Cloning template "${template.title}"...` }).start();
+  try {
+    if (await directoryExists(projectPath)) {
+      spinner4.error(`Directory ${projectName} already exists`);
+      throw new Error(`Directory ${projectName} already exists`);
+    }
+    await cloneRepositoryWithoutGit(template.githubUrl, projectPath, branch);
+    await updatePackageJson(projectPath, projectName);
+    const envExamplePath = path3.join(projectPath, ".env.example");
+    if (await fileExists(envExamplePath)) {
+      const envPath = path3.join(projectPath, ".env");
+      await fs4.copyFile(envExamplePath, envPath);
+      if (llmProvider) {
+        await updateEnvFile(envPath, llmProvider);
+      }
+    }
+    spinner4.success(`Template "${template.title}" cloned successfully to ${projectName}`);
+    return projectPath;
+  } catch (error) {
+    spinner4.error(`Failed to clone template: ${error instanceof Error ? error.message : "Unknown error"}`);
+    throw error;
+  }
+}
+async function directoryExists(dirPath) {
+  try {
+    const stat = await fs4.stat(dirPath);
+    return stat.isDirectory();
+  } catch {
+    return false;
+  }
+}
+async function fileExists(filePath) {
+  try {
+    const stat = await fs4.stat(filePath);
+    return stat.isFile();
+  } catch {
+    return false;
+  }
+}
+async function cloneRepositoryWithoutGit(repoUrl, targetPath, branch) {
+  await fs4.mkdir(targetPath, { recursive: true });
+  try {
+    const degitRepo = repoUrl.replace("https://github.com/", "");
+    const degitRepoWithBranch = branch ? `${degitRepo}#${branch}` : degitRepo;
+    const degitCommand = shellQuote2.quote(["npx", "degit", degitRepoWithBranch, targetPath]);
+    await exec2(degitCommand, {
+      cwd: process.cwd()
+    });
+  } catch {
+    try {
+      const gitArgs = ["git", "clone"];
+      if (branch) {
+        gitArgs.push("--branch", branch);
+      }
+      gitArgs.push(repoUrl, targetPath);
+      const gitCommand = shellQuote2.quote(gitArgs);
+      await exec2(gitCommand, {
+        cwd: process.cwd()
+      });
+      const gitDir = path3.join(targetPath, ".git");
+      if (await directoryExists(gitDir)) {
+        await fs4.rm(gitDir, { recursive: true, force: true });
+      }
+    } catch (gitError) {
+      throw new Error(`Failed to clone repository: ${gitError instanceof Error ? gitError.message : "Unknown error"}`);
+    }
+  }
+}
+async function updatePackageJson(projectPath, projectName) {
+  const packageJsonPath = path3.join(projectPath, "package.json");
+  try {
+    const packageJsonContent = await fs4.readFile(packageJsonPath, "utf-8");
+    const packageJson = JSON.parse(packageJsonContent);
+    packageJson.name = projectName;
+    await fs4.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2), "utf-8");
+  } catch (error) {
+    logger.warn(`Could not update package.json: ${error instanceof Error ? error.message : "Unknown error"}`);
+  }
+}
+async function updateEnvFile(envPath, llmProvider) {
+  try {
+    const envContent = await fs4.readFile(envPath, "utf-8");
+    const modelString = getModelIdentifier(llmProvider);
+    if (!modelString) {
+      logger.warn(`Could not get model identifier for provider: ${llmProvider}`);
+      return;
+    }
+    const modelValue = modelString.replace(/'/g, "");
+    const updatedContent = envContent.replace(/^MODEL=.*/m, `MODEL=${modelValue}`);
+    await fs4.writeFile(envPath, updatedContent, "utf-8");
+    logger.info(`Updated MODEL in .env to ${modelValue}`);
+  } catch (error) {
+    logger.warn(`Could not update .env file: ${error instanceof Error ? error.message : "Unknown error"}`);
+  }
+}
+async function installDependencies(projectPath, packageManager) {
+  const spinner4 = yoctoSpinner({ text: "Installing dependencies..." }).start();
+  try {
+    const pm = packageManager || getPackageManager();
+    const installCommand = shellQuote2.quote([pm, "install"]);
+    await exec2(installCommand, {
+      cwd: projectPath
+    });
+    spinner4.success("Dependencies installed successfully");
+  } catch (error) {
+    spinner4.error(`Failed to install dependencies: ${error instanceof Error ? error.message : "Unknown error"}`);
+    throw error;
+  }
+}
+var TEMPLATES_API_URL = process.env.MASTRA_TEMPLATES_API_URL || "https://mastra.ai/api/templates.json";
+async function loadTemplates() {
+  try {
+    const response = await fetch(TEMPLATES_API_URL);
+    if (!response.ok) {
+      throw new Error(`Failed to fetch templates: ${response.statusText}`);
+    }
+    const templates = await response.json();
+    return templates;
+  } catch (error) {
+    console.error("Error loading templates:", error);
+    throw new Error("Failed to load templates. Please check your internet connection and try again.");
+  }
+}
+function pluralize(count, singular, plural) {
+  return count === 1 ? singular : plural || `${singular}s`;
+}
+async function selectTemplate(templates) {
+  const choices = templates.map((template) => {
+    const parts = [];
+    if (template.agents?.length) {
+      parts.push(`${template.agents.length} ${pluralize(template.agents.length, "agent")}`);
+    }
+    if (template.tools?.length) {
+      parts.push(`${template.tools.length} ${pluralize(template.tools.length, "tool")}`);
+    }
+    if (template.workflows?.length) {
+      parts.push(`${template.workflows.length} ${pluralize(template.workflows.length, "workflow")}`);
+    }
+    if (template.mcp?.length) {
+      parts.push(`${template.mcp.length} ${pluralize(template.mcp.length, "MCP server")}`);
+    }
+    if (template.networks?.length) {
+      parts.push(`${template.networks.length} ${pluralize(template.networks.length, "agent network")}`);
+    }
+    return {
+      value: template,
+      label: template.title,
+      hint: parts.join(", ") || "Template components"
+    };
+  });
+  const selected = await ve({
+    message: "Select a template:",
+    options: choices
+  });
+  if (pD(selected)) {
+    return null;
+  }
+  return selected;
+}
+function findTemplateByName(templates, templateName) {
+  let template = templates.find((t) => t.slug === templateName);
+  if (template) return template;
+  const slugWithPrefix = `template-${templateName}`;
+  template = templates.find((t) => t.slug === slugWithPrefix);
+  if (template) return template;
+  template = templates.find((t) => t.title.toLowerCase() === templateName.toLowerCase());
+  if (template) return template;
+  return null;
+}
+function getDefaultProjectName(template) {
+  return template.slug.replace(/^template-/, "");
+}
 var s = Y();
 var init = async ({
-  directory,
-  addExample = false,
+  directory = "src/",
   components,
   llmProvider = "openai",
   llmApiKey,
-  configureEditorWithDocsMCP
+  addExample = false,
+  configureEditorWithDocsMCP,
+  versionTag
 }) => {
   s.start("Initializing Mastra");
+  const packageVersionTag = versionTag ? `@${versionTag}` : "";
   try {
     const result = await createMastraDir(directory);
     if (!result.ok) {
@@ -2200,7 +2361,8 @@ var init = async ({
         dirPath,
         addExample,
         addWorkflow: components.includes("workflows"),
-        addAgent: components.includes("agents")
+        addAgent: components.includes("agents"),
+        addScorers: components.includes("scorers")
       }),
       ...components.map((component) => createComponentsDir(dirPath, component)),
       writeAPIKey({ provider: llmProvider, apiKey: llmApiKey })
@@ -2214,22 +2376,31 @@ var init = async ({
       const depService = new DepsService();
       const needsLibsql = await depService.checkDependencies(["@mastra/libsql"]) !== `ok`;
       if (needsLibsql) {
-        await depService.installPackages(["@mastra/libsql"]);
+        await depService.installPackages([`@mastra/libsql${packageVersionTag}`]);
       }
       const needsMemory = components.includes(`agents`) && await depService.checkDependencies(["@mastra/memory"]) !== `ok`;
       if (needsMemory) {
-        await depService.installPackages(["@mastra/memory"]);
+        await depService.installPackages([`@mastra/memory${packageVersionTag}`]);
       }
       const needsLoggers = await depService.checkDependencies(["@mastra/loggers"]) !== `ok`;
       if (needsLoggers) {
-        await depService.installPackages(["@mastra/loggers"]);
+        await depService.installPackages([`@mastra/loggers${packageVersionTag}`]);
+      }
+      const needsObservability = await depService.checkDependencies(["@mastra/observability"]) !== `ok`;
+      if (needsObservability) {
+        await depService.installPackages([`@mastra/observability${packageVersionTag}`]);
+      }
+      const needsEvals = components.includes(`scorers`) && await depService.checkDependencies(["@mastra/evals"]) !== `ok`;
+      if (needsEvals) {
+        await depService.installPackages([`@mastra/evals${packageVersionTag}`]);
       }
     }
     const key = await getAPIKey(llmProvider || "openai");
     if (configureEditorWithDocsMCP) {
       await installMastraDocsMCPServer({
         editor: configureEditorWithDocsMCP,
-        directory: process.cwd()
+        directory: process.cwd(),
+        versionTag
       });
     }
     s.stop();
@@ -2278,6 +2449,32 @@ var execWithTimeout = async (command, timeoutMs) => {
     throw error;
   }
 };
+async function getInitCommand(pm) {
+  switch (pm) {
+    case "npm":
+      return "npm init -y";
+    case "pnpm":
+      return "pnpm init";
+    case "yarn":
+      return "yarn init -y";
+    case "bun":
+      return "bun init -y";
+    default:
+      return "npm init -y";
+  }
+}
+async function initializePackageJson(pm) {
+  const initCommand = await getInitCommand(pm);
+  await exec3(initCommand);
+  const packageJsonPath = path3.join(process.cwd(), "package.json");
+  const packageJson = JSON.parse(await fs4.readFile(packageJsonPath, "utf-8"));
+  packageJson.type = "module";
+  packageJson.engines = {
+    ...packageJson.engines,
+    node: ">=22.13.0"
+  };
+  await fs4.writeFile(packageJsonPath, JSON.stringify(packageJson, null, 2));
+}
 async function installMastraDependency(pm, dependency, versionTag, isDev, timeout) {
   let installCommand = getPackageManagerAddCommand(pm);
   if (isDev) {
@@ -2315,7 +2512,7 @@ var createMastraProject = async ({
     defaultValue: "my-mastra-app",
     validate: (value) => {
       if (value.length === 0) return "Project name cannot be empty";
-      if (fs4__default__default.existsSync(value)) {
+      if (fs3__default__default.existsSync(value)) {
         return `A directory named "${value}" already exists. Please choose a different name.`;
       }
     }
@@ -2332,10 +2529,13 @@ var createMastraProject = async ({
     });
   }
   const s2 = Y();
+  const originalCwd = process.cwd();
+  let projectPath = null;
   try {
     s2.start("Creating project");
     try {
-      await fs5.mkdir(projectName);
+      await fs4.mkdir(projectName);
+      projectPath = path3.resolve(originalCwd, projectName);
     } catch (error) {
       if (error instanceof Error && "code" in error && error.code === "EEXIST") {
         s2.stop(`A directory named "${projectName}" already exists. Please choose a different name.`);
@@ -2350,9 +2550,7 @@ var createMastraProject = async ({
     const installCommand = getPackageManagerAddCommand(pm);
     s2.message("Initializing project structure");
     try {
-      await exec3(`npm init -y`);
-      await exec3(`npm pkg set type="module"`);
-      await exec3(`npm pkg set engines.node=">=20.9.0"`);
+      await initializePackageJson(pm);
       const depsService = new DepsService();
       await depsService.addScriptsToPackageJson({
         dev: "mastra dev",
@@ -2367,8 +2565,8 @@ var createMastraProject = async ({
     s2.stop("Project structure created");
     s2.start(`Installing ${pm} dependencies`);
     try {
-      await exec3(`${pm} ${installCommand} zod@^3`);
-      await exec3(`${pm} ${installCommand} typescript @types/node --save-dev`);
+      await exec3(`${pm} ${installCommand} zod@^4`);
+      await exec3(`${pm} ${installCommand} -D typescript @types/node`);
       await exec3(`echo '{
   "compilerOptions": {
     "target": "ES2022",
@@ -2431,42 +2629,61 @@ var createMastraProject = async ({
     s2.stop();
     const errorMessage = error instanceof Error ? error.message : "An unexpected error occurred";
     xe(`Project creation failed: ${errorMessage}`);
+    if (projectPath && fs3__default__default.existsSync(projectPath)) {
+      try {
+        process.chdir(originalCwd);
+        await fs4.rm(projectPath, { recursive: true, force: true });
+      } catch (cleanupError) {
+        console.error(
+          `Warning: Failed to clean up project directory: ${cleanupError instanceof Error ? cleanupError.message : "Unknown error"}`
+        );
+      }
+    }
     process.exit(1);
   }
 };
-var create = async (args2) => {
-  if (args2.template !== void 0) {
-    await createFromTemplate({ ...args2, injectedAnalytics: args2.analytics });
+var version$1 = package_default.version;
+var create = async (args) => {
+  if (args.template !== void 0) {
+    await createFromTemplate({
+      projectName: args.projectName,
+      template: args.template,
+      timeout: args.timeout,
+      injectedAnalytics: args.analytics,
+      llmProvider: args.llmProvider
+    });
     return;
   }
-  const needsInteractive = args2.components === void 0 || args2.llmProvider === void 0 || args2.addExample === void 0;
+  const needsInteractive = args.components === void 0 || args.llmProvider === void 0 || args.addExample === void 0;
   const { projectName, result } = await createMastraProject({
-    projectName: args2?.projectName,
-    createVersionTag: args2?.createVersionTag,
-    timeout: args2?.timeout,
-    llmProvider: args2?.llmProvider,
-    llmApiKey: args2?.llmApiKey,
+    projectName: args?.projectName,
+    createVersionTag: args?.createVersionTag,
+    timeout: args?.timeout,
+    llmProvider: args?.llmProvider,
+    llmApiKey: args?.llmApiKey,
     needsInteractive
   });
-  const directory = args2.directory || "src/";
+  const directory = args.directory || "src/";
   if (needsInteractive && result) {
     await init({
       ...result,
       llmApiKey: result?.llmApiKey,
-      components: ["agents", "tools", "workflows"],
-      addExample: true
+      components: ["agents", "tools", "workflows", "scorers"],
+      addExample: true,
+      versionTag: args.createVersionTag
     });
     postCreate({ projectName });
     return;
   }
-  const { components = [], llmProvider = "openai", addExample = false, llmApiKey } = args2;
+  const { components = [], llmProvider = "openai", addExample = false, llmApiKey } = args;
   await init({
     directory,
     components,
     llmProvider,
     addExample,
     llmApiKey,
-    configureEditorWithDocsMCP: args2.mcpServer
+    configureEditorWithDocsMCP: args.mcpServer,
+    versionTag: args.createVersionTag
   });
   postCreate({ projectName });
 };
@@ -2557,9 +2774,9 @@ async function createFromGitHubUrl(url) {
     workflows: []
   };
 }
-async function createFromTemplate(args2) {
+async function createFromTemplate(args) {
   let selectedTemplate;
-  if (args2.template === true) {
+  if (args.template === true) {
     const templates = await loadTemplates();
     const selected = await selectTemplate(templates);
     if (!selected) {
@@ -2567,26 +2784,26 @@ async function createFromTemplate(args2) {
       return;
     }
     selectedTemplate = selected;
-  } else if (args2.template && typeof args2.template === "string") {
-    if (isGitHubUrl(args2.template)) {
-      const spinner5 = Y();
-      spinner5.start("Validating GitHub repository...");
-      const validation = await validateGitHubProject(args2.template);
+  } else if (args.template && typeof args.template === "string") {
+    if (isGitHubUrl(args.template)) {
+      const spinner4 = Y();
+      spinner4.start("Validating GitHub repository...");
+      const validation = await validateGitHubProject(args.template);
       if (!validation.isValid) {
-        spinner5.stop("Validation failed");
+        spinner4.stop("Validation failed");
         M.error("This does not appear to be a valid Mastra project:");
         validation.errors.forEach((error) => M.error(`  - ${error}`));
         throw new Error("Invalid Mastra project");
       }
-      spinner5.stop("Valid Mastra project \u2713");
-      selectedTemplate = await createFromGitHubUrl(args2.template);
+      spinner4.stop("Valid Mastra project \u2713");
+      selectedTemplate = await createFromGitHubUrl(args.template);
     } else {
       const templates = await loadTemplates();
-      const found = findTemplateByName(templates, args2.template);
+      const found = findTemplateByName(templates, args.template);
       if (!found) {
-        M.error(`Template "${args2.template}" not found. Available templates:`);
+        M.error(`Template "${args.template}" not found. Available templates:`);
         templates.forEach((t) => M.info(`  - ${t.title} (use: ${t.slug.replace("template-", "")})`));
-        throw new Error(`Template "${args2.template}" not found`);
+        throw new Error(`Template "${args.template}" not found`);
       }
       selectedTemplate = found;
     }
@@ -2594,7 +2811,7 @@ async function createFromTemplate(args2) {
   if (!selectedTemplate) {
     throw new Error("No template selected");
   }
-  let projectName = args2.projectName;
+  let projectName = args.projectName;
   if (!projectName) {
     const defaultName = getDefaultProjectName(selectedTemplate);
     const response = await he({
@@ -2608,17 +2825,41 @@ async function createFromTemplate(args2) {
     }
     projectName = response;
   }
+  let llmProvider = args.llmProvider;
+  if (!llmProvider) {
+    const providerResponse = await ve({
+      message: "Select a default provider:",
+      options: LLM_PROVIDERS
+    });
+    if (pD(providerResponse)) {
+      M.info("Project creation cancelled.");
+      return;
+    }
+    llmProvider = providerResponse;
+  }
+  let projectPath = null;
   try {
-    const analytics = args2.injectedAnalytics || getAnalytics();
+    const analytics = args.injectedAnalytics || getAnalytics();
     if (analytics) {
       analytics.trackEvent("cli_template_used", {
         template_slug: selectedTemplate.slug,
         template_title: selectedTemplate.title
       });
+      if (llmProvider) {
+        analytics.trackEvent("cli_model_provider_selected", {
+          provider: llmProvider,
+          selection_method: args.llmProvider ? "cli_args" : "interactive"
+        });
+      }
     }
-    const projectPath = await cloneTemplate({
+    const isBeta = version$1?.includes("beta") ?? false;
+    const isMastraTemplate = selectedTemplate.githubUrl.includes("github.com/mastra-ai/");
+    const branch = isBeta && isMastraTemplate ? "beta" : void 0;
+    projectPath = await cloneTemplate({
       template: selectedTemplate,
-      projectName
+      projectName,
+      branch,
+      llmProvider
     });
     await installDependencies(projectPath);
     Me(`
@@ -2629,6 +2870,17 @@ async function createFromTemplate(args2) {
       `);
     postCreate({ projectName });
   } catch (error) {
+    if (projectPath) {
+      try {
+        if (fs3__default__default.existsSync(projectPath)) {
+          await fs4.rm(projectPath, { recursive: true, force: true });
+        }
+      } catch (cleanupError) {
+        console.error(
+          `Warning: Failed to clean up project directory: ${cleanupError instanceof Error ? cleanupError.message : "Unknown error"}`
+        );
+      }
+    }
     M.error(`Failed to create project from template: ${error instanceof Error ? error.message : "Unknown error"}`);
     throw error;
   }
@@ -2675,7 +2927,7 @@ program.version(`${version}`, "-v, --version").description(`create-mastra ${vers
 program.name("create-mastra").description("Create a new Mastra project").argument("[project-name]", "Directory name of the project").option(
   "-p, --project-name <string>",
   "Project name that will be used in package.json and as the project directory name."
-).option("--default", "Quick start with defaults (src, OpenAI, examples)").option("-c, --components <components>", "Comma-separated list of components (agents, tools, workflows)").option("-l, --llm <model-provider>", "Default model provider (openai, anthropic, groq, google, or cerebras)").option("-k, --llm-api-key <api-key>", "API key for the model provider").option("-e, --example", "Include example code").option("-n, --no-example", "Do not include example code").option("-t, --timeout [timeout]", "Configurable timeout for package installation, defaults to 60000 ms").option("-d, --dir <directory>", "Target directory for Mastra source code (default: src/)").option("-m, --mcp <mcp>", "MCP Server for code editor (cursor, cursor-global, windsurf, vscode)").option(
+).option("--default", "Quick start with defaults (src, OpenAI, examples)").option("-c, --components <components>", "Comma-separated list of components (agents, tools, workflows, scorers)").option("-l, --llm <model-provider>", "Default model provider (openai, anthropic, groq, google, or cerebras)").option("-k, --llm-api-key <api-key>", "API key for the model provider").option("-e, --example", "Include example code").option("-n, --no-example", "Do not include example code").option("-t, --timeout [timeout]", "Configurable timeout for package installation, defaults to 60000 ms").option("-d, --dir <directory>", "Target directory for Mastra source code (default: src/)").option("-m, --mcp <mcp>", "MCP Server for code editor (cursor, cursor-global, windsurf, vscode)").option(
   "--template [template-name]",
   "Create project from a template (use template name, public GitHub URL, or leave blank to select from list)"
 ).action(async (projectNameArg, args) => {
@@ -2683,7 +2935,7 @@ program.name("create-mastra").description("Create a new Mastra project").argumen
   const timeout = args?.timeout ? args?.timeout === true ? 6e4 : parseInt(args?.timeout, 10) : void 0;
   if (args.default) {
     await create({
-      components: ["agents", "tools", "workflows"],
+      components: ["agents", "tools", "workflows", "scorers"],
       llmProvider: "openai",
       addExample: true,
       createVersionTag,