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

package/dist/presenters/project.js

@@ -1,25 +1,25 @@
-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 { renderList, renderMutate, renderShow, serializeList } from "../output/patterns.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
 function renderProjectList(context, descriptor, result) {
-	const lines = renderList({
-		title: "Listing projects for the authenticated workspace.",
-		descriptor,
-		parentContext: {
-			key: "workspace",
-			value: result.workspace.name
-		},
-		items: result.projects.map((project) => ({
-			noun: "project",
-			label: project.name,
-			id: project.id,
-			status: null
-		})),
-		emptyMessage: "No projects found."
-	}, context.ui);
+	const ui = context.ui;
+	const rail = ui.dim("│");
+	const lines = [`${ui.strong(formatDescriptorLabel(descriptor))} ${ui.dim("→")} ${ui.dim("Listing projects for the authenticated workspace.")}`, ""];
+	lines.push(`${rail}  ${ui.accent("workspace:")}  ${result.workspace.name}`);
+	if (result.projects.length === 0) {
+		lines.push(`${rail}  ${ui.dim("No projects found.")}`);
+		if (result.localBinding?.status === "not-linked" || result.localBinding?.status === "invalid") lines.push(...renderNextSteps(["Link an existing Project you choose: prisma-cli project link <id-or-name>", "Create a new Project: prisma-cli project create <name>"]));
+		return lines;
+	}
+	const nameWidth = Math.max(4, ...result.projects.map((project) => stringWidth(project.name)));
+	lines.push(rail);
+	lines.push(`${rail}  ${ui.accent(padDisplay("name", nameWidth))}  ${ui.accent("id")}`);
+	for (const project of result.projects) lines.push(`${rail}  ${padDisplay(project.name, nameWidth)}  ${project.id}`);
 	if (result.localBinding?.status === "not-linked" || result.localBinding?.status === "invalid") lines.push(...renderNextSteps(["Link an existing Project you choose: prisma-cli project link <id-or-name>", "Create a new Project: prisma-cli project create <name>"]));
 	return lines;
 }
@@ -51,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;
 	}
@@ -133,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-meta.js

@@ -194,6 +194,8 @@ const DESCRIPTORS = [
 			"prisma-cli app deploy --project proj_123",
 			"prisma-cli app deploy --create-project my-app --yes",
 			"prisma-cli app deploy --app my-app --env DATABASE_URL=postgresql://example",
+			"prisma-cli app deploy --db",
+			"prisma-cli app deploy --db --yes",
 			"prisma-cli app deploy --app my-app --framework nextjs --http-port 3000",
 			"prisma-cli app deploy --branch feat-login --framework hono",
 			"prisma-cli app deploy --prod --yes",
@@ -361,6 +363,7 @@ const DESCRIPTORS = [
 		examples: [
 			"prisma-cli project env list",
 			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role production",
+			"prisma-cli project env add --file .env --role preview",
 			"prisma-cli project env add DATABASE_URL=postgresql://branch --branch feature/foo",
 			"prisma-cli project env remove STRIPE_KEY --role preview"
 		]
@@ -377,7 +380,9 @@ const DESCRIPTORS = [
 		examples: [
 			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role production",
 			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role preview",
+			"prisma-cli project env add --file .env --role preview",
 			"prisma-cli project env add DATABASE_URL=postgresql://branch --branch feature/foo",
+			"prisma-cli project env add --file .env.local --branch feature/foo",
 			"API_URL=https://api.example prisma-cli project env add API_URL --project proj_123 --role preview"
 		]
 	},
@@ -393,6 +398,7 @@ const DESCRIPTORS = [
 		examples: [
 			"prisma-cli project env update STRIPE_KEY=sk_new_xxx --role production",
 			"prisma-cli project env update STRIPE_KEY=sk_new_xxx --role preview",
+			"prisma-cli project env update --file .env --role production",
 			"prisma-cli project env update DATABASE_URL=postgresql://branch --branch feature/foo"
 		]
 	},

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-beta.4",
+  "version": "3.0.0-beta.6",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -36,12 +36,13 @@
   "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",
+    "dotenv": "^17.4.2",
     "magicast": "^0.5.3",
     "open": "^11.0.0",
     "string-width": "^8.2.1",