@prisma/cli 3.0.0-beta.2 → 3.0.0-beta.4

package/dist/controllers/app.js

@@ -16,10 +16,12 @@ import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "../l
 import { buildProjectSetupNextActions, inferTargetName, projectNotFoundError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
 import { bindProjectToDirectory, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
 import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
+import { readLocalGitBranch } from "../lib/git/local-branch.js";
 import { 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 { 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";
@@ -48,7 +50,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 +81,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",
@@ -107,7 +111,7 @@ async function runAppDeploy(context, appName, options) {
 		envProjectId
 	});
 	const skipLocalPin = Boolean(envProjectId || options?.projectRef || options?.createProjectName);
-	const localPin = skipLocalPin ? { kind: "missing" } : await readLocalResolutionPin(context.runtime.cwd);
+	const localPin = skipLocalPin ? { kind: "missing" } : await readLocalResolutionPin(context.runtime.cwd, context.runtime.signal);
 	if (!skipLocalPin && localPin.kind === "invalid") throw localResolutionPinStaleError();
 	const branch = await resolveDeployBranch(context, options?.branchName);
 	if (options?.httpPort) parseDeployHttpPort(options.httpPort);
@@ -138,7 +142,7 @@ async function runAppDeploy(context, appName, options) {
 		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,9 +160,15 @@ async function runAppDeploy(context, appName, options) {
 	});
 	framework = customized.framework;
 	runtime = customized.runtime;
+	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 portMapping = parseDeployPortMapping(String(runtime.port));
 	const progressState = createPreviewDeployProgressState();
 	const deployStartedAt = Date.now();
@@ -174,6 +184,7 @@ async function runAppDeploy(context, appName, options) {
 		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);
@@ -217,7 +228,7 @@ async function runAppListDeploys(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 list app deployments", error, ["prisma-cli app deploy"]);
 	});
 	const currentLiveDeploymentId = await resolveCurrentLiveDeploymentId(context, projectId, deploymentsResult.app, deploymentsResult.deployments);
@@ -256,7 +267,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);
@@ -284,7 +295,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 +332,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,7 +345,11 @@ 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: {
@@ -355,7 +370,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 +389,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 +406,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 +425,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 +443,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 +486,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 +520,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 +530,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 +543,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 +586,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 +621,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 +634,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"]);
@@ -644,7 +662,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 +676,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"]);
@@ -687,7 +706,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);
@@ -762,8 +781,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 +1013,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 +1241,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 +1262,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 () => {
@@ -1280,7 +1313,7 @@ async function resolveProjectContext(context, client, explicitProject, options)
 		workspace: authState.workspace,
 		explicitProject,
 		envProjectId: options?.envProjectId,
-		listProjects: () => listRealWorkspaceProjects(client, authState.workspace),
+		listProjects: () => listRealWorkspaceProjects(client, authState.workspace, context.runtime.signal),
 		commandName: options?.commandName
 	});
 	const branch = options?.branch ?? await resolveDeployBranch(context, void 0);
@@ -1296,8 +1329,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 +1339,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 +1365,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 +1380,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 +1391,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 +1417,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,12 +1438,16 @@ 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)
+			name: remoteBranch.name,
+			kind: remoteBranch.role
 		}
 	};
 }
@@ -1432,7 +1472,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 +1482,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 +1490,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 +1508,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,7 +1548,7 @@ 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",
@@ -1537,13 +1557,18 @@ async function detectNextConfig(cwd) {
 		"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;
 		}
 	}
@@ -1715,7 +1740,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";
@@ -1737,7 +1762,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");
 }

package/dist/controllers/auth.js

@@ -11,32 +11,32 @@ function isRealMode(context) {
 async function runAuthLogin(context, options) {
 	let result;
 	if (isRealMode(context)) {
-		await performLogin(context.runtime.env);
-		result = await readAuthState(context.runtime.env);
+		await performLogin(context.runtime.env, context.runtime.signal);
+		result = await readAuthState(context.runtime.env, context.runtime.signal);
 	} else result = await loginWithSelectionFlow(context, createAuthUseCases(createCliUseCaseGateways(context)), options);
 	return createAuthSuccess("auth.login", result, ["prisma-cli auth whoami", "prisma-cli project list"]);
 }
 async function runAuthLogout(context) {
 	let result;
 	if (isRealMode(context)) {
-		await performLogout(context.runtime.env);
-		result = await readAuthState(context.runtime.env);
+		await performLogout(context.runtime.env, context.runtime.signal);
+		result = await readAuthState(context.runtime.env, context.runtime.signal);
 	} else result = await createAuthUseCases(createCliUseCaseGateways(context)).logout();
 	return createAuthSuccess("auth.logout", result, ["prisma-cli auth login"]);
 }
 async function runAuthWhoAmI(context) {
 	let result;
-	if (isRealMode(context)) result = await readAuthState(context.runtime.env);
+	if (isRealMode(context)) result = await readAuthState(context.runtime.env, context.runtime.signal);
 	else result = await createAuthUseCases(createCliUseCaseGateways(context)).whoami();
 	return createAuthSuccess("auth.whoami", result, result.authenticated ? [] : ["prisma-cli auth login"]);
 }
 async function requireAuthenticatedAuthState(context) {
 	if (isRealMode(context)) {
-		const current = await readAuthState(context.runtime.env);
+		const current = await readAuthState(context.runtime.env, context.runtime.signal);
 		if (current.authenticated) return current;
 		if (!canPrompt(context)) throw authRequiredError();
-		await performLogin(context.runtime.env);
-		return readAuthState(context.runtime.env);
+		await performLogin(context.runtime.env, context.runtime.signal);
+		return readAuthState(context.runtime.env, context.runtime.signal);
 	}
 	const useCases = createAuthUseCases(createCliUseCaseGateways(context));
 	const current = await useCases.whoami();