@prisma/cli 3.0.0-alpha.9 → 3.0.0-beta.1

package/dist/lib/auth/auth-ops.js

@@ -42,41 +42,52 @@ async function readAuthState(env) {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
+	const client = await requireComputeAuth(env);
+	const currentPrincipal = await readCurrentPrincipalAuthState(client);
+	if (currentPrincipal) return currentPrincipal;
 	const claims = decodeJwtPayload(tokens.accessToken);
 	return buildAuthState({
 		workspaceIdFromCredential: tokens.workspaceId,
 		claims,
-		env
+		env,
+		client
 	});
 }
 async function readServiceTokenAuthState(token, env) {
+	const client = await requireComputeAuth(env);
+	const currentPrincipal = await readCurrentPrincipalAuthState(client);
+	if (currentPrincipal) return currentPrincipal;
 	const claims = decodeJwtPayload(token);
 	const workspaceId = workspaceIdFromClaims(claims);
 	if (!workspaceId) return {
 		authenticated: false,
 		provider: null,
 		user: null,
-		workspace: null
+		workspace: null,
+		credential: null
 	};
 	return buildAuthState({
 		workspaceIdFromCredential: workspaceId,
 		claims,
-		env
+		env,
+		client
 	});
 }
-async function buildAuthState({ workspaceIdFromCredential, claims, env }) {
+async function buildAuthState({ workspaceIdFromCredential, claims, env, client }) {
 	let workspaceId = workspaceIdFromCredential;
 	let workspaceName = workspaceIdFromCredential;
-	const client = await requireComputeAuth(env);
+	client ??= await requireComputeAuth(env);
 	if (client) try {
 		const { data, response } = await client.GET("/v1/workspaces/{id}", { params: { path: { id: workspaceIdFromCredential } } });
 		if (response?.status === 401) return {
 			authenticated: false,
 			provider: null,
 			user: null,
-			workspace: null
+			workspace: null,
+			credential: null
 		};
 		if (data?.data?.id) {
 			workspaceId = data.data.id;
@@ -92,9 +103,39 @@ async function buildAuthState({ workspaceIdFromCredential, claims, env }) {
 		workspace: {
 			id: workspaceId,
 			name: workspaceName
-		}
+		},
+		credential: null
 	};
 }
+async function readCurrentPrincipalAuthState(client) {
+	if (!client) return null;
+	try {
+		const { data, response } = await client.GET("/v1/me");
+		if (response?.status === 401) return {
+			authenticated: false,
+			provider: null,
+			user: null,
+			workspace: null,
+			credential: null
+		};
+		const principal = data?.data;
+		if (!principal) return null;
+		if (!principal.credential) return null;
+		return {
+			authenticated: true,
+			provider: null,
+			user: principal.user ? {
+				id: principal.user.id,
+				email: principal.user.email,
+				name: principal.user.name
+			} : null,
+			workspace: principal.workspace,
+			credential: principal.credential
+		};
+	} catch {
+		return null;
+	}
+}
 async function performLogout(env) {
 	await new FileTokenStorage(env).clearTokens();
 }

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

@@ -1,73 +1,33 @@
 import { CliError } from "../../shell/errors.js";
-import { canPrompt } from "../../shell/runtime.js";
+import { formatCommandArgument } from "../../shell/command-arguments.js";
+import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, readLocalResolutionPin } from "./local-pin.js";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 //#region src/lib/project/resolution.ts
 async function resolveProjectTarget(options) {
 	const projects = await options.listProjects();
-	const inferredName = await inferTargetName(options.context.runtime.cwd);
-	if (options.explicitProject) return rememberIfRequested(options, resolveExplicitProject(options.explicitProject, projects, options.workspace), "explicit", {
-		targetName: options.explicitProject,
-		targetNameSource: "explicit"
+	const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: true });
+	if (target) return target;
+	throw await projectSetupRequiredError({
+		cwd: options.context.runtime.cwd,
+		projects,
+		commandName: options.commandName
 	});
-	const platformMapping = await resolveDurablePlatformMapping();
-	if (platformMapping) return rememberIfRequested(options, platformMapping, "platform-mapping");
-	let staleRemembered = false;
-	if (!options.allowCreate) {
-		const rememberedResult = await resolveRememberedProject(options, projects);
-		if (rememberedResult.target) return rememberedResult.target;
-		staleRemembered = rememberedResult.stale;
-	}
-	const packageName = inferredName.source === "package-name" ? inferredName.name : null;
-	if (packageName) {
-		const matches = projects.filter((project) => projectMatchesPackageName(project, packageName));
-		if (matches.length === 1) return rememberIfRequested(options, matches[0], "package-name", {
-			targetName: packageName,
-			targetNameSource: "package-name"
-		});
-		if (matches.length > 1) return resolveAmbiguousProject(options, matches, packageName, "package-name");
-	}
-	if (options.allowCreate && options.createProject) {
-		if (inferredName.name) {
-			const existing = projects.filter((project) => projectMatchesPackageName(project, inferredName.name));
-			if (existing.length === 1) return rememberIfRequested(options, existing[0], inferredName.source, {
-				targetName: inferredName.name,
-				targetNameSource: inferredName.source
-			});
-			if (existing.length > 1) return resolveAmbiguousProject(options, existing, inferredName.name, inferredName.source);
-			return rememberIfRequested(options, await options.createProject(inferredName.name), "created", {
-				targetName: inferredName.name,
-				targetNameSource: inferredName.source
-			});
-		}
-	}
-	if (options.prompt && canPrompt(options.context) && projects.length > 0) return rememberIfRequested(options, await options.prompt.select({
-		message: "Select a project",
-		choices: sortProjects(projects).map((project) => ({
-			label: `${project.name} (${project.id})`,
-			value: project
-		}))
-	}), "prompt");
-	if (staleRemembered && projects.length > 1) throw localStateStaleError();
-	throw projectUnresolvedError();
-}
-async function resolveRememberedProject(options, projects) {
-	const remembered = await options.context.stateStore.readRememberedProject(options.workspace.id);
-	if (!remembered) return {
-		target: null,
-		stale: false
-	};
-	const matched = projects.find((project) => project.id === remembered.id);
-	if (!matched) return {
-		target: null,
-		stale: true
-	};
+}
+async function inspectProjectBinding(options) {
+	const projects = await options.listProjects();
+	const target = await resolveBoundProjectTarget(options, projects, { allowEnvProjectId: false });
+	if (target) return target;
 	return {
-		target: await rememberIfRequested(options, matched, "remembered-local", {
-			targetName: remembered.name,
-			targetNameSource: "remembered-local"
-		}),
-		stale: false
+		workspace: options.workspace,
+		project: null,
+		localBinding: { status: "not-linked" },
+		resolution: { projectSource: "unbound" },
+		...await buildProjectSetupSuggestion({
+			cwd: options.context.runtime.cwd,
+			projects,
+			commandName: options.commandName ?? "project show"
+		})
 	};
 }
 function projectNotFoundError(projectRef, workspace) {
@@ -99,27 +59,77 @@ function projectAmbiguousError(projectRef, matches) {
 		nextSteps
 	});
 }
-function projectUnresolvedError() {
+function localStateStaleError() {
 	return new CliError({
-		code: "PROJECT_UNRESOLVED",
+		code: "LOCAL_STATE_STALE",
 		domain: "project",
-		summary: "No project is resolved for this directory",
-		why: "No project could be resolved from explicit input, platform mappings, remembered local context, or package metadata.",
-		fix: "Pass --project <id-or-name> on the command that needs a project, or add a package.json name that matches an accessible project.",
+		summary: "Local project binding is stale",
+		why: `The target recorded in ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH} is no longer available in the selected workspace.`,
+		fix: `Delete ${LOCAL_RESOLUTION_PIN_RELATIVE_PATH}, then choose a Project explicitly.`,
+		meta: { pinPath: LOCAL_RESOLUTION_PIN_RELATIVE_PATH },
 		exitCode: 1,
-		nextSteps: ["prisma-cli project list", "prisma-cli project show --project <id-or-name>"]
+		nextSteps: ["prisma-cli project list", "prisma-cli project link <id-or-name>"]
 	});
 }
-function localStateStaleError() {
+async function buildProjectSetupSuggestion(options) {
+	const suggestedName = await inferTargetName(options.cwd);
+	const candidates = sortProjects(options.projects.filter((project) => projectMatchesSuggestedName(project, suggestedName.name))).map(toProjectSummary);
+	return {
+		suggestedProjectName: suggestedName.name,
+		suggestedProjectNameSource: suggestedName.source,
+		candidates,
+		recoveryCommands: buildProjectRecoveryCommands(options.commandName)
+	};
+}
+async function projectSetupRequiredError(options) {
+	const suggestion = await buildProjectSetupSuggestion(options);
 	return new CliError({
-		code: "LOCAL_STATE_STALE",
+		code: "PROJECT_SETUP_REQUIRED",
 		domain: "project",
-		summary: "Remembered project context is stale",
-		why: "The remembered project is no longer available in the selected workspace, and automatic resolution would be ambiguous.",
-		fix: "Pass --project <id-or-name> to choose the project explicitly.",
+		summary: "Choose a Project before running this command",
+		why: `This directory is not linked to a Prisma Project, and ${options.commandName ? `prisma-cli ${options.commandName}` : "this command"} will not choose one from package or directory names.`,
+		fix: "Link the directory to an existing Project, or pass --project <id-or-name> for this command.",
+		meta: { ...suggestion },
 		exitCode: 1,
-		nextSteps: ["prisma-cli project list"]
+		nextSteps: ["prisma-cli project list", ...suggestion.recoveryCommands],
+		nextActions: buildProjectSetupNextActions({
+			commandName: options.commandName,
+			suggestedProjectName: suggestion.suggestedProjectName
+		})
+	});
+}
+function buildProjectSetupNextActions(options = {}) {
+	const recoveryCommands = buildProjectRecoveryCommands(options.commandName);
+	const linkCommand = recoveryCommands[0] ?? "prisma-cli project link <id-or-name>";
+	const retryCommand = recoveryCommands[1];
+	const actions = [{
+		kind: "user-choice",
+		journey: "project-setup",
+		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."
+	}, {
+		kind: "run-command",
+		journey: "project-setup",
+		label: "Link the chosen Project",
+		command: linkCommand,
+		reason: "Linking writes the durable local Project binding for this directory."
+	}];
+	const createCommand = options.createCommand ?? (options.suggestedProjectName ? `prisma-cli project create ${formatCommandArgument(options.suggestedProjectName)}` : void 0);
+	if (createCommand) actions.push({
+		kind: "run-command",
+		journey: "project-setup",
+		label: "Create and link a new Project",
+		command: createCommand,
+		reason: "Use this when the user wants a new Prisma Project instead of an existing one."
 	});
+	if (options.commandName) actions.push({
+		kind: "run-command",
+		journey: "recover",
+		label: "Retry with an explicit Project",
+		command: retryCommand ?? `prisma-cli ${options.commandName} --project <id-or-name>`
+	});
+	return actions;
 }
 async function readPackageName(cwd) {
 	try {
@@ -157,33 +167,46 @@ function resolveExplicitProject(projectRef, projects, workspace) {
 	if (matches.length > 1) throw projectAmbiguousError(projectRef, matches);
 	throw projectNotFoundError(projectRef, workspace);
 }
-function resolveAmbiguousProject(options, matches, projectRef, targetNameSource) {
-	if (options.prompt && canPrompt(options.context)) return options.prompt.select({
-		message: "Select a project",
-		choices: sortProjects(matches).map((project) => ({
-			label: `${project.name} (${project.id})`,
-			value: project
-		}))
-	}).then((selected) => rememberIfRequested(options, selected, "prompt", {
-		targetName: projectRef,
-		targetNameSource
-	}));
-	throw projectAmbiguousError(projectRef, matches);
-}
-function projectMatchesPackageName(project, packageName) {
-	return project.id === packageName || project.name === packageName || project.slug === packageName;
+function projectMatchesSuggestedName(project, suggestedName) {
+	return project.id === suggestedName || project.name === suggestedName || project.slug === suggestedName;
 }
 async function resolveDurablePlatformMapping() {
 	return null;
 }
-async function rememberIfRequested(options, project, projectSource, resolutionDetails) {
-	if (options.remember) await options.context.stateStore.setRememberedProject({
-		id: project.id,
-		name: project.name,
-		workspaceId: options.workspace.id
+async function resolveBoundProjectTarget(options, projects, settings) {
+	if (options.explicitProject) return resolvedTarget(options.workspace, resolveExplicitProject(options.explicitProject, projects, options.workspace), "explicit", {
+		targetName: options.explicitProject,
+		targetNameSource: "explicit"
 	});
+	if (settings.allowEnvProjectId && options.envProjectId) {
+		const project = projects.find((candidate) => candidate.id === options.envProjectId);
+		if (!project) throw projectNotFoundError(options.envProjectId, options.workspace);
+		return resolvedTarget(options.workspace, project, "env", {
+			targetName: options.envProjectId,
+			targetNameSource: "env"
+		});
+	}
+	const localPin = await readLocalResolutionPin(options.context.runtime.cwd);
+	if (localPin.kind === "invalid") throw localStateStaleError();
+	if (localPin.kind === "present") {
+		if (localPin.pin.workspaceId !== options.workspace.id) throw localStateStaleError();
+		const project = projects.find((candidate) => candidate.id === localPin.pin.projectId);
+		if (!project) throw localStateStaleError();
+		return resolvedTarget(options.workspace, project, "local-pin", {
+			targetName: project.name,
+			targetNameSource: "local-pin"
+		});
+	}
+	const platformMapping = await resolveDurablePlatformMapping();
+	if (platformMapping && platformMapping.workspace.id === options.workspace.id) return resolvedTarget(options.workspace, platformMapping, "platform-mapping", {
+		targetName: platformMapping.name,
+		targetNameSource: "platform-mapping"
+	});
+	return null;
+}
+function resolvedTarget(workspace, project, projectSource, resolutionDetails) {
 	return {
-		workspace: options.workspace,
+		workspace,
 		project: toProjectSummary(project),
 		resolution: {
 			projectSource,
@@ -191,6 +214,11 @@ async function rememberIfRequested(options, project, projectSource, resolutionDe
 		}
 	};
 }
+function buildProjectRecoveryCommands(commandName) {
+	const commands = ["prisma-cli project link <id-or-name>"];
+	if (commandName) commands.push(`prisma-cli ${commandName} --project <id-or-name>`);
+	return commands;
+}
 function toProjectSummary(project) {
 	return {
 		id: project.id,
@@ -198,4 +226,4 @@ function toProjectSummary(project) {
 	};
 }
 //#endregion
-export { inferTargetName, projectNotFoundError, resolveProjectTarget, sortProjects };
+export { buildProjectSetupNextActions, inferTargetName, inspectProjectBinding, projectAmbiguousError, projectNotFoundError, resolveDurablePlatformMapping, resolveProjectTarget, sortProjects };

package/dist/lib/project/setup.js

@@ -0,0 +1,88 @@
+import { CliError, usageError } from "../../shell/errors.js";
+import "../../shell/command-arguments.js";
+import { LOCAL_RESOLUTION_PIN_RELATIVE_PATH, ensureLocalResolutionPinGitignore, writeLocalResolutionPin } from "./local-pin.js";
+import { projectAmbiguousError, projectNotFoundError } from "./resolution.js";
+//#region src/lib/project/setup.ts
+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];
+	if (matches.length > 1) throw projectAmbiguousError(projectRef, matches);
+	throw projectNotFoundError(projectRef, workspace);
+}
+async function bindProjectToDirectory(context, workspace, project, action) {
+	await writeLocalResolutionPin(context.runtime.cwd, {
+		workspaceId: workspace.id,
+		projectId: project.id
+	});
+	await ensureLocalResolutionPinGitignore(context.runtime.cwd);
+	return {
+		workspace,
+		project,
+		directory: formatSetupDirectory(context.runtime.cwd),
+		localPin: {
+			path: LOCAL_RESOLUTION_PIN_RELATIVE_PATH,
+			written: true
+		},
+		action
+	};
+}
+function toProjectSummary(project) {
+	return {
+		id: project.id,
+		name: project.name
+	};
+}
+function projectSetupNameRequiredError(command) {
+	return usageError("Project create requires a name", "The project name must be a non-empty value.", "Pass a Project name explicitly.", [`prisma-cli ${command} my-app`], "project");
+}
+function projectCreateFailedError(error, projectName, workspace, options) {
+	const status = extractHttpStatus(error);
+	if (status === 401 || status === 403) return new CliError({
+		code: "PROJECT_CREATE_FAILED",
+		domain: "project",
+		summary: `Could not create Project "${projectName}"`,
+		why: `The platform rejected the Project create in workspace "${workspace.name}" (HTTP ${status}).`,
+		fix: options.permissionFix,
+		debug: formatDebugDetails(error),
+		exitCode: 1,
+		nextSteps: options.nextSteps
+	});
+	return new CliError({
+		code: "PROJECT_CREATE_FAILED",
+		domain: "project",
+		summary: `Could not create Project "${projectName}"`,
+		why: error instanceof Error ? error.message : String(error),
+		fix: options.fallbackFix,
+		debug: formatDebugDetails(error),
+		exitCode: 1,
+		nextSteps: options.nextSteps
+	});
+}
+function formatSetupDirectory(cwd) {
+	const basename = cwd.split(/[\\/]/).filter(Boolean).pop();
+	return basename ? `./${basename}` : ".";
+}
+function extractHttpStatus(error) {
+	if (!error || typeof error !== "object") return null;
+	const candidate = error;
+	if (typeof candidate.statusCode === "number") return candidate.statusCode;
+	if (typeof candidate.status === "number") return candidate.status;
+	if (typeof candidate.message === "string") {
+		const match = /\(HTTP (\d{3})\)/.exec(candidate.message);
+		if (match) return Number.parseInt(match[1], 10);
+	}
+	return null;
+}
+function formatDebugDetails(error) {
+	if (error instanceof Error) return error.stack ?? error.message;
+	return typeof error === "string" ? error : null;
+}
+//#endregion
+export { bindProjectToDirectory, isValidProjectSetupName, projectCreateFailedError, projectSetupNameRequiredError, resolveProjectForSetup, toProjectSummary, validateProjectSetupNameText };

package/dist/presenters/app-env.js

@@ -1,7 +1,8 @@
 import { renderList, renderShow, serializeList } from "../output/patterns.js";
 //#region src/presenters/app-env.ts
 function scopeLabel(scope) {
-	return scope.role;
+	if (scope.kind === "role") return scope.role ?? "unknown";
+	return `branch:${scope.branchName ?? scope.branchId ?? "unknown"}`;
 }
 function renderEnvAdd(context, descriptor, result) {
 	return renderShow({
@@ -79,7 +80,7 @@ function renderEnvList(context, descriptor, result) {
 		},
 		items: result.variables.map((variable) => ({
 			noun: "variable",
-			label: variable.key,
+			label: `${variable.key} (${variable.source})`,
 			id: variable.id,
 			status: variable.isManagedBySystem ? "default" : null
 		})),
@@ -94,7 +95,7 @@ function serializeEnvList(result) {
 			context: { scope: scopeLabel(result.scope) },
 			items: result.variables.map((variable) => ({
 				noun: "variable",
-				label: variable.key,
+				label: `${variable.key} (${variable.source})`,
 				id: variable.id,
 				status: variable.isManagedBySystem ? "default" : null
 			}))