pennyrouter 0.1.12 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pennyrouter",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "description": "Install and manage PennyRouter local coding-agent integrations.",
   "homepage": "https://pennyrouter.com",
   "bugs": {

package/src/cli.js

@@ -1,4 +1,4 @@
-import { spawnSync } from "node:child_process";
+import { spawn, spawnSync } from "node:child_process";
 import { emitKeypressEvents } from "node:readline";
 import { createInterface } from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
@@ -234,6 +234,41 @@ function readAnthropicOAuthToken(flags = {}) {
   return { token: normalizeAnthropicToken(result.stdout), source: "ant" };
 }
 
+// ANSI/CSI escape sequences that `claude setup-token`'s TUI emits (colors, cursor
+// moves, bracketed-paste). We strip these before scanning for the token so a match
+// isn't split by control bytes. Kept deliberately broad.
+// eslint-disable-next-line no-control-regex
+const ANSI_ESCAPE_RE = /\x1b\[[0-9;?]*[ -/]*[@-~]/g;
+// The token line printed by `claude setup-token`. Match any sk-ant-* token so we don't
+// depend on the exact variant/version (e.g. sk-ant-oat01-...).
+const ANTHROPIC_SETUP_TOKEN_RE = /sk-ant-[A-Za-z0-9_-]+/;
+
+// Run `claude setup-token` inline and extract the token it prints. The command is a
+// full-screen TUI (ANSI art + banner) that also prints the real token on a line like
+// "sk-ant-oat01-...". We pipe stdout so we can read it, but tee every chunk straight
+// back to the terminal so the user still sees the whole flow (including "you won't be
+// able to see it again"). stdin/stderr inherit the TTY for the interactive parts. After
+// exit we ANSI-strip the captured stdout and regex out the token. Returns "" on
+// non-zero exit or if no token line was found, so the caller falls back to paste.
+function runClaudeSetupToken() {
+  return new Promise((resolve) => {
+    let captured = "";
+    const child = spawn("claude", ["setup-token"], {
+      stdio: ["inherit", "pipe", "inherit"],
+    });
+    child.stdout.on("data", (chunk) => {
+      captured += chunk.toString("utf8");
+      output.write(chunk); // tee: keep the TUI visible to the user
+    });
+    child.on("error", () => resolve(""));
+    child.on("close", (code) => {
+      if (code !== 0) return resolve("");
+      const match = captured.replace(ANSI_ESCAPE_RE, "").match(ANTHROPIC_SETUP_TOKEN_RE);
+      resolve(match ? match[0] : "");
+    });
+  });
+}
+
 function normalizeAnthropicToken(value) {
   let text = String(value || "").trim();
   if (!text) return "";
@@ -373,7 +408,17 @@ async function maybeConfigureClaudeAnthropicAuth(flags, selected) {
 
   console.log("");
   if (commandExists("claude")) {
-    console.log("Run `claude setup-token` in another terminal, then paste the token here.");
+    // The user already opted into subscription auth above, so run `claude setup-token`
+    // directly and capture the token — no copy-paste, no second confirm. The command
+    // opens the browser for approval inline. On failure we fall through to manual paste.
+    console.log("Launching `claude setup-token` — approve in your browser when prompted.");
+    const captured = await runClaudeSetupToken();
+    if (captured) {
+      console.log("");
+      return { token: captured, source: "setup-token" };
+    }
+    console.log("");
+    console.log("Couldn't capture a token automatically. Paste it below, or leave blank to skip.");
   } else {
     console.log("Claude Code was not found on PATH. Paste an Anthropic bearer token, or leave blank to skip.");
   }

package/src/statusline.js

@@ -72,7 +72,9 @@ export async function restoreClaudeCodeStatusline(current) {
 // free and fast: read stdin, print from cache, refresh out-of-band.
 const STATUSLINE_SCRIPT = `#!/usr/bin/env node
 // PennyRouter statusline for Claude Code (installed by \`pennyrouter install\`).
-// Prints: [wrapped original statusline |] penny segment (managed model / BYPASS / off).
+// Prints: [wrapped original statusline (all lines) |] penny segment (penny / penny (sub)
+// / penny (byok) / penny off). The wrapped statusline's first line gets the penny suffix;
+// any further lines (e.g. a context bar) pass through verbatim.
 // Never blocks on the network: reads a per-session cache and refreshes it detached.
 import { readFileSync, mkdirSync, writeFileSync, statSync } from "node:fs";
 import { spawn, spawnSync } from "node:child_process";
@@ -137,33 +139,40 @@ if (sessionId && pennyInstalled && cacheAge > refreshMs) {
   }).unref();
 }
 
-function shortModel(m) {
-  if (typeof m !== "string" || !m) return "";
-  return m.split("/").pop().replace(/^claude-/, "");
+// Auth tier suffix: only "sub"/"byok" are shown (penny-tier and unknown render bare).
+function authSuffix(mode) {
+  return mode === "sub" || mode === "byok" ? " (" + mode + ")" : "";
 }
 
 let penny;
 if (!pennyInstalled) {
   penny = "🪙 penny off";
 } else if (cache && cache.known && cache.bypass) {
-  penny = "🪙 penny BYPASS";
-} else if (cache && cache.known && cache.model) {
-  penny = "🪙 penny · " + shortModel(cache.model);
+  penny = "🪙 penny off";
 } else {
-  penny = "🪙 penny on";
+  penny = "🪙 penny" + authSuffix(cache && cache.auth_mode);
 }
 
-let prefix = "";
+// Wrap the underlying statusline (e.g. ccstatusline) and append the penny segment to
+// its FIRST line only, preserving every subsequent line verbatim (the Context bar and
+// any other rows). Taking only line [0] here is what dropped multi-line statuslines.
+let lines;
 if (config.wrap_command) {
   const run = spawnSync(config.wrap_command, {
     shell: true, input: raw, encoding: "utf8", timeout: 1500,
   });
-  prefix = (run.stdout || "").split("\\n")[0].trim();
+  lines = (run.stdout || "").replace(/\\n$/, "").split("\\n");
+  if (lines.length === 1 && lines[0] === "") lines = [];
 } else {
   const model = input.model?.display_name || "";
   const dir = input.workspace?.current_dir ? basename(input.workspace.current_dir) : "";
-  prefix = [model, dir].filter(Boolean).join(" · ");
+  lines = [[model, dir].filter(Boolean).join(" · ")].filter(Boolean);
 }
 
-console.log(prefix ? prefix + " | " + penny : penny);
+if (lines.length === 0) {
+  console.log(penny);
+} else {
+  lines[0] = lines[0].trimEnd() + " | " + penny;
+  console.log(lines.join("\\n"));
+}
 `;