tokmon 0.12.3 → 0.12.4

package/dist/cli.js

@@ -484,8 +484,9 @@ async function fetchUsage(token) {
           resetsAt: formatReset(data.seven_day_sonnet.resets_at)
         } : null,
         extraUsage: data.extra_usage?.is_enabled ? {
-          limit: data.extra_usage.monthly_limit / 100,
-          used: data.extra_usage.used_credits / 100
+          limit: data.extra_usage.monthly_limit != null ? data.extra_usage.monthly_limit / 100 : null,
+          used: (data.extra_usage.used_credits ?? 0) / 100,
+          currency: data.extra_usage.currency ?? "USD"
         } : null
       }
     };
@@ -641,13 +642,13 @@ function App({ interval: cliInterval }) {
     });
   }, []);
   const billingMs = cfg.billingInterval * 6e4;
-  const slotIdsKey = (activeSlot.id === null && cfg.accounts.length > 0 ? slots.slice(1) : [activeSlot]).map((s) => s.id ?? "__default__").join(",");
+  const dataSlots = cfg.accounts.length > 0 ? slots.slice(1) : slots;
+  const dataSlotsKey = dataSlots.map((s) => s.id ?? "__default__").join(",");
   useEffect(() => {
     if (!config2) return;
     let active = true;
-    const slotsToLoad = activeSlot.id === null && cfg.accounts.length > 0 ? slots.slice(1) : [activeSlot];
     const load = async () => {
-      await Promise.all(slotsToLoad.map(async (slot) => {
+      await Promise.all(dataSlots.map(async (slot) => {
         try {
           const dashboard = await fetchDashboard(tz, slot.homeDir);
           if (!active) return;
@@ -672,13 +673,12 @@ function App({ interval: cliInterval }) {
       active = false;
       clearInterval(id);
     };
-  }, [interval2, tz, config2, slotIdsKey]);
+  }, [interval2, tz, config2, dataSlotsKey]);
   useEffect(() => {
     if (!config2) return;
     let active = true;
-    const slotsToLoad = activeSlot.id === null && cfg.accounts.length > 0 ? slots.slice(1) : [activeSlot];
     const load = async () => {
-      await Promise.all(slotsToLoad.map(async (slot) => {
+      await Promise.all(dataSlots.map(async (slot) => {
         try {
           const billing = await fetchBilling(slot.homeDir);
           if (!active) return;
@@ -698,7 +698,7 @@ function App({ interval: cliInterval }) {
       active = false;
       clearInterval(id);
     };
-  }, [billingMs, config2, slotIdsKey]);
+  }, [billingMs, config2, dataSlotsKey]);
   useEffect(() => {
     tableLoadedOnce.current = false;
     setTable(null);
@@ -1155,19 +1155,7 @@ function App({ interval: cliInterval }) {
         activeAccountId: cfg.activeAccountId
       }
     ) : /* @__PURE__ */ jsxs(Fragment, { children: [
-      slots.length > 1 && /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsx(
-        AccountStrip,
-        {
-          slots,
-          activeIdx: activeSlotIdx,
-          onSelect: (i) => {
-            const id = slots[i].id;
-            updateConfig((c) => ({ ...c, activeAccountId: id }));
-            resetView();
-          }
-        }
-      ) }),
-      /* @__PURE__ */ jsxs(Box, { marginTop: slots.length > 1 ? 0 : 1, children: [
+      /* @__PURE__ */ jsxs(Box, { marginTop: 1, children: [
         /* @__PURE__ */ jsx(TabBar, { tabs: TABS, active: tab, onSelect: (i) => {
           setTab(i);
           resetView();
@@ -1175,14 +1163,31 @@ function App({ interval: cliInterval }) {
         /* @__PURE__ */ jsx(Text, { dimColor: true, children: "  Tab/\u2190\u2192" })
       ] }),
       /* @__PURE__ */ jsx(Box, { height: 1 }),
-      tab === 0 && /* @__PURE__ */ jsx(
-        DashboardView,
-        {
-          slots: visibleSlots,
-          stats,
-          compact: visibleSlots.length > 1
-        }
-      ),
+      tab === 0 && /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(
+          DashboardView,
+          {
+            slots: visibleSlots,
+            stats,
+            compact: visibleSlots.length > 1
+          }
+        ),
+        slots.length > 1 && /* @__PURE__ */ jsxs(Box, { marginTop: 1, flexDirection: "column", children: [
+          /* @__PURE__ */ jsx(Text, { bold: true, children: "Accounts" }),
+          /* @__PURE__ */ jsx(Box, { marginTop: 0, children: /* @__PURE__ */ jsx(
+            AccountStrip,
+            {
+              slots,
+              activeIdx: activeSlotIdx,
+              onSelect: (i) => {
+                const id = slots[i].id;
+                updateConfig((c) => ({ ...c, activeAccountId: id }));
+                resetView();
+              }
+            }
+          ) })
+        ] })
+      ] }),
       tab === 1 && /* @__PURE__ */ jsxs(Fragment, { children: [
         /* @__PURE__ */ jsx(ViewBar, { views: VIEWS, active: view, sort: SORTS[sort], onSelect: (i) => {
           setView(i);
@@ -1685,17 +1690,19 @@ function RateLimitsCard({ items }) {
             items.map(({ slot, s }) => {
               const e = s.billing?.extraUsage;
               if (!e) return null;
+              const sym = e.currency === "EUR" ? "\u20AC" : "$";
               return /* @__PURE__ */ jsxs(Box, { children: [
                 /* @__PURE__ */ jsx(Text, { color: slot.color, children: "\u25CF " }),
                 /* @__PURE__ */ jsx(Box, { width: 22, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: truncateName(slot.name, 20) }) }),
                 /* @__PURE__ */ jsxs(Text, { color: "yellow", children: [
-                  "$",
+                  sym,
                   e.used.toFixed(2)
                 ] }),
-                /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-                  " / $",
+                e.limit != null ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+                  " / ",
+                  sym,
                   e.limit.toFixed(2)
-                ] })
+                ] }) : /* @__PURE__ */ jsx(Text, { dimColor: true, children: " used" })
               ] }, slot.id ?? "__default__");
             })
           ] })
@@ -1711,8 +1718,12 @@ function MetricBlock({
   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;
+  const rows = items.map((i) => ({
+    slot: i.slot,
+    lim: pick(i.s.billing) ?? null,
+    error: i.s.billing?.error ?? null
+  }));
+  if (rows.every((r) => r.lim === null && !r.error)) return null;
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
     /* @__PURE__ */ jsxs(Box, { children: [
       /* @__PURE__ */ jsx(Text, { bold: true, children: label }),
@@ -1721,16 +1732,25 @@ function MetricBlock({
         sublabel
       ] })
     ] }),
-    rows.map(({ slot, lim }) => /* @__PURE__ */ jsx(
-      AccountLimitBar,
-      {
-        slot,
-        pct: lim.utilization,
-        resets: showResets ? lim.resetsAt : null,
-        showName: items.length > 1
-      },
-      slot.id ?? "__default__"
-    ))
+    rows.map(({ slot, lim, error }) => {
+      if (lim) {
+        return /* @__PURE__ */ jsx(
+          AccountLimitBar,
+          {
+            slot,
+            pct: lim.utilization,
+            resets: showResets ? lim.resetsAt : null,
+            showName: items.length > 1
+          },
+          slot.id ?? "__default__"
+        );
+      }
+      return /* @__PURE__ */ jsxs(Box, { children: [
+        /* @__PURE__ */ jsx(Text, { color: slot.color, children: "\u25CF " }),
+        /* @__PURE__ */ jsx(Box, { width: 22, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: truncateName(slot.name, 20) }) }),
+        /* @__PURE__ */ jsx(Text, { color: error ? "red" : void 0, dimColor: !error, children: error ?? "no data" })
+      ] }, slot.id ?? "__default__");
+    })
   ] });
 }
 function AccountLimitBar({

package/package.json

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