primcli 1.69.0 → 1.70.0

package/dist/oclif/index.js

@@ -44956,7 +44956,7 @@ const PRIMITIVE_TEAM_AUTHOR = {
 	url: "https://primitive.dev"
 };
 const SDK_VERSION_RANGE = "^2.0.0";
-const CLI_VERSION_RANGE = "^1.69.0";
+const CLI_VERSION_RANGE = "^1.70.0";
 const ESBUILD_VERSION_RANGE = "^0.27.0";
 function renderHandler() {
 	return `// env.PRIMITIVE_API_KEY, env.PRIMITIVE_WEBHOOK_SECRET, and
@@ -50376,14 +50376,7 @@ var ListenPendingCommand = class ListenPendingCommand extends Command {
 	}
 };
 //#endregion
-//#region src/oclif/commands/login.ts
-const MAX_CLI_LOGIN_POLL_INTERVAL_SECONDS = 60;
-function cliError$3(message) {
-	return new Errors.CLIError(message, { exit: 1 });
-}
-function sleep(ms) {
-	return new Promise((resolve) => setTimeout(resolve, ms));
-}
+//#region src/oclif/browser-login-prompt.ts
 function openBrowser(url) {
 	const command = process.platform === "darwin" ? "open" : process.platform === "win32" ? "cmd" : "xdg-open";
 	const args = process.platform === "win32" ? [
@@ -50399,6 +50392,143 @@ function openBrowser(url) {
 	child.on("error", () => void 0);
 	child.unref();
 }
+/**
+* The copy-URL hotkey needs raw keypresses from a terminal and a terminal
+* to show the hint on. Anything else (CI, agents, piped output) gets the
+* plain URL and never blocks on input.
+*/
+function canOfferCopyHotkey(input, output) {
+	return Boolean(input.isTTY && output.isTTY && typeof input.setRawMode === "function");
+}
+function formatBrowserLoginInstructions(params) {
+	const { copyHotkey, openedBrowser, start } = params;
+	const copyHint = copyHotkey ? " (c to copy)" : "";
+	const lines = [`Your sign-in code is: ${start.user_code}`];
+	if (openedBrowser) lines.push("Opening Primitive in your browser...", "", `Browser didn't open, or want a different one? Use this URL${copyHint}:`);
+	else lines.push("", `Open this URL in any browser to sign in${copyHint}:`);
+	lines.push(`  ${start.verification_uri_complete}`);
+	if (start.verification_uri !== start.verification_uri_complete) lines.push(`On another device, go to ${start.verification_uri} and enter ${start.user_code}.`);
+	lines.push("");
+	return `${lines.join("\n")}\n`;
+}
+/**
+* OSC 52 asks the terminal emulator itself to set the clipboard, so it
+* works over SSH, where a local clipboard command would copy on the
+* remote host instead of the machine the user is sitting at.
+*/
+function osc52Sequence(text) {
+	return `\u001b]52;c;${Buffer.from(text, "utf8").toString("base64")}\u0007`;
+}
+function nativeClipboardCommand() {
+	if (process.env.SSH_CONNECTION || process.env.SSH_TTY) return null;
+	if (process.platform === "darwin") return ["pbcopy", []];
+	if (process.platform === "win32") return ["clip", []];
+	if (process.env.WAYLAND_DISPLAY) return ["wl-copy", []];
+	if (process.env.DISPLAY) return ["xclip", ["-selection", "clipboard"]];
+	return null;
+}
+/**
+* Resolves false on any failure, including a tool that exits before
+* reading its input (EPIPE on stdin), so the caller falls back to OSC 52
+* instead of the error taking down login.
+*/
+function runClipboardCommand(command, args, text) {
+	return new Promise((resolve) => {
+		let inputFailed = false;
+		const child = spawn(command, args, { stdio: [
+			"pipe",
+			"ignore",
+			"ignore"
+		] });
+		child.on("error", () => resolve(false));
+		child.stdin.on("error", () => {
+			inputFailed = true;
+		});
+		child.on("close", (code) => resolve(code === 0 && !inputFailed));
+		child.stdin.end(text);
+	});
+}
+function copyWithNativeClipboard(text) {
+	const command = nativeClipboardCommand();
+	if (!command) return Promise.resolve(false);
+	return runClipboardCommand(command[0], command[1], text);
+}
+/**
+* Copies via the native clipboard when running locally and always emits
+* OSC 52 as well. Terminals without OSC 52 support (macOS Terminal.app)
+* are covered by the native path; SSH sessions are covered by OSC 52.
+*/
+async function copyToClipboard(text, output, native = copyWithNativeClipboard) {
+	output.write(osc52Sequence(text));
+	return await native(text) ? "native" : "terminal";
+}
+const CTRL_C = "";
+const CTRL_Z = "";
+/**
+* Listens for `c` while the CLI polls for browser approval. Raw mode turns
+* Ctrl+C and Ctrl+Z into plain input, so they are handled here: Ctrl+C is
+* re-raised as SIGINT, and Ctrl+Z restores the terminal, suspends with
+* SIGTSTP, and re-enters raw mode on SIGCONT. Several keys can arrive in
+* one chunk (pastes, SSH), so every character is checked. Returns a
+* disposer that restores the terminal.
+*/
+function listenForCopyHotkey(params) {
+	const { input, output, url } = params;
+	const copy = params.copy ?? copyToClipboard;
+	let disposed = false;
+	const copyUrl = () => {
+		copy(url, output).then((how) => {
+			if (disposed) return;
+			output.write(how === "native" ? "Copied the sign-in URL to your clipboard.\n" : "Sent the sign-in URL to your terminal's clipboard. If nothing was copied, select the URL above instead.\n");
+		});
+	};
+	const onContinue = () => {
+		if (!disposed) input.setRawMode?.(true);
+	};
+	const suspend = () => {
+		input.setRawMode?.(false);
+		process.once("SIGCONT", onContinue);
+		process.kill(process.pid, "SIGTSTP");
+	};
+	const onData = (chunk) => {
+		let wantsCopy = false;
+		for (const key of chunk.toString()) {
+			if (key === CTRL_C) {
+				dispose();
+				process.kill(process.pid, "SIGINT");
+				return;
+			}
+			if (key === CTRL_Z && process.platform !== "win32") {
+				if (wantsCopy) copyUrl();
+				suspend();
+				return;
+			}
+			if (key === "c" || key === "C") wantsCopy = true;
+		}
+		if (wantsCopy) copyUrl();
+	};
+	const dispose = () => {
+		if (disposed) return;
+		disposed = true;
+		input.off("data", onData);
+		process.off("SIGCONT", onContinue);
+		input.setRawMode?.(false);
+		input.pause();
+	};
+	input.setRawMode?.(true);
+	input.on("data", onData);
+	input.resume();
+	return dispose;
+}
+//#endregion
+//#region src/oclif/commands/login.ts
+const MAX_CLI_LOGIN_POLL_INTERVAL_SECONDS = 60;
+function cliError$3(message) {
+	return new Errors.CLIError(message, { exit: 1 });
+}
+function sleep(ms) {
+	return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function unwrapData$2(value) {
 	return value?.data ?? null;
 }
@@ -50584,22 +50714,34 @@ var LoginCommand$1 = class extends Command {
 		}
 		const start = unwrapData$2(started.data);
 		if (!start) throw cliError$3("Primitive API returned an empty CLI login response.");
-		process.stderr.write(`Your sign-in code is: ${start.user_code}\n`);
-		if (!flags["no-browser"]) {
-			openBrowser(start.verification_uri_complete);
-			process.stderr.write("Opening Primitive in your browser...\n");
-		}
-		process.stderr.write(`If the browser did not open, visit: ${start.verification_uri_complete}\n`);
-		process.stderr.write("Waiting for browser approval...\n");
-		const login = await pollCliLoginUntilApproved({
-			poll: (deviceCode) => pollCliLogin({
-				body: { device_code: deviceCode },
-				client: apiClient.client,
-				responseStyle: "fields"
-			}),
-			retryCommand,
+		const openedBrowser = !flags["no-browser"];
+		if (openedBrowser) openBrowser(start.verification_uri_complete);
+		const copyHotkey = canOfferCopyHotkey(process.stdin, process.stderr);
+		const stopCopyHotkey = copyHotkey ? listenForCopyHotkey({
+			input: process.stdin,
+			output: process.stderr,
+			url: start.verification_uri_complete
+		}) : () => void 0;
+		process.stderr.write(formatBrowserLoginInstructions({
+			copyHotkey,
+			openedBrowser,
 			start
-		});
+		}));
+		process.stderr.write("Waiting for browser approval...\n");
+		let login;
+		try {
+			login = await pollCliLoginUntilApproved({
+				poll: (deviceCode) => pollCliLogin({
+					body: { device_code: deviceCode },
+					client: apiClient.client,
+					responseStyle: "fields"
+				}),
+				retryCommand,
+				start
+			});
+		} finally {
+			stopCopyHotkey();
+		}
 		deleteChatState(this.config.configDir);
 		saveCliCredentials(this.config.configDir, {
 			access_token: login.access_token,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primcli",
-  "version": "1.69.0",
+  "version": "1.70.0",
   "description": "Official Primitive CLI: deploy Primitive Functions, send and inspect mail, manage endpoints, all from the terminal. Wraps the @primitivedotdev/sdk runtime client with one-shot commands.",
   "type": "module",
   "sideEffects": false,