tokmon 0.29.3 → 0.29.5

package/README.md

@@ -68,7 +68,8 @@ progress lines, and comfortable, compact, or tight spacing. Auto layout adapts
 to smaller displays; Custom mode exposes half-point edge and gap controls.
 Clicking the item opens a compact view of every enabled provider and account,
 including usage, reset times, token totals, spend, cache savings, and recent
-history.
+history. The Desktop App settings can also launch Tokmon silently at login on
+macOS and Windows, with native approval state shown in the app.
 
 ![Tokmon desktop quota popover](assets/desktop/tray-popover.png)
 

package/dist/{bootstrap-ink-MPWICEIJ.js → bootstrap-ink-VORCPVK4.js}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   createDaemonRpcClient
-} from "./chunk-AUUBRLBG.js";
+} from "./chunk-3SXVUTV2.js";
 import {
   accountIdentityText,
   accountsByProvider,
@@ -11,14 +11,15 @@ import {
   resolveQuotaViews,
   severity,
   usageFromHeadroom
-} from "./chunk-3D6TO5TS.js";
+} from "./chunk-U2FQXNIU.js";
 import {
   PROVIDERS,
   PROVIDER_ORDER,
   coalesceTables,
   col,
   currency,
-  detectProviders,
+  detectAccountProviders,
+  detectInstalledProviders,
   formatAgo,
   formatResetAt,
   resetAt,
@@ -28,8 +29,8 @@ import {
   time,
   tokens,
   withTimeout
-} from "./chunk-WPZTPMBX.js";
-import "./chunk-BYLWQ46U.js";
+} from "./chunk-EZHV4R74.js";
+import "./chunk-6RPYSOBA.js";
 import {
   COLOR_PALETTE,
   DEFAULTS,
@@ -55,7 +56,7 @@ import {
   setProviderTrackingEnabled,
   snapshotCacheFile,
   themePresetOption
-} from "./chunk-G2A3DVPU.js";
+} from "./chunk-GQCFGAQ6.js";
 import {
   glyphs
 } from "./chunk-RF4GGQGM.js";
@@ -1605,7 +1606,7 @@ var SettingsView = memo4(function SettingsView2({
         const identityLabel = config.privacyMode ? redactEmail(rawIdentityLabel) : rawIdentityLabel;
         const plan = identity?.plan ?? null;
         const ignored = acc.source === "ignored";
-        const sourceLabel = acc.source === "auto" ? "auto tracking" : ignored ? "ignored" : "configured";
+        const sourceLabel = acc.source === "auto" ? "auto tracking" : ignored ? "removed" : acc.enabled ? "configured" : "disabled";
         return /* @__PURE__ */ jsxs6(Box6, { children: [
           /* @__PURE__ */ jsxs6(Text6, { color: selected ? theme.accent : void 0, children: [
             selected ? glyphs().caretR : " ",
@@ -1615,7 +1616,7 @@ var SettingsView = memo4(function SettingsView2({
             ignored ? glyphs().warn : isActive ? glyphs().dot : glyphs().radioOff,
             " "
           ] }),
-          /* @__PURE__ */ jsx7(Box6, { width: 28, children: /* @__PURE__ */ jsx7(Text6, { bold: !ignored, dimColor: ignored, children: truncateName(identityLabel, 27) }) }),
+          /* @__PURE__ */ jsx7(Box6, { width: 28, children: /* @__PURE__ */ jsx7(Text6, { bold: !ignored && acc.enabled, dimColor: ignored || !acc.enabled, children: truncateName(identityLabel, 27) }) }),
           /* @__PURE__ */ jsx7(Box6, { width: 9, children: /* @__PURE__ */ jsx7(Text6, { color: provider.color, children: provider.name }) }),
           /* @__PURE__ */ jsx7(Box6, { width: 18, children: /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: plan ? truncateName(plan, 17) : "" }) }),
           /* @__PURE__ */ jsx7(Box6, { width: 14, children: /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: sourceLabel }) }),
@@ -1699,7 +1700,7 @@ var SettingsView = memo4(function SettingsView2({
       glyphs().middot,
       "  space activate  ",
       glyphs().middot,
-      "  x ignore  ",
+      "  x remove  ",
       glyphs().middot,
       "  s/Esc close"
     ] }) : trackedAccounts[cursor]?.source === "ignored" ? /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
@@ -1707,7 +1708,7 @@ var SettingsView = memo4(function SettingsView2({
       glyphs().arrowD,
       " select  ",
       glyphs().middot,
-      "  Enter/x turn on  ",
+      "  Enter/x restore  ",
       glyphs().middot,
       "  s/Esc close"
     ] }) : /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
@@ -1723,7 +1724,7 @@ var SettingsView = memo4(function SettingsView2({
       glyphs().middot,
       "  Enter edit  ",
       glyphs().middot,
-      "  space activate  ",
+      "  e enable/disable  ",
       glyphs().middot,
       "  d delete  ",
       glyphs().middot,
@@ -2775,6 +2776,14 @@ function handleSettings(input, key, ctx) {
       deleteAccount(row.explicitId);
       return;
     }
+    if (row.source === "configured" && row.explicitId && input === "e") {
+      updateConfig((current) => ({
+        ...current,
+        activeAccountId: !row.enabled || current.activeAccountId !== row.id ? current.activeAccountId : null,
+        accounts: current.accounts.map((account) => account.id === row.explicitId ? { ...account, enabled: !row.enabled } : account)
+      }));
+      return;
+    }
     if (row.source === "auto" && input === "x") {
       updateConfig((current) => ({
         ...current,
@@ -2786,7 +2795,7 @@ function handleSettings(input, key, ctx) {
       }));
       return;
     }
-    if (input === " ") {
+    if (input === " " && row.enabled) {
       updateConfig((current) => ({ ...current, activeAccountId: row.id }));
       return;
     }
@@ -3729,6 +3738,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     daemon
   });
   const [detected, setDetected] = useState10([]);
+  const [detectedAccounts, setDetectedAccounts] = useState10([]);
   const [tab, setTab] = useState10(0);
   const [view, setView] = useState10(0);
   const [cursor, setCursor] = useState10(0);
@@ -3768,17 +3778,22 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     () => [...new Set((snapshot?.accounts ?? []).map((account) => account.providerId))],
     [snapshot]
   );
-  const detectedProviders = connected ? daemonDetected : detected;
+  const detectedProviders = useMemo3(
+    () => [.../* @__PURE__ */ new Set([...snapshot?.installedProviders ?? detected, ...daemonDetected])],
+    [daemonDetected, detected, snapshot?.installedProviders]
+  );
+  const detectedAccountProviders = connected ? daemonDetected : detectedAccounts;
   const accounts = useMemo3(() => connected ? (snapshot?.accounts ?? []).map((account) => ({
     id: account.id,
     providerId: account.providerId,
     name: account.name,
     color: account.color,
-    homeDir: account.homeDir ?? void 0
-  })) : buildAccounts(cfg, detectedProviders), [cfg, connected, detectedProviders, snapshot]);
+    homeDir: account.homeDir ?? void 0,
+    source: account.source
+  })) : buildAccounts(cfg, detectedAccountProviders), [cfg, connected, detectedAccountProviders, snapshot]);
   const trackedAccountRows = useMemo3(
-    () => getTrackedAccountRows(cfg, detectedProviders, accounts),
-    [cfg, detectedProviders, accounts]
+    () => getTrackedAccountRows(cfg, detectedAccountProviders, accounts),
+    [cfg, detectedAccountProviders, accounts]
   );
   const settingsRowCount = settingsTab === "general" ? GENERAL_ROWS : settingsTab === "theme" ? THEME_ROWS : settingsTab === "desktop" ? DESKTOP_FIXED_ROWS : settingsTab === "providers" ? PROVIDER_ORDER.length + 1 : trackedAccountRows.length + 1;
   const accountsRef = useRef8([]);
@@ -3955,9 +3970,11 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     enabled: onboardEnabled.includes(pid)
   }));
   useEffect9(() => {
-    if (connected) return;
-    void detectProviders().then(setDetected);
-  }, [connected]);
+    void Promise.all([detectInstalledProviders(), detectAccountProviders()]).then(([installed, accounts2]) => {
+      setDetected(installed);
+      setDetectedAccounts(accounts2);
+    });
+  }, []);
   const tableKey = useMemo3(
     () => `${effTableProvider}|${tableAccounts.map(acctKey).join(",")}|${tz}`,
     [effTableProvider, tableAccounts, tz]
@@ -4088,7 +4105,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     if (webStartingRef.current) return;
     webStartingRef.current = true;
     try {
-      const { startWebServer } = await import("./server-P6BRXBZ5.js");
+      const { startWebServer } = await import("./server-VWBW53QU.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);

package/dist/{chunk-AUUBRLBG.js → chunk-3SXVUTV2.js}

@@ -4,10 +4,10 @@ import {
   TOKMON_WS_METHODS,
   TOKMON_WS_PATH,
   TokmonRpcGroup
-} from "./chunk-BYLWQ46U.js";
+} from "./chunk-6RPYSOBA.js";
 import {
   normalizeConfig
-} from "./chunk-G2A3DVPU.js";
+} from "./chunk-GQCFGAQ6.js";
 
 // src/client/daemon-rpc-client.ts
 import { Cause, Context, Duration, Effect, Exit, Fiber, Layer, ManagedRuntime, Schedule, Schema, Stream } from "effect";

package/dist/{chunk-BLUQGJKM.js → chunk-6NJLM5IZ.js}

@@ -8,14 +8,14 @@ import {
   readLock,
   retireIncompatibleCliOwner,
   verifyLock
-} from "./chunk-YWDMEU3L.js";
+} from "./chunk-UD2IPQK3.js";
 import {
   daemonChannelFromWire,
   resolveDaemonChannel
 } from "./chunk-UYPDMVW5.js";
 import {
   TOKMON_PROTOCOL_VERSION
-} from "./chunk-BYLWQ46U.js";
+} from "./chunk-6RPYSOBA.js";
 
 // src/client/daemon-handle.ts
 import { spawn } from "child_process";

package/dist/{chunk-BYLWQ46U.js → chunk-6RPYSOBA.js}

@@ -4,7 +4,7 @@ import {
   DESKTOP_GRAPH_RANGES,
   PROVIDER_IDS,
   THEME_PRESET_IDS
-} from "./chunk-G2A3DVPU.js";
+} from "./chunk-GQCFGAQ6.js";
 
 // src/rpc/contract.ts
 import { Schema } from "effect";
@@ -12,7 +12,7 @@ import * as Rpc from "effect/unstable/rpc/Rpc";
 import * as RpcGroup from "effect/unstable/rpc/RpcGroup";
 var TOKMON_WS_PATH = "/ws";
 var TOKMON_PROTOCOL_VERSION = 4;
-var TOKMON_CAPABILITIES = ["config-cas", "config-revision", "allowed-hosts", "tray-config", "usage-activity", "tray-pins", "provider-pins", "desktop-disclosure", "desktop-graph-range", "provider-headroom", "canonical-identity", "appearance-v1", "theme-engine", "account-detection-v1", "menu-bar-today-tokens", "menu-bar-builder-v1"];
+var TOKMON_CAPABILITIES = ["config-cas", "config-revision", "allowed-hosts", "tray-config", "usage-activity", "tray-pins", "provider-pins", "desktop-disclosure", "desktop-graph-range", "provider-headroom", "canonical-identity", "appearance-v1", "theme-engine", "account-detection-v1", "account-provenance-v1", "installed-harnesses-v1", "discovery-refresh-v1", "menu-bar-today-tokens", "menu-bar-builder-v1"];
 var TOKMON_WS_METHODS = {
   getConfig: "tokmon.getConfig",
   setConfig: "tokmon.setConfig",
@@ -36,7 +36,8 @@ var AccountSchema = Schema.Struct({
   providerId: ProviderIdSchema,
   name: Schema.String,
   homeDir: Schema.String,
-  color: Schema.optionalKey(Schema.String)
+  color: Schema.optionalKey(Schema.String),
+  enabled: Schema.optionalKey(Schema.Boolean)
 });
 var TrayConfigSchema = Schema.Struct({
   enabled: Schema.Boolean,
@@ -339,6 +340,7 @@ var WebAccountSchema = Schema.Struct({
   name: Schema.String,
   color: Schema.String,
   homeDir: Schema.NullOr(Schema.String),
+  source: Schema.optionalKey(Schema.Literals(["auto", "configured"])),
   hasUsage: Schema.Boolean,
   hasBilling: Schema.Boolean,
   email: Schema.optionalKey(Schema.NullOr(Schema.String)),
@@ -364,6 +366,7 @@ var WebSnapshotSchema = Schema.Struct({
   tz: Schema.String,
   intervalMs: PositiveFiniteSchema,
   billingIntervalMs: Schema.optionalKey(PositiveFiniteSchema),
+  installedProviders: Schema.optionalKey(Schema.Array(ProviderIdSchema)),
   providers: Schema.Array(Schema.Struct({
     id: ProviderIdSchema,
     name: Schema.String,

package/dist/{chunk-WPZTPMBX.js → chunk-EZHV4R74.js}

@@ -5,7 +5,7 @@ import {
   envDir,
   expandHome,
   isValidTimezone
-} from "./chunk-G2A3DVPU.js";
+} from "./chunk-GQCFGAQ6.js";
 
 // src/async.ts
 var DEFAULT_TIMEOUT_MS = 3e4;
@@ -901,13 +901,19 @@ function getClaudeDirs(homeDir) {
   return claudeConfigDirs(homeDir).map((d) => join3(d, "projects"));
 }
 async function detectClaude(homeDir) {
-  for (const dir of getClaudeDirs(homeDir)) {
+  for (const configDir of claudeConfigDirs(homeDir)) {
     try {
-      await access(dir);
+      await access(join3(configDir, ".credentials.json"));
       return true;
     } catch {
     }
   }
+  for (const dir of getClaudeDirs(homeDir)) {
+    try {
+      if ((await walkFiles(dir)).some((file) => file.endsWith(".jsonl"))) return true;
+    } catch {
+    }
+  }
   return false;
 }
 function claudePriceFor(model, timestamp = Date.now()) {
@@ -4069,7 +4075,7 @@ function priceFor(model) {
 }
 async function detectGrok(homeDir) {
   for (const home of grokHomes(homeDir)) {
-    for (const p of [join19(home, "logs", "unified.jsonl"), join19(home, "sessions"), join19(home, "auth.json"), join19(home, "bin", "grok")]) {
+    for (const p of [join19(home, "logs", "unified.jsonl"), join19(home, "sessions"), join19(home, "auth.json")]) {
       try {
         await access10(p);
         return true;
@@ -4373,12 +4379,11 @@ var PROVIDERS = {
   gemini: geminiProvider,
   grok: grokProvider
 };
-async function detectProviders() {
+async function detectWhere(predicate) {
   const found = await Promise.all(
     PROVIDER_ORDER.map(async (id) => {
       try {
-        if (installSignals(id)) return id;
-        return await PROVIDERS[id].detect() ? id : null;
+        return await predicate(id) ? id : null;
       } catch {
         return null;
       }
@@ -4386,6 +4391,12 @@ async function detectProviders() {
   );
   return found.filter((id) => id !== null);
 }
+function detectInstalledProviders() {
+  return detectWhere(async (id) => installSignals(id) || await PROVIDERS[id].detect());
+}
+function detectAccountProviders() {
+  return detectWhere((id) => PROVIDERS[id].detect());
+}
 
 export {
   withTimeout,
@@ -4422,5 +4433,6 @@ export {
   grokAuthPaths,
   PROVIDER_ORDER,
   PROVIDERS,
-  detectProviders
+  detectInstalledProviders,
+  detectAccountProviders
 };

package/dist/{chunk-G2A3DVPU.js → chunk-GQCFGAQ6.js}

@@ -3,7 +3,7 @@
 // src/config.ts
 import { chmod, readFile, writeFile, mkdir, rename, unlink } from "fs/promises";
 import { chmodSync, mkdirSync, renameSync, unlinkSync, writeFileSync } from "fs";
-import { join, isAbsolute } from "path";
+import { join, isAbsolute, resolve } from "path";
 import { homedir } from "os";
 
 // src/providers/types.ts
@@ -613,6 +613,7 @@ function getTrackedAccountRows(config, trackedProviders = PROVIDER_ORDER.filter(
   const excludedKeys = new Set(
     config.accountDetection.excludedAccounts.map((ref) => keyFor(ref.providerId, ref.homeDir))
   );
+  const liveById = new Map((autoAccounts ?? []).map((account) => [account.id, account]));
   const rememberRow = (row) => {
     rowIds.add(row.id);
     rowKeys.add(keyFor(row.providerId, row.homeDir));
@@ -622,6 +623,10 @@ function getTrackedAccountRows(config, trackedProviders = PROVIDER_ORDER.filter(
     const meta = PROVIDER_META[account.providerId];
     configuredIds.add(account.id);
     configuredKeys.add(keyFor(account.providerId, account.homeDir));
+    const live = liveById.get(account.id);
+    if (live) {
+      configuredKeys.add(keyFor(account.providerId, live.homeDir));
+    }
     rememberRow({
       id: account.id,
       providerId: account.providerId,
@@ -629,6 +634,7 @@ function getTrackedAccountRows(config, trackedProviders = PROVIDER_ORDER.filter(
       homeDir: account.homeDir || "~",
       color: account.color || meta.color,
       source: "configured",
+      enabled: account.enabled !== false,
       explicitId: account.id,
       explicitIndex
     });
@@ -647,11 +653,12 @@ function getTrackedAccountRows(config, trackedProviders = PROVIDER_ORDER.filter(
         name: account.name,
         homeDir: account.homeDir || "~",
         color: account.color || meta.color,
-        source: "auto"
+        source: "auto",
+        enabled: true
       });
     }
   }
-  for (const providerId of PROVIDER_ORDER) {
+  if (autoAccounts === void 0) for (const providerId of PROVIDER_ORDER) {
     if (!detectionEnabled || detectorDisabled.has(providerId)) continue;
     if (config.disabledProviders.includes(providerId)) continue;
     if (!tracked.has(providerId)) continue;
@@ -665,7 +672,8 @@ function getTrackedAccountRows(config, trackedProviders = PROVIDER_ORDER.filter(
       name: meta.name,
       homeDir: "~",
       color: meta.color,
-      source: "auto"
+      source: "auto",
+      enabled: true
     });
   }
   for (const ref of config.accountDetection.excludedAccounts) {
@@ -678,6 +686,7 @@ function getTrackedAccountRows(config, trackedProviders = PROVIDER_ORDER.filter(
       homeDir: ref.homeDir,
       color: meta.color,
       source: "ignored",
+      enabled: false,
       excludedRef: ref
     });
   }
@@ -840,7 +849,8 @@ function repairConfig(input) {
       providerId,
       name,
       homeDir: typeof raw.homeDir === "string" && raw.homeDir.trim() ? raw.homeDir : "~",
-      ...typeof raw.color === "string" && raw.color.trim() ? { color: raw.color } : {}
+      ...typeof raw.color === "string" && raw.color.trim() ? { color: raw.color } : {},
+      ...raw.enabled === false ? { enabled: false } : {}
     });
   });
   const disabledProviders = (Array.isArray(parsed.disabledProviders) ? parsed.disabledProviders : []).filter(validProvider);
@@ -929,7 +939,7 @@ function repairConfig(input) {
     graphRangeDays: DESKTOP_GRAPH_RANGES.includes(rawDesktop.graphRangeDays) ? rawDesktop.graphRangeDays : DEFAULT_DESKTOP_CONFIG.graphRangeDays
   };
   if (parsed.desktop !== void 0 && !sameJson(parsed.desktop, desktop)) reasons.push("desktop contained invalid settings");
-  const activeAccountId = typeof parsed.activeAccountId === "string" && (accountIds.has(parsed.activeAccountId) || PROVIDER_IDS.includes(parsed.activeAccountId)) ? parsed.activeAccountId : null;
+  const activeAccountId = typeof parsed.activeAccountId === "string" && parsed.activeAccountId.trim() ? parsed.activeAccountId.trim() : null;
   if (parsed.activeAccountId !== void 0 && parsed.activeAccountId !== null && activeAccountId === null) {
     reasons.push("activeAccountId did not match a known account/provider");
   }
@@ -1059,13 +1069,14 @@ async function loadConfig() {
     return { ...DEFAULTS };
   }
   const repaired = repairConfig(parsed);
-  if (repaired.repaired) {
+  const config = canonicalizeConfigHomeRefs(repaired.config);
+  if (repaired.repaired || JSON.stringify(config) !== JSON.stringify(repaired.config)) {
     try {
-      await saveConfig(repaired.config);
+      await saveConfig(config);
     } catch {
     }
   }
-  return repaired.config;
+  return config;
 }
 var saveQueue = Promise.resolve();
 var tempSequence = 0;
@@ -1074,7 +1085,7 @@ function configTempFile(dir) {
   return join(dir, `config.json.${process.pid}.${Date.now()}.${tempSequence}.tmp`);
 }
 function configJson(config) {
-  return JSON.stringify(normalizeConfig(config), null, 2) + "\n";
+  return JSON.stringify(canonicalizeConfigHomeRefs(normalizeConfig(config)), null, 2) + "\n";
 }
 function saveConfig(config) {
   const write = async () => {
@@ -1121,6 +1132,24 @@ function expandHome(p) {
   if (p.startsWith("~/") || p.startsWith("~\\")) return join(homedir(), p.slice(2));
   return p;
 }
+function canonicalizeConfigHomeRefs(config) {
+  const defaultHome = resolve(homedir());
+  const canonical = (value) => resolve(expandHome(value)) === defaultHome ? "~" : value;
+  return {
+    ...config,
+    accounts: config.accounts.map((account) => ({
+      ...account,
+      homeDir: canonical(account.homeDir || "~")
+    })),
+    accountDetection: {
+      ...config.accountDetection,
+      excludedAccounts: config.accountDetection.excludedAccounts.map((ref) => ({
+        ...ref,
+        homeDir: canonical(ref.homeDir)
+      }))
+    }
+  };
+}
 function findAccount(config, id) {
   if (!id) return null;
   return config.accounts.find((a) => a.id === id) ?? null;
@@ -1171,5 +1200,6 @@ export {
   saveConfig,
   saveConfigSync,
   expandHome,
+  canonicalizeConfigHomeRefs,
   findAccount
 };