@emesoft/tokenhub 0.8.2 → 0.8.4

package/bin/tokenhub.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { readFileSync } from "node:fs";
 import { adminConfigPath, removeAdminConfig } from "../lib/admin.js";
-import { showBanner } from "../lib/banner.js";
+import { isInteractive, showBanner } from "../lib/banner.js";
 import { parseDashboardArgs, runDashboard } from "../lib/dashboard.js";
 import { runOverlayInstall } from "../lib/overlay.js";
 import { promptTenant, runConnect, TENANT_DOMAIN } from "../lib/pair.js";
@@ -53,6 +53,9 @@ async function main(argv) {
   }
   const file = settingsPath();
   if (command === "connect") {
+    if (isInteractive()) {
+      await showBanner({ showActions: false });
+    }
     const controller = new AbortController();
     process.once("SIGINT", () => controller.abort());
     let poolUrl = arg;

package/lib/banner.d.ts

@@ -1,6 +1,7 @@
 export interface BannerOptions {
   stream?: NodeJS.WriteStream;
   animate?: boolean;
+  showActions?: boolean;
 }
 
 export function isInteractive(stream?: NodeJS.WriteStream): boolean;

package/lib/banner.js

@@ -6,7 +6,6 @@ const TOKEN_COLOR = "\x1b[38;5;39;1m"; // Electric cyan bold
 const HUB_COLOR = "\x1b[38;5;208;1m";   // TokenHub warm amber/clay bold
 const CYAN = "\x1b[38;5;39m";
 const MUTED = "\x1b[38;5;244m";
-const GREEN = "\x1b[38;5;114m";
 const RESET = "\x1b[0m";
 const BOLD = "\x1b[1m";
 
@@ -25,15 +24,15 @@ export const LOGO_PARTS = [
   },
   {
     token: "     ██║   ██║   ██║██╔═██╗ ██╔══╝  ██║╚██╗██║",
-    hub:   "██╔══██║██║   ██║██╔═══╝ ",
+    hub:   "██╔══██║██║   ██║██╔══██╗",
   },
   {
     token: "     ██║   ╚██████╔╝██║  ██╗███████╗██║ ╚████║",
-    hub:   "██║  ██║╚██████╔╝██║     ",
+    hub:   "██║  ██║╚██████╔╝██████╔╝",
   },
   {
     token: "     ╚═╝    ╚═════╝ ╚═╝  ╚═╝╚══════╝╚═╝  ╚═══╝",
-    hub:   "╚═╝  ╚═╝ ╚═════╝ ╚═╝     ",
+    hub:   "╚═╝  ╚═╝ ╚═════╝ ╚═════╝ ",
   },
 ];
 
@@ -72,9 +71,10 @@ export function isInteractive(stream = process.stdout) {
  * @param {object} [options]
  * @param {NodeJS.WriteStream} [options.stream]
  * @param {boolean} [options.animate]
+ * @param {boolean} [options.showActions]
  * @returns {Promise<void>}
  */
-export async function showBanner({ stream = process.stdout, animate } = {}) {
+export async function showBanner({ stream = process.stdout, animate, showActions = true } = {}) {
   const interactive = animate ?? isInteractive(stream);
   const color = !process.env.NO_COLOR && (interactive || Boolean(stream?.isTTY));
 
@@ -91,8 +91,10 @@ export async function showBanner({ stream = process.stdout, animate } = {}) {
     stream.write("\n");
     stream.write(color ? `${CYAN}${SUBTITLE}${RESET}\n` : `${SUBTITLE}\n`);
     stream.write(color ? `${MUTED}${DIVIDER}${RESET}\n` : `${DIVIDER}\n`);
-    for (const action of ACTIONS) {
-      stream.write(color ? `${action}\n` : `${action.replace(/\x1b\[[0-9;]*m/g, "")}\n`);
+    if (showActions) {
+      for (const action of ACTIONS) {
+        stream.write(color ? `${action}\n` : `${action.replace(/\x1b\[[0-9;]*m/g, "")}\n`);
+      }
     }
     stream.write("\n");
     return;
@@ -103,12 +105,6 @@ export async function showBanner({ stream = process.stdout, animate } = {}) {
 
   // Draw the logo lines progressively with a smooth typewriter scan
   for (const row of LOGO_PARTS) {
-    const tokenPart = `${TOKEN_COLOR}${row.token}`;
-    const hubPart = `${HUB_COLOR}${row.hub}${RESET}\n`;
-
-    // Progressive character scan per line
-    const fullLine = `${tokenPart}${hubPart}`;
-    // Split into 4 chunks per line for high-tech sweep effect
     const chunkSize = 16;
     let idx = 0;
     while (idx < row.token.length) {
@@ -146,12 +142,13 @@ export async function showBanner({ stream = process.stdout, animate } = {}) {
     await sleep(8);
   }
   stream.write(`${RESET}\n`);
-  await sleep(40);
 
-  // Quick actions lines
-  for (const action of ACTIONS) {
-    stream.write(`${action}\n`);
+  if (showActions) {
     await sleep(40);
+    for (const action of ACTIONS) {
+      stream.write(`${action}\n`);
+      await sleep(40);
+    }
   }
 
   stream.write("\n");

package/lib/pair.d.ts

@@ -1,6 +1,18 @@
 export const TENANT_DOMAIN: string;
 export function resolvePoolUrl(input: string | undefined): string;
-export function promptTenant(streams?: { input?: NodeJS.ReadableStream & { isTTY?: boolean }; output?: NodeJS.WritableStream }): Promise<string>;
+export function fetchTenants(platformUrl?: string): Promise<Array<{ slug: string; name: string }>>;
+export function selectChoice(options: {
+  message: string;
+  choices: Array<{ label: string; value: string }>;
+  input?: NodeJS.ReadableStream & { isTTY?: boolean; setRawMode?: (mode: boolean) => void };
+  output?: NodeJS.WritableStream;
+}): Promise<string>;
+export function promptTenant(options?: {
+  input?: NodeJS.ReadableStream & { isTTY?: boolean; setRawMode?: (mode: boolean) => void };
+  output?: NodeJS.WritableStream;
+  fetchFn?: (platformUrl?: string) => Promise<Array<{ slug: string; name: string }>>;
+  tenantList?: Array<{ slug: string; name: string }>;
+}): Promise<string>;
 export function openBrowser(url: string, platform?: string): void;
 export function runConnect(options: {
   /** Tenant slug (`acme`) or pool URL; required. */

package/lib/pair.js

@@ -1,5 +1,6 @@
 import { spawn } from "node:child_process";
 import { hostname } from "node:os";
+import { emitKeypressEvents } from "node:readline";
 import { createInterface } from "node:readline/promises";
 import { writeAdminConfig } from "./admin.js";
 import { connectSettings, normalizeUrl, overridingEnvVars, readSettings } from "./settings.js";
@@ -27,13 +28,129 @@ export function resolvePoolUrl(input) {
 }
 
 /**
- * Ask for the tenant slug on the terminal.
- * @param {{ input?: NodeJS.ReadableStream & { isTTY?: boolean }, output?: NodeJS.WritableStream }} [streams] Streams to prompt on (tests).
- * @returns {Promise<string>} What was typed.
+ * Fetch available active tenants from the platform API.
+ * @param {string} [platformUrl] Address of the platform or tenant host.
+ * @returns {Promise<Array<{ slug: string, name: string }>>}
+ */
+export async function fetchTenants(platformUrl = `https://${TENANT_DOMAIN}`) {
+  try {
+    const res = await fetch(`${platformUrl}/api/tenants`, { signal: AbortSignal.timeout(3000) });
+    if (!res.ok) return [{ slug: "emesoft", name: "Emesoft" }];
+    const data = await res.json().catch(() => null);
+    if (data?.ok && Array.isArray(data.tenants) && data.tenants.length > 0) {
+      return data.tenants;
+    }
+  } catch {
+    // offline or unreachable
+  }
+  return [{ slug: "emesoft", name: "Emesoft" }];
+}
+
+/**
+ * Interactive arrow-key select prompt in terminal.
+ * @param {object} options
+ * @param {string} options.message Question/prompt to display.
+ * @param {Array<{ label: string, value: string }>} options.choices List of choices.
+ * @param {NodeJS.ReadableStream & { isTTY?: boolean, setRawMode?: (mode: boolean) => void }} [options.input]
+ * @param {NodeJS.WritableStream} [options.output]
+ * @returns {Promise<string>} Selected value.
+ */
+export function selectChoice({ message, choices, input = process.stdin, output = process.stdout }) {
+  return new Promise((resolve) => {
+    let selected = 0;
+    const isRaw = input.isRaw;
+    emitKeypressEvents(input);
+    if (typeof input.setRawMode === "function") input.setRawMode(true);
+
+    const CYAN = "\x1b[36;1m";
+    const RESET = "\x1b[0m";
+    const DIM = "\x1b[2m";
+    const HIDE_CURSOR = "\x1b[?25l";
+    const SHOW_CURSOR = "\x1b[?25h";
+
+    function render(first = false) {
+      if (!first) {
+        output.write(`\x1b[${choices.length}A`);
+      }
+      for (let i = 0; i < choices.length; i++) {
+        const isCurrent = i === selected;
+        const prefix = isCurrent ? `${CYAN}❯ ` : "  ";
+        const label = isCurrent ? `${CYAN}${choices[i].label}${RESET}` : choices[i].label;
+        output.write(`\x1b[2K\r${prefix}${label}\n`);
+      }
+    }
+
+    output.write(`${HIDE_CURSOR}${message} ${DIM}(Use ↑/↓ arrows, Enter to select)${RESET}\n`);
+    render(true);
+
+    function cleanup() {
+      output.write(SHOW_CURSOR);
+      input.removeListener("keypress", onKeypress);
+      if (typeof input.setRawMode === "function") input.setRawMode(isRaw ?? false);
+    }
+
+    function onKeypress(str, key) {
+      if (key && key.name === "c" && key.ctrl) {
+        cleanup();
+        process.exit(130);
+      } else if (key && (key.name === "up" || key.name === "k")) {
+        selected = (selected - 1 + choices.length) % choices.length;
+        render();
+      } else if (key && (key.name === "down" || key.name === "j")) {
+        selected = (selected + 1) % choices.length;
+        render();
+      } else if (key && (key.name === "return" || key.name === "enter")) {
+        cleanup();
+        resolve(choices[selected].value);
+      }
+    }
+
+    input.on("keypress", onKeypress);
+  });
+}
+
+/**
+ * Ask for the tenant slug on the terminal (interactive select or text input).
+ * @param {object} [options] Streams and options for prompting (tests).
+ * @param {NodeJS.ReadableStream & { isTTY?: boolean, setRawMode?: (mode: boolean) => void }} [options.input]
+ * @param {NodeJS.WritableStream} [options.output]
+ * @param {(platformUrl?: string) => Promise<Array<{ slug: string, name: string }>>} [options.fetchFn]
+ * @param {Array<{ slug: string, name: string }>} [options.tenantList]
+ * @returns {Promise<string>} What was selected or typed.
  * @throws {Error} When stdin is not interactive.
  */
-export async function promptTenant({ input = process.stdin, output = process.stdout } = {}) {
+export async function promptTenant({
+  input = process.stdin,
+  output = process.stdout,
+  fetchFn = fetchTenants,
+  tenantList,
+} = {}) {
   if (!input.isTTY) throw new Error(`Name your tenant, e.g. \`tokenhub connect acme\` for https://acme.${TENANT_DOMAIN} (no terminal to ask on).`);
+
+  const canRaw = typeof input.setRawMode === "function";
+  if (canRaw) {
+    const list = tenantList ?? (await fetchFn());
+    const choices = list.map((t) => ({
+      label: `${t.slug} (${t.name})`,
+      value: t.slug,
+    }));
+    choices.push({
+      label: "Other... (enter custom tenant)",
+      value: "__custom__",
+    });
+
+    const chosen = await selectChoice({
+      message: `? Select your TokenHub tenant:`,
+      choices,
+      input,
+      output,
+    });
+
+    if (chosen !== "__custom__") {
+      return chosen;
+    }
+  }
+
   const rl = createInterface({ input, output });
   try {
     return await rl.question(`Tenant name (the part before .${TENANT_DOMAIN}): `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emesoft/tokenhub",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "description": "Connect Claude Code to a TokenHub pool in one command, and track your spend from the terminal",
   "keywords": [
     "claude",