tokmon 0.12.2 → 0.12.4

package/dist/cli.js

@@ -434,16 +434,15 @@ async function readMacKeychain() {
   }
 }
 async function getAccessToken(homeDir) {
-  if (homeDir) {
-    const fromFile = await readCredentialsFile(homeDir);
-    if (fromFile) return fromFile;
-    return null;
-  }
-  if (process.platform === "darwin") {
-    const token = await readMacKeychain();
-    if (token) return token;
+  const isDefault = !homeDir || homeDir === homedir3();
+  if (isDefault) {
+    if (process.platform === "darwin") {
+      const token = await readMacKeychain();
+      if (token) return token;
+    }
+    return readCredentialsFile(homeDir);
   }
-  return readCredentialsFile();
+  return readCredentialsFile(homeDir);
 }
 var EMPTY = { session: null, weekly: null, sonnet: null, extraUsage: null, peak: null, error: null };
 async function fetchBilling(homeDir) {
@@ -485,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
       }
     };
@@ -580,6 +580,9 @@ var DEFAULT_CONFIG = {
 };
 var GENERAL_ROWS = 4;
 var IS_TTY = process.stdin.isTTY === true;
+function truncateName(s, n) {
+  return s.length > n ? s.slice(0, n - 1) + "\u2026" : s;
+}
 function buildSlots(config2) {
   const slots = [];
   if (config2.accounts.length === 0) {
@@ -638,27 +641,30 @@ function App({ interval: cliInterval }) {
       setConfig(c);
     });
   }, []);
+  const billingMs = cfg.billingInterval * 6e4;
+  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 () => {
-      try {
-        const next = /* @__PURE__ */ new Map();
-        await Promise.all(slotsToLoad.map(async (slot) => {
-          const [dashboard, billing] = await Promise.all([
-            fetchDashboard(tz, slot.homeDir),
-            fetchBilling(slot.homeDir)
-          ]);
-          next.set(slotKey(slot), { slot, dashboard, billing });
-        }));
-        if (active) {
-          setStats(next);
-          setError(null);
-          setUpdated(/* @__PURE__ */ new Date());
+      await Promise.all(dataSlots.map(async (slot) => {
+        try {
+          const dashboard = await fetchDashboard(tz, slot.homeDir);
+          if (!active) return;
+          setStats((prev) => {
+            const next = new Map(prev);
+            const cur = next.get(slotKey(slot)) ?? { slot, dashboard: null, billing: null };
+            next.set(slotKey(slot), { ...cur, slot, dashboard });
+            return next;
+          });
+        } catch (e) {
+          if (active) setError(e instanceof Error ? e.message : String(e));
         }
-      } catch (e) {
-        if (active) setError(e instanceof Error ? e.message : String(e));
+      }));
+      if (active) {
+        setError(null);
+        setUpdated(/* @__PURE__ */ new Date());
       }
     };
     load();
@@ -667,7 +673,32 @@ function App({ interval: cliInterval }) {
       active = false;
       clearInterval(id);
     };
-  }, [interval2, tz, config2, activeSlot.id]);
+  }, [interval2, tz, config2, dataSlotsKey]);
+  useEffect(() => {
+    if (!config2) return;
+    let active = true;
+    const load = async () => {
+      await Promise.all(dataSlots.map(async (slot) => {
+        try {
+          const billing = await fetchBilling(slot.homeDir);
+          if (!active) return;
+          setStats((prev) => {
+            const next = new Map(prev);
+            const cur = next.get(slotKey(slot)) ?? { slot, dashboard: null, billing: null };
+            next.set(slotKey(slot), { ...cur, slot, billing });
+            return next;
+          });
+        } catch {
+        }
+      }));
+    };
+    load();
+    const id = setInterval(load, billingMs);
+    return () => {
+      active = false;
+      clearInterval(id);
+    };
+  }, [billingMs, config2, dataSlotsKey]);
   useEffect(() => {
     tableLoadedOnce.current = false;
     setTable(null);
@@ -813,6 +844,21 @@ function App({ interval: cliInterval }) {
       activeAccountId: c.activeAccountId === id ? null : c.activeAccountId
     }));
   }
+  function moveAccount(idx, dir) {
+    updateConfig((c) => {
+      const next = [...c.accounts];
+      const target = idx + dir;
+      if (target < 0 || target >= next.length) return c;
+      [next[idx], next[target]] = [next[target], next[idx]];
+      return { ...c, accounts: next };
+    });
+    setSettingsCursor((c) => {
+      const target = c + dir;
+      const min = accountRowsStart;
+      const max = accountRowsStart + cfg.accounts.length - 1;
+      return Math.max(min, Math.min(max, target));
+    });
+  }
   const accountRowsStart = GENERAL_ROWS;
   const totalSettingsRows = GENERAL_ROWS + cfg.accounts.length + 1;
   useInput((input, key) => {
@@ -915,6 +961,12 @@ function App({ interval: cliInterval }) {
         setShowSettings(false);
         return;
       }
+      const accIdxNav = settingsCursor - accountRowsStart;
+      const onAccountRow = accIdxNav >= 0 && accIdxNav < cfg.accounts.length;
+      if (onAccountRow && key.shift && (key.upArrow || key.downArrow)) {
+        moveAccount(accIdxNav, key.upArrow ? -1 : 1);
+        return;
+      }
       if (key.upArrow) {
         setSettingsCursor((c) => Math.max(0, c - 1));
         return;
@@ -1103,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();
@@ -1123,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);
@@ -1346,7 +1403,7 @@ function SettingsView({
       /* @__PURE__ */ jsx(Text, { children: "Add account" })
     ] }),
     /* @__PURE__ */ jsx(Box, { height: 1 }),
-    editingTz ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "type IANA name (e.g. Europe/London) \xB7 empty = System \xB7 Enter save \xB7 Esc cancel" }) : cursor >= accountRowsStart && cursor < accountRowsStart + config2.accounts.length ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191\u2193 select  \xB7  Enter edit  \xB7  space activate  \xB7  d delete  \xB7  s/Esc close" }) : cursor === accountRowsStart + config2.accounts.length ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191\u2193 select  \xB7  Enter add account  \xB7  s/Esc close" }) : /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191\u2193 select  \u2190\u2192 adjust  Enter edit  s/Esc close" })
+    editingTz ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "type IANA name (e.g. Europe/London) \xB7 empty = System \xB7 Enter save \xB7 Esc cancel" }) : cursor >= accountRowsStart && cursor < accountRowsStart + config2.accounts.length ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191\u2193 select  \xB7  \u21E7\u2191\u2193 reorder  \xB7  Enter edit  \xB7  space activate  \xB7  d delete  \xB7  s/Esc close" }) : cursor === accountRowsStart + config2.accounts.length ? /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191\u2193 select  \xB7  Enter add account  \xB7  s/Esc close" }) : /* @__PURE__ */ jsx(Text, { dimColor: true, children: "\u2191\u2193 select  \u2190\u2192 adjust  Enter edit  s/Esc close" })
   ] });
 }
 function AccountFormView({ form, accounts }) {
@@ -1622,7 +1679,7 @@ function RateLimitsCard({ items }) {
         /* @__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(Box, { width: 22, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: truncateName(slot.name, 20) }) }),
           /* @__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 }),
@@ -1633,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: 12, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: slot.name }) }),
+                /* @__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__");
             })
           ] })
@@ -1659,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 }),
@@ -1669,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({
@@ -1691,7 +1763,7 @@ function AccountLimitBar({
   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: " " }) }),
+    showName ? /* @__PURE__ */ jsx(Box, { width: 22, children: /* @__PURE__ */ jsx(Text, { dimColor: true, children: truncateName(slot.name, 20) }) }) : /* @__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: " " }),

package/package.json

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