mastra 1.22.0 → 1.23.0-alpha.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # mastra
 
+## 1.23.0-alpha.1
+
+### Patch Changes
+
+- Improved the default agent harness to use Mastra's built-in web search and web fetch tools across supported model providers. ([#20697](https://github.com/mastra-ai/mastra/pull/20697))
+
+- Updated dependencies [[`89200ba`](https://github.com/mastra-ai/mastra/commit/89200bafa05444bb7949b363ce7b743e29867561), [`c950138`](https://github.com/mastra-ai/mastra/commit/c950138e72e4f317a40187e3800588731ab790ce), [`063c8b2`](https://github.com/mastra-ai/mastra/commit/063c8b2eb14e4e5ca021779bc33e8c3c031c8604), [`f4e964c`](https://github.com/mastra-ai/mastra/commit/f4e964cad57057301d6bed5c55bcdd730175b941), [`1f7bbd7`](https://github.com/mastra-ai/mastra/commit/1f7bbd7785a8d230aad02454ecabeb4a0b2cc96f), [`e47ff36`](https://github.com/mastra-ai/mastra/commit/e47ff36945720f4ee4caa09f6e83514d7d188608), [`fb9a6ac`](https://github.com/mastra-ai/mastra/commit/fb9a6ac11c9560518742ece60b49d6b062845fd3), [`fb9a6ac`](https://github.com/mastra-ai/mastra/commit/fb9a6ac11c9560518742ece60b49d6b062845fd3), [`aa2cec8`](https://github.com/mastra-ai/mastra/commit/aa2cec8501f634d51c2f3ebfb3dd3aa7af8d2ca2), [`2adf8eb`](https://github.com/mastra-ai/mastra/commit/2adf8eb4a70ed2b6cff2dd39281496ea0e025fac), [`8264611`](https://github.com/mastra-ai/mastra/commit/8264611510e421b818bc7395dc2ae4d9c2d518b2), [`44fc98b`](https://github.com/mastra-ai/mastra/commit/44fc98b9d1242aa87a3ab44bdce9e9f12c44d8c9), [`0f2ef41`](https://github.com/mastra-ai/mastra/commit/0f2ef4118da022e4f30dac4e9856cc3a8c97671c)]:
+  - @mastra/core@1.57.0-alpha.1
+  - @mastra/deployer@1.57.0-alpha.1
+
+## 1.22.1-alpha.0
+
+### Patch Changes
+
+- Updated dependencies [[`c8002da`](https://github.com/mastra-ai/mastra/commit/c8002da7775c468e2965b6ff5f82045450fa8cb9)]:
+  - @mastra/core@1.56.1-alpha.0
+  - @mastra/deployer@1.56.1-alpha.0
+
 ## 1.22.0
 
 ### Minor Changes

package/dist/commands/create/create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/create/create.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAa9D,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,6BAA6B,EAC7B,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAS9G,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,6BAA6B,EAC7B,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,6BAA6B,EAC7B,mBAAmB,GACpB,CAAC;AACF,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,UAAU,EAAE,uBAAuB,EAAE,CAAC;AAa7F,qBAAa,oBAAqB,SAAQ,KAAK;;CAK9C;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB,CAEpF;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,oBAAoB;;;;EAMvE;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAqID,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,oBAAoB,EAC7B,YAAY,GAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,mBAAmB,CAAM,GACxE,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,eAAO,MAAM,MAAM,GAAU,MAAM,aAAa,KAAG,OAAO,CAAC,IAAI,CA0Q9D,CAAC"}
+{"version":3,"file":"create.d.ts","sourceRoot":"","sources":["../../../src/commands/create/create.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAa9D,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,6BAA6B,EAC7B,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,6BAA6B,EAC7B,mBAAmB,EACpB,MAAM,WAAW,CAAC;AACnB,OAAO,KAAK,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AAS9G,OAAO,EACL,oBAAoB,EACpB,sBAAsB,EACtB,aAAa,EACb,6BAA6B,EAC7B,sBAAsB,EACtB,kBAAkB,EAClB,qBAAqB,EACrB,6BAA6B,EAC7B,mBAAmB,GACpB,CAAC;AACF,YAAY,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,UAAU,EAAE,uBAAuB,EAAE,CAAC;AAa7F,qBAAa,oBAAqB,SAAQ,KAAK;;CAK9C;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,oBAAoB,CAEpF;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,oBAAoB;;;;EAMvE;AAED,MAAM,WAAW,aAAa;IAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACtD,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAqID,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,OAAO,EAAE,oBAAoB,EAC7B,YAAY,GAAE,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,mBAAmB,CAAM,GACxE,OAAO,CAAC,IAAI,CAAC,CAGf;AAED,eAAO,MAAM,MAAM,GAAU,MAAM,aAAa,KAAG,OAAO,CAAC,IAAI,CAiR9D,CAAC"}

package/dist/commands/create/create.js

@@ -1,3 +1,3 @@
 import { B as validateProjectName, F as normalizeCreateCommandOptions, I as parseCreateLLMProvider, L as parseCreateTimeout, M as CREATE_LLM_PROVIDERS, N as configureCreateCommand, P as getCreateMode, R as selectMatchingDistTag, z as validateCreateOptionConflicts } from "../../analytics-CzFlN5Uy.js";
-import { a as runCreateCommand, i as isCreateCancelledError, n as create, r as getCreateCommandAnalyticsArgs, t as CreateCancelledError } from "../../create-DxtDgme6.js";
+import { a as runCreateCommand, i as isCreateCancelledError, n as create, r as getCreateCommandAnalyticsArgs, t as CreateCancelledError } from "../../create-fMweiYxb.js";
 export { CREATE_LLM_PROVIDERS, CreateCancelledError, configureCreateCommand, create, getCreateCommandAnalyticsArgs, getCreateMode, isCreateCancelledError, normalizeCreateCommandOptions, parseCreateLLMProvider, parseCreateTimeout, runCreateCommand, selectMatchingDistTag, validateCreateOptionConflicts, validateProjectName };

package/dist/commands/create/provider-adapter.d.ts

@@ -2,20 +2,15 @@ import type { PackageManager } from '../../utils/package-manager.js';
 import type { CreateLLMProvider } from './command.js';
 export interface ManagedProviderConfig {
     displayName: string;
-    sdkPackage: string;
-    sdkVersion?: string;
-    providerIdentifier: string;
     primaryModel?: string;
     observationalModel?: string;
     apiKeyEnv: string;
-    apiKeyPrerequisite: string;
-    featureDescription: string;
-    webSearchEntry?: string;
-}
-interface ResolvedManagedProviderConfig extends ManagedProviderConfig {
-    sdkVersion: string;
 }
 export declare const MANAGED_PROVIDER_CONFIGS: Record<CreateLLMProvider, ManagedProviderConfig>;
+interface ManagedTemplateAdaptationResult extends ManagedProviderConfig {
+    apiKeyWritten: boolean;
+    adaptationFailed: boolean;
+}
 export declare function adaptDefaultTemplate({ projectPath, projectName, packageManager, provider, apiKey, versionTag, }: {
     projectPath: string;
     projectName: string;
@@ -23,6 +18,6 @@ export declare function adaptDefaultTemplate({ projectPath, projectName, package
     provider: CreateLLMProvider;
     apiKey?: string;
     versionTag: string;
-}): Promise<ResolvedManagedProviderConfig>;
+}): Promise<ManagedTemplateAdaptationResult>;
 export {};
 //# sourceMappingURL=provider-adapter.d.ts.map

package/dist/commands/create/provider-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider-adapter.d.ts","sourceRoot":"","sources":["../../../src/commands/create/provider-adapter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAKnD,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,6BAA8B,SAAQ,qBAAqB;IACnE,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,iBAAiB,EAAE,qBAAqB,CA6CrF,CAAC;AA0OF,wBAAsB,oBAAoB,CAAC,EACzC,WAAW,EACX,WAAW,EACX,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,GACX,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,6BAA6B,CAAC,CA2DzC"}
+{"version":3,"file":"provider-adapter.d.ts","sourceRoot":"","sources":["../../../src/commands/create/provider-adapter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAKnD,MAAM,WAAW,qBAAqB;IACpC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,eAAO,MAAM,wBAAwB,EAAE,MAAM,CAAC,iBAAiB,EAAE,qBAAqB,CAuBrF,CAAC;AAMF,UAAU,+BAAgC,SAAQ,qBAAqB;IACrE,aAAa,EAAE,OAAO,CAAC;IACvB,gBAAgB,EAAE,OAAO,CAAC;CAC3B;AAgJD,wBAAsB,oBAAoB,CAAC,EACzC,WAAW,EACX,WAAW,EACX,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,GACX,EAAE;IACD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,cAAc,CAAC;IAC/B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,OAAO,CAAC,+BAA+B,CAAC,CA+F3C"}

package/dist/{create-DxtDgme6.js → create-fMweiYxb.js}

@@ -3,6 +3,7 @@ import { o as platformFetch, r as authHeaders, t as MASTRA_PLATFORM_API_URL } fr
 import { i as getToken, t as LoginCancelledError } from "./credentials-CE1thn6C.js";
 import { r as resolveCurrentOrg, t as OrgSelectionCancelledError } from "./orgs-DOhO9kNz.js";
 import color from "picocolors";
+import { randomUUID } from "crypto";
 import fs, { constants } from "fs";
 import path from "path";
 import fsPromises from "fs/promises";
@@ -536,69 +537,52 @@ async function writeEmptyScaffold({ projectPath, projectName, versionTag, packag
 const MANAGED_PROVIDER_CONFIGS = {
 	openai: {
 		displayName: "OpenAI",
-		sdkPackage: "@ai-sdk/openai",
-		providerIdentifier: "openai",
-		apiKeyEnv: "OPENAI_API_KEY",
-		apiKeyPrerequisite: "An OpenAI API key",
-		featureDescription: "OpenAI web search and direct web page fetching"
+		apiKeyEnv: "OPENAI_API_KEY"
 	},
 	anthropic: {
 		displayName: "Anthropic",
-		sdkPackage: "@ai-sdk/anthropic",
-		sdkVersion: "^3.0.96",
-		providerIdentifier: "anthropic",
 		primaryModel: "anthropic/claude-sonnet-5",
 		observationalModel: "anthropic/claude-haiku-4-5",
-		apiKeyEnv: "ANTHROPIC_API_KEY",
-		apiKeyPrerequisite: "An Anthropic API key",
-		featureDescription: "Anthropic web search and direct web page fetching",
-		webSearchEntry: "anthropic.tools.webSearch_20250305()"
+		apiKeyEnv: "ANTHROPIC_API_KEY"
 	},
 	google: {
 		displayName: "Google Gemini",
-		sdkPackage: "@ai-sdk/google",
-		sdkVersion: "^3.0.91",
-		providerIdentifier: "google",
 		primaryModel: "google/gemini-3.5-flash",
 		observationalModel: "google/gemini-3.5-flash",
-		apiKeyEnv: "GOOGLE_GENERATIVE_AI_API_KEY",
-		apiKeyPrerequisite: "A Google Gemini API key",
-		featureDescription: "Google Gemini web search and direct web page fetching",
-		webSearchEntry: "google.tools.googleSearch({})"
+		apiKeyEnv: "GOOGLE_GENERATIVE_AI_API_KEY"
 	},
 	xai: {
 		displayName: "xAI",
-		sdkPackage: "@ai-sdk/xai",
-		sdkVersion: "^3.0.106",
-		providerIdentifier: "xai",
 		primaryModel: "xai/grok-4.3",
 		observationalModel: "xai/grok-4.3",
-		apiKeyEnv: "XAI_API_KEY",
-		apiKeyPrerequisite: "An xAI API key",
-		featureDescription: "xAI web search and direct web page fetching",
-		webSearchEntry: "xai.tools.webSearch()"
+		apiKeyEnv: "XAI_API_KEY"
 	}
 };
-const PROVIDER_SDK_PACKAGES = Object.values(MANAGED_PROVIDER_CONFIGS).map((config) => config.sdkPackage);
-const OPENAI_SDK_PACKAGE = "@ai-sdk/openai";
 const OPENAI_API_KEY = "OPENAI_API_KEY";
-const OPENAI_IMPORT = /^import\s*\{\s*openai\s*\}\s*from\s*['"]@ai-sdk\/openai['"];?\s*$/m;
-const OPENAI_MODEL = /(\bmodel\s*:\s*['"])openai\/[^'"]+(['"])/g;
-const WEB_SEARCH_PROPERTY = /^([ \t]*)web_search\s*:\s*([^\n]+?)(?:,)?\s*$/m;
+const PRIMARY_OPENAI_MODEL = /(\bmodel\s*:\s*['"])openai\/[^'"]+(['"])(?=\s*,?\s*\n\s*defaultOptions\s*:)/g;
+const OBSERVATIONAL_OPENAI_MODEL = /(observationalMemory\s*:\s*\{[^{}]*?\bmodel\s*:\s*['"])openai\/[^'"]+(['"])/g;
 function findMatches(content, pattern) {
 	const flags = pattern.flags.includes("g") ? pattern.flags : `${pattern.flags}g`;
 	return [...content.matchAll(new RegExp(pattern.source, flags))];
 }
-function replaceSingleMatch(content, pattern, replacement, description, fileName) {
-	const matches = findMatches(content, pattern);
-	if (matches.length !== 1) throw new Error(`Default template compatibility error: expected one ${description} in ${fileName}, found ${matches.length}.`);
-	if (typeof replacement === "string") return content.replace(pattern, replacement);
-	return content.replace(pattern, replacement);
+function replaceSingleMatch(content, pattern, replacement) {
+	if (findMatches(content, pattern).length !== 1) return {
+		applied: false,
+		content
+	};
+	if (typeof replacement === "string") return {
+		applied: true,
+		content: content.replace(pattern, replacement)
+	};
+	return {
+		applied: true,
+		content: content.replace(pattern, replacement)
+	};
 }
 function getDependencyMap(manifest, section) {
 	const value = manifest[section];
 	if (value === void 0 && section === "devDependencies") return void 0;
-	if (!value || typeof value !== "object" || Array.isArray(value)) throw new Error(`Default template compatibility error: package.json has invalid ${section}.`);
+	if (!value || typeof value !== "object" || Array.isArray(value)) return void 0;
 	return value;
 }
 function collectMastraPackages(manifestSource) {
@@ -617,118 +601,155 @@ function collectMastraPackages(manifestSource) {
 	}
 	return [...names];
 }
-function normalizeManagedManifest(content, provider, mastraVersions, fallbackTag) {
+function normalizeManagedManifest(content, mastraVersions, fallbackTag) {
 	let manifest;
 	try {
 		manifest = JSON.parse(content);
 	} catch {
-		throw new Error("Default template compatibility error: package.json is not valid JSON.");
+		return {
+			applied: false,
+			content
+		};
 	}
-	const dependencySections = [getDependencyMap(manifest, "dependencies"), getDependencyMap(manifest, "devDependencies")].filter((section) => section !== void 0);
-	const openAiLocations = dependencySections.filter((section) => Object.hasOwn(section, OPENAI_SDK_PACKAGE));
-	if (openAiLocations.length !== 1) throw new Error(`Default template compatibility error: package.json must contain ${OPENAI_SDK_PACKAGE} in exactly one dependency section.`);
-	const sourceSection = openAiLocations[0];
-	const templateOpenAiVersion = sourceSection[OPENAI_SDK_PACKAGE];
-	if (typeof templateOpenAiVersion !== "string" || templateOpenAiVersion.trim() === "") throw new Error(`Default template compatibility error: package.json must contain a nonempty ${OPENAI_SDK_PACKAGE} version.`);
-	for (const section of dependencySections) for (const packageName of PROVIDER_SDK_PACKAGES) delete section[packageName];
-	const sdkVersion = provider.sdkPackage === OPENAI_SDK_PACKAGE ? templateOpenAiVersion : provider.sdkVersion;
-	if (!sdkVersion) throw new Error(`Default template compatibility error: no SDK version is configured for ${provider.displayName}.`);
-	sourceSection[provider.sdkPackage] = sdkVersion;
+	const dependencies = getDependencyMap(manifest, "dependencies");
+	const devDependencies = getDependencyMap(manifest, "devDependencies");
+	if (!dependencies || manifest.devDependencies !== void 0 && !devDependencies) return {
+		applied: false,
+		content
+	};
+	const dependencySections = [dependencies, devDependencies].filter((section) => section !== void 0);
 	for (const section of dependencySections) for (const packageName of Object.keys(section)) if (packageName === "mastra" || packageName.startsWith("@mastra/")) section[packageName] = mastraVersions?.[packageName] ?? fallbackTag;
 	return {
-		content: `${JSON.stringify(manifest, null, 2)}\n`,
-		sdkVersion
+		applied: true,
+		content: `${JSON.stringify(manifest, null, 2)}\n`
 	};
 }
 function adaptAgentSource(source, provider, config) {
-	if (provider === "openai") return source;
-	if (!config.primaryModel || !config.observationalModel) throw new Error(`Default template compatibility error: model configuration is missing for ${config.displayName}.`);
-	let next = replaceSingleMatch(source, OPENAI_IMPORT, `import { ${config.providerIdentifier} } from '${config.sdkPackage}';`, "OpenAI provider import", "src/mastra/agents/agent.ts");
-	const modelMatches = findMatches(next, OPENAI_MODEL);
-	if (modelMatches.length !== 2) throw new Error(`Default template compatibility error: expected two OpenAI model assignments in src/mastra/agents/agent.ts, found ${modelMatches.length}.`);
-	const models = [config.primaryModel, config.observationalModel];
-	let modelIndex = 0;
-	next = next.replace(OPENAI_MODEL, (_match, prefix, suffix) => {
-		return `${prefix}${models[modelIndex++]}${suffix}`;
-	});
-	const webSearchMatches = findMatches(next, WEB_SEARCH_PROPERTY);
-	if (webSearchMatches.length > 1) throw new Error(`Default template compatibility error: expected at most one web_search property in src/mastra/agents/agent.ts, found ${webSearchMatches.length}.`);
-	if (webSearchMatches.length === 1) {
-		const match = webSearchMatches[0];
-		if (!match[2]?.includes("openai.")) throw new Error("Default template compatibility error: the existing web_search property is not owned by the OpenAI template.");
-		next = next.replace(WEB_SEARCH_PROPERTY, config.webSearchEntry ? `${match[1]}web_search: ${config.webSearchEntry},` : "");
-	} else if (config.webSearchEntry) next = replaceSingleMatch(next, /^([ \t]*)web_fetch\s*:\s*[^\n]+$/m, (_line, indentation) => `${indentation}web_fetch: webFetchTool,\n${indentation}web_search: ${config.webSearchEntry},`, "web_fetch property used to place web_search", "src/mastra/agents/agent.ts");
-	return next;
+	if (provider === "openai") return {
+		applied: true,
+		content: source
+	};
+	if (!config.primaryModel || !config.observationalModel) return {
+		applied: false,
+		content: source
+	};
+	if (findMatches(source, PRIMARY_OPENAI_MODEL).length !== 1) return {
+		applied: false,
+		content: source
+	};
+	if (findMatches(source, OBSERVATIONAL_OPENAI_MODEL).length !== 1) return {
+		applied: false,
+		content: source
+	};
+	return {
+		applied: true,
+		content: source.replace(PRIMARY_OPENAI_MODEL, `$1${config.primaryModel}$2`).replace(OBSERVATIONAL_OPENAI_MODEL, `$1${config.observationalModel}$2`)
+	};
 }
 function replaceEnvKey(source, nextKey) {
-	return replaceSingleMatch(source, new RegExp(`^([ \\t]*)${OPENAI_API_KEY}[ \\t]*=.*$`, "m"), (_line, indentation) => `${indentation}${nextKey}=`, `${OPENAI_API_KEY} assignment`, ".env.example");
+	return replaceSingleMatch(source, new RegExp(`^([ \\t]*)${OPENAI_API_KEY}[ \\t]*=.*$`, "m"), (_line, indentation) => `${indentation}${nextKey}=`);
 }
 function setEnvValue(source, key, value) {
-	return replaceSingleMatch(source, new RegExp(`^([ \\t]*)${key}[ \\t]*=.*$`, "m"), (_line, indentation) => `${indentation}${key}=${value}`, `${key} assignment`, ".env");
+	return replaceSingleMatch(source, new RegExp(`^([ \\t]*)${key}[ \\t]*=.*$`, "m"), (_line, indentation) => `${indentation}${key}=${value}`);
 }
 function adaptReadme(source, provider, config, projectName, packageManager) {
-	return source.replace(/^# .+$/m, `# ${projectName}`).replaceAll("npm run dev", `${packageManager} run dev`).replace(/^- .*OpenAI web search.*$/m, `- ${config.featureDescription}`).replace(/^- .*OpenAI API key.*$/m, `- ${config.apiKeyPrerequisite}`).replace(/^([ \t]*)npx create-mastra@\S+.*$/m, `$1npx create-mastra@latest <project-name> --llm ${provider}`).replaceAll(OPENAI_API_KEY, config.apiKeyEnv);
+	if (!(source.includes(OPENAI_API_KEY) || /^([ \t]*)npx create-mastra@\S+.*$/m.test(source))) return {
+		applied: false,
+		content: source
+	};
+	return {
+		applied: true,
+		content: source.replace(/^# .+$/m, `# ${projectName}`).replaceAll("npm run dev", `${packageManager} run dev`).replace(/^([ \t]*)npx create-mastra@\S+.*$/m, `$1npx create-mastra@latest <project-name> --llm ${provider}`).replaceAll(OPENAI_API_KEY, config.apiKeyEnv)
+	};
 }
-function assertNoProviderResidue(provider, files) {
-	for (const [otherProvider, config] of Object.entries(MANAGED_PROVIDER_CONFIGS)) {
-		if (otherProvider === provider) continue;
-		const checks = [
-			[files.manifest, config.sdkPackage],
-			[files.agent, `${config.providerIdentifier}/`],
-			[files.agent, `${config.providerIdentifier}.tools`],
-			[files.envExample, config.apiKeyEnv]
-		];
-		if (files.env !== void 0) checks.push([files.env, config.apiKeyEnv]);
-		for (const [content, residue] of checks) if (content.includes(residue)) throw new Error(`Default template compatibility error: generated project still contains ${JSON.stringify(residue)} from ${config.displayName}.`);
+async function writeSecureEnv(envPath, content) {
+	const tempPath = path.join(path.dirname(envPath), `.env.mastra-create-${process.pid}-${randomUUID()}.tmp`);
+	try {
+		await fsPromises.writeFile(tempPath, content, {
+			encoding: "utf8",
+			flag: "wx",
+			mode: 384
+		});
+		if (process.platform !== "win32") await fsPromises.chmod(tempPath, 384);
+		await fsPromises.rename(tempPath, envPath);
+		return true;
+	} catch {
+		try {
+			await fsPromises.rm(tempPath, { force: true });
+		} catch {}
+		return false;
 	}
 }
 async function adaptDefaultTemplate({ projectPath, projectName, packageManager, provider, apiKey, versionTag }) {
 	const config = MANAGED_PROVIDER_CONFIGS[provider];
+	let adaptationFailed = false;
+	const write = async (filePath, content) => {
+		try {
+			await fsPromises.writeFile(filePath, content, "utf8");
+			return true;
+		} catch {
+			adaptationFailed = true;
+			return false;
+		}
+	};
 	const agentPath = path.join(projectPath, "src/mastra/agents/agent.ts");
+	if (provider !== "openai") try {
+		const result = adaptAgentSource(await fsPromises.readFile(agentPath, "utf8"), provider, config);
+		if (!result.applied) adaptationFailed = true;
+		else await write(agentPath, result.content);
+	} catch {
+		adaptationFailed = true;
+	}
 	const packageJsonPath = path.join(projectPath, "package.json");
+	try {
+		const source = await fsPromises.readFile(packageJsonPath, "utf8");
+		const mastraPackages = collectMastraPackages(source);
+		const resolvedVersions = await resolveMastraPackageVersions(mastraPackages, versionTag);
+		if (resolvedVersions === void 0 && mastraPackages.length > 0) console.warn(`We could not resolve exact Mastra package versions for the "${versionTag}" channel, using the channel tag instead`);
+		const result = normalizeManagedManifest(source, resolvedVersions, versionTag);
+		if (!result.applied) adaptationFailed = true;
+		else await write(packageJsonPath, result.content);
+	} catch {
+		adaptationFailed = true;
+	}
 	const envExamplePath = path.join(projectPath, ".env.example");
 	const envPath = path.join(projectPath, ".env");
+	let adaptedEnvExample;
+	try {
+		const result = replaceEnvKey(await fsPromises.readFile(envExamplePath, "utf8"), config.apiKeyEnv);
+		if (!result.applied) adaptationFailed = true;
+		else if (await write(envExamplePath, result.content)) adaptedEnvExample = result.content;
+	} catch {
+		adaptationFailed = true;
+	}
+	let apiKeyWritten = false;
+	if (adaptedEnvExample === void 0) {
+		if (apiKey) adaptationFailed = true;
+	} else if (apiKey) {
+		const result = setEnvValue(adaptedEnvExample, config.apiKeyEnv, apiKey);
+		if (!result.applied) adaptationFailed = true;
+		else {
+			apiKeyWritten = await writeSecureEnv(envPath, result.content);
+			if (!apiKeyWritten) adaptationFailed = true;
+		}
+	} else try {
+		await fsPromises.rm(envPath, { force: true });
+	} catch {
+		adaptationFailed = true;
+	}
 	const readmePath = path.join(projectPath, "README.md");
-	let agentSource;
-	let packageJsonSource;
-	let envExampleSource;
 	try {
-		[agentSource, packageJsonSource, envExampleSource] = await Promise.all([
-			fsPromises.readFile(agentPath, "utf8"),
-			fsPromises.readFile(packageJsonPath, "utf8"),
-			fsPromises.readFile(envExamplePath, "utf8")
-		]);
-	} catch (error) {
-		throw new Error(`Default template compatibility error: required template file is missing or unreadable: ${error instanceof Error ? error.message : "Unknown error"}`);
+		const result = adaptReadme(await fsPromises.readFile(readmePath, "utf8"), provider, config, projectName, packageManager);
+		if (!result.applied) adaptationFailed = true;
+		else await write(readmePath, result.content);
+	} catch {
+		adaptationFailed = true;
 	}
-	const readmeSource = await fsPromises.readFile(readmePath, "utf8").catch(() => void 0);
-	const nextAgent = adaptAgentSource(agentSource, provider, config);
-	const mastraPackages = collectMastraPackages(packageJsonSource);
-	const resolvedVersions = await resolveMastraPackageVersions(mastraPackages, versionTag);
-	if (resolvedVersions === void 0 && mastraPackages.length > 0) console.warn(`We could not resolve exact Mastra package versions for the "${versionTag}" channel, using the channel tag instead`);
-	const normalizedManifest = normalizeManagedManifest(packageJsonSource, config, resolvedVersions, versionTag);
-	const nextEnvExample = replaceEnvKey(envExampleSource, config.apiKeyEnv);
-	const nextEnv = apiKey ? setEnvValue(nextEnvExample, config.apiKeyEnv, apiKey) : void 0;
-	const nextReadme = readmeSource === void 0 ? void 0 : adaptReadme(readmeSource, provider, config, projectName, packageManager);
-	assertNoProviderResidue(provider, {
-		agent: nextAgent,
-		manifest: normalizedManifest.content,
-		envExample: nextEnvExample,
-		env: nextEnv
-	});
-	const writes = [
-		fsPromises.writeFile(agentPath, nextAgent, "utf8"),
-		fsPromises.writeFile(packageJsonPath, normalizedManifest.content, "utf8"),
-		fsPromises.writeFile(envExamplePath, nextEnvExample, "utf8"),
-		nextEnv === void 0 ? fsPromises.rm(envPath, { force: true }) : fsPromises.writeFile(envPath, nextEnv, "utf8")
-	];
-	if (nextReadme !== void 0) writes.push(fsPromises.writeFile(readmePath, nextReadme, "utf8"));
-	if (packageManager === "pnpm") writes.push(fsPromises.writeFile(path.join(projectPath, "pnpm-workspace.yaml"), PNPM_WORKSPACE, "utf8"));
-	await Promise.all(writes);
-	if (nextEnv !== void 0 && process.platform !== "win32") await fsPromises.chmod(envPath, 384);
+	if (packageManager === "pnpm") await write(path.join(projectPath, "pnpm-workspace.yaml"), PNPM_WORKSPACE);
 	return {
 		...config,
-		sdkVersion: normalizedManifest.sdkVersion
+		apiKeyWritten,
+		adaptationFailed
 	};
 }
 //#endregion
@@ -739,7 +760,7 @@ const DEFAULT_TEMPLATE = {
 	slug: "template-agent-harness",
 	agents: ["agent"],
 	mcp: [],
-	tools: ["web-fetch"],
+	tools: [],
 	networks: [],
 	workflows: []
 };
@@ -959,6 +980,7 @@ const create = async (args) => {
 	process.on("SIGINT", handleSigint);
 	process.on("SIGTERM", handleSigterm);
 	let selectedApiKeyEnv;
+	let selectedApiKeyWritten = false;
 	let materializationError;
 	try {
 		if (mode === "empty") {
@@ -981,14 +1003,17 @@ const create = async (args) => {
 				...observabilityEnabled ? { silent: true } : {}
 			});
 			if (isManaged) {
-				selectedApiKeyEnv = (await adaptDefaultTemplate({
+				const providerConfig = await adaptDefaultTemplate({
 					projectPath: staging.projectPath,
 					projectName,
 					packageManager,
 					provider: llmProvider,
 					apiKey: llmApiKey,
 					versionTag: versionTag ?? "latest"
-				})).apiKeyEnv;
+				});
+				selectedApiKeyEnv = providerConfig.apiKeyEnv;
+				selectedApiKeyWritten = providerConfig.apiKeyWritten;
+				if (providerConfig.adaptationFailed) p.log.warn("Some provider setup could not be applied. Review the generated project before running it.");
 				materializationController.signal.throwIfAborted();
 			}
 		}
@@ -1083,7 +1108,7 @@ const create = async (args) => {
 		observabilitySummary = `${color.yellow("Could not connect this project to Mastra platform automatically:")} ${message}\n\n${placeholderSummary}1. Visit ${color.cyan("https://projects.mastra.ai")} to create a project and an access token.\n2. Paste the token into ${color.cyan("MASTRA_PLATFORM_ACCESS_TOKEN")} and the project id into ${color.cyan("MASTRA_PROJECT_ID")}.`;
 	}
 	if (mode === "managed") {
-		const apiKeySummary = llmApiKey ? `Your ${selectedApiKeyEnv} value was written to ${color.cyan(".env")}.` : platformEnvWritten ? `Set ${selectedApiKeyEnv} in ${color.cyan(".env")} before starting.` : `Copy ${color.cyan(".env.example")} to ${color.cyan(".env")} and set ${selectedApiKeyEnv} before starting.`;
+		const apiKeySummary = llmApiKey ? selectedApiKeyWritten ? `Your ${selectedApiKeyEnv} value was written to ${color.cyan(".env")}.` : `Set ${selectedApiKeyEnv} in ${color.cyan(".env")} before starting.` : platformEnvWritten ? `Set ${selectedApiKeyEnv} in ${color.cyan(".env")} before starting.` : `Copy ${color.cyan(".env.example")} to ${color.cyan(".env")} and set ${selectedApiKeyEnv} before starting.`;
 		p.note(`${color.green("Success!")}\n\n${apiKeySummary}${observabilitySummary ? `\n\n${observabilitySummary}` : ""}`);
 	} else if (mode === "template") p.note(`${color.green("Success!")}\n\nCreate a ${color.cyan(".env")} file if the template requires environment variables.`);
 	postCreate({
@@ -1263,4 +1288,4 @@ async function resolveTemplate(mode, template) {
 //#endregion
 export { runCreateCommand as a, createLogger as c, isCreateCancelledError as i, logger as l, create as n, installMastraSkills as o, getCreateCommandAnalyticsArgs as r, provisionObservabilityProject as s, CreateCancelledError as t };
 
-//# sourceMappingURL=create-DxtDgme6.js.map
+//# sourceMappingURL=create-fMweiYxb.js.map