bingocode 1.1.166 → 1.1.168

package/bin/bingo-win.cjs

@@ -1,147 +1,215 @@
-#!/usr/bin/env node
-
-const { spawn, spawnSync } = require('node:child_process');
-const path = require('path');
-const os = require('os');
-const fs = require('fs');
-
-process.env.NoDefaultCurrentDirectoryInExePath = '1';
-
-// ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
-/**
- * 更加健壮的根目录定位：
- * 1. 如果 preload.ts 在 ../ (当前 bin/ 目录下运行)
- * 2. 否则查找同级及上级目录中的 package.json
- */
-function getProjectRoot() {
-  let curr = __dirname;
-  try {
-    while (curr !== path.dirname(curr)) {
-      if (fs.existsSync(path.join(curr, 'preload.ts')) || fs.existsSync(path.join(curr, 'package.json'))) {
-        return curr;
-      }
-      const parent = path.dirname(curr);
-      if (fs.existsSync(path.join(parent, 'preload.ts'))) return parent;
-      curr = parent;
-    }
-  } catch (err) {
-    // 防止权限拒绝等导致挂死
-  }
-  return path.join(__dirname, '..');
-}
-
-const ROOT_DIR = getProjectRoot();
-
-(function deployBingoDefaults() {
-  const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
-  const bingoDir = path.join(configDir, 'bingo');
-  const targetSettings = path.join(bingoDir, 'settings.json');
-
-  // 只在 settings.json 不存在时才部署
-  if (!fs.existsSync(targetSettings)) {
-    const defaultsDir = path.join(ROOT_DIR, 'config', 'bingo-defaults');
-    const srcSettings = path.join(defaultsDir, 'settings.json');
-
-    if (fs.existsSync(srcSettings)) {
-      try {
-        if (!fs.existsSync(bingoDir)) {
-          fs.mkdirSync(bingoDir, { recursive: true });
-        }
-        fs.copyFileSync(srcSettings, targetSettings);
-        console.log('[bingo] 首次启动：已部署默认配置到', targetSettings);
-      } catch (err) {
-        console.warn('[bingo] 部署默认配置失败:', err.message);
-      }
-    }
-  }
-})();
-
-// 自动定位 bun.exe（纯文件系统查找，无子进程，无 DEP0190 警告）
-function resolveBunExe() {
-  // 1. 用户指定路径
-  if (process.env.BUN_PATH && fs.existsSync(process.env.BUN_PATH)) {
-    return process.env.BUN_PATH;
-  }
-  const home = os.homedir();
-  const appData = process.env.APPDATA || path.join(home, 'AppData', 'Roaming');
-  const candidates = [
-    // npm install -g bun 的真实 exe（最常见）
-    path.join(appData, 'npm', 'node_modules', 'bun', 'bin', 'bun.exe'),
-    // bun 官方安装脚本位置
-    path.join(home, '.bun', 'bin', 'bun.exe'),
-  ];
-  // 遍历 PATH 中每个目录查找 bun.exe
-  for (const dir of (process.env.PATH || '').split(path.delimiter)) {
-    candidates.push(path.join(dir, 'bun.exe'));
-  }
-  for (const c of candidates) {
-    try { if (fs.existsSync(c)) return c; } catch (_) {}
-  }
-  return null;
-}
-
-// 检查 bun 是否可用
-function bunExists() {
-  return resolveBunExe() !== null;
-}
-
-// 安装 bun（通过 npm install -g bun）
-function installBun() {
-  console.log('[bingocode] bun 未检测到，正在通过 npm install -g bun 安装...');
-
-  try {
-    const npmResult = spawnSync(
-      'npm.cmd',
-      ['install', '-g', 'bun', '--loglevel', 'error'],
-      { stdio: 'inherit' }
-    );
-    if (npmResult.status !== 0) {
-      throw new Error(`npm install -g bun 失败，exit code ${npmResult.status}`);
-    }
-
-    console.log('[bingocode] bun 安装完成，正在启动...');
-    return true;
-  } catch (err) {
-    console.error(`[bingocode] bun 自动安装失败: ${err.message}`);
-    console.log('[bingocode] 请手动安装 bun: npm install -g bun');
-    return false;
-  }
-}
-
-if (!bunExists()) {
-  if (!installBun()) {
-    process.exit(1);
-  }
-}
-
-// 安装完成后重新解析 bun 路径
-const bunExe = resolveBunExe();
-if (!bunExe) {
-  console.error('[bingocode] 安装后仍找不到 bun.exe，请重新打开终端后再试，或手动安装 bun: npm install -g bun');
-  process.exit(1);
-}
-
-// Bingo Manager 入口
-const entry = path.join(ROOT_DIR, 'src', 'entrypoints', 'manager.tsx');
-
-// preload shim
-const preload = path.join(ROOT_DIR, 'preload.ts');
-if (!fs.existsSync(preload)) {
-  console.error('[bingocode] 找不到 preload.ts，MACRO 将无法注入：' + preload);
-  process.exit(1);
-}
-
-// 检查 .env
-let envFlag = '';
-const envPath = path.join(ROOT_DIR, '.env');
-if (fs.existsSync(envPath)) {
-  envFlag = `--env-file=${envPath}`;
-}
-
-const extraArgs = process.argv.slice(2);
-const args = [`--preload=${preload}`, envFlag, entry, ...extraArgs].filter(Boolean);
-
-// 用绝对路径 spawn，不依赖 shell 解析 PATH
-const child = spawn(bunExe, args, { stdio: 'inherit' });
-
-child.on('exit', (code) => process.exit(code));
+#!/usr/bin/env node
+
+const { spawn, spawnSync } = require('node:child_process');
+const path = require('path');
+const os = require('os');
+const fs = require('fs');
+
+process.env.NoDefaultCurrentDirectoryInExePath = '1';
+
+// ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
+/**
+ * 更加健壮的根目录定位：
+ * 1. 如果 preload.ts 在 ../ (当前 bin/ 目录下运行)
+ * 2. 否则查找同级及上级目录中的 package.json
+ */
+function getProjectRoot() {
+  let curr = __dirname;
+  try {
+    while (curr !== path.dirname(curr)) {
+      if (fs.existsSync(path.join(curr, 'preload.ts')) || fs.existsSync(path.join(curr, 'package.json'))) {
+        return curr;
+      }
+      const parent = path.dirname(curr);
+      if (fs.existsSync(path.join(parent, 'preload.ts'))) return parent;
+      curr = parent;
+    }
+  } catch (err) {
+    // 防止权限拒绝等导致挂死
+  }
+  return path.join(__dirname, '..');
+}
+
+const ROOT_DIR = getProjectRoot();
+
+(function deployBingoDefaults() {
+  const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
+  const bingoDir = path.join(configDir, 'bingo');
+  const targetSettings = path.join(bingoDir, 'settings.json');
+
+  // 只在 settings.json 不存在时才部署
+  if (!fs.existsSync(targetSettings)) {
+    const defaultsDir = path.join(ROOT_DIR, 'config', 'bingo-defaults');
+    const srcSettings = path.join(defaultsDir, 'settings.json');
+
+    if (fs.existsSync(srcSettings)) {
+      try {
+        if (!fs.existsSync(bingoDir)) {
+          fs.mkdirSync(bingoDir, { recursive: true });
+        }
+        fs.copyFileSync(srcSettings, targetSettings);
+        console.log('[bingo] 首次启动：已部署默认配置到', targetSettings);
+      } catch (err) {
+        console.warn('[bingo] 部署默认配置失败:', err.message);
+      }
+    }
+  }
+})();
+
+// 自动定位 bun.exe（纯文件系统查找，无子进程，无 DEP0190 警告）
+function resolveBunExe() {
+  // 1. 用户指定路径
+  if (process.env.BUN_PATH && fs.existsSync(process.env.BUN_PATH)) {
+    return process.env.BUN_PATH;
+  }
+  const home = os.homedir();
+  const appData = process.env.APPDATA || path.join(home, 'AppData', 'Roaming');
+  const candidates = [
+    // npm install -g bun 的真实 exe（最常见）
+    path.join(appData, 'npm', 'node_modules', 'bun', 'bin', 'bun.exe'),
+    // bun 官方安装脚本位置
+    path.join(home, '.bun', 'bin', 'bun.exe'),
+  ];
+  // 遍历 PATH 中每个目录查找 bun.exe
+  for (const dir of (process.env.PATH || '').split(path.delimiter)) {
+    candidates.push(path.join(dir, 'bun.exe'));
+  }
+  for (const c of candidates) {
+    try { if (fs.existsSync(c)) return c; } catch (_) {}
+  }
+  return null;
+}
+
+// 检查 bun 是否可用
+function bunExists() {
+  return resolveBunExe() !== null;
+}
+
+// 安装 bun（通过 npm install -g bun）
+function installBun() {
+  console.log('[bingocode] bun 未检测到，正在通过 npm install -g bun 安装...');
+
+  try {
+    const npmResult = spawnSync(
+      'npm.cmd',
+      ['install', '-g', 'bun', '--loglevel', 'error'],
+      { stdio: 'inherit' }
+    );
+    if (npmResult.status !== 0) {
+      throw new Error(`npm install -g bun 失败，exit code ${npmResult.status}`);
+    }
+
+    console.log('[bingocode] bun 安装完成，正在启动...');
+    return true;
+  } catch (err) {
+    console.error(`[bingocode] bun 自动安装失败: ${err.message}`);
+    console.log('[bingocode] 请手动安装 bun: npm install -g bun');
+    return false;
+  }
+}
+
+if (!bunExists()) {
+  if (!installBun()) {
+    process.exit(1);
+  }
+}
+
+// 安装完成后重新解析 bun 路径
+const bunExe = resolveBunExe();
+if (!bunExe) {
+  console.error('[bingocode] 安装后仍找不到 bun.exe，请重新打开终端后再试，或手动安装 bun: npm install -g bun');
+  process.exit(1);
+}
+
+// Bingo Manager 入口
+const entry = path.join(ROOT_DIR, 'src', 'entrypoints', 'manager.tsx');
+
+// preload shim
+const preload = path.join(ROOT_DIR, 'preload.ts');
+if (!fs.existsSync(preload)) {
+  console.error('[bingocode] 找不到 preload.ts，MACRO 将无法注入：' + preload);
+  process.exit(1);
+}
+
+// 检查 .env
+let envFlag = '';
+const envPath = path.join(ROOT_DIR, '.env');
+if (fs.existsSync(envPath)) {
+  envFlag = `--env-file=${envPath}`;
+}
+
+const extraArgs = process.argv.slice(2);
+
+// ── Start tray daemon if not already running ────────────────────────────────
+const RUNTIME_DIR = path.join(os.homedir(), '.claude-cli', 'runtime');
+const DAEMON_LOCK_FILE = path.join(RUNTIME_DIR, 'daemon.lock');
+
+function serverHealthy() {
+  return new Promise((resolve) => {
+    const http = require('http');
+    const req = http.get('http://127.0.0.1:3456/health', { timeout: 1000 }, (res) => {
+      let data = '';
+      res.on('data', (c) => (data += c));
+      res.on('end', () => {
+        try {
+          resolve(res.statusCode === 200 && JSON.parse(data).status === 'ok');
+        } catch {
+          resolve(false);
+        }
+      });
+    });
+    req.on('error', () => resolve(false));
+    req.setTimeout(1000, () => { req.destroy(); resolve(false); });
+  });
+}
+
+function isDaemonAlive() {
+  try {
+    const pid = parseInt(fs.readFileSync(DAEMON_LOCK_FILE, 'utf-8').trim(), 10);
+    process.kill(pid, 0); // signal 0 == probe only
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+const CHECK_MS = 3000;
+
+async function startTrayDaemonIfNeeded() {
+  // Daemon PID lock prevents race: only one daemon runs across multiple bingo launches
+  if (isDaemonAlive()) {
+    console.log('[bingo] Daemon already running, skipping daemon start');
+    return;
+  }
+
+  // stale lock cleanup
+  try { fs.unlinkSync(DAEMON_LOCK_FILE); } catch {}
+
+  console.log('[bingo] Starting tray daemon...');
+  const trayEntry = path.join(ROOT_DIR, 'src', 'entrypoints', 'tray-only.ts');
+  const daemon = spawn(bunExe, ['--preload=' + preload, trayEntry], {
+    detached: true,
+    stdio: 'ignore',
+    env: { ...process.env },
+  });
+  daemon.unref();
+
+  // Wait for health check
+  const start = Date.now();
+  while (Date.now() - start < CHECK_MS) {
+    if (await serverHealthy()) {
+      console.log('[bingo] Tray daemon started successfully');
+      break;
+    }
+    await (new Promise((r) => setTimeout(r, 300)));
+  }
+}
+
+// Start daemon, then launch CLI independently
+startTrayDaemonIfNeeded().catch(() => {});
+
+// ── Launch CLI (connects to existing server) ───────────────────────────────
+const args = [`--preload=${preload}`, envFlag, entry, ...extraArgs].filter(Boolean);
+
+// 用绝对路径 spawn，不依赖 shell 解析 PATH
+const child = spawn(bunExe, args, { stdio: 'inherit' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.1.166",
+  "version": "1.1.168",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",
@@ -26,7 +26,6 @@
     ".claude/",
     "runtime/",
     "preload.ts",
-    ".env.example",
     "package.json",
     "tsconfig.json",
     "README.md",
@@ -80,6 +79,7 @@
     "lru-cache": "^11.2.7",
     "marked": "^17.0.5",
     "medium-zoom": "^1.1.0",
+    "node-notifier": "^10.0.1",
     "p-map": "^7.0.4",
     "picomatch": "^4.0.4",
     "proper-lockfile": "^4.1.2",
@@ -94,6 +94,7 @@
     "stack-utils": "^2.0.6",
     "strip-ansi": "^7.2.0",
     "supports-hyperlinks": "^4.4.0",
+    "systray2": "^2.1.4",
     "tree-kill": "^1.2.2",
     "ts-node": "^10.9.2",
     "type-fest": "^5.5.0",
@@ -112,11 +113,7 @@
   "devDependencies": {
     "@types/node": "^25.6.0"
   },
-  "description": "<p align=\"center\">   <img src=\"docs/images/logo-horizontal.jpg\" alt=\"Claude Code Haha\" width=\"480\"> </p>",
-  "main": "index.js",
-  "directories": {
-    "doc": "docs"
-  },
+  "description": "BingoCode - AI-powered coding assistant CLI built on Claude",
   "keywords": [],
   "author": "Leanchy",
   "license": "MIT"

package/src/entrypoints/tray-only.ts

@@ -0,0 +1,151 @@
+/**
+ * tray-only.ts — 背景托盘入口（无 UI，系统托盘守护进程）
+ *
+ * 使用 systray2 渲染原生托盘图标，启动服务器，处理退出请求。
+ * 关闭所有 CLI 时，服务器继续运行直到用户右键 Exit 退出。
+ */
+import SysTray from 'systray2';
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
+import http from 'http';
+import { fileURLToPath } from 'url';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const ROOT_DIR = path.resolve(__dirname, '../../');
+
+const PORT = Number(process.env.BINGO_SERVER_PORT || 3456);
+const HOST = process.env.BINGO_SERVER_HOST || '127.0.0.1';
+
+let serverHandle: any = null;
+
+// ── Daemon PID lock ──────────────────────────────────────────────────────
+const DAEMON_LOCK_FILE = path.join(os.homedir(), '.claude-cli', 'runtime', 'daemon.lock');
+try { fs.mkdirSync(path.dirname(DAEMON_LOCK_FILE), { recursive: true }); } catch {}
+fs.writeFileSync(DAEMON_LOCK_FILE, String(process.pid), { flag: 'w' });
+process.on('exit', () => {
+  try { fs.unlinkSync(DAEMON_LOCK_FILE); } catch {}
+});
+
+// Generate green dot icon inline (16x16 PNG, 32-bit RGBA)
+import zlib from 'zlib';
+function buildGreenDotBase64(): string {
+  const W = 16, H = 16;
+  const raw: number[] = [];
+  for (let y = 0; y < H; y++) {
+    raw.push(0); // filter none
+    for (let x = 0; x < W; x++) {
+      const dx = x - 7.5, dy = y - 7.5;
+      const d = Math.sqrt(dx*dx + dy*dy);
+      if (d < 5.5) {
+        raw.push(0x1a, 0xe8, 0x30, 0xff);
+      } else {
+        raw.push(0, 0, 0, 0);
+      }
+    }
+  }
+  const rgbadata = Buffer.from(raw);
+  const compressed = zlib.deflateSync(rgbadata);
+  const sig = Buffer.from([137,80,78,71,13,10,26,10]);
+  const ihdrData = Buffer.alloc(13);
+  ihdrData.writeUInt32BE(W, 0);
+  ihdrData.writeUInt32BE(H, 4);
+  ihdrData.writeUInt8(8, 8);
+  ihdrData.writeUInt8(6, 9);
+  const ihdr = makePngChunk('IHDR', ihdrData);
+  const idat = makePngChunk('IDAT', compressed);
+  const iend = makePngChunk('IEND', Buffer.alloc(0));
+  return Buffer.concat([sig, ihdr, idat, iend]).toString('base64');
+}
+function makePngChunk(type: string, data: Buffer): Buffer {
+  const t = Buffer.from(type, 'ascii');
+  const len = Buffer.alloc(4); len.writeUInt32BE(data.length, 0);
+  const crcInput = Buffer.concat([t, data]);
+  const crc = crc32(crcInput);
+  const trailer = Buffer.alloc(4); trailer.writeUInt32BE(crc, 0);
+  return Buffer.concat([len, t, data, trailer]);
+}
+function crc32(buf: Buffer): number {
+  let c = 0xffffffff;
+  for (let i = 0; i < buf.length; i++) {
+    c = crcTable[(c ^ buf[i]) & 0xff] ^ (c >>> 8);
+  }
+  return (c ^ 0xffffffff) >>> 0;
+}
+const crcTable = (() => {
+  const t = new Int32Array(256);
+  for (let n = 0; n < 256; n++) {
+    let c = n;
+    for (let k = 0; k < 8; k++) {
+      c = (c & 1) ? (0xedb88320 ^ (c >>> 1)) : (c >>> 1);
+    }
+    t[n] = c;
+  }
+  return t;
+})();
+
+const iconB64 = buildGreenDotBase64();
+
+try {
+  const systray = new SysTray({
+    menu: {
+      icon: iconB64,
+      title: 'Bingo',
+      tooltip: 'Bingo is running',
+      items: [
+        {
+          title: 'Server Running',
+          tooltip: 'Bingo is running on port ' + PORT,
+          checked: false,
+          enabled: false,
+        },
+        {
+          title: 'Exit Bingo',
+          tooltip: 'Stop all bingo services',
+          checked: false,
+          enabled: true,
+        },
+      ],
+    },
+    debug: false,
+    copyDir: true,
+  });
+
+  systray.onClick((action: any) => {
+    if (action.seq_id === 1) {
+      console.log('[tray] Exiting via tray menu');
+      const req = http.request(
+        `http://${HOST}:${PORT}/exit`,
+        { method: 'POST', timeout: 5000 },
+        () => {},
+      );
+      req.on('error', () => {
+        try {
+          systray.kill(false);
+        } catch {}
+        process.exit(0);
+      });
+      req.end();
+    }
+  });
+
+} catch (e) {
+  console.error('[tray] Failed to create systray:', e);
+}
+
+// ── Start the server ─────────────────────────────────────────────────────────
+import { ensureSingletonLocalServer } from '../server/ensureSingletonLocalServer.js';
+const serverEntry = path.join(ROOT_DIR, 'src', 'server', 'index.ts');
+
+ensureSingletonLocalServer({ serverEntry, host: HOST, port: PORT })
+  .then((handle: any) => {
+    serverHandle = handle;
+    console.log('[tray] Server started on http://' + HOST + ':' + PORT);
+  })
+  .catch((err: any) => {
+    console.error('[tray] Failed to start server:', err.message || err);
+  });
+
+// Keep event loop alive indefinitely
+setInterval(() => {}, 60_000);

package/src/manager/CliMenuManager.tsx

@@ -14,7 +14,6 @@ import { ensureSingletonLocalServer } from '../server/ensureSingletonLocalServer
 import { TopBar, BottomBar, Panel, Hint, Kbd, SecondaryMenu, StateDisplay, ScrollBar, truncate, safePadEnd } from '../manager/CliMenuUi.tsx';
 import { WelcomeV2 } from '../components/LogoV2/WelcomeV2.tsx';
 import { TopToolbar } from '../manager/TopToolbar.tsx';
-import { TokenStatsPanel } from '../manager/TokenStatsPanel.tsx';
 
 // Theme switching (Hook)
 import { useTheme } from '../components/design-system/ThemeProvider.js';
@@ -485,7 +484,7 @@ export const CliMenuManager: React.FC = () => {
   const [settingData, setSettingData] = useState<any>(null);
   const [loadingSetting, setLoadingSetting] = useState(false);
   const [setErr, setSetErr] = useState<string | null>(null);
-  const [settingsStage, setSettingsStage] = useState<'list' | 'langPicker' | 'tokenStats'>('list');
+  const [settingsStage, setSettingsStage] = useState<'list' | 'langPicker'>('list');
   const [settingsCursor, setSettingsCursor] = useState(0);
   const [autoModeEnabled, setAutoModeEnabled] = useState(false);
   const [bypassPermsEnabled, setBypassPermsEnabled] = useState(false);
@@ -764,7 +763,6 @@ export const CliMenuManager: React.FC = () => {
       // Settings: langPicker → back to list; list → back to main menu
       if (page === 'settings') {
         if (settingsStage === 'langPicker') { setSettingsStage('list'); return; }
-        if (settingsStage === 'tokenStats') { setSettingsStage('list'); return; }
       }
       setPage(null);
       setHistoryMenuStage('list');
@@ -876,8 +874,8 @@ export const CliMenuManager: React.FC = () => {
     // Settings interactions
     if (!showHelp && page === 'settings') {
       if (settingsStage === 'list') {
-        // Fixed rows: Language, Auto Mode, Bypass, Token Stats = 4 rows
-        const totalRows = 4 + (settingData && typeof settingData === 'object' ? Object.keys(settingData).length : 0);
+        // +1 for the fixed Language row prepended before settingData entries
+        const totalRows = 3 + (settingData && typeof settingData === 'object' ? Object.keys(settingData).length : 0);
         const visible = Math.max(1, MID_H - 2);
         if (key.downArrow || input === 'j') {
           setSettingsCursor(c => Math.min(totalRows - 1, c + 1));
@@ -925,9 +923,6 @@ export const CliMenuManager: React.FC = () => {
               }
               return next;
             });
-          } else if (settingsCursor === 3) {
-            // Row 3: open Token Stats
-            setSettingsStage('tokenStats');
           }
         }
       }
@@ -1411,24 +1406,12 @@ export const CliMenuManager: React.FC = () => {
         );
       }
 
-      // --- tokenStats sub-menu ---
-      if (settingsStage === 'tokenStats') {
-        return (
-          <TokenStatsPanel
-            width={VIEW_W}
-            height={MID_H}
-            onBack={() => setSettingsStage('list')}
-          />
-        );
-      }
-
       // --- settings list ---
       type SettingRow = { key: string; label: string; value: string; interactive: boolean };
       const fixedRows: SettingRow[] = [
         { key: '__lang', label: tS.langLabel, value: currentLangLabel, interactive: true },
         { key: '__autoMode', label: tS.autoModeLabel, value: autoModeEnabled ? tS.autoModeOn : tS.autoModeOff, interactive: true },
         { key: '__bypassPerms', label: tS.bypassPermsLabel, value: bypassPermsEnabled ? tS.bypassPermsOn : tS.bypassPermsOff, interactive: true },
-        { key: '__tokenStats', label: 'Token Stats', value: '>', interactive: true },
       ];
       const dataEntries = settingData && typeof settingData === 'object' ? Object.entries(settingData) : [];
       const dataRows: SettingRow[] = dataEntries.map(([k, v]) => ({

package/src/server/ensureSingletonLocalServer.ts

@@ -1,182 +1,173 @@
-  // server/ensureSingletonLocalServer.ts
-  import { spawn } from 'child_process';
-  import fs from 'fs';
-  import fsp from 'fs/promises';
-  import path from 'path';
-  import os from 'os';
-  import axios from 'axios';
-
-  type Handle = {
-    baseUrl: string;
-    stopIfLast: () => Promise<void>;
-    pid?: number;
-  };
-
-  const RUNTIME_DIR = path.join(os.homedir(), '.claude-cli', 'runtime');
-  const LOCK_JSON = path.join(RUNTIME_DIR, 'server.lock.json');
-  const BOOT_LOCK = path.join(RUNTIME_DIR, 'server.boot.lock');
-  const LEASES_DIR = path.join(RUNTIME_DIR, 'leases');
-
-  const DEFAULT_HOST = '127.0.0.1';
-  const DEFAULT_PORT = Number(process.env.SERVER_PORT || 3456);
-  const HEALTH_TIMEOUT_MS = Number(process.env.HEALTH_TIMEOUT_MS || 20000);
-  const HEALTH_RETRY_MS = 300;
-
-  function mkdirp(p: string) { fs.mkdirSync(p, { recursive: true }); }
-  function atomicCreate(p: string): boolean {
-    try { const fd = fs.openSync(p, 'wx'); fs.closeSync(fd); return true; } catch { return false; }
-  }
-  function rmSafe(p: string) { try { fs.rmSync(p, { force: true, recursive: true }); } catch {} }
-  function readJson<T>(p: string): T | null { try { return JSON.parse(fs.readFileSync(p, 'utf-8')) as T; } catch { return null; } }
-  function writeJson(p: string, data: any) { fs.writeFileSync(p, JSON.stringify(data, null, 2), 'utf-8'); }
-  function isPidAlive(pid: number): boolean { try { process.kill(pid, 0); return true; } catch { return false; } }
-  async function waitHealthy(baseUrl: string, timeoutMs: number) {
-    const start = Date.now(); let lastErr: any = null;
-    while (Date.now() - start < timeoutMs) {
-      try {
-        const r = await axios.get(baseUrl.replace(/\/+$/, '') + '/health', { timeout: 1500 });
-        if (r.status === 200 && r.data?.status === 'ok') return;
-      } catch (e) { lastErr = e; }
-      await new Promise(r => setTimeout(r, HEALTH_RETRY_MS));
-    }
-    throw new Error(`Health check timeout: ${lastErr?.message || 'unknown'}`);
-  }
-  function resolveBunPath(): string {
-    // 优先环境变量
-    const fromEnv = process.env.BUN_PATH;
-    if (fromEnv && fs.existsSync(fromEnv)) return fromEnv;
-
-    // Windows：纯文件系统查找 bun.exe，无子进程，无 DEP0190 警告
-    if (process.platform === 'win32') {
-      const home = os.homedir();
-      const appData = process.env.APPDATA || path.join(home, 'AppData', 'Roaming');
-      const candidates = [
-        path.join(appData, 'npm', 'node_modules', 'bun', 'bin', 'bun.exe'),
-        path.join(home, '.bun', 'bin', 'bun.exe'),
-      ];
-      for (const dir of (process.env.PATH || '').split(path.delimiter)) {
-        candidates.push(path.join(dir, 'bun.exe'));
-      }
-      for (const c of candidates) {
-        try { if (fs.existsSync(c)) return c; } catch (_) {}
-      }
-    } else {
-      // Linux/macOS：遍历 PATH 查找 bun
-      for (const dir of (process.env.PATH || '').split(path.delimiter)) {
-        const c = path.join(dir, 'bun');
-        try { if (fs.existsSync(c)) return c; } catch (_) {}
-      }
-    }
-
-    throw new Error('Bun not detected. Please install via: npm install -g bun');
-  }
-
-  async function acquireLease(): Promise<string> {
-    mkdirp(LEASES_DIR);
-    const lease = path.join(LEASES_DIR, `${process.pid}.json`);
-    await fsp.writeFile(lease, JSON.stringify({ pid: process.pid, ts: Date.now() }));
-    const cleanup = () => rmSafe(lease);
-    process.once('exit', cleanup);
-    process.once('SIGINT', () => { cleanup(); process.exit(130); });
-    process.once('SIGTERM', () => { cleanup(); process.exit(143); });
-    return lease;
-  }
-  function countValidLeases(): number {
-    try {
-      const files = fs.readdirSync(LEASES_DIR);
-      let alive = 0;
-      for (const f of files) {
-        const p = path.join(LEASES_DIR, f);
-        const data = readJson<{pid:number, ts:number}>(p);
-        if (data?.pid && isPidAlive(data.pid)) alive++;
-        else rmSafe(p);
-      }
-      return alive;
-    } catch { return 0; }
-  }
-
-  export async function ensureSingletonLocalServer(opts: {
-    serverEntry: string;
-    host?: string;
-    port?: number;
-    baseUrlEnv?: string;
-    passEnv?: Record<string, string>;
-  }): Promise<Handle> {
-    const preset = (opts.baseUrlEnv || process.env.BASE_API_URL || '').trim();
-    if (preset) {
-      try { await waitHealthy(preset, 3000); } catch {}
-      await acquireLease();
-      return { baseUrl: preset.replace(/\/+$/, ''), stopIfLast: async () => {} };
-    }
-
-    const host = opts.host || DEFAULT_HOST;
-    const port = Number(opts.port ?? DEFAULT_PORT);
-    const baseUrl = `http://${host}:${port}`;
-    mkdirp(RUNTIME_DIR);
-
-    const lock = readJson<{ pid:number, port:number }>(LOCK_JSON);
-    if (lock && lock.port === port) {
-      const healthy = await (async () => { try { await waitHealthy(baseUrl, 1200); return true; } catch { return false; } })();
-      if (healthy && isPidAlive(lock.pid)) {
-        await acquireLease();
-        return { baseUrl, stopIfLast: makeStopIfLast(lock.pid, baseUrl), pid: lock.pid };
-      }
-      rmSafe(LOCK_JSON);
-    }
-
-    const iAmSpawner = atomicCreate(BOOT_LOCK);
-    if (!iAmSpawner) {
-      try { await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS); } catch {
-        rmSafe(BOOT_LOCK); rmSafe(LOCK_JSON);
-        return await ensureSingletonLocalServer(opts);
-      }
-      await acquireLease();
-      const live = readJson<{pid:number}>(LOCK_JSON);
-      return { baseUrl, stopIfLast: makeStopIfLast(live?.pid || 0, baseUrl), pid: live?.pid };
-    }
-
-    let child: any = null;
-    try {
-      const bun = resolveBunPath();
-      child = spawn(
-        bun,
-        [opts.serverEntry, '--host', host, '--port', String(port)],
-        {
-          env: { ...process.env, SERVER_AUTH_REQUIRED: '0', ...(opts.passEnv || {}) },
-          stdio: 'ignore',
-          detached: false,
-        }
-      );
-      await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS);
-      writeJson(LOCK_JSON, { pid: child.pid, port, startedAt: new Date().toISOString() });
-    } catch (e) {
-      if (child?.pid) {
-        try {
-          if (process.platform === 'win32') spawn('taskkill', ['/PID', String(child.pid), '/T', '/F']);
-          else process.kill(child.pid, 'SIGTERM');
-        } catch {}
-      }
-      throw e;
-    } finally {
-      rmSafe(BOOT_LOCK);
-    }
-
-    await acquireLease();
-    return { baseUrl, stopIfLast: makeStopIfLast(child.pid, baseUrl), pid: child.pid };
-  }
-
-  function makeStopIfLast(serverPid: number, baseUrl: string) {
-    return async () => {
-      const rest = countValidLeases();
-      if (rest > 0) return;
-      let healthy = false;
-      try { await waitHealthy(baseUrl, 800); healthy = true; } catch {}
-      if (healthy && serverPid && isPidAlive(serverPid)) {
-        try {
-          if (process.platform === 'win32') spawn('taskkill', ['/PID', String(serverPid), '/T', '/F']);
-          else process.kill(serverPid, 'SIGTERM');
-        } catch {}
-      }
-      rmSafe(LOCK_JSON);
-    };
-  }
+// server/ensureSingletonLocalServer.ts
+import { spawn } from 'child_process';
+import fs from 'fs';
+import fsp from 'fs/promises';
+import path from 'path';
+import os from 'os';
+import axios from 'axios';
+
+type Handle = {
+  baseUrl: string;
+  stopIfLast: () => Promise<void>;
+  pid?: number;
+};
+
+const RUNTIME_DIR = path.join(os.homedir(), '.claude-cli', 'runtime');
+const LOCK_JSON = path.join(RUNTIME_DIR, 'server.lock.json');
+const BOOT_LOCK = path.join(RUNTIME_DIR, 'server.boot.lock');
+const LEASES_DIR = path.join(RUNTIME_DIR, 'leases');
+
+const DEFAULT_HOST = '127.0.0.1';
+const DEFAULT_PORT = Number(process.env.SERVER_PORT || 3456);
+const HEALTH_TIMEOUT_MS = Number(process.env.HEALTH_TIMEOUT_MS || 20000);
+const HEALTH_RETRY_MS = 300;
+
+function mkdirp(p: string) { fs.mkdirSync(p, { recursive: true }); }
+function atomicCreate(p: string): boolean {
+  try { const fd = fs.openSync(p, 'wx'); fs.closeSync(fd); return true; } catch { return false; }
+}
+function rmSafe(p: string) { try { fs.rmSync(p, { force: true, recursive: true }); } catch {} }
+function readJson<T>(p: string): T | null { try { return JSON.parse(fs.readFileSync(p, 'utf-8')) as T; } catch { return null; } }
+function writeJson(p: string, data: any) { fs.writeFileSync(p, JSON.stringify(data, null, 2), 'utf-8'); }
+function isPidAlive(pid: number): boolean { try { process.kill(pid, 0); return true; } catch { return false; } }
+async function waitHealthy(baseUrl: string, timeoutMs: number) {
+  const start = Date.now(); let lastErr: any = null;
+  while (Date.now() - start < timeoutMs) {
+    try {
+      const r = await axios.get(baseUrl.replace(/\/+$/, '') + '/health', { timeout: 1500 });
+      if (r.status === 200 && r.data?.status === 'ok') return;
+    } catch (e) { lastErr = e; }
+    await new Promise(r => setTimeout(r, HEALTH_RETRY_MS));
+  }
+  throw new Error(`Health check timeout: ${lastErr?.message || 'unknown'}`);
+}
+function resolveBunPath(): string {
+  // 优先环境变量
+  const fromEnv = process.env.BUN_PATH;
+  if (fromEnv && fs.existsSync(fromEnv)) return fromEnv;
+
+  // Windows：纯文件系统查找 bun.exe，无子进程，无 DEP0190 警告
+  if (process.platform === 'win32') {
+    const home = os.homedir();
+    const appData = process.env.APPDATA || path.join(home, 'AppData', 'Roaming');
+    const candidates = [
+      path.join(appData, 'npm', 'node_modules', 'bun', 'bin', 'bun.exe'),
+      path.join(home, '.bun', 'bin', 'bun.exe'),
+    ];
+    for (const dir of (process.env.PATH || '').split(path.delimiter)) {
+      candidates.push(path.join(dir, 'bun.exe'));
+    }
+    for (const c of candidates) {
+      try { if (fs.existsSync(c)) return c; } catch (_) {}
+    }
+  } else {
+    // Linux/macOS：遍历 PATH 查找 bun
+    for (const dir of (process.env.PATH || '').split(path.delimiter)) {
+      const c = path.join(dir, 'bun');
+      try { if (fs.existsSync(c)) return c; } catch (_) {}
+    }
+  }
+
+  throw new Error('Bun not detected. Please install via: npm install -g bun');
+}
+
+async function acquireLease(): Promise<string> {
+  mkdirp(LEASES_DIR);
+  const lease = path.join(LEASES_DIR, `${process.pid}.json`);
+  await fsp.writeFile(lease, JSON.stringify({ pid: process.pid, ts: Date.now() }));
+  const cleanup = () => rmSafe(lease);
+  process.once('exit', cleanup);
+  process.once('SIGINT', () => { cleanup(); process.exit(130); });
+  process.once('SIGTERM', () => { cleanup(); process.exit(143); });
+  return lease;
+}
+function countValidLeases(): number {
+  try {
+    const files = fs.readdirSync(LEASES_DIR);
+    let alive = 0;
+    for (const f of files) {
+      const p = path.join(LEASES_DIR, f);
+      const data = readJson<{pid:number, ts:number}>(p);
+      if (data?.pid && isPidAlive(data.pid)) alive++;
+      else rmSafe(p);
+    }
+    return alive;
+  } catch { return 0; }
+}
+
+export async function ensureSingletonLocalServer(opts: {
+  serverEntry: string;
+  host?: string;
+  port?: number;
+  baseUrlEnv?: string;
+  passEnv?: Record<string, string>;
+}): Promise<Handle> {
+  const preset = (opts.baseUrlEnv || process.env.BASE_API_URL || '').trim();
+  if (preset) {
+    try { await waitHealthy(preset, 3000); } catch {}
+    await acquireLease();
+    return { baseUrl: preset.replace(/\/+$/, ''), stopIfLast: async () => {} };
+  }
+
+  const host = opts.host || DEFAULT_HOST;
+  const port = Number(opts.port ?? DEFAULT_PORT);
+  const baseUrl = `http://${host}:${port}`;
+  mkdirp(RUNTIME_DIR);
+
+  const lock = readJson<{ pid:number, port:number }>(LOCK_JSON);
+  if (lock && lock.port === port) {
+    const healthy = await (async () => { try { await waitHealthy(baseUrl, 1200); return true; } catch { return false; } })();
+    if (healthy && isPidAlive(lock.pid)) {
+      await acquireLease();
+      return { baseUrl, stopIfLast: makeStopIfLast(lock.pid, baseUrl), pid: lock.pid };
+    }
+    rmSafe(LOCK_JSON);
+  }
+
+  const iAmSpawner = atomicCreate(BOOT_LOCK);
+  if (!iAmSpawner) {
+    try { await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS); } catch {
+      rmSafe(BOOT_LOCK); rmSafe(LOCK_JSON);
+      return await ensureSingletonLocalServer(opts);
+    }
+    await acquireLease();
+    const live = readJson<{pid:number}>(LOCK_JSON);
+    return { baseUrl, stopIfLast: makeStopIfLast(live?.pid || 0, baseUrl), pid: live?.pid };
+  }
+
+  let child: any = null;
+  try {
+    const bun = resolveBunPath();
+    child = spawn(
+      bun,
+      [opts.serverEntry, '--host', host, '--port', String(port)],
+      {
+        env: { ...process.env, SERVER_AUTH_REQUIRED: '0', ...(opts.passEnv || {}) },
+        stdio: 'ignore',
+        detached: true,
+      }
+    );
+    child.unref();
+    await waitHealthy(baseUrl, HEALTH_TIMEOUT_MS);
+    writeJson(LOCK_JSON, { pid: child.pid, port, startedAt: new Date().toISOString() });
+  } catch (e) {
+    if (child?.pid) {
+      try {
+        if (process.platform === 'win32') spawn('taskkill', ['/PID', String(child.pid), '/T', '/F']);
+        else process.kill(child.pid, 'SIGTERM');
+      } catch {}
+    }
+    throw e;
+  } finally {
+    rmSafe(BOOT_LOCK);
+  }
+
+  await acquireLease();
+  return { baseUrl, stopIfLast: makeStopIfLast(child.pid, baseUrl), pid: child.pid };
+}
+
+function makeStopIfLast(_serverPid: number, _baseUrl: string) {
+  return async () => {
+    // no-op: only POST /exit from tray can stop server
+  };
+}

package/.env.example

@@ -1,53 +0,0 @@
-# ============================================================
-# MiniMax（直连 Anthropic 兼容接口）
-# 海外用户: ANTHROPIC_BASE_URL=https://api.minimax.io/anthropic
-# 国内用户: ANTHROPIC_BASE_URL=https://api.minimaxi.com/anthropic
-# 可用模型: MiniMax-M2.7（默认）、MiniMax-M2.7-highspeed（更快）
-# ============================================================
-# ANTHROPIC_AUTH_TOKEN=your_minimax_api_key_here
-# ANTHROPIC_BASE_URL=https://api.minimax.io/anthropic
-# ANTHROPIC_MODEL=MiniMax-M2.7
-# ANTHROPIC_DEFAULT_SONNET_MODEL=MiniMax-M2.7
-# ANTHROPIC_DEFAULT_HAIKU_MODEL=MiniMax-M2.7-highspeed
-# ANTHROPIC_DEFAULT_OPUS_MODEL=MiniMax-M2.7
-# API_TIMEOUT_MS=3000000
-
-# ============================================================
-# OpenAI（通过 LiteLLM 代理）
-# 先启动: litellm --config litellm_config.yaml --port 4000
-# ============================================================
-# ANTHROPIC_AUTH_TOKEN=sk-anything
-# ANTHROPIC_BASE_URL=http://localhost:4000
-# ANTHROPIC_MODEL=gpt-4o
-# ANTHROPIC_DEFAULT_SONNET_MODEL=gpt-4o
-# ANTHROPIC_DEFAULT_HAIKU_MODEL=gpt-4o
-# ANTHROPIC_DEFAULT_OPUS_MODEL=gpt-4o
-# API_TIMEOUT_MS=3000000
-
-# ============================================================
-# DeepSeek（通过 LiteLLM 代理）
-# 先启动: litellm --config litellm_config.yaml --port 4000
-# ============================================================
-# ANTHROPIC_AUTH_TOKEN=sk-anything
-# ANTHROPIC_BASE_URL=http://localhost:4000
-# ANTHROPIC_MODEL=deepseek-chat
-# ANTHROPIC_DEFAULT_SONNET_MODEL=deepseek-chat
-# ANTHROPIC_DEFAULT_HAIKU_MODEL=deepseek-chat
-# ANTHROPIC_DEFAULT_OPUS_MODEL=deepseek-chat
-# API_TIMEOUT_MS=3000000
-
-# ============================================================
-# OpenRouter（直连 Anthropic 兼容接口）
-# ============================================================
-# ANTHROPIC_AUTH_TOKEN=sk-or-v1-xxx
-# ANTHROPIC_BASE_URL=https://openrouter.ai/api/v1
-# ANTHROPIC_MODEL=openai/gpt-4o
-# ANTHROPIC_DEFAULT_SONNET_MODEL=openai/gpt-4o
-# ANTHROPIC_DEFAULT_HAIKU_MODEL=openai/gpt-4o-mini
-# ANTHROPIC_DEFAULT_OPUS_MODEL=openai/gpt-4o
-
-# ============================================================
-# 通用设置（建议始终开启）
-# ============================================================
-DISABLE_TELEMETRY=1
-CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC=1

package/src/manager/TokenStatsPanel.tsx

@@ -1,260 +0,0 @@
-import React, { useState, useEffect, useMemo } from 'react';
-import { Box, Text, useInput } from 'ink';
-import { StateDisplay, ScrollBar, safePadEnd } from '../manager/CliMenuUi.tsx';
-import { aggregateClaudeCodeStats, type ClaudeCodeStats, type DailyModelTokens } from '../utils/stats.ts';
-import { formatNumber } from '../utils/format.js';
-
-// Get ISO week number (Monday-based)
-function getWeekNumber(dateStr: string): string {
-  const date = new Date(dateStr);
-  date.setHours(0, 0, 0, 0);
-  date.setDate(date.getDate() + 4 - (date.getDay() || 7));
-  const yearStart = new Date(date.getFullYear(), 0, 1);
-  const weekNo = Math.ceil((((date.getTime() - yearStart.getTime()) / 86400000) + 1) / 7);
-  return `${date.getFullYear()}-W${String(weekNo).padStart(2, '0')}`;
-}
-
-// Get month key (YYYY-MM)
-function getMonthKey(dateStr: string): string {
-  return dateStr.slice(0, 7);
-}
-
-// Aggregate daily tokens by week
-function aggregateByWeek(dailyTokens: DailyModelTokens[]): DailyModelTokens[] {
-  const weekMap = new Map<string, { [model: string]: number }>();
-
-  for (const day of dailyTokens) {
-    const weekKey = getWeekNumber(day.date);
-    const existing = weekMap.get(weekKey) || {};
-
-    for (const [model, tokens] of Object.entries(day.tokensByModel)) {
-      existing[model] = (existing[model] || 0) + tokens;
-    }
-
-    weekMap.set(weekKey, existing);
-  }
-
-  return Array.from(weekMap.entries())
-    .map(([date, tokensByModel]) => ({ date, tokensByModel }))
-    .sort((a, b) => a.date.localeCompare(b.date));
-}
-
-// Aggregate daily tokens by month
-function aggregateByMonth(dailyTokens: DailyModelTokens[]): DailyModelTokens[] {
-  const monthMap = new Map<string, { [model: string]: number }>();
-
-  for (const day of dailyTokens) {
-    const monthKey = getMonthKey(day.date);
-    const existing = monthMap.get(monthKey) || {};
-
-    for (const [model, tokens] of Object.entries(day.tokensByModel)) {
-      existing[model] = (existing[model] || 0) + tokens;
-    }
-
-    monthMap.set(monthKey, existing);
-  }
-
-  return Array.from(monthMap.entries())
-    .map(([date, tokensByModel]) => ({ date, tokensByModel }))
-    .sort((a, b) => a.date.localeCompare(b.date));
-}
-
-// Get last N days
-function getLastNDays(dailyTokens: DailyModelTokens[], n: number = 14): DailyModelTokens[] {
-  const sorted = [...dailyTokens].sort((a, b) => b.date.localeCompare(a.date));
-  return sorted.slice(0, n);
-}
-
-type TimeRange = 'day' | 'week' | 'month' | 'total';
-
-type Props = {
-  width: number;
-  height: number;
-  onBack: () => void;
-};
-
-export const TokenStatsPanel: React.FC<Props> = ({ width, height, onBack }) => {
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<string | null>(null);
-  const [stats, setStats] = useState<ClaudeCodeStats | null>(null);
-  const [timeRange, setTimeRange] = useState<TimeRange>('total');
-  const [activeButton, setActiveButton] = useState(3); // 0=day, 1=week, 2=month, 3=total
-
-  useEffect(() => {
-    let cancelled = false;
-    setLoading(true);
-    setError(null);
-    aggregateClaudeCodeStats()
-      .then(data => {
-        if (!cancelled) {
-          setStats(data);
-          setLoading(false);
-        }
-      })
-      .catch(err => {
-        if (!cancelled) {
-          setError(err.message || String(err));
-          setLoading(false);
-        }
-      });
-    return () => { cancelled = true; };
-  }, []);
-
-  // Handle keyboard input for time range switching
-  useInput((input, key) => {
-    if (input === '1') {
-      setTimeRange('day');
-      setActiveButton(0);
-    } else if (input === '2') {
-      setTimeRange('week');
-      setActiveButton(1);
-    } else if (input === '3') {
-      setTimeRange('month');
-      setActiveButton(2);
-    } else if (input === '4') {
-      setTimeRange('total');
-      setActiveButton(3);
-    } else if (key.leftArrow && activeButton > 0) {
-      const newButton = activeButton - 1;
-      setActiveButton(newButton);
-      setTimeRange(['day', 'week', 'month', 'total'][newButton] as TimeRange);
-    } else if (key.rightArrow && activeButton < 3) {
-      const newButton = activeButton + 1;
-      setActiveButton(newButton);
-      setTimeRange(['day', 'week', 'month', 'total'][newButton] as TimeRange);
-    }
-  });
-
-  if (loading) {
-    return <StateDisplay type="loading" message="Loading token stats..." />;
-  }
-  if (error) {
-    return <StateDisplay type="error" message={`Failed to load: ${error}`} />;
-  }
-  if (!stats || !stats.modelUsage || Object.keys(stats.modelUsage).length === 0) {
-    return <StateDisplay type="empty" message="No token data yet. Run some conversations first!" />;
-  }
-
-  // Calculate column widths
-  const MODEL_COL = 28;
-  const NUM_COL = 14;
-  const DATE_COL = 12;
-  const visible = height - 4; // leave room for header row + buttons + bottom hint
-
-  // Prepare data based on time range
-  let isDateView = timeRange !== 'total';
-
-  const formatCount = (n: number) => formatNumber(n);
-
-  // Time range buttons
-  const timeButtons = [
-    { label: 'Day', key: '1' },
-    { label: 'Week', key: '2' },
-    { label: 'Month', key: '3' },
-    { label: 'Total', key: '4' },
-  ];
-
-  return (
-    <Box width={width} height={height} flexDirection="column">
-      {/* Time range buttons */}
-      <Box marginBottom={1}>
-        {timeButtons.map((btn, idx) => (
-          <Text key={btn.key} color={activeButton === idx ? 'cyan' : 'white'}>
-            [{btn.label}] {btn.key}
-            {idx < timeButtons.length - 1 ? '  ' : ''}
-          </Text>
-        ))}
-      </Box>
-
-      <Box flexDirection="column" flexGrow={1}>
-        {isDateView ? (
-          <>
-            <Text bold>
-              {safePadEnd('Date', DATE_COL)}
-              {safePadEnd('Model', MODEL_COL)}
-              {safePadEnd('Total Tokens', NUM_COL)}
-            </Text>
-            <Text dimColor>{'─'.repeat(width - 4)}</Text>
-            <Box flexDirection="row" flexGrow={1} position="relative">
-              <Box flexDirection="column" flexGrow={1}>
-                {(() => {
-                  // Date-based views - aggregate dailyModelTokens
-                  let aggregated: DailyModelTokens[];
-                  if (timeRange === 'day') {
-                    aggregated = getLastNDays(stats.dailyModelTokens, 14);
-                  } else if (timeRange === 'week') {
-                    aggregated = aggregateByWeek(stats.dailyModelTokens);
-                  } else {
-                    // month
-                    aggregated = aggregateByMonth(stats.dailyModelTokens);
-                  }
-
-                  return aggregated.flatMap(day =>
-                    Object.entries(day.tokensByModel).map(([model, tokens]) => {
-                      const row = [
-                        safePadEnd(day.date, DATE_COL),
-                        safePadEnd(model.length > MODEL_COL - 3 ? model.slice(0, MODEL_COL - 4) + '…' : model, MODEL_COL),
-                        safePadEnd(formatCount(tokens), NUM_COL),
-                      ].join('');
-                      return <Text key={`${day.date}-${model}`}>{row}</Text>;
-                    })
-                  );
-                })()}
-              </Box>
-              <ScrollBar
-                total={(() => {
-                  let aggregated: DailyModelTokens[];
-                  if (timeRange === 'day') {
-                    aggregated = getLastNDays(stats.dailyModelTokens, 14);
-                  } else if (timeRange === 'week') {
-                    aggregated = aggregateByWeek(stats.dailyModelTokens);
-                  } else {
-                    aggregated = aggregateByMonth(stats.dailyModelTokens);
-                  }
-                  return aggregated.flatMap(day => Object.keys(day.tokensByModel)).length;
-                })()}
-                offset={0}
-                height={visible - 2}
-              />
-            </Box>
-          </>
-        ) : (
-          <>
-            <Text bold>
-              {safePadEnd('Model', MODEL_COL)}
-              {safePadEnd('Input Tokens', NUM_COL)}
-              {safePadEnd('Output Tokens', NUM_COL)}
-              {safePadEnd('Cache Read', NUM_COL)}
-              {safePadEnd('Cache Create', NUM_COL)}
-            </Text>
-            <Text dimColor>{'─'.repeat(width - 4)}</Text>
-            <Box flexDirection="row" flexGrow={1} position="relative">
-              <Box flexDirection="column" flexGrow={1}>
-                {Object.entries(stats.modelUsage).sort(
-                  (a, b) => (b[1].inputTokens + b[1].outputTokens) - (a[1].inputTokens + a[1].outputTokens)
-                ).map(([model, usage]) => {
-                  const row = [
-                    safePadEnd(model.length > MODEL_COL - 3 ? model.slice(0, MODEL_COL - 4) + '…' : model, MODEL_COL),
-                    safePadEnd(formatCount(usage.inputTokens), NUM_COL),
-                    safePadEnd(formatCount(usage.outputTokens), NUM_COL),
-                    safePadEnd(formatCount(usage.cacheReadInputTokens), NUM_COL),
-                    safePadEnd(formatCount(usage.cacheCreationInputTokens), NUM_COL),
-                  ].join('');
-                  return <Text key={model}>{row}</Text>;
-                })}
-              </Box>
-              <ScrollBar
-                total={Object.keys(stats.modelUsage).length}
-                offset={0}
-                height={visible - 2}
-              />
-            </Box>
-          </>
-        )}
-      </Box>
-      <Text dimColor>ESC back · 1-4 or ←→ to switch view</Text>
-    </Box>
-  );
-};
-
-export default TokenStatsPanel;