aihezu 2.8.12 → 2.8.13

package/commands/usage.js

@@ -231,32 +231,16 @@ function formatDateTime(value) {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
 
-function formatDurationSeconds(value) {
-  const total = asNumber(value);
-  if (total === null) return '-';
-  let remaining = Math.max(0, Math.floor(total));
-  const days = Math.floor(remaining / 86400);
-  remaining %= 86400;
-  const hours = Math.floor(remaining / 3600);
-  remaining %= 3600;
-  const minutes = Math.floor(remaining / 60);
-  const seconds = remaining % 60;
-
-  const parts = [];
-  if (days) parts.push(`${days} 天`);
-  if (hours) parts.push(`${hours} 小时`);
-  if (minutes) parts.push(`${minutes} 分`);
-  if (seconds || parts.length === 0) parts.push(`${seconds} 秒`);
-  return parts.join(' ');
-}
-
-function formatDurationMinutes(value) {
-  const minutes = asNumber(value);
-  if (minutes === null || minutes <= 0) return '-';
-  const human = formatDurationSeconds(minutes * 60);
-  if (human === '-') return '-';
-  const minuteText = Number.isInteger(minutes) ? String(minutes) : minutes.toFixed(2);
-  return `${human} (${minuteText} 分钟)`;
+// 把毫秒格式化为简洁的人类可读时长：11661.24 → "11.7s"，950 → "950ms"，65000 → "1m5s"
+function formatDuration(ms) {
+  const n = asNumber(ms);
+  if (n === null || n < 0) return '-';
+  if (n < 1000) return `${Math.round(n)}ms`;
+  const seconds = n / 1000;
+  if (seconds < 60) return `${seconds.toFixed(1)}s`;
+  const m = Math.floor(seconds / 60);
+  const s = Math.round(seconds % 60);
+  return s ? `${m}m${s}s` : `${m}m`;
 }
 
 function formatNumber(value) {
@@ -305,7 +289,12 @@ async function queryUnifiedUsage(baseUrl, authToken) {
     const apiBase = getUsageApiBase(baseUrl);
     const usageUrl = `${apiBase}/v1/usage`;
     const res = await getJson(usageUrl, {
-      headers: { Authorization: `Bearer ${authToken}` }
+      headers: {
+        Authorization: `Bearer ${authToken}`,
+        // 防御性禁用任何中间缓存，确保每次拿到最新快照
+        'Cache-Control': 'no-cache',
+        Pragma: 'no-cache'
+      }
     });
 
     if (res.statusCode < 200 || res.statusCode >= 300) {
@@ -330,123 +319,130 @@ async function queryUnifiedUsage(baseUrl, authToken) {
   }
 }
 
-function displayUnifiedUsageStats(stats, origin, source) {
-  const subscription = stats.subscription || {};
-  const today = (stats.usage && stats.usage.today) || {};
-  const total = (stats.usage && stats.usage.total) || {};
+// 渲染订阅制额度行（仅当账号返回了 *_limit_usd 字段时使用）
+function renderQuotaLine(label, used, limit) {
+  const u = asNumber(used);
+  const l = asNumber(limit);
+  if (l === null || l <= 0) return null;
+  return `${label}: ${formatCost(u)} / ${formatCost(l)} (${formatPercent(u, l)}) ` +
+    `${renderBar(u, l)} ${usageHint(u, l)}`.trimEnd();
+}
 
-  const dailyUsage = asNumber(subscription.daily_usage_usd);
-  const dailyLimit = asNumber(subscription.daily_limit_usd);
-  const weeklyUsage = asNumber(subscription.weekly_usage_usd);
-  const weeklyLimit = asNumber(subscription.weekly_limit_usd);
-  const monthlyUsage = asNumber(subscription.monthly_usage_usd);
-  const monthlyLimit = asNumber(subscription.monthly_limit_usd);
+// 余额 / 额度区块：钱包模式显示余额，订阅模式显示日/周/月额度进度条
+function displayBalanceOrQuota(stats) {
+  const sub = stats.subscription || {};
+  const lines = [];
+
+  const dailyLine = renderQuotaLine('日额度', sub.daily_usage_usd, sub.daily_limit_usd);
+  const weeklyLine = renderQuotaLine('周额度', sub.weekly_usage_usd, sub.weekly_limit_usd);
+  const monthlyLine = renderQuotaLine('月额度', sub.monthly_usage_usd, sub.monthly_limit_usd);
+  if (dailyLine) lines.push(dailyLine);
+  if (weeklyLine) lines.push(weeklyLine);
+  if (monthlyLine) lines.push(monthlyLine);
+
+  if (sub.expires_at) {
+    const expiresMs = Date.parse(sub.expires_at);
+    if (!Number.isNaN(expiresMs)) lines.push(`套餐到期: ${formatDateTime(expiresMs)}`);
+  }
 
-  const unit = stats.unit || 'USD';
-  const planName = stats.planName || '-';
-  const mode = stats.mode || '-';
-  const isValid = stats.isValid === false ? '否' : '是';
+  // 钱包余额（无订阅额度时）
+  const balance = asNumber(stats.remaining) !== null ? asNumber(stats.remaining) : asNumber(stats.balance);
+  if (!lines.length && balance !== null) {
+    lines.push(`余额: ${formatCost(balance)}`);
+  }
 
-  console.log(`域名: ${origin}`);
-  console.log(`来源: ${source}`);
-  console.log(`套餐: ${planName} | 模式: ${mode} | 有效: ${isValid} | 单位: ${unit}`);
-  console.log('');
+  // 累计已用（usage.total.cost 优先，回退到 model_stats 合计）
+  const totalCost = asNumber(stats.usage && stats.usage.total && stats.usage.total.cost);
+  if (totalCost !== null) lines.push(`累计已用: ${formatCost(totalCost)}`);
 
-  if (dailyUsage !== null || dailyLimit !== null) {
-    const usageText = formatCost(dailyUsage);
-    if (dailyLimit !== null && dailyLimit > 0) {
-      console.log(
-        `日额度: ${usageText} / ${formatCost(dailyLimit)} (${formatPercent(dailyUsage, dailyLimit)}) ` +
-        `${renderBar(dailyUsage, dailyLimit)} ${usageHint(dailyUsage, dailyLimit)}`.trimEnd()
-      );
-      const dailyRemaining = asNumber(stats.remaining);
-      if (dailyRemaining !== null) {
-        console.log(`日剩余: ${formatCost(dailyRemaining)}`);
-      } else if (dailyUsage !== null) {
-        console.log(`日剩余: ${formatCost(dailyLimit - dailyUsage)}`);
-      }
-    } else {
-      console.log(`日用量: ${usageText} (无限制)`);
-    }
+  if (lines.length) {
+    console.log('');
+    lines.forEach(line => console.log(line));
   }
+}
 
-  if (weeklyUsage !== null && weeklyLimit !== null && weeklyLimit > 0) {
-    console.log(
-      `周额度: ${formatCost(weeklyUsage)} / ${formatCost(weeklyLimit)} (${formatPercent(weeklyUsage, weeklyLimit)}) ` +
-      `${renderBar(weeklyUsage, weeklyLimit)} ${usageHint(weeklyUsage, weeklyLimit)}`.trimEnd()
-    );
-  } else if (weeklyUsage !== null && weeklyUsage > 0) {
-    console.log(`周用量: ${formatCost(weeklyUsage)}`);
-  }
+function displayUnifiedUsageStats(stats, origin, source, tokenMask) {
+  const usage = stats.usage || {};
+  const today = usage.today || {};
+  const total = usage.total || {};
 
-  if (monthlyUsage !== null && monthlyLimit !== null && monthlyLimit > 0) {
-    console.log(
-      `月额度: ${formatCost(monthlyUsage)} / ${formatCost(monthlyLimit)} (${formatPercent(monthlyUsage, monthlyLimit)}) ` +
-      `${renderBar(monthlyUsage, monthlyLimit)} ${usageHint(monthlyUsage, monthlyLimit)}`.trimEnd()
-    );
-  } else if (monthlyUsage !== null && monthlyUsage > 0) {
-    console.log(`月用量: ${formatCost(monthlyUsage)}`);
-  }
+  const unit = stats.unit || 'USD';
+  const planName = stats.planName || '-';
+  const mode = stats.mode || '-';
+  const valid = stats.isValid === false ? '失效' : '有效';
+  const host = origin.replace(/^https?:\/\//, '');
 
-  const expiresAt = subscription.expires_at;
-  if (expiresAt) {
-    const expiresMs = Date.parse(expiresAt);
-    if (!Number.isNaN(expiresMs)) {
-      console.log(`套餐到期: ${formatDateTime(expiresMs)}`);
-    }
-  }
+  console.log(`域名: ${host}`);
+  console.log(`来源: ${source}${tokenMask ? ' · ' + tokenMask : ''}`);
+  console.log(`套餐: ${planName} | ${mode} | ${valid} | ${unit}`);
 
-  if (Object.keys(today).length > 0) {
+  // 余额 / 订阅额度
+  displayBalanceOrQuota(stats);
+
+  // 今日（日期取 daily_usage 末项，回退 today 自带）
+  const daily = Array.isArray(stats.daily_usage) ? stats.daily_usage : [];
+  const todayDate = (daily.length && daily[daily.length - 1].date) || today.date || '';
+  if (Object.keys(today).length) {
     console.log('');
-    console.log('今日:');
-    const todayParts = [];
-    if (asNumber(today.requests) !== null) todayParts.push(`请求 ${formatNumber(today.requests)} 次`);
-    if (asNumber(today.total_tokens) !== null) todayParts.push(`Token ${formatCompactNumber(today.total_tokens)}`);
-    if (asNumber(today.input_tokens) !== null) todayParts.push(`输入 ${formatCompactNumber(today.input_tokens)}`);
-    if (asNumber(today.output_tokens) !== null) todayParts.push(`输出 ${formatCompactNumber(today.output_tokens)}`);
-    if (asNumber(today.cache_read_tokens) !== null) todayParts.push(`缓存读 ${formatCompactNumber(today.cache_read_tokens)}`);
-    if (asNumber(today.cache_creation_tokens) !== null) todayParts.push(`缓存写 ${formatCompactNumber(today.cache_creation_tokens)}`);
-    if (todayParts.length) console.log(`  ${todayParts.join(' | ')}`);
-    if (asNumber(today.cost) !== null) console.log(`  费用: ${formatCost(today.cost)}`);
+    console.log(`[今日${todayDate ? ' ' + todayDate : ''}]`);
+    const head = [];
+    if (asNumber(today.requests) !== null) head.push(`请求 ${formatNumber(today.requests)} 次`);
+    if (asNumber(today.total_tokens) !== null) head.push(`Token ${formatCompactNumber(today.total_tokens)}`);
+    if (asNumber(today.cost) !== null) head.push(`费用 ${formatCost(today.cost)}`);
+    if (head.length) console.log(`  ${head.join(' | ')}`);
+
+    const detail = [];
+    if (asNumber(today.input_tokens) !== null) detail.push(`输入 ${formatCompactNumber(today.input_tokens)}`);
+    if (asNumber(today.output_tokens) !== null) detail.push(`输出 ${formatCompactNumber(today.output_tokens)}`);
+    const cacheRead = asNumber(today.cache_read_tokens);
+    const cacheWrite = asNumber(today.cache_creation_tokens) !== null
+      ? asNumber(today.cache_creation_tokens) : asNumber(today.cache_write_tokens);
+    if (cacheRead !== null) detail.push(`缓存读 ${formatCompactNumber(cacheRead)}`);
+    if (cacheWrite !== null) detail.push(`缓存写 ${formatCompactNumber(cacheWrite)}`);
+    if (detail.length) console.log(`  ${detail.join(' | ')}`);
   }
 
-  if (Object.keys(total).length > 0 && total !== today) {
-    const totalRequests = asNumber(total.requests);
-    const totalCost = asNumber(total.cost);
-    if (totalRequests !== null || totalCost !== null) {
-      console.log('');
-      console.log('累计:');
-      const parts = [];
-      if (totalRequests !== null) parts.push(`请求 ${formatNumber(total.requests)} 次`);
-      if (asNumber(total.total_tokens) !== null) parts.push(`Token ${formatCompactNumber(total.total_tokens)}`);
-      if (totalCost !== null) parts.push(`费用 ${formatCost(total.cost)}`);
-      if (parts.length) console.log(`  ${parts.join(' | ')}`);
-    }
+  // 累计
+  if ((asNumber(total.requests) !== null || asNumber(total.cost) !== null) && total !== today) {
+    console.log('');
+    console.log('[累计]');
+    const parts = [];
+    if (asNumber(total.requests) !== null) parts.push(`请求 ${formatNumber(total.requests)} 次`);
+    if (asNumber(total.total_tokens) !== null) parts.push(`Token ${formatCompactNumber(total.total_tokens)}`);
+    if (asNumber(total.cost) !== null) parts.push(`费用 ${formatCost(total.cost)}`);
+    if (parts.length) console.log(`  ${parts.join(' | ')}`);
   }
 
-  const usage = stats.usage || {};
+  // 实时
   const rpm = asNumber(usage.rpm);
   const tpm = asNumber(usage.tpm);
-  const avgDuration = asNumber(usage.average_duration_ms);
-  if (rpm !== null || tpm !== null || avgDuration !== null) {
+  const avg = asNumber(usage.average_duration_ms);
+  if (rpm !== null || tpm !== null || avg !== null) {
+    console.log('');
+    console.log('[实时]');
     const parts = [];
     if (rpm !== null) parts.push(`RPM ${rpm}`);
-    if (tpm !== null) parts.push(`TPM ${tpm}`);
-    if (avgDuration !== null) parts.push(`平均耗时 ${avgDuration} ms`);
-    console.log(`实时: ${parts.join(' | ')}`);
+    if (tpm !== null) parts.push(`TPM ${formatCompactNumber(tpm)}`);
+    if (avg !== null) parts.push(`平均 ${formatDuration(avg)}`);
+    console.log(`  ${parts.join(' | ')}`);
   }
 
-  if (Array.isArray(stats.model_stats) && stats.model_stats.length > 0) {
+  // 模型用量（按费用降序，列对齐）
+  const models = Array.isArray(stats.model_stats) ? stats.model_stats.slice() : [];
+  if (models.length) {
+    models.sort((a, b) => (asNumber(b.cost) || 0) - (asNumber(a.cost) || 0));
+    const nameWidth = Math.max(...models.map(m => String(m.model || '-').length));
+    const reqWidth = Math.max(...models.map(m => formatNumber(m.requests).length));
+    const tokWidth = Math.max(...models.map(m => formatCompactNumber(m.total_tokens).length));
+    const costWidth = Math.max(...models.map(m => formatCost(m.cost).length));
     console.log('');
-    console.log('模型用量:');
-    for (const m of stats.model_stats) {
-      const parts = [
-        `${m.model || '-'}`,
-        `请求 ${formatNumber(m.requests)} 次`,
-        `Token ${formatCompactNumber(m.total_tokens)}`,
-        `费用 ${formatCost(m.cost)}`
-      ];
-      console.log(`  - ${parts.join(' | ')}`);
+    console.log('[模型用量]');
+    for (const m of models) {
+      const name = String(m.model || '-').padEnd(nameWidth);
+      const req = formatNumber(m.requests).padStart(reqWidth);
+      const tok = formatCompactNumber(m.total_tokens).padStart(tokWidth);
+      const cost = formatCost(m.cost).padStart(costWidth);
+      console.log(`  ${name} | ${req} 次 | ${tok} | ${cost}`);
     }
   }
 
@@ -534,11 +530,10 @@ async function usageCommand(args = []) {
     if (service.configs.length === 0) continue;
 
     hasAnyConfig = true;
-    console.log('');
-    console.log(`${'='.repeat(50)}`);
-    console.log(`=== ${service.name} 用量统计 ===`);
-    console.log(`${'='.repeat(50)}`);
-    console.log('');
+    if (!outputJson) {
+      console.log('');
+      console.log(`════════ ${service.name} 用量 ════════`);
+    }
 
     allResults[service.name] = [];
 
@@ -549,9 +544,9 @@ async function usageCommand(args = []) {
     const requests = configsToUse.map(config => {
       const effectiveKey = overrideKey || config.authToken;
       const sourceLabel = overrideKey ? `命令行 Key (${config.source})` : config.source;
-      console.log(`[查询中] ${sourceLabel} - Token: ${maskToken(effectiveKey)}`);
       return {
         sourceLabel,
+        tokenMask: maskToken(effectiveKey),
         promise: queryUnifiedUsage(config.baseUrl, effectiveKey)
       };
     });
@@ -560,21 +555,25 @@ async function usageCommand(args = []) {
 
     for (let i = 0; i < results.length; i += 1) {
       const outcome = results[i];
-      const sourceLabel = requests[i].sourceLabel;
+      const { sourceLabel, tokenMask } = requests[i];
       const result = outcome.status === 'fulfilled'
         ? outcome.value
         : { error: outcome.reason ? outcome.reason.message : '查询失败' };
 
       if (result.error) {
-        console.log(`[错误] ${result.error}`);
-        console.log('');
+        if (!outputJson) {
+          console.log('');
+          console.log(`来源: ${sourceLabel} · ${tokenMask}`);
+          console.log(`[错误] ${result.error}`);
+        }
         allResults[service.name].push({
           source: sourceLabel,
           error: result.error
         });
       } else {
         if (!outputJson) {
-          displayUnifiedUsageStats(result.stats, result.origin, sourceLabel);
+          console.log('');
+          displayUnifiedUsageStats(result.stats, result.origin, sourceLabel, tokenMask);
         }
         allResults[service.name].push({
           source: sourceLabel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aihezu",
-  "version": "2.8.12",
+  "version": "2.8.13",
   "description": "AI 开发环境配置工具 - 支持 Claude Code, Codex, Google Gemini 的本地化配置、代理设置与缓存清理",
   "main": "bin/aihezu.js",
   "bin": {