ccstatusline-usage 2.3.3 → 2.3.5

package/README.md

@@ -18,7 +18,7 @@
 
 [![npm version](https://img.shields.io/npm/v/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
 [![npm downloads](https://img.shields.io/npm/dm/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sirmalloc/ccstatusline/blob/main/LICENSE)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/pcvelz/ccstatusline-usage/blob/main/LICENSE)
 [![Node.js Version](https://img.shields.io/node/v/ccstatusline-usage.svg)](https://nodejs.org)
 [![install size](https://packagephobia.com/badge?p=ccstatusline-usage)](https://packagephobia.com/result?p=ccstatusline-usage)
 [![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/pcvelz/ccstatusline-usage/graphs/commit-activity)
@@ -34,7 +34,7 @@ This fork adds API-based usage widgets beyond the upstream:
 - **Weekly Pace** - Pendulum bar showing if you're ahead or behind expected usage pace
 - **Reset Timer** - Time until 5-hour session window resets
 - **Context Window Display** - Visual bar showing context usage
-- **Off Peak** - Shows peak/off-peak 2x status during Anthropic usage promotions
+- **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
 
 ### Enhanced Status Line Preview
@@ -66,6 +66,17 @@ Session: [████░░░░░░░░░░░] 27.0% | Weekly: [██
 
 ## 🆕 Recent Updates
 
+### [v2.3.5](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.5) - Upstream sync + permanent peak/off-peak widget
+
+- [sirmalloc/ccstatusline](https://github.com/sirmalloc/ccstatusline): **Major upstream sync** — 180 commits merged, including Weekly Reset Timer widget, new test infrastructure, Windows support, and various improvements
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Permanent Off-Peak widget** — Widget no longer disappears after the March 28 promo ends; shows peak/off-peak status permanently with countdown timer (Anthropic confirmed peak hours continue to drain sessions faster)
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **README fork branding fix** — Fixed upstream package name references in Windows install commands, WSL section, and dev setup
+
+### [v2.3.4](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.4) - Upstream sync + extra usage fix
+
+- [sirmalloc/ccstatusline](https://github.com/sirmalloc/ccstatusline): **Native rate_limits support** — Upstream now uses Claude Code 2.1.80's native `rate_limits` field for usage data
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Extra usage regression fix** — Reset timer widget now supplements native `rate_limits` data with API fetch for extra usage fields that upstream's pipeline omits
+
 ### [v2.3.3](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.3) - CI pipeline fix
 
 - [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **CI pipeline fix** — Fixed TypeScript errors (model union type narrowing, missing `extraUsageBalance` setting), disabled broken `import/order` ESLint rule (incompatible with ESLint 10), resolved all remaining lint errors in fork-specific files
@@ -332,19 +343,19 @@ ccstatusline works seamlessly on Windows with full feature compatibility across
 irm bun.sh/install.ps1 | iex
 
 # Run ccstatusline
-bunx -y ccstatusline@latest
+bunx -y ccstatusline-usage@latest
 ```
 
 #### Option 2: Using Node.js
 ```powershell
 # Using npm
-npx -y ccstatusline@latest
+npx -y ccstatusline-usage@latest
 
 # Or with Yarn
-yarn dlx ccstatusline@latest
+yarn dlx ccstatusline-usage@latest
 
 # Or with pnpm
-pnpm dlx ccstatusline@latest
+pnpm dlx ccstatusline-usage@latest
 ```
 
 ### Windows-Specific Features
@@ -399,7 +410,7 @@ winget install Git.Git
 **Issue**: Permission errors during installation
 ```powershell
 # Use non-global installation (recommended)
-npx -y ccstatusline@latest
+npx -y ccstatusline-usage@latest
 
 # Or run PowerShell as Administrator for global install
 ```
@@ -427,7 +438,7 @@ ccstatusline works perfectly in WSL environments:
 # Install in WSL Ubuntu/Debian
 curl -fsSL https://bun.sh/install | bash
 source ~/.bashrc
-bunx -y ccstatusline@latest
+bunx -y ccstatusline-usage@latest
 ```
 
 **WSL Benefits**:
@@ -466,7 +477,7 @@ Configure ccstatusline in your Claude Code settings:
 {
   "statusLine": {
     "type": "command",
-    "command": "bunx -y ccstatusline@latest",
+    "command": "bunx -y ccstatusline-usage@latest",
     "padding": 0
   }
 }
@@ -477,7 +488,7 @@ Configure ccstatusline in your Claude Code settings:
 {
   "statusLine": {
     "type": "command",
-    "command": "npx -y ccstatusline@latest",
+    "command": "npx -y ccstatusline-usage@latest",
     "padding": 0
   }
 }
@@ -562,7 +573,7 @@ bun run example
 - **Skills** - Shows skill activity as last used, total count, or unique list (with optional list limit and hide-when-empty toggle)
 - **Thinking Effort** - Shows the current Claude Code thinking effort level
 - **Vim Mode** - Displays current vim editor mode
-- **Off Peak** *(ccstatusline-usage)* - Shows `Off peak: Off-peak 2x` or `Off peak: Peak` during Anthropic usage promotions (auto-hides when promotion ends)
+- **Off Peak** *(ccstatusline-usage)* - Shows `Off-peak (X:XX hr)` or `Peak (X:XX hr)` with countdown to next status change. Peak hours (5-11 AM PT weekdays) drain sessions faster per Anthropic's permanent capacity policy
 - **Separator** - Visual divider between widgets (available when Powerline mode is off and no default separator is configured)
 - **Flex Separator** - Expands to fill available space (available when Powerline mode is off)
 
@@ -757,7 +768,7 @@ The documentation will be generated in the `docs/` directory and can be viewed b
 
 ```bash
 # Clone the repository
-git clone https://github.com/sirmalloc/ccstatusline.git
+git clone https://github.com/pcvelz/ccstatusline-usage.git
 cd ccstatusline
 
 # Install dependencies
@@ -917,7 +928,7 @@ Give a ⭐ if this project helped you!
 
 [![npm version](https://img.shields.io/npm/v/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
 [![npm downloads](https://img.shields.io/npm/dm/ccstatusline-usage.svg)](https://www.npmjs.com/package/ccstatusline-usage)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/sirmalloc/ccstatusline/blob/main/LICENSE)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/pcvelz/ccstatusline-usage/blob/main/LICENSE)
 [![Made with Bun](https://img.shields.io/badge/Made%20with-Bun-000000.svg?logo=bun)](https://bun.sh)
 
 [![Issues](https://img.shields.io/github/issues/sirmalloc/ccstatusline)](https://github.com/sirmalloc/ccstatusline/issues)

package/dist/ccstatusline.js

@@ -54072,7 +54072,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.3";
+var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.5";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -61846,6 +61846,128 @@ var init_ApiUsage = __esm(() => {
   CRED_FILE = path7.join(os7.homedir(), ".claude", ".credentials.json");
 });
 
+// src/widgets/WeeklyResetTimer.ts
+function makeTimerProgressBar2(percent, width) {
+  const clampedPercent = Math.max(0, Math.min(100, percent));
+  const filledWidth = Math.floor(clampedPercent / 100 * width);
+  const emptyWidth = width - filledWidth;
+  return "█".repeat(filledWidth) + "░".repeat(emptyWidth);
+}
+function isWeeklyResetHoursOnly(item) {
+  return isMetadataFlagEnabled(item, "hours");
+}
+function toggleWeeklyResetHoursOnly(item) {
+  return toggleMetadataFlag(item, "hours");
+}
+function getWeeklyResetModifierText(item) {
+  const displayMode = getUsageDisplayMode(item);
+  const modifiers = [];
+  if (displayMode === "progress") {
+    modifiers.push("progress bar");
+  } else if (displayMode === "progress-short") {
+    modifiers.push("short bar");
+  }
+  if (isUsageInverted(item)) {
+    modifiers.push("inverted");
+  }
+  if (!isUsageProgressMode(displayMode)) {
+    if (isUsageCompact(item)) {
+      modifiers.push("compact");
+    }
+    if (isWeeklyResetHoursOnly(item)) {
+      modifiers.push("hours only");
+    }
+  }
+  return makeModifierText(modifiers);
+}
+
+class WeeklyResetTimerWidget {
+  getDefaultColor() {
+    return "brightBlue";
+  }
+  getDescription() {
+    return "Shows time remaining until weekly usage reset";
+  }
+  getDisplayName() {
+    return "Weekly Reset Timer";
+  }
+  getCategory() {
+    return "Usage";
+  }
+  getEditorDisplay(item) {
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: getWeeklyResetModifierText(item)
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-progress") {
+      return cycleUsageDisplayMode(item, ["compact", "hours"]);
+    }
+    if (action === "toggle-invert") {
+      return toggleUsageInverted(item);
+    }
+    if (action === "toggle-compact") {
+      return toggleUsageCompact(item);
+    }
+    if (action === "toggle-hours") {
+      return toggleWeeklyResetHoursOnly(item);
+    }
+    return null;
+  }
+  render(item, context, settings) {
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
+    const compact2 = isUsageCompact(item);
+    const useDays = !isWeeklyResetHoursOnly(item);
+    if (context.isPreview) {
+      const previewPercent = inverted ? 90 : 10;
+      if (isUsageProgressMode(displayMode)) {
+        const barWidth = getUsageProgressBarWidth(displayMode);
+        const progressBar = makeTimerProgressBar2(previewPercent, barWidth);
+        return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
+      }
+      return formatRawOrLabeledValue(item, "Weekly Reset: ", formatUsageDuration(WEEKLY_PREVIEW_DURATION_MS, compact2, useDays));
+    }
+    const usageData = context.usageData ?? {};
+    const window2 = resolveWeeklyUsageWindow(usageData);
+    if (!window2) {
+      if (usageData.error) {
+        return getUsageErrorMessage(usageData.error);
+      }
+      return null;
+    }
+    if (isUsageProgressMode(displayMode)) {
+      const barWidth = getUsageProgressBarWidth(displayMode);
+      const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
+      const progressBar = makeTimerProgressBar2(percent, barWidth);
+      const percentage = percent.toFixed(1);
+      return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${percentage}%`);
+    }
+    const remainingTime = formatUsageDuration(window2.remainingMs, compact2, useDays);
+    return formatRawOrLabeledValue(item, "Weekly Reset: ", remainingTime);
+  }
+  getCustomKeybinds(item) {
+    const keybinds = getUsageTimerCustomKeybinds(item);
+    if (!item || !isUsageProgressMode(getUsageDisplayMode(item))) {
+      keybinds.push({ key: "h", label: "(h)ours only", action: "toggle-hours" });
+    }
+    return keybinds;
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var WEEKLY_PREVIEW_DURATION_MS;
+var init_WeeklyResetTimer = __esm(() => {
+  init_usage();
+  init_usage_display();
+  WEEKLY_PREVIEW_DURATION_MS = 36.5 * 60 * 60 * 1000;
+});
+
 // src/widgets/Link.tsx
 function isValidHttpUrl(url2) {
   try {
@@ -62602,34 +62724,45 @@ var init_WeeklyPace = __esm(() => {
 });
 
 // src/widgets/OffPeak.ts
-function isOffPeak(now2) {
-  const ms = now2.getTime();
-  if (ms < PROMO_START_MS || ms >= PROMO_END_MS) {
-    return null;
-  }
+function isWeekend(now2) {
   const dayOfWeek = now2.getUTCDay();
-  const isWeekend = dayOfWeek === 0 || dayOfWeek === 6;
-  if (isWeekend)
-    return true;
+  return dayOfWeek === 0 || dayOfWeek === 6;
+}
+function isPeakHour(now2) {
   const utcHour = now2.getUTCHours();
-  const isPeak = utcHour >= PEAK_START_UTC_HOUR && utcHour < PEAK_END_UTC_HOUR;
-  return !isPeak;
+  return utcHour >= PEAK_START_UTC_HOUR && utcHour < PEAK_END_UTC_HOUR;
+}
+function isPromoActive(now2) {
+  const ms = now2.getTime();
+  return ms >= PROMO_START_MS && ms < PROMO_END_MS;
+}
+function isOffPeak(now2) {
+  if (isWeekend(now2))
+    return true;
+  return !isPeakHour(now2);
 }
 function minutesUntilFlip(now2) {
-  const dayOfWeek = now2.getUTCDay();
-  const isWeekend = dayOfWeek === 0 || dayOfWeek === 6;
-  if (isWeekend)
-    return null;
+  if (isWeekend(now2)) {
+    return minutesUntilMondayPeak(now2);
+  }
   const utcHour = now2.getUTCHours();
-  const isPeak = utcHour >= PEAK_START_UTC_HOUR && utcHour < PEAK_END_UTC_HOUR;
-  const flipHour = isPeak ? PEAK_END_UTC_HOUR : PEAK_START_UTC_HOUR;
+  const peak = isPeakHour(now2);
+  const flipHour = peak ? PEAK_END_UTC_HOUR : PEAK_START_UTC_HOUR;
   const target = new Date(now2);
-  if (!isPeak && utcHour >= PEAK_END_UTC_HOUR) {
+  if (!peak && utcHour >= PEAK_END_UTC_HOUR) {
     target.setUTCDate(now2.getUTCDate() + 1);
   }
   target.setUTCHours(flipHour, 0, 0, 0);
   return Math.max(0, Math.round((target.getTime() - now2.getTime()) / 60000));
 }
+function minutesUntilMondayPeak(now2) {
+  const dayOfWeek = now2.getUTCDay();
+  const daysUntilMonday = dayOfWeek === 0 ? 1 : 8 - dayOfWeek;
+  const target = new Date(now2);
+  target.setUTCDate(now2.getUTCDate() + daysUntilMonday);
+  target.setUTCHours(PEAK_START_UTC_HOUR, 0, 0, 0);
+  return Math.max(0, Math.round((target.getTime() - now2.getTime()) / 60000));
+}
 function formatCountdown(minutes) {
   const h = Math.floor(minutes / 60);
   const m = minutes % 60;
@@ -62641,7 +62774,7 @@ class OffPeakWidget {
     return "green";
   }
   getDescription() {
-    return "Shows peak / off-peak 2x status during the March 2026 Anthropic usage promotion";
+    return "Shows peak / off-peak status with countdown timer";
   }
   getDisplayName() {
     return "Off Peak";
@@ -62654,17 +62787,21 @@ class OffPeakWidget {
   }
   render(item, context, _settings) {
     if (context.isPreview) {
-      return item.rawValue ? "Off-peak 2x (3:42)" : "Off-peak 2x (3:42)";
+      return item.rawValue ? "Off-peak (3:42 hr)" : "Off-peak (3:42 hr)";
     }
     const now2 = new Date;
     const offPeak = isOffPeak(now2);
-    if (offPeak === null)
-      return null;
     const mins = minutesUntilFlip(now2);
-    const countdown = mins !== null ? ` (${formatCountdown(mins)} hr)` : "";
+    const countdown = ` (${formatCountdown(mins)} hr)`;
     const mobile = (context.terminalWidth ?? 0) > 0 && (context.terminalWidth ?? 0) < 80;
+    if (isPromoActive(now2)) {
+      if (offPeak) {
+        return mobile ? `2x${countdown}` : `Off-peak 2x${countdown}`;
+      }
+      return `Peak${countdown}`;
+    }
     if (offPeak) {
-      return mobile ? `2x${countdown}` : `Off-peak 2x${countdown}`;
+      return mobile ? `OffPk${countdown}` : `Off-peak${countdown}`;
     }
     return `Peak${countdown}`;
   }
@@ -62696,6 +62833,7 @@ var init_widgets = __esm(async () => {
   init_FreeMemory();
   init_SessionName();
   init_ApiUsage();
+  init_WeeklyResetTimer();
   init_ThinkingEffort();
   init_Battery();
   init_VimMode();
@@ -62756,6 +62894,7 @@ var init_widget_manifest = __esm(async () => {
     { type: "session-usage", create: () => new SessionUsageWidget },
     { type: "weekly-usage", create: () => new WeeklyUsageWidget },
     { type: "reset-timer", create: () => new ResetTimerWidget },
+    { type: "weekly-reset-timer", create: () => new WeeklyResetTimerWidget },
     { type: "context-bar", create: () => new ContextBarWidget },
     { type: "skills", create: () => new SkillsWidget },
     { type: "thinking-effort", create: () => new ThinkingEffortWidget },
@@ -68997,6 +69136,10 @@ var CoercedNumberSchema = exports_external.preprocess((value) => {
   const parsed = Number(trimmed);
   return Number.isFinite(parsed) ? parsed : value;
 }, exports_external.number());
+var RateLimitPeriodSchema = exports_external.object({
+  used_percentage: CoercedNumberSchema.nullable().optional(),
+  resets_at: CoercedNumberSchema.nullable().optional()
+});
 var StatusJSONSchema = exports_external.looseObject({
   hook_event_name: exports_external.string().optional(),
   session_id: exports_external.string().optional(),
@@ -69039,7 +69182,11 @@ var StatusJSONSchema = exports_external.looseObject({
     used_percentage: CoercedNumberSchema.nullable().optional(),
     remaining_percentage: CoercedNumberSchema.nullable().optional()
   }).nullable().optional(),
-  vim: exports_external.object({ mode: exports_external.string().optional() }).nullable().optional()
+  vim: exports_external.object({ mode: exports_external.string().optional() }).nullable().optional(),
+  rate_limits: exports_external.object({
+    five_hour: RateLimitPeriodSchema.optional(),
+    seven_day: RateLimitPeriodSchema.optional()
+  }).nullable().optional()
 });
 
 // src/ccstatusline.ts
@@ -69172,11 +69319,46 @@ var USAGE_WIDGET_TYPES = new Set([
 function hasUsageDependentWidgets(lines) {
   return lines.some((line) => line.some((item) => USAGE_WIDGET_TYPES.has(item.type)));
 }
-async function prefetchUsageDataIfNeeded(lines) {
+function epochSecondsToIsoString(epochSeconds) {
+  if (epochSeconds === null || epochSeconds === undefined || !Number.isFinite(epochSeconds)) {
+    return;
+  }
+  return new Date(epochSeconds * 1000).toISOString();
+}
+function extractUsageDataFromRateLimits(rateLimits) {
+  if (!rateLimits) {
+    return null;
+  }
+  const sessionUsage = rateLimits.five_hour?.used_percentage ?? undefined;
+  const sessionResetAt = epochSecondsToIsoString(rateLimits.five_hour?.resets_at);
+  const weeklyUsage = rateLimits.seven_day?.used_percentage ?? undefined;
+  const weeklyResetAt = epochSecondsToIsoString(rateLimits.seven_day?.resets_at);
+  if (sessionUsage === undefined && weeklyUsage === undefined) {
+    return null;
+  }
+  return { sessionUsage, sessionResetAt, weeklyUsage, weeklyResetAt };
+}
+function hasCompleteRateLimitsUsageData(usageData) {
+  return usageData?.sessionUsage !== undefined && usageData.sessionResetAt !== undefined && usageData.weeklyUsage !== undefined && usageData.weeklyResetAt !== undefined;
+}
+function hasExtraUsageDependentWidgets(lines) {
+  return lines.some((line) => line.some((item) => item.type === "reset-timer"));
+}
+async function prefetchUsageDataIfNeeded(lines, data) {
   if (!hasUsageDependentWidgets(lines)) {
     return null;
   }
-  return await fetchUsageData();
+  const rateLimitsData = extractUsageDataFromRateLimits(data?.rate_limits);
+  if (hasCompleteRateLimitsUsageData(rateLimitsData)) {
+    if (hasExtraUsageDependentWidgets(lines)) {
+      const apiData = await fetchUsageData();
+      if (apiData.error === undefined) {
+        return { ...rateLimitsData, extraUsageEnabled: apiData.extraUsageEnabled, extraUsageLimit: apiData.extraUsageLimit, extraUsageUsed: apiData.extraUsageUsed, extraUsageUtilization: apiData.extraUsageUtilization };
+      }
+    }
+    return rateLimitsData;
+  }
+  return fetchUsageData();
 }
 
 // src/ccstatusline.ts
@@ -69248,7 +69430,7 @@ async function renderMultipleLines(data) {
   if (hasSessionClock && !hasSessionDurationInStatusJson(data) && data.transcript_path) {
     sessionDuration = await getSessionDuration(data.transcript_path);
   }
-  const usageData = await prefetchUsageDataIfNeeded(lines);
+  const usageData = await prefetchUsageDataIfNeeded(lines, data);
   let speedMetrics = null;
   let windowedSpeedMetrics = null;
   if (hasSpeedItems && data.transcript_path) {

package/package.json

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