@prisma/cli 3.0.0-dev.97.1 → 8.0.0-rc.1

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

@@ -22,12 +22,14 @@ function createAppProvider(client, options) {
 		async createProject(options) {
 			const projectResult = await sdk.createProject({
 				name: options.name,
+				region: options.region,
 				signal: options.signal
 			});
 			if (projectResult.isErr()) throw new Error(projectResult.error.message);
 			return {
 				id: projectResult.value.id,
-				name: projectResult.value.name
+				name: projectResult.value.name,
+				defaultRegion: projectResult.value.defaultRegion
 			};
 		},
 		async listApps(projectId, options) {
@@ -37,6 +39,15 @@ function createAppProvider(client, options) {
 				signal: options?.signal
 			});
 		},
+		async createApp(options) {
+			return createComputeService(client, {
+				projectId: options.projectId,
+				branchName: options.branchName,
+				displayName: options.name,
+				...options.region !== void 0 ? { region: options.region } : {},
+				...options.signal !== void 0 ? { signal: options.signal } : {}
+			});
+		},
 		async resolveBranch(projectId, options) {
 			const branch = await resolveOrCreateBranch(client, {
 				projectId,
@@ -68,17 +79,18 @@ function createAppProvider(client, options) {
 			return deleteEnvironmentVariable(client, options);
 		},
 		async removeApp(appId, options) {
-			const appResult = await sdk.showService({
-				serviceId: appId,
+			const appResult = await sdk.showApp({
+				appId,
 				signal: options?.signal
 			});
 			if (appResult.isErr()) throw new Error(appResult.error.message);
-			const destroyResult = await sdk.destroyService({
-				serviceId: appId,
-				keepService: false,
+			const destroyResult = await sdk.destroyApp({
+				appId,
+				keepApp: false,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
-				signal: options?.signal
+				signal: options?.signal,
+				progress: options?.progress
 			});
 			if (destroyResult.isErr()) throw new Error(destroyResult.error.message);
 			return {
@@ -90,8 +102,8 @@ function createAppProvider(client, options) {
 			return listComputeServiceDomains(client, appId, options?.signal);
 		},
 		async addDomain(options) {
-			const result = await client.POST("/v1/compute-services/{computeServiceId}/domains", {
-				params: { path: { computeServiceId: options.appId } },
+			const result = await client.POST("/v1/apps/{appId}/domains", {
+				params: { path: { appId: options.appId } },
 				body: { hostname: options.hostname },
 				signal: options.signal
 			});
@@ -135,8 +147,8 @@ function createAppProvider(client, options) {
 		},
 		async promoteDeployment(options) {
 			const promoteResult = await sdk.promote({
-				serviceId: options.appId,
-				versionId: options.deploymentId,
+				appId: options.appId,
+				deploymentId: options.deploymentId,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
 				signal: options.signal,
@@ -144,6 +156,41 @@ function createAppProvider(client, options) {
 			});
 			if (promoteResult.isErr()) throw new Error(promoteResult.error.message);
 		},
+		async startDeployment(options) {
+			const result = await sdk.startDeployment({
+				deploymentId: options.deploymentId,
+				signal: options.signal
+			});
+			if (result.isErr()) throw new Error(result.error.message);
+		},
+		async stopDeployment(options) {
+			const result = await sdk.stopDeployment({
+				deploymentId: options.deploymentId,
+				signal: options.signal
+			});
+			if (result.isErr()) throw new Error(result.error.message);
+		},
+		async deleteDeployment(options) {
+			const result = await sdk.deleteDeployment({
+				deploymentId: options.deploymentId,
+				signal: options.signal
+			});
+			if (result.isErr()) throw new Error(result.error.message);
+		},
+		async readDeployment(options) {
+			const result = await sdk.showDeployment({
+				deploymentId: options.deploymentId,
+				signal: options.signal
+			});
+			if (result.isErr()) throw new Error(result.error.message);
+			return {
+				id: result.value.id,
+				status: result.value.status,
+				createdAt: result.value.createdAt,
+				url: toAbsoluteUrl(result.value.previewDomain ?? null),
+				live: null
+			};
+		},
 		async deployApp(options) {
 			const resolvedApp = options.appId ? {
 				appId: options.appId,
@@ -169,11 +216,12 @@ function createAppProvider(client, options) {
 					buildSettings: options.buildSettings
 				}),
 				projectId: options.projectId,
-				serviceId: resolvedApp.appId,
-				serviceName: resolvedApp.appName,
+				appId: resolvedApp.appId,
+				appName: resolvedApp.appName,
 				region: resolvedApp.region,
 				portMapping: options.portMapping,
 				envVars: options.envVars,
+				skipPromote: options.skipPromote,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
 				interaction: options.interaction,
@@ -185,22 +233,24 @@ function createAppProvider(client, options) {
 			return {
 				projectId: deployed.projectId,
 				app: {
-					id: deployed.serviceId,
-					name: deployed.serviceName,
+					id: deployed.appId,
+					name: deployed.appName,
 					region: deployed.region ?? null,
-					liveDeploymentId: deployed.versionId,
-					liveUrl: toAbsoluteUrl(deployed.serviceEndpointDomain ?? null)
+					liveDeploymentId: deployed.promoted ? deployed.deploymentId : deployed.previousDeploymentId,
+					liveUrl: toAbsoluteUrl(deployed.appEndpointDomain ?? null)
 				},
 				deployment: {
-					id: deployed.versionId,
+					id: deployed.deploymentId,
 					status: "running",
-					url: toAbsoluteUrl(deployed.serviceEndpointDomain ?? deployed.versionEndpointDomain ?? null)
-				}
+					url: toAbsoluteUrl(deployed.appEndpointDomain ?? deployed.deploymentEndpointDomain ?? null),
+					live: deployed.promoted
+				},
+				promoted: deployed.promoted
 			};
 		},
 		async updateAppEnv(options) {
 			const updateResult = await sdk.updateEnv({
-				serviceId: options.appId,
+				appId: options.appId,
 				envVars: options.envVars,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
@@ -209,19 +259,19 @@ function createAppProvider(client, options) {
 			});
 			if (updateResult.isErr()) throw new Error(updateResult.error.message);
 			const promoteResult = await sdk.promote({
-				serviceId: options.appId,
-				versionId: updateResult.value.versionId,
+				appId: options.appId,
+				deploymentId: updateResult.value.deploymentId,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
 				signal: options.signal,
 				progress: options.promoteProgress
 			});
 			if (promoteResult.isErr()) throw new Error(promoteResult.error.message);
-			const [serviceResult, versionResult] = await Promise.all([sdk.showService({
-				serviceId: options.appId,
+			const [serviceResult, versionResult] = await Promise.all([sdk.showApp({
+				appId: options.appId,
 				signal: options.signal
-			}), sdk.showVersion({
-				versionId: updateResult.value.versionId,
+			}), sdk.showDeployment({
+				deploymentId: updateResult.value.deploymentId,
 				signal: options.signal
 			})]);
 			if (serviceResult.isErr()) throw new Error(serviceResult.error.message);
@@ -232,25 +282,25 @@ function createAppProvider(client, options) {
 					id: serviceResult.value.id,
 					name: serviceResult.value.name,
 					region: serviceResult.value.region ?? null,
-					liveDeploymentId: serviceResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: serviceResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? null)
 				},
 				deployment: {
 					id: versionResult.value.id,
 					status: versionResult.value.status,
 					createdAt: versionResult.value.createdAt,
-					url: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? versionResult.value.previewDomain ?? null),
+					url: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? versionResult.value.previewDomain ?? null),
 					live: true
 				},
 				variables: envVarNames(versionResult.value.envVars)
 			};
 		},
 		async listAppEnvNames(options) {
-			const [serviceResult, versionResult] = await Promise.all([sdk.showService({
-				serviceId: options.appId,
+			const [serviceResult, versionResult] = await Promise.all([sdk.showApp({
+				appId: options.appId,
 				signal: options.signal
-			}), sdk.showVersion({
-				versionId: options.deploymentId,
+			}), sdk.showDeployment({
+				deploymentId: options.deploymentId,
 				signal: options.signal
 			})]);
 			if (serviceResult.isErr()) throw new Error(serviceResult.error.message);
@@ -261,25 +311,25 @@ function createAppProvider(client, options) {
 					id: serviceResult.value.id,
 					name: serviceResult.value.name,
 					region: serviceResult.value.region ?? null,
-					liveDeploymentId: serviceResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: serviceResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? null)
 				},
 				deployment: {
 					id: versionResult.value.id,
 					status: versionResult.value.status,
 					createdAt: versionResult.value.createdAt,
 					url: toAbsoluteUrl(versionResult.value.previewDomain ?? null),
-					live: serviceResult.value.latestVersionId === versionResult.value.id
+					live: serviceResult.value.latestDeploymentId === versionResult.value.id
 				},
 				variables: envVarNames(versionResult.value.envVars)
 			};
 		},
 		async listDeployments(appId, options) {
-			const [appResult, versionsResult] = await Promise.all([sdk.showService({
-				serviceId: appId,
+			const [appResult, versionsResult] = await Promise.all([sdk.showApp({
+				appId,
 				signal: options?.signal
-			}), sdk.listVersions({
-				serviceId: appId,
+			}), sdk.listDeployments({
+				appId,
 				signal: options?.signal
 			})]);
 			if (appResult.isErr()) throw new Error(appResult.error.message);
@@ -289,8 +339,8 @@ function createAppProvider(client, options) {
 					id: appResult.value.id,
 					name: appResult.value.name,
 					region: appResult.value.region ?? null,
-					liveDeploymentId: appResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(appResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: appResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(appResult.value.appEndpointDomain ?? null)
 				},
 				deployments: versionsResult.value.slice().sort((left, right) => {
 					const byDate = right.createdAt.localeCompare(left.createdAt);
@@ -305,21 +355,23 @@ function createAppProvider(client, options) {
 			};
 		},
 		async showDeployment(deploymentId, options) {
-			const deploymentResult = await sdk.showVersion({
-				versionId: deploymentId,
+			const deploymentResult = await sdk.showDeployment({
+				deploymentId,
 				signal: options?.signal
 			});
 			if (deploymentResult.isErr()) {
 				if (ApiError.is(deploymentResult.error) && deploymentResult.error.statusCode === 404) return null;
 				throw new Error(deploymentResult.error.message);
 			}
+			const app = await findAppForDeployment(sdk, deploymentId, options?.signal);
+			const promotedUrl = app !== null && app.liveDeploymentId === deploymentResult.value.id ? app.liveUrl : null;
 			return {
-				app: await findAppForDeployment(sdk, deploymentId, options?.signal),
+				app,
 				deployment: {
 					id: deploymentResult.value.id,
 					status: deploymentResult.value.status,
 					createdAt: deploymentResult.value.createdAt,
-					url: toAbsoluteUrl(deploymentResult.value.previewDomain ?? null),
+					url: promotedUrl ?? toAbsoluteUrl(deploymentResult.value.previewDomain ?? null),
 					live: null
 				}
 			};
@@ -329,7 +381,7 @@ function createAppProvider(client, options) {
 			const result = await streamLogs({
 				baseUrl: options.baseUrl,
 				token: await options.getToken(),
-				versionId: streamOptions.deploymentId,
+				deploymentId: streamOptions.deploymentId,
 				signal: streamOptions.signal
 			}, streamOptions.onRecord);
 			if (result.isErr()) {
@@ -382,7 +434,7 @@ async function listComputeServices(client, options) {
 	const services = [];
 	let cursor;
 	while (true) {
-		const result = await client.GET("/v1/compute-services", {
+		const result = await client.GET("/v1/apps", {
 			params: { query: {
 				projectId: options.projectId,
 				branchGitName: options.branchGitName,
@@ -395,18 +447,62 @@ async function listComputeServices(client, options) {
 		if (!result.data.pagination.hasMore || !result.data.pagination.nextCursor) break;
 		cursor = result.data.pagination.nextCursor;
 	}
-	return services.map((service) => ({
+	return services.map(toAppRecord);
+}
+function toAppRecord(service) {
+	return {
 		id: service.id,
 		name: service.name,
 		region: service.region.id ?? null,
 		branchId: service.branchId,
-		liveDeploymentId: service.latestVersionId ?? null,
-		liveUrl: toAbsoluteUrl(service.serviceEndpointDomain ?? null)
-	}));
+		liveDeploymentId: service.latestDeploymentId ?? null,
+		liveUrl: toAbsoluteUrl(service.appEndpointDomain ?? null)
+	};
+}
+/**
+* Creates a service on a branch, resolving (or creating) the branch
+* first because the create body needs its id. A name already taken on
+* the branch comes back as the existing service rather than an error:
+* the API answers 409 and the caller asked for a service by that name,
+* which already exists.
+*/
+async function createComputeService(client, options) {
+	const branch = await resolveOrCreateBranch(client, {
+		projectId: options.projectId,
+		gitName: options.branchName,
+		signal: options.signal
+	});
+	const result = await client.POST("/v1/apps", {
+		body: {
+			projectId: options.projectId,
+			branchId: branch.id,
+			displayName: options.displayName,
+			...options.region ? { regionId: options.region } : {}
+		},
+		signal: options.signal
+	});
+	if (result.error || !result.data) {
+		if (result.response.status === 409) {
+			const matched = (await listComputeServices(client, {
+				projectId: options.projectId,
+				branchGitName: options.branchName,
+				signal: options.signal
+			})).find((service) => service.name === options.displayName);
+			if (matched) return {
+				service: matched,
+				existing: true
+			};
+		}
+		throw apiCallError(`Failed to create app "${options.displayName}"`, result.response, result.error);
+	}
+	return {
+		service: toAppRecord(result.data.data),
+		existing: false
+	};
 }
-async function listComputeServiceDomains(client, computeServiceId, signal) {
-	const result = await client.GET("/v1/compute-services/{computeServiceId}/domains", {
-		params: { path: { computeServiceId } },
+async function listComputeServiceDomains(client, appId, signal) {
+	const result = await client.GET("/v1/apps/{appId}/domains", {
+		params: { path: { appId } },
 		signal
 	});
 	if (result.error || !result.data) throw domainApiCallError("Failed to list custom domains", result.response, result.error);
@@ -418,7 +514,7 @@ function normalizeDomainRecord(domain) {
 		type: domain.type,
 		url: domain.url,
 		hostname: domain.hostname,
-		computeServiceId: domain.computeServiceId,
+		appId: domain.appId,
 		status: domain.status,
 		foundryStatus: domain.foundryStatus,
 		failureReason: domain.failureReason,
@@ -448,40 +544,17 @@ function normalizeHostnameForComparison(hostname) {
 	return hostname.trim().replace(/\.$/, "").toLowerCase();
 }
 async function createBranchApp(client, options) {
-	const branch = await resolveOrCreateBranch(client, {
+	const created = await createComputeService(client, {
 		projectId: options.projectId,
-		gitName: options.branchName,
-		signal: options.signal
-	});
-	const result = await client.POST("/v1/compute-services", {
-		body: {
-			projectId: options.projectId,
-			branchId: branch.id,
-			displayName: options.appName,
-			...options.region ? { regionId: options.region } : {}
-		},
-		signal: options.signal
+		branchName: options.branchName,
+		displayName: options.appName,
+		...options.region !== void 0 ? { region: options.region } : {},
+		...options.signal !== void 0 ? { signal: options.signal } : {}
 	});
-	if (result.error || !result.data) {
-		if (result.response.status === 409) {
-			const matched = (await listComputeServices(client, {
-				projectId: options.projectId,
-				branchGitName: options.branchName,
-				signal: options.signal
-			})).find((app) => app.name === options.appName);
-			if (matched) return {
-				appId: matched.id,
-				appName: matched.name,
-				region: matched.region ?? options.region
-			};
-		}
-		throw apiCallError(`Failed to create app "${options.appName}"`, result.response, result.error);
-	}
-	const service = result.data.data;
 	return {
-		appId: service.id,
-		appName: service.name,
-		region: service.region.id ?? options.region
+		appId: created.service.id,
+		appName: created.service.name,
+		region: created.service.region ?? options.region
 	};
 }
 function apiCallError(summary, response, error) {
@@ -503,7 +576,7 @@ async function findAppForDeployment(sdk, deploymentId, signal) {
 	const projectsResult = await sdk.listProjects({ signal });
 	if (projectsResult.isErr()) throw new Error(projectsResult.error.message);
 	for (const project of projectsResult.value) {
-		const servicesResult = await sdk.listServices({
+		const servicesResult = await sdk.listApps({
 			projectId: project.id,
 			signal
 		});
@@ -516,8 +589,8 @@ async function findAppForDeployment(sdk, deploymentId, signal) {
 	return null;
 }
 async function findServiceAppForDeployment(sdk, serviceId, deploymentId, signal) {
-	const detailResult = await sdk.showService({
-		serviceId,
+	const detailResult = await sdk.showApp({
+		appId: serviceId,
 		signal
 	});
 	if (detailResult.isErr()) throw new Error(detailResult.error.message);
@@ -525,12 +598,12 @@ async function findServiceAppForDeployment(sdk, serviceId, deploymentId, signal)
 		id: detailResult.value.id,
 		name: detailResult.value.name,
 		region: detailResult.value.region ?? null,
-		liveDeploymentId: detailResult.value.latestVersionId ?? null,
-		liveUrl: toAbsoluteUrl(detailResult.value.serviceEndpointDomain ?? null)
+		liveDeploymentId: detailResult.value.latestDeploymentId ?? null,
+		liveUrl: toAbsoluteUrl(detailResult.value.appEndpointDomain ?? null)
 	};
 	if (app.liveDeploymentId === deploymentId) return app;
-	const versionsResult = await sdk.listVersions({
-		serviceId,
+	const versionsResult = await sdk.listDeployments({
+		appId: serviceId,
 		signal
 	});
 	if (versionsResult.isErr()) throw new Error(versionsResult.error.message);

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

@@ -1,61 +1,86 @@
-import { CliError, usageError } from "../../shell/errors.js";
-import { confirmPrompt } from "../../shell/prompt.js";
+import { formatCommandArgument } from "../../command-arguments.js";
+import { CliError, usageError } from "../../errors.js";
 import { renderSummaryLine } from "../../shell/ui.js";
 import { canPrompt } from "../../shell/runtime.js";
-import { formatCommandArgument } from "../../shell/command-arguments.js";
-import "../project/setup.js";
+import { confirmPrompt } from "../../shell/prompt.js";
 import { hasBranchDatabaseSignal, inspectBranchDatabaseSignal } from "./branch-database.js";
 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 (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" && !options.firstProductionDeploy) {
-		if (options.db === true) throw productionDatabaseSetupAfterFirstDeployError();
+	const databaseRequested = options.db === true;
+	const conflict = findBranchDatabaseSetupConflict(branch, options);
+	if (conflict) {
+		if (databaseRequested) throw branchDatabaseSetupConflictError(conflict);
 		return emptyBranchDatabaseSetupOutcome();
 	}
 	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: existingDatabaseEnvReason(branch),
-				envVars: targetEnvVars
-			} : void 0,
-			warnings: warning ? [warning] : []
-		};
-	}
+	if (hasExistingDatabaseEnvForTarget(branch, envState)) return existingDatabaseEnvOutcome(context, branch, envState, databaseRequested);
 	const localSignal = await inspectBranchDatabaseSignal(options.projectDir, context.runtime.signal);
 	if (localSignal.unsupportedSchema) {
-		if (options.db === true) throw unsupportedBranchDatabaseSchemaError(localSignal.unsupportedSchema, branch, context);
+		if (databaseRequested) throw unsupportedBranchDatabaseSchemaError(localSignal.unsupportedSchema, branch, context);
 		return emptyBranchDatabaseSetupOutcome();
 	}
-	const hasSignal = hasBranchDatabaseSignal(localSignal) || Boolean(envState.inheritedPreviewDatabaseUrl);
-	if (options.db !== true) {
-		if (!hasSignal) return emptyBranchDatabaseSetupOutcome();
-		if (!canPrompt(context) || context.flags.yes) {
-			const warning = databasePromptSuppressedWarning(branch);
-			emitBranchDatabaseWarning(context, warning);
-			return {
+	const confirmation = await confirmBranchDatabaseSetup(context, branch, localSignal, envState, databaseRequested);
+	if (!confirmation.confirmed) return confirmation.outcome;
+	return setupBranchDatabase(context, provider, projectId, branch, localSignal, envState, options.projectDir);
+}
+function findBranchDatabaseSetupConflict(branch, options) {
+	if (hasProvidedDatabaseEnvVars(options.providedEnvVars)) return "provided-env-vars";
+	if (branch.kind === "production" && !options.firstProductionDeploy) return "production-after-first-deploy";
+	return null;
+}
+function branchDatabaseSetupConflictError(conflict) {
+	switch (conflict) {
+		case "provided-env-vars": return providedDatabaseEnvVarsError();
+		case "production-after-first-deploy": return productionDatabaseSetupAfterFirstDeployError();
+	}
+}
+function existingDatabaseEnvOutcome(context, branch, envState, databaseRequested) {
+	if (!databaseRequested) return emptyBranchDatabaseSetupOutcome();
+	const envVars = getTargetDatabaseEnvVarKeys(envState);
+	const warning = existingDatabaseEnvWarning(branch, envVars);
+	emitBranchDatabaseWarning(context, warning);
+	return {
+		result: {
+			status: "skipped",
+			reason: existingDatabaseEnvReason(branch),
+			envVars
+		},
+		warnings: [warning]
+	};
+}
+async function confirmBranchDatabaseSetup(context, branch, signal, envState, databaseRequested) {
+	if (databaseRequested) {
+		if (!canPrompt(context) && !context.flags.yes) throw nonInteractiveDatabaseSetupRequiresYesError(branch);
+		return { confirmed: true };
+	}
+	if (!(hasBranchDatabaseSignal(signal) || Boolean(envState.inheritedPreviewDatabaseUrl))) return {
+		confirmed: false,
+		outcome: emptyBranchDatabaseSetupOutcome()
+	};
+	if (!canPrompt(context) || context.flags.yes) {
+		const warning = databasePromptSuppressedWarning(branch);
+		emitBranchDatabaseWarning(context, warning);
+		return {
+			confirmed: false,
+			outcome: {
 				result: void 0,
 				warnings: [warning]
-			};
-		}
-		maybeRenderBranchDatabaseSignal(context, branch, localSignal, envState);
-		if (!await confirmPrompt({
-			input: context.runtime.stdin,
-			output: context.output.stderr,
-			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, options.projectDir);
+			}
+		};
+	}
+	maybeRenderBranchDatabaseSignal(context, branch, signal, envState);
+	return await confirmPrompt({
+		input: context.runtime.stdin,
+		output: context.output.stderr,
+		signal: context.runtime.signal,
+		message: databasePromptMessage(branch),
+		initialValue: false
+	}) ? { confirmed: true } : {
+		confirmed: false,
+		outcome: emptyBranchDatabaseSetupOutcome()
+	};
 }
 async function setupBranchDatabase(context, provider, projectId, branch, signal, envState, projectDir) {
 	emitBranchDatabaseProgress(context, "pending", "Creating database");
@@ -224,6 +249,9 @@ function emptyBranchDatabaseSetupOutcome() {
 		warnings: []
 	};
 }
+function providedDatabaseEnvVarsError() {
+	return 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");
+}
 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");
 }