tokmon 0.20.5 → 0.21.0

package/dist/{chunk-XQEJ4WQ5.js → chunk-7MFZMI5C.js}

@@ -122,13 +122,13 @@ function isValidTimezone(tz) {
 }
 function normalizeConfig(parsed) {
   try {
-    const accounts = (Array.isArray(parsed.accounts) ? parsed.accounts : []).map((a) => ({ ...a, providerId: a.providerId ?? "claude" })).filter((a) => typeof a?.id === "string" && typeof a?.name === "string" && PROVIDER_IDS.includes(a.providerId));
+    const accounts = (Array.isArray(parsed.accounts) ? parsed.accounts : []).map((a) => ({ ...a, providerId: a.providerId ?? "claude" })).filter((a) => typeof a?.id === "string" && typeof a?.name === "string" && PROVIDER_IDS.includes(a.providerId)).map((a) => ({ ...a, homeDir: typeof a.homeDir === "string" && a.homeDir.trim() ? a.homeDir : "~" }));
     return {
       ...DEFAULTS,
       interval: clampNum(parsed.interval, DEFAULTS.interval, 1),
       billingInterval: clampNum(parsed.billingInterval, DEFAULTS.billingInterval, 1),
       clearScreen: typeof parsed.clearScreen === "boolean" ? parsed.clearScreen : DEFAULTS.clearScreen,
-      timezone: typeof parsed.timezone === "string" && parsed.timezone.trim() && isValidTimezone(parsed.timezone.trim()) ? parsed.timezone : null,
+      timezone: typeof parsed.timezone === "string" && parsed.timezone.trim() && isValidTimezone(parsed.timezone.trim()) ? parsed.timezone.trim() : null,
       accounts,
       activeAccountId: typeof parsed.activeAccountId === "string" ? parsed.activeAccountId : null,
       disabledProviders: (Array.isArray(parsed.disabledProviders) ? parsed.disabledProviders : []).filter((p) => PROVIDER_IDS.includes(p)),

package/dist/{chunk-YYATNY5E.js → chunk-CPN67OK6.js}

@@ -8,7 +8,7 @@ import {
   detectProviders,
   fetchPeak,
   resolveTimezone
-} from "./chunk-EHIQHGJL.js";
+} from "./chunk-YCIUMAKK.js";
 import {
   cacheDir,
   expandHome,
@@ -16,7 +16,7 @@ import {
   normalizeConfig,
   saveConfig,
   snapshotCacheFile
-} from "./chunk-XQEJ4WQ5.js";
+} from "./chunk-7MFZMI5C.js";
 
 // src/web/server.ts
 import { createServer } from "http";
@@ -96,10 +96,10 @@ async function fetchAccountTable(account, tz) {
   if (!p.fetchTable) return null;
   return p.fetchTable(account, tz);
 }
-async function fetchAccountBilling(account) {
+async function fetchAccountBilling(account, tz) {
   const p = PROVIDERS[account.providerId];
   if (!p.fetchBilling) return null;
-  return p.fetchBilling(account);
+  return p.fetchBilling(account, tz);
 }
 function assembleSnapshot(opts) {
   const accounts = opts.resolved.map((r) => {
@@ -429,123 +429,78 @@ function createDataEngine(opts) {
   };
   let usageAccounts = resolved.filter((r) => r.hasUsage);
   let billingAccounts = resolved.filter((r) => r.hasBilling);
-  let summaryBusy = false;
-  let summaryForcePending = false;
-  const refreshSummary = async (force = false) => {
-    if (stopped) return;
-    if (summaryBusy) {
-      if (force) summaryForcePending = true;
-      return;
-    }
-    if (!force && idle()) return;
-    const epoch = configEpoch;
-    summaryBusy = true;
-    try {
-      for (const r of usageAccounts) {
-        if (stopped) return;
-        let dashboard = null;
-        let ok = true;
-        try {
-          dashboard = await withTimeout(fetchAccountSummary(r.account, tz), FETCH_TIMEOUT_MS);
-        } catch {
-          ok = false;
-        }
-        if (stopped || epoch !== configEpoch) return;
-        if (ok) {
-          usageEntry(r.account.id).dashboard = dashboard;
-          summaryState.set(r.account.id, "ready");
-        } else summaryState.set(r.account.id, "error");
-        reveal();
-      }
-      rebuild();
-    } finally {
-      summaryBusy = false;
-      if (summaryForcePending && !stopped) {
-        summaryForcePending = false;
-        void refreshSummary(true);
+  const makeRefreshLoop = (opts2) => {
+    let busy = false;
+    let forcePending = false;
+    const run = async (force = false) => {
+      if (stopped) return;
+      if (busy) {
+        if (force) forcePending = true;
+        return;
       }
-    }
-  };
-  let tableBusy = false;
-  let tableForcePending = false;
-  const refreshTable = async (force = false) => {
-    if (stopped) return;
-    if (tableBusy) {
-      if (force) tableForcePending = true;
-      return;
-    }
-    if (!force && idle()) return;
-    const epoch = configEpoch;
-    tableBusy = true;
-    try {
-      for (const r of usageAccounts) {
-        if (stopped) return;
-        let table = null;
-        let ok = true;
-        try {
-          table = await withTimeout(fetchAccountTable(r.account, tz), FETCH_TIMEOUT_MS);
-        } catch {
-          ok = false;
+      if (!force && idle()) return;
+      const epoch = configEpoch;
+      busy = true;
+      try {
+        for (const r of opts2.accounts()) {
+          if (stopped) return;
+          let value = null;
+          let ok = true;
+          try {
+            value = await withTimeout(opts2.fetch(r), FETCH_TIMEOUT_MS);
+          } catch {
+            ok = false;
+          }
+          if (stopped || epoch !== configEpoch) return;
+          if (ok) {
+            opts2.apply(r.account.id, value);
+            opts2.state.set(r.account.id, "ready");
+          } else opts2.state.set(r.account.id, "error");
+          reveal();
         }
-        if (stopped || epoch !== configEpoch) return;
-        if (ok) {
-          usageEntry(r.account.id).table = table;
-          tableState.set(r.account.id, "ready");
-        } else tableState.set(r.account.id, "error");
-        reveal();
-      }
-      rebuild();
-    } finally {
-      tableBusy = false;
-      if (tableForcePending && !stopped) {
-        tableForcePending = false;
-        void refreshTable(true);
-      }
-    }
-  };
-  let billingBusy = false;
-  let billingForcePending = false;
-  const refreshBilling = async (force = false) => {
-    if (stopped) return;
-    if (billingBusy) {
-      if (force) billingForcePending = true;
-      return;
-    }
-    if (!force && idle()) return;
-    const epoch = configEpoch;
-    billingBusy = true;
-    try {
-      for (const r of billingAccounts) {
-        if (stopped) return;
-        let result = null;
-        let ok = true;
-        try {
-          result = await withTimeout(fetchAccountBilling(r.account), FETCH_TIMEOUT_MS);
-        } catch {
-          ok = false;
+        rebuild();
+      } finally {
+        busy = false;
+        if (forcePending && !stopped) {
+          forcePending = false;
+          void run(true);
         }
-        if (stopped || epoch !== configEpoch) return;
-        if (ok) {
-          billing.set(r.account.id, result);
-          billingState.set(r.account.id, "ready");
-        } else billingState.set(r.account.id, "error");
-        reveal();
       }
-      rebuild();
-    } finally {
-      billingBusy = false;
-      if (billingForcePending && !stopped) {
-        billingForcePending = false;
-        void refreshBilling(true);
-      }
-    }
+    };
+    return run;
   };
+  const refreshSummary = makeRefreshLoop({
+    accounts: () => usageAccounts,
+    fetch: (r) => fetchAccountSummary(r.account, tz),
+    apply: (id, dashboard) => {
+      usageEntry(id).dashboard = dashboard;
+    },
+    state: summaryState
+  });
+  const refreshTable = makeRefreshLoop({
+    accounts: () => usageAccounts,
+    fetch: (r) => fetchAccountTable(r.account, tz),
+    apply: (id, table) => {
+      usageEntry(id).table = table;
+    },
+    state: tableState
+  });
+  const refreshBilling = makeRefreshLoop({
+    accounts: () => billingAccounts,
+    fetch: (r) => fetchAccountBilling(r.account, tz),
+    apply: (id, result) => {
+      billing.set(id, result);
+    },
+    state: billingState
+  });
   let peakBusy = false;
   const refreshPeak = async (force = false) => {
     if (stopped || peakBusy || !hasClaude || !force && idle()) return;
+    const epoch = configEpoch;
     peakBusy = true;
     try {
       const next = await fetchPeak();
+      if (stopped || epoch !== configEpoch || !hasClaude) return;
       if (next) {
         peak = next;
         rebuild();
@@ -611,12 +566,16 @@ function createDataEngine(opts) {
       tz = next.tz;
       summaryIntervalMs = next.summaryIntervalMs;
       billingIntervalMs = next.billingIntervalMs;
+      const sourceKey = (r) => `${r.account.providerId}:${r.account.homeDir ?? ""}`;
+      const prevSources = new Map(resolved.map((r) => [r.account.id, sourceKey(r)]));
       resolved = next.resolved;
       hasClaude = resolved.some((r) => r.account.providerId === "claude");
       if (!hasClaude) peak = null;
       usageAccounts = resolved.filter((r) => r.hasUsage);
       billingAccounts = resolved.filter((r) => r.hasBilling);
-      const survivors = new Set(resolved.map((r) => r.account.id));
+      const survivors = new Set(
+        resolved.filter((r) => !prevSources.has(r.account.id) || prevSources.get(r.account.id) === sourceKey(r)).map((r) => r.account.id)
+      );
       for (const id of [...usage.keys()]) if (!survivors.has(id)) usage.delete(id);
       for (const id of [...billing.keys()]) if (!survivors.has(id)) billing.delete(id);
       for (const map of [summaryState, billingState, tableState]) {