tokmon 0.28.2 → 0.28.4

package/dist/{cli-command-DCENRCO3.js → cli-command-I4GRR3MF.js}

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
 import {
   attachOrSpawn
-} from "./chunk-LKYOWBD4.js";
-import "./chunk-J3JW3RFP.js";
+} from "./chunk-FLANGRI6.js";
+import "./chunk-5B3XCEMC.js";
+import "./chunk-UYPDMVW5.js";
 import {
   createDaemonRpcClient
-} from "./chunk-M7XMV36F.js";
+} from "./chunk-7CH6S7BR.js";
 import {
   PROVIDERS,
   antigravityStateDb,
@@ -25,12 +26,13 @@ import {
   startOfMonth,
   startOfWeek,
   withTimeout
-} from "./chunk-LCAHTRGP.js";
-import "./chunk-WUK3MQUB.js";
+} from "./chunk-CFKUZCMB.js";
+import "./chunk-JZSZEHVD.js";
 import {
+  DESKTOP_GRAPH_RANGES,
   PROVIDER_IDS,
   configLocation
-} from "./chunk-HP5UZCXP.js";
+} from "./chunk-HNWEJ6MS.js";
 
 // src/provider-locations.ts
 import { access } from "fs/promises";
@@ -133,7 +135,7 @@ async function cliSource(account) {
     providerId: account.providerId,
     provider: PROVIDERS[account.providerId].name,
     accountId: account.id,
-    account: account.email || account.displayName || account.name,
+    account: account.identity?.accessibleLabel ?? (account.email || account.displayName || account.name),
     homeDir: account.homeDir,
     locations: await providerLocations(account.providerId, account.homeDir ?? void 0)
   };
@@ -341,15 +343,38 @@ Options:
       --timeout <seconds>       Startup/refresh timeout (default: 45)
   -h, --help                    Show this help
 `;
-var CONFIG_HELP = `tokmon config - Print tokmon's configuration file location
+var CONFIG_HELP = `tokmon config - Read and update tokmon settings
 
 Usage:
   tokmon config [path]
   tokmon config --json
+  tokmon config get [--json]
+  tokmon config set <setting> <value> [--json]
+
+Settings:
+  privacy <on|off>
+  privacy-key <char>
+  menu-bar-pins <ids|none>       Comma-separated provider ids; at most 2
+  menu-bar-text <on|off>
+  summary-mode <smart|tightest>
+  expanded-providers <ids|none>  Comma-separated provider ids
+  active-window <minutes>        1..1440
+  graph-range <7|14|30>          Desktop spend graph days
+  auto-detect <on|off>           Automatic account discovery
+  auto-detect-providers <ids|none>
+  launch-at-login <on|off>
 
 Options:
-      --json                    Emit { "path": "..." }
+      --json                    Emit machine-readable JSON
+      --compact                 Emit compact JSON
+      --timeout <seconds>       Daemon connection timeout (default: 45)
   -h, --help                    Show this help
+
+Examples:
+  tokmon config get
+  tokmon config set privacy off
+  tokmon config set menu-bar-pins claude,codex
+  tokmon config set summary-mode smart --json
 `;
 function valueAfter(args, index, name) {
   const value = args[index + 1];
@@ -430,6 +455,15 @@ function isSnapshot(value) {
 var delay = (ms) => new Promise((resolve) => {
   setTimeout(resolve, ms);
 });
+async function connectDaemonConfig(timeoutMs) {
+  const handle = await attachOrSpawn({ timeoutMs });
+  if (handle.kind !== "spawned" || !handle.baseUrl) throw new Error("tokmon daemon is unavailable");
+  return createDaemonRpcClient(handle.baseUrl, {
+    transport: "node",
+    reconnectAttempts: 2,
+    reconnectBaseDelayMs: 100
+  });
+}
 async function fetchDaemonSnapshot(timeoutMs, refresh) {
   const handle = await attachOrSpawn({ timeoutMs });
   if (handle.kind !== "spawned" || !handle.baseUrl) throw new Error("tokmon daemon is unavailable");
@@ -475,6 +509,209 @@ function rejectsOption(args, names) {
   }
   return null;
 }
+var CONFIG_SETTINGS = [
+  "privacy",
+  "privacy-key",
+  "menu-bar-pins",
+  "menu-bar-text",
+  "summary-mode",
+  "expanded-providers",
+  "active-window",
+  "graph-range",
+  "auto-detect",
+  "auto-detect-providers",
+  "launch-at-login"
+];
+function configReport(config) {
+  return {
+    revision: config.revision,
+    privacy: config.privacyMode ? "on" : "off",
+    privacyKey: config.privacyToggleKey,
+    menuBarPins: [...config.tray.pinnedProviders],
+    menuBarText: config.tray.showMenuBarText ? "on" : "off",
+    summaryMode: config.tray.displayMetric === "smartHeadroom" ? "smart" : "tightest",
+    expandedProviders: [...config.desktop.expandedProviders],
+    activeWindowMinutes: config.tray.activeTimeoutMin,
+    graphRangeDays: config.desktop.graphRangeDays,
+    autoDetect: config.accountDetection.enabled ? "on" : "off",
+    autoDetectProviders: PROVIDER_IDS.filter((id) => !config.accountDetection.disabledProviders.includes(id)),
+    launchAtLogin: config.tray.launchAtLogin ? "on" : "off"
+  };
+}
+function formatConfigReport(report) {
+  const list = (values) => values.length > 0 ? values.join(",") : "none";
+  return [
+    `privacy             ${report.privacy}`,
+    `privacy-key         ${report.privacyKey}`,
+    `menu-bar-pins       ${list(report.menuBarPins)}`,
+    `menu-bar-text       ${report.menuBarText}`,
+    `summary-mode        ${report.summaryMode}`,
+    `expanded-providers  ${list(report.expandedProviders)}`,
+    `active-window       ${report.activeWindowMinutes}m`,
+    `graph-range         ${report.graphRangeDays}d`,
+    `auto-detect         ${report.autoDetect}`,
+    `auto-detect-providers ${list(report.autoDetectProviders)}`,
+    `launch-at-login     ${report.launchAtLogin}`
+  ].join("\n") + "\n";
+}
+function onOff(value, setting) {
+  if (value === "on") return true;
+  if (value === "off") return false;
+  throw new Error(`${setting} must be on or off`);
+}
+function providerList(value, setting, max = PROVIDER_IDS.length) {
+  if (value === "none") return [];
+  const raw = value.split(",").map((item) => item.trim());
+  if (raw.length === 0 || raw.some((item) => item.length === 0)) {
+    throw new Error(`${setting} must be a comma-separated provider list or none`);
+  }
+  const unique2 = [...new Set(raw)];
+  for (const provider of unique2) {
+    if (!PROVIDER_IDS.includes(provider)) throw new Error(`unknown provider: ${provider}`);
+  }
+  if (unique2.length > max) throw new Error(`${setting} accepts at most ${max} providers`);
+  return unique2;
+}
+function settingMutation(setting, value) {
+  if (setting === "privacy") {
+    const enabled2 = onOff(value, setting);
+    return { mutate: (config) => ({ ...config, privacyMode: enabled2 }), display: value };
+  }
+  if (setting === "privacy-key") {
+    if (value.length !== 1 || new RegExp("\\s|\\p{Cc}", "u").test(value)) throw new Error("privacy-key must be one printable non-whitespace character");
+    return { mutate: (config) => ({ ...config, privacyToggleKey: value }), display: value };
+  }
+  if (setting === "menu-bar-pins") {
+    const providers = providerList(value, setting, 2);
+    return {
+      mutate: (config) => ({
+        ...config,
+        tray: { ...config.tray, pinnedProviders: providers, pins: [], pinnedAccount: null }
+      }),
+      display: providers
+    };
+  }
+  if (setting === "menu-bar-text") {
+    const enabled2 = onOff(value, setting);
+    return { mutate: (config) => ({ ...config, tray: { ...config.tray, showMenuBarText: enabled2 } }), display: value };
+  }
+  if (setting === "summary-mode") {
+    if (value !== "smart" && value !== "tightest") throw new Error("summary-mode must be smart or tightest");
+    const displayMetric = value === "smart" ? "smartHeadroom" : "tightestRemaining";
+    return { mutate: (config) => ({ ...config, tray: { ...config.tray, displayMetric } }), display: value };
+  }
+  if (setting === "expanded-providers") {
+    const providers = providerList(value, setting);
+    return {
+      mutate: (config) => ({ ...config, desktop: { ...config.desktop, expandedProviders: providers } }),
+      display: providers
+    };
+  }
+  if (setting === "active-window") {
+    const minutes = Number(value);
+    if (!Number.isInteger(minutes) || minutes < 1 || minutes > 1440) throw new Error("active-window must be an integer from 1 to 1440 minutes");
+    return { mutate: (config) => ({ ...config, tray: { ...config.tray, activeTimeoutMin: minutes } }), display: minutes };
+  }
+  if (setting === "graph-range") {
+    const days = Number(value);
+    if (!DESKTOP_GRAPH_RANGES.includes(days)) throw new Error("graph-range must be 7, 14, or 30 days");
+    return {
+      mutate: (config) => ({ ...config, desktop: { ...config.desktop, graphRangeDays: days } }),
+      display: days
+    };
+  }
+  if (setting === "auto-detect") {
+    const enabled2 = onOff(value, setting);
+    return {
+      mutate: (config) => ({ ...config, accountDetection: { ...config.accountDetection, enabled: enabled2 } }),
+      display: value
+    };
+  }
+  if (setting === "auto-detect-providers") {
+    const enabled2 = providerList(value, setting);
+    return {
+      mutate: (config) => ({
+        ...config,
+        accountDetection: {
+          ...config.accountDetection,
+          disabledProviders: PROVIDER_IDS.filter((provider) => !enabled2.includes(provider))
+        }
+      }),
+      display: enabled2
+    };
+  }
+  if (setting !== "launch-at-login") throw new Error(`unsupported config setting: ${setting}`);
+  const enabled = onOff(value, setting);
+  return { mutate: (config) => ({ ...config, tray: { ...config.tray, launchAtLogin: enabled } }), display: value };
+}
+function isConfigConflict(cause) {
+  return !!cause && typeof cause === "object" && cause.kind === "conflict";
+}
+async function readDaemonConfig(timeoutMs, connect) {
+  const client = await connect(timeoutMs);
+  try {
+    const state = await withTimeout(client.getConfig(), timeoutMs);
+    return {
+      state,
+      close: () => client.close(),
+      get: () => withTimeout(client.getConfig(), timeoutMs),
+      set: (update) => withTimeout(client.setConfig(update), timeoutMs)
+    };
+  } catch (cause) {
+    await client.close().catch(() => {
+    });
+    throw cause;
+  }
+}
+async function runConfigCommand(args, configPath, connect) {
+  const [action, settingName, value, ...extra] = args.positionals;
+  if (!action || action === "path") {
+    if (settingName || value || extra.length > 0) throw new Error("usage: tokmon config [path] [--json]");
+    return args.json ? json({ path: configPath() }, args.compact) : `${configPath()}
+`;
+  }
+  if (action !== "get" && action !== "set") throw new Error("usage: tokmon config [path|get|set]");
+  if (action === "get") {
+    if (settingName || value || extra.length > 0) throw new Error("usage: tokmon config get [--json]");
+    const daemon2 = await readDaemonConfig(args.timeoutMs, connect);
+    try {
+      const report = configReport(daemon2.state.config);
+      return args.json ? json(report, args.compact) : formatConfigReport(report);
+    } finally {
+      await daemon2.close().catch(() => {
+      });
+    }
+  }
+  if (!settingName || !CONFIG_SETTINGS.includes(settingName) || value === void 0 || extra.length > 0) {
+    throw new Error("usage: tokmon config set <setting> <value>");
+  }
+  const setting = settingName;
+  const update = settingMutation(setting, value);
+  const daemon = await readDaemonConfig(args.timeoutMs, connect);
+  try {
+    let base = daemon.state;
+    let saved = null;
+    for (let attempt = 0; attempt < 2; attempt++) {
+      try {
+        saved = await daemon.set({
+          expectedRevision: base.config.revision,
+          config: update.mutate(base.config)
+        });
+        break;
+      } catch (cause) {
+        if (attempt > 0 || !isConfigConflict(cause)) throw cause;
+        base = await daemon.get();
+      }
+    }
+    if (!saved) throw new Error("config update failed");
+    const result = { setting, value: update.display, revision: saved.config.revision };
+    return args.json ? json(result, args.compact) : `${setting} ${Array.isArray(update.display) ? update.display.join(",") || "none" : update.display}
+`;
+  } finally {
+    await daemon.close().catch(() => {
+    });
+  }
+}
 function queryHelp(command) {
   if (command === "providers") return PROVIDERS_HELP;
   if (command === "snapshot") return SNAPSHOT_HELP;
@@ -486,13 +723,9 @@ async function runQueryCommand(command, args, dependencies = {}) {
   if (parsed.help) return queryHelp(command);
   const getConfigPath = dependencies.configPath ?? configLocation;
   if (command === "config") {
-    const invalid = rejectsOption(args, ["--period", "--provider", "--account", "--model", "--refresh", "--cached", "--no-refresh", "--timeout"]);
+    const invalid = rejectsOption(args, ["--period", "--provider", "--account", "--model", "--refresh", "--cached", "--no-refresh"]);
     if (invalid) throw new Error(`${invalid} is not valid for tokmon config`);
-    if (parsed.positionals.length > 1 || parsed.positionals[0] && parsed.positionals[0] !== "path") {
-      throw new Error("usage: tokmon config [path] [--json]");
-    }
-    return parsed.json ? json({ path: getConfigPath() }, parsed.compact) : `${getConfigPath()}
-`;
+    return runConfigCommand(parsed, getConfigPath, dependencies.connectConfig ?? connectDaemonConfig);
   }
   if (command === "providers" || command === "snapshot") {
     const invalid = rejectsOption(args, ["--period", "--provider", "--account", "--model", "--cached", "--no-refresh"]);
@@ -519,6 +752,7 @@ async function runQueryCommand(command, args, dependencies = {}) {
 `;
 }
 export {
+  connectDaemonConfig,
   fetchDaemonSnapshot,
   parseQueryArgs,
   queryHelp,

package/dist/cli.js

@@ -41,7 +41,7 @@ function validateServeArgs(serveArgs) {
 }
 async function main() {
   if (subcommand && ["usage", "models", "query", "providers", "snapshot", "config"].includes(subcommand)) {
-    const { runQueryCommand } = await import("./cli-command-DCENRCO3.js");
+    const { runQueryCommand } = await import("./cli-command-I4GRR3MF.js");
     try {
       const output = await runQueryCommand(
         subcommand,
@@ -60,14 +60,14 @@ Run tokmon ${subcommand} --help for usage.
     return;
   }
   if (subcommand === "__daemon") {
-    const { runDaemon } = await import("./daemon-6Y4O7NXS.js");
+    const { runDaemon } = await import("./daemon-ZXV3V5CS.js");
     await runDaemon(args.slice(1), { foreground: false });
     process.exitCode ??= 0;
     return;
   }
   if (subcommand === "serve" || subcommand === "web") {
     validateServeArgs(args.slice(1));
-    const { runDaemon } = await import("./daemon-6Y4O7NXS.js");
+    const { runDaemon } = await import("./daemon-ZXV3V5CS.js");
     await runDaemon(args.slice(1), { foreground: true });
     process.exitCode ??= 0;
     return;
@@ -115,9 +115,9 @@ Run tokmon ${subcommand} --help for usage.
       return;
     }
   }
-  const { loadConfig } = await import("./config-HXFJTNLM.js");
+  const { loadConfig } = await import("./config-3DGZ47F7.js");
   const { resolveGlyphs, setGlyphs } = await import("./glyphs-NKCSZLGO.js");
-  const { attachOrSpawn } = await import("./daemon-handle-GVCYVDPO.js");
+  const { attachOrSpawn } = await import("./daemon-handle-G4OGPFR3.js");
   const config = await loadConfig();
   setGlyphs(resolveGlyphs({
     flag: asciiFlag,
@@ -128,7 +128,7 @@ Run tokmon ${subcommand} --help for usage.
   }));
   const daemon = await attachOrSpawn();
   const mode = daemon.kind === "spawned" ? "connected" : "degraded";
-  const { bootstrapInk } = await import("./bootstrap-ink-IMT3S5HU.js");
+  const { bootstrapInk } = await import("./bootstrap-ink-WG4WG3R2.js");
   await bootstrapInk({ interval, config, daemon, mode });
 }
 void main().catch((error) => {

package/dist/{config-HXFJTNLM.js → config-3DGZ47F7.js}

@@ -3,10 +3,15 @@ import {
   ACCENT_COLORS,
   COLOR_PALETTE,
   DEFAULTS,
+  DEFAULT_ACCOUNT_DETECTION_CONFIG,
+  DEFAULT_TRAY_CONFIG,
+  DESKTOP_GRAPH_RANGES,
+  MAX_PINNED_PROVIDERS,
   PROVIDER_IDS,
   PROVIDER_META,
   cacheDir,
   clampNum,
+  cleanProviderSelection,
   configLocation,
   containsEmail,
   envDir,
@@ -15,26 +20,36 @@ import {
   generateAccountId,
   getTrackedAccountRows,
   loadConfig,
+  moveProviderSelection,
   normalizeAllowedHost,
   normalizeAllowedHosts,
   normalizeConfig,
   pickAccentColor,
+  providerDetectionEnabled,
   redactEmail,
   repairConfig,
   sanitizeTyped,
   saveConfig,
   saveConfigSync,
+  setDetectedAccountExcluded,
+  setProviderDetectionEnabled,
   slugify,
-  snapshotCacheFile
-} from "./chunk-HP5UZCXP.js";
+  snapshotCacheFile,
+  toggleProviderSelection
+} from "./chunk-HNWEJ6MS.js";
 export {
   ACCENT_COLORS,
   COLOR_PALETTE,
   DEFAULTS,
+  DEFAULT_ACCOUNT_DETECTION_CONFIG,
+  DEFAULT_TRAY_CONFIG,
+  DESKTOP_GRAPH_RANGES,
+  MAX_PINNED_PROVIDERS,
   PROVIDER_IDS,
   PROVIDER_META,
   cacheDir,
   clampNum,
+  cleanProviderSelection,
   configLocation,
   containsEmail,
   envDir,
@@ -43,15 +58,20 @@ export {
   generateAccountId,
   getTrackedAccountRows,
   loadConfig,
+  moveProviderSelection,
   normalizeAllowedHost,
   normalizeAllowedHosts,
   normalizeConfig,
   pickAccentColor,
+  providerDetectionEnabled,
   redactEmail,
   repairConfig,
   sanitizeTyped,
   saveConfig,
   saveConfigSync,
+  setDetectedAccountExcluded,
+  setProviderDetectionEnabled,
   slugify,
-  snapshotCacheFile
+  snapshotCacheFile,
+  toggleProviderSelection
 };