tokmon 0.29.3 → 0.29.5

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

@@ -10,13 +10,14 @@ import {
   deriveQuotaViews,
   fetchPeak,
   namedHex
-} from "./chunk-3D6TO5TS.js";
+} from "./chunk-U2FQXNIU.js";
 import {
   PROVIDERS,
-  detectProviders,
+  detectAccountProviders,
+  detectInstalledProviders,
   resolveTimezone,
   withTimeout
-} from "./chunk-WPZTPMBX.js";
+} from "./chunk-EZHV4R74.js";
 import {
   ConfigPersistenceFailure,
   ConfigUpdateConflictFailure,
@@ -26,137 +27,21 @@ import {
   TOKMON_WS_METHODS,
   TOKMON_WS_PATH,
   TokmonRpcGroup
-} from "./chunk-BYLWQ46U.js";
+} from "./chunk-6RPYSOBA.js";
 import {
   cacheDir,
+  canonicalizeConfigHomeRefs,
   expandHome,
   loadConfig,
   normalizeConfig,
   saveConfig,
   snapshotCacheFile
-} from "./chunk-G2A3DVPU.js";
+} from "./chunk-GQCFGAQ6.js";
 
 // src/web/server.ts
 import { createServer } from "http";
 import { randomBytes, timingSafeEqual } from "crypto";
 
-// src/web/data.ts
-async function resolveAccounts(config) {
-  const detected = await detectProviders();
-  const accounts = buildAccounts(config, detected);
-  return accounts.map((a) => {
-    const p = PROVIDERS[a.providerId];
-    return {
-      account: a,
-      hasUsage: p.hasUsage || !!p.fetchTable,
-      hasBilling: p.hasBilling,
-      color: colorHex(a.color, PROVIDERS[a.providerId].color)
-    };
-  });
-}
-async function fetchAccountSummary(account, tz) {
-  const p = PROVIDERS[account.providerId];
-  if (!p.fetchSummary) return null;
-  return p.fetchSummary(account, tz);
-}
-async function fetchAccountTable(account, tz) {
-  const p = PROVIDERS[account.providerId];
-  if (!p.fetchTable) return null;
-  return p.fetchTable(account, tz);
-}
-async function fetchAccountBilling(account, tz) {
-  const p = PROVIDERS[account.providerId];
-  if (!p.fetchBilling) return null;
-  return p.fetchBilling(account, tz);
-}
-function assembleSnapshot(opts) {
-  const providerOrdinals = /* @__PURE__ */ new Map();
-  const accounts = opts.resolved.map((r) => {
-    const u = opts.usage.get(r.account.id);
-    const billing = opts.billing.get(r.account.id) ?? null;
-    const ordinal = (providerOrdinals.get(r.account.providerId) ?? 0) + 1;
-    providerOrdinals.set(r.account.providerId, ordinal);
-    const quotas = deriveQuotaViews(billing?.metrics ?? []);
-    return {
-      id: r.account.id,
-      providerId: r.account.providerId,
-      name: r.account.name,
-      color: r.color,
-      homeDir: r.account.homeDir ?? null,
-      hasUsage: r.hasUsage,
-      hasBilling: r.hasBilling,
-      email: billing?.email ?? null,
-      displayName: billing?.displayName ?? null,
-      identity: deriveAccountIdentity({
-        name: r.account.name,
-        email: billing?.email,
-        displayName: billing?.displayName,
-        providerName: PROVIDERS[r.account.providerId].name,
-        ordinal,
-        privacyMode: opts.config.privacyMode
-      }),
-      quotas,
-      headroom: deriveProviderHeadroom([{
-        id: r.account.id,
-        lastActivityAt: u?.dashboard?.lastActivityAt ?? null,
-        quotas
-      }], opts.config.tray.activeTimeoutMin, Date.now(), opts.config.tray.displayMetric),
-      plan: billing?.plan ?? null,
-      lastActivityAt: u?.dashboard?.lastActivityAt ?? null,
-      dashboard: u?.dashboard ?? null,
-      table: u?.table ?? null,
-      billing,
-      summaryState: opts.summaryState?.get(r.account.id) ?? "pending",
-      billingState: opts.billingState?.get(r.account.id) ?? "pending",
-      tableState: opts.tableState?.get(r.account.id) ?? "pending",
-      summaryUpdatedAt: opts.summaryUpdatedAt?.get(r.account.id) ?? null,
-      billingUpdatedAt: opts.billingUpdatedAt?.get(r.account.id) ?? null,
-      tableUpdatedAt: opts.tableUpdatedAt?.get(r.account.id) ?? null
-    };
-  });
-  const accountsByProvider = /* @__PURE__ */ new Map();
-  for (const account of accounts) {
-    const group = accountsByProvider.get(account.providerId) ?? [];
-    group.push(account);
-    accountsByProvider.set(account.providerId, group);
-  }
-  const seen = /* @__PURE__ */ new Set();
-  const providers = [];
-  for (const r of opts.resolved) {
-    if (seen.has(r.account.providerId)) continue;
-    seen.add(r.account.providerId);
-    providers.push({
-      id: r.account.providerId,
-      name: PROVIDERS[r.account.providerId].name,
-      color: namedHex(PROVIDERS[r.account.providerId].color),
-      headroom: deriveProviderHeadroom(
-        (accountsByProvider.get(r.account.providerId) ?? []).map((account) => ({
-          id: account.id,
-          lastActivityAt: account.lastActivityAt,
-          quotas: account.quotas ?? []
-        })),
-        opts.config.tray.activeTimeoutMin,
-        Date.now(),
-        opts.config.tray.displayMetric
-      )
-    });
-  }
-  return {
-    version: opts.version,
-    generatedAt: Date.now(),
-    tz: opts.tz,
-    intervalMs: opts.intervalMs,
-    billingIntervalMs: opts.billingIntervalMs,
-    providers,
-    accounts,
-    seeded: opts.seeded ?? false,
-    peak: opts.peak ?? null
-  };
-}
-function tzFor(config) {
-  return resolveTimezone(config.timezone);
-}
-
 // src/web/static.ts
 import { createReadStream, existsSync, readFileSync } from "fs";
 import { stat } from "fs/promises";
@@ -335,6 +220,125 @@ code{color:#e6b450}</style></head><body>
 // src/web/data-engine.ts
 import { readFileSync as readFileSync2, writeFileSync, mkdirSync, renameSync } from "fs";
 
+// src/web/data.ts
+async function resolveAccounts(config) {
+  const detected = await detectAccountProviders();
+  const accounts = buildAccounts(config, detected);
+  return accounts.map((a) => {
+    const p = PROVIDERS[a.providerId];
+    return {
+      account: a,
+      hasUsage: p.hasUsage || !!p.fetchTable,
+      hasBilling: p.hasBilling,
+      color: colorHex(a.color, PROVIDERS[a.providerId].color)
+    };
+  });
+}
+async function fetchAccountSummary(account, tz) {
+  const p = PROVIDERS[account.providerId];
+  if (!p.fetchSummary) return null;
+  return p.fetchSummary(account, tz);
+}
+async function fetchAccountTable(account, tz) {
+  const p = PROVIDERS[account.providerId];
+  if (!p.fetchTable) return null;
+  return p.fetchTable(account, tz);
+}
+async function fetchAccountBilling(account, tz) {
+  const p = PROVIDERS[account.providerId];
+  if (!p.fetchBilling) return null;
+  return p.fetchBilling(account, tz);
+}
+function assembleSnapshot(opts) {
+  const providerOrdinals = /* @__PURE__ */ new Map();
+  const accounts = opts.resolved.map((r) => {
+    const u = opts.usage.get(r.account.id);
+    const billing = opts.billing.get(r.account.id) ?? null;
+    const ordinal = (providerOrdinals.get(r.account.providerId) ?? 0) + 1;
+    providerOrdinals.set(r.account.providerId, ordinal);
+    const quotas = deriveQuotaViews(billing?.metrics ?? []);
+    return {
+      id: r.account.id,
+      providerId: r.account.providerId,
+      name: r.account.name,
+      color: r.color,
+      homeDir: r.account.homeDir ?? null,
+      source: r.account.source ?? "auto",
+      hasUsage: r.hasUsage,
+      hasBilling: r.hasBilling,
+      email: billing?.email ?? null,
+      displayName: billing?.displayName ?? null,
+      identity: deriveAccountIdentity({
+        name: r.account.name,
+        email: billing?.email,
+        displayName: billing?.displayName,
+        providerName: PROVIDERS[r.account.providerId].name,
+        ordinal,
+        privacyMode: opts.config.privacyMode
+      }),
+      quotas,
+      headroom: deriveProviderHeadroom([{
+        id: r.account.id,
+        lastActivityAt: u?.dashboard?.lastActivityAt ?? null,
+        quotas
+      }], opts.config.tray.activeTimeoutMin, Date.now(), opts.config.tray.displayMetric),
+      plan: billing?.plan ?? null,
+      lastActivityAt: u?.dashboard?.lastActivityAt ?? null,
+      dashboard: u?.dashboard ?? null,
+      table: u?.table ?? null,
+      billing,
+      summaryState: opts.summaryState?.get(r.account.id) ?? "pending",
+      billingState: opts.billingState?.get(r.account.id) ?? "pending",
+      tableState: opts.tableState?.get(r.account.id) ?? "pending",
+      summaryUpdatedAt: opts.summaryUpdatedAt?.get(r.account.id) ?? null,
+      billingUpdatedAt: opts.billingUpdatedAt?.get(r.account.id) ?? null,
+      tableUpdatedAt: opts.tableUpdatedAt?.get(r.account.id) ?? null
+    };
+  });
+  const accountsByProvider = /* @__PURE__ */ new Map();
+  for (const account of accounts) {
+    const group = accountsByProvider.get(account.providerId) ?? [];
+    group.push(account);
+    accountsByProvider.set(account.providerId, group);
+  }
+  const seen = /* @__PURE__ */ new Set();
+  const providers = [];
+  for (const r of opts.resolved) {
+    if (seen.has(r.account.providerId)) continue;
+    seen.add(r.account.providerId);
+    providers.push({
+      id: r.account.providerId,
+      name: PROVIDERS[r.account.providerId].name,
+      color: namedHex(PROVIDERS[r.account.providerId].color),
+      headroom: deriveProviderHeadroom(
+        (accountsByProvider.get(r.account.providerId) ?? []).map((account) => ({
+          id: account.id,
+          lastActivityAt: account.lastActivityAt,
+          quotas: account.quotas ?? []
+        })),
+        opts.config.tray.activeTimeoutMin,
+        Date.now(),
+        opts.config.tray.displayMetric
+      )
+    });
+  }
+  return {
+    version: opts.version,
+    generatedAt: Date.now(),
+    tz: opts.tz,
+    intervalMs: opts.intervalMs,
+    billingIntervalMs: opts.billingIntervalMs,
+    installedProviders: opts.installedProviders,
+    providers,
+    accounts,
+    seeded: opts.seeded ?? false,
+    peak: opts.peak ?? null
+  };
+}
+function tzFor(config) {
+  return resolveTimezone(config.timezone);
+}
+
 // src/web/refresh-queue.ts
 function deferred() {
   let resolve;
@@ -439,6 +443,7 @@ function createDataEngine(opts) {
   let summaryIntervalMs = opts.summaryIntervalMs;
   let billingIntervalMs = opts.billingIntervalMs;
   let resolved = opts.resolved;
+  let installedProviders = opts.installedProviders ?? [];
   let currentConfig = opts.config;
   const usage = /* @__PURE__ */ new Map();
   const billing = /* @__PURE__ */ new Map();
@@ -478,6 +483,7 @@ function createDataEngine(opts) {
     intervalMs: summaryIntervalMs,
     billingIntervalMs,
     resolved,
+    installedProviders,
     usage,
     billing,
     summaryState,
@@ -714,6 +720,7 @@ function createDataEngine(opts) {
       const sourceKey = (r) => `${r.account.providerId}:${r.account.homeDir ?? ""}`;
       const prevSources = new Map(resolved.map((r) => [r.account.id, sourceKey(r)]));
       resolved = next.resolved;
+      installedProviders = next.installedProviders;
       hasClaude = resolved.some((r) => r.account.providerId === "claude");
       if (!hasClaude) peak = null;
       usageAccounts = resolved.filter((r) => r.hasUsage);
@@ -820,13 +827,27 @@ var ConfigPersistenceError = class extends Error {
   }
 };
 async function resolveEngineConfig(config) {
+  const [resolved, installedProviders] = await Promise.all([
+    resolveAccounts(config),
+    detectInstalledProviders()
+  ]);
   return {
-    resolved: await resolveAccounts(config),
+    resolved,
+    installedProviders,
     tz: tzFor(config),
     summaryIntervalMs: summaryIntervalFor(config),
     billingIntervalMs: billingIntervalFor(config)
   };
 }
+async function rediscoverEngineAccounts(engine, state, resolve = resolveEngineConfig) {
+  while (true) {
+    const expected = state.config;
+    const next = await resolve(expected);
+    if (state.config.revision !== expected.revision) continue;
+    engine.setConfig(next);
+    return;
+  }
+}
 function configAffectsEngine(previous, next) {
   return previous.interval !== next.interval || previous.billingInterval !== next.billingInterval || previous.timezone !== next.timezone || JSON.stringify(previous.accounts) !== JSON.stringify(next.accounts) || JSON.stringify(previous.disabledProviders) !== JSON.stringify(next.disabledProviders) || JSON.stringify(previous.accountDetection) !== JSON.stringify(next.accountDetection);
 }
@@ -838,8 +859,14 @@ function mergeCapabilityFields(incomingConfig, current) {
   const incoming = incomingConfig;
   const incomingTray = incoming.tray;
   const incomingDesktop = incoming.desktop;
+  const currentAccounts = new Map(current.accounts.map((account) => [account.id, account]));
+  const accounts = hasOwn(incoming, "accounts") && Array.isArray(incoming.accounts) ? incoming.accounts.map((account) => {
+    const previous = currentAccounts.get(account.id);
+    return !hasOwn(account, "enabled") && previous?.enabled === false ? { ...account, enabled: false } : account;
+  }) : current.accounts;
   return {
     ...incoming,
+    accounts,
     appearance: hasOwn(incoming, "appearance") ? incoming.appearance : current.appearance,
     accountDetection: hasOwn(incoming, "accountDetection") ? incoming.accountDetection : current.accountDetection,
     tray: hasOwn(incoming, "tray") && incomingTray ? {
@@ -866,10 +893,10 @@ async function applyConfigUpdateUnlocked(engine, state, input) {
   if (input.expectedRevision !== state.config.revision) {
     throw new ConfigConflictError(toConfigState(state.config));
   }
-  const normalized = normalizeConfig({
+  const normalized = canonicalizeConfigHomeRefs(normalizeConfig({
     ...mergeCapabilityFields(input.config, state.config),
     revision: state.config.revision + 1
-  });
+  }));
   const reconfigureEngine = configAffectsEngine(state.config, normalized);
   const engineConfig = reconfigureEngine ? await resolveEngineConfig(normalized) : null;
   try {
@@ -1065,9 +1092,12 @@ function configUpdateEffect(engine, state, input) {
 function refreshFailureEffect(error) {
   return error instanceof AggregateError ? Effect.fail(new RefreshFailure({ kind: "refresh", message: error.message })) : Effect.die(error);
 }
-function refreshEffect(engine, scope) {
+function refreshEffect(engine, state, scope) {
   return Effect.tryPromise({
-    try: () => engine.refresh(scope),
+    try: async () => {
+      if (scope === "all") await rediscoverEngineAccounts(engine, state);
+      await engine.refresh(scope);
+    },
     catch: (error) => error
   }).pipe(Effect.matchEffect({
     onFailure: refreshFailureEffect,
@@ -1081,7 +1111,7 @@ async function mountWsRpc(server, deps) {
     TokmonRpcGroup.of({
       [TOKMON_WS_METHODS.getConfig]: () => Effect.promise(() => Promise.resolve(deps.state.config ?? loadConfig()).then(toConfigState)),
       [TOKMON_WS_METHODS.setConfig]: (config) => configUpdateEffect(deps.engine, deps.state, config),
-      [TOKMON_WS_METHODS.refresh]: ({ scope: scope2 }) => refreshEffect(deps.engine, scope2),
+      [TOKMON_WS_METHODS.refresh]: ({ scope: scope2 }) => refreshEffect(deps.engine, deps.state, scope2),
       [TOKMON_WS_METHODS.browseFs]: ({ path }) => Effect.promise(() => listHomeDirectory(path)),
       [TOKMON_WS_METHODS.snapshot]: () => snapshotStream(deps.engine),
       [TOKMON_WS_METHODS.config]: () => configStream(deps.engine).pipe(Stream.map(toConfigState))
@@ -1221,19 +1251,16 @@ function createRouter(engine, state, vite, webRoot, wsToken, version, protocolVe
 }
 async function startWebServer(opts) {
   const state = { config: opts.config };
-  const tz = tzFor(state.config);
   const version = opts.version ?? appVersion();
   const protocolVersion = opts.protocolVersion ?? TOKMON_PROTOCOL_VERSION;
   const capabilities = opts.capabilities ?? TOKMON_CAPABILITIES;
   const ownerKind = opts.ownerKind ?? "cli";
   const channel = resolveDaemonChannel(opts.channel);
-  const summaryIntervalMs = summaryIntervalFor(state.config);
-  const billingIntervalMs = billingIntervalFor(state.config);
   const wsToken = opts.wsToken ?? randomBytes(32).toString("base64url");
   const log = (msg) => {
     if (opts.log) process.stdout.write(msg + "\n");
   };
-  const resolved = await resolveAccounts(state.config);
+  const engineConfig = await resolveEngineConfig(state.config);
   const server = createServer();
   let vite = null;
   let engine = null;
@@ -1242,7 +1269,7 @@ async function startWebServer(opts) {
     if (isDevMode()) vite = await createViteDevServer(server, log);
     const webRoot = vite ? null : opts.webRoot ?? findWebRoot();
     if (!vite && !webRoot) log("  \u26A0 no dashboard available \u2014 see the page for build/dev instructions");
-    engine = createDataEngine({ version, config: state.config, tz, summaryIntervalMs, billingIntervalMs, resolved });
+    engine = createDataEngine({ version, config: state.config, ...engineConfig });
     server.addListener("request", createRouter(
       engine,
       state,

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

@@ -5,13 +5,38 @@ import {
   identityFromIdToken,
   readClaudeIdentity,
   readJson
-} from "./chunk-WPZTPMBX.js";
+} from "./chunk-EZHV4R74.js";
 import {
-  containsEmail,
   expandHome,
-  redactEmail,
   slugify
-} from "./chunk-G2A3DVPU.js";
+} from "./chunk-GQCFGAQ6.js";
+
+// src/peak.ts
+async function fetchPeak() {
+  try {
+    const res = await fetch("https://promoclock.co/api/status", {
+      headers: { "Accept": "application/json", "User-Agent": "tokmon" },
+      signal: AbortSignal.timeout(3e3)
+    });
+    if (!res.ok) return null;
+    const data = await readJson(res);
+    if (!data) return null;
+    let state;
+    if (data.isPeak === true || data.status === "peak") state = "peak";
+    else if (data.isWeekend === true || data.status === "weekend") state = "weekend";
+    else if (data.isOffPeak === true || data.status === "off_peak" || data.status === "off-peak") state = "off-peak";
+    else return null;
+    const minutesUntilChange = typeof data.minutesUntilChange === "number" && Number.isFinite(data.minutesUntilChange) ? data.minutesUntilChange : null;
+    return {
+      state,
+      label: state === "peak" ? "Peak" : state === "weekend" ? "Weekend" : "Off-Peak",
+      minutesUntilChange,
+      changesAt: minutesUntilChange !== null ? new Date(Date.now() + minutesUntilChange * 6e4).toISOString() : null
+    };
+  } catch {
+    return null;
+  }
+}
 
 // src/accounts.ts
 import { existsSync, readdirSync, readFileSync as readFileSync2, statSync } from "fs";
@@ -41,25 +66,39 @@ function readCodexIdentity(homeDir) {
 function accountKey(providerId, homeDir) {
   return `${providerId}:${homeDir ? resolve(expandHome(homeDir)) : homedir()}`;
 }
-function uniqueId(base, used) {
-  let id = slugify(base) || "account";
-  if (!used.has(id)) {
-    used.add(id);
-    return id;
+function runtimeHomeDir(homeDir) {
+  const expanded = resolve(expandHome(homeDir));
+  return expanded === resolve(homedir()) ? void 0 : expanded;
+}
+function stableHash(value) {
+  let hash = 2166136261;
+  for (let i = 0; i < value.length; i++) {
+    hash ^= value.charCodeAt(i);
+    hash = Math.imul(hash, 16777619);
   }
-  for (let i = 2; i < 1e3; i++) {
-    const next = `${id}_${i}`;
-    if (!used.has(next)) {
-      used.add(next);
-      return next;
+  return (hash >>> 0).toString(36);
+}
+function discoveredId(providerId, homeDir) {
+  const label = slugify(basename(homeDir).replace(new RegExp(`^\\.${providerId}[_-]?`), "")) || "account";
+  return `${providerId}_${label}_${stableHash(resolve(homeDir))}`;
+}
+function containsClaudeSession(root) {
+  if (!existsSync(root)) return false;
+  const pending = [root];
+  while (pending.length > 0) {
+    const current = pending.pop();
+    try {
+      for (const entry of readdirSync(current, { withFileTypes: true })) {
+        if (entry.isFile() && entry.name.endsWith(".jsonl")) return true;
+        if (entry.isDirectory()) pending.push(join2(current, entry.name));
+      }
+    } catch {
     }
   }
-  id = `${id}_${Date.now()}`;
-  used.add(id);
-  return id;
+  return false;
 }
 function hasClaudeState(homeDir) {
-  return existsSync(join2(homeDir, ".claude.json")) || existsSync(join2(homeDir, ".claude", ".credentials.json")) || existsSync(join2(homeDir, ".claude", "projects")) || existsSync(join2(homeDir, ".config", "claude", ".credentials.json")) || existsSync(join2(homeDir, ".config", "claude", "projects"));
+  return existsSync(join2(homeDir, ".claude", ".credentials.json")) || existsSync(join2(homeDir, ".config", "claude", ".credentials.json")) || containsClaudeSession(join2(homeDir, ".claude", "projects")) || containsClaudeSession(join2(homeDir, ".config", "claude", "projects"));
 }
 function candidateAlternateHomes(prefix) {
   const home = homedir();
@@ -107,73 +146,93 @@ function labelForCodexHome(homeDir) {
   const raw = basename(homeDir).replace(/^\.codex[_-]?/, "").replace(/[_-]+/g, " ").trim();
   return raw ? `Codex ${raw}` : "Codex";
 }
-function discoverClaudeAccounts(usedIds) {
+function discoverClaudeAccounts() {
   const provider = PROVIDERS.claude;
   const out = [];
   for (const homeDir of candidateAlternateHomes("claude")) {
     if (!hasClaudeState(homeDir)) continue;
-    const suffix = basename(homeDir).replace(/^\.claude[_-]?/, "") || basename(homeDir);
     out.push({
-      id: uniqueId(`claude_${suffix}`, usedIds),
+      id: discoveredId("claude", homeDir),
       providerId: "claude",
       name: labelForClaudeHome(homeDir),
       color: provider.color,
-      homeDir
+      homeDir,
+      source: "auto"
     });
   }
   return out;
 }
-function discoverCodexAccounts(usedIds) {
+function discoverCodexAccounts() {
   const provider = PROVIDERS.codex;
   const out = [];
   for (const homeDir of candidateAlternateHomes("codex")) {
     if (!hasCodexAuth(homeDir)) continue;
-    const suffix = basename(homeDir).replace(/^\.codex[_-]?/, "") || basename(homeDir);
     out.push({
-      id: uniqueId(`codex_${suffix}`, usedIds),
+      id: discoveredId("codex", homeDir),
       providerId: "codex",
       name: labelForCodexHome(homeDir),
       color: provider.color,
-      homeDir
+      homeDir,
+      source: "auto"
     });
   }
   return out;
 }
-function discoverProviderAccounts(providerId, usedIds) {
-  if (providerId === "claude") return discoverClaudeAccounts(usedIds);
-  if (providerId === "codex") return discoverCodexAccounts(usedIds);
+function discoverProviderAccounts(providerId) {
+  if (providerId === "claude") return discoverClaudeAccounts();
+  if (providerId === "codex") return discoverCodexAccounts();
   return [];
 }
 function buildAccounts(config, detected) {
   const out = [];
-  const usedIds = new Set(config.accounts.map((a) => a.id));
   const seenKeys = /* @__PURE__ */ new Set();
+  const seenIds = /* @__PURE__ */ new Set();
   const excludedKeys = new Set(
     config.accountDetection.excludedAccounts.map((ref) => accountKey(ref.providerId, ref.homeDir))
   );
   const add = (account) => {
     const key = accountKey(account.providerId, account.homeDir);
     if (seenKeys.has(key)) return;
+    let id = account.id;
+    if (seenIds.has(id)) {
+      const base = `${id}_auto`;
+      id = base;
+      for (let suffix = 2; seenIds.has(id); suffix++) id = `${base}_${suffix}`;
+    }
     seenKeys.add(key);
-    out.push(account);
+    seenIds.add(id);
+    out.push(id === account.id ? account : { ...account, id });
   };
   for (const pid of PROVIDER_ORDER) {
     if (config.disabledProviders.includes(pid)) continue;
     const provider = PROVIDERS[pid];
     const configured = config.accounts.filter((a) => a.providerId === pid);
     for (const a of configured) {
+      if (a.enabled === false) {
+        seenKeys.add(accountKey(a.providerId, a.homeDir));
+        seenIds.add(a.id);
+        continue;
+      }
       add({
         id: a.id,
         providerId: pid,
         name: a.name,
         color: a.color || provider.color,
-        homeDir: a.homeDir && a.homeDir !== "~" ? expandHome(a.homeDir) : void 0
+        homeDir: runtimeHomeDir(a.homeDir || "~"),
+        source: "configured"
       });
     }
     if (!config.accountDetection.enabled || config.accountDetection.disabledProviders.includes(pid)) continue;
-    const discovered = discoverProviderAccounts(pid, usedIds);
+    const discovered = discoverProviderAccounts(pid);
     if (detected.includes(pid)) {
-      const account = { id: pid, providerId: pid, name: provider.name, color: provider.color, homeDir: void 0 };
+      const account = {
+        id: pid,
+        providerId: pid,
+        name: provider.name,
+        color: provider.color,
+        homeDir: void 0,
+        source: "auto"
+      };
       if (!excludedKeys.has(accountKey(pid))) add(account);
     }
     for (const account of discovered) {
@@ -358,12 +417,12 @@ function deriveAccountIdentity(input) {
   const registered = input.name.trim() || input.providerName;
   const email = input.email?.trim() || null;
   const displayName = input.displayName?.trim() || null;
-  if (input.privacyMode && (containsEmail(registered) || containsEmail(email))) {
+  if (input.privacyMode) {
     const title2 = `${input.providerName} account ${input.ordinal}`;
     return { title: title2, subtitle: null, accessibleLabel: title2, redacted: true };
   }
-  const title = input.privacyMode ? redactEmail(registered) : registered;
-  const subtitleCandidate = !input.privacyMode ? email && !registered.toLowerCase().includes(email.toLowerCase()) ? email : displayName : displayName && !containsEmail(displayName) ? displayName : null;
+  const title = registered;
+  const subtitleCandidate = email && !registered.toLowerCase().includes(email.toLowerCase()) ? email : displayName;
   const subtitle = subtitleCandidate && subtitleCandidate !== title ? subtitleCandidate : null;
   return { title, subtitle, accessibleLabel: subtitle ? `${title}, ${subtitle}` : title, redacted: input.privacyMode && title !== registered };
 }
@@ -490,34 +549,8 @@ function deriveProviderHeadroom(accounts, activeTimeoutMin, now, displayMetric =
   return { ...selected.view, basis, representativeAccountId: selected.account.id, activeAccountIds: activeIds, explanation: `${selected.view.explanation}; ${basis === "active" ? "active account" : "best available account"}` };
 }
 
-// src/peak.ts
-async function fetchPeak() {
-  try {
-    const res = await fetch("https://promoclock.co/api/status", {
-      headers: { "Accept": "application/json", "User-Agent": "tokmon" },
-      signal: AbortSignal.timeout(3e3)
-    });
-    if (!res.ok) return null;
-    const data = await readJson(res);
-    if (!data) return null;
-    let state;
-    if (data.isPeak === true || data.status === "peak") state = "peak";
-    else if (data.isWeekend === true || data.status === "weekend") state = "weekend";
-    else if (data.isOffPeak === true || data.status === "off_peak" || data.status === "off-peak") state = "off-peak";
-    else return null;
-    const minutesUntilChange = typeof data.minutesUntilChange === "number" && Number.isFinite(data.minutesUntilChange) ? data.minutesUntilChange : null;
-    return {
-      state,
-      label: state === "peak" ? "Peak" : state === "weekend" ? "Weekend" : "Off-Peak",
-      minutesUntilChange,
-      changesAt: minutesUntilChange !== null ? new Date(Date.now() + minutesUntilChange * 6e4).toISOString() : null
-    };
-  } catch {
-    return null;
-  }
-}
-
 export {
+  fetchPeak,
   buildAccounts,
   accountsByProvider,
   namedHex,
@@ -529,6 +562,5 @@ export {
   severity,
   deriveAccountIdentity,
   accountIdentityText,
-  deriveProviderHeadroom,
-  fetchPeak
+  deriveProviderHeadroom
 };

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

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