@inferhub/usage 0.1.9 → 0.1.11

package/bin/statusline.mjs

@@ -1,66 +1,71 @@
 #!/usr/bin/env node
-/**
- * Claude Code statusline — one compact line.
- *
- * Session id strategy:
- *  - Prefer conversation-prefix hash from transcript (matches proxy sessionid.Derive)
- *  - Also try Claude's session_id (if proxy stored user/metadata session)
- *  - Never fall back to "latest account session" (that jumps between chats)
- */
-import { readFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { fileURLToPath, pathToFileURL } from "node:url";
-
-const root = dirname(fileURLToPath(import.meta.url));
-const client = await import(pathToFileURL(join(root, "../dist/index.js")).href);
-
-function readStdin() {
-  try {
-    return readFileSync(0, "utf8");
-  } catch {
-    return "{}";
-  }
-}
-
-let input = {};
-try {
-  input = JSON.parse(readStdin() || "{}");
-} catch {
-  input = {};
-}
-
-try {
-  const sessionId = client.sessionIdFromClaudeStatuslineInput({
-    session_id: input.session_id,
-    transcript_path: input.transcript_path,
-  });
-
-  // Fetch with explicit session when known; otherwise omit session block rather
-  // than showing the account's latest unrelated conversation.
-  const { usage } = await client.fetchAccountUsageAuto({
-    window: "day",
-    sessionId: sessionId || undefined,
-  });
-
-  // If we couldn't derive a session id, strip session so we don't show wrong data
-  if (!sessionId) {
-    usage.session = null;
-  } else if (usage.session && usage.session.id !== sessionId) {
-    // API returned a different session (e.g. latest) — hide it
-    usage.session = null;
-  }
-
-  const contextPct =
-    typeof input?.context_window?.used_percentage === "number"
-      ? input.context_window.used_percentage
-      : null;
-  const model = input?.model?.display_name || input?.model?.id || null;
-
-  process.stdout.write(
-    client.formatStatusLine(usage, { contextPct, model }) + "\n",
-  );
-} catch (e) {
-  const msg = e instanceof Error ? e.message : String(e);
-  process.stdout.write("InferHub · offline (" + msg.slice(0, 40) + ")\n");
-  process.exitCode = 0;
-}
+/**
+ * Claude Code statusline — one compact line.
+ *
+ * Session id strategy:
+ *  - Prefer conversation-prefix hash from transcript (matches proxy sessionid.Derive)
+ *  - Also try Claude's session_id (if proxy stored user/metadata session)
+ *  - Never fall back to "latest account session" (that jumps between chats)
+ */
+import { readFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+
+const root = dirname(fileURLToPath(import.meta.url));
+const client = await import(pathToFileURL(join(root, "../dist/index.js")).href);
+
+function readStdin() {
+  try {
+    return readFileSync(0, "utf8");
+  } catch {
+    return "{}";
+  }
+}
+
+let input = {};
+try {
+  input = JSON.parse(readStdin() || "{}");
+} catch {
+  input = {};
+}
+
+try {
+  const sessionId = client.sessionIdFromClaudeStatuslineInput({
+    session_id: input.session_id,
+    transcript_path: input.transcript_path,
+  });
+
+  // Fetch with explicit session when known; otherwise omit session block rather
+  // than showing the account's latest unrelated conversation.
+  const { usage } = await client.fetchAccountUsageAuto({
+    window: "day",
+    sessionId: sessionId || undefined,
+  });
+
+  // If we couldn't derive a session id, strip session so we don't show wrong data.
+  // Accept exact id or legacy JSON blob that contains this session UUID.
+  if (!sessionId) {
+    usage.session = null;
+  } else if (usage.session) {
+    const got = String(usage.session.id || "");
+    if (got !== sessionId && !got.includes(sessionId)) {
+      usage.session = null;
+    } else {
+      usage.session.id = sessionId; // normalize display/id for formatters
+    }
+  }
+
+  const contextPct =
+    typeof input?.context_window?.used_percentage === "number"
+      ? input.context_window.used_percentage
+      : null;
+  const model = input?.model?.display_name || input?.model?.id || null;
+
+  process.stdout.write(
+    client.formatStatusLine(usage, { contextPct, model }) + "\n",
+  );
+} catch (e) {
+  const msg = e instanceof Error ? e.message : String(e);
+  process.stdout.write("InferHub · offline (" + msg.slice(0, 40) + ")\n");
+  process.exitCode = 0;
+}

package/dist/format.test.js

@@ -7,7 +7,7 @@ test("normalizeBaseUrl adds /v1", () => {
 test("usageUrl", () => {
     assert.equal(usageUrl("https://api.inferhub.dev", "day", "UTC", "abc"), "https://api.inferhub.dev/v1/me/usage?window=day&tz=UTC&session_id=abc");
 });
-test("formatStatusLine includes tokens compactly", () => {
+test("formatStatusLine has sess/day/all/bal without top model", () => {
     const usage = {
         object: "account.usage",
         currency: "USDC",
@@ -49,12 +49,9 @@ test("formatStatusLine includes tokens compactly", () => {
         cache: { cached: false, ttl_seconds: 30 },
     };
     const line = formatStatusLine(usage, { model: "grok-4.5", contextPct: 8 });
-    assert.equal(line, "InferHub · sess 19r/6.0M · day 129r/26.4M · all $0.41/3.9kr/354.2M · bal $1.31 · top gpt-5.5");
-    assert.ok(line.length < 100, `too long: ${line.length} ${line}`);
-    assert.match(line, /3\.9kr/);
-    assert.match(line, /354\.2M/);
-    assert.doesNotMatch(line, /3933r/);
-    // empty session omitted
+    assert.equal(line, "InferHub · sess 19r/6.0M · day 129r/26.4M · all $0.41/3.9kr/354.2M · bal $1.31");
+    assert.doesNotMatch(line, /top /);
+    assert.doesNotMatch(line, /gpt-5\.5/);
     const noSess = { ...usage, session: null };
     assert.doesNotMatch(formatStatusLine(noSess), /sess /);
     assert.equal(money("0"), "$0");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inferhub/usage",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Shared InferHub account usage client for coding-agent plugins",
   "type": "module",
   "main": "./dist/index.js",

package/src/format.test.ts

@@ -14,7 +14,7 @@ test("usageUrl", () => {
   );
 });
 
-test("formatStatusLine includes tokens compactly", () => {
+test("formatStatusLine has sess/day/all/bal without top model", () => {
   const usage: AccountUsage = {
     object: "account.usage",
     currency: "USDC",
@@ -59,14 +59,11 @@ test("formatStatusLine includes tokens compactly", () => {
   const line = formatStatusLine(usage, { model: "grok-4.5", contextPct: 8 });
   assert.equal(
     line,
-    "InferHub · sess 19r/6.0M · day 129r/26.4M · all $0.41/3.9kr/354.2M · bal $1.31 · top gpt-5.5",
+    "InferHub · sess 19r/6.0M · day 129r/26.4M · all $0.41/3.9kr/354.2M · bal $1.31",
   );
-  assert.ok(line.length < 100, `too long: ${line.length} ${line}`);
-  assert.match(line, /3\.9kr/);
-  assert.match(line, /354\.2M/);
-  assert.doesNotMatch(line, /3933r/);
+  assert.doesNotMatch(line, /top /);
+  assert.doesNotMatch(line, /gpt-5\.5/);
 
-  // empty session omitted
   const noSess = { ...usage, session: null };
   assert.doesNotMatch(formatStatusLine(noSess), /sess /);