@prisma/cli 8.0.0-rc.5 → 8.0.0-rc.5-dev.65

package/README.md

@@ -15,15 +15,9 @@
 `@prisma/cli` is the public beta of the new CLI for the
 Prisma Developer Platform.
 
-It is the terminal surface managing your platform projects, branches, apps,
-deployments, and environment variables.
-
-The command model is under active development to include tooling for your
-schema, database, migration, and broader platform workflows.
-
-Looking for Prisma ORM commands such as `prisma generate`, `prisma migrate`, or
-`prisma studio`? Use the [`prisma`](https://www.npmjs.com/package/prisma)
-package.
+It is one binary for the ORM, Composer, and the Prisma Developer
+Platform: projects, branches, services, deployments, environment
+variables, and the Prisma ORM schema and migration workflow.
 
 ---
 
@@ -32,7 +26,7 @@ package.
 Install the beta package locally:
 
 ```bash
-npm install --save-dev @prisma/cli
+npm install --save-dev @prisma/cli@next
 ```
 
 Run the binary exposed by this package:
@@ -40,22 +34,26 @@ Run the binary exposed by this package:
 ```bash
 npx prisma-cli --help
 npx prisma-cli auth login
-npx prisma-cli app deploy
+npx prisma-cli project create my-app
+npx prisma-cli git connect git@github.com:owner/repo.git
 ```
 
+Deployments start from pushing the connected repository, the Console, or
+`prisma-cli composer deploy` — there is no standalone deploy command.
+
 With `pnpm`:
 
 ```bash
-pnpm add -D @prisma/cli
+pnpm add -D @prisma/cli@next
 pnpm prisma-cli auth login
-pnpm prisma-cli app deploy
+pnpm prisma-cli git connect
 ```
 
 Useful next commands:
 
 ```bash
-npx prisma-cli app logs
-npx prisma-cli app open
+npx prisma-cli service list
+npx prisma-cli service logs
 npx prisma-cli project env add DATABASE_URL=postgresql://example --role preview
 npx prisma-cli project env add --file .env --role preview
 npx prisma-cli project env list
@@ -71,24 +69,27 @@ The beta package exposes `prisma-cli` so it can coexist with the existing
 
 | Group | What it does |
 | --- | --- |
-| `version` | Show the installed CLI build and host environment. |
 | `auth` | Log in, log out, and inspect the active Prisma account. |
-| `project` | List projects, show the resolved project, and manage project environment variables. |
-| `git` | Connect or disconnect a project from a GitHub repository. |
+| `project` | List, create, link, and manage projects and their environment variables. |
+| `git` | Connect or disconnect a project from a GitHub repository; pushes deploy. |
 | `branch` | List Prisma branches for the resolved project. |
-| `database` | Create, inspect, and remove Prisma Postgres databases and their connection strings. |
-| `bucket` | Create, list, and delete Tigris object-store buckets and their access keys. |
-| `app` | Build, run, deploy, inspect, open, stream logs, promote, roll back, and remove apps. |
+| `postgres` | Create, inspect, restore, and remove Prisma Postgres databases and their connections. |
+| `bucket` | Create, list, and delete object-store buckets and their access keys. |
+| `service` | Inspect services: deployments, logs, domains, promote, roll back, remove. |
+| `build` | Stream platform build logs. |
+| `composer` | Deploy, destroy, and develop Composer apps. |
+| `contract`, `db`, `migrate`, `migration`, `format`, `orm init`, `lsp` | The Prisma ORM workflow. |
+| `init` | Write a committed compute config for the project. |
 
 Common examples:
 
 ```bash
-npx prisma-cli version
+npx prisma-cli --version
 npx prisma-cli auth whoami
 npx prisma-cli project show
 npx prisma-cli branch list
-npx prisma-cli app deploy --branch feat-login --framework nextjs
-npx prisma-cli app promote <deployment-id>
+npx prisma-cli service list
+npx prisma-cli service deployment promote DEPLOYMENT_ID
 ```
 
 ### Built for humans, CI, and agents
@@ -105,9 +106,9 @@ npx prisma-cli app promote <deployment-id>
 ## Beta notes
 
 - Requires Node.js 22.18 or newer.
-- This is a beta package and may change quickly.
-- Official beta releases publish as `@prisma/cli`.
-- The package binary is `prisma-cli`, not `prisma`, during beta.
+- This is a release-candidate package and may change quickly.
+- The 8.0.0 release candidates publish as `@prisma/cli` on the `next` dist-tag.
+- The package binary is `prisma-cli`; the sibling `prisma` package ships the same CLI under the `prisma` binary.
 - Local project context is cached in `.prisma/local.json`, which is gitignored and not a declarative repo config file.
 
 ---
@@ -115,9 +116,7 @@ npx prisma-cli app promote <deployment-id>
 ## Documentation
 
 - [CLI docs index](https://github.com/prisma/prisma-cli/blob/main/docs/README.md)
-- [Resource model](https://github.com/prisma/prisma-cli/blob/main/docs/product/resource-model.md)
 - [Command principles](https://github.com/prisma/prisma-cli/blob/main/docs/product/command-principles.md)
-- [Command spec](https://github.com/prisma/prisma-cli/blob/main/docs/product/command-spec.md)
 - [Output conventions](https://github.com/prisma/prisma-cli/blob/main/docs/product/output-conventions.md)
 - [Error conventions](https://github.com/prisma/prisma-cli/blob/main/docs/product/error-conventions.md)
 

package/dist/cli.js

@@ -34,9 +34,12 @@ import { pipeline } from "node:stream/promises";
 * this constant rather than restating the name.
 */
 const CLI_NAME = "prisma-cli";
-/** The CLI docs page (also the update-check fallback instruction URL). */
-const CLI_DOCS_URL = "https://www.prisma.io/docs/orm/tools/prisma-cli";
-const PRISMA_CLI_PACKAGE_SPEC = `@prisma/cli@latest`;
+/** The CLI docs page (also the update-check fallback instruction URL).
+*  The old /docs/orm/tools/prisma-cli path 308-redirects to the ORM CLI
+*  reference — the wrong docs for the unified CLI — so this points at
+*  the docs root until the unified CLI has its own page. */
+const CLI_DOCS_URL = "https://www.prisma.io/docs";
+const PRISMA_CLI_PACKAGE_SPEC = `@prisma/cli@next`;
 const DEFAULT_PRISMA_CLI_PACKAGE_RUNNER = ["npx", "-y"];
 const PRISMA_CLI_BINARY = "prisma-cli";
 function formatPrismaCliCommand(args, options = {}) {
@@ -2805,12 +2808,11 @@ function projectRemoveBlockedError(projectId, error) {
 		domain: "project",
 		summary: "Project cannot be removed yet",
 		why: error?.error?.message ?? `Project "${projectId}" still has active deployments.`,
-		fix: "Remove the project's apps first, then retry the removal.",
+		fix: "Remove the project's services first, then retry the removal.",
 		exitCode: 1,
 		nextSteps: [formatPrismaCliCommand([
-			"app",
+			"service",
 			"remove",
-			"--app",
 			"<name>"
 		])]
 	});
@@ -2951,7 +2953,7 @@ function projectAmbiguousError(projectRef, matches) {
 function projectAmbiguousCliError(projectRef, matches) {
 	const firstMatch = matches[0];
 	const nextSteps = ["prisma-cli project list"];
-	if (firstMatch) nextSteps.push(`prisma-cli app deploy --project ${firstMatch.id}`);
+	if (firstMatch) nextSteps.push(`prisma-cli project link ${firstMatch.id}`);
 	return new CliError({
 		code: "PROJECT_AMBIGUOUS",
 		domain: "project",
@@ -3618,7 +3620,7 @@ function localStateWriteFailedError(error, options) {
 		debug: formatDebugDetails(error.cause),
 		meta: options.meta,
 		exitCode: 1,
-		nextSteps: ["prisma-cli project link <id-or-name>", "prisma-cli app deploy --project <id-or-name>"]
+		nextSteps: ["prisma-cli project link <id-or-name>"]
 	});
 }
 function toProjectSummary(project) {
@@ -6515,10 +6517,12 @@ function toAbsoluteUrl(url) {
 }
 //#endregion
 //#region src/commands/project/presentation.ts
-const DEPLOY_NEXT_ACTION = {
+/** Deploys come from pushing a connected repository, so the step after
+*  creating or linking a Project is connecting one. */
+const CONNECT_REPO_NEXT_ACTION = {
 	kind: "run-command",
-	label: `${CLI_NAME} app deploy`,
-	command: `${CLI_NAME} app deploy`
+	label: `${CLI_NAME} git connect`,
+	command: `${CLI_NAME} git connect`
 };
 /** The legacy local-pin warnings of `project remove` / `project
 *  transfer`: the operation succeeded, so they are warn diagnostics
@@ -6563,7 +6567,7 @@ function setupPresentations(result) {
 			}
 		],
 		json: () => serializeProjectSetup(result),
-		next: () => [DEPLOY_NEXT_ACTION]
+		next: () => [CONNECT_REPO_NEXT_ACTION]
 	};
 }
 //#endregion
@@ -6810,7 +6814,7 @@ function initPresentations(result, formatCommand) {
 		stdout: () => [result.configPath],
 		next: () => [
 			...typesMissing(result) && result.types.installCommand ? [runCommand(result.types.installCommand)] : [],
-			runCommand(formatCommand(["app", "deploy"])),
+			runCommand(formatCommand(["git", "connect"])),
 			...isLinked(result) ? [] : [runCommand(formatCommand(["project", "link"]))]
 		]
 	};
@@ -9313,7 +9317,7 @@ async function readEnvFileAssignments(cwd, filePath, command) {
 	try {
 		contents = await readFile(resolvedPath, "utf8");
 	} catch (error) {
-		throw usageError(`Failed to read env file "${filePath}"`, error instanceof Error ? error.message : "The file could not be read.", "Pass a readable dotenv file path.", [command === "deploy" ? "prisma-cli app deploy --env .env" : `prisma-cli project env ${command} --file .env --role preview`], "app");
+		throw usageError(`Failed to read env file "${filePath}"`, error instanceof Error ? error.message : "The file could not be read.", "Pass a readable dotenv file path.", [`prisma-cli project env ${command} --file .env --role preview`], "app");
 	}
 	return parseEnvFileContents(contents, filePath, command);
 }
@@ -9365,7 +9369,7 @@ function extractParsedKeys(contents) {
 }
 function validateEnvFileKey(key, line, filePath, command) {
 	try {
-		validateKey(key, command === "deploy" ? "add" : command);
+		validateKey(key, command);
 	} catch (error) {
 		const reason = error instanceof Error && error.message.length > 0 ? error.message : "Invalid environment variable key.";
 		throw usageError(`Invalid environment variable "${key}" in "${filePath}"`, `Line ${line}: ${reason}`, "Use a valid env-var key and retry the import.", [], "app");
@@ -9701,7 +9705,7 @@ async function resolveOrCreateBranch(client, projectId, branchName, signal) {
 		why: "Creating the first branch would make it the project default, but branch overrides are preview-only.",
 		fix: "Create or deploy the default branch first, then add the branch override.",
 		exitCode: 1,
-		nextSteps: ["prisma-cli app deploy --branch main"]
+		nextSteps: ["prisma-cli git connect <repository-url>"]
 	});
 	const { data, error, response } = await client.POST("/v1/projects/{projectId}/branches", {
 		params: { path: { projectId } },
@@ -12053,8 +12057,8 @@ function domainWaitPresentations(result) {
 async function loadComputeConfig$1(cwd, signal) {
 	return loadComputeConfig(cwd, { signal });
 }
-function computeConfigErrorToCliError(error, commandName = "deploy") {
-	const command = `prisma-cli app ${commandName}`;
+function computeConfigErrorToCliError(error, commandName) {
+	const command = `prisma-cli service ${commandName}`;
 	return matchError(error, {
 		ComputeConfigAmbiguousError: (ambiguous) => new CliError({
 			code: "COMPUTE_CONFIG_INVALID",
@@ -14226,6 +14230,52 @@ function runTelemetry(inputs) {
 //#region src/auth/legacy-state.ts
 const LEGACY_PLACEHOLDER_NAME = "Unknown workspace";
 /**
+* The sessions re-serialized in the legacy store's record shape. The
+* 3.x CLI reads `tokens` from auth.json (`data.tokens || []`, silently
+* empty for any other shape), so a write that dropped the key made
+* every session invisible to `@prisma/cli@latest` on the same machine
+* the moment this CLI first mutated the file (#204). Sessions without
+* a refresh token still mirror; the legacy reader skips them, exactly
+* as it skips its own unrefreshable records.
+*/
+function legacyTokensMirror(sessions) {
+	return sessions.map((session) => ({
+		workspaceId: session.workspaceId,
+		token: session.token,
+		...session.refreshToken === void 0 ? {} : { refreshToken: session.refreshToken }
+	}));
+}
+/**
+* Keeps auth.context.json's `activeWorkspaceId` — the pointer the 3.x
+* CLI selects its session with — in step with `currentWorkspaceId`.
+* The rest of the context file (the remembered-workspace name map) is
+* preserved verbatim; only the pointer moves.
+*/
+async function syncLegacyContext(authFilePath, currentWorkspaceId) {
+	const contextFilePath = getAuthContextFilePath(authFilePath);
+	const context = await readLegacyContext(contextFilePath);
+	if (context.exists && context.activeWorkspaceId === currentWorkspaceId) return;
+	if (!context.exists && currentWorkspaceId === null) return;
+	const raw = await fs.readFile(contextFilePath, "utf8").catch(() => null);
+	let workspaces = {};
+	if (raw !== null) try {
+		const parsed = JSON.parse(raw);
+		if (typeof parsed.workspaces === "object" && parsed.workspaces !== null && !Array.isArray(parsed.workspaces)) workspaces = parsed.workspaces;
+	} catch {}
+	const tempPath = `${contextFilePath}.${randomUUID()}.tmp`;
+	const payload = `${JSON.stringify({
+		activeWorkspaceId: currentWorkspaceId,
+		workspaces
+	}, null, 2)}\n`;
+	try {
+		await fs.writeFile(tempPath, payload, "utf8");
+		await fs.rename(tempPath, contextFilePath);
+	} catch (error) {
+		await fs.unlink(tempPath).catch(() => {});
+		throw error;
+	}
+}
+/**
 * The legacy store read as sessions. Pure: adoption never writes, and
 * the legacy files stay untouched until a mutation materializes the
 * adopted set in the new format.
@@ -14412,14 +14462,22 @@ function normalizeSession(session) {
 	};
 }
 /** Temp file in the same directory, fsync, rename, mode 0600 — a reader
-*  only ever sees a complete state. */
+*  only ever sees a complete state. The written file also carries the
+*  legacy `tokens` mirror and the auth.context.json pointer stays in
+*  step, so the 3.x CLI sharing this store keeps seeing the sessions
+*  (#204). Our own reader branches on `sessions` before it ever looks
+*  at `tokens`, so the mirror is invisible to this CLI. */
 async function writeCredentialState(filePath, state) {
 	await fs.mkdir(path.dirname(filePath), { recursive: true });
 	const tempPath = `${filePath}.${randomUUID()}.tmp`;
+	const payload = {
+		...state,
+		tokens: legacyTokensMirror(state.sessions)
+	};
 	try {
 		const handle = await fs.open(tempPath, "wx", FILE_MODE);
 		try {
-			await handle.writeFile(`${JSON.stringify(state, null, 2)}\n`, "utf8");
+			await handle.writeFile(`${JSON.stringify(payload, null, 2)}\n`, "utf8");
 			await handle.sync();
 		} finally {
 			await handle.close();
@@ -14430,6 +14488,7 @@ async function writeCredentialState(filePath, state) {
 		throw error;
 	}
 	await fs.chmod(filePath, FILE_MODE).catch(() => {});
+	await syncLegacyContext(filePath, state.currentWorkspaceId);
 }
 var StateLockTimeoutError = class extends CliStructuredError {
 	constructor(lockPath, waitTimeoutMs) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "8.0.0-rc.5",
+  "version": "8.0.0-rc.5-dev.65",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -40,11 +40,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@prisma/cli-engine": "0.2.0",
-    "@prisma/composer-cli": "0.8.0",
+    "@prisma/composer-cli": "0.9.0-dev.1",
     "@prisma/compute-sdk": "0.39.0",
     "@prisma/credentials-store": "^7.8.0",
     "@prisma/management-api-sdk": "1.55.0",
-    "@prisma/orm-toolchain": "8.0.0-rc.3",
+    "@prisma/orm-toolchain": "8.0.0-rc.3-dev.3",
     "@vercel/detect-agent": "^1.2.3",
     "better-result": "^2.9.2",
     "dotenv": "^17.4.2",
@@ -52,10 +52,10 @@
     "open": "^11.0.0"
   },
   "devDependencies": {
-    "@prisma/composer": "0.8.0",
-    "@repo/cli-conformance": "8.0.0-rc.5",
-    "@repo/cli-telemetry": "8.0.0-rc.5",
-    "@repo/tsconfig": "8.0.0-rc.5",
+    "@prisma/composer": "0.9.0-dev.1",
+    "@repo/cli-conformance": "8.0.0-rc.5-dev.65",
+    "@repo/cli-telemetry": "8.0.0-rc.5-dev.65",
+    "@repo/tsconfig": "8.0.0-rc.5-dev.65",
     "@types/node": "^22.19.19",
     "tsdown": "^0.21.10",
     "tsx": "^4.22.4",