ccstatusline-usage 2.3.13 → 2.3.15

package/README.md

@@ -32,7 +32,7 @@ This fork adds API-based usage widgets beyond the upstream:
 
 - **Session/Weekly Usage** - Real utilization from Anthropic API with progress bars
 - **Weekly Pace** - Pendulum bar showing if you're ahead or behind expected usage pace
-- **Reset Timer** - Time until 5-hour session window resets
+- **Reset Timer** - Time until weekly reset (when at 100% / on a charged model); otherwise time until 5-hour session window resets
 - **Context Window Display** - Visual bar showing context usage
 - **Off Peak** - Shows peak/off-peak status with countdown timer (peak hours drain sessions faster)
 - **Two-line Layout** - Session info on line 1, context on line 2
@@ -67,6 +67,15 @@ Session: [████░░░░░░░░░░░] 27.0% | Weekly: [██
 
 ## 🆕 Recent Updates
 
+### [v2.3.15](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.15) - Move extra amounts into Weekly bar, Reset Timer shows weekly reset time
+
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Extra amounts in Weekly bar** — When at 100% / on a charged model, the split bar now shows `€spent/€limit` after the bar instead of `100.0%`. Mobile shows the spent amount only.
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Reset Timer shows weekly reset time** — When extra usage is active the timer now counts down to the weekly reset instead of showing the `Extra: €X/€Y` spending (which moved to the Weekly bar). Falls back to session timer if no weekly reset data is available.
+
+### [v2.3.14](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.14) - Drop extraUsageBalance setting
+
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): Removed the `extraUsageBalance` setting introduced in v2.3.12. `Extra: €X/€Y` now uses the API's monthly limit directly — stable, no config, no drift.
+
 ### [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.

package/dist/ccstatusline.js

@@ -52459,7 +52459,6 @@ var init_Settings = __esm(() => {
       autoAlign: false,
       continueThemeAcrossLines: false
     }),
-    extraUsageBalance: exports_external.number().optional(),
     updatemessage: exports_external.object({
       message: exports_external.string().nullable().optional(),
       remaining: exports_external.number().nullable().optional()
@@ -55593,7 +55592,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.13";
+var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.15";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -63158,18 +63157,19 @@ function formatUsageBar(label, shortLabel, percent, size2) {
   const display = Math.min(100, percent);
   return `${size2 === "mobile" ? shortLabel : label}: ${bar} ${display.toFixed(1)}%`;
 }
-function formatSplitUsageBar(label, shortLabel, extraPercent, size2) {
+function formatSplitUsageBar(label, shortLabel, extraPercent, size2, extraUsed, extraLimit) {
+  const displayLabel = size2 === "mobile" ? shortLabel : label;
+  const suffix = extraUsed !== undefined && extraLimit !== undefined ? `${DARK_RED_OPEN2}${formatCents(extraUsed)}/${formatCents(extraLimit)}${DARK_RED_CLOSE2}` : "100.0%";
+  if (size2 === "mobile") {
+    const bar2 = makeProgressBar(100, getBarWidth(size2));
+    const mobileSuffix = extraUsed !== undefined ? `${DARK_RED_OPEN2}${formatCents(extraUsed)}${DARK_RED_CLOSE2}` : suffix;
+    return `${displayLabel}: ${bar2} ${mobileSuffix}`;
+  }
   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);
+  return `${displayLabel}: ${bar} ${suffix}`;
 }
-function computeExtraPercent(extraUsed, extraLimit, ceiling) {
-  const denominator = computeEffectiveTotal(extraUsed, extraLimit, ceiling);
-  return denominator > 0 ? extraUsed / denominator * 100 : 0;
+function computeExtraPercent(extraUsed, extraLimit) {
+  return extraLimit > 0 ? extraUsed / extraLimit * 100 : 0;
 }
 function getCurrencySymbol() {
   try {
@@ -63200,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 ?? {};
@@ -63212,7 +63212,7 @@ class SessionUsageWidget {
     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);
+      const extraPercent = computeExtraPercent(extraUsed, extraLimit);
       return formatSplitUsageBar("Session", "S", extraPercent, size2);
     }
     return formatUsageBar("Session", "S", data.sessionUsage, size2);
@@ -63241,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 ?? {};
@@ -63252,9 +63252,9 @@ class WeeklyUsageWidget {
     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);
+    if (data.extraUsageEnabled === true && extraUsed !== undefined && extraLimit !== undefined && data.weeklyUsage >= 100) {
+      const extraPercent = computeExtraPercent(extraUsed, extraLimit);
+      return formatSplitUsageBar("Weekly", "W", extraPercent, size2, extraUsed, extraLimit);
     }
     return formatUsageBar("Weekly", "W", data.weeklyUsage, size2);
   }
@@ -63282,7 +63282,7 @@ class ResetTimerWidget {
   getEditorDisplay(_item) {
     return { displayText: this.getDisplayName() };
   }
-  render(_item, context, settings) {
+  render(_item, context, _settings) {
     if (context.isPreview)
       return "4:30 hr";
     const data = context.usageData ?? {};
@@ -63293,11 +63293,14 @@ class ResetTimerWidget {
     const is1mModel = modelId.includes("[1m]");
     const isOpus = modelId.includes("opus");
     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 effectiveTotal = computeEffectiveTotal(data.extraUsageUsed, data.extraUsageLimit, settings.extraUsageBalance);
-      const limit = formatCents(effectiveTotal);
-      return `${DARK_RED_OPEN2}Extra: ${used}/${limit}${DARK_RED_CLOSE2}`;
+    const extraActive = data.extraUsageEnabled && data.extraUsageUsed !== undefined && data.extraUsageLimit !== undefined && (data.weeklyUsage !== undefined && data.weeklyUsage >= 100 || data.sessionUsage !== undefined && data.sessionUsage >= 100 || isChargedModel);
+    if (extraActive) {
+      const weeklyWindow = resolveWeeklyUsageWindow(data);
+      if (weeklyWindow) {
+        const hours = Math.floor(weeklyWindow.remainingMs / (1000 * 60 * 60));
+        const minutes = Math.floor(weeklyWindow.remainingMs % (1000 * 60 * 60) / (1000 * 60));
+        return `${hours}:${minutes.toString().padStart(2, "0")} hr`;
+      }
     }
     if (!data.sessionResetAt)
       return null;

package/package.json

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