minimax-status 1.2.1 → 1.2.2

package/cli/api.js

@@ -81,10 +81,11 @@ class MinimaxAPI {
 
     try {
       const response = await axios.get(
-        `https://www.minimaxi.com/v1/token_plan/remains`,
+        `https://www.minimaxi.com/v1/api/openplatform/coding_plan/remains`,
         {
           headers: {
             Authorization: `Bearer ${this.token}`,
+            referer: "https://platform.minimaxi.com/",
             Accept: "application/json",
           },
           timeout: 10000, // 10秒超时
@@ -296,24 +297,33 @@ class MinimaxAPI {
     const endTime = new Date(modelData.end_time);
 
     // Calculate counts
-    // 新接口 usage_count 是已使用次数（正确值）
-    const usedCount = modelData.current_interval_usage_count;
-    const remainingCount = modelData.current_interval_total_count - usedCount;
-
-    // Calculate percentage - 基于已使用次数的百分比
-    const usedPercentage = Math.round(
-      (usedCount / modelData.current_interval_total_count) * 100
-    );
+    // ⚠ 新接口 usage_count 在 video 上语义不一致（usage=3/total=3 但 remaining_percent=100
+    // 表示 0% 已用），用 usedPercentage 反算 used（用户视角 = 基于官网显示的已用%）。
+    // 这让 video: total=3, usedPercentage=0 → used=0, remaining=3（"3/3 剩余"），跟官网一致。
+    const totalCount = modelData.current_interval_total_count;
+    const remainingPct = modelData.current_interval_remaining_percent;
+    const usedPercentage = remainingPct !== undefined && remainingPct !== null
+      ? Math.round(100 - remainingPct)
+      : (totalCount > 0 ? Math.round((modelData.current_interval_usage_count / totalCount) * 100) : 0);
+    const usedCount = totalCount > 0 ? Math.round((totalCount * usedPercentage) / 100) : 0;
+    const remainingCount = totalCount - usedCount;
 
     // Calculate remaining time in human-readable format
     const remainingMs = modelData.remains_time;
     const hours = Math.floor(remainingMs / (1000 * 60 * 60));
     const minutes = Math.floor((remainingMs % (1000 * 60 * 60)) / (1000 * 60));
 
-    // Calculate weekly usage data
+    // Calculate weekly usage data — 同样基于 remaining_percent 反转
     const weeklyUsed = modelData.current_weekly_usage_count;
     const weeklyTotal = modelData.current_weekly_total_count;
-    const weeklyPercentage = weeklyTotal > 0 ? Math.floor((weeklyUsed / weeklyTotal) * 100) : 0;
+    const weeklyRemainingPct = modelData.current_weekly_remaining_percent;
+    const weeklyPercentage = weeklyRemainingPct !== undefined && weeklyRemainingPct !== null
+      ? Math.round(100 - weeklyRemainingPct)
+      : (weeklyTotal > 0 ? Math.floor((weeklyUsed / weeklyTotal) * 100) : 0);
+    // ⚠ Bug fix: 旧逻辑 weeklyTotal === 0 判 unlimited，但主人账号的 `general`
+    // 模型 weekly_total=0、weekly_remaining_percent=97（3% 已用，有数据）。
+    // 真正的"无限"应当是 total=0 **且** remaining_percent 也没返回。
+    const weeklyUnlimited = weeklyTotal === 0 && (modelData.current_weekly_remaining_percent == null);
     const weeklyRemainingMs = modelData.weekly_remains_time;
     const weeklyDays = Math.floor(weeklyRemainingMs / (1000 * 60 * 60 * 24));
     const weeklyHours = Math.floor((weeklyRemainingMs % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
@@ -395,7 +405,7 @@ class MinimaxAPI {
         percentage: weeklyPercentage,
         days: weeklyDays,
         hours: weeklyHours,
-        unlimited: weeklyTotal === 0,
+        unlimited: weeklyUnlimited,
         text: weeklyDays > 0
           ? `${weeklyDays} 天 ${weeklyHours} 小时后重置`
           : `${weeklyHours} 小时后重置`,
@@ -417,16 +427,25 @@ class MinimaxAPI {
 
     return apiData.model_remains.map(modelData => {
       const totalCount = modelData.current_interval_total_count;
-      // 新接口 usage_count 是已使用次数（正确值）
-      const usedCount = modelData.current_interval_usage_count;
+      // ⚠ 新接口 usage_count 在 video 上语义不一致；用 usedPercentage 反算 used
+      // 跟官网一致：video total=3, used%=0 → used=0, remaining=3（"3/3 剩余"）
+      const remainingPct = modelData.current_interval_remaining_percent;
+      const usedPercentage = remainingPct !== undefined && remainingPct !== null
+        ? Math.round(100 - remainingPct)
+        : (totalCount > 0 ? Math.round((modelData.current_interval_usage_count / totalCount) * 100) : 0);
+      const usedCount = totalCount > 0 ? Math.round((totalCount * usedPercentage) / 100) : 0;
       const remainingCount = totalCount - usedCount;
-      const usedPercentage = totalCount > 0 ? Math.round((usedCount / totalCount) * 100) : 0;
 
-      // Weekly data
+      // Weekly data — 同样基于 remaining_percent 反转
       const weeklyTotal = modelData.current_weekly_total_count || 0;
       const weeklyUsed = modelData.current_weekly_usage_count || 0;
       const weeklyRemainingCount = weeklyTotal - weeklyUsed;
-      const weeklyPercentage = weeklyTotal > 0 ? Math.floor((weeklyUsed / weeklyTotal) * 100) : 0;
+      const weeklyRemainingPct = modelData.current_weekly_remaining_percent;
+      const weeklyPercentage = weeklyRemainingPct !== undefined && weeklyRemainingPct !== null
+        ? Math.round(100 - weeklyRemainingPct)
+        : (weeklyTotal > 0 ? Math.floor((weeklyUsed / weeklyTotal) * 100) : 0);
+      // Bug fix: 同 parseUsageData — 真正"无限"是 total=0 且 remaining_percent 也没
+      const weeklyUnlimited = weeklyTotal === 0 && (modelData.current_weekly_remaining_percent == null);
 
       return {
         name: modelData.model_name,
@@ -434,7 +453,7 @@ class MinimaxAPI {
         remaining: remainingCount,
         total: totalCount,
         percentage: usedPercentage,
-        unlimited: weeklyTotal === 0,
+        unlimited: weeklyUnlimited,
         weeklyPercentage,
         weeklyTotal,
         weeklyRemainingCount,

package/cli/index.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 // Force color output even in non-TTY environments (e.g., Claude Code statusline)
 process.env.FORCE_COLOR = "1";

package/cli/renderer.js

@@ -100,13 +100,17 @@ class Renderer {
       }
     }
 
-    if (usage && usage.total > 0) {
+    // 5h 限额 block — 总是显示（即使 total=0 也要显示百分比 + 5h 前缀）
+    // ⚠ 不再用 usage.total > 0 过滤（5h 限额数据对 general 模型 total=0 也要显示）
+    if (usage && usage.percentage !== undefined && usage.percentage !== null) {
       let bg = '#065F46'; // safe (Emerald 800 - dark enough for white text)
       if (usagePercentage >= 95) bg = '#991B1B'; // danger (Red 800)
       else if (usagePercentage >= 75) bg = '#9A3412'; // warn (Orange 800)
 
-      let usageText = ` ${usagePercentage}%  (${usage.remaining}/${usage.total}) `;
-      
+      // total=0 时不显示 (X/Y) 段
+      const usedTotalSuffix = usage.total > 0 ? ` (${usage.remaining}/${usage.total})` : '';
+      let usageText = ` 5h ${usagePercentage}%${usedTotalSuffix} `;
+
       if (weekly) {
         if (weekly.unlimited) {
           usageText += `· W ∞ `;

package/cli/status.js

@@ -35,7 +35,7 @@ class StatusBar {
 
     const lines = [];
     lines.push('');
-    lines.push(chalk.bold('📊 Token 消耗统计'));
+    lines.push(chalk.bold('Token 消耗统计'));
 
     // 计算表格宽度
     const leftWidth = 12; // "昨日消耗:  "
@@ -63,7 +63,7 @@ class StatusBar {
 
     const lines = [];
     lines.push('');
-    lines.push(chalk.bold('📋 所有模型额度'));
+    lines.push(chalk.bold('所有模型额度'));
 
     // 简化模型名称映射
     const shortName = (name) => {
@@ -86,9 +86,9 @@ class StatusBar {
 
     // 显示状态
     const getStatusText = (percentage) => {
-      if (percentage >= 85) return '⛔';
-      if (percentage >= 60) return '⚡';
-      return '✓';
+      if (percentage >= 85) return 'X';
+      if (percentage >= 60) return '!';
+      return 'OK';
     };
 
     // 每行显示一个模型
@@ -97,7 +97,8 @@ class StatusBar {
       const color = getStatusColor(model.percentage);
       const status = getStatusText(model.percentage);
       const pct = `${model.percentage}%`;
-      const usedTotal = `${model.used}/${model.total}`;
+      // total=0 时不显示 X/Y（避免 0/0 这种无数据展示）
+      const usedTotal = model.total > 0 ? `${model.used}/${model.total}` : '—';
 
       lines.push(`  ${color(short.padEnd(15))} ${color(pct.padEnd(5))} ${color(usedTotal.padEnd(12))} ${color(status)}`);
     }
@@ -143,13 +144,6 @@ class StatusBar {
 
     contentLines.push('');
 
-    // 模型名称
-    contentLines.push(`${chalk.cyan('当前模型:')} ${modelName}`);
-
-    // 时间窗口
-    const timeWindowText = `${timeWindow.start}-${timeWindow.end}(${timeWindow.timezone})`;
-    contentLines.push(`${chalk.cyan('时间窗口:')} ${timeWindowText}`);
-
     // 剩余时间
     contentLines.push(`${chalk.cyan('剩余时间:')} ${remaining.text}`);
 
@@ -158,8 +152,10 @@ class StatusBar {
     // 使用百分比与进度条
     contentLines.push(`${chalk.cyan('已用额度:')} ${progressBar} ${usage.percentage}%`);
 
-    // 剩余次数
-    contentLines.push(`${chalk.dim('     剩余:')} ${usage.remaining}/${usage.total} 次调用`);
+    // 剩余次数（total=0 时不显示）
+    if (usage.total > 0) {
+      contentLines.push(`${chalk.dim('     剩余:')} ${usage.remaining}/${usage.total} 次调用`);
+    }
 
     // 周用量（如果有数据）
     if (weekly) {
@@ -176,7 +172,9 @@ class StatusBar {
           15 - Math.floor((weeklyPercent / 100) * 15),
           weeklyPercent
         );
-        contentLines.push(`${chalk.cyan('周限额:')} ${weeklyColor(weeklyProgress)} ${weeklyColor(weekly.percentage + '%')} (${weekly.used}/${weekly.total})`);
+        // total=0 时不显示 (X/Y)
+        const weeklyUsedTotal = weekly.total > 0 ? ` (${weekly.used}/${weekly.total})` : '';
+        contentLines.push(`${chalk.cyan('周限额:')} ${weeklyColor(weeklyProgress)} ${weeklyColor(weekly.percentage + '%')}${weeklyUsedTotal}`);
         contentLines.push(`${chalk.dim('     重置:')} ${weekly.text}`);
       }
     }
@@ -249,13 +247,13 @@ class StatusBar {
   }
 
   getStatus(percentage) {
-    // 基于已使用百分比
+    // 基于已使用百分比（去 emoji 跟 vscode 1.0.7 风格一致）
     if (percentage >= 85) {
-      return '⛔ 即将用完';
+      return '即将用完';
     } else if (percentage >= 60) {
-      return '⚡ 注意使用';
+      return '注意使用';
     } else {
-      return '✓ 正常使用';
+      return '正常使用';
     }
   }
 
@@ -287,7 +285,7 @@ class StatusBar {
 
     const lines = [];
     lines.push('');
-    lines.push(chalk.bold('📋 所有模型额度'));
+    lines.push(chalk.bold('所有模型额度'));
 
     // 表头
     lines.push(chalk.gray('─'.repeat(55)));

package/cli/statusbar.js

@@ -10,7 +10,7 @@ class StatusBar {
   }
 
   render() {
-    const { usage, remaining, modelName, weekly } = this.data;
+    const { usage, remaining, weekly, expiry } = this.data;
     const percentage = usage.percentage;
 
     // 基于已使用百分比：使用越多越危险
@@ -21,22 +21,29 @@ class StatusBar {
       color = chalk.yellow;
     }
 
-    const statusIcon = percentage >= 85 ? '⚠' : percentage >= 60 ? '⚡' : '✓';
     const remainingText = remaining.hours > 0
       ? `${remaining.hours}h${remaining.minutes}m`
       : `${remaining.minutes}m`;
 
+    // total=0 时不显示 X/Y（避免 0/0 这种无数据展示，保留百分比）
+    const usedTotalSuffix = usage.total > 0 ? ` (${usage.used}/${usage.total})` : '';
+
     let weeklyStr = '';
     if (weekly) {
       if (weekly.unlimited) {
-        weeklyStr = ` ${chalk.blue('W')} ♾️`;
+        weeklyStr = ` ${chalk.blue('W')} ∞`;
       } else {
         const weeklyColor = weekly.percentage >= 85 ? chalk.red : weekly.percentage >= 60 ? chalk.yellow : chalk.green;
-        weeklyStr = ` ${chalk.blue('W')} ${weeklyColor(weekly.percentage + '%')}`;
+        // total=0 时不显示 (X/Y)
+        const weeklySuffix = weekly.total > 0 ? ` (${weekly.used}/${weekly.total})` : '';
+        weeklyStr = ` ${chalk.blue('W')} ${weeklyColor(weekly.percentage + '%')}${weeklySuffix}`;
       }
     }
 
-    return `${color('●')} ${modelName} ${color(percentage + '%')} (${usage.used}/${usage.total}) ${remainingText}${weeklyStr} ${statusIcon}`;
+    // 到期信息（剩 N 天）— 与 claude-code statusline 对齐
+    const expiryStr = expiry ? ` 剩${expiry.daysRemaining}天` : '';
+
+    return `${color(percentage + '%')}${usedTotalSuffix} ${remainingText}${weeklyStr}${expiryStr}`;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "minimax-status",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "MiniMax Claude Code 使用状态监控工具",
   "bin": {
     "minimax-status": "cli/index.js",