claude-rpc 0.6.2 → 0.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-rpc",
-  "version": "0.6.2",
+  "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

@@ -379,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'),
@@ -562,7 +565,19 @@ 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-

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.2';
+const BAKED = '0.6.3';
 
 function readPkgVersion() {
   try {