@prisma/cli 3.0.0-dev.63.1 → 3.0.0-dev.65.1

package/dist/adapters/local-state.js

@@ -141,4 +141,4 @@ var LocalStateStore = class {
 	}
 };
 //#endregion
-export { LocalStateStore };
+export { LocalStateStore, resolveLocalStateFilePath };

package/dist/cli2.js

@@ -1,6 +1,6 @@
 import { CliError } from "./shell/errors.js";
 import { createShellUi } from "./shell/ui.js";
-import { writeHumanError, writeJsonError, writeJsonSuccess } from "./shell/output.js";
+import { formatUnexpectedError, writeHumanError, writeJsonError, writeJsonSuccess } from "./shell/output.js";
 import { attachCommandDescriptor } from "./shell/command-meta.js";
 import { addCompactGlobalFlags } from "./shell/global-flags.js";
 import { configureRuntimeCommand, createCommandContext } from "./shell/runtime.js";
@@ -33,8 +33,7 @@ async function runCli(options = {}) {
 		return process.exitCode ?? 0;
 	} catch (error) {
 		if (error instanceof CommanderError) return error.code === "commander.helpDisplayed" ? 0 : 2;
-		const message = error instanceof Error ? error.stack ?? error.message : String(error);
-		runtime.stderr.write(`${message}\n`);
+		runtime.stderr.write(formatUnexpectedError(error, runtime.argv.includes("--trace")));
 		return 1;
 	} finally {
 		runtime.stdin;

package/dist/controllers/app-env-file.js

@@ -2,7 +2,7 @@ import { CliError } from "../shell/errors.js";
 import { formatScopeLabel } from "../lib/app/env-config.js";
 import { apiCallError, findVariableByNaturalKey, toMetadata } from "./app-env-api.js";
 //#region src/controllers/app-env-file.ts
-async function runEnvAddFile(context, client, projectId, resolved, filePath, assignments) {
+async function runEnvAddFile(context, client, projectId, resolved, filePath, assignments, verboseContext) {
 	const existing = await findVariablesByNaturalKey(client, projectId, assignments.map((assignment) => assignment.key), resolved, context.runtime.signal);
 	const existingKeys = assignments.map((assignment) => assignment.key).filter((key) => existing.has(key));
 	if (existingKeys.length > 0) throw new CliError({
@@ -40,6 +40,7 @@ async function runEnvAddFile(context, client, projectId, resolved, filePath, ass
 		command: "project.env.add",
 		result: {
 			projectId,
+			verboseContext,
 			scope: resolved.descriptor,
 			variables,
 			file: {
@@ -51,7 +52,7 @@ async function runEnvAddFile(context, client, projectId, resolved, filePath, ass
 		nextSteps: []
 	};
 }
-async function runEnvUpdateFile(context, client, projectId, resolved, filePath, assignments) {
+async function runEnvUpdateFile(context, client, projectId, resolved, filePath, assignments, verboseContext) {
 	const existing = await findVariablesByNaturalKey(client, projectId, assignments.map((assignment) => assignment.key), resolved, context.runtime.signal);
 	const missingKeys = assignments.map((assignment) => assignment.key).filter((key) => !existing.has(key));
 	if (missingKeys.length > 0) throw new CliError({
@@ -87,6 +88,7 @@ async function runEnvUpdateFile(context, client, projectId, resolved, filePath,
 		command: "project.env.update",
 		result: {
 			projectId,
+			verboseContext,
 			scope: resolved.descriptor,
 			variables,
 			file: {

package/dist/controllers/app-env.js

@@ -17,12 +17,12 @@ async function runEnvAdd(context, rawAssignment, flags) {
 	});
 	if (!scope) throw usageError(`prisma-cli project env add requires --role or --branch`, "Writing without an explicit scope is rejected.", "Pass --role production, --role preview, or --branch <git-name>.", ["prisma-cli project env add KEY=value --role production"], "app");
 	const input = await resolveEnvWriteInput(context, source, "add");
-	const { client, projectId } = await requireClientAndProject(context, flags.projectRef, "project env add");
+	const { client, projectId, verboseContext } = await requireClientAndProject(context, flags.projectRef, "project env add");
 	const resolved = await resolveScopeToApi(client, projectId, scope, {
 		createBranchIfMissing: true,
 		signal: context.runtime.signal
 	});
-	if (input.kind === "file") return runEnvAddFile(context, client, projectId, resolved, input.filePath, input.assignments);
+	if (input.kind === "file") return runEnvAddFile(context, client, projectId, resolved, input.filePath, input.assignments, verboseContext);
 	if (await findVariableByNaturalKey(client, projectId, input.key, resolved, context.runtime.signal)) throw new CliError({
 		code: "ENV_VARIABLE_ALREADY_EXISTS",
 		domain: "app",
@@ -33,10 +33,6 @@ async function runEnvAdd(context, rawAssignment, flags) {
 		nextSteps: [`prisma-cli project env update ${input.key}=<new-value> ${formatScopeFlag(scope)}`]
 	});
 	const warnings = scope.kind === "branch" && !await findVariableByNaturalKey(client, projectId, input.key, {
-		scope: {
-			kind: "role",
-			role: "preview"
-		},
 		descriptor: {
 			kind: "role",
 			role: "preview"
@@ -61,6 +57,7 @@ async function runEnvAdd(context, rawAssignment, flags) {
 		command: "project.env.add",
 		result: {
 			projectId,
+			verboseContext,
 			scope: resolved.descriptor,
 			variable: toMetadata(data.data, resolved.descriptor)
 		},
@@ -76,12 +73,12 @@ async function runEnvUpdate(context, rawAssignment, flags) {
 	});
 	if (!scope) throw usageError(`prisma-cli project env update requires --role or --branch`, "Writing without an explicit scope is rejected.", "Pass --role production, --role preview, or --branch <git-name>.", ["prisma-cli project env update KEY=value --role production"], "app");
 	const input = await resolveEnvWriteInput(context, source, "update");
-	const { client, projectId } = await requireClientAndProject(context, flags.projectRef, "project env update");
+	const { client, projectId, verboseContext } = await requireClientAndProject(context, flags.projectRef, "project env update");
 	const resolved = await resolveScopeToApi(client, projectId, scope, {
 		createBranchIfMissing: false,
 		signal: context.runtime.signal
 	});
-	if (input.kind === "file") return runEnvUpdateFile(context, client, projectId, resolved, input.filePath, input.assignments);
+	if (input.kind === "file") return runEnvUpdateFile(context, client, projectId, resolved, input.filePath, input.assignments, verboseContext);
 	const existing = await findVariableByNaturalKey(client, projectId, input.key, resolved, context.runtime.signal);
 	if (!existing) throw new CliError({
 		code: "ENV_VARIABLE_NOT_FOUND",
@@ -102,6 +99,7 @@ async function runEnvUpdate(context, rawAssignment, flags) {
 		command: "project.env.update",
 		result: {
 			projectId,
+			verboseContext,
 			scope: resolved.descriptor,
 			variable: toMetadata(data.data, resolved.descriptor)
 		},
@@ -140,8 +138,8 @@ async function runEnvList(context, flags) {
 		requireExplicit: false,
 		command: "list"
 	});
-	const { client, projectId } = await requireClientAndProject(context, flags.projectRef, "project env list");
-	const resolved = await resolveListScopeToApi(client, projectId, explicit, {
+	const { client, projectId, verboseContext } = await requireClientAndProject(context, flags.projectRef, "project env list");
+	const resolved = await resolveListScopeToApi(client, projectId, explicit ?? void 0, {
 		cwd: context.runtime.cwd,
 		signal: context.runtime.signal
 	});
@@ -154,6 +152,7 @@ async function runEnvList(context, flags) {
 		command: "project.env.list",
 		result: {
 			projectId,
+			verboseContext,
 			scope: resolved.descriptor,
 			target: resolved.target,
 			variables: variables.map((row) => toMetadata(row, resolved.descriptor))
@@ -169,7 +168,7 @@ async function runEnvRemove(context, key, flags) {
 		command: "remove"
 	});
 	if (!scope) throw usageError("prisma-cli project env remove requires --role or --branch", "Writing without an explicit scope is rejected.", "Pass --role production, --role preview, or --branch <git-name>.", [`prisma-cli project env remove ${key} --role production`], "app");
-	const { client, projectId } = await requireClientAndProject(context, flags.projectRef, "project env remove");
+	const { client, projectId, verboseContext } = await requireClientAndProject(context, flags.projectRef, "project env remove");
 	const resolved = await resolveScopeToApi(client, projectId, scope, {
 		createBranchIfMissing: false,
 		signal: context.runtime.signal
@@ -193,6 +192,7 @@ async function runEnvRemove(context, key, flags) {
 		command: "project.env.remove",
 		result: {
 			projectId,
+			verboseContext,
 			scope: resolved.descriptor,
 			key
 		},
@@ -205,15 +205,21 @@ async function requireClientAndProject(context, explicitProject, commandName) {
 	const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 	if (!client) throw authRequiredError(["prisma-cli auth login"]);
 	if (!authState.workspace) throw workspaceRequiredError();
+	const target = await resolveProjectTarget({
+		context,
+		workspace: authState.workspace,
+		explicitProject,
+		listProjects: () => listRealWorkspaceProjects(client, authState.workspace, context.runtime.signal),
+		commandName
+	});
 	return {
 		client,
-		projectId: (await resolveProjectTarget({
-			context,
+		projectId: target.project.id,
+		verboseContext: {
 			workspace: authState.workspace,
-			explicitProject,
-			listProjects: () => listRealWorkspaceProjects(client, authState.workspace, context.runtime.signal),
-			commandName
-		})).project.id
+			project: target.project,
+			resolution: target.resolution
+		}
 	};
 }
 async function resolveScopeToApi(client, projectId, scope, options) {

package/dist/controllers/app.js

@@ -7,7 +7,7 @@ import { canPrompt } from "../shell/runtime.js";
 import { confirmPrompt, selectPrompt, textPrompt } from "../shell/prompt.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
 import { readAuthState } from "../lib/auth/auth-ops.js";
-import { parseEnvAssignments } from "../lib/app/env-vars.js";
+import { envVarNames, parseEnvAssignments } from "../lib/app/env-vars.js";
 import { renderDeployOutputRows, renderDeploySettingsPreview } from "../lib/app/deploy-output.js";
 import { readBunPackageEntrypoint, readBunPackageJson } from "../lib/app/bun-project.js";
 import { DEFAULT_LOCAL_DEV_PORT, resolveLocalBuildType, runLocalApp } from "../lib/app/local-dev.js";
@@ -213,6 +213,18 @@ async function runAppDeploy(context, appName, options) {
 				name: deployResult.app.name
 			},
 			deployment: deployResult.deployment,
+			deploySettings: {
+				framework: {
+					key: framework.key,
+					buildType,
+					name: framework.displayName,
+					source: framework.annotation
+				},
+				entrypoint: entrypoint ?? null,
+				httpPort: runtime.port,
+				region: selectedApp.region ?? null,
+				envVars: envVarNames(envVars)
+			},
 			durationMs: deployDurationMs,
 			localPin: localPinResult
 		},
@@ -228,6 +240,7 @@ async function runAppListDeploys(context, appName, projectRef) {
 		command: "app.list-deploys",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: null,
 			deployments: []
 		},
@@ -247,6 +260,7 @@ async function runAppListDeploys(context, appName, projectRef) {
 		command: "app.list-deploys",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -265,6 +279,7 @@ async function runAppShow(context, appName, projectRef) {
 		command: "app.show",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: null,
 			liveDeployment: null,
 			liveUrl: null,
@@ -287,6 +302,7 @@ async function runAppShow(context, appName, projectRef) {
 		command: "app.show",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -360,6 +376,7 @@ async function runAppOpen(context, appName, projectRef) {
 		command: "app.open",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -650,6 +667,7 @@ async function runAppPromote(context, deploymentId, appName, projectRef) {
 		command: "app.promote",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -692,6 +710,7 @@ async function runAppRollback(context, appName, deploymentId, projectRef) {
 		command: "app.rollback",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: deploymentsResult.app.id,
 				name: deploymentsResult.app.name
@@ -720,6 +739,7 @@ async function runAppRemove(context, appName, projectRef) {
 		command: "app.remove",
 		result: {
 			projectId,
+			verboseContext: toAppVerboseContext(target),
 			app: {
 				id: removedApp.id,
 				name: removedApp.name
@@ -1464,10 +1484,19 @@ function toBranchKind(name) {
 }
 function toResultBranch(branch) {
 	return {
+		id: branch.id,
 		name: branch.name,
 		kind: branch.kind
 	};
 }
+function toAppVerboseContext(target) {
+	return {
+		workspace: target.workspace,
+		project: target.project,
+		branch: target.branch,
+		resolution: target.resolution
+	};
+}
 function toBranchDatabaseDeployBranch(branch) {
 	if (!branch.id) throw new Error(`Deploy branch "${branch.name}" was not resolved remotely.`);
 	return {

package/dist/controllers/branch.js

@@ -41,6 +41,11 @@ async function listRealBranches(context) {
 	return {
 		projectId: target.project.id,
 		projectName: target.project.name,
+		verboseContext: {
+			workspace,
+			project: target.project,
+			resolution: target.resolution
+		},
 		branches: sortBranches(branches.map(toBranchSummary))
 	};
 }

package/dist/lib/diagnostics.js

@@ -0,0 +1,15 @@
+import { resolveLocalStateFilePath } from "../adapters/local-state.js";
+import { resolveStateDir } from "../shell/runtime.js";
+import { readLocalGitState } from "./git/local-status.js";
+//#region src/lib/diagnostics.ts
+async function collectCommandDiagnostics(context, options = {}) {
+	const stateDir = resolveStateDir(context.runtime);
+	return {
+		cwd: context.runtime.cwd,
+		stateFilePath: resolveLocalStateFilePath(stateDir),
+		git: await readLocalGitState(context.runtime.cwd, context.runtime.signal),
+		durationMs: options.durationMs
+	};
+}
+//#endregion
+export { collectCommandDiagnostics };

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

@@ -0,0 +1,57 @@
+import { execFile } from "node:child_process";
+//#region src/lib/git/local-status.ts
+async function readLocalGitState(cwd, signal) {
+	signal.throwIfAborted();
+	if ((await runGit(cwd, ["rev-parse", "--is-inside-work-tree"], signal))?.trim() !== "true") return null;
+	const [ref, sha, status] = await Promise.all([
+		runGit(cwd, [
+			"symbolic-ref",
+			"--quiet",
+			"--short",
+			"HEAD"
+		], signal),
+		runGit(cwd, [
+			"rev-parse",
+			"--short",
+			"HEAD"
+		], signal),
+		runGit(cwd, ["status", "--porcelain"], signal)
+	]);
+	return {
+		ref: cleanGitValue(ref),
+		sha: cleanGitValue(sha),
+		dirty: status === null ? null : status.trim().length > 0
+	};
+}
+function runGit(cwd, args, signal) {
+	return new Promise((resolve, reject) => {
+		signal.throwIfAborted();
+		execFile("git", args, {
+			cwd,
+			signal,
+			timeout: 2e3
+		}, (error, stdout) => {
+			if (signal.aborted) {
+				reject(error);
+				return;
+			}
+			if (error) {
+				resolve(null);
+				return;
+			}
+			resolve(stdout);
+		}).on("error", (error) => {
+			if (signal.aborted) {
+				reject(error);
+				return;
+			}
+			resolve(null);
+		});
+	});
+}
+function cleanGitValue(value) {
+	const cleaned = value?.trim();
+	return cleaned ? cleaned : null;
+}
+//#endregion
+export { readLocalGitState };

package/dist/presenters/app-env.js

@@ -1,4 +1,6 @@
+import { renderVerboseBlock } from "../shell/ui.js";
 import { renderList, renderShow, serializeList } from "../output/patterns.js";
+import { renderResolvedProjectContextBlock, stripVerboseContext } from "./verbose-context.js";
 //#region src/presenters/app-env.ts
 function scopeLabel(scope) {
 	if (scope.kind === "role") return scope.role ?? "unknown";
@@ -14,23 +16,102 @@ function listTargetLabel(result) {
 	}
 	return scopeLabel(result.scope);
 }
-function renderEnvAdd(context, descriptor, result) {
-	if (result.variables !== void 0) return renderList({
-		title: "Setting new environment variables from file.",
-		descriptor,
-		parentContext: {
-			key: "target",
-			value: `${scopeLabel(result.scope)} from ${result.file.path}`
+function renderEnvVerboseBlocks(context, result) {
+	return [...renderEnvResolvedContextBlock(context, result.verboseContext), ...renderEnvTargetBlock(context, result)];
+}
+function renderEnvResolvedContextBlock(context, verboseContext) {
+	return renderResolvedProjectContextBlock(context.ui, verboseContext);
+}
+function renderEnvTargetBlock(context, result) {
+	return renderVerboseBlock(context.ui, envTargetRows(result), { title: "Env target" });
+}
+function envTargetRows(result) {
+	return [
+		{
+			key: "project id",
+			value: result.projectId,
+			tone: "dim"
 		},
-		items: result.variables.map((variable) => ({
-			noun: "variable",
-			label: `${variable.key} (${variable.source})`,
-			id: variable.id,
-			status: variable.isManagedBySystem ? "default" : null
-		})),
-		emptyMessage: "No environment variables imported."
-	}, context.ui);
-	return renderShow({
+		{
+			key: "scope",
+			value: scopeLabel(result.scope)
+		},
+		...envListTargetRows(result),
+		...envFileRows(result),
+		{
+			key: "keys",
+			value: formatKeyNames(envResultKeys(result)),
+			tone: envResultKeys(result).length > 0 ? "default" : "dim"
+		}
+	];
+}
+function envListTargetRows(result) {
+	if (!("target" in result)) return [];
+	return [
+		{
+			key: "target source",
+			value: result.target.source
+		},
+		{
+			key: "env map",
+			value: result.target.envMap
+		},
+		...result.target.branchName ? [{
+			key: "branch",
+			value: result.target.branchName
+		}] : [],
+		...result.target.branchId ? [{
+			key: "branch id",
+			value: result.target.branchId,
+			tone: "dim"
+		}] : [],
+		...result.target.branchExists === false ? [{
+			key: "branch state",
+			value: "not created yet",
+			tone: "warning"
+		}] : []
+	];
+}
+function envFileRows(result) {
+	if (!("file" in result) || !result.file) return [];
+	return [{
+		key: "file",
+		value: result.file.path
+	}, {
+		key: "file count",
+		value: String(result.file.count)
+	}];
+}
+function envResultKeys(result) {
+	if ("variables" in result && result.variables) return result.variables.map((variable) => variable.key).sort((left, right) => left.localeCompare(right));
+	if ("variable" in result && result.variable) return [result.variable.key];
+	if ("key" in result) return [result.key];
+	return [];
+}
+function formatKeyNames(keys) {
+	return keys.length > 0 ? keys.join(", ") : "none";
+}
+function renderEnvAdd(context, descriptor, result) {
+	if (result.variables !== void 0) {
+		const lines = renderList({
+			title: "Setting new environment variables from file.",
+			descriptor,
+			parentContext: {
+				key: "target",
+				value: `${scopeLabel(result.scope)} from ${result.file.path}`
+			},
+			items: result.variables.map((variable) => ({
+				noun: "variable",
+				label: `${variable.key} (${variable.source})`,
+				id: variable.id,
+				status: variable.isManagedBySystem ? "default" : null
+			})),
+			emptyMessage: "No environment variables imported."
+		}, context.ui);
+		lines.push(...renderEnvVerboseBlocks(context, result));
+		return lines;
+	}
+	const lines = renderShow({
 		title: "Setting a new environment variable.",
 		descriptor,
 		fields: [
@@ -58,27 +139,33 @@ function renderEnvAdd(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvAdd(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderEnvUpdate(context, descriptor, result) {
-	if (result.variables !== void 0) return renderList({
-		title: "Replacing environment variable values from file.",
-		descriptor,
-		parentContext: {
-			key: "target",
-			value: `${scopeLabel(result.scope)} from ${result.file.path}`
-		},
-		items: result.variables.map((variable) => ({
-			noun: "variable",
-			label: `${variable.key} (${variable.source})`,
-			id: variable.id,
-			status: variable.isManagedBySystem ? "default" : null
-		})),
-		emptyMessage: "No environment variables updated."
-	}, context.ui);
-	return renderShow({
+	if (result.variables !== void 0) {
+		const lines = renderList({
+			title: "Replacing environment variable values from file.",
+			descriptor,
+			parentContext: {
+				key: "target",
+				value: `${scopeLabel(result.scope)} from ${result.file.path}`
+			},
+			items: result.variables.map((variable) => ({
+				noun: "variable",
+				label: `${variable.key} (${variable.source})`,
+				id: variable.id,
+				status: variable.isManagedBySystem ? "default" : null
+			})),
+			emptyMessage: "No environment variables updated."
+		}, context.ui);
+		lines.push(...renderEnvVerboseBlocks(context, result));
+		return lines;
+	}
+	const lines = renderShow({
 		title: "Replacing the environment variable's value.",
 		descriptor,
 		fields: [
@@ -106,12 +193,14 @@ function renderEnvUpdate(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvUpdate(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderEnvList(context, descriptor, result) {
-	return renderList({
+	const lines = renderList({
 		title: "Listing environment variables for the selected scope.",
 		descriptor,
 		parentContext: {
@@ -126,26 +215,29 @@ function renderEnvList(context, descriptor, result) {
 		})),
 		emptyMessage: "No environment variables defined in this scope."
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvList(result) {
+	const serializable = stripVerboseContext(result);
 	return {
-		projectId: result.projectId,
-		scope: result.scope,
-		target: result.target,
+		projectId: serializable.projectId,
+		scope: serializable.scope,
+		target: serializable.target,
 		...serializeList({
-			context: { target: listTargetLabel(result) },
-			items: result.variables.map((variable) => ({
+			context: { target: listTargetLabel(serializable) },
+			items: serializable.variables.map((variable) => ({
 				noun: "variable",
 				label: `${variable.key} (${variable.source})`,
 				id: variable.id,
 				status: variable.isManagedBySystem ? "default" : null
 			}))
 		}),
-		variables: result.variables
+		variables: serializable.variables
 	};
 }
 function renderEnvRm(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Removing the environment variable from the scope.",
 		descriptor,
 		fields: [
@@ -163,9 +255,11 @@ function renderEnvRm(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderEnvVerboseBlocks(context, result));
+	return lines;
 }
 function serializeEnvRm(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 //#endregion
 export { renderEnvAdd, renderEnvList, renderEnvRm, renderEnvUpdate, serializeEnvAdd, serializeEnvList, serializeEnvRm, serializeEnvUpdate };

package/dist/presenters/app.js

@@ -1,6 +1,8 @@
+import { renderVerboseBlock } from "../shell/ui.js";
 import { renderDeployOutputRows } from "../lib/app/deploy-output.js";
 import { formatDomainFailureFix } from "../lib/app/domain-guidance.js";
 import { renderList, renderShow, serializeList } from "../output/patterns.js";
+import { renderResolvedProjectContextBlock, stripVerboseContext } from "./verbose-context.js";
 //#region src/presenters/app.ts
 function renderAppBuild(context, descriptor, result) {
 	return renderShow({
@@ -35,12 +37,18 @@ function renderAppDeploy(context, descriptor, result) {
 		...renderDeployOutputRows(context.ui, [{
 			label: "Logs",
 			value: "prisma-cli app logs"
-		}])
+		}]),
+		...renderDeployResolvedContextBlock(context, result),
+		...renderDeploySettingsBlock(context, result)
 	];
 }
 function serializeAppDeploy(result) {
-	const { localPin: _localPin, ...serialized } = result;
-	return serialized;
+	const { deploySettings: _deploySettings, localPin: _localPin, ...serialized } = result;
+	const { id: _branchId, ...branch } = serialized.branch;
+	return {
+		...serialized,
+		branch
+	};
 }
 function renderBranchDatabaseDeploySummary(context, result) {
 	if (!result.branchDatabase || result.branchDatabase.status !== "created") return [];
@@ -70,8 +78,107 @@ function formatDuration(durationMs) {
 	if (durationMs < 1e3) return `${durationMs}ms`;
 	return `${(durationMs / 1e3).toFixed(1)}s`;
 }
+function renderDeployResolvedContextBlock(context, result) {
+	return renderResolvedProjectContextBlock(context.ui, {
+		workspace: result.workspace,
+		project: result.project,
+		resolution: result.resolution,
+		branch: {
+			id: result.branch.id,
+			name: result.branch.name,
+			kind: result.branch.kind
+		}
+	}, { extraRows: [
+		{
+			key: "app",
+			value: result.app.name
+		},
+		{
+			key: "app id",
+			value: result.app.id,
+			tone: "dim"
+		},
+		{
+			key: "deployment id",
+			value: result.deployment.id,
+			tone: "dim"
+		},
+		{
+			key: "deployment status",
+			value: result.deployment.status
+		},
+		...result.localPin ? [{
+			key: "local pin",
+			value: result.localPin.path
+		}] : [],
+		{
+			key: "deploy duration",
+			value: formatDuration(result.durationMs)
+		}
+	] });
+}
+function renderDeploySettingsBlock(context, result) {
+	return renderVerboseBlock(context.ui, [...deploySettingsRows(result.deploySettings), ...branchDatabaseRows(result.branchDatabase)], { title: "Deploy settings" });
+}
+function deploySettingsRows(settings) {
+	return [
+		{
+			key: "framework",
+			value: `${settings.framework.name} (${settings.framework.buildType})`
+		},
+		{
+			key: "framework source",
+			value: settings.framework.source,
+			tone: "dim"
+		},
+		{
+			key: "entrypoint",
+			value: settings.entrypoint ?? "derived from build output",
+			tone: settings.entrypoint ? "default" : "dim"
+		},
+		{
+			key: "http port",
+			value: String(settings.httpPort)
+		},
+		{
+			key: "region",
+			value: settings.region ?? "existing app region",
+			tone: settings.region ? "default" : "dim"
+		},
+		{
+			key: "env vars",
+			value: formatEnvVarNames(settings.envVars),
+			tone: settings.envVars.length > 0 ? "default" : "dim"
+		}
+	];
+}
+function branchDatabaseRows(branchDatabase) {
+	if (!branchDatabase) return [{
+		key: "branch db",
+		value: "not configured",
+		tone: "dim"
+	}];
+	return [
+		{
+			key: "branch db",
+			value: branchDatabase.status === "created" ? `created${branchDatabase.database ? ` (${branchDatabase.database.name})` : ""}` : `skipped${branchDatabase.reason ? ` (${branchDatabase.reason})` : ""}`,
+			tone: branchDatabase.status === "created" ? "success" : "dim"
+		},
+		...branchDatabase.envVars.length > 0 ? [{
+			key: "branch db env",
+			value: branchDatabase.envVars.join(", ")
+		}] : [],
+		...branchDatabase.schema ? [{
+			key: "branch db schema",
+			value: `${formatBranchDatabaseSchemaCommand(branchDatabase.schema.command)} (${branchDatabase.schema.source}, ${branchDatabase.schema.path})`
+		}] : []
+	];
+}
+function formatEnvVarNames(envVars) {
+	return envVars.length > 0 ? envVars.join(", ") : "none";
+}
 function renderAppListDeploys(context, descriptor, result) {
-	return renderList({
+	const lines = renderList({
 		title: "Listing deployments for the selected app.",
 		descriptor,
 		parentContext: {
@@ -86,20 +193,23 @@ function renderAppListDeploys(context, descriptor, result) {
 		})),
 		emptyMessage: result.app ? "No deployments found." : "No apps found."
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppListDeploys(result) {
-	if (!result.app) return {
-		projectId: result.projectId,
+	const { verboseContext: _verboseContext, ...serializable } = result;
+	if (!serializable.app) return {
+		projectId: serializable.projectId,
 		app: null,
 		items: [],
 		count: 0
 	};
 	return {
-		projectId: result.projectId,
-		app: result.app,
+		projectId: serializable.projectId,
+		app: serializable.app,
 		...serializeList({
-			context: { app: result.app.name },
-			items: result.deployments.map((deployment) => ({
+			context: { app: serializable.app.name },
+			items: serializable.deployments.map((deployment) => ({
 				noun: "deployment",
 				label: deployment.id,
 				id: deployment.id,
@@ -109,7 +219,7 @@ function serializeAppListDeploys(result) {
 	};
 }
 function renderAppShow(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Showing the selected app state.",
 		descriptor,
 		fields: [
@@ -139,9 +249,11 @@ function renderAppShow(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppShow(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppShowDeploy(context, descriptor, result) {
 	return renderShow({
@@ -183,7 +295,7 @@ function serializeAppShowDeploy(result) {
 	return result;
 }
 function renderAppOpen(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: result.opened ? "Opening the live URL for the selected app." : "Resolving the live URL for the selected app.",
 		descriptor,
 		fields: [
@@ -207,9 +319,11 @@ function renderAppOpen(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppOpen(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppDomainAdd(context, descriptor, result) {
 	return renderShow({
@@ -311,7 +425,7 @@ function serializeAppDomainRetry(result) {
 	return result;
 }
 function renderAppPromote(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Switching the live deployment for the selected app.",
 		descriptor,
 		fields: [
@@ -349,12 +463,14 @@ function renderAppPromote(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppPromote(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppRollback(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Restoring the selected app to an earlier deployment.",
 		descriptor,
 		fields: [
@@ -397,9 +513,11 @@ function renderAppRollback(context, descriptor, result) {
 			}] : []
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppRollback(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function renderAppRun(_context, _descriptor, _result) {
 	return [];
@@ -408,7 +526,7 @@ function serializeAppRun(result) {
 	return result;
 }
 function renderAppRemove(context, descriptor, result) {
-	return renderShow({
+	const lines = renderShow({
 		title: "Removing the selected app.",
 		descriptor,
 		fields: [
@@ -427,9 +545,11 @@ function renderAppRemove(context, descriptor, result) {
 			}
 		]
 	}, context.ui);
+	lines.push(...renderResolvedProjectContextBlock(context.ui, result.verboseContext));
+	return lines;
 }
 function serializeAppRemove(result) {
-	return result;
+	return stripVerboseContext(result);
 }
 function toneForStatus(status) {
 	if (status === "running" || status === "ready" || status === "healthy") return "success";

package/dist/presenters/branch.js

@@ -1,5 +1,6 @@
 import { formatColumns } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
+import { renderResolvedProjectContextBlock } from "./verbose-context.js";
 //#region src/presenters/branch.ts
 function renderBranchList(context, descriptor, result) {
 	const ui = context.ui;
@@ -9,6 +10,7 @@ function renderBranchList(context, descriptor, result) {
 	lines.push(rail);
 	if (result.branches.length === 0) {
 		lines.push(`${rail}  ${ui.dim("No branches found.")}`);
+		lines.push(...renderBranchResolvedContextBlock(context, result));
 		return lines;
 	}
 	const widths = [
@@ -26,14 +28,19 @@ function renderBranchList(context, descriptor, result) {
 		branch.role,
 		branch.envMap
 	], widths)}`);
+	lines.push(...renderBranchResolvedContextBlock(context, result));
 	return lines;
 }
 function serializeBranchList(result) {
+	const { verboseContext: _verboseContext, ...serializable } = result;
 	return {
-		projectId: result.projectId,
-		projectName: result.projectName,
-		branches: result.branches
+		projectId: serializable.projectId,
+		projectName: serializable.projectName,
+		branches: serializable.branches
 	};
 }
+function renderBranchResolvedContextBlock(context, result) {
+	return renderResolvedProjectContextBlock(context.ui, result.verboseContext);
+}
 //#endregion
 export { renderBranchList, serializeBranchList };

package/dist/presenters/project.js

@@ -1,7 +1,8 @@
-import { padDisplay, renderNextSteps, renderSummaryLine } from "../shell/ui.js";
+import { padDisplay, renderNextSteps, renderSummaryLine, renderVerboseBlock } from "../shell/ui.js";
 import { formatDescriptorLabel } from "../shell/command-meta.js";
 import { formatCommandArgument } from "../shell/command-arguments.js";
 import { renderMutate, renderShow, serializeList } from "../output/patterns.js";
+import { renderResolvedProjectContextBlock } from "./verbose-context.js";
 import path from "node:path";
 import stringWidth from "string-width";
 //#region src/presenters/project.ts
@@ -50,6 +51,25 @@ function renderProjectShow(context, descriptor, result) {
 				tone: "warning"
 			}]
 		}, context.ui);
+		lines.push(...renderVerboseBlock(context.ui, [
+			{
+				key: "workspace",
+				value: result.workspace.name
+			},
+			{
+				key: "workspace id",
+				value: result.workspace.id,
+				tone: "dim"
+			},
+			{
+				key: "project source",
+				value: "unbound"
+			},
+			{
+				key: "suggested name",
+				value: `${result.suggestedProjectName} (${result.suggestedProjectNameSource})`
+			}
+		], { title: "Resolved context" }));
 		lines.push(...renderNextSteps(["Link an existing Project you choose: prisma-cli project link <id-or-name>", `Create a new Project: prisma-cli project create ${formatCommandArgument(result.suggestedProjectName)}`]));
 		return lines;
 	}
@@ -132,6 +152,11 @@ function renderBoundProjectShow(context, descriptor, result) {
 		lines.push(rail);
 		lines.push(`${rail}  ${ui.dim("→")} ${ui.link(result.project.url)}`);
 	}
+	lines.push(...renderResolvedProjectContextBlock(context.ui, {
+		workspace: result.workspace,
+		project: result.project,
+		resolution: result.resolution
+	}));
 	return lines;
 }
 function formatLocalRepoPath(cwd, env) {

package/dist/presenters/verbose-context.js

@@ -0,0 +1,64 @@
+import { renderVerboseBlock } from "../shell/ui.js";
+//#region src/presenters/verbose-context.ts
+function renderResolvedProjectContextBlock(ui, context, options = {}) {
+	if (!context) return [];
+	return renderVerboseBlock(ui, [...projectResolutionRows(context), ...options.extraRows ?? []], { title: options.title ?? "Resolved context" });
+}
+function projectResolutionRows(context) {
+	return [
+		{
+			key: "workspace",
+			value: context.workspace.name
+		},
+		{
+			key: "workspace id",
+			value: context.workspace.id,
+			tone: "dim"
+		},
+		{
+			key: "project",
+			value: context.project.name
+		},
+		{
+			key: "project id",
+			value: context.project.id,
+			tone: "dim"
+		},
+		{
+			key: "project source",
+			value: formatProjectSource(context.resolution.projectSource)
+		},
+		...context.resolution.targetName ? [{
+			key: "target name",
+			value: formatTargetName(context.resolution)
+		}] : [],
+		...context.branch ? [{
+			key: "branch",
+			value: `${context.branch.name} (${context.branch.kind})`
+		}, ...context.branch.id ? [{
+			key: "branch id",
+			value: context.branch.id,
+			tone: "dim"
+		}] : []] : []
+	];
+}
+function stripVerboseContext(result) {
+	const { verboseContext: _verboseContext, ...serialized } = result;
+	return serialized;
+}
+function formatProjectSource(source) {
+	switch (source) {
+		case "explicit": return "--project";
+		case "env": return "environment";
+		case "local-pin": return ".prisma/local.json";
+		case "platform-mapping": return "platform mapping";
+		case "created": return "created";
+		case "prompt": return "prompt";
+		case "unbound": return "unbound";
+	}
+}
+function formatTargetName(resolution) {
+	return resolution.targetNameSource ? `${resolution.targetName} (${resolution.targetNameSource})` : String(resolution.targetName);
+}
+//#endregion
+export { renderResolvedProjectContextBlock, stripVerboseContext };

package/dist/shell/command-runner.js

@@ -3,6 +3,8 @@ import { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, write
 import { getCommandDescriptor } from "./command-meta.js";
 import { resolveGlobalFlags } from "./global-flags.js";
 import { createCommandContext } from "./runtime.js";
+import { collectCommandDiagnostics } from "../lib/diagnostics.js";
+import { renderCommandDiagnostics } from "./diagnostics-output.js";
 import { AuthError } from "@prisma/management-api-sdk";
 //#region src/shell/command-runner.ts
 function toCliError(error, runtime) {
@@ -19,6 +21,7 @@ async function runCommand(runtime, commandName, options, handler, presenter) {
 	const flags = resolveGlobalFlags(runtime.argv, options);
 	const context = await createCommandContext(runtime, flags);
 	const descriptor = getCommandDescriptor(commandName);
+	const startedAt = Date.now();
 	try {
 		const success = await handler(context);
 		if (flags.json) {
@@ -29,7 +32,12 @@ async function runCommand(runtime, commandName, options, handler, presenter) {
 			return;
 		}
 		if (flags.quiet) return;
-		writeHumanLines(context.output, presenter.renderHuman(context, descriptor, success.result));
+		const rendered = presenter.renderHuman(context, descriptor, success.result);
+		const diagnostics = await renderBestEffortCommandDiagnostics(context, {
+			enabled: flags.verbose && rendered.length > 0,
+			durationMs: Date.now() - startedAt
+		});
+		writeHumanLines(context.output, [...rendered, ...diagnostics]);
 	} catch (error) {
 		const cliError = toCliError(error, runtime);
 		if (cliError) {
@@ -41,6 +49,14 @@ async function runCommand(runtime, commandName, options, handler, presenter) {
 		throw error;
 	}
 }
+async function renderBestEffortCommandDiagnostics(context, options) {
+	if (!options.enabled) return [];
+	try {
+		return renderCommandDiagnostics(context, await collectCommandDiagnostics(context, { durationMs: options.durationMs }));
+	} catch {
+		return [];
+	}
+}
 async function runStreamingCommand(runtime, commandName, options, handler) {
 	const flags = resolveGlobalFlags(runtime.argv, options);
 	const context = await createCommandContext(runtime, flags);

package/dist/shell/diagnostics-output.js

@@ -0,0 +1,63 @@
+import { renderVerboseBlock } from "./ui.js";
+import path from "node:path";
+//#region src/shell/diagnostics-output.ts
+function renderCommandDiagnostics(context, diagnostics, rows = [], options = {}) {
+	if (!diagnostics) return [];
+	const { env } = context.runtime;
+	const git = diagnostics.git;
+	return renderVerboseBlock(context.ui, [
+		...rows,
+		...diagnostics.durationMs === void 0 ? [] : [{
+			key: "duration",
+			value: formatDuration(diagnostics.durationMs)
+		}],
+		{
+			key: "cwd",
+			value: formatLocalPath(diagnostics.cwd, env)
+		},
+		{
+			key: "state file",
+			value: formatLocalPath(diagnostics.stateFilePath, env)
+		},
+		...git ? [
+			{
+				key: "git ref",
+				value: git.ref ?? "detached",
+				tone: git.ref ? "default" : "dim"
+			},
+			{
+				key: "git sha",
+				value: git.sha ?? "unknown",
+				tone: git.sha ? "default" : "dim"
+			},
+			{
+				key: "git dirty",
+				value: formatDirtyState(git.dirty),
+				tone: git.dirty ? "warning" : "dim"
+			}
+		] : [{
+			key: "git",
+			value: "not detected",
+			tone: "dim"
+		}]
+	], { title: options.title ?? "Local context" });
+}
+function formatLocalPath(value, env) {
+	const resolved = path.resolve(value);
+	const home = env.HOME ? path.resolve(env.HOME) : null;
+	if (home && (resolved === home || resolved.startsWith(`${home}${path.sep}`))) {
+		const relative = path.relative(home, resolved);
+		return relative ? `~/${relative}` : "~";
+	}
+	return resolved;
+}
+function formatDirtyState(dirty) {
+	if (dirty === null) return "unknown";
+	return dirty ? "yes" : "no";
+}
+function formatDuration(durationMs) {
+	if (durationMs < 1e3) return `${durationMs}ms`;
+	return `${(durationMs / 1e3).toFixed(1)}s`;
+}
+//#endregion
+export { renderCommandDiagnostics };

package/dist/shell/output.js

@@ -23,6 +23,15 @@ function cliErrorToJson(error) {
 		docsUrl: error.docsUrl
 	};
 }
+function formatUnexpectedError(error, trace) {
+	const debug = error instanceof Error ? error.stack ?? error.message : String(error);
+	if (trace) return `${debug}\n`;
+	return [
+		`Unexpected CLI error: ${error instanceof Error && error.message ? error.message : String(error)}`,
+		"More: Re-run with --trace for deeper diagnostics",
+		""
+	].join("\n");
+}
 function writeJsonError(output, command, error) {
 	output.stdout.write(`${JSON.stringify({
 		ok: false,
@@ -70,4 +79,4 @@ function writeHumanError(output, ui, error, options) {
 	writeHumanLines(output, lines);
 }
 //#endregion
-export { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess };
+export { cliErrorToJson, formatUnexpectedError, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess };

package/dist/shell/runtime.js

@@ -48,4 +48,4 @@ function canPrompt(context) {
 	return Boolean(context.runtime.stdin.isTTY && context.runtime.stderr.isTTY);
 }
 //#endregion
-export { canPrompt, configureRuntimeCommand, createCommandContext };
+export { canPrompt, configureRuntimeCommand, createCommandContext, resolveStateDir };

package/dist/shell/ui.js

@@ -48,6 +48,17 @@ function renderNextSteps(steps) {
 		...steps.map((step) => `- ${step}`)
 	];
 }
+function renderVerboseBlock(ui, rows, options = {}) {
+	if (!ui.verbose || rows.length === 0) return [];
+	const title = options.title ?? "Details";
+	const keyWidth = Math.max(...rows.map((row) => stringWidth(`${row.key}:`)));
+	const rail = ui.dim("│");
+	return [
+		"",
+		`${ui.dim(title)}:`,
+		...rows.map((row) => `${rail}  ${ui.accent(padDisplay(`${row.key}:`, keyWidth))}  ${formatVerboseValue(ui, row)}`)
+	];
+}
 function formatColumns(columns, widths) {
 	return columns.map((value, index) => padDisplay(value, widths[index])).join("   ").trimEnd();
 }
@@ -76,5 +87,13 @@ function formatHeaderValue(ui, row) {
 	if (row.tone === "link") return ui.link(value);
 	return value;
 }
+function formatVerboseValue(ui, row) {
+	const value = row.sensitive ? maskValue(row.value) : row.value;
+	if (row.tone === "dim") return ui.dim(value);
+	if (row.tone === "success") return ui.success(value);
+	if (row.tone === "warning") return ui.warning(value);
+	if (row.tone === "link") return ui.link(value);
+	return value;
+}
 //#endregion
-export { createShellUi, formatColumns, maskValue, padDisplay, renderCommandHeader, renderNextSteps, renderSummaryLine, wrapText };
+export { createShellUi, formatColumns, maskValue, padDisplay, renderCommandHeader, renderNextSteps, renderSummaryLine, renderVerboseBlock, wrapText };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.63.1",
+  "version": "3.0.0-dev.65.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -36,9 +36,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@clack/prompts": "^1.5.0",
-    "@prisma/compute-sdk": "^0.20.0",
+    "@prisma/compute-sdk": "^0.21.0",
     "@prisma/credentials-store": "^7.8.0",
-    "@prisma/management-api-sdk": "^1.35.0",
+    "@prisma/management-api-sdk": "^1.37.0",
     "c12": "4.0.0-beta.5",
     "colorette": "^2.0.20",
     "commander": "^14.0.3",