tokmon 0.28.8 → 0.29.0

package/README.md

@@ -60,11 +60,15 @@ signed and notarized. Windows builds are currently unsigned.
 | --- | --- | --- |
 | Terminal | A fast overview while coding | `tokmon` |
 | Web dashboard | Charts, filtering, all-time history, and exports | `tokmon serve` |
-| Desktop | Pinned quota rings and quick account details | Install from Releases |
-
-The desktop app can pin two providers in the macOS menu bar. Clicking it opens
-a compact view of every provider and account, including usage, reset times,
-token totals, spend, cache savings, and recent history.
+| Desktop | A customisable menu-bar summary and quick account details | Install from Releases |
+
+Pin up to two providers directly from their desktop cards, then decide exactly
+what the macOS menu bar shows: provider marks, usage or today's tokens, optional
+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.
 
 ![Tokmon desktop quota popover](assets/desktop/tray-popover.png)
 

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   createDaemonRpcClient
-} from "./chunk-RY24UHMK.js";
+} from "./chunk-AUUBRLBG.js";
 import {
   accountIdentityText,
   accountsByProvider,
@@ -11,7 +11,7 @@ import {
   resolveQuotaViews,
   severity,
   usageFromHeadroom
-} from "./chunk-BZFDTIFV.js";
+} from "./chunk-3D6TO5TS.js";
 import {
   PROVIDERS,
   PROVIDER_ORDER,
@@ -28,11 +28,12 @@ import {
   time,
   tokens,
   withTimeout
-} from "./chunk-DESEB73E.js";
-import "./chunk-UON47FYF.js";
+} from "./chunk-WPZTPMBX.js";
+import "./chunk-BYLWQ46U.js";
 import {
   COLOR_PALETTE,
   DEFAULTS,
+  DEFAULT_MENU_BAR_CONFIG,
   DESKTOP_GRAPH_RANGES,
   THEME_PRESET_IDS,
   configLocation,
@@ -51,10 +52,10 @@ import {
   saveConfigSync,
   setDetectedAccountExcluded,
   setProviderDetectionEnabled,
+  setProviderTrackingEnabled,
   snapshotCacheFile,
-  themePresetOption,
-  toggleProviderSelection
-} from "./chunk-O7ORALKA.js";
+  themePresetOption
+} from "./chunk-G2A3DVPU.js";
 import {
   glyphs
 } from "./chunk-RF4GGQGM.js";
@@ -1102,6 +1103,34 @@ function cycleNumber(values, current, direction) {
 var step = (key) => key.leftArrow ? -1 : 1;
 var isToggleKey = (key) => key.leftArrow || key.rightArrow || key.return;
 var isAdjustKey = (input, key) => input === " " || key.leftArrow || key.rightArrow || key.return;
+function toggleMenuBarPresentationElement(config, element) {
+  const elements = config.tray.menuBar.elements;
+  if (elements[element] && Object.values(elements).filter(Boolean).length === 1) return config;
+  const nextElements = { ...elements, [element]: !elements[element] };
+  return {
+    ...config,
+    tray: {
+      ...config.tray,
+      showMenuBarText: nextElements.value,
+      menuBar: { ...config.tray.menuBar, elements: nextElements }
+    }
+  };
+}
+function adjustMenuBarSpacing(config, field, direction, max) {
+  const current = config.tray.menuBar.customSpacing[field];
+  const value = Math.min(max, Math.max(0, Math.round((current + direction * 0.5) * 2) / 2));
+  return {
+    ...config,
+    tray: {
+      ...config.tray,
+      menuBar: {
+        ...config.tray.menuBar,
+        mode: "custom",
+        customSpacing: { ...config.tray.menuBar.customSpacing, [field]: value }
+      }
+    }
+  };
+}
 var GENERAL_SETTINGS = [
   {
     key: "refreshInterval",
@@ -1292,11 +1321,35 @@ var DESKTOP_FIXED_SETTINGS = [
     }
   },
   {
-    key: "menuBarValues",
-    label: "Menu bar values",
-    render: (rc) => toggleText(rc.config.tray.showMenuBarText, rc.theme, "shown", "icon only", rc.theme.unknown),
+    key: "menuBarMode",
+    label: "Menu bar layout",
+    render: (rc) => caret(/* @__PURE__ */ jsx7(Text6, { bold: true, color: rc.theme.accent, children: rc.config.tray.menuBar.mode })),
+    onAdjust: (input, key, ctx) => {
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => ({ ...c, tray: { ...c.tray, menuBar: { ...c.tray.menuBar, mode: c.tray.menuBar.mode === "auto" ? "custom" : "auto" } } }));
+    }
+  },
+  {
+    key: "menuBarMark",
+    label: "Provider mark",
+    render: (rc) => toggleText(rc.config.tray.menuBar.elements.providerMark, rc.theme, "shown", "hidden", rc.theme.unknown),
+    onAdjust: (input, key, ctx) => {
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => toggleMenuBarPresentationElement(c, "providerMark"));
+    }
+  },
+  {
+    key: "menuBarValue",
+    label: "Value",
+    render: (rc) => toggleText(rc.config.tray.menuBar.elements.value, rc.theme, "shown", "hidden", rc.theme.unknown),
+    onAdjust: (input, key, ctx) => {
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => toggleMenuBarPresentationElement(c, "value"));
+    }
+  },
+  {
+    key: "menuBarProgress",
+    label: "Progress",
+    render: (rc) => toggleText(rc.config.tray.menuBar.elements.progress, rc.theme, "shown", "hidden", rc.theme.unknown),
     onAdjust: (input, key, ctx) => {
-      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => ({ ...c, tray: { ...c.tray, showMenuBarText: !c.tray.showMenuBarText } }));
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => toggleMenuBarPresentationElement(c, "progress"));
     }
   },
   {
@@ -1307,6 +1360,68 @@ var DESKTOP_FIXED_SETTINGS = [
       if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => ({ ...c, tray: { ...c.tray, menuBarValue: c.tray.menuBarValue === "usage" ? "todayTokens" : "usage" } }));
     }
   },
+  {
+    key: "menuBarDensity",
+    label: "Density",
+    render: (rc) => caret(/* @__PURE__ */ jsx7(Text6, { bold: true, color: rc.theme.accent, children: rc.config.tray.menuBar.density })),
+    onAdjust: (input, key, ctx) => {
+      if (!isAdjustKey(input, key)) return;
+      const choices = ["comfortable", "compact", "tight"];
+      ctx.global.updateConfig((c) => {
+        const current = choices.indexOf(c.tray.menuBar.density);
+        return { ...c, tray: { ...c.tray, menuBar: { ...c.tray.menuBar, density: choices[(current + step(key) + choices.length) % choices.length] } } };
+      });
+    }
+  },
+  {
+    key: "menuBarEdgePadding",
+    label: "Edge padding",
+    render: (rc) => caret(/* @__PURE__ */ jsxs6(Text6, { bold: true, color: rc.theme.cost, children: [
+      rc.config.tray.menuBar.customSpacing.edgePaddingPt.toFixed(1),
+      "pt"
+    ] })),
+    onAdjust: (input, key, ctx) => {
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => adjustMenuBarSpacing(c, "edgePaddingPt", step(key), 6));
+    }
+  },
+  {
+    key: "menuBarMarkValueGap",
+    label: "Mark/value gap",
+    render: (rc) => caret(/* @__PURE__ */ jsxs6(Text6, { bold: true, color: rc.theme.cost, children: [
+      rc.config.tray.menuBar.customSpacing.markValueGapPt.toFixed(1),
+      "pt"
+    ] })),
+    onAdjust: (input, key, ctx) => {
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => adjustMenuBarSpacing(c, "markValueGapPt", step(key), 8));
+    }
+  },
+  {
+    key: "menuBarProviderGap",
+    label: "Provider gap",
+    render: (rc) => caret(/* @__PURE__ */ jsxs6(Text6, { bold: true, color: rc.theme.cost, children: [
+      rc.config.tray.menuBar.customSpacing.providerGapPt.toFixed(1),
+      "pt"
+    ] })),
+    onAdjust: (input, key, ctx) => {
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => adjustMenuBarSpacing(c, "providerGapPt", step(key), 16));
+    }
+  },
+  {
+    key: "menuBarReset",
+    label: "Reset presentation",
+    render: (rc) => /* @__PURE__ */ jsx7(Text6, { bold: true, color: rc.theme.unknown, children: "press enter" }),
+    onAdjust: (input, key, ctx) => {
+      if (input !== " " && !key.return) return;
+      ctx.global.updateConfig((c) => {
+        const menuBar = {
+          ...DEFAULT_MENU_BAR_CONFIG,
+          elements: { ...DEFAULT_MENU_BAR_CONFIG.elements },
+          customSpacing: { ...DEFAULT_MENU_BAR_CONFIG.customSpacing }
+        };
+        return { ...c, tray: { ...c.tray, menuBar, showMenuBarText: menuBar.elements.value } };
+      });
+    }
+  },
   {
     key: "summary",
     label: "Summary",
@@ -1437,31 +1552,11 @@ var SettingsView = memo4(function SettingsView2({
         /* @__PURE__ */ jsx7(Row, { cursor, idx: i, label: row.label, children: row.render(rc) }),
         row.below?.(rc, cursor === i)
       ] }, row.key)),
-      /* @__PURE__ */ jsxs6(Box6, { marginTop: 1, children: [
-        /* @__PURE__ */ jsx7(Text6, { bold: true, dimColor: true, children: "Menu bar pins" }),
-        /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "  up to 2 providers, in order" })
-      ] }),
-      PROVIDER_ORDER.map((pid, i) => {
-        const idx = DESKTOP_FIXED_ROWS + i;
-        const selected = cursor === idx;
-        const pinned = config.tray.pinnedProviders.includes(pid);
-        const position = config.tray.pinnedProviders.indexOf(pid);
-        const meta = PROVIDERS[pid];
-        return /* @__PURE__ */ jsxs6(Box6, { children: [
-          /* @__PURE__ */ jsxs6(Text6, { color: selected ? theme.accent : void 0, children: [
-            selected ? glyphs().caretR : " ",
-            " "
-          ] }),
-          /* @__PURE__ */ jsxs6(Box6, { width: 20, children: [
-            /* @__PURE__ */ jsxs6(Text6, { color: meta.color, children: [
-              glyphs().dot,
-              " "
-            ] }),
-            /* @__PURE__ */ jsx7(Text6, { bold: pinned, children: meta.name })
-          ] }),
-          /* @__PURE__ */ jsx7(Text6, { color: pinned ? theme.ok : void 0, dimColor: !pinned, children: pinned ? `[${position + 1}] pinned` : "[ ] not pinned" })
-        ] }, pid);
-      })
+      /* @__PURE__ */ jsxs6(Box6, { marginTop: 1, flexDirection: "column", children: [
+        /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "  Menu-bar presentation applies to the macOS desktop app." }),
+        /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "  Pin providers from their cards in the desktop overview." }),
+        /* @__PURE__ */ jsx7(Text6, { dimColor: true, children: "  Adjusting a spacing value switches the layout to custom." })
+      ] })
     ] }),
     activeTab === "providers" && /* @__PURE__ */ jsxs6(Fragment5, { children: [
       /* @__PURE__ */ jsx7(Text6, { bold: true, dimColor: true, children: "Providers" }),
@@ -2576,7 +2671,7 @@ function handleSettings(input, key, ctx) {
     ctx.allowedHostsEditor.setValue(null);
     ctx.allowedHostsEditor.setError(null);
   };
-  const rowCount = tab === "general" ? GENERAL_ROWS : tab === "theme" ? THEME_ROWS : tab === "desktop" ? DESKTOP_FIXED_ROWS + PROVIDER_ORDER.length : tab === "providers" ? PROVIDER_ORDER.length + 1 : trackedAccounts.length + 1;
+  const rowCount = tab === "general" ? GENERAL_ROWS : tab === "theme" ? THEME_ROWS : tab === "desktop" ? DESKTOP_FIXED_ROWS : tab === "providers" ? PROVIDER_ORDER.length + 1 : trackedAccounts.length + 1;
   if (key.tab) {
     switchTab(key.shift ? -1 : 1);
     return;
@@ -2630,20 +2725,7 @@ function handleSettings(input, key, ctx) {
     return;
   }
   if (tab === "desktop") {
-    if (cursor < DESKTOP_FIXED_ROWS) {
-      DESKTOP_FIXED_SETTINGS[cursor]?.onAdjust(input, key, ctx);
-      return;
-    }
-    const provider = PROVIDER_ORDER[cursor - DESKTOP_FIXED_ROWS];
-    if (provider && (input === " " || key.leftArrow || key.rightArrow || key.return)) {
-      updateConfig((current) => ({
-        ...current,
-        tray: {
-          ...current.tray,
-          pinnedProviders: toggleProviderSelection(current.tray.pinnedProviders, provider, new Set(PROVIDER_ORDER), 2)
-        }
-      }));
-    }
+    DESKTOP_FIXED_SETTINGS[cursor]?.onAdjust(input, key, ctx);
     return;
   }
   if (tab === "providers") {
@@ -3698,7 +3780,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     () => getTrackedAccountRows(cfg, detectedProviders, accounts),
     [cfg, detectedProviders, accounts]
   );
-  const settingsRowCount = settingsTab === "general" ? GENERAL_ROWS : settingsTab === "theme" ? THEME_ROWS : settingsTab === "desktop" ? DESKTOP_FIXED_ROWS + PROVIDER_ORDER.length : settingsTab === "providers" ? PROVIDER_ORDER.length + 1 : trackedAccountRows.length + 1;
+  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([]);
   accountsRef.current = accounts;
   const rowCountRef = useRef8(0);
@@ -3939,11 +4021,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     });
   }
   function toggleProvider(pid) {
-    updateConfig((c) => ({
-      ...c,
-      knownProviders: c.knownProviders.includes(pid) ? c.knownProviders : [...c.knownProviders, pid],
-      disabledProviders: c.disabledProviders.includes(pid) ? c.disabledProviders.filter((p) => p !== pid) : [...c.disabledProviders, pid]
-    }));
+    updateConfig((c) => setProviderTrackingEnabled(c, pid, c.disabledProviders.includes(pid)));
   }
   function confirmOnboarding() {
     const enabled = onboardEnabled;
@@ -4010,7 +4088,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     if (webStartingRef.current) return;
     webStartingRef.current = true;
     try {
-      const { startWebServer } = await import("./server-LNFK5MRX.js");
+      const { startWebServer } = await import("./server-P6BRXBZ5.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);

package/dist/{chunk-BZFDTIFV.js → chunk-3D6TO5TS.js}

@@ -5,13 +5,13 @@ import {
   identityFromIdToken,
   readClaudeIdentity,
   readJson
-} from "./chunk-DESEB73E.js";
+} from "./chunk-WPZTPMBX.js";
 import {
   containsEmail,
   expandHome,
   redactEmail,
   slugify
-} from "./chunk-O7ORALKA.js";
+} from "./chunk-G2A3DVPU.js";
 
 // src/accounts.ts
 import { existsSync, readdirSync, readFileSync as readFileSync2, statSync } from "fs";

package/dist/{chunk-6E2OJCIQ.js → chunk-5Q5HUOP4.js}

@@ -10,13 +10,13 @@ import {
   deriveQuotaViews,
   fetchPeak,
   namedHex
-} from "./chunk-BZFDTIFV.js";
+} from "./chunk-3D6TO5TS.js";
 import {
   PROVIDERS,
   detectProviders,
   resolveTimezone,
   withTimeout
-} from "./chunk-DESEB73E.js";
+} from "./chunk-WPZTPMBX.js";
 import {
   ConfigPersistenceFailure,
   ConfigUpdateConflictFailure,
@@ -26,7 +26,7 @@ import {
   TOKMON_WS_METHODS,
   TOKMON_WS_PATH,
   TokmonRpcGroup
-} from "./chunk-UON47FYF.js";
+} from "./chunk-BYLWQ46U.js";
 import {
   cacheDir,
   expandHome,
@@ -34,7 +34,7 @@ import {
   normalizeConfig,
   saveConfig,
   snapshotCacheFile
-} from "./chunk-O7ORALKA.js";
+} from "./chunk-G2A3DVPU.js";
 
 // src/web/server.ts
 import { createServer } from "http";
@@ -845,6 +845,13 @@ function mergeCapabilityFields(incomingConfig, current) {
     tray: hasOwn(incoming, "tray") && incomingTray ? {
       ...current.tray,
       ...incomingTray,
+      menuBar: hasOwn(incomingTray, "menuBar") ? incomingTray.menuBar : hasOwn(incomingTray, "showMenuBarText") && incomingTray.showMenuBarText !== current.tray.showMenuBarText ? {
+        ...current.tray.menuBar,
+        elements: {
+          ...current.tray.menuBar.elements,
+          value: incomingTray.showMenuBarText
+        }
+      } : current.tray.menuBar,
       pinnedProviders: hasOwn(incomingTray, "pinnedProviders") ? incomingTray.pinnedProviders : current.tray.pinnedProviders
     } : current.tray,
     desktop: hasOwn(incoming, "desktop") && incomingDesktop ? {

package/dist/{chunk-RY24UHMK.js → chunk-AUUBRLBG.js}

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

package/dist/{chunk-MIXBF6QU.js → chunk-BLUQGJKM.js}

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

package/dist/{chunk-UON47FYF.js → chunk-BYLWQ46U.js}

@@ -4,7 +4,7 @@ import {
   DESKTOP_GRAPH_RANGES,
   PROVIDER_IDS,
   THEME_PRESET_IDS
-} from "./chunk-O7ORALKA.js";
+} from "./chunk-G2A3DVPU.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"];
+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_WS_METHODS = {
   getConfig: "tokmon.getConfig",
   setConfig: "tokmon.setConfig",
@@ -40,6 +40,23 @@ var AccountSchema = Schema.Struct({
 });
 var TrayConfigSchema = Schema.Struct({
   enabled: Schema.Boolean,
+  // Additive under `menu-bar-builder-v1`; old peers omit it and repair from
+  // `showMenuBarText`, while the daemon's CAS boundary preserves newer state.
+  menuBar: Schema.optionalKey(Schema.Struct({
+    version: Schema.Literal(1),
+    mode: Schema.Literals(["auto", "custom"]),
+    elements: Schema.Struct({
+      providerMark: Schema.Boolean,
+      value: Schema.Boolean,
+      progress: Schema.Boolean
+    }),
+    density: Schema.Literals(["comfortable", "compact", "tight"]),
+    customSpacing: Schema.Struct({
+      edgePaddingPt: Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 6 })).check(Schema.isMultipleOf(0.5)),
+      markValueGapPt: Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 8 })).check(Schema.isMultipleOf(0.5)),
+      providerGapPt: Schema.Finite.check(Schema.isBetween({ minimum: 0, maximum: 16 })).check(Schema.isMultipleOf(0.5))
+    })
+  })),
   showMenuBarText: Schema.Boolean,
   menuBarValue: Schema.optionalKey(Schema.Literals(["usage", "todayTokens"])),
   displayMetric: Schema.Literals(["smartHeadroom", "tightestRemaining"]),

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

@@ -500,8 +500,24 @@ function moveProviderSelection(values, providerId, direction) {
   [next[index], next[target]] = [next[target], next[index]];
   return next;
 }
+var DEFAULT_MENU_BAR_CONFIG = {
+  version: 1,
+  mode: "auto",
+  elements: {
+    providerMark: true,
+    value: true,
+    progress: false
+  },
+  density: "comfortable",
+  customSpacing: {
+    edgePaddingPt: 1,
+    markValueGapPt: 3,
+    providerGapPt: 8
+  }
+};
 var DEFAULT_TRAY_CONFIG = {
   enabled: true,
+  menuBar: DEFAULT_MENU_BAR_CONFIG,
   showMenuBarText: true,
   menuBarValue: "usage",
   displayMetric: "smartHeadroom",
@@ -670,6 +686,14 @@ function getTrackedAccountRows(config, trackedProviders = PROVIDER_ORDER.filter(
 function providerDetectionEnabled(config, providerId) {
   return config.enabled && !config.disabledProviders.includes(providerId);
 }
+function setProviderTrackingEnabled(config, providerId, enabled) {
+  const disabledProviders = config.disabledProviders.filter((id) => id !== providerId);
+  return {
+    ...config,
+    knownProviders: config.knownProviders.includes(providerId) ? config.knownProviders : [...config.knownProviders, providerId],
+    disabledProviders: enabled ? disabledProviders : [...disabledProviders, providerId]
+  };
+}
 function setProviderDetectionEnabled(config, providerId, enabled) {
   const without = config.disabledProviders.filter((id) => id !== providerId);
   return {
@@ -692,6 +716,10 @@ function clampNum(v, fallback, min) {
 function finiteInRange(v, fallback, min, max) {
   return typeof v === "number" && Number.isFinite(v) && v >= min && v <= max ? v : fallback;
 }
+function halfPointInRange(v, fallback, min, max) {
+  if (typeof v !== "number" || !Number.isFinite(v)) return fallback;
+  return Math.min(max, Math.max(min, Math.round(v * 2) / 2));
+}
 function isValidTimezone(tz) {
   try {
     new Intl.DateTimeFormat("en-CA", { timeZone: tz });
@@ -713,6 +741,50 @@ function sameJson(a, b) {
     return false;
   }
 }
+function repairMenuBarConfig(input, legacyShowMenuBarText = DEFAULT_TRAY_CONFIG.showMenuBarText) {
+  if (!isRecord2(input)) {
+    return {
+      ...DEFAULT_MENU_BAR_CONFIG,
+      elements: {
+        ...DEFAULT_MENU_BAR_CONFIG.elements,
+        value: legacyShowMenuBarText
+      },
+      customSpacing: { ...DEFAULT_MENU_BAR_CONFIG.customSpacing }
+    };
+  }
+  const elements = isRecord2(input.elements) ? input.elements : {};
+  const spacing = isRecord2(input.customSpacing) ? input.customSpacing : {};
+  return {
+    version: 1,
+    mode: input.mode === "custom" ? "custom" : "auto",
+    elements: {
+      providerMark: typeof elements.providerMark === "boolean" ? elements.providerMark : DEFAULT_MENU_BAR_CONFIG.elements.providerMark,
+      value: typeof elements.value === "boolean" ? elements.value : DEFAULT_MENU_BAR_CONFIG.elements.value,
+      progress: typeof elements.progress === "boolean" ? elements.progress : DEFAULT_MENU_BAR_CONFIG.elements.progress
+    },
+    density: input.density === "compact" || input.density === "tight" ? input.density : DEFAULT_MENU_BAR_CONFIG.density,
+    customSpacing: {
+      edgePaddingPt: halfPointInRange(
+        spacing.edgePaddingPt,
+        DEFAULT_MENU_BAR_CONFIG.customSpacing.edgePaddingPt,
+        0,
+        6
+      ),
+      markValueGapPt: halfPointInRange(
+        spacing.markValueGapPt,
+        DEFAULT_MENU_BAR_CONFIG.customSpacing.markValueGapPt,
+        0,
+        8
+      ),
+      providerGapPt: halfPointInRange(
+        spacing.providerGapPt,
+        DEFAULT_MENU_BAR_CONFIG.customSpacing.providerGapPt,
+        0,
+        16
+      )
+    }
+  };
+}
 function normalizeAllowedHost(value) {
   if (typeof value !== "string") return null;
   const candidate = value.trim();
@@ -819,9 +891,13 @@ function repairConfig(input) {
   }
   const rawTray = isRecord2(parsed.tray) ? parsed.tray : {};
   if (parsed.tray !== void 0 && !isRecord2(parsed.tray)) reasons.push("tray was not an object");
+  const legacyShowMenuBarText = typeof rawTray.showMenuBarText === "boolean" ? rawTray.showMenuBarText : DEFAULT_TRAY_CONFIG.showMenuBarText;
+  const menuBar = repairMenuBarConfig(rawTray.menuBar, legacyShowMenuBarText);
   const tray = {
     enabled: typeof rawTray.enabled === "boolean" ? rawTray.enabled : DEFAULT_TRAY_CONFIG.enabled,
-    showMenuBarText: typeof rawTray.showMenuBarText === "boolean" ? rawTray.showMenuBarText : DEFAULT_TRAY_CONFIG.showMenuBarText,
+    menuBar,
+    // Keep the legacy field canonical for older desktop and CLI clients.
+    showMenuBarText: menuBar.elements.value,
     menuBarValue: rawTray.menuBarValue === "todayTokens" || rawTray.menuBarValue === "usage" ? rawTray.menuBarValue : DEFAULT_TRAY_CONFIG.menuBarValue,
     displayMetric: rawTray.displayMetric === "tightestRemaining" || rawTray.displayMetric === "smartHeadroom" ? rawTray.displayMetric : DEFAULT_TRAY_CONFIG.displayMetric,
     pollIntervalSec: finiteInRange(rawTray.pollIntervalSec, DEFAULT_TRAY_CONFIG.pollIntervalSec, 1, 86400),
@@ -1062,6 +1138,7 @@ export {
   cleanProviderSelection,
   toggleProviderSelection,
   moveProviderSelection,
+  DEFAULT_MENU_BAR_CONFIG,
   DEFAULT_TRAY_CONFIG,
   DEFAULT_ACCOUNT_DETECTION_CONFIG,
   DEFAULTS,
@@ -1072,10 +1149,12 @@ export {
   redactEmail,
   getTrackedAccountRows,
   providerDetectionEnabled,
+  setProviderTrackingEnabled,
   setProviderDetectionEnabled,
   setDetectedAccountExcluded,
   clampNum,
   isValidTimezone,
+  repairMenuBarConfig,
   normalizeAllowedHost,
   normalizeAllowedHosts,
   repairConfig,

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

@@ -5,7 +5,7 @@ import {
   envDir,
   expandHome,
   isValidTimezone
-} from "./chunk-O7ORALKA.js";
+} from "./chunk-G2A3DVPU.js";
 
 // src/async.ts
 var DEFAULT_TIMEOUT_MS = 3e4;

package/dist/{chunk-WHOIUSJM.js → chunk-YWDMEU3L.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-UYPDMVW5.js";
 import {
   cacheDir
-} from "./chunk-O7ORALKA.js";
+} from "./chunk-G2A3DVPU.js";
 
 // src/web/daemon-compatibility.ts
 function classifyDaemonCompatibility(owner, clientProtocolVersion) {