@prisma/cli 3.0.0-beta.16 → 3.0.0-beta.18

package/dist/lib/agent/package-manager.js

@@ -0,0 +1,99 @@
+import { readFileSync, statSync } from "node:fs";
+import path from "node:path";
+//#region src/lib/agent/package-manager.ts
+const LOCKFILE_PACKAGE_MANAGERS = [
+	{
+		packageManager: "bun",
+		fileNames: ["bun.lock", "bun.lockb"]
+	},
+	{
+		packageManager: "pnpm",
+		fileNames: ["pnpm-lock.yaml", "pnpm-workspace.yaml"]
+	},
+	{
+		packageManager: "yarn",
+		fileNames: ["yarn.lock"]
+	},
+	{
+		packageManager: "npm",
+		fileNames: ["package-lock.json", "npm-shrinkwrap.json"]
+	}
+];
+async function resolveSkillsPackageRunner(options) {
+	return resolvePackageRunner(options);
+}
+async function resolvePackageRunner(options) {
+	options.signal.throwIfAborted();
+	const packageManager = detectPackageManagerSync(options.cwd, options.signal) ?? "npm";
+	options.signal.throwIfAborted();
+	return packageRunnerForPackageManager(packageManager);
+}
+function resolvePackageRunnerSync(cwd) {
+	return packageRunnerForPackageManager(detectPackageManagerSync(cwd) ?? "npm");
+}
+function detectPackageManagerSync(cwd, signal) {
+	let directory = path.resolve(cwd);
+	while (true) {
+		signal?.throwIfAborted();
+		const packageJsonManager = readPackageJsonPackageManager(directory);
+		if (packageJsonManager) return packageJsonManager;
+		const lockfileManager = readLockfilePackageManager(directory, signal);
+		if (lockfileManager) return lockfileManager;
+		const parent = path.dirname(directory);
+		if (parent === directory) return null;
+		directory = parent;
+	}
+}
+function readPackageJsonPackageManager(directory) {
+	const packageJsonPath = path.join(directory, "package.json");
+	let content;
+	try {
+		content = readFileSync(packageJsonPath, "utf8");
+	} catch (error) {
+		if (isMissingFileError(error)) return null;
+		throw error;
+	}
+	try {
+		return parsePackageManager(JSON.parse(content).packageManager);
+	} catch {
+		return null;
+	}
+}
+function readLockfilePackageManager(directory, signal) {
+	for (const candidate of LOCKFILE_PACKAGE_MANAGERS) for (const fileName of candidate.fileNames) {
+		signal?.throwIfAborted();
+		if (fileExists(path.join(directory, fileName))) return candidate.packageManager;
+	}
+	return null;
+}
+function fileExists(filePath) {
+	try {
+		return statSync(filePath).isFile();
+	} catch (error) {
+		if (isMissingFileError(error)) return false;
+		throw error;
+	}
+}
+function parsePackageManager(value) {
+	if (typeof value !== "string") return null;
+	const normalized = value.trim().toLowerCase();
+	if (normalized === "bun" || normalized.startsWith("bun@")) return "bun";
+	if (normalized === "pnpm" || normalized.startsWith("pnpm@")) return "pnpm";
+	if (normalized === "yarn" || normalized.startsWith("yarn@")) return "yarn";
+	if (normalized === "npm" || normalized.startsWith("npm@")) return "npm";
+	return null;
+}
+function packageRunnerForPackageManager(packageManager) {
+	switch (packageManager) {
+		case "bun": return ["bunx"];
+		case "pnpm": return ["pnpm", "dlx"];
+		case "yarn": return ["yarn", "dlx"];
+		case "npm": return ["npx", "-y"];
+	}
+}
+function isMissingFileError(error) {
+	const code = error.code;
+	return code === "ENOENT" || code === "ENOTDIR";
+}
+//#endregion
+export { resolvePackageRunner, resolvePackageRunnerSync, resolveSkillsPackageRunner };

package/dist/lib/agent/setup-status.js

@@ -0,0 +1,83 @@
+import { PRISMA_SKILLS_LOCK_FILENAME } from "./constants.js";
+import path from "node:path";
+import { readFile, stat } from "node:fs/promises";
+import { findComputeConfigDir } from "@prisma/compute-sdk/config";
+//#region src/lib/agent/setup-status.ts
+async function readPrismaAgentSetupStatus(options) {
+	const setupCwd = await resolvePrismaAgentSetupCwd(options);
+	const skillsLockPath = path.join(setupCwd, PRISMA_SKILLS_LOCK_FILENAME);
+	const [skillsInstalled, promptDismissedAt] = await Promise.all([hasPrismaSkillsLock(skillsLockPath, options.signal, options.requiredSkill), options.stateStore?.readAgentSetupPromptDismissedAt() ?? null]);
+	return {
+		skillsLockPath: path.basename(skillsLockPath),
+		skillsInstalled,
+		promptDismissedAt
+	};
+}
+async function resolvePrismaAgentSetupCwd(options) {
+	options.signal.throwIfAborted();
+	const configDir = await findComputeConfigDir(options.cwd, options.signal);
+	options.signal.throwIfAborted();
+	return configDir ?? options.cwd;
+}
+function isPrismaAgentSetupComplete(status) {
+	return status.skillsInstalled;
+}
+function shouldOfferPrismaAgentSetup(status) {
+	return !isPrismaAgentSetupComplete(status) && !status.promptDismissedAt;
+}
+async function isLikelyProjectDirectory(options) {
+	return (await Promise.all([
+		"package.json",
+		"prisma.compute.ts",
+		"prisma.config.ts",
+		".git"
+	].map((fileName) => pathExists(path.join(options.cwd, fileName), options.signal)))).some(Boolean);
+}
+async function hasPrismaSkillsLock(filePath, signal, requiredSkill) {
+	try {
+		const raw = await readFile(filePath, {
+			encoding: "utf8",
+			signal
+		});
+		return hasPrismaSkillsLockEntry(JSON.parse(raw), requiredSkill);
+	} catch (error) {
+		if (isNotFoundError(error) || error instanceof SyntaxError) return false;
+		throw error;
+	}
+}
+function hasPrismaSkillsLockEntry(value, requiredSkill) {
+	if (!isRecord(value)) return false;
+	if (requiredSkill) return skillLockEntryUsesPrismaSource(readSkillLockEntries(value)[requiredSkill]);
+	if (readLegacySources(value).includes("prisma/skills")) return true;
+	return Object.values(readSkillLockEntries(value)).some(skillLockEntryUsesPrismaSource);
+}
+function readLegacySources(value) {
+	return Array.isArray(value.sources) ? value.sources.filter((source) => typeof source === "string") : [];
+}
+function readSkillLockEntries(value) {
+	return isRecord(value.skills) ? value.skills : {};
+}
+function skillLockEntryUsesPrismaSource(value) {
+	return isRecord(value) && value.source === "prisma/skills";
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null;
+}
+async function pathExists(filePath, signal) {
+	signal.throwIfAborted();
+	try {
+		await stat(filePath);
+		signal.throwIfAborted();
+		return true;
+	} catch (error) {
+		if (signal.aborted) throw error;
+		if (isNotFoundError(error)) return false;
+		throw error;
+	}
+}
+function isNotFoundError(error) {
+	const code = error.code;
+	return code === "ENOENT" || code === "ENOTDIR";
+}
+//#endregion
+export { isLikelyProjectDirectory, readPrismaAgentSetupStatus, resolvePrismaAgentSetupCwd, shouldOfferPrismaAgentSetup };

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

@@ -68,14 +68,14 @@ function createAppProvider(client, options) {
 			return deleteEnvironmentVariable(client, options);
 		},
 		async removeApp(appId, options) {
-			const appResult = await sdk.showService({
-				serviceId: appId,
+			const appResult = await sdk.showApp({
+				appId,
 				signal: options?.signal
 			});
 			if (appResult.isErr()) throw new Error(appResult.error.message);
-			const destroyResult = await sdk.destroyService({
-				serviceId: appId,
-				keepService: false,
+			const destroyResult = await sdk.destroyApp({
+				appId,
+				keepApp: false,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
 				signal: options?.signal
@@ -90,8 +90,8 @@ function createAppProvider(client, options) {
 			return listComputeServiceDomains(client, appId, options?.signal);
 		},
 		async addDomain(options) {
-			const result = await client.POST("/v1/compute-services/{computeServiceId}/domains", {
-				params: { path: { computeServiceId: options.appId } },
+			const result = await client.POST("/v1/apps/{appId}/domains", {
+				params: { path: { appId: options.appId } },
 				body: { hostname: options.hostname },
 				signal: options.signal
 			});
@@ -135,8 +135,8 @@ function createAppProvider(client, options) {
 		},
 		async promoteDeployment(options) {
 			const promoteResult = await sdk.promote({
-				serviceId: options.appId,
-				versionId: options.deploymentId,
+				appId: options.appId,
+				deploymentId: options.deploymentId,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
 				signal: options.signal,
@@ -169,8 +169,8 @@ function createAppProvider(client, options) {
 					buildSettings: options.buildSettings
 				}),
 				projectId: options.projectId,
-				serviceId: resolvedApp.appId,
-				serviceName: resolvedApp.appName,
+				appId: resolvedApp.appId,
+				appName: resolvedApp.appName,
 				region: resolvedApp.region,
 				portMapping: options.portMapping,
 				envVars: options.envVars,
@@ -185,22 +185,22 @@ function createAppProvider(client, options) {
 			return {
 				projectId: deployed.projectId,
 				app: {
-					id: deployed.serviceId,
-					name: deployed.serviceName,
+					id: deployed.appId,
+					name: deployed.appName,
 					region: deployed.region ?? null,
-					liveDeploymentId: deployed.versionId,
-					liveUrl: toAbsoluteUrl(deployed.serviceEndpointDomain ?? null)
+					liveDeploymentId: deployed.deploymentId,
+					liveUrl: toAbsoluteUrl(deployed.appEndpointDomain ?? null)
 				},
 				deployment: {
-					id: deployed.versionId,
+					id: deployed.deploymentId,
 					status: "running",
-					url: toAbsoluteUrl(deployed.serviceEndpointDomain ?? deployed.versionEndpointDomain ?? null)
+					url: toAbsoluteUrl(deployed.appEndpointDomain ?? deployed.deploymentEndpointDomain ?? null)
 				}
 			};
 		},
 		async updateAppEnv(options) {
 			const updateResult = await sdk.updateEnv({
-				serviceId: options.appId,
+				appId: options.appId,
 				envVars: options.envVars,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
@@ -209,19 +209,19 @@ function createAppProvider(client, options) {
 			});
 			if (updateResult.isErr()) throw new Error(updateResult.error.message);
 			const promoteResult = await sdk.promote({
-				serviceId: options.appId,
-				versionId: updateResult.value.versionId,
+				appId: options.appId,
+				deploymentId: updateResult.value.deploymentId,
 				timeoutSeconds: 120,
 				pollIntervalMs: 2e3,
 				signal: options.signal,
 				progress: options.promoteProgress
 			});
 			if (promoteResult.isErr()) throw new Error(promoteResult.error.message);
-			const [serviceResult, versionResult] = await Promise.all([sdk.showService({
-				serviceId: options.appId,
+			const [serviceResult, versionResult] = await Promise.all([sdk.showApp({
+				appId: options.appId,
 				signal: options.signal
-			}), sdk.showVersion({
-				versionId: updateResult.value.versionId,
+			}), sdk.showDeployment({
+				deploymentId: updateResult.value.deploymentId,
 				signal: options.signal
 			})]);
 			if (serviceResult.isErr()) throw new Error(serviceResult.error.message);
@@ -232,25 +232,25 @@ function createAppProvider(client, options) {
 					id: serviceResult.value.id,
 					name: serviceResult.value.name,
 					region: serviceResult.value.region ?? null,
-					liveDeploymentId: serviceResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: serviceResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? null)
 				},
 				deployment: {
 					id: versionResult.value.id,
 					status: versionResult.value.status,
 					createdAt: versionResult.value.createdAt,
-					url: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? versionResult.value.previewDomain ?? null),
+					url: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? versionResult.value.previewDomain ?? null),
 					live: true
 				},
 				variables: envVarNames(versionResult.value.envVars)
 			};
 		},
 		async listAppEnvNames(options) {
-			const [serviceResult, versionResult] = await Promise.all([sdk.showService({
-				serviceId: options.appId,
+			const [serviceResult, versionResult] = await Promise.all([sdk.showApp({
+				appId: options.appId,
 				signal: options.signal
-			}), sdk.showVersion({
-				versionId: options.deploymentId,
+			}), sdk.showDeployment({
+				deploymentId: options.deploymentId,
 				signal: options.signal
 			})]);
 			if (serviceResult.isErr()) throw new Error(serviceResult.error.message);
@@ -261,25 +261,25 @@ function createAppProvider(client, options) {
 					id: serviceResult.value.id,
 					name: serviceResult.value.name,
 					region: serviceResult.value.region ?? null,
-					liveDeploymentId: serviceResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(serviceResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: serviceResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(serviceResult.value.appEndpointDomain ?? null)
 				},
 				deployment: {
 					id: versionResult.value.id,
 					status: versionResult.value.status,
 					createdAt: versionResult.value.createdAt,
 					url: toAbsoluteUrl(versionResult.value.previewDomain ?? null),
-					live: serviceResult.value.latestVersionId === versionResult.value.id
+					live: serviceResult.value.latestDeploymentId === versionResult.value.id
 				},
 				variables: envVarNames(versionResult.value.envVars)
 			};
 		},
 		async listDeployments(appId, options) {
-			const [appResult, versionsResult] = await Promise.all([sdk.showService({
-				serviceId: appId,
+			const [appResult, versionsResult] = await Promise.all([sdk.showApp({
+				appId,
 				signal: options?.signal
-			}), sdk.listVersions({
-				serviceId: appId,
+			}), sdk.listDeployments({
+				appId,
 				signal: options?.signal
 			})]);
 			if (appResult.isErr()) throw new Error(appResult.error.message);
@@ -289,8 +289,8 @@ function createAppProvider(client, options) {
 					id: appResult.value.id,
 					name: appResult.value.name,
 					region: appResult.value.region ?? null,
-					liveDeploymentId: appResult.value.latestVersionId ?? null,
-					liveUrl: toAbsoluteUrl(appResult.value.serviceEndpointDomain ?? null)
+					liveDeploymentId: appResult.value.latestDeploymentId ?? null,
+					liveUrl: toAbsoluteUrl(appResult.value.appEndpointDomain ?? null)
 				},
 				deployments: versionsResult.value.slice().sort((left, right) => {
 					const byDate = right.createdAt.localeCompare(left.createdAt);
@@ -305,8 +305,8 @@ function createAppProvider(client, options) {
 			};
 		},
 		async showDeployment(deploymentId, options) {
-			const deploymentResult = await sdk.showVersion({
-				versionId: deploymentId,
+			const deploymentResult = await sdk.showDeployment({
+				deploymentId,
 				signal: options?.signal
 			});
 			if (deploymentResult.isErr()) {
@@ -329,7 +329,7 @@ function createAppProvider(client, options) {
 			const result = await streamLogs({
 				baseUrl: options.baseUrl,
 				token: await options.getToken(),
-				versionId: streamOptions.deploymentId,
+				deploymentId: streamOptions.deploymentId,
 				signal: streamOptions.signal
 			}, streamOptions.onRecord);
 			if (result.isErr()) {
@@ -382,7 +382,7 @@ async function listComputeServices(client, options) {
 	const services = [];
 	let cursor;
 	while (true) {
-		const result = await client.GET("/v1/compute-services", {
+		const result = await client.GET("/v1/apps", {
 			params: { query: {
 				projectId: options.projectId,
 				branchGitName: options.branchGitName,
@@ -400,13 +400,13 @@ async function listComputeServices(client, options) {
 		name: service.name,
 		region: service.region.id ?? null,
 		branchId: service.branchId,
-		liveDeploymentId: service.latestVersionId ?? null,
-		liveUrl: toAbsoluteUrl(service.serviceEndpointDomain ?? null)
+		liveDeploymentId: service.latestDeploymentId ?? null,
+		liveUrl: toAbsoluteUrl(service.appEndpointDomain ?? null)
 	}));
 }
 async function listComputeServiceDomains(client, computeServiceId, signal) {
-	const result = await client.GET("/v1/compute-services/{computeServiceId}/domains", {
-		params: { path: { computeServiceId } },
+	const result = await client.GET("/v1/apps/{appId}/domains", {
+		params: { path: { appId: computeServiceId } },
 		signal
 	});
 	if (result.error || !result.data) throw domainApiCallError("Failed to list custom domains", result.response, result.error);
@@ -453,7 +453,7 @@ async function createBranchApp(client, options) {
 		gitName: options.branchName,
 		signal: options.signal
 	});
-	const result = await client.POST("/v1/compute-services", {
+	const result = await client.POST("/v1/apps", {
 		body: {
 			projectId: options.projectId,
 			branchId: branch.id,
@@ -503,7 +503,7 @@ async function findAppForDeployment(sdk, deploymentId, signal) {
 	const projectsResult = await sdk.listProjects({ signal });
 	if (projectsResult.isErr()) throw new Error(projectsResult.error.message);
 	for (const project of projectsResult.value) {
-		const servicesResult = await sdk.listServices({
+		const servicesResult = await sdk.listApps({
 			projectId: project.id,
 			signal
 		});
@@ -516,8 +516,8 @@ async function findAppForDeployment(sdk, deploymentId, signal) {
 	return null;
 }
 async function findServiceAppForDeployment(sdk, serviceId, deploymentId, signal) {
-	const detailResult = await sdk.showService({
-		serviceId,
+	const detailResult = await sdk.showApp({
+		appId: serviceId,
 		signal
 	});
 	if (detailResult.isErr()) throw new Error(detailResult.error.message);
@@ -525,12 +525,12 @@ async function findServiceAppForDeployment(sdk, serviceId, deploymentId, signal)
 		id: detailResult.value.id,
 		name: detailResult.value.name,
 		region: detailResult.value.region ?? null,
-		liveDeploymentId: detailResult.value.latestVersionId ?? null,
-		liveUrl: toAbsoluteUrl(detailResult.value.serviceEndpointDomain ?? null)
+		liveDeploymentId: detailResult.value.latestDeploymentId ?? null,
+		liveUrl: toAbsoluteUrl(detailResult.value.appEndpointDomain ?? null)
 	};
 	if (app.liveDeploymentId === deploymentId) return app;
-	const versionsResult = await sdk.listVersions({
-		serviceId,
+	const versionsResult = await sdk.listDeployments({
+		appId: serviceId,
 		signal
 	});
 	if (versionsResult.isErr()) throw new Error(versionsResult.error.message);

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

@@ -1,8 +1,8 @@
+import { formatCommandArgument } from "../../shell/command-arguments.js";
 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 { formatCommandArgument } from "../../shell/command-arguments.js";
+import { confirmPrompt } from "../../shell/prompt.js";
 import "../project/setup.js";
 import { hasBranchDatabaseSignal, inspectBranchDatabaseSignal } from "./branch-database.js";
 import path from "node:path";
@@ -51,6 +51,7 @@ async function maybeSetupBranchDatabase(context, provider, projectId, branch, op
 		if (!await confirmPrompt({
 			input: context.runtime.stdin,
 			output: context.output.stderr,
+			signal: context.runtime.signal,
 			message: databasePromptMessage(branch),
 			initialValue: false
 		})) return emptyBranchDatabaseSetupOutcome();

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

@@ -1,8 +1,9 @@
-import { access, readFile, readdir, stat } from "node:fs/promises";
 import path from "node:path";
+import { access, readFile, readdir, stat } from "node:fs/promises";
 //#region src/lib/app/branch-database.ts
 const SKIPPED_DIRECTORIES = new Set([
 	".git",
+	".agents",
 	".next",
 	".nuxt",
 	".output",

package/dist/lib/app/build-settings.js

@@ -1,5 +1,5 @@
-import { readFile } from "node:fs/promises";
 import path from "node:path";
+import { readFile } from "node:fs/promises";
 import { resolveBuildSettings, resolveConfiguredBuildSettings } from "@prisma/compute-sdk";
 //#region src/lib/app/build-settings.ts
 /** Legacy build-settings file: no longer read or written, only detected for migration. */

package/dist/lib/app/build.js

@@ -1,18 +1,20 @@
 import "./build-settings.js";
-import "node:fs/promises";
 import "node:path";
+import "node:fs/promises";
+import { FRAMEWORKS } from "@prisma/compute-sdk/config";
 import { normalizeArtifactSymlinks, resolveBuildStrategy } from "@prisma/compute-sdk";
 //#region src/lib/app/build.ts
-const APP_BUILD_TYPES = [
-	"auto",
-	"bun",
-	"nextjs",
-	"nuxt",
-	"astro",
-	"nestjs",
-	"tanstack-start"
-];
-const RESOLVED_APP_BUILD_TYPES = APP_BUILD_TYPES.filter((buildType) => buildType !== "auto");
+const RESOLVED_APP_BUILD_TYPES = [...frameworkBuildTypesByLastOccurrence()];
+const APP_BUILD_TYPES = ["auto", ...RESOLVED_APP_BUILD_TYPES];
+const APP_BUILD_TYPE_LABELS = APP_BUILD_TYPES.join(", ");
+function frameworkBuildTypesByLastOccurrence() {
+	const buildTypes = /* @__PURE__ */ new Set();
+	for (const framework of FRAMEWORKS) {
+		if (buildTypes.has(framework.buildType)) buildTypes.delete(framework.buildType);
+		buildTypes.add(framework.buildType);
+	}
+	return buildTypes;
+}
 var AppBuildStrategy = class {
 	#appPath;
 	#entrypoint;
@@ -77,4 +79,4 @@ async function resolveAppBuildStrategy(options) {
 	});
 }
 //#endregion
-export { APP_BUILD_TYPES, AppBuildStrategy, RESOLVED_APP_BUILD_TYPES, executeAppBuild };
+export { APP_BUILD_TYPES, APP_BUILD_TYPE_LABELS, AppBuildStrategy, RESOLVED_APP_BUILD_TYPES, executeAppBuild };

package/dist/lib/app/bun-project.js

@@ -1,5 +1,5 @@
-import { access, readFile } from "node:fs/promises";
 import path from "node:path";
+import { access, readFile } from "node:fs/promises";
 //#region src/lib/app/bun-project.ts
 async function readBunPackageJson(appPath, signal) {
 	const packageJsonPath = path.join(appPath, "package.json");

package/dist/lib/app/compute-config.js

@@ -1,6 +1,6 @@
 import { CliError } from "../../shell/errors.js";
-import { COMPUTE_CONFIG_FILENAME, COMPUTE_CONFIG_FILENAME as COMPUTE_CONFIG_FILENAME$1, ComputeConfigTargetRequiredError, computeTargetAppDir, frameworkByKey, inferComputeTargetFromCwd, loadComputeConfig, selectComputeDeployTarget } from "@prisma/compute-sdk/config";
 import path from "node:path";
+import { COMPUTE_CONFIG_FILENAME, COMPUTE_CONFIG_FILENAME as COMPUTE_CONFIG_FILENAME$1, ComputeConfigTargetRequiredError, computeTargetAppDir, frameworkByKey, inferComputeTargetFromCwd, loadComputeConfig, selectComputeDeployTarget } from "@prisma/compute-sdk/config";
 import { matchError } from "better-result";
 //#region src/lib/app/compute-config.ts
 /**
@@ -18,47 +18,45 @@ function computeFrameworkToBuildType(framework) {
 function mergeComputeDeployInputs(options) {
 	const { cli, target, configFilename } = options;
 	const configAnnotation = `set by ${configFilename}`;
-	const framework = cli.framework ? {
-		value: cli.framework,
-		annotation: "set by --framework"
-	} : target?.framework ? {
-		value: target.framework,
-		annotation: configAnnotation
-	} : void 0;
-	const entrypoint = cli.entrypoint ? {
-		value: cli.entrypoint,
-		annotation: "set by --entry"
-	} : target?.entry ? {
-		value: target.entry,
-		annotation: configAnnotation
-	} : void 0;
-	const httpPort = cli.httpPort ? {
-		value: cli.httpPort,
-		annotation: "set by --http-port"
-	} : target?.httpPort ? {
-		value: String(target.httpPort),
-		annotation: configAnnotation
-	} : void 0;
+	const framework = mergeStringInput(cli.framework, "set by --framework", target?.framework ?? void 0, configAnnotation);
+	const entrypoint = mergeStringInput(cli.entrypoint, "set by --entry", target?.entry ?? void 0, configAnnotation);
+	const httpPort = mergeStringInput(cli.httpPort, "set by --http-port", target?.httpPort ? String(target.httpPort) : void 0, configAnnotation);
+	const region = mergeStringInput(cli.region, "set by --region", target?.region ?? void 0, configAnnotation);
 	const cliEnvInputs = cli.envInputs && cli.envInputs.length > 0 ? cli.envInputs : void 0;
 	const configEnvInputs = target && target.envInputs.length > 0 ? target.envInputs : void 0;
 	const envInputs = cliEnvInputs ?? configEnvInputs;
-	const configAppName = target?.name ? {
-		value: target.name,
-		annotation: configAnnotation
-	} : target?.key ? {
-		value: target.key,
-		annotation: configAnnotation
-	} : void 0;
+	const configAppName = readConfigAppName(target, configAnnotation);
 	return {
 		framework,
 		entrypoint,
 		httpPort,
+		region,
 		envInputs,
 		envInputsFromConfig: !cliEnvInputs && configEnvInputs !== void 0,
 		configAppName,
 		appRoot: target?.root ?? void 0
 	};
 }
+function mergeStringInput(cliValue, cliAnnotation, configValue, configAnnotation) {
+	if (cliValue !== void 0) return {
+		value: cliValue,
+		annotation: cliAnnotation
+	};
+	if (configValue) return {
+		value: configValue,
+		annotation: configAnnotation
+	};
+}
+function readConfigAppName(target, configAnnotation) {
+	if (target?.name) return {
+		value: target.name,
+		annotation: configAnnotation
+	};
+	if (target?.key) return {
+		value: target.key,
+		annotation: configAnnotation
+	};
+}
 /**
 * Merges CLI inputs for the local `app build` and `app run` commands with a
 * selected config target. Explicit flags win; `--build-type auto` is the

package/dist/lib/app/deploy-plan.js

@@ -30,6 +30,7 @@ function perAppInputsForDeployAll(inputs) {
 		["--framework", inputs.framework],
 		["--entry", inputs.entrypoint],
 		["--http-port", inputs.httpPort],
+		["--region", inputs.region],
 		["--env", inputs.envAssignments?.length ? inputs.envAssignments : void 0],
 		[inputs.appIdEnvVar.name, inputs.appIdEnvVar.value]
 	].filter(([, value]) => value !== void 0).map(([flag]) => flag);

package/dist/lib/app/deploy-progress.js

@@ -6,7 +6,7 @@ function createDeployProgressState() {
 		buildCompleted: false,
 		archiveReady: false,
 		uploadCompleted: false,
-		versionId: null,
+		deploymentId: null,
 		startRequested: false,
 		containerLive: false,
 		deploymentUrl: null,
@@ -39,8 +39,8 @@ function createDeployProgress(output, ui, enabled, state = createDeployProgressS
 		onUploadStart() {
 			write("Uploading...");
 		},
-		onVersionCreated(versionId) {
-			state.versionId = versionId;
+		onDeploymentCreated(deploymentId) {
+			state.deploymentId = deploymentId;
 		},
 		onUploadComplete() {
 			state.uploadCompleted = true;
@@ -69,16 +69,16 @@ function createPromoteProgress(output, enabled) {
 		output.write(`${line}\n`);
 	};
 	return {
-		onVersionStarting(versionId) {
-			write(`Starting deployment ${versionId}...`);
+		onDeploymentStarting(deploymentId) {
+			write(`Starting deployment ${deploymentId}...`);
 		},
-		onVersionStartRequested() {
+		onDeploymentStartRequested() {
 			write("Requesting deployment start...");
 		},
 		onStatusChange(status) {
 			write(`Status: ${status}`);
 		},
-		onVersionRunning() {
+		onDeploymentRunning() {
 			write("Deployment is running.");
 		},
 		onPromoteStart() {