sv 0.16.5 → 0.17.0

package/dist/{engine-CCAozEpo.mjs → engine-B7chsCPG.mjs}

@@ -1,5 +1,5 @@
 import { createRequire } from "node:module";
-import { AGENTS, COMMANDS, Walker, coerceVersion, color, constructCommand, createPrinter, dedent, defineEnv, detect, downloadJson, fileExists, isVersionUnsupportedBelow, js, loadFile, loadPackageJson, minVersion, parse, pnpm, resolveCommand, resolveCommandArray, sanitizeName, saveFile, svelte, svelteConfig, transforms } from "@sveltejs/sv-utils";
+import { AGENTS, COMMANDS, KIT3_TSCONFIG, KIT3_TSCONFIG_DEFAULT, Walker, coerceVersion, color, constructCommand, createPrinter, dedent, defineEnv, detect, downloadJson, fileExists, isKit3, isVersionUnsupportedBelow, js, libSubpathImports, loadFile, loadPackageJson, minVersion, parse, pnpm, resolveCommand, resolveCommandArray, resolveLibPrefix, sanitizeName, saveFile, svelte, svelteConfig, transforms } from "@sveltejs/sv-utils";
 import fs, { closeSync, existsSync, openSync, readSync, statSync } from "node:fs";
 import path, { basename, delimiter, dirname, isAbsolute, join, normalize, resolve } from "node:path";
 import { promisify, stripVTControlCharacters, styleText } from "node:util";
@@ -8,7 +8,7 @@ import * as b$1 from "node:readline";
 import G from "node:readline";
 import { ReadStream } from "node:tty";
 import { fileURLToPath } from "node:url";
-import childProcess, { exec, spawn } from "node:child_process";
+import childProcess, { exec, spawn, spawnSync } from "node:child_process";
 import { pipeline } from "node:stream/promises";
 import { PassThrough } from "node:stream";
 import { EventEmitter } from "node:events";
@@ -493,9 +493,9 @@ function W({ input: r = stdin, output: t = stdout, overwrite: s = !0, hideCursor
 		r.off("keypress", n), e && t.write(import_src.cursor.show), r instanceof ReadStream && r.isTTY && !q$1 && r.setRawMode(!1), i.terminal = !1, i.close();
 	};
 }
-const A = (r) => "columns" in r && typeof r.columns == "number" ? r.columns : 80, L = (r) => "rows" in r && typeof r.rows == "number" ? r.rows : 20;
-function B(r, t, s, e = s, i = s, n) {
-	return wrapAnsi(t, A(r ?? stdout) - s.length, {
+const A$1 = (r) => "columns" in r && typeof r.columns == "number" ? r.columns : 80, L$1 = (r) => "rows" in r && typeof r.rows == "number" ? r.rows : 20;
+function B$1(r, t, s, e = s, i = s, n) {
+	return wrapAnsi(t, A$1(r ?? stdout) - s.length, {
 		hard: !0,
 		trim: !1
 	}).split(`
@@ -629,7 +629,7 @@ var m = class {
 		if (t !== this._prevFrame) {
 			if (this.state === "initial") this.output.write(import_src.cursor.hide);
 			else {
-				const s = Y$1(this._prevFrame, t), e = L(this.output);
+				const s = Y$1(this._prevFrame, t), e = L$1(this.output);
 				if (this.restoreCursor(), s) {
 					const i = Math.max(0, s.numLinesAfter - e), n = Math.max(0, s.numLinesBefore - e);
 					let o = s.lines.find((u) => u >= i);
@@ -805,7 +805,7 @@ const tt = se(), at = () => process.env.CI === "true", Tt = (t) => t.isTTY === !
 		removals: c
 	};
 }, F$1 = ({ cursor: t, options: i, style: s, output: r = process.stdout, maxItems: u = Number.POSITIVE_INFINITY, columnPadding: n = 0, rowPadding: a = 4 }) => {
-	const c = A(r) - n, o = L(r), l = styleText("dim", "..."), d = Math.max(o - a, 0), g = Math.max(Math.min(u, d), 5);
+	const c = A$1(r) - n, o = L$1(r), l = styleText("dim", "..."), d = Math.max(o - a, 0), g = Math.max(Math.min(u, d), 5);
 	let p = 0;
 	t >= g - 3 && (p = Math.max(Math.min(t - g + 3, i.length - g), 0));
 	let f = g < i.length && p > 0, h = g < i.length && p + g < i.length;
@@ -843,7 +843,7 @@ const le = (t) => {
 		output: t.output,
 		initialValue: t.initialValue ?? !0,
 		render() {
-			const r = t.withGuide ?? h$1.withGuide, u = `${P$1(this.state)}  `, n = r ? `${styleText("gray", $)}  ` : "", a = B(t.output, t.message, n, u), c = `${r ? `${styleText("gray", $)}
+			const r = t.withGuide ?? h$1.withGuide, u = `${P$1(this.state)}  `, n = r ? `${styleText("gray", $)}  ` : "", a = B$1(t.output, t.message, n, u), c = `${r ? `${styleText("gray", $)}
 ` : ""}${a}
 `, o = this.value ? i : s;
 			switch (this.state) {
@@ -961,7 +961,7 @@ ${styleText("reset", styleText("dim", `Press ${styleText([
 			], " space ")} to select, ${styleText("gray", styleText("bgWhite", styleText("inverse", " enter ")))} to submit`))}`;
 		},
 		render() {
-			const r = t.withGuide ?? h$1.withGuide, u = B(t.output, t.message, r ? `${ft(this.state)}  ` : "", `${P$1(this.state)}  `), n = `${r ? `${styleText("gray", $)}
+			const r = t.withGuide ?? h$1.withGuide, u = B$1(t.output, t.message, r ? `${ft(this.state)}  ` : "", `${P$1(this.state)}  `), n = `${r ? `${styleText("gray", $)}
 ` : ""}${u}
 `, a = this.value ?? [], c = (o, l) => {
 				if (o.disabled) return i(o, "disabled");
@@ -971,12 +971,12 @@ ${styleText("reset", styleText("dim", `Press ${styleText([
 			switch (this.state) {
 				case "submit": {
 					const o = this.options.filter(({ value: d }) => a.includes(d)).map((d) => i(d, "submitted")).join(styleText("dim", ", ")) || styleText("dim", "none");
-					return `${n}${B(t.output, o, r ? `${styleText("gray", $)}  ` : "")}`;
+					return `${n}${B$1(t.output, o, r ? `${styleText("gray", $)}  ` : "")}`;
 				}
 				case "cancel": {
 					const o = this.options.filter(({ value: d }) => a.includes(d)).map((d) => i(d, "cancelled")).join(styleText("dim", ", "));
 					if (o.trim() === "") return `${n}${styleText("gray", $)}`;
-					return `${n}${B(t.output, o, r ? `${styleText("gray", $)}  ` : "")}${r ? `
+					return `${n}${B$1(t.output, o, r ? `${styleText("gray", $)}  ` : "")}${r ? `
 ${styleText("gray", $)}` : ""}`;
 				}
 				case "error": {
@@ -1027,7 +1027,7 @@ ${r ? styleText("cyan", x$1) : ""}
 }, Ce = (t = "", i = "", s) => {
 	const r = s?.output ?? V.stdout, u = s?.withGuide ?? h$1.withGuide, n = s?.format ?? be, a = [
 		"",
-		...Se(t, A(r) - 6, n).split(`
+		...Se(t, A$1(r) - 6, n).split(`
 `).map(n),
 		""
 	], c = fastStringWidth(i), o = Math.max(a.reduce((p, f) => {
@@ -1053,7 +1053,7 @@ ${styleText("gray", g + st.repeat(o + 2) + dt)}
 ], delay: a = tt ? 80 : 120, signal: c, ...o } = {}) => {
 	const l = at();
 	let d, g, p = !1, f = !1, h = "", I, m = performance.now();
-	const y = A(s), v = o?.styleFrame ?? _e, C = (_) => {
+	const y = A$1(s), v = o?.styleFrame ?? _e, C = (_) => {
 		const A = _ > 1 ? u ?? h$1.messages.error : r ?? h$1.messages.cancel;
 		f = _ === 1, p && (W$1(A, _), f && typeof i == "function" && i());
 	}, S = () => C(2), b = () => C(1), G = () => {
@@ -1136,17 +1136,17 @@ ${styleText("gray", g + st.repeat(o + 2) + dt)}
 		output: t.output,
 		initialValue: t.initialValue,
 		render() {
-			const s = t.withGuide ?? h$1.withGuide, r = `${P$1(this.state)}  `, u = `${ft(this.state)}  `, n = B(t.output, t.message, u, r), a = `${s ? `${styleText("gray", $)}
+			const s = t.withGuide ?? h$1.withGuide, r = `${P$1(this.state)}  `, u = `${ft(this.state)}  `, n = B$1(t.output, t.message, u, r), a = `${s ? `${styleText("gray", $)}
 ` : ""}${n}
 `;
 			switch (this.state) {
 				case "submit": {
 					const c = s ? `${styleText("gray", $)}  ` : "";
-					return `${a}${B(t.output, i(this.options[this.cursor], "selected"), c)}`;
+					return `${a}${B$1(t.output, i(this.options[this.cursor], "selected"), c)}`;
 				}
 				case "cancel": {
 					const c = s ? `${styleText("gray", $)}  ` : "";
-					return `${a}${B(t.output, i(this.options[this.cursor], "cancelled"), c)}${s ? `
+					return `${a}${B$1(t.output, i(this.options[this.cursor], "cancelled"), c)}${s ? `
 ${styleText("gray", $)}` : ""}`;
 				}
 				default: {
@@ -1192,7 +1192,7 @@ ${Bt}${r.trimStart()}`), s = 3 + stripVTControlCharacters(r.trimStart()).length)
 	warning: (t) => q.warn(t),
 	error: (t) => q.message(t, { symbol: styleText("red", yt) })
 }, Oe = (t) => t.replace(/\x1b\[(?:\d+;)*\d*[ABCDEFGHfJKSTsu]|\x1b\[(s|u)/g, ""), Pe = (t) => {
-	const i = t.output ?? process.stdout, s = A(i), r = styleText("gray", $), u = t.spacing ?? 1, n = 3, a = t.retainLog === !0, c = !at() && Tt(i);
+	const i = t.output ?? process.stdout, s = A$1(i), r = styleText("gray", $), u = t.spacing ?? 1, n = 3, a = t.retainLog === !0, c = !at() && Tt(i);
 	i.write(`${r}
 `), i.write(`${styleText("green", H)}  ${t.title}
 `);
@@ -1348,7 +1348,7 @@ ${i ? styleText("cyan", x$1) : ""}
 //#endregion
 //#region package.json
 var name = "sv";
-var version = "0.16.5";
+var version = "0.17.0";
 //#endregion
 //#region src/core/errors.ts
 var UnsupportedError = class extends Error {
@@ -1361,6 +1361,7 @@ var UnsupportedError = class extends Error {
 };
 //#endregion
 //#region src/core/common.ts
+const RX_IMPORT_ONLY = /^\s*@\S+\s*$/;
 const NO_PREFIX = "--no-";
 let options$8 = [];
 function getLongFlag(flags) {
@@ -1530,7 +1531,7 @@ function updateAgent(projectPath, language, packageManager, loadedAddons) {
 	const agentFiles = [
 		"AGENTS.md",
 		"GEMINI.md",
-		"CLAUDE.md"
+		".claude/CLAUDE.md"
 	];
 	const languageLabel = language === "typescript" ? "TypeScript" : language === "checkjs" ? "JavaScript (JSDoc)" : "None";
 	const packageManagerLabel = packageManager ?? "npm";
@@ -1549,6 +1550,7 @@ function updateAgent(projectPath, language, packageManager, loadedAddons) {
 		const agentPath = path.join(projectPath, fileName);
 		if (!fs.existsSync(agentPath)) continue;
 		let content = fs.readFileSync(agentPath, "utf-8");
+		if (RX_IMPORT_ONLY.test(content)) continue;
 		content = content.replace(existingSectionPattern, "");
 		content = configSection + content;
 		fs.writeFileSync(agentPath, content);
@@ -1885,10 +1887,12 @@ var k = class extends Error {
 		this.output = t;
 	}
 };
+const A = /\r?\n/;
 const j = {
 	timeout: void 0,
 	persist: false
 };
+const M = { timeout: void 0 };
 const N = { windowsHide: true };
 function P(e) {
 	const t = new AbortController();
@@ -2036,12 +2040,56 @@ var I = class {
 		if (this._resolveClose) this._resolveClose();
 	};
 };
+function L(e, r, i) {
+	const a = {
+		...M,
+		...i
+	};
+	const o = cwd();
+	const s = {
+		windowsHide: true,
+		...a.nodeOptions
+	};
+	if (a.timeout !== void 0) s.timeout = a.timeout;
+	s.env = y(o, s.env, a.nodePath);
+	const c = D(e, r ?? [], s);
+	const l = spawnSync(c.command, c.args, c.options);
+	if (l.error) throw l.error;
+	const u = l.stdout?.toString() ?? "";
+	const d = l.stderr?.toString() ?? "";
+	const f = l.status ?? void 0;
+	const p = l.signal != null;
+	const m = {
+		stdout: u,
+		stderr: d,
+		get exitCode() {
+			return f;
+		},
+		get pid() {
+			return l.pid;
+		},
+		get killed() {
+			return p;
+		},
+		*[Symbol.iterator]() {
+			for (const e of [u, d]) {
+				if (!e) continue;
+				const t = e.split(A);
+				if (t[t.length - 1] === "") t.pop();
+				yield* t;
+			}
+		}
+	};
+	if (a.throwOnError && f !== 0 && f !== void 0) throw new k(m, m);
+	return m;
+}
 const R = (e, t, n) => {
 	const r = new I(e, t, n);
 	r.spawn();
 	return r;
 };
 const z = R;
+const B = L;
 //#endregion
 //#region ../../node_modules/.pnpm/commander@15.0.0/node_modules/commander/lib/error.js
 /**
@@ -5637,11 +5685,9 @@ function pipe(...pipe$1) {
 }
 //#endregion
 //#region src/core/config.ts
-/**
-* The entry point for your addon, It will hold every thing! (options, setup, run, nextSteps, ...)
-*/
-function defineAddon(config) {
-	return config;
+function defineAddon(...args) {
+	if (args.length === 0) return (config) => config;
+	return args[0];
 }
 /**
 * Generates an inline error hint based on the addon source
@@ -5690,6 +5736,263 @@ function createOptionBuilder(options) {
 	};
 }
 //#endregion
+//#region src/addons/ai-tools.ts
+const REGEX_MD = /\.md$/;
+const CLIENTS = {
+	"claude-code": {
+		label: "Claude Code",
+		pluginSettings: {
+			path: ".claude/settings.json",
+			marketplace: "svelte",
+			repo: "sveltejs/ai-tools",
+			id: "svelte@svelte"
+		},
+		agentPath: "AGENTS.md",
+		agentLink: {
+			path: ".claude/CLAUDE.md",
+			contents: "@../AGENTS.md\n"
+		},
+		configPath: ".mcp.json",
+		skillsPath: ".claude/skills",
+		agentsPath: ".claude/agents",
+		mcpOptions: {
+			typeLocal: "stdio",
+			typeRemote: "http",
+			env: true
+		}
+	},
+	cursor: {
+		label: "Cursor",
+		agentPath: "AGENTS.md",
+		configPath: ".cursor/mcp.json",
+		skillsPath: ".cursor/skills",
+		agentsPath: ".cursor/agents",
+		mcpOptions: {}
+	},
+	gemini: {
+		label: "Gemini",
+		agentPath: "GEMINI.md",
+		configPath: ".gemini/settings.json",
+		skillsPath: ".gemini/skills",
+		agentsPath: ".gemini/agents",
+		schema: "https://raw.githubusercontent.com/google-gemini/gemini-cli/main/schemas/settings.schema.json",
+		mcpOptions: {}
+	},
+	opencode: {
+		label: "OpenCode",
+		pluginOnly: true,
+		agentPath: "AGENTS.md",
+		configPath: ".opencode/opencode.json",
+		schema: "https://opencode.ai/config.json",
+		customData: { plugin: ["@sveltejs/opencode"] },
+		extraFiles: [{
+			path: ".opencode/svelte.json",
+			data: { $schema: "https://svelte.dev/opencode/schema.json" }
+		}]
+	},
+	vscode: {
+		label: "VS Code",
+		agentPath: "AGENTS.md",
+		configPath: ".vscode/mcp.json",
+		skillsPath: ".github/skills",
+		agentsPath: ".github/agents",
+		agentExtension: ".agent.md",
+		mcpOptions: { serversKey: "servers" }
+	},
+	other: {
+		label: "Other",
+		agentPath: "AGENTS.md"
+	}
+};
+const acceptsTools = (client) => Boolean(client && !client.pluginOnly && (client.skillsPath || client.agentsPath || client.configPath));
+const wantsLooseTools = (client, delivery) => acceptsTools(client) && (!client.pluginSettings || delivery !== "plugin");
+const wantsMcpConfig = (client, delivery) => Boolean(client?.mcpOptions) && wantsLooseTools(client, delivery);
+const TOOLS = {
+	mcp: {
+		label: "MCP server",
+		kind: "mcp"
+	},
+	"svelte-code-writer": {
+		label: "svelte-code-writer",
+		kind: "skill",
+		hint: "skill"
+	},
+	"svelte-core-bestpractices": {
+		label: "svelte-core-bestpractices",
+		kind: "skill",
+		hint: "skill"
+	},
+	"svelte-file-editor": {
+		label: "svelte-file-editor",
+		kind: "agent",
+		hint: "sub-agent"
+	}
+};
+var ai_tools_default = defineAddon({
+	id: "ai-tools",
+	shortDescription: "Svelte AI tools",
+	homepage: "https://svelte.dev/docs/ai",
+	options: defineAddonOptions().add("ide", {
+		question: "Which client would you like to use?",
+		type: "multiselect",
+		default: [],
+		options: Object.entries(CLIENTS).map(([value, client]) => ({
+			value,
+			label: client.label
+		})),
+		required: true
+	}).add("delivery", {
+		question: "How would you like to add the Svelte tools?",
+		type: "select",
+		default: "plugin",
+		options: [{
+			value: "plugin",
+			label: "Svelte plugin",
+			hint: "recommended, auto-installs & updates"
+		}, {
+			value: "tools",
+			label: "Individual tools",
+			hint: "choose exactly what to add"
+		}],
+		condition: ({ ide }) => ide.some((i) => CLIENTS[i]?.pluginSettings)
+	}).add("tools", {
+		question: "Which tools would you like to add?",
+		type: "multiselect",
+		default: Object.keys(TOOLS),
+		options: Object.entries(TOOLS).map(([value, t]) => ({
+			value,
+			label: t.label,
+			hint: t.hint
+		})),
+		required: false,
+		condition: ({ ide, delivery }) => ide.some((i) => wantsLooseTools(CLIENTS[i], delivery))
+	}).add("mcpSetup", {
+		question: "Which MCP setup would you like to use?",
+		type: "select",
+		default: "remote",
+		options: [{
+			value: "local",
+			label: "Local",
+			hint: "will use stdio"
+		}, {
+			value: "remote",
+			label: "Remote",
+			hint: "will use a remote endpoint"
+		}],
+		condition: ({ ide, delivery, tools }) => (tools === void 0 || tools.includes("mcp")) && ide.some((i) => wantsMcpConfig(CLIENTS[i], delivery))
+	}).build(),
+	run: ({ sv, options }) => {
+		const usePlugin = options.delivery === "plugin";
+		const selected = options.tools ?? Object.keys(TOOLS);
+		const selectedSkills = selected.filter((t) => TOOLS[t]?.kind === "skill");
+		const selectedAgents = selected.filter((t) => TOOLS[t]?.kind === "agent");
+		const wantsMcp = selected.includes("mcp");
+		const getLocalConfig = (o) => {
+			return {
+				...o?.typeLocal ? { type: o.typeLocal } : {},
+				command: o?.command ?? "npx",
+				...o?.env ? { env: {} } : {},
+				...o?.args === null ? {} : { args: o?.args ?? ["-y", "@sveltejs/mcp"] }
+			};
+		};
+		const getRemoteConfig = (o) => {
+			return {
+				...o?.typeRemote ? { type: o.typeRemote } : {},
+				url: "https://mcp.svelte.dev/mcp"
+			};
+		};
+		const filesAdded = [];
+		const filesExistingAlready = [];
+		const sharedFiles = getSharedFiles();
+		const mcpFiles = sharedFiles.filter((file) => file.include.includes("mcp"));
+		const skillFiles = sharedFiles.filter((file) => file.include.includes("skills"));
+		const agentFiles = sharedFiles.filter((file) => file.include.includes("agents"));
+		const agentFile = mcpFiles.find((file) => file.name === "AGENTS.md");
+		const addFile = (path, contents) => {
+			sv.file(path, (content) => {
+				if (content) {
+					filesExistingAlready.push(path);
+					return false;
+				}
+				if (!filesAdded.includes(path)) filesAdded.push(path);
+				return contents;
+			});
+		};
+		for (const ide of options.ide) {
+			const client = CLIENTS[ide];
+			if (!client) continue;
+			if (client.pluginSettings && usePlugin) {
+				const plugin = client.pluginSettings;
+				sv.file(plugin.path, transforms.json(({ data }) => {
+					data.extraKnownMarketplaces ??= {};
+					data.extraKnownMarketplaces[plugin.marketplace] ??= { source: {
+						source: "github",
+						repo: plugin.repo
+					} };
+					data.enabledPlugins ??= {};
+					data.enabledPlugins[plugin.id] = true;
+				}));
+				continue;
+			}
+			if (!client.agentPath) continue;
+			const { mcpOptions, agentPath, agentLink, configPath, skillsPath, agentsPath, agentExtension, schema, customData, extraFiles } = client;
+			if (!filesAdded.includes(agentPath)) sv.file(agentPath, (content) => {
+				if (content) {
+					filesExistingAlready.push(agentPath);
+					return false;
+				}
+				filesAdded.push(agentPath);
+				return agentFile?.contents ?? "";
+			});
+			if (agentLink) addFile(agentLink.path, agentLink.contents);
+			const writeMcp = Boolean(mcpOptions) && wantsMcp;
+			if (configPath && (writeMcp || customData)) sv.file(configPath, transforms.json(({ data }) => {
+				if (schema) data["$schema"] = schema;
+				if (customData) for (const [key, value] of Object.entries(customData)) data[key] = value;
+				if (writeMcp) {
+					const key = mcpOptions.serversKey ?? "mcpServers";
+					data[key] ??= {};
+					data[key].svelte = options.mcpSetup === "local" ? getLocalConfig(mcpOptions) : getRemoteConfig(mcpOptions);
+				}
+			}));
+			if (extraFiles) for (const extra of extraFiles) sv.file(extra.path, transforms.json(({ data }) => {
+				for (const [key, value] of Object.entries(extra.data)) data[key] = value;
+			}));
+			if (skillsPath) for (const file of skillFiles) {
+				if (!selectedSkills.includes(file.name.split("/")[0])) continue;
+				addFile(`${skillsPath}/${file.name}`, file.contents);
+			}
+			if (agentsPath) for (const file of agentFiles) {
+				if (!selectedAgents.includes(file.name.replace(REGEX_MD, ""))) continue;
+				const ext = agentExtension ?? ".md";
+				addFile(`${agentsPath}/${file.name.replace(REGEX_MD, ext)}`, file.contents);
+			}
+		}
+		if (filesExistingAlready.length > 0) R$1.warn(`${filesExistingAlready.map((path) => color.path(path)).join(", ")} already exists, we didn't touch ${filesExistingAlready.length > 1 ? "them" : "it"}. See ${color.website("https://svelte.dev/docs/ai")} for manual setup.`);
+	},
+	nextSteps({ options, cwd }) {
+		const steps = [];
+		for (const ide of options.ide) {
+			const client = CLIENTS[ide];
+			if (!client?.pluginSettings) continue;
+			const plugin = client.pluginSettings;
+			const settingsPath = path.resolve(cwd, plugin.path);
+			if (!fs.existsSync(settingsPath)) continue;
+			let pluginEnabled = false;
+			try {
+				pluginEnabled = Boolean(JSON.parse(fs.readFileSync(settingsPath, "utf8")).enabledPlugins?.[plugin.id]);
+			} catch {}
+			if (!pluginEnabled) continue;
+			const looseDirs = [client.skillsPath, client.agentsPath].filter((dir) => Boolean(dir) && fs.existsSync(path.resolve(cwd, dir)) && fs.readdirSync(path.resolve(cwd, dir)).some((entry) => Object.keys(TOOLS).includes(entry.replace(REGEX_MD, ""))));
+			if (looseDirs.length === 0) continue;
+			steps.push(`${client.label}: the Svelte plugin is enabled and ${looseDirs.map((d) => color.path(d)).join(" + ")} also exist${looseDirs.length > 1 ? "" : "s"} - remove ${looseDirs.length > 1 ? "them" : "it"} (or disable the plugin) to avoid duplicate skills/sub-agents.`);
+		}
+		if (options.delivery === "plugin" && options.ide.includes("claude-code")) steps.push(`Open the project in Claude Code and trust the workspace - the Svelte plugin installs automatically.`);
+		if (options.ide.includes("other")) steps.push(`For other clients: ${color.website(`https://svelte.dev/docs/ai/${options.mcpSetup ?? "remote"}-setup#Other-clients`)}`);
+		return steps;
+	}
+});
+//#endregion
 //#region src/addons/common.ts
 const ESLINT_VERSION = "^10.4.1";
 const addEslintConfigPrettier = transforms.script(({ ast, js }) => {
@@ -5842,6 +6145,7 @@ var better_auth_default = defineAddon({
 		runsAfter("experimental");
 	},
 	run: ({ sv, cwd, language, options, directory, dependencyVersion, file }) => {
+		const lib = resolveLibPrefix(dependencyVersion("@sveltejs/kit"));
 		const svelteVersion = dependencyVersion("svelte");
 		const svelte5 = !!svelteVersion && coerceVersion(svelteVersion).major === 5;
 		const [ts, s5] = createPrinter(language === "ts", svelte5);
@@ -5888,7 +6192,7 @@ var better_auth_default = defineAddon({
 		}
 		sv.file(`${directory.lib}/server/auth.${language}`, transforms.script(({ ast, comments, js }) => {
 			js.imports.addNamed(ast, {
-				from: "$lib/server/db",
+				from: `${lib}/server/db`,
 				imports: [d1 ? "getDb" : "db"]
 			});
 			js.imports.addNamed(ast, {
@@ -5945,7 +6249,7 @@ var better_auth_default = defineAddon({
 					/**
 					 * DO NOT USE!
 					 *
-					 * This instance is used by the \`better-auth\` CLI for schema generation ONLY.
+					 * This instance is used by the \`auth\` CLI for schema generation ONLY.
 					 * To access \`auth\` at runtime, use \`event.locals.auth\`.
 					 */
 					export const auth = createAuth(null${ts("!")});`;
@@ -5969,7 +6273,7 @@ var better_auth_default = defineAddon({
 		const authConfigPath = `${directory.lib}/server/auth.${language}`;
 		const authSchemaPath = `${directory.lib}/server/db/auth.schema.${language}`;
 		sv.file(file.package, transforms.json(({ data, json }) => {
-			json.packageScriptsUpsert(data, "auth:schema", `better-auth generate --config ${authConfigPath} --output ${authSchemaPath} --yes`);
+			json.packageScriptsUpsert(data, "auth:schema", `auth generate --config ${authConfigPath} --output ${authSchemaPath} --yes`);
 		}));
 		sv.file(`${directory.lib}/server/db/auth.schema.${language}`, transforms.text(({ content }) => {
 			if (content) return false;
@@ -5984,7 +6288,7 @@ var better_auth_default = defineAddon({
 		sv.file("src/app.d.ts", transforms.script(({ ast, comments, js }) => {
 			if (d1) js.imports.addNamed(ast, {
 				imports: ["createAuth"],
-				from: "$lib/server/auth"
+				from: `${lib}/server/auth`
 			});
 			js.imports.addNamed(ast, {
 				imports: ["User", "Session"],
@@ -6008,7 +6312,7 @@ var better_auth_default = defineAddon({
 			});
 			js.imports.addNamed(ast, {
 				imports: [d1 ? "createAuth" : "auth"],
-				from: "$lib/server/auth"
+				from: `${lib}/server/auth`
 			});
 			env.importEnv(ast, js, ["building"]);
 			const handleContent = dedent`
@@ -6116,7 +6420,7 @@ var better_auth_default = defineAddon({
 					import { fail, redirect } from '@sveltejs/kit';
 					${ts("import type { Actions } from './$types';")}
 					${ts("import type { PageServerLoad } from './$types';")}
-					${!d1 ? "import { auth } from '$lib/server/auth';" : ""}
+					${!d1 ? `import { auth } from '${lib}/server/auth';` : ""}
 					${needsAPIError ? "import { APIError } from 'better-auth/api';" : ""}
 
 					export const load${ts(": PageServerLoad")} = (event) => {
@@ -6185,7 +6489,7 @@ var better_auth_default = defineAddon({
 					import { redirect } from '@sveltejs/kit';
 					${ts("import type { Actions } from './$types';")}
 					${ts("import type { PageServerLoad } from './$types';")}
-					${!d1 ? "import { auth } from '$lib/server/auth';" : ""}
+					${!d1 ? `import { auth } from '${lib}/server/auth';` : ""}
 
 					export const load${ts(": PageServerLoad")} = (event) => {
 						if (!event.locals.user) {
@@ -6352,7 +6656,7 @@ var drizzle_default = defineAddon({
 		runsAfter("experimental");
 		if (!isKit) return unsupported("Requires SvelteKit");
 	},
-	run: ({ sv, language, options, directory, dependencyVersion, cwd, cancel, file, packageManager }) => {
+	run: ({ sv, language, options, directory, dependencyVersion, cwd, cancel, file }) => {
 		const [ts] = createPrinter(language === "ts");
 		const baseDBPath = path.resolve(cwd, directory.lib, "server", "db");
 		const paths = {
@@ -6369,9 +6673,8 @@ var drizzle_default = defineAddon({
 		if (options.postgresql === "neon") sv.devDependency("@neondatabase/serverless", "^1.1.0");
 		if (options.postgresql === "postgres.js") sv.devDependency("postgres", "^3.4.9");
 		if (options.sqlite === "better-sqlite3") {
-			sv.dependency("better-sqlite3", "^12.10.0");
+			sv.dependency("better-sqlite3", "^13.0.2");
 			sv.devDependency("@types/better-sqlite3", "^7.6.13");
-			if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.allowBuilds("better-sqlite3"));
 		}
 		if (options.sqlite === "libsql" || options.sqlite === "turso") sv.devDependency("@libsql/client", "^0.17.3");
 		sv.file(".env", generateEnv(options, false));
@@ -6469,7 +6772,13 @@ var drizzle_default = defineAddon({
 					})
 				`) });
 		}));
-		svelteConfig.edit({
+		if (isKit3(dependencyVersion("@sveltejs/kit"))) {
+			const configFile = language === "ts" ? "tsconfig.json" : "jsconfig.json";
+			if (fileExists(cwd, configFile)) sv.file(configFile, transforms.json(({ data }) => {
+				const include = data.include ??= ["src"];
+				if (!include.includes(`drizzle.config.${language}`)) include.push(`drizzle.config.${language}`);
+			}));
+		} else svelteConfig.edit({
 			sv,
 			cwd
 		}, ({ override, js }) => {
@@ -6885,12 +7194,25 @@ const FEATURES = {
 		hint: "kit ^2 only",
 		inNext: false
 	},
-	handleRenderingErrors: { label: "rendering error boundaries" },
+	handleRenderingErrors: {
+		label: "rendering error boundaries",
+		hint: "kit ^2 only",
+		inNext: false
+	},
 	forkPreloads: {
 		label: "forked preloading",
 		off: true
 	}
 };
+const SOURCE_EXTENSIONS = [
+	".svelte",
+	".svelte.ts",
+	".svelte.js",
+	".ts",
+	".js",
+	".svx",
+	".md"
+];
 const KIT3_PEERS = {
 	vite: "^8.0.0",
 	"@sveltejs/vite-plugin-svelte": "^7.0.0",
@@ -6922,7 +7244,7 @@ var experimental_default = defineAddon({
 		required: false
 	}).build(),
 	setup: ({ runsAfter }) => runsAfter("sveltekitAdapter"),
-	run: ({ sv, cwd, options, language, dependencyVersion }) => {
+	run: ({ sv, cwd, options, language, directory, dependencyVersion }) => {
 		const kitNext = options.versions.includes("kit");
 		if (kitNext) {
 			sv.devDependency("@sveltejs/kit", "next");
@@ -6938,6 +7260,23 @@ var experimental_default = defineAddon({
 			};
 			for (const name of Object.keys(deps)) if (name.startsWith("@sveltejs/adapter-")) sv.devDependency(name, "next");
 		}
+		if (kitNext) {
+			for (const name of ["tsconfig.json", "jsconfig.json"]) {
+				if (!fileExists(cwd, name)) continue;
+				sv.file(name, transforms.json(({ data }) => {
+					data.extends = KIT3_TSCONFIG;
+					data.include ??= [directory.src];
+					for (const [key, value] of Object.entries(data.compilerOptions ?? {})) if (KIT3_TSCONFIG_DEFAULT[key] === value) delete data.compilerOptions[key];
+				}));
+			}
+			sv.file("package.json", transforms.json(({ data }) => {
+				data.imports = {
+					...libSubpathImports(directory.lib),
+					...data.imports
+				};
+			}));
+			for (const relative of sourceFiles(cwd, directory.src)) sv.file(relative, (content) => content.includes("$lib") ? content.replaceAll("$lib", "#lib") : false);
+		}
 		const config = {};
 		for (const [name, f] of Object.entries(FEATURES)) {
 			if (!options.features.includes(name)) continue;
@@ -6953,147 +7292,12 @@ var experimental_default = defineAddon({
 		}, ({ override }) => override(config));
 	}
 });
-var mcp_default = defineAddon({
-	id: "mcp",
-	shortDescription: "Svelte MCP",
-	homepage: "https://svelte.dev/docs/mcp",
-	options: defineAddonOptions().add("ide", {
-		question: "Which client would you like to use?",
-		type: "multiselect",
-		default: [],
-		options: [
-			{
-				value: "claude-code",
-				label: "claude code"
-			},
-			{
-				value: "cursor",
-				label: "Cursor"
-			},
-			{
-				value: "gemini",
-				label: "Gemini"
-			},
-			{
-				value: "opencode",
-				label: "opencode"
-			},
-			{
-				value: "vscode",
-				label: "VSCode"
-			},
-			{
-				value: "other",
-				label: "Other"
-			}
-		],
-		required: true
-	}).add("setup", {
-		question: "What setup would you like to use?",
-		type: "select",
-		default: "remote",
-		options: [{
-			value: "local",
-			label: "Local",
-			hint: "will use stdio"
-		}, {
-			value: "remote",
-			label: "Remote",
-			hint: "will use a remote endpoint"
-		}],
-		required: true,
-		condition: ({ ide }) => !(ide.length === 1 && ide.includes("opencode"))
-	}).build(),
-	run: ({ sv, options }) => {
-		const getLocalConfig = (o) => {
-			return {
-				...o?.typeLocal ? { type: o.typeLocal } : {},
-				command: o?.command ?? "npx",
-				...o?.env ? { env: {} } : {},
-				...o?.args === null ? {} : { args: o?.args ?? ["-y", "@sveltejs/mcp"] }
-			};
-		};
-		const getRemoteConfig = (o) => {
-			return {
-				...o?.typeRemote ? { type: o.typeRemote } : {},
-				url: "https://mcp.svelte.dev/mcp"
-			};
-		};
-		const configurator = {
-			"claude-code": {
-				agentPath: "CLAUDE.md",
-				configPath: ".mcp.json",
-				mcpOptions: {
-					typeLocal: "stdio",
-					typeRemote: "http",
-					env: true
-				}
-			},
-			cursor: {
-				agentPath: "AGENTS.md",
-				configPath: ".cursor/mcp.json",
-				mcpOptions: {}
-			},
-			gemini: {
-				agentPath: "GEMINI.md",
-				configPath: ".gemini/settings.json",
-				schema: "https://raw.githubusercontent.com/google-gemini/gemini-cli/main/schemas/settings.schema.json",
-				mcpOptions: {}
-			},
-			opencode: {
-				agentPath: "AGENTS.md",
-				configPath: ".opencode/opencode.json",
-				schema: "https://opencode.ai/config.json",
-				customData: { plugin: ["@sveltejs/opencode"] },
-				extraFiles: [{
-					path: ".opencode/svelte.json",
-					data: { $schema: "https://svelte.dev/opencode/schema.json" }
-				}]
-			},
-			vscode: {
-				agentPath: "AGENTS.md",
-				configPath: ".vscode/mcp.json",
-				mcpOptions: { serversKey: "servers" }
-			},
-			other: { other: true }
-		};
-		const filesAdded = [];
-		const filesExistingAlready = [];
-		const agentFile = getSharedFiles().filter((file) => file.include.includes("mcp")).find((file) => file.name === "AGENTS.md");
-		for (const ide of options.ide) {
-			const value = configurator[ide];
-			if (value === void 0) continue;
-			if ("other" in value) continue;
-			const { mcpOptions, agentPath, configPath, schema, customData, extraFiles } = value;
-			if (!filesAdded.includes(agentPath)) sv.file(agentPath, (content) => {
-				if (content) {
-					filesExistingAlready.push(agentPath);
-					return false;
-				}
-				filesAdded.push(agentPath);
-				return agentFile?.contents ?? "";
-			});
-			sv.file(configPath, transforms.json(({ data }) => {
-				if (schema) data["$schema"] = schema;
-				if (customData) for (const [key, value] of Object.entries(customData)) data[key] = value;
-				if (mcpOptions) {
-					const key = mcpOptions.serversKey ?? "mcpServers";
-					data[key] ??= {};
-					data[key].svelte = options.setup === "local" ? getLocalConfig(mcpOptions) : getRemoteConfig(mcpOptions);
-				}
-			}));
-			if (extraFiles) for (const extra of extraFiles) sv.file(extra.path, transforms.json(({ data }) => {
-				for (const [key, value] of Object.entries(extra.data)) data[key] = value;
-			}));
-		}
-		if (filesExistingAlready.length > 0) R$1.warn(`${filesExistingAlready.map((path) => color.path(path)).join(", ")} already exists, we didn't touch ${filesExistingAlready.length > 1 ? "them" : "it"}. See ${color.website("https://svelte.dev/docs/mcp/overview#Usage")} for manual setup.`);
-	},
-	nextSteps({ options }) {
-		const steps = [];
-		if (options.ide.includes("other")) steps.push(`For other clients: ${color.website(`https://svelte.dev/docs/mcp/${options.setup}-setup#Other-clients`)}`);
-		return steps;
-	}
-});
+/** Workspace-relative source files under `src`, for the `$lib` -> `#lib` rewrite. */
+function sourceFiles(cwd, src) {
+	const root = path.resolve(cwd, src);
+	if (!fs.existsSync(root)) return [];
+	return fs.readdirSync(root, { recursive: true }).map((entry) => path.join(src, entry)).filter((relative) => SOURCE_EXTENSIONS.some((ext) => relative.endsWith(ext)) && fs.statSync(path.resolve(cwd, relative)).isFile());
+}
 //#endregion
 //#region src/addons/mdsvex.ts
 var mdsvex_default = defineAddon({
@@ -7162,11 +7366,15 @@ var paraglide_default = defineAddon({
 	shortDescription: "i18n",
 	homepage: "https://inlang.com/m/gerre34r/library-inlang-paraglideJs",
 	options: options$3,
-	setup: ({ isKit, unsupported }) => {
+	setup: ({ isKit, unsupported, runsAfter }) => {
 		if (!isKit) unsupported("Requires SvelteKit");
+		runsAfter("experimental");
 	},
-	run: ({ sv, options, file, language, directory }) => {
+	run: ({ sv, options, file, language, directory, dependencyVersion }) => {
 		const [ts] = createPrinter(language === "ts");
+		const kitRange = dependencyVersion("@sveltejs/kit");
+		const lib = resolveLibPrefix(kitRange);
+		const pathType = isKit3(kitRange) ? "Path" : "Pathname";
 		const paraglideOutDir = `${directory.lib}/paraglide`;
 		sv.devDependency("@inlang/paraglide-js", "^2.18.2");
 		sv.file(file.viteConfig, transforms.script(({ ast, js }) => {
@@ -7183,7 +7391,7 @@ var paraglide_default = defineAddon({
 		}));
 		sv.file(`src/hooks.${language}`, transforms.script(({ ast, comments, js }) => {
 			js.imports.addNamed(ast, {
-				from: "$lib/paraglide/runtime",
+				from: `${lib}/paraglide/runtime`,
 				imports: ["deLocalizeUrl"]
 			});
 			const expression = js.common.parseExpression("(request) => deLocalizeUrl(request.url).pathname");
@@ -7206,11 +7414,11 @@ var paraglide_default = defineAddon({
 		}));
 		sv.file(`src/hooks.server.${language}`, transforms.script(({ ast, comments, js }) => {
 			js.imports.addNamed(ast, {
-				from: "$lib/paraglide/server",
+				from: `${lib}/paraglide/server`,
 				imports: ["paraglideMiddleware"]
 			});
 			js.imports.addNamed(ast, {
-				from: "$lib/paraglide/runtime",
+				from: `${lib}/paraglide/runtime`,
 				imports: ["getTextDirection"]
 			});
 			js.kit.addHooksHandle(ast, {
@@ -7250,7 +7458,7 @@ var paraglide_default = defineAddon({
 		sv.file(`${directory.kitRoutes}/+layout.svelte`, transforms.svelteScript({ language }, ({ ast, svelte, js }) => {
 			js.imports.addNamed(ast.instance.content, {
 				imports: ["locales", "localizeHref"],
-				from: "$lib/paraglide/runtime"
+				from: `${lib}/paraglide/runtime`
 			});
 			js.imports.addNamed(ast.instance.content, {
 				imports: ["page"],
@@ -7261,14 +7469,14 @@ var paraglide_default = defineAddon({
 				from: "$app/paths"
 			});
 			if (language === "ts") js.imports.addNamed(ast.instance.content, {
-				imports: ["Pathname"],
+				imports: [pathType],
 				from: "$app/types",
 				isType: true
 			});
 			svelte.addFragment(ast, dedent`
 						<div style="display:none">
 							{#each locales as locale (locale)}
-								<a href={resolve(localizeHref(page.url.pathname, { locale })${ts(" as Pathname")})}>{locale}</a>
+								<a href={resolve(localizeHref(page.url.pathname, { locale })${ts(` as ${pathType}`)})}>{locale}</a>
 							{/each}
 						</div>`, { language });
 		}));
@@ -7277,11 +7485,11 @@ var paraglide_default = defineAddon({
 			sv.file(`${directory.kitRoutes}/demo/paraglide/+page.svelte`, transforms.svelteScript({ language }, ({ ast, svelte, js }) => {
 				js.imports.addNamed(ast.instance.content, {
 					imports: { m: "m" },
-					from: "$lib/paraglide/messages.js"
+					from: `${lib}/paraglide/messages.js`
 				});
 				js.imports.addNamed(ast.instance.content, {
 					imports: { setLocale: "setLocale" },
-					from: "$lib/paraglide/runtime"
+					from: `${lib}/paraglide/runtime`
 				});
 				let templateCode = "<h1>{m.hello_world({ name: 'SvelteKit User' })}</h1>";
 				const { validLanguageTags } = parseLanguageTagInput(options.languageTags);
@@ -7559,7 +7767,7 @@ var sveltekit_adapter_default = defineAddon({
 		});
 		if (adapter.package === "@sveltejs/adapter-cloudflare") {
 			sv.devDependency("wrangler", "^4.97.0");
-			if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.allowBuilds("workerd", "sharp"));
+			if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.allowBuilds("workerd"));
 			const ext = fileExists(cwd, "wrangler.toml") ? "toml" : "jsonc";
 			const applyWranglerConfig = (data) => {
 				if (ext === "jsonc") data.$schema ??= "./node_modules/wrangler/config-schema.json";
@@ -7635,11 +7843,10 @@ var tailwindcss_default = defineAddon({
 		default: [],
 		required: false
 	}).build(),
-	run: ({ sv, options, file, isKit, directory, dependencyVersion, language, packageManager }) => {
+	run: ({ sv, options, file, isKit, directory, dependencyVersion, language }) => {
 		const prettierInstalled = Boolean(dependencyVersion("prettier"));
 		sv.devDependency("tailwindcss", "^4.3.0");
 		sv.devDependency("@tailwindcss/vite", "^4.3.0");
-		if (packageManager === "pnpm") sv.file(file.findUp("pnpm-workspace.yaml"), pnpm.allowBuilds("@tailwindcss/oxide"));
 		if (prettierInstalled) sv.devDependency("prettier-plugin-tailwindcss", "^0.8.0");
 		for (const plugin of plugins) {
 			if (!options.plugins.includes(plugin.id)) continue;
@@ -7877,7 +8084,7 @@ const officialAddons$1 = {
 	mdsvex: mdsvex_default,
 	paraglide: paraglide_default,
 	storybook: storybook_default,
-	mcp: mcp_default,
+	aiTools: ai_tools_default,
 	experimental: experimental_default
 };
 function getAddonDetails(id) {
@@ -10693,50 +10900,61 @@ async function formatFiles(options) {
 	const { start, stop } = vt();
 	start("Formatting modified files");
 	const args = [
-		"prettier",
 		"--write",
 		"--ignore-unknown",
 		...options.filesToFormat
 	];
-	const cmd = resolveCommand(options.packageManager, "execute-local", args);
+	let result = await run("prettier", args, options.cwd);
+	if (result.notFound) {
+		const cmd = resolveCommand(options.packageManager, "execute-local", ["prettier", ...args]);
+		result = await run(cmd.command, cmd.args, options.cwd);
+	}
+	if (result.error !== void 0) {
+		stop("Failed to format files");
+		R$1.error(result.error);
+		return;
+	}
+	stop("Successfully formatted modified files");
+}
+async function run(command, args, cwd) {
 	try {
-		const result = await z(cmd.command, cmd.args, {
+		await z(command, args, {
 			nodeOptions: {
-				cwd: options.cwd,
+				cwd,
 				stdio: "pipe"
 			},
 			throwOnError: true
 		});
-		if (result.exitCode !== 0) {
-			stop("Failed to format files");
-			R$1.error(result.stderr);
-			return;
-		}
+		return {};
 	} catch (e) {
-		stop("Failed to format files");
-		R$1.error(e?.output?.stderr || "unknown error");
-		return;
+		if (e?.code === "ENOENT") return {
+			notFound: true,
+			error: `${command} not found`
+		};
+		const output = e?.output;
+		return { error: [output?.stderr, output?.stdout].filter(Boolean).join("\n").trim() || (e instanceof Error ? e.message : "unknown error") };
 	}
-	stop("Successfully formatted modified files");
 }
 //#endregion
 //#region src/core/package-manager.ts
 const AGENT_NAMES = AGENTS.filter((agent) => !agent.includes("@"));
-const agentOptions = AGENT_NAMES.map((pm) => ({
-	value: pm,
-	label: pm
-}));
-agentOptions.unshift({
-	label: "None",
-	value: void 0
-});
 const installOption = new Option("--install <package-manager>", "installs dependencies with a specified package manager").choices(AGENT_NAMES);
 async function packageManagerPrompt(cwd) {
 	const agent = (await detect({ cwd }))?.name ?? getUserAgent();
 	if (!V.stdout.isTTY) return agent;
 	const pm = await Ee({
 		message: "Which package manager do you want to install dependencies with?",
-		options: agentOptions,
+		options: [{
+			label: "None",
+			value: void 0
+		}, ...AGENT_NAMES.map((agent) => {
+			const installed = isInstalled(agent);
+			return {
+				value: agent,
+				label: installed ? agent : color.dim(`${agent} (not installed)`),
+				installed
+			};
+		}).sort((a, b) => Number(b.installed) - Number(a.installed))],
 		initialValue: agent
 	});
 	if (R$2(pm)) {
@@ -10745,7 +10963,12 @@ async function packageManagerPrompt(cwd) {
 	}
 	return pm;
 }
+/** Returns `false` when the package manager isn't installed and the install was skipped. */
 async function installDependencies(agent, cwd) {
+	if (!isInstalled(agent)) {
+		R$1.warn(`${color.command(agent)} is not installed, skipping dependency installation.`);
+		return false;
+	}
 	const task = Pe({
 		title: `Installing dependencies with ${color.command(agent)}...`,
 		limit: Math.ceil(V.stdout.rows / 2),
@@ -10769,12 +10992,12 @@ async function installDependencies(agent, cwd) {
 	} catch {}
 	if ((proc.exitCode ?? 0) === 0) {
 		task.success(`Successfully installed dependencies with ${color.command(agent)}`);
-		return;
+		return true;
 	}
 	if (agent === "pnpm" && output.join("\n").includes("ERR_PNPM_IGNORED_BUILDS")) {
 		task.success(`Installed dependencies with ${color.command(agent)}`);
 		R$1.warn(`Some build scripts were skipped. Run ${color.command(`${agent} approve-builds`)} to approve them.`);
-		return;
+		return true;
 	}
 	task.error("Failed to install dependencies");
 	ge("Operation failed.");
@@ -10791,6 +11014,20 @@ function getUserAgent() {
 	const name = pmSpec.substring(0, separatorPos);
 	return AGENTS.includes(name) ? name : void 0;
 }
+const installedCache = /* @__PURE__ */ new Map();
+function isInstalled(agent) {
+	let installed = installedCache.get(agent);
+	if (installed === void 0) {
+		try {
+			B(agent, ["--version"], { nodeOptions: { stdio: "ignore" } });
+			installed = true;
+		} catch {
+			installed = false;
+		}
+		installedCache.set(agent, installed);
+	}
+	return installed;
+}
 function addPnpmAllowBuilds(cwd, packageManager, ...packages) {
 	if (packageManager !== "pnpm" || packages.length === 0) return;
 	const found = up$1("pnpm-workspace.yaml", { cwd });
@@ -11225,7 +11462,7 @@ const create = new Command("create").description("Scaffold a new project (--add
 		V.exit(1);
 	}
 	runCommand(async () => {
-		const { directory, addOnNextSteps, packageManager } = await createProject(cwd, options);
+		const { directory, addOnNextSteps, packageManager, depsInstalled } = await createProject(cwd, options);
 		let i = 1;
 		const initialSteps = ["📁 Project steps", ""];
 		const relative = path.relative(V.cwd(), directory);
@@ -11234,7 +11471,8 @@ const create = new Command("create").description("Scaffold a new project (--add
 			const pathHasSpaces = relative.includes(" ");
 			initialSteps.push(`  ${i++}: ${color.command(`cd ${pathHasSpaces ? `"${relative}"` : relative}`)}`);
 		}
-		if (!packageManager) initialSteps.push(`  ${i++}: ${color.command(resolveCommandArray(pm, "install", []))}`);
+		if (packageManager && !depsInstalled) initialSteps.push(`  ${i++}: Install ${color.command(pm)}`);
+		if (!packageManager || !depsInstalled) initialSteps.push(`  ${i++}: ${color.command(resolveCommandArray(pm, "install", []))}`);
 		const steps = [
 			...initialSteps,
 			`  ${i++}: ${color.command(resolveCommandArray(pm, "run", ["dev", "--open"]))}`,
@@ -11410,18 +11648,20 @@ async function createProject(cwd, options) {
 	updateAgent(directory, language, packageManager ?? "npm", loadedAddons);
 	const addOnNextSteps = getNextSteps(addOnSuccessfulAddons, workspace, answers, addonSetupResults);
 	addPnpmAllowBuilds(projectPath, packageManager, "esbuild");
+	let depsInstalled = false;
 	if (packageManager) {
-		await installDependencies(packageManager, projectPath);
-		await formatFiles({
+		depsInstalled = await installDependencies(packageManager, projectPath);
+		if (depsInstalled) await formatFiles({
 			packageManager,
 			cwd: projectPath,
-			filesToFormat: addOnFilesToFormat
+			filesToFormat: addOnSuccessfulAddons.some((addon) => addon.addon.id === "prettier") ? ["."] : addOnFilesToFormat
 		});
 	}
 	return {
 		directory: projectPath,
 		addOnNextSteps,
-		packageManager
+		packageManager,
+		depsInstalled
 	};
 }
 async function createProjectFromPlayground(url, cwd) {
@@ -11713,9 +11953,9 @@ async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 	}
 	for (const loaded of addons) answers[loaded.addon.id] ??= {};
 	let setupResults = {};
-	if (addons.length > 0) setupResults = setupAddons(addons, workspace);
+	if (addons.length > 0) setupResults = await setupAddons(addons, workspace);
 	if (addons.length === 0) {
-		const results = setupAddons(officialAddons.map((a) => createLoadedAddon(a)), workspace);
+		const results = await setupAddons(officialAddons.map((a) => createLoadedAddon(a)), workspace);
 		const addonOptions = officialAddons.filter(({ id, hidden }) => results[id].unsupported.length === 0 && !hidden).map(({ id, homepage, shortDescription }) => ({
 			label: id,
 			value: id,
@@ -11735,11 +11975,11 @@ async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 			addons.push(createLoadedAddon(addon));
 			answers[id] = {};
 		}
-		setupResults = setupAddons(addons, workspace);
+		setupResults = await setupAddons(addons, workspace);
 	}
 	const missingSetupResults = addons.filter((a) => !setupResults[a.addon.id]);
 	if (missingSetupResults.length > 0) {
-		const additionalSetupResults = setupAddons(missingSetupResults, workspace);
+		const additionalSetupResults = await setupAddons(missingSetupResults, workspace);
 		Object.assign(setupResults, additionalSetupResults);
 	}
 	const dependencyChains = /* @__PURE__ */ new Map();
@@ -11779,7 +12019,7 @@ async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 		}
 		const newlyAddedAddons = addons.filter((a) => !setupResults[a.addon.id]);
 		if (newlyAddedAddons.length > 0) {
-			const newSetupResults = setupAddons(newlyAddedAddons, workspace);
+			const newSetupResults = await setupAddons(newlyAddedAddons, workspace);
 			Object.assign(setupResults, newSetupResults);
 		}
 	}
@@ -11851,7 +12091,7 @@ async function promptAddonQuestions({ options, loadedAddons, workspace }) {
 	};
 }
 async function runAddonsApply({ answers, options, loadedAddons, setupResults, workspace, fromCommand }) {
-	if (!setupResults) setupResults = setupAddons(loadedAddons.length ? loadedAddons : officialAddons.map((a) => createLoadedAddon(a)), workspace);
+	if (!setupResults) setupResults = await setupAddons(loadedAddons.length ? loadedAddons : officialAddons.map((a) => createLoadedAddon(a)), workspace);
 	if (loadedAddons.length === 0) return {
 		nextSteps: [],
 		argsFormattedAddons: [],
@@ -11910,17 +12150,20 @@ async function runAddonsApply({ answers, options, loadedAddons, setupResults, wo
 		if (!options.gitCheck) argsFormattedAddons.push("--no-git-check");
 		buildAndLogArgs(packageManager, "add", argsFormattedAddons);
 	}
+	let depsInstalled = true;
 	if (packageManager) {
 		workspace.packageManager = packageManager;
-		await installDependencies(packageManager, options.cwd);
-		await formatFiles({
+		depsInstalled = await installDependencies(packageManager, options.cwd);
+		if (depsInstalled) await formatFiles({
 			packageManager,
 			cwd: options.cwd,
 			filesToFormat
 		});
 	}
+	const nextSteps = getNextSteps(successfulAddons, workspace, answers, setupResults);
+	if (packageManager && !depsInstalled) nextSteps.unshift(`Install ${color.command(packageManager)}, then run ${color.command(resolveCommandArray(packageManager, "install", []))}`);
 	return {
-		nextSteps: getNextSteps(successfulAddons, workspace, answers, setupResults),
+		nextSteps,
 		argsFormattedAddons,
 		filesToFormat,
 		successfulAddons,
@@ -12133,7 +12376,7 @@ async function add({ addons, cwd, options, packageManager = "npm" }) {
 		loadedAddons,
 		workspace,
 		options,
-		setupResults: setupAddons(loadedAddons, workspace)
+		setupResults: await setupAddons(loadedAddons, workspace)
 	});
 }
 async function applyAddons({ loadedAddons, workspace, setupResults, options }) {
@@ -12176,29 +12419,35 @@ async function applyAddons({ loadedAddons, workspace, setupResults, options }) {
 	};
 }
 /** Setup addons - takes LoadedAddon[] and returns setup results */
-function setupAddons(loadedAddons, workspace) {
+async function setupAddons(loadedAddons, workspace) {
 	const setupResults = {};
 	for (const loaded of loadedAddons) {
 		const addon = loaded.addon;
+		const additionalOptions = {};
 		const setupResult = {
 			unsupported: [],
 			dependsOn: [],
-			runsAfter: []
+			runsAfter: [],
+			additionalOptions
 		};
 		try {
-			addon.setup?.({
+			await addon.setup?.({
 				...workspace,
 				dependsOn: (name) => {
 					setupResult.dependsOn.push(name);
 					setupResult.runsAfter.push(name);
 				},
 				unsupported: (reason) => setupResult.unsupported.push(reason),
-				runsAfter: (name) => setupResult.runsAfter.push(name)
+				runsAfter: (name) => setupResult.runsAfter.push(name),
+				addOption: (key, question) => {
+					additionalOptions[key] = question;
+				}
 			});
 		} catch (err) {
 			const msg = err instanceof Error ? err.message : String(err);
 			throw new Error(`Add-on '${addon.id}' failed during setup: ${msg}\n\n${getErrorHint(loaded.reference.source)}`, { cause: err });
 		}
+		if (Object.keys(additionalOptions).length > 0) Object.assign(addon.options, additionalOptions);
 		setupResults[addon.id] = setupResult;
 	}
 	return setupResults;
@@ -12285,10 +12534,30 @@ async function runAddon({ addon, loaded, multiple, workspace, workspaceOptions }
 		cancels
 	};
 }
+/**
+* Orders add-ons so every `runsAfter` is honoured, keeping the original order between add-ons that
+* don't constrain each other. Cycles and unknown ids are ignored rather than fatal - an add-on that
+* can't be placed simply keeps its position.
+*/
 function orderAddons(addons, setupResults) {
-	return addons.sort((a, b) => {
-		return setupResults[a.id]?.runsAfter?.length - setupResults[b.id]?.runsAfter?.length;
-	});
+	const byId = new Map(addons.map((addon) => [addon.id, addon]));
+	const ordered = [];
+	const placed = /* @__PURE__ */ new Set();
+	const visiting = /* @__PURE__ */ new Set();
+	const place = (addon) => {
+		if (placed.has(addon.id) || visiting.has(addon.id)) return;
+		visiting.add(addon.id);
+		for (const id of setupResults[addon.id]?.runsAfter ?? []) {
+			const dependency = byId.get(id);
+			if (dependency) place(dependency);
+		}
+		visiting.delete(addon.id);
+		placed.add(addon.id);
+		ordered.push(addon);
+	};
+	const seeded = [...addons].sort((a, b) => (setupResults[a.id]?.runsAfter?.length ?? 0) - (setupResults[b.id]?.runsAfter?.length ?? 0));
+	for (const addon of seeded) place(addon);
+	return ordered;
 }
 //#endregion
 export { __toESM as S, name as _, detectPackageManager as a, __commonJSMin as b, defineAddonOptions as c, Command as d, R as f, helpConfig as g, forwardExitCode as h, addPnpmAllowBuilds as i, from as l, create$1 as m, add$1 as n, officialAddons$1 as o, z as p, create as r, defineAddon as s, add as t, program as u, version as v, __require as x, svDeprecated as y };