@amdahl/cli 0.3.2 → 0.3.3

package/README.md

@@ -68,6 +68,7 @@ Set up in:
   [ ] Codex
 (Use the arrow keys, Space to tick or untick, then Enter)
 Opening your browser…
+Browser didn't open? Press Enter for the link.
 ✓ Signed in · Acme
 ✓ Added to Claude Code
 Try it: in Claude Code, run /mcp once to connect, then say "make this email sound less like AI"
@@ -76,10 +77,16 @@ Try it: in Claude Code, run /mcp once to connect, then say "make this email soun
 It finds Claude Code, Cursor and Codex by their command on your PATH
 (`claude`, `cursor`, `codex`) or their folder in your home folder (`.claude`,
 `.cursor`, `.codex`), and ticks the ones it finds. Enter accepts. If you are
-not signed in, it signs you in through the browser first. It prints the
-sign-in link only if the browser could not be opened, or nothing came back
-within a minute, and it waits up to 15 minutes, so someone new can create
-their workspace on the way and land back in the same setup. If the server
+not signed in, it signs you in through the browser first. Under "Opening
+your browser…" it prints one short line. In a terminal that shows links
+(iTerm2, VS Code, Warp, Terminal, WezTerm, Ghostty, Windows Terminal, VTE 0.50
+or later) it reads "Browser didn't open? Open the sign-in page" and the last
+words are a link; elsewhere it says to press Enter for the link.
+`FORCE_HYPERLINK=1` or `0` overrides the guess, and `NO_COLOR` turns the link
+off. Either way, Enter prints the full sign-in link once. If the browser
+could not be opened, or with `--no-browser`, the full link prints at once.
+It waits up to 15 minutes, so someone new can create their workspace on the
+way and land back in the same setup. If the server
 rejects a key set in
 `AMDAHL_KEY` (or `AMDAHL_API_KEY`, `AMDAHL_ACCESS_TOKEN`, `--api-key`), it says
 so and skips the browser sign-in, since that key would still win. Then it

package/dist/amdahl.js

@@ -7478,6 +7478,42 @@ function multiSelectMenu(input, output, question, choices, options = {}) {
     return "redraw";
   });
 }
+function listenForEnter(input, onEnter, onCancel) {
+  const wasRaw = input.isRaw === true;
+  let done = false;
+  const stop = () => {
+    if (done) return;
+    done = true;
+    input.removeListener("keypress", onKeypress);
+    input.removeListener("error", stop);
+    process.removeListener("SIGINT", cancel);
+    try {
+      input.setRawMode?.(wasRaw);
+    } catch {
+    }
+    input.pause();
+  };
+  const cancel = () => {
+    if (done) return;
+    stop();
+    onCancel();
+  };
+  const onKeypress = (_text, key) => {
+    if (key?.ctrl && key.name === "c") cancel();
+    else if (key?.name === "return" || key?.name === "enter") onEnter();
+  };
+  try {
+    emitKeypressEvents(input);
+    input.setRawMode?.(true);
+    input.on("keypress", onKeypress);
+    input.on("error", stop);
+    process.on("SIGINT", cancel);
+    input.resume();
+  } catch {
+    stop();
+  }
+  return stop;
+}
 
 // src/io.ts
 var PromptCancelled = class extends Error {
@@ -7563,6 +7599,7 @@ function realIo() {
       ...options,
       trueColor: /^(truecolor|24bit)$/i.test(process.env.COLORTERM ?? "")
     }),
+    listenForEnter: (onEnter, onCancel) => listenForEnter(process.stdin, onEnter, onCancel),
     uninterruptible,
     run: runProcess,
     openUrl: async (url) => {
@@ -7576,7 +7613,6 @@ function realIo() {
     now: () => Date.now(),
     sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
     loginTimeoutMs: 9e5,
-    browserGraceMs: 6e4,
     fetchTimeoutMs: 15e3
   };
 }
@@ -8545,6 +8581,18 @@ var CONTROL_RE = /[\u0000-\u001f\u007f-\u009f]/g;
 function printable(text2) {
   return text2.replace(CONTROL_RE, "");
 }
+var HYPERLINK_TERMINALS = /* @__PURE__ */ new Set(["iTerm.app", "vscode", "WarpTerminal", "Apple_Terminal", "WezTerm", "ghostty"]);
+function supportsHyperlinks(env, color) {
+  if (env.FORCE_HYPERLINK === "0") return false;
+  if (env.FORCE_HYPERLINK === "1") return true;
+  if (!color) return false;
+  if (HYPERLINK_TERMINALS.has(env.TERM_PROGRAM ?? "")) return true;
+  if (Number(env.VTE_VERSION) >= 5e3) return true;
+  return Boolean(env.WT_SESSION);
+}
+function hyperlink(text2, url) {
+  return `\x1B]8;;${printable(url)}\x1B\\${text2}\x1B]8;;\x1B\\`;
+}
 function createOutput(io, json, noColor) {
   const color = !noColor && !io.env.NO_COLOR && io.env.TERM !== "dumb" && io.stderrIsTTY && !json;
   return {
@@ -8593,7 +8641,8 @@ async function browserSignIn(ctx) {
   const endpoints = await discover(ctx.apiUrl);
   const pkce = createPkce();
   const consoleUrl = consoleUrlFor(io, ctx.apiUrl);
-  let timer;
+  let stopKeys = () => {
+  };
   let linkShown = false;
   const loopback = await startLoopback(io, {
     port,
@@ -8602,7 +8651,6 @@ async function browserSignIn(ctx) {
     timeoutMs: io.loginTimeoutMs,
     // The page carries the way on; the authorize link would only sign in as the same address again.
     onSignInAgain: (reason, retry) => {
-      clearTimeout(timer);
       linkShown = true;
       out.info(signInAgainLine(reason, retry));
     }
@@ -8619,18 +8667,27 @@ async function browserSignIn(ctx) {
   ${url}
 `);
     };
+    let cancelled;
     if (flags["no-browser"]) {
       showLink("Open this URL in a browser to sign in:");
     } else {
       out.info("Opening your browser\u2026");
+      if (!ctx.nonInteractive && io.stderrIsTTY) {
+        const fallback = supportsHyperlinks(io.env, out.color) ? hyperlink("Open the sign-in page", url) : "Press Enter for the link.";
+        out.info(`Browser didn't open? ${fallback}`);
+        cancelled = new Promise((_, reject) => {
+          stopKeys = io.listenForEnter(
+            () => showLink("Open this link to sign in:"),
+            () => reject(new PromptCancelled())
+          );
+        });
+      }
       void io.openUrl(url).then((opened) => {
         if (!opened) showLink("Your browser did not open. Open this link to sign in:");
       });
-      timer = setTimeout(() => showLink("Finish in your browser, or open this link:"), io.browserGraceMs);
-      timer.unref?.();
     }
-    const callback = await loopback.result;
-    clearTimeout(timer);
+    const callback = await (cancelled ? Promise.race([loopback.result, cancelled]) : loopback.result);
+    stopKeys();
     linkShown = true;
     if (callback.kind === "no_business") {
       throw new CliError("no_business", noBusinessMessage(consoleUrl, callback.mayCreate, callback.reason), EXIT.noWorkspace);
@@ -8664,7 +8721,7 @@ async function browserSignIn(ctx) {
     ctx.saveConfig();
     return { profile: name, me, workspace: ws };
   } finally {
-    clearTimeout(timer);
+    stopKeys();
     loopback.close();
   }
 }
@@ -10363,7 +10420,7 @@ async function workspaceUse(ctx, args) {
 }
 
 // src/version.ts
-var VERSION = "0.3.2";
+var VERSION = "0.3.3";
 
 // src/main.ts
 var COMMANDS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amdahl/cli",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "type": "module",
   "description": "The amdahl command line: sign in, check setup, optimize messages, manage API keys, connect MCP clients.",
   "license": "Apache-2.0",