@prisma/cli 3.0.0-dev.62.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/lib/project/resolution.js

@@ -5,8 +5,12 @@ import { readFile } from "node:fs/promises";
 import path from "node:path";
 //#region src/lib/project/resolution.ts
 async function resolveProjectTarget(options) {
+	const localPin = await readImplicitLocalPin(options, { allowEnvProjectId: true });
 	const projects = await options.listProjects();
-	const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: true });
+	const target = await resolveBoundProjectTarget(options, projects, {
+		allowEnvProjectId: true,
+		localPin
+	});
 	if (target) return target;
 	throw await projectSetupRequiredError({
 		cwd: options.context.runtime.cwd,
@@ -16,8 +20,12 @@ async function resolveProjectTarget(options) {
 	});
 }
 async function inspectProjectBinding(options) {
+	const localPin = await readImplicitLocalPin(options, { allowEnvProjectId: false });
 	const projects = await options.listProjects();
-	const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: false });
+	const target = await resolveBoundProjectTarget(options, projects, {
+		allowEnvProjectId: false,
+		localPin
+	});
 	if (target) return target;
 	return {
 		workspace: options.workspace,
@@ -73,6 +81,28 @@ function localStateStaleError() {
 		nextSteps: ["prisma-cli project list", "prisma-cli project link <id-or-name>"]
 	});
 }
+function localProjectWorkspaceMismatchError(options) {
+	return new CliError({
+		code: "LOCAL_PROJECT_WORKSPACE_MISMATCH",
+		domain: "project",
+		summary: "Project link uses another workspace",
+		why: `${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} links this directory to project ${options.pinnedProjectId} in workspace ${options.pinnedWorkspaceId}, but your current CLI session is workspace "${options.activeWorkspace.name}" (${options.activeWorkspace.id}).`,
+		fix: "Sign in to the linked workspace, or relink this directory to a project in the current workspace.",
+		meta: {
+			pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
+			pinnedWorkspaceId: options.pinnedWorkspaceId,
+			pinnedProjectId: options.pinnedProjectId,
+			activeWorkspaceId: options.activeWorkspace.id,
+			activeWorkspaceName: options.activeWorkspace.name
+		},
+		exitCode: 1,
+		nextSteps: [
+			"prisma-cli auth login",
+			"prisma-cli project list",
+			"prisma-cli project link <id-or-name>"
+		]
+	});
+}
 async function buildProjectSetupSuggestion(options) {
 	const suggestedName = await inferTargetName(options.cwd, options.signal);
 	const candidates = sortProjects(options.projects.filter((project) => projectMatchesSuggestedName(project, suggestedName.name))).map(toProjectSummary);
@@ -192,10 +222,15 @@ async function resolveBoundProjectTarget(options, projects, settings) {
 			targetNameSource: "env"
 		});
 	}
-	const localPin = await readLocalResolutionPin(options.context.runtime.cwd, options.context.runtime.signal);
+	const localPin = settings.localPin;
+	if (!localPin) return null;
 	if (localPin.kind === "invalid") throw localStateStaleError();
 	if (localPin.kind === "present") {
-		if (localPin.pin.workspaceId !== options.workspace.id) throw localStateStaleError();
+		if (localPin.pin.workspaceId !== options.workspace.id) throw localProjectWorkspaceMismatchError({
+			pinnedWorkspaceId: localPin.pin.workspaceId,
+			pinnedProjectId: localPin.pin.projectId,
+			activeWorkspace: options.workspace
+		});
 		const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
 		if (!project) throw localStateStaleError();
 		return resolvedTarget(options.workspace, project, "local-pin", {
@@ -210,6 +245,16 @@ async function resolveBoundProjectTarget(options, projects, settings) {
 	});
 	return null;
 }
+async function readImplicitLocalPin(options, settings) {
+	if (options.explicitProject || settings.allowEnvProjectId && options.envProjectId) return null;
+	const localPin = await readLocalResolutionPin(options.context.runtime.cwd, options.context.runtime.signal);
+	if (localPin.kind === "present" && localPin.pin.workspaceId !== options.workspace.id) throw localProjectWorkspaceMismatchError({
+		pinnedWorkspaceId: localPin.pin.workspaceId,
+		pinnedProjectId: localPin.pin.projectId,
+		activeWorkspace: options.workspace
+	});
+	return localPin;
+}
 function resolvedTarget(workspace, project, projectSource, resolutionDetails) {
 	return {
 		workspace,