ccstatusline 2.1.6 → 2.1.7

package/README.md

@@ -46,15 +46,16 @@
 
 ## 🆕 Recent Updates
 
-### v2.1.0 - v2.1.6 - Usage widgets, links, new git insertions / deletions widgets, and reliability fixes
+### v2.1.0 - v2.1.7 - Usage widgets, links, new git insertions / deletions widgets, and reliability fixes
 
-- **🧩 New Usage widgets (v2.1.0)** - Added **Session Usage**, **Weekly Usage**, **Reset Timer**, and **Context Bar** widgets.
+- **🧩 New Usage widgets (v2.1.0)** - Added **Session Usage**, **Weekly Usage**, **Block Reset Timer**, and **Context Bar** widgets.
 - **📊 More accurate counts (v2.1.0)** - Usage/context widgets now use new statusline JSON metrics when available for more accurate token and context counts.
 - **🪟 Windows empty file bug fix (v2.1.1)** - Fixed a Windows issue that could create an empty `c:\dev\null` file.
 - **🔗 New Link widget (v2.1.3)** - Added a new **Link** widget with clickable OSC8 rendering, preview parity, and raw mode support.
 - **➕ New Git Insertions widget (v2.1.4)** - Added a dedicated Git widget that shows only uncommitted insertions (e.g., `+42`).
 - **➖ New Git Deletions widget (v2.1.4)** - Added a dedicated Git widget that shows only uncommitted deletions (e.g., `-10`).
 - **🧠 Context format fallback fix (v2.1.6)** - When `context_window_size` is missing, context widgets now infer 1M models from long-context labels such as `[1m]` and `1M context` in model identifiers.
+- **⏳ Weekly reset timer split (v2.1.7)** - Added a separate `Weekly Reset Timer` widget.
 
 ### v2.0.26 - v2.0.29 - Performance, git internals, and workflow improvements
 
@@ -426,7 +427,8 @@ bun run example
 - **Session Name** - Shows the session name set via `/rename` command in Claude Code
 - **Claude Session ID** - Shows the current Claude Code session ID from status JSON
 - **Block Timer** - Shows time elapsed in current 5-hour block or progress bar
-- **Reset Timer** - Shows time remaining until the current 5-hour block resets
+- **Block Reset Timer** - Shows time remaining until the current 5-hour block resets
+- **Weekly Reset Timer** - Shows time remaining until the weekly usage window resets
 - **Current Working Directory** - Shows current working directory with segment limit, fish-style abbreviation, and optional `~` home abbreviation
 - **Version** - Shows Claude Code version
 - **Output Style** - Shows the currently set output style in Claude Code
@@ -528,6 +530,8 @@ Widget-specific shortcuts:
 - **Git widgets**: `h` toggle hide `no git` output
 - **Context % widgets**: `u` toggle used vs remaining display
 - **Block Timer**: `p` cycle display mode (time/full bar/short bar)
+- **Block Reset Timer**: `p` cycle display mode (time/full bar/short bar)
+- **Weekly Reset Timer**: `p` cycle display mode (time/full bar/short bar)
 - **Current Working Dir**: `h` home abbreviation, `s` segment editor, `f` fish-style path
 - **Custom Command**: `e` command, `w` max width, `t` timeout, `p` preserve ANSI colors
 - **Link**: `u` URL, `e` link text

package/dist/ccstatusline.js

@@ -51478,7 +51478,7 @@ import { execSync as execSync3 } from "child_process";
 import * as fs5 from "fs";
 import * as path4 from "path";
 var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils";
-var PACKAGE_VERSION = "2.1.6";
+var PACKAGE_VERSION = "2.1.7";
 function getPackageVersion() {
   if (/^\d+\.\d+\.\d+/.test(PACKAGE_VERSION)) {
     return PACKAGE_VERSION;
@@ -55690,12 +55690,14 @@ var CACHE_MAX_AGE = 180;
 var LOCK_MAX_AGE = 30;
 var TOKEN_CACHE_MAX_AGE = 3600;
 var FIVE_HOUR_BLOCK_MS = 5 * 60 * 60 * 1000;
+var SEVEN_DAY_WINDOW_MS = 7 * 24 * 60 * 60 * 1000;
 var UsageErrorSchema = exports_external.enum(["no-credentials", "timeout", "api-error", "parse-error"]);
 var UsageCredentialsSchema = exports_external.object({ claudeAiOauth: exports_external.object({ accessToken: exports_external.string().nullable().optional() }).optional() });
 var CachedUsageDataSchema = exports_external.object({
   sessionUsage: exports_external.number().nullable().optional(),
   sessionResetAt: exports_external.string().nullable().optional(),
   weeklyUsage: exports_external.number().nullable().optional(),
+  weeklyResetAt: exports_external.string().nullable().optional(),
   extraUsageEnabled: exports_external.boolean().nullable().optional(),
   extraUsageLimit: exports_external.number().nullable().optional(),
   extraUsageUsed: exports_external.number().nullable().optional(),
@@ -55705,10 +55707,12 @@ var CachedUsageDataSchema = exports_external.object({
 var UsageApiResponseSchema = exports_external.object({
   five_hour: exports_external.object({
     utilization: exports_external.number().nullable().optional(),
-    reset_at: exports_external.string().nullable().optional(),
     resets_at: exports_external.string().nullable().optional()
   }).optional(),
-  seven_day: exports_external.object({ utilization: exports_external.number().nullable().optional() }).optional(),
+  seven_day: exports_external.object({
+    utilization: exports_external.number().nullable().optional(),
+    resets_at: exports_external.string().nullable().optional()
+  }).optional(),
   extra_usage: exports_external.object({
     is_enabled: exports_external.boolean().nullable().optional(),
     monthly_limit: exports_external.number().nullable().optional(),
@@ -55738,6 +55742,7 @@ function parseCachedUsageData(rawJson) {
     sessionUsage: parsed.sessionUsage ?? undefined,
     sessionResetAt: parsed.sessionResetAt ?? undefined,
     weeklyUsage: parsed.weeklyUsage ?? undefined,
+    weeklyResetAt: parsed.weeklyResetAt ?? undefined,
     extraUsageEnabled: parsed.extraUsageEnabled ?? undefined,
     extraUsageLimit: parsed.extraUsageLimit ?? undefined,
     extraUsageUsed: parsed.extraUsageUsed ?? undefined,
@@ -55752,8 +55757,9 @@ function parseUsageApiResponse(rawJson) {
   }
   return {
     sessionUsage: parsed.five_hour?.utilization ?? undefined,
-    sessionResetAt: parsed.five_hour?.resets_at ?? parsed.five_hour?.reset_at ?? undefined,
+    sessionResetAt: parsed.five_hour?.resets_at ?? undefined,
     weeklyUsage: parsed.seven_day?.utilization ?? undefined,
+    weeklyResetAt: parsed.seven_day?.resets_at ?? undefined,
     extraUsageEnabled: parsed.extra_usage?.is_enabled ?? undefined,
     extraUsageLimit: parsed.extra_usage?.monthly_limit ?? undefined,
     extraUsageUsed: parsed.extra_usage?.used_credits ?? undefined,
@@ -55934,16 +55940,16 @@ function fetchUsageData() {
 function clamp(value, min, max) {
   return Math.max(min, Math.min(max, value));
 }
-function buildUsageWindow(resetAtMs, nowMs) {
-  if (!Number.isFinite(resetAtMs) || !Number.isFinite(nowMs)) {
+function buildUsageWindow(resetAtMs, nowMs, durationMs) {
+  if (!Number.isFinite(resetAtMs) || !Number.isFinite(nowMs) || !Number.isFinite(durationMs) || durationMs <= 0) {
     return null;
   }
-  const startAtMs = resetAtMs - FIVE_HOUR_BLOCK_MS;
-  const elapsedMs = clamp(nowMs - startAtMs, 0, FIVE_HOUR_BLOCK_MS);
-  const remainingMs = FIVE_HOUR_BLOCK_MS - elapsedMs;
-  const elapsedPercent = elapsedMs / FIVE_HOUR_BLOCK_MS * 100;
+  const startAtMs = resetAtMs - durationMs;
+  const elapsedMs = clamp(nowMs - startAtMs, 0, durationMs);
+  const remainingMs = durationMs - elapsedMs;
+  const elapsedPercent = elapsedMs / durationMs * 100;
   return {
-    sessionDurationMs: FIVE_HOUR_BLOCK_MS,
+    sessionDurationMs: durationMs,
     elapsedMs,
     remainingMs,
     elapsedPercent,
@@ -55958,14 +55964,14 @@ function getUsageWindowFromResetAt(sessionResetAt, nowMs = Date.now()) {
   if (Number.isNaN(resetAtMs)) {
     return null;
   }
-  return buildUsageWindow(resetAtMs, nowMs);
+  return buildUsageWindow(resetAtMs, nowMs, FIVE_HOUR_BLOCK_MS);
 }
 function getUsageWindowFromBlockMetrics(blockMetrics, nowMs = Date.now()) {
   const startAtMs = blockMetrics.startTime.getTime();
   if (Number.isNaN(startAtMs)) {
     return null;
   }
-  return buildUsageWindow(startAtMs + FIVE_HOUR_BLOCK_MS, nowMs);
+  return buildUsageWindow(startAtMs + FIVE_HOUR_BLOCK_MS, nowMs, FIVE_HOUR_BLOCK_MS);
 }
 function resolveUsageWindowWithFallback(usageData, blockMetrics, nowMs = Date.now()) {
   const usageWindow = getUsageWindowFromResetAt(usageData.sessionResetAt, nowMs);
@@ -55978,6 +55984,19 @@ function resolveUsageWindowWithFallback(usageData, blockMetrics, nowMs = Date.no
   }
   return getUsageWindowFromBlockMetrics(fallbackMetrics, nowMs);
 }
+function getWeeklyUsageWindowFromResetAt(weeklyResetAt, nowMs = Date.now()) {
+  if (!weeklyResetAt) {
+    return null;
+  }
+  const resetAtMs = Date.parse(weeklyResetAt);
+  if (Number.isNaN(resetAtMs)) {
+    return null;
+  }
+  return buildUsageWindow(resetAtMs, nowMs, SEVEN_DAY_WINDOW_MS);
+}
+function resolveWeeklyUsageWindow(usageData, nowMs = Date.now()) {
+  return getWeeklyUsageWindowFromResetAt(usageData.weeklyResetAt, nowMs);
+}
 function formatUsageDuration(durationMs) {
   const clampedMs = Math.max(0, durationMs);
   const elapsedHours = Math.floor(clampedMs / (1000 * 60 * 60));
@@ -56692,7 +56711,7 @@ class WeeklyUsageWidget {
     return true;
   }
 }
-// src/widgets/ResetTimer.ts
+// src/widgets/BlockResetTimer.ts
 function makeTimerProgressBar2(percent, width) {
   const clampedPercent = Math.max(0, Math.min(100, percent));
   const filledWidth = Math.floor(clampedPercent / 100 * width);
@@ -56700,15 +56719,15 @@ function makeTimerProgressBar2(percent, width) {
   return "█".repeat(filledWidth) + "░".repeat(emptyWidth);
 }
 
-class ResetTimerWidget {
+class BlockResetTimerWidget {
   getDefaultColor() {
     return "brightBlue";
   }
   getDescription() {
-    return "Shows time remaining until current 5hr block reset";
+    return "Shows time remaining until current 5hr block reset window";
   }
   getDisplayName() {
-    return "Reset Timer";
+    return "Block Reset Timer";
   }
   getCategory() {
     return "Usage";
@@ -56771,6 +56790,85 @@ class ResetTimerWidget {
     return true;
   }
 }
+// src/widgets/WeeklyResetTimer.ts
+function makeTimerProgressBar3(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);
+}
+
+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: getUsageDisplayModifierText(item)
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-progress") {
+      return cycleUsageDisplayMode(item);
+    }
+    if (action === "toggle-invert") {
+      return toggleUsageInverted(item);
+    }
+    return null;
+  }
+  render(item, context, settings) {
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
+    if (context.isPreview) {
+      const previewPercent = inverted ? 90 : 10;
+      if (isUsageProgressMode(displayMode)) {
+        const barWidth = getUsageProgressBarWidth(displayMode);
+        const progressBar = makeTimerProgressBar3(previewPercent, barWidth);
+        return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
+      }
+      return formatRawOrLabeledValue(item, "Weekly Reset: ", "36hr 30m");
+    }
+    const usageData = fetchUsageData();
+    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 = makeTimerProgressBar3(percent, barWidth);
+      const percentage = percent.toFixed(1);
+      return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${percentage}%`);
+    }
+    const remainingTime = formatUsageDuration(window2.remainingMs);
+    return formatRawOrLabeledValue(item, "Weekly Reset: ", remainingTime);
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "p", label: "(p)rogress toggle", action: "toggle-progress" },
+      { key: "v", label: "in(v)ert fill", action: "toggle-invert" }
+    ];
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
 // src/widgets/ContextBar.ts
 function getDisplayMode(item) {
   return item.metadata?.display === "progress" ? "progress" : "progress-short";
@@ -57078,7 +57176,8 @@ var widgetRegistry = new Map([
   ["free-memory", new FreeMemoryWidget],
   ["session-usage", new SessionUsageWidget],
   ["weekly-usage", new WeeklyUsageWidget],
-  ["reset-timer", new ResetTimerWidget],
+  ["reset-timer", new BlockResetTimerWidget],
+  ["weekly-reset-timer", new WeeklyResetTimerWidget],
   ["context-bar", new ContextBarWidget]
 ]);
 function getWidget(type) {

package/package.json

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