ccstatusline 2.2.25 → 2.2.26

package/README.md

@@ -47,6 +47,14 @@
 
 ## 🆕 Recent Updates
 
+### v2.2.25 - v2.2.26 - Fable usage, migrated usage API support, compaction accuracy, and rendering reliability
+
+- **🪄 Weekly Fable usage** - Added a `Weekly Fable Usage` widget with percentage, progress-bar, remaining-mode, and time-cursor controls.
+- **📊 Reshaped usage API support** - Session and all-model weekly usage can fall back to the newer `limits[]` response, while Sonnet, Opus, and Fable weekly widgets read authoritative `weekly_scoped` entries so migrated accounts do not show stale or frozen values.
+- **🧠 Correct post-compaction context** - Context length and percentage widgets reset immediately from `compact_boundary.postTokens` after `/compact`, then switch to the first new turn instead of retaining the pre-compaction size.
+- **🧹 Reliable hidden-widget separators** - Manual separators now look past widgets that render empty, preserve the intended visible boundary, and inherit colors from the actual preceding visible widget.
+- **⚡ Non-blocking Git PR/CI refreshes** - Git PR and CI widgets render from a versioned disk cache while stale data refreshes in the background, preventing slow `gh` calls from blocking the status line.
+
 ### v2.2.22 - v2.2.24 - Powerline flex mode, cache/CI/sandbox visibility, layout controls, composable metrics, and safer config
 
 ![Powerline Flex Mode](https://raw.githubusercontent.com/sirmalloc/ccstatusline/main/screenshots/powerline-flex.png)
@@ -258,7 +266,7 @@
 
 ## ✨ Features
 
-- **📊 Real-time Metrics** - Display model name, git branch, token usage, per-model weekly usage, extra usage limits, voice input state, session duration, compaction count, block timer, and more
+- **📊 Real-time Metrics** - Display model name, git branch, token usage, Sonnet/Opus/Fable weekly usage, extra usage limits, voice input state, session duration, compaction count, block timer, and more
 - **🎨 Fully Customizable** - Choose what to display and customize colors for each element
 - **⚡ Powerline Support** - Beautiful Powerline-style rendering with arrow separators, caps, and custom fonts
 - **📐 Multi-line Support** - Configure multiple independent status lines

package/dist/ccstatusline.js

@@ -58287,7 +58287,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/home/runner/work/ccstatusline/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.25";
+var __dirname = "/home/runner/work/ccstatusline/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.26";
 var init_terminal = () => {};
 
 // src/utils/format-tokens.ts
@@ -58761,6 +58761,9 @@ function formatSeparator(sep) {
   }
   return sep;
 }
+function isSpacingSeparator(widget, defaultSeparator) {
+  return widget?.type === "separator" && (widget.character ?? defaultSeparator ?? "|").trim().length === 0;
+}
 function countPowerlineStartCapSlots(widgets, preRenderedWidgets) {
   let pendingFlexAfterRenderedSegment = false;
   let hasRenderedSegment = false;
@@ -58914,27 +58917,44 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
     if (!widget)
       continue;
     if (widget.type === "separator") {
-      let hasContentBefore = false;
+      let contentBeforeIndex = null;
+      let replacesSpacingSeparator = false;
+      let crossedEmptyWidget = false;
       for (let j = i - 1;j >= 0; j--) {
         const prevWidget = widgets[j];
         if (!prevWidget)
           continue;
-        if (prevWidget.type === "separator" || prevWidget.type === "flex-separator")
+        if (prevWidget.type === "separator") {
+          if (!isSpacingSeparator(prevWidget, settings.defaultSeparator))
+            break;
+          replacesSpacingSeparator = true;
           continue;
-        hasContentBefore = Boolean(preRenderedWidgets[j]?.content);
-        break;
+        }
+        if (prevWidget.type === "flex-separator")
+          break;
+        if (preRenderedWidgets[j]?.content) {
+          if (!prevWidget.merge || !crossedEmptyWidget)
+            contentBeforeIndex = j;
+          break;
+        }
+        crossedEmptyWidget = true;
       }
-      if (!hasContentBefore)
+      if (contentBeforeIndex === null)
         continue;
+      if (replacesSpacingSeparator) {
+        while (isSpacingSeparator(elements[elements.length - 1]?.widget, settings.defaultSeparator)) {
+          elements.pop();
+        }
+      }
       const sepChar = widget.character ?? (settings.defaultSeparator ?? "|");
       const formattedSep = formatSeparator(sepChar);
       let separatorColor = widget.color ?? "gray";
       let separatorBg = widget.backgroundColor;
       let separatorBold = widget.bold;
       let separatorDim = widget.dim;
-      if (settings.inheritSeparatorColors && i > 0 && !widget.color && !widget.backgroundColor) {
-        const prevWidget = widgets[i - 1];
-        if (prevWidget && prevWidget.type !== "separator" && prevWidget.type !== "flex-separator") {
+      if (settings.inheritSeparatorColors && !widget.color && !widget.backgroundColor) {
+        const prevWidget = widgets[contentBeforeIndex];
+        if (prevWidget) {
           let widgetColor = prevWidget.color;
           if (!widgetColor) {
             const widgetImpl = getWidget(prevWidget.type);
@@ -61880,12 +61900,20 @@ var init_dist5 = __esm(() => {
 });
 
 // src/utils/usage-types.ts
-var FIVE_HOUR_BLOCK_MS, SEVEN_DAY_WINDOW_MS, UsageErrorSchema;
+function setUsageField(target, field, value) {
+  target[field] = value;
+}
+var FIVE_HOUR_BLOCK_MS, SEVEN_DAY_WINDOW_MS, UsageErrorSchema, WEEKLY_MODEL_USAGE_BUCKETS;
 var init_usage_types = __esm(() => {
   init_zod();
   FIVE_HOUR_BLOCK_MS = 5 * 60 * 60 * 1000;
   SEVEN_DAY_WINDOW_MS = 7 * 24 * 60 * 60 * 1000;
   UsageErrorSchema = exports_external.enum(["no-credentials", "timeout", "rate-limited", "api-error", "parse-error"]);
+  WEEKLY_MODEL_USAGE_BUCKETS = [
+    { widgetType: "weekly-sonnet-usage", modelDisplayName: "Sonnet", apiBucketKey: "seven_day_sonnet", usageField: "weeklySonnetUsage", resetField: "weeklySonnetResetAt" },
+    { widgetType: "weekly-opus-usage", modelDisplayName: "Opus", apiBucketKey: "seven_day_opus", usageField: "weeklyOpusUsage", resetField: "weeklyOpusResetAt" },
+    { widgetType: "fable-weekly-usage", modelDisplayName: "Fable", usageField: "fableUsage", resetField: "fableResetAt" }
+  ];
 });
 
 // src/utils/usage-fetch.ts
@@ -61898,6 +61926,22 @@ import * as path4 from "path";
 function getUsageApiBucketUtilization(bucket) {
   return bucket === null ? 0 : bucket?.utilization ?? undefined;
 }
+function findUsageApiLimit(limits, kind) {
+  return limits?.find((limit) => limit.kind === kind);
+}
+function isPlaceholderUsageApiLimit(limit) {
+  return (limit.percent ?? 0) === 0 && (limit.resets_at ?? null) === null;
+}
+function getUsageApiLimitPercent(limit) {
+  return limit && !isPlaceholderUsageApiLimit(limit) ? limit.percent ?? undefined : undefined;
+}
+function getUsageApiLimitResetAt(limit) {
+  return limit && !isPlaceholderUsageApiLimit(limit) ? limit.resets_at ?? undefined : undefined;
+}
+function findWeeklyScopedLimit(limits, modelDisplayName) {
+  const normalizedModelName = modelDisplayName.toLowerCase();
+  return limits?.find((limit) => limit.kind === "weekly_scoped" && (limit.scope?.model?.display_name ?? "").toLowerCase().includes(normalizedModelName));
+}
 function parseJsonWithSchema(rawJson, schema) {
   try {
     const parsed = schema.safeParse(JSON.parse(rawJson));
@@ -61925,6 +61969,8 @@ function parseCachedUsageData(rawJson) {
     weeklySonnetResetAt: parsed.weeklySonnetResetAt ?? undefined,
     weeklyOpusUsage: parsed.weeklyOpusUsage ?? undefined,
     weeklyOpusResetAt: parsed.weeklyOpusResetAt ?? undefined,
+    fableUsage: parsed.fableUsage ?? undefined,
+    fableResetAt: parsed.fableResetAt ?? undefined,
     extraUsageEnabled: parsed.extraUsageEnabled ?? undefined,
     extraUsageLimit: parsed.extraUsageLimit ?? undefined,
     extraUsageUsed: parsed.extraUsageUsed ?? undefined,
@@ -61945,26 +61991,34 @@ function tokenHashMatches(cachedHash, currentHash) {
   }
   return cachedHash === currentHash;
 }
+function getLegacyUsageApiBucket(parsed, apiBucketKey) {
+  return parsed[apiBucketKey];
+}
 function parseUsageApiResponse(rawJson) {
   const parsed = parseJsonWithSchema(rawJson, UsageApiResponseSchema);
   if (!parsed) {
     return null;
   }
-  return {
-    sessionUsage: getUsageApiBucketUtilization(parsed.five_hour),
-    sessionResetAt: parsed.five_hour?.resets_at ?? undefined,
-    weeklyUsage: getUsageApiBucketUtilization(parsed.seven_day),
-    weeklyResetAt: parsed.seven_day?.resets_at ?? undefined,
-    weeklySonnetUsage: getUsageApiBucketUtilization(parsed.seven_day_sonnet),
-    weeklySonnetResetAt: parsed.seven_day_sonnet?.resets_at ?? undefined,
-    weeklyOpusUsage: getUsageApiBucketUtilization(parsed.seven_day_opus),
-    weeklyOpusResetAt: parsed.seven_day_opus?.resets_at ?? undefined,
+  const sessionLimit = findUsageApiLimit(parsed.limits, "session");
+  const weeklyLimit = findUsageApiLimit(parsed.limits, "weekly_all");
+  const result2 = {
+    sessionUsage: getUsageApiBucketUtilization(parsed.five_hour) ?? getUsageApiLimitPercent(sessionLimit),
+    sessionResetAt: parsed.five_hour?.resets_at ?? getUsageApiLimitResetAt(sessionLimit),
+    weeklyUsage: getUsageApiBucketUtilization(parsed.seven_day) ?? getUsageApiLimitPercent(weeklyLimit),
+    weeklyResetAt: parsed.seven_day?.resets_at ?? getUsageApiLimitResetAt(weeklyLimit),
     extraUsageEnabled: parsed.extra_usage?.is_enabled ?? undefined,
     extraUsageLimit: parsed.extra_usage?.monthly_limit ?? undefined,
     extraUsageUsed: parsed.extra_usage?.used_credits ?? undefined,
     extraUsageUtilization: parsed.extra_usage?.utilization ?? undefined,
     extraUsageCurrency: parsed.extra_usage?.currency ?? undefined
   };
+  for (const bucket of WEEKLY_MODEL_USAGE_BUCKETS) {
+    const scopedLimit = findWeeklyScopedLimit(parsed.limits, bucket.modelDisplayName);
+    const legacyBucket = bucket.apiBucketKey ? getLegacyUsageApiBucket(parsed, bucket.apiBucketKey) : undefined;
+    setUsageField(result2, bucket.usageField, getUsageApiLimitPercent(scopedLimit) ?? getUsageApiBucketUtilization(legacyBucket));
+    setUsageField(result2, bucket.resetField, getUsageApiLimitResetAt(scopedLimit) ?? legacyBucket?.resets_at ?? undefined);
+  }
+  return result2;
 }
 function ensureCacheDirExists() {
   if (!fs4.existsSync(CACHE_DIR)) {
@@ -61992,7 +62046,10 @@ function hasRequiredUsageField(data, field) {
   if (windowSentinel !== undefined && data[windowSentinel] !== undefined) {
     return true;
   }
-  return data.extraUsageEnabled !== undefined && EXTRA_USAGE_DETAIL_FIELDS.has(field);
+  if (data.extraUsageEnabled !== undefined && EXTRA_USAGE_DETAIL_FIELDS.has(field)) {
+    return true;
+  }
+  return (data.sessionUsage !== undefined || data.weeklyUsage !== undefined) && FABLE_USAGE_FIELDS.has(field);
 }
 function hasRequiredUsageFields(data, requiredFields = []) {
   return requiredFields.every((field) => hasRequiredUsageField(data, field));
@@ -62325,7 +62382,7 @@ async function fetchUsageData(options = {}) {
     return getStaleUsageOrError("parse-error", now2, currentTokenHash, LOCK_MAX_AGE, requiredFields);
   }
 }
-var CACHE_DIR, CACHE_FILE, LOCK_FILE, CACHE_MAX_AGE = 180, LOCK_MAX_AGE = 30, DEFAULT_RATE_LIMIT_BACKOFF = 300, MACOS_USAGE_CREDENTIALS_SERVICE = "Claude Code-credentials", MACOS_SECURITY_DUMP_MAX_BUFFER, EXTRA_USAGE_DETAIL_FIELDS, WINDOW_RESET_FIELD_SENTINELS, UsageCredentialsSchema, UsageLockErrorSchema, UsageLockSchema, CachedUsageDataSchema, CachedTokenHashSchema, UsageApiBucketSchema, UsageApiResponseSchema, cachedUsageData = null, usageCacheTime = 0, usageErrorCacheMaxAge, USAGE_API_HOST = "api.anthropic.com", USAGE_API_PATH = "/api/oauth/usage", USAGE_API_TIMEOUT_MS = 5000;
+var CACHE_DIR, CACHE_FILE, LOCK_FILE, CACHE_MAX_AGE = 180, LOCK_MAX_AGE = 30, DEFAULT_RATE_LIMIT_BACKOFF = 300, MACOS_USAGE_CREDENTIALS_SERVICE = "Claude Code-credentials", MACOS_SECURITY_DUMP_MAX_BUFFER, EXTRA_USAGE_DETAIL_FIELDS, FABLE_USAGE_FIELDS, WINDOW_RESET_FIELD_SENTINELS, UsageCredentialsSchema, UsageLockErrorSchema, UsageLockSchema, CachedUsageDataSchema, CachedTokenHashSchema, UsageApiBucketSchema, UsageApiLimitSchema, UsageApiResponseSchema, cachedUsageData = null, usageCacheTime = 0, usageErrorCacheMaxAge, USAGE_API_HOST = "api.anthropic.com", USAGE_API_PATH = "/api/oauth/usage", USAGE_API_TIMEOUT_MS = 5000;
 var init_usage_fetch = __esm(async () => {
   init_dist5();
   init_zod();
@@ -62340,11 +62397,14 @@ var init_usage_fetch = __esm(async () => {
     "extraUsageUsed",
     "extraUsageUtilization"
   ]);
+  FABLE_USAGE_FIELDS = new Set([
+    "fableUsage",
+    "fableResetAt"
+  ]);
   WINDOW_RESET_FIELD_SENTINELS = {
     sessionResetAt: "sessionUsage",
     weeklyResetAt: "weeklyUsage",
-    weeklySonnetResetAt: "weeklySonnetUsage",
-    weeklyOpusResetAt: "weeklyOpusUsage"
+    ...Object.fromEntries(WEEKLY_MODEL_USAGE_BUCKETS.map((bucket) => [bucket.resetField, bucket.usageField]))
   };
   UsageCredentialsSchema = exports_external.object({ claudeAiOauth: exports_external.object({ accessToken: exports_external.string().nullable().optional() }).optional() });
   UsageLockErrorSchema = exports_external.enum(["timeout", "rate-limited", "parse-error"]);
@@ -62361,6 +62421,8 @@ var init_usage_fetch = __esm(async () => {
     weeklySonnetResetAt: exports_external.string().nullable().optional(),
     weeklyOpusUsage: exports_external.number().nullable().optional(),
     weeklyOpusResetAt: exports_external.string().nullable().optional(),
+    fableUsage: exports_external.number().nullable().optional(),
+    fableResetAt: exports_external.string().nullable().optional(),
     extraUsageEnabled: exports_external.boolean().nullable().optional(),
     extraUsageLimit: exports_external.number().nullable().optional(),
     extraUsageUsed: exports_external.number().nullable().optional(),
@@ -62373,11 +62435,18 @@ var init_usage_fetch = __esm(async () => {
     utilization: exports_external.number().nullable().optional(),
     resets_at: exports_external.string().nullable().optional()
   }).nullable().optional();
+  UsageApiLimitSchema = exports_external.looseObject({
+    kind: exports_external.string().nullable().optional(),
+    percent: exports_external.number().nullable().optional(),
+    resets_at: exports_external.string().nullable().optional(),
+    scope: exports_external.looseObject({ model: exports_external.looseObject({ display_name: exports_external.string().nullable().optional() }).nullable().optional() }).nullable().catch(null).optional()
+  });
   UsageApiResponseSchema = exports_external.looseObject({
     five_hour: UsageApiBucketSchema,
     seven_day: UsageApiBucketSchema,
     seven_day_sonnet: UsageApiBucketSchema,
     seven_day_opus: UsageApiBucketSchema,
+    limits: exports_external.array(UsageApiLimitSchema).nullable().optional(),
     extra_usage: exports_external.looseObject({
       is_enabled: exports_external.boolean().nullable().optional(),
       monthly_limit: exports_external.number().nullable().optional(),
@@ -65133,8 +65202,79 @@ var init_jsonl_cache = __esm(async () => {
   existsSync6 = fs7.existsSync;
 });
 
-// src/utils/jsonl-metrics.ts
+// src/utils/compaction.ts
 import * as fs8 from "fs";
+function isCompactBoundary(record2) {
+  if (typeof record2 !== "object" || record2 === null) {
+    return false;
+  }
+  const r = record2;
+  return r.type === "system" && r.subtype === "compact_boundary" && r.isSidechain !== true;
+}
+function getCompactBoundaryPostTokens(record2) {
+  if (!isCompactBoundary(record2)) {
+    return null;
+  }
+  const meta3 = record2.compactMetadata;
+  const post = typeof meta3 === "object" && meta3 !== null ? meta3.postTokens : undefined;
+  return typeof post === "number" && Number.isFinite(post) ? Math.max(0, post) : null;
+}
+function computeCompactionStats(lines) {
+  const stats = {
+    count: 0,
+    byTrigger: { auto: 0, manual: 0, unknown: 0 },
+    tokensReclaimed: 0
+  };
+  for (const line of lines) {
+    const record2 = parseJsonlLine(line);
+    if (!isCompactBoundary(record2)) {
+      continue;
+    }
+    stats.count += 1;
+    const meta3 = record2.compactMetadata;
+    const metaRecord = typeof meta3 === "object" && meta3 !== null ? meta3 : null;
+    const trigger = metaRecord?.trigger;
+    if (trigger === "auto") {
+      stats.byTrigger.auto += 1;
+    } else if (trigger === "manual") {
+      stats.byTrigger.manual += 1;
+    } else {
+      stats.byTrigger.unknown += 1;
+    }
+    const pre = metaRecord?.preTokens;
+    const post = metaRecord?.postTokens;
+    if (typeof pre === "number" && typeof post === "number") {
+      const reclaimed = pre - post;
+      if (Number.isFinite(reclaimed)) {
+        stats.tokensReclaimed += Math.max(0, reclaimed);
+      }
+    }
+  }
+  return stats;
+}
+async function getCompactionStats(transcriptPath) {
+  try {
+    if (!fs8.existsSync(transcriptPath)) {
+      return ZERO_COMPACTION_STATS;
+    }
+    const lines = await readJsonlLines(transcriptPath);
+    return computeCompactionStats(lines);
+  } catch {
+    return ZERO_COMPACTION_STATS;
+  }
+}
+var ZERO_COMPACTION_STATS;
+var init_compaction = __esm(() => {
+  init_jsonl_lines();
+  ZERO_COMPACTION_STATS = Object.freeze({
+    count: 0,
+    byTrigger: Object.freeze({ auto: 0, manual: 0, unknown: 0 }),
+    tokensReclaimed: 0
+  });
+});
+
+// src/utils/jsonl-metrics.ts
+import * as fs9 from "fs";
 import path7 from "node:path";
 function collectAgentIds(value, agentIds) {
   if (!value || typeof value !== "object") {
@@ -65167,7 +65307,7 @@ function getReferencedSubagentIds(lines) {
 }
 async function getSessionDuration(transcriptPath) {
   try {
-    if (!fs8.existsSync(transcriptPath)) {
+    if (!fs9.existsSync(transcriptPath)) {
       return null;
     }
     const lines = await readJsonlLines(transcriptPath);
@@ -65217,7 +65357,7 @@ async function getSessionDuration(transcriptPath) {
 }
 async function getTokenMetrics(transcriptPath) {
   try {
-    if (!fs8.existsSync(transcriptPath)) {
+    if (!fs9.existsSync(transcriptPath)) {
       return { inputTokens: 0, outputTokens: 0, cachedTokens: 0, cacheReadTokens: 0, cacheCreationTokens: 0, totalTokens: 0, contextLength: 0 };
     }
     const lines = await readJsonlLines(transcriptPath);
@@ -65228,22 +65368,30 @@ async function getTokenMetrics(transcriptPath) {
     let contextLength = 0;
     let mostRecentMainChainEntry = null;
     let mostRecentTimestamp = null;
+    let mostRecentPostCompactionEntry = null;
+    let mostRecentPostCompactionTimestamp = null;
+    let lastCompactBoundaryLineIndex = -1;
+    let lastCompactBoundaryPostTokens = null;
     const parsedEntries = [];
     let hasStopReasonField = false;
-    for (const line of lines) {
+    for (const [lineIndex, line] of lines.entries()) {
       const data = parseJsonlLine(line);
+      if (isCompactBoundary(data)) {
+        lastCompactBoundaryLineIndex = lineIndex;
+        lastCompactBoundaryPostTokens = getCompactBoundaryPostTokens(data);
+      }
       if (data?.message?.usage) {
-        parsedEntries.push(data);
+        parsedEntries.push({ data, lineIndex });
         if (Object.hasOwn(data.message, "stop_reason")) {
           hasStopReasonField = true;
         }
       }
     }
-    const entriesToCount = hasStopReasonField ? parsedEntries.filter((data, index) => {
-      const stopReason = data.message?.stop_reason;
+    const entriesToCount = hasStopReasonField ? parsedEntries.filter((entry, index) => {
+      const stopReason = entry.data.message?.stop_reason;
       return Boolean(stopReason) || stopReason === null && index === parsedEntries.length - 1;
     }) : parsedEntries;
-    for (const data of entriesToCount) {
+    for (const { data, lineIndex } of entriesToCount) {
       const usage = data.message?.usage;
       if (!usage) {
         continue;
@@ -65258,12 +65406,20 @@ async function getTokenMetrics(transcriptPath) {
           mostRecentTimestamp = entryTime;
           mostRecentMainChainEntry = data;
         }
+        if (lineIndex > lastCompactBoundaryLineIndex && (!mostRecentPostCompactionTimestamp || entryTime > mostRecentPostCompactionTimestamp)) {
+          mostRecentPostCompactionTimestamp = entryTime;
+          mostRecentPostCompactionEntry = data;
+        }
       }
     }
-    if (mostRecentMainChainEntry?.message?.usage) {
-      const usage = mostRecentMainChainEntry.message.usage;
-      contextLength = (usage.input_tokens || 0) + (usage.cache_read_input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0);
-    }
+    const contextLengthFromEntry = (entry) => {
+      const usage = entry?.message?.usage;
+      if (!usage) {
+        return null;
+      }
+      return (usage.input_tokens || 0) + (usage.cache_read_input_tokens ?? 0) + (usage.cache_creation_input_tokens ?? 0);
+    };
+    contextLength = lastCompactBoundaryLineIndex >= 0 ? contextLengthFromEntry(mostRecentPostCompactionEntry) ?? lastCompactBoundaryPostTokens ?? 0 : contextLengthFromEntry(mostRecentMainChainEntry) ?? 0;
     const cachedTokens = cacheReadTokens + cacheCreationTokens;
     const totalTokens = inputTokens + outputTokens + cachedTokens;
     return { inputTokens, outputTokens, cachedTokens, cacheReadTokens, cacheCreationTokens, totalTokens, contextLength };
@@ -65442,11 +65598,11 @@ function getSubagentTranscriptPaths(transcriptPath, referencedAgentIds) {
   const seenPaths = new Set;
   const matchedPaths = [];
   for (const subagentsDir of candidateDirs) {
-    if (!fs8.existsSync(subagentsDir)) {
+    if (!fs9.existsSync(subagentsDir)) {
       continue;
     }
     try {
-      const dirEntries = fs8.readdirSync(subagentsDir, { withFileTypes: true });
+      const dirEntries = fs9.readdirSync(subagentsDir, { withFileTypes: true });
       for (const entry of dirEntries) {
         if (!entry.isFile()) {
           continue;
@@ -65475,7 +65631,7 @@ async function getSpeedMetricsCollection(transcriptPath, options = {}) {
   const normalizedWindows = Array.from(new Set((options.windowSeconds ?? []).map((window2) => normalizeWindowSeconds(window2)).filter((window2) => window2 !== null)));
   const emptyWindowedMetrics = buildEmptyWindowedMetrics(normalizedWindows);
   try {
-    if (!fs8.existsSync(transcriptPath)) {
+    if (!fs9.existsSync(transcriptPath)) {
       return {
         sessionAverage: createEmptySpeedMetrics(),
         windowed: emptyWindowedMetrics
@@ -65520,6 +65676,7 @@ async function getSpeedMetricsCollection(transcriptPath, options = {}) {
   }
 }
 var init_jsonl_metrics = __esm(() => {
+  init_compaction();
   init_jsonl_lines();
 });
 
@@ -65658,6 +65815,9 @@ function resolveWeeklySonnetUsageWindow(usageData, nowMs = Date.now()) {
 function resolveWeeklyOpusUsageWindow(usageData, nowMs = Date.now()) {
   return getWeeklyUsageWindowFromResetAt(usageData.weeklyOpusResetAt ?? usageData.weeklyResetAt, nowMs);
 }
+function resolveFableUsageWindow(usageData, nowMs = Date.now()) {
+  return getWeeklyUsageWindowFromResetAt(usageData.fableResetAt ?? usageData.weeklyResetAt, nowMs);
+}
 function formatUsageDuration(durationMs, compact2 = false, useDays = true) {
   const clampedMs = Math.max(0, durationMs);
   const totalHours = Math.floor(clampedMs / (1000 * 60 * 60));
@@ -66872,7 +67032,7 @@ var init_JjRevision = __esm(() => {
 });
 
 // src/widgets/ClaudeAccountEmail.ts
-import * as fs9 from "fs";
+import * as fs10 from "fs";
 
 class ClaudeAccountEmailWidget {
   getDefaultColor() {
@@ -66895,7 +67055,7 @@ class ClaudeAccountEmailWidget {
       return item.rawValue ? "you@example.com" : "Account: you@example.com";
     }
     try {
-      const content = fs9.readFileSync(getClaudeJsonPath(), "utf-8");
+      const content = fs10.readFileSync(getClaudeJsonPath(), "utf-8");
       const data = JSON.parse(content);
       const email3 = data.oauthAccount?.emailAddress;
       if (typeof email3 !== "string" || email3.length === 0) {
@@ -67333,7 +67493,7 @@ class FreeMemoryWidget {
 var init_FreeMemory = () => {};
 
 // src/widgets/SessionName.ts
-import * as fs10 from "fs";
+import * as fs11 from "fs";
 
 class SessionNameWidget {
   getDefaultColor() {
@@ -67360,7 +67520,7 @@ class SessionNameWidget {
       return null;
     }
     try {
-      const content = fs10.readFileSync(transcriptPath, "utf-8");
+      const content = fs11.readFileSync(transcriptPath, "utf-8");
       const lines = content.split(`
 `);
       for (let i = lines.length - 1;i >= 0; i--) {
@@ -68039,6 +68199,102 @@ var init_WeeklyOpusUsage = __esm(async () => {
   await init_usage();
 });
 
+// src/widgets/FableWeeklyUsage.ts
+class FableWeeklyUsageWidget {
+  getDefaultColor() {
+    return "brightBlue";
+  }
+  getDescription() {
+    return "Shows Fable-only weekly usage percentage";
+  }
+  getDisplayName() {
+    return "Weekly Fable Usage";
+  }
+  getCategory() {
+    return "Usage";
+  }
+  getEditorDisplay(item) {
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: getUsageDisplayModifierText(item, { showUsageDirection: true })
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-progress") {
+      return cycleUsageDisplayMode(item, [], true, true);
+    }
+    if (action === "toggle-invert") {
+      return toggleUsageInverted(item);
+    }
+    if (action === "toggle-cursor") {
+      return toggleUsageCursor(item);
+    }
+    return null;
+  }
+  render(item, context, settings) {
+    const displayMode = getUsageDisplayMode(item);
+    const inverted = isUsageInverted(item);
+    const showCursor = isUsageCursorEnabled(item);
+    if (context.isPreview) {
+      const previewPercent = 4;
+      const renderedPercent2 = inverted ? 100 - previewPercent : previewPercent;
+      if (isUsageProgressMode(displayMode)) {
+        const width = getUsageProgressBarWidth(displayMode);
+        const progressBar = makeTimerProgressBar2(renderedPercent2, width, showCursor ? { cursorPercent: 50 } : undefined);
+        const progressDisplay = `[${progressBar}] ${renderedPercent2.toFixed(1)}%`;
+        return formatRawOrLabeledValue(item, LABEL3, progressDisplay);
+      }
+      if (isUsageSliderMode(displayMode)) {
+        const slider = makeSliderBar(renderedPercent2, undefined, showCursor ? { cursorPercent: 50 } : undefined);
+        const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent2.toFixed(1)}%` : slider;
+        return formatRawOrLabeledValue(item, LABEL3, sliderDisplay);
+      }
+      return formatRawOrLabeledValue(item, LABEL3, `${renderedPercent2.toFixed(1)}%`);
+    }
+    const data = context.usageData ?? {};
+    if (data.fableUsage === undefined) {
+      if (data.error)
+        return getUsageErrorMessage(data.error);
+      return null;
+    }
+    const percent = Math.max(0, Math.min(100, data.fableUsage));
+    const renderedPercent = inverted ? 100 - percent : percent;
+    const getCursorOptions = () => {
+      if (!showCursor) {
+        return;
+      }
+      const window2 = resolveFableUsageWindow(data);
+      return window2 ? { cursorPercent: window2.elapsedPercent } : undefined;
+    };
+    if (isUsageProgressMode(displayMode)) {
+      const width = getUsageProgressBarWidth(displayMode);
+      const progressBar = makeTimerProgressBar2(renderedPercent, width, getCursorOptions());
+      const progressDisplay = `[${progressBar}] ${renderedPercent.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, LABEL3, progressDisplay);
+    }
+    if (isUsageSliderMode(displayMode)) {
+      const slider = makeSliderBar(renderedPercent, undefined, getCursorOptions());
+      const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent.toFixed(1)}%` : slider;
+      return formatRawOrLabeledValue(item, LABEL3, sliderDisplay);
+    }
+    return formatRawOrLabeledValue(item, LABEL3, `${renderedPercent.toFixed(1)}%`);
+  }
+  getCustomKeybinds(item) {
+    return getUsagePercentCustomKeybinds(item);
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var LABEL3 = "Fable Weekly: ";
+var init_FableWeeklyUsage = __esm(async () => {
+  init_usage_display();
+  await init_usage();
+});
+
 // src/widgets/shared/locale-editor.tsx
 function getInitialSelectedIndex(options, currentLocale) {
   const selectedValue = currentLocale ? canonicalizeLocale(currentLocale) : DEFAULT_RESET_LOCALE;
@@ -69675,69 +69931,6 @@ class GitWorktreeOriginalBranchWidget {
   }
 }
 
-// src/utils/compaction.ts
-import * as fs11 from "fs";
-function isCompactBoundary(record2) {
-  if (typeof record2 !== "object" || record2 === null) {
-    return false;
-  }
-  const r = record2;
-  return r.type === "system" && r.subtype === "compact_boundary" && r.isSidechain !== true;
-}
-function computeCompactionStats(lines) {
-  const stats = {
-    count: 0,
-    byTrigger: { auto: 0, manual: 0, unknown: 0 },
-    tokensReclaimed: 0
-  };
-  for (const line of lines) {
-    const record2 = parseJsonlLine(line);
-    if (!isCompactBoundary(record2)) {
-      continue;
-    }
-    stats.count += 1;
-    const meta3 = record2.compactMetadata;
-    const metaRecord = typeof meta3 === "object" && meta3 !== null ? meta3 : null;
-    const trigger = metaRecord?.trigger;
-    if (trigger === "auto") {
-      stats.byTrigger.auto += 1;
-    } else if (trigger === "manual") {
-      stats.byTrigger.manual += 1;
-    } else {
-      stats.byTrigger.unknown += 1;
-    }
-    const pre = metaRecord?.preTokens;
-    const post = metaRecord?.postTokens;
-    if (typeof pre === "number" && typeof post === "number") {
-      const reclaimed = pre - post;
-      if (Number.isFinite(reclaimed)) {
-        stats.tokensReclaimed += Math.max(0, reclaimed);
-      }
-    }
-  }
-  return stats;
-}
-async function getCompactionStats(transcriptPath) {
-  try {
-    if (!fs11.existsSync(transcriptPath)) {
-      return ZERO_COMPACTION_STATS;
-    }
-    const lines = await readJsonlLines(transcriptPath);
-    return computeCompactionStats(lines);
-  } catch {
-    return ZERO_COMPACTION_STATS;
-  }
-}
-var ZERO_COMPACTION_STATS;
-var init_compaction = __esm(() => {
-  init_jsonl_lines();
-  ZERO_COMPACTION_STATS = Object.freeze({
-    count: 0,
-    byTrigger: Object.freeze({ auto: 0, manual: 0, unknown: 0 }),
-    tokensReclaimed: 0
-  });
-});
-
 // src/widgets/CompactionCounter.ts
 function getFormat2(item) {
   const format = item.metadata?.format;
@@ -70707,6 +70900,7 @@ var init_widgets = __esm(async () => {
     init_ExtraUsageUsed(),
     init_WeeklySonnetUsage(),
     init_WeeklyOpusUsage(),
+    init_FableWeeklyUsage(),
     init_BlockResetTimer(),
     init_WeeklyResetTimer(),
     init_ContextBar(),
@@ -70799,6 +70993,7 @@ var init_widget_manifest = __esm(async () => {
     { type: "extra-usage-used", create: () => new ExtraUsageUsedWidget },
     { type: "weekly-sonnet-usage", create: () => new WeeklySonnetUsageWidget },
     { type: "weekly-opus-usage", create: () => new WeeklyOpusUsageWidget },
+    { type: "fable-weekly-usage", create: () => new FableWeeklyUsageWidget },
     { type: "reset-timer", create: () => new BlockResetTimerWidget },
     { type: "weekly-reset-timer", create: () => new WeeklyResetTimerWidget },
     { type: "context-bar", create: () => new ContextBarWidget },
@@ -80181,28 +80376,28 @@ await init_renderer2();
 init_terminal();
 
 // src/utils/usage-prefetch.ts
+init_usage_types();
 await init_usage();
-var USAGE_WIDGET_TYPES = new Set([
+var BASE_USAGE_WIDGET_TYPES = [
   "session-usage",
   "weekly-usage",
-  "weekly-sonnet-usage",
-  "weekly-opus-usage",
   "block-timer",
   "reset-timer",
   "weekly-reset-timer",
   "extra-usage-utilization",
   "extra-usage-remaining",
   "extra-usage-used"
+];
+var USAGE_WIDGET_TYPES = new Set([
+  ...BASE_USAGE_WIDGET_TYPES,
+  ...WEEKLY_MODEL_USAGE_BUCKETS.map((bucket) => bucket.widgetType)
 ]);
 var USAGE_DATA_FIELDS = [
   "sessionUsage",
   "sessionResetAt",
   "weeklyUsage",
   "weeklyResetAt",
-  "weeklySonnetUsage",
-  "weeklySonnetResetAt",
-  "weeklyOpusUsage",
-  "weeklyOpusResetAt",
+  ...WEEKLY_MODEL_USAGE_BUCKETS.flatMap((bucket) => [bucket.usageField, bucket.resetField]),
   "extraUsageEnabled",
   "extraUsageLimit",
   "extraUsageUsed",
@@ -80213,8 +80408,7 @@ var EMPTY_USAGE_REQUIREMENTS = [];
 var USAGE_WIDGET_REQUIREMENTS = {
   "session-usage": [{ field: "sessionUsage" }],
   "weekly-usage": [{ field: "weeklyUsage" }],
-  "weekly-sonnet-usage": [{ field: "weeklySonnetUsage" }],
-  "weekly-opus-usage": [{ field: "weeklyOpusUsage" }],
+  ...Object.fromEntries(WEEKLY_MODEL_USAGE_BUCKETS.map((bucket) => [bucket.widgetType, [{ field: bucket.usageField }]])),
   "block-timer": [{ field: "sessionResetAt", suppressFetchError: true }],
   "reset-timer": [{ field: "sessionResetAt", suppressFetchError: true }],
   "weekly-reset-timer": [{ field: "weeklyResetAt", suppressFetchError: true }],
@@ -80235,8 +80429,7 @@ var USAGE_WIDGET_REQUIREMENTS = {
 var USAGE_CURSOR_REQUIREMENTS = {
   "session-usage": { field: "sessionResetAt" },
   "weekly-usage": { field: "weeklyResetAt" },
-  "weekly-sonnet-usage": { field: "weeklySonnetResetAt", alternatives: ["weeklyResetAt"] },
-  "weekly-opus-usage": { field: "weeklyOpusResetAt", alternatives: ["weeklyResetAt"] }
+  ...Object.fromEntries(WEEKLY_MODEL_USAGE_BUCKETS.map((bucket) => [bucket.widgetType, { field: bucket.resetField, alternatives: ["weeklyResetAt"] }]))
 };
 function hasUsageDependentWidgets(lines) {
   return lines.some((line) => line.some((item) => USAGE_WIDGET_TYPES.has(item.type)));
@@ -80286,21 +80479,14 @@ function hasAnyUsageDataField(data) {
   return USAGE_DATA_FIELDS.some((field) => data?.[field] !== undefined);
 }
 function pickDefinedUsageFields(data) {
-  return {
-    ...data?.sessionUsage !== undefined ? { sessionUsage: data.sessionUsage } : {},
-    ...data?.sessionResetAt !== undefined ? { sessionResetAt: data.sessionResetAt } : {},
-    ...data?.weeklyUsage !== undefined ? { weeklyUsage: data.weeklyUsage } : {},
-    ...data?.weeklyResetAt !== undefined ? { weeklyResetAt: data.weeklyResetAt } : {},
-    ...data?.weeklySonnetUsage !== undefined ? { weeklySonnetUsage: data.weeklySonnetUsage } : {},
-    ...data?.weeklySonnetResetAt !== undefined ? { weeklySonnetResetAt: data.weeklySonnetResetAt } : {},
-    ...data?.weeklyOpusUsage !== undefined ? { weeklyOpusUsage: data.weeklyOpusUsage } : {},
-    ...data?.weeklyOpusResetAt !== undefined ? { weeklyOpusResetAt: data.weeklyOpusResetAt } : {},
-    ...data?.extraUsageEnabled !== undefined ? { extraUsageEnabled: data.extraUsageEnabled } : {},
-    ...data?.extraUsageLimit !== undefined ? { extraUsageLimit: data.extraUsageLimit } : {},
-    ...data?.extraUsageUsed !== undefined ? { extraUsageUsed: data.extraUsageUsed } : {},
-    ...data?.extraUsageUtilization !== undefined ? { extraUsageUtilization: data.extraUsageUtilization } : {},
-    ...data?.extraUsageCurrency !== undefined ? { extraUsageCurrency: data.extraUsageCurrency } : {}
-  };
+  const picked = {};
+  for (const field of USAGE_DATA_FIELDS) {
+    const value = data?.[field];
+    if (value !== undefined) {
+      setUsageField(picked, field, value);
+    }
+  }
+  return picked;
 }
 function mergeUsageData(rateLimitsData, apiData) {
   return {
@@ -80315,28 +80501,28 @@ function epochSecondsToIsoString(epochSeconds) {
   }
   return new Date(epochSeconds * 1000).toISOString();
 }
+function getRateLimitBucketUsage(bucket) {
+  return bucket?.used_percentage ?? undefined;
+}
 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);
-  const weeklySonnetUsage = rateLimits.seven_day_sonnet === null ? 0 : rateLimits.seven_day_sonnet?.used_percentage ?? undefined;
-  const weeklySonnetResetAt = epochSecondsToIsoString(rateLimits.seven_day_sonnet?.resets_at);
-  const weeklyOpusUsage = rateLimits.seven_day_opus === null ? 0 : rateLimits.seven_day_opus?.used_percentage ?? undefined;
-  const weeklyOpusResetAt = epochSecondsToIsoString(rateLimits.seven_day_opus?.resets_at);
+  const rateLimitBuckets = rateLimits;
   const usageData = {
-    sessionUsage,
-    sessionResetAt,
-    weeklyUsage,
-    weeklyResetAt,
-    weeklySonnetUsage,
-    weeklySonnetResetAt,
-    weeklyOpusUsage,
-    weeklyOpusResetAt
+    sessionUsage: rateLimits.five_hour?.used_percentage ?? undefined,
+    sessionResetAt: epochSecondsToIsoString(rateLimits.five_hour?.resets_at),
+    weeklyUsage: rateLimits.seven_day?.used_percentage ?? undefined,
+    weeklyResetAt: epochSecondsToIsoString(rateLimits.seven_day?.resets_at)
   };
+  for (const bucket of WEEKLY_MODEL_USAGE_BUCKETS) {
+    if (!bucket.apiBucketKey) {
+      continue;
+    }
+    const rateLimitBucket = rateLimitBuckets[bucket.apiBucketKey];
+    setUsageField(usageData, bucket.usageField, getRateLimitBucketUsage(rateLimitBucket));
+    setUsageField(usageData, bucket.resetField, epochSecondsToIsoString(rateLimitBucket?.resets_at));
+  }
   return hasAnyUsageDataField(usageData) ? usageData : null;
 }
 async function prefetchUsageDataIfNeeded(lines, data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline",
-  "version": "2.2.25",
+  "version": "2.2.26",
   "bugs": {
     "url": "https://github.com/sirmalloc/ccstatusline/issues"
   },