ccstatusline-usage 2.3.11 → 2.3.13

package/README.md

@@ -67,6 +67,17 @@ Session: [████░░░░░░░░░░░] 27.0% | Weekly: [██
 
 ## 🆕 Recent Updates
 
+### [v2.3.13](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.13) - Fix timer color regression from v2.3.12
+
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Fix timer color** — In v2.3.12, the Reset Timer widget color setting was applied to both the `Extra: €X/€Y` output and the countdown timer (e.g. `4:28 hr`), causing the timer to appear red. The dark red is now applied inline only to the `Extra:` path; the countdown timer respects the widget's configured color as before.
+
+### [v2.3.12](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.12) - Split bar for extra usage, stable effective-total, 100% clamp
+
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Split bar at 100%** — Session and Weekly usage bars switch to a split display when the limit is reached and extra usage is active: left half (full) shows the base usage, right half (dark red) shows how much of the extra budget has been spent.
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Stable effective-total** — Set `extraUsageBalance` (cents) in `~/.config/ccstatusline/settings.json` to your spending ceiling (`spent + account_balance` at config time, e.g. €153.23 + €56.06 → `20929`). The denominator stays fixed as spending continues, capped at the API monthly limit. Without this setting, the monthly limit is used directly.
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Extra usage color via config** — The `Extra: €X/€Y` Reset Timer output color is now driven by the widget's color setting (configurable in TUI or settings.json) instead of being hardcoded.
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Usage clamped to 100%** — Session and Weekly bars and percentage labels cap at 100% even if the API returns values above 100.
+
 ### [v2.3.11](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.11) - Fix dual-cache drift between Weekly Usage and Weekly Pace
 
 - [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Unified usage data source** — Session Usage, Weekly Usage, and Reset Timer widgets now read from the shared `context.usageData` pipeline instead of maintaining a separate API cache. Previously, around the weekly reset boundary the two caches could drift and show contradictory data (e.g. `Weekly: 99%` alongside `Pace: D1/7 +2%`). Deleted ~330 lines of duplicate fetching/caching infrastructure from `ApiUsage.tsx` (556 → 227 lines). Upstream merge: #278 (JSONL token overcounting fix), #283 (model display name parenthetical strip — integrated into fork's existing `[1m]`-aware display logic).

package/dist/ccstatusline.js

@@ -55593,7 +55593,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.11";
+var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.13";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -62130,6 +62130,13 @@ function getUsageErrorMessage(error48) {
       return "[Parse Error]";
   }
 }
+function makeSplitUsageBar(extraPercent, totalWidth) {
+  const halfWidth = Math.floor((totalWidth - 1) / 2);
+  const clamped = Math.max(0, Math.min(100, extraPercent));
+  const rightFilled = Math.round(clamped / 100 * halfWidth);
+  const rightEmpty = halfWidth - rightFilled;
+  return "[" + "█".repeat(halfWidth) + "|" + DARK_RED_OPEN + "█".repeat(rightFilled) + "░".repeat(rightEmpty) + DARK_RED_CLOSE + "]";
+}
 function makePendulumBar(delta, halfWidth = 7) {
   const clamped = Math.max(-100, Math.min(100, delta));
   const fill2 = Math.min(halfWidth, Math.round(Math.abs(clamped) / 100 * halfWidth));
@@ -62138,6 +62145,7 @@ function makePendulumBar(delta, halfWidth = 7) {
   }
   return "[" + "░".repeat(halfWidth) + "|" + "█".repeat(fill2) + "░".repeat(halfWidth - fill2) + "]";
 }
+var DARK_RED_OPEN = "\x1B[38;2;204;0;0m", DARK_RED_CLOSE = "\x1B[39m";
 var init_usage_windows = __esm(() => {
   init_jsonl();
   init_usage_types();
@@ -63140,13 +63148,28 @@ function getBarWidth(size2) {
   return DEFAULT_BAR_WIDTH;
 }
 function makeProgressBar(percent, width = DEFAULT_BAR_WIDTH) {
-  const filled = Math.round(percent / 100 * width);
+  const clamped = Math.min(100, Math.max(0, percent));
+  const filled = Math.round(clamped / 100 * width);
   const empty2 = width - filled;
   return "[" + "█".repeat(filled) + "░".repeat(empty2) + "]";
 }
 function formatUsageBar(label, shortLabel, percent, size2) {
   const bar = makeProgressBar(percent, getBarWidth(size2));
-  return `${size2 === "mobile" ? shortLabel : label}: ${bar} ${percent.toFixed(1)}%`;
+  const display = Math.min(100, percent);
+  return `${size2 === "mobile" ? shortLabel : label}: ${bar} ${display.toFixed(1)}%`;
+}
+function formatSplitUsageBar(label, shortLabel, extraPercent, size2) {
+  const bar = makeSplitUsageBar(extraPercent, getBarWidth(size2));
+  return `${size2 === "mobile" ? shortLabel : label}: ${bar} 100.0%`;
+}
+function computeEffectiveTotal(extraUsed, extraLimit, ceiling) {
+  if (ceiling === undefined)
+    return extraLimit;
+  return Math.min(ceiling, extraLimit);
+}
+function computeExtraPercent(extraUsed, extraLimit, ceiling) {
+  const denominator = computeEffectiveTotal(extraUsed, extraLimit, ceiling);
+  return denominator > 0 ? extraUsed / denominator * 100 : 0;
 }
 function getCurrencySymbol() {
   try {
@@ -63177,7 +63200,7 @@ class SessionUsageWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
-  render(_item, context, _settings) {
+  render(_item, context, settings) {
     if (context.isPreview)
       return "Session: [███░░░░░░░░░░░░] 20%";
     const data = context.usageData ?? {};
@@ -63185,7 +63208,14 @@ class SessionUsageWidget {
       return getUsageErrorMessage(data.error);
     if (data.sessionUsage === undefined)
       return null;
-    return formatUsageBar("Session", "S", data.sessionUsage, getDisplaySize(context));
+    const size2 = getDisplaySize(context);
+    const extraUsed = data.extraUsageUsed;
+    const extraLimit = data.extraUsageLimit;
+    if (size2 !== "mobile" && data.extraUsageEnabled === true && extraUsed !== undefined && extraLimit !== undefined && data.sessionUsage >= 100 && (data.weeklyUsage === undefined || data.weeklyUsage < 100)) {
+      const extraPercent = computeExtraPercent(extraUsed, extraLimit, settings.extraUsageBalance);
+      return formatSplitUsageBar("Session", "S", extraPercent, size2);
+    }
+    return formatUsageBar("Session", "S", data.sessionUsage, size2);
   }
   supportsRawValue() {
     return false;
@@ -63211,7 +63241,7 @@ class WeeklyUsageWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
-  render(_item, context, _settings) {
+  render(_item, context, settings) {
     if (context.isPreview)
       return "Weekly: [██░░░░░░░░░░░░░] 12%";
     const data = context.usageData ?? {};
@@ -63219,7 +63249,14 @@ class WeeklyUsageWidget {
       return getUsageErrorMessage(data.error);
     if (data.weeklyUsage === undefined)
       return null;
-    return formatUsageBar("Weekly", "W", data.weeklyUsage, getDisplaySize(context));
+    const size2 = getDisplaySize(context);
+    const extraUsed = data.extraUsageUsed;
+    const extraLimit = data.extraUsageLimit;
+    if (size2 !== "mobile" && data.extraUsageEnabled === true && extraUsed !== undefined && extraLimit !== undefined && data.weeklyUsage >= 100) {
+      const extraPercent = computeExtraPercent(extraUsed, extraLimit, settings.extraUsageBalance);
+      return formatSplitUsageBar("Weekly", "W", extraPercent, size2);
+    }
+    return formatUsageBar("Weekly", "W", data.weeklyUsage, size2);
   }
   supportsRawValue() {
     return false;
@@ -63258,9 +63295,9 @@ class ResetTimerWidget {
     const isChargedModel = is1mModel && !isOpus;
     if (data.extraUsageEnabled && data.extraUsageUsed !== undefined && data.extraUsageLimit !== undefined && (data.weeklyUsage !== undefined && data.weeklyUsage >= 100 || data.sessionUsage !== undefined && data.sessionUsage >= 100 || isChargedModel)) {
       const used = formatCents(data.extraUsageUsed);
-      const displayLimit = settings.extraUsageBalance ?? data.extraUsageLimit;
-      const limit = formatCents(displayLimit);
-      return `Extra: ${used}/${limit}`;
+      const effectiveTotal = computeEffectiveTotal(data.extraUsageUsed, data.extraUsageLimit, settings.extraUsageBalance);
+      const limit = formatCents(effectiveTotal);
+      return `${DARK_RED_OPEN2}Extra: ${used}/${limit}${DARK_RED_CLOSE2}`;
     }
     if (!data.sessionResetAt)
       return null;
@@ -63333,7 +63370,7 @@ class ContextBarWidget {
     return true;
   }
 }
-var MOBILE_THRESHOLD = 134, MEDIUM_THRESHOLD2 = 178, MOBILE_BAR_WIDTH = 4, MEDIUM_BAR_WIDTH = 8, DEFAULT_BAR_WIDTH = 15;
+var DARK_RED_OPEN2 = "\x1B[38;2;204;0;0m", DARK_RED_CLOSE2 = "\x1B[39m", MOBILE_THRESHOLD = 134, MEDIUM_THRESHOLD2 = 178, MOBILE_BAR_WIDTH = 4, MEDIUM_BAR_WIDTH = 8, DEFAULT_BAR_WIDTH = 15;
 var init_ApiUsage = __esm(() => {
   init_usage();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline-usage",
-  "version": "2.3.11",
+  "version": "2.3.13",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",