@prisma/cli 3.0.0-dev.135.1 → 3.0.0-dev.137.1

package/dist/controllers/app.js

@@ -32,8 +32,9 @@ import { createSelectPromptPort } from "./select-prompt-port.js";
 import { requireAuthenticatedAuthState } from "./auth.js";
 import { listRealWorkspaceProjects } from "./project.js";
 import path from "node:path";
-import { access, readFile } from "node:fs/promises";
+import { access } from "node:fs/promises";
 import { COMPUTE_REGIONS, ENTRYPOINT_BUILD_TYPES, FRAMEWORKS, LOCAL_DEV_BUILD_TYPES, frameworkByKey, frameworkFromAlias, isConfigBackedBuildType } from "@prisma/compute-sdk/config";
+import { detectComputeAppFromDirectory } from "@prisma/compute-sdk/config/directory";
 import { Result, matchError } from "better-result";
 import open from "open";
 //#region src/controllers/app.ts
@@ -1990,55 +1991,21 @@ async function resolveDeployEntrypoint(cwd, framework, explicitEntrypoint, signa
 	}
 }
 async function detectDeployFramework(cwd, signal) {
-	const packageJson = await readBunPackageJson(cwd, signal);
-	for (const framework of FRAMEWORKS) {
-		if (framework.detectConfigFiles.length === 0 && framework.detectPackages.length === 0) continue;
-		const configFile = await detectFrameworkConfigFile(cwd, framework, signal);
-		if (!configFile.exists && !hasAnyPackageDependency(packageJson, framework.detectPackages)) continue;
-		const annotation = framework.key === "nextjs" && configFile.standalone ? "standalone output detected" : configFile.exists ? `detected from ${path.basename(configFile.path)}` : "detected from package.json";
-		return {
-			key: framework.key,
-			buildType: framework.buildType,
-			displayName: framework.displayName,
-			annotation
-		};
-	}
-	return null;
-}
-async function detectFrameworkConfigFile(cwd, framework, signal) {
-	for (const candidate of framework.detectConfigFiles) {
-		const filePath = path.join(cwd, candidate);
-		signal.throwIfAborted();
-		try {
-			const content = await readFile(filePath, {
-				encoding: "utf8",
-				signal
-			});
-			return {
-				exists: true,
-				standalone: /\boutput\s*:\s*["'`]standalone["'`]/.test(content),
-				path: filePath
-			};
-		} catch (error) {
-			if (signal.aborted) throw error;
-			if (error.code !== "ENOENT") throw error;
-		}
-	}
+	const detected = await detectComputeAppFromDirectory({
+		appPath: cwd,
+		signal
+	});
+	if (!detected) return null;
+	let annotation = "detected from package.json";
+	if (detected.configFile?.standaloneOutput) annotation = "standalone output detected";
+	else if (detected.configFile) annotation = `detected from ${path.basename(detected.configFile.path)}`;
 	return {
-		exists: false,
-		standalone: false,
-		path: null
+		key: detected.framework,
+		buildType: detected.buildType,
+		displayName: detected.frameworkName,
+		annotation
 	};
 }
-function hasPackageDependency(packageJson, dependencyName) {
-	return hasDependency(packageJson?.dependencies, dependencyName) || hasDependency(packageJson?.devDependencies, dependencyName);
-}
-function hasAnyPackageDependency(packageJson, dependencyNames) {
-	return dependencyNames.some((dependencyName) => hasPackageDependency(packageJson, dependencyName));
-}
-function hasDependency(dependencies, dependencyName) {
-	return Boolean(dependencies && typeof dependencies === "object" && dependencyName in dependencies);
-}
 function frameworkFromUserFacingValue(value, annotation) {
 	const framework = frameworkFromAlias(value);
 	if (!framework) throw frameworkNotDetectedError(void 0, value);

package/dist/controllers/database.js

@@ -356,7 +356,10 @@ async function requireDatabaseContext(context, flags, commandName) {
 		});
 		if (targetResult.isErr()) throw projectResolutionErrorToCliError(targetResult.error);
 		return {
-			provider: createManagementDatabaseProvider(client, { formatCommand: resolvePrismaCliPackageCommandFormatterSync(context.runtime.cwd) }),
+			provider: createManagementDatabaseProvider(client, {
+				formatCommand: resolvePrismaCliPackageCommandFormatterSync(context.runtime.cwd),
+				workspaceId: workspace.id
+			}),
 			target: targetResult.value
 		};
 	}
@@ -374,11 +377,14 @@ async function requireDatabaseContext(context, flags, commandName) {
 	};
 }
 async function requireDatabaseProviderOnly(context) {
-	await requireAuthenticatedAuthState(context);
+	const authState = await requireAuthenticatedAuthState(context);
 	if (isRealMode(context)) {
 		const client = await requireComputeAuth(context.runtime.env, context.runtime.signal);
 		if (!client) throw authRequiredError();
-		return createManagementDatabaseProvider(client, { formatCommand: resolvePrismaCliPackageCommandFormatterSync(context.runtime.cwd) });
+		return createManagementDatabaseProvider(client, {
+			formatCommand: resolvePrismaCliPackageCommandFormatterSync(context.runtime.cwd),
+			workspaceId: authState.workspace?.id
+		});
 	}
 	return createFixtureDatabaseProvider(context);
 }

package/dist/lib/database/provider.js

@@ -1,8 +1,17 @@
 import { formatPrismaCliCommand } from "../../shell/cli-command.js";
 import { CliError } from "../../shell/errors.js";
 //#region src/lib/database/provider.ts
+const SUBSCRIPTION_LOOKUP_TIMEOUT_MS = 3e3;
 function createManagementDatabaseProvider(client, options) {
 	const formatCommand = options?.formatCommand ?? ((args) => formatPrismaCliCommand(args));
+	const toDatabaseApiError = (summary, response, error, signal) => databaseApiError({
+		client,
+		workspaceId: options?.workspaceId,
+		summary,
+		response,
+		error,
+		signal
+	});
 	return {
 		async listDatabases(options) {
 			const databases = [];
@@ -16,7 +25,7 @@ function createManagementDatabaseProvider(client, options) {
 					} },
 					signal: options.signal
 				});
-				if (result.error || !result.data) throw databaseApiError("Failed to list databases", result.response, result.error);
+				if (result.error || !result.data) throw await toDatabaseApiError("Failed to list databases", result.response, result.error, options.signal);
 				databases.push(...result.data.data);
 				if (!result.data.pagination.hasMore || !result.data.pagination.nextCursor) break;
 				cursor = result.data.pagination.nextCursor;
@@ -28,8 +37,8 @@ function createManagementDatabaseProvider(client, options) {
 				params: { path: { databaseId } },
 				signal: options?.signal
 			});
-			if (result.response?.status === 404) return null;
-			if (result.error || !result.data) throw databaseApiError("Failed to show database", result.response, result.error);
+			if (result.response?.status === 404 && !isPlanLimitApiError(result.error)) return null;
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to show database", result.response, result.error, options?.signal);
 			const database = result.data.data;
 			return normalizeDatabase(database, requireDatabaseProjectId(database, options?.projectId));
 		},
@@ -44,7 +53,7 @@ function createManagementDatabaseProvider(client, options) {
 				},
 				signal: options.signal
 			});
-			if (result.error || !result.data) throw databaseApiError("Failed to create database", result.response, result.error);
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to create database", result.response, result.error, options.signal);
 			return normalizeCreatedDatabase(result.data.data, options.projectId);
 		},
 		async removeDatabase(databaseId, options) {
@@ -52,14 +61,14 @@ function createManagementDatabaseProvider(client, options) {
 				params: { path: { databaseId } },
 				signal: options?.signal
 			});
-			if (result.error) throw databaseApiError("Failed to remove database", result.response, result.error);
+			if (result.error) throw await toDatabaseApiError("Failed to remove database", result.response, result.error, options?.signal);
 		},
 		async listConnections(databaseId, options) {
 			const result = await client.GET("/v1/databases/{databaseId}/connections", {
 				params: { path: { databaseId } },
 				signal: options?.signal
 			});
-			if (result.error || !result.data) throw databaseApiError("Failed to list database connections", result.response, result.error);
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to list database connections", result.response, result.error, options?.signal);
 			return result.data.data.map((connection) => normalizeConnection(connection, databaseId));
 		},
 		async createConnection(options) {
@@ -68,7 +77,7 @@ function createManagementDatabaseProvider(client, options) {
 				body: { name: options.name },
 				signal: options.signal
 			});
-			if (result.error || !result.data) throw databaseApiError("Failed to create database connection", result.response, result.error);
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to create database connection", result.response, result.error, options.signal);
 			return normalizeCreatedConnection(result.data.data, options.databaseId);
 		},
 		async removeConnection(connectionId, options) {
@@ -76,7 +85,7 @@ function createManagementDatabaseProvider(client, options) {
 				params: { path: { id: connectionId } },
 				signal: options?.signal
 			});
-			if (result.error) throw databaseApiError("Failed to remove database connection", result.response, result.error);
+			if (result.error) throw await toDatabaseApiError("Failed to remove database connection", result.response, result.error, options?.signal);
 		},
 		async getUsage(databaseId, options) {
 			const result = await client.GET("/v1/databases/{databaseId}/usage", {
@@ -89,7 +98,7 @@ function createManagementDatabaseProvider(client, options) {
 				},
 				signal: options?.signal
 			});
-			if (result.error || !result.data) throw databaseApiError("Failed to fetch database usage", result.response, result.error);
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to fetch database usage", result.response, result.error, options?.signal);
 			return normalizeUsage(result.data);
 		},
 		async listBackups(databaseId, options) {
@@ -100,8 +109,8 @@ function createManagementDatabaseProvider(client, options) {
 				},
 				signal: options?.signal
 			});
-			if (result.response?.status === 422) throw backupsUnsupportedError(databaseId, result.error);
-			if (result.error || !result.data) throw databaseApiError("Failed to list database backups", result.response, result.error);
+			if (result.response?.status === 422 && !isPlanLimitApiError(result.error)) throw backupsUnsupportedError(databaseId, result.error);
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to list database backups", result.response, result.error, options?.signal);
 			return normalizeBackupList(result.data);
 		},
 		async restoreDatabase(options) {
@@ -114,9 +123,9 @@ function createManagementDatabaseProvider(client, options) {
 				} },
 				signal: options.signal
 			});
-			if (result.response?.status === 409) throw restoreConflictError(options.targetDatabaseId, result.error, formatCommand);
-			if (result.response?.status === 404) throw restoreBackupNotFoundError(options, result.error, formatCommand);
-			if (result.error || !result.data) throw databaseApiError("Failed to restore database", result.response, result.error);
+			if (result.response?.status === 409 && !isPlanLimitApiError(result.error)) throw restoreConflictError(options.targetDatabaseId, result.error, formatCommand);
+			if (result.response?.status === 404 && !isPlanLimitApiError(result.error)) throw restoreBackupNotFoundError(options, result.error, formatCommand);
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to restore database", result.response, result.error, options.signal);
 			return normalizeDatabase(result.data.data, options.projectId);
 		},
 		async rotateConnection(connectionId, options) {
@@ -124,7 +133,7 @@ function createManagementDatabaseProvider(client, options) {
 				params: { path: { id: connectionId } },
 				signal: options?.signal
 			});
-			if (result.error || !result.data) throw databaseApiError("Failed to rotate database connection", result.response, result.error);
+			if (result.error || !result.data) throw await toDatabaseApiError("Failed to rotate database connection", result.response, result.error, options?.signal);
 			return normalizeRotatedConnection(result.data.data);
 		}
 	};
@@ -298,17 +307,72 @@ function restoreConflictError(targetDatabaseId, error, formatCommand) {
 		])]
 	});
 }
-function databaseApiError(summary, response, error) {
-	const status = response?.status ?? 0;
+async function databaseApiError(options) {
+	if (isPlanLimitApiError(options.error)) {
+		const subscription = options.workspaceId ? await readWorkspaceSubscription(options.client, options.workspaceId, options.signal) : null;
+		const workspaceLine = options.workspaceId ? `Workspace: ${options.workspaceId}` : "Workspace: unavailable";
+		const planName = subscription?.planName || null;
+		const usageBlocked = subscription?.usageBlocked ?? null;
+		const upgradeUrl = subscription?.upgradeUrl || null;
+		const recoveryLines = [...planName ? [`Current plan: ${planName}`] : [], upgradeUrl ? `Upgrade: ${upgradeUrl}` : "Upgrade: Open Prisma Console and upgrade the affected workspace plan."];
+		return new CliError({
+			code: "PLAN_LIMIT_REACHED",
+			domain: "database",
+			summary: "Workspace plan limit reached",
+			why: "Database operations are blocked because this workspace has used the operations included in its plan. This is a workspace plan limit, not a Prisma outage.",
+			fix: upgradeUrl ? `Upgrade the workspace plan at ${upgradeUrl}.` : "Open Prisma Console and upgrade the affected workspace plan.",
+			meta: {
+				workspaceId: options.workspaceId ?? null,
+				blockedFeature: null,
+				planName,
+				usageBlocked,
+				upgradeUrl
+			},
+			exitCode: 1,
+			nextSteps: [],
+			humanLines: [
+				"Workspace plan limit reached [PLAN_LIMIT_REACHED]",
+				"",
+				"Database operations are blocked because this workspace has used the operations included in its plan. This is a workspace plan limit, not a Prisma outage.",
+				"",
+				workspaceLine,
+				...recoveryLines
+			]
+		});
+	}
+	const status = options.response?.status ?? 0;
 	return new CliError({
-		code: error?.error?.code ?? "DATABASE_API_ERROR",
+		code: options.error?.error?.code ?? "DATABASE_API_ERROR",
 		domain: "database",
-		summary,
-		why: error?.error?.message ?? `The Management API returned status ${status || "unknown"}.`,
-		fix: error?.error?.hint ?? "Re-run with --trace for the underlying API response details.",
+		summary: options.summary,
+		why: options.error?.error?.message ?? `The Management API returned status ${status || "unknown"}.`,
+		fix: options.error?.error?.hint ?? "Re-run with --trace for the underlying API response details.",
 		exitCode: 1,
 		nextSteps: []
 	});
 }
+function isPlanLimitApiError(error) {
+	return error?.error?.code === "planLimitReached";
+}
+async function readWorkspaceSubscription(client, workspaceId, signal) {
+	signal?.throwIfAborted();
+	const timeoutController = new AbortController();
+	const timeout = setTimeout(() => timeoutController.abort(), SUBSCRIPTION_LOOKUP_TIMEOUT_MS);
+	const requestSignal = signal ? AbortSignal.any([signal, timeoutController.signal]) : timeoutController.signal;
+	try {
+		const result = await client.GET("/v1/workspaces/{id}/subscription", {
+			params: { path: { id: workspaceId } },
+			signal: requestSignal
+		});
+		signal?.throwIfAborted();
+		if (result.error) return null;
+		return result.data?.data ?? null;
+	} catch {
+		signal?.throwIfAborted();
+		return null;
+	} finally {
+		clearTimeout(timeout);
+	}
+}
 //#endregion
 export { createManagementDatabaseProvider, normalizeConnection, normalizeDatabase };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "3.0.0-dev.135.1",
+  "version": "3.0.0-dev.137.1",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -44,9 +44,9 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.5.0",
-    "@prisma/compute-sdk": "0.34.0",
+    "@prisma/compute-sdk": "0.39.0",
     "@prisma/credentials-store": "^7.8.0",
-    "@prisma/management-api-sdk": "^1.50.0",
+    "@prisma/management-api-sdk": "^1.55.0",
     "better-result": "^2.9.2",
     "colorette": "^2.0.20",
     "commander": "^14.0.3",