@emesoft/tokenhub 0.3.1 → 0.4.0

package/README.md

@@ -4,12 +4,13 @@ Pair Claude Code on this machine with a [TokenHub](https://tokenhub.aimpact.io.v
 
 ```
 npx @emesoft/tokenhub connect https://tokenhub.aimpact.io.vn
+npx @emesoft/tokenhub connect https://tokenhub.aimpact.io.vn --no-statusline
 npx @emesoft/tokenhub usage
 npx @emesoft/tokenhub dashboard
 npx @emesoft/tokenhub disconnect
 ```
 
-`connect` prints a short code and opens your browser. Confirm the code on the pool's member site and the CLI writes `ANTHROPIC_BASE_URL` and `ANTHROPIC_AUTH_TOKEN` into `~/.claude/settings.json` (or `$CLAUDE_CONFIG_DIR/settings.json`). Other settings are kept, and the previous file is saved as `settings.json.bak`. Each paired machine gets its own key, which you can revoke on the Keys page.
+`connect` prints a short code and opens your browser. Confirm the code on the pool's member site and the CLI writes `ANTHROPIC_BASE_URL` and `ANTHROPIC_AUTH_TOKEN` into `~/.claude/settings.json` (or `$CLAUDE_CONFIG_DIR/settings.json`). It also adds a `statusLine` that shows today's spend and credit under the Claude Code prompt (pass `--no-statusline` to skip it; a `statusLine` you already had is left alone). Other settings are kept, and the previous file is saved as `settings.json.bak`. Each paired machine gets its own key, which you can revoke on the Keys page.
 
 `usage` shows today's and this week's spend against your limits, your credit and the pool's health (`--json` for the raw report). It exits 2 when the pool would currently refuse your requests (out of credit or budget reached).
 
@@ -17,7 +18,7 @@ npx @emesoft/tokenhub disconnect
 
 Requests to the pool carry your key and one extra header, `x-tokenhub-cli: <version>` (this CLI's version), and nothing else.
 
-`disconnect` removes only those two entries.
+`disconnect` removes only those two entries and the TokenHub `statusLine`.
 
 If `ANTHROPIC_BASE_URL`, `ANTHROPIC_AUTH_TOKEN` or `ANTHROPIC_API_KEY` is set in your shell, it overrides `settings.json`.
 

package/bin/tokenhub.js

@@ -8,11 +8,13 @@ import { fetchUsage, formatUsage, resolveCredentials } from "../lib/usage.js";
 const HELP = `tokenhub - pair Claude Code with a TokenHub pool
 
 Usage:
-  tokenhub connect <poolUrl>   Pair this machine and write ~/.claude/settings.json
+  tokenhub connect <poolUrl> [--no-statusline]
+                               Pair this machine and write ~/.claude/settings.json, including the status line
+                               (today's spend under the prompt) unless --no-statusline
   tokenhub usage [--json]      Show today's and this week's spend, credit and pool health
   tokenhub dashboard [--interval <sec>] [--once]
                                Live full-screen view of spend, pool health and recent requests (q quits)
-  tokenhub disconnect          Remove the pool entries from settings.json
+  tokenhub disconnect          Remove the pool entries and the status line from settings.json
   tokenhub --help | --version
 `;
 
@@ -22,7 +24,9 @@ Usage:
  * @returns {Promise<number>} Process exit code.
  */
 async function main(argv) {
-  const [command, arg] = argv;
+  const [command, ...rest] = argv;
+  const flags = rest.filter((item) => item.startsWith("--"));
+  const arg = rest.find((item) => !item.startsWith("--"));
   if (!command || command === "--help" || command === "-h" || command === "help") {
     console.log(HELP);
     return command ? 0 : 1;
@@ -40,7 +44,7 @@ async function main(argv) {
     }
     const controller = new AbortController();
     process.once("SIGINT", () => controller.abort());
-    return runConnect({ poolUrl: arg, settingsFile: file, signal: controller.signal });
+    return runConnect({ poolUrl: arg, settingsFile: file, signal: controller.signal, statusLine: !flags.includes("--no-statusline") });
   }
   if (command === "usage") {
     try {
@@ -50,7 +54,7 @@ async function main(argv) {
         return 1;
       }
       const report = await fetchUsage(credentials.baseUrl, credentials.key);
-      console.log(arg === "--json" ? JSON.stringify(report, null, 2) : formatUsage(report));
+      console.log(flags.includes("--json") ? JSON.stringify(report, null, 2) : formatUsage(report));
       return report.blocked ? 2 : 0;
     } catch (error) {
       console.error(`Error: ${error.message}`);

package/lib/pair.d.ts

@@ -8,4 +8,5 @@ export function runConnect(options: {
   deviceName?: string;
   intervalOverrideMs?: number;
   env?: Record<string, string | undefined>;
+  statusLine?: boolean;
 }): Promise<number>;

package/lib/pair.js

@@ -69,6 +69,7 @@ async function postJson(url, body, signal) {
  * @param {string} [options.deviceName] Name shown on the confirmation page.
  * @param {number} [options.intervalOverrideMs] Poll interval override (tests).
  * @param {Record<string, string | undefined>} [options.env] Environment inspected for overriding variables.
+ * @param {boolean} [options.statusLine] Also install the TokenHub status line (default true).
  * @returns {Promise<number>} Process exit code.
  */
 export async function runConnect({
@@ -80,6 +81,7 @@ export async function runConnect({
   deviceName = hostname(),
   intervalOverrideMs,
   env = process.env,
+  statusLine = true,
 }) {
   let pool;
   try {
@@ -119,8 +121,11 @@ export async function runConnect({
       if (poll.status === 429) continue;
       const status = poll.body?.status;
       if (status === "approved") {
-        connectSettings(settingsFile, poll.body.baseUrl, poll.body.key);
+        const statusResult = connectSettings(settingsFile, poll.body.baseUrl, poll.body.key, { statusLine });
         log(`Connected. Claude Code settings updated: ${settingsFile}`);
+        if (statusResult === "installed") log("Status line added: today's spend and credit show under the Claude Code prompt.");
+        if (statusResult === "updated") log("Status line refreshed with your new key.");
+        if (statusResult === "kept") log("Your existing statusLine was left as is. The setup guide on the pool site has the TokenHub one if you want it.");
         const overriding = overridingEnvVars(env);
         if (overriding.length > 0) {
           log(`Warning: ${overriding.join(", ")} set in your shell overrides settings.json. Unset it to use the pool.`);

package/lib/settings.d.ts

@@ -1,9 +1,22 @@
 export function settingsPath(env?: Record<string, string | undefined>, home?: string): string;
 export function normalizeUrl(input: string): string;
 export function mergeSettings(settings: Record<string, any>, baseUrl: string, key: string): Record<string, any>;
+export function statusLineCommand(baseUrl: string, key: string, platform?: string): string;
+export function isTokenhubStatusLine(value: unknown): boolean;
+export function installStatusLine(
+  settings: Record<string, any>,
+  baseUrl: string,
+  key: string,
+  platform?: string,
+): { settings: Record<string, any>; result: "installed" | "updated" | "kept" };
 export function removeSettings(settings: Record<string, any>): Record<string, any>;
 export function overridingEnvVars(env?: Record<string, string | undefined>): string[];
 export function readSettings(file: string): { exists: boolean; settings: Record<string, any> };
 export function writeSettings(file: string, settings: Record<string, any>): void;
-export function connectSettings(file: string, baseUrl: string, key: string): void;
+export function connectSettings(
+  file: string,
+  baseUrl: string,
+  key: string,
+  options?: { statusLine?: boolean; platform?: string },
+): "installed" | "updated" | "kept" | "skipped";
 export function disconnectSettings(file: string): boolean;

package/lib/settings.js

@@ -4,6 +4,7 @@ import { dirname, join } from "node:path";
 
 const BASE_URL_KEY = "ANTHROPIC_BASE_URL";
 const TOKEN_KEY = "ANTHROPIC_AUTH_TOKEN";
+const STATUS_PATH = "/member/api/status";
 
 /**
  * Locate Claude Code's user settings file.
@@ -48,15 +49,52 @@ export function mergeSettings(settings, baseUrl, key) {
 }
 
 /**
- * Return a copy of the settings without the pool connection entries.
+ * The shell command Claude Code runs to draw the TokenHub status line (today's spend and credit under the prompt).
+ * @param {string} baseUrl Pool address.
+ * @param {string} key The member's key.
+ * @param {string} [platform] Node platform name; Windows gets `curl.exe` with double quotes (works from cmd, PowerShell and Git Bash).
+ * @returns {string} The command line.
+ */
+export function statusLineCommand(baseUrl, key, platform = process.platform) {
+  const url = `${baseUrl}${STATUS_PATH}?format=line`;
+  return platform === "win32" ? `curl.exe -s -H "x-api-key: ${key}" "${url}"` : `curl -s -H 'x-api-key: ${key}' '${url}'`;
+}
+
+/**
+ * @param {unknown} value A `statusLine` setting.
+ * @returns {boolean} True when it is the TokenHub status line (a command calling the pool's status endpoint).
+ */
+export function isTokenhubStatusLine(value) {
+  return isPlainObject(value) && typeof value.command === "string" && value.command.includes(STATUS_PATH);
+}
+
+/**
+ * Add the TokenHub status line unless the user already has a different one.
  * @param {Record<string, any>} settings Existing settings object.
- * @returns {Record<string, any>} New settings; `env` is dropped when it ends up empty.
+ * @param {string} baseUrl Pool address.
+ * @param {string} key The member's key.
+ * @param {string} [platform] Node platform name.
+ * @returns {{ settings: Record<string, any>, result: "installed" | "updated" | "kept" }} `installed` when there was none,
+ *   `updated` when ours was refreshed with the new key, `kept` when another status line was left alone.
+ */
+export function installStatusLine(settings, baseUrl, key, platform = process.platform) {
+  const existing = settings.statusLine;
+  if (existing !== undefined && !isTokenhubStatusLine(existing)) return { settings, result: "kept" };
+  const statusLine = { ...(isPlainObject(existing) ? existing : {}), type: "command", command: statusLineCommand(baseUrl, key, platform) };
+  return { settings: { ...settings, statusLine }, result: existing === undefined ? "installed" : "updated" };
+}
+
+/**
+ * Return a copy of the settings without the pool connection entries (and without our status line).
+ * @param {Record<string, any>} settings Existing settings object.
+ * @returns {Record<string, any>} New settings; `env` is dropped when it ends up empty, another status line is kept.
  */
 export function removeSettings(settings) {
-  const { env, ...rest } = settings;
-  if (!isPlainObject(env)) return { ...settings };
+  const { env, statusLine, ...rest } = settings;
+  const keep = statusLine !== undefined && !isTokenhubStatusLine(statusLine) ? { statusLine } : {};
+  if (!isPlainObject(env)) return { ...rest, ...keep, ...(env === undefined ? {} : { env }) };
   const { [BASE_URL_KEY]: _url, [TOKEN_KEY]: _token, ...otherEnv } = env;
-  return Object.keys(otherEnv).length > 0 ? { ...rest, env: otherEnv } : rest;
+  return Object.keys(otherEnv).length > 0 ? { ...rest, ...keep, env: otherEnv } : { ...rest, ...keep };
 }
 
 /**
@@ -103,20 +141,28 @@ export function writeSettings(file, settings) {
 }
 
 /**
- * Persist a pool connection into the settings file.
+ * Persist a pool connection (and the TokenHub status line) into the settings file.
  * @param {string} file Path of settings.json.
  * @param {string} baseUrl Value for ANTHROPIC_BASE_URL.
  * @param {string} key Value for ANTHROPIC_AUTH_TOKEN.
- * @returns {void}
+ * @param {{ statusLine?: boolean, platform?: string }} [options] `statusLine: false` skips the status line; `platform` is for tests.
+ * @returns {"installed" | "updated" | "kept" | "skipped"} What happened to the status line.
  * @throws {Error} When the existing file is invalid JSON (left untouched).
  */
-export function connectSettings(file, baseUrl, key) {
+export function connectSettings(file, baseUrl, key, options = {}) {
   const { settings } = readSettings(file);
-  writeSettings(file, mergeSettings(settings, baseUrl, key));
+  const merged = mergeSettings(settings, baseUrl, key);
+  if (options.statusLine === false) {
+    writeSettings(file, merged);
+    return "skipped";
+  }
+  const { settings: next, result } = installStatusLine(merged, baseUrl, key, options.platform);
+  writeSettings(file, next);
+  return result;
 }
 
 /**
- * Remove the pool connection from the settings file.
+ * Remove the pool connection (and our status line) from the settings file.
  * @param {string} file Path of settings.json.
  * @returns {boolean} True when the file changed, false when there was nothing to remove.
  * @throws {Error} When the existing file is invalid JSON (left untouched).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emesoft/tokenhub",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Pair Claude Code on this machine with a TokenHub pool",
   "type": "module",
   "bin": {