@prisma/cli 3.0.0-beta.10 → 3.0.0-beta.11

package/dist/lib/app/preview-build-settings.js

@@ -1,64 +1,102 @@
-import { CliError } from "../../shell/errors.js";
 import { readBunPackageJson } from "./bun-project.js";
-import { readFile, readdir, stat, writeFile } from "node:fs/promises";
+import { sourceRootLineage } from "@prisma/compute-sdk/config";
+import { readFile, readdir, stat } from "node:fs/promises";
 import path from "node:path";
 import { exec } from "node:child_process";
 import { parseModule } from "magicast";
 //#region src/lib/app/preview-build-settings.ts
+/** Legacy build-settings file: no longer read or written, only detected for migration. */
 const PRISMA_APP_CONFIG_FILENAME = "prisma.app.json";
-const PRISMA_APP_CONFIG_SCHEMA_URL = "https://pris.ly/schemas/prisma-app-config.v1.json";
-async function resolveOrCreatePreviewBuildSettings(options) {
+/**
+* Detects a leftover `prisma.app.json`. The file is no longer used: one that
+* matches the effective settings is reported for deletion, one with custom
+* values must be migrated to the compute config so builds never silently
+* change.
+*/
+async function detectLegacyBuildSettings(options) {
 	const configPath = path.join(options.appPath, PRISMA_APP_CONFIG_FILENAME);
-	const existing = await readPreviewBuildSettingsConfig(configPath, options.signal);
-	if (existing) return {
-		status: "used",
-		configPath,
-		relativeConfigPath: PRISMA_APP_CONFIG_FILENAME,
-		settings: {
-			buildCommand: existing.buildCommand,
-			buildCommandSource: null,
-			outputDirectory: existing.outputDirectory,
-			outputDirectorySource: null
-		}
-	};
-	const settings = await resolvePreviewBuildSettings(options);
-	const config = {
-		$schema: PRISMA_APP_CONFIG_SCHEMA_URL,
-		buildCommand: settings.buildCommand,
-		outputDirectory: settings.outputDirectory
-	};
+	let content;
 	try {
-		await writeFile(configPath, `${JSON.stringify(config, null, 2)}\n`, {
+		options.signal?.throwIfAborted();
+		content = await readFile(configPath, {
 			encoding: "utf8",
-			flag: "wx",
 			signal: options.signal
 		});
 	} catch (error) {
-		if (error.code === "EEXIST") {
-			const raced = await readPreviewBuildSettingsConfig(configPath, options.signal);
-			if (raced) return {
-				status: "used",
-				configPath,
-				relativeConfigPath: PRISMA_APP_CONFIG_FILENAME,
-				settings: {
-					buildCommand: raced.buildCommand,
-					buildCommandSource: null,
-					outputDirectory: raced.outputDirectory,
-					outputDirectorySource: null
-				}
-			};
-		}
-		throw error;
+		if (options.signal?.aborted) throw error;
+		return { kind: "absent" };
 	}
-	return {
-		status: "created",
+	let legacy;
+	try {
+		const parsed = JSON.parse(content);
+		const buildCommand = parsed.buildCommand === null || typeof parsed.buildCommand === "string" ? typeof parsed.buildCommand === "string" ? parsed.buildCommand.trim() || null : null : void 0;
+		const outputDirectory = typeof parsed.outputDirectory === "string" ? normalizeRelativePath(parsed.outputDirectory) : void 0;
+		if (buildCommand === void 0 || !outputDirectory) return {
+			kind: "invalid",
+			configPath
+		};
+		legacy = {
+			buildCommand,
+			outputDirectory
+		};
+	} catch {
+		return {
+			kind: "invalid",
+			configPath
+		};
+	}
+	return legacy.buildCommand === options.effective.buildCommand && legacy.outputDirectory === options.effective.outputDirectory ? {
+		kind: "matching",
+		configPath
+	} : {
+		kind: "custom",
 		configPath,
-		relativeConfigPath: PRISMA_APP_CONFIG_FILENAME,
-		settings
+		...legacy
+	};
+}
+/** Resolves build settings purely from framework inference; nothing is read or written. */
+async function resolveInferredPreviewBuildSettings(options) {
+	return {
+		status: "inferred",
+		configPath: null,
+		relativeConfigPath: null,
+		settings: await resolvePreviewBuildSettings(options)
+	};
+}
+/**
+* Resolves build settings when the compute config owns them: configured
+* fields win, omitted fields fall back to framework defaults.
+*/
+async function resolveConfiguredPreviewBuildSettings(options) {
+	const configFilename = path.basename(options.configPath);
+	const source = `set by ${configFilename}`;
+	const fallback = options.configured.command === void 0 || options.configured.outputDirectory === void 0 ? await resolvePreviewBuildSettings(options) : null;
+	return {
+		status: "config",
+		configPath: options.configPath,
+		relativeConfigPath: configFilename,
+		settings: {
+			buildCommand: options.configured.command !== void 0 ? options.configured.command : fallback.buildCommand,
+			buildCommandSource: options.configured.command !== void 0 ? source : fallback.buildCommandSource,
+			outputDirectory: options.configured.outputDirectory ?? fallback.outputDirectory,
+			outputDirectorySource: options.configured.outputDirectory !== void 0 ? source : fallback.outputDirectorySource
+		}
 	};
 }
 async function resolvePreviewBuildSettings(options) {
 	switch (options.buildType) {
+		case "nuxt": return {
+			buildCommand: "nuxt build",
+			buildCommandSource: "Nuxt default",
+			outputDirectory: ".output",
+			outputDirectorySource: "Nuxt output"
+		};
+		case "astro": return {
+			buildCommand: "astro build",
+			buildCommandSource: "Astro default",
+			outputDirectory: "dist",
+			outputDirectorySource: "Astro output"
+		};
 		case "nextjs": {
 			const packageJson = await readBunPackageJson(options.appPath, options.signal);
 			const buildCommand = await resolveFrameworkBuildCommand(options.appPath, packageJson, {
@@ -104,57 +142,6 @@ async function resolvePreviewBuildSettings(options) {
 		}
 	}
 }
-async function readPreviewBuildSettingsConfig(configPath, signal) {
-	let content;
-	try {
-		content = await readFile(configPath, {
-			encoding: "utf8",
-			signal
-		});
-	} catch (error) {
-		if (error.code === "ENOENT") return null;
-		throw error;
-	}
-	let parsed;
-	try {
-		parsed = JSON.parse(content);
-	} catch (error) {
-		throw invalidPrismaAppConfigError(configPath, `The file is not valid JSON: ${error instanceof Error ? error.message : String(error)}`);
-	}
-	if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw invalidPrismaAppConfigError(configPath, "The file must contain a JSON object.");
-	const raw = parsed;
-	if ("$schema" in raw && raw.$schema !== void 0 && typeof raw.$schema !== "string") throw invalidPrismaAppConfigError(configPath, "The $schema field must be a string when present.");
-	if (raw.buildCommand !== null && typeof raw.buildCommand !== "string") throw invalidPrismaAppConfigError(configPath, "The buildCommand field must be a string or null.");
-	let buildCommand = null;
-	if (typeof raw.buildCommand === "string") {
-		buildCommand = raw.buildCommand.trim();
-		if (buildCommand.length === 0) throw invalidPrismaAppConfigError(configPath, "The buildCommand field must not be an empty string. Use null to skip the build step.");
-	}
-	const outputDirectory = normalizeConfigOutputDirectory(configPath, raw.outputDirectory);
-	return {
-		buildCommand,
-		outputDirectory
-	};
-}
-function normalizeConfigOutputDirectory(configPath, value) {
-	if (typeof value !== "string" || value.trim().length === 0) throw invalidPrismaAppConfigError(configPath, "The outputDirectory field must be a non-empty string.");
-	const normalized = normalizeRelativePath(value);
-	if (!normalized) throw invalidPrismaAppConfigError(configPath, "The outputDirectory field must be a relative path inside the app directory.");
-	return normalized;
-}
-function invalidPrismaAppConfigError(configPath, why) {
-	return new CliError({
-		code: "APP_CONFIG_INVALID",
-		domain: "app",
-		summary: `Invalid ${PRISMA_APP_CONFIG_FILENAME}`,
-		why,
-		fix: `Edit ${PRISMA_APP_CONFIG_FILENAME} so buildCommand is a string or null and outputDirectory is a relative path inside the app root. Delete the file and rerun prisma-cli app deploy to regenerate defaults.`,
-		where: configPath,
-		meta: { configPath },
-		exitCode: 2,
-		nextSteps: ["prisma-cli app deploy"]
-	});
-}
 async function hasRootFile(appPath, filenames, signal) {
 	let entries;
 	try {
@@ -203,12 +190,14 @@ function readBuildScript(packageJson) {
 	return buildScript.length > 0 ? buildScript : null;
 }
 async function resolvePackageManager(appPath, packageJson, signal) {
-	const fromPackageManager = packageManagerFromPackageJson(packageJson?.packageManager);
-	if (fromPackageManager) return fromPackageManager;
-	if (await pathExists(path.join(appPath, "bun.lock"), signal) || await pathExists(path.join(appPath, "bun.lockb"), signal)) return "bun";
-	if (await pathExists(path.join(appPath, "pnpm-lock.yaml"), signal)) return "pnpm";
-	if (await pathExists(path.join(appPath, "yarn.lock"), signal)) return "yarn";
-	if (await pathExists(path.join(appPath, "package-lock.json"), signal)) return "npm";
+	for (const directory of await sourceRootLineage(appPath, signal)) {
+		const fromPackageManager = packageManagerFromPackageJson((directory === path.resolve(appPath) ? packageJson : await readBunPackageJson(directory, signal))?.packageManager);
+		if (fromPackageManager) return fromPackageManager;
+		if (await pathExists(path.join(directory, "bun.lock"), signal) || await pathExists(path.join(directory, "bun.lockb"), signal)) return "bun";
+		if (await pathExists(path.join(directory, "pnpm-lock.yaml"), signal)) return "pnpm";
+		if (await pathExists(path.join(directory, "yarn.lock"), signal)) return "yarn";
+		if (await pathExists(path.join(directory, "package-lock.json"), signal)) return "npm";
+	}
 }
 function packageManagerFromPackageJson(value) {
 	if (typeof value !== "string") return null;
@@ -217,15 +206,16 @@ function packageManagerFromPackageJson(value) {
 }
 async function runResolvedBuildCommand(appPath, settings, failurePrefix, signal) {
 	if (!settings.buildCommand) return;
-	await execBuildCommand(settings.buildCommand, appPath, failurePrefix, signal);
+	const binDirs = (await sourceRootLineage(appPath, signal)).map((directory) => path.join(directory, "node_modules", ".bin"));
+	await execBuildCommand(settings.buildCommand, appPath, binDirs, failurePrefix, signal);
 }
-function execBuildCommand(command, cwd, failurePrefix, signal) {
+function execBuildCommand(command, cwd, binDirs, failurePrefix, signal) {
 	return new Promise((resolve, reject) => {
 		const child = exec(command, {
 			cwd,
 			env: {
 				...process.env,
-				PATH: [path.join(cwd, "node_modules", ".bin"), process.env.PATH].filter(Boolean).join(path.delimiter)
+				PATH: [...binDirs, process.env.PATH].filter(Boolean).join(path.delimiter)
 			},
 			maxBuffer: 10 * 1024 * 1024,
 			signal
@@ -365,6 +355,7 @@ function propertyKeyName(value) {
 function normalizeRelativePath(value) {
 	const raw = value.trim().replace(/\\/g, "/");
 	if (raw.length === 0 || raw.split("/").includes("..")) return;
+	if (/^[A-Za-z]:/.test(raw)) return;
 	const normalized = path.posix.normalize(raw);
 	const segments = normalized.split("/");
 	if (path.win32.isAbsolute(value) || path.posix.isAbsolute(normalized) || segments.includes("..")) return;
@@ -382,4 +373,4 @@ async function pathExists(targetPath, signal) {
 	}
 }
 //#endregion
-export { PRISMA_APP_CONFIG_FILENAME, PRISMA_APP_CONFIG_SCHEMA_URL, hasAnyPackageDependency, hasPackageDependency, hasRootFile, joinPosix, nextOutputRootFromStandaloneDirectory, resolveOrCreatePreviewBuildSettings, resolvePreviewBuildSettings, runResolvedBuildCommand };
+export { PRISMA_APP_CONFIG_FILENAME, detectLegacyBuildSettings, hasAnyPackageDependency, hasPackageDependency, hasRootFile, joinPosix, nextOutputRootFromStandaloneDirectory, resolveConfiguredPreviewBuildSettings, resolveInferredPreviewBuildSettings, resolvePreviewBuildSettings, runResolvedBuildCommand };

package/dist/lib/app/preview-build.js

@@ -1,6 +1,7 @@
 import { readBunPackageJson, resolveBunEntrypoint } from "./bun-project.js";
-import { PRISMA_APP_CONFIG_FILENAME, hasAnyPackageDependency, hasPackageDependency, hasRootFile, joinPosix, nextOutputRootFromStandaloneDirectory, resolvePreviewBuildSettings, runResolvedBuildCommand } from "./preview-build-settings.js";
-import { chmod, copyFile, cp, lstat, mkdir, mkdtemp, readFile, readdir, readlink, rm, stat } from "node:fs/promises";
+import { hasAnyPackageDependency, hasPackageDependency, hasRootFile, joinPosix, nextOutputRootFromStandaloneDirectory, resolvePreviewBuildSettings, runResolvedBuildCommand } from "./preview-build-settings.js";
+import { resolveSourceRoot } from "@prisma/compute-sdk/config";
+import { chmod, copyFile, cp, lstat, mkdir, mkdtemp, readdir, readlink, rm, stat, writeFile } from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
 import { AstroBuild, BunBuild, NuxtBuild } from "@prisma/compute-sdk";
@@ -151,7 +152,7 @@ var PreviewNextjsBuild = class {
 		});
 		await runResolvedBuildCommand(this.#appPath, settings, "Next.js", signal);
 		const standaloneDir = path.join(this.#appPath, settings.outputDirectory);
-		if (!await directoryExists(standaloneDir, signal)) throw new Error(`Next.js build did not produce standalone output at ${settings.outputDirectory}. Add output: "standalone" to your next.config file, or update ${PRISMA_APP_CONFIG_FILENAME}.`);
+		if (!await directoryExists(standaloneDir, signal)) return stageNextjsFullTreeFallbackArtifact(this.#appPath, signal);
 		const outDir = await unsupportedFilesystemBoundary(signal, () => mkdtemp(path.join(os.tmpdir(), "compute-build-")));
 		try {
 			const artifactDir = path.join(outDir, "app");
@@ -187,6 +188,45 @@ var PreviewNextjsBuild = class {
 		}
 	}
 };
+const FULL_TREE_NEXT_START_ENTRYPOINT = "prisma-next-start.cjs";
+const FULL_TREE_NEXT_START_SOURCE = [
+	"process.chdir(__dirname);",
+	"process.env.NODE_ENV = \"production\";",
+	"process.argv.push(\"start\", \"-p\", process.env.PORT ?? \"3000\");",
+	"require(\"next/dist/bin/next\");",
+	""
+].join("\n");
+async function stageNextjsFullTreeFallbackArtifact(appPath, signal) {
+	const outDir = await unsupportedFilesystemBoundary(signal, () => mkdtemp(path.join(os.tmpdir(), "compute-build-")));
+	try {
+		const artifactDir = path.join(outDir, "app");
+		await unsupportedFilesystemBoundary(signal, () => cp(appPath, artifactDir, {
+			recursive: true,
+			verbatimSymlinks: true,
+			filter: (source) => !isExcludedFromFullTreeArtifact(path.basename(source))
+		}));
+		await unsupportedFilesystemBoundary(signal, () => writeFile(path.join(artifactDir, FULL_TREE_NEXT_START_ENTRYPOINT), FULL_TREE_NEXT_START_SOURCE));
+		return {
+			directory: artifactDir,
+			entrypoint: FULL_TREE_NEXT_START_ENTRYPOINT,
+			defaultPortMapping: { http: 3e3 },
+			cleanup: () => rm(outDir, {
+				recursive: true,
+				force: true
+			})
+		};
+	} catch (error) {
+		await rm(outDir, {
+			recursive: true,
+			force: true
+		});
+		throw error;
+	}
+}
+/** Excludes VCS internals and dotenv files (local secrets, superseded by the deploy env). */
+function isExcludedFromFullTreeArtifact(basename) {
+	return basename === ".git" || basename === ".env" || basename.startsWith(".env.");
+}
 var PreviewTanstackStartBuild = class {
 	#appPath;
 	#buildSettings;
@@ -207,7 +247,7 @@ var PreviewTanstackStartBuild = class {
 		const outputDir = path.join(this.#appPath, settings.outputDirectory);
 		const entrypoint = "server/index.mjs";
 		const entryPath = path.join(outputDir, entrypoint);
-		if (!(await unsupportedFilesystemBoundary(signal, () => stat(entryPath).catch(() => null)))?.isFile()) throw new Error(`TanStack Start build did not produce a Nitro node server entrypoint at ${joinPosix(settings.outputDirectory, entrypoint)}. Ensure your vite.config includes the tanstackStart() and nitro() plugins with the default node preset, or update ${PRISMA_APP_CONFIG_FILENAME}.`);
+		if (!(await unsupportedFilesystemBoundary(signal, () => stat(entryPath).catch(() => null)))?.isFile()) throw new Error(`TanStack Start build did not produce a Nitro node server entrypoint at ${joinPosix(settings.outputDirectory, entrypoint)}. Ensure your vite.config includes the tanstackStart() and nitro() plugins with the default node preset, or set build.outputDirectory in prisma.compute.ts.`);
 		const outDir = await unsupportedFilesystemBoundary(signal, () => mkdtemp(path.join(os.tmpdir(), "compute-build-")));
 		try {
 			const artifactDir = path.join(outDir, "app");
@@ -276,7 +316,7 @@ async function stageNextjsStandaloneArtifact(options) {
 		sourceRoot: await resolveSourceRoot(appRoot, options.signal),
 		signal: options.signal
 	});
-	await hoistPnpmDependencies(path.join(artifactRoot, "node_modules"), options.signal);
+	await hoistIsolatedStoreDependencies(path.join(artifactRoot, "node_modules"), options.signal);
 }
 async function copyNextjsStaticAssets(options) {
 	const serverSubpath = nextjsServerSubpath(options.entrypoint);
@@ -318,12 +358,21 @@ function nextjsServerSubpath(entrypoint) {
 	const dir = path.posix.dirname(entrypoint);
 	return dir === "." ? "" : dir;
 }
-async function hoistPnpmDependencies(nodeModulesDir, signal) {
-	const pnpmNodeModulesDir = path.join(nodeModulesDir, ".pnpm", "node_modules");
-	if (!await directoryExists(pnpmNodeModulesDir, signal)) return;
-	const entries = await unsupportedFilesystemBoundary(signal, () => readdir(pnpmNodeModulesDir, { withFileTypes: true }));
+/**
+* pnpm and bun (isolated linker) both keep packages in a virtual store with a
+* shared symlink farm (`.pnpm/node_modules`, `.bun/node_modules`). Hoist the
+* farm entries to the artifact's node_modules root so Node-style resolution
+* works after symlinks are materialized.
+*/
+async function hoistIsolatedStoreDependencies(nodeModulesDir, signal) {
+	await hoistStoreDependencies(nodeModulesDir, path.join(nodeModulesDir, ".pnpm", "node_modules"), signal);
+	await hoistStoreDependencies(nodeModulesDir, path.join(nodeModulesDir, ".bun", "node_modules"), signal);
+}
+async function hoistStoreDependencies(nodeModulesDir, storeNodeModulesDir, signal) {
+	if (!await directoryExists(storeNodeModulesDir, signal)) return;
+	const entries = await unsupportedFilesystemBoundary(signal, () => readdir(storeNodeModulesDir, { withFileTypes: true }));
 	for (const entry of entries) {
-		const sourcePath = path.join(pnpmNodeModulesDir, entry.name);
+		const sourcePath = path.join(storeNodeModulesDir, entry.name);
 		if (entry.name.startsWith("@") && entry.isDirectory()) {
 			const scopedEntries = await unsupportedFilesystemBoundary(signal, () => readdir(sourcePath, { withFileTypes: true }));
 			for (const scopedEntry of scopedEntries) {
@@ -331,7 +380,7 @@ async function hoistPnpmDependencies(nodeModulesDir, signal) {
 				if (await pathExists(scopedDestination, signal)) continue;
 				await unsupportedFilesystemBoundary(signal, () => mkdir(path.dirname(scopedDestination), { recursive: true }));
 				await copyPathMaterializingSymlinks(path.join(sourcePath, scopedEntry.name), scopedDestination, {
-					standaloneRoot: pnpmNodeModulesDir,
+					standaloneRoot: storeNodeModulesDir,
 					appRoot: nodeModulesDir,
 					sourceRoot: nodeModulesDir,
 					signal
@@ -342,7 +391,7 @@ async function hoistPnpmDependencies(nodeModulesDir, signal) {
 		const destinationPath = path.join(nodeModulesDir, entry.name);
 		if (await pathExists(destinationPath, signal)) continue;
 		await copyPathMaterializingSymlinks(sourcePath, destinationPath, {
-			standaloneRoot: pnpmNodeModulesDir,
+			standaloneRoot: storeNodeModulesDir,
 			appRoot: nodeModulesDir,
 			sourceRoot: nodeModulesDir,
 			signal
@@ -442,29 +491,6 @@ async function directoryExists(targetPath, signal) {
 		return false;
 	}
 }
-async function resolveSourceRoot(appRoot, signal) {
-	let current = path.resolve(appRoot);
-	while (true) {
-		if (await pathExists(path.join(current, ".git"), signal) || await pathExists(path.join(current, "pnpm-workspace.yaml"), signal) || await pathExists(path.join(current, "bun.lock"), signal) || await pathExists(path.join(current, "bun.lockb"), signal) || await packageJsonDeclaresWorkspaces(current, signal)) return current;
-		const parent = path.dirname(current);
-		if (parent === current) return path.resolve(appRoot);
-		current = parent;
-	}
-}
-async function packageJsonDeclaresWorkspaces(directory, signal) {
-	signal?.throwIfAborted();
-	try {
-		const content = await readFile(path.join(directory, "package.json"), {
-			encoding: "utf8",
-			signal
-		});
-		const parsed = JSON.parse(content);
-		return Boolean(parsed.workspaces);
-	} catch (error) {
-		if (signal?.aborted) throw error;
-		return false;
-	}
-}
 async function unsupportedFilesystemBoundary(signal, operation) {
 	signal?.throwIfAborted();
 	const result = await operation();

package/dist/lib/app/preview-provider.js

@@ -509,29 +509,33 @@ async function findAppForDeployment(sdk, deploymentId, signal) {
 		});
 		if (servicesResult.isErr()) throw new Error(servicesResult.error.message);
 		for (const service of servicesResult.value) {
-			const detailResult = await sdk.showService({
-				serviceId: service.id,
-				signal
-			});
-			if (detailResult.isErr()) throw new Error(detailResult.error.message);
-			const app = {
-				id: detailResult.value.id,
-				name: detailResult.value.name,
-				region: detailResult.value.region ?? null,
-				liveDeploymentId: detailResult.value.latestVersionId ?? null,
-				liveUrl: toAbsoluteUrl(detailResult.value.serviceEndpointDomain ?? null)
-			};
-			if (app.liveDeploymentId === deploymentId) return app;
-			const versionsResult = await sdk.listVersions({
-				serviceId: service.id,
-				signal
-			});
-			if (versionsResult.isErr()) throw new Error(versionsResult.error.message);
-			if (versionsResult.value.some((version) => version.id === deploymentId)) return app;
+			const app = await findServiceAppForDeployment(sdk, service.id, deploymentId, signal);
+			if (app) return app;
 		}
 	}
 	return null;
 }
+async function findServiceAppForDeployment(sdk, serviceId, deploymentId, signal) {
+	const detailResult = await sdk.showService({
+		serviceId,
+		signal
+	});
+	if (detailResult.isErr()) throw new Error(detailResult.error.message);
+	const app = {
+		id: detailResult.value.id,
+		name: detailResult.value.name,
+		region: detailResult.value.region ?? null,
+		liveDeploymentId: detailResult.value.latestVersionId ?? null,
+		liveUrl: toAbsoluteUrl(detailResult.value.serviceEndpointDomain ?? null)
+	};
+	if (app.liveDeploymentId === deploymentId) return app;
+	const versionsResult = await sdk.listVersions({
+		serviceId,
+		signal
+	});
+	if (versionsResult.isErr()) throw new Error(versionsResult.error.message);
+	return versionsResult.value.some((version) => version.id === deploymentId) ? app : null;
+}
 function toAbsoluteUrl(url) {
 	if (!url) return null;
 	return url.startsWith("https://") || url.startsWith("http://") ? url : `https://${url}`;

package/dist/lib/app/production-deploy-gate.js

@@ -1,6 +1,6 @@
 import { CliError } from "../../shell/errors.js";
-import { canPrompt } from "../../shell/runtime.js";
 import { confirmPrompt } from "../../shell/prompt.js";
+import { canPrompt } from "../../shell/runtime.js";
 //#region src/lib/app/production-deploy-gate.ts
 async function enforceProductionDeployGate(context, provider, options) {
 	if (options.branchKind !== "production") return { firstProductionDeploy: false };
@@ -104,12 +104,12 @@ function productionDeployRequiresFlagError() {
 			"",
 			"Production deploys require explicit intent. Re-run with:",
 			"",
-			"  prisma app deploy --prod",
+			"  prisma-cli app deploy --prod",
 			"",
 			"Or deploy a preview from a feature branch:",
 			"",
 			"  git checkout -b <branch-name>",
-			"  prisma app deploy"
+			"  prisma-cli app deploy"
 		]
 	});
 }

package/dist/lib/auth/login.js

@@ -106,35 +106,42 @@ async function consumePastedCallback(options) {
 	});
 	try {
 		for (;;) {
-			let answer;
-			try {
-				answer = await rl.question("Paste the callback URL here: ", { signal: options.signal });
-			} catch (error) {
-				if (error?.name === "AbortError") return;
-				throw error;
-			}
-			const trimmed = answer.trim().replace(/^["']|["']$/g, "");
-			let url;
-			try {
-				if (!trimmed) throw new Error("empty input");
-				url = new URL(trimmed);
-			} catch {
-				options.output.write("That didn't look like a URL. Paste the full localhost callback URL and try again.\n");
-				continue;
-			}
-			try {
-				await options.complete(url);
-				return;
-			} catch (error) {
-				const message = error instanceof Error ? error.message : String(error);
-				options.output.write(`Sign-in didn't complete (${message}). Paste the callback URL to try again.\n`);
-				continue;
-			}
+			const url = await readPastedCallbackUrl(rl, options);
+			if (url === null) return;
+			if (url === void 0) continue;
+			if (await tryCompletePastedCallback(url, options)) return;
 		}
 	} finally {
 		rl.close();
 	}
 }
+async function readPastedCallbackUrl(rl, options) {
+	let answer;
+	try {
+		answer = await rl.question("Paste the callback URL here: ", { signal: options.signal });
+	} catch (error) {
+		if (error?.name === "AbortError") return null;
+		throw error;
+	}
+	const trimmed = answer.trim().replace(/^["']|["']$/g, "");
+	try {
+		if (!trimmed) throw new Error("empty input");
+		return new URL(trimmed);
+	} catch {
+		options.output.write("That didn't look like a URL. Paste the full localhost callback URL and try again.\n");
+		return;
+	}
+}
+async function tryCompletePastedCallback(url, options) {
+	try {
+		await options.complete(url);
+		return true;
+	} catch (error) {
+		const message = error instanceof Error ? error.message : String(error);
+		options.output.write(`Sign-in didn't complete (${message}). Paste the callback URL to try again.\n`);
+		return false;
+	}
+}
 var LoginState = class {
 	latestVerifier;
 	latestState;

package/dist/lib/diagnostics.js

@@ -3,7 +3,7 @@ import { resolveStateDir } from "../shell/runtime.js";
 import { readLocalGitState } from "./git/local-status.js";
 //#region src/lib/diagnostics.ts
 async function collectCommandDiagnostics(context, options = {}) {
-	const stateDir = resolveStateDir(context.runtime);
+	const stateDir = await resolveStateDir(context.runtime);
 	return {
 		cwd: context.runtime.cwd,
 		stateFilePath: resolveLocalStateFilePath(stateDir),

package/dist/lib/fs/home-path.js

@@ -0,0 +1,24 @@
+import path from "node:path";
+//#region src/lib/fs/home-path.ts
+/**
+* Shortens a path under the user's home directory to `~/...` for display,
+* posix-style on every platform. Falls back to the Windows home variables
+* when `HOME` is unset (native cmd/PowerShell sessions).
+*/
+function shortenHomePath(value, env) {
+	const resolved = path.resolve(value);
+	const home = resolveHomeDirectory(env);
+	if (home && (resolved === home || resolved.startsWith(`${home}${path.sep}`))) {
+		const relative = path.relative(home, resolved).split(path.sep).join("/");
+		return relative ? `~/${relative}` : "~";
+	}
+	return resolved;
+}
+function resolveHomeDirectory(env) {
+	if (env.HOME) return path.resolve(env.HOME);
+	if (env.USERPROFILE) return path.resolve(env.USERPROFILE);
+	if (env.HOMEDRIVE && env.HOMEPATH) return path.resolve(`${env.HOMEDRIVE}${env.HOMEPATH}`);
+	return null;
+}
+//#endregion
+export { shortenHomePath };

package/dist/lib/git/local-branch.js

@@ -1,9 +1,22 @@
 import { access, readFile } from "node:fs/promises";
 import path from "node:path";
 //#region src/lib/git/local-branch.ts
+/**
+* Resolves the checked-out branch the way git does: the nearest `.git`
+* (directory or worktree file) from `cwd` upward owns the answer, so
+* monorepo commands run from inside a package see the repository branch.
+* Returns null for detached HEAD or when no repository contains `cwd`.
+*/
 async function readLocalGitBranch(cwd, signal) {
-	const headPath = await resolveGitHeadPath(path.join(cwd, ".git"), signal);
-	if (!headPath) return null;
+	for (let directory = path.resolve(cwd);;) {
+		const headPath = await resolveGitHeadPath(path.join(directory, ".git"), signal);
+		if (headPath) return readBranchFromHead(headPath, signal);
+		const parent = path.dirname(directory);
+		if (parent === directory) return null;
+		directory = parent;
+	}
+}
+async function readBranchFromHead(headPath, signal) {
 	try {
 		const head = (await readFile(headPath, {
 			encoding: "utf8",
@@ -12,7 +25,6 @@ async function readLocalGitBranch(cwd, signal) {
 		if (head.startsWith("ref: refs/heads/")) return head.slice(16);
 	} catch (error) {
 		if (signal.aborted) throw error;
-		return null;
 	}
 	return null;
 }

package/dist/lib/project/resolution.js

@@ -1,6 +1,6 @@
 import { CliError } from "../../shell/errors.js";
-import { formatCommandArgument } from "../../shell/command-arguments.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "./local-pin.js";
+import { formatCommandArgument } from "../../shell/command-arguments.js";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 import { Result, TaggedError, matchError } from "better-result";
@@ -339,7 +339,7 @@ async function resolveBoundProjectTarget(options, projects, settings) {
 }
 async function readImplicitLocalPin(options, settings) {
 	if (options.explicitProject || settings.allowEnvProjectId && options.envProjectId) return Result.ok(null);
-	const localPinResult = await readLocalResolutionPin(options.context.runtime.cwd, options.context.runtime.signal);
+	const localPinResult = await readLocalResolutionPin(options.projectDir ?? options.context.runtime.cwd, options.context.runtime.signal);
 	if (localPinResult.isErr()) return Result.err(localPinReadErrorToProjectError(localPinResult.error));
 	const localPin = localPinResult.value;
 	if (localPin.kind === "present" && localPin.pin.workspaceId !== options.workspace.id) return Result.err(new LocalProjectWorkspaceMismatchError({