tokmon 0.28.5 → 0.28.7

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   createDaemonRpcClient
-} from "./chunk-6YJ5H3JT.js";
+} from "./chunk-RY24UHMK.js";
 import {
   accountIdentityText,
   accountsByProvider,
@@ -11,7 +11,7 @@ import {
   resolveQuotaViews,
   severity,
   usageFromHeadroom
-} from "./chunk-TN6V7XSL.js";
+} from "./chunk-BZFDTIFV.js";
 import {
   PROVIDERS,
   PROVIDER_ORDER,
@@ -28,8 +28,8 @@ import {
   time,
   tokens,
   withTimeout
-} from "./chunk-CFKUZCMB.js";
-import "./chunk-EEMD2PXA.js";
+} from "./chunk-DESEB73E.js";
+import "./chunk-UON47FYF.js";
 import {
   COLOR_PALETTE,
   DEFAULTS,
@@ -54,7 +54,7 @@ import {
   snapshotCacheFile,
   themePresetOption,
   toggleProviderSelection
-} from "./chunk-HNWEJ6MS.js";
+} from "./chunk-O7ORALKA.js";
 import {
   glyphs
 } from "./chunk-RF4GGQGM.js";
@@ -655,6 +655,12 @@ function quotaViews(stats) {
 }
 function QuotaRow({ quota, color, barW, labelW, resetW, resetDisplay, tz }) {
   const theme = useTuiTheme();
+  if (quota.value?.kind === "money") {
+    return /* @__PURE__ */ jsxs2(Box2, { children: [
+      /* @__PURE__ */ jsx3(Box2, { width: labelW, flexShrink: 0, children: /* @__PURE__ */ jsx3(Text2, { dimColor: true, wrap: "truncate", children: quota.label }) }),
+      /* @__PURE__ */ jsx3(Text2, { bold: true, color: theme.cost, wrap: "truncate-end", children: quota.valueText })
+    ] });
+  }
   if (quota.bounded && quota.usedPct !== null) {
     const used = quota.usedPct;
     const remaining = quota.remainingPct ?? 0;
@@ -1293,6 +1299,14 @@ var DESKTOP_FIXED_SETTINGS = [
       if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => ({ ...c, tray: { ...c.tray, showMenuBarText: !c.tray.showMenuBarText } }));
     }
   },
+  {
+    key: "menuBarContent",
+    label: "Menu bar content",
+    render: (rc) => caret(/* @__PURE__ */ jsx7(Text6, { bold: true, color: rc.theme.accent, children: rc.config.tray.menuBarValue === "todayTokens" ? "tokens today" : "usage" })),
+    onAdjust: (input, key, ctx) => {
+      if (isAdjustKey(input, key)) ctx.global.updateConfig((c) => ({ ...c, tray: { ...c.tray, menuBarValue: c.tray.menuBarValue === "usage" ? "todayTokens" : "usage" } }));
+    }
+  },
   {
     key: "summary",
     label: "Summary",
@@ -3622,7 +3636,7 @@ function useAccountForm({ cfg, detected, updateConfig, trackedAccountRows, setSe
 
 // src/app.tsx
 import { Fragment as Fragment6, jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
-function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "degraded" }) {
+function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "degraded", degradedMessage }) {
   const connected = mode === "connected" && baseUrl !== null;
   const degraded = !connected;
   const daemon = useDaemon(connected ? baseUrl : null);
@@ -3996,7 +4010,7 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
     if (webStartingRef.current) return;
     webStartingRef.current = true;
     try {
-      const { startWebServer } = await import("./server-BNZCKS2A.js");
+      const { startWebServer } = await import("./server-LNFK5MRX.js");
       const ctrl = await startWebServer({ config: cfg, log: false });
       webRef.current = ctrl;
       openUrl(ctrl.url);
@@ -4185,7 +4199,8 @@ function App({ interval: cliInterval, initialConfig, baseUrl = null, mode = "deg
       glyphs().warn,
       " degraded ",
       glyphs().middot,
-      " background service unavailable, running in-process"
+      " ",
+      degradedMessage ?? "background service unavailable, running in-process"
     ] }),
     connected && daemon.conn !== "live" && /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
       glyphs().warn,
@@ -4333,7 +4348,8 @@ async function bootstrapInk({ interval, config, daemon, mode }) {
         interval,
         initialConfig: config,
         baseUrl: daemon.baseUrl,
-        mode
+        mode,
+        degradedMessage: daemon.issue?.message
       }
     ) })
   );

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

@@ -10,13 +10,13 @@ import {
   deriveQuotaViews,
   fetchPeak,
   namedHex
-} from "./chunk-TN6V7XSL.js";
+} from "./chunk-BZFDTIFV.js";
 import {
   PROVIDERS,
   detectProviders,
   resolveTimezone,
   withTimeout
-} from "./chunk-CFKUZCMB.js";
+} from "./chunk-DESEB73E.js";
 import {
   ConfigPersistenceFailure,
   ConfigUpdateConflictFailure,
@@ -26,7 +26,7 @@ import {
   TOKMON_WS_METHODS,
   TOKMON_WS_PATH,
   TokmonRpcGroup
-} from "./chunk-EEMD2PXA.js";
+} from "./chunk-UON47FYF.js";
 import {
   cacheDir,
   expandHome,
@@ -34,7 +34,7 @@ import {
   normalizeConfig,
   saveConfig,
   snapshotCacheFile
-} from "./chunk-HNWEJ6MS.js";
+} from "./chunk-O7ORALKA.js";
 
 // src/web/server.ts
 import { createServer } from "http";

package/dist/{chunk-TN6V7XSL.js → chunk-BZFDTIFV.js}

@@ -5,13 +5,13 @@ import {
   identityFromIdToken,
   readClaudeIdentity,
   readJson
-} from "./chunk-CFKUZCMB.js";
+} from "./chunk-DESEB73E.js";
 import {
   containsEmail,
   expandHome,
   redactEmail,
   slugify
-} from "./chunk-HNWEJ6MS.js";
+} from "./chunk-O7ORALKA.js";
 
 // src/accounts.ts
 import { existsSync, readdirSync, readFileSync as readFileSync2, statSync } from "fs";
@@ -281,15 +281,34 @@ function inferRole(metric) {
   if (metric.modelId || !metric.primary && metric.format.kind === "percent" && !["usage", "api", "auto"].includes(label)) return "model";
   return "other";
 }
-function valueText(metric, usedPct) {
+function formatMoney(value, currency) {
+  try {
+    return new Intl.NumberFormat("en-US", { style: "currency", currency }).format(value);
+  } catch {
+    return `$${value.toFixed(2)}`;
+  }
+}
+function moneyValue(metric) {
+  if (metric.format.kind !== "dollars" || !Number.isFinite(metric.used)) return void 0;
+  const limit = metric.limit != null && Number.isFinite(metric.limit) ? metric.limit : null;
+  return {
+    kind: "money",
+    used: metric.used,
+    limit,
+    remaining: limit === null ? null : limit - metric.used,
+    currency: metric.format.currency?.trim().toUpperCase() || "USD"
+  };
+}
+function valueText(metric, usedPct, value) {
+  if (value) {
+    if (value.remaining === null) return formatMoney(value.used, value.currency);
+    const used = `${formatMoney(value.used, value.currency)} used`;
+    return value.remaining >= 0 ? `${used} \xB7 ${formatMoney(value.remaining, value.currency)} left` : `${used} \xB7 ${formatMoney(-value.remaining, value.currency)} over`;
+  }
   if (usedPct !== null) return `${Math.round(usedPct)}% used`;
   if (!Number.isFinite(metric.used)) return "\u2014";
   if (metric.format.kind === "dollars") {
-    try {
-      return new Intl.NumberFormat("en-US", { style: "currency", currency: metric.format.currency ?? "USD", maximumFractionDigits: 2 }).format(metric.used);
-    } catch {
-      return `$${metric.used.toFixed(2)}`;
-    }
+    return formatMoney(metric.used, metric.format.currency?.trim().toUpperCase() || "USD");
   }
   if (metric.format.kind === "count") {
     const suffix = metric.format.suffix?.trim();
@@ -303,6 +322,7 @@ function deriveQuotaView(metric, sourceIndex = 0) {
   const usedPct = metric.format.kind === "percent" ? metric.used : metric.limit != null && metric.limit > 0 ? metric.used / metric.limit * 100 : null;
   const finiteUsedPct = usedPct == null || !Number.isFinite(usedPct) ? null : clampPct(usedPct);
   const resets = metric.resetsAt ? Date.parse(metric.resetsAt) : Number.NaN;
+  const value = moneyValue(metric);
   return {
     key: metric.key ?? `${metric.label}:${sourceIndex}`,
     label: metric.label.replace(/\s*(limit|usage)$/i, "").trim() || metric.label,
@@ -315,7 +335,8 @@ function deriveQuotaView(metric, sourceIndex = 0) {
     primary: metric.primary === true,
     active: metric.active === true,
     displayOrder: sourceIndex,
-    valueText: valueText(metric, finiteUsedPct)
+    valueText: valueText(metric, finiteUsedPct, value),
+    ...value ? { value } : {}
   };
 }
 function deriveQuotaViews(metrics) {
@@ -425,8 +446,9 @@ function cumulativeQuotaViews(accounts) {
     const remainingPct = rows.reduce((sum, quota) => sum + quota.remainingPct, 0) / rows.length;
     const usedPct = 100 - remainingPct;
     const resets = rows.map((quota) => quota.resetsAt).filter((value) => value !== null);
+    const { value: _value, ...firstWithoutValue } = first;
     return {
-      ...first,
+      ...firstWithoutValue,
       usedPct,
       remainingPct,
       resetsAt: resets.length > 0 ? Math.min(...resets) : null,

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

@@ -5,7 +5,7 @@ import {
   envDir,
   expandHome,
   isValidTimezone
-} from "./chunk-HNWEJ6MS.js";
+} from "./chunk-O7ORALKA.js";
 
 // src/async.ts
 var DEFAULT_TIMEOUT_MS = 3e4;
@@ -1706,7 +1706,6 @@ function identityFromIdToken(idToken) {
 // src/providers/codex/billing.ts
 var USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 var RESET_CREDITS_URL = "https://chatgpt.com/backend-api/wham/rate-limit-reset-credits";
-var CREDIT_USD_RATE = 0.04;
 function chatGptPlanLabel(planType) {
   if (typeof planType !== "string" || !planType.trim()) return null;
   const p = planType.trim().toLowerCase();
@@ -1830,11 +1829,13 @@ function appendWindowMetrics(metrics, rl, headerPct) {
     metrics.push(percentMetric(label, used, resetFrom2(item)));
   }
 }
-function appendCredits(metrics, source) {
+function creditBalanceMetric(source) {
   const balance = numberValue(source?.credits?.balance ?? source?.credit_balance);
-  if (balance !== void 0 && balance >= 0) {
-    metrics.push({ label: "Credits", used: balance * CREDIT_USD_RATE, limit: null, format: { kind: "dollars" } });
-  }
+  return balance !== void 0 && balance >= 0 ? { key: "credits", role: "unbounded", label: "Credits", used: balance, limit: null, format: { kind: "count", suffix: "available" } } : null;
+}
+function appendCredits(metrics, source) {
+  const metric = creditBalanceMetric(source);
+  if (metric) metrics.push(metric);
 }
 async function fetchResetCredits(headers) {
   try {

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

@@ -1,16 +1,21 @@
 #!/usr/bin/env node
 import {
+  classifyDaemonCompatibility,
+  daemonConflictMessage,
+  isAlive,
+  probeHealth,
+  readForeignLock,
   readLock,
   retireIncompatibleCliOwner,
   verifyLock
-} from "./chunk-5B3XCEMC.js";
+} from "./chunk-WHOIUSJM.js";
 import {
   daemonChannelFromWire,
   resolveDaemonChannel
 } from "./chunk-UYPDMVW5.js";
 import {
   TOKMON_PROTOCOL_VERSION
-} from "./chunk-EEMD2PXA.js";
+} from "./chunk-UON47FYF.js";
 
 // src/client/daemon-handle.ts
 import { spawn } from "child_process";
@@ -51,6 +56,45 @@ async function attach(opts, protocolVersion) {
   const lock = await verifyLock(readLock(opts), protocolVersion);
   return lock ? connected(lock.url) : null;
 }
+function incompatibleOwnerIssue(owner, protocolVersion, options = {}) {
+  return {
+    kind: owner.ownerKind === "desktop" ? "incompatible-desktop" : owner.ownerKind === "cli" ? "incompatible-cli" : "incompatible-owner",
+    message: daemonConflictMessage(owner, {
+      clientKind: "cli",
+      clientProtocolVersion: protocolVersion,
+      ...options
+    }),
+    ownerKind: owner.ownerKind ?? null,
+    ownerVersion: owner.version ?? null,
+    ownerProtocolVersion: owner.protocolVersion ?? null,
+    clientProtocolVersion: protocolVersion
+  };
+}
+async function arbitrateIncompatibleOwner(opts, protocolVersion, timeoutMs) {
+  const owner = readForeignLock(opts);
+  if (!owner || !isAlive(owner.pid)) return { retired: false, issue: null };
+  const decision = classifyDaemonCompatibility(owner, protocolVersion);
+  const verified = await probeHealth(owner.url, owner.wsToken, {
+    channel: owner.channel,
+    ...owner.ownerKind ? { ownerKind: owner.ownerKind } : {},
+    ...owner.protocolVersion === void 0 ? {} : { protocolVersion: owner.protocolVersion },
+    ...owner.version ? { version: owner.version } : {}
+  }, Math.min(500, timeoutMs));
+  if (!verified) {
+    return {
+      retired: false,
+      issue: incompatibleOwnerIssue(owner, protocolVersion, { verificationFailed: true })
+    };
+  }
+  if (decision.action !== "retire") {
+    return { retired: false, issue: incompatibleOwnerIssue(owner, protocolVersion) };
+  }
+  const retired = await retireIncompatibleCliOwner(opts, protocolVersion, timeoutMs);
+  return retired ? { retired: true, issue: null } : {
+    retired: false,
+    issue: incompatibleOwnerIssue(owner, protocolVersion, { retirementFailed: true })
+  };
+}
 async function attachOrSpawn(opts = {}) {
   const protocolVersion = TOKMON_PROTOCOL_VERSION;
   const timeoutMs = opts.timeoutMs ?? HANDSHAKE_TIMEOUT_MS;
@@ -59,9 +103,21 @@ async function attachOrSpawn(opts = {}) {
   const lockOpts = { cachePath: opts.cachePath, channel };
   const existing = await attach(lockOpts, protocolVersion);
   if (existing) return existing;
-  await retireIncompatibleCliOwner(lockOpts, protocolVersion, timeoutMs);
-  const upgraded = await attach(lockOpts, protocolVersion);
-  if (upgraded) return upgraded;
+  for (let attempt = 0; attempt < 2; attempt++) {
+    const arbitration = await arbitrateIncompatibleOwner(lockOpts, protocolVersion, timeoutMs);
+    if (arbitration.issue) return degraded(arbitration.issue);
+    if (!arbitration.retired) break;
+    const upgraded = await attach(lockOpts, protocolVersion);
+    if (upgraded) return upgraded;
+  }
+  const raced = await attach(lockOpts, protocolVersion);
+  if (raced) return raced;
+  const raceArbitration = await arbitrateIncompatibleOwner(lockOpts, protocolVersion, timeoutMs);
+  if (raceArbitration.issue) return degraded(raceArbitration.issue);
+  if (raceArbitration.retired) {
+    const replacement = await attach(lockOpts, protocolVersion);
+    if (replacement) return replacement;
+  }
   const entry = opts.entry ?? process.argv[1];
   if (!entry) return degraded();
   const execPath = opts.execPath ?? process.execPath;
@@ -79,13 +135,19 @@ async function attachOrSpawn(opts = {}) {
         detached: process.platform !== "win32",
         env
       });
-    } catch {
-      resolve(degraded());
+    } catch (error) {
+      const detail = error instanceof Error && error.message ? `: ${error.message}` : "";
+      resolve(degraded({
+        kind: "spawn-failed",
+        message: `Could not start the Tokmon background service${detail}. Check Node permissions and retry; local-only mode is active.`
+      }));
       return;
     }
     let settled = false;
     let stdout = "";
     let pollTimer = null;
+    let startupError = null;
+    let startupExit = null;
     const finish = (handle) => {
       if (settled) return;
       settled = true;
@@ -102,7 +164,23 @@ async function attachOrSpawn(opts = {}) {
           return;
         }
         if (final) {
-          finish(degraded());
+          if (startupError) {
+            finish(degraded({
+              kind: "spawn-failed",
+              message: `Could not start the Tokmon background service: ${startupError}. Check Node permissions and retry; local-only mode is active.`
+            }));
+          } else if (startupExit) {
+            const result = startupExit.signal ? `signal ${startupExit.signal}` : `exit code ${startupExit.code ?? "unknown"}`;
+            finish(degraded({
+              kind: "startup-exit",
+              message: `The Tokmon background service exited before it was ready (${result}). Update or reinstall Tokmon, then retry; local-only mode is active.`
+            }));
+          } else {
+            finish(degraded({
+              kind: "startup-timeout",
+              message: `The Tokmon background service did not become ready within ${Math.ceil(timeoutMs / 1e3)}s. Quit any stuck Tokmon process and retry; local-only mode is active.`
+            }));
+          }
           return;
         }
         if (!settled && !pollTimer) {
@@ -127,12 +205,18 @@ async function attachOrSpawn(opts = {}) {
         return;
       }
     });
-    child.once("error", () => tryAttach());
-    child.once("exit", () => tryAttach());
+    child.once("error", (error) => {
+      startupError = error.message || error.name;
+      tryAttach();
+    });
+    child.once("exit", (code, signal) => {
+      startupExit = { code, signal };
+      tryAttach();
+    });
   });
 }
-function degraded() {
-  return { kind: "degraded", baseUrl: null, stop: () => {
+function degraded(issue) {
+  return { kind: "degraded", baseUrl: null, ...issue ? { issue } : {}, stop: () => {
   } };
 }
 

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

@@ -503,6 +503,7 @@ function moveProviderSelection(values, providerId, direction) {
 var DEFAULT_TRAY_CONFIG = {
   enabled: true,
   showMenuBarText: true,
+  menuBarValue: "usage",
   displayMetric: "smartHeadroom",
   pollIntervalSec: 30,
   activeTimeoutMin: 10,
@@ -821,6 +822,7 @@ function repairConfig(input) {
   const tray = {
     enabled: typeof rawTray.enabled === "boolean" ? rawTray.enabled : DEFAULT_TRAY_CONFIG.enabled,
     showMenuBarText: typeof rawTray.showMenuBarText === "boolean" ? rawTray.showMenuBarText : DEFAULT_TRAY_CONFIG.showMenuBarText,
+    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),
     activeTimeoutMin: finiteInRange(rawTray.activeTimeoutMin, DEFAULT_TRAY_CONFIG.activeTimeoutMin, 1, 1440),

package/dist/{chunk-6YJ5H3JT.js → chunk-RY24UHMK.js}

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

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

@@ -4,7 +4,7 @@ import {
   DESKTOP_GRAPH_RANGES,
   PROVIDER_IDS,
   THEME_PRESET_IDS
-} from "./chunk-HNWEJ6MS.js";
+} from "./chunk-O7ORALKA.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"];
+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_WS_METHODS = {
   getConfig: "tokmon.getConfig",
   setConfig: "tokmon.setConfig",
@@ -41,6 +41,7 @@ var AccountSchema = Schema.Struct({
 var TrayConfigSchema = Schema.Struct({
   enabled: Schema.Boolean,
   showMenuBarText: Schema.Boolean,
+  menuBarValue: Schema.optionalKey(Schema.Literals(["usage", "todayTokens"])),
   displayMetric: Schema.Literals(["smartHeadroom", "tightestRemaining"]),
   pollIntervalSec: Schema.Finite.check(Schema.isBetween({ minimum: 1, maximum: 86400 })),
   activeTimeoutMin: Schema.Finite.check(Schema.isBetween({ minimum: 1, maximum: 1440 })),
@@ -271,7 +272,14 @@ var QuotaViewSchema = Schema.Struct({
   primary: Schema.Boolean,
   active: Schema.Boolean,
   displayOrder: NonNegativeIntegerSchema,
-  valueText: Schema.String
+  valueText: Schema.String,
+  value: Schema.optionalKey(Schema.Struct({
+    kind: Schema.Literal("money"),
+    used: Schema.Finite,
+    limit: Schema.NullOr(Schema.Finite),
+    remaining: Schema.NullOr(Schema.Finite),
+    currency: Schema.String
+  }))
 });
 var HeadroomFactorSchema = Schema.Struct({
   key: Schema.String,

package/dist/{chunk-5B3XCEMC.js → chunk-WHOIUSJM.js}

@@ -5,7 +5,53 @@ import {
 } from "./chunk-UYPDMVW5.js";
 import {
   cacheDir
-} from "./chunk-HNWEJ6MS.js";
+} from "./chunk-O7ORALKA.js";
+
+// src/web/daemon-compatibility.ts
+function classifyDaemonCompatibility(owner, clientProtocolVersion) {
+  if (owner.protocolVersion === clientProtocolVersion) {
+    return { action: "attach", reason: "same-protocol" };
+  }
+  if (owner.ownerKind === "desktop") {
+    return { action: "refuse", reason: "desktop-owner" };
+  }
+  if (owner.ownerKind === "cli" && owner.protocolVersion !== void 0) {
+    return owner.protocolVersion < clientProtocolVersion ? { action: "retire", reason: "older-cli" } : { action: "refuse", reason: "newer-cli" };
+  }
+  if (owner.ownerKind === void 0 && owner.protocolVersion === void 0) {
+    return { action: "retire", reason: "legacy-cli" };
+  }
+  return { action: "refuse", reason: "ambiguous-owner" };
+}
+function daemonConflictMessage(owner, context) {
+  const kind = owner.ownerKind === "desktop" ? "Tokmon Desktop" : owner.ownerKind === "cli" ? "Tokmon CLI background service" : "Legacy Tokmon background service";
+  const name = owner.version ? `${kind} ${owner.version}` : kind;
+  const ownerProtocol = owner.protocolVersion === void 0 ? "an implicit legacy protocol" : `protocol ${owner.protocolVersion}`;
+  const client = context.clientKind === "desktop" ? "this desktop app" : "this CLI";
+  if (context.verificationFailed) {
+    return `A live lock claims ${name} using ${ownerProtocol}, but its owner proof could not be verified. It was not signalled. Quit the existing Tokmon process, remove a stale lock only after confirming it has stopped, then retry.`;
+  }
+  if (owner.protocolVersion === context.clientProtocolVersion) {
+    return `${name} claims compatible protocol ${context.clientProtocolVersion}, but its owner proof could not be verified. It was not signalled. Quit the existing Tokmon process, then retry.`;
+  }
+  const summary = `${name} owns the background service using ${ownerProtocol}; ${client} needs protocol ${context.clientProtocolVersion}.`;
+  if (context.retirementFailed) {
+    return `${summary} Tokmon could not stop that older CLI service safely, so it was left running. Quit the existing Tokmon CLI/background service, then retry.`;
+  }
+  if (owner.ownerKind === "desktop") {
+    if (context.clientKind === "desktop") {
+      return owner.protocolVersion !== void 0 && owner.protocolVersion < context.clientProtocolVersion ? `${summary} Fully quit the older Tokmon Desktop instance, install the current release, then reopen Tokmon.` : `${summary} This app is older than the running Tokmon Desktop instance. Reopen the newer app, or replace this installation with the current release.`;
+    }
+    if (owner.protocolVersion !== void 0 && owner.protocolVersion < context.clientProtocolVersion) {
+      return `${summary} In Tokmon Desktop, open Settings \u2192 Desktop App \u2192 Check for Updates, install the update, then restart Tokmon. Alternatively, quit Tokmon Desktop before retrying the CLI.`;
+    }
+    return `${summary} Update the CLI with \`pnpm --config.minimum-release-age=0 dlx tokmon@latest\`, or quit Tokmon Desktop before retrying this CLI.`;
+  }
+  if (owner.ownerKind === "cli" && owner.protocolVersion !== void 0 && owner.protocolVersion > context.clientProtocolVersion) {
+    return context.clientKind === "desktop" ? `${summary} Update Tokmon Desktop and restart it, or stop the newer CLI background service before reopening the app.` : `${summary} Update the CLI with \`pnpm --config.minimum-release-age=0 dlx tokmon@latest\`, or stop the newer background service before retrying.`;
+  }
+  return `${summary} The owner could not be identified safely and was not signalled. Quit the existing Tokmon process, then retry.`;
+}
 
 // src/web/lockfile.ts
 import { closeSync, fchmodSync, fsyncSync, lstatSync, mkdirSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from "fs";
@@ -247,11 +293,11 @@ async function retireIncompatibleCliOwner(opts, protocolVersion, timeoutMs = TAK
   const compatible = readLock(opts);
   if (compatible?.protocolVersion === protocolVersion) return false;
   const foreign = readForeignLock(opts);
-  const legacyCli = foreign?.ownerKind === void 0 && foreign?.protocolVersion === void 0;
-  if (!foreign || foreign.state !== "ready" || foreign.ownerKind === "desktop" || foreign.ownerKind !== "cli" && !legacyCli || foreign.pid === process.pid || !isAlive(foreign.pid)) return false;
+  const decision = foreign && classifyDaemonCompatibility(foreign, protocolVersion);
+  if (!foreign || foreign.state !== "ready" || decision?.action !== "retire" || foreign.pid === process.pid || !isAlive(foreign.pid)) return false;
   const health = await ownerHealth(foreign.url, foreign.wsToken, Math.min(1e3, timeoutMs));
   const healthChannel = daemonChannelFromWire(health?.channel);
-  if (health?.ok !== true || health.owner !== true || health.ownerKind !== void 0 && health.ownerKind !== "cli" || healthChannel !== foreign.channel) return false;
+  if (health?.ok !== true || health.owner !== true || (decision.reason === "legacy-cli" ? health.ownerKind !== void 0 || health.protocolVersion !== void 0 : health.ownerKind !== "cli" || health.protocolVersion !== foreign.protocolVersion) || healthChannel !== foreign.channel) return false;
   try {
     process.kill(foreign.pid, "SIGTERM");
   } catch {
@@ -279,6 +325,8 @@ async function retireIncompatibleCliOwner(opts, protocolVersion, timeoutMs = TAK
 }
 
 export {
+  classifyDaemonCompatibility,
+  daemonConflictMessage,
   lockfilePath,
   readLock,
   readForeignLock,
@@ -289,6 +337,7 @@ export {
   reclaimUnhealthyLock,
   reclaimAbandonedLock,
   isAlive,
+  probeHealth,
   verifyLock,
   retireIncompatibleCliOwner
 };