ccstatusline-usage 2.3.3 → 2.3.4

package/README.md

@@ -66,6 +66,11 @@ 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

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.4";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -68997,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(),
@@ -69039,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
@@ -69172,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
@@ -69248,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.3",
+  "version": "2.3.4",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",