claude-discover 1.10.5 → 1.10.6

package/bin/claude/statusline.mjs

@@ -10,7 +10,7 @@ import { styleText } from 'node:util'
 // Formatting
 const THRESHOLDS = { // (white, yellow, red)
   context: [0, 100_000, 250_000],
-  limit:   [0, 60, 90],
+  limit:   [0, 60, 90], // keep in sync with src/renderer/utils/thresholds.js
   cache:   [90, 60, 0],
   tokens:  [0, 250_000, 1_000_000],
   session: [0, 3_000_000, 8_000_000],

package/out/main/main.js

@@ -1,4 +1,4 @@
-import { app, dialog, BrowserWindow, shell, nativeTheme, Menu, ipcMain } from "electron";
+import { app, shell, dialog, BrowserWindow, nativeTheme, Menu, ipcMain } from "electron";
 import { EventEmitter } from "node:events";
 import os, { homedir } from "node:os";
 import path, { join, dirname, basename } from "node:path";
@@ -6,12 +6,12 @@ import fs from "node:fs";
 import { sync } from "write-file-atomic";
 import fsp from "node:fs/promises";
 import crypto from "node:crypto";
+import { pathToFileURL, fileURLToPath } from "node:url";
 import which from "which";
 import { execFile, spawn } from "node:child_process";
 import { promisify } from "node:util";
 import latestVersion from "latest-version";
 import semver from "semver";
-import { pathToFileURL, fileURLToPath } from "node:url";
 import windowStateKeeper from "electron-window-state";
 import contextMenu from "electron-context-menu";
 import { FindOverlay } from "electron-find-overlay";
@@ -680,21 +680,16 @@ function extractText(content) {
   if (!Array.isArray(content)) return "";
   return content.map((b) => typeof b === "string" ? b : b?.type === "text" ? b.text : "").filter(Boolean).join("\n");
 }
-function shortProject(dir, depth = 2) {
+function shortProject(dir, depth) {
   if (!dir) return "(no project)";
   const parts = dir.replace(/\\/g, "/").split("/").filter(Boolean);
   return parts.slice(-depth).join("/") || dir;
 }
-const TEMP_ROOT = /^(.*?\/AppData\/Local\/Temp|\/(?:private\/)?(?:tmp|var\/folders\/[^/]+\/[^/]+\/T))\/(.+)/i;
-function tempProject(dir) {
-  const m = dir?.replace(/\\/g, "/").match(TEMP_ROOT);
-  return m ? { project: dir.slice(0, m[1].length), tag: m[2] } : null;
-}
-function suffixLabels(dirs, depth = 2) {
-  const labels = new Map([...new Set(dirs)].map((dir) => [dir, shortProject(dir, depth)]));
+function suffixLabels(dirs) {
+  const labels = new Map([...new Set(dirs)].map((dir) => [dir, shortProject(dir, 1)]));
   const counts = /* @__PURE__ */ new Map();
   for (const label of labels.values()) counts.set(label, (counts.get(label) ?? 0) + 1);
-  for (const [dir, label] of labels) if (counts.get(label) > 1) labels.set(dir, shortProject(dir, depth + 1));
+  for (const [dir, label] of labels) if (counts.get(label) > 1) labels.set(dir, shortProject(dir, 2));
   return labels;
 }
 function classifySource(meta) {
@@ -715,10 +710,6 @@ function freshMeta({ sessionId, parentSessionId, filePath, parentFilePath, fileS
     continuesTo: null,
     entrypoint: null,
     project: null,
-    worktree: null,
-    worktreePath: null,
-    tempPath: null,
-    tempTag: null,
     gitBranch: null,
     version: null,
     model: null,
@@ -937,19 +928,6 @@ class SessionParser {
     if (meta.startedAt == null) meta.startedAt = mtimeFallback;
     if (meta.lastActivityAt == null) meta.lastActivityAt = mtimeFallback;
     meta.source = classifySource(meta);
-    const wt = meta.project && meta.project.replace(/\\/g, "/").match(/\/\.claude\/worktrees\/([^/]+)/);
-    if (wt) {
-      meta.worktree = wt[1];
-      meta.worktreePath = meta.project.slice(0, wt.index + wt[0].length);
-      meta.project = meta.project.slice(0, wt.index);
-    }
-    const tmp = tempProject(meta.project);
-    if (tmp) {
-      meta.tempPath = meta.project;
-      meta.tempTag = tmp.tag;
-      meta.project = tmp.project;
-    }
-    meta.projectShort = shortProject(meta.project);
     meta.activeMs = meta.activityPeriods.reduce((sum, p) => sum + Math.max(0, p.end - p.start), 0);
     const t = meta.tokens;
     meta.totalTokens = t.input + t.output + t.cacheRead + t.cacheCreation;
@@ -1235,6 +1213,52 @@ class MetaCache {
     return this.periodMetas.delete(filePath);
   }
 }
+const WORKTREE = /\/\.claude\/worktrees\/([^/]+)/;
+const TEMP_ROOT = /^(.*?\/AppData\/Local\/Temp|\/(?:private\/)?(?:tmp|var\/folders\/[^/]+\/[^/]+\/T))\/(.+)/i;
+const WINDOWS = process.platform === "win32";
+const LOCAL_DIR = WINDOWS ? /^[a-z]:[\\/]/i : /^\//;
+class ProjectResolver {
+  #repoRoots = /* @__PURE__ */ new Map();
+  // `subdir` is where in the project the session ran: a repo or worktree subfolder, or a temp run dir
+  async resolve(cwd) {
+    const out = { project: cwd, subdir: null, worktree: null, worktreePath: null, tempPath: null };
+    const wt = cwd?.replace(/\\/g, "/").match(WORKTREE);
+    if (wt) {
+      out.worktree = wt[1];
+      out.worktreePath = cwd.slice(0, wt.index + wt[0].length);
+      out.subdir = cwd.slice(out.worktreePath.length + 1).replace(/\\/g, "/") || null;
+      out.project = cwd.slice(0, wt.index);
+    }
+    const tmp = out.project?.replace(/\\/g, "/").match(TEMP_ROOT);
+    if (tmp) {
+      out.tempPath = out.project;
+      out.subdir = tmp[2];
+      out.project = out.project.slice(0, tmp[1].length);
+      return out;
+    }
+    const root = await this.repoRoot(out.project);
+    if (root && root !== out.project) {
+      out.subdir = [path.relative(root, out.project).replaceAll("\\", "/"), out.subdir].filter(Boolean).join("/");
+      out.project = root;
+    }
+    return out;
+  }
+  // The nearest ancestor (or dir itself) holding a .git — a dir, or a file in worktrees/submodules — else null
+  repoRoot(dir) {
+    if (!LOCAL_DIR.test(dir ?? "")) return Promise.resolve(null);
+    if (!this.#repoRoots.has(dir)) this.#repoRoots.set(dir, this.#findRepoRoot(dir));
+    return this.#repoRoots.get(dir);
+  }
+  async #findRepoRoot(dir) {
+    const home = os.homedir();
+    const isHome = WINDOWS ? (d) => d.toLowerCase() === home.toLowerCase() : (d) => d === home;
+    for (let d = dir; ; d = path.dirname(d)) {
+      if (isHome(d)) return null;
+      if (await fsp.stat(path.join(d, ".git")).catch(() => null)) return d;
+      if (path.dirname(d) === d) return null;
+    }
+  }
+}
 const seed = {
   "claude-opus-5": { "input": 5, "output": 25, "cacheRead": 0.5, "cacheWrite": 6.25, "cacheWrite1h": 10, "fastModeMplr": 2 },
   "claude-fable-5-1": { "input": 10, "output": 50, "cacheRead": 0.25, "cacheWrite": 12.5, "cacheWrite1h": 20 },
@@ -1381,6 +1405,7 @@ class SessionsService extends EventEmitter {
     this.pricing = new Pricing();
     this.throttleMs = throttleMs;
     this.metaCache = new MetaCache();
+    this.projects = new ProjectResolver();
     this.activeDay = null;
     this.scanAbort = null;
     this.updateTimer = null;
@@ -1453,7 +1478,10 @@ class SessionsService extends EventEmitter {
   start() {
     this.pricing.on("update", () => this._reprice());
     this.scanner.watch({
-      onChange: (p, stat) => this._refresh(p, stat),
+      onChange: (p, stat) => {
+        this.emit("activity");
+        this._refresh(p, stat);
+      },
       onUnlink: (p) => this._evict(p)
     });
     return this;
@@ -1484,7 +1512,8 @@ class SessionsService extends EventEmitter {
       pricing: this.pricing
     });
     await reader.stream((obj) => parser.feed(obj));
-    return parser.finalize(stat.mtimeMs);
+    const meta = parser.finalize(stat.mtimeMs);
+    return Object.assign(meta, await this.projects.resolve(meta.project));
   }
   // Resume/fork copies prior message.ids verbatim. Walk earliest-first; if a
   // session's ids overlap one already counted, rescan it with the overlap
@@ -1506,7 +1535,7 @@ class SessionsService extends EventEmitter {
       return stripInternal(rescanned ? { ...m, ...rescanned } : m);
     }));
     const labels = suffixLabels(sessions.map((m) => m.project));
-    for (const m of sessions) m.projectShort = labels.get(m.project);
+    for (const m of sessions) m.projectShort = m.tempPath ? "Temp" : labels.get(m.project);
     return sessions;
   }
   _dedupedDay(day) {
@@ -1571,6 +1600,53 @@ class WorkHours {
     return data;
   }
 }
+const VIEWABLE_EXT = /* @__PURE__ */ new Set([".md", ".txt", ".json", ".jsonl", ".log", ".csv", ".png", ".jpg", ".jpeg", ".gif", ".svg", ".webp", ".pdf"]);
+async function openLinkSafely(href, baseFile) {
+  if (/^(https?:|mailto:)/i.test(href)) return shell.openExternal(href);
+  if (!baseFile) return;
+  let decoded;
+  try {
+    decoded = decodeURIComponent(href);
+  } catch {
+    return;
+  }
+  const baseDir = path.dirname(path.resolve(baseFile));
+  const abs = path.resolve(baseDir, decoded);
+  const rel = path.relative(baseDir, abs);
+  if (rel.startsWith("..") || path.isAbsolute(rel)) return;
+  if (!VIEWABLE_EXT.has(path.extname(abs).toLowerCase())) return shell.showItemInFolder(abs);
+  const err = await shell.openPath(abs);
+  if (err) shell.showItemInFolder(abs);
+  return err;
+}
+const DEV_ORIGIN = process.env.ELECTRON_RENDERER_URL && new URL(process.env.ELECTRON_RENDERER_URL).origin;
+const APP_PAGES = pathToFileURL(path.join(import.meta.dirname, "../renderer/")).href;
+function lockNavigation(contents) {
+  const toBrowser = (url) => /^(https?|mailto):/i.test(url) && shell.openExternal(url);
+  const block = (e, url) => {
+    const { href, origin } = new URL(url);
+    if (href.startsWith(APP_PAGES) || origin === DEV_ORIGIN) return;
+    e.preventDefault();
+    toBrowser(url);
+  };
+  contents.setWindowOpenHandler(({ url }) => {
+    toBrowser(url);
+    return { action: "deny" };
+  });
+  contents.on("will-navigate", block);
+  contents.on("will-redirect", block);
+}
+async function withTimeout(promise, ms, cleanup) {
+  const { promise: timeout, reject } = Promise.withResolvers();
+  const timer = setTimeout(reject, ms, new Error(`timed out after ${ms / 1e3}s`));
+  try {
+    return await Promise.race([promise, timeout]);
+  } finally {
+    clearTimeout(timer);
+    cleanup?.();
+  }
+}
+const USAGE_TIMEOUT = 3e4;
 class AgentRunner {
   async run(text, sender) {
     const { query } = await import("@anthropic-ai/claude-agent-sdk");
@@ -1597,6 +1673,14 @@ class AgentRunner {
     }
     return { code: 0 };
   }
+  // The structured /usage data, from a session that's closed whether it answers, fails or hangs
+  async usage() {
+    const { query } = await import("@anthropic-ai/claude-agent-sdk");
+    const q = query({ prompt: (async function* () {
+    })(), options: { tools: [], settingSources: [] } });
+    const usage = q.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET({ skipBehaviors: true });
+    return withTimeout(usage, USAGE_TIMEOUT, () => q.close());
+  }
 }
 const mtimeOf = (path2) => fs.statSync(path2, { throwIfNoEntry: false })?.mtimeMs;
 class ClaudeSettings {
@@ -2000,41 +2084,65 @@ class AutoUpdate {
     return semver.gt(latest, current) ? { current, latest } : null;
   }
 }
-const VIEWABLE_EXT = /* @__PURE__ */ new Set([".md", ".txt", ".json", ".jsonl", ".log", ".csv", ".png", ".jpg", ".jpeg", ".gif", ".svg", ".webp", ".pdf"]);
-async function openLinkSafely(href, baseFile) {
-  if (/^(https?:|mailto:)/i.test(href)) return shell.openExternal(href);
-  if (!baseFile) return;
-  let decoded;
-  try {
-    decoded = decodeURIComponent(href);
-  } catch {
-    return;
+const EVERY = 6e4;
+const toWindow = (w) => w?.utilization == null ? null : {
+  utilization: w.utilization,
+  // 0..100
+  resetsAt: w.resets_at ? Math.round(Date.parse(w.resets_at) / 6e4) * 6e4 : null
+  // the server sends 16:29:59.72 for 16:30
+};
+const toExtra = (e) => e && {
+  on: e.is_enabled,
+  reason: !e.is_enabled && !e.user_disabled ? e.disabled_reason : null,
+  // e.g. 'out_of_credits'
+  used: e.used_credits,
+  limit: e.monthly_limit,
+  currency: e.currency,
+  decimals: e.decimal_places ?? 2
+};
+class RateLimits {
+  #agentRunner;
+  #limits = null;
+  // the latest fetch's promise, shared by concurrent callers
+  #fetchedAt = 0;
+  #active = false;
+  // a transcript changed since the last fetch
+  constructor(agentRunner) {
+    this.#agentRunner = agentRunner;
+  }
+  // A transcript changed
+  markActive() {
+    this.#active = true;
+  }
+  // Refetched once over a minute old; with `ifActive`, only if Claude Code wrote a transcript since
+  get({ ifActive = false } = {}) {
+    if (Date.now() - this.#fetchedAt >= EVERY && (this.#active || !ifActive)) {
+      this.#fetchedAt = Date.now();
+      this.#active = false;
+      this.#limits = this.#fetch();
+    }
+    return this.#limits;
+  }
+  async #fetch() {
+    try {
+      const { subscription_type: plan, rate_limits: rl } = await this.#agentRunner.usage();
+      return rl && {
+        at: Date.now(),
+        plan,
+        // 'pro' | 'max' | 'team' | 'enterprise'
+        fiveHour: toWindow(rl.five_hour),
+        sevenDay: toWindow(rl.seven_day),
+        models: (rl.model_scoped ?? []).filter((m) => m.utilization != null).map((m) => ({ name: m.display_name, ...toWindow(m) })),
+        // per-model weekly caps
+        sources: (rl.seven_day_breakdown?.rows ?? []).filter((r) => r.percent > 0).map((r) => ({ name: r.display_name, pct: r.percent })),
+        // undocumented: Claude Code / Chats / Cowork shares of the week
+        extra: toExtra(rl.extra_usage)
+      };
+    } catch (err) {
+      console.warn("[rate-limits]", err.message);
+      return null;
+    }
   }
-  const baseDir = path.dirname(path.resolve(baseFile));
-  const abs = path.resolve(baseDir, decoded);
-  const rel = path.relative(baseDir, abs);
-  if (rel.startsWith("..") || path.isAbsolute(rel)) return;
-  if (!VIEWABLE_EXT.has(path.extname(abs).toLowerCase())) return shell.showItemInFolder(abs);
-  const err = await shell.openPath(abs);
-  if (err) shell.showItemInFolder(abs);
-  return err;
-}
-const DEV_ORIGIN = process.env.ELECTRON_RENDERER_URL && new URL(process.env.ELECTRON_RENDERER_URL).origin;
-const APP_PAGES = pathToFileURL(path.join(import.meta.dirname, "../renderer/")).href;
-function lockNavigation(contents) {
-  const toBrowser = (url) => /^(https?|mailto):/i.test(url) && shell.openExternal(url);
-  const block = (e, url) => {
-    const { href, origin } = new URL(url);
-    if (href.startsWith(APP_PAGES) || origin === DEV_ORIGIN) return;
-    e.preventDefault();
-    toBrowser(url);
-  };
-  contents.setWindowOpenHandler(({ url }) => {
-    toBrowser(url);
-    return { action: "deny" };
-  });
-  contents.on("will-navigate", block);
-  contents.on("will-redirect", block);
 }
 const __dirname$1 = path.dirname(fileURLToPath(import.meta.url));
 const DEV_URL = process.env.ELECTRON_RENDERER_URL;
@@ -2072,6 +2180,7 @@ class MainWindow {
     this.findBar = new FindOverlay(this.win);
     this.findBar.on("show", () => this.send("find:active", true));
     this.findBar.on("hide", () => this.send("find:active", false));
+    this.win.on("closed", () => this.findBar = null);
     return this.win;
   }
   send(channel, payload) {
@@ -2092,13 +2201,15 @@ class Application {
     this.workHours = new WorkHours();
     this.sessionsService = new SessionsService();
     this.autoUpdate = new AutoUpdate();
+    this.rateLimits = new RateLimits(this.agentRunner);
     this.switchers = new Switchers({ restart: () => this.restart() });
   }
   start() {
-    const { deepLink, win, agentRunner, workHours, sessionsService, autoUpdate, switchers } = this;
+    const { deepLink, win, agentRunner, workHours, sessionsService, autoUpdate, rateLimits, switchers } = this;
     Menu.setApplicationMenu(this.#buildMenu());
     sessionsService.on("update", (update) => win.send("sessions:update", update));
     sessionsService.on("progress", (p) => win.send("sessions:scan-progress", p));
+    sessionsService.on("activity", () => rateLimits.markActive());
     deepLink?.on("open", (target) => {
       win.focus();
       win.send("deeplink:open-session", target);
@@ -2114,6 +2225,7 @@ class Application {
     ipcMain.handle("work-hours:set", (_e, data) => workHours.write(data));
     ipcMain.handle("auto-update:check", () => autoUpdate.check());
     ipcMain.handle("auto-update:install", () => autoUpdate.install());
+    ipcMain.handle("rate-limits:get", (_e, opts) => rateLimits.get(opts));
     ipcMain.handle("agent:run", (e, text) => agentRunner.run(text, e.sender));
     ipcMain.handle("shell:open-link", (_e, href, baseFile) => openLinkSafely(href, baseFile));
     ipcMain.handle("deeplink:take-pending", () => deepLink?.takePending() ?? null);
@@ -2170,6 +2282,8 @@ class Application {
           { role: "paste" },
           { role: "selectAll" },
           { label: "Find…", accelerator: "CmdOrCtrl+F", click: () => win.findBar?.show() },
+          { label: "Find Next", accelerator: "CmdOrCtrl+G", click: () => win.findBar?.next() },
+          { label: "Find Previous", accelerator: "CmdOrCtrl+Shift+G", click: () => win.findBar?.prev() },
           { label: "Deselect", accelerator: "Escape", click: (_i, w) => win.findBar?.visible ? win.findBar.hide() : w?.webContents.unselect() }
         ]
       },

package/out/preload/preload.cjs

@@ -24,6 +24,7 @@ electron.contextBridge.exposeInMainWorld("api", {
   onAgentOutput: subscribe("agent:output"),
   checkUpdate: () => electron.ipcRenderer.invoke("auto-update:check"),
   installUpdate: () => electron.ipcRenderer.invoke("auto-update:install"),
+  getRateLimits: (opts) => electron.ipcRenderer.invoke("rate-limits:get", opts),
   openLink: (href, baseFile) => electron.ipcRenderer.invoke("shell:open-link", href, baseFile),
   onFindActive: subscribe("find:active"),
   findClose: () => electron.ipcRenderer.send("find:close"),