@prisma/cli 3.0.0-alpha.2 → 3.0.0-alpha.4

package/dist/shell/command-meta.js

@@ -47,7 +47,7 @@ const DESCRIPTORS = [
 	{
 		id: "project",
 		path: ["prisma", "project"],
-		description: "Manage the link between this directory and a Prisma project",
+		description: "Manage and inspect your Prisma projects",
 		examples: ["prisma-cli project list", "prisma-cli project show"]
 	},
 	{
@@ -62,6 +62,12 @@ const DESCRIPTORS = [
 		description: "View your active Platform branches",
 		examples: ["prisma-cli branch list", "prisma-cli branch show"]
 	},
+	{
+		id: "git",
+		path: ["prisma", "git"],
+		description: "Manage Git repository connections for a project",
+		examples: ["prisma-cli git connect", "prisma-cli git disconnect"]
+	},
 	{
 		id: "project.list",
 		path: [
@@ -79,18 +85,32 @@ const DESCRIPTORS = [
 			"project",
 			"show"
 		],
-		description: "Show the Prisma project linked to this directory",
-		examples: ["prisma-cli project show", "prisma-cli project show --json"]
+		description: "Show which project is active for this directory",
+		examples: ["prisma-cli project show", "prisma-cli project show --project proj_123 --json"]
 	},
 	{
-		id: "project.link",
+		id: "git.connect",
 		path: [
 			"prisma",
-			"project",
-			"link"
+			"git",
+			"connect"
+		],
+		description: "Connect the resolved project to a GitHub repository",
+		examples: [
+			"prisma-cli git connect",
+			"prisma-cli git connect git@github.com:prisma/prisma-cli.git",
+			"prisma-cli git connect --project proj_123"
+		]
+	},
+	{
+		id: "git.disconnect",
+		path: [
+			"prisma",
+			"git",
+			"disconnect"
 		],
-		description: "Link this directory to a Prisma project",
-		examples: ["prisma-cli project link", "prisma-cli project link proj_123"]
+		description: "Disconnect the GitHub repository from the resolved project",
+		examples: ["prisma-cli git disconnect", "prisma-cli git disconnect --project proj_123"]
 	},
 	{
 		id: "branch.list",
@@ -99,7 +119,7 @@ const DESCRIPTORS = [
 			"branch",
 			"list"
 		],
-		description: "List active Platform branches linked to this project",
+		description: "List active Platform branches for the resolved project",
 		examples: ["prisma-cli branch list", "prisma-cli branch list --json"]
 	},
 	{
@@ -260,6 +280,68 @@ const DESCRIPTORS = [
 		],
 		description: "Remove the app from the current branch",
 		examples: ["prisma-cli app remove --app hello-world", "prisma-cli app remove --app hello-world --yes"]
+	},
+	{
+		id: "project.env",
+		path: [
+			"prisma",
+			"project",
+			"env"
+		],
+		description: "Manage environment variables for the active project",
+		examples: [
+			"prisma-cli project env list --role production",
+			"prisma-cli project env add STRIPE_KEY=sk_test_xxx --role production",
+			"prisma-cli project env rm STRIPE_KEY --role preview"
+		]
+	},
+	{
+		id: "project.env.add",
+		path: [
+			"prisma",
+			"project",
+			"env",
+			"add"
+		],
+		description: "Create a new environment variable.",
+		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",
+			"API_URL=https://api.example prisma-cli project env add API_URL --project proj_123 --role preview"
+		]
+	},
+	{
+		id: "project.env.update",
+		path: [
+			"prisma",
+			"project",
+			"env",
+			"update"
+		],
+		description: "Replace an existing environment variable's value.",
+		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"]
+	},
+	{
+		id: "project.env.list",
+		path: [
+			"prisma",
+			"project",
+			"env",
+			"list"
+		],
+		description: "List environment variable metadata for a scope (no values).",
+		examples: ["prisma-cli project env list --role production", "prisma-cli project env list --role preview"]
+	},
+	{
+		id: "project.env.rm",
+		path: [
+			"prisma",
+			"project",
+			"env",
+			"rm"
+		],
+		description: "Remove an environment variable from a scope.",
+		examples: ["prisma-cli project env rm STRIPE_KEY --role production", "prisma-cli project env rm STRIPE_KEY --role preview"]
 	}
 ];
 const DESCRIPTORS_BY_ID = new Map(DESCRIPTORS.map((descriptor) => [descriptor.id, descriptor]));

package/dist/shell/command-runner.js

@@ -1,8 +1,8 @@
 import { CliError } from "./errors.js";
+import { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess } from "./output.js";
 import { getCommandDescriptor } from "./command-meta.js";
 import { resolveGlobalFlags } from "./global-flags.js";
 import { createCommandContext } from "./runtime.js";
-import { writeHumanError, writeHumanLines, writeJsonError, writeJsonSuccess } from "./output.js";
 //#region src/shell/command-runner.ts
 async function runCommand(runtime, commandName, options, handler, presenter) {
 	const flags = resolveGlobalFlags(runtime.argv, options);
@@ -29,5 +29,35 @@ async function runCommand(runtime, commandName, options, handler, presenter) {
 		throw error;
 	}
 }
+async function runStreamingCommand(runtime, commandName, options, handler) {
+	const flags = resolveGlobalFlags(runtime.argv, options);
+	const context = await createCommandContext(runtime, flags);
+	try {
+		await handler(context);
+		if (flags.json) writeJsonEvent(context.output, {
+			type: "success",
+			command: commandName,
+			timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+			result: null,
+			warnings: [],
+			nextSteps: []
+		});
+	} catch (error) {
+		if (error instanceof CliError) {
+			if (flags.json) writeJsonEvent(context.output, {
+				type: "error",
+				command: commandName,
+				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+				error: cliErrorToJson(error),
+				warnings: [],
+				nextSteps: error.nextSteps
+			});
+			else writeHumanError(context.output, context.ui, error, { trace: flags.trace });
+			process.exitCode = error.exitCode;
+			return;
+		}
+		throw error;
+	}
+}
 //#endregion
-export { runCommand };
+export { runCommand, runStreamingCommand };

package/dist/shell/errors.js

@@ -51,6 +51,9 @@ function authRequiredError(nextSteps = ["prisma-cli auth login"]) {
 		nextSteps
 	});
 }
+function workspaceRequiredError() {
+	return usageError("Workspace required", "This command needs an active workspace, but the authenticated session does not have one.", "Run prisma-cli auth login and choose a workspace.", ["prisma-cli auth login"], "auth");
+}
 function featureUnavailableError(summary, why, fix, nextSteps = [], domain = "cli") {
 	return new CliError({
 		code: "FEATURE_UNAVAILABLE",
@@ -63,4 +66,4 @@ function featureUnavailableError(summary, why, fix, nextSteps = [], domain = "cl
 	});
 }
 //#endregion
-export { CliError, authRequiredError, featureUnavailableError, usageError };
+export { CliError, authRequiredError, featureUnavailableError, usageError, workspaceRequiredError };

package/dist/shell/help.js

@@ -1,6 +1,6 @@
+import { createShellUi, padDisplay, wrapText } from "./ui.js";
 import { formatDescriptorLabel, getDescriptorForCommand } from "./command-meta.js";
 import { COMPACT_GLOBAL_OPTION_FLAGS, resolveGlobalFlags } from "./global-flags.js";
-import { createShellUi, padDisplay, wrapText } from "./ui.js";
 //#region src/shell/help.ts
 function renderHelp(command, runtime) {
 	const descriptor = getDescriptorForCommand(command);

package/dist/shell/output.js

@@ -6,21 +6,27 @@ function writeJsonSuccess(output, success) {
 		...success
 	}, null, 2)}\n`);
 }
+function writeJsonEvent(output, event) {
+	output.stdout.write(`${JSON.stringify(event)}\n`);
+}
+function cliErrorToJson(error) {
+	return {
+		code: error.code,
+		domain: error.domain,
+		severity: error.severity,
+		summary: error.summary,
+		why: error.why,
+		fix: error.fix,
+		where: error.where,
+		meta: error.meta,
+		docsUrl: error.docsUrl
+	};
+}
 function writeJsonError(output, command, error) {
 	output.stdout.write(`${JSON.stringify({
 		ok: false,
 		command,
-		error: {
-			code: error.code,
-			domain: error.domain,
-			severity: error.severity,
-			summary: error.summary,
-			why: error.why,
-			fix: error.fix,
-			where: error.where,
-			meta: error.meta,
-			docsUrl: error.docsUrl
-		},
+		error: cliErrorToJson(error),
 		warnings: [],
 		nextSteps: error.nextSteps
 	}, null, 2)}\n`);
@@ -51,4 +57,4 @@ function writeHumanError(output, ui, error, options) {
 	writeHumanLines(output, lines);
 }
 //#endregion
-export { writeHumanError, writeHumanLines, writeJsonError, writeJsonSuccess };
+export { cliErrorToJson, writeHumanError, writeHumanLines, writeJsonError, writeJsonEvent, writeJsonSuccess };

package/dist/shell/runtime.js

@@ -1,6 +1,6 @@
+import { createShellUi } from "./ui.js";
 import { LocalStateStore } from "../adapters/local-state.js";
 import { MockApi } from "../adapters/mock-api.js";
-import { createShellUi } from "./ui.js";
 import { renderHelp } from "./help.js";
 import path from "node:path";
 //#region src/shell/runtime.ts

package/dist/shell/ui.js

@@ -25,6 +25,18 @@ function createShellUi(runtime, flags) {
 		strong: (text) => colors.bold(text)
 	};
 }
+function renderCommandHeader(ui, options) {
+	if (!ui.isTTY) return [];
+	const rows = options.rows ?? [];
+	const lines = [`${ui.strong(options.commandLabel)} ${ui.dim("→")} ${ui.dim(options.description)}`, ""];
+	const rail = ui.dim("│");
+	const keyWidth = rows.length > 0 ? Math.max(...rows.map((row) => stringWidth(`${row.key}:`)), stringWidth("Read more")) : stringWidth("Read more");
+	for (const row of rows) lines.push(`${rail}  ${ui.accent(padDisplay(`${row.key}:`, keyWidth))}  ${formatHeaderValue(ui, row)}`);
+	if (rows.length > 0 || options.docsPath) lines.push(rail);
+	if (options.docsPath) lines.push(`${rail}  ${ui.accent(padDisplay("Read more", keyWidth))}  ${ui.link(options.docsPath)}`);
+	lines.push("");
+	return lines;
+}
 function renderSummaryLine(ui, status, text) {
 	return `${status === "success" ? ui.success("✔") : status === "error" ? ui.error("✘") : status === "warning" ? ui.warning("⚠") : ui.info("ℹ")} ${text}`;
 }
@@ -55,5 +67,11 @@ function resolveColorEnabled(runtime, flags, isTTY) {
 	if (runtime.env.NO_COLOR !== void 0) return false;
 	return isTTY;
 }
+function formatHeaderValue(ui, row) {
+	const value = row.sensitive ? maskValue(row.value) : row.value;
+	if (row.tone === "dim") return ui.dim(value);
+	if (row.tone === "link") return ui.link(value);
+	return value;
+}
 //#endregion
-export { createShellUi, maskValue, padDisplay, renderNextSteps, renderSummaryLine, wrapText };
+export { createShellUi, maskValue, padDisplay, renderCommandHeader, renderNextSteps, renderSummaryLine, wrapText };

package/dist/use-cases/auth.js

@@ -40,13 +40,12 @@ function createAuthUseCases(dependencies) {
 	};
 }
 async function resolveCurrentAuthState(dependencies) {
-	const [session, linkedProjectId] = await Promise.all([dependencies.sessionGateway.readAuthSession(), dependencies.projectConfigGateway.readLinkedProjectId()]);
+	const session = await dependencies.sessionGateway.readAuthSession();
 	if (!session) return {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null,
-		linkedProjectId
+		workspace: null
 	};
 	const provider = dependencies.identityGateway.getProvider(session.provider);
 	const user = dependencies.identityGateway.getUser(session.userId);
@@ -55,15 +54,13 @@ async function resolveCurrentAuthState(dependencies) {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null,
-		linkedProjectId
+		workspace: null
 	};
 	return {
 		authenticated: true,
 		provider: provider.id,
-		user,
-		workspace,
-		linkedProjectId
+		user: { email: user.email },
+		workspace
 	};
 }
 //#endregion

package/dist/use-cases/branch.js

@@ -2,41 +2,41 @@
 function createBranchUseCases(dependencies) {
 	return {
 		list: async () => {
-			const [linkedProjectId, activeBranch] = await Promise.all([dependencies.projectConfigGateway.readLinkedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
-			const remoteBranches = await listRemoteBranches(dependencies.branchGateway, linkedProjectId);
+			const [projectId, activeBranch] = await Promise.all([dependencies.projectStateGateway.readRememberedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
+			const remoteBranches = await listRemoteBranches(dependencies.branchGateway, projectId);
 			return {
-				linkedProjectId,
-				projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
+				projectId,
+				projectName: resolveProjectName(dependencies.projectGateway, projectId),
 				activeBranch,
 				branches: buildBranchSummaries(activeBranch, remoteBranches)
 			};
 		},
 		show: async () => {
-			const [linkedProjectId, activeBranch] = await Promise.all([dependencies.projectConfigGateway.readLinkedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
+			const [projectId, activeBranch] = await Promise.all([dependencies.projectStateGateway.readRememberedProjectId(), dependencies.branchStateGateway.readActiveBranch()]);
 			return {
-				linkedProjectId,
-				projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
-				branch: buildBranchDetail(dependencies.branchGateway, linkedProjectId, activeBranch)
+				projectId,
+				projectName: resolveProjectName(dependencies.projectGateway, projectId),
+				branch: buildBranchDetail(dependencies.branchGateway, projectId, activeBranch)
 			};
 		},
 		use: async (branchName) => {
 			await dependencies.branchStateGateway.writeActiveBranch(branchName);
-			const linkedProjectId = await dependencies.projectConfigGateway.readLinkedProjectId();
+			const projectId = await dependencies.projectStateGateway.readRememberedProjectId();
 			return {
-				linkedProjectId,
-				projectName: resolveProjectName(dependencies.projectGateway, linkedProjectId),
-				branch: buildBranchDetail(dependencies.branchGateway, linkedProjectId, branchName)
+				projectId,
+				projectName: resolveProjectName(dependencies.projectGateway, projectId),
+				branch: buildBranchDetail(dependencies.branchGateway, projectId, branchName)
 			};
 		}
 	};
 }
-function resolveProjectName(projectGateway, linkedProjectId) {
-	if (!linkedProjectId) return null;
-	return projectGateway.getProject(linkedProjectId)?.name ?? null;
+function resolveProjectName(projectGateway, projectId) {
+	if (!projectId) return null;
+	return projectGateway.getProject(projectId)?.name ?? null;
 }
-async function listRemoteBranches(branchGateway, linkedProjectId) {
-	if (!linkedProjectId) return [];
-	return branchGateway.listBranchesForProject(linkedProjectId);
+async function listRemoteBranches(branchGateway, projectId) {
+	if (!projectId) return [];
+	return branchGateway.listBranchesForProject(projectId);
 }
 function buildBranchSummaries(activeBranch, remoteBranches) {
 	const byName = /* @__PURE__ */ new Map();
@@ -56,9 +56,9 @@ function buildBranchSummaries(activeBranch, remoteBranches) {
 	});
 	return sortBranches([...byName.values()]);
 }
-function buildBranchDetail(branchGateway, linkedProjectId, branchName) {
+function buildBranchDetail(branchGateway, projectId, branchName) {
 	const kind = toBranchKind(branchName);
-	const remoteBranch = linkedProjectId ? branchGateway.getBranchForProject(linkedProjectId, branchName) : void 0;
+	const remoteBranch = projectId ? branchGateway.getBranchForProject(projectId, branchName) : void 0;
 	return {
 		name: branchName,
 		kind,

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

@@ -1,5 +1,3 @@
-import { UnsafeConfigWriteError, readLinkedProjectId, writeLinkedProjectId } from "../adapters/config.js";
-import { usageError } from "../shell/errors.js";
 //#region src/use-cases/create-cli-gateways.ts
 function createCliUseCaseGateways(context) {
 	return {
@@ -44,17 +42,9 @@ function createCliUseCaseGateways(context) {
 			},
 			getDeployment: (deploymentId) => context.api.getDeployment(deploymentId)
 		},
-		projectConfigGateway: {
-			readLinkedProjectId: () => readLinkedProjectId(context.runtime.cwd),
-			writeLinkedProjectId: async (projectId) => {
-				try {
-					await writeLinkedProjectId(context.runtime.cwd, projectId);
-				} catch (error) {
-					if (error instanceof UnsafeConfigWriteError) throw usageError("Project link requires a writable Prisma config", error.message, "Update prisma.config.ts to use a recognizable project field, or remove it and rerun prisma-cli project link.", ["prisma-cli project link proj_123"], "project");
-					throw error;
-				}
-			}
-		},
+		projectStateGateway: { readRememberedProjectId: async () => {
+			return (await context.stateStore.readLastResolvedProject())?.id ?? null;
+		} },
 		sessionGateway: {
 			readAuthSession: async () => {
 				return (await context.stateStore.read()).auth;

package/dist/use-cases/project.js

@@ -1,4 +1,4 @@
-import { CliError, authRequiredError } from "../shell/errors.js";
+import { authRequiredError } from "../shell/errors.js";
 //#region src/use-cases/project.ts
 function createProjectUseCases(dependencies) {
 	return {
@@ -6,44 +6,9 @@ function createProjectUseCases(dependencies) {
 			const workspace = requireWorkspace(authState);
 			return {
 				workspace,
-				linkedProjectId: authState.linkedProjectId,
 				projects: listSortedWorkspaceProjects(dependencies.projectGateway, workspace.id).map(toProjectSummary)
 			};
 		},
-		show: async (authState) => {
-			if (!authState.linkedProjectId) return {
-				linkedProjectId: null,
-				workspace: null,
-				project: null
-			};
-			if (!authState.authenticated || !authState.workspace) return {
-				linkedProjectId: authState.linkedProjectId,
-				workspace: null,
-				project: null
-			};
-			const project = dependencies.projectGateway.getProjectForWorkspace(authState.workspace.id, authState.linkedProjectId);
-			if (!project) return {
-				linkedProjectId: authState.linkedProjectId,
-				workspace: null,
-				project: null
-			};
-			return {
-				linkedProjectId: authState.linkedProjectId,
-				workspace: authState.workspace,
-				project: toProjectSummary(project)
-			};
-		},
-		link: async (authState, projectId) => {
-			const workspace = requireWorkspace(authState);
-			const project = dependencies.projectGateway.getProjectForWorkspace(workspace.id, projectId);
-			if (!project) throw projectNotFoundError(`The project "${projectId}" does not exist in workspace "${workspace.name}".`, "Run prisma-cli project list and choose a project id from the active workspace.");
-			await dependencies.projectConfigGateway.writeLinkedProjectId(project.id);
-			return {
-				linkedProjectId: project.id,
-				workspace,
-				project: toProjectSummary(project)
-			};
-		},
 		listProjectsForWorkspace: async (workspaceId) => listSortedWorkspaceProjects(dependencies.projectGateway, workspaceId).map(toProjectSummary)
 	};
 }
@@ -60,16 +25,5 @@ function toProjectSummary(project) {
 		name: project.name
 	};
 }
-function projectNotFoundError(why, fix, nextSteps = ["prisma-cli project list"]) {
-	return new CliError({
-		code: "PROJECT_NOT_FOUND",
-		domain: "project",
-		summary: "Project not found",
-		why,
-		fix,
-		exitCode: 1,
-		nextSteps
-	});
-}
 //#endregion
-export { createProjectUseCases, projectNotFoundError };
+export { createProjectUseCases };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-alpha.2",
+  "version": "3.0.0-alpha.4",
   "description": "Preview of the unified Prisma CLI.",
   "type": "module",
   "bin": {
@@ -39,7 +39,7 @@
     "@prisma/compute-sdk": "^0.17.0",
     "c12": "4.0.0-beta.4",
     "@prisma/credentials-store": "^7.7.0",
-    "@prisma/management-api-sdk": "^1.24.0",
+    "@prisma/management-api-sdk": "^1.27.0",
     "colorette": "^2.0.20",
     "commander": "^12.1.0",
     "magicast": "^0.3.5",

package/dist/adapters/config.js

@@ -1,74 +0,0 @@
-import path from "node:path";
-import { copyFile, mkdir, mkdtemp, readFile, rm } from "node:fs/promises";
-import os from "node:os";
-import { updateConfig } from "c12/update";
-//#region src/adapters/config.ts
-const PROJECT_FIELD_PATTERN = /project\s*:\s*["']([^"']+)["']/;
-async function readLinkedProjectId(cwd) {
-	const configPath = path.join(cwd, "prisma.config.ts");
-	try {
-		return (await readFile(configPath, "utf8")).match(PROJECT_FIELD_PATTERN)?.[1] ?? null;
-	} catch (error) {
-		if (error.code === "ENOENT") return null;
-		throw error;
-	}
-}
-var UnsafeConfigWriteError = class extends Error {
-	constructor(message) {
-		super(message);
-		this.name = "UnsafeConfigWriteError";
-	}
-};
-async function assertLinkedProjectIdWritable(cwd) {
-	const tempDir = await mkdtemp(path.join(os.tmpdir(), "prisma-cli-config-"));
-	const sourceConfigPath = path.join(cwd, "prisma.config.ts");
-	const tempConfigPath = path.join(tempDir, "prisma.config.ts");
-	try {
-		try {
-			await copyFile(sourceConfigPath, tempConfigPath);
-		} catch (error) {
-			if (error.code !== "ENOENT") throw error;
-		}
-		await applyLinkedProjectIdUpdate(tempDir, "proj_preflight");
-	} catch (error) {
-		throw toUnsafeConfigWriteError(error);
-	} finally {
-		await rm(tempDir, {
-			recursive: true,
-			force: true
-		});
-	}
-}
-async function writeLinkedProjectId(cwd, projectId) {
-	try {
-		await applyLinkedProjectIdUpdate(cwd, projectId);
-	} catch (error) {
-		if (error.code === "ENOENT") {
-			await mkdir(cwd, { recursive: true });
-			await applyLinkedProjectIdUpdate(cwd, projectId);
-			return;
-		}
-		throw toUnsafeConfigWriteError(error);
-	}
-}
-async function applyLinkedProjectIdUpdate(cwd, projectId) {
-	await updateConfig({
-		cwd,
-		configFile: "prisma.config",
-		onUpdate(config) {
-			config.project = projectId;
-		},
-		onCreate() {
-			return renderProjectConfig(projectId);
-		}
-	});
-}
-function renderProjectConfig(projectId) {
-	return `export default {\n  project: "${projectId}",\n};\n`;
-}
-function toUnsafeConfigWriteError(error) {
-	if (error instanceof UnsafeConfigWriteError) return error;
-	return new UnsafeConfigWriteError("The existing prisma.config.ts file could not be updated safely.");
-}
-//#endregion
-export { UnsafeConfigWriteError, assertLinkedProjectIdWritable, readLinkedProjectId, writeLinkedProjectId };