exe-watcher 0.2.16 → 0.2.46

package/dist/cli.js

@@ -29,9 +29,15 @@ import { readFile as readFile3, mkdir as mkdir5, rename as rename4, unlink as un
 import { open as open3 } from "fs/promises";
 import { join as join6 } from "path";
 import { randomBytes as randomBytes3 } from "crypto";
+function getPricingWarnings() {
+  return _pricingWarnings;
+}
 function getCachePath() {
   return join6(getCacheDir(), "litellm-pricing.json");
 }
+function getLastKnownGoodPath() {
+  return join6(getCacheDir(), "pricing-cache.json");
+}
 function parseLiteLLMEntry(entry) {
   if (entry.input_cost_per_token === void 0 || entry.output_cost_per_token === void 0) return null;
   return {
@@ -88,6 +94,27 @@ async function fetchAndCachePricing() {
     }
     throw err;
   }
+  try {
+    const lkgPath = getLastKnownGoodPath();
+    const lkgTmp = `${lkgPath}.${randomBytes3(8).toString("hex")}.tmp`;
+    const lkgHandle = await open3(lkgTmp, "w", 384);
+    try {
+      await lkgHandle.writeFile(JSON.stringify({
+        timestamp: Date.now(),
+        data: Object.fromEntries(pricing)
+      }), { encoding: "utf-8" });
+      await lkgHandle.sync();
+    } finally {
+      await lkgHandle.close();
+    }
+    await rename4(lkgTmp, lkgPath).catch(() => {
+      try {
+        unlink2(lkgTmp);
+      } catch {
+      }
+    });
+  } catch {
+  }
   return pricing;
 }
 async function loadCachedPricing() {
@@ -95,21 +122,45 @@ async function loadCachedPricing() {
     const raw = await readFile3(getCachePath(), "utf-8");
     const cached = JSON.parse(raw);
     if (Date.now() - cached.timestamp > CACHE_TTL_MS2) return null;
-    return new Map(Object.entries(cached.data));
+    return { map: new Map(Object.entries(cached.data)), timestamp: cached.timestamp };
+  } catch {
+    return null;
+  }
+}
+async function loadLastKnownGoodPricing() {
+  try {
+    const raw = await readFile3(getLastKnownGoodPath(), "utf-8");
+    const cached = JSON.parse(raw);
+    return { map: new Map(Object.entries(cached.data)), timestamp: cached.timestamp };
   } catch {
     return null;
   }
 }
 async function loadPricing() {
+  _pricingWarnings = [];
   const cached = await loadCachedPricing();
   if (cached) {
-    pricingCache = cached;
+    pricingCache = cached.map;
+    _pricingLastUpdated = cached.timestamp;
     return;
   }
   try {
     pricingCache = await fetchAndCachePricing();
+    _pricingLastUpdated = Date.now();
   } catch {
-    pricingCache = new Map(Object.entries(FALLBACK_PRICING));
+    const lkg = await loadLastKnownGoodPricing();
+    if (lkg) {
+      pricingCache = lkg.map;
+      _pricingLastUpdated = lkg.timestamp;
+      const ageDays = Math.floor((Date.now() - lkg.timestamp) / (24 * 60 * 60 * 1e3));
+      if (Date.now() - lkg.timestamp > STALENESS_WARN_MS) {
+        _pricingWarnings.push(`Model pricing data may be outdated (last updated ${ageDays} days ago)`);
+      }
+    } else {
+      pricingCache = new Map(Object.entries(FALLBACK_PRICING));
+      _pricingLastUpdated = null;
+      _pricingWarnings.push("Using hardcoded fallback pricing \u2014 could not fetch or load cached pricing");
+    }
   }
 }
 function setModelAliases(aliases) {
@@ -214,7 +265,7 @@ function applyContextTier(costs, inputTokens) {
     cacheReadCostPerToken: tier.cacheReadCostPerToken ?? costs.cacheReadCostPerToken
   };
 }
-var LITELLM_URL, CACHE_TTL_MS2, WEB_SEARCH_COST, LONG_CONTEXT_1M_THRESHOLD_TOKENS, GEMINI_LONG_CONTEXT_THRESHOLD_TOKENS, DIRECT_PROVIDER_PREFIXES, FALLBACK_PRICING, pricingCache, BUILTIN_ALIASES, userAliases;
+var LITELLM_URL, CACHE_TTL_MS2, WEB_SEARCH_COST, LONG_CONTEXT_1M_THRESHOLD_TOKENS, GEMINI_LONG_CONTEXT_THRESHOLD_TOKENS, DIRECT_PROVIDER_PREFIXES, FALLBACK_PRICING, pricingCache, _pricingWarnings, _pricingLastUpdated, STALENESS_WARN_MS, BUILTIN_ALIASES, userAliases;
 var init_models = __esm({
   "src/models.ts"() {
     "use strict";
@@ -308,6 +359,9 @@ var init_models = __esm({
       "MiniMax-M2.7": { inputCostPerToken: 3e-7, outputCostPerToken: 12e-7, cacheWriteCostPerToken: 375e-9, cacheReadCostPerToken: 6e-8, webSearchCostPerRequest: WEB_SEARCH_COST, fastMultiplier: 1 }
     };
     pricingCache = null;
+    _pricingWarnings = [];
+    _pricingLastUpdated = null;
+    STALENESS_WARN_MS = 7 * 24 * 60 * 60 * 1e3;
     BUILTIN_ALIASES = {
       "anthropic--claude-4.6-opus": "claude-opus-4-6",
       "anthropic--claude-4.6-sonnet": "claude-sonnet-4-6",
@@ -320,7 +374,7 @@ var init_models = __esm({
 });
 
 // src/bash-utils.ts
-import { basename as basename4 } from "path";
+import { basename as basename5 } from "path";
 function stripQuotedStrings(command) {
   return command.replace(/"[^"]*"|'[^']*'/g, (match) => " ".repeat(match.length));
 }
@@ -347,7 +401,7 @@ function extractBashCommands(command) {
     const tokens = segment.split(/\s+/);
     let i = 0;
     while (i < tokens.length && /^\w+=/.test(tokens[i])) i++;
-    const base = i < tokens.length ? basename4(tokens[i]) : "";
+    const base = i < tokens.length ? basename5(tokens[i]) : "";
     if (base && base !== "cd" && base !== "true" && base !== "false") {
       commands.push(base);
     }
@@ -456,7 +510,7 @@ Upgrade Node (https://nodejs.org) and run exe-watcher again.
 (underlying error: ${message})`;
     return false;
   } finally {
-    restore();
+    setTimeout(restore, 0);
   }
 }
 function isSqliteAvailable() {
@@ -968,7 +1022,7 @@ __export(cursor_agent_exports, {
 import { createHash as createHash2 } from "crypto";
 import { existsSync as existsSync2 } from "fs";
 import { readdir as readdir7, readFile as readFile6, stat as stat9 } from "fs/promises";
-import { join as join14, basename as basename6 } from "path";
+import { join as join14, basename as basename7 } from "path";
 import { homedir as homedir10 } from "os";
 function getCursorAgentBaseDir(baseDirOverride) {
   if (baseDirOverride) return baseDirOverride;
@@ -1027,7 +1081,7 @@ function resolveModel3(raw) {
   return raw;
 }
 function toConversationId(transcriptPath) {
-  const filename = basename6(transcriptPath, ".txt");
+  const filename = basename7(transcriptPath, ".txt");
   if (filename.length === 36 && UUID_LIKE.test(filename)) return filename;
   return createHash2("sha1").update(transcriptPath).digest("hex").slice(0, 16);
 }
@@ -1160,7 +1214,7 @@ function createParser6(source, seenKeys, dbPath, summariesByConversationId) {
         const transcript = await readFile6(source.path, "utf-8");
         const parsed = parseTranscript(transcript);
         if (!parsed.recognized) {
-          process.stderr.write(`exe-watcher: skipped ${basename6(source.path)}: unrecognized cursor-agent transcript format
+          process.stderr.write(`exe-watcher: skipped ${basename7(source.path)}: unrecognized cursor-agent transcript format
 `);
           return;
         }
@@ -1221,7 +1275,7 @@ function createCursorAgentProvider(baseDirOverride) {
     name: "cursor-agent",
     displayName: "Cursor Agent",
     modelDisplayName(model) {
-      if (model === "default") return modelDisplayNames5.default;
+      if (model === "default") return modelDisplayNames5["default"] ?? "Auto (Sonnet est.)";
       const label = modelDisplayNames5[model] ?? model;
       return `${label} (est.)`;
     },
@@ -1298,8 +1352,8 @@ var init_cursor_agent = __esm({
 });
 
 // src/cli.ts
-import { existsSync as existsSync6, readFileSync as readFileSync2, statSync as statSync3 } from "fs";
-import { join as join21 } from "path";
+import { existsSync as existsSync7, readFileSync as readFileSync3, statSync as statSync3 } from "fs";
+import { join as join23 } from "path";
 import { homedir as homedir14 } from "os";
 import { Command } from "commander";
 
@@ -1308,15 +1362,19 @@ import { spawn } from "child_process";
 import { createWriteStream } from "fs";
 import { cp, mkdir, mkdtemp, rename, rm, stat } from "fs/promises";
 import { homedir, platform, tmpdir } from "os";
-import { join } from "path";
+import { basename, join } from "path";
 import { pipeline } from "stream/promises";
 import { Readable } from "stream";
-var RELEASE_API = "https://api.github.com/repos/AskExe/exe-watcher/releases/latest";
+var RELEASE_API_LATEST = "https://api.github.com/repos/AskExe/exe-watcher/releases/latest";
+var RELEASE_API_BY_TAG = "https://api.github.com/repos/AskExe/exe-watcher/releases/tags/";
 var APP_BUNDLE_NAME = "Watcher by EXE.app";
 var ASSET_PATTERN = /^ExeWatcherMenubar-.*\.zip$/;
 var APP_PROCESS_NAME = "ExeWatcherMenubar";
 var SUPPORTED_OS = "darwin";
 var MIN_MACOS_MAJOR = 14;
+var DEFAULT_APP_EXIT_TIMEOUT_MS = 5e3;
+var DEFAULT_APP_LAUNCH_TIMEOUT_MS = 5e3;
+var POLL_INTERVAL_MS = 150;
 function userApplicationsDir() {
   return join(homedir(), "Applications");
 }
@@ -1351,14 +1409,26 @@ async function sysProductVersion() {
     });
   });
 }
-async function fetchLatestReleaseAsset() {
-  const response = await fetch(RELEASE_API, {
+async function fetchLatestReleaseAsset(version2) {
+  const tag = version2 ? version2.startsWith("mac-") ? version2 : `mac-${version2.startsWith("v") ? version2 : `v${version2}`}` : void 0;
+  const url = tag ? `${RELEASE_API_BY_TAG}${tag}` : RELEASE_API_LATEST;
+  const response = await fetch(url, {
     headers: {
       // Identify the installer so GitHub's abuse heuristics treat us as a known client.
       "User-Agent": "exe-watcher-installer",
       Accept: "application/vnd.github+json"
-    }
+    },
+    signal: AbortSignal.timeout(1e4)
   });
+  if (response.status === 403) {
+    const resetHeader = response.headers.get("X-RateLimit-Reset");
+    if (resetHeader) {
+      const resetTimestamp = Number(resetHeader);
+      const waitMinutes = Math.max(1, Math.ceil((resetTimestamp - Date.now() / 1e3) / 60));
+      throw new Error(`GitHub API rate limit reached. Try again in ${waitMinutes} minutes.`);
+    }
+    throw new Error("GitHub API rate limit reached. Try again later.");
+  }
   if (!response.ok) {
     throw new Error(`GitHub release lookup failed: HTTP ${response.status}`);
   }
@@ -1369,6 +1439,12 @@ async function fetchLatestReleaseAsset() {
       `No ${APP_BUNDLE_NAME} zip found in release ${body.tag_name}. Check https://github.com/AskExe/exe-watcher/releases.`
     );
   }
+  const allowedPrefixes = ["https://github.com/", "https://objects.githubusercontent.com/"];
+  if (!allowedPrefixes.some((prefix) => asset.browser_download_url.startsWith(prefix))) {
+    throw new Error(
+      `Untrusted download URL: ${asset.browser_download_url}. Expected a GitHub-hosted asset URL.`
+    );
+  }
   return asset;
 }
 async function downloadToFile(url, destPath) {
@@ -1392,20 +1468,96 @@ async function runCommand(command, args) {
     });
   });
 }
-async function isAppRunning() {
+async function sleep(ms) {
+  await new Promise((resolve2) => setTimeout(resolve2, ms));
+}
+async function captureCommand(command, args) {
   return new Promise((resolve2) => {
-    const proc = spawn("/usr/bin/pgrep", ["-f", APP_PROCESS_NAME]);
-    proc.on("close", (code) => resolve2(code === 0));
-    proc.on("error", () => resolve2(false));
+    const proc = spawn(command, args, { stdio: ["ignore", "pipe", "ignore"] });
+    let stdout = "";
+    proc.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    proc.on("error", () => resolve2({ code: 1, stdout: "" }));
+    proc.on("close", (code) => resolve2({ code: code ?? 1, stdout }));
   });
 }
-async function killRunningApp() {
+function parsePids(output) {
+  return output.split(/\s+/).map((s) => Number(s)).filter((pid) => Number.isInteger(pid) && pid > 0 && pid !== process.pid);
+}
+async function runningAppPids() {
+  const result = await captureCommand("/usr/bin/pgrep", ["-f", APP_PROCESS_NAME]);
+  return result.code === 0 ? parsePids(result.stdout) : [];
+}
+async function isAppRunning() {
+  return (await runningAppPids()).length > 0;
+}
+function timeoutFromEnv(name, fallback) {
+  const value = Number(process.env[name] ?? "");
+  return Number.isFinite(value) && value >= 0 ? value : fallback;
+}
+async function waitForNoRunningApp(timeoutMs = timeoutFromEnv("EXE_WATCHER_APP_EXIT_TIMEOUT_MS", DEFAULT_APP_EXIT_TIMEOUT_MS)) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if ((await runningAppPids()).length === 0) return true;
+    await sleep(POLL_INTERVAL_MS);
+  }
+  return (await runningAppPids()).length === 0;
+}
+async function waitForRunningApp(timeoutMs = timeoutFromEnv("EXE_WATCHER_APP_LAUNCH_TIMEOUT_MS", DEFAULT_APP_LAUNCH_TIMEOUT_MS)) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if ((await runningAppPids()).length > 0) return true;
+    await sleep(POLL_INTERVAL_MS);
+  }
+  return (await runningAppPids()).length > 0;
+}
+async function signalPids(signal, pids) {
+  if (pids.length === 0) return;
   await new Promise((resolve2) => {
-    const proc = spawn("/usr/bin/pkill", ["-f", APP_PROCESS_NAME]);
+    const proc = spawn("/bin/kill", [`-${signal}`, ...pids.map(String)]);
     proc.on("close", () => resolve2());
     proc.on("error", () => resolve2());
   });
 }
+async function movePath(source, dest) {
+  try {
+    await rename(source, dest);
+  } catch (err) {
+    if (err.code === "EXDEV") {
+      await cp(source, dest, { recursive: true });
+      await rm(source, { recursive: true, force: true });
+    } else {
+      throw err;
+    }
+  }
+}
+async function restoreExistingApp(backupPath, targetPath) {
+  if (!await exists(backupPath)) return;
+  await killRunningApp().catch(() => {
+  });
+  await rm(targetPath, { recursive: true, force: true }).catch(() => {
+  });
+  await movePath(backupPath, targetPath);
+  await runCommand("/usr/bin/open", [targetPath]).catch(() => {
+  });
+  await waitForRunningApp().catch(() => false);
+}
+async function killRunningApp() {
+  const initialPids = await runningAppPids();
+  if (initialPids.length === 0) return;
+  console.log(`Stopping existing Exe Watcher Menubar (${initialPids.join(", ")})...`);
+  await signalPids("TERM", initialPids);
+  if (await waitForNoRunningApp()) return;
+  const stubbornPids = await runningAppPids();
+  if (stubbornPids.length > 0) {
+    console.log(`Force-stopping stale Exe Watcher Menubar (${stubbornPids.join(", ")})...`);
+    await signalPids("KILL", stubbornPids);
+  }
+  if (!await waitForNoRunningApp()) {
+    throw new Error("Could not stop the existing Exe Watcher Menubar process. Please quit it and retry.");
+  }
+}
 async function installMenubarApp(options = {}) {
   await ensureSupportedPlatform();
   const appsDir = userApplicationsDir();
@@ -1417,8 +1569,8 @@ async function installMenubarApp(options = {}) {
     }
     return { installedPath: targetPath, launched: true };
   }
-  console.log("Looking up the latest Exe Watcher Menubar release...");
-  const asset = await fetchLatestReleaseAsset();
+  console.log(options.version ? `Looking up Exe Watcher Menubar release ${options.version}...` : "Looking up the latest Exe Watcher Menubar release...");
+  const asset = await fetchLatestReleaseAsset(options.version);
   const stagingDir = await mkdtemp(join(tmpdir(), "exe-watcher-menubar-"));
   try {
     const archivePath = join(stagingDir, asset.name);
@@ -1433,23 +1585,33 @@ async function installMenubarApp(options = {}) {
     await runCommand("/usr/bin/xattr", ["-dr", "com.apple.quarantine", unpackedApp]).catch(() => {
     });
     await mkdir(appsDir, { recursive: true });
-    if (alreadyInstalled) {
-      await killRunningApp();
-      await rm(targetPath, { recursive: true, force: true });
-    }
+    const backupPath = alreadyInstalled ? join(appsDir, `${basename(APP_BUNDLE_NAME, ".app")}.backup-${Date.now()}.app`) : void 0;
+    let targetReplaced = false;
     try {
-      await rename(unpackedApp, targetPath);
+      if (alreadyInstalled && backupPath) {
+        await killRunningApp();
+        await movePath(targetPath, backupPath);
+      }
+      await movePath(unpackedApp, targetPath);
+      targetReplaced = true;
+      console.log("Launching Exe Watcher Menubar...");
+      await runCommand("/usr/bin/open", [targetPath]);
+      if (!await waitForRunningApp()) {
+        throw new Error("Installed Exe Watcher Menubar, but the app did not launch.");
+      }
+      if (backupPath) {
+        await rm(backupPath, { recursive: true, force: true }).catch(() => {
+        });
+      }
+      return { installedPath: targetPath, launched: true };
     } catch (err) {
-      if (err.code === "EXDEV") {
-        await cp(unpackedApp, targetPath, { recursive: true });
-        await rm(unpackedApp, { recursive: true, force: true });
-      } else {
-        throw err;
+      if (backupPath && (targetReplaced || await exists(backupPath))) {
+        await restoreExistingApp(backupPath, targetPath);
+        const detail = err instanceof Error ? err.message : String(err);
+        throw new Error(`${detail} Restored the previous working Exe Watcher Menubar; your menu bar app was not left broken.`);
       }
+      throw err;
     }
-    console.log("Launching Exe Watcher Menubar...");
-    await runCommand("/usr/bin/open", [targetPath]);
-    return { installedPath: targetPath, launched: true };
   } finally {
     await rm(stagingDir, { recursive: true, force: true });
   }
@@ -1563,7 +1725,9 @@ function getRateCachePath() {
   return join4(getCacheDir(), "exchange-rate.json");
 }
 async function fetchRate(code) {
-  const response = await fetch(`${FRANKFURTER_URL}${code}`);
+  const response = await fetch(`${FRANKFURTER_URL}${code}`, {
+    signal: AbortSignal.timeout(5e3)
+  });
   if (!response.ok) throw new Error(`HTTP ${response.status}`);
   const data = await response.json();
   const rate = data.rates?.[code];
@@ -1895,7 +2059,9 @@ function escCsv(s) {
 }
 function rowsToCsv(rows) {
   if (rows.length === 0) return "";
-  const headers = Object.keys(rows[0]);
+  const firstRow = rows[0];
+  if (!firstRow) return "";
+  const headers = Object.keys(firstRow);
   const lines = [headers.map(escCsv).join(",")];
   for (const row of rows) {
     lines.push(headers.map((h) => escCsv(String(row[h] ?? ""))).join(","));
@@ -2176,8 +2342,8 @@ async function exportJson(periods, outputPath) {
 init_models();
 
 // src/parser.ts
-import { readdir as readdir8, stat as stat10 } from "fs/promises";
-import { basename as basename7, join as join15 } from "path";
+import { readdir as readdir8, stat as stat11 } from "fs/promises";
+import { basename as basename8, join as join16 } from "path";
 
 // src/fs-utils.ts
 import { readFile as readFile4, stat as stat3 } from "fs/promises";
@@ -2254,7 +2420,7 @@ function readSessionFileSync(filePath) {
     closeSync(fd);
   }
 }
-async function* readSessionLines(filePath) {
+async function* readSessionLines(filePath, startByte) {
   let size;
   try {
     size = (await stat3(filePath)).size;
@@ -2266,7 +2432,7 @@ async function* readSessionLines(filePath) {
     warn(`skipped oversize file ${filePath} (${size} bytes > cap ${MAX_SESSION_FILE_BYTES})`);
     return;
   }
-  const stream = createReadStream(filePath, { encoding: "utf-8" });
+  const stream = createReadStream(filePath, { encoding: "utf-8", start: startByte ?? 0 });
   const rl = createInterface({ input: stream, crlfDelay: Infinity });
   try {
     for await (const line of rl) yield line;
@@ -2282,7 +2448,7 @@ init_models();
 
 // src/providers/claude.ts
 import { readdir as readdir2, stat as stat4 } from "fs/promises";
-import { basename, join as join7 } from "path";
+import { basename as basename2, join as join7 } from "path";
 import { homedir as homedir4 } from "os";
 var shortNames = {
   "claude-opus-4-7": "Opus 4.7",
@@ -2363,7 +2529,7 @@ var claude = {
     }
     const desktopDirs = await findDesktopProjectDirs(getDesktopSessionsDir());
     for (const dirPath of desktopDirs) {
-      sources.push({ path: dirPath, project: basename(dirPath), provider: "claude" });
+      sources.push({ path: dirPath, project: basename2(dirPath), provider: "claude" });
     }
     return sources;
   },
@@ -2377,7 +2543,7 @@ var claude = {
 
 // src/providers/codex.ts
 import { readdir as readdir3, stat as stat5 } from "fs/promises";
-import { basename as basename2, join as join8 } from "path";
+import { basename as basename3, join as join8 } from "path";
 import { homedir as homedir5 } from "os";
 init_models();
 var modelDisplayNames = {
@@ -2465,11 +2631,16 @@ function resolveModel(info, sessionModel) {
   return info?.info?.model ?? info?.info?.model_name ?? sessionModel ?? "gpt-5";
 }
 function createParser(source, seenKeys) {
+  const parserWarnings = [];
   return {
+    warnings: parserWarnings,
     async *parse() {
       const content = await readSessionFile(source.path);
       if (content === null) return;
       const lines = content.split("\n").filter((l) => l.trim());
+      if (lines.length === 0) return;
+      let hasSessionMeta = false;
+      let hasTokenCounts = false;
       let sessionModel;
       let sessionId = "";
       let prevCumulativeTotal = 0;
@@ -2487,7 +2658,8 @@ function createParser(source, seenKeys) {
           continue;
         }
         if (entry.type === "session_meta") {
-          sessionId = entry.payload?.session_id ?? basename2(source.path, ".jsonl");
+          hasSessionMeta = true;
+          sessionId = entry.payload?.session_id ?? basename3(source.path, ".jsonl");
           sessionModel = entry.payload?.model;
           continue;
         }
@@ -2506,6 +2678,7 @@ function createParser(source, seenKeys) {
           continue;
         }
         if (entry.type === "event_msg" && entry.payload?.type === "token_count") {
+          hasTokenCounts = true;
           const info = entry.payload.info;
           if (!info) continue;
           const cumulativeTotal = info.total_token_usage?.total_tokens ?? 0;
@@ -2581,6 +2754,12 @@ function createParser(source, seenKeys) {
           pendingUserMessage = "";
         }
       }
+      if (lines.length > 5 && !hasSessionMeta) {
+        parserWarnings.push(`Codex session file format may have changed \u2014 missing session_meta (${basename3(source.path)})`);
+      }
+      if (lines.length > 5 && hasSessionMeta && !hasTokenCounts) {
+        parserWarnings.push(`Codex session file format may have changed \u2014 no token_count events found (${basename3(source.path)})`);
+      }
     }
   };
 }
@@ -2610,7 +2789,7 @@ var codex = createCodexProvider();
 
 // src/providers/copilot.ts
 import { readdir as readdir4, stat as stat6 } from "fs/promises";
-import { basename as basename3, dirname as dirname2, join as join9 } from "path";
+import { basename as basename4, dirname as dirname2, join as join9 } from "path";
 import { homedir as homedir6 } from "os";
 init_models();
 var modelDisplayNames2 = {
@@ -2657,7 +2836,7 @@ function createParser2(source, seenKeys) {
     async *parse() {
       const content = await readSessionFile(source.path);
       if (content === null) return;
-      const sessionId = basename3(dirname2(source.path));
+      const sessionId = basename4(dirname2(source.path));
       const lines = content.split("\n").filter((l) => l.trim());
       let currentModel = "";
       let pendingUserMessage = "";
@@ -2726,7 +2905,7 @@ async function discoverSessionsInDir2(sessionStateDir) {
     const yaml = await readSessionFile(join9(sessionStateDir, sessionId, "workspace.yaml"));
     if (yaml !== null) {
       const cwd = parseCwd(yaml);
-      if (cwd) project = basename3(cwd);
+      if (cwd) project = basename4(cwd);
     }
     sources.push({ path: eventsPath, project, provider: "copilot" });
   }
@@ -2758,7 +2937,7 @@ var copilot = createCopilotProvider();
 
 // src/providers/pi.ts
 import { readdir as readdir5, stat as stat7 } from "fs/promises";
-import { basename as basename5, join as join10 } from "path";
+import { basename as basename6, join as join10 } from "path";
 import { homedir as homedir7 } from "os";
 init_models();
 init_bash_utils();
@@ -2827,7 +3006,7 @@ async function discoverSessionsInDir3(sessionsDir, providerName) {
       const first = await readFirstEntry(filePath);
       if (!first || first.type !== "session") continue;
       const cwd = first.cwd ?? dirName;
-      sources.push({ path: filePath, project: basename5(cwd), provider: providerName });
+      sources.push({ path: filePath, project: basename6(cwd), provider: providerName });
     }
   }
   return sources;
@@ -2838,7 +3017,7 @@ function createParser3(source, seenKeys) {
       const content = await readSessionFile(source.path);
       if (content === null) return;
       const lines = content.split("\n").filter((l) => l.trim());
-      let sessionId = basename5(source.path, ".jsonl");
+      let sessionId = basename6(source.path, ".jsonl");
       let pendingUserMessage = "";
       for (const [lineIdx, line] of lines.entries()) {
         let entry;
@@ -2995,15 +3174,44 @@ async function getAllProviders() {
   if (cursorAgent) all.push(cursorAgent);
   return all;
 }
+var _lastDiscoveryWarnings = [];
+function getDiscoveryWarnings() {
+  return _lastDiscoveryWarnings;
+}
+var PROVIDER_TIMEOUT_MS = 5e3;
+function withTimeout(promise, ms, label) {
+  return Promise.race([
+    promise.then((result) => ({ result, warning: null })),
+    new Promise(
+      (resolve2) => setTimeout(() => resolve2({ result: null, warning: `Provider "${label}" timed out after ${ms}ms \u2014 skipped` }), ms)
+    )
+  ]);
+}
 async function discoverAllSessions(providerFilter) {
+  _lastDiscoveryWarnings = [];
   const allProviders = await getAllProviders();
   const filtered = providerFilter && providerFilter !== "all" ? allProviders.filter((p) => p.name === providerFilter) : allProviders;
-  const all = [];
-  for (const provider of filtered) {
-    const sessions = await provider.discoverSessions();
-    all.push(...sessions);
-  }
-  return all;
+  const results = await Promise.all(
+    filtered.map(async (provider) => {
+      try {
+        const { result, warning } = await withTimeout(
+          provider.discoverSessions(),
+          PROVIDER_TIMEOUT_MS,
+          provider.name
+        );
+        if (warning) {
+          _lastDiscoveryWarnings.push(warning);
+          return [];
+        }
+        return result ?? [];
+      } catch (err) {
+        const msg = err instanceof Error ? err.message : String(err);
+        _lastDiscoveryWarnings.push(`Provider "${provider.name}" discovery failed: ${msg}`);
+        return [];
+      }
+    })
+  );
+  return results.flat();
 }
 async function getProvider(name) {
   if (name === "cursor") {
@@ -3148,8 +3356,97 @@ function classifyTurn(turn) {
   return { ...turn, category, retries: countRetries(turn), hasEdits: turnHasEdits(turn) };
 }
 
+// src/session-index.ts
+init_cache_dir();
+import { stat as stat10 } from "fs/promises";
+import { existsSync as existsSync3, unlinkSync } from "fs";
+import { readFile as readFile7, mkdir as mkdir7, rename as rename6, unlink as unlink3, open as open5 } from "fs/promises";
+import { join as join15 } from "path";
+import { randomBytes as randomBytes5 } from "crypto";
+var SESSION_INDEX_VERSION = 1;
+var INDEX_FILENAME = "session-index.json";
+var currentIndex = null;
+function emptyIndex() {
+  return { v: SESSION_INDEX_VERSION, e: {} };
+}
+function indexPath() {
+  return join15(getCacheDir(), INDEX_FILENAME);
+}
+async function loadSessionIndex() {
+  if (currentIndex) return currentIndex;
+  try {
+    const raw = await readFile7(indexPath(), "utf-8");
+    const parsed = JSON.parse(raw);
+    if (parsed.v !== SESSION_INDEX_VERSION) {
+      currentIndex = emptyIndex();
+      return currentIndex;
+    }
+    currentIndex = parsed;
+    return currentIndex;
+  } catch {
+    currentIndex = emptyIndex();
+    return currentIndex;
+  }
+}
+async function saveSessionIndex(index) {
+  const dir = getCacheDir();
+  if (!existsSync3(dir)) await mkdir7(dir, { recursive: true });
+  const finalPath = indexPath();
+  const tempPath = `${finalPath}.${randomBytes5(8).toString("hex")}.tmp`;
+  const payload = JSON.stringify(index);
+  const handle = await open5(tempPath, "w", 384);
+  try {
+    await handle.writeFile(payload, { encoding: "utf-8" });
+    await handle.sync();
+  } finally {
+    await handle.close();
+  }
+  try {
+    await rename6(tempPath, finalPath);
+  } catch (err) {
+    try {
+      await unlink3(tempPath);
+    } catch {
+    }
+    throw err;
+  }
+  currentIndex = index;
+}
+async function checkSessionFile(filePath, index, dateRange) {
+  const entry = index.e[filePath];
+  if (!entry) return "parse";
+  let fileStat;
+  try {
+    fileStat = await stat10(filePath);
+  } catch {
+    return "parse";
+  }
+  if (fileStat.size !== entry.s || fileStat.mtimeMs !== entry.m) return "parse";
+  if (entry.h === 0) return "skip";
+  return "parse";
+}
+function recordParseResult(filePath, index, sizeBytes, mtimeMs, hasApiCalls) {
+  const prev = index.e[filePath];
+  const h = hasApiCalls ? 1 : prev?.h === 1 ? 1 : 0;
+  index.e[filePath] = { s: sizeBytes, m: mtimeMs, h };
+}
+function pruneIndex(index, knownPaths) {
+  let pruned = 0;
+  for (const path of Object.keys(index.e)) {
+    if (!knownPaths.has(path)) {
+      delete index.e[path];
+      pruned++;
+    }
+  }
+  return pruned;
+}
+
 // src/parser.ts
 init_bash_utils();
+var _parseWarnings = [];
+function getParseWarnings() {
+  return _parseWarnings;
+}
 function unsanitizePath(dirName) {
   return dirName.replace(/-/g, "/");
 }
@@ -3356,7 +3653,7 @@ function buildSessionSummary(sessionId, project, turns) {
 async function parseSessionFile(filePath, project, seenMsgIds, dateRange) {
   if (dateRange) {
     try {
-      const s = await stat10(filePath);
+      const s = await stat11(filePath);
       if (s.mtimeMs < dateRange.start.getTime()) return null;
     } catch {
     }
@@ -3370,7 +3667,7 @@ async function parseSessionFile(filePath, project, seenMsgIds, dateRange) {
   }
   if (!hasLines) return null;
   if (entries.length === 0) return null;
-  const sessionId = basename7(filePath, ".jsonl");
+  const sessionId = basename8(filePath, ".jsonl");
   let turns = groupIntoTurns(entries, seenMsgIds);
   if (dateRange) {
     turns = turns.filter((turn) => {
@@ -3387,23 +3684,46 @@ async function parseSessionFile(filePath, project, seenMsgIds, dateRange) {
 }
 async function collectJsonlFiles(dirPath) {
   const files = await readdir8(dirPath).catch(() => []);
-  const jsonlFiles = files.filter((f) => f.endsWith(".jsonl")).map((f) => join15(dirPath, f));
+  const jsonlFiles = files.filter((f) => f.endsWith(".jsonl")).map((f) => join16(dirPath, f));
   for (const entry of files) {
     if (entry.endsWith(".jsonl")) continue;
-    const subagentsPath = join15(dirPath, entry, "subagents");
+    const subagentsPath = join16(dirPath, entry, "subagents");
     const subFiles = await readdir8(subagentsPath).catch(() => []);
     for (const sf of subFiles) {
-      if (sf.endsWith(".jsonl")) jsonlFiles.push(join15(subagentsPath, sf));
+      if (sf.endsWith(".jsonl")) jsonlFiles.push(join16(subagentsPath, sf));
     }
   }
   return jsonlFiles;
 }
 async function scanProjectDirs(dirs, seenMsgIds, dateRange) {
+  const sessionIndex = await loadSessionIndex();
   const projectMap = /* @__PURE__ */ new Map();
+  let indexDirty = false;
+  const allJsonlPaths = /* @__PURE__ */ new Set();
   for (const { path: dirPath, name: dirName } of dirs) {
     const jsonlFiles = await collectJsonlFiles(dirPath);
+    for (const f of jsonlFiles) allJsonlPaths.add(f);
     for (const filePath of jsonlFiles) {
+      const action = await checkSessionFile(filePath, sessionIndex, dateRange);
+      if (action === "skip") continue;
+      let preStat = null;
+      try {
+        const s = await stat11(filePath);
+        preStat = { size: s.size, mtimeMs: s.mtimeMs };
+      } catch {
+      }
       const session = await parseSessionFile(filePath, dirName, seenMsgIds, dateRange);
+      const hasApiCalls = session !== null && session.apiCalls > 0;
+      if (preStat && (hasApiCalls || !dateRange)) {
+        try {
+          const postStat = await stat11(filePath);
+          if (postStat.size === preStat.size && postStat.mtimeMs === preStat.mtimeMs) {
+            recordParseResult(filePath, sessionIndex, preStat.size, preStat.mtimeMs, hasApiCalls);
+            indexDirty = true;
+          }
+        } catch {
+        }
+      }
       if (session && session.apiCalls > 0) {
         const existing = projectMap.get(dirName) ?? [];
         existing.push(session);
@@ -3411,13 +3731,19 @@ async function scanProjectDirs(dirs, seenMsgIds, dateRange) {
       }
     }
   }
-  return Array.from(projectMap.entries()).map(([dirName, sessions]) => ({
+  const pruned = pruneIndex(sessionIndex, allJsonlPaths);
+  if (pruned > 0) indexDirty = true;
+  if (indexDirty) {
+    await saveSessionIndex(sessionIndex);
+  }
+  const projects = Array.from(projectMap.entries()).map(([dirName, sessions]) => ({
     project: dirName,
     projectPath: unsanitizePath(dirName),
     sessions,
     totalCostUSD: sessions.reduce((s, sess) => s + sess.totalCostUSD, 0),
     totalApiCalls: sessions.reduce((s, sess) => s + sess.apiCalls, 0)
   }));
+  return { projects, indexDirty };
 }
 function providerCallToTurn(call) {
   const tools = call.tools;
@@ -3458,7 +3784,7 @@ async function parseProviderSources(providerName, sources, seenKeys, dateRange)
   for (const source of sources) {
     if (dateRange) {
       try {
-        const s = await stat10(source.path);
+        const s = await stat11(source.path);
         if (s.mtimeMs < dateRange.start.getTime()) continue;
       } catch {
       }
@@ -3483,6 +3809,9 @@ async function parseProviderSources(providerName, sources, seenKeys, dateRange)
         sessionMap.set(key, { project: source.project, turns: [classified] });
       }
     }
+    if (parser.warnings && parser.warnings.length > 0) {
+      _parseWarnings.push(...parser.warnings);
+    }
   }
   const projectMap = /* @__PURE__ */ new Map();
   for (const [key, { project, turns }] of sessionMap) {
@@ -3510,6 +3839,8 @@ var CACHE_TTL_MS3 = 6e4;
 var MAX_CACHE_ENTRIES = 10;
 var sessionCache = /* @__PURE__ */ new Map();
 var inFlightSourceContexts = /* @__PURE__ */ new Map();
+var SOURCE_CONTEXT_TTL_MS = 5e3;
+var resolvedSourceContexts = /* @__PURE__ */ new Map();
 function sourceContextCacheKey(providerFilter) {
   return JSON.stringify({
     provider: providerFilter ?? "all",
@@ -3534,9 +3865,13 @@ function buildCacheFingerprint(sources) {
 }
 async function getSourceContext(providerFilter) {
   const key = sourceContextCacheKey(providerFilter);
-  const cached = inFlightSourceContexts.get(key);
-  if (cached) {
-    return cached;
+  const resolved = resolvedSourceContexts.get(key);
+  if (resolved && Date.now() - resolved.ts < SOURCE_CONTEXT_TTL_MS) {
+    return resolved.result;
+  }
+  const inflight = inFlightSourceContexts.get(key);
+  if (inflight) {
+    return inflight;
   }
   const promise = (async () => {
     const sources = await discoverAllSessions(providerFilter);
@@ -3545,13 +3880,11 @@ async function getSourceContext(providerFilter) {
   })();
   inFlightSourceContexts.set(key, promise);
   try {
-    return await promise;
-  } catch (err) {
-    throw err;
+    const result = await promise;
+    resolvedSourceContexts.set(key, { result, ts: Date.now() });
+    return result;
   } finally {
-    if (inFlightSourceContexts.get(key) === promise) {
-      inFlightSourceContexts.delete(key);
-    }
+    inFlightSourceContexts.delete(key);
   }
 }
 function cachePut(key, data) {
@@ -3586,6 +3919,7 @@ function filterProjectsByName(projects, include, exclude) {
   return result;
 }
 async function parseAllSessions(dateRange, providerFilter) {
+  _parseWarnings = [];
   const sourceContext = await getSourceContext(providerFilter);
   const allSources = sourceContext.sources;
   const key = cacheKey(dateRange, providerFilter, sourceContext.fingerprint);
@@ -3596,7 +3930,7 @@ async function parseAllSessions(dateRange, providerFilter) {
   const claudeSources = allSources.filter((s) => s.provider === "claude");
   const nonClaudeSources = allSources.filter((s) => s.provider !== "claude");
   const claudeDirs = claudeSources.map((s) => ({ path: s.path, name: s.project }));
-  const claudeProjects = await scanProjectDirs(claudeDirs, seenMsgIds, dateRange);
+  const { projects: claudeProjects } = await scanProjectDirs(claudeDirs, seenMsgIds, dateRange);
   const providerGroups = /* @__PURE__ */ new Map();
   for (const source of nonClaudeSources) {
     const existing = providerGroups.get(source.provider) ?? [];
@@ -3669,6 +4003,19 @@ function renderStatusBar(projects) {
 }
 
 // src/menubar-json.ts
+import { readdirSync, readFileSync as readFileSync2 } from "fs";
+import { join as join17, dirname as dirname3 } from "path";
+import { fileURLToPath } from "url";
+function getCliVersion() {
+  try {
+    const pkgPath = join17(dirname3(fileURLToPath(import.meta.url)), "..", "package.json");
+    const pkg = JSON.parse(readFileSync2(pkgPath, "utf-8"));
+    return pkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+var MIN_APP_VERSION = "0.2.40";
 var TOP_ACTIVITIES_LIMIT = 20;
 var TOP_MODELS_LIMIT = 20;
 var TOP_FINDINGS_LIMIT = 10;
@@ -3785,7 +4132,10 @@ function buildHistory(daily) {
 }
 function buildMenubarPayload(current, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics) {
   return {
+    schemaVersion: 2,
     generated: (/* @__PURE__ */ new Date()).toISOString(),
+    cliVersion: getCliVersion(),
+    minAppVersion: MIN_APP_VERSION,
     current: {
       label: current.label,
       cost: current.cost,
@@ -3811,18 +4161,18 @@ function buildMenubarPayload(current, providers, optimize, dailyHistory, agentSt
 
 // src/daily-cache.ts
 init_cache_dir();
-import { createHash as createHash3, randomBytes as randomBytes5 } from "crypto";
-import { existsSync as existsSync3 } from "fs";
-import { mkdir as mkdir7, open as open5, readFile as readFile7, rename as rename6, unlink as unlink3 } from "fs/promises";
-import { join as join16 } from "path";
+import { createHash as createHash3, randomBytes as randomBytes6 } from "crypto";
+import { existsSync as existsSync4 } from "fs";
+import { mkdir as mkdir8, open as open6, readFile as readFile8, rename as rename7, unlink as unlink4 } from "fs/promises";
+import { join as join18 } from "path";
 var DAILY_CACHE_VERSION = 6;
 var DEFAULT_DAILY_CACHE_SCOPE = "global";
 var DAILY_CACHE_FILENAME = "daily-cache.json";
 function getCachePath3(scopeKey) {
   if (scopeKey === DEFAULT_DAILY_CACHE_SCOPE) {
-    return join16(getCacheDir(), DAILY_CACHE_FILENAME);
+    return join18(getCacheDir(), DAILY_CACHE_FILENAME);
   }
-  return join16(getCacheDir(), `daily-cache-${scopeKey}.json`);
+  return join18(getCacheDir(), `daily-cache-${scopeKey}.json`);
 }
 function emptyCache(scopeKey) {
   return { version: DAILY_CACHE_VERSION, scopeKey, lastComputedDate: null, days: [] };
@@ -3849,9 +4199,9 @@ function isValidCache(parsed) {
 }
 async function loadDailyCache(scopeKey = DEFAULT_DAILY_CACHE_SCOPE) {
   const path = getCachePath3(scopeKey);
-  if (!existsSync3(path)) return emptyCache(scopeKey);
+  if (!existsSync4(path)) return emptyCache(scopeKey);
   try {
-    const raw = await readFile7(path, "utf-8");
+    const raw = await readFile8(path, "utf-8");
     const parsed = JSON.parse(raw);
     if (!isValidCache(parsed)) return emptyCache(scopeKey);
     if (parsed.scopeKey !== scopeKey) return emptyCache(scopeKey);
@@ -3862,12 +4212,12 @@ async function loadDailyCache(scopeKey = DEFAULT_DAILY_CACHE_SCOPE) {
 }
 async function saveDailyCache(cache) {
   const dir = getCacheDir();
-  if (!existsSync3(dir)) await mkdir7(dir, { recursive: true });
+  if (!existsSync4(dir)) await mkdir8(dir, { recursive: true });
   const scopeKey = cache.scopeKey || DEFAULT_DAILY_CACHE_SCOPE;
   const finalPath = getCachePath3(scopeKey);
-  const tempPath = `${finalPath}.${randomBytes5(8).toString("hex")}.tmp`;
+  const tempPath = `${finalPath}.${randomBytes6(8).toString("hex")}.tmp`;
   const payload = JSON.stringify({ ...cache, scopeKey });
-  const handle = await open5(tempPath, "w", 384);
+  const handle = await open6(tempPath, "w", 384);
   try {
     await handle.writeFile(payload, { encoding: "utf-8" });
     await handle.sync();
@@ -3875,10 +4225,10 @@ async function saveDailyCache(cache) {
     await handle.close();
   }
   try {
-    await rename6(tempPath, finalPath);
+    await rename7(tempPath, finalPath);
   } catch (err) {
     try {
-      await unlink3(tempPath);
+      await unlink4(tempPath);
     } catch {
     }
     throw err;
@@ -3917,9 +4267,9 @@ init_models();
 
 // src/optimize.ts
 import chalk2 from "chalk";
-import { readdir as readdir9, stat as stat11 } from "fs/promises";
-import { existsSync as existsSync4, statSync as statSync2 } from "fs";
-import { basename as basename8, join as join17 } from "path";
+import { readdir as readdir9, stat as stat12 } from "fs/promises";
+import { existsSync as existsSync5, statSync as statSync2 } from "fs";
+import { basename as basename9, join as join19 } from "path";
 import { homedir as homedir11 } from "os";
 var ORANGE = "#F59E0B";
 var DIM = "#666666";
@@ -4003,13 +4353,13 @@ var DEFAULT_TREND_PERIOD_MS = DEFAULT_TREND_PERIOD_DAYS * 24 * 60 * 60 * 1e3;
 var IMPROVING_THRESHOLD = 0.5;
 async function collectJsonlFiles2(dirPath) {
   const files = await readdir9(dirPath).catch(() => []);
-  const result = files.filter((f) => f.endsWith(".jsonl")).map((f) => join17(dirPath, f));
+  const result = files.filter((f) => f.endsWith(".jsonl")).map((f) => join19(dirPath, f));
   for (const entry of files) {
     if (entry.endsWith(".jsonl")) continue;
-    const subPath = join17(dirPath, entry, "subagents");
+    const subPath = join19(dirPath, entry, "subagents");
     const subFiles = await readdir9(subPath).catch(() => []);
     for (const sf of subFiles) {
-      if (sf.endsWith(".jsonl")) result.push(join17(subPath, sf));
+      if (sf.endsWith(".jsonl")) result.push(join19(subPath, sf));
     }
   }
   return result;
@@ -4017,7 +4367,7 @@ async function collectJsonlFiles2(dirPath) {
 async function isFileStaleForRange(filePath, range) {
   if (!range) return false;
   try {
-    const s = await stat11(filePath);
+    const s = await stat12(filePath);
     return s.mtimeMs < range.start.getTime();
   } catch {
     return false;
@@ -4028,7 +4378,8 @@ async function runWithConcurrency(items, limit, worker) {
   async function next() {
     while (idx < items.length) {
       const current = idx++;
-      await worker(items[current]);
+      const item = items[current];
+      if (item !== void 0) await worker(item);
     }
   }
   await Promise.all(Array.from({ length: Math.min(limit, items.length) }, () => next()));
@@ -4048,7 +4399,7 @@ async function scanJsonlFile(filePath, project, dateRange, recentCutoffMs = Date
   const cwds = [];
   const apiCalls = [];
   const userMessages = [];
-  const sessionId = basename8(filePath, ".jsonl");
+  const sessionId = basename9(filePath, ".jsonl");
   let lastVersion = "";
   for await (const line of readSessionLines(filePath)) {
     if (!line.trim()) continue;
@@ -4146,16 +4497,16 @@ function isReadTool(name) {
 function loadMcpConfigs(projectCwds) {
   const servers = /* @__PURE__ */ new Map();
   const configPaths = [
-    join17(homedir11(), ".claude", "settings.json"),
-    join17(homedir11(), ".claude", "settings.local.json")
+    join19(homedir11(), ".claude", "settings.json"),
+    join19(homedir11(), ".claude", "settings.local.json")
   ];
   for (const cwd of projectCwds) {
-    configPaths.push(join17(cwd, ".mcp.json"));
-    configPaths.push(join17(cwd, ".claude", "settings.json"));
-    configPaths.push(join17(cwd, ".claude", "settings.local.json"));
+    configPaths.push(join19(cwd, ".mcp.json"));
+    configPaths.push(join19(cwd, ".claude", "settings.json"));
+    configPaths.push(join19(cwd, ".claude", "settings.local.json"));
   }
   for (const p of configPaths) {
-    if (!existsSync4(p)) continue;
+    if (!existsSync5(p)) continue;
     const config = readJsonFile(p);
     if (!config) continue;
     let mtime = 0;
@@ -4238,7 +4589,7 @@ function detectDuplicateReads(calls, dateRange) {
       const extra = entry.count - 1;
       totalDuplicates += extra;
       if (entry.recent > 1) recentDuplicates += entry.recent - 1;
-      const name = basename8(file);
+      const name = basename9(file);
       fileDupes.set(name, (fileDupes.get(name) ?? 0) + extra);
     }
   }
@@ -4305,13 +4656,13 @@ function expandImports(filePath, seen, depth) {
   if (content === null) return { totalLines: 0, importedFiles: 0 };
   let totalLines = content.split("\n").length;
   let importedFiles = 0;
-  const dir = join17(filePath, "..");
+  const dir = join19(filePath, "..");
   IMPORT_PATTERN.lastIndex = 0;
   for (const match of content.matchAll(IMPORT_PATTERN)) {
     const rawPath = match[1];
     if (!rawPath) continue;
-    const resolved = rawPath.startsWith("/") ? rawPath : join17(dir, rawPath);
-    if (!existsSync4(resolved)) continue;
+    const resolved = rawPath.startsWith("/") ? rawPath : join19(dir, rawPath);
+    if (!existsSync5(resolved)) continue;
     const nested = expandImports(resolved, seen, depth + 1);
     totalLines += nested.totalLines;
     importedFiles += 1 + nested.importedFiles;
@@ -4322,8 +4673,8 @@ function detectBloatedClaudeMd(projectCwds) {
   const bloated = [];
   for (const cwd of projectCwds) {
     for (const name of ["CLAUDE.md", ".claude/CLAUDE.md"]) {
-      const fullPath = join17(cwd, name);
-      if (!existsSync4(fullPath)) continue;
+      const fullPath = join19(cwd, name);
+      if (!existsSync5(fullPath)) continue;
       const { totalLines, importedFiles } = expandImports(fullPath, /* @__PURE__ */ new Set(), 0);
       if (totalLines > CLAUDEMD_HEALTHY_LINES) {
         bloated.push({ path: `${shortHomePath(cwd)}/${name}`, expandedLines: totalLines, imports: importedFiles });
@@ -4342,7 +4693,7 @@ function detectBloatedClaudeMd(projectCwds) {
   return {
     title: `Your CLAUDE.md is too long`,
     explanation: `${list}. CLAUDE.md plus all @-imported files load into every API call. Trimming below ${CLAUDEMD_HEALTHY_LINES} lines saves ~${formatTokens(tokensSaved)} tokens per call.`,
-    impact: worst.expandedLines > CLAUDEMD_HIGH_THRESHOLD_LINES ? "high" : "medium",
+    impact: (worst?.expandedLines ?? 0) > CLAUDEMD_HIGH_THRESHOLD_LINES ? "high" : "medium",
     tokensSaved,
     fix: {
       type: "paste",
@@ -4412,7 +4763,7 @@ function detectCacheBloat(apiCalls, projects, dateRange) {
   const median2 = sorted[Math.floor(sorted.length / 2)];
   const baseline = computeBudgetAwareCacheBaseline(projects);
   const bloatThreshold = baseline * CACHE_BLOAT_MULTIPLIER;
-  if (median2 < bloatThreshold) return null;
+  if (median2 === void 0 || median2 < bloatThreshold) return null;
   const recentCalls = apiCalls.filter((c) => c.recent);
   const totalBloated = apiCalls.filter((c) => c.cacheCreationTokens > bloatThreshold).length;
   const recentBloated = recentCalls.filter((c) => c.cacheCreationTokens > bloatThreshold).length;
@@ -4431,15 +4782,15 @@ function detectCacheBloat(apiCalls, projects, dateRange) {
   const tokensSaved = excess * apiCalls.length;
   let versionNote = "";
   if (versionAvgs.length >= 2) {
-    const [high, ...rest] = versionAvgs;
-    const low = rest[rest.length - 1];
-    if (high.avg - low.avg > CACHE_VERSION_DIFF_THRESHOLD) {
+    const high = versionAvgs[0];
+    const low = versionAvgs[versionAvgs.length - 1];
+    if (high && low && high.avg - low.avg > CACHE_VERSION_DIFF_THRESHOLD) {
       versionNote = ` Version ${high.version} averages ${formatTokens(high.avg)} vs ${low.version} at ${formatTokens(low.avg)}.`;
     }
   }
   return {
     title: "Session warmup is unusually large",
-    explanation: `Median cache_creation per call is ${formatTokens(median2)} tokens, about ${formatTokens(excess)} above your baseline of ${formatTokens(baseline)}.${versionNote}`,
+    explanation: `Median cache_creation per call is ${formatTokens(median2 ?? 0)} tokens, about ${formatTokens(excess)} above your baseline of ${formatTokens(baseline)}.${versionNote}`,
     impact: excess > CACHE_EXCESS_HIGH_THRESHOLD ? "high" : "medium",
     tokensSaved,
     fix: {
@@ -4451,7 +4802,7 @@ function detectCacheBloat(apiCalls, projects, dateRange) {
   };
 }
 async function listMarkdownFiles(dir) {
-  if (!existsSync4(dir)) return [];
+  if (!existsSync5(dir)) return [];
   try {
     const entries = await readdir9(dir);
     return entries.filter((e) => e.endsWith(".md")).map((e) => e.replace(/\.md$/, ""));
@@ -4460,12 +4811,12 @@ async function listMarkdownFiles(dir) {
   }
 }
 async function listSkillDirs(dir) {
-  if (!existsSync4(dir)) return [];
+  if (!existsSync5(dir)) return [];
   try {
     const entries = await readdir9(dir);
     const names = [];
     for (const entry of entries) {
-      if (existsSync4(join17(dir, entry, "SKILL.md"))) names.push(entry);
+      if (existsSync5(join19(dir, entry, "SKILL.md"))) names.push(entry);
     }
     return names;
   } catch {
@@ -4473,7 +4824,7 @@ async function listSkillDirs(dir) {
   }
 }
 async function detectGhostAgents(calls) {
-  const defined = await listMarkdownFiles(join17(homedir11(), ".claude", "agents"));
+  const defined = await listMarkdownFiles(join19(homedir11(), ".claude", "agents"));
   if (defined.length === 0) return null;
   const invoked = /* @__PURE__ */ new Set();
   for (const call of calls) {
@@ -4498,7 +4849,7 @@ async function detectGhostAgents(calls) {
   };
 }
 async function detectGhostSkills(calls) {
-  const defined = await listSkillDirs(join17(homedir11(), ".claude", "skills"));
+  const defined = await listSkillDirs(join19(homedir11(), ".claude", "skills"));
   if (defined.length === 0) return null;
   const invoked = /* @__PURE__ */ new Set();
   for (const call of calls) {
@@ -4523,7 +4874,7 @@ async function detectGhostSkills(calls) {
   };
 }
 async function detectGhostCommands(userMessages) {
-  const defined = await listMarkdownFiles(join17(homedir11(), ".claude", "commands"));
+  const defined = await listMarkdownFiles(join19(homedir11(), ".claude", "commands"));
   if (defined.length === 0) return null;
   const invoked = /* @__PURE__ */ new Set();
   for (const msg of userMessages) {
@@ -4551,12 +4902,12 @@ async function detectGhostCommands(userMessages) {
 }
 function readShellProfileLimit() {
   for (const profile of SHELL_PROFILES) {
-    const path = join17(homedir11(), profile);
-    if (!existsSync4(path)) continue;
+    const path = join19(homedir11(), profile);
+    if (!existsSync5(path)) continue;
     const content = readSessionFileSync(path);
     if (content === null) continue;
     const match = content.match(/^\s*export\s+BASH_MAX_OUTPUT_LENGTH\s*=\s*['"]?(\d+)['"]?/m);
-    if (match) return parseInt(match[1], 10);
+    if (match?.[1]) return parseInt(match[1], 10);
   }
   return null;
 }
@@ -4749,7 +5100,8 @@ function renderOptimize(findings, costRate, periodLabel, periodCost, sessionCoun
   lines.push(chalk2.hex(GREEN)(`  Potential savings: ~${formatTokens(totalTokens)} tokens${costText}`));
   lines.push("");
   for (let i = 0; i < findings.length; i++) {
-    lines.push(...renderFinding(i + 1, findings[i], costRate));
+    const finding = findings[i];
+    if (finding) lines.push(...renderFinding(i + 1, finding, costRate));
   }
   lines.push(chalk2.hex(DIM)("  " + SEP.repeat(PANEL_WIDTH)));
   lines.push(chalk2.dim("  Estimates only."));
@@ -4772,8 +5124,8 @@ async function runOptimize(projects, periodLabel, dateRange, preScanned) {
 
 // src/context-budget.ts
 import { readdir as readdir10 } from "fs/promises";
-import { existsSync as existsSync5 } from "fs";
-import { join as join18 } from "path";
+import { existsSync as existsSync6 } from "fs";
+import { join as join20 } from "path";
 import { homedir as homedir12 } from "os";
 var CHARS_PER_TOKEN2 = 4;
 var SYSTEM_BASE_TOKENS = 10400;
@@ -4783,7 +5135,7 @@ function estimateTokens2(text) {
   return Math.ceil(text.length / CHARS_PER_TOKEN2);
 }
 async function readConfigFile(path) {
-  if (!existsSync5(path)) return null;
+  if (!existsSync6(path)) return null;
   const raw = await readSessionFile(path);
   if (raw === null) return null;
   try {
@@ -4795,13 +5147,13 @@ async function readConfigFile(path) {
 async function countMcpTools(projectPath) {
   const home = homedir12();
   const configPaths = [
-    join18(home, ".claude", "settings.json"),
-    join18(home, ".claude", "settings.local.json")
+    join20(home, ".claude", "settings.json"),
+    join20(home, ".claude", "settings.local.json")
   ];
   if (projectPath) {
-    configPaths.push(join18(projectPath, ".mcp.json"));
-    configPaths.push(join18(projectPath, ".claude", "settings.json"));
-    configPaths.push(join18(projectPath, ".claude", "settings.local.json"));
+    configPaths.push(join20(projectPath, ".mcp.json"));
+    configPaths.push(join20(projectPath, ".claude", "settings.json"));
+    configPaths.push(join20(projectPath, ".claude", "settings.local.json"));
   }
   const servers = /* @__PURE__ */ new Set();
   let toolCount = 0;
@@ -4818,16 +5170,16 @@ async function countMcpTools(projectPath) {
   return toolCount;
 }
 async function countSkills(projectPath) {
-  const dirs = [join18(homedir12(), ".claude", "skills")];
-  if (projectPath) dirs.push(join18(projectPath, ".claude", "skills"));
+  const dirs = [join20(homedir12(), ".claude", "skills")];
+  if (projectPath) dirs.push(join20(projectPath, ".claude", "skills"));
   let count = 0;
   for (const dir of dirs) {
-    if (!existsSync5(dir)) continue;
+    if (!existsSync6(dir)) continue;
     try {
       const entries = await readdir10(dir);
       for (const entry of entries) {
-        const skillFile = join18(dir, entry, "SKILL.md");
-        if (existsSync5(skillFile)) count++;
+        const skillFile = join20(dir, entry, "SKILL.md");
+        if (existsSync6(skillFile)) count++;
       }
     } catch {
       continue;
@@ -4839,15 +5191,15 @@ async function scanMemoryFiles(projectPath) {
   const home = homedir12();
   const files = [];
   const paths = [
-    { path: join18(home, ".claude", "CLAUDE.md"), name: "~/.claude/CLAUDE.md" }
+    { path: join20(home, ".claude", "CLAUDE.md"), name: "~/.claude/CLAUDE.md" }
   ];
   if (projectPath) {
-    paths.push({ path: join18(projectPath, "CLAUDE.md"), name: "CLAUDE.md" });
-    paths.push({ path: join18(projectPath, ".claude", "CLAUDE.md"), name: ".claude/CLAUDE.md" });
-    paths.push({ path: join18(projectPath, "CLAUDE.local.md"), name: "CLAUDE.local.md" });
+    paths.push({ path: join20(projectPath, "CLAUDE.md"), name: "CLAUDE.md" });
+    paths.push({ path: join20(projectPath, ".claude", "CLAUDE.md"), name: ".claude/CLAUDE.md" });
+    paths.push({ path: join20(projectPath, "CLAUDE.local.md"), name: "CLAUDE.local.md" });
   }
   for (const { path, name } of paths) {
-    if (!existsSync5(path)) continue;
+    if (!existsSync6(path)) continue;
     const content = await readSessionFile(path);
     if (content === null) continue;
     files.push({ name, tokens: estimateTokens2(content) });
@@ -4879,7 +5231,9 @@ async function discoverProjectCwd(sessionDir) {
     return null;
   }
   if (files.length === 0) return null;
-  const content = await readSessionFile(join18(sessionDir, files[0]));
+  const firstFile = files[0];
+  if (!firstFile) return null;
+  const content = await readSessionFile(join20(sessionDir, firstFile));
   if (content === null) return null;
   for (const line of content.split("\n")) {
     if (!line.trim()) continue;
@@ -4898,8 +5252,8 @@ import React, { useState, useEffect, useRef } from "react";
 import { render, Box, Text, useInput, useApp, useStdout } from "ink";
 
 // src/compare-stats.ts
-import { readdir as readdir11, readFile as readFile8 } from "fs/promises";
-import { join as join19 } from "path";
+import { readdir as readdir11, readFile as readFile9 } from "fs/promises";
+import { join as join21 } from "path";
 var PLANNING_TOOLS = /* @__PURE__ */ new Set(["TaskCreate", "TaskUpdate", "TodoWrite", "EnterPlanMode", "ExitPlanMode"]);
 function aggregateModelStats(projects) {
   const byModel = /* @__PURE__ */ new Map();
@@ -5126,12 +5480,12 @@ async function collectJsonlFiles3(sessionDir) {
   const files = [];
   for (const entry of entries) {
     if (entry.isFile() && entry.name.endsWith(".jsonl") && !isCompactFile(entry.name)) {
-      files.push(join19(sessionDir, entry.name));
+      files.push(join21(sessionDir, entry.name));
     } else if (entry.isDirectory() && entry.name === "subagents") {
-      const subEntries = await readdir11(join19(sessionDir, entry.name), { withFileTypes: true });
+      const subEntries = await readdir11(join21(sessionDir, entry.name), { withFileTypes: true });
       for (const sub of subEntries) {
         if (sub.isFile() && sub.name.endsWith(".jsonl") && !isCompactFile(sub.name)) {
-          files.push(join19(sessionDir, entry.name, sub.name));
+          files.push(join21(sessionDir, entry.name, sub.name));
         }
       }
     }
@@ -5151,10 +5505,10 @@ async function scanSelfCorrections(projectDirs) {
     const allFiles = [];
     for (const entry of entries) {
       if (entry.isFile() && entry.name.endsWith(".jsonl") && !isCompactFile(entry.name)) {
-        allFiles.push(join19(dir, entry.name));
+        allFiles.push(join21(dir, entry.name));
       } else if (entry.isDirectory()) {
         try {
-          const sessionFiles = await collectJsonlFiles3(join19(dir, entry.name));
+          const sessionFiles = await collectJsonlFiles3(join21(dir, entry.name));
           allFiles.push(...sessionFiles);
         } catch {
           continue;
@@ -5164,7 +5518,7 @@ async function scanSelfCorrections(projectDirs) {
     for (const file of allFiles) {
       let raw;
       try {
-        raw = await readFile8(file, "utf8");
+        raw = await readFile9(file, "utf8");
       } catch {
         continue;
       }
@@ -5647,9 +6001,9 @@ function median(values) {
   const sorted = [...values].sort((a, b) => a - b);
   const mid = Math.floor(sorted.length / 2);
   if (sorted.length % 2 === 0) {
-    return (sorted[mid - 1] + sorted[mid]) / 2;
+    return ((sorted[mid - 1] ?? 0) + (sorted[mid] ?? 0)) / 2;
   }
-  return sorted[mid];
+  return sorted[mid] ?? 0;
 }
 function toLocalDateKey(d) {
   const year = d.getFullYear();
@@ -5779,7 +6133,7 @@ function planDisplayName(id) {
 }
 
 // src/dashboard.tsx
-import { join as join20 } from "path";
+import { join as join22 } from "path";
 import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 var PERIODS = ["today", "week", "30days", "month", "all"];
 var PERIOD_LABELS = {
@@ -6227,7 +6581,7 @@ function TopSessions({ projects, pw, bw }) {
   if (top.length === 0) {
     return /* @__PURE__ */ jsx2(Panel, { title: "Top Sessions", color: PANEL_COLORS.sessions, width: pw, children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "No sessions" }) });
   }
-  const maxCost = top[0].totalCostUSD;
+  const maxCost = top[0]?.totalCostUSD ?? 0;
   const nw = Math.max(8, pw - bw - TOP_SESSIONS_COST_COL - TOP_SESSIONS_CALLS_COL - 1 - PANEL_CHROME);
   return /* @__PURE__ */ jsxs2(Panel, { title: "Top Sessions", color: PANEL_COLORS.sessions, width: pw, children: [
     /* @__PURE__ */ jsxs2(Text2, { dimColor: true, wrap: "truncate-end", children: [
@@ -6552,11 +6906,11 @@ function InteractiveDashboard({ initialPeriod, initialProvider, refreshSeconds,
   useEffect2(() => {
     let cancelled = false;
     async function loadBudgets() {
-      const claudeDir = join20(homedir13(), ".claude", "projects");
+      const claudeDir = join22(homedir13(), ".claude", "projects");
       const budgets = /* @__PURE__ */ new Map();
       for (const project of projects.slice(0, 8)) {
         if (cancelled) return;
-        const cwd = await discoverProjectCwd(join20(claudeDir, project.project));
+        const cwd = await discoverProjectCwd(join22(claudeDir, project.project));
         if (!cwd) continue;
         budgets.set(project.project, await estimateContextBudget(cwd));
       }
@@ -6648,7 +7002,7 @@ function InteractiveDashboard({ initialPeriod, initialProvider, refreshSeconds,
     }
     if (input === "p" && multipleProviders && view !== "compare") {
       const opts = ["all", ...detectedProviders];
-      const next = opts[(opts.indexOf(activeProvider) + 1) % opts.length];
+      const next = opts[(opts.indexOf(activeProvider) + 1) % opts.length] ?? "all";
       setActiveProvider(next);
       setView("dashboard");
       if (debounceRef.current) clearTimeout(debounceRef.current);
@@ -6656,8 +7010,8 @@ function InteractiveDashboard({ initialPeriod, initialProvider, refreshSeconds,
       return;
     }
     const idx = PERIODS.indexOf(period);
-    if (key.leftArrow) switchPeriod(PERIODS[(idx - 1 + PERIODS.length) % PERIODS.length]);
-    else if (key.rightArrow || key.tab) switchPeriod(PERIODS[(idx + 1) % PERIODS.length]);
+    if (key.leftArrow) switchPeriod(PERIODS[(idx - 1 + PERIODS.length) % PERIODS.length] ?? "today");
+    else if (key.rightArrow || key.tab) switchPeriod(PERIODS[(idx + 1) % PERIODS.length] ?? "today");
     else if (input === "1") switchPeriodImmediate("today");
     else if (input === "2") switchPeriodImmediate("week");
     else if (input === "3") switchPeriodImmediate("30days");
@@ -6808,6 +7162,7 @@ function computeProgressiveBackfillStart({
 }
 
 // src/cli.ts
+import { createInterface as createInterface2 } from "readline";
 import { createRequire as createRequire2 } from "module";
 var require2 = createRequire2(import.meta.url);
 var { version } = require2("../package.json");
@@ -7103,10 +7458,10 @@ program.command("status").description("Compact status output (today + week + mon
       const hadYesterday = c.days.some((d) => d.date >= yesterdayStr);
       if (hadYesterday) {
         const freshDays = c.days.filter((d) => d.date < yesterdayStr);
-        const latestFresh = freshDays.length > 0 ? freshDays[freshDays.length - 1].date : null;
+        const latestFresh = freshDays.length > 0 ? freshDays[freshDays.length - 1]?.date ?? null : null;
         c = { ...c, days: freshDays, lastComputedDate: latestFresh };
       }
-      const oldestCachedDate = c.days.length > 0 ? c.days[0].date : null;
+      const oldestCachedDate = c.days.length > 0 ? c.days[0]?.date ?? null : null;
       const effectiveGapStart = computeProgressiveBackfillStart({
         lastComputedDate: c.lastComputedDate,
         oldestCachedDate,
@@ -7124,7 +7479,7 @@ program.command("status").description("Compact status output (today + week + mon
         c = addNewDays(c, gapDays, yesterdayStr, coveredThrough ? { coveredThrough } : void 0);
         await saveDailyCache(c);
       }
-      const updatedOldest = c.days.length > 0 ? c.days[0].date : null;
+      const updatedOldest = c.days.length > 0 ? c.days[0]?.date ?? null : null;
       const neededStart = new Date(todayStart.getTime() - (selectedPeriodHistoryDays - 1) * MS_PER_DAY4);
       const fullBackfillStart = new Date(todayStart.getTime() - BACKFILL_DAYS * MS_PER_DAY4);
       const clampedNeeded = neededStart < fullBackfillStart ? fullBackfillStart : neededStart;
@@ -7267,15 +7622,15 @@ program.command("status").description("Compact status output (today + week + mon
         optimize = await scanAndDetect(todayProjects, scanRange);
       }
     }
-    const exeOsDir = join21(homedir14(), ".exe-os");
-    const exeOsDetected = existsSync6(exeOsDir);
+    const exeOsDir = join23(homedir14(), ".exe-os");
+    const exeOsDetected = existsSync7(exeOsDir);
     let agentStats = null;
     let statsFileAge = null;
     try {
-      const statsPath = join21(exeOsDir, "agent-stats.json");
-      if (existsSync6(statsPath)) {
+      const statsPath = join23(exeOsDir, "agent-stats.json");
+      if (existsSync7(statsPath)) {
         statsFileAge = Math.round((Date.now() - statSync3(statsPath).mtimeMs) / 1e3);
-        const parsed = JSON.parse(readFileSync2(statsPath, "utf-8"));
+        const parsed = JSON.parse(readFileSync3(statsPath, "utf-8"));
         if (parsed && Array.isArray(parsed.agents) && typeof parsed.generated === "string") {
           agentStats = parsed;
         } else {
@@ -7308,6 +7663,7 @@ program.command("status").description("Compact status output (today + week + mon
       const todayOnlyDays = todayDays.filter((d) => d.date > yesterdayStr);
       projectSpend = buildProjectSpendFromDays(selectedPeriodDays, todayOnlyDays, [], []);
     }
+    warnings.push(...getDiscoveryWarnings(), ...getPricingWarnings(), ...getParseWarnings());
     const diagnostics = { daysCount, parseTimeMs, warnings };
     const payload = buildMenubarPayload(currentData, providers, optimize, dailyHistory, agentStats, projectSpend, exeOsDetected, statsFileAge, diagnostics);
     const json = JSON.stringify(payload);
@@ -7380,9 +7736,9 @@ program.command("export").description("Export usage data to CSV or JSON (include
   Exported (Today + 7 Days + 30 Days) to: ${savedPath}
 `);
 });
-program.command("menubar").description("Install and launch the macOS menubar app (one command, no clone)").option("--force", "Reinstall even if an older copy is already in ~/Applications").action(async (opts) => {
+program.command("menubar").description("Install and launch the macOS menubar app (one command, no clone)").option("--force", "Reinstall even if an older copy is already in ~/Applications").option("--version <semver>", "Install a specific release version (e.g. v0.2.38) instead of latest").action(async (opts) => {
   try {
-    const result = await installMenubarApp({ force: opts.force });
+    const result = await installMenubarApp({ force: opts.force, version: opts.version });
     console.log(`
   Ready. ${result.installedPath}
 `);
@@ -7619,12 +7975,12 @@ program.command("compare").description("Compare two AI models side-by-side").opt
   await renderCompare(range, opts.provider);
 });
 program.command("agent-status").description("Diagnose exe-os agent data pipeline").action(() => {
-  const exeOsDir = join21(homedir14(), ".exe-os");
-  const statsPath = join21(exeOsDir, "agent-stats.json");
-  const pidPath = join21(exeOsDir, "exed.pid");
-  const dirExists = existsSync6(exeOsDir);
-  const statsExists = dirExists && existsSync6(statsPath);
-  const pidExists = dirExists && existsSync6(pidPath);
+  const exeOsDir = join23(homedir14(), ".exe-os");
+  const statsPath = join23(exeOsDir, "agent-stats.json");
+  const pidPath = join23(exeOsDir, "exed.pid");
+  const dirExists = existsSync7(exeOsDir);
+  const statsExists = dirExists && existsSync7(statsPath);
+  const pidExists = dirExists && existsSync7(pidPath);
   const lines = [];
   lines.push(`exe-os directory:  ${dirExists ? "\u2713 found" : "\u2717 not found"} (${exeOsDir})`);
   lines.push(`daemon pid file:   ${pidExists ? "\u2713 found" : "\u2717 not found"}`);
@@ -7633,7 +7989,7 @@ program.command("agent-status").description("Diagnose exe-os agent data pipeline
   } else {
     try {
       const ageSeconds = Math.round((Date.now() - statSync3(statsPath).mtimeMs) / 1e3);
-      const raw = readFileSync2(statsPath, "utf-8");
+      const raw = readFileSync3(statsPath, "utf-8");
       const parsed = JSON.parse(raw);
       if (parsed && Array.isArray(parsed.agents) && typeof parsed.generated === "string") {
         const agentCount = parsed.agents.length;
@@ -7653,15 +8009,28 @@ program.command("agent-status").description("Diagnose exe-os agent data pipeline
   console.log(lines.join("\n"));
 });
 if (process.argv.length <= 2 && process.platform === "darwin") {
-  installMenubarApp().then((result) => {
-    console.log(`
-  Installed: ${result.installedPath}`);
-    if (result.launched) console.log("  Launched.");
-  }).catch((err) => {
-    console.error(`
+  const isTTY = process.stdin.isTTY && process.stdout.isTTY;
+  if (!isTTY) {
+    program.outputHelp();
+  } else {
+    const rl = createInterface2({ input: process.stdin, output: process.stdout });
+    rl.question("\n  No subcommand given. Install the macOS menubar app? (y/N) ", (answer) => {
+      rl.close();
+      if (answer.trim().toLowerCase() === "y") {
+        installMenubarApp().then((result) => {
+          console.log(`
+  Ready. ${result.installedPath}
+`);
+        }).catch((err) => {
+          console.error(`
   ${err instanceof Error ? err.message : String(err)}`);
-    process.exitCode = 1;
-  });
+          process.exitCode = 1;
+        });
+      } else {
+        program.outputHelp();
+      }
+    });
+  }
 } else {
   program.parse();
 }