codebuddy-stats 1.1.3 → 1.1.5

package/README.md

@@ -2,6 +2,8 @@
 
 一个用于分析 CodeBuddy 系列产品使用成本的命令行工具，支持交互式 TUI 界面和纯文本输出。
 
+![](./assets/README-1.jpg)
+
 ## 功能特性
 
 - **双数据源支持** - 同时支持 CodeBuddy Code 和 CodeBuddy IDE（VS Code 扩展）
@@ -68,7 +70,7 @@ cbs --help
 按项目分类的费用统计，方便了解不同项目的 AI 使用成本。
 
 工具会自动将项目标识解析为可读路径：
-- **Code 模式**: 将 `Users-anoti-Documents-project-xxx` 还原为 `~/Documents/project/xxx`
+- **Code 模式**: 将 `Users-foo-Documents-project-xxx` 还原为 `~/Documents/project/xxx`
 - **IDE 模式**: 将 MD5 hash 映射为实际工作区路径
 
 ### Daily

package/dist/index.js

@@ -146,7 +146,7 @@ function renderOverview(box, data, width, note) {
     content += '─'.repeat(summaryWidth) + '\n';
     if (width >= 80) {
         // 双列布局
-        content += `{green-fg}Total cost:{/green-fg}       ${formatCost(grandTotal.cost).padStart(12)}    `;
+        content += `{green-fg}~Total cost:{/green-fg}      ${formatCost(grandTotal.cost).padStart(12)}    `;
         content += `{green-fg}Active days:{/green-fg}      ${String(activeDays).padStart(8)}\n`;
         content += `{green-fg}Total tokens:{/green-fg}     ${formatTokens(grandTotal.tokens).padStart(12)}    `;
         content += `{green-fg}Total requests:{/green-fg}   ${formatNumber(grandTotal.requests).padStart(8)}\n`;
@@ -155,7 +155,7 @@ function renderOverview(box, data, width, note) {
     }
     else {
         // 单列布局
-        content += `{green-fg}Total cost:{/green-fg}       ${formatCost(grandTotal.cost)}\n`;
+        content += `{green-fg}~Total cost:{/green-fg}      ${formatCost(grandTotal.cost)}\n`;
         content += `{green-fg}Total tokens:{/green-fg}     ${formatTokens(grandTotal.tokens)}\n`;
         content += `{green-fg}Total requests:{/green-fg}   ${formatNumber(grandTotal.requests)}\n`;
         content += `{green-fg}Active days:{/green-fg}      ${activeDays}\n`;
@@ -188,7 +188,7 @@ function renderByModel(box, data, width, note) {
     content +=
         '{underline}' +
             'Model'.padEnd(modelCol) +
-            'Cost'.padStart(12) +
+            '~Cost'.padStart(12) +
             'Requests'.padStart(12) +
             'Tokens'.padStart(12) +
             'Avg/Req'.padStart(10) +
@@ -229,7 +229,7 @@ function renderByProject(box, data, width, note) {
     content +=
         '{underline}' +
             'Project'.padEnd(projectCol) +
-            'Cost'.padStart(12) +
+            '~Cost'.padStart(12) +
             'Requests'.padStart(12) +
             'Tokens'.padStart(12) +
             '{/underline}\n';
@@ -264,8 +264,9 @@ function renderDaily(box, data, scrollOffset = 0, width, note) {
     const availableWidth = width - 6; // padding
     const dateCol = 12;
     const costCol = 12;
+    const tokensCol = 10;
     const reqCol = 10;
-    const fixedCols = dateCol + costCol + reqCol;
+    const fixedCols = dateCol + costCol + tokensCol + reqCol;
     const remainingWidth = availableWidth - fixedCols;
     const modelCol = Math.max(15, Math.min(25, Math.floor(remainingWidth * 0.4)));
     const projectCol = Math.max(20, remainingWidth - modelCol);
@@ -273,7 +274,8 @@ function renderDaily(box, data, scrollOffset = 0, width, note) {
     content +=
         '{underline}' +
             'Date'.padEnd(dateCol) +
-            'Cost'.padStart(costCol) +
+            '~Cost'.padStart(costCol) +
+            'Tokens'.padStart(tokensCol) +
             'Requests'.padStart(reqCol) +
             'Top Model'.padStart(modelCol) +
             'Top Project'.padStart(projectCol) +
@@ -304,6 +306,7 @@ function renderDaily(box, data, scrollOffset = 0, width, note) {
         content +=
             date.padEnd(dateCol) +
                 formatCost(daySummary.cost).padStart(costCol) +
+                formatTokens(daySummary.tokens).padStart(tokensCol) +
                 formatNumber(daySummary.requests).padStart(reqCol) +
                 truncate(topModel.id, modelCol - 1).padStart(modelCol) +
                 truncate(shortProject, projectCol - 1).padStart(projectCol) +

package/dist/lib/workspace-resolver.js

@@ -3,7 +3,7 @@ import fsSync from 'node:fs';
 import path from 'node:path';
 import os from 'node:os';
 import crypto from 'node:crypto';
-import { getWorkspaceStorageDir } from './paths.js';
+import { getIdeDataDir, getWorkspaceStorageDir } from './paths.js';
 // 缓存已解析的 CodeBuddy Code 路径名
 const codePathCache = new Map();
 /**
@@ -86,38 +86,381 @@ function computePathHash(p) {
     return crypto.createHash('md5').update(p).digest('hex');
 }
 /**
- * 加载所有工作区映射
+ * 从 CodeBuddyIDE 的 file-tree 数据中反推出 workspace hash -> 真实路径
+ *
+ * 背景：Remote SSH 场景下，server 侧 `workspaceStorage/<hash>/workspace.json` 可能不存在，
+ * 但 CodeBuddyExtension 会把对话关联的文件路径写入 `file-tree.json`，可据此还原工作区根目录。
  */
-export async function loadWorkspaceMappings() {
-    const mappings = new Map();
-    const storageDir = getWorkspaceStorageDir();
-    let entries = [];
+async function loadWorkspaceMappingsFromIdeFileTree() {
+    const out = new Map();
+    const root = getIdeDataDir();
+    async function pathExists(p) {
+        try {
+            await fs.access(p);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }
+    function collectFilePaths(node, acc, depth = 0) {
+        if (depth > 10)
+            return;
+        if (typeof node === 'string')
+            return;
+        if (Array.isArray(node)) {
+            for (const item of node)
+                collectFilePaths(item, acc, depth + 1);
+            return;
+        }
+        if (!node || typeof node !== 'object')
+            return;
+        for (const [k, v] of Object.entries(node)) {
+            if (k === 'filePath' && typeof v === 'string' && v) {
+                acc.push(v);
+                continue;
+            }
+            if (k === 'createdEntries' && Array.isArray(v)) {
+                for (const e of v) {
+                    if (typeof e === 'string' && e)
+                        acc.push(e);
+                }
+                continue;
+            }
+            collectFilePaths(v, acc, depth + 1);
+        }
+    }
+    function resolveWorkspacePathFromFilePaths(hash, filePaths) {
+        for (const raw of filePaths) {
+            const p = extractPathFromUri(raw) || (path.isAbsolute(raw) ? raw : null);
+            if (!p)
+                continue;
+            let cur = p;
+            for (let i = 0; i < 50; i++) {
+                if (computePathHash(cur) === hash)
+                    return cur;
+                const parent = path.dirname(cur);
+                if (parent === cur)
+                    break;
+                cur = parent;
+            }
+        }
+        return null;
+    }
+    // 扫描 `Data/*/CodeBuddyIDE/*/file-tree/*/<convId>/file-tree.json`
+    let level1 = [];
     try {
-        entries = await fs.readdir(storageDir, { withFileTypes: true });
+        level1 = await fs.readdir(root, { withFileTypes: true });
     }
     catch {
-        return mappings;
+        return out;
     }
-    for (const entry of entries) {
-        if (!entry.isDirectory())
+    for (const dirent of level1) {
+        if (!dirent.isDirectory())
             continue;
-        const workspaceJsonPath = path.join(storageDir, entry.name, 'workspace.json');
+        const codeBuddyIdeRoot = path.join(root, dirent.name, 'CodeBuddyIDE');
+        if (!(await pathExists(codeBuddyIdeRoot)))
+            continue;
+        // 兼容两种结构：
+        // 1) CodeBuddyIDE/file-tree
+        // 2) CodeBuddyIDE/<profile>/file-tree（当前主流）
+        const profileDirs = [];
+        if (await pathExists(path.join(codeBuddyIdeRoot, 'file-tree'))) {
+            profileDirs.push(codeBuddyIdeRoot);
+        }
+        let nested = [];
         try {
-            const content = await fs.readFile(workspaceJsonPath, 'utf8');
-            const data = JSON.parse(content);
-            const folderUri = data.folder;
-            if (!folderUri)
+            nested = await fs.readdir(codeBuddyIdeRoot, { withFileTypes: true });
+        }
+        catch {
+            nested = [];
+        }
+        for (const child of nested) {
+            if (!child.isDirectory())
                 continue;
-            const extractedPath = extractPathFromUri(folderUri);
-            if (!extractedPath)
+            const profileDir = path.join(codeBuddyIdeRoot, child.name);
+            if (await pathExists(path.join(profileDir, 'file-tree'))) {
+                profileDirs.push(profileDir);
+            }
+        }
+        for (const profileDir of profileDirs) {
+            const fileTreeDir = path.join(profileDir, 'file-tree');
+            let workspaces = [];
+            try {
+                workspaces = await fs.readdir(fileTreeDir, { withFileTypes: true });
+            }
+            catch {
                 continue;
-            const hash = computePathHash(extractedPath);
-            const displayPath = getDisplayPath(folderUri);
-            mappings.set(hash, { hash, folderUri, displayPath });
+            }
+            for (const ws of workspaces) {
+                if (!ws.isDirectory())
+                    continue;
+                const workspaceHash = ws.name;
+                if (!/^[a-f0-9]{32}$/.test(workspaceHash))
+                    continue;
+                if (out.has(workspaceHash))
+                    continue;
+                const workspaceDir = path.join(fileTreeDir, workspaceHash);
+                let convDirs = [];
+                try {
+                    convDirs = await fs.readdir(workspaceDir, { withFileTypes: true });
+                }
+                catch {
+                    continue;
+                }
+                let resolved = null;
+                for (const conv of convDirs) {
+                    if (!conv.isDirectory())
+                        continue;
+                    const fileTreeJson = path.join(workspaceDir, conv.name, 'file-tree.json');
+                    try {
+                        const raw = await fs.readFile(fileTreeJson, 'utf8');
+                        const parsed = JSON.parse(raw);
+                        const paths = [];
+                        collectFilePaths(parsed, paths);
+                        resolved = resolveWorkspacePathFromFilePaths(workspaceHash, paths);
+                        if (resolved)
+                            break;
+                    }
+                    catch {
+                        // ignore
+                    }
+                }
+                if (!resolved)
+                    continue;
+                const folderUri = 'file://' + resolved;
+                out.set(workspaceHash, {
+                    hash: workspaceHash,
+                    folderUri,
+                    displayPath: getDisplayPath(folderUri),
+                });
+            }
+        }
+    }
+    return out;
+}
+/**
+ * 从 CodeBuddyIDE 的 history/messages 中反推出 workspace hash -> 真实路径
+ *
+ * 场景：有些对话没有触发 file-tree 落盘，但 messages 里常包含 tool-result 的绝对路径。
+ */
+async function loadWorkspaceMappingsFromIdeHistory() {
+    const out = new Map();
+    const root = getIdeDataDir();
+    async function pathExists(p) {
+        try {
+            await fs.access(p);
+            return true;
         }
         catch {
-            // 跳过无法读取的文件
+            return false;
+        }
+    }
+    async function readFileHeadUtf8(filePath, bytes = 64 * 1024) {
+        const fh = await fs.open(filePath, 'r');
+        try {
+            const buf = Buffer.alloc(bytes);
+            const { bytesRead } = await fh.read(buf, 0, buf.length, 0);
+            return buf.toString('utf8', 0, bytesRead);
         }
+        finally {
+            await fh.close();
+        }
+    }
+    function extractCandidatePathsFromText(text) {
+        const set = new Set();
+        const uriRe = /(vscode-remote:\/\/[^\s"']+|file:\/\/[^\s"']+)/g;
+        for (const m of text.matchAll(uriRe)) {
+            const v = m[1];
+            if (v)
+                set.add(v);
+        }
+        const absPathRe = /\/[A-Za-z0-9._~@%+=:,\-]+(?:\/[A-Za-z0-9._~@%+=:,\-]+)+/g;
+        for (const m of text.matchAll(absPathRe)) {
+            const v = m[0];
+            if (v)
+                set.add(v);
+        }
+        return [...set];
+    }
+    function resolveWorkspacePathFromCandidates(hash, candidates) {
+        for (const raw of candidates) {
+            const p = extractPathFromUri(raw) || (path.isAbsolute(raw) ? raw : null);
+            if (!p)
+                continue;
+            let cur = p;
+            for (let i = 0; i < 50; i++) {
+                if (computePathHash(cur) === hash)
+                    return cur;
+                const parent = path.dirname(cur);
+                if (parent === cur)
+                    break;
+                cur = parent;
+            }
+        }
+        return null;
+    }
+    let level1 = [];
+    try {
+        level1 = await fs.readdir(root, { withFileTypes: true });
+    }
+    catch {
+        return out;
+    }
+    for (const dirent of level1) {
+        if (!dirent.isDirectory())
+            continue;
+        const codeBuddyIdeRoot = path.join(root, dirent.name, 'CodeBuddyIDE');
+        if (!(await pathExists(codeBuddyIdeRoot)))
+            continue;
+        const profileDirs = [];
+        if (await pathExists(path.join(codeBuddyIdeRoot, 'history'))) {
+            profileDirs.push(codeBuddyIdeRoot);
+        }
+        let nested = [];
+        try {
+            nested = await fs.readdir(codeBuddyIdeRoot, { withFileTypes: true });
+        }
+        catch {
+            nested = [];
+        }
+        for (const child of nested) {
+            if (!child.isDirectory())
+                continue;
+            const profileDir = path.join(codeBuddyIdeRoot, child.name);
+            if (await pathExists(path.join(profileDir, 'history'))) {
+                profileDirs.push(profileDir);
+            }
+        }
+        for (const profileDir of profileDirs) {
+            const historyDir = path.join(profileDir, 'history');
+            let workspaces = [];
+            try {
+                workspaces = await fs.readdir(historyDir, { withFileTypes: true });
+            }
+            catch {
+                continue;
+            }
+            for (const ws of workspaces) {
+                if (!ws.isDirectory())
+                    continue;
+                const workspaceHash = ws.name;
+                if (!/^[a-f0-9]{32}$/.test(workspaceHash))
+                    continue;
+                if (out.has(workspaceHash))
+                    continue;
+                const workspaceDir = path.join(historyDir, workspaceHash);
+                let convDirs = [];
+                try {
+                    convDirs = await fs.readdir(workspaceDir, { withFileTypes: true });
+                }
+                catch {
+                    continue;
+                }
+                let resolved = null;
+                for (const conv of convDirs) {
+                    if (!conv.isDirectory())
+                        continue;
+                    const messagesDir = path.join(workspaceDir, conv.name, 'messages');
+                    if (!(await pathExists(messagesDir)))
+                        continue;
+                    let msgFiles = [];
+                    try {
+                        msgFiles = await fs.readdir(messagesDir, { withFileTypes: true });
+                    }
+                    catch {
+                        continue;
+                    }
+                    let tried = 0;
+                    for (const msg of msgFiles) {
+                        if (!msg.isFile() || !msg.name.endsWith('.json'))
+                            continue;
+                        const msgPath = path.join(messagesDir, msg.name);
+                        tried += 1;
+                        if (tried > 30)
+                            break;
+                        try {
+                            const head = await readFileHeadUtf8(msgPath);
+                            const candidates = extractCandidatePathsFromText(head);
+                            resolved = resolveWorkspacePathFromCandidates(workspaceHash, candidates);
+                            if (resolved)
+                                break;
+                        }
+                        catch {
+                            // ignore
+                        }
+                    }
+                    if (resolved)
+                        break;
+                }
+                if (!resolved)
+                    continue;
+                const folderUri = 'file://' + resolved;
+                out.set(workspaceHash, {
+                    hash: workspaceHash,
+                    folderUri,
+                    displayPath: getDisplayPath(folderUri),
+                });
+            }
+        }
+    }
+    return out;
+}
+/**
+ * 加载所有工作区映射
+ */
+export async function loadWorkspaceMappings() {
+    const mappings = new Map();
+    // 1) 尝试从客户端 workspaceStorage/workspace.json 解析
+    const storageDir = getWorkspaceStorageDir();
+    try {
+        const entries = await fs.readdir(storageDir, { withFileTypes: true });
+        for (const entry of entries) {
+            if (!entry.isDirectory())
+                continue;
+            const workspaceJsonPath = path.join(storageDir, entry.name, 'workspace.json');
+            try {
+                const content = await fs.readFile(workspaceJsonPath, 'utf8');
+                const data = JSON.parse(content);
+                const folderUri = data.folder;
+                if (!folderUri)
+                    continue;
+                const extractedPath = extractPathFromUri(folderUri);
+                if (!extractedPath)
+                    continue;
+                const hash = computePathHash(extractedPath);
+                const displayPath = getDisplayPath(folderUri);
+                mappings.set(hash, { hash, folderUri, displayPath });
+            }
+            catch {
+                // ignore
+            }
+        }
+    }
+    catch {
+        // ignore
+    }
+    // 2) Remote SSH 等场景的兜底：从 CodeBuddyIDE file-tree 反推
+    try {
+        const ideMappings = await loadWorkspaceMappingsFromIdeFileTree();
+        for (const [hash, mapping] of ideMappings) {
+            if (!mappings.has(hash))
+                mappings.set(hash, mapping);
+        }
+    }
+    catch {
+        // ignore
+    }
+    // 3) 进一步兜底：从 CodeBuddyIDE history/messages 反推（tool-result 常带绝对路径）
+    try {
+        const ideMappings = await loadWorkspaceMappingsFromIdeHistory();
+        for (const [hash, mapping] of ideMappings) {
+            if (!mappings.has(hash))
+                mappings.set(hash, mapping);
+        }
+    }
+    catch {
+        // ignore
     }
     return mappings;
 }
@@ -137,8 +480,8 @@ function pathExistsSync(p) {
  * 尝试将 CodeBuddy Code 的项目名（路径中 / 替换为 -）还原为真实路径
  * 使用回溯搜索，因为目录名本身可能包含 -
  *
- * 例如: "Users-anoti-Documents-project-codebudy-cost-analyzer"
- *    -> "/Users/anoti/Documents/project/codebudy-cost-analyzer"
+ * 例如: "Users-foo-Documents-project-codebudy-cost-analyzer"
+ *    -> "/Users/foo/Documents/project/codebudy-cost-analyzer"
  */
 function tryResolveCodePath(name) {
     // 检查缓存

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codebuddy-stats",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "type": "module",
   "main": "dist/index.js",
   "files": [