@leo000001/opencode-quota-sidebar 4.0.0 → 4.0.2

package/README.md

@@ -325,6 +325,12 @@ Examples:
 
 The package exposes a standalone CLI dashboard. After installing globally or making the `bin` available:
 
+```bash
+npm install -g @leo000001/opencode-quota-sidebar
+```
+
+If you prefer not to install globally, you can also run it with `npx @leo000001/opencode-quota-sidebar <args>`.
+
 ```bash
 # Current period (single snapshot)
 opencode-quota day          # today

package/README.zh-CN.md

@@ -332,6 +332,12 @@ usage 聚合采用增量模式。插件会为每个 session 维护 cursor，优
 
 这个包同时提供一个独立 CLI dashboard。全局安装或让 `bin` 可执行后：
 
+```bash
+npm install -g @leo000001/opencode-quota-sidebar
+```
+
+如果不想全局安装，也可以直接用 `npx @leo000001/opencode-quota-sidebar <args>` 运行。
+
 ```bash
 # 当前周期（单次快照）
 opencode-quota day          # 今天

package/dist/format.js

@@ -409,15 +409,22 @@ function usageDetailLines(usage, cacheMetrics, options) {
         `I${numberToken(usage.input)}`,
         `O${numberToken(usage.output)}`,
     ]);
-    const secondary = [];
+    const secondaryGroups = [];
+    const coverageTokens = [];
+    if (cacheMetrics.cachedRatio !== undefined) {
+        coverageTokens.push(`Cd ${formatPercent(cacheMetrics.cachedRatio, 0)}`);
+    }
+    if (coverageTokens.length > 0)
+        secondaryGroups.push(coverageTokens);
+    const cacheTokens = [];
     const pushCacheRead = () => {
         if (usage.cacheRead > 0) {
-            secondary.push(`CR${numberToken(usage.cacheRead)}`);
+            cacheTokens.push(`R${numberToken(usage.cacheRead)}`);
         }
     };
     const pushCacheWrite = () => {
         if (usage.cacheWrite > 0) {
-            secondary.push(`CW${numberToken(usage.cacheWrite)}`);
+            cacheTokens.push(`W${numberToken(usage.cacheWrite)}`);
         }
     };
     if (options.cacheReadFirst) {
@@ -428,11 +435,22 @@ function usageDetailLines(usage, cacheMetrics, options) {
         pushCacheWrite();
         pushCacheRead();
     }
-    if (cacheMetrics.cachedRatio !== undefined) {
-        secondary.push(`Cd${formatPercent(cacheMetrics.cachedRatio, 0)}`);
+    if (cacheTokens.length > 0) {
+        if (coverageTokens.length > 0) {
+            const combined = [...coverageTokens, ...cacheTokens].join(' ');
+            if (fitsLine(combined, width)) {
+                secondaryGroups.length = 0;
+                secondaryGroups.push([...coverageTokens, ...cacheTokens]);
+            }
+            else {
+                secondaryGroups.push(cacheTokens);
+            }
+        }
+        else {
+            secondaryGroups.push(cacheTokens);
+        }
     }
-    if (secondary.length > 0)
-        groups.push(secondary);
+    groups.push(...secondaryGroups);
     if (options.showCost && usage.apiCost > 0) {
         groups.push([costToken(usage.apiCost)]);
     }
@@ -453,6 +471,65 @@ function usageDetailLines(usage, cacheMetrics, options) {
     }
     return packed;
 }
+function packUsageGroups(groups, width) {
+    const packed = [];
+    for (const group of groups) {
+        let current = '';
+        for (const token of group) {
+            const candidate = current ? `${current} ${token}` : token;
+            if (!current || fitsLine(candidate, width)) {
+                current = candidate;
+                continue;
+            }
+            packed.push(current);
+            current = token;
+        }
+        if (current)
+            packed.push(current);
+    }
+    return packed;
+}
+function readableSidebarUsageLines(usage, cacheMetrics, width, showCost) {
+    const groups = [
+        [
+            `Req ${shortNumber(usage.assistantMessages, 1)}`,
+            `In ${panelNumber(usage.input)}`,
+            `Out ${panelNumber(usage.output)}`,
+        ],
+    ];
+    if (cacheMetrics.cachedRatio !== undefined) {
+        const cacheTokens = [
+            `Cached ${formatPercent(cacheMetrics.cachedRatio, 0)}`,
+        ];
+        if (usage.cacheRead > 0)
+            cacheTokens.push(`Read ${panelNumber(usage.cacheRead)}`);
+        if (usage.cacheWrite > 0)
+            cacheTokens.push(`Write ${panelNumber(usage.cacheWrite)}`);
+        groups.push(cacheTokens);
+    }
+    else {
+        const cacheTokens = [];
+        if (usage.cacheRead > 0)
+            cacheTokens.push(`Cache Read ${panelNumber(usage.cacheRead)}`);
+        if (usage.cacheWrite > 0)
+            cacheTokens.push(`Write ${panelNumber(usage.cacheWrite)}`);
+        if (cacheTokens.length > 0)
+            groups.push(cacheTokens);
+    }
+    const summaryTokens = [];
+    if (showCost && usage.apiCost > 0) {
+        summaryTokens.push(`Est ${formatApiCostValue(usage.apiCost)}`);
+    }
+    if (summaryTokens.length > 0)
+        groups.push(summaryTokens);
+    const allTokens = groups.flat();
+    if (allTokens.some((token) => !fitsLine(token, width)))
+        return undefined;
+    const packed = packUsageGroups(groups, width);
+    if (packed.length > 4)
+        return undefined;
+    return packed;
+}
 function formatQuotaPercent(value, options) {
     const missing = options?.missing ?? '-';
     if (value === undefined)
@@ -611,9 +688,13 @@ export function renderSidebarContextLine(tokens, percent, width) {
 export function renderSidebarUsageLines(usage, config, options) {
     const width = Math.max(8, Math.floor(config.sidebar.width || 36));
     const cacheMetrics = getCacheCoverageMetrics(usage);
+    const showCost = options?.showCost ?? config.sidebar.showCost;
+    const readable = readableSidebarUsageLines(usage, cacheMetrics, width, showCost);
+    if (readable)
+        return readable.map((line) => fitLine(line, width));
     return usageDetailLines(usage, cacheMetrics, {
         width,
-        showCost: options?.showCost ?? config.sidebar.showCost,
+        showCost,
         numberToken: panelNumber,
         costToken: (value) => `Est ${formatApiCostValue(value)}`,
         cacheReadFirst: true,

package/dist/title.js

@@ -3,6 +3,7 @@ function sanitizeTitleFragment(value) {
         .replace(/[\x00-\x1F\x7F-\x9F]/g, ' ')
         .trimEnd();
 }
+const compactUsageTokenPattern = '(?:R\\$?[\\d.,]+[kKmM]?|W\\$?[\\d.,]+[kKmM]?|I\\$?[\\d.,]+[kKmM]?|O\\$?[\\d.,]+[kKmM]?|CR\\$?[\\d.,]+[kKmM]?|CW\\$?[\\d.,]+[kKmM]?|R(?:ead)?\\s+\\$?[\\d.,]+[kKmM]?|W(?:rite)?\\s+\\$?[\\d.,]+[kKmM]?|Cd\\s*\\d[\\d.,]*%|CC\\d[\\d.,]*%|CRC\\d[\\d.,]*%|API\\$\\S+|Est\\$\\S+)';
 function isCoreDecoratedDetail(line) {
     if (!line)
         return false;
@@ -29,7 +30,7 @@ function isCoreDecoratedDetail(line) {
         return true;
     if (/^Est\$\S+$/.test(line))
         return true;
-    if (/^(?:R\$?[\d.,]+[kKmM]?|I\$?[\d.,]+[kKmM]?|O\$?[\d.,]+[kKmM]?|CR\$?[\d.,]+[kKmM]?|CW\$?[\d.,]+[kKmM]?|Cd\d[\d.,]*%|CC\d[\d.,]*%|CRC\d[\d.,]*%|API\$\S+|Est\$\S+)(?:\s+(?:R\$?[\d.,]+[kKmM]?|I\$?[\d.,]+[kKmM]?|O\$?[\d.,]+[kKmM]?|CR\$?[\d.,]+[kKmM]?|CW\$?[\d.,]+[kKmM]?|Cd\d[\d.,]*%|CC\d[\d.,]*%|CRC\d[\d.,]*%|API\$\S+|Est\$\S+))*$/.test(line)) {
+    if (new RegExp(`^${compactUsageTokenPattern}(?:\\s+${compactUsageTokenPattern})*$`).test(line)) {
         return true;
     }
     // Single-line compact mode compatibility.
@@ -125,7 +126,7 @@ function isSingleLineDecoratedPrefix(line) {
         return true;
     if (/^Est\$\S+(?:~|$)/.test(line))
         return true;
-    if (/^(?:R\$?[\d.,]+[kKmM]?|I\$?[\d.,]+[kKmM]?|O\$?[\d.,]+[kKmM]?|CR\$?[\d.,]+[kKmM]?|CW\$?[\d.,]+[kKmM]?|Cd\d[\d.,]*%|CC\d[\d.,]*%|CRC\d[\d.,]*%|API\$\S+|Est\$\S+)(?:\s+(?:R\$?[\d.,]+[kKmM]?|I\$?[\d.,]+[kKmM]?|O\$?[\d.,]+[kKmM]?|CR\$?[\d.,]+[kKmM]?|CW\$?[\d.,]+[kKmM]?|Cd\d[\d.,]*%|CC\d[\d.,]*%|CRC\d[\d.,]*%|API\$\S+|Est\$\S+))*?(?:~|$)/.test(line)) {
+    if (new RegExp(`^${compactUsageTokenPattern}(?:\\s+${compactUsageTokenPattern})*?(?:~|$)`).test(line)) {
         return true;
     }
     return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leo000001/opencode-quota-sidebar",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "OpenCode plugin that shows quota and token usage in TUI sidebar panels and compact session titles",
   "type": "module",
   "main": "dist/index.js",