ccstatusline 2.2.11 → 2.2.13

package/dist/ccstatusline.js

@@ -56136,7 +56136,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.11";
+var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.13";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -57127,11 +57127,21 @@ function isUsageProgressMode(mode) {
 function isUsageSliderMode(mode) {
   return mode === "slider" || mode === "slider-only";
 }
-function makeSliderBar(percent, width = SLIDER_WIDTH) {
+function makeSliderBar(percent, width = SLIDER_WIDTH, options) {
   const clamped = Math.max(0, Math.min(100, percent));
   const filled = Math.round(clamped / 100 * width);
-  const empty = width - filled;
-  return "▓".repeat(filled) + "░".repeat(empty);
+  const cursorPos = options?.cursorPercent !== undefined ? Math.min(Math.floor(Math.max(0, Math.min(100, options.cursorPercent)) / 100 * width), width - 1) : -1;
+  let bar = "";
+  for (let i = 0;i < width; i++) {
+    if (i === cursorPos) {
+      bar += "│";
+    } else if (i < filled) {
+      bar += "▓";
+    } else {
+      bar += "░";
+    }
+  }
+  return bar;
 }
 function getUsageProgressBarWidth(mode) {
   return mode === "progress" ? 32 : 16;
@@ -57142,6 +57152,12 @@ function isUsageInverted(item) {
 function isUsageCompact(item) {
   return isMetadataFlagEnabled(item, "compact");
 }
+function isUsageCursorEnabled(item) {
+  return isMetadataFlagEnabled(item, "cursor");
+}
+function toggleUsageCursor(item) {
+  return toggleMetadataFlag(item, "cursor");
+}
 function isUsageDateMode(item) {
   return isMetadataFlagEnabled(item, "absolute");
 }
@@ -57213,6 +57229,9 @@ function getUsageDisplayModifierText(item, options = {}) {
   if (isUsageInverted(item)) {
     modifiers.push("inverted");
   }
+  if (isUsageCursorEnabled(item) && (isUsageProgressMode(mode) || isUsageSliderMode(mode))) {
+    modifiers.push("time cursor");
+  }
   if (options.includeCompact && !isUsageProgressMode(mode) && isUsageCompact(item)) {
     modifiers.push("compact");
   }
@@ -57240,7 +57259,8 @@ function cycleUsageDisplayMode(item, disabledInProgressKeys = [], includeSlider
   } else {
     nextMode = currentMode === "time" ? "progress" : currentMode === "progress" ? "progress-short" : "time";
   }
-  const nextItem = removeMetadataKeys(item, nextMode === "time" ? ["invert"] : disabledInProgressKeys);
+  const keysToRemove = nextMode === "time" ? ["invert", "cursor"] : disabledInProgressKeys;
+  const nextItem = removeMetadataKeys(item, keysToRemove);
   const nextMetadata = {
     ...nextItem.metadata ?? {},
     display: nextMode
@@ -57260,12 +57280,17 @@ function getUsagePercentCustomKeybinds(item) {
     if (isUsageProgressMode(mode) || isUsageSliderMode(mode)) {
       keybinds.push(INVERT_TOGGLE_KEYBIND);
     }
+    if (isUsageProgressMode(mode) || isUsageSliderMode(mode)) {
+      keybinds.push(CURSOR_TOGGLE_KEYBIND);
+    }
   }
   return keybinds;
 }
 function getUsageTimerCustomKeybinds(item, options = {}) {
   const keybinds = [PROGRESS_TOGGLE_KEYBIND];
-  if (item && isUsageProgressMode(getUsageDisplayMode(item))) {
+  const mode = item ? getUsageDisplayMode(item) : "time";
+  const isBarMode = isUsageProgressMode(mode) || isUsageSliderMode(mode);
+  if (item && isBarMode) {
     keybinds.push(INVERT_TOGGLE_KEYBIND);
   } else {
     keybinds.push(COMPACT_TOGGLE_KEYBIND);
@@ -57273,7 +57298,7 @@ function getUsageTimerCustomKeybinds(item, options = {}) {
       keybinds.push(DATE_TOGGLE_KEYBIND);
     }
   }
-  if (item && isUsageDateMode(item) && !isUsageProgressMode(getUsageDisplayMode(item))) {
+  if (item && isUsageDateMode(item) && !isBarMode) {
     if (options.includeHourFormat) {
       keybinds.push(HOUR_FORMAT_TOGGLE_KEYBIND);
     }
@@ -57286,12 +57311,13 @@ function getUsageTimerCustomKeybinds(item, options = {}) {
   }
   return keybinds;
 }
-var SLIDER_WIDTH = 10, PROGRESS_TOGGLE_KEYBIND, INVERT_TOGGLE_KEYBIND, COMPACT_TOGGLE_KEYBIND, DATE_TOGGLE_KEYBIND, HOUR_FORMAT_TOGGLE_KEYBIND, TIMEZONE_KEYBIND, LOCALE_KEYBIND;
+var SLIDER_WIDTH = 10, PROGRESS_TOGGLE_KEYBIND, INVERT_TOGGLE_KEYBIND, COMPACT_TOGGLE_KEYBIND, CURSOR_TOGGLE_KEYBIND, DATE_TOGGLE_KEYBIND, HOUR_FORMAT_TOGGLE_KEYBIND, TIMEZONE_KEYBIND, LOCALE_KEYBIND;
 var init_usage_display = __esm(() => {
   init_locales2();
   PROGRESS_TOGGLE_KEYBIND = { key: "p", label: "(p)rogress toggle", action: "toggle-progress" };
   INVERT_TOGGLE_KEYBIND = { key: "v", label: "in(v)ert fill", action: "toggle-invert" };
   COMPACT_TOGGLE_KEYBIND = { key: "s", label: "(s)hort time", action: "toggle-compact" };
+  CURSOR_TOGGLE_KEYBIND = { key: "t", label: "(t)ime cursor", action: "toggle-cursor" };
   DATE_TOGGLE_KEYBIND = { key: "t", label: "(t)imestamp", action: "toggle-date" };
   HOUR_FORMAT_TOGGLE_KEYBIND = { key: "h", label: "12/24 (h)our", action: "toggle-hour-format" };
   TIMEZONE_KEYBIND = { key: "z", label: "time(z)one", action: "edit-timezone" };
@@ -57386,23 +57412,19 @@ class ContextPercentageWidget {
   }
   render(item, context, settings) {
     const isInverse = isContextInverse(item);
+    const label = isInverse ? "Ctx Left: " : "Ctx Used: ";
     const sliderMode = getContextSliderMode(item);
     const contextPercentageMetrics = calculateContextPercentageMetrics(context);
+    const formatContextPercentage = (displayPercentage) => {
+      const sliderResult = renderContextSlider(sliderMode, displayPercentage);
+      return formatRawOrLabeledValue(item, label, sliderResult ?? `${displayPercentage.toFixed(1)}%`);
+    };
     if (context.isPreview) {
-      const previewPercent = isInverse ? 90.7 : 9.3;
-      const sliderResult = renderContextSlider(sliderMode, previewPercent);
-      if (sliderResult !== null) {
-        return formatRawOrLabeledValue(item, "Ctx: ", sliderResult);
-      }
-      return formatRawOrLabeledValue(item, "Ctx: ", `${previewPercent.toFixed(1)}%`);
+      return formatContextPercentage(isInverse ? 90.7 : 9.3);
     }
     if (contextPercentageMetrics !== null) {
       const displayPercentage = isInverse ? 100 - contextPercentageMetrics.usedPercentage : contextPercentageMetrics.usedPercentage;
-      const sliderResult = renderContextSlider(sliderMode, displayPercentage);
-      if (sliderResult !== null) {
-        return formatRawOrLabeledValue(item, "Ctx: ", sliderResult);
-      }
-      return formatRawOrLabeledValue(item, "Ctx: ", `${displayPercentage.toFixed(1)}%`);
+      return formatContextPercentage(displayPercentage);
     }
     return null;
   }
@@ -57457,35 +57479,27 @@ class ContextPercentageUsableWidget {
   }
   render(item, context, settings) {
     const isInverse = isContextInverse(item);
+    const label = isInverse ? "Ctx(u) Left: " : "Ctx(u) Used: ";
     const sliderMode = getContextSliderMode(item);
     const modelIdentifier = getModelContextIdentifier(context.data?.model);
     const contextWindowMetrics = getContextWindowMetrics(context.data);
     const contextConfig = getContextConfig(modelIdentifier, contextWindowMetrics.windowSize);
+    const formatContextPercentage = (displayPercentage) => {
+      const sliderResult = renderContextSlider(sliderMode, displayPercentage);
+      return formatRawOrLabeledValue(item, label, sliderResult ?? `${displayPercentage.toFixed(1)}%`);
+    };
     if (context.isPreview) {
-      const previewPercent = isInverse ? 88.4 : 11.6;
-      const sliderResult = renderContextSlider(sliderMode, previewPercent);
-      if (sliderResult !== null) {
-        return formatRawOrLabeledValue(item, "Ctx(u): ", sliderResult);
-      }
-      return formatRawOrLabeledValue(item, "Ctx(u): ", `${previewPercent.toFixed(1)}%`);
+      return formatContextPercentage(isInverse ? 88.4 : 11.6);
     }
     if (contextWindowMetrics.contextLengthTokens !== null) {
       const usedPercentage = Math.min(100, contextWindowMetrics.contextLengthTokens / contextConfig.usableTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
-      const sliderResult = renderContextSlider(sliderMode, displayPercentage);
-      if (sliderResult !== null) {
-        return formatRawOrLabeledValue(item, "Ctx(u): ", sliderResult);
-      }
-      return formatRawOrLabeledValue(item, "Ctx(u): ", `${displayPercentage.toFixed(1)}%`);
+      return formatContextPercentage(displayPercentage);
     }
     if (context.tokenMetrics) {
       const usedPercentage = Math.min(100, context.tokenMetrics.contextLength / contextConfig.usableTokens * 100);
       const displayPercentage = isInverse ? 100 - usedPercentage : usedPercentage;
-      const sliderResult = renderContextSlider(sliderMode, displayPercentage);
-      if (sliderResult !== null) {
-        return formatRawOrLabeledValue(item, "Ctx(u): ", sliderResult);
-      }
-      return formatRawOrLabeledValue(item, "Ctx(u): ", `${displayPercentage.toFixed(1)}%`);
+      return formatContextPercentage(displayPercentage);
     }
     return null;
   }
@@ -59507,6 +59521,10 @@ function parseCachedUsageData(rawJson) {
     sessionResetAt: parsed.sessionResetAt ?? undefined,
     weeklyUsage: parsed.weeklyUsage ?? undefined,
     weeklyResetAt: parsed.weeklyResetAt ?? undefined,
+    weeklySonnetUsage: parsed.weeklySonnetUsage ?? undefined,
+    weeklySonnetResetAt: parsed.weeklySonnetResetAt ?? undefined,
+    weeklyOpusUsage: parsed.weeklyOpusUsage ?? undefined,
+    weeklyOpusResetAt: parsed.weeklyOpusResetAt ?? undefined,
     extraUsageEnabled: parsed.extraUsageEnabled ?? undefined,
     extraUsageLimit: parsed.extraUsageLimit ?? undefined,
     extraUsageUsed: parsed.extraUsageUsed ?? undefined,
@@ -59524,6 +59542,10 @@ function parseUsageApiResponse(rawJson) {
     sessionResetAt: parsed.five_hour?.resets_at ?? undefined,
     weeklyUsage: parsed.seven_day?.utilization ?? undefined,
     weeklyResetAt: parsed.seven_day?.resets_at ?? undefined,
+    weeklySonnetUsage: parsed.seven_day_sonnet === null ? 0 : parsed.seven_day_sonnet?.utilization ?? undefined,
+    weeklySonnetResetAt: parsed.seven_day_sonnet?.resets_at ?? undefined,
+    weeklyOpusUsage: parsed.seven_day_opus === null ? 0 : parsed.seven_day_opus?.utilization ?? undefined,
+    weeklyOpusResetAt: parsed.seven_day_opus?.resets_at ?? undefined,
     extraUsageEnabled: parsed.extra_usage?.is_enabled ?? undefined,
     extraUsageLimit: parsed.extra_usage?.monthly_limit ?? undefined,
     extraUsageUsed: parsed.extra_usage?.used_credits ?? undefined,
@@ -59548,9 +59570,12 @@ function cacheUsageData(data, now2) {
   usageErrorCacheMaxAge = LOCK_MAX_AGE;
   return data;
 }
-function getStaleUsageOrError(error48, now2, errorCacheMaxAge = LOCK_MAX_AGE) {
+function hasRequiredUsageFields(data, requiredFields = []) {
+  return requiredFields.every((field) => data[field] !== undefined);
+}
+function getStaleUsageOrError(error48, now2, errorCacheMaxAge = LOCK_MAX_AGE, requiredFields = []) {
   const stale = readStaleUsageCache();
-  if (stale && !stale.error) {
+  if (stale && !stale.error && hasRequiredUsageFields(stale, requiredFields)) {
     return cacheUsageData(stale, now2);
   }
   return setCachedUsageError(error48, now2, errorCacheMaxAge);
@@ -59802,11 +59827,12 @@ async function fetchFromUsageApi(token) {
     request2.end();
   });
 }
-async function fetchUsageData() {
+async function fetchUsageData(options = {}) {
   const now2 = Math.floor(Date.now() / 1000);
+  const requiredFields = options.requiredFields ?? [];
   if (cachedUsageData) {
     const cacheAge = now2 - usageCacheTime;
-    if (!cachedUsageData.error && cacheAge < CACHE_MAX_AGE) {
+    if (!cachedUsageData.error && cacheAge < CACHE_MAX_AGE && hasRequiredUsageFields(cachedUsageData, requiredFields)) {
       return cachedUsageData;
     }
     if (cachedUsageData.error && cacheAge < usageErrorCacheMaxAge) {
@@ -59818,35 +59844,35 @@ async function fetchUsageData() {
     const fileAge = now2 - Math.floor(stat.mtimeMs / 1000);
     if (fileAge < CACHE_MAX_AGE) {
       const fileData = parseCachedUsageData(fs3.readFileSync(CACHE_FILE, "utf8"));
-      if (fileData && !fileData.error) {
+      if (fileData && !fileData.error && hasRequiredUsageFields(fileData, requiredFields)) {
         return cacheUsageData(fileData, now2);
       }
     }
   } catch {}
   const token = getUsageToken();
   if (!token) {
-    return getStaleUsageOrError("no-credentials", now2);
+    return getStaleUsageOrError("no-credentials", now2, LOCK_MAX_AGE, requiredFields);
   }
   const activeLock = readActiveUsageLock(now2);
   if (activeLock) {
-    return getStaleUsageOrError(activeLock.error, now2, Math.max(1, activeLock.blockedUntil - now2));
+    return getStaleUsageOrError(activeLock.error, now2, Math.max(1, activeLock.blockedUntil - now2), requiredFields);
   }
   writeUsageLock(now2 + LOCK_MAX_AGE, "timeout");
   try {
     const response = await fetchFromUsageApi(token);
     if (response.kind === "rate-limited") {
       writeUsageLock(now2 + response.retryAfterSeconds, "rate-limited");
-      return getStaleUsageOrError("rate-limited", now2, response.retryAfterSeconds);
+      return getStaleUsageOrError("rate-limited", now2, response.retryAfterSeconds, requiredFields);
     }
     if (response.kind === "error") {
-      return getStaleUsageOrError("api-error", now2);
+      return getStaleUsageOrError("api-error", now2, LOCK_MAX_AGE, requiredFields);
     }
     const usageData = parseUsageApiResponse(response.body);
     if (!usageData) {
-      return getStaleUsageOrError("parse-error", now2);
+      return getStaleUsageOrError("parse-error", now2, LOCK_MAX_AGE, requiredFields);
     }
     if (usageData.sessionUsage === undefined && usageData.weeklyUsage === undefined) {
-      return getStaleUsageOrError("parse-error", now2);
+      return getStaleUsageOrError("parse-error", now2, LOCK_MAX_AGE, requiredFields);
     }
     try {
       ensureCacheDirExists();
@@ -59854,10 +59880,10 @@ async function fetchUsageData() {
     } catch {}
     return cacheUsageData(usageData, now2);
   } catch {
-    return getStaleUsageOrError("parse-error", now2);
+    return getStaleUsageOrError("parse-error", now2, 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, UsageCredentialsSchema, UsageLockErrorSchema, UsageLockSchema, CachedUsageDataSchema, 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, UsageCredentialsSchema, UsageLockErrorSchema, UsageLockSchema, CachedUsageDataSchema, PerModelWeeklyBucketSchema, 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();
@@ -59878,12 +59904,20 @@ var init_usage_fetch = __esm(async () => {
     sessionResetAt: exports_external.string().nullable().optional(),
     weeklyUsage: exports_external.number().nullable().optional(),
     weeklyResetAt: exports_external.string().nullable().optional(),
+    weeklySonnetUsage: exports_external.number().nullable().optional(),
+    weeklySonnetResetAt: exports_external.string().nullable().optional(),
+    weeklyOpusUsage: exports_external.number().nullable().optional(),
+    weeklyOpusResetAt: exports_external.string().nullable().optional(),
     extraUsageEnabled: exports_external.boolean().nullable().optional(),
     extraUsageLimit: exports_external.number().nullable().optional(),
     extraUsageUsed: exports_external.number().nullable().optional(),
     extraUsageUtilization: exports_external.number().nullable().optional(),
     error: exports_external.string().nullable().optional()
   });
+  PerModelWeeklyBucketSchema = exports_external.object({
+    utilization: exports_external.number().nullable().optional(),
+    resets_at: exports_external.string().nullable().optional()
+  }).nullable().optional();
   UsageApiResponseSchema = exports_external.object({
     five_hour: exports_external.object({
       utilization: exports_external.number().nullable().optional(),
@@ -59893,6 +59927,8 @@ var init_usage_fetch = __esm(async () => {
       utilization: exports_external.number().nullable().optional(),
       resets_at: exports_external.string().nullable().optional()
     }).optional(),
+    seven_day_sonnet: PerModelWeeklyBucketSchema,
+    seven_day_opus: PerModelWeeklyBucketSchema,
     extra_usage: exports_external.object({
       is_enabled: exports_external.boolean().nullable().optional(),
       monthly_limit: exports_external.number().nullable().optional(),
@@ -63161,6 +63197,12 @@ function getWeeklyUsageWindowFromResetAt(weeklyResetAt, nowMs = Date.now()) {
 function resolveWeeklyUsageWindow(usageData, nowMs = Date.now()) {
   return getWeeklyUsageWindowFromResetAt(usageData.weeklyResetAt, nowMs);
 }
+function resolveWeeklySonnetUsageWindow(usageData, nowMs = Date.now()) {
+  return getWeeklyUsageWindowFromResetAt(usageData.weeklySonnetResetAt ?? usageData.weeklyResetAt, nowMs);
+}
+function resolveWeeklyOpusUsageWindow(usageData, nowMs = Date.now()) {
+  return getWeeklyUsageWindowFromResetAt(usageData.weeklyOpusResetAt ?? usageData.weeklyResetAt, nowMs);
+}
 function formatUsageDuration(durationMs, compact2 = false, useDays = true) {
   const clampedMs = Math.max(0, durationMs);
   const totalHours = Math.floor(clampedMs / (1000 * 60 * 60));
@@ -63318,7 +63360,7 @@ class BlockTimerWidget {
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      return cycleUsageDisplayMode(item, ["compact"]);
+      return cycleUsageDisplayMode(item, ["compact"], true);
     }
     if (action === "toggle-invert") {
       return toggleUsageInverted(item);
@@ -63339,6 +63381,11 @@ class BlockTimerWidget {
         const progressBar = makeTimerProgressBar(previewPercent, barWidth);
         return formatRawOrLabeledValue(item, "Block ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
       }
+      if (isUsageSliderMode(displayMode)) {
+        const slider = makeSliderBar(previewPercent);
+        const sliderDisplay = displayMode === "slider" ? `${slider} ${previewPercent.toFixed(1)}%` : slider;
+        return formatRawOrLabeledValue(item, "Block ", sliderDisplay);
+      }
       return formatRawOrLabeledValue(item, "Block: ", compact2 ? "3h45m" : "3hr 45m");
     }
     const usageData = context.usageData ?? {};
@@ -63349,6 +63396,11 @@ class BlockTimerWidget {
         const emptyBar = "░".repeat(barWidth);
         return formatRawOrLabeledValue(item, "Block ", `[${emptyBar}] 0.0%`);
       }
+      if (isUsageSliderMode(displayMode)) {
+        const emptySlider = makeSliderBar(0);
+        const sliderDisplay = displayMode === "slider" ? `${emptySlider} 0.0%` : emptySlider;
+        return formatRawOrLabeledValue(item, "Block ", sliderDisplay);
+      }
       return formatRawOrLabeledValue(item, "Block: ", compact2 ? "0h" : "0hr 0m");
     }
     if (isUsageProgressMode(displayMode)) {
@@ -63358,6 +63410,12 @@ class BlockTimerWidget {
       const percentage = percent.toFixed(1);
       return formatRawOrLabeledValue(item, "Block ", `[${progressBar}] ${percentage}%`);
     }
+    if (isUsageSliderMode(displayMode)) {
+      const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
+      const slider = makeSliderBar(percent);
+      const sliderDisplay = displayMode === "slider" ? `${slider} ${percent.toFixed(1)}%` : slider;
+      return formatRawOrLabeledValue(item, "Block ", sliderDisplay);
+    }
     const elapsedTime = formatUsageDuration(window2.elapsedMs, compact2);
     return formatRawOrLabeledValue(item, "Block: ", elapsedTime);
   }
@@ -63666,149 +63724,793 @@ class ClaudeSessionIdWidget {
   }
 }
 
-// src/widgets/ClaudeAccountEmail.ts
-import * as fs8 from "fs";
+// src/utils/jj.ts
+import { execFileSync as execFileSync4 } from "child_process";
+function runJjArgs(args, context, allowEmpty = false) {
+  try {
+    const cwd2 = resolveGitCwd(context);
+    const output = execFileSync4("jj", args, {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "ignore"],
+      ...cwd2 ? { cwd: cwd2 } : {}
+    }).trimEnd();
+    return allowEmpty || output.length > 0 ? output : null;
+  } catch {
+    return null;
+  }
+}
+function isInsideJjRepo(context) {
+  return runJjArgs(["root"], context) !== null;
+}
+function parseDiffStat(stat2) {
+  const insertMatch = /(\d+)\s+insertions?/.exec(stat2);
+  const deleteMatch = /(\d+)\s+deletions?/.exec(stat2);
+  return {
+    insertions: insertMatch?.[1] ? parseInt(insertMatch[1], 10) : 0,
+    deletions: deleteMatch?.[1] ? parseInt(deleteMatch[1], 10) : 0
+  };
+}
+function getJjChangeCounts(context) {
+  return parseDiffStat(runJjArgs(["diff", "--stat"], context) ?? "");
+}
+var init_jj = __esm(() => {
+  init_git();
+});
 
-class ClaudeAccountEmailWidget {
+// src/widgets/JjBookmarks.ts
+class JjBookmarksWidget {
   getDefaultColor() {
-    return "blue";
+    return "magenta";
   }
   getDescription() {
-    return "Displays the email of the currently logged-in Claude account";
+    return "Shows the current jujutsu bookmark(s)";
   }
   getDisplayName() {
-    return "Claude Account Email";
+    return "JJ Bookmarks";
   }
   getCategory() {
-    return "Session";
+    return "Jujutsu";
   }
   getEditorDisplay(item) {
-    return { displayText: this.getDisplayName() };
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
   }
-  render(item, context, settings) {
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
     if (context.isPreview) {
-      return item.rawValue ? "you@example.com" : "Account: you@example.com";
+      return item.rawValue ? "main" : "\uD83D\uDD16 main";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : "\uD83D\uDD16 no jj";
+    }
+    const bookmarks = this.getJjBookmarks(context);
+    if (bookmarks) {
+      return item.rawValue ? bookmarks : `\uD83D\uDD16 ${bookmarks}`;
+    }
+    return hideNoJj ? null : "\uD83D\uDD16 (none)";
+  }
+  getJjBookmarks(context) {
+    const output = runJjArgs([
+      "log",
+      "--no-graph",
+      "-r",
+      "heads(::@ & bookmarks())",
+      "--template",
+      "bookmarks"
+    ], context);
+    if (!output) {
+      return null;
     }
-    try {
-      const content = fs8.readFileSync(getClaudeJsonPath(), "utf-8");
-      const data = JSON.parse(content);
-      const email3 = data.oauthAccount?.emailAddress;
-      if (typeof email3 !== "string" || email3.length === 0) {
-        return null;
-      }
-      return item.rawValue ? email3 : `Account: ${email3}`;
-    } catch {
+    const bookmarks = output.split(/\s+/).filter(Boolean);
+    if (bookmarks.length === 0) {
       return null;
     }
+    return bookmarks.join(", ");
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
   }
   supportsRawValue() {
     return true;
   }
-  supportsColors(item) {
+  supportsColors() {
     return true;
   }
 }
-var init_ClaudeAccountEmail = __esm(async () => {
-  await init_claude_settings();
+var init_JjBookmarks = __esm(() => {
+  init_jj();
 });
 
-// src/utils/speed-metrics.ts
-function calculateOutputSpeed(metrics) {
-  if (metrics.totalDurationMs === 0) {
-    return null;
+// src/widgets/JjWorkspace.ts
+class JjWorkspaceWidget {
+  getDefaultColor() {
+    return "blue";
   }
-  const seconds = metrics.totalDurationMs / 1000;
-  return metrics.outputTokens / seconds;
-}
-function calculateInputSpeed(metrics) {
-  if (metrics.totalDurationMs === 0) {
-    return null;
+  getDescription() {
+    return "Shows the current jujutsu workspace name";
   }
-  const seconds = metrics.totalDurationMs / 1000;
-  return metrics.inputTokens / seconds;
-}
-function calculateTotalSpeed(metrics) {
-  if (metrics.totalDurationMs === 0) {
+  getDisplayName() {
+    return "JJ Workspace";
+  }
+  getCategory() {
+    return "Jujutsu";
+  }
+  getEditorDisplay(item) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
+    }
     return null;
   }
-  const seconds = metrics.totalDurationMs / 1000;
-  return metrics.totalTokens / seconds;
-}
-function formatSpeed(tokensPerSec) {
-  if (tokensPerSec === null) {
-    return "—";
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    if (context.isPreview) {
+      return item.rawValue ? "default" : "◆ default";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : "◆ no jj";
+    }
+    const workspace = this.getJjWorkspace(context);
+    if (workspace) {
+      return item.rawValue ? workspace : `◆ ${workspace}`;
+    }
+    return hideNoJj ? null : "◆ no jj";
   }
-  if (tokensPerSec >= 1000) {
-    const kValue = tokensPerSec / 1000;
-    return `${kValue.toFixed(1)}k t/s`;
+  getJjWorkspace(context) {
+    const output = runJjArgs([
+      "workspace",
+      "list",
+      "--template",
+      CURRENT_WORKSPACE_TEMPLATE
+    ], context);
+    if (!output) {
+      return null;
+    }
+    return output.split(/\r?\n/).map((workspace) => workspace.trim()).find(Boolean) ?? null;
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors() {
+    return true;
   }
-  return `${tokensPerSec.toFixed(1)} t/s`;
 }
+var CURRENT_WORKSPACE_TEMPLATE = `if(target.current_working_copy(), name ++ "
+")`;
+var init_JjWorkspace = __esm(() => {
+  init_jj();
+});
 
-// src/utils/speed-window.ts
-function clampSpeedWindowSeconds(value) {
-  if (!Number.isFinite(value)) {
-    return DEFAULT_SPEED_WINDOW_SECONDS;
+// src/widgets/JjRootDir.ts
+class JjRootDirWidget {
+  getDefaultColor() {
+    return "cyan";
   }
-  const normalized = Math.trunc(value);
-  if (normalized < MIN_SPEED_WINDOW_SECONDS) {
-    return MIN_SPEED_WINDOW_SECONDS;
+  getDescription() {
+    return "Shows the jujutsu repository root directory name";
   }
-  if (normalized > MAX_SPEED_WINDOW_SECONDS) {
-    return MAX_SPEED_WINDOW_SECONDS;
+  getDisplayName() {
+    return "JJ Root Dir";
   }
-  return normalized;
-}
-function getWidgetSpeedWindowSeconds(item) {
-  const metadataValue = item.metadata?.[SPEED_WINDOW_METADATA_KEY];
-  if (!metadataValue) {
-    return DEFAULT_SPEED_WINDOW_SECONDS;
+  getCategory() {
+    return "Jujutsu";
   }
-  const parsed = Number.parseInt(metadataValue, 10);
-  if (!Number.isFinite(parsed)) {
-    return DEFAULT_SPEED_WINDOW_SECONDS;
+  getEditorDisplay(item) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
   }
-  return clampSpeedWindowSeconds(parsed);
-}
-function isWidgetSpeedWindowEnabled(item) {
-  return getWidgetSpeedWindowSeconds(item) > 0;
-}
-function withWidgetSpeedWindowSeconds(item, seconds) {
-  return {
-    ...item,
-    metadata: {
-      ...item.metadata ?? {},
-      [SPEED_WINDOW_METADATA_KEY]: clampSpeedWindowSeconds(seconds).toString()
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
     }
-  };
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    if (context.isPreview) {
+      return "my-repo";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : "no jj";
+    }
+    const rootDir = runJjArgs(["root"], context);
+    if (rootDir) {
+      return this.getRootDirName(rootDir);
+    }
+    return hideNoJj ? null : "no jj";
+  }
+  getRootDirName(rootDir) {
+    const trimmedRootDir = rootDir.replace(/[\\/]+$/, "");
+    const normalizedRootDir = trimmedRootDir.length > 0 ? trimmedRootDir : rootDir;
+    const parts = normalizedRootDir.split(/[\\/]/).filter(Boolean);
+    const lastPart = parts[parts.length - 1];
+    return lastPart && lastPart.length > 0 ? lastPart : normalizedRootDir;
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
+  }
+  supportsRawValue() {
+    return false;
+  }
+  supportsColors() {
+    return true;
+  }
 }
-var SPEED_WINDOW_METADATA_KEY = "windowSeconds", DEFAULT_SPEED_WINDOW_SECONDS = 0, MIN_SPEED_WINDOW_SECONDS = 0, MAX_SPEED_WINDOW_SECONDS = 120;
+var init_JjRootDir = __esm(() => {
+  init_jj();
+});
 
-// src/widgets/shared/speed-widget.tsx
-function getSpeedMetricsForWidget(item, context) {
-  if (!isWidgetSpeedWindowEnabled(item)) {
-    return context.speedMetrics ?? null;
+// src/widgets/JjChanges.ts
+class JjChangesWidget {
+  getDefaultColor() {
+    return "yellow";
   }
-  const windowSeconds = getWidgetSpeedWindowSeconds(item);
-  return context.windowedSpeedMetrics?.[windowSeconds.toString()] ?? null;
-}
-function calculateSpeed(kind, metrics) {
-  if (kind === "input") {
-    return calculateInputSpeed(metrics);
+  getDescription() {
+    return "Shows jujutsu changes count (+insertions, -deletions)";
   }
-  if (kind === "output") {
-    return calculateOutputSpeed(metrics);
+  getDisplayName() {
+    return "JJ Changes";
   }
-  return calculateTotalSpeed(metrics);
-}
-function getSpeedWidgetDisplayName(kind) {
-  return SPEED_WIDGET_CONFIG[kind].displayName;
-}
-function getSpeedWidgetDescription(kind) {
-  return SPEED_WIDGET_CONFIG[kind].description;
-}
-function getSpeedWidgetEditorDisplay(kind, item) {
-  const windowSeconds = getWidgetSpeedWindowSeconds(item);
+  getCategory() {
+    return "Jujutsu";
+  }
+  getEditorDisplay(item) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    if (context.isPreview) {
+      return "(+42,-10)";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : "(no jj)";
+    }
+    const changes = this.getJjChanges(context);
+    if (changes) {
+      return `(+${changes.insertions},-${changes.deletions})`;
+    }
+    return hideNoJj ? null : "(no jj)";
+  }
+  getJjChanges(context) {
+    const stat2 = runJjArgs(["diff", "--stat"], context);
+    let totalInsertions = 0;
+    let totalDeletions = 0;
+    if (stat2) {
+      const lines = stat2.split(`
+`);
+      const summaryLine = lines[lines.length - 1];
+      if (summaryLine) {
+        const insertMatch = /(\d+) insertion/.exec(summaryLine);
+        const deleteMatch = /(\d+) deletion/.exec(summaryLine);
+        totalInsertions += insertMatch?.[1] ? parseInt(insertMatch[1], 10) : 0;
+        totalDeletions += deleteMatch?.[1] ? parseInt(deleteMatch[1], 10) : 0;
+      }
+    }
+    return { insertions: totalInsertions, deletions: totalDeletions };
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
+  }
+  supportsRawValue() {
+    return false;
+  }
+  supportsColors() {
+    return true;
+  }
+}
+var init_JjChanges = __esm(() => {
+  init_jj();
+});
+
+// src/widgets/JjInsertions.ts
+class JjInsertionsWidget {
+  getDefaultColor() {
+    return "green";
+  }
+  getDescription() {
+    return "Shows jujutsu insertions count";
+  }
+  getDisplayName() {
+    return "JJ Insertions";
+  }
+  getCategory() {
+    return "Jujutsu";
+  }
+  getEditorDisplay(item) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    if (context.isPreview) {
+      return "+42";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : "(no jj)";
+    }
+    const changes = getJjChangeCounts(context);
+    return `+${changes.insertions}`;
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
+  }
+  supportsRawValue() {
+    return false;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var init_JjInsertions = __esm(() => {
+  init_jj();
+});
+
+// src/widgets/JjDeletions.ts
+class JjDeletionsWidget {
+  getDefaultColor() {
+    return "red";
+  }
+  getDescription() {
+    return "Shows jujutsu deletions count";
+  }
+  getDisplayName() {
+    return "JJ Deletions";
+  }
+  getCategory() {
+    return "Jujutsu";
+  }
+  getEditorDisplay(item) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    if (context.isPreview) {
+      return "-10";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : "(no jj)";
+    }
+    const changes = getJjChangeCounts(context);
+    return `-${changes.deletions}`;
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
+  }
+  supportsRawValue() {
+    return false;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var init_JjDeletions = __esm(() => {
+  init_jj();
+});
+
+// src/widgets/JjDescription.ts
+class JjDescriptionWidget {
+  getDefaultColor() {
+    return "white";
+  }
+  getDescription() {
+    return "Shows the current jujutsu change description";
+  }
+  getDisplayName() {
+    return "JJ Description";
+  }
+  getCategory() {
+    return "Jujutsu";
+  }
+  getEditorDisplay(item) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    if (context.isPreview) {
+      return "(no description)";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : "no jj";
+    }
+    const description = runJjArgs([
+      "log",
+      "--no-graph",
+      "-r",
+      "@",
+      "-T",
+      "description.first_line()"
+    ], context, true);
+    if (description === null) {
+      return hideNoJj ? null : "no jj";
+    }
+    return description.length > 0 ? description : "(no description)";
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
+  }
+  supportsRawValue() {
+    return false;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var init_JjDescription = __esm(() => {
+  init_jj();
+});
+
+// src/widgets/JjRevision.ts
+class JjRevisionWidget {
+  getDefaultColor() {
+    return "green";
+  }
+  getDescription() {
+    return "Shows the current jujutsu change ID (short)";
+  }
+  getDisplayName() {
+    return "JJ Revision";
+  }
+  getCategory() {
+    return "Jujutsu";
+  }
+  getEditorDisplay(item) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    const modifiers = [];
+    if (hideNoJj) {
+      modifiers.push("hide 'no jj'");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: modifiers.length > 0 ? `(${modifiers.join(", ")})` : undefined
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-nojj") {
+      const currentState = item.metadata?.hideNoJj === "true";
+      return {
+        ...item,
+        metadata: {
+          ...item.metadata,
+          hideNoJj: (!currentState).toString()
+        }
+      };
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const hideNoJj = item.metadata?.hideNoJj === "true";
+    if (context.isPreview) {
+      return item.rawValue ? "kkmpptxz" : " kkmpptxz";
+    }
+    if (!isInsideJjRepo(context)) {
+      return hideNoJj ? null : " no jj";
+    }
+    const changeId = this.getJjRevision(context);
+    if (changeId) {
+      return item.rawValue ? changeId : ` ${changeId}`;
+    }
+    return hideNoJj ? null : " no jj";
+  }
+  getJjRevision(context) {
+    return runJjArgs([
+      "log",
+      "--no-graph",
+      "-r",
+      "@",
+      "-T",
+      "change_id.shortest()"
+    ], context);
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "h", label: "(h)ide 'no jj' message", action: "toggle-nojj" }
+    ];
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors() {
+    return true;
+  }
+}
+var init_JjRevision = __esm(() => {
+  init_jj();
+});
+
+// src/widgets/ClaudeAccountEmail.ts
+import * as fs8 from "fs";
+
+class ClaudeAccountEmailWidget {
+  getDefaultColor() {
+    return "blue";
+  }
+  getDescription() {
+    return "Displays the email of the currently logged-in Claude account";
+  }
+  getDisplayName() {
+    return "Claude Account Email";
+  }
+  getCategory() {
+    return "Session";
+  }
+  getEditorDisplay(item) {
+    return { displayText: this.getDisplayName() };
+  }
+  render(item, context, settings) {
+    if (context.isPreview) {
+      return item.rawValue ? "you@example.com" : "Account: you@example.com";
+    }
+    try {
+      const content = fs8.readFileSync(getClaudeJsonPath(), "utf-8");
+      const data = JSON.parse(content);
+      const email3 = data.oauthAccount?.emailAddress;
+      if (typeof email3 !== "string" || email3.length === 0) {
+        return null;
+      }
+      return item.rawValue ? email3 : `Account: ${email3}`;
+    } catch {
+      return null;
+    }
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var init_ClaudeAccountEmail = __esm(async () => {
+  await init_claude_settings();
+});
+
+// src/utils/speed-metrics.ts
+function calculateOutputSpeed(metrics) {
+  if (metrics.totalDurationMs === 0) {
+    return null;
+  }
+  const seconds = metrics.totalDurationMs / 1000;
+  return metrics.outputTokens / seconds;
+}
+function calculateInputSpeed(metrics) {
+  if (metrics.totalDurationMs === 0) {
+    return null;
+  }
+  const seconds = metrics.totalDurationMs / 1000;
+  return metrics.inputTokens / seconds;
+}
+function calculateTotalSpeed(metrics) {
+  if (metrics.totalDurationMs === 0) {
+    return null;
+  }
+  const seconds = metrics.totalDurationMs / 1000;
+  return metrics.totalTokens / seconds;
+}
+function formatSpeed(tokensPerSec) {
+  if (tokensPerSec === null) {
+    return "—";
+  }
+  if (tokensPerSec >= 1000) {
+    const kValue = tokensPerSec / 1000;
+    return `${kValue.toFixed(1)}k t/s`;
+  }
+  return `${tokensPerSec.toFixed(1)} t/s`;
+}
+
+// src/utils/speed-window.ts
+function clampSpeedWindowSeconds(value) {
+  if (!Number.isFinite(value)) {
+    return DEFAULT_SPEED_WINDOW_SECONDS;
+  }
+  const normalized = Math.trunc(value);
+  if (normalized < MIN_SPEED_WINDOW_SECONDS) {
+    return MIN_SPEED_WINDOW_SECONDS;
+  }
+  if (normalized > MAX_SPEED_WINDOW_SECONDS) {
+    return MAX_SPEED_WINDOW_SECONDS;
+  }
+  return normalized;
+}
+function getWidgetSpeedWindowSeconds(item) {
+  const metadataValue = item.metadata?.[SPEED_WINDOW_METADATA_KEY];
+  if (!metadataValue) {
+    return DEFAULT_SPEED_WINDOW_SECONDS;
+  }
+  const parsed = Number.parseInt(metadataValue, 10);
+  if (!Number.isFinite(parsed)) {
+    return DEFAULT_SPEED_WINDOW_SECONDS;
+  }
+  return clampSpeedWindowSeconds(parsed);
+}
+function isWidgetSpeedWindowEnabled(item) {
+  return getWidgetSpeedWindowSeconds(item) > 0;
+}
+function withWidgetSpeedWindowSeconds(item, seconds) {
+  return {
+    ...item,
+    metadata: {
+      ...item.metadata ?? {},
+      [SPEED_WINDOW_METADATA_KEY]: clampSpeedWindowSeconds(seconds).toString()
+    }
+  };
+}
+var SPEED_WINDOW_METADATA_KEY = "windowSeconds", DEFAULT_SPEED_WINDOW_SECONDS = 0, MIN_SPEED_WINDOW_SECONDS = 0, MAX_SPEED_WINDOW_SECONDS = 120;
+
+// src/widgets/shared/speed-widget.tsx
+function getSpeedMetricsForWidget(item, context) {
+  if (!isWidgetSpeedWindowEnabled(item)) {
+    return context.speedMetrics ?? null;
+  }
+  const windowSeconds = getWidgetSpeedWindowSeconds(item);
+  return context.windowedSpeedMetrics?.[windowSeconds.toString()] ?? null;
+}
+function calculateSpeed(kind, metrics) {
+  if (kind === "input") {
+    return calculateInputSpeed(metrics);
+  }
+  if (kind === "output") {
+    return calculateOutputSpeed(metrics);
+  }
+  return calculateTotalSpeed(metrics);
+}
+function getSpeedWidgetDisplayName(kind) {
+  return SPEED_WIDGET_CONFIG[kind].displayName;
+}
+function getSpeedWidgetDescription(kind) {
+  return SPEED_WIDGET_CONFIG[kind].description;
+}
+function getSpeedWidgetEditorDisplay(kind, item) {
+  const windowSeconds = getWidgetSpeedWindowSeconds(item);
   const modifiers = windowSeconds > 0 ? [`${windowSeconds}s window`] : ["session avg"];
   return {
     displayText: getSpeedWidgetDisplayName(kind),
@@ -64181,16 +64883,222 @@ class SessionNameWidget {
 }
 var init_SessionName = () => {};
 
-// src/widgets/SessionUsage.ts
-class SessionUsageWidget {
+// src/widgets/shared/progress-bar.ts
+function makeTimerProgressBar2(percent, width, options) {
+  const clampedPercent = Math.max(0, Math.min(100, percent));
+  const filledWidth = Math.round(clampedPercent / 100 * width);
+  const cursorPos = options?.cursorPercent !== undefined ? Math.min(Math.floor(Math.max(0, Math.min(100, options.cursorPercent)) / 100 * width), width - 1) : -1;
+  let bar = "";
+  for (let i = 0;i < width; i++) {
+    if (i === cursorPos) {
+      bar += "│";
+    } else if (i < filledWidth) {
+      bar += "█";
+    } else {
+      bar += "░";
+    }
+  }
+  return bar;
+}
+
+// src/widgets/SessionUsage.ts
+class SessionUsageWidget {
+  getDefaultColor() {
+    return "brightBlue";
+  }
+  getDescription() {
+    return "Shows daily/session API usage percentage";
+  }
+  getDisplayName() {
+    return "Session Usage";
+  }
+  getCategory() {
+    return "Usage";
+  }
+  getEditorDisplay(item) {
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: getUsageDisplayModifierText(item)
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-progress") {
+      return cycleUsageDisplayMode(item, [], 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 = 20;
+      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, "Session: ", 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, "Session: ", sliderDisplay);
+      }
+      return formatRawOrLabeledValue(item, "Session: ", `${previewPercent.toFixed(1)}%`);
+    }
+    const data = context.usageData ?? {};
+    if (data.error)
+      return getUsageErrorMessage(data.error);
+    if (data.sessionUsage === undefined)
+      return null;
+    const percent = Math.max(0, Math.min(100, data.sessionUsage));
+    const renderedPercent = inverted ? 100 - percent : percent;
+    const getCursorOptions = () => {
+      if (!showCursor) {
+        return;
+      }
+      const window2 = resolveUsageWindowWithFallback(data, context.blockMetrics);
+      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, "Session: ", progressDisplay);
+    }
+    if (isUsageSliderMode(displayMode)) {
+      const slider = makeSliderBar(renderedPercent, undefined, getCursorOptions());
+      const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent.toFixed(1)}%` : slider;
+      return formatRawOrLabeledValue(item, "Session: ", sliderDisplay);
+    }
+    return formatRawOrLabeledValue(item, "Session: ", `${percent.toFixed(1)}%`);
+  }
+  getCustomKeybinds(item) {
+    return getUsagePercentCustomKeybinds(item);
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var init_SessionUsage = __esm(async () => {
+  init_usage_display();
+  await init_usage();
+});
+
+// src/widgets/WeeklyUsage.ts
+class WeeklyUsageWidget {
+  getDefaultColor() {
+    return "brightBlue";
+  }
+  getDescription() {
+    return "Shows weekly API usage percentage";
+  }
+  getDisplayName() {
+    return "Weekly Usage";
+  }
+  getCategory() {
+    return "Usage";
+  }
+  getEditorDisplay(item) {
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: getUsageDisplayModifierText(item)
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === "toggle-progress") {
+      return cycleUsageDisplayMode(item, [], 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 = 12;
+      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, "Weekly: ", 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, "Weekly: ", sliderDisplay);
+      }
+      return formatRawOrLabeledValue(item, "Weekly: ", `${previewPercent.toFixed(1)}%`);
+    }
+    const data = context.usageData ?? {};
+    if (data.error)
+      return getUsageErrorMessage(data.error);
+    if (data.weeklyUsage === undefined)
+      return null;
+    const percent = Math.max(0, Math.min(100, data.weeklyUsage));
+    const renderedPercent = inverted ? 100 - percent : percent;
+    const getCursorOptions = () => {
+      if (!showCursor) {
+        return;
+      }
+      const window2 = resolveWeeklyUsageWindow(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, "Weekly: ", progressDisplay);
+    }
+    if (isUsageSliderMode(displayMode)) {
+      const slider = makeSliderBar(renderedPercent, undefined, getCursorOptions());
+      const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent.toFixed(1)}%` : slider;
+      return formatRawOrLabeledValue(item, "Weekly: ", sliderDisplay);
+    }
+    return formatRawOrLabeledValue(item, "Weekly: ", `${percent.toFixed(1)}%`);
+  }
+  getCustomKeybinds(item) {
+    return getUsagePercentCustomKeybinds(item);
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(item) {
+    return true;
+  }
+}
+var init_WeeklyUsage = __esm(async () => {
+  init_usage_display();
+  await init_usage();
+});
+
+// src/widgets/WeeklySonnetUsage.ts
+class WeeklySonnetUsageWidget {
   getDefaultColor() {
     return "brightBlue";
   }
   getDescription() {
-    return "Shows daily/session API usage percentage";
+    return "Shows weekly Sonnet API usage percentage";
   }
   getDisplayName() {
-    return "Session Usage";
+    return "Weekly Sonnet Usage";
   }
   getCategory() {
     return "Usage";
@@ -64208,44 +65116,57 @@ class SessionUsageWidget {
     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 = 20;
+      const previewPercent = 8;
       const renderedPercent2 = inverted ? 100 - previewPercent : previewPercent;
       if (isUsageProgressMode(displayMode)) {
         const width = getUsageProgressBarWidth(displayMode);
-        const progressDisplay = `${makeUsageProgressBar(renderedPercent2, width)} ${renderedPercent2.toFixed(1)}%`;
-        return formatRawOrLabeledValue(item, "Session: ", progressDisplay);
+        const progressBar = makeTimerProgressBar2(renderedPercent2, width, showCursor ? { cursorPercent: 50 } : undefined);
+        const progressDisplay = `[${progressBar}] ${renderedPercent2.toFixed(1)}%`;
+        return formatRawOrLabeledValue(item, LABEL, progressDisplay);
       }
       if (isUsageSliderMode(displayMode)) {
-        const slider = makeSliderBar(renderedPercent2);
+        const slider = makeSliderBar(renderedPercent2, undefined, showCursor ? { cursorPercent: 50 } : undefined);
         const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent2.toFixed(1)}%` : slider;
-        return formatRawOrLabeledValue(item, "Session: ", sliderDisplay);
+        return formatRawOrLabeledValue(item, LABEL, sliderDisplay);
       }
-      return formatRawOrLabeledValue(item, "Session: ", `${previewPercent.toFixed(1)}%`);
+      return formatRawOrLabeledValue(item, LABEL, `${previewPercent.toFixed(1)}%`);
     }
     const data = context.usageData ?? {};
     if (data.error)
       return getUsageErrorMessage(data.error);
-    if (data.sessionUsage === undefined)
+    if (data.weeklySonnetUsage === undefined)
       return null;
-    const percent = Math.max(0, Math.min(100, data.sessionUsage));
+    const percent = Math.max(0, Math.min(100, data.weeklySonnetUsage));
     const renderedPercent = inverted ? 100 - percent : percent;
+    const getCursorOptions = () => {
+      if (!showCursor) {
+        return;
+      }
+      const window2 = resolveWeeklySonnetUsageWindow(data);
+      return window2 ? { cursorPercent: window2.elapsedPercent } : undefined;
+    };
     if (isUsageProgressMode(displayMode)) {
       const width = getUsageProgressBarWidth(displayMode);
-      const progressDisplay = `${makeUsageProgressBar(renderedPercent, width)} ${renderedPercent.toFixed(1)}%`;
-      return formatRawOrLabeledValue(item, "Session: ", progressDisplay);
+      const progressBar = makeTimerProgressBar2(renderedPercent, width, getCursorOptions());
+      const progressDisplay = `[${progressBar}] ${renderedPercent.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, LABEL, progressDisplay);
     }
     if (isUsageSliderMode(displayMode)) {
-      const slider = makeSliderBar(renderedPercent);
+      const slider = makeSliderBar(renderedPercent, undefined, getCursorOptions());
       const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent.toFixed(1)}%` : slider;
-      return formatRawOrLabeledValue(item, "Session: ", sliderDisplay);
+      return formatRawOrLabeledValue(item, LABEL, sliderDisplay);
     }
-    return formatRawOrLabeledValue(item, "Session: ", `${percent.toFixed(1)}%`);
+    return formatRawOrLabeledValue(item, LABEL, `${percent.toFixed(1)}%`);
   }
   getCustomKeybinds(item) {
     return getUsagePercentCustomKeybinds(item);
@@ -64257,21 +65178,22 @@ class SessionUsageWidget {
     return true;
   }
 }
-var init_SessionUsage = __esm(async () => {
+var LABEL = "Weekly Sonnet: ";
+var init_WeeklySonnetUsage = __esm(async () => {
   init_usage_display();
   await init_usage();
 });
 
-// src/widgets/WeeklyUsage.ts
-class WeeklyUsageWidget {
+// src/widgets/WeeklyOpusUsage.ts
+class WeeklyOpusUsageWidget {
   getDefaultColor() {
     return "brightBlue";
   }
   getDescription() {
-    return "Shows weekly API usage percentage";
+    return "Shows weekly Opus API usage percentage";
   }
   getDisplayName() {
-    return "Weekly Usage";
+    return "Weekly Opus Usage";
   }
   getCategory() {
     return "Usage";
@@ -64289,44 +65211,57 @@ class WeeklyUsageWidget {
     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 = 12;
+      const previewPercent = 4;
       const renderedPercent2 = inverted ? 100 - previewPercent : previewPercent;
       if (isUsageProgressMode(displayMode)) {
         const width = getUsageProgressBarWidth(displayMode);
-        const progressDisplay = `${makeUsageProgressBar(renderedPercent2, width)} ${renderedPercent2.toFixed(1)}%`;
-        return formatRawOrLabeledValue(item, "Weekly: ", progressDisplay);
+        const progressBar = makeTimerProgressBar2(renderedPercent2, width, showCursor ? { cursorPercent: 50 } : undefined);
+        const progressDisplay = `[${progressBar}] ${renderedPercent2.toFixed(1)}%`;
+        return formatRawOrLabeledValue(item, LABEL2, progressDisplay);
       }
       if (isUsageSliderMode(displayMode)) {
-        const slider = makeSliderBar(renderedPercent2);
+        const slider = makeSliderBar(renderedPercent2, undefined, showCursor ? { cursorPercent: 50 } : undefined);
         const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent2.toFixed(1)}%` : slider;
-        return formatRawOrLabeledValue(item, "Weekly: ", sliderDisplay);
+        return formatRawOrLabeledValue(item, LABEL2, sliderDisplay);
       }
-      return formatRawOrLabeledValue(item, "Weekly: ", `${previewPercent.toFixed(1)}%`);
+      return formatRawOrLabeledValue(item, LABEL2, `${previewPercent.toFixed(1)}%`);
     }
     const data = context.usageData ?? {};
     if (data.error)
       return getUsageErrorMessage(data.error);
-    if (data.weeklyUsage === undefined)
+    if (data.weeklyOpusUsage === undefined)
       return null;
-    const percent = Math.max(0, Math.min(100, data.weeklyUsage));
+    const percent = Math.max(0, Math.min(100, data.weeklyOpusUsage));
     const renderedPercent = inverted ? 100 - percent : percent;
+    const getCursorOptions = () => {
+      if (!showCursor) {
+        return;
+      }
+      const window2 = resolveWeeklyOpusUsageWindow(data);
+      return window2 ? { cursorPercent: window2.elapsedPercent } : undefined;
+    };
     if (isUsageProgressMode(displayMode)) {
       const width = getUsageProgressBarWidth(displayMode);
-      const progressDisplay = `${makeUsageProgressBar(renderedPercent, width)} ${renderedPercent.toFixed(1)}%`;
-      return formatRawOrLabeledValue(item, "Weekly: ", progressDisplay);
+      const progressBar = makeTimerProgressBar2(renderedPercent, width, getCursorOptions());
+      const progressDisplay = `[${progressBar}] ${renderedPercent.toFixed(1)}%`;
+      return formatRawOrLabeledValue(item, LABEL2, progressDisplay);
     }
     if (isUsageSliderMode(displayMode)) {
-      const slider = makeSliderBar(renderedPercent);
+      const slider = makeSliderBar(renderedPercent, undefined, getCursorOptions());
       const sliderDisplay = displayMode === "slider" ? `${slider} ${renderedPercent.toFixed(1)}%` : slider;
-      return formatRawOrLabeledValue(item, "Weekly: ", sliderDisplay);
+      return formatRawOrLabeledValue(item, LABEL2, sliderDisplay);
     }
-    return formatRawOrLabeledValue(item, "Weekly: ", `${percent.toFixed(1)}%`);
+    return formatRawOrLabeledValue(item, LABEL2, `${percent.toFixed(1)}%`);
   }
   getCustomKeybinds(item) {
     return getUsagePercentCustomKeybinds(item);
@@ -64338,7 +65273,8 @@ class WeeklyUsageWidget {
     return true;
   }
 }
-var init_WeeklyUsage = __esm(async () => {
+var LABEL2 = "Weekly Opus: ";
+var init_WeeklyOpusUsage = __esm(async () => {
   init_usage_display();
   await init_usage();
 });
@@ -64795,7 +65731,7 @@ var init_timezone_editor = __esm(async () => {
 });
 
 // src/widgets/BlockResetTimer.ts
-function makeTimerProgressBar2(percent, width) {
+function makeTimerProgressBar3(percent, width) {
   const clampedPercent = Math.max(0, Math.min(100, percent));
   const filledWidth = Math.floor(clampedPercent / 100 * width);
   const emptyWidth = width - filledWidth;
@@ -64823,7 +65759,7 @@ class BlockResetTimerWidget {
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      return cycleUsageDisplayMode(item, ["compact", "absolute"]);
+      return cycleUsageDisplayMode(item, ["compact", "absolute"], true);
     }
     if (action === "toggle-invert") {
       return toggleUsageInverted(item);
@@ -64848,9 +65784,14 @@ class BlockResetTimerWidget {
       const previewPercent = inverted ? 90 : 10;
       if (isUsageProgressMode(displayMode)) {
         const barWidth = getUsageProgressBarWidth(displayMode);
-        const progressBar = makeTimerProgressBar2(previewPercent, barWidth);
+        const progressBar = makeTimerProgressBar3(previewPercent, barWidth);
         return formatRawOrLabeledValue(item, "Reset ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
       }
+      if (isUsageSliderMode(displayMode)) {
+        const slider = makeSliderBar(previewPercent);
+        const sliderDisplay = displayMode === "slider" ? `${slider} ${previewPercent.toFixed(1)}%` : slider;
+        return formatRawOrLabeledValue(item, "Reset ", sliderDisplay);
+      }
       if (dateMode) {
         const resetAt = formatUsageResetAt(BLOCK_RESET_PREVIEW_AT, compact2, getUsageTimezone(item), getUsageLocale(item), isUsage12HourClock(item));
         return formatRawOrLabeledValue(item, "Reset: ", resetAt ?? (compact2 ? "03-12 08:30Z" : "2026-03-12 08:30 UTC"));
@@ -64868,10 +65809,16 @@ class BlockResetTimerWidget {
     if (isUsageProgressMode(displayMode)) {
       const barWidth = getUsageProgressBarWidth(displayMode);
       const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
-      const progressBar = makeTimerProgressBar2(percent, barWidth);
+      const progressBar = makeTimerProgressBar3(percent, barWidth);
       const percentage = percent.toFixed(1);
       return formatRawOrLabeledValue(item, "Reset ", `[${progressBar}] ${percentage}%`);
     }
+    if (isUsageSliderMode(displayMode)) {
+      const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
+      const slider = makeSliderBar(percent);
+      const sliderDisplay = displayMode === "slider" ? `${slider} ${percent.toFixed(1)}%` : slider;
+      return formatRawOrLabeledValue(item, "Reset ", sliderDisplay);
+    }
     if (dateMode) {
       const timezone = getUsageTimezone(item);
       const locale = getUsageLocale(item);
@@ -64918,7 +65865,7 @@ var init_BlockResetTimer = __esm(async () => {
 });
 
 // src/widgets/WeeklyResetTimer.ts
-function makeTimerProgressBar3(percent, width) {
+function makeTimerProgressBar4(percent, width) {
   const clampedPercent = Math.max(0, Math.min(100, percent));
   const filledWidth = Math.floor(clampedPercent / 100 * width);
   const emptyWidth = width - filledWidth;
@@ -64933,16 +65880,21 @@ function toggleWeeklyResetHoursOnly(item) {
 function getWeeklyResetModifierText(item) {
   const displayMode = getUsageDisplayMode(item);
   const dateMode = isUsageDateMode(item);
+  const isBarMode = isUsageProgressMode(displayMode) || isUsageSliderMode(displayMode);
   const modifiers = [];
   if (displayMode === "progress") {
     modifiers.push("long bar");
   } else if (displayMode === "progress-short") {
     modifiers.push("medium bar");
+  } else if (displayMode === "slider") {
+    modifiers.push("short bar");
+  } else if (displayMode === "slider-only") {
+    modifiers.push("short bar only");
   }
   if (isUsageInverted(item)) {
     modifiers.push("inverted");
   }
-  if (!isUsageProgressMode(displayMode)) {
+  if (!isBarMode) {
     if (isUsageCompact(item)) {
       modifiers.push("compact");
     }
@@ -64956,11 +65908,11 @@ function getWeeklyResetModifierText(item) {
     }
   }
   const timezoneModifier = getUsageTimezoneModifier(item);
-  if (!isUsageProgressMode(displayMode) && dateMode && timezoneModifier) {
+  if (!isBarMode && dateMode && timezoneModifier) {
     modifiers.push(timezoneModifier);
   }
   const localeModifier = getUsageLocaleModifier(item);
-  if (!isUsageProgressMode(displayMode) && dateMode && localeModifier) {
+  if (!isBarMode && dateMode && localeModifier) {
     modifiers.push(localeModifier);
   }
   return makeModifierText(modifiers);
@@ -64987,7 +65939,7 @@ class WeeklyResetTimerWidget {
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      return cycleUsageDisplayMode(item, ["compact", "hours", "absolute"]);
+      return cycleUsageDisplayMode(item, ["compact", "hours", "absolute"], true);
     }
     if (action === "toggle-invert") {
       return toggleUsageInverted(item);
@@ -65016,9 +65968,14 @@ class WeeklyResetTimerWidget {
       const previewPercent = inverted ? 90 : 10;
       if (isUsageProgressMode(displayMode)) {
         const barWidth = getUsageProgressBarWidth(displayMode);
-        const progressBar = makeTimerProgressBar3(previewPercent, barWidth);
+        const progressBar = makeTimerProgressBar4(previewPercent, barWidth);
         return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
       }
+      if (isUsageSliderMode(displayMode)) {
+        const slider = makeSliderBar(previewPercent);
+        const sliderDisplay = displayMode === "slider" ? `${slider} ${previewPercent.toFixed(1)}%` : slider;
+        return formatRawOrLabeledValue(item, "Weekly Reset ", sliderDisplay);
+      }
       if (dateMode) {
         const resetAt = formatUsageResetAt(WEEKLY_RESET_PREVIEW_AT, compact2, getUsageTimezone(item), getUsageLocale(item), isUsage12HourClock(item));
         return formatRawOrLabeledValue(item, "Weekly Reset: ", resetAt ?? (compact2 ? "03-15 08:30Z" : "2026-03-15 08:30 UTC"));
@@ -65036,10 +65993,16 @@ class WeeklyResetTimerWidget {
     if (isUsageProgressMode(displayMode)) {
       const barWidth = getUsageProgressBarWidth(displayMode);
       const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
-      const progressBar = makeTimerProgressBar3(percent, barWidth);
+      const progressBar = makeTimerProgressBar4(percent, barWidth);
       const percentage = percent.toFixed(1);
       return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${percentage}%`);
     }
+    if (isUsageSliderMode(displayMode)) {
+      const percent = inverted ? window2.remainingPercent : window2.elapsedPercent;
+      const slider = makeSliderBar(percent);
+      const sliderDisplay = displayMode === "slider" ? `${slider} ${percent.toFixed(1)}%` : slider;
+      return formatRawOrLabeledValue(item, "Weekly Reset ", sliderDisplay);
+    }
     if (dateMode) {
       const timezone = getUsageTimezone(item);
       const locale = getUsageLocale(item);
@@ -65058,7 +66021,9 @@ class WeeklyResetTimerWidget {
       includeLocale: true,
       includeTimezone: true
     });
-    if (!item || !isUsageProgressMode(getUsageDisplayMode(item)) && !isUsageDateMode(item)) {
+    const mode = item ? getUsageDisplayMode(item) : "time";
+    const isBarMode = isUsageProgressMode(mode) || isUsageSliderMode(mode);
+    if (!item || !isBarMode && !isUsageDateMode(item)) {
       keybinds.push({ key: "h", label: "(h)ours only", action: "toggle-hours" });
     }
     return keybinds;
@@ -66053,6 +67018,141 @@ var init_CompactionCounter = __esm(() => {
   FORMATS2 = ["icon-space-number", "text-and-number", "number"];
 });
 
+// src/widgets/VoiceStatus.ts
+function getFormat3(item) {
+  const f = item.metadata?.format;
+  return FORMATS3.includes(f ?? "") ? f : DEFAULT_FORMAT3;
+}
+function setFormat3(item, format) {
+  if (format === DEFAULT_FORMAT3) {
+    const { format: removedFormat, ...restMetadata } = item.metadata ?? {};
+    return {
+      ...item,
+      metadata: Object.keys(restMetadata).length > 0 ? restMetadata : undefined
+    };
+  }
+  return {
+    ...item,
+    metadata: {
+      ...item.metadata ?? {},
+      format
+    }
+  };
+}
+function isNerdFontEnabled3(item) {
+  return item.metadata?.[NERD_FONT_METADATA_KEY3] === "true";
+}
+function toggleNerdFont3(item) {
+  if (!isNerdFontEnabled3(item)) {
+    return {
+      ...item,
+      metadata: {
+        ...item.metadata ?? {},
+        [NERD_FONT_METADATA_KEY3]: "true"
+      }
+    };
+  }
+  const { [NERD_FONT_METADATA_KEY3]: removedNerdFont, ...restMetadata } = item.metadata ?? {};
+  return {
+    ...item,
+    metadata: Object.keys(restMetadata).length > 0 ? restMetadata : undefined
+  };
+}
+function formatStatus(enabled, format, nerdFont) {
+  const stateText = enabled ? "on" : "off";
+  const stateDot = enabled ? STATE_DOT_ON : STATE_DOT_OFF;
+  const icon = nerdFont ? enabled ? MIC_NERD_FONT : MIC_SLASH_NERD_FONT : MIC_EMOJI;
+  switch (format) {
+    case "icon":
+      return nerdFont ? icon : `${icon} ${stateDot}`;
+    case "icon-text":
+      return `${icon} ${stateText}`;
+    case "text":
+      return stateText;
+    case "word":
+      return `voice ${stateText}`;
+  }
+}
+function resolveVoiceConfigCwd(context) {
+  const candidates = [
+    context.data?.workspace?.project_dir,
+    context.data?.cwd,
+    context.data?.workspace?.current_dir
+  ];
+  return candidates.find((candidate) => typeof candidate === "string" && candidate.trim().length > 0);
+}
+
+class VoiceStatusWidget {
+  getDefaultColor() {
+    return "magenta";
+  }
+  getDescription() {
+    return "Shows whether Claude Code voice input is enabled";
+  }
+  getDisplayName() {
+    return "Voice Status";
+  }
+  getCategory() {
+    return "Core";
+  }
+  getEditorDisplay(item) {
+    const modifiers = [getFormat3(item)];
+    if (isNerdFontEnabled3(item)) {
+      modifiers.push("nerd font");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: `(${modifiers.join(", ")})`
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === CYCLE_FORMAT_ACTION3) {
+      const currentFormat = getFormat3(item);
+      const nextFormat = FORMATS3[(FORMATS3.indexOf(currentFormat) + 1) % FORMATS3.length] ?? DEFAULT_FORMAT3;
+      return setFormat3(item, nextFormat);
+    }
+    if (action === TOGGLE_NERD_FONT_ACTION3) {
+      return toggleNerdFont3(item);
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const format = getFormat3(item);
+    const nerdFont = isNerdFontEnabled3(item);
+    if (context.isPreview) {
+      if (item.rawValue) {
+        return "on";
+      }
+      return formatStatus(true, format, nerdFont);
+    }
+    const config2 = getVoiceConfig(resolveVoiceConfigCwd(context));
+    if (config2 === null) {
+      return null;
+    }
+    if (item.rawValue) {
+      return config2.enabled ? "on" : "off";
+    }
+    return formatStatus(config2.enabled, format, nerdFont);
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "f", label: "(f)ormat", action: CYCLE_FORMAT_ACTION3 },
+      { key: "n", label: "(n)erd font", action: TOGGLE_NERD_FONT_ACTION3 }
+    ];
+  }
+  supportsRawValue() {
+    return true;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
+var MIC_EMOJI = "\uD83C\uDFA4", MIC_NERD_FONT = "", MIC_SLASH_NERD_FONT = "", STATE_DOT_OFF = "○", STATE_DOT_ON = "◉", FORMATS3, DEFAULT_FORMAT3 = "icon", CYCLE_FORMAT_ACTION3 = "cycle-format", TOGGLE_NERD_FONT_ACTION3 = "toggle-nerd-font", NERD_FONT_METADATA_KEY3 = "nerdFont";
+var init_VoiceStatus = __esm(async () => {
+  await init_claude_settings();
+  FORMATS3 = ["icon", "icon-text", "text", "word"];
+});
+
 // src/widgets/index.ts
 var init_widgets = __esm(async () => {
   init_GitBranch();
@@ -66083,6 +67183,14 @@ var init_widgets = __esm(async () => {
   init_ContextPercentage();
   init_ContextPercentageUsable();
   init_TerminalWidth();
+  init_JjBookmarks();
+  init_JjWorkspace();
+  init_JjRootDir();
+  init_JjChanges();
+  init_JjInsertions();
+  init_JjDeletions();
+  init_JjDescription();
+  init_JjRevision();
   init_FreeMemory();
   init_SessionName();
   init_VimMode();
@@ -66105,12 +67213,15 @@ var init_widgets = __esm(async () => {
     init_TotalSpeed(),
     init_SessionUsage(),
     init_WeeklyUsage(),
+    init_WeeklySonnetUsage(),
+    init_WeeklyOpusUsage(),
     init_BlockResetTimer(),
     init_WeeklyResetTimer(),
     init_ContextBar(),
     init_Link(),
     init_Skills(),
-    init_ThinkingEffort()
+    init_ThinkingEffort(),
+    init_VoiceStatus()
   ]);
 });
 
@@ -66146,6 +67257,14 @@ var init_widget_manifest = __esm(async () => {
     { type: "git-upstream-repo", create: () => new GitUpstreamRepoWidget },
     { type: "git-upstream-owner-repo", create: () => new GitUpstreamOwnerRepoWidget },
     { type: "git-is-fork", create: () => new GitIsForkWidget },
+    { type: "jj-bookmarks", create: () => new JjBookmarksWidget },
+    { type: "jj-workspace", create: () => new JjWorkspaceWidget },
+    { type: "jj-root-dir", create: () => new JjRootDirWidget },
+    { type: "jj-changes", create: () => new JjChangesWidget },
+    { type: "jj-insertions", create: () => new JjInsertionsWidget },
+    { type: "jj-deletions", create: () => new JjDeletionsWidget },
+    { type: "jj-description", create: () => new JjDescriptionWidget },
+    { type: "jj-revision", create: () => new JjRevisionWidget },
     { type: "current-working-dir", create: () => new CurrentWorkingDirWidget },
     { type: "tokens-input", create: () => new TokensInputWidget },
     { type: "tokens-output", create: () => new TokensOutputWidget },
@@ -66173,12 +67292,15 @@ var init_widget_manifest = __esm(async () => {
     { type: "free-memory", create: () => new FreeMemoryWidget },
     { type: "session-usage", create: () => new SessionUsageWidget },
     { type: "weekly-usage", create: () => new WeeklyUsageWidget },
+    { type: "weekly-sonnet-usage", create: () => new WeeklySonnetUsageWidget },
+    { type: "weekly-opus-usage", create: () => new WeeklyOpusUsageWidget },
     { type: "reset-timer", create: () => new BlockResetTimerWidget },
     { type: "weekly-reset-timer", create: () => new WeeklyResetTimerWidget },
     { type: "context-bar", create: () => new ContextBarWidget },
     { type: "skills", create: () => new SkillsWidget },
     { type: "thinking-effort", create: () => new ThinkingEffortWidget },
     { type: "vim-mode", create: () => new VimModeWidget },
+    { type: "voice-status", create: () => new VoiceStatusWidget },
     { type: "worktree-mode", create: () => new GitWorktreeModeWidget },
     { type: "worktree-name", create: () => new GitWorktreeNameWidget },
     { type: "worktree-branch", create: () => new GitWorktreeBranchWidget },
@@ -66290,6 +67412,9 @@ __export(exports_hooks, {
   syncWidgetHooks: () => syncWidgetHooks,
   removeManagedHooks: () => removeManagedHooks
 });
+function hasWidgetHooks(widget) {
+  return Boolean(widget && "getHooks" in widget && typeof widget.getHooks === "function");
+}
 function stripManagedHooks(hooks) {
   for (const event of Object.keys(hooks)) {
     hooks[event] = (hooks[event] ?? []).filter((entry) => entry._tag !== HOOK_TAG);
@@ -66304,7 +67429,7 @@ function getActiveHookDefs(settings) {
   for (const line of settings.lines) {
     for (const item of line) {
       const widget = getWidget(item.type);
-      if (!widget?.getHooks) {
+      if (!hasWidgetHooks(widget)) {
         continue;
       }
       for (const hook of widget.getHooks()) {
@@ -66731,8 +67856,53 @@ async function setRefreshInterval(interval) {
   }
   await saveClaudeSettings(settings);
 }
-var readFile4, writeFile2, mkdir2, CCSTATUSLINE_COMMANDS;
+function getVoiceConfigCandidatePathsByPriority(cwd2) {
+  const userDir = getClaudeConfigDir();
+  const projectDir = path8.join(cwd2, ".claude");
+  const candidates = [
+    path8.join(projectDir, "settings.local.json"),
+    path8.join(projectDir, "settings.json"),
+    path8.join(userDir, "settings.local.json"),
+    path8.join(userDir, "settings.json")
+  ];
+  return Array.from(new Set(candidates));
+}
+function tryReadVoiceLayer(filePath) {
+  let content;
+  try {
+    content = fs11.readFileSync(filePath, "utf-8");
+  } catch (error48) {
+    const isMissing = error48.code === "ENOENT";
+    return { fileExisted: !isMissing, enabled: undefined };
+  }
+  try {
+    const parsed = JSON.parse(content);
+    const voice = parsed.voice;
+    if (voice === undefined || voice === null) {
+      return { fileExisted: true, enabled: undefined };
+    }
+    const result2 = VoiceConfigSchema.safeParse(voice);
+    return { fileExisted: true, enabled: result2.success ? result2.data.enabled : undefined };
+  } catch {
+    return { fileExisted: true, enabled: undefined };
+  }
+}
+function getVoiceConfig(cwd2 = process.cwd()) {
+  let anyFileExisted = false;
+  for (const filePath of getVoiceConfigCandidatePathsByPriority(cwd2)) {
+    const layer = tryReadVoiceLayer(filePath);
+    if (layer.fileExisted) {
+      anyFileExisted = true;
+    }
+    if (layer.enabled !== undefined) {
+      return { enabled: layer.enabled };
+    }
+  }
+  return anyFileExisted ? { enabled: false } : null;
+}
+var readFile4, writeFile2, mkdir2, CCSTATUSLINE_COMMANDS, VoiceConfigSchema;
 var init_claude_settings = __esm(async () => {
+  init_zod();
   init_Settings();
   await init_config();
   readFile4 = fs11.promises.readFile;
@@ -66743,6 +67913,7 @@ var init_claude_settings = __esm(async () => {
     BUNX: "bunx -y ccstatusline@latest",
     SELF_MANAGED: "ccstatusline"
   };
+  VoiceConfigSchema = exports_external.object({ enabled: exports_external.boolean().optional() });
 });
 
 // node_modules/pluralize/pluralize.js
@@ -70855,7 +72026,7 @@ var PowerlineSeparatorEditor = ({
           newInvertBgs[selectedIndex] = isLeftFacing;
         }
         updateSeparators(newSeparators, mode === "separator" ? newInvertBgs : undefined);
-      } else if ((input === "a" || input === "A") && (mode === "separator" || separators.length < 3)) {
+      } else if (input === "a" || input === "A") {
         const newSeparators = [...separators];
         const newInvertBgs = mode === "separator" ? [...invertBgs] : [];
         const defaultChar = presetSeparators[0]?.char ?? "";
@@ -70875,7 +72046,7 @@ var PowerlineSeparatorEditor = ({
           updateSeparators(newSeparators, newInvertBgs);
           setSelectedIndex(selectedIndex + 1);
         }
-      } else if ((input === "i" || input === "I") && (mode === "separator" || separators.length < 3)) {
+      } else if (input === "i" || input === "I") {
         const newSeparators = [...separators];
         const newInvertBgs = mode === "separator" ? [...invertBgs] : [];
         const defaultChar = presetSeparators[0]?.char ?? "";
@@ -70927,7 +72098,6 @@ var PowerlineSeparatorEditor = ({
         return "Powerline End Cap Configuration";
     }
   };
-  const canAdd = mode === "separator" || separators.length < 3;
   const canDelete = mode !== "separator" || separators.length > 1;
   return /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
     flexDirection: "column",
@@ -70979,7 +72149,7 @@ var PowerlineSeparatorEditor = ({
           /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
             children: /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Text, {
               dimColor: true,
-              children: `↑↓ select, ← → cycle${canAdd ? ", (a)dd, (i)nsert" : ""}${canDelete ? ", (d)elete" : ""}, (c)lear, (h)ex${mode === "separator" ? ", (t)oggle invert" : ""}, ESC back`
+              children: `↑↓ select, ← → cycle, (a)dd, (i)nsert${canDelete ? ", (d)elete" : ""}, (c)lear, (h)ex${mode === "separator" ? ", (t)oggle invert" : ""}, ESC back`
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this),
           /* @__PURE__ */ jsx_dev_runtime18.jsxDEV(Box_default, {
@@ -72864,7 +74034,9 @@ var StatusJSONSchema = exports_external.looseObject({
   }).nullable().optional(),
   rate_limits: exports_external.object({
     five_hour: RateLimitPeriodSchema.optional(),
-    seven_day: RateLimitPeriodSchema.optional()
+    seven_day: RateLimitPeriodSchema.optional(),
+    seven_day_sonnet: RateLimitPeriodSchema.nullable().optional(),
+    seven_day_opus: RateLimitPeriodSchema.nullable().optional()
   }).nullable().optional()
 });
 
@@ -72980,11 +74152,11 @@ function saveCompactionState(sessionId, state) {
 
 // src/ccstatusline.ts
 init_context_percentage();
-await __promiseAll([
-  init_config(),
-  init_jsonl()
-]);
-await init_renderer2();
+await init_config();
+
+// src/utils/hook-handler.ts
+import * as fs15 from "fs";
+import * as path12 from "path";
 
 // src/utils/skills.ts
 import * as fs14 from "fs";
@@ -73032,18 +74204,83 @@ function getSkillsMetrics(sessionId) {
     return EMPTY;
   }
 }
+
+// src/utils/hook-handler.ts
+function handleHookInput(input) {
+  if (!input) {
+    return;
+  }
+  try {
+    const data = JSON.parse(input);
+    const sessionId = data.session_id;
+    if (!sessionId) {
+      return;
+    }
+    let skillName = "";
+    if (data.hook_event_name === "PreToolUse" && data.tool_name === "Skill") {
+      skillName = data.tool_input?.skill ?? "";
+    } else if (data.hook_event_name === "UserPromptSubmit") {
+      const match = /^\/([a-zA-Z0-9_:-]+)(?:\s|$)/.exec(data.prompt ?? "");
+      if (match) {
+        skillName = match[1] ?? "";
+      }
+    }
+    if (!skillName) {
+      return;
+    }
+    const filePath = getSkillsFilePath(sessionId);
+    fs15.mkdirSync(path12.dirname(filePath), { recursive: true });
+    const entry = JSON.stringify({
+      timestamp: new Date().toISOString(),
+      session_id: sessionId,
+      skill: skillName,
+      source: data.hook_event_name
+    });
+    fs15.appendFileSync(filePath, entry + `
+`);
+  } catch {}
+}
+
+// src/ccstatusline.ts
+await init_jsonl();
+await init_renderer2();
 // src/utils/usage-prefetch.ts
 await init_usage();
 var USAGE_WIDGET_TYPES = new Set([
   "session-usage",
   "weekly-usage",
+  "weekly-sonnet-usage",
+  "weekly-opus-usage",
   "block-timer",
   "reset-timer",
   "weekly-reset-timer"
 ]);
+var PER_MODEL_USAGE_WIDGET_TYPES = new Set([
+  "weekly-sonnet-usage",
+  "weekly-opus-usage"
+]);
 function hasUsageDependentWidgets(lines) {
   return lines.some((line) => line.some((item) => USAGE_WIDGET_TYPES.has(item.type)));
 }
+function getPerModelUsageRequirements(lines) {
+  const requirements = {
+    opus: false,
+    sonnet: false
+  };
+  for (const line of lines) {
+    for (const item of line) {
+      if (!PER_MODEL_USAGE_WIDGET_TYPES.has(item.type)) {
+        continue;
+      }
+      if (item.type === "weekly-sonnet-usage") {
+        requirements.sonnet = true;
+      } else if (item.type === "weekly-opus-usage") {
+        requirements.opus = true;
+      }
+    }
+  }
+  return requirements;
+}
 function epochSecondsToIsoString(epochSeconds) {
   if (epochSeconds === null || epochSeconds === undefined || !Number.isFinite(epochSeconds)) {
     return;
@@ -73058,23 +74295,56 @@ function extractUsageDataFromRateLimits(rateLimits) {
   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);
   if (sessionUsage === undefined && weeklyUsage === undefined) {
     return null;
   }
-  return { sessionUsage, sessionResetAt, weeklyUsage, weeklyResetAt };
+  return {
+    sessionUsage,
+    sessionResetAt,
+    weeklyUsage,
+    weeklyResetAt,
+    weeklySonnetUsage,
+    weeklySonnetResetAt,
+    weeklyOpusUsage,
+    weeklyOpusResetAt
+  };
+}
+function hasCompleteRateLimitsUsageData(usageData, perModelRequirements) {
+  if (usageData?.sessionUsage === undefined || usageData.sessionResetAt === undefined || usageData.weeklyUsage === undefined || usageData.weeklyResetAt === undefined) {
+    return false;
+  }
+  if (perModelRequirements.sonnet && usageData.weeklySonnetUsage === undefined) {
+    return false;
+  }
+  if (perModelRequirements.opus && usageData.weeklyOpusUsage === undefined) {
+    return false;
+  }
+  return true;
 }
-function hasCompleteRateLimitsUsageData(usageData) {
-  return usageData?.sessionUsage !== undefined && usageData.sessionResetAt !== undefined && usageData.weeklyUsage !== undefined && usageData.weeklyResetAt !== undefined;
+function getRequiredUsageFields(perModelRequirements) {
+  const requiredFields = [];
+  if (perModelRequirements.sonnet) {
+    requiredFields.push("weeklySonnetUsage");
+  }
+  if (perModelRequirements.opus) {
+    requiredFields.push("weeklyOpusUsage");
+  }
+  return requiredFields;
 }
 async function prefetchUsageDataIfNeeded(lines, data) {
   if (!hasUsageDependentWidgets(lines)) {
     return null;
   }
   const rateLimitsData = extractUsageDataFromRateLimits(data?.rate_limits);
-  if (hasCompleteRateLimitsUsageData(rateLimitsData)) {
+  const perModelRequirements = getPerModelUsageRequirements(lines);
+  if (hasCompleteRateLimitsUsageData(rateLimitsData, perModelRequirements)) {
     return rateLimitsData;
   }
-  return fetchUsageData();
+  return fetchUsageData({ requiredFields: getRequiredUsageFields(perModelRequirements) });
 }
 
 // src/ccstatusline.ts
@@ -73109,8 +74379,8 @@ async function ensureWindowsUtf8CodePage() {
     return;
   }
   try {
-    const { execFileSync: execFileSync4 } = await import("child_process");
-    execFileSync4("chcp.com", ["65001"], { stdio: "ignore" });
+    const { execFileSync: execFileSync5 } = await import("child_process");
+    execFileSync5("chcp.com", ["65001"], { stdio: "ignore" });
   } catch {}
 }
 async function renderMultipleLines(data) {
@@ -73236,44 +74506,7 @@ function parseConfigArg() {
 }
 async function handleHook() {
   const input = await readStdin();
-  if (!input) {
-    console.log("{}");
-    return;
-  }
-  try {
-    const data = JSON.parse(input);
-    const sessionId = data.session_id;
-    if (!sessionId) {
-      console.log("{}");
-      return;
-    }
-    let skillName = "";
-    if (data.hook_event_name === "PreToolUse" && data.tool_name === "Skill") {
-      skillName = data.tool_input?.skill ?? "";
-    } else if (data.hook_event_name === "UserPromptSubmit") {
-      const match = /^\/([a-zA-Z0-9_:-]+)(?:\s|$)/.exec(data.prompt ?? "");
-      if (match) {
-        skillName = match[1] ?? "";
-      }
-    }
-    if (!skillName) {
-      console.log("{}");
-      return;
-    }
-    const filePath = getSkillsFilePath(sessionId);
-    const fs15 = await import("fs");
-    const path12 = await import("path");
-    fs15.mkdirSync(path12.dirname(filePath), { recursive: true });
-    const entry = JSON.stringify({
-      timestamp: new Date().toISOString(),
-      session_id: sessionId,
-      skill: skillName,
-      source: data.hook_event_name
-    });
-    fs15.appendFileSync(filePath, entry + `
-`);
-  } catch {}
-  console.log("{}");
+  handleHookInput(input);
 }
 async function main() {
   initConfigPath(parseConfigArg());