@prisma/cli 3.0.0-dev.81.1 → 3.0.0-dev.83.1

package/dist/adapters/token-storage.js

@@ -1,8 +1,8 @@
 import { getAuthFilePath } from "../lib/auth/client.js";
 import fs from "node:fs/promises";
 import path from "node:path";
-import { CredentialsStore } from "@prisma/credentials-store";
 import { randomUUID } from "node:crypto";
+import { CredentialsStore } from "@prisma/credentials-store";
 //#region src/adapters/token-storage.ts
 function findLatestValidTokens(allCredentials) {
 	for (let i = allCredentials.length - 1; i >= 0; i -= 1) {
@@ -49,7 +49,7 @@ var FileTokenStorage = class {
 			const all = await this.credentialsStore.getCredentials();
 			this.signal?.throwIfAborted();
 			return findLatestValidTokens(all);
-		} catch (error) {
+		} catch (_error) {
 			if (this.signal?.aborted) throw this.signal.reason;
 			return null;
 		}

package/dist/cli.js

@@ -3,22 +3,22 @@ import { runUpdateDiscoveryWorker } from "./shell/update-check.js";
 import { runCli } from "./cli2.js";
 import process from "node:process";
 //#region src/bin.ts
-if (process.env.PRISMA_CLI_RUN_UPDATE_CHECK_WORKER === "1") runUpdateDiscoveryWorker().then(() => {
+if (process.env.PRISMA_CLI_RUN_UPDATE_CHECK_WORKER === "1") {
+	await runUpdateDiscoveryWorker();
 	process.exitCode = 0;
-});
-else {
+} else {
 	const controller = new AbortController();
 	const abortCli = () => {
 		if (!controller.signal.aborted) controller.abort(new DOMException("Command canceled", "AbortError"));
 	};
 	process.once("SIGINT", abortCli);
 	process.once("SIGTERM", abortCli);
-	runCli({ signal: controller.signal }).then((exitCode) => {
-		process.exitCode = exitCode;
-	}).finally(() => {
+	try {
+		process.exitCode = await runCli({ signal: controller.signal });
+	} finally {
 		process.off("SIGINT", abortCli);
 		process.off("SIGTERM", abortCli);
-	});
+	}
 }
 //#endregion
 export {};

package/dist/cli2.js

@@ -1,10 +1,10 @@
 import { CliError } from "./shell/errors.js";
-import { createShellUi } from "./shell/ui.js";
-import { formatUnexpectedError, writeHumanError, writeJsonError, writeJsonSuccess } from "./shell/output.js";
+import "./shell/prompt.js";
 import { attachCommandDescriptor } from "./shell/command-meta.js";
 import { addCompactGlobalFlags } from "./shell/global-flags.js";
+import { createShellUi } from "./shell/ui.js";
 import { configureRuntimeCommand, createCommandContext } from "./shell/runtime.js";
-import "./shell/prompt.js";
+import { formatUnexpectedError, writeHumanError, writeJsonError, writeJsonSuccess } from "./shell/output.js";
 import { createAppCommand } from "./commands/app/index.js";
 import { createAuthCommand } from "./commands/auth/index.js";
 import { createBranchCommand } from "./commands/branch/index.js";

package/dist/controllers/app-env.js

@@ -1,8 +1,8 @@
 import { CliError, authRequiredError, usageError, workspaceRequiredError } from "../shell/errors.js";
-import { requireComputeAuth } from "../lib/auth/guard.js";
+import { projectResolutionErrorToCliError, resolveProjectTarget } from "../lib/project/resolution.js";
 import { formatScopeLabel, parseKeyValuePositional, resolveEnvScope } from "../lib/app/env-config.js";
 import { readEnvFileAssignments } from "../lib/app/env-file.js";
-import { projectResolutionErrorToCliError, resolveProjectTarget } from "../lib/project/resolution.js";
+import { requireComputeAuth } from "../lib/auth/guard.js";
 import { readLocalGitBranch } from "../lib/git/local-branch.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listRealWorkspaceProjects } from "./project.js";
@@ -204,12 +204,13 @@ async function requireClientAndProject(context, explicitProject, commandName) {
 	const authState = await requireAuthenticatedAuthState(context);
 	const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 	if (!client) throw authRequiredError(["prisma-cli auth login"]);
-	if (!authState.workspace) throw workspaceRequiredError();
+	const workspace = authState.workspace;
+	if (!workspace) throw workspaceRequiredError();
 	const targetResult = await resolveProjectTarget({
 		context,
-		workspace: authState.workspace,
+		workspace,
 		explicitProject,
-		listProjects: () => listRealWorkspaceProjects(client, authState.workspace, context.runtime.signal),
+		listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
 		commandName
 	});
 	if (targetResult.isErr()) throw projectResolutionErrorToCliError(targetResult.error);
@@ -218,7 +219,7 @@ async function requireClientAndProject(context, explicitProject, commandName) {
 		client,
 		projectId: target.project.id,
 		verboseContext: {
-			workspace: authState.workspace,
+			workspace,
 			project: target.project,
 			resolution: target.resolution
 		}

package/dist/controllers/app.js

@@ -1,37 +1,37 @@
 import { SERVICE_TOKEN_ENV_VAR, getApiBaseUrl } from "../lib/auth/client.js";
 import { FileTokenStorage } from "../adapters/token-storage.js";
 import { CliError, authRequiredError, featureUnavailableError, usageError, workspaceRequiredError } from "../shell/errors.js";
+import { confirmPrompt, selectPrompt, textPrompt } from "../shell/prompt.js";
 import { renderCommandHeader } from "../shell/ui.js";
-import { writeJsonEvent } from "../shell/output.js";
 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, 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";
-import { formatCommandArgument } from "../shell/command-arguments.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "../lib/project/local-pin.js";
+import { formatCommandArgument } from "../shell/command-arguments.js";
 import { buildProjectSetupNextActions, inferTargetName, projectNotFoundError, projectResolutionErrorToCliError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
 import { bindProjectToDirectory, projectCreateFailedError, projectDirectoryBindingErrorToCliError, 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 { maybeSetupBranchDatabase } from "../lib/app/branch-database-deploy.js";
+import { readBunPackageEntrypoint, readBunPackageJson } from "../lib/app/bun-project.js";
+import { renderDeployOutputRows, renderDeploySettingsPreview } from "../lib/app/deploy-output.js";
+import { formatDomainFailureFix } from "../lib/app/domain-guidance.js";
+import { envVarNames, parseEnvInputs } from "../lib/app/env-vars.js";
+import { DEFAULT_LOCAL_DEV_PORT, resolveLocalBuildType, runLocalApp } from "../lib/app/local-dev.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";
 import { createPreviewDeployProgress, createPreviewDeployProgressState, createPreviewPromoteProgress } from "../lib/app/preview-progress.js";
 import { PreviewDomainApiError, createPreviewAppProvider } from "../lib/app/preview-provider.js";
 import { enforceProductionDeployGate } from "../lib/app/production-deploy-gate.js";
-import { formatDomainFailureFix } from "../lib/app/domain-guidance.js";
+import { requireComputeAuth } from "../lib/auth/guard.js";
+import { readAuthState } from "../lib/auth/auth-ops.js";
+import { readLocalGitBranch } from "../lib/git/local-branch.js";
+import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
+import { writeJsonEvent } from "../shell/output.js";
 import { createSelectPromptPort } from "./select-prompt-port.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listRealWorkspaceProjects } from "./project.js";
 import { access, readFile } from "node:fs/promises";
 import path from "node:path";
-import open from "open";
 import { Result, matchError } from "better-result";
+import open from "open";
 //#region src/controllers/app.ts
 const DEPLOY_FRAMEWORKS = [
 	"nextjs",
@@ -910,51 +910,72 @@ async function confirmDomainRemoval(context, target, hostname) {
 	})) throw usageError("Custom domain removal canceled", "The command was canceled before the domain was detached.", "Rerun the command and confirm removal, or pass --yes.", [`prisma-cli app domain remove ${hostname} --app ${target.app.name} --yes`], "app");
 }
 function domainCommandError(command, error, hostname) {
-	if (error instanceof PreviewDomainApiError) {
-		if (command === "add" && (error.status === 400 || error.status === 422) && isDomainDnsError(error)) return domainDnsNotConfiguredError(hostname, error);
-		if (command === "add" && error.status === 400) return new CliError({
-			code: "DOMAIN_HOSTNAME_INVALID",
-			domain: "app",
-			summary: `Invalid custom domain "${hostname}"`,
-			why: error.message,
-			fix: "Pass a valid hostname like shop.acme.com and make sure DNS can be verified.",
-			debug: formatDebugDetails(error),
-			exitCode: 2,
-			nextSteps: ["prisma-cli app domain add shop.acme.com"]
-		});
-		if (command === "add" && (error.status === 429 || isDomainQuotaError(error))) return new CliError({
-			code: "DOMAIN_QUOTA_EXCEEDED",
-			domain: "app",
-			summary: "Custom domain quota exceeded",
-			why: error.message,
-			fix: "Remove an existing custom domain before adding another one.",
-			debug: formatDebugDetails(error),
-			exitCode: 1,
-			nextSteps: ["prisma-cli app domain remove <hostname>"]
-		});
-		if (command === "add" && error.status === 409) return domainAlreadyRegisteredError(hostname, error);
-		if (command === "add" && error.status === 422) return new CliError({
-			code: "NO_DEPLOYMENTS",
-			domain: "app",
-			summary: "Custom domain requires a live production deployment",
-			why: "The selected production app does not have a promoted version that can receive a custom domain.",
-			fix: "Deploy the app to the production branch, then rerun the domain command.",
-			debug: formatDebugDetails(error),
-			exitCode: 1,
-			nextSteps: ["prisma-cli app deploy --branch production", `prisma-cli app domain add ${hostname}`]
-		});
-		if ((command === "show" || command === "remove" || command === "retry" || command === "wait") && error.status === 404) return domainNotFoundError(hostname);
-		if (command === "retry" && error.status === 409) return new CliError({
-			code: "DOMAIN_RETRY_NOT_ELIGIBLE",
-			domain: "app",
-			summary: `Custom domain "${hostname}" is not eligible for retry`,
-			why: error.message,
-			fix: "Wait for the current verification or TLS step to finish, then rerun retry if the domain fails.",
-			debug: formatDebugDetails(error),
-			exitCode: 1,
-			nextSteps: [`prisma-cli app domain show ${hostname}`]
-		});
-	}
+	if (error instanceof PreviewDomainApiError) return domainApiCommandError(command, error, hostname);
+	return new CliError({
+		code: "DEPLOY_FAILED",
+		domain: "app",
+		summary: `Custom domain ${command} failed`,
+		why: error instanceof Error ? error.message : String(error),
+		fix: "Retry the command, or rerun with --trace for more detailed diagnostics.",
+		debug: formatDebugDetails(error),
+		exitCode: 1,
+		nextSteps: [`prisma-cli app domain show ${hostname}`]
+	});
+}
+function domainApiCommandError(command, error, hostname) {
+	if (command === "add") return domainAddCommandError(error, hostname);
+	if (error.status === 404) return domainNotFoundError(hostname);
+	if (command === "retry" && error.status === 409) return domainRetryNotEligibleError(error, hostname);
+	return domainGenericCommandError(command, error, hostname);
+}
+function domainAddCommandError(error, hostname) {
+	if ((error.status === 400 || error.status === 422) && isDomainDnsError(error)) return domainDnsNotConfiguredError(hostname, error);
+	if (error.status === 400) return new CliError({
+		code: "DOMAIN_HOSTNAME_INVALID",
+		domain: "app",
+		summary: `Invalid custom domain "${hostname}"`,
+		why: error.message,
+		fix: "Pass a valid hostname like shop.acme.com and make sure DNS can be verified.",
+		debug: formatDebugDetails(error),
+		exitCode: 2,
+		nextSteps: ["prisma-cli app domain add shop.acme.com"]
+	});
+	if (error.status === 429 || isDomainQuotaError(error)) return new CliError({
+		code: "DOMAIN_QUOTA_EXCEEDED",
+		domain: "app",
+		summary: "Custom domain quota exceeded",
+		why: error.message,
+		fix: "Remove an existing custom domain before adding another one.",
+		debug: formatDebugDetails(error),
+		exitCode: 1,
+		nextSteps: ["prisma-cli app domain remove <hostname>"]
+	});
+	if (error.status === 409) return domainAlreadyRegisteredError(hostname, error);
+	if (error.status === 422) return new CliError({
+		code: "NO_DEPLOYMENTS",
+		domain: "app",
+		summary: "Custom domain requires a live production deployment",
+		why: "The selected production app does not have a promoted version that can receive a custom domain.",
+		fix: "Deploy the app to the production branch, then rerun the domain command.",
+		debug: formatDebugDetails(error),
+		exitCode: 1,
+		nextSteps: ["prisma-cli app deploy --branch production", `prisma-cli app domain add ${hostname}`]
+	});
+	return domainGenericCommandError("add", error, hostname);
+}
+function domainRetryNotEligibleError(error, hostname) {
+	return new CliError({
+		code: "DOMAIN_RETRY_NOT_ELIGIBLE",
+		domain: "app",
+		summary: `Custom domain "${hostname}" is not eligible for retry`,
+		why: error.message,
+		fix: "Wait for the current verification or TLS step to finish, then rerun retry if the domain fails.",
+		debug: formatDebugDetails(error),
+		exitCode: 1,
+		nextSteps: [`prisma-cli app domain show ${hostname}`]
+	});
+}
+function domainGenericCommandError(command, error, hostname) {
 	return new CliError({
 		code: "DEPLOY_FAILED",
 		domain: "app",
@@ -1356,14 +1377,14 @@ async function requireProviderAndDeployProjectContext(context, explicitProject,
 	};
 }
 async function resolveProjectContext(context, client, explicitProject, options) {
-	const authState = await requireAuthenticatedAuthState(context);
-	if (!authState.workspace) throw workspaceRequiredError();
+	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
+	if (!workspace) throw workspaceRequiredError();
 	const resolvedResult = await resolveProjectTarget({
 		context,
-		workspace: authState.workspace,
+		workspace,
 		explicitProject,
 		envProjectId: options?.envProjectId,
-		listProjects: () => listRealWorkspaceProjects(client, authState.workspace, context.runtime.signal),
+		listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
 		commandName: options?.commandName
 	});
 	if (resolvedResult.isErr()) throw projectResolutionErrorToCliError(resolvedResult.error);
@@ -1382,8 +1403,16 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
 	const branch = options.branch ?? await resolveDeployBranch(context, void 0);
-	const projects = await listRealWorkspaceProjects(client, workspace, context.runtime.signal);
-	if (explicitProject) return withRemoteDeployBranch(provider, {
+	return withRemoteDeployBranch(provider, await resolveDeployProjectSetup(context, provider, workspace, await listRealWorkspaceProjects(client, workspace, context.runtime.signal), explicitProject, options), branch, context.runtime.signal);
+}
+async function resolveDeployProjectSetup(context, provider, workspace, projects, explicitProject, options) {
+	const selected = await resolveNonInteractiveDeployProjectSetup(context, provider, workspace, projects, explicitProject, options);
+	if (selected) return selected;
+	if (canPrompt(context) && !context.flags.yes) return resolveInteractiveDeployProjectSetup(context, provider, workspace, projects);
+	throw projectSetupRequiredError(projects, await inferTargetName(context.runtime.cwd, context.runtime.signal));
+}
+async function resolveNonInteractiveDeployProjectSetup(context, provider, workspace, projects, explicitProject, options) {
+	if (explicitProject) return {
 		workspace,
 		project: toProjectSummary(resolveProjectForSetup(explicitProject, projects, workspace)),
 		resolution: {
@@ -1392,11 +1421,11 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 			targetNameSource: "explicit"
 		},
 		localPinAction: "linked"
-	}, branch, context.runtime.signal);
+	};
 	if (options.createProjectName) {
 		const projectName = options.createProjectName.trim();
 		if (!projectName) throw projectSetupNameRequiredError("app deploy --create-project");
-		return withRemoteDeployBranch(provider, {
+		return {
 			workspace,
 			project: toProjectSummary(await createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal)),
 			resolution: {
@@ -1405,12 +1434,12 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 				targetNameSource: "explicit"
 			},
 			localPinAction: "created"
-		}, branch, context.runtime.signal);
+		};
 	}
 	if (options.envProjectId) {
 		const project = projects.find((candidate) => candidate.id === options.envProjectId);
 		if (!project) throw projectNotFoundError(options.envProjectId, workspace);
-		return withRemoteDeployBranch(provider, {
+		return {
 			workspace,
 			project: toProjectSummary(project),
 			resolution: {
@@ -1418,14 +1447,14 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 				targetName: options.envProjectId,
 				targetNameSource: "env"
 			}
-		}, branch, context.runtime.signal);
+		};
 	}
 	const localPin = options.localPin;
 	if (localPin.kind === "present") {
 		if (localPin.pin.workspaceId !== workspace.id) throw localResolutionPinStaleError();
 		const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
 		if (!project) throw localResolutionPinStaleError();
-		return withRemoteDeployBranch(provider, {
+		return {
 			workspace,
 			project: toProjectSummary(project),
 			resolution: {
@@ -1433,10 +1462,10 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 				targetName: project.name,
 				targetNameSource: "local-pin"
 			}
-		}, branch, context.runtime.signal);
+		};
 	}
 	const platformMapping = await resolveDurablePlatformMapping();
-	if (platformMapping && platformMapping.workspace.id === workspace.id) return withRemoteDeployBranch(provider, {
+	if (platformMapping && platformMapping.workspace.id === workspace.id) return {
 		workspace,
 		project: toProjectSummary(platformMapping),
 		resolution: {
@@ -1444,9 +1473,8 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 			targetName: platformMapping.name,
 			targetNameSource: "platform-mapping"
 		}
-	}, branch, context.runtime.signal);
-	if (canPrompt(context) && !context.flags.yes) return withRemoteDeployBranch(provider, await resolveInteractiveDeployProjectSetup(context, provider, workspace, projects), branch, context.runtime.signal);
-	throw projectSetupRequiredError(projects, await inferTargetName(context.runtime.cwd, context.runtime.signal));
+	};
+	return null;
 }
 async function resolveInteractiveDeployProjectSetup(context, provider, workspace, projects) {
 	const setup = await promptForProjectSetupChoice({
@@ -1890,41 +1918,7 @@ function deployFailedError(summary, error, nextSteps) {
 function appDeployFailedError(error, progress) {
 	const why = error instanceof Error ? error.message : String(error);
 	const debug = formatDebugDetails(error);
-	if (progress.buildStarted && !progress.buildCompleted) {
-		const standaloneOutputFailure = isNextStandaloneOutputFailure(why);
-		const fix = standaloneOutputFailure ? "Add output: \"standalone\" to next.config.*, then rerun deploy." : "Inspect the build output above, fix the error, and redeploy.";
-		const nextSteps = standaloneOutputFailure ? ["Add output: \"standalone\" to next.config.*, then rerun prisma-cli app deploy"] : [];
-		const nextActions = standaloneOutputFailure ? [{
-			kind: "edit-file",
-			journey: "deploy-app",
-			label: "Add Next.js standalone output",
-			reason: "Prisma Compute needs Next.js standalone output to build a deployable server artifact."
-		}, {
-			kind: "run-command",
-			journey: "deploy-app",
-			label: "Rerun deploy",
-			command: "prisma-cli app deploy"
-		}] : [];
-		return new CliError({
-			code: "BUILD_FAILED",
-			domain: "app",
-			summary: "Build failed locally.",
-			why,
-			fix,
-			debug,
-			meta: { phase: "build" },
-			humanLines: [
-				"Build failed locally.",
-				"",
-				`✗ Built       ${why}`,
-				"",
-				`Fix: ${fix}`
-			],
-			exitCode: 1,
-			nextSteps,
-			nextActions
-		});
-	}
+	if (progress.buildStarted && !progress.buildCompleted) return appBuildFailedError(why, debug);
 	if (!progress.buildStarted) return deployFailedError("App deploy failed", error, ["prisma-cli app deploy"]);
 	const phaseHeadline = progress.containerLive ? "The deployment started, but the app is not ready yet." : "Deploy failed after the build completed.";
 	const recoveryLines = progress.versionId ? ["See what happened", `prisma-cli app logs --deployment ${progress.versionId}`] : ["Fix", "Retry the command, or rerun with --trace for more detailed diagnostics."];
@@ -1965,6 +1959,41 @@ function appDeployFailedError(error, progress) {
 		nextSteps: []
 	});
 }
+function appBuildFailedError(why, debug) {
+	const standaloneOutputFailure = isNextStandaloneOutputFailure(why);
+	const fix = standaloneOutputFailure ? "Add output: \"standalone\" to next.config.*, then rerun deploy." : "Inspect the build output above, fix the error, and redeploy.";
+	const nextSteps = standaloneOutputFailure ? ["Add output: \"standalone\" to next.config.*, then rerun prisma-cli app deploy"] : [];
+	const nextActions = standaloneOutputFailure ? [{
+		kind: "edit-file",
+		journey: "deploy-app",
+		label: "Add Next.js standalone output",
+		reason: "Prisma Compute needs Next.js standalone output to build a deployable server artifact."
+	}, {
+		kind: "run-command",
+		journey: "deploy-app",
+		label: "Rerun deploy",
+		command: "prisma-cli app deploy"
+	}] : [];
+	return new CliError({
+		code: "BUILD_FAILED",
+		domain: "app",
+		summary: "Build failed locally.",
+		why,
+		fix,
+		debug,
+		meta: { phase: "build" },
+		humanLines: [
+			"Build failed locally.",
+			"",
+			`✗ Built       ${why}`,
+			"",
+			`Fix: ${fix}`
+		],
+		exitCode: 1,
+		nextSteps,
+		nextActions
+	});
+}
 function localResolutionPinStaleError() {
 	return new CliError({
 		code: "LOCAL_STATE_STALE",

package/dist/controllers/branch.js

@@ -1,6 +1,6 @@
 import { CliError, authRequiredError, workspaceRequiredError } from "../shell/errors.js";
-import { requireComputeAuth } from "../lib/auth/guard.js";
 import { projectResolutionErrorToCliError, resolveProjectTarget } from "../lib/project/resolution.js";
+import { requireComputeAuth } from "../lib/auth/guard.js";
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listRealWorkspaceProjects } from "./project.js";

package/dist/controllers/database.js

@@ -1,6 +1,6 @@
 import { CliError, authRequiredError, usageError, workspaceRequiredError } from "../shell/errors.js";
-import { requireComputeAuth } from "../lib/auth/guard.js";
 import { projectResolutionErrorToCliError, resolveProjectTarget } from "../lib/project/resolution.js";
+import { requireComputeAuth } from "../lib/auth/guard.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listFixtureWorkspaceProjects, listRealWorkspaceProjects } from "./project.js";
 import { createManagementDatabaseProvider, normalizeConnection, normalizeDatabase } from "../lib/database/provider.js";

package/dist/controllers/project.js

@@ -1,19 +1,19 @@
 import { CliError, authRequiredError, featureUnavailableError, usageError, workspaceRequiredError } from "../shell/errors.js";
 import { renderSummaryLine } from "../shell/ui.js";
 import { canPrompt } from "../shell/runtime.js";
-import { requireComputeAuth } from "../lib/auth/guard.js";
-import { formatCommandArgument } from "../shell/command-arguments.js";
 import { readLocalResolutionPin } from "../lib/project/local-pin.js";
+import { formatCommandArgument } from "../shell/command-arguments.js";
 import { buildProjectSetupNextActions, inferTargetName, inspectProjectBinding, projectResolutionErrorToCliError, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
 import { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectDirectoryBindingErrorToCliError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
-import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
 import { createPreviewAppProvider } from "../lib/app/preview-provider.js";
+import { requireComputeAuth } from "../lib/auth/guard.js";
+import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { parseGitHubRepositoryUrl, readGitOriginRemote } from "../adapters/git.js";
 import { createProjectUseCases } from "../use-cases/project.js";
-import open from "open";
 import { matchError } from "better-result";
+import open from "open";
 //#region src/controllers/project.ts
 const GITHUB_INSTALL_POLL_INTERVAL_MS = 2e3;
 const GITHUB_INSTALL_POLL_TIMEOUT_MS = 12e4;

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

@@ -1,7 +1,7 @@
 import { CliError, usageError } from "../../shell/errors.js";
+import { confirmPrompt } from "../../shell/prompt.js";
 import { renderSummaryLine } from "../../shell/ui.js";
 import { canPrompt } from "../../shell/runtime.js";
-import { confirmPrompt } from "../../shell/prompt.js";
 import { formatCommandArgument } from "../../shell/command-arguments.js";
 import "../project/setup.js";
 import { hasBranchDatabaseSignal, inspectBranchDatabaseSignal, runBranchDatabaseSchemaSetup } from "./branch-database.js";
@@ -9,6 +9,22 @@ 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();
+	const preflight = branchDatabasePreflight(branch, options);
+	if (preflight) return preflight;
+	const envState = await inspectBranchDatabaseEnv(provider, projectId, branch, context.runtime.signal);
+	const existingEnvOutcome = existingBranchDatabaseEnvOutcome(context, branch, getTargetDatabaseEnvVarKeys(envState), envState, options.db);
+	if (existingEnvOutcome) return existingEnvOutcome;
+	const localSignal = await inspectBranchDatabaseSignal(context.runtime.cwd, context.runtime.signal);
+	if (localSignal.unsupportedSchema) {
+		if (options.db === true) throw unsupportedBranchDatabaseSchemaError(localSignal.unsupportedSchema, branch, context);
+		return emptyBranchDatabaseSetupOutcome();
+	}
+	const promptOutcome = await branchDatabasePromptOutcome(context, branch, localSignal, envState, options.db);
+	if (promptOutcome) return promptOutcome;
+	if (options.db === true && !canPrompt(context) && !context.flags.yes) throw nonInteractiveDatabaseSetupRequiresYesError(branch);
+	return setupBranchDatabase(context, provider, projectId, branch, localSignal, envState);
+}
+function branchDatabasePreflight(branch, options) {
 	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();
@@ -17,46 +33,40 @@ async function maybeSetupBranchDatabase(context, provider, projectId, branch, op
 		if (options.db === true) throw productionDatabaseSetupAfterFirstDeployError();
 		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 null;
+}
+function existingBranchDatabaseEnvOutcome(context, branch, targetEnvVars, envState, requested) {
+	if (!hasExistingDatabaseEnvForTarget(branch, envState)) return null;
+	const warning = requested === true ? existingDatabaseEnvWarning(branch, targetEnvVars) : null;
+	if (warning) emitBranchDatabaseWarning(context, warning);
+	return {
+		result: requested === true ? {
+			status: "skipped",
+			reason: existingDatabaseEnvReason(branch),
+			envVars: targetEnvVars,
+			schema: null
+		} : void 0,
+		warnings: warning ? [warning] : []
+	};
+}
+async function branchDatabasePromptOutcome(context, branch, localSignal, envState, requested) {
+	if (requested === true) return null;
+	if (!(hasBranchDatabaseSignal(localSignal) || Boolean(envState.inheritedPreviewDatabaseUrl))) return emptyBranchDatabaseSetupOutcome();
+	if (!canPrompt(context) || context.flags.yes) {
+		const warning = databasePromptSuppressedWarning(branch);
+		emitBranchDatabaseWarning(context, warning);
 		return {
-			result: options.db === true ? {
-				status: "skipped",
-				reason: existingDatabaseEnvReason(branch),
-				envVars: targetEnvVars,
-				schema: null
-			} : void 0,
-			warnings: warning ? [warning] : []
+			result: void 0,
+			warnings: [warning]
 		};
 	}
-	const localSignal = await inspectBranchDatabaseSignal(context.runtime.cwd, context.runtime.signal);
-	if (localSignal.unsupportedSchema) {
-		if (options.db === true) 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 {
-				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);
+	maybeRenderBranchDatabaseSignal(context, branch, localSignal, envState);
+	return await confirmPrompt({
+		input: context.runtime.stdin,
+		output: context.output.stderr,
+		message: databasePromptMessage(branch),
+		initialValue: false
+	}) ? null : emptyBranchDatabaseSetupOutcome();
 }
 async function setupBranchDatabase(context, provider, projectId, branch, signal, envState) {
 	emitBranchDatabaseProgress(context, "pending", "Creating database");
@@ -73,15 +83,16 @@ async function setupBranchDatabase(context, provider, projectId, branch, signal,
 		let schemaSetup = null;
 		const warnings = [];
 		let skippedSchemaWarning = null;
-		if (signal.schema) {
-			emitBranchDatabaseProgress(context, "pending", `Applying database schema with ${formatSchemaSetupCommand(signal.schema.command)}`);
+		const schema = signal.schema;
+		if (schema) {
+			emitBranchDatabaseProgress(context, "pending", `Applying database schema with ${formatSchemaSetupCommand(schema.command)}`);
 			schemaSetup = await runBranchDatabaseSchemaSetup({
 				context,
-				schema: signal.schema,
+				schema,
 				databaseUrl: database.databaseUrl,
 				directUrl: database.directUrl
 			}).catch((error) => {
-				throw schemaSetupFailedError(error, signal.schema, branch, context.runtime.cwd);
+				throw schemaSetupFailedError(error, schema, branch, context.runtime.cwd);
 			});
 			emitBranchDatabaseProgress(context, "success", "Applied database schema");
 		} else skippedSchemaWarning = "No supported Prisma schema source was found. Database env vars were created, but schema setup was skipped.";