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

package/dist/controllers/app.js

@@ -7,19 +7,23 @@ 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 { parseEnvAssignments } from "../lib/app/env-vars.js";
-import { renderDeployOutputRows } from "../lib/app/deploy-output.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 { buildProjectSetupNextActions, inferTargetName, projectNotFoundError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
-import { bindProjectToDirectory, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.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 { 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 { createSelectPromptPort } from "./select-prompt-port.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
@@ -27,6 +31,7 @@ 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";
 //#region src/controllers/app.ts
 const DEPLOY_FRAMEWORKS = [
 	"nextjs",
@@ -48,7 +53,8 @@ async function runAppBuild(context, entrypoint, requestedBuildType) {
 		const { artifact, buildType: actualBuildType } = await executePreviewBuild({
 			appPath: context.runtime.cwd,
 			entrypoint,
-			buildType
+			buildType,
+			signal: context.runtime.signal
 		});
 		return {
 			command: "app.build",
@@ -78,12 +84,13 @@ async function runAppRun(context, entrypoint, requestedBuildType, requestedPort)
 			buildType: resolvedBuildType,
 			entrypoint,
 			port,
-			env: context.runtime.env
+			env: context.runtime.env,
+			signal: context.runtime.signal
 		});
 	} catch (error) {
 		throw runFailedError("Local app run failed", error);
 	}
-	if (runResult.signal === "SIGINT" || runResult.signal === "SIGTERM") process.exitCode = runResult.signal === "SIGINT" ? 130 : 143;
+	if (runResult.signal === "SIGINT" || runResult.signal === "SIGTERM") throw new DOMException("Command canceled", "AbortError");
 	else if (runResult.exitCode !== 0) throw runFailedError("Local app run failed", `The ${formatFrameworkName(runResult.framework)} process exited with code ${runResult.exitCode}.`, runResult.exitCode);
 	return {
 		command: "app.run",
@@ -106,9 +113,9 @@ async function runAppDeploy(context, appName, options) {
 		createProjectName: options?.createProjectName,
 		envProjectId
 	});
-	const skipLocalPin = Boolean(envProjectId || options?.projectRef || options?.createProjectName);
-	const localPin = skipLocalPin ? { kind: "missing" } : await readLocalResolutionPin(context.runtime.cwd);
-	if (!skipLocalPin && localPin.kind === "invalid") throw localResolutionPinStaleError();
+	const localPinReadResult = Boolean(envProjectId || options?.projectRef || options?.createProjectName) ? Result.ok({ kind: "missing" }) : await readLocalResolutionPin(context.runtime.cwd, context.runtime.signal);
+	if (localPinReadResult.isErr()) throw localPinReadErrorToDeployError(localPinReadResult.error);
+	const localPin = localPinReadResult.value;
 	const branch = await resolveDeployBranch(context, options?.branchName);
 	if (options?.httpPort) parseDeployHttpPort(options.httpPort);
 	assertSupportedEntrypointForRequestedDeployShape({
@@ -124,8 +131,10 @@ async function runAppDeploy(context, appName, options) {
 	let localPinResult;
 	if (target.localPinAction) {
 		const setupResult = await bindProjectToDirectory(context, target.workspace, target.project, target.localPinAction);
-		localPinResult = setupResult.localPin;
-		maybeRenderProjectLinked(context, setupResult.directory, setupResult.project.name, setupResult.localPin.path);
+		if (setupResult.isErr()) throw projectDirectoryBindingErrorToCliError(setupResult.error);
+		const projectSetup = setupResult.value;
+		localPinResult = projectSetup.localPin;
+		maybeRenderProjectLinked(context, projectSetup.directory, projectSetup.project.name, projectSetup.localPin.path);
 	}
 	let framework = await resolveDeployFramework(context, {
 		requestedFramework: options?.framework,
@@ -133,12 +142,12 @@ 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,
 		firstDeploy: Boolean(target.localPinAction),
-		inferName: () => inferTargetName(context.runtime.cwd)
+		inferName: () => inferTargetName(context.runtime.cwd, context.runtime.signal)
 	});
 	await maybeRenderDeploySetupBlock(context, {
 		includeDirectory: !target.localPinAction,
@@ -156,10 +165,27 @@ async function runAppDeploy(context, appName, options) {
 	});
 	framework = customized.framework;
 	runtime = customized.runtime;
+	const productionDeployGate = await enforceProductionDeployGate(context, provider, {
+		appId: selectedApp.appId,
+		appName: selectedApp.displayName,
+		branchKind: target.branch.kind,
+		prod: options?.prod === true
+	});
 	const buildType = framework.buildType;
 	assertSupportedEntrypoint(buildType, options?.entrypoint, "deploy");
-	const entrypoint = await resolveDeployEntrypoint(context.runtime.cwd, framework, options?.entrypoint);
+	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,
+		providedEnvVars: envVars,
+		firstProductionDeploy: productionDeployGate.firstProductionDeploy
+	});
 	const progressState = createPreviewDeployProgressState();
 	const deployStartedAt = Date.now();
 	const deployResult = await provider.deployApp({
@@ -171,9 +197,11 @@ async function runAppDeploy(context, appName, options) {
 		region: selectedApp.region,
 		entrypoint,
 		buildType,
+		buildSettings: buildSettingsResolution.settings,
 		portMapping,
 		envVars,
 		interaction: void 0,
+		signal: context.runtime.signal,
 		progress: createPreviewDeployProgress(context.output.stderr, context.ui, !context.flags.json && !context.flags.quiet, progressState)
 	}).catch((error) => {
 		throw appDeployFailedError(error, progressState);
@@ -189,17 +217,42 @@ async function runAppDeploy(context, appName, options) {
 		result: {
 			workspace: target.workspace,
 			project: target.project,
-			branch: target.branch,
+			branch: toResultBranch(target.branch),
 			resolution: target.resolution,
+			branchDatabase: branchDatabaseSetup.result,
 			app: {
 				id: deployResult.app.id,
 				name: deployResult.app.name
 			},
 			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,
+					name: framework.displayName,
+					source: framework.annotation
+				},
+				entrypoint: entrypoint ?? null,
+				httpPort: runtime.port,
+				region: selectedApp.region ?? null,
+				envVars: envVarNames(envVars)
+			},
 			durationMs: deployDurationMs,
 			localPin: localPinResult
 		},
-		warnings: [],
+		warnings: branchDatabaseSetup.warnings,
 		nextSteps: ["prisma-cli app list-deploys", `prisma-cli app show-deploy ${deployResult.deployment.id}`]
 	};
 }
@@ -211,13 +264,14 @@ async function runAppListDeploys(context, appName, projectRef) {
 		command: "app.list-deploys",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: null,
 			deployments: []
 		},
 		warnings: [],
 		nextSteps: ["prisma-cli app deploy"]
 	};
-	const deploymentsResult = await provider.listDeployments(selectedApp.id).catch((error) => {
+	const deploymentsResult = await provider.listDeployments(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to list app deployments", error, ["prisma-cli app deploy"]);
 	});
 	const currentLiveDeploymentId = await resolveCurrentLiveDeploymentId(context, projectId, deploymentsResult.app, deploymentsResult.deployments);
@@ -230,6 +284,7 @@ async function runAppListDeploys(context, appName, projectRef) {
 		command: "app.list-deploys",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -248,6 +303,7 @@ async function runAppShow(context, appName, projectRef) {
 		command: "app.show",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: null,
 			liveDeployment: null,
 			liveUrl: null,
@@ -256,7 +312,7 @@ async function runAppShow(context, appName, projectRef) {
 		warnings: [],
 		nextSteps: ["prisma-cli app deploy"]
 	};
-	const deploymentsResult = await provider.listDeployments(selectedApp.id).catch((error) => {
+	const deploymentsResult = await provider.listDeployments(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to inspect app", error, ["prisma-cli app list-deploys"]);
 	});
 	const currentLiveDeploymentId = await resolveCurrentLiveDeploymentId(context, projectId, deploymentsResult.app, deploymentsResult.deployments);
@@ -270,6 +326,7 @@ async function runAppShow(context, appName, projectRef) {
 		command: "app.show",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -284,7 +341,7 @@ async function runAppShow(context, appName, projectRef) {
 }
 async function runAppShowDeploy(context, deploymentId) {
 	ensurePreviewAppMode(context);
-	const deployment = await (await requirePreviewAppProvider(context)).showDeployment(deploymentId).catch((error) => {
+	const deployment = await (await requirePreviewAppProvider(context)).showDeployment(deploymentId, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to show deployment", error, ["prisma-cli app list-deploys"]);
 	});
 	if (!deployment) throw new CliError({
@@ -321,7 +378,7 @@ async function runAppOpen(context, appName, projectRef) {
 	const { provider, target, projectId } = await requireProviderAndProjectContext(context, projectRef, { commandName: "app open" });
 	const selectedApp = await resolveExistingAppSelection(context, projectId, await listApps(context, provider, projectId, target.branch.name), appName);
 	if (!selectedApp) throw noDeploymentsError("No deployments available to open", "The resolved project does not have any deployed app yet.");
-	const deploymentsResult = await provider.listDeployments(selectedApp.id).catch((error) => {
+	const deploymentsResult = await provider.listDeployments(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to resolve app URL", error, ["prisma-cli app show"]);
 	});
 	const currentLiveDeploymentId = await resolveCurrentLiveDeploymentId(context, projectId, deploymentsResult.app, deploymentsResult.deployments);
@@ -334,11 +391,16 @@ async function runAppOpen(context, appName, projectRef) {
 	if (!liveDeployment) throw noDeploymentsError("No deployments available to open", `The selected app "${deploymentsResult.app.name}" does not have any deployments yet.`);
 	if (!deploymentsResult.app.liveUrl) throw featureUnavailableError("Live URL is not available for the selected app", "Deployments exist, but the provider does not expose a stable live service URL for this app yet.", "Run prisma-cli app show to inspect the current deployment state and try again after the app reports a live URL.", ["prisma-cli app show"], "app");
 	const shouldOpen = canPrompt(context);
-	if (shouldOpen) await open(deploymentsResult.app.liveUrl);
+	if (shouldOpen) {
+		context.runtime.signal.throwIfAborted();
+		await open(deploymentsResult.app.liveUrl);
+		context.runtime.signal.throwIfAborted();
+	}
 	return {
 		command: "app.open",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -355,7 +417,8 @@ async function runAppDomainAdd(context, hostname, options) {
 	const target = await resolveAppDomainTarget(context, options, `app domain add ${normalizedHostname}`);
 	const added = await target.provider.addDomain({
 		appId: target.app.id,
-		hostname: normalizedHostname
+		hostname: normalizedHostname,
+		signal: context.runtime.signal
 	}).catch((error) => {
 		throw domainCommandError("add", error, normalizedHostname);
 	});
@@ -373,8 +436,8 @@ async function runAppDomainAdd(context, hostname, options) {
 async function runAppDomainShow(context, hostname, options) {
 	const normalizedHostname = normalizeDomainHostname(hostname);
 	const target = await resolveAppDomainTarget(context, options, `app domain show ${normalizedHostname}`);
-	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "show");
-	const detail = await target.provider.showDomain(domain.id).catch((error) => {
+	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "show", context.runtime.signal);
+	const detail = await target.provider.showDomain(domain.id, { signal: context.runtime.signal }).catch((error) => {
 		throw domainCommandError("show", error, normalizedHostname);
 	});
 	return {
@@ -390,9 +453,9 @@ async function runAppDomainShow(context, hostname, options) {
 async function runAppDomainRemove(context, hostname, options) {
 	const normalizedHostname = normalizeDomainHostname(hostname);
 	const target = await resolveAppDomainTarget(context, options, `app domain remove ${normalizedHostname}`);
-	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "remove");
+	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "remove", context.runtime.signal);
 	await confirmDomainRemoval(context, target.resultTarget, normalizedHostname);
-	await target.provider.removeDomain(domain.id).catch((error) => {
+	await target.provider.removeDomain(domain.id, { signal: context.runtime.signal }).catch((error) => {
 		throw domainCommandError("remove", error, normalizedHostname);
 	});
 	return {
@@ -409,8 +472,8 @@ async function runAppDomainRemove(context, hostname, options) {
 async function runAppDomainRetry(context, hostname, options) {
 	const normalizedHostname = normalizeDomainHostname(hostname);
 	const target = await resolveAppDomainTarget(context, options, `app domain retry ${normalizedHostname}`);
-	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "retry");
-	const retried = await target.provider.retryDomain(domain.id).catch((error) => {
+	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "retry", context.runtime.signal);
+	const retried = await target.provider.retryDomain(domain.id, { signal: context.runtime.signal }).catch((error) => {
 		throw domainCommandError("retry", error, normalizedHostname);
 	});
 	return {
@@ -427,7 +490,7 @@ async function runAppDomainWait(context, hostname, options) {
 	const normalizedHostname = normalizeDomainHostname(hostname);
 	const timeoutMs = parseDomainWaitTimeout(options?.timeout);
 	const target = await resolveAppDomainTarget(context, options, `app domain wait ${normalizedHostname}`);
-	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "wait");
+	const domain = await resolveDomainByHostname(target.provider, target.app.id, normalizedHostname, "wait", context.runtime.signal);
 	if (!context.flags.json && !context.flags.quiet) context.output.stderr.write([
 		`app domain wait -> Waiting for ${normalizedHostname} to become active.`,
 		"",
@@ -470,8 +533,8 @@ async function runAppDomainWait(context, hostname, options) {
 			exitCode: 1,
 			nextSteps: [`prisma-cli app domain show ${normalizedHostname}`]
 		});
-		await sleep(Math.min(pollIntervalMs, Math.max(deadline - Date.now(), 0)));
-		current = await target.provider.showDomain(current.id).catch((error) => {
+		await sleep(Math.min(pollIntervalMs, Math.max(deadline - Date.now(), 0)), context.runtime.signal);
+		current = await target.provider.showDomain(current.id, { signal: context.runtime.signal }).catch((error) => {
 			throw domainCommandError("wait", error, normalizedHostname);
 		});
 	}
@@ -504,6 +567,7 @@ async function runAppLogs(context, appName, deploymentId, projectRef) {
 	}
 	await provider.streamDeploymentLogs({
 		deploymentId: target.deployment.id,
+		signal: context.runtime.signal,
 		onRecord: (record) => writeLogRecord(context, record)
 	}).catch((error) => {
 		throw deployFailedError("Failed to stream app logs", error, [`prisma-cli app show-deploy ${target.deployment.id}`, "prisma-cli app list-deploys"]);
@@ -513,7 +577,7 @@ async function resolveExplicitLogDeployment(context, provider, projectId, branch
 	if (appName) {
 		const selectedApp = await resolveExistingAppSelection(context, projectId, await listApps(context, provider, projectId, branchName), appName);
 		if (!selectedApp) throw noDeploymentsError("No deployments available to stream logs", "The resolved project does not have any deployed app yet.");
-		const deploymentsResult = await provider.listDeployments(selectedApp.id).catch((error) => {
+		const deploymentsResult = await provider.listDeployments(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 			throw deployFailedError("Failed to list app deployments", error, ["prisma-cli app list-deploys"]);
 		});
 		const deployment = requireDeploymentForApp(deploymentsResult.deployments, deploymentId, selectedApp.name);
@@ -526,7 +590,7 @@ async function resolveExplicitLogDeployment(context, provider, projectId, branch
 			deployment
 		};
 	}
-	const shown = await provider.showDeployment(deploymentId).catch((error) => {
+	const shown = await provider.showDeployment(deploymentId, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to show deployment", error, ["prisma-cli app list-deploys"]);
 	});
 	if (!shown) throw new CliError({
@@ -569,7 +633,7 @@ async function resolveExplicitLogDeployment(context, provider, projectId, branch
 async function resolveLiveLogDeployment(context, provider, projectId, branchName, appName) {
 	const selectedApp = await resolveExistingAppSelection(context, projectId, await listApps(context, provider, projectId, branchName), appName);
 	if (!selectedApp) throw noDeploymentsError("No deployments available to stream logs", "The resolved project does not have any deployed app yet.");
-	const deploymentsResult = await provider.listDeployments(selectedApp.id).catch((error) => {
+	const deploymentsResult = await provider.listDeployments(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to list app deployments", error, ["prisma-cli app list-deploys"]);
 	});
 	const currentLiveDeploymentId = await resolveCurrentLiveDeploymentId(context, projectId, deploymentsResult.app, deploymentsResult.deployments);
@@ -604,7 +668,7 @@ async function runAppPromote(context, deploymentId, appName, projectRef) {
 	ensurePreviewAppMode(context);
 	const { provider, target, projectId } = await requireProviderAndProjectContext(context, projectRef, { commandName: "app promote" });
 	const selectedApp = await requireReleaseAppSelection(context, projectId, await listApps(context, provider, projectId, target.branch.name), appName, "promote");
-	const deploymentsResult = await provider.listDeployments(selectedApp.id).catch((error) => {
+	const deploymentsResult = await provider.listDeployments(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to list app deployments", error, ["prisma-cli app list-deploys"]);
 	});
 	const currentLiveDeploymentId = await resolveCurrentLiveDeploymentId(context, projectId, deploymentsResult.app, deploymentsResult.deployments);
@@ -617,6 +681,7 @@ async function runAppPromote(context, deploymentId, appName, projectRef) {
 	if (!targetAlreadyLive) await provider.promoteDeployment({
 		appId: selectedApp.id,
 		deploymentId: targetDeployment.id,
+		signal: context.runtime.signal,
 		progress: createPreviewPromoteProgress(context.output.stderr, !context.flags.json && !context.flags.quiet)
 	}).catch((error) => {
 		throw deployFailedError("Failed to promote deployment", error, ["prisma-cli app list-deploys"]);
@@ -626,6 +691,7 @@ async function runAppPromote(context, deploymentId, appName, projectRef) {
 		command: "app.promote",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -644,7 +710,7 @@ async function runAppRollback(context, appName, deploymentId, projectRef) {
 	ensurePreviewAppMode(context);
 	const { provider, target, projectId } = await requireProviderAndProjectContext(context, projectRef, { commandName: "app rollback" });
 	const selectedApp = await requireReleaseAppSelection(context, projectId, await listApps(context, provider, projectId, target.branch.name), appName, "rollback");
-	const deploymentsResult = await provider.listDeployments(selectedApp.id).catch((error) => {
+	const deploymentsResult = await provider.listDeployments(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 		throw deployFailedError("Failed to list app deployments", error, ["prisma-cli app list-deploys"]);
 	});
 	const currentLiveDeploymentId = await resolveCurrentLiveDeploymentId(context, projectId, deploymentsResult.app, deploymentsResult.deployments);
@@ -658,6 +724,7 @@ async function runAppRollback(context, appName, deploymentId, projectRef) {
 	if (!targetAlreadyLive) await provider.promoteDeployment({
 		appId: selectedApp.id,
 		deploymentId: targetDeployment.id,
+		signal: context.runtime.signal,
 		progress: createPreviewPromoteProgress(context.output.stderr, !context.flags.json && !context.flags.quiet)
 	}).catch((error) => {
 		throw deployFailedError("Failed to roll back deployment", error, ["prisma-cli app list-deploys"]);
@@ -667,6 +734,7 @@ async function runAppRollback(context, appName, deploymentId, projectRef) {
 		command: "app.rollback",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -687,7 +755,7 @@ async function runAppRemove(context, appName, projectRef) {
 	const { provider, target, projectId } = await requireProviderAndProjectContext(context, projectRef, { commandName: "app remove" });
 	const selectedApp = await requireReleaseAppSelection(context, projectId, await listApps(context, provider, projectId, target.branch.name), appName, "remove");
 	await confirmAppRemoval(context, selectedApp);
-	const removedApp = await provider.removeApp(selectedApp.id).catch((error) => {
+	const removedApp = await provider.removeApp(selectedApp.id, { signal: context.runtime.signal }).catch((error) => {
 		throw removeFailedError("Failed to remove app", error, ["prisma-cli app show", "prisma-cli app list-deploys"]);
 	});
 	const warnings = await cleanupRemovedAppState(context, projectId, removedApp.id);
@@ -695,6 +763,7 @@ async function runAppRemove(context, appName, projectRef) {
 		command: "app.remove",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: removedApp.id,
 				name: removedApp.name
@@ -738,7 +807,7 @@ async function resolveAppDomainTarget(context, options, commandName = "app domai
 		resultTarget: {
 			workspace: target.workspace,
 			project: target.project,
-			branch: target.branch,
+			branch: toResultBranch(target.branch),
 			app: {
 				id: selectedApp.id,
 				name: selectedApp.name
@@ -762,8 +831,8 @@ async function resolveDomainAppSelection(context, projectId, apps, options) {
 	if (selectedApp) return selectedApp;
 	throw usageError("Custom domain requires an existing app on the production branch", "The resolved production branch does not have an app that can receive a custom domain.", "Deploy or promote an app to production first, then rerun the domain command.", ["prisma-cli app deploy --branch production", "prisma-cli app show"], "app");
 }
-async function resolveDomainByHostname(provider, appId, hostname, command) {
-	const matched = (await provider.listDomains(appId).catch((error) => {
+async function resolveDomainByHostname(provider, appId, hostname, command, signal) {
+	const matched = (await provider.listDomains(appId, { signal }).catch((error) => {
 		throw domainCommandError(command, error, hostname);
 	})).find((domain) => sameDomainHostname(domain.hostname, hostname));
 	if (matched) return matched;
@@ -994,9 +1063,20 @@ function formatElapsed(milliseconds) {
 	const remainingSeconds = seconds % 60;
 	return `${minutes}:${String(remainingSeconds).padStart(2, "0")}`;
 }
-async function sleep(milliseconds) {
+async function sleep(milliseconds, signal) {
 	if (milliseconds <= 0) return;
-	await new Promise((resolve) => setTimeout(resolve, milliseconds));
+	signal.throwIfAborted();
+	await new Promise((resolve, reject) => {
+		const onAbort = () => {
+			clearTimeout(timeout);
+			reject(signal.reason);
+		};
+		const timeout = setTimeout(() => {
+			signal.removeEventListener("abort", onAbort);
+			resolve();
+		}, milliseconds);
+		signal.addEventListener("abort", onAbort, { once: true });
+	});
 }
 async function resolveDeployAppSelection(context, projectId, apps, options) {
 	if (options.explicitAppName) {
@@ -1211,7 +1291,10 @@ function resolveRollbackTarget(deployments, currentLiveDeploymentId) {
 	});
 }
 async function listApps(context, provider, projectId, branchName) {
-	return provider.listApps(projectId, { branchName }).then(sortApps).catch((error) => {
+	return provider.listApps(projectId, {
+		branchName,
+		signal: context.runtime.signal
+	}).then(sortApps).catch((error) => {
 		if (isMissingProjectError(error)) throw new CliError({
 			code: "PROJECT_NOT_FOUND",
 			domain: "project",
@@ -1229,20 +1312,20 @@ async function requirePreviewAppProvider(context) {
 	return provider;
 }
 async function requirePreviewAppProviderWithClient(context) {
-	const client = await requireComputeAuth(context.runtime.env);
+	const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 	if (!client) throw authRequiredError(["prisma-cli auth login"]);
 	return {
 		client,
-		provider: createPreviewAppProvider(client, createPreviewLogAuthOptions(context.runtime.env))
+		provider: createPreviewAppProvider(client, createPreviewLogAuthOptions(context.runtime.env, context.runtime.signal))
 	};
 }
-function createPreviewLogAuthOptions(env) {
+function createPreviewLogAuthOptions(env, signal) {
 	const rawToken = env[SERVICE_TOKEN_ENV_VAR]?.trim();
 	if (rawToken) return {
 		baseUrl: getApiBaseUrl(env),
 		getToken: async () => rawToken
 	};
-	const tokenStorage = new FileTokenStorage(env);
+	const tokenStorage = new FileTokenStorage(env, signal);
 	return {
 		baseUrl: getApiBaseUrl(env),
 		getToken: async () => {
@@ -1275,18 +1358,21 @@ async function requireProviderAndDeployProjectContext(context, explicitProject,
 async function resolveProjectContext(context, client, explicitProject, options) {
 	const authState = await requireAuthenticatedAuthState(context);
 	if (!authState.workspace) throw workspaceRequiredError();
-	const resolved = await resolveProjectTarget({
+	const resolvedResult = await resolveProjectTarget({
 		context,
 		workspace: authState.workspace,
 		explicitProject,
 		envProjectId: options?.envProjectId,
-		listProjects: () => listRealWorkspaceProjects(client, authState.workspace),
+		listProjects: () => listRealWorkspaceProjects(client, authState.workspace, context.runtime.signal),
 		commandName: options?.commandName
 	});
+	if (resolvedResult.isErr()) throw projectResolutionErrorToCliError(resolvedResult.error);
+	const resolved = resolvedResult.value;
 	const branch = options?.branch ?? await resolveDeployBranch(context, void 0);
 	return {
 		...resolved,
 		branch: {
+			id: null,
 			name: branch.name,
 			kind: toBranchKind(branch.name)
 		}
@@ -1296,8 +1382,8 @@ 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);
-	if (explicitProject) return withDeployBranch({
+	const projects = await listRealWorkspaceProjects(client, workspace, context.runtime.signal);
+	if (explicitProject) return withRemoteDeployBranch(provider, {
 		workspace,
 		project: toProjectSummary(resolveProjectForSetup(explicitProject, projects, workspace)),
 		resolution: {
@@ -1306,25 +1392,25 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 			targetNameSource: "explicit"
 		},
 		localPinAction: "linked"
-	}, branch);
+	}, branch, context.runtime.signal);
 	if (options.createProjectName) {
 		const projectName = options.createProjectName.trim();
 		if (!projectName) throw projectSetupNameRequiredError("app deploy --create-project");
-		return withDeployBranch({
+		return withRemoteDeployBranch(provider, {
 			workspace,
-			project: toProjectSummary(await createProjectForDeploySetup(provider, projectName, workspace)),
+			project: toProjectSummary(await createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal)),
 			resolution: {
 				projectSource: "created",
 				targetName: projectName,
 				targetNameSource: "explicit"
 			},
 			localPinAction: "created"
-		}, branch);
+		}, branch, context.runtime.signal);
 	}
 	if (options.envProjectId) {
 		const project = projects.find((candidate) => candidate.id === options.envProjectId);
 		if (!project) throw projectNotFoundError(options.envProjectId, workspace);
-		return withDeployBranch({
+		return withRemoteDeployBranch(provider, {
 			workspace,
 			project: toProjectSummary(project),
 			resolution: {
@@ -1332,14 +1418,14 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 				targetName: options.envProjectId,
 				targetNameSource: "env"
 			}
-		}, branch);
+		}, 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 withDeployBranch({
+		return withRemoteDeployBranch(provider, {
 			workspace,
 			project: toProjectSummary(project),
 			resolution: {
@@ -1347,10 +1433,10 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 				targetName: project.name,
 				targetNameSource: "local-pin"
 			}
-		}, branch);
+		}, branch, context.runtime.signal);
 	}
 	const platformMapping = await resolveDurablePlatformMapping();
-	if (platformMapping && platformMapping.workspace.id === workspace.id) return withDeployBranch({
+	if (platformMapping && platformMapping.workspace.id === workspace.id) return withRemoteDeployBranch(provider, {
 		workspace,
 		project: toProjectSummary(platformMapping),
 		resolution: {
@@ -1358,15 +1444,15 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 			targetName: platformMapping.name,
 			targetNameSource: "platform-mapping"
 		}
-	}, branch);
-	if (canPrompt(context) && !context.flags.yes) return withDeployBranch(await resolveInteractiveDeployProjectSetup(context, provider, workspace, projects), branch);
-	throw projectSetupRequiredError(projects, await inferTargetName(context.runtime.cwd));
+	}, 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));
 }
 async function resolveInteractiveDeployProjectSetup(context, provider, workspace, projects) {
 	const setup = await promptForProjectSetupChoice({
 		context,
 		projects,
-		createProject: (projectName) => createProjectForDeploySetup(provider, projectName, workspace),
+		createProject: (projectName) => createProjectForDeploySetup(provider, projectName, workspace, context.runtime.signal),
 		cancel: {
 			why: "Deploy needs a Project before it can continue.",
 			fix: "Choose an existing Project or create a new one, then rerun deploy.",
@@ -1384,8 +1470,11 @@ async function resolveInteractiveDeployProjectSetup(context, provider, workspace
 		localPinAction: setup.action
 	};
 }
-async function createProjectForDeploySetup(provider, projectName, workspace) {
-	const created = await provider.createProject({ name: projectName }).catch((error) => {
+async function createProjectForDeploySetup(provider, projectName, workspace, signal) {
+	const created = await provider.createProject({
+		name: projectName,
+		signal
+	}).catch((error) => {
 		throw projectCreateFailedError(error, projectName, workspace, {
 			nextSteps: [
 				"prisma-cli project list",
@@ -1402,18 +1491,46 @@ async function createProjectForDeploySetup(provider, projectName, workspace) {
 		workspace
 	};
 }
-function withDeployBranch(target, branch) {
+async function withRemoteDeployBranch(provider, target, branch, signal) {
+	const remoteBranch = await provider.resolveBranch(target.project.id, {
+		branchName: branch.name,
+		signal
+	});
 	return {
 		...target,
 		branch: {
-			name: branch.name,
-			kind: toBranchKind(branch.name)
+			id: remoteBranch.id,
+			name: remoteBranch.name,
+			kind: remoteBranch.role
 		}
 	};
 }
 function toBranchKind(name) {
 	return name === "production" || name === "main" ? "production" : "preview";
 }
+function toResultBranch(branch) {
+	return {
+		id: branch.id,
+		name: branch.name,
+		kind: branch.kind
+	};
+}
+function toAppVerboseContext(target) {
+	return {
+		workspace: target.workspace,
+		project: target.project,
+		branch: target.branch,
+		resolution: target.resolution
+	};
+}
+function toBranchDatabaseDeployBranch(branch) {
+	if (!branch.id) throw new Error(`Deploy branch "${branch.name}" was not resolved remotely.`);
+	return {
+		id: branch.id,
+		name: branch.name,
+		kind: branch.kind
+	};
+}
 function assertExclusiveDeployProjectInputs(options) {
 	const provided = [
 		options.projectRef ? "--project" : null,
@@ -1432,7 +1549,7 @@ async function resolveDeployBranch(context, explicitBranchName) {
 		name: explicitBranchName,
 		annotation: "set by --branch"
 	};
-	const gitBranch = await readLocalGitBranch(context.runtime.cwd);
+	const gitBranch = await readLocalGitBranch(context.runtime.cwd, context.runtime.signal);
 	if (gitBranch) return {
 		name: gitBranch,
 		annotation: "from local Git branch"
@@ -1442,29 +1559,6 @@ async function resolveDeployBranch(context, explicitBranchName) {
 		annotation: "default"
 	};
 }
-async function readLocalGitBranch(cwd) {
-	const headPath = await resolveGitHeadPath(path.join(cwd, ".git"));
-	if (!headPath) return null;
-	try {
-		const head = (await readFile(headPath, "utf8")).trim();
-		if (head.startsWith("ref: refs/heads/")) return head.slice(16);
-	} catch {
-		return null;
-	}
-	return null;
-}
-async function resolveGitHeadPath(gitPath) {
-	try {
-		const raw = await readFile(gitPath, "utf8");
-		if (raw.startsWith("gitdir:")) return path.join(path.resolve(path.dirname(gitPath), raw.slice(7).trim()), "HEAD");
-	} catch {}
-	try {
-		await access(path.join(gitPath, "HEAD"));
-		return path.join(gitPath, "HEAD");
-	} catch {
-		return null;
-	}
-}
 async function resolveDeployFramework(context, options) {
 	if (options.requestedFramework) return frameworkFromUserFacingValue(options.requestedFramework, "set by --framework");
 	if (options.entrypoint) return {
@@ -1473,7 +1567,7 @@ async function resolveDeployFramework(context, options) {
 		displayName: "Bun",
 		annotation: "set by --entry"
 	};
-	const detected = await detectDeployFramework(context.runtime.cwd);
+	const detected = await detectDeployFramework(context.runtime.cwd, context.runtime.signal);
 	if (detected) return detected;
 	throw frameworkNotDetectedError(context.runtime.cwd);
 }
@@ -1491,23 +1585,26 @@ function assertSupportedEntrypointForRequestedDeployShape(options) {
 	if (!options.requestedFramework) return;
 	assertSupportedEntrypoint(frameworkFromUserFacingValue(options.requestedFramework, "set by --framework").buildType, options.entrypoint, "deploy");
 }
-async function resolveDeployEntrypoint(cwd, framework, explicitEntrypoint) {
+async function resolveDeployEntrypoint(cwd, framework, explicitEntrypoint, signal) {
 	if (explicitEntrypoint || framework.buildType !== "bun") return explicitEntrypoint;
-	const packageEntrypoint = readBunPackageEntrypoint(await readBunPackageJson(cwd));
+	const packageEntrypoint = readBunPackageEntrypoint(await readBunPackageJson(cwd, signal));
 	if (packageEntrypoint) return packageEntrypoint;
 	if (framework.key !== "hono") return;
 	const defaultEntrypoint = "src/index.ts";
+	signal.throwIfAborted();
 	try {
 		await access(path.join(cwd, defaultEntrypoint));
+		signal.throwIfAborted();
 		return defaultEntrypoint;
 	} catch (error) {
+		if (signal.aborted) throw error;
 		if (error.code !== "ENOENT") throw error;
 		return;
 	}
 }
-async function detectDeployFramework(cwd) {
-	const packageJson = await readBunPackageJson(cwd);
-	const nextConfig = await detectNextConfig(cwd);
+async function detectDeployFramework(cwd, signal) {
+	const packageJson = await readBunPackageJson(cwd, signal);
+	const nextConfig = await detectNextConfig(cwd, signal);
 	if (nextConfig.exists || hasPackageDependency(packageJson, "next")) return {
 		key: "nextjs",
 		buildType: "nextjs",
@@ -1528,22 +1625,26 @@ async function detectDeployFramework(cwd) {
 	};
 	return null;
 }
-async function detectNextConfig(cwd) {
+async function detectNextConfig(cwd, signal) {
 	for (const candidate of [
 		"next.config.js",
 		"next.config.mjs",
-		"next.config.cjs",
 		"next.config.ts",
 		"next.config.mts"
 	]) {
 		const filePath = path.join(cwd, candidate);
+		signal.throwIfAborted();
 		try {
-			const content = await readFile(filePath, "utf8");
+			const content = await readFile(filePath, {
+				encoding: "utf8",
+				signal
+			});
 			return {
 				exists: true,
 				standalone: /\boutput\s*:\s*["'`]standalone["'`]/.test(content)
 			};
 		} catch (error) {
+			if (signal.aborted) throw error;
 			if (error.code !== "ENOENT") throw error;
 		}
 	}
@@ -1620,6 +1721,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`);
@@ -1629,10 +1744,14 @@ async function maybeCustomizeDeploySettings(context, options) {
 		framework: options.framework,
 		runtime: options.runtime
 	};
+	maybeRenderDeploySettingsPreview(context, {
+		framework: options.framework,
+		runtime: options.runtime
+	});
 	if (!await confirmPrompt({
 		input: context.runtime.stdin,
 		output: context.runtime.stderr,
-		message: "Customize settings?",
+		message: "Customize build settings?",
 		initialValue: false
 	})) return {
 		framework: options.framework,
@@ -1677,6 +1796,16 @@ async function maybeCustomizeDeploySettings(context, options) {
 		runtime
 	};
 }
+function maybeRenderDeploySettingsPreview(context, options) {
+	if (context.flags.quiet || context.flags.json) return;
+	context.output.stderr.write(`Detected ${options.framework.displayName}\n${renderDeploySettingsPreview(context.ui, [{
+		key: "framework",
+		value: options.framework.displayName
+	}, {
+		key: "runtime",
+		value: `HTTP ${options.runtime.port}`
+	}]).join("\n")}\n\n`);
+}
 function frameworkDisplayName(framework) {
 	switch (framework) {
 		case "nextjs": return "Next.js";
@@ -1701,7 +1830,7 @@ function formatDeployDirectory(cwd) {
 async function readCurrentWorkspaceId(context) {
 	const state = await context.stateStore.read();
 	if (state.auth?.workspaceId) return state.auth.workspaceId;
-	return (await readAuthState(context.runtime.env)).workspace?.id ?? null;
+	return (await readAuthState(context.runtime.env, context.runtime.signal)).workspace?.id ?? null;
 }
 function normalizeBuildType(requestedBuildType) {
 	if (!requestedBuildType) return "auto";
@@ -1723,7 +1852,7 @@ function assertSupportedEntrypoint(buildType, entrypoint, commandName) {
 	}
 }
 async function requireLocalBuildType(context, buildType, commandName) {
-	const resolvedBuildType = await resolveLocalBuildType(context.runtime.cwd, buildType);
+	const resolvedBuildType = await resolveLocalBuildType(context.runtime.cwd, buildType, context.runtime.signal);
 	if (resolvedBuildType) return resolvedBuildType;
 	throw usageError(`App ${commandName} requires an explicit framework when detection is ambiguous`, "This preview only starts local dev servers for clear Next.js or Bun project shapes.", "Pass --build-type nextjs for a Next.js app, or pass --build-type bun with --entry <path> for a Bun app.", [`prisma-cli app ${commandName} --build-type nextjs`, `prisma-cli app ${commandName} --build-type bun --entry server.ts`], "app");
 }
@@ -1852,6 +1981,18 @@ function localResolutionPinStaleError() {
 		]
 	});
 }
+function localPinReadErrorToDeployError(error) {
+	return matchError(error, {
+		LocalResolutionPinInvalidJsonError: () => localResolutionPinStaleError(),
+		LocalResolutionPinInvalidShapeError: () => localResolutionPinStaleError(),
+		LocalResolutionPinReadAbortedError: (error) => {
+			throw error;
+		},
+		UnhandledException: (error) => {
+			throw error;
+		}
+	});
+}
 function readDeployEnvOverride(context, name) {
 	const value = context.runtime.env[name]?.trim();
 	return value ? value : void 0;