void 0.25.0 → 0.26.1

package/dist/{init-DT7yuuyl.mjs → init-Bw-fRKGp.mjs}

@@ -1,26 +1,27 @@
 import { a as join, i as isAbsolute, l as relative, n as dirname, t as basename, u as resolve } from "./dist-BVqXeR_h.mjs";
-import { r as detectFramework } from "./plugin-inference-CXWnn79A.mjs";
+import { r as detectFramework } from "./plugin-inference-BlQbOL0P.mjs";
 import { n as readProjectPaths, o as TYPED_CONFIG_FILE } from "./project-paths-GgcMozYz.mjs";
-import { m as readConfig, u as getDatabaseDialect } from "./config-Br_JZD6u.mjs";
-import { l as writeProjectConfig, n as readDeploymentPlatform, r as readProjectConfig, s as writeDeploymentPlatform, t as attachSelectedPlatform } from "./project-BkbfDs0V.mjs";
-import { r as materializeCloudflareConfig } from "./cloudflare-config-Bktvwtpf.mjs";
-import { A as writeProvisionedWranglerConfig, i as LATEST_KNOWN_COMPAT_DATE } from "./wrangler-DhUerFkW.mjs";
-import { c as getToken } from "./auth-7wuZ5ob8.mjs";
-import { n as parseDotenvFile, t as expandDotenv } from "./dotenv-VQxupEUv.mjs";
-import { n as ensureProjectTsconfig, t as createProjectTsconfig } from "./project-tsconfig-B8GeM0RM.mjs";
-import { t as MagicString } from "./dist-AoCzRTJE.mjs";
-import { A as confirm, B as note, H as outro, K as select, L as log, O as cancel, X as text, tt as isCancel } from "./prompts-6OSVA7DJ.mjs";
+import { m as readConfig, u as getDatabaseDialect } from "./config-DiowPT80.mjs";
+import { l as writeProjectConfig, n as readDeploymentPlatform, r as readProjectConfig, s as writeDeploymentPlatform, t as attachSelectedPlatform } from "./project-DQstYTxO.mjs";
+import { r as materializeCloudflareConfig } from "./cloudflare-config-BmhBv3HV.mjs";
+import { i as LATEST_KNOWN_COMPAT_DATE, j as writeProvisionedWranglerConfig } from "./wrangler-D9KTuqnv.mjs";
+import { c as getToken } from "./auth-B5_tZLxT.mjs";
+import { A as confirm, K as select, L as log, O as cancel, X as text, tt as isCancel } from "./dist-D3m88sjf.mjs";
+import { d as printSuccess, u as note } from "./output-C50ag2r3.mjs";
+import { n as ensureProjectTsconfig, t as createProjectTsconfig } from "./project-tsconfig-CVJhNMxs.mjs";
+import { t as MagicString } from "./dist-Cegxq8gs.mjs";
+import { t as parseDotenvFile } from "./dotenv-BfU6eqFt.mjs";
 import { n as getPackageDir, t as detectAgents } from "./agents-B_pX_HmQ.mjs";
-import { r as PlatformClient } from "./client-RsPo8wsP.mjs";
-import { i as migrateFrameworkAdapterPaths, t as migrateLegacyVoidConfig } from "./migrate-CV1on-yJ.mjs";
-import { o as formatProjectCommand } from "./cloudflare-process-B-wekeR6.mjs";
-import { a as promptProjectSelection, r as promptAndCreateProject } from "./create-project-eAPgYq35.mjs";
-import { t as writeDrizzleConfig } from "./config-D8MOgiQV.mjs";
-import { n as writeVoidProjectConfig, t as canRewriteVoidProjectConfig } from "./config-write-B1f88wJA.mjs";
-import { t as promptForLoginToken } from "./login-pWQHYVu2.mjs";
-import { i as saveDiscoveredPlatform, t as discoverPlatform } from "./platform-cmd-D7vSWMvV.mjs";
-import { t as connectCloudflare } from "./cloudflare-connect-CuhRgk3k.mjs";
-import { n as findInstalledYarnPnpRuntime, r as hasLocalLockfile, t as buildDrizzleKitSpawnEnv } from "./yarn-pnp-BV4AzNul.mjs";
+import { r as PlatformClient } from "./client-C2Prx_Bi.mjs";
+import { i as migrateFrameworkAdapterPaths, t as migrateLegacyVoidConfig } from "./migrate-NLsjBbuM.mjs";
+import { s as formatProjectCommand } from "./cloudflare-process-2-TfIEzB.mjs";
+import { a as promptProjectSelection, r as promptAndCreateProject } from "./create-project-DxiyW6iX.mjs";
+import { n as writeDrizzleConfig } from "./config-CLYAosnQ.mjs";
+import { n as writeVoidProjectConfig, t as canRewriteVoidProjectConfig } from "./config-write-AHGesphx.mjs";
+import { t as promptForLoginToken } from "./login-D-Q4xw3Q.mjs";
+import { i as saveDiscoveredPlatform, t as discoverPlatform } from "./platform-cmd-B8-bCb7t.mjs";
+import { t as connectCloudflare } from "./cloudflare-connect-2G3rL2rP.mjs";
+import { n as findInstalledYarnPnpRuntime, r as hasLocalLockfile, t as buildDrizzleKitSpawnEnv } from "./yarn-pnp-CUX_iTPA.mjs";
 import { createRequire } from "node:module";
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmdirSync, unlinkSync, writeFileSync } from "node:fs";
 import { fileURLToPath } from "node:url";
@@ -29,13 +30,6 @@ import { parse } from "jsonc-parser";
 import { parseArgs } from "node:util";
 import { spawnSync } from "node:child_process";
 //#region src/cli/deploy-setup.ts
-async function ensureToken(root) {
-	const existing = getToken(root);
-	if (existing) return existing;
-	const token = await promptForLoginToken(root);
-	log.success("Token saved.");
-	return token;
-}
 async function maybeSetupDeployProject(root) {
 	const existing = readProjectConfig(root);
 	if (existing) {
@@ -49,7 +43,11 @@ async function maybeSetupDeployProject(root) {
 		process.exit(0);
 	}
 	if (!shouldSetup) return null;
-	const token = existingToken ?? await ensureToken(root);
+	let token = existingToken;
+	if (!token) {
+		token = await promptForLoginToken(root);
+		log.step("Token saved.");
+	}
 	const client = new PlatformClient(token, { root });
 	const projects = await client.listProjects();
 	if (projects.length === 0) return promptAndCreateProject(root, client);
@@ -60,7 +58,7 @@ async function maybeSetupDeployProject(root) {
 			slug: result.project.slug
 		};
 		writeProjectConfig(root, attachSelectedPlatform(root, config, client.apiUrl));
-		log.success(`Linked project: ${config.slug}`);
+		log.step(`Linked project: ${config.slug}`);
 		return config;
 	}
 	return promptAndCreateProject(root, client);
@@ -78,8 +76,6 @@ async function maybeSetupDeployProject(root) {
 * This is a best-effort DX sweetener, not a correctness boundary — a
 * wrong guess only costs the user a single-line edit.
 */
-/** Void has one local dotenv source. */
-const SCAFFOLD_SOURCE_FILES = [".env"];
 const BOOLEAN_LITERAL = /^(true|false)$/i;
 const HTTP_URL = /^https?:\/\/\S+$/;
 const SMALL_INTEGER = /^(?:0|[1-9]\d{0,4})$/;
@@ -97,34 +93,13 @@ function inferHelperForValue(value) {
 	if (SMALL_INTEGER.test(trimmed)) return "number";
 	return "string";
 }
-/** Collect a deduped list of inferred entries from the dotenv files we find. */
+/** Collect the inferred entries from the local `.env`, sorted by key. */
 function collectInferredEntries(root) {
-	const seen = /* @__PURE__ */ new Map();
-	const cumulative = {};
-	for (const file of SCAFFOLD_SOURCE_FILES) {
-		const parsed = parseDotenvFile(join(root, file), { expand: false });
-		const expansionView = {
-			...parsed,
-			...cumulative
-		};
-		const expanded = expandDotenv(expansionView);
-		for (const key of Object.keys(parsed)) {
-			const value = expanded[key] ?? "";
-			if (!(key in cumulative)) cumulative[key] = parsed[key];
-			const existing = seen.get(key);
-			if (!existing) seen.set(key, {
-				key,
-				helper: inferHelperForValue(value),
-				sampleValue: value || void 0
-			});
-			else if (!existing.sampleValue && value) seen.set(key, {
-				key,
-				helper: inferHelperForValue(value),
-				sampleValue: value
-			});
-		}
-	}
-	return [...seen.values()].sort((a, b) => a.key.localeCompare(b.key));
+	const values = parseDotenvFile(join(root, ".env"));
+	return Object.keys(values).sort((a, b) => a.localeCompare(b)).map((key) => ({
+		key,
+		helper: inferHelperForValue(values[key])
+	}));
 }
 /**
 * Render the scaffolded `env.ts` body. The imports are pulled in lazily
@@ -164,27 +139,17 @@ function renderEnvTs(entries) {
 * no-ops when `env.ts` is present. Never overwrites an existing file.
 */
 function maybeScaffoldEnvTs(root) {
-	for (const candidate of [
-		"env.ts",
-		"env.mts",
-		"env.js",
-		"env.mjs"
-	]) if (existsSync(join(root, candidate))) return {
-		written: null,
-		skipReason: "env-ts-exists",
-		entries: []
-	};
-	for (const candidate of [
-		"src/env.ts",
-		"src/env.mts",
-		"src/env.js",
-		"src/env.mjs"
-	]) if (existsSync(join(root, candidate))) return {
+	for (const dir of ["", "src/"]) for (const ext of [
+		"ts",
+		"mts",
+		"js",
+		"mjs"
+	]) if (existsSync(join(root, `${dir}env.${ext}`))) return {
 		written: null,
 		skipReason: "env-ts-exists",
 		entries: []
 	};
-	if (!SCAFFOLD_SOURCE_FILES.some((f) => existsSync(join(root, f)))) return {
+	if (!existsSync(join(root, ".env"))) return {
 		written: null,
 		skipReason: "no-dotenv-files",
 		entries: []
@@ -776,7 +741,6 @@ function parseInitArgs(args) {
 			options: {
 				tsconfig: { type: "boolean" },
 				github: { type: "boolean" },
-				agents: { type: "boolean" },
 				git: { type: "boolean" }
 			},
 			allowNegative: true,
@@ -789,7 +753,6 @@ function parseInitArgs(args) {
 	return {
 		tsconfig: parsed.values.tsconfig === true,
 		github: parsed.values.github === true,
-		agents: parsed.values.agents === true,
 		git: parsed.values.git
 	};
 }
@@ -919,12 +882,15 @@ function getOwnConfigBaseUrlDir(config, configDir) {
 	const compilerOptions = asRecord(config.compilerOptions);
 	return compilerOptions && typeof compilerOptions.baseUrl === "string" ? resolve(configDir, compilerOptions.baseUrl) : null;
 }
+function readExtends(config) {
+	return typeof config.extends === "string" ? [config.extends] : Array.isArray(config.extends) ? config.extends.filter((value) => typeof value === "string") : [];
+}
 function getEffectiveConfigBaseUrlDir(config, configPath, seen) {
 	if (seen.has(configPath)) return null;
 	seen.add(configPath);
 	const ownBaseUrl = getOwnConfigBaseUrlDir(config, dirname(configPath));
 	if (ownBaseUrl) return ownBaseUrl;
-	const extendsValues = typeof config.extends === "string" ? [config.extends] : Array.isArray(config.extends) ? config.extends.filter((value) => typeof value === "string") : [];
+	const extendsValues = readExtends(config);
 	let inheritedBaseUrl = null;
 	for (const extendsValue of extendsValues) {
 		const extendedPath = resolveExtendedTsconfig(configPath, extendsValue);
@@ -984,7 +950,7 @@ function collectTsconfigPatchFromConfig(config, configPath, root, outputBaseDir,
 	};
 	if (seen.has(configPath)) return patch;
 	seen.add(configPath);
-	const extendsValues = typeof config.extends === "string" ? [config.extends] : Array.isArray(config.extends) ? config.extends.filter((value) => typeof value === "string") : [];
+	const extendsValues = readExtends(config);
 	const hasOwnFiles = Array.isArray(config.files);
 	const compilerOptions = asRecord(config.compilerOptions);
 	const hasOwnPaths = asRecord(compilerOptions?.paths) !== null;
@@ -1139,7 +1105,7 @@ function parsePackageManagerField(pkg) {
 * pnpm markers is still pnpm-managed if the enclosing workspace root has
 * `pnpm-workspace.yaml`, a `pnpm-lock.yaml`, or `packageManager: pnpm@...`.
 *
-* Round 33: local non-pnpm signals MUST outrank the ancestor walk. A bun
+* Local non-pnpm signals MUST outrank the ancestor walk. A bun
 * or yarn subproject nested under a pnpm workspace ancestor is still
 * bun/yarn — its local `bun.lockb` / `yarn.lock` / `package-lock.json` or
 * a local Corepack pin for bun/yarn/npm proves the ancestor's pnpm shape
@@ -1153,7 +1119,7 @@ function isPnpmProject(root, pkg) {
 	const localPm = parsePackageManagerField(pkg);
 	if (localPm === "pnpm") return true;
 	if (localPm === "bun" || localPm === "yarn" || localPm === "npm") return false;
-	if (existsSync(join(root, "bun.lockb")) || existsSync(join(root, "bun.lock")) || existsSync(join(root, "yarn.lock")) || existsSync(join(root, "package-lock.json"))) return false;
+	if (hasLocalLockfile(root)) return false;
 	return hasAncestorPnpmMarkers(root);
 }
 /**
@@ -1162,14 +1128,13 @@ function isPnpmProject(root, pkg) {
 * workspace root is pnpm-managed even when the subpackage has no local
 * pnpm signals.
 *
-* Round 43: an ancestor `pnpm-workspace.yaml` / `pnpm-lock.yaml` /
+* An ancestor `pnpm-workspace.yaml` / `pnpm-lock.yaml` /
 * Corepack pnpm pin alone is NOT proof that `start` is governed by
 * that repo's pnpm install. A scratch app nested under a pnpm
 * monorepo is a separate project when its path doesn't match the
-* workspace globs. Previously this returned `true` too eagerly, and
-* `ensureVoidDependency` / `scaffoldPagesApp` then treated it like a
-* workspace member even though the subsequent local install used the
-* standalone fallback path.
+* workspace globs; treating it as a member would make
+* `ensureVoidDependency` / `scaffoldPagesApp` disagree with the local
+* install, which uses the standalone fallback path.
 *
 * Delegate workspace membership to `findWorkspaceRoot` +
 * `isWorkspaceSubpackage` — the same check used by the
@@ -1204,14 +1169,13 @@ function hasAncestorPnpmMarkers(start) {
 * subpackage's `package.json` (or verified it was already there), and
 * under PnP the workspace-root install is what wires up resolution.
 *
-* Round 40: a committed-but-unfetched `.pnp.cjs` is NOT proof that
+* A committed-but-unfetched `.pnp.cjs` is NOT proof that
 * `yarn install` has run. Yarn Berry repos commonly commit `.pnp.cjs`
 * but gitignore `.yarn/cache/*.zip` (zero-install is opt-in), so a
 * fresh clone has the runtime file on disk while the archives it
 * points at are missing. The stricter `findInstalledYarnPnpRuntime`
-* also requires `<pnp-root>/.yarn/install-state.gz` — Yarn's canonical
-* post-install marker, gitignored by convention — as proof that yarn
-* install has actually populated the archives. Without that marker,
+* also requires a post-install marker next to the runtime
+* (`.yarn/install-state.gz` or a populated `.yarn/cache`). Without it,
 * we fall through and return false so the caller triggers the install
 * step before attempting to spawn drizzle-kit.
 */
@@ -1304,12 +1268,8 @@ function readWorkspacePatterns(workspaceRoot) {
 * whitespace (or is the first column) AND it is not inside a quoted
 * scalar. Flow-style inline quoting is handled by a plain state machine
 * — no escape sequence support, because real-world workspace globs
-* never contain escaped quotes.
-*
-* This replaces the original `/\s+#.*$/` strip which was greedy and
-* would truncate legitimate quoted values like `- "path #hash/*"`,
-* leaving a broken glob that silently failed
-* `isWorkspaceSubpackage` membership.
+* never contain escaped quotes. A naive `/\s+#.*$/` strip would
+* truncate quoted values like `- "path #hash/*"`.
 */
 function stripYamlLineComment(line) {
 	let inSingle = false;
@@ -1540,13 +1500,14 @@ function detectProjectState(root) {
 		if (field === "pnpm" || field === "yarn" || field === "bun") packageManager = field;
 		else packageManager = "npm";
 	}
+	const paths = readProjectPaths(root);
 	return {
 		hasTypescript,
 		hasTsconfig: existsSync(join(root, "tsconfig.json")),
 		hasGithubWorkflows: existsSync(join(root, ".github", "workflows")),
-		hasRoutes: existsSync(readProjectPaths(root).routesDir),
-		hasMigrations: existsSync(readProjectPaths(root).migrationsDir) || existsSync(join(root, "migrations")),
-		hasPages: existsSync(readProjectPaths(root).pagesDir),
+		hasRoutes: existsSync(paths.routesDir),
+		hasMigrations: existsSync(paths.migrationsDir) || existsSync(join(root, "migrations")),
+		hasPages: existsSync(paths.pagesDir),
 		packageManager,
 		typescriptWanted: hasTypescript
 	};
@@ -1559,15 +1520,12 @@ function hasDrizzleSchema(root) {
 	return existsSync(paths.schemaFile) || existsSync(paths.schemaDir);
 }
 function detectPagesFramework(root) {
-	try {
-		const pkg = JSON.parse(readFileSync(join(root, "package.json"), "utf-8"));
-		return detectScaffoldFrameworkFromDependencies({
-			...asRecord(pkg.dependencies) ?? {},
-			...asRecord(pkg.devDependencies) ?? {}
-		});
-	} catch {
-		return;
-	}
+	const pkg = readPackageJson(root);
+	if (!pkg) return;
+	return detectScaffoldFrameworkFromDependencies({
+		...asRecord(pkg.dependencies) ?? {},
+		...asRecord(pkg.devDependencies) ?? {}
+	});
 }
 function readPackageJson(root) {
 	try {
@@ -1591,9 +1549,10 @@ function getDeclaredDependencySpec(root, packageName) {
 	}
 }
 function resolveScaffoldDependencySpec(root, packageName, fallbackVersion) {
-	const explicit = getDeclaredDependencySpec(root, packageName);
-	if (explicit) return explicit;
-	return fallbackVersion;
+	return getDeclaredDependencySpec(root, packageName) || fallbackVersion;
+}
+function defaultPackageName(root) {
+	return basename(root).toLowerCase().replace(/[^a-z0-9-]/g, "-") || "my-app";
 }
 function setupTsconfig(root, state, pagesFramework) {
 	const tsconfigPath = join(root, "tsconfig.json");
@@ -1618,7 +1577,7 @@ function setupTsconfig(root, state, pagesFramework) {
 			else if (Array.isArray(extendsValue)) tsconfig.extends = [...extendsValue, target];
 			else tsconfig.extends = target;
 			updated = true;
-			log.success("Updated tsconfig.json — added extends .void/tsconfig.json");
+			log.step("Updated tsconfig.json — added extends .void/tsconfig.json");
 		}
 		const compilerOptions = asRecord(tsconfig.compilerOptions) ?? {};
 		tsconfig.compilerOptions = compilerOptions;
@@ -1626,13 +1585,13 @@ function setupTsconfig(root, state, pagesFramework) {
 		if (!types.includes("void/env")) {
 			types.push("void/env");
 			updated = true;
-			log.success("Updated tsconfig.json — added void/env to types");
+			log.step("Updated tsconfig.json — added void/env to types");
 		}
 		const cfIdx = types.indexOf("@cloudflare/workers-types");
 		if (cfIdx !== -1) {
 			types.splice(cfIdx, 1);
 			updated = true;
-			log.success("Removed @cloudflare/workers-types from tsconfig types (included in void/env)");
+			log.step("Removed @cloudflare/workers-types from tsconfig types (included in void/env)");
 		}
 		compilerOptions.types = types;
 		const existingFiles = uniqueStrings(existingPatch.files);
@@ -1641,7 +1600,7 @@ function setupTsconfig(root, state, pagesFramework) {
 			if (JSON.stringify(tsconfig.files) !== JSON.stringify(files)) {
 				tsconfig.files = files;
 				updated = true;
-				log.success("Updated tsconfig.json — merged generated Void type files");
+				log.step("Updated tsconfig.json — merged generated Void type files");
 			}
 		}
 		if (Object.keys(existingPatch.paths).length > 0 || asRecord(compilerOptions.paths) !== null) {
@@ -1651,7 +1610,7 @@ function setupTsconfig(root, state, pagesFramework) {
 			if (JSON.stringify(existingPaths) !== JSON.stringify(paths)) {
 				compilerOptions.paths = paths;
 				updated = true;
-				log.success("Updated tsconfig.json — merged generated Void path aliases");
+				log.step("Updated tsconfig.json — merged generated Void path aliases");
 			}
 		}
 		if (updated) {
@@ -1661,7 +1620,7 @@ function setupTsconfig(root, state, pagesFramework) {
 				...rest
 			};
 			writeFileSync(tsconfigPath, JSON.stringify(ordered, null, 2) + "\n");
-		} else log.success("tsconfig.json looks good");
+		} else log.step("tsconfig.json looks good");
 		try {
 			const pkgPath = join(root, "package.json");
 			const pkg = JSON.parse(readFileSync(pkgPath, "utf-8"));
@@ -1676,7 +1635,7 @@ function setupTsconfig(root, state, pagesFramework) {
 			}
 			if (pkgUpdated) {
 				writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
-				log.success("Removed @cloudflare/workers-types from package.json (included in void/env)");
+				log.step("Removed @cloudflare/workers-types from package.json (included in void/env)");
 				log.info(`Re-run ${state.packageManager} install to update your lockfile`);
 			}
 		} catch {}
@@ -1704,21 +1663,18 @@ function setupTsconfig(root, state, pagesFramework) {
 			]
 		};
 		writeFileSync(tsconfigPath, JSON.stringify(tsconfig, null, 2) + "\n");
-		log.success("Created tsconfig.json");
+		log.step("Created tsconfig.json");
 		if (!state.hasTypescript) log.info("Don't forget to install typescript");
 	}
 }
 function readProjectWranglerCompatDate(root) {
-	for (const configPath of [materializeCloudflareConfig(root)]) {
-		if (!existsSync(configPath)) continue;
-		try {
-			const raw = readFileSync(configPath, "utf-8");
-			const errors = [];
-			const parsed = parse(raw, errors);
-			if (errors.length > 0) throw new SyntaxError("Failed to parse JSONC");
-			if (typeof parsed?.compatibility_date === "string") return parsed.compatibility_date;
-		} catch {}
-	}
+	const configPath = materializeCloudflareConfig(root);
+	if (!existsSync(configPath)) return;
+	try {
+		const errors = [];
+		const parsed = parse(readFileSync(configPath, "utf-8"), errors);
+		if (errors.length === 0 && typeof parsed?.compatibility_date === "string") return parsed.compatibility_date;
+	} catch {}
 }
 /**
 * Ensure wrangler.jsonc exists with `compatibility_date` and `nodejs_als` flag
@@ -1731,11 +1687,8 @@ function setupWranglerConfig(root, framework) {
 		compatibilityDate: LATEST_KNOWN_COMPAT_DATE,
 		compatibilityFlags: ["nodejs_als"]
 	});
-	if (result.modified) log.success(hadConfig ? "Updated Cloudflare config with compatibility_date and nodejs_als" : "Created Cloudflare config with compatibility_date and nodejs_als");
-	else log.success(`${basename(result.configPath)} looks good`);
-}
-function writeVoidConfig(root, config) {
-	writeVoidProjectConfig(root, config);
+	if (result.modified) log.step(hadConfig ? "Updated Cloudflare config with compatibility_date and nodejs_als" : "Created Cloudflare config with compatibility_date and nodejs_als");
+	else log.step(`${basename(result.configPath)} looks good`);
 }
 function ensureVoidWorkerCompatibilityDate(root) {
 	const config = readConfig(root);
@@ -1745,15 +1698,15 @@ function ensureVoidWorkerCompatibilityDate(root) {
 	const compatibilityDate = readProjectWranglerCompatDate(root) ?? "2026-02-24";
 	if (!canRewriteVoidProjectConfig(root)) {
 		writeProvisionedWranglerConfig(root, { compatibilityDate });
-		log.success("Pinned worker compatibility_date in void.lock.json");
+		log.step("Pinned worker compatibility_date in void.lock.json");
 		return;
 	}
 	config.worker = {
 		...worker,
 		compatibility_date: compatibilityDate
 	};
-	writeVoidConfig(root, config);
-	log.success("Pinned worker compatibility_date in void.config.ts");
+	writeVoidProjectConfig(root, config);
+	log.step("Pinned worker compatibility_date in void.config.ts");
 }
 function clearConfiguredDatabase(root, messages) {
 	const config = readConfig(root);
@@ -1762,8 +1715,8 @@ function clearConfiguredDatabase(root, messages) {
 		return;
 	}
 	delete config.database;
-	writeVoidConfig(root, config);
-	log.success(messages.updated);
+	writeVoidProjectConfig(root, config);
+	log.step(messages.updated);
 }
 function applyDatabaseDialect(root, dialect) {
 	const config = readConfig(root);
@@ -1773,8 +1726,8 @@ function applyDatabaseDialect(root, dialect) {
 			return;
 		}
 		config.database = "pg";
-		writeVoidConfig(root, config);
-		log.success("Configured PostgreSQL in void.config.ts");
+		writeVoidProjectConfig(root, config);
+		log.step("Configured PostgreSQL in void.config.ts");
 		return;
 	}
 	if (dialect === "mysql") {
@@ -1783,8 +1736,8 @@ function applyDatabaseDialect(root, dialect) {
 			return;
 		}
 		config.database = "mysql";
-		writeVoidConfig(root, config);
-		log.success("Configured MySQL in void.config.ts");
+		writeVoidProjectConfig(root, config);
+		log.step("Configured MySQL in void.config.ts");
 		return;
 	}
 	clearConfiguredDatabase(root, {
@@ -1932,7 +1885,7 @@ async function ensureVoidPlatformConnection(root) {
 	let selectedApiUrl = null;
 	let promptedForPlatform = false;
 	try {
-		const { getApiUrl, getSiteDomain } = await import("./auth-CdgZ9uag.mjs");
+		const { getApiUrl, getSiteDomain } = await import("./auth-BgX2qYSY.mjs");
 		selectedApiUrl = getApiUrl(root);
 		getSiteDomain(root);
 	} catch (error) {
@@ -1952,7 +1905,7 @@ async function ensureVoidPlatformConnection(root) {
 	}
 	const discovery = await discoverPlatform(selectedApiUrl);
 	saveDiscoveredPlatform(discovery);
-	if (promptedForPlatform) log.success(`Connected to ${discovery.displayName} at ${discovery.apiUrl}.`);
+	if (promptedForPlatform) log.step(`Connected to ${discovery.displayName} at ${discovery.apiUrl}.`);
 	return discovery;
 }
 async function setupCloudflareDeployment(root) {
@@ -2109,7 +2062,7 @@ function setupGithubActions(root, state, platform = "void", platformApiUrl) {
 	const slug = readProjectConfig(root)?.slug ?? null;
 	mkdirSync(workflowDir, { recursive: true });
 	writeFileSync(workflowPath, getWorkflowYaml(root, state.packageManager, slug, platform, platformApiUrl));
-	log.success("Created .github/workflows/void-deploy.yml");
+	log.step("Created .github/workflows/void-deploy.yml");
 	if (platform === "cloudflare") note("Pushes to main will deploy through the same readiness-gated Cloudflare path.\nAdd a scoped CLOUDFLARE_API_TOKEN repository secret; PostgreSQL/MySQL apps also need DATABASE_URL.\nKeep cloudflare.account_id in void.config.ts.", "GitHub Actions Cloudflare deploy");
 	else if (slug) note(`Pushes to main will build and deploy "${slug}" via GitHub OIDC — no token to store.\nConnect the repo to your project in the Void dashboard to authorize it.`, "GitHub Actions OIDC deploy");
 	else note("Pushes to main will build and deploy via GitHub OIDC — no token to store.\nSet a VOID_PROJECT repository variable (Settings → Secrets and variables → Actions → Variables)\nto your project slug, and connect the repo to your project in the Void dashboard.", "GitHub Actions OIDC deploy");
@@ -2132,7 +2085,7 @@ function patchWorkflowProjectSlug(root, slug) {
 	const placeholderBlock = "  # Set a VOID_PROJECT repository variable to your project slug\n  # (Settings → Secrets and variables → Actions → Variables).\n  VOID_PROJECT: ${{ vars.VOID_PROJECT }}";
 	if (!yaml.includes(placeholderBlock)) return false;
 	writeFileSync(workflowPath, yaml.replace(placeholderBlock, `  VOID_PROJECT: ${slug}`));
-	log.success(`Set VOID_PROJECT: ${slug} in .github/workflows/void-deploy.yml`);
+	log.step(`Set VOID_PROJECT: ${slug} in .github/workflows/void-deploy.yml`);
 	return true;
 }
 function writeFileIfMissing(root, filePath, content) {
@@ -2140,13 +2093,13 @@ function writeFileIfMissing(root, filePath, content) {
 	if (existsSync(fullPath)) return;
 	mkdirSync(dirname(fullPath), { recursive: true });
 	writeFileSync(fullPath, content);
-	log.success(`Created ${filePath}`);
+	log.step(`Created ${filePath}`);
 }
 function ensureGitignore(root) {
 	const gitignorePath = join(root, ".gitignore");
 	if (!existsSync(gitignorePath)) {
 		writeFileSync(gitignorePath, SCAFFOLD_GITIGNORE_LINES.join("\n") + "\n");
-		log.success("Created .gitignore");
+		log.step("Created .gitignore");
 		return;
 	}
 	const content = readFileSync(gitignorePath, "utf-8");
@@ -2155,7 +2108,7 @@ function ensureGitignore(root) {
 	if (missing.length === 0) return;
 	const separator = content.endsWith("\n") ? "" : "\n";
 	writeFileSync(gitignorePath, content + separator + missing.join("\n") + "\n");
-	log.success("Updated .gitignore with Void defaults");
+	log.step("Updated .gitignore with Void defaults");
 }
 function removeTopLevelYamlBlock(yaml, key) {
 	const lines = yaml.split(/\r?\n/);
@@ -2192,7 +2145,7 @@ function insertPnpmAllowBuilds(yaml) {
 function resolvePnpmConfigRoot(root, pkg) {
 	if (existsSync(join(root, "pnpm-workspace.yaml")) || existsSync(join(root, "pnpm-lock.yaml")) || parsePackageManagerField(pkg) === "pnpm") return root;
 	const workspaceRoot = findWorkspaceRoot(root);
-	if (workspaceRoot !== void 0 && isWorkspaceSubpackage(workspaceRoot, root) && hasAncestorPnpmMarkers(root)) return workspaceRoot;
+	if (workspaceRoot !== void 0 && hasAncestorPnpmMarkers(root)) return workspaceRoot;
 	return root;
 }
 function ensurePnpmAllowBuilds(root, pkg) {
@@ -2202,7 +2155,7 @@ function ensurePnpmAllowBuilds(root, pkg) {
 	const after = insertPnpmAllowBuilds(removeTopLevelYamlBlock(removeTopLevelYamlBlock(before, "onlyBuiltDependencies"), "allowBuilds"));
 	if (after !== before) {
 		writeFileSync(workspacePath, after);
-		log.success(configRoot === root ? "Updated pnpm-workspace.yaml with approved builds" : `Updated ${relative(root, workspacePath)} with approved builds`);
+		log.step(configRoot === root ? "Updated pnpm-workspace.yaml with approved builds" : `Updated ${relative(root, workspacePath)} with approved builds`);
 		return true;
 	}
 	return false;
@@ -2216,7 +2169,7 @@ function installProjectDependencies(root, packageManager) {
 	});
 	if (result.error) throw result.error;
 	if (result.status !== 0) throw new Error(`${packageManager} install failed with exit code ${result.status ?? "unknown"}`);
-	log.success(`Installed dependencies with ${packageManager}`);
+	log.step(`Installed dependencies with ${packageManager}`);
 }
 function generateStarterMigration(root, starterMode) {
 	const dialect = starterMode;
@@ -2275,7 +2228,7 @@ function generateStarterMigration(root, starterMode) {
 		const detail = [result.stderr, result.stdout].filter(Boolean).join("\n").trim();
 		throw new Error(["Failed to generate the starter database migration.", ...detail ? [detail] : []].join("\n\n"));
 	}
-	log.success("Generated initial Drizzle migration");
+	log.step("Generated initial Drizzle migration");
 }
 function scaffoldPagesApp(root, packageManager, framework, starterMode, toolchain) {
 	const packageJsonPath = join(root, "package.json");
@@ -2292,7 +2245,7 @@ function scaffoldPagesApp(root, packageManager, framework, starterMode, toolchai
 	} catch {
 		throw new Error("Could not parse package.json in empty project");
 	}
-	const fallbackName = basename(root).toLowerCase().replace(/[^a-z0-9-]/g, "-") || "my-app";
+	const fallbackName = defaultPackageName(root);
 	if (!pkg.name || typeof pkg.name !== "string") pkg.name = fallbackName;
 	if (pkg.private === void 0) pkg.private = true;
 	if (!pkg.type) pkg.type = "module";
@@ -2326,7 +2279,7 @@ function scaffoldPagesApp(root, packageManager, framework, starterMode, toolchai
 	if (isPnpmProject(root, pkg)) ensurePnpmAllowBuilds(root, pkg);
 	if (packageManager === "pnpm" && resolveWorkspaceDeferral(root, pkg) === void 0 && (!pkg.packageManager || typeof pkg.packageManager !== "string")) pkg.packageManager = "pnpm@12.4.1";
 	writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + "\n");
-	log.success("Updated package.json with starter scripts and dependencies");
+	log.step("Updated package.json with starter scripts and dependencies");
 	for (const [filePath, content] of Object.entries(template.files)) writeFileIfMissing(root, filePath, content);
 	ensureGitignore(root);
 	if (starterMode !== "static") applyDatabaseDialect(root, starterMode);
@@ -2358,7 +2311,7 @@ function ensureExistingProjectPackage(root, options = {}) {
 			throw new Error("Could not parse package.json while configuring Void");
 		}
 	}
-	const fallbackName = basename(root).toLowerCase().replace(/[^a-z0-9-]/g, "-") || "my-app";
+	const fallbackName = defaultPackageName(root);
 	let changed = !existedBefore;
 	let dependencyAdded = false;
 	if (!pkg.name || typeof pkg.name !== "string") {
@@ -2400,7 +2353,7 @@ function ensureExistingProjectPackage(root, options = {}) {
 	const pnpmConfigChanged = isPnpmProject(root, pkg) ? ensurePnpmAllowBuilds(root, pkg) : false;
 	if (changed) {
 		writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + "\n");
-		log.success(existedBefore ? plainViteSetup ? "Updated package.json with Void dependencies and Vite scripts" : "Updated package.json with Void dependency" : plainViteSetup ? "Created package.json with Void dependencies and Vite scripts" : "Created package.json with Void dependency");
+		log.step(existedBefore ? plainViteSetup ? "Updated package.json with Void dependencies and Vite scripts" : "Updated package.json with Void dependency" : plainViteSetup ? "Created package.json with Void dependencies and Vite scripts" : "Created package.json with Void dependency");
 	}
 	return {
 		dependencyAdded,
@@ -2455,7 +2408,7 @@ function ensureExistingProjectViteConfig(root, framework) {
 		return;
 	}
 	writeFileSync(fullPath, updated);
-	log.success(`Added voidPlugin() to ${configPath}`);
+	log.step(`Added voidPlugin() to ${configPath}`);
 }
 function setupExistingProject(root, framework) {
 	log.info("Existing project detected. Configuring Void...");
@@ -2490,7 +2443,7 @@ export const posts = sqliteTable("posts", {
   createdAt: text("created_at").notNull().default(sql\`(datetime('now'))\`),
 });
 `);
-	log.success("Created db/schema.ts");
+	log.step("Created db/schema.ts");
 	mkdirSync(join(paths.routesDir, "api"), { recursive: true });
 	writeFileSync(join(paths.routesDir, "api", "posts.ts"), `import { defineHandler } from "void";
 import { db } from "void/db";
@@ -2501,7 +2454,7 @@ export const GET = defineHandler(async () => {
   return db.select().from(posts);
 });
 `);
-	log.success("Created routes/api/posts.ts");
+	log.step("Created routes/api/posts.ts");
 	ensureProjectTsconfig(root, void 0, true, true, { paths });
 	mkdirSync(paths.ssrDir, { recursive: true });
 	writeFileSync(join(paths.ssrDir, "demo.ts"), `import { fetch } from "void/client";
@@ -2515,7 +2468,7 @@ console.log(posts);
 // posts[0].body   ← string (type-checked)
 // posts[0].nope   ← TypeScript error
 `);
-	log.success("Created src/demo.ts");
+	log.step("Created src/demo.ts");
 	note(`SQL migration → DB types → Route handler → Route types → Typed fetch
 
 Run \`${devCommand}\` and open src/demo.ts to see the types in action.\nTry changing the migration or handler — types update automatically.`, "Type Safety Demo");
@@ -2543,7 +2496,7 @@ function ensureVoidDependency(root) {
 			throw new Error("Could not parse package.json while scaffolding demo");
 		}
 	}
-	const fallbackName = basename(root).toLowerCase().replace(/[^a-z0-9-]/g, "-") || "my-app";
+	const fallbackName = defaultPackageName(root);
 	let changed = !existedBefore;
 	if (!pkg.name || typeof pkg.name !== "string") {
 		pkg.name = fallbackName;
@@ -2561,16 +2514,14 @@ function ensureVoidDependency(root) {
 	if (!pkg.dependencies || typeof pkg.dependencies !== "object" || Array.isArray(pkg.dependencies)) pkg.dependencies = {};
 	const devDependencies = asRecord(pkg.devDependencies) ?? {};
 	pkg.devDependencies = devDependencies;
-	if (!DEPENDENCY_FIELDS.some((field) => {
-		return typeof asRecord(pkg[field])?.void === "string";
-	})) {
+	if (!hasDeclaredDependency(pkg, "void")) {
 		devDependencies.void = voidSpec;
 		changed = true;
 	}
 	const pnpmConfigChanged = isPnpmProject(root, pkg) ? ensurePnpmAllowBuilds(root, pkg) : false;
 	if (changed) {
 		writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + "\n");
-		log.success(existedBefore ? "Ensured void is in package.json devDependencies" : "Created package.json with void as a devDependency");
+		log.step(existedBefore ? "Ensured void is in package.json devDependencies" : "Created package.json with void as a devDependency");
 	}
 	return changed || pnpmConfigChanged;
 }
@@ -2578,42 +2529,57 @@ function getOwnVersion() {
 	return JSON.parse(readFileSync(join(getPackageDir(), "package.json"), "utf-8")).version;
 }
 const MARKER_VERSION_SOURCE = String.raw`\d+\.\d+\.\d+(?:-[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?` + String.raw`(?:\+[0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*)?`;
-const MARKER_OPEN_RE = new RegExp(String.raw`^<!--injected-by-void-v(${MARKER_VERSION_SOURCE})-->\r?$`, "m");
 const MARKER_CLOSE = "<!--/injected-by-void-->";
 const MARKER_BLOCK_RE = new RegExp(String.raw`^<!--injected-by-void-v${MARKER_VERSION_SOURCE}-->\r?\n[\s\S]*?^<!--\/injected-by-void-->\r?$`, "m");
-function injectAgentBlock(root) {
+async function injectAgentBlock(root, newProject) {
 	const filePath = "AGENTS.md";
 	const fullPath = join(root, filePath);
 	const version = getOwnVersion();
 	const template = readFileSync(join(getPackageDir(), "AGENTS_TEMPLATE.md"), "utf-8");
 	const block = `${`<!--injected-by-void-v${version}-->`}\n${template}\n${MARKER_CLOSE}`;
-	if (existsSync(fullPath)) {
-		const existing = readFileSync(fullPath, "utf-8");
-		const match = existing.match(MARKER_OPEN_RE);
-		if (match) {
-			if (match[1] === version) {
-				log.info(`${filePath} already has Void instructions (v${version})`);
-				return;
-			}
+	const existing = existsSync(fullPath) ? readFileSync(fullPath, "utf-8") : null;
+	const managedBlock = existing?.match(MARKER_BLOCK_RE);
+	if (managedBlock?.[0] === block) {
+		log.info(`${filePath} already has Void instructions (v${version})`);
+		return;
+	}
+	if (!newProject) {
+		if (process.env.CI || !process.stdin.isTTY) {
+			log.info(`Skipping ${filePath} setup without an interactive terminal; read node_modules/void/docs/.`);
+			return;
+		}
+		const accepted = await confirm({
+			message: managedBlock ? "Update Void instructions in AGENTS.md?" : existing !== null ? "Append Void instructions to AGENTS.md?" : "Create AGENTS.md with Void instructions?",
+			initialValue: true
+		});
+		if (isCancel(accepted)) {
+			cancel("Setup cancelled.");
+			process.exit(0);
+		}
+		if (!accepted) return;
+	}
+	if (existing !== null) {
+		if (managedBlock) {
 			const updated = existing.replace(MARKER_BLOCK_RE, block);
 			writeFileSync(fullPath, updated);
-			log.success(`Updated Void instructions in ${filePath} (v${match[1]} → v${version})`);
+			log.step(`Updated Void instructions in ${filePath}`);
 		} else {
 			const separator = existing.endsWith("\n") ? "\n" : "\n\n";
 			writeFileSync(fullPath, existing + separator + block + "\n");
-			log.success(`Added Void instructions to ${filePath}`);
+			log.step(`Added Void instructions to ${filePath}`);
 		}
 	} else {
 		writeFileSync(fullPath, block + "\n");
-		log.success(`Created ${filePath} with Void instructions`);
+		log.step(`Created ${filePath} with Void instructions`);
 	}
 }
 async function runInitCommand(root, initArgs) {
 	console.log();
-	const targeted = Boolean(initArgs && (initArgs.tsconfig || initArgs.github || initArgs.agents));
+	const targeted = Boolean(initArgs && (initArgs.tsconfig || initArgs.github));
 	if (!targeted) root = await resolveInitRoot(root);
+	const newProject = isScaffoldableEmptyProject(root) && !existsSync(join(root, "AGENTS.md"));
 	const hadTypedConfig = existsSync(join(root, TYPED_CONFIG_FILE));
-	if (migrateLegacyVoidConfig(root)) log.success("Migrated project configuration to void.config.ts. Commit void.config.ts and void.lock.json.");
+	if (migrateLegacyVoidConfig(root)) log.step("Migrated project configuration to void.config.ts. Commit void.config.ts and void.lock.json.");
 	const workspaceSubpackage = isInsideWorkspaceSubpackage(root);
 	if (workspaceSubpackage && initArgs?.git !== void 0) throw new Error("init: The --git/--no-git options are not available when adding a package to an existing monorepo.");
 	const gitInitialized = !workspaceSubpackage && (!targeted || initArgs?.git !== void 0) ? await setupGit(root, initArgs?.git) : false;
@@ -2674,14 +2640,12 @@ async function runInitCommand(root, initArgs) {
 	if (framework) setupWranglerConfig(root, framework);
 	if (!hadTypedConfig) migrateFrameworkAdapterPaths(root);
 	if (!targeted && !didScaffoldStarter) applyDatabaseSetup(root, await promptDatabaseSetup(root));
-	if (!targeted || initArgs?.agents) {
-		injectAgentBlock(root);
-		const agents = detectAgents(root);
-		if (agents.length > 0) {
-			const { linkSkillsForSpecificAgents } = await import("./skills-BPQUGClu.mjs");
-			linkSkillsForSpecificAgents(root, agents);
-		} else log.info("No coding agent detected; read the bundled docs linked in AGENTS.md");
-	}
+	await injectAgentBlock(root, newProject);
+	const agents = detectAgents(root);
+	if (agents.length > 0) {
+		const { linkSkillsForSpecificAgents } = await import("./skills-BgVMvQdy.mjs");
+		linkSkillsForSpecificAgents(root, agents);
+	} else log.info("Bundled Void docs: node_modules/void/docs/");
 	if (!targeted && !framework) {
 		if (didScaffoldStarter || state.hasRoutes || state.hasMigrations || state.hasPages) log.info("Project already has pages, routes, or migrations, skipping demo");
 		else if (!state.typescriptWanted) {} else {
@@ -2708,11 +2672,11 @@ async function runInitCommand(root, initArgs) {
 	let voidPlatformDiscovery = null;
 	if (!targeted && deploymentPlatform === "cloudflare") await setupCloudflareDeployment(root);
 	if (!targeted && deploymentPlatform === "void") voidPlatformDiscovery = await ensureVoidPlatformConnection(root);
-	const githubStepSkipForSubpackage = isInsideWorkspaceSubpackage(root);
+	const githubStepSkipForSubpackage = workspaceSubpackage;
 	let shouldSetupGithub = targeted ? initArgs?.github === true : deploymentPlatform !== "none";
 	if (shouldSetupGithub && !githubStepSkipForSubpackage && deploymentPlatform !== "cloudflare" && deploymentPlatform !== "none") {
 		if (!voidPlatformDiscovery) {
-			const { getApiUrl } = await import("./auth-CdgZ9uag.mjs");
+			const { getApiUrl } = await import("./auth-BgX2qYSY.mjs");
 			voidPlatformDiscovery = await discoverPlatform(getApiUrl(root));
 		}
 		if (!voidPlatformDiscovery.capabilities.githubActions) {
@@ -2737,8 +2701,8 @@ async function runInitCommand(root, initArgs) {
 		const scaffoldResult = maybeScaffoldEnvTs(root);
 		if (scaffoldResult.written) {
 			const rel = relative(root, scaffoldResult.written) || "env.ts";
-			if (scaffoldResult.entries.length > 0) log.success(`Scaffolded ${rel} from .env — review inferred types before running dev.`);
-			else log.success(`Created empty ${rel} — add your env keys with \`defineEnv({...})\`.`);
+			if (scaffoldResult.entries.length > 0) log.step(`Scaffolded ${rel} from .env — review inferred types before running dev.`);
+			else log.step(`Created empty ${rel} — add your env keys with \`defineEnv({...})\`.`);
 		}
 	}
 	if (scaffoldAddedDependencies) installProjectDependencies(root, state.packageManager);
@@ -2749,9 +2713,9 @@ async function runInitCommand(root, initArgs) {
 	}
 	if (gitInitialized) log.info(`Git (optional): ${initialCommitCommand(root)}`);
 	if (workspaceSubpackageSkip) {
-		if (scaffoldedStarterMode) outro("Run your workspace install, then `void db generate` to finish setup.");
-		else outro("Run your workspace install to finish setup.");
-	} else outro(`Run \`${getDevCommand(root, framework)}\` to start developing`);
+		if (scaffoldedStarterMode) printSuccess("Project initialized. Run your workspace install, then `void db generate` to finish setup.");
+		else printSuccess("Project initialized. Run your workspace install to finish setup.");
+	} else printSuccess(`Project initialized. Run \`${getDevCommand(root, framework)}\` to start developing.`);
 }
 //#endregion
 export { parseInitArgs, runInitCommand };