ccstatusline-usage 2.3.2 → 2.3.4

package/README.md

@@ -66,6 +66,16 @@ Session: [████░░░░░░░░░░░] 27.0% | Weekly: [██
 
 ## 🆕 Recent Updates
 
+### [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
+- [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Release workflow** — Added mandatory CI pipeline check before tagging/releasing
+
 ### [v2.3.2](https://github.com/pcvelz/ccstatusline-usage/releases/tag/v2.3.2) - Off Peak widget + WeeklyPace compact fix
 
 - [pcvelz/ccstatusline-usage](https://github.com/pcvelz/ccstatusline-usage): **Off Peak widget** — New widget showing `Off peak: Off-peak 2x` or `Off peak: Peak` during the Anthropic March 2026 Spring Break promotion (off-peak = weekdays outside 8 AM–2 PM ET, weekends all day). Widget automatically hides after March 28, 2026 23:59 PT.

package/dist/ccstatusline.js

@@ -52452,6 +52452,7 @@ var init_Settings = __esm(() => {
       theme: undefined,
       autoAlign: false
     }),
+    extraUsageBalance: exports_external.number().optional(),
     updatemessage: exports_external.object({
       message: exports_external.string().nullable().optional(),
       remaining: exports_external.number().nullable().optional()
@@ -54071,7 +54072,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.2";
+var __dirname = "/Users/peter/Documents/Code/ccstatusline-usage/src/utils", PACKAGE_VERSION = "2.3.4";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -61431,7 +61432,7 @@ import * as path7 from "path";
 function readTokenFromFile() {
   try {
     const creds = JSON.parse(fs9.readFileSync(CRED_FILE, "utf8"));
-    return creds?.claudeAiOauth?.accessToken ?? null;
+    return creds.claudeAiOauth?.accessToken ?? null;
   } catch {
     return null;
   }
@@ -61440,7 +61441,7 @@ function readTokenFromKeychain() {
   try {
     const result2 = execSync5('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
     const parsed = JSON.parse(result2);
-    return parsed?.claudeAiOauth?.accessToken ?? null;
+    return parsed.claudeAiOauth?.accessToken ?? null;
   } catch {
     return null;
   }
@@ -61457,8 +61458,7 @@ function getToken() {
   let token = null;
   if (process.platform === "darwin")
     token = readTokenFromKeychain();
-  if (!token)
-    token = readTokenFromFile();
+  token ??= readTokenFromFile();
   if (token) {
     cachedToken = token;
     tokenCacheTime = now2;
@@ -61745,7 +61745,8 @@ class ResetTimerWidget {
     const data = fetchApiData();
     if (data.error)
       return getErrorMessage(data.error);
-    const modelId = context.data?.model?.id ?? "";
+    const model = context.data?.model;
+    const modelId = (typeof model === "string" ? model : model?.id) ?? "";
     const is1mModel = modelId.includes("[1m]");
     const isOpus = modelId.includes("opus");
     const isChargedModel = is1mModel && !isOpus;
@@ -62614,6 +62615,26 @@ function isOffPeak(now2) {
   const isPeak = utcHour >= PEAK_START_UTC_HOUR && utcHour < PEAK_END_UTC_HOUR;
   return !isPeak;
 }
+function minutesUntilFlip(now2) {
+  const dayOfWeek = now2.getUTCDay();
+  const isWeekend = dayOfWeek === 0 || dayOfWeek === 6;
+  if (isWeekend)
+    return null;
+  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 target = new Date(now2);
+  if (!isPeak && 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 formatCountdown(minutes) {
+  const h = Math.floor(minutes / 60);
+  const m = minutes % 60;
+  return `${h}:${String(m).padStart(2, "0")}`;
+}
 
 class OffPeakWidget {
   getDefaultColor() {
@@ -62633,16 +62654,19 @@ class OffPeakWidget {
   }
   render(item, context, _settings) {
     if (context.isPreview) {
-      return item.rawValue ? "Off-peak 2x" : "Off peak: Off-peak 2x";
+      return item.rawValue ? "Off-peak 2x (3:42)" : "Off-peak 2x (3:42)";
     }
-    const result2 = isOffPeak(new Date);
-    if (result2 === null)
+    const now2 = new Date;
+    const offPeak = isOffPeak(now2);
+    if (offPeak === null)
       return null;
-    const value = result2 ? "Off-peak 2x" : "Peak";
+    const mins = minutesUntilFlip(now2);
+    const countdown = mins !== null ? ` (${formatCountdown(mins)} hr)` : "";
     const mobile = (context.terminalWidth ?? 0) > 0 && (context.terminalWidth ?? 0) < 80;
-    if (item.rawValue || mobile)
-      return value;
-    return `Off peak: ${value}`;
+    if (offPeak) {
+      return mobile ? `2x${countdown}` : `Off-peak 2x${countdown}`;
+    }
+    return `Peak${countdown}`;
   }
   supportsRawValue() {
     return true;
@@ -68973,6 +68997,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(),
@@ -69015,7 +69043,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
@@ -69148,11 +69180,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
@@ -69224,7 +69291,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.2",
+  "version": "2.3.4",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",