claude-rpc 0.6.1 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-rpc",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "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/default-config.js

@@ -48,12 +48,12 @@ export const DEFAULT_CONFIG = {
     byStatus: {
       working: {
         details: "Working in {project}",
-        state:   "{currentToolPretty} · {currentFilePretty} · {tokensFmt} tokens",
+        state:   "{currentToolPretty} · {currentFilePretty} · {tokensLabel}",
         largeImageText: "Working on a {fileLang} file",
       },
       thinking: {
         details: "Thinking in {project}",
-        state:   "{modelPretty} · {messagesLabel} · {tokensFmt} tokens",
+        state:   "{modelPretty} · {messagesLabel} · {tokensLabel}",
         largeImageText: "Reasoning with {modelPretty}",
       },
       notification: {

package/src/format.js

@@ -140,6 +140,37 @@ function fmtHour(h) {
   return `${hh}:00`;
 }
 
+// Detect a cwd that would leak the user's OS username if rendered on
+// Discord. Examples:
+//   /home/lucas              → basename matches $USER → leak
+//   C:\Users\lucas           → equals $USERPROFILE → leak
+//   /Users/lucas/projects/x  → basename "x" ≠ user → fine
+// On a real privacy-sensitive cwd (the home dir itself, with no project
+// scoping), buildVars falls back to `appName` so the card reads
+// "Idle in Claude Code" instead of "Idle in lucas".
+function looksLikeUsernameLeak(cwd) {
+  if (!cwd) return false;
+  // Check both POSIX and Windows env vars unconditionally — a test or
+  // edge case might have one without the other, and over-suppressing
+  // the leak side is the safe direction.
+  const homes = [process.env.HOME, process.env.USERPROFILE].filter(Boolean);
+  const users = [process.env.USER, process.env.USERNAME].filter(Boolean);
+  // Normalize path separators so Windows-style cwds work on POSIX
+  // basename (which doesn't split on '\').
+  const norm = (p) => p.replace(/\\/g, '/').replace(/\/+$/, '').toLowerCase();
+  const cwdN = norm(cwd);
+  for (const home of homes) {
+    if (cwdN === norm(home)) return true;
+  }
+  if (users.length) {
+    const base = cwdN.split('/').pop() || '';
+    for (const u of users) {
+      if (base === u.toLowerCase()) return true;
+    }
+  }
+  return false;
+}
+
 // Trim "C:\repo\src\app\page.tsx" → "src/app/page.tsx" (3 trailing segments).
 function prettyFilePath(p) {
   if (!p) return '';
@@ -156,7 +187,14 @@ export function buildVars(state, config, aggregate) {
   // {tokens} / {tokensFmt} now means the grand total (in + out + cache).
   const sessionTokens = sessionReal + sessionCacheRead + sessionCacheWrite;
   const duration = state.sessionStart ? Date.now() - state.sessionStart : 0;
-  const projectPretty = humanProject(state.cwd) || 'Claude Code';
+  // Privacy: when cwd is the user's home dir (or its basename matches the
+  // OS username), don't render it. "Idle in lucas" on Discord is a username
+  // 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 currentToolPretty = humanTool(state.currentTool);
   const modelPretty = humanModel(state.model);
 
@@ -298,7 +336,7 @@ export function buildVars(state, config, aggregate) {
     statusIcon: config?.statusIcons?.[state.status] || state.status || 'idle',
     project: projectPretty,
     projectPretty,
-    cwd: state.cwd || '',
+    cwd: safeCwd,
     model: state.model || 'claude',
     modelPretty,
     messages,
@@ -341,7 +379,10 @@ export function buildVars(state, config, aggregate) {
     // Literal single space — handy for blanking a line without `requires`.
     empty: ' ',
 
-    // pluralized session labels
+    // Pluralized session labels. tokensLabel is empty when zero so the
+    // `· {tokensLabel}` suffix in default templates collapses away —
+    // "Bash · · 0 tokens" is not a useful frame.
+    tokensLabel: sessionTokens > 0 ? `${fmtNum(sessionTokens)} tokens` : '',
     messagesLabel: plural(messages, 'prompt'),
     toolsLabel: plural(tools, 'tool call'),
     filesEditedLabel: plural(filesEdited, 'edit'),
@@ -524,7 +565,40 @@ export function buildVars(state, config, aggregate) {
 
 export function fillTemplate(tpl, vars) {
   if (typeof tpl !== 'string') return tpl;
-  return tpl.replace(/\{(\w+)\}/g, (_, key) => (key in vars ? String(vars[key]) : `{${key}}`));
+  const filled = tpl.replace(/\{(\w+)\}/g, (_, key) => (key in vars ? String(vars[key]) : `{${key}}`));
+  return collapseSeparators(filled);
+}
+
+// After substitution, a template like "{currentToolPretty} · {currentFilePretty} · {tokensFmt} tokens"
+// can resolve to "Bash ·  · 0 tokens" when the tool doesn't have a file path
+// and no tokens have accumulated yet. Split on `·`, trim each segment, drop
+// empty segments, rejoin — so empty middle vars don't leave orphan separators
+// and trailing/leading separators disappear entirely. Templates without `·`
+// pass through untouched.
+function collapseSeparators(s) {
+  if (!s.includes('·')) return s;
+  return s.split('·').map((p) => p.trim()).filter(Boolean).join(' · ');
+}
+
+// Helper used by every "go stale" branch in applyIdle. Wipes the current-
+// activity slots so rotation frames can't render yesterday's project /
+// file / tool names, and zeroes the session counters that are tied to
+// the now-dead session.
+function staleWipe(state) {
+  return {
+    ...state,
+    status: 'stale',
+    currentTool: null,
+    currentFile: null,
+    sessionStart: null,
+    cwd: '',
+    messages: 0,
+    tools: 0,
+    filesOpened: [],
+    filesEdited: [],
+    filesRead: [],
+    tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+  };
 }
 
 // Apply idle/stale transitions based on lastActivity age. Used by both daemon
@@ -546,22 +620,7 @@ export function applyIdle(state, cfg = {}) {
   // Authoritative close signal from the SessionEnd hook — trust it instead
   // of waiting on staleSessionMin. Any other hook clears the flag, so a
   // sibling session staying alive will reset us out of this branch.
-  if (state.claudeClosed) {
-    return {
-      ...state,
-      status: 'stale',
-      currentTool: null,
-      currentFile: null,
-      sessionStart: null,
-      cwd: '',
-      messages: 0,
-      tools: 0,
-      filesOpened: [],
-      filesEdited: [],
-      filesRead: [],
-      tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    };
-  }
+  if (state.claudeClosed) return staleWipe(state);
 
   // Notification is a brief status — hold it for ~8s after the hook fires,
   // then fall through to normal idle/stale processing.
@@ -578,22 +637,7 @@ export function applyIdle(state, cfg = {}) {
   const liveAgeMs = mostRecentLiveMs ? now - mostRecentLiveMs : Infinity;
 
   // Truly dormant: no live transcripts AND local state is old → stale.
-  if (ageMs > staleMs && liveAgeMs > staleMs) {
-    return {
-      ...state,
-      status: 'stale',
-      currentTool: null,
-      currentFile: null,
-      sessionStart: null,
-      cwd: '',
-      messages: 0,
-      tools: 0,
-      filesOpened: [],
-      filesEdited: [],
-      filesRead: [],
-      tokens: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
-    };
-  }
+  if (ageMs > staleMs && liveAgeMs > staleMs) return staleWipe(state);
 
   // Local state is stale but a live transcript exists somewhere on disk.
   // Borrow the most-recent live session as our "active" context, since the
@@ -619,11 +663,25 @@ export function applyIdle(state, cfg = {}) {
   }
 
   // Local state is fresh.
-  if (state.status === 'idle') return state;
+  if (state.status === 'idle') {
+    // Fast-path stale: if there are NO transcripts being written anywhere
+    // on disk, Claude Code isn't running. SessionEnd may not have fired
+    // (force-quit, OS sleep, crash). Going stale here clears Discord
+    // within ~90-120s of close instead of waiting the full staleMs (5min)
+    // — keeps the user's cwd off the card when they're away from their
+    // machine. The 5min legacy fallback below still catches the case
+    // where transcript mtime is fresh but the hook channel is silent.
+    if (liveSessions.length === 0) return staleWipe(state);
+    return state;
+  }
   if (ageMs > idleMs) {
     // Hook channel is quiet, but a live transcript was modified recently?
     // Keep "working" instead of dropping to "idle".
     if (liveAgeMs <= idleMs) return state;
+    // Hooks quiet AND no live transcripts → Claude is closed, not paused.
+    // Skip idle, go straight to stale. Same privacy reasoning as the
+    // idle-state fast-path above.
+    if (liveSessions.length === 0) return staleWipe(state);
     // Going idle — wipe "current activity" indicators so rotation frames
     // gated on filesEdited / currentFile / currentTool stop showing stale
     // active-session data. Keep the session counters (messages/tools/tokens)

package/src/install.js

@@ -260,6 +260,25 @@ export function migrateConfig() {
     added.push('presence.largeImageText');
   }
 
+  // v0.6.3: byStatus.working.state and .thinking.state used `{tokensFmt} tokens`
+  // which renders "0 tokens" before any session activity has accrued — combined
+  // with empty `{currentFilePretty}` for tools like Bash, that surfaced as
+  // "Bash · · 0 tokens" on the card. New default uses `{tokensLabel}` which is
+  // empty until tokens > 0, and fillTemplate now collapses adjacent separators.
+  // Migrate only the verbatim old template — leave anything the user customized.
+  const OLD_WORKING = '{currentToolPretty} · {currentFilePretty} · {tokensFmt} tokens';
+  const OLD_THINKING = '{modelPretty} · {messagesLabel} · {tokensFmt} tokens';
+  if (cfg.presence.byStatus?.working?.state === OLD_WORKING &&
+      DEFAULT_CONFIG.presence?.byStatus?.working?.state) {
+    cfg.presence.byStatus.working.state = DEFAULT_CONFIG.presence.byStatus.working.state;
+    added.push('presence.byStatus.working.state');
+  }
+  if (cfg.presence.byStatus?.thinking?.state === OLD_THINKING &&
+      DEFAULT_CONFIG.presence?.byStatus?.thinking?.state) {
+    cfg.presence.byStatus.thinking.state = DEFAULT_CONFIG.presence.byStatus.thinking.state;
+    added.push('presence.byStatus.thinking.state');
+  }
+
   if (added.length === 0) {
     console.log(`  config up to date → ${CONFIG_PATH}`);
     return false;

package/src/version.js

@@ -11,7 +11,7 @@ import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { ROOT } from './paths.js';
 
-const BAKED = '0.6.1';
+const BAKED = '0.6.3';
 
 function readPkgVersion() {
   try {