@prisma/cli 3.0.0-dev.56.1 → 3.0.0-dev.58.1

package/README.md

@@ -57,6 +57,7 @@ Useful next commands:
 npx prisma-cli app logs
 npx prisma-cli app open
 npx prisma-cli project env add DATABASE_URL=postgresql://example --role preview
+npx prisma-cli project env list
 npx prisma-cli project env list --role preview
 ```
 
@@ -73,7 +74,7 @@ The beta package exposes `prisma-cli` so it can coexist with the existing
 | `auth` | Log in, log out, and inspect the active Prisma account. |
 | `project` | List projects, show the resolved project, and manage project environment variables. |
 | `git` | Connect or disconnect a project from a GitHub repository. |
-| `branch` | Inspect the Prisma branch that maps to the current work context. |
+| `branch` | List Prisma branches for the resolved project. |
 | `app` | Build, run, deploy, inspect, open, stream logs, promote, roll back, and remove apps. |
 
 Common examples:
@@ -82,7 +83,7 @@ Common examples:
 npx prisma-cli version
 npx prisma-cli auth whoami
 npx prisma-cli project show
-npx prisma-cli branch show
+npx prisma-cli branch list
 npx prisma-cli app deploy --branch feat-login --framework nextjs
 npx prisma-cli app promote <deployment-id>
 ```

package/dist/commands/branch/index.js

@@ -2,16 +2,14 @@ import { attachCommandDescriptor } from "../../shell/command-meta.js";
 import { addCompactGlobalFlags, addGlobalFlags } from "../../shell/global-flags.js";
 import { configureRuntimeCommand } from "../../shell/runtime.js";
 import { runCommand } from "../../shell/command-runner.js";
-import { runBranchList, runBranchShow, runBranchUse } from "../../controllers/branch.js";
-import { renderBranchList, renderBranchShow, renderBranchUse, serializeBranchList, serializeBranchShow } from "../../presenters/branch.js";
+import { runBranchList } from "../../controllers/branch.js";
+import { renderBranchList, serializeBranchList } from "../../presenters/branch.js";
 import { Command } from "commander";
 //#region src/commands/branch/index.ts
 function createBranchCommand(runtime) {
 	const branch = attachCommandDescriptor(configureRuntimeCommand(new Command("branch"), runtime), "branch");
 	addCompactGlobalFlags(branch);
 	branch.addCommand(createBranchListCommand(runtime));
-	branch.addCommand(createBranchShowCommand(runtime));
-	branch.addCommand(createBranchUseCommand(runtime));
 	return branch;
 }
 function createBranchListCommand(runtime) {
@@ -25,28 +23,5 @@ function createBranchListCommand(runtime) {
 	});
 	return command;
 }
-function createBranchShowCommand(runtime) {
-	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("show"), runtime), "branch.show");
-	addGlobalFlags(command);
-	command.action(async (options) => {
-		await runCommand(runtime, "branch.show", options, (context) => runBranchShow(context), {
-			renderHuman: (context, descriptor, result) => renderBranchShow(context, descriptor, result),
-			renderJson: (result) => serializeBranchShow(result)
-		});
-	});
-	return command;
-}
-function createBranchUseCommand(runtime) {
-	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("use"), runtime), "branch.use");
-	command.argument("[name]", "Branch name");
-	addGlobalFlags(command);
-	command.action(async (branchName, options) => {
-		await runCommand(runtime, "branch.use", options, (context) => runBranchUse(context, branchName), {
-			renderHuman: (context, descriptor, result) => renderBranchUse(context, descriptor, result),
-			renderJson: (result) => serializeBranchShow(result)
-		});
-	});
-	return command;
-}
 //#endregion
 export { createBranchCommand };

package/dist/controllers/app-env.js

@@ -1,16 +1,11 @@
 import { CliError, authRequiredError, usageError, workspaceRequiredError } from "../shell/errors.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
 import { resolveProjectTarget } from "../lib/project/resolution.js";
+import { readLocalGitBranch } from "../lib/git/local-branch.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listRealWorkspaceProjects } from "./project.js";
 import { formatScopeLabel, parseKeyValuePositional, resolveEnvScope } from "../lib/app/env-config.js";
 //#region src/controllers/app-env.ts
-function defaultRoleScope() {
-	return {
-		kind: "role",
-		role: "production"
-	};
-}
 async function runEnvAdd(context, rawAssignment, flags) {
 	const { key, value } = parseKeyValuePositional(rawAssignment, "add", context.runtime.env);
 	const scope = resolveEnvScope(flags, {
@@ -108,25 +103,30 @@ async function runEnvUpdate(context, rawAssignment, flags) {
 	};
 }
 async function runEnvList(context, flags) {
-	const scope = resolveEnvScope(flags, {
+	const explicit = resolveEnvScope(flags, {
 		requireExplicit: false,
 		command: "list"
-	}) ?? defaultRoleScope();
+	});
 	const { client, projectId } = await requireClientAndProject(context, flags.projectRef, "project env list");
-	const resolved = await resolveScopeToApi(client, projectId, scope, {
-		createBranchIfMissing: false,
+	const resolved = await resolveListScopeToApi(client, projectId, explicit, {
+		cwd: context.runtime.cwd,
 		signal: context.runtime.signal
 	});
-	const variables = await listVariables(client, projectId, resolved, context.runtime.signal);
+	const variables = resolved.kind === "scoped" ? await listVariables(client, projectId, {
+		scope: resolved.addScope,
+		descriptor: resolved.descriptor,
+		apiTarget: resolved.apiTarget
+	}, context.runtime.signal) : await listOverviewVariables(client, projectId, context.runtime.signal);
 	return {
 		command: "project.env.list",
 		result: {
 			projectId,
 			scope: resolved.descriptor,
+			target: resolved.target,
 			variables: variables.map((row) => toMetadata(row, resolved.descriptor))
 		},
 		warnings: [],
-		nextSteps: variables.length === 0 ? [`prisma-cli project env add KEY=value ${formatScopeFlag(scope)}`] : []
+		nextSteps: variables.length === 0 ? [`prisma-cli project env add KEY=value ${formatScopeFlag(resolved.addScope)}`] : []
 	};
 }
 async function runEnvRemove(context, key, flags) {
@@ -196,12 +196,12 @@ async function resolveScopeToApi(client, projectId, scope, options) {
 		}
 	};
 	const branch = options.createBranchIfMissing ? await resolveOrCreateBranch(client, projectId, scope.branchName, options.signal) : await resolveExistingBranch(client, projectId, scope.branchName, options.signal);
-	if (branch.isDefault) throw new CliError({
+	if (branch.role === "production") throw new CliError({
 		code: "ENV_BRANCH_SCOPE_IS_PRODUCTION",
 		domain: "app",
-		summary: `Branch "${scope.branchName}" is the default branch`,
+		summary: `Branch "${scope.branchName}" is the production branch`,
 		why: "Production variables are project-level only; branch overrides apply to preview branches.",
-		fix: "Use --role production for the default branch.",
+		fix: "Use --role production for the production branch.",
 		exitCode: 1,
 		nextSteps: ["prisma-cli project env list --role production"]
 	});
@@ -218,6 +218,123 @@ async function resolveScopeToApi(client, projectId, scope, options) {
 		}
 	};
 }
+async function resolveListScopeToApi(client, projectId, explicit, options) {
+	if (explicit) {
+		const resolved = await resolveScopeToApi(client, projectId, explicit, {
+			createBranchIfMissing: false,
+			signal: options.signal
+		});
+		return {
+			kind: "scoped",
+			descriptor: resolved.descriptor,
+			target: targetFromExplicitScope(resolved.descriptor),
+			apiTarget: resolved.apiTarget,
+			addScope: resolved.scope
+		};
+	}
+	const gitBranch = await readLocalGitBranch(options.cwd, options.signal);
+	if (gitBranch) {
+		const branch = (await listBranchesByName(client, projectId, gitBranch, options.signal))[0];
+		if (!branch) return {
+			kind: "scoped",
+			descriptor: {
+				kind: "role",
+				role: "preview"
+			},
+			target: {
+				source: "local-git",
+				branchName: gitBranch,
+				branchExists: false,
+				envMap: "preview"
+			},
+			apiTarget: {
+				class: "preview",
+				branchId: null
+			},
+			addScope: {
+				kind: "branch",
+				branchName: gitBranch
+			}
+		};
+		if (branch.role === "production") return {
+			kind: "scoped",
+			descriptor: {
+				kind: "role",
+				role: "production"
+			},
+			target: {
+				source: "local-git",
+				branchName: branch.gitName,
+				branchId: branch.id,
+				branchRole: branch.role,
+				branchExists: true,
+				envMap: "production"
+			},
+			apiTarget: {
+				class: "production",
+				branchId: null
+			},
+			addScope: {
+				kind: "role",
+				role: "production"
+			}
+		};
+		return {
+			kind: "scoped",
+			descriptor: {
+				kind: "branch",
+				branchName: branch.gitName,
+				branchId: branch.id
+			},
+			target: {
+				source: "local-git",
+				branchName: branch.gitName,
+				branchId: branch.id,
+				branchRole: branch.role,
+				branchExists: true,
+				envMap: "preview"
+			},
+			apiTarget: {
+				class: "preview",
+				branchId: branch.id
+			},
+			addScope: {
+				kind: "branch",
+				branchName: branch.gitName
+			}
+		};
+	}
+	return {
+		kind: "overview",
+		descriptor: { kind: "overview" },
+		target: {
+			source: "overview",
+			envMap: "overview"
+		},
+		addScope: {
+			kind: "role",
+			role: "preview"
+		}
+	};
+}
+function targetFromExplicitScope(scope) {
+	if (scope.kind === "branch") return {
+		source: "explicit",
+		branchName: scope.branchName,
+		branchId: scope.branchId,
+		branchRole: "preview",
+		branchExists: true,
+		envMap: "preview"
+	};
+	if (scope.kind === "role") return {
+		source: "explicit",
+		envMap: scope.role
+	};
+	return {
+		source: "overview",
+		envMap: "overview"
+	};
+}
 function formatScopeFlag(scope) {
 	if (scope.kind === "role") return `--role ${scope.role}`;
 	return `--branch ${scope.branchName}`;
@@ -306,25 +423,38 @@ async function findVariableByNaturalKey(client, projectId, key, resolved, signal
 	return data.data.filter((row) => rowMatchesExactScope(row, resolved))[0] ?? null;
 }
 async function listVariables(client, projectId, resolved, signal) {
+	return materializeEffectiveRows(await collectEnvironmentVariables(client, projectId, signal, {
+		className: resolved.apiTarget.class,
+		filter: (row) => rowMatchesScope(row, resolved)
+	}), resolved);
+}
+async function listOverviewVariables(client, projectId, signal) {
+	return (await collectEnvironmentVariables(client, projectId, signal, { filter: (row) => row.branchId === null && (row.class === "production" || row.class === "preview") })).sort((left, right) => {
+		const roleOrder = roleSortOrder(left.class) - roleSortOrder(right.class);
+		return roleOrder !== 0 ? roleOrder : left.key.localeCompare(right.key);
+	});
+}
+async function collectEnvironmentVariables(client, projectId, signal, options) {
 	const collected = [];
 	let cursor;
 	while (true) {
-		const query = {
-			projectId,
-			class: resolved.apiTarget.class
-		};
+		const query = { projectId };
+		if (options.className !== void 0) query.class = options.className;
 		if (cursor !== void 0) query.cursor = cursor;
 		const result = await client.GET("/v1/environment-variables", {
 			params: { query },
 			signal
 		});
 		if (result.error || !result.data) throw apiCallError(`Failed to list environment variables`, result.response, result.error);
-		const page = result.data.data.filter((row) => rowMatchesScope(row, resolved));
+		const page = result.data.data.filter(options.filter);
 		collected.push(...page);
 		if (!result.data.pagination.hasMore || !result.data.pagination.nextCursor) break;
 		cursor = result.data.pagination.nextCursor;
 	}
-	return materializeEffectiveRows(collected, resolved);
+	return collected;
+}
+function roleSortOrder(role) {
+	return role === "production" ? 0 : 1;
 }
 function rowMatchesScope(row, resolved) {
 	if (row.class !== resolved.apiTarget.class) return false;
@@ -357,6 +487,7 @@ function toMetadata(row, requestedScope) {
 }
 function formatDescriptorLabel(scope) {
 	if (scope.kind === "role") return scope.role ?? "unknown";
+	if (scope.kind === "overview") return "overview";
 	return `branch:${scope.branchName ?? scope.branchId ?? "unknown"}`;
 }
 function apiCallError(summary, response, error) {

package/dist/controllers/app.js

@@ -16,6 +16,7 @@ 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";
@@ -1481,42 +1482,6 @@ async function resolveDeployBranch(context, explicitBranchName) {
 		annotation: "default"
 	};
 }
-async function readLocalGitBranch(cwd, signal) {
-	const headPath = await resolveGitHeadPath(path.join(cwd, ".git"), signal);
-	if (!headPath) return null;
-	try {
-		const head = (await readFile(headPath, {
-			encoding: "utf8",
-			signal
-		})).trim();
-		if (head.startsWith("ref: refs/heads/")) return head.slice(16);
-	} catch (error) {
-		if (signal.aborted) throw error;
-		return null;
-	}
-	return null;
-}
-async function resolveGitHeadPath(gitPath, signal) {
-	signal.throwIfAborted();
-	try {
-		const raw = await readFile(gitPath, {
-			encoding: "utf8",
-			signal
-		});
-		if (raw.startsWith("gitdir:")) return path.join(path.resolve(path.dirname(gitPath), raw.slice(7).trim()), "HEAD");
-	} catch (error) {
-		if (signal.aborted) throw error;
-	}
-	signal.throwIfAborted();
-	try {
-		await access(path.join(gitPath, "HEAD"));
-		signal.throwIfAborted();
-		return path.join(gitPath, "HEAD");
-	} catch (error) {
-		if (signal.aborted) throw error;
-		return null;
-	}
-}
 async function resolveDeployFramework(context, options) {
 	if (options.requestedFramework) return frameworkFromUserFacingValue(options.requestedFramework, "set by --framework");
 	if (options.entrypoint) return {

package/dist/controllers/branch.js

@@ -1,73 +1,99 @@
-import { featureUnavailableError, usageError } from "../shell/errors.js";
-import { canPrompt } from "../shell/runtime.js";
+import { CliError, authRequiredError, workspaceRequiredError } from "../shell/errors.js";
+import { requireComputeAuth } from "../lib/auth/guard.js";
+import { resolveProjectTarget } from "../lib/project/resolution.js";
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways.js";
 import { createSelectPromptPort } from "./select-prompt-port.js";
+import { requireAuthenticatedAuthState } from "./auth.js";
+import { listRealWorkspaceProjects } from "./project.js";
 import { createBranchUseCases } from "../use-cases/branch.js";
 //#region src/controllers/branch.ts
-const PREVIEW_BRANCH_PATTERN = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 function isRealMode(context) {
 	return !context.runtime.fixturePath && !context.runtime.env.PRISMA_CLI_MOCK_FIXTURE_PATH;
 }
 async function runBranchList(context) {
-	if (isRealMode(context)) throw branchCommandsUnavailableError();
-	return {
+	if (isRealMode(context)) return {
 		command: "branch.list",
-		result: await createBranchUseCases(createCliUseCaseGateways(context)).list(),
+		result: await listRealBranches(context),
 		warnings: [],
 		nextSteps: []
 	};
-}
-async function runBranchShow(context) {
-	if (isRealMode(context)) throw branchCommandsUnavailableError();
-	const result = await createBranchUseCases(createCliUseCaseGateways(context)).show();
 	return {
-		command: "branch.show",
-		result,
+		command: "branch.list",
+		result: await createBranchUseCases(createCliUseCaseGateways(context)).list(),
 		warnings: [],
-		nextSteps: result.branch.kind === "preview" && !result.branch.remoteState ? ["prisma-cli app deploy"] : []
+		nextSteps: []
 	};
 }
-async function runBranchUse(context, branchName) {
-	if (isRealMode(context)) throw branchCommandsUnavailableError();
-	const useCases = createBranchUseCases(createCliUseCaseGateways(context));
-	const resolvedBranchName = await resolveBranchNameForUse(context, useCases, branchName);
-	validateBranchName(resolvedBranchName);
-	const result = await useCases.use(resolvedBranchName);
+async function listRealBranches(context) {
+	const authState = await requireAuthenticatedAuthState(context);
+	const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
+	if (!client) throw authRequiredError(["prisma-cli auth login"]);
+	const workspace = authState.workspace;
+	if (!workspace) throw workspaceRequiredError();
+	const target = await resolveProjectTarget({
+		context,
+		workspace,
+		listProjects: () => listRealWorkspaceProjects(client, workspace, context.runtime.signal),
+		prompt: createSelectPromptPort(context),
+		remember: true
+	});
+	const branches = await listBranches(client, target.project.id, context.runtime.signal);
 	return {
-		command: "branch.use",
-		result,
-		warnings: result.branch.kind === "production" ? ["Production is protected and durable. Use with care."] : [],
-		nextSteps: result.branch.kind === "preview" && !result.branch.remoteState ? ["prisma-cli branch show", "prisma-cli app deploy"] : ["prisma-cli branch show"]
+		projectId: target.project.id,
+		projectName: target.project.name,
+		branches: sortBranches(branches.map(toBranchSummary))
 	};
 }
-async function resolveBranchNameForUse(context, useCases, branchName) {
-	if (branchName) return branchName;
-	if (!canPrompt(context)) throw branchSelectionRequiredError();
-	const result = await useCases.list();
-	return createSelectPromptPort(context).select({
-		message: "Select a branch",
-		choices: result.branches.map((branch) => ({
-			label: renderBranchChoiceLabel(branch),
-			value: branch.name
-		}))
+function sortBranches(branches) {
+	return branches.slice().sort((left, right) => {
+		const leftRank = branchOrder(left);
+		const rightRank = branchOrder(right);
+		if (leftRank !== rightRank) return leftRank - rightRank;
+		return left.name.localeCompare(right.name);
 	});
 }
-function renderBranchChoiceLabel(branch) {
-	const markers = [];
-	if (branch.active) markers.push("active");
-	if (!branch.remoteState) markers.push("not created yet");
-	return markers.length > 0 ? `${branch.name} (${markers.join(", ")})` : branch.name;
+function branchOrder(branch) {
+	return branch.role === "production" ? 0 : 1;
 }
-function validateBranchName(branchName) {
-	if (branchName === "production") return;
-	if (PREVIEW_BRANCH_PATTERN.test(branchName)) return;
-	throw usageError("Branch name must use the documented form", "Branch names must be production or a lowercase preview slug such as preview or feat-auth.", "Use production or a lowercase preview branch name with letters, numbers, and hyphens.", ["prisma-cli branch list"], "branch");
+async function listBranches(client, projectId, signal) {
+	const collected = [];
+	let cursor;
+	while (true) {
+		const query = {};
+		if (cursor !== void 0) query.cursor = cursor;
+		const { data, error, response } = await client.GET("/v1/projects/{projectId}/branches", {
+			params: {
+				path: { projectId },
+				query
+			},
+			signal
+		});
+		if (error || !data) throw branchApiError("Failed to list branches", response, error);
+		collected.push(...data.data);
+		if (!data.pagination.hasMore || !data.pagination.nextCursor) break;
+		cursor = data.pagination.nextCursor;
+	}
+	return collected;
 }
-function branchSelectionRequiredError() {
-	return usageError("Branch use requires a target in non-interactive mode", "This command cannot prompt for branch selection in the current mode.", "Re-run prisma-cli branch use in a TTY, or pass a branch name explicitly.", ["prisma-cli branch list"], "branch");
+function toBranchSummary(branch) {
+	return {
+		id: branch.id,
+		name: branch.gitName,
+		role: branch.role,
+		envMap: branch.role
+	};
 }
-function branchCommandsUnavailableError() {
-	return featureUnavailableError("Branch commands are not available in this preview", "The current preview cannot resolve or change remote branch context yet.", "Use prisma-cli app deploy for preview app deployment workflows.", ["prisma-cli app deploy --app <name>"], "branch");
+function branchApiError(summary, response, error) {
+	const status = response?.status ?? 0;
+	return new CliError({
+		code: error?.error?.code ?? "BRANCH_API_ERROR",
+		domain: "branch",
+		summary,
+		why: error?.error?.message ?? `The Management API returned status ${status || "unknown"}.`,
+		fix: error?.error?.hint ?? "Re-run with --trace for the underlying API response details.",
+		exitCode: 1,
+		nextSteps: []
+	});
 }
 //#endregion
-export { runBranchList, runBranchShow, runBranchUse };
+export { runBranchList };

package/dist/lib/git/local-branch.js

@@ -0,0 +1,41 @@
+import { access, readFile } from "node:fs/promises";
+import path from "node:path";
+//#region src/lib/git/local-branch.ts
+async function readLocalGitBranch(cwd, signal) {
+	const headPath = await resolveGitHeadPath(path.join(cwd, ".git"), signal);
+	if (!headPath) return null;
+	try {
+		const head = (await readFile(headPath, {
+			encoding: "utf8",
+			signal
+		})).trim();
+		if (head.startsWith("ref: refs/heads/")) return head.slice(16);
+	} catch (error) {
+		if (signal.aborted) throw error;
+		return null;
+	}
+	return null;
+}
+async function resolveGitHeadPath(gitPath, signal) {
+	signal.throwIfAborted();
+	try {
+		const raw = await readFile(gitPath, {
+			encoding: "utf8",
+			signal
+		});
+		if (raw.startsWith("gitdir:")) return path.join(path.resolve(path.dirname(gitPath), raw.slice(7).trim()), "HEAD");
+	} catch (error) {
+		if (signal.aborted) throw error;
+	}
+	signal.throwIfAborted();
+	try {
+		await access(path.join(gitPath, "HEAD"));
+		signal.throwIfAborted();
+		return path.join(gitPath, "HEAD");
+	} catch (error) {
+		if (signal.aborted) throw error;
+		return null;
+	}
+}
+//#endregion
+export { readLocalGitBranch };

package/dist/presenters/app-env.js

@@ -2,8 +2,18 @@ import { renderList, renderShow, serializeList } from "../output/patterns.js";
 //#region src/presenters/app-env.ts
 function scopeLabel(scope) {
 	if (scope.kind === "role") return scope.role ?? "unknown";
+	if (scope.kind === "overview") return "overview";
 	return `branch:${scope.branchName ?? scope.branchId ?? "unknown"}`;
 }
+function listTargetLabel(result) {
+	const target = result.target;
+	if (target.source === "overview") return "overview";
+	if (target.branchName) {
+		const suffix = target.branchExists === false ? " (not created yet)" : "";
+		return `branch:${target.branchName} -> ${target.envMap}${suffix}`;
+	}
+	return scopeLabel(result.scope);
+}
 function renderEnvAdd(context, descriptor, result) {
 	return renderShow({
 		title: "Setting a new environment variable.",
@@ -75,8 +85,8 @@ function renderEnvList(context, descriptor, result) {
 		title: "Listing environment variables for the selected scope.",
 		descriptor,
 		parentContext: {
-			key: "scope",
-			value: scopeLabel(result.scope)
+			key: "target",
+			value: listTargetLabel(result)
 		},
 		items: result.variables.map((variable) => ({
 			noun: "variable",
@@ -91,8 +101,9 @@ function serializeEnvList(result) {
 	return {
 		projectId: result.projectId,
 		scope: result.scope,
+		target: result.target,
 		...serializeList({
-			context: { scope: scopeLabel(result.scope) },
+			context: { target: listTargetLabel(result) },
 			items: result.variables.map((variable) => ({
 				noun: "variable",
 				label: `${variable.key} (${variable.source})`,

package/dist/presenters/branch.js

@@ -1,111 +1,39 @@
-import { renderList, renderMutate, renderShow, serializeList } from "../output/patterns.js";
+import { formatColumns } from "../shell/ui.js";
+import { formatDescriptorLabel } from "../shell/command-meta.js";
 //#region src/presenters/branch.ts
 function renderBranchList(context, descriptor, result) {
-	return renderList({
-		title: "Listing branches for the resolved project.",
-		descriptor,
-		parentContext: {
-			key: "project",
-			value: result.projectName ?? "not resolved"
-		},
-		items: result.branches.map((branch) => ({
-			noun: "branch",
-			label: branch.name,
-			id: branch.id,
-			status: branch.active ? "active" : null
-		})),
-		emptyMessage: "No branches found."
-	}, context.ui);
+	const ui = context.ui;
+	const lines = [`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim("Listing branches for the resolved project.")}`, ""];
+	const rail = ui.dim("│");
+	lines.push(`${rail}  ${ui.accent("project:")}  ${result.projectName}`);
+	lines.push(rail);
+	if (result.branches.length === 0) {
+		lines.push(`${rail}  ${ui.dim("No branches found.")}`);
+		return lines;
+	}
+	const widths = [
+		Math.max(4, ...result.branches.map((branch) => branch.name.length)),
+		Math.max(4, ...result.branches.map((branch) => branch.role.length)),
+		Math.max(7, ...result.branches.map((branch) => branch.envMap.length))
+	];
+	lines.push(`${rail}  ${ui.accent(formatColumns([
+		"Name",
+		"Role",
+		"Env map"
+	], widths))}`);
+	for (const branch of result.branches) lines.push(`${rail}  ${formatColumns([
+		branch.name,
+		branch.role,
+		branch.envMap
+	], widths)}`);
+	return lines;
 }
 function serializeBranchList(result) {
-	return serializeList({
-		context: { project: result.projectName ?? "not resolved" },
-		items: result.branches.map((branch) => ({
-			noun: "branch",
-			label: branch.name,
-			id: branch.id,
-			status: branch.active ? "active" : null
-		}))
-	});
-}
-function serializeBranchShow(result) {
 	return {
 		projectId: result.projectId,
 		projectName: result.projectName,
-		branch: {
-			name: result.branch.name,
-			kind: result.branch.kind,
-			active: result.branch.active,
-			remoteState: result.branch.remoteState,
-			liveDeployment: result.branch.liveDeployment
-		}
+		branches: result.branches
 	};
 }
-function renderBranchShow(context, descriptor, result) {
-	const fields = [
-		{
-			key: "project",
-			value: result.projectName ?? "not resolved",
-			tone: result.projectName ? "default" : "dim"
-		},
-		{
-			key: "branch",
-			value: result.branch.name,
-			tone: result.branch.active ? "success" : "default"
-		},
-		{
-			key: "kind",
-			value: result.branch.kind
-		}
-	];
-	if (result.branch.liveDeployment) {
-		fields.push({
-			key: "status",
-			value: result.branch.liveDeployment.status,
-			tone: toneForDeploymentStatus(result.branch.liveDeployment.status)
-		});
-		if (result.branch.liveDeployment.url) fields.push({
-			key: "url",
-			value: result.branch.liveDeployment.url,
-			tone: "link"
-		});
-	} else if (!result.branch.remoteState) fields.push({
-		key: "remote state",
-		value: "not created yet",
-		tone: "dim"
-	});
-	return renderShow({
-		title: "Showing the current active branch context.",
-		descriptor,
-		fields
-	}, context.ui);
-}
-function toneForDeploymentStatus(status) {
-	if (status === "ready" || status === "active" || status === "healthy") return "success";
-	if (status === "pending" || status === "building" || status === "starting") return "warning";
-	if (status === "failed" || status === "error") return "error";
-	return "default";
-}
-function renderBranchUse(context, descriptor, result) {
-	return renderMutate({
-		title: "Changing the local default branch context.",
-		descriptor,
-		context: [{
-			key: "project",
-			value: result.projectName ?? "not resolved",
-			tone: result.projectName ? "default" : "dim"
-		}, {
-			key: "branch",
-			value: result.branch.name
-		}],
-		operationDescription: "Applying active branch change",
-		operationCount: 1,
-		details: ["Active branch updated in local CLI state for this repo."],
-		alerts: result.branch.kind === "production" ? [{
-			tone: "warning",
-			text: "Production is protected and durable. Use with care"
-		}] : void 0
-	}, context.ui);
-}
 //#endregion
-export { renderBranchList, renderBranchShow, renderBranchUse, serializeBranchList, serializeBranchShow };
+export { renderBranchList, serializeBranchList };

package/dist/shell/command-meta.js

@@ -69,8 +69,8 @@ const DESCRIPTORS = [
 	{
 		id: "branch",
 		path: ["prisma", "branch"],
-		description: "View your active Platform branches",
-		examples: ["prisma-cli branch list", "prisma-cli branch show"]
+		description: "View your Platform branches",
+		examples: ["prisma-cli branch list"]
 	},
 	{
 		id: "git",
@@ -153,29 +153,9 @@ const DESCRIPTORS = [
 			"branch",
 			"list"
 		],
-		description: "List active Platform branches for the resolved project",
+		description: "List Platform branches for the resolved project",
 		examples: ["prisma-cli branch list", "prisma-cli branch list --json"]
 	},
-	{
-		id: "branch.show",
-		path: [
-			"prisma",
-			"branch",
-			"show"
-		],
-		description: "Show the Platform branch matching your current Git branch",
-		examples: ["prisma-cli branch show", "prisma-cli branch show --json"]
-	},
-	{
-		id: "branch.use",
-		path: [
-			"prisma",
-			"branch",
-			"use"
-		],
-		description: "Change the local default branch context.",
-		examples: ["prisma-cli branch use", "prisma-cli branch use production"]
-	},
 	{
 		id: "app.build",
 		path: [
@@ -379,7 +359,7 @@ const DESCRIPTORS = [
 		],
 		description: "Manage environment variables for the active project",
 		examples: [
-			"prisma-cli project env list --role production",
+			"prisma-cli project env list",
 			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role production",
 			"prisma-cli project env add DATABASE_URL=postgresql://branch --branch feature/foo",
 			"prisma-cli project env remove STRIPE_KEY --role preview"
@@ -426,6 +406,7 @@ const DESCRIPTORS = [
 		],
 		description: "List environment variable metadata for a scope (no values).",
 		examples: [
+			"prisma-cli project env list",
 			"prisma-cli project env list --role production",
 			"prisma-cli project env list --role preview",
 			"prisma-cli project env list --branch feature/foo"

package/dist/shell/ui.js

@@ -48,6 +48,9 @@ function renderNextSteps(steps) {
 		...steps.map((step) => `- ${step}`)
 	];
 }
+function formatColumns(columns, widths) {
+	return columns.map((value, index) => padDisplay(value, widths[index])).join("   ").trimEnd();
+}
 function wrapText(text, width, indent = "") {
 	return wrapAnsi(text, width, {
 		hard: false,
@@ -74,4 +77,4 @@ function formatHeaderValue(ui, row) {
 	return value;
 }
 //#endregion
-export { createShellUi, maskValue, padDisplay, renderCommandHeader, renderNextSteps, renderSummaryLine, wrapText };
+export { createShellUi, formatColumns, maskValue, padDisplay, renderCommandHeader, renderNextSteps, renderSummaryLine, wrapText };

package/dist/use-cases/branch.js

@@ -1,34 +1,19 @@
 //#region src/use-cases/branch.ts
 function createBranchUseCases(dependencies) {
-	return {
-		list: async () => {
-			const [projectId, activeBranch] = await Promise.all([dependencies.projectStateGateway.readRememberedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
-			const remoteBranches = await listRemoteBranches(dependencies.branchGateway, projectId);
-			return {
-				projectId,
-				projectName: resolveProjectName(dependencies.projectGateway, projectId),
-				activeBranch,
-				branches: buildBranchSummaries(activeBranch, remoteBranches)
-			};
-		},
-		show: async () => {
-			const [projectId, activeBranch] = await Promise.all([dependencies.projectStateGateway.readRememberedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
-			return {
-				projectId,
-				projectName: resolveProjectName(dependencies.projectGateway, projectId),
-				branch: buildBranchDetail(dependencies.branchGateway, projectId, activeBranch)
-			};
-		},
-		use: async (branchName) => {
-			await dependencies.branchStateGateway.writeActiveBranch(branchName);
-			const projectId = await dependencies.projectStateGateway.readRememberedProjectId();
-			return {
-				projectId,
-				projectName: resolveProjectName(dependencies.projectGateway, projectId),
-				branch: buildBranchDetail(dependencies.branchGateway, projectId, branchName)
-			};
-		}
-	};
+	return { list: async () => {
+		const projectId = await dependencies.projectStateGateway.readRememberedProjectId();
+		if (!projectId) return {
+			projectId: "",
+			projectName: "not resolved",
+			branches: []
+		};
+		const remoteBranches = await listRemoteBranches(dependencies.branchGateway, projectId);
+		return {
+			projectId,
+			projectName: resolveProjectName(dependencies.projectGateway, projectId) ?? "not resolved",
+			branches: buildBranchSummaries(remoteBranches)
+		};
+	} };
 }
 function resolveProjectName(projectGateway, projectId) {
 	if (!projectId) return null;
@@ -38,38 +23,13 @@ async function listRemoteBranches(branchGateway, projectId) {
 	if (!projectId) return [];
 	return branchGateway.listBranchesForProject(projectId);
 }
-function buildBranchSummaries(activeBranch, remoteBranches) {
-	const byName = /* @__PURE__ */ new Map();
-	for (const branch of remoteBranches) byName.set(branch.name, {
+function buildBranchSummaries(remoteBranches) {
+	return sortBranches(remoteBranches.map((branch) => ({
 		id: branch.id,
 		name: branch.name,
-		kind: branch.kind,
-		active: activeBranch === branch.name,
-		remoteState: true
-	});
-	if (!byName.has(activeBranch)) byName.set(activeBranch, {
-		id: activeBranch,
-		name: activeBranch,
-		kind: toBranchKind(activeBranch),
-		active: true,
-		remoteState: false
-	});
-	return sortBranches([...byName.values()]);
-}
-function buildBranchDetail(branchGateway, projectId, branchName) {
-	const kind = toBranchKind(branchName);
-	const remoteBranch = projectId ? branchGateway.getBranchForProject(projectId, branchName) : void 0;
-	return {
-		name: branchName,
-		kind,
-		active: true,
-		remoteState: Boolean(remoteBranch),
-		liveDeployment: remoteBranch && remoteBranch.currentDeploymentId ? toLiveDeployment(branchGateway.getDeployment(remoteBranch.currentDeploymentId)) : null
-	};
-}
-function toBranchKind(name) {
-	if (name === "production") return "production";
-	return "preview";
+		role: branch.role,
+		envMap: branch.role
+	})));
 }
 function sortBranches(branches) {
 	return branches.slice().sort((left, right) => {
@@ -80,16 +40,8 @@ function sortBranches(branches) {
 	});
 }
 function branchOrder(branch) {
-	if (branch.name === "production") return 0;
+	if (branch.role === "production") return 0;
 	return 1;
 }
-function toLiveDeployment(deployment) {
-	if (!deployment) return null;
-	return {
-		id: deployment.id,
-		status: deployment.status,
-		url: deployment.url
-	};
-}
 //#endregion
 export { createBranchUseCases };

package/dist/use-cases/create-cli-gateways.js

@@ -29,16 +29,9 @@ function createCliUseCaseGateways(context) {
 			getProjectForWorkspace: (workspaceId, projectId) => context.api.getProjectForWorkspace(workspaceId, projectId)
 		},
 		branchGateway: {
-			listBranchesForProject: (projectId) => context.api.listBranchesForProject(projectId).map((branch) => ({
-				...branch,
-				kind: branch.name === "production" ? "production" : "preview"
-			})),
+			listBranchesForProject: (projectId) => context.api.listBranchesForProject(projectId),
 			getBranchForProject: (projectId, name) => {
-				const branch = context.api.getBranchForProject(projectId, name);
-				return branch ? {
-					...branch,
-					kind: branch.name === "production" ? "production" : "preview"
-				} : void 0;
+				return context.api.getBranchForProject(projectId, name);
 			},
 			getDeployment: (deploymentId) => context.api.getDeployment(deploymentId)
 		},
@@ -55,14 +48,6 @@ function createCliUseCaseGateways(context) {
 			clearAuthSession: async () => {
 				await context.stateStore.clearAuthSession();
 			}
-		},
-		branchStateGateway: {
-			readActiveBranch: async () => {
-				return (await context.stateStore.read()).branch.active;
-			},
-			writeActiveBranch: async (branchName) => {
-				await context.stateStore.setActiveBranch(branchName);
-			}
 		}
 	};
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.56.1",
+  "version": "3.0.0-dev.58.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {