@prisma/cli 3.0.0-beta.6 → 3.0.0-beta.8

package/dist/commands/app/index.js

@@ -65,7 +65,7 @@ function createDeployCommand(runtime) {
 		"hono",
 		"tanstack-start",
 		"bun"
-	])).addOption(new Option("--entry <path>", "Entrypoint path for Bun deploys")).addOption(new Option("--http-port <port>", "HTTP port override for the deployed app")).addOption(new Option("--env <name=value>", "Environment variable").argParser(collectRepeatableValues)).addOption(new Option("--db", "Create and wire an isolated database for the preview Branch")).addOption(new Option("--no-db", "Skip branch database setup")).addOption(new Option("--prod", "Confirm intent to deploy to production"));
+	])).addOption(new Option("--entry <path>", "Entrypoint path for Bun deploys")).addOption(new Option("--http-port <port>", "HTTP port override for the deployed app")).addOption(new Option("--env <name=value|file>", "Environment variable assignment or dotenv file").argParser(collectRepeatableValues)).addOption(new Option("--db", "Create and wire a Prisma Postgres database for this deploy target")).addOption(new Option("--no-db", "Skip database setup")).addOption(new Option("--prod", "Confirm intent to deploy to production"));
 	addGlobalFlags(command);
 	command.action(async (options) => {
 		const appName = options.app;
@@ -80,7 +80,7 @@ function createDeployCommand(runtime) {
 		const db = options.db;
 		const hasDbConflict = hasFlag(runtime.argv, "--db") && hasFlag(runtime.argv, "--no-db");
 		await runCommand(runtime, "app.deploy", options, (context) => {
-			if (hasDbConflict) throw usageError("app deploy accepts either --db or --no-db", "--db requests branch database setup, while --no-db disables it.", "Pass exactly one database setup flag.", ["prisma-cli app deploy --db", "prisma-cli app deploy --no-db"], "app");
+			if (hasDbConflict) throw usageError("app deploy accepts either --db or --no-db", "--db requests database setup, while --no-db disables it.", "Pass exactly one database setup flag.", ["prisma-cli app deploy --db", "prisma-cli app deploy --no-db"], "app");
 			return runAppDeploy(context, appName, {
 				projectRef,
 				createProjectName,

package/dist/controllers/app-env.js

@@ -1,11 +1,11 @@
 import { CliError, authRequiredError, usageError, workspaceRequiredError } from "../shell/errors.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
+import { formatScopeLabel, parseKeyValuePositional, resolveEnvScope } from "../lib/app/env-config.js";
+import { readEnvFileAssignments } from "../lib/app/env-file.js";
 import { resolveProjectTarget } from "../lib/project/resolution.js";
 import { readLocalGitBranch } from "../lib/git/local-branch.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listRealWorkspaceProjects } from "./project.js";
-import { formatScopeLabel, parseKeyValuePositional, resolveEnvScope } from "../lib/app/env-config.js";
-import { readEnvFileAssignments } from "../lib/app/env-file.js";
 import { apiCallError, findVariableByNaturalKey, toMetadata } from "./app-env-api.js";
 import { runEnvAddFile, runEnvUpdateFile } from "./app-env-file.js";
 //#region src/controllers/app-env.ts

package/dist/controllers/app.js

@@ -7,7 +7,7 @@ import { canPrompt } from "../shell/runtime.js";
 import { confirmPrompt, selectPrompt, textPrompt } from "../shell/prompt.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
 import { readAuthState } from "../lib/auth/auth-ops.js";
-import { envVarNames, parseEnvAssignments } from "../lib/app/env-vars.js";
+import { envVarNames, parseEnvInputs } from "../lib/app/env-vars.js";
 import { renderDeployOutputRows, renderDeploySettingsPreview } from "../lib/app/deploy-output.js";
 import { readBunPackageEntrypoint, readBunPackageJson } from "../lib/app/bun-project.js";
 import { DEFAULT_LOCAL_DEV_PORT, resolveLocalBuildType, runLocalApp } from "../lib/app/local-dev.js";
@@ -17,6 +17,7 @@ import { buildProjectSetupNextActions, inferTargetName, projectNotFoundError, re
 import { bindProjectToDirectory, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
 import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
 import { readLocalGitBranch } from "../lib/git/local-branch.js";
+import { resolveOrCreatePreviewBuildSettings } from "../lib/app/preview-build-settings.js";
 import { PREVIEW_BUILD_TYPES, RESOLVED_PREVIEW_BUILD_TYPES, executePreviewBuild } from "../lib/app/preview-build.js";
 import { PREVIEW_DEFAULT_REGION } from "../lib/app/preview-interaction.js";
 import { maybeSetupBranchDatabase } from "../lib/app/branch-database-deploy.js";
@@ -138,7 +139,7 @@ async function runAppDeploy(context, appName, options) {
 	});
 	let runtime = resolveDeployRuntime(options?.httpPort, framework);
 	assertSupportedEntrypoint(framework.buildType, options?.entrypoint, "deploy");
-	const envVars = toOptionalEnvVars(parseEnvAssignments(options?.envAssignments, { commandName: "deploy" }));
+	const envVars = toOptionalEnvVars(await parseEnvInputs(context.runtime.cwd, options?.envAssignments, { commandName: "deploy" }));
 	const selectedApp = await resolveDeployAppSelection(context, projectId, await listApps(context, provider, projectId, target.branch.name), {
 		explicitAppName: appName,
 		explicitAppId: envAppId,
@@ -161,7 +162,7 @@ async function runAppDeploy(context, appName, options) {
 	});
 	framework = customized.framework;
 	runtime = customized.runtime;
-	await enforceProductionDeployGate(context, provider, {
+	const productionDeployGate = await enforceProductionDeployGate(context, provider, {
 		appId: selectedApp.appId,
 		appName: selectedApp.displayName,
 		branchKind: target.branch.kind,
@@ -170,10 +171,17 @@ async function runAppDeploy(context, appName, options) {
 	const buildType = framework.buildType;
 	assertSupportedEntrypoint(buildType, options?.entrypoint, "deploy");
 	const entrypoint = await resolveDeployEntrypoint(context.runtime.cwd, framework, options?.entrypoint, context.runtime.signal);
+	const buildSettingsResolution = await resolveOrCreatePreviewBuildSettings({
+		appPath: context.runtime.cwd,
+		buildType,
+		signal: context.runtime.signal
+	});
+	maybeRenderDeployBuildSettings(context, buildSettingsResolution);
 	const portMapping = parseDeployPortMapping(String(runtime.port));
 	const branchDatabaseSetup = await maybeSetupBranchDatabase(context, provider, projectId, toBranchDatabaseDeployBranch(target.branch), {
 		db: options?.db,
-		inlineEnvVars: envVars
+		providedEnvVars: envVars,
+		firstProductionDeploy: productionDeployGate.firstProductionDeploy
 	});
 	const progressState = createPreviewDeployProgressState();
 	const deployStartedAt = Date.now();
@@ -186,6 +194,7 @@ async function runAppDeploy(context, appName, options) {
 		region: selectedApp.region,
 		entrypoint,
 		buildType,
+		buildSettings: buildSettingsResolution.settings,
 		portMapping,
 		envVars,
 		interaction: void 0,
@@ -214,6 +223,18 @@ async function runAppDeploy(context, appName, options) {
 			},
 			deployment: deployResult.deployment,
 			deploySettings: {
+				config: {
+					path: buildSettingsResolution.relativeConfigPath,
+					status: buildSettingsResolution.status
+				},
+				buildCommand: {
+					value: buildSettingsResolution.settings.buildCommand,
+					source: buildSettingsResolution.settings.buildCommandSource
+				},
+				outputDirectory: {
+					value: buildSettingsResolution.settings.outputDirectory,
+					source: buildSettingsResolution.settings.outputDirectorySource
+				},
 				framework: {
 					key: framework.key,
 					buildType,
@@ -1603,7 +1624,6 @@ async function detectNextConfig(cwd, signal) {
 	for (const candidate of [
 		"next.config.js",
 		"next.config.mjs",
-		"next.config.cjs",
 		"next.config.ts",
 		"next.config.mts"
 	]) {
@@ -1696,6 +1716,20 @@ async function maybeRenderDeploySetupBlock(context, details) {
 	const prefix = details.includeDirectory ? `Deploying ${directory} to` : "Deploying to";
 	context.output.stderr.write(`${prefix} ${details.projectName} / ${details.branchName} / ${details.appName}\n\n`);
 }
+function maybeRenderDeployBuildSettings(context, resolution) {
+	if (context.flags.json || context.flags.quiet) return;
+	const settings = resolution.settings;
+	const title = resolution.status === "created" ? `Created ${resolution.relativeConfigPath}` : `Using ${resolution.relativeConfigPath}`;
+	context.output.stderr.write(`${title}\n${renderDeployOutputRows(context.ui, [{
+		label: "Build Command",
+		value: settings.buildCommand ?? "none",
+		origin: settings.buildCommandSource ?? void 0
+	}, {
+		label: "Output Directory",
+		value: settings.outputDirectory,
+		origin: settings.outputDirectorySource ?? void 0
+	}]).join("\n")}\n\n`);
+}
 function maybeRenderProjectLinked(context, directory, projectName, localPinPath) {
 	if (context.flags.json || context.flags.quiet) return;
 	context.output.stderr.write(`${context.ui.success("✔")} Linked "${directory}" to Project "${projectName}"\nSaved ${localPinPath}\n\n`);

package/dist/lib/app/branch-database-deploy.js

@@ -8,66 +8,66 @@ import path from "node:path";
 //#region src/lib/app/branch-database-deploy.ts
 async function maybeSetupBranchDatabase(context, provider, projectId, branch, options) {
 	if (options.db === false) return emptyBranchDatabaseSetupOutcome();
-	if (hasInlineDatabaseEnvVars(options.inlineEnvVars)) {
-		if (options.db === true) throw usageError("Branch database setup cannot be combined with inline database env vars", "The deploy command received --db and an inline DATABASE_URL or DIRECT_URL value.", "Remove the inline --env database value to let --db create a branch override, or remove --db to deploy with the provided value.", ["prisma-cli app deploy --db", "prisma-cli app deploy --env DATABASE_URL=postgresql://example"], "app");
+	if (hasProvidedDatabaseEnvVars(options.providedEnvVars)) {
+		if (options.db === true) throw usageError("Database setup cannot be combined with provided database env vars", "The deploy command received --db and a DATABASE_URL or DIRECT_URL value from --env.", "Remove the --env database value to let --db create and wire a database, or remove --db to deploy with the provided value.", ["prisma-cli app deploy --db", "prisma-cli app deploy --env DATABASE_URL=postgresql://example"], "app");
 		return emptyBranchDatabaseSetupOutcome();
 	}
-	if (branch.kind === "production") {
-		if (options.db === true) throw usageError("Branch database setup is only available for preview branches", "Production database wiring is a durable environment decision and is not created implicitly by app deploy.", "Use project env commands to manage production DATABASE_URL, or deploy a preview branch with --db.", ["prisma-cli project env add DATABASE_URL=<value> --role production", "prisma-cli app deploy --branch feature/db --db"], "app");
+	if (branch.kind === "production" && !options.firstProductionDeploy) {
+		if (options.db === true) throw productionDatabaseSetupAfterFirstDeployError();
 		return emptyBranchDatabaseSetupOutcome();
 	}
-	const localSignal = await inspectBranchDatabaseSignal(context.runtime.cwd, context.runtime.signal);
-	const envState = await inspectBranchDatabaseEnv(provider, projectId, branch.id, context.runtime.signal);
-	const branchEnvVars = [envState.branchDatabaseUrl, envState.branchDirectUrl].filter((variable) => Boolean(variable)).map((variable) => variable.key).sort();
-	if (envState.branchDatabaseUrl) {
-		const warning = options.db === true ? `Branch "${branch.name}" already has DATABASE_URL. Leaving branch database env vars unchanged.` : null;
+	const envState = await inspectBranchDatabaseEnv(provider, projectId, branch, context.runtime.signal);
+	const targetEnvVars = getTargetDatabaseEnvVarKeys(envState);
+	if (hasExistingDatabaseEnvForTarget(branch, envState)) {
+		const warning = options.db === true ? existingDatabaseEnvWarning(branch, targetEnvVars) : null;
 		if (warning) emitBranchDatabaseWarning(context, warning);
 		return {
 			result: options.db === true ? {
 				status: "skipped",
-				reason: "branch-env-exists",
-				envVars: branchEnvVars,
+				reason: existingDatabaseEnvReason(branch),
+				envVars: targetEnvVars,
 				schema: null
 			} : void 0,
 			warnings: warning ? [warning] : []
 		};
 	}
+	const localSignal = await inspectBranchDatabaseSignal(context.runtime.cwd, context.runtime.signal);
 	if (localSignal.unsupportedSchema) {
-		if (options.db === true) throw unsupportedBranchDatabaseSchemaError(localSignal.unsupportedSchema, branch.name, context);
+		if (options.db === true) throw unsupportedBranchDatabaseSchemaError(localSignal.unsupportedSchema, branch, context);
 		return emptyBranchDatabaseSetupOutcome();
 	}
-	const hasSignal = hasBranchDatabaseSignal(localSignal) || Boolean(envState.previewDatabaseUrl);
+	const hasSignal = hasBranchDatabaseSignal(localSignal) || Boolean(envState.inheritedPreviewDatabaseUrl);
 	if (options.db !== true) {
 		if (!hasSignal) return emptyBranchDatabaseSetupOutcome();
 		if (!canPrompt(context) || context.flags.yes) {
-			const warning = "This app appears to use DATABASE_URL. Run prisma-cli app deploy --db to create an isolated database for this preview branch.";
+			const warning = databasePromptSuppressedWarning(branch);
 			emitBranchDatabaseWarning(context, warning);
 			return {
 				result: void 0,
 				warnings: [warning]
 			};
 		}
-		maybeRenderBranchDatabaseSignal(context, branch.name, localSignal, envState);
+		maybeRenderBranchDatabaseSignal(context, branch, localSignal, envState);
 		if (!await confirmPrompt({
 			input: context.runtime.stdin,
 			output: context.output.stderr,
-			message: `Create an isolated database for branch "${branch.name}"?`,
+			message: databasePromptMessage(branch),
 			initialValue: false
 		})) return emptyBranchDatabaseSetupOutcome();
-	}
+	} else if (!canPrompt(context) && !context.flags.yes) throw nonInteractiveDatabaseSetupRequiresYesError(branch);
 	return setupBranchDatabase(context, provider, projectId, branch, localSignal, envState);
 }
 async function setupBranchDatabase(context, provider, projectId, branch, signal, envState) {
-	emitBranchDatabaseProgress(context, "pending", "Creating branch database");
+	emitBranchDatabaseProgress(context, "pending", "Creating database");
 	const database = await provider.createBranchDatabase({
 		projectId,
 		branchId: branch.id,
 		branchName: branch.name,
 		signal: context.runtime.signal
 	}).catch((error) => {
-		throw branchDatabaseSetupFailedError("Failed to create branch database", error, branch.name);
+		throw branchDatabaseSetupFailedError("Failed to create database", error, branch);
 	});
-	emitBranchDatabaseProgress(context, "success", "Created branch database");
+	emitBranchDatabaseProgress(context, "success", "Created database");
 	try {
 		let schemaSetup = null;
 		const warnings = [];
@@ -80,12 +80,12 @@ async function setupBranchDatabase(context, provider, projectId, branch, signal,
 				databaseUrl: database.databaseUrl,
 				directUrl: database.directUrl
 			}).catch((error) => {
-				throw schemaSetupFailedError(error, signal.schema, branch.name, context.runtime.cwd);
+				throw schemaSetupFailedError(error, signal.schema, branch, context.runtime.cwd);
 			});
 			emitBranchDatabaseProgress(context, "success", "Applied database schema");
-		} else skippedSchemaWarning = "No supported Prisma schema source was found. Branch database env vars were created, but schema setup was skipped.";
+		} else skippedSchemaWarning = "No supported Prisma schema source was found. Database env vars were created, but schema setup was skipped.";
 		const envVars = await upsertBranchDatabaseEnvVars(context, provider, projectId, branch, database, envState);
-		emitBranchDatabaseProgress(context, "success", `Added branch env override${envVars.length === 1 ? "" : "s"} ${envVars.join(", ")}`);
+		emitBranchDatabaseProgress(context, "success", `Added ${envScopeLabel(branch)} env var${envVars.length === 1 ? "" : "s"} ${envVars.join(", ")}`);
 		if (skippedSchemaWarning) {
 			emitBranchDatabaseWarning(context, skippedSchemaWarning);
 			warnings.push(skippedSchemaWarning);
@@ -107,37 +107,36 @@ async function setupBranchDatabase(context, provider, projectId, branch, signal,
 			warnings
 		};
 	} catch (error) {
-		throw await cleanupCreatedBranchDatabaseAfterFailure(context, provider, database, branch.name, error);
+		throw await cleanupCreatedBranchDatabaseAfterFailure(context, provider, database, branch, error);
 	}
 }
 async function upsertBranchDatabaseEnvVars(context, provider, projectId, branch, database, envState) {
+	const scope = envScopeForBranch(branch);
 	const written = [];
 	await upsertBranchDatabaseEnvVar(context, provider, {
 		projectId,
-		branchId: branch.id,
-		className: "preview",
+		...scope,
 		key: "DATABASE_URL",
 		value: database.databaseUrl,
-		existing: envState.branchDatabaseUrl,
-		branchName: branch.name
+		existing: envState.targetDatabaseUrl,
+		branch
 	});
 	written.push("DATABASE_URL");
 	if (database.directUrl) {
 		await upsertBranchDatabaseEnvVar(context, provider, {
 			projectId,
-			branchId: branch.id,
-			className: "preview",
+			...scope,
 			key: "DIRECT_URL",
 			value: database.directUrl,
-			existing: envState.branchDirectUrl,
-			branchName: branch.name
+			existing: envState.targetDirectUrl,
+			branch
 		});
 		written.push("DIRECT_URL");
-	} else if (envState.branchDirectUrl) await provider.deleteEnvironmentVariable({
-		envVarId: envState.branchDirectUrl.id,
+	} else if (branch.kind === "preview" && envState.targetDirectUrl) await provider.deleteEnvironmentVariable({
+		envVarId: envState.targetDirectUrl.id,
 		signal: context.runtime.signal
 	}).catch((error) => {
-		throw branchDatabaseSetupFailedError("Failed to remove stale DIRECT_URL", error, branch.name);
+		throw branchDatabaseSetupFailedError("Failed to remove stale DIRECT_URL", error, branch);
 	});
 	return written;
 }
@@ -148,53 +147,88 @@ async function upsertBranchDatabaseEnvVar(context, provider, options) {
 			value: options.value,
 			signal: context.runtime.signal
 		}).catch((error) => {
-			throw branchDatabaseSetupFailedError(`Failed to update ${options.key}`, error, options.branchName);
+			throw branchDatabaseSetupFailedError(`Failed to update ${options.key}`, error, options.branch);
 		});
 		return;
 	}
 	await provider.createEnvironmentVariable({
 		projectId: options.projectId,
-		branchId: options.branchId,
 		className: options.className,
 		key: options.key,
 		value: options.value,
+		...options.branchId ? { branchId: options.branchId } : {},
 		signal: context.runtime.signal
 	}).catch((error) => {
-		throw branchDatabaseSetupFailedError(`Failed to write ${options.key}`, error, options.branchName);
+		throw branchDatabaseSetupFailedError(`Failed to write ${options.key}`, error, options.branch);
 	});
 }
-async function inspectBranchDatabaseEnv(provider, projectId, branchId, signal) {
+async function inspectBranchDatabaseEnv(provider, projectId, branch, signal) {
+	const scope = envScopeForBranch(branch);
 	const [databaseUrlRows, directUrlRows] = await Promise.all([provider.listEnvironmentVariables({
 		projectId,
-		className: "preview",
+		className: scope.className,
 		key: "DATABASE_URL",
 		signal
 	}), provider.listEnvironmentVariables({
 		projectId,
-		className: "preview",
+		className: scope.className,
 		key: "DIRECT_URL",
 		signal
 	})]);
+	const targetBranchId = branch.kind === "preview" ? branch.id : null;
 	return {
-		branchDatabaseUrl: findEnvVar(databaseUrlRows, { branchId }),
-		branchDirectUrl: findEnvVar(directUrlRows, { branchId }),
-		previewDatabaseUrl: findEnvVar(databaseUrlRows, { branchId: null })
+		targetDatabaseUrl: findEnvVar(databaseUrlRows, { branchId: targetBranchId }),
+		targetDirectUrl: findEnvVar(directUrlRows, { branchId: targetBranchId }),
+		inheritedPreviewDatabaseUrl: branch.kind === "preview" ? findEnvVar(databaseUrlRows, { branchId: null }) : null
 	};
 }
 function findEnvVar(rows, options) {
 	return rows.find((row) => row.branchId === options.branchId) ?? null;
 }
-function hasInlineDatabaseEnvVars(envVars) {
+function hasProvidedDatabaseEnvVars(envVars) {
 	return Boolean(envVars && ("DATABASE_URL" in envVars || "DIRECT_URL" in envVars));
 }
-function maybeRenderBranchDatabaseSignal(context, branchName, signal, envState) {
+function envScopeForBranch(branch) {
+	return branch.kind === "production" ? { className: "production" } : {
+		className: "preview",
+		branchId: branch.id
+	};
+}
+function envScopeLabel(branch) {
+	return branch.kind === "production" ? "production" : "branch";
+}
+function getTargetDatabaseEnvVarKeys(envState) {
+	return [envState.targetDatabaseUrl, envState.targetDirectUrl].filter((variable) => Boolean(variable)).map((variable) => variable.key).sort();
+}
+function hasExistingDatabaseEnvForTarget(branch, envState) {
+	if (branch.kind === "production") return Boolean(envState.targetDatabaseUrl || envState.targetDirectUrl);
+	return Boolean(envState.targetDatabaseUrl);
+}
+function existingDatabaseEnvReason(branch) {
+	return branch.kind === "production" ? "production-env-exists" : "branch-env-exists";
+}
+function existingDatabaseEnvWarning(branch, envVars) {
+	if (branch.kind === "production") return `Production already has ${envVars.join(" and ")}. Treating it as BYO database configuration and leaving env vars unchanged.`;
+	return `Branch "${branch.name}" already has DATABASE_URL. Leaving branch database env vars unchanged.`;
+}
+function databasePromptSuppressedWarning(branch) {
+	if (branch.kind === "production") return "This app appears to use DATABASE_URL. Run prisma-cli app deploy --db --yes to create and wire a Prisma Postgres database for this first production deploy.";
+	return "This app appears to use DATABASE_URL. Run prisma-cli app deploy --db to create an isolated database for this preview branch.";
+}
+function databasePromptMessage(branch) {
+	return branch.kind === "production" ? "Create a Prisma Postgres database for production?" : `Create an isolated database for branch "${branch.name}"?`;
+}
+function maybeRenderBranchDatabaseSignal(context, branch, signal, envState) {
 	if (context.flags.json || context.flags.quiet) return;
 	const rows = [
 		signal.schema ? `  Schema  ${path.relative(context.runtime.cwd, signal.schema.path) || defaultSchemaSourcePath(signal.schema)}` : null,
 		signal.databaseUrlReferences.length > 0 ? `  Code    ${signal.databaseUrlReferences.slice(0, 3).join(", ")}` : null,
-		envState.previewDatabaseUrl ? "  Env     preview DATABASE_URL is inherited by this branch" : null
+		envState.inheritedPreviewDatabaseUrl ? "  Env     preview DATABASE_URL is inherited by this branch" : null
 	].filter((row) => Boolean(row));
-	context.output.stderr.write(`Database signal found for branch "${branchName}"\n${rows.join("\n")}\n\n`);
+	context.output.stderr.write(`Database signal found for ${databaseTargetLabel(branch)}\n${rows.join("\n")}\n\n`);
+}
+function databaseTargetLabel(branch) {
+	return branch.kind === "production" ? `production branch "${branch.name}"` : `branch "${branch.name}"`;
 }
 function emitBranchDatabaseProgress(context, status, message) {
 	if (context.flags.json || context.flags.quiet) return;
@@ -211,6 +245,12 @@ function emptyBranchDatabaseSetupOutcome() {
 		warnings: []
 	};
 }
+function productionDatabaseSetupAfterFirstDeployError() {
+	return usageError("Database setup is only available during the first production deploy", "The selected production app already has a live deployment.", "Use project env commands to manage production DATABASE_URL, or deploy a preview branch with --db.", ["prisma-cli project env add DATABASE_URL=<value> --role production", "prisma-cli app deploy --branch feature/db --db"], "app");
+}
+function nonInteractiveDatabaseSetupRequiresYesError(branch) {
+	return usageError("Database setup requires --yes in non-interactive mode", "The deploy command received --db, but prompts are not available and --yes was not passed.", "Pass --yes together with --db to confirm non-interactive database creation.", [branch.kind === "production" ? "prisma-cli app deploy --prod --db --yes" : `prisma-cli app deploy --branch ${formatCommandArgument(branch.name)} --db --yes`], "app");
+}
 function formatSchemaSetupCommand(command) {
 	switch (command) {
 		case "migrate-deploy": return "prisma migrate deploy";
@@ -218,46 +258,46 @@ function formatSchemaSetupCommand(command) {
 		case "prisma-next-db-init": return "prisma-next db init";
 	}
 }
-function branchDatabaseSetupFailedError(summary, error, branchName) {
+function branchDatabaseSetupFailedError(summary, error, branch) {
 	return new CliError({
 		code: "BRANCH_DATABASE_SETUP_FAILED",
 		domain: "app",
 		summary,
 		why: error instanceof Error ? error.message : String(error),
-		fix: "Retry the command, or create the branch database and env vars manually with project env commands.",
+		fix: "Retry the command, or create the database and env vars manually with project env commands.",
 		debug: formatDebugDetails(error),
-		meta: { branch: branchName },
+		meta: { branch: branch.name },
 		exitCode: 1,
-		nextSteps: [`prisma-cli app deploy --branch ${formatCommandArgument(branchName)} --db`, `prisma-cli project env list --branch ${formatCommandArgument(branchName)}`]
+		nextSteps: [formatAppDeployWithDbNextStep(branch), formatProjectEnvListNextStep(branch)]
 	});
 }
-async function cleanupCreatedBranchDatabaseAfterFailure(context, provider, database, branchName, error) {
-	const setupError = error instanceof CliError ? error : branchDatabaseSetupFailedError("Branch database setup failed", error, branchName);
-	emitBranchDatabaseProgress(context, "pending", "Removing branch database after setup failed");
+async function cleanupCreatedBranchDatabaseAfterFailure(context, provider, database, branch, error) {
+	const setupError = error instanceof CliError ? error : branchDatabaseSetupFailedError("Database setup failed", error, branch);
+	emitBranchDatabaseProgress(context, "pending", "Removing database after setup failed");
 	try {
 		await provider.deleteBranchDatabase({
 			databaseId: database.id,
 			signal: context.runtime.signal
 		});
-		emitBranchDatabaseProgress(context, "success", "Removed branch database after setup failed");
+		emitBranchDatabaseProgress(context, "success", "Removed database after setup failed");
 	} catch (cleanupError) {
-		return branchDatabaseCleanupFailedError(setupError, cleanupError, database, branchName);
+		return branchDatabaseCleanupFailedError(setupError, cleanupError, database, branch);
 	}
 	return setupError;
 }
-function branchDatabaseCleanupFailedError(setupError, cleanupError, database, branchName) {
+function branchDatabaseCleanupFailedError(setupError, cleanupError, database, branch) {
 	const cleanupWhy = cleanupError instanceof Error ? cleanupError.message : String(cleanupError);
-	const setupWhy = setupError.why ?? "Branch database setup failed.";
+	const setupWhy = setupError.why ?? "Database setup failed.";
 	return new CliError({
 		code: setupError.code,
 		domain: setupError.domain,
 		summary: setupError.summary,
 		why: `${setupWhy} Prisma could not delete the created database "${database.name}" (${database.id}): ${cleanupWhy}`,
-		fix: "Delete the created branch database from Console or contact Prisma support, then rerun deploy with --db.",
+		fix: "Delete the created database from Console or contact Prisma support, then rerun deploy with --db.",
 		debug: formatCombinedDebugDetails(setupError, cleanupError),
 		meta: {
 			...setupError.meta,
-			branch: branchName,
+			branch: branch.name,
 			databaseId: database.id,
 			databaseName: database.name,
 			cleanupFailed: true
@@ -266,7 +306,7 @@ function branchDatabaseCleanupFailedError(setupError, cleanupError, database, br
 		nextSteps: []
 	});
 }
-function schemaSetupFailedError(error, schema, branchName, cwd) {
+function schemaSetupFailedError(error, schema, branch, cwd) {
 	return new CliError({
 		code: "SCHEMA_SETUP_FAILED",
 		domain: "app",
@@ -275,17 +315,26 @@ function schemaSetupFailedError(error, schema, branchName, cwd) {
 		fix: "Fix the Prisma schema or migrations, then rerun deploy with --db.",
 		debug: formatDebugDetails(error),
 		meta: {
-			branch: branchName,
+			branch: branch.name,
 			schemaPath: schema.path,
 			source: schema.kind,
 			command: schema.command
 		},
 		exitCode: 1,
-		nextSteps: [...formatSchemaSetupNextSteps(schema, cwd), `prisma-cli app deploy --branch ${formatCommandArgument(branchName)} --db`]
+		nextSteps: [...formatSchemaSetupNextSteps(schema, cwd), formatAppDeployWithDbNextStep(branch)]
 	});
 }
-function unsupportedBranchDatabaseSchemaError(schema, branchName, context) {
-	return usageError("Branch database setup is not available for this Prisma schema", `${path.relative(context.runtime.cwd, schema.path) || defaultUnsupportedSchemaSourcePath(schema)} targets ${formatUnsupportedSchemaTarget(schema.target)}, but --db creates Prisma Postgres databases.`, "Use project env commands to provide a database URL for this branch, or switch the Prisma schema source to PostgreSQL before using --db.", [`prisma-cli project env add DATABASE_URL=<value> --branch ${formatCommandArgument(branchName)}`, `prisma-cli app deploy --branch ${formatCommandArgument(branchName)}`], "app");
+function unsupportedBranchDatabaseSchemaError(schema, branch, context) {
+	return usageError("Database setup is not available for this Prisma schema", `${path.relative(context.runtime.cwd, schema.path) || defaultUnsupportedSchemaSourcePath(schema)} targets ${formatUnsupportedSchemaTarget(schema.target)}, but --db creates Prisma Postgres databases.`, "Use project env commands to provide a database URL, or switch the Prisma schema source to PostgreSQL before using --db.", [formatProjectEnvAddNextStep(branch), `prisma-cli app deploy --branch ${formatCommandArgument(branch.name)}`], "app");
+}
+function formatAppDeployWithDbNextStep(branch) {
+	return `prisma-cli app deploy --branch ${formatCommandArgument(branch.name)} --db`;
+}
+function formatProjectEnvListNextStep(branch) {
+	return branch.kind === "production" ? "prisma-cli project env list --role production" : `prisma-cli project env list --branch ${formatCommandArgument(branch.name)}`;
+}
+function formatProjectEnvAddNextStep(branch) {
+	return branch.kind === "production" ? "prisma-cli project env add DATABASE_URL=<value> --role production" : `prisma-cli project env add DATABASE_URL=<value> --branch ${formatCommandArgument(branch.name)}`;
 }
 function formatSchemaSetupNextSteps(schema, cwd) {
 	const sourcePath = path.relative(cwd, schema.path) || defaultSchemaSourcePath(schema);

package/dist/lib/app/env-file.js

@@ -11,7 +11,7 @@ async function readEnvFileAssignments(cwd, filePath, command) {
 	try {
 		contents = await readFile(resolvedPath, "utf8");
 	} catch (error) {
-		throw usageError(`Failed to read env file "${filePath}"`, error instanceof Error ? error.message : "The file could not be read.", "Pass a readable dotenv file path.", [`prisma-cli project env ${command} --file .env --role preview`], "app");
+		throw usageError(`Failed to read env file "${filePath}"`, error instanceof Error ? error.message : "The file could not be read.", "Pass a readable dotenv file path.", [command === "deploy" ? "prisma-cli app deploy --env .env" : `prisma-cli project env ${command} --file .env --role preview`], "app");
 	}
 	return parseEnvFileContents(contents, filePath, command);
 }
@@ -63,7 +63,7 @@ function extractParsedKeys(contents) {
 }
 function validateEnvFileKey(key, line, filePath, command) {
 	try {
-		validateKey(key, command);
+		validateKey(key, command === "deploy" ? "add" : command);
 	} catch (error) {
 		const reason = error instanceof Error && error.message.length > 0 ? error.message : "Invalid environment variable key.";
 		throw usageError(`Invalid environment variable "${key}" in "${filePath}"`, `Line ${line}: ${reason}`, "Use a valid env-var key and retry the import.", [], "app");

package/dist/lib/app/env-vars.js

@@ -1,4 +1,6 @@
 import { usageError } from "../../shell/errors.js";
+import { validateKey } from "./env-config.js";
+import { readEnvFileAssignments } from "./env-file.js";
 //#region src/lib/app/env-vars.ts
 function parseEnvAssignments(assignments, options) {
 	const values = assignments ?? [];
@@ -10,15 +12,39 @@ function parseEnvAssignments(assignments, options) {
 		if (separatorIndex === -1) throw usageError("Environment variable assignment must use NAME=VALUE", "A provided --env flag is missing the = separator.", `Pass repeated --env NAME=VALUE flags, for example prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example.`, [`prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example`], "app");
 		const name = assignment.slice(0, separatorIndex);
 		if (name.length === 0) throw usageError("Environment variable name is required", "A provided --env flag has an empty variable name.", `Pass repeated --env NAME=VALUE flags, for example prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example.`, [`prisma-cli app ${options.commandName} --env DATABASE_URL=postgresql://example`], "app");
+		validateEnvAssignmentName(name, options.commandName);
 		if (seen.has(name)) throw usageError(`Environment variable "${name}" was provided more than once`, "Each environment variable name may be set only once per command invocation.", `Remove the duplicate "${name}" assignment and rerun prisma-cli app ${options.commandName}.`, [`prisma-cli app ${options.commandName} --env ${name}=value`], "app");
+		const value = assignment.slice(separatorIndex + 1);
+		if (value.length === 0) throw usageError(`Environment variable "${name}" has an empty value`, `A provided --env flag defines ${name} with no value.`, "Pass a non-empty value, or omit the key from the deploy command.", [`prisma-cli app ${options.commandName} --env ${name}=value`], "app");
 		seen.add(name);
-		parsed[name] = assignment.slice(separatorIndex + 1);
+		parsed[name] = value;
 	}
 	return parsed;
 }
+async function parseEnvInputs(cwd, inputs, options) {
+	const values = inputs ?? [];
+	const expandedAssignments = [];
+	for (const value of values) {
+		if (value.includes("=")) {
+			expandedAssignments.push(value);
+			continue;
+		}
+		const fileAssignments = await readEnvFileAssignments(cwd, value, options.commandName);
+		expandedAssignments.push(...fileAssignments.map((assignment) => `${assignment.key}=${assignment.value}`));
+	}
+	return parseEnvAssignments(expandedAssignments, options);
+}
+function validateEnvAssignmentName(name, commandName) {
+	try {
+		validateKey(name, "add");
+	} catch (error) {
+		const reason = error instanceof Error && error.message.length > 0 ? error.message : "Invalid environment variable name.";
+		throw usageError(`Invalid environment variable "${name}"`, reason, "Use a valid env-var name and retry the deploy.", [`prisma-cli app ${commandName} --env DATABASE_URL=postgresql://example`], "app");
+	}
+}
 function envVarNames(envVars) {
 	if (!envVars) return [];
 	return Object.entries(envVars).filter(([, value]) => value !== null).map(([name]) => name).sort((left, right) => left.localeCompare(right));
 }
 //#endregion
-export { envVarNames, parseEnvAssignments };
+export { envVarNames, parseEnvInputs };