claude-rpc 0.17.2 → 0.19.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-rpc",
-  "version": "0.17.2",
+  "version": "0.19.1",
   "description": "Discord Rich Presence for Claude Code — live model, project, tokens, and lifetime stats driven by Claude Code's hook system.",
   "type": "module",
   "license": "MIT",

package/src/badge.js

@@ -3,6 +3,7 @@
 
 import { dayKey } from './scanner.js';
 import { fmtCost } from './pricing.js';
+import { fmtNum, fmtHours as fmtHoursLabel } from './fmt.js';
 
 const COLORS = {
   hours:  { left: '#555', right: '#4c1' },     // green
@@ -58,22 +59,6 @@ function rangeLabel(range) {
 
 export { rangeToDays, rangeLabel, pickWindow };
 
-function fmtHoursLabel(ms) {
-  if (!ms) return '0h';
-  const h = ms / 3_600_000;
-  if (h < 1) return `${Math.round(h * 60)}m`;
-  if (h < 10) return `${h.toFixed(1)}h`;
-  return `${Math.round(h)}h`;
-}
-
-function fmtNum(n) {
-  if (!n) return '0';
-  if (n < 1000) return String(n);
-  if (n < 1_000_000) return `${(n / 1000).toFixed(1)}k`;
-  if (n < 1_000_000_000) return `${(n / 1_000_000).toFixed(2)}M`;
-  return `${(n / 1_000_000_000).toFixed(2)}B`;
-}
-
 // Compute label/value pair for the requested metric.
 function valueFor(aggregate, metric, range) {
   const a = aggregate || {};

package/src/card.js

@@ -15,6 +15,7 @@ import { dayKey } from './scanner.js';
 import { fmtCost } from './pricing.js';
 import { rangeToDays, rangeLabel, pickWindow } from './badge.js';
 import { VERSION } from './version.js';
+import { fmtNum, fmtHours } from './fmt.js';
 
 const W = 880;
 const H = 540;
@@ -45,22 +46,6 @@ function escapeXml(s) {
     .replace(/"/g, '"');
 }
 
-function fmtNum(n) {
-  if (!n) return '0';
-  if (n < 1000) return String(Math.round(n));
-  if (n < 1_000_000) return `${(n / 1000).toFixed(1)}k`;
-  if (n < 1_000_000_000) return `${(n / 1_000_000).toFixed(2)}M`;
-  return `${(n / 1_000_000_000).toFixed(2)}B`;
-}
-
-function fmtHours(ms) {
-  if (!ms || ms < 0) return '0h';
-  const h = ms / 3_600_000;
-  if (h < 1) return `${Math.round(h * 60)}m`;
-  if (h < 10) return `${h.toFixed(1)}h`;
-  return `${Math.round(h)}h`;
-}
-
 function rangeTitle(range) {
   const rl = rangeLabel(range);
   if (rl === 'all-time') return 'on claude';
@@ -103,7 +88,9 @@ function topWeekday(aggregate) {
   const wd = aggregate?.byWeekday || {};
   let best = null;
   for (const [k, v] of Object.entries(wd)) {
-    if (!best || (v.activeMs || 0) > (best.ms || 0)) best = { day: Number(k), ms: v.activeMs || 0 };
+    const day = Number(k);
+    if (!Number.isInteger(day) || day < 0 || day > 6) continue; // out-of-range key → skip, no blank name + stray "(3h)"
+    if (!best || (v.activeMs || 0) > (best.ms || 0)) best = { day, ms: v.activeMs || 0 };
   }
   return best;
 }
@@ -133,6 +120,7 @@ function peakHourLabel(aggregate) {
   const ph = aggregate?.peakHour;
   if (!ph || ph.hour == null) return null;
   const h = Number(ph.hour);
+  if (!Number.isInteger(h) || h < 0 || h > 23) return null; // corrupt aggregate → no label, not "99:00"/"NaN:00"
   return `${String(h).padStart(2, '0')}:00`;
 }
 

package/src/cli.js

@@ -11,9 +11,10 @@ if (process.platform === 'win32' && process.stdout.isTTY) {
   try { spawnSync('chcp.com', ['65001'], { stdio: 'ignore', windowsHide: true }); } catch { /* chcp absent (Wine, custom shell) — accept whatever code page is set */ }
 }
 import { DAEMON_SCRIPT, PID_PATH, STATE_PATH, LOG_PATH, AGGREGATE_PATH, CONFIG_PATH, IS_PACKAGED, IS_NPX, EXE_PATH, CANONICAL_EXE } from './paths.js';
-import { readState } from './state.js';
+import { readActiveState } from './state.js';
 import { buildVars, fillTemplate, humanProject, humanTool, applyIdle, framePasses, fmtNum } from './format.js';
 import { scan, readAggregate, findLiveSessions, dayKey, weekKey } from './scanner.js';
+import { weekGrid } from './week.js';
 import { runHookCli } from './hook.js';
 import { install as runInstall, uninstall as runUninstall, isInstalled, migrateConfig, installHooks, ensureCanonicalExe, installMcp, uninstallMcp, setupOutro } from './install.js';
 import { startTui } from './tui.js';
@@ -62,7 +63,7 @@ function readJson(path, fallback) {
 // (`profile set`, `community on`, `link`, …). mkdirSync first.
 function writeUserConfig(userCfg) {
   mkdirSync(dirname(CONFIG_PATH), { recursive: true });
-  writeUserConfig(userCfg);
+  writeFileSync(CONFIG_PATH, JSON.stringify(userCfg, null, 2) + '\n');
 }
 
 // Validate a flag's value taken with `argv[++i]`. A value that's missing or
@@ -346,7 +347,7 @@ function todayBoxLines(vars, aggregate) {
 }
 
 function showStatus() {
-  const state = readState();
+  const state = readActiveState();
   const aggregate = readAggregate();
   const config = loadConfig();
   const live = findLiveSessions({ thresholdMs: 90_000 });
@@ -528,7 +529,7 @@ function showStatus() {
 }
 
 function showToday() {
-  const state = readState();
+  const state = readActiveState();
   const aggregate = readAggregate();
   const config = loadConfig();
   state.liveSessions = findLiveSessions({ thresholdMs: 90_000 });
@@ -561,7 +562,7 @@ function showToday() {
 }
 
 function showWeek() {
-  const state = readState();
+  const state = readActiveState();
   const aggregate = readAggregate();
   const config = loadConfig();
   state.liveSessions = findLiveSessions({ thresholdMs: 90_000 });
@@ -593,22 +594,7 @@ function showWeek() {
 
   // Current ISO week (Mon → Sun). Future days show "—".
   if (aggregate?.byDay) {
-    const now = new Date();
-    now.setHours(0, 0, 0, 0);
-    const monday = new Date(now);
-    monday.setDate(monday.getDate() - ((monday.getDay() + 6) % 7));
-    const days = [];
-    for (let i = 0; i < 7; i++) {
-      const d = new Date(monday);
-      d.setDate(d.getDate() + i);
-      const k = dayKey(d.getTime());
-      const dayName = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'][d.getDay()];
-      const ms = aggregate.byDay[k]?.activeMs || 0;
-      const isFuture = d > now;
-      const isToday = k === dayKey(now.getTime());
-      days.push({ label: `${dayName} ${k.slice(5)}`, ms, isFuture, isToday });
-    }
-    const maxMs = Math.max(...days.map((d) => d.ms)) || 1;
+    const { days, maxMs } = weekGrid(aggregate.byDay);
     const lines = days.map(({ label, ms, isFuture, isToday }) => {
       if (isFuture) return `${c.dim}${label.padEnd(12)} ${'·'.repeat(22)}     —${c.reset}`;
       const h = ms / 3_600_000;
@@ -681,7 +667,7 @@ function statusColor(status) {
 }
 
 function showPreview() {
-  let state = readState();
+  let state = readActiveState();
   const aggregate = readAggregate();
   const config = loadConfig();
   const live = findLiveSessions({ thresholdMs: 90_000 });
@@ -744,7 +730,7 @@ function showPreview() {
 // dashboard having to inline-eval ESM source. Output shape matches the
 // previous helper exactly: { vars: [sorted keys], live: <full vars object> }.
 function dumpVars() {
-  let state = readState();
+  let state = readActiveState();
   const config = loadConfig();
   state.liveSessions = findLiveSessions({ thresholdMs: 90_000 });
   state = applyIdle(state, config);
@@ -971,7 +957,7 @@ async function doGithubStat(argv) {
 // Build the live template-variable table the way the daemon does — current
 // state + idle/stale resolution + aggregate. Shared by statusline/session-card.
 function liveVars() {
-  const state = readState();
+  const state = readActiveState();
   state.liveSessions = findLiveSessions({ thresholdMs: 90_000 });
   const config = loadConfig();
   const resolved = applyIdle(state, config);
@@ -1837,7 +1823,7 @@ function overview() {
   }
 
   // Status line: daemon up/down + project + model + status verb.
-  const state = readState();
+  const state = readActiveState();
   const aggregate = readAggregate();
   state.liveSessions = findLiveSessions({ thresholdMs: 90_000 });
   state.usage = readUsageCache();

package/src/daemon.js

@@ -2,8 +2,8 @@
 import { writeFileSync, readFileSync, existsSync, unlinkSync, watch, appendFileSync, mkdirSync, statSync, renameSync } from 'node:fs';
 import { basename, dirname } from 'node:path';
 import { Client } from './discord-ipc.js';
-import { readState, sweepStaleStateTmp } from './state.js';
-import { makeRotationCursor, pickFrames, selectFrame, resolveLargeImageKey, shouldShowGithubButton } from './presence.js';
+import { readState, sweepStaleStateTmp, listSessionStates, sweepStaleSessionStates } from './state.js';
+import { makeRotationCursor, pickFrames, selectFrame, resolveLargeImageKey, shouldShowGithubButton, pickActiveSession } from './presence.js';
 import { buildVars, fillTemplate, framePasses, applyIdle, applyShipped, applyTrigger } from './format.js';
 import { scan, readAggregate, findLiveSessions, readSessionTokens } from './scanner.js';
 import { detectGithubUrl } from './git.js';
@@ -78,6 +78,7 @@ let aggregate = readAggregate() || null;
 let liveSessions = [];
 let client = null;
 let connected = false;
+let connecting = false; // login() in flight — see the watchdog note in connect()
 let lastPayloadHash = '';
 // Last status we acted on for outbound side-effects (webhook / desktop notify).
 // Tracked separately from the render hash so we fire once per transition.
@@ -96,6 +97,9 @@ let reconnectDelayMs    = RECONNECT_BASE_MS;
 // 12-frame rotation into a single-frame working state and back, producing a
 // jarring "blank tick" until modulo aligns.
 const rotationCursor = makeRotationCursor();
+// Which concurrent session's card we're currently showing. pickActiveSession
+// keeps it sticky — see resolvePresence.
+let displayedSessionId = null;
 // Stabilizes Discord's elapsed timer: applyIdle can synthesize a sessionStart
 // from a moving transcript mtime, and missing-hook scenarios leave it null —
 // either case would make startTimestamp jump on every rotation.
@@ -121,8 +125,10 @@ try {
 } catch { /* unreadable PID file — fall through and claim it */ }
 writeFileSync(PID_PATH, String(process.pid));
 
-// Reclaim any per-pid state tmp files orphaned by a hard-killed writer.
+// Reclaim any per-pid state tmp files orphaned by a hard-killed writer, plus
+// per-session state files from sessions that ended long ago.
 sweepStaleStateTmp();
+sweepStaleSessionStates();
 
 // pickFrames / selectFrame / resolveLargeImageKey now live in presence.js (pure
 // + unit-tested). The rotation cursor (rotationCursor) is owned here and passed
@@ -135,7 +141,29 @@ sweepStaleStateTmp();
 // previously this chain ran twice and only buildActivity applied the trigger
 // overlay, so the two could diverge.
 function resolvePresence(opts = {}) {
-  let state = opts.state || readState();
+  let state;
+  if (opts.state) {
+    state = opts.state; // standalone caller (preview/api) passes an explicit state
+  } else {
+    // Multi-session: each session writes its own state-<id>.json. Pick which one
+    // to show, sticking with the current session while it's active so the card
+    // doesn't thrash between projects (which also stabilizes the elapsed timer
+    // and the GitHub button — both follow the displayed session). Fall back to
+    // the legacy global state.json when there are no per-session files.
+    const sessions = listSessionStates();
+    if (sessions.length) {
+      const idleMs = Math.max(30_000, (config.idleThresholdSec || 60) * 1000);
+      const picked = pickActiveSession(sessions, displayedSessionId, Date.now(), idleMs);
+      displayedSessionId = picked.sessionId;
+      state = picked.state || readState();
+      // Party count from the SAME per-session list we selected from, so the
+      // "N sessions" field stays consistent with the card instead of wobbling
+      // on transcript-mtime timing.
+      state._liveCount = picked.liveCount;
+    } else {
+      state = readState();
+    }
+  }
   // Attach live sessions BEFORE applyIdle so the stale/idle decision can
   // see ongoing transcript activity, not just this daemon's hook state.
   state.liveSessions = opts.liveSessions || liveSessions;
@@ -257,7 +285,9 @@ function buildActivity(opts = {}) {
   // Concurrent sessions render natively via Discord's party field — the card
   // shows "(2 of 2)" with no template work. Only attached when more than one
   // live session exists (a party of one is noise). Opt out: showPartySize:false.
-  const liveCount = (state.liveSessions || []).length;
+  // Prefer the per-session count (consistent with the displayed session); fall
+  // back to the transcript-derived count for the legacy single-state path.
+  const liveCount = state._liveCount != null ? state._liveCount : (state.liveSessions || []).length;
   if (config.showPartySize !== false && liveCount > 1) {
     activity.partyId = 'claude-rpc';
     activity.partySize = liveCount;
@@ -376,6 +406,10 @@ function isConnectionError(e) {
 
 async function connect() {
   if (reconnectTimer) { clearTimeout(reconnectTimer); reconnectTimer = null; }
+  // While login() is in flight, connected===false and reconnectTimer===null
+  // both hold, so the watchdog's "down, nothing pending" branch would spawn a
+  // second connect() that overwrites `client` and orphans this socket. Block it.
+  connecting = true;
   client = new Client({ clientId: config.clientId, transport: { type: 'ipc' } });
 
   client.on('ready', () => {
@@ -393,6 +427,8 @@ async function connect() {
   try { await client.login(); }
   catch (e) {
     scheduleReconnect(`Discord login failed: ${e.message}`);
+  } finally {
+    connecting = false;
   }
 }
 
@@ -580,7 +616,7 @@ const HEALTH_CHECK_MS = 30_000;
 setInterval(() => {
   try {
     // Half-open: flag says connected but there's no usable user handle.
-    if (connected && !client?.user) {
+    if (connected && !client?.user && !connecting) {
       log('Watchdog: connected but no user handle — forcing reconnect');
       connected = false;
       try { client?.destroy(); } catch { /* already gone */ }
@@ -589,7 +625,7 @@ setInterval(() => {
     }
     // Down with nothing scheduled to bring us back. scheduleReconnect is a
     // no-op when a timer is already pending, so this can't stack retries.
-    if (!connected && !reconnectTimer) {
+    if (!connected && !reconnectTimer && !connecting) {
       log('Watchdog: disconnected with no reconnect pending — forcing reconnect');
       scheduleReconnect('watchdog: no retry pending');
     }

package/src/discord-ipc.js

@@ -32,6 +32,9 @@ export const OP_PING = 3;
 export const OP_PONG = 4;
 
 const CONNECT_TIMEOUT_MS = 10_000; // matches @xhayper's connect() timeout
+// Per-candidate connect timeout: a socket file whose peer accepts then stalls
+// must not wedge discovery of the real Discord socket behind it.
+const SOCKET_CONNECT_TIMEOUT_MS = 1500;
 
 // Same resolution order @xhayper used: XDG_RUNTIME_DIR → TMPDIR → TMP → TEMP → /tmp.
 function getTempDir() {
@@ -171,14 +174,18 @@ export class Client extends EventEmitter {
     for (const p of paths) {
       const socket = await new Promise((resolve) => {
         const s = net.createConnection(p);
-        const onErr = () => {
+        let timer = null;
+        const cleanup = () => {
+          clearTimeout(timer);
           s.removeListener('connect', onOk);
-          resolve(null);
-        };
-        const onOk = () => {
           s.removeListener('error', onErr);
-          resolve(s);
         };
+        const onErr = () => { cleanup(); resolve(null); };
+        const onOk = () => { cleanup(); resolve(s); };
+        // A peer that accepts then stalls would otherwise never settle this
+        // candidate and block the rest each discovery cycle (and leak the fd).
+        timer = setTimeout(() => { cleanup(); s.destroy(); resolve(null); }, SOCKET_CONNECT_TIMEOUT_MS);
+        if (typeof timer === 'object' && 'unref' in timer) timer.unref();
         s.once('connect', onOk);
         s.once('error', onErr);
       });

package/src/doctor.js

@@ -18,6 +18,7 @@ import { findLiveSessions } from './scanner.js';
 import { detectGithubUrl } from './git.js';
 import { resolveVisibility, listPrivateCwds, detectGithubPrivate } from './privacy.js';
 import { readClaudeCredentials, readUsageCache } from './usage.js';
+import { EVENTS as HOOK_EVENTS, isOurHook } from './install.js';
 import { c, check as uiCheck } from './ui.js';
 
 const counters = { pass: 0, fail: 0, warn: 0 };
@@ -82,6 +83,28 @@ function checkMode() {
   check('execution mode', mode, detail);
 }
 
+// Pure classifiers — extracted so doctor's decision logic is unit-testable
+// without spawning the full filesystem diagnostic. The check* wrappers below
+// pair these with the actual reads + check() output.
+const PLACEHOLDER_CLIENT_ID = '1234567890123456789';
+
+// '' / the seed placeholder → 'unset'; not a 17–21 digit snowflake → 'malformed'.
+export function classifyClientId(clientId) {
+  if (!clientId || clientId === PLACEHOLDER_CLIENT_ID) return 'unset';
+  if (!/^\d{17,21}$/.test(String(clientId))) return 'malformed';
+  return 'ok';
+}
+
+// Most-recent-wins IPC state inferred from the daemon log tail: 'up'/'down'/'unknown'.
+export function ipcStateFromLog(logText) {
+  let ipc = 'unknown';
+  for (const line of String(logText || '').split('\n').slice(-80)) {
+    if (/Discord RPC connected|Presence updated|Presence cleared/i.test(line)) ipc = 'up';
+    else if (/retry in \d+s|login failed|Discord disconnected/i.test(line)) ipc = 'down';
+  }
+  return ipc;
+}
+
 function checkConfig() {
   if (!existsSync(CONFIG_PATH)) {
     check('config.json present', 'fail', CONFIG_PATH,
@@ -98,10 +121,11 @@ function checkConfig() {
   }
   check('config.json present', 'pass', CONFIG_PATH);
 
-  if (!cfg.clientId || cfg.clientId === '1234567890123456789') {
+  const clientIdClass = classifyClientId(cfg.clientId);
+  if (clientIdClass === 'unset') {
     check('discord clientId set', 'fail', cfg.clientId || '(empty)',
       `paste your discord application ID into ${CONFIG_PATH}`);
-  } else if (!/^\d{17,21}$/.test(String(cfg.clientId))) {
+  } else if (clientIdClass === 'malformed') {
     check('discord clientId set', 'warn', `${cfg.clientId} doesn't look like a snowflake`,
       'discord application IDs are 17–21 digits');
   } else {
@@ -152,16 +176,6 @@ function checkClaudeProjects() {
   return count;
 }
 
-const HOOK_EVENTS = [
-  'SessionStart', 'UserPromptSubmit', 'PreToolUse', 'PostToolUse',
-  'Stop', 'SubagentStop', 'Notification', 'SessionEnd',
-];
-
-function isOurHookCommand(cmd) {
-  if (!cmd) return false;
-  return /claude-rpc/i.test(cmd) || /hook\.js/i.test(cmd);
-}
-
 function checkHooks() {
   if (!existsSync(CLAUDE_SETTINGS)) {
     check('hooks registered', 'fail', `${CLAUDE_SETTINGS} missing`,
@@ -181,7 +195,7 @@ function checkHooks() {
   for (const event of HOOK_EVENTS) {
     const bucket = settings.hooks?.[event];
     if (!Array.isArray(bucket) || bucket.length === 0) { missing.push(event); continue; }
-    const ours = bucket.flatMap((e) => e.hooks || []).find((h) => isOurHookCommand(h.command));
+    const ours = bucket.flatMap((e) => e.hooks || []).find((h) => isOurHook(h));
     if (!ours) { missing.push(event); continue; }
     if (IS_PACKAGED && !ours.command.includes(CANONICAL_EXE)) stale.push({ event, cmd: ours.command });
     if (IS_NPM_INSTALL && !/\bclaude-rpc\b\s+hook\b/.test(ours.command)) stale.push({ event, cmd: ours.command });
@@ -259,12 +273,8 @@ function checkDaemonLog() {
   // Ns" / "login failed" / "disconnected" line means it dropped. Whichever
   // happened most recently wins.
   let ipc = 'unknown';
-  try {
-    for (const line of readFileSync(LOG_PATH, 'utf8').split('\n').slice(-80)) {
-      if (/Discord RPC connected|Presence updated|Presence cleared/i.test(line)) ipc = 'up';
-      else if (/retry in \d+s|login failed|Discord disconnected/i.test(line)) ipc = 'down';
-    }
-  } catch { /* log unreadable — ipc stays 'unknown', warn renders */ }
+  try { ipc = ipcStateFromLog(readFileSync(LOG_PATH, 'utf8')); }
+  catch { /* log unreadable — ipc stays 'unknown', warn renders */ }
   if (ipc === 'up') {
     check('discord IPC connection', 'pass',
       `connected · ${sizeKB} KB log · last write ${ageMin.toFixed(1)} min ago`);

package/src/fmt.js

@@ -0,0 +1,33 @@
+// Canonical number/duration formatters shared across the card, badge, profile,
+// insights and the live presence engine (format.js re-exports these). Single
+// source of truth so tier-boundary rounding behaves identically everywhere —
+// the copies had drifted (sub-1000 rounding, a missing Billion tier).
+//
+// NOTE: worker/src/badge.js keeps a byte-for-byte copy of fmtNum — the worker
+// deploys dependency-free and can't import across the package boundary. Keep
+// the two in sync; test/format.test.js pins fmtNum's tier behavior.
+
+// Compact integer: 999 → "999", 1_500 → "1.5k", 1_500_000 → "1.50M", up to "B".
+// The unit is chosen from the ROUNDED value, so 999_999 → "1.00M" (not the old
+// "1000.0k") and 999_999_999 → "1.00B".
+export function fmtNum(n) {
+  if (!n) return '0';
+  const neg = n < 0 ? '-' : '';
+  const v = Math.abs(n);
+  if (v < 1000) return neg + Math.round(v);
+  for (const [suf, div, prec] of [['k', 1e3, 1], ['M', 1e6, 2], ['B', 1e9, 2]]) {
+    const s = (v / div).toFixed(prec);
+    if (Number(s) < 1000) return neg + s + suf;
+  }
+  return neg + (v / 1e9).toFixed(2) + 'B'; // ≥ ~1e12 stays in the B tier
+}
+
+// Duration from ms: <60m → "42m", <10h → "2.5h", else "12h". Rounds to whole
+// minutes first so 59.7m → "1.0h" (not the old "60m").
+export function fmtHours(ms) {
+  if (!ms || ms < 0) return '0h';
+  const mins = Math.round(ms / 60_000);
+  if (mins < 60) return `${mins}m`;
+  const hours = mins / 60;
+  return hours < 10 ? `${hours.toFixed(1)}h` : `${Math.round(hours)}h`;
+}

package/src/format.js

@@ -4,6 +4,7 @@ import { fmtCost } from './pricing.js';
 import { languageOf } from './languages.js';
 import { detectGitBranch, detectGitRepo } from './git.js';
 import { fmtResetTime, fmtResetDay } from './usage.js';
+import { fmtNum, fmtHours } from './fmt.js';
 
 const WEEKDAY_NAMES = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 
@@ -33,14 +34,6 @@ function fmtHourLocal(ms) {
   return `${String(d.getHours()).padStart(2, '0')}:${String(d.getMinutes()).padStart(2, '0')}`;
 }
 
-function fmtNum(n) {
-  if (!n) return '0';
-  if (n < 1000) return `${n}`;
-  if (n < 1_000_000) return `${(n / 1000).toFixed(1)}k`;
-  if (n < 1_000_000_000) return `${(n / 1_000_000).toFixed(2)}M`;
-  return `${(n / 1_000_000_000).toFixed(2)}B`;
-}
-
 function fmtDuration(ms) {
   if (!ms || ms < 0) return '0s';
   const s = Math.floor(ms / 1000);
@@ -69,14 +62,6 @@ function fmtToolElapsed(ms) {
   return `${h}h ${m}m`;
 }
 
-function fmtHours(ms) {
-  if (!ms || ms < 0) return '0h';
-  const hours = ms / 3_600_000;
-  if (hours < 1) return `${Math.round(hours * 60)}m`;
-  if (hours < 10) return `${hours.toFixed(1)}h`;
-  return `${Math.round(hours)}h`;
-}
-
 function plural(n, sing, plur) {
   const word = n === 1 ? sing : (plur || `${sing}s`);
   return `${fmtNum(n)} ${word}`;
@@ -223,9 +208,11 @@ export function buildVars(state, config, aggregate) {
   // leak to anyone viewing the card. Fall back to the configured app name.
   const cwdIsLeaky = looksLikeUsernameLeak(state.cwd);
   const safeCwd = cwdIsLeaky ? '' : (state.cwd || '');
-  const projectPretty = cwdIsLeaky
-    ? (config?.appName || 'Claude Code')
-    : (humanProject(state.cwd) || 'Claude Code');
+  const appName = config?.appName || 'Claude Code';
+  // Project label with the home-dir/username-leak guard applied — shared by the
+  // single-session label and the concurrent list so neither renders "lucas".
+  const safeProject = (cwd) => looksLikeUsernameLeak(cwd) ? appName : (humanProject(cwd) || appName);
+  const projectPretty = safeProject(state.cwd);
   const currentToolPretty = humanTool(state.currentTool);
   const modelPretty = humanModel(state.model);
 
@@ -244,7 +231,7 @@ export function buildVars(state, config, aggregate) {
   const concurrentOther = Math.max(0, concurrent - 1);
   const concurrentListPretty = liveSessions
     .slice(0, 3)
-    .map((s) => (typeof s === 'string' ? humanProject(s) : humanProject(s.cwd || s.project || '')))
+    .map((s) => safeProject(typeof s === 'string' ? s : (s.cwd || s.project || '')))
     .filter(Boolean)
     .join(', ') || '—';
 
@@ -517,7 +504,7 @@ export function buildVars(state, config, aggregate) {
     gitRepo,
 
     // ── App identity (v0.3.6) ───────────────────────────────────
-    appName: config?.appName || 'Claude Code',
+    appName,
 
     // Literal single space — handy for blanking a line without `requires`.
     empty: ' ',

package/src/hook.js

@@ -125,9 +125,17 @@ function parseInput() {
 // directly (avoids spawning a child process per hook).
 export function processHookEvent(event, input = {}) {
   const now = Date.now();
+  // Each session writes its OWN state file (state-<sessionId>.json) so concurrent
+  // sessions stop clobbering one shared state.json — that thrash made the card
+  // jump between projects, the timer reset, and counters over-count. Subagent
+  // hooks carry the parent's session_id, so their activity rolls up correctly.
+  // No id (legacy payload) → the global state.json, preserving old behavior.
+  const sid = input.session_id || input.sessionId || null;
+  const update = (fn) => updateState(fn, sid);
+  const reset = (seed) => resetState(seed, sid);
 
   function setActivity(patch) {
-    updateState((s) => {
+    update((s) => {
       Object.assign(s, patch);
       s.lastActivity = now;
       // Any hook firing means Claude Code is alive — clear the closed flag
@@ -140,7 +148,7 @@ export function processHookEvent(event, input = {}) {
 
   switch (event) {
     case 'SessionStart': {
-      resetState({
+      reset({
         cwd: input.cwd || process.cwd(),
         model: input.model?.id || input.model || 'claude',
         status: 'idle',
@@ -148,7 +156,7 @@ export function processHookEvent(event, input = {}) {
       break;
     }
     case 'UserPromptSubmit': {
-      updateState((s) => {
+      update((s) => {
         s.messages += 1;
         s.lastUserPrompt = now;
         s.lastActivity = now;
@@ -164,7 +172,7 @@ export function processHookEvent(event, input = {}) {
       const toolName = input.tool_name || input.toolName || 'tool';
       const toolInput = input.tool_input || input.toolInput || {};
       const file = toolInput.file_path || toolInput.path || toolInput.notebook_path || null;
-      updateState((s) => {
+      update((s) => {
         s.tools += 1;
         s.toolBreakdown[toolName] = (s.toolBreakdown[toolName] || 0) + 1;
         s.currentTool = toolName;
@@ -211,7 +219,7 @@ export function processHookEvent(event, input = {}) {
           }
         }
       }
-      updateState((s) => {
+      update((s) => {
         s.currentTool = null;
         s.toolStartedAt = null;
         s.lastActivity = now;
@@ -236,7 +244,7 @@ export function processHookEvent(event, input = {}) {
       break;
     }
     case 'Notification': {
-      updateState((s) => {
+      update((s) => {
         s.status = 'notification';
         s.lastNotification = now;
         s.lastActivity = now;
@@ -254,7 +262,7 @@ export function processHookEvent(event, input = {}) {
       // rewriting earlier context, not advancing a turn. Surface it as its
       // own state so the card stops reading "Thinking…" for the 10-60s
       // compactions can take on big sessions.
-      updateState((s) => {
+      update((s) => {
         s.status = 'compacting';
         s.compactStartedAt = now;
         s.compactTrigger = input.trigger || input.matcher || null;
@@ -276,7 +284,7 @@ export function processHookEvent(event, input = {}) {
       // staleSessionMin timeout. applyIdle short-circuits to stale when it
       // sees claudeClosed=true. Any subsequent hook from another live
       // session will flip the flag back to false.
-      updateState((s) => {
+      update((s) => {
         s.status = 'stale';
         s.claudeClosed = true;
         s.currentTool = null;

package/src/insights.js

@@ -4,24 +4,10 @@
 
 import { dayKey, weekKey } from './scanner.js';
 import { fmtCost } from './pricing.js';
+import { fmtNum, fmtHours } from './fmt.js';
 
 const WEEKDAYS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
 
-function fmtHours(ms) {
-  if (!ms || ms < 0) return '0h';
-  const hours = ms / 3_600_000;
-  if (hours < 1) return `${Math.round(hours * 60)}m`;
-  if (hours < 10) return `${hours.toFixed(1)}h`;
-  return `${Math.round(hours)}h`;
-}
-
-function fmtNum(n) {
-  if (!n) return '0';
-  if (n < 1000) return `${n}`;
-  if (n < 1_000_000) return `${(n / 1000).toFixed(1)}k`;
-  return `${(n / 1_000_000).toFixed(2)}M`;
-}
-
 function pct(n) {
   const sign = n >= 0 ? '+' : '−';
   return `${sign}${Math.round(Math.abs(n) * 100)}%`;