@prisma/cli 3.0.0-dev.42.1 → 3.0.0-dev.46.1

package/dist/commands/project/index.js

@@ -31,10 +31,10 @@ function createProjectCreateCommand(runtime) {
 }
 function createProjectLinkCommand(runtime) {
 	const command = attachCommandDescriptor(configureRuntimeCommand(new Command("link"), runtime), "project.link");
-	command.argument("<id-or-name>", "Project id or name");
+	command.argument("[id-or-name]", "Project id or name");
 	addGlobalFlags(command);
 	command.action(async (projectRef, options) => {
-		await runCommand(runtime, "project.link", options, (context) => runProjectLink(context, String(projectRef)), {
+		await runCommand(runtime, "project.link", options, (context) => runProjectLink(context, typeof projectRef === "string" ? projectRef : void 0), {
 			renderHuman: (context, descriptor, result) => renderProjectSetup(context, descriptor, result),
 			renderJson: (result) => serializeProjectSetup(result)
 		});

package/dist/controllers/app.js

@@ -8,13 +8,14 @@ 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 { renderDeployOutputRows } from "../lib/app/deploy-output.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";
 import { formatCommandArgument } from "../shell/command-arguments.js";
 import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "../lib/project/local-pin.js";
 import { buildProjectSetupNextActions, inferTargetName, projectNotFoundError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
 import { bindProjectToDirectory, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
+import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
 import { PREVIEW_BUILD_TYPES, RESOLVED_PREVIEW_BUILD_TYPES, executePreviewBuild } from "../lib/app/preview-build.js";
 import { PREVIEW_DEFAULT_REGION } from "../lib/app/preview-interaction.js";
 import { createPreviewDeployProgress, createPreviewDeployProgressState, createPreviewPromoteProgress } from "../lib/app/preview-progress.js";
@@ -1362,58 +1363,25 @@ async function resolveDeployProjectContext(context, client, provider, explicitPr
 	throw projectSetupRequiredError(projects, await inferTargetName(context.runtime.cwd));
 }
 async function resolveInteractiveDeployProjectSetup(context, provider, workspace, projects) {
-	const sortedProjects = sortProjects(projects);
-	const choice = await selectPrompt({
-		input: context.runtime.stdin,
-		output: context.runtime.stderr,
-		message: "Which Project should this directory use?",
-		choices: [
-			...sortedProjects.map((project) => ({
-				label: project.name,
-				value: {
-					kind: "project",
-					project
-				}
-			})),
-			{
-				label: "Create a new Project",
-				value: { kind: "create" }
-			},
-			{
-				label: "Cancel",
-				value: { kind: "cancel" }
-			}
-		]
-	});
-	if (choice.kind === "cancel") throw usageError("Project setup canceled", "Deploy needs a Project before it can continue.", "Choose an existing Project or create a new one, then rerun deploy.", ["prisma-cli app deploy --project <id-or-name>", "prisma-cli app deploy --create-project <name>"], "project");
-	if (choice.kind === "project") return {
-		workspace,
-		project: toProjectSummary(choice.project),
-		resolution: {
-			projectSource: "prompt",
-			targetName: choice.project.name,
-			targetNameSource: "prompt"
-		},
-		localPinAction: "linked"
-	};
-	const suggestedName = await inferTargetName(context.runtime.cwd);
-	const rawName = await textPrompt({
-		input: context.runtime.stdin,
-		output: context.runtime.stderr,
-		message: "Project name",
-		placeholder: suggestedName.name,
-		validate: (value) => validateProjectSetupNameText(value, suggestedName.name)
+	const setup = await promptForProjectSetupChoice({
+		context,
+		projects,
+		createProject: (projectName) => createProjectForDeploySetup(provider, projectName, workspace),
+		cancel: {
+			why: "Deploy needs a Project before it can continue.",
+			fix: "Choose an existing Project or create a new one, then rerun deploy.",
+			nextSteps: ["prisma-cli app deploy --project <id-or-name>", "prisma-cli app deploy --create-project <name>"]
+		}
 	});
-	const projectName = rawName.trim() || suggestedName.name;
 	return {
 		workspace,
-		project: toProjectSummary(await createProjectForDeploySetup(provider, projectName, workspace)),
+		project: setup.project,
 		resolution: {
-			projectSource: "created",
-			targetName: projectName,
-			targetNameSource: rawName.trim() ? "prompt" : suggestedName.source
+			projectSource: setup.action === "created" ? "created" : "prompt",
+			targetName: setup.targetName,
+			targetNameSource: setup.targetNameSource
 		},
-		localPinAction: "created"
+		localPinAction: setup.action
 	};
 }
 async function createProjectForDeploySetup(provider, projectName, workspace) {
@@ -1459,10 +1427,6 @@ function assertExclusiveDeployProjectInputs(options) {
 		`unset ${PRISMA_PROJECT_ID_ENV_VAR}`
 	], "project");
 }
-function validateProjectSetupNameText(value, fallback) {
-	if ((value?.trim() || fallback).trim().length > 0) return;
-	return "Enter a Project name.";
-}
 async function resolveDeployBranch(context, explicitBranchName) {
 	if (explicitBranchName) return {
 		name: explicitBranchName,
@@ -1665,10 +1629,14 @@ async function maybeCustomizeDeploySettings(context, options) {
 		framework: options.framework,
 		runtime: options.runtime
 	};
+	maybeRenderDeploySettingsPreview(context, {
+		framework: options.framework,
+		runtime: options.runtime
+	});
 	if (!await confirmPrompt({
 		input: context.runtime.stdin,
 		output: context.runtime.stderr,
-		message: "Customize settings?",
+		message: "Customize build settings?",
 		initialValue: false
 	})) return {
 		framework: options.framework,
@@ -1713,6 +1681,16 @@ async function maybeCustomizeDeploySettings(context, options) {
 		runtime
 	};
 }
+function maybeRenderDeploySettingsPreview(context, options) {
+	if (context.flags.quiet || context.flags.json) return;
+	context.output.stderr.write(`Detected ${options.framework.displayName}\n${renderDeploySettingsPreview(context.ui, [{
+		key: "framework",
+		value: options.framework.displayName
+	}, {
+		key: "runtime",
+		value: `HTTP ${options.runtime.port}`
+	}]).join("\n")}\n\n`);
+}
 function frameworkDisplayName(framework) {
 	switch (framework) {
 		case "nextjs": return "Next.js";

package/dist/controllers/project.js

@@ -2,9 +2,11 @@ import { CliError, authRequiredError, featureUnavailableError, usageError, works
 import { renderSummaryLine } from "../shell/ui.js";
 import { canPrompt } from "../shell/runtime.js";
 import { requireComputeAuth } from "../lib/auth/guard.js";
+import { formatCommandArgument } from "../shell/command-arguments.js";
 import { readLocalResolutionPin } from "../lib/project/local-pin.js";
-import { buildProjectSetupNextActions, inspectProjectBinding, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
+import { buildProjectSetupNextActions, inferTargetName, inspectProjectBinding, resolveProjectTarget, sortProjects } from "../lib/project/resolution.js";
 import { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary } from "../lib/project/setup.js";
+import { promptForProjectSetupChoice } from "../lib/project/interactive-setup.js";
 import { createPreviewAppProvider } from "../lib/app/preview-provider.js";
 import { createCliUseCaseGateways } from "../use-cases/create-cli-gateways.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
@@ -60,7 +62,10 @@ async function runProjectList(context) {
 	};
 }
 function buildProjectListNextActions(localBinding) {
-	return localBinding?.status === "linked" ? [] : buildProjectSetupNextActions({ reason: localBinding?.status === "invalid" ? "This directory has an invalid local Project binding. Ask the user which Prisma Project to link before running Project-scoped commands." : "This directory is not linked to a Prisma Project. Project list shows available Projects, but none is selected for this directory." });
+	return localBinding?.status === "linked" ? [] : buildProjectSetupNextActions({
+		createCommand: "prisma-cli project create <name>",
+		reason: localBinding?.status === "invalid" ? "This directory has an invalid local Project binding. Ask the user which Prisma Project to link before running Project-scoped commands." : "This directory is not linked to a Prisma Project. Project list shows available Projects, but none is selected for this directory."
+	});
 }
 async function runProjectShow(context, explicitProject) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
@@ -107,15 +112,84 @@ async function runProjectCreate(context, projectName) {
 async function runProjectLink(context, projectRef) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
-	if (!projectRef || !projectRef.trim()) throw usageError("Project link requires a Project id or name", "The command cannot choose a Project without an explicit id or name.", "Pass the Project id or name as the first argument.", ["prisma-cli project link proj_123"], "project");
-	const projects = isRealMode(context) ? await listRealProjectsForLink(context, workspace) : listFixtureWorkspaceProjects(context, workspace);
+	let provider = null;
+	let projects;
+	if (isRealMode(context)) {
+		const client = await requireComputeAuth(context.runtime.env);
+		if (!client) throw authRequiredError();
+		provider = createPreviewAppProvider(client);
+		projects = await listRealWorkspaceProjects(client, workspace);
+	} else projects = listFixtureWorkspaceProjects(context, workspace);
+	let result;
+	if (projectRef?.trim()) result = await bindProjectToDirectory(context, workspace, toProjectSummary(resolveProjectForSetup(projectRef.trim(), projects, workspace)), "linked");
+	else if (canPrompt(context) && !context.flags.yes) result = await resolveInteractiveProjectLinkSetup(context, workspace, projects, provider);
+	else throw await projectLinkTargetRequiredError(context, projects);
 	return {
 		command: "project.link",
-		result: await bindProjectToDirectory(context, workspace, toProjectSummary(resolveProjectForSetup(projectRef.trim(), projects, workspace)), "linked"),
+		result,
 		warnings: [],
 		nextSteps: ["prisma-cli app deploy"]
 	};
 }
+async function resolveInteractiveProjectLinkSetup(context, workspace, projects, provider) {
+	const setup = await promptForProjectSetupChoice({
+		context,
+		projects,
+		createProject: (projectName) => {
+			if (!provider) throw featureUnavailableError("Project create is not available in fixture mode", "Creating Projects requires live platform integration.", "Rerun without fixture mode enabled to create a Project.", ["prisma-cli auth login"], "project");
+			return createProjectForLinkSetup(provider, projectName, workspace);
+		},
+		cancel: {
+			why: "Project link needs a Project before it can continue.",
+			fix: "Choose an existing Project or create a new one, then rerun project link.",
+			nextSteps: ["prisma-cli project link <id-or-name>", "prisma-cli project create <name>"]
+		}
+	});
+	return bindProjectToDirectory(context, workspace, setup.project, setup.action);
+}
+async function createProjectForLinkSetup(provider, projectName, workspace) {
+	const created = await provider.createProject({ name: projectName }).catch((error) => {
+		throw projectCreateFailedError(error, projectName, workspace, {
+			nextSteps: [
+				"prisma-cli project list",
+				"prisma-cli project link <id-or-name>",
+				`prisma-cli project create ${formatCommandArgument(projectName)}`
+			],
+			permissionFix: "Grant the token permission to create Projects in this workspace, or link an existing Project.",
+			fallbackFix: "Retry the command, or choose an existing Project with prisma-cli project link <id-or-name>."
+		});
+	});
+	return {
+		id: created.id,
+		name: created.name,
+		workspace
+	};
+}
+async function projectLinkTargetRequiredError(context, projects) {
+	const suggestedName = await inferTargetName(context.runtime.cwd);
+	const createCommand = `prisma-cli project create ${formatCommandArgument(suggestedName.name)}`;
+	const recoveryCommands = ["prisma-cli project link <id-or-name>", createCommand];
+	return new CliError({
+		code: "PROJECT_LINK_TARGET_REQUIRED",
+		domain: "project",
+		summary: "Choose a Project to link this directory",
+		why: "This directory is not linked to a Prisma Project. Existing Projects are candidates until the user chooses one, and package or directory names are suggestions only.",
+		fix: "Run prisma-cli project link in a TTY to choose from the setup list, pass a Project id or name, or create a new Project.",
+		meta: {
+			suggestedProjectName: suggestedName.name,
+			suggestedProjectNameSource: suggestedName.source,
+			candidates: sortProjects(projects).map(toProjectSummary),
+			recoveryCommands
+		},
+		exitCode: 2,
+		nextSteps: ["prisma-cli project list", ...recoveryCommands],
+		nextActions: buildProjectSetupNextActions({
+			suggestedProjectName: suggestedName.name,
+			createCommand,
+			reason: "Project link needs the user to choose an existing Project or create a new one. Existing Projects, package names, and directory names are candidates only, not selections."
+		})
+	});
+}
 async function runGitConnect(context, gitUrl, options = {}) {
 	const workspace = (await requireAuthenticatedAuthState(context)).workspace;
 	if (!workspace) throw workspaceRequiredError();
@@ -242,11 +316,6 @@ async function resolveRequiredProjectInRealMode(context, workspace, explicitProj
 		commandName
 	});
 }
-async function listRealProjectsForLink(context, workspace) {
-	const client = await requireComputeAuth(context.runtime.env);
-	if (!client) throw authRequiredError();
-	return listRealWorkspaceProjects(client, workspace);
-}
 async function resolveProjectShowInFixtureMode(context, workspace, explicitProject) {
 	return inspectProjectBinding({
 		context,

package/dist/lib/app/deploy-output.js

@@ -2,6 +2,7 @@ import { padDisplay } from "../../shell/ui.js";
 //#region src/lib/app/deploy-output.ts
 const DEPLOY_OUTPUT_MIN_LABEL_WIDTH = 9;
 const DEPLOY_OUTPUT_MIN_VALUE_WIDTH = 9;
+const DEPLOY_SETTINGS_MIN_KEY_WIDTH = 10;
 function renderDeployOutputRows(ui, rows) {
 	if (rows.length === 0) return [];
 	const labelWidth = Math.max(DEPLOY_OUTPUT_MIN_LABEL_WIDTH, ...rows.map((row) => row.label.length));
@@ -11,5 +12,13 @@ function renderDeployOutputRows(ui, rows) {
 		return `  ${padDisplay(row.label, labelWidth)}  ${padDisplay(ui.strong(row.value), valueWidth)}${row.origin ? `  ${ui.dim(`· ${row.origin}`)}` : ""}`.trimEnd();
 	});
 }
+function renderDeploySettingsPreview(ui, rows) {
+	if (rows.length === 0) return [];
+	const keyWidth = Math.max(DEPLOY_SETTINGS_MIN_KEY_WIDTH, ...rows.map((row) => `${row.key}:`.length));
+	const rail = ui.dim("│");
+	return rows.map((row) => {
+		return `${rail}  ${ui.accent(padDisplay(`${row.key}:`, keyWidth))}  ${ui.strong(row.value)}`;
+	});
+}
 //#endregion
-export { renderDeployOutputRows };
+export { renderDeployOutputRows, renderDeploySettingsPreview };

package/dist/lib/project/interactive-setup.js

@@ -0,0 +1,56 @@
+import { usageError } from "../../shell/errors.js";
+import { selectPrompt, textPrompt } from "../../shell/prompt.js";
+import { inferTargetName, sortProjects } from "./resolution.js";
+import { toProjectSummary, validateProjectSetupNameText } from "./setup.js";
+//#region src/lib/project/interactive-setup.ts
+async function promptForProjectSetupChoice(options) {
+	const sortedProjects = sortProjects(options.projects);
+	const projectNames = sortedProjects.map((project) => project.name);
+	const duplicateNames = new Set(projectNames.filter((name, index) => projectNames.indexOf(name) !== index));
+	const choice = await selectPrompt({
+		input: options.context.runtime.stdin,
+		output: options.context.runtime.stderr,
+		message: "Which Project should this directory use?",
+		choices: [
+			...sortedProjects.map((project) => ({
+				label: duplicateNames.has(project.name) ? `${project.name} (${project.id})` : project.name,
+				value: {
+					kind: "project",
+					project
+				}
+			})),
+			{
+				label: "Create a new Project",
+				value: { kind: "create" }
+			},
+			{
+				label: "Cancel",
+				value: { kind: "cancel" }
+			}
+		]
+	});
+	if (choice.kind === "cancel") throw usageError("Project setup canceled", options.cancel.why, options.cancel.fix, options.cancel.nextSteps, "project");
+	if (choice.kind === "project") return {
+		project: toProjectSummary(choice.project),
+		action: "linked",
+		targetName: choice.project.name,
+		targetNameSource: "prompt"
+	};
+	const suggestedName = await inferTargetName(options.context.runtime.cwd);
+	const rawName = await textPrompt({
+		input: options.context.runtime.stdin,
+		output: options.context.runtime.stderr,
+		message: "Project name",
+		placeholder: suggestedName.name,
+		validate: (value) => validateProjectSetupNameText(value, suggestedName.name)
+	});
+	const projectName = rawName.trim() || suggestedName.name;
+	return {
+		project: toProjectSummary(await options.createProject(projectName)),
+		action: "created",
+		targetName: projectName,
+		targetNameSource: rawName.trim() ? "prompt" : suggestedName.source
+	};
+}
+//#endregion
+export { promptForProjectSetupChoice };

package/dist/lib/project/resolution.js

@@ -105,7 +105,7 @@ function buildProjectSetupNextActions(options = {}) {
 	const actions = [{
 		kind: "user-choice",
 		journey: "project-setup",
-		label: "Ask the user which Prisma Project this directory should use",
+		label: "Ask the user whether to link an existing Project or create a new one",
 		commands: ["prisma-cli project list", ...recoveryCommands],
 		reason: options.reason ?? "This directory is not linked to a Prisma Project. Package and directory names are suggestions only, not a safe Project selection."
 	}, {

package/dist/lib/project/setup.js

@@ -6,6 +6,10 @@ import { projectAmbiguousError, projectNotFoundError } from "./resolution.js";
 function isValidProjectSetupName(projectName) {
 	return projectName.trim().length > 0;
 }
+function validateProjectSetupNameText(value, fallback) {
+	if ((value?.trim() || fallback).trim().length > 0) return;
+	return "Enter a Project name.";
+}
 function resolveProjectForSetup(projectRef, projects, workspace) {
 	const matches = projects.filter((project) => project.id === projectRef || project.name === projectRef);
 	if (matches.length === 1) return matches[0];
@@ -81,4 +85,4 @@ function formatDebugDetails(error) {
 	return typeof error === "string" ? error : null;
 }
 //#endregion
-export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary };
+export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };

package/dist/presenters/project.js

@@ -18,7 +18,7 @@ function renderProjectList(context, descriptor, result) {
 		})),
 		emptyMessage: "No projects found."
 	}, context.ui);
-	if (result.localBinding?.status === "not-linked" || result.localBinding?.status === "invalid") lines.push(...renderNextSteps(["Link the chosen Project: prisma-cli project link <id-or-name>"]));
+	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;
 }
 function serializeProjectList(result) {
@@ -49,7 +49,7 @@ function renderProjectShow(context, descriptor, result) {
 				tone: "warning"
 			}]
 		}, context.ui);
-		lines.push(...renderNextSteps(["Link an existing Project: prisma-cli project link <id-or-name>", `Create a new Project: prisma-cli project create ${formatCommandArgument(result.suggestedProjectName)}`]));
+		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;
 	}
 	return renderShow({

package/dist/shell/command-meta.js

@@ -115,8 +115,12 @@ const DESCRIPTORS = [
 			"project",
 			"link"
 		],
-		description: "Link this directory to an existing Project",
-		examples: ["prisma-cli project link proj_123", "prisma-cli project link \"Acme Dashboard\" --json"]
+		description: "Link this directory to a Project",
+		examples: [
+			"prisma-cli project link",
+			"prisma-cli project link proj_123",
+			"prisma-cli project link \"Acme Dashboard\" --json"
+		]
 	},
 	{
 		id: "git.connect",

package/package.json

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