tokmon 0.12.0 → 0.12.2

package/dist/cli.js

@@ -988,14 +988,12 @@ function App({ interval: cliInterval }) {
       resetView();
       return;
     }
-    if (input === "1") {
-      setTab(0);
-      resetView();
-      return;
-    }
-    if (input === "2") {
-      setTab(1);
-      resetView();
+    if (input && /^[0-9]$/.test(input) && slots.length > 1) {
+      const target = slots[parseInt(input, 10)];
+      if (target) {
+        updateConfig((c) => ({ ...c, activeAccountId: target.id }));
+        resetView();
+      }
       return;
     }
     if (tab === 1) {
@@ -1165,7 +1163,7 @@ function Footer({ hasAccounts }) {
     /* @__PURE__ */ jsx(Text, { dimColor: true, children: " (" }),
     /* @__PURE__ */ jsx(Text, { color: "cyan", children: "davidilie.com" }),
     /* @__PURE__ */ jsx(Text, { dimColor: true, children: ")  \xB7  s=settings  " }),
-    hasAccounts && /* @__PURE__ */ jsx(Text, { dimColor: true, children: "a/A=cycle account  " }),
+    hasAccounts && /* @__PURE__ */ jsx(Text, { dimColor: true, children: "0-9=jump  a/A=cycle  " }),
     /* @__PURE__ */ jsx(Text, { dimColor: true, children: "q=quit" })
   ] });
 }
@@ -1181,28 +1179,17 @@ function TabBar({ tabs, active, onSelect }) {
   ] }) }, t)) });
 }
 function AccountStrip({ slots, activeIdx, onSelect }) {
-  return /* @__PURE__ */ jsxs(Box, { children: [
-    /* @__PURE__ */ jsx(Text, { dimColor: true, children: "account  " }),
-    slots.map((s, i) => {
-      const active = i === activeIdx;
-      const dot = s.id === null ? "\u2726" : "\u25CF";
-      return /* @__PURE__ */ jsx(ClickableBox, { onClick: () => onSelect(i), marginRight: 2, children: active ? /* @__PURE__ */ jsxs(Text, { bold: true, color: s.color, children: [
-        /* @__PURE__ */ jsxs(Text, { children: [
-          dot,
-          " "
-        ] }),
-        /* @__PURE__ */ jsxs(Text, { inverse: true, children: [
-          " ",
-          s.name,
-          " "
-        ] })
-      ] }) : /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-        dot,
-        " ",
-        s.name
-      ] }) }, s.id ?? "__all__");
-    })
-  ] });
+  return /* @__PURE__ */ jsx(Box, { flexWrap: "wrap", children: slots.map((s, i) => {
+    const active = i === activeIdx;
+    const dot = s.id === null ? "\u2726" : "\u25CF";
+    return /* @__PURE__ */ jsxs(ClickableBox, { onClick: () => onSelect(i), marginRight: 2, children: [
+      /* @__PURE__ */ jsx(Text, { dimColor: !active, children: i }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      /* @__PURE__ */ jsx(Text, { color: s.color, bold: active, dimColor: !active, children: dot }),
+      /* @__PURE__ */ jsx(Text, { children: " " }),
+      active ? /* @__PURE__ */ jsx(Text, { bold: true, color: s.color, children: s.name }) : /* @__PURE__ */ jsx(Text, { dimColor: true, children: s.name })
+    ] }, s.id ?? "__all__");
+  }) });
 }
 function ViewBar({ views, active, sort, onSelect }) {
   return /* @__PURE__ */ jsxs(Box, { children: [
@@ -1538,114 +1525,183 @@ function ColorField({ value, focused }) {
     /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "      shows on dashboard, account strip, borders" }) })
   ] });
 }
-function DashboardView({ slots, stats, compact }) {
+function DashboardView({ slots, stats, compact: _compact }) {
   const slotKey = (s) => s.id ?? "__default__";
-  return /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: slots.map((slot, i) => {
-    const s = stats.get(slotKey(slot));
-    if (!s?.dashboard) {
-      return /* @__PURE__ */ jsxs(Box, { children: [
-        /* @__PURE__ */ jsxs(Text, { color: slot.color, bold: true, children: [
-          "\u25CF ",
-          slot.name,
-          " "
-        ] }),
-        /* @__PURE__ */ jsx(Text, { dimColor: true, children: "loading..." })
-      ] }, slotKey(slot));
-    }
-    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx(
-        AccountCard,
-        {
-          slot,
-          dashboard: s.dashboard,
-          billing: s.billing,
-          compact
-        }
-      ),
-      i < slots.length - 1 && /* @__PURE__ */ jsx(Box, { height: 1 })
-    ] }, slotKey(slot));
-  }) });
-}
-function AccountCard({ slot, dashboard, billing, compact }) {
+  const items = slots.map((slot) => ({ slot, s: stats.get(slotKey(slot)) })).filter((x) => !!x.s?.dashboard);
+  if (items.length === 0) return /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Loading..." });
+  const agg = aggregateUsage(items.map((i) => i.s.dashboard));
+  const isMulti = items.length > 1;
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsxs(Box, { children: [
-      /* @__PURE__ */ jsxs(Text, { color: slot.color, bold: true, children: [
-        "\u25CF ",
-        slot.name
-      ] }),
-      slot.id && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-        "  ",
-        slot.id
-      ] })
-    ] }),
-    /* @__PURE__ */ jsxs(Box, { flexDirection: compact ? "row" : "column", marginTop: compact ? 0 : 0, children: [
-      /* @__PURE__ */ jsxs(
-        Box,
-        {
-          flexDirection: "column",
-          paddingLeft: 1,
-          marginRight: compact ? 2 : 0,
-          borderStyle: "bold",
-          borderColor: slot.color,
-          borderRight: false,
-          borderTop: false,
-          borderBottom: false,
-          children: [
-            /* @__PURE__ */ jsx(Text, { bold: true, children: "Usage" }),
-            !compact && /* @__PURE__ */ jsx(Box, { height: 1 }),
-            /* @__PURE__ */ jsx(SummaryRow, { label: "Today", summary: dashboard.today, compact }),
-            /* @__PURE__ */ jsx(SummaryRow, { label: compact ? "Week" : "This Week", summary: dashboard.week, compact }),
-            /* @__PURE__ */ jsx(SummaryRow, { label: compact ? "Month" : "This Month", summary: dashboard.month, compact }),
-            dashboard.burnRate > 0 && !compact && /* @__PURE__ */ jsxs(Fragment, { children: [
-              /* @__PURE__ */ jsx(Box, { height: 1 }),
-              /* @__PURE__ */ jsxs(Box, { children: [
-                /* @__PURE__ */ jsx(Box, { width: 14, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Burn rate" }) }),
-                /* @__PURE__ */ jsx(Box, { width: 12, justifyContent: "flex-end", children: /* @__PURE__ */ jsx(Text, { color: "red", children: currency(dashboard.burnRate) }) }),
-                /* @__PURE__ */ jsx(Text, { dimColor: true, children: "/hr" })
-              ] })
+    /* @__PURE__ */ jsxs(
+      Box,
+      {
+        flexDirection: "column",
+        paddingLeft: 1,
+        borderStyle: "bold",
+        borderColor: isMulti ? "green" : items[0].slot.color,
+        borderRight: false,
+        borderTop: false,
+        borderBottom: false,
+        children: [
+          /* @__PURE__ */ jsxs(Box, { children: [
+            /* @__PURE__ */ jsx(Text, { bold: true, children: "Claude" }),
+            isMulti && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+              "   all accounts (",
+              items.length,
+              ")"
             ] }),
-            dashboard.burnRate > 0 && compact && /* @__PURE__ */ jsxs(Box, { children: [
-              /* @__PURE__ */ jsx(Box, { width: 10, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Burn" }) }),
-              /* @__PURE__ */ jsx(Text, { color: "red", children: currency(dashboard.burnRate) }),
+            !isMulti && items[0].slot.id && /* @__PURE__ */ jsxs(Fragment, { children: [
+              /* @__PURE__ */ jsx(Text, { dimColor: true, children: "   " }),
+              /* @__PURE__ */ jsx(Text, { color: items[0].slot.color, children: "\u25CF " }),
+              /* @__PURE__ */ jsx(Text, { dimColor: true, children: items[0].slot.name })
+            ] })
+          ] }),
+          /* @__PURE__ */ jsx(Box, { height: 1 }),
+          /* @__PURE__ */ jsx(SummaryRow, { label: "Today", summary: agg.today }),
+          /* @__PURE__ */ jsx(SummaryRow, { label: "This Week", summary: agg.week }),
+          /* @__PURE__ */ jsx(SummaryRow, { label: "This Month", summary: agg.month }),
+          agg.burnRate > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(Box, { height: 1 }),
+            /* @__PURE__ */ jsxs(Box, { children: [
+              /* @__PURE__ */ jsx(Box, { width: 14, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Burn rate" }) }),
+              /* @__PURE__ */ jsx(Box, { width: 12, justifyContent: "flex-end", children: /* @__PURE__ */ jsx(Text, { color: "red", children: currency(agg.burnRate) }) }),
               /* @__PURE__ */ jsx(Text, { dimColor: true, children: "/hr" })
             ] })
-          ]
-        }
-      ),
-      !compact && /* @__PURE__ */ jsx(Box, { height: 1 }),
-      /* @__PURE__ */ jsxs(
-        Box,
-        {
-          flexDirection: "column",
-          paddingLeft: 1,
-          borderStyle: "bold",
-          borderColor: billing?.error ? "red" : "yellow",
-          borderRight: false,
-          borderTop: false,
-          borderBottom: false,
-          children: [
-            /* @__PURE__ */ jsx(Text, { bold: true, children: "Rate Limits" }),
-            !compact && /* @__PURE__ */ jsx(Box, { height: 1 }),
-            billing?.error ? /* @__PURE__ */ jsx(Text, { color: "red", children: billing.error }) : billing?.session || billing?.weekly ? /* @__PURE__ */ jsxs(Fragment, { children: [
-              billing.session && /* @__PURE__ */ jsx(LimitBar, { label: "Session", pct: billing.session.utilization, resets: billing.session.resetsAt, compact }),
-              billing.weekly && /* @__PURE__ */ jsx(LimitBar, { label: "Weekly", pct: billing.weekly.utilization, resets: billing.weekly.resetsAt, compact }),
-              billing.sonnet && /* @__PURE__ */ jsx(LimitBar, { label: "Sonnet", pct: billing.sonnet.utilization, resets: billing.sonnet.resetsAt, compact }),
-              billing.extraUsage && /* @__PURE__ */ jsxs(Box, { children: [
-                /* @__PURE__ */ jsx(Box, { width: 10, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Extra" }) }),
+          ] })
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsx(Box, { height: 1 }),
+    /* @__PURE__ */ jsx(RateLimitsCard, { items })
+  ] });
+}
+function aggregateUsage(list) {
+  const z = {
+    today: { cost: 0, tokens: 0 },
+    week: { cost: 0, tokens: 0 },
+    month: { cost: 0, tokens: 0 },
+    burnRate: 0
+  };
+  for (const d of list) {
+    z.today.cost += d.today.cost;
+    z.today.tokens += d.today.tokens;
+    z.week.cost += d.week.cost;
+    z.week.tokens += d.week.tokens;
+    z.month.cost += d.month.cost;
+    z.month.tokens += d.month.tokens;
+    z.burnRate += d.burnRate;
+  }
+  return z;
+}
+function SummaryRow({ label, summary }) {
+  return /* @__PURE__ */ jsxs(Box, { children: [
+    /* @__PURE__ */ jsx(Box, { width: 14, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: label }) }),
+    /* @__PURE__ */ jsx(Box, { width: 12, justifyContent: "flex-end", children: /* @__PURE__ */ jsx(Text, { bold: true, color: "yellow", children: currency(summary.cost) }) }),
+    /* @__PURE__ */ jsx(Box, { width: 18, justifyContent: "flex-end", children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+      tokens(summary.tokens),
+      " tokens"
+    ] }) })
+  ] });
+}
+function RateLimitsCard({ items }) {
+  const anyData = items.some((i) => i.s.billing?.session || i.s.billing?.weekly || i.s.billing?.sonnet);
+  const anyError = items.some((i) => i.s.billing?.error);
+  const borderColor = !anyData && anyError ? "red" : "yellow";
+  return /* @__PURE__ */ jsxs(
+    Box,
+    {
+      flexDirection: "column",
+      paddingLeft: 1,
+      borderStyle: "bold",
+      borderColor,
+      borderRight: false,
+      borderTop: false,
+      borderBottom: false,
+      children: [
+        /* @__PURE__ */ jsx(Text, { bold: true, children: "Rate Limits" }),
+        /* @__PURE__ */ jsx(Box, { height: 1 }),
+        !anyData ? anyError ? /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: items.map(({ slot, s }) => s.billing?.error && /* @__PURE__ */ jsxs(Box, { children: [
+          /* @__PURE__ */ jsx(Text, { color: slot.color, children: "\u25CF " }),
+          /* @__PURE__ */ jsx(Box, { width: 12, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: slot.name }) }),
+          /* @__PURE__ */ jsx(Text, { color: "red", children: s.billing.error })
+        ] }, slot.id ?? "__default__")) }) : /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Fetching..." }) : /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+          /* @__PURE__ */ jsx(MetricBlock, { label: "Total Usage", sublabel: "5h session", pick: (b) => b?.session, items, showResets: true }),
+          /* @__PURE__ */ jsx(MetricBlock, { label: "This Week", sublabel: "7-day", pick: (b) => b?.weekly, items, showResets: true }),
+          /* @__PURE__ */ jsx(MetricBlock, { label: "Sonnet", sublabel: "7-day sonnet", pick: (b) => b?.sonnet, items }),
+          items.some((i) => i.s.billing?.extraUsage) && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ jsx(Text, { bold: true, dimColor: true, children: "Extra Usage" }),
+            items.map(({ slot, s }) => {
+              const e = s.billing?.extraUsage;
+              if (!e) return null;
+              return /* @__PURE__ */ jsxs(Box, { children: [
+                /* @__PURE__ */ jsx(Text, { color: slot.color, children: "\u25CF " }),
+                /* @__PURE__ */ jsx(Box, { width: 12, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: slot.name }) }),
                 /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
                   "$",
-                  billing.extraUsage.used.toFixed(2)
+                  e.used.toFixed(2)
                 ] }),
                 /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
                   " / $",
-                  billing.extraUsage.limit.toFixed(2),
-                  " limit"
+                  e.limit.toFixed(2)
                 ] })
-              ] })
-            ] }) : /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Fetching..." })
-          ]
-        }
-      )
+              ] }, slot.id ?? "__default__");
+            })
+          ] })
+        ] })
+      ]
+    }
+  );
+}
+function MetricBlock({
+  label,
+  sublabel,
+  pick,
+  items,
+  showResets
+}) {
+  const rows = items.map((i) => ({ slot: i.slot, lim: pick(i.s.billing) ?? null })).filter((r) => r.lim !== null);
+  if (rows.length === 0) return null;
+  return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
+    /* @__PURE__ */ jsxs(Box, { children: [
+      /* @__PURE__ */ jsx(Text, { bold: true, children: label }),
+      /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+        "  ",
+        sublabel
+      ] })
+    ] }),
+    rows.map(({ slot, lim }) => /* @__PURE__ */ jsx(
+      AccountLimitBar,
+      {
+        slot,
+        pct: lim.utilization,
+        resets: showResets ? lim.resetsAt : null,
+        showName: items.length > 1
+      },
+      slot.id ?? "__default__"
+    ))
+  ] });
+}
+function AccountLimitBar({
+  slot,
+  pct,
+  resets,
+  showName
+}) {
+  const width = 28;
+  const filled = Math.max(0, Math.min(width, Math.round(pct / 100 * width)));
+  return /* @__PURE__ */ jsxs(Box, { children: [
+    /* @__PURE__ */ jsx(Text, { color: slot.color, children: "\u25CF " }),
+    showName ? /* @__PURE__ */ jsx(Box, { width: 12, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: slot.name }) }) : /* @__PURE__ */ jsx(Box, { width: 2, children: /* @__PURE__ */ jsx(Text, { children: " " }) }),
+    /* @__PURE__ */ jsx(Text, { color: slot.color, children: "\u2501".repeat(filled) }),
+    /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2500".repeat(width - filled) }),
+    /* @__PURE__ */ jsx(Text, { children: " " }),
+    /* @__PURE__ */ jsx(Box, { width: 5, justifyContent: "flex-end", children: /* @__PURE__ */ jsxs(Text, { bold: true, children: [
+      Math.round(pct),
+      "%"
+    ] }) }),
+    resets && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+      "  resets ",
+      resets
     ] })
   ] });
 }
@@ -1667,45 +1723,6 @@ function fmtMinutes(mins) {
   const m = mins % 60;
   return m === 0 ? `${h}h` : `${h}h ${m}m`;
 }
-function LimitBar({ label, pct, resets, compact }) {
-  const width = compact ? 16 : 30;
-  const filled = Math.round(pct / 100 * width);
-  const color = pct >= 80 ? "red" : pct >= 50 ? "yellow" : "green";
-  return /* @__PURE__ */ jsxs(Box, { children: [
-    /* @__PURE__ */ jsx(Box, { width: 10, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: label }) }),
-    /* @__PURE__ */ jsx(Text, { color, children: "\u2501".repeat(filled) }),
-    /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2500".repeat(width - filled) }),
-    /* @__PURE__ */ jsx(Text, { children: " " }),
-    /* @__PURE__ */ jsxs(Text, { bold: true, children: [
-      Math.round(pct),
-      "%"
-    ] }),
-    !compact && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-      "  resets ",
-      resets
-    ] })
-  ] });
-}
-function SummaryRow({ label, summary, compact }) {
-  if (compact) {
-    return /* @__PURE__ */ jsxs(Box, { children: [
-      /* @__PURE__ */ jsx(Box, { width: 10, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: label }) }),
-      /* @__PURE__ */ jsx(Box, { width: 10, justifyContent: "flex-end", children: /* @__PURE__ */ jsx(Text, { bold: true, color: "yellow", children: currency(summary.cost) }) }),
-      /* @__PURE__ */ jsx(Box, { width: 14, justifyContent: "flex-end", children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-        tokens(summary.tokens),
-        " tk"
-      ] }) })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs(Box, { children: [
-    /* @__PURE__ */ jsx(Box, { width: 14, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: label }) }),
-    /* @__PURE__ */ jsx(Box, { width: 12, justifyContent: "flex-end", children: /* @__PURE__ */ jsx(Text, { bold: true, color: "yellow", children: currency(summary.cost) }) }),
-    /* @__PURE__ */ jsx(Box, { width: 18, justifyContent: "flex-end", children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-      tokens(summary.tokens),
-      " tokens"
-    ] }) })
-  ] });
-}
 function TableView({ rows: allRows, cursor, expanded, maxRows, cols, onRowClick }) {
   const wide = cols > 90;
   const base = wide ? { label: 12, input: 10, output: 10, cc: 14, cr: 12, total: 11, cost: 13 } : { label: 8, input: 7, output: 7, cc: 7, cr: 8, total: 0, cost: 11 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tokmon",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "Terminal dashboard for Claude Code usage and costs",
   "type": "module",
   "bin": {