claude-rpc 0.11.2 → 0.12.1

package/README.md

@@ -258,7 +258,8 @@ The full default config is in [`src/default-config.js`](src/default-config.js)
 | `calendar`       | Year activity heatmap SVG (`--out` `--gist`) |
 | `session-card`   | Recap card for the current session (`--out`) |
 | `statusline`     | One-line status for tmux/shell prompts (`--template`) |
-| `mcp`            | Run as an MCP server — expose your stats to Claude Code |
+| `mcp install`    | Wire the stats MCP server into Claude Code (one command) |
+| `mcp`            | Run the MCP server (stdio) for Claude Code |
 | `wrapped`        | Open your animated year-in-review (Claude Wrapped) |
 | `private` / `public` / `privacy` | Per-cwd visibility toggles + status |
 | `community`      | Opt-in community totals — `on` \| `off` \| `status` \| `report` |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-rpc",
-  "version": "0.11.2",
+  "version": "0.12.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/cli.js

@@ -15,7 +15,7 @@ import { readState } from './state.js';
 import { buildVars, fillTemplate, humanProject, humanTool, applyIdle, framePasses } from './format.js';
 import { scan, readAggregate, findLiveSessions, dayKey, weekKey } from './scanner.js';
 import { runHookCli } from './hook.js';
-import { install as runInstall, uninstall as runUninstall, isInstalled, migrateConfig, installHooks, ensureCanonicalExe } from './install.js';
+import { install as runInstall, uninstall as runUninstall, isInstalled, migrateConfig, installHooks, ensureCanonicalExe, installMcp, uninstallMcp, mcpServerCommand } from './install.js';
 import { startTui } from './tui.js';
 import { generateInsights } from './insights.js';
 import { badgeSvg } from './badge.js';
@@ -847,6 +847,34 @@ async function doMcp() {
   runMcpServer();
 }
 
+// One-command wiring into Claude Code — runs `claude mcp add` for the user.
+function doMcpInstall(argv) {
+  const scope = argv.includes('--project') ? 'project' : argv.includes('--local') ? 'local' : 'user';
+  const res = installMcp({ exePath: EXE_PATH || process.execPath, scope });
+  const manual = (r) => `claude mcp add claude-rpc --scope ${scope} -- ${r.command} ${r.args.join(' ')}`;
+  if (res.ok) {
+    console.log('');
+    console.log(`  ${c.green}✓${c.reset} Registered the ${c.cyan}claude-rpc${c.reset} MCP server with Claude Code (scope: ${scope}).`);
+    console.log(`  ${c.dim}Restart Claude Code (or run /mcp), then ask: "how long have I coded today?"${c.reset}`);
+    console.log('');
+  } else if (res.reason === 'no-claude') {
+    fail('the `claude` CLI was not found on your PATH', {
+      hint: `install Claude Code first, then run: ${manual(res)}`,
+      code: EX_USER_ERROR,
+    });
+  } else {
+    fail(`\`claude mcp add\` failed (exit ${res.code})`, { hint: `try it manually: ${manual(res)}`, code: EX_USER_ERROR });
+  }
+}
+
+function doMcpUninstall(argv) {
+  const scope = argv.includes('--project') ? 'project' : argv.includes('--local') ? 'local' : 'user';
+  const res = uninstallMcp({ scope });
+  if (res.ok) console.log(`${c.green}✓${c.reset} Removed the claude-rpc MCP server (scope: ${scope}).`);
+  else if (res.reason === 'no-claude') fail('the `claude` CLI was not found on your PATH', { code: EX_USER_ERROR });
+  else fail('could not remove the MCP server', { hint: 'claude mcp remove claude-rpc', code: EX_USER_ERROR });
+}
+
 // ── Privacy commands ─────────────────────────────────────────────────────
 //
 // `claude-rpc private`        → add current cwd to ~/.claude-rpc/private-list.json
@@ -1140,7 +1168,8 @@ function help() {
     ['statusline', 'One-line status for tmux/shell prompts (--template)'],
     ['calendar',  'Year activity heatmap SVG (--out --gist)'],
     ['session-card', 'Recap card for the current session (--out)'],
-    ['mcp',       'Run as an MCP server — expose your stats to Claude Code'],
+    ['mcp install', 'Wire the stats MCP server into Claude Code (one command)'],
+    ['mcp',       'Run the MCP server (stdio) — exposes your stats to Claude'],
     ['wrapped',   'Open your animated year-in-review (Claude Wrapped)'],
     ['private',   'Mark the current directory as private (hide from Discord)'],
     ['public',    'Un-mark the current directory'],
@@ -1218,7 +1247,13 @@ const packagedDefault = IS_PACKAGED && !cmd;
     case 'statusline': doStatusline(process.argv.slice(3)); break;
     case 'calendar':  await doCalendar(process.argv.slice(3)); break;
     case 'session-card': await doSessionCard(process.argv.slice(3)); break;
-    case 'mcp':       await doMcp(); break;
+    case 'mcp': {
+      const sub = process.argv[3];
+      if (sub === 'install')   { doMcpInstall(process.argv.slice(4)); break; }
+      if (sub === 'uninstall') { doMcpUninstall(process.argv.slice(4)); break; }
+      await doMcp();
+      break;
+    }
     case 'wrapped':   process.env.CLAUDE_RPC_OPEN_PATH = '/wrapped'; await import('./server/index.js'); break;
     case 'private':   doPrivate(); break;
     case 'public':    doPublic(); break;

package/src/install.js

@@ -235,6 +235,35 @@ export function seedConfig() {
 // without clobbering the user's customizations. Anything the user already
 // has — including a pre-existing byStatus, custom rotation array, custom
 // appName etc. — is left untouched.
+// How Claude Code should invoke the MCP server — same three-mode resolution
+// as the hook commands (packaged exe / npm bin / dev source).
+export function mcpServerCommand(exePath) {
+  if (IS_PACKAGED) return { command: exePath, args: ['mcp'] };
+  if (IS_NPM_INSTALL) return { command: 'claude-rpc', args: ['mcp'] };
+  const cli = join(dirname(HOOK_SCRIPT), 'cli.js').replace(/\\/g, '/');
+  return { command: 'node', args: [cli, 'mcp'] };
+}
+
+// Register the MCP server with Claude Code via its own `claude mcp add`, so a
+// user never has to hand-type the command. Best-effort: returns { ok, reason,
+// command, args }. Needs the `claude` CLI on PATH.
+export function installMcp({ exePath, scope = 'user' } = {}) {
+  const { command, args } = mcpServerCommand(exePath);
+  const winShell = process.platform === 'win32';
+  // Replace any stale entry first so re-running is idempotent (ignore failure).
+  spawnSync('claude', ['mcp', 'remove', 'claude-rpc', '--scope', scope], { stdio: 'ignore', shell: winShell });
+  const r = spawnSync('claude', ['mcp', 'add', 'claude-rpc', '--scope', scope, '--', command, ...args], { stdio: 'inherit', shell: winShell });
+  if (r.error && r.error.code === 'ENOENT') return { ok: false, reason: 'no-claude', command, args };
+  if (r.status !== 0) return { ok: false, reason: 'add-failed', code: r.status, command, args };
+  return { ok: true, command, args, scope };
+}
+
+export function uninstallMcp({ scope = 'user' } = {}) {
+  const r = spawnSync('claude', ['mcp', 'remove', 'claude-rpc', '--scope', scope], { stdio: 'inherit', shell: process.platform === 'win32' });
+  if (r.error && r.error.code === 'ENOENT') return { ok: false, reason: 'no-claude' };
+  return { ok: r.status === 0 };
+}
+
 export function migrateConfig({ silent = false } = {}) {
   if (!existsSync(CONFIG_PATH)) return false;
   let cfg;

package/src/scanner.js

@@ -7,7 +7,7 @@ import { costFor, pricingKeyFor } from './pricing.js';
 
 // Bumping this forces a full re-parse on next scan. Increment whenever the
 // per-transcript summary schema changes in a way old caches can't satisfy.
-const CACHE_VERSION = 3;
+const CACHE_VERSION = 4;
 
 // Cap counted gap between consecutive timestamps. Anything larger is treated
 // as the user walking away — we count only what's plausibly active time.
@@ -188,6 +188,13 @@ export function parseTranscript(filePath) {
     byModel: {},          // pricing key → { turns, tokens, cost } (model split)
   };
   const fileSet = new Set();
+  // Claude Code splits one assistant message (a single message.id) across
+  // several JSONL lines — one per content block (thinking / text / tool_use)
+  // — and repeats the SAME `usage` object on every line. Token/cost/turn
+  // counting must happen once per message.id, or a 3-block turn is counted 3×
+  // (this was the source of wildly inflated token + cost totals). Content
+  // blocks themselves are distinct per line, so those stay counted per line.
+  const usageCountedIds = new Set();
   // Records in their original order, retaining timestamps for per-day bucketing.
   const records = [];
 
@@ -212,10 +219,15 @@ export function parseTranscript(filePath) {
     if (r.type === 'assistant') {
       const turnModel = r.message?.model || summary.model;
       const u = r.message?.usage;
+      // Count usage/cost/turn only the first time we see this message.id (see
+      // usageCountedIds note above). No id (rare/legacy) → count it.
+      const msgId = r.message?.id;
+      const firstSeen = !msgId || !usageCountedIds.has(msgId);
+      if (msgId) usageCountedIds.add(msgId);
       // Per-model split bucket, keyed by pricing key so cost/tokens/turns align.
       const mkey = turnModel ? pricingKeyFor(turnModel) : null;
       const mb = mkey ? (summary.byModel[mkey] ||= { turns: 0, tokens: 0, cost: 0 }) : null;
-      if (u) {
+      if (u && firstSeen) {
         summary.inputTokens += u.input_tokens || 0;
         summary.outputTokens += u.output_tokens || 0;
         summary.cacheReadTokens += u.cache_read_input_tokens || 0;
@@ -241,8 +253,10 @@ export function parseTranscript(filePath) {
       }
       if (turnModel) {
         if (!summary.model) summary.model = turnModel;
-        summary.modelsUsed[turnModel] = (summary.modelsUsed[turnModel] || 0) + 1;
-        if (mb) mb.turns += 1;
+        if (firstSeen) {
+          summary.modelsUsed[turnModel] = (summary.modelsUsed[turnModel] || 0) + 1;
+          if (mb) mb.turns += 1;
+        }
       }
       const blocks = r.message?.content || [];
       for (const b of blocks) {

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