@winston.wan/burn-your-money 3.0.1 → 3.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winston.wan/burn-your-money",
-  "version": "3.0.1",
+  "version": "3.0.3",
   "description": "💸 Burn Your Money - 实时显示 Claude Code 的 token 消耗，看着你的钱包燃烧！",
   "main": "src/statusline.js",
   "scripts": {

package/src/statusline.js

@@ -172,18 +172,63 @@ function main() {
                 try {
                     const { execSync } = require('child_process');
                     const scriptPath = path.join(__dirname, 'token-history.js');
-                    const freshData = execSync(`node "${scriptPath}" summary`, { encoding: 'utf8' });
+                    // 使用更兼容的方式执行脚本
+                    const freshData = execSync(`node "${scriptPath}" summary`, {
+                        encoding: 'utf8',
+                        stdio: ['ignore', 'pipe', 'ignore']
+                    });
                     historyData = JSON.parse(freshData);
                     historyData._cache_time = now;
                     writeJsonFile(HISTORY_CACHE, historyData);
                 } catch (e) {
-                    // 如果获取失败，使用旧缓存
+                    // 如果获取失败，尝试直接读取 stats-cache.json 作为降级方案
+                    try {
+                        const statsCache = path.join(os.homedir(), '.claude', 'stats-cache.json');
+                        const stats = JSON.parse(fs.readFileSync(statsCache, 'utf8'));
+
+                        // 从 stats-cache.json 构建基本数据
+                        const totalInput = Object.values(stats.modelUsage || {}).reduce((sum, m) => sum + (m.inputTokens || 0), 0);
+                        const totalOutput = Object.values(stats.modelUsage || {}).reduce((sum, m) => sum + (m.outputTokens || 0), 0);
+                        const totalCache = Object.values(stats.modelUsage || {}).reduce((sum, m) => sum + (m.cacheReadInputTokens || 0), 0);
+                        const totalTokens = totalInput + totalOutput + totalCache;
+                        const totalCost = (totalInput / 1000000 * 3) + (totalOutput / 1000000 * 15) + (totalCache / 1000000 * 0.3);
+
+                        historyData = {
+                            total_tokens_all: totalTokens,
+                            total_cost: totalCost.toFixed(2),
+                            today_tokens: 0,
+                            today_cost: '0.00',
+                            week_tokens: 0,
+                            week_cost: '0.00',
+                            month_tokens: 0,
+                            month_cost: '0.00',
+                            _cache_time: now
+                        };
+                        writeJsonFile(HISTORY_CACHE, historyData);
+                    } catch (e2) {
+                        // 如果降级方案也失败，使用旧缓存或默认值
+                        if (!historyData || !historyData.total_tokens_all) {
+                            historyData = {
+                                total_tokens_all: 0,
+                                total_cost: '0.00',
+                                today_tokens: 0,
+                                today_cost: '0.00',
+                                _cache_time: now
+                            };
+                        }
+                    }
                 }
             }
 
             // 如果缓存不存在或无效，使用默认值（但保留已有数据）
             if (!historyData || typeof historyData !== 'object') {
-                historyData = {};
+                historyData = {
+                    total_tokens_all: 0,
+                    total_cost: '0.00',
+                    today_tokens: 0,
+                    today_cost: '0.00',
+                    _cache_time: now
+                };
             }
 
             // 确保 _cache_time 存在（如果是旧缓存，添加时间戳）

package/src/token-history.js

@@ -78,38 +78,18 @@ function readStats() {
         const totalOutputTokens = Object.values(data.modelUsage || {}).reduce((sum, model) => sum + (model.outputTokens || 0), 0);
         const totalCacheReadTokens = Object.values(data.modelUsage || {}).reduce((sum, model) => sum + (model.cacheReadInputTokens || 0), 0);
 
-        // 获取今日 tokens
-        // 注意：dailyModelTokens 不包含缓存 tokens，且可能更新不及时
-        // 如果 lastComputedDate 不是今天，今日数据可能不准确
-        const lastComputedDate = data.lastComputedDate || '';
+        // 计算今日 tokens（总计 - 历史每日总和，排除今天）
         const dailyTokens = data.dailyModelTokens || [];
+        let historySum = 0;
+        dailyTokens.forEach(day => {
+            if (day.date !== TODAY) {
+                const models = day.tokensByModel || {};
+                historySum += Object.values(models).reduce((sum, tokens) => sum + (tokens || 0), 0);
+            }
+        });
 
-        const totalTokensAll = totalInputTokens + totalOutputTokens + totalCacheReadTokens;
-
-        // 检查是否有今日的 dailyModelTokens 记录
-        const todayEntry = dailyTokens.find(day => day.date === TODAY);
-        let todayTokens = 0;
-        if (todayEntry) {
-            const models = todayEntry.tokensByModel || {};
-            todayTokens = Object.values(models).reduce((sum, tokens) => sum + (tokens || 0), 0);
-            // 补偿缓存 tokens（按比例估算）
-            const cacheRatio = totalCacheReadTokens / (totalTokensAll || 1);
-            todayTokens = Math.floor(todayTokens * (1 + cacheRatio));
-        } else if (lastComputedDate !== TODAY) {
-            // lastComputedDate 不是今天，无法准确计算今日 tokens
-            todayTokens = 0;
-        } else {
-            // 尝试从总量推算（可能不准确）
-            let historySum = 0;
-            dailyTokens.forEach(day => {
-                if (day.date !== TODAY) {
-                    const models = day.tokensByModel || {};
-                    historySum += Object.values(models).reduce((sum, tokens) => sum + (tokens || 0), 0);
-                }
-            });
-            todayTokens = totalTokensAll - historySum;
-            if (todayTokens < 0) todayTokens = 0;
-        }
+        const todayTokens = totalInputTokens + totalOutputTokens - historySum;
+        if (todayTokens < 0) todayTokens = 0;
 
         // 本周 tokens（排除今天，用上面的 todayTokens）
         const WEEK_START = getWeekStart();
@@ -143,17 +123,18 @@ function readStats() {
             }
         });
 
-        // 计算费用（按 3/15/0.3 规则：Input $3/M, Output $15/M, Cache $0.3/M）
+        // 计算费用（简化：按 3/15/0.3 规则）
         const totalCost = (totalInputTokens / 1000000 * 3) +
                           (totalOutputTokens / 1000000 * 15) +
                           (totalCacheReadTokens / 1000000 * 0.3);
 
-        // 计算各周期费用（按 token 数量比例分摊）
-        const totalTokensForRatio = totalTokensAll || 1;
-        const todayCost = todayTokens > 0 ? (todayTokens / totalTokensForRatio * totalCost) : 0;
-        const weekCost = weekTokens > 0 ? (weekTokens / totalTokensForRatio * totalCost) : 0;
-        const monthCost = monthTokens > 0 ? (monthTokens / totalTokensForRatio * totalCost) : 0;
-        const lastMonthCost = lastMonthTokens > 0 ? (lastMonthTokens / totalTokensForRatio * totalCost) : 0;
+        const totalTokensAll = totalInputTokens + totalOutputTokens + totalCacheReadTokens;
+
+        // 计算各周期费用（按比例分摊）
+        const todayCost = todayTokens > 0 ? (todayTokens / (totalInputTokens + totalOutputTokens) * totalCost) : 0;
+        const weekCost = weekTokens > 0 ? (weekTokens / (totalInputTokens + totalOutputTokens) * totalCost) : 0;
+        const monthCost = monthTokens > 0 ? (monthTokens / (totalInputTokens + totalOutputTokens) * totalCost) : 0;
+        const lastMonthCost = lastMonthTokens > 0 ? (lastMonthTokens / (totalInputTokens + totalOutputTokens) * totalCost) : 0;
 
         // 获取每日数据（用于趋势图）
         const dailyData = dailyTokens.slice(-7).map(day => ({
@@ -276,13 +257,6 @@ function main() {
             console.log('');
 
             // 统计数据
-            console.log('💰 Token 价格说明');
-            console.log('─'.repeat(40));
-            console.log('   Input:  $3.00 / 百万 tokens');
-            console.log('   Output: $15.00 / 百万 tokens');
-            console.log('   Cache:  $0.30 / 百万 tokens (90% 折扣)');
-            console.log('');
-
             console.log('📆 本周消费');
             console.log('─'.repeat(40));
             console.log(`   Tokens:  ${formatNumber(stats.week_tokens)}`);
@@ -301,6 +275,14 @@ function main() {
             console.log(`   费用:    $${stats.total_cost}`);
             console.log('');
 
+            // Token 价格说明
+            console.log('💰 Token 价格说明');
+            console.log('─'.repeat(40));
+            console.log('   Input:  $3.00 / 百万 tokens');
+            console.log('   Output: $15.00 / 百万 tokens');
+            console.log('   Cache:  $0.30 / 百万 tokens (90% 折扣)');
+            console.log('');
+
             // 有趣的统计
             const totalCostNum = parseFloat(stats.total_cost);
             const totalTokensNum = stats.total_tokens_all;