@prisma/cli 8.0.0-rc.15-dev.114 → 8.0.0-rc.16-dev.120

package/dist/cli.js

@@ -1168,19 +1168,19 @@ async function login(options = {}) {
 				if (completed) {
 					const workspaceName = await state.resolveWorkspaceName();
 					res.setHeader("Content-Type", "text/html; charset=utf-8");
-					res.end(renderSuccessPage(workspaceName));
+					res.end(renderSuccessPage(workspaceName, options.uiContext));
 					return;
 				}
 				try {
 					await completeOnce(url);
 					const workspaceName = await state.resolveWorkspaceName();
 					res.setHeader("Content-Type", "text/html; charset=utf-8");
-					res.end(renderSuccessPage(workspaceName));
+					res.end(renderSuccessPage(workspaceName, options.uiContext));
 					settle(resolve);
 				} catch (error) {
 					res.statusCode = 400;
 					res.setHeader("Content-Type", "text/plain; charset=utf-8");
-					res.end("Sign-in could not be completed. Return to your terminal.");
+					res.end(options.uiContext === "prisma-plugin" ? "Sign-in couldn’t be completed. Return to your ChatGPT conversation to try again." : "Sign-in could not be completed. Return to your terminal.");
 					settle(() => reject(error));
 					return;
 				}
@@ -1338,7 +1338,9 @@ var LoginState = class {
 		return `${this.options.hostname}:${this.options.port}`;
 	}
 };
-function renderSuccessPage(workspaceName) {
+function renderSuccessPage(workspaceName, uiContext) {
+	let body = workspaceName ? `Your terminal is now connected to your ${escapeHtml(workspaceName)} workspace. Head back to your terminal to continue.` : "Your terminal is now connected to your Prisma workspace. Head back to your terminal to continue.";
+	if (uiContext === "prisma-plugin") body = "You’re connected to Prisma. Return to your ChatGPT conversation.";
 	return `<!doctype html>
 <html lang="en">
 <head>
@@ -1512,8 +1514,8 @@ function renderSuccessPage(workspaceName) {
   <svg class="mark" width="36" height="36" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="M25.21,24.21,12.739,27.928a.525.525,0,0,1-.667-.606L16.528,5.811a.43.43,0,0,1,.809-.094l8.249,17.661A.6.6,0,0,1,25.21,24.21Zm2.139-.878L17.8,2.883h0A1.531,1.531,0,0,0,16.491,2a1.513,1.513,0,0,0-1.4.729L4.736,19.648a1.592,1.592,0,0,0,.018,1.7l5.064,7.909a1.628,1.628,0,0,0,1.83.678l14.7-4.383a1.6,1.6,0,0,0,1-2.218Z" style="fill:#0c344b;fill-rule:evenodd"/></svg>
   <main>
     <h1>You're all set.</h1>
-    <p>${workspaceName ? `Your terminal is now connected to your ${escapeHtml(workspaceName)} workspace. Head back to your terminal to continue.` : "Your terminal is now connected to your Prisma workspace. Head back to your terminal to continue."}</p>
-    <section class="skills">
+    <p>${body}</p>
+    ${uiContext === "prisma-plugin" ? "" : `<section class="skills">
       <div class="skills-lead">
         <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M9.937 15.5A2 2 0 0 0 8.5 14.063l-6.135-1.582a.5.5 0 0 1 0-.962L8.5 9.936A2 2 0 0 0 9.937 8.5l1.582-6.135a.5.5 0 0 1 .963 0L14.063 8.5A2 2 0 0 0 15.5 9.937l6.135 1.581a.5.5 0 0 1 0 .964L15.5 14.063a2 2 0 0 0-1.437 1.437l-1.582 6.135a.5.5 0 0 1-.963 0z"/><path d="M20 3v4"/><path d="M22 5h-4"/></svg>
         Using an AI coding agent? Add the Prisma skills:
@@ -1526,9 +1528,9 @@ function renderSuccessPage(workspaceName) {
         </button>
       </div>
       <span class="visually-hidden skills-status" role="status"></span>
-    </section>
+    </section>`}
   </main>
-  <script>
+  ${uiContext === "prisma-plugin" ? "" : `<script>
     (() => {
       const command = "npx skills add prisma/skills";
       const button = document.querySelector(".copy");
@@ -1557,7 +1559,7 @@ function renderSuccessPage(workspaceName) {
         }, 2000);
       });
     })();
-  <\/script>
+  <\/script>`}
 </body>
 </html>`;
 }
@@ -1598,7 +1600,8 @@ async function performLogin(env, signal, options) {
 		tokenStorage,
 		env,
 		signal,
-		onVerificationUrl: options?.onVerificationUrl
+		onVerificationUrl: options?.onVerificationUrl,
+		uiContext: options?.uiContext
 	});
 	const tokens = tokenStorage.tokens;
 	if (!tokens) throw new AuthError$1("Sign-in finished without producing a credential.");
@@ -3449,12 +3452,16 @@ function presentationsFor$2(spec, result) {
 }
 const authLoginCommand = defineCommand({
 	managesCredentials: true,
+	args: { flags: { uiContext: flag.enum({
+		values: ["prisma-plugin"],
+		brief: "Show browser completion guidance for the Prisma plugin in ChatGPT (default: terminal guidance)"
+	}) } },
 	help: {
 		summary: "Log in to your Prisma platform account",
 		description: "Opens a browser sign-in and stores a session for one workspace, the account-level container that holds your Projects. Run it again to add a session for another workspace; 'auth workspace use' switches between stored sessions. In CI or other non-interactive environments, skip login and set PRISMA_SERVICE_TOKEN instead.",
 		examples: ["auth login"]
 	},
-	handler: async (_args, ctx) => {
+	handler: async (args, ctx) => {
 		const environmentSession = environmentCredentialInForce(ctx.env);
 		ctx.report({
 			kind: "step-started",
@@ -3462,11 +3469,14 @@ const authLoginCommand = defineCommand({
 		});
 		let session;
 		try {
-			const credential = await performLogin(ctx.env, ctx.signal, { onVerificationUrl: (url) => ctx.report({
-				kind: "endpoint",
-				name: "verification",
-				url
-			}) });
+			const credential = await performLogin(ctx.env, ctx.signal, {
+				uiContext: args.flags.uiContext,
+				onVerificationUrl: (url) => ctx.report({
+					kind: "endpoint",
+					name: "verification",
+					url
+				})
+			});
 			const workspaceId = credentialWorkspaceId(credential.token);
 			if (workspaceId === void 0) throw loginWorkspaceUnknownError();
 			session = await ctx.credentialManager.createSession(credential, workspaceId);
@@ -14732,13 +14742,38 @@ function memoizedConfigLoader(proc) {
 		return load;
 	};
 }
-async function assembleRuntime(proc) {
-	const stdin = {
+/**
+* The engine returns the iterator when it has finished prompting. Node's
+* stdin iterator cannot honour that while it is awaiting a keystroke,
+* and a terminal being read keeps the process alive, so the adapter
+* unrefs stdin itself and settles at once. The underlying return is
+* left to complete whenever it can, and the next run refs stdin again
+* before it reads.
+*/
+function makeStdin(proc) {
+	return {
 		setRawMode: proc.stdin.isTTY === true && proc.stdin.setRawMode !== void 0 ? (enabled) => {
 			proc.stdin.setRawMode?.(enabled);
 		} : void 0,
-		[Symbol.asyncIterator]: () => proc.stdin[Symbol.asyncIterator]()
+		[Symbol.asyncIterator]: () => {
+			proc.stdin.ref?.();
+			const chunks = proc.stdin[Symbol.asyncIterator]();
+			return {
+				next: () => chunks.next(),
+				return: async () => {
+					proc.stdin.unref?.();
+					chunks.return?.()?.catch(() => {});
+					return {
+						done: true,
+						value: void 0
+					};
+				}
+			};
+		}
 	};
+}
+async function assembleRuntime(proc) {
+	const stdin = makeStdin(proc);
 	warnOnDeprecatedStateFileEnvVar(proc);
 	const apiBaseUrl = getApiBaseUrl(proc.env);
 	const authBaseUrl = getAuthBaseUrl(proc.env);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prisma/cli",
-  "version": "8.0.0-rc.15-dev.114",
+  "version": "8.0.0-rc.16-dev.120",
   "description": "Command-line interface for the Prisma Developer Platform.",
   "type": "module",
   "bin": {
@@ -40,11 +40,11 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@manypkg/tools": "^2.1.2",
-    "@prisma/cli-engine": "0.6.0",
-    "@prisma/composer-cli": "0.21.0-dev.2",
+    "@prisma/cli-engine": "0.6.1",
+    "@prisma/composer-cli": "0.22.0-dev.1",
     "@prisma/compute-sdk": "0.42.0",
     "@prisma/management-api-sdk": "1.69.0",
-    "@prisma/orm-toolchain": "8.0.0-rc.11-dev.38",
+    "@prisma/orm-toolchain": "8.0.0-rc.11-dev.55",
     "@vercel/detect-agent": "^1.2.3",
     "better-result": "^2.9.2",
     "cross-spawn": "^7.0.6",
@@ -53,11 +53,11 @@
     "open": "^11.0.0"
   },
   "devDependencies": {
-    "@prisma/composer": "0.21.0-dev.2",
+    "@prisma/composer": "0.22.0-dev.1",
     "@prisma/credentials-store": "^7.8.0",
-    "@repo/cli-conformance": "8.0.0-rc.15-dev.114",
-    "@repo/cli-telemetry": "8.0.0-rc.15-dev.114",
-    "@repo/tsconfig": "8.0.0-rc.15-dev.114",
+    "@repo/cli-conformance": "8.0.0-rc.16-dev.120",
+    "@repo/cli-telemetry": "8.0.0-rc.16-dev.120",
+    "@repo/tsconfig": "8.0.0-rc.16-dev.120",
     "@types/node": "^22.19.19",
     "@types/cross-spawn": "^6.0.6",
     "tsdown": "^0.21.10",