@cad0p/pi-usage 0.11.4 → 0.11.5

package/src/omarchy/record.js

@@ -184,17 +184,20 @@ function recordTierLabel(provider) {
 }
 
 /**
- * Slot label of one account: "#1" for the base entry (or the first result when
- * the provider does not carry slots at all), "#<slot>" for a sibling.
+ * Slot label of one account: "" for the base entry (auth.json gives it no
+ * number, so no surface may invent one), "#<slot>" for a real sibling, and a
+ * named account as-is. A report cached before the fix still says "#1": that is
+ * the same base entry and normalizes to "".
  *
  * @param {import("../model.js").QuotaResult} provider
- * @param {number} index
  * @returns {string}
  */
-function accountLabel(provider, index) {
-  if (typeof provider.slot === "string" && provider.slot !== "") return `#${provider.slot}`;
-  if (typeof provider.account === "string" && /^#\d/.test(provider.account)) return provider.account;
-  return `#${index + 1}`;
+function accountLabel(provider) {
+  if (typeof provider.slot === "string") return provider.slot === "" ? "" : `#${provider.slot}`;
+  const account = typeof provider.account === "string" ? provider.account : "";
+  if (account === "" || account === "#1") return "";
+  if (/^#\d+$/.test(account)) return account;
+  return account;
 }
 
 /**
@@ -333,7 +336,11 @@ function compactFailureList(failures) {
       labels.push(failures[index].label);
       index += 1;
     }
-    groups.push(`${compactLabels(labels)} ${reason}`);
+    // The unnumbered base entry has no slot label: in prose it is "base", and
+    // when it is the only failure the reason alone says everything.
+    const named = labels.map((label) => (label === "" ? "base" : label));
+    const names = compactLabels(named);
+    groups.push(named.length === 1 && named[0] === "base" ? reason : `${names} ${reason}`);
   }
   const text = redact(groups.join(" · "));
   return text.length <= HELP_MAX ? text : `${text.slice(0, HELP_MAX - 1).trimEnd()}…`;
@@ -370,12 +377,12 @@ function buildFamilyRecord(family, providers, options = {}) {
   const accounts = [];
   let okCount = 0;
 
-  providers.forEach((provider, index) => {
-    const label = accountLabel(provider, index);
+  providers.forEach((provider) => {
+    const label = accountLabel(provider);
     if (provider.ok) {
       okCount += 1;
       const window = bindingWindow(provider.windows);
-      const mapped = window ? mapLimits([window], provider, `${label} · `)[0] : null;
+      const mapped = window ? mapLimits([window], provider, label === "" ? "" : `${label} · `)[0] : null;
       if (mapped) limits.push(mapped);
       accounts.push({ id: redact(label), ok: true, status: "", limits: mapLimits(provider.windows, provider) });
       return;

package/src/providers/opencode-go.js

@@ -41,14 +41,15 @@ function record(value) {
 }
 
 /**
- * The account label shown by every surface: #1 for the base entry, #<slot> for a
- * numbered sibling. The key itself never appears.
+ * The account label shown by every surface: the base auth.json entry has no
+ * numeric suffix, so it gets no number; only a real sibling slot is `#<slot>`.
+ * The key itself never appears.
  *
  * @param {{ slot?: string | null }} credential
  * @returns {string}
  */
 function accountLabel(credential) {
-  return credential.slot ? `#${credential.slot}` : "#1";
+  return credential.slot ? `#${credential.slot}` : "";
 }
 
 /**

package/src/render/panel.js

@@ -161,6 +161,20 @@ function wrapPlain(text, width) {
   return lines.length > 0 ? lines : [""];
 }
 
+/**
+ * The slot label of an account: "" for the base auth.json entry (it has no
+ * number, so no surface may invent one), "#<slot>" for a real sibling. A report
+ * cached before the fix still says "#1" for the base entry.
+ *
+ * @param {string | null | undefined} account
+ * @returns {string}
+ */
+function slotLabel(account) {
+  if (typeof account !== "string") return "";
+  if (account === "#1") return "";
+  return /^#\d+$/.test(account) ? account : "";
+}
+
 /**
  * Per-provider detail lines, without box decoration.
  *
@@ -176,8 +190,10 @@ export function renderProviderLines(provider, paint, contentWidth = MAX_WIDTH, o
   const lines = [];
 
   // A multi-account family puts "#<slot>" in the title, so repeating it in the
-  // meta line would print the same label twice on one row.
-  const meta = options.accountInTitle ? [] : [provider.account];
+  // meta line would print the same label twice on one row. The unnumbered base
+  // entry contributes nothing, so the meta line does not start with a separator.
+  const accountText = provider.account === "#1" ? "" : slotLabel(provider.account) || provider.account || "";
+  const meta = options.accountInTitle || accountText === "" ? [] : [accountText];
   if (provider.plan) meta.push(`plan ${provider.plan}`);
   // Claude has two stores, and a broken one is the first thing to rule out when
   // the percentage looks wrong, so the panel names the store it actually read.
@@ -185,7 +201,11 @@ export function renderProviderLines(provider, paint, contentWidth = MAX_WIDTH, o
   if (provider.expiresInMin !== null && provider.expiresInMin <= 120) {
     meta.push(provider.expiresInMin < 0 ? "token EXPIRED" : `token ${provider.expiresInMin}m`);
   }
-  lines.push(clip(`${paint("bold", title)} ${paint("dim", `· ${meta.join(" · ")}`)}`, contentWidth));
+  lines.push(
+    meta.length === 0
+      ? clip(paint("bold", title), contentWidth)
+      : clip(`${paint("bold", title)} ${paint("dim", `· ${meta.join(" · ")}`)}`, contentWidth),
+  );
 
   if (!provider.ok) {
     const wrapped = wrapPlain(provider.error ?? "unavailable", contentWidth - 6);
@@ -318,10 +338,11 @@ export function renderPanel(providers, paint, meta = {}) {
     familyCounts.set(provider.family, (familyCounts.get(provider.family) ?? 0) + 1);
   }
   /** @param {import("../model.js").QuotaResult} provider */
-  const accountTitle = (provider) =>
-    (familyCounts.get(provider.family) ?? 0) > 1 && typeof provider.account === "string" && provider.account.startsWith("#")
-      ? `${FAMILY_TITLE[provider.family] ?? provider.label} ${provider.account}`
-      : null;
+  const accountTitle = (provider) => {
+    if ((familyCounts.get(provider.family) ?? 0) <= 1) return null;
+    const slot = slotLabel(provider.account);
+    return slot === "" ? null : `${FAMILY_TITLE[provider.family] ?? provider.label} ${slot}`;
+  };
 
   // Render once at the hard maximum, then settle on the natural width of the
   // content so long degradation messages cannot stretch every other row.