ccstatusline 2.2.4 → 2.2.5

package/README.md

@@ -46,7 +46,7 @@
 
 ## 🆕 Recent Updates
 
-### v2.2.0 - v2.2.4 - Token Speed + Skills widget updates
+### v2.2.0 - v2.2.5 - Token Speed + Skills widget updates
 
 - **🚀 New Token Speed widgets** - Added three widgets: **Input Speed**, **Output Speed**, and **Total Speed**.
   - Each speed widget supports a configurable window of `0-120` seconds in the widget editor (`w` key).
@@ -55,6 +55,8 @@
 - **🧩 New Skills widget controls (v2.2.1)** - Added configurable Skills modes (last/count/list), optional hide-when-empty behavior, and list-size limiting with most-recent-first ordering.
 - **🌐 Usage API proxy support (v2.2.2)** - Usage widgets honor the uppercase `HTTPS_PROXY` environment variable for their direct API call to Anthropic.
 - **🧠 New Thinking Effort widget (v2.2.4)** - Added a widget that shows the current Claude Code thinking effort level.
+- **🍎 Better macOS usage lookup reliability (v2.2.5)** - Improved reliability when loading usage API tokens on macOS.
+- **⌨️ New Vim Mode widget (v2.2.5)** - Added a widget that shows the current vim mode, with ASCII and optional Nerd Font icon display.
 - **🤝 Better subagent-aware speed reporting** - Token speed calculations continue to include referenced subagent activity so displayed speeds better reflect actual concurrent work.
 
 ### v2.1.0 - v2.1.10 - Usage widgets, links, new git insertions / deletions widgets, and reliability fixes

package/dist/ccstatusline.js

@@ -13487,89 +13487,6 @@ var init_strip_ansi2 = __esm(() => {
   regex2 = ansiRegex2();
 });
 
-// node_modules/wrap-ansi/node_modules/string-width/node_modules/get-east-asian-width/lookup.js
-function isAmbiguous2(x) {
-  return x === 161 || x === 164 || x === 167 || x === 168 || x === 170 || x === 173 || x === 174 || x >= 176 && x <= 180 || x >= 182 && x <= 186 || x >= 188 && x <= 191 || x === 198 || x === 208 || x === 215 || x === 216 || x >= 222 && x <= 225 || x === 230 || x >= 232 && x <= 234 || x === 236 || x === 237 || x === 240 || x === 242 || x === 243 || x >= 247 && x <= 250 || x === 252 || x === 254 || x === 257 || x === 273 || x === 275 || x === 283 || x === 294 || x === 295 || x === 299 || x >= 305 && x <= 307 || x === 312 || x >= 319 && x <= 322 || x === 324 || x >= 328 && x <= 331 || x === 333 || x === 338 || x === 339 || x === 358 || x === 359 || x === 363 || x === 462 || x === 464 || x === 466 || x === 468 || x === 470 || x === 472 || x === 474 || x === 476 || x === 593 || x === 609 || x === 708 || x === 711 || x >= 713 && x <= 715 || x === 717 || x === 720 || x >= 728 && x <= 731 || x === 733 || x === 735 || x >= 768 && x <= 879 || x >= 913 && x <= 929 || x >= 931 && x <= 937 || x >= 945 && x <= 961 || x >= 963 && x <= 969 || x === 1025 || x >= 1040 && x <= 1103 || x === 1105 || x === 8208 || x >= 8211 && x <= 8214 || x === 8216 || x === 8217 || x === 8220 || x === 8221 || x >= 8224 && x <= 8226 || x >= 8228 && x <= 8231 || x === 8240 || x === 8242 || x === 8243 || x === 8245 || x === 8251 || x === 8254 || x === 8308 || x === 8319 || x >= 8321 && x <= 8324 || x === 8364 || x === 8451 || x === 8453 || x === 8457 || x === 8467 || x === 8470 || x === 8481 || x === 8482 || x === 8486 || x === 8491 || x === 8531 || x === 8532 || x >= 8539 && x <= 8542 || x >= 8544 && x <= 8555 || x >= 8560 && x <= 8569 || x === 8585 || x >= 8592 && x <= 8601 || x === 8632 || x === 8633 || x === 8658 || x === 8660 || x === 8679 || x === 8704 || x === 8706 || x === 8707 || x === 8711 || x === 8712 || x === 8715 || x === 8719 || x === 8721 || x === 8725 || x === 8730 || x >= 8733 && x <= 8736 || x === 8739 || x === 8741 || x >= 8743 && x <= 8748 || x === 8750 || x >= 8756 && x <= 8759 || x === 8764 || x === 8765 || x === 8776 || x === 8780 || x === 8786 || x === 8800 || x === 8801 || x >= 8804 && x <= 8807 || x === 8810 || x === 8811 || x === 8814 || x === 8815 || x === 8834 || x === 8835 || x === 8838 || x === 8839 || x === 8853 || x === 8857 || x === 8869 || x === 8895 || x === 8978 || x >= 9312 && x <= 9449 || x >= 9451 && x <= 9547 || x >= 9552 && x <= 9587 || x >= 9600 && x <= 9615 || x >= 9618 && x <= 9621 || x === 9632 || x === 9633 || x >= 9635 && x <= 9641 || x === 9650 || x === 9651 || x === 9654 || x === 9655 || x === 9660 || x === 9661 || x === 9664 || x === 9665 || x >= 9670 && x <= 9672 || x === 9675 || x >= 9678 && x <= 9681 || x >= 9698 && x <= 9701 || x === 9711 || x === 9733 || x === 9734 || x === 9737 || x === 9742 || x === 9743 || x === 9756 || x === 9758 || x === 9792 || x === 9794 || x === 9824 || x === 9825 || x >= 9827 && x <= 9829 || x >= 9831 && x <= 9834 || x === 9836 || x === 9837 || x === 9839 || x === 9886 || x === 9887 || x === 9919 || x >= 9926 && x <= 9933 || x >= 9935 && x <= 9939 || x >= 9941 && x <= 9953 || x === 9955 || x === 9960 || x === 9961 || x >= 9963 && x <= 9969 || x === 9972 || x >= 9974 && x <= 9977 || x === 9979 || x === 9980 || x === 9982 || x === 9983 || x === 10045 || x >= 10102 && x <= 10111 || x >= 11094 && x <= 11097 || x >= 12872 && x <= 12879 || x >= 57344 && x <= 63743 || x >= 65024 && x <= 65039 || x === 65533 || x >= 127232 && x <= 127242 || x >= 127248 && x <= 127277 || x >= 127280 && x <= 127337 || x >= 127344 && x <= 127373 || x === 127375 || x === 127376 || x >= 127387 && x <= 127404 || x >= 917760 && x <= 917999 || x >= 983040 && x <= 1048573 || x >= 1048576 && x <= 1114109;
-}
-function isFullWidth2(x) {
-  return x === 12288 || x >= 65281 && x <= 65376 || x >= 65504 && x <= 65510;
-}
-function isWide2(x) {
-  return x >= 4352 && x <= 4447 || x === 8986 || x === 8987 || x === 9001 || x === 9002 || x >= 9193 && x <= 9196 || x === 9200 || x === 9203 || x === 9725 || x === 9726 || x === 9748 || x === 9749 || x >= 9776 && x <= 9783 || x >= 9800 && x <= 9811 || x === 9855 || x >= 9866 && x <= 9871 || x === 9875 || x === 9889 || x === 9898 || x === 9899 || x === 9917 || x === 9918 || x === 9924 || x === 9925 || x === 9934 || x === 9940 || x === 9962 || x === 9970 || x === 9971 || x === 9973 || x === 9978 || x === 9981 || x === 9989 || x === 9994 || x === 9995 || x === 10024 || x === 10060 || x === 10062 || x >= 10067 && x <= 10069 || x === 10071 || x >= 10133 && x <= 10135 || x === 10160 || x === 10175 || x === 11035 || x === 11036 || x === 11088 || x === 11093 || x >= 11904 && x <= 11929 || x >= 11931 && x <= 12019 || x >= 12032 && x <= 12245 || x >= 12272 && x <= 12287 || x >= 12289 && x <= 12350 || x >= 12353 && x <= 12438 || x >= 12441 && x <= 12543 || x >= 12549 && x <= 12591 || x >= 12593 && x <= 12686 || x >= 12688 && x <= 12773 || x >= 12783 && x <= 12830 || x >= 12832 && x <= 12871 || x >= 12880 && x <= 42124 || x >= 42128 && x <= 42182 || x >= 43360 && x <= 43388 || x >= 44032 && x <= 55203 || x >= 63744 && x <= 64255 || x >= 65040 && x <= 65049 || x >= 65072 && x <= 65106 || x >= 65108 && x <= 65126 || x >= 65128 && x <= 65131 || x >= 94176 && x <= 94180 || x === 94192 || x === 94193 || x >= 94208 && x <= 100343 || x >= 100352 && x <= 101589 || x >= 101631 && x <= 101640 || x >= 110576 && x <= 110579 || x >= 110581 && x <= 110587 || x === 110589 || x === 110590 || x >= 110592 && x <= 110882 || x === 110898 || x >= 110928 && x <= 110930 || x === 110933 || x >= 110948 && x <= 110951 || x >= 110960 && x <= 111355 || x >= 119552 && x <= 119638 || x >= 119648 && x <= 119670 || x === 126980 || x === 127183 || x === 127374 || x >= 127377 && x <= 127386 || x >= 127488 && x <= 127490 || x >= 127504 && x <= 127547 || x >= 127552 && x <= 127560 || x === 127568 || x === 127569 || x >= 127584 && x <= 127589 || x >= 127744 && x <= 127776 || x >= 127789 && x <= 127797 || x >= 127799 && x <= 127868 || x >= 127870 && x <= 127891 || x >= 127904 && x <= 127946 || x >= 127951 && x <= 127955 || x >= 127968 && x <= 127984 || x === 127988 || x >= 127992 && x <= 128062 || x === 128064 || x >= 128066 && x <= 128252 || x >= 128255 && x <= 128317 || x >= 128331 && x <= 128334 || x >= 128336 && x <= 128359 || x === 128378 || x === 128405 || x === 128406 || x === 128420 || x >= 128507 && x <= 128591 || x >= 128640 && x <= 128709 || x === 128716 || x >= 128720 && x <= 128722 || x >= 128725 && x <= 128727 || x >= 128732 && x <= 128735 || x === 128747 || x === 128748 || x >= 128756 && x <= 128764 || x >= 128992 && x <= 129003 || x === 129008 || x >= 129292 && x <= 129338 || x >= 129340 && x <= 129349 || x >= 129351 && x <= 129535 || x >= 129648 && x <= 129660 || x >= 129664 && x <= 129673 || x >= 129679 && x <= 129734 || x >= 129742 && x <= 129756 || x >= 129759 && x <= 129769 || x >= 129776 && x <= 129784 || x >= 131072 && x <= 196605 || x >= 196608 && x <= 262141;
-}
-var init_lookup2 = () => {};
-
-// node_modules/wrap-ansi/node_modules/string-width/node_modules/get-east-asian-width/index.js
-function validate2(codePoint) {
-  if (!Number.isSafeInteger(codePoint)) {
-    throw new TypeError(`Expected a code point, got \`${typeof codePoint}\`.`);
-  }
-}
-function eastAsianWidth2(codePoint, { ambiguousAsWide = false } = {}) {
-  validate2(codePoint);
-  if (isFullWidth2(codePoint) || isWide2(codePoint) || ambiguousAsWide && isAmbiguous2(codePoint)) {
-    return 2;
-  }
-  return 1;
-}
-var init_get_east_asian_width2 = __esm(() => {
-  init_lookup2();
-});
-
-// node_modules/wrap-ansi/node_modules/string-width/index.js
-function stringWidth2(string, options = {}) {
-  if (typeof string !== "string" || string.length === 0) {
-    return 0;
-  }
-  const {
-    ambiguousIsNarrow = true,
-    countAnsiEscapeCodes = false
-  } = options;
-  if (!countAnsiEscapeCodes) {
-    string = stripAnsi2(string);
-  }
-  if (string.length === 0) {
-    return 0;
-  }
-  let width = 0;
-  const eastAsianWidthOptions = { ambiguousAsWide: !ambiguousIsNarrow };
-  for (const { segment: character } of segmenter2.segment(string)) {
-    const codePoint = character.codePointAt(0);
-    if (codePoint <= 31 || codePoint >= 127 && codePoint <= 159) {
-      continue;
-    }
-    if (codePoint >= 8203 && codePoint <= 8207 || codePoint === 65279) {
-      continue;
-    }
-    if (codePoint >= 768 && codePoint <= 879 || codePoint >= 6832 && codePoint <= 6911 || codePoint >= 7616 && codePoint <= 7679 || codePoint >= 8400 && codePoint <= 8447 || codePoint >= 65056 && codePoint <= 65071) {
-      continue;
-    }
-    if (codePoint >= 55296 && codePoint <= 57343) {
-      continue;
-    }
-    if (codePoint >= 65024 && codePoint <= 65039) {
-      continue;
-    }
-    if (defaultIgnorableCodePointRegex2.test(character)) {
-      continue;
-    }
-    if (import_emoji_regex2.default().test(character)) {
-      width += 2;
-      continue;
-    }
-    width += eastAsianWidth2(codePoint, eastAsianWidthOptions);
-  }
-  return width;
-}
-var import_emoji_regex2, segmenter2, defaultIgnorableCodePointRegex2;
-var init_string_width2 = __esm(() => {
-  init_strip_ansi2();
-  init_get_east_asian_width2();
-  import_emoji_regex2 = __toESM(require_emoji_regex(), 1);
-  segmenter2 = new Intl.Segmenter;
-  defaultIgnorableCodePointRegex2 = /^\p{Default_Ignorable_Code_Point}$/u;
-});
-
 // node_modules/wrap-ansi/node_modules/ansi-styles/index.js
 function assembleStyles2() {
   const codes = new Map;
@@ -13754,13 +13671,13 @@ function wrapAnsi(string, columns, options) {
 `).map((line) => exec(line, columns, options)).join(`
 `);
 }
-var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC = "]", ANSI_SGR_TERMINATOR = "m", ANSI_ESCAPE_LINK, wrapAnsiCode = (code) => `${ESCAPES.values().next().value}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`, wrapAnsiHyperlink = (url) => `${ESCAPES.values().next().value}${ANSI_ESCAPE_LINK}${url}${ANSI_ESCAPE_BELL}`, wordLengths = (string) => string.split(" ").map((character) => stringWidth2(character)), wrapWord = (rows, word, columns) => {
+var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC = "]", ANSI_SGR_TERMINATOR = "m", ANSI_ESCAPE_LINK, wrapAnsiCode = (code) => `${ESCAPES.values().next().value}${ANSI_CSI}${code}${ANSI_SGR_TERMINATOR}`, wrapAnsiHyperlink = (url) => `${ESCAPES.values().next().value}${ANSI_ESCAPE_LINK}${url}${ANSI_ESCAPE_BELL}`, wordLengths = (string) => string.split(" ").map((character) => stringWidth(character)), wrapWord = (rows, word, columns) => {
   const characters = [...word];
   let isInsideEscape = false;
   let isInsideLinkEscape = false;
-  let visible = stringWidth2(stripAnsi2(rows.at(-1)));
+  let visible = stringWidth(stripAnsi2(rows.at(-1)));
   for (const [index, character] of characters.entries()) {
-    const characterLength = stringWidth2(character);
+    const characterLength = stringWidth(character);
     if (visible + characterLength <= columns) {
       rows[rows.length - 1] += character;
     } else {
@@ -13796,7 +13713,7 @@ var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
   const words2 = string.split(" ");
   let last2 = words2.length;
   while (last2 > 0) {
-    if (stringWidth2(words2[last2 - 1]) > 0) {
+    if (stringWidth(words2[last2 - 1]) > 0) {
       break;
     }
     last2--;
@@ -13818,7 +13735,7 @@ var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
     if (options.trim !== false) {
       rows[rows.length - 1] = rows.at(-1).trimStart();
     }
-    let rowLength = stringWidth2(rows.at(-1));
+    let rowLength = stringWidth(rows.at(-1));
     if (index !== 0) {
       if (rowLength >= columns && (options.wordWrap === false || options.trim === false)) {
         rows.push("");
@@ -13893,7 +13810,7 @@ var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
   return returnValue;
 };
 var init_wrap_ansi = __esm(() => {
-  init_string_width2();
+  init_string_width();
   init_strip_ansi2();
   init_ansi_styles2();
   ESCAPES = new Set([
@@ -20491,7 +20408,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           }
           return 0;
         };
-        var validate3 = function validate4(version) {
+        var validate2 = function validate3(version) {
           return typeof version === "string" && /^[v\d]/.test(version) && semver.test(version);
         };
         var compare = function compare2(v1, v2, operator) {
@@ -35007,12 +34924,12 @@ function findWideFastPathRange(ranges) {
   }
   return [fastPathStart, fastPathEnd];
 }
-var minimumAmbiguousCodePoint, maximumAmbiguousCodePoint, minimumFullWidthCodePoint, maximumFullWidthCodePoint, minimumHalfWidthCodePoint, maximumHalfWidthCodePoint, minimumNarrowCodePoint, maximumNarrowCodePoint, minimumWideCodePoint, maximumWideCodePoint, commonCjkCodePoint = 19968, wideFastPathStart, wideFastPathEnd, isFullWidth3 = (codePoint) => {
+var minimumAmbiguousCodePoint, maximumAmbiguousCodePoint, minimumFullWidthCodePoint, maximumFullWidthCodePoint, minimumHalfWidthCodePoint, maximumHalfWidthCodePoint, minimumNarrowCodePoint, maximumNarrowCodePoint, minimumWideCodePoint, maximumWideCodePoint, commonCjkCodePoint = 19968, wideFastPathStart, wideFastPathEnd, isFullWidth2 = (codePoint) => {
   if (codePoint < minimumFullWidthCodePoint || codePoint > maximumFullWidthCodePoint) {
     return false;
   }
   return isInRange(fullwidthRanges, codePoint);
-}, isWide3 = (codePoint) => {
+}, isWide2 = (codePoint) => {
   if (codePoint >= wideFastPathStart && codePoint <= wideFastPathEnd) {
     return true;
   }
@@ -35021,7 +34938,7 @@ var minimumAmbiguousCodePoint, maximumAmbiguousCodePoint, minimumFullWidthCodePo
   }
   return isInRange(wideRanges, codePoint);
 };
-var init_lookup3 = __esm(() => {
+var init_lookup2 = __esm(() => {
   init_lookup_data();
   minimumAmbiguousCodePoint = ambiguousRanges[0];
   maximumAmbiguousCodePoint = ambiguousRanges.at(-1);
@@ -35037,8 +34954,8 @@ var init_lookup3 = __esm(() => {
 });
 
 // node_modules/slice-ansi/node_modules/is-fullwidth-code-point/node_modules/get-east-asian-width/index.js
-var init_get_east_asian_width3 = __esm(() => {
-  init_lookup3();
+var init_get_east_asian_width2 = __esm(() => {
+  init_lookup2();
 });
 
 // node_modules/slice-ansi/node_modules/is-fullwidth-code-point/index.js
@@ -35046,10 +34963,10 @@ function isFullwidthCodePoint2(codePoint) {
   if (!Number.isInteger(codePoint)) {
     return false;
   }
-  return isFullWidth3(codePoint) || isWide3(codePoint);
+  return isFullWidth2(codePoint) || isWide2(codePoint);
 }
 var init_is_fullwidth_code_point = __esm(() => {
-  init_get_east_asian_width3();
+  init_get_east_asian_width2();
 });
 
 // node_modules/slice-ansi/index.js
@@ -35108,15 +35025,15 @@ function tokenize(string, endCharacter = Number.POSITIVE_INFINITY) {
         continue;
       }
     }
-    const isFullWidth4 = isFullwidthCodePoint2(codePoint);
+    const isFullWidth3 = isFullwidthCodePoint2(codePoint);
     const character = String.fromCodePoint(codePoint);
     returnValue.push({
       type: "character",
       value: character,
-      isFullWidth: isFullWidth4
+      isFullWidth: isFullWidth3
     });
     index += character.length;
-    visibleCount += isFullWidth4 ? 2 : character.length;
+    visibleCount += isFullWidth3 ? 2 : character.length;
     if (visibleCount >= endCharacter) {
       break;
     }
@@ -37479,7 +37396,7 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
       this.stack = "";
     }
     PropTypeError.prototype = Error.prototype;
-    function createChainableTypeChecker(validate3) {
+    function createChainableTypeChecker(validate2) {
       if (true) {
         var manualPropTypeCallCache = {};
         var manualPropTypeWarningCount = 0;
@@ -37510,7 +37427,7 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
           }
           return null;
         } else {
-          return validate3(props, propName, componentName, location, propFullName);
+          return validate2(props, propName, componentName, location, propFullName);
         }
       }
       var chainedCheckType = checkType.bind(null, false);
@@ -37518,7 +37435,7 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
       return chainedCheckType;
     }
     function createPrimitiveTypeChecker(expectedType) {
-      function validate3(props, propName, componentName, location, propFullName, secret) {
+      function validate2(props, propName, componentName, location, propFullName, secret) {
         var propValue = props[propName];
         var propType = getPropType(propValue);
         if (propType !== expectedType) {
@@ -37527,13 +37444,13 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createAnyTypeChecker() {
       return createChainableTypeChecker(emptyFunctionThatReturnsNull);
     }
     function createArrayOfTypeChecker(typeChecker) {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         if (typeof typeChecker !== "function") {
           return new PropTypeError("Property `" + propFullName + "` of component `" + componentName + "` has invalid PropType notation inside arrayOf.");
         }
@@ -37550,10 +37467,10 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createElementTypeChecker() {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         var propValue = props[propName];
         if (!isValidElement(propValue)) {
           var propType = getPropType(propValue);
@@ -37561,10 +37478,10 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createElementTypeTypeChecker() {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         var propValue = props[propName];
         if (!ReactIs.isValidElementType(propValue)) {
           var propType = getPropType(propValue);
@@ -37572,10 +37489,10 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createInstanceTypeChecker(expectedClass) {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         if (!(props[propName] instanceof expectedClass)) {
           var expectedClassName = expectedClass.name || ANONYMOUS;
           var actualClassName = getClassName(props[propName]);
@@ -37583,7 +37500,7 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createEnumTypeChecker(expectedValues) {
       if (!Array.isArray(expectedValues)) {
@@ -37596,7 +37513,7 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return emptyFunctionThatReturnsNull;
       }
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         var propValue = props[propName];
         for (var i = 0;i < expectedValues.length; i++) {
           if (is(propValue, expectedValues[i])) {
@@ -37612,10 +37529,10 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         });
         return new PropTypeError("Invalid " + location + " `" + propFullName + "` of value `" + String(propValue) + "` " + ("supplied to `" + componentName + "`, expected one of " + valuesString + "."));
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createObjectOfTypeChecker(typeChecker) {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         if (typeof typeChecker !== "function") {
           return new PropTypeError("Property `" + propFullName + "` of component `" + componentName + "` has invalid PropType notation inside objectOf.");
         }
@@ -37634,7 +37551,7 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createUnionTypeChecker(arrayOfTypeCheckers) {
       if (!Array.isArray(arrayOfTypeCheckers)) {
@@ -37648,7 +37565,7 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
           return emptyFunctionThatReturnsNull;
         }
       }
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         var expectedTypes = [];
         for (var i2 = 0;i2 < arrayOfTypeCheckers.length; i2++) {
           var checker2 = arrayOfTypeCheckers[i2];
@@ -37663,22 +37580,22 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         var expectedTypesMessage = expectedTypes.length > 0 ? ", expected one of type [" + expectedTypes.join(", ") + "]" : "";
         return new PropTypeError("Invalid " + location + " `" + propFullName + "` supplied to " + ("`" + componentName + "`" + expectedTypesMessage + "."));
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createNodeChecker() {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         if (!isNode2(props[propName])) {
           return new PropTypeError("Invalid " + location + " `" + propFullName + "` supplied to " + ("`" + componentName + "`, expected a ReactNode."));
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function invalidValidatorError(componentName, location, propFullName, key, type) {
       return new PropTypeError((componentName || "React class") + ": " + location + " type `" + propFullName + "." + key + "` is invalid; " + "it must be a function, usually from the `prop-types` package, but received `" + type + "`.");
     }
     function createShapeTypeChecker(shapeTypes) {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         var propValue = props[propName];
         var propType = getPropType(propValue);
         if (propType !== "object") {
@@ -37696,10 +37613,10 @@ var require_factoryWithTypeCheckers = __commonJS((exports, module) => {
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function createStrictShapeTypeChecker(shapeTypes) {
-      function validate3(props, propName, componentName, location, propFullName) {
+      function validate2(props, propName, componentName, location, propFullName) {
         var propValue = props[propName];
         var propType = getPropType(propValue);
         if (propType !== "object") {
@@ -37723,7 +37640,7 @@ Valid keys: ` + JSON.stringify(Object.keys(shapeTypes), null, "  "));
         }
         return null;
       }
-      return createChainableTypeChecker(validate3);
+      return createChainableTypeChecker(validate2);
     }
     function isNode2(propValue) {
       switch (typeof propValue) {
@@ -54965,6 +54882,13 @@ function toggleMetadataFlag(item, key) {
     }
   };
 }
+function removeMetadataKeys(item, keys2) {
+  const nextMetadata = Object.fromEntries(Object.entries(item.metadata ?? {}).filter(([key]) => !keys2.includes(key)));
+  return {
+    ...item,
+    metadata: Object.keys(nextMetadata).length > 0 ? nextMetadata : undefined
+  };
+}
 
 // src/widgets/shared/git-no-git.ts
 function isHideNoGitEnabled(item) {
@@ -56103,7 +56027,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.4";
+var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.5";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -56190,9 +56114,9 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
     }
     const actualPreRenderedIndex = preRenderedIndices[i];
     const preRendered = actualPreRenderedIndex !== undefined ? preRenderedWidgets[actualPreRenderedIndex] : undefined;
+    const widgetImpl = getWidget(widget.type);
     if (preRendered?.content) {
       widgetText = preRendered.content;
-      const widgetImpl = getWidget(widget.type);
       if (widgetImpl) {
         defaultColor = widgetImpl.getDefaultColor();
       }
@@ -56314,7 +56238,7 @@ function renderPowerlineStatusLine(widgets, settings, context, lineIndex = 0, gl
       const separatorIndex = Math.min(globalIndex, separators.length - 1);
       const separator = separators[separatorIndex] ?? "";
       const shouldInvert = invertBgs[separatorIndex] ?? false;
-      let separatorOutput = "";
+      let separatorOutput;
       const sameBackground = widget.bgColor && nextWidget.bgColor && widget.bgColor === nextWidget.bgColor;
       if (shouldInvert) {
         if (widget.bgColor && nextWidget.bgColor) {
@@ -56628,7 +56552,7 @@ function renderStatusLine(widgets, settings, context, preRenderedWidgets, preCal
       }
     }
   });
-  let statusLine = "";
+  let statusLine;
   if (hasFlexSeparator && terminalWidth) {
     const parts = [[]];
     let currentPart = 0;
@@ -57465,8 +57389,8 @@ var import_react27, jsx_dev_runtime, CustomTextEditor = ({ widget, onComplete, o
   const [cursorPos, setCursorPos] = import_react27.useState(text.length);
   const getGraphemes = (str) => {
     if ("Segmenter" in Intl) {
-      const segmenter3 = new Intl.Segmenter(undefined, { granularity: "grapheme" });
-      return Array.from(segmenter3.segment(str), (seg) => seg.segment);
+      const segmenter2 = new Intl.Segmenter(undefined, { granularity: "grapheme" });
+      return Array.from(segmenter2.segment(str), (seg) => seg.segment);
     }
     return Array.from(str);
   };
@@ -58943,7 +58867,7 @@ var init_usage_types = __esm(() => {
 });
 
 // src/utils/usage-fetch.ts
-import { execSync as execSync4 } from "child_process";
+import { execFileSync } from "child_process";
 import * as fs3 from "fs";
 import * as https from "https";
 import * as os3 from "os";
@@ -59019,33 +58943,121 @@ function getStaleUsageOrError(error48, now2, errorCacheMaxAge = LOCK_MAX_AGE) {
   }
   return setCachedUsageError(error48, now2, errorCacheMaxAge);
 }
-function getUsageToken() {
-  const now2 = Math.floor(Date.now() / 1000);
-  if (cachedUsageToken && now2 - usageTokenCacheTime < TOKEN_CACHE_MAX_AGE) {
-    return cachedUsageToken;
+function normalizeSecurityTimedateValue(rawValue) {
+  const cleaned = rawValue.replace(/\\000/g, "").replace(/\0/g, "").trim();
+  return /^\d{14}Z$/.test(cleaned) ? cleaned : null;
+}
+function decodeHexAscii(rawHex) {
+  if (rawHex.length === 0 || rawHex.length % 2 !== 0) {
+    return null;
   }
-  try {
-    const isMac = process.platform === "darwin";
-    if (isMac) {
-      const result2 = execSync4('security find-generic-password -s "Claude Code-credentials" -w 2>/dev/null', { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"] }).trim();
-      const token2 = parseUsageAccessToken(result2);
-      if (token2) {
-        cachedUsageToken = token2;
-        usageTokenCacheTime = now2;
-      }
-      return token2;
+  let decoded = "";
+  for (let i = 0;i < rawHex.length; i += 2) {
+    const byte = Number.parseInt(rawHex.slice(i, i + 2), 16);
+    if (Number.isNaN(byte)) {
+      return null;
     }
-    const credFile = path2.join(getClaudeConfigDir(), ".credentials.json");
-    const token = parseUsageAccessToken(fs3.readFileSync(credFile, "utf8"));
+    decoded += String.fromCharCode(byte);
+  }
+  return decoded;
+}
+function parseModifiedTimeFromKeychainBlock(block) {
+  const quotedMatch = /"mdat"<timedate>=(?:0x[0-9A-Fa-f]+\s+)?"([^"]+)"/.exec(block);
+  if (quotedMatch?.[1]) {
+    const parsed = normalizeSecurityTimedateValue(quotedMatch[1]);
+    if (parsed !== null) {
+      return parsed;
+    }
+  }
+  const hexMatch = /"mdat"<timedate>=0x([0-9A-Fa-f]+)/.exec(block);
+  if (!hexMatch?.[1]) {
+    return null;
+  }
+  const decoded = decodeHexAscii(hexMatch[1]);
+  return decoded ? normalizeSecurityTimedateValue(decoded) : null;
+}
+function sortMacKeychainCredentialCandidates(a, b) {
+  if (a.modifiedAt !== null && b.modifiedAt !== null && a.modifiedAt !== b.modifiedAt) {
+    return b.modifiedAt.localeCompare(a.modifiedAt);
+  }
+  if (a.modifiedAt !== null && b.modifiedAt === null) {
+    return -1;
+  }
+  if (a.modifiedAt === null && b.modifiedAt !== null) {
+    return 1;
+  }
+  return a.order - b.order;
+}
+function parseMacKeychainCredentialCandidates(rawDump, servicePrefix = MACOS_USAGE_CREDENTIALS_SERVICE) {
+  const blocks = rawDump.split(/(?=^keychain:\s)/m).filter((block) => block.trim().length > 0);
+  const dedupedCandidates = new Map;
+  let order = 0;
+  for (const block of blocks) {
+    const serviceMatch = /"svce"<blob>="([^"]+)"/.exec(block);
+    const service = serviceMatch?.[1];
+    if (!service || !service.startsWith(servicePrefix) || service === MACOS_USAGE_CREDENTIALS_SERVICE) {
+      continue;
+    }
+    const candidate = {
+      modifiedAt: parseModifiedTimeFromKeychainBlock(block),
+      order,
+      service
+    };
+    order += 1;
+    const existing = dedupedCandidates.get(service);
+    if (!existing || sortMacKeychainCredentialCandidates(candidate, existing) < 0) {
+      dedupedCandidates.set(service, candidate);
+    }
+  }
+  return [...dedupedCandidates.values()].sort(sortMacKeychainCredentialCandidates).map((candidate) => candidate.service);
+}
+function readMacKeychainSecret(service) {
+  try {
+    return execFileSync("security", ["find-generic-password", "-s", service, "-w"], { encoding: "utf8", stdio: ["pipe", "pipe", "ignore"] }).trim();
+  } catch {
+    return null;
+  }
+}
+function readUsageTokenFromMacKeychainService(service) {
+  const secret = readMacKeychainSecret(service);
+  return secret ? parseUsageAccessToken(secret) : null;
+}
+function listMacKeychainCredentialCandidates() {
+  try {
+    const rawDump = execFileSync("security", ["dump-keychain"], {
+      encoding: "utf8",
+      maxBuffer: MACOS_SECURITY_DUMP_MAX_BUFFER,
+      stdio: ["pipe", "pipe", "ignore"]
+    });
+    return parseMacKeychainCredentialCandidates(rawDump);
+  } catch {
+    return [];
+  }
+}
+function readUsageTokenFromMacKeychainCandidates() {
+  const candidates = listMacKeychainCredentialCandidates();
+  for (const service of candidates) {
+    const token = readUsageTokenFromMacKeychainService(service);
     if (token) {
-      cachedUsageToken = token;
-      usageTokenCacheTime = now2;
+      return token;
     }
-    return token;
+  }
+  return null;
+}
+function readUsageTokenFromCredentialsFile() {
+  try {
+    const credFile = path2.join(getClaudeConfigDir(), ".credentials.json");
+    return parseUsageAccessToken(fs3.readFileSync(credFile, "utf8"));
   } catch {
     return null;
   }
 }
+function getUsageToken() {
+  if (process.platform !== "darwin") {
+    return readUsageTokenFromCredentialsFile();
+  }
+  return readUsageTokenFromMacKeychainService(MACOS_USAGE_CREDENTIALS_SERVICE) ?? readUsageTokenFromMacKeychainCandidates() ?? readUsageTokenFromCredentialsFile();
+}
 function readStaleUsageCache() {
   try {
     return parseCachedUsageData(fs3.readFileSync(CACHE_FILE, "utf8"));
@@ -59233,7 +59245,7 @@ async function fetchUsageData() {
     return getStaleUsageOrError("parse-error", now2);
   }
 }
-var import_https_proxy_agent, CACHE_DIR, CACHE_FILE, LOCK_FILE, CACHE_MAX_AGE = 180, LOCK_MAX_AGE = 30, DEFAULT_RATE_LIMIT_BACKOFF = 300, TOKEN_CACHE_MAX_AGE = 3600, UsageCredentialsSchema, UsageLockErrorSchema, UsageLockSchema, CachedUsageDataSchema, UsageApiResponseSchema, cachedUsageData = null, usageCacheTime = 0, cachedUsageToken = null, usageTokenCacheTime = 0, usageErrorCacheMaxAge, USAGE_API_HOST = "api.anthropic.com", USAGE_API_PATH = "/api/oauth/usage", USAGE_API_TIMEOUT_MS = 5000;
+var import_https_proxy_agent, 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 init_usage_fetch = __esm(() => {
   init_zod();
   init_claude_settings();
@@ -59242,6 +59254,7 @@ var init_usage_fetch = __esm(() => {
   CACHE_DIR = path2.join(os3.homedir(), ".cache", "ccstatusline");
   CACHE_FILE = path2.join(CACHE_DIR, "usage.json");
   LOCK_FILE = path2.join(CACHE_DIR, "usage.lock");
+  MACOS_SECURITY_DUMP_MAX_BUFFER = 8 * 1024 * 1024;
   UsageCredentialsSchema = exports_external.object({ claudeAiOauth: exports_external.object({ accessToken: exports_external.string().nullable().optional() }).optional() });
   UsageLockErrorSchema = exports_external.enum(["timeout", "rate-limited"]);
   UsageLockSchema = exports_external.object({
@@ -62289,17 +62302,16 @@ function getWeeklyUsageWindowFromResetAt(weeklyResetAt, nowMs = Date.now()) {
 function resolveWeeklyUsageWindow(usageData, nowMs = Date.now()) {
   return getWeeklyUsageWindowFromResetAt(usageData.weeklyResetAt, nowMs);
 }
-function formatUsageDuration(durationMs, compact2 = false) {
+function formatUsageDuration(durationMs, compact2 = false, useDays = true) {
   const clampedMs = Math.max(0, durationMs);
-  const elapsedHours = Math.floor(clampedMs / (1000 * 60 * 60));
-  const elapsedMinutes = Math.floor(clampedMs % (1000 * 60 * 60) / (1000 * 60));
-  if (compact2) {
-    return elapsedMinutes === 0 ? `${elapsedHours}h` : `${elapsedHours}h${elapsedMinutes}m`;
-  }
-  if (elapsedMinutes === 0) {
-    return `${elapsedHours}hr`;
-  }
-  return `${elapsedHours}hr ${elapsedMinutes}m`;
+  const totalHours = Math.floor(clampedMs / (1000 * 60 * 60));
+  const m = Math.floor(clampedMs % (1000 * 60 * 60) / (1000 * 60));
+  const hLabel = compact2 ? "h" : "hr";
+  const sep2 = compact2 ? "" : " ";
+  const d = useDays ? Math.floor(totalHours / 24) : 0;
+  const h = useDays ? totalHours % 24 : totalHours;
+  const parts = [d > 0 && `${d}d`, h > 0 && `${h}${hLabel}`, m > 0 && `${m}m`].filter(Boolean);
+  return parts.length > 0 ? parts.join(sep2) : "0m";
 }
 function getUsageErrorMessage(error48) {
   switch (error48) {
@@ -62366,30 +62378,49 @@ function getUsageDisplayModifierText(item, options = {}) {
   if (isUsageInverted(item)) {
     modifiers.push("inverted");
   }
-  if (options.includeCompact && isUsageCompact(item)) {
+  if (options.includeCompact && !isUsageProgressMode(mode) && isUsageCompact(item)) {
     modifiers.push("compact");
   }
   return makeModifierText(modifiers);
 }
-function cycleUsageDisplayMode(item) {
+function cycleUsageDisplayMode(item, disabledInProgressKeys = []) {
   const currentMode = getUsageDisplayMode(item);
   const nextMode = currentMode === "time" ? "progress" : currentMode === "progress" ? "progress-short" : "time";
+  const nextItem = removeMetadataKeys(item, nextMode === "time" ? ["invert"] : disabledInProgressKeys);
   const nextMetadata = {
-    ...item.metadata ?? {},
+    ...nextItem.metadata ?? {},
     display: nextMode
   };
-  if (nextMode === "time") {
-    delete nextMetadata.invert;
-  }
   return {
-    ...item,
+    ...nextItem,
     metadata: nextMetadata
   };
 }
 function toggleUsageInverted(item) {
   return toggleMetadataFlag(item, "invert");
 }
-var init_usage_display = () => {};
+function getUsagePercentCustomKeybinds(item) {
+  const keybinds = [PROGRESS_TOGGLE_KEYBIND];
+  if (item && isUsageProgressMode(getUsageDisplayMode(item))) {
+    keybinds.push(INVERT_TOGGLE_KEYBIND);
+  }
+  return keybinds;
+}
+function getUsageTimerCustomKeybinds(item) {
+  const keybinds = [PROGRESS_TOGGLE_KEYBIND];
+  if (item && isUsageProgressMode(getUsageDisplayMode(item))) {
+    keybinds.push(INVERT_TOGGLE_KEYBIND);
+  } else {
+    keybinds.push(COMPACT_TOGGLE_KEYBIND);
+  }
+  return keybinds;
+}
+var PROGRESS_TOGGLE_KEYBIND, INVERT_TOGGLE_KEYBIND, COMPACT_TOGGLE_KEYBIND;
+var init_usage_display = __esm(() => {
+  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" };
+});
 
 // src/widgets/BlockTimer.ts
 function makeTimerProgressBar(percent, width) {
@@ -62420,7 +62451,7 @@ class BlockTimerWidget {
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      return cycleUsageDisplayMode(item);
+      return cycleUsageDisplayMode(item, ["compact"]);
     }
     if (action === "toggle-invert") {
       return toggleUsageInverted(item);
@@ -62463,12 +62494,8 @@ class BlockTimerWidget {
     const elapsedTime = formatUsageDuration(window2.elapsedMs, compact2);
     return formatRawOrLabeledValue(item, "Block: ", elapsedTime);
   }
-  getCustomKeybinds() {
-    return [
-      { key: "p", label: "(p)rogress toggle", action: "toggle-progress" },
-      { key: "v", label: "in(v)ert fill", action: "toggle-invert" },
-      { key: "s", label: "(s)hort time", action: "toggle-compact" }
-    ];
+  getCustomKeybinds(item) {
+    return getUsageTimerCustomKeybinds(item);
   }
   supportsRawValue() {
     return true;
@@ -63103,7 +63130,7 @@ var init_TotalSpeed = __esm(async () => {
 });
 
 // src/widgets/FreeMemory.ts
-import { execSync as execSync5 } from "child_process";
+import { execSync as execSync4 } from "child_process";
 import os6 from "os";
 function formatBytes(bytes) {
   const GB = 1024 ** 3;
@@ -63119,7 +63146,7 @@ function formatBytes(bytes) {
 }
 function getUsedMemoryMacOS() {
   try {
-    const output = execSync5("vm_stat", { encoding: "utf8" });
+    const output = execSync4("vm_stat", { encoding: "utf8" });
     const lines = output.split(`
 `);
     const firstLine = lines[0];
@@ -63297,11 +63324,8 @@ class SessionUsageWidget {
     }
     return formatRawOrLabeledValue(item, "Session: ", `${percent.toFixed(1)}%`);
   }
-  getCustomKeybinds() {
-    return [
-      { key: "p", label: "(p)rogress toggle", action: "toggle-progress" },
-      { key: "v", label: "in(v)ert fill", action: "toggle-invert" }
-    ];
+  getCustomKeybinds(item) {
+    return getUsagePercentCustomKeybinds(item);
   }
   supportsRawValue() {
     return true;
@@ -63371,11 +63395,8 @@ class WeeklyUsageWidget {
     }
     return formatRawOrLabeledValue(item, "Weekly: ", `${percent.toFixed(1)}%`);
   }
-  getCustomKeybinds() {
-    return [
-      { key: "p", label: "(p)rogress toggle", action: "toggle-progress" },
-      { key: "v", label: "in(v)ert fill", action: "toggle-invert" }
-    ];
+  getCustomKeybinds(item) {
+    return getUsagePercentCustomKeybinds(item);
   }
   supportsRawValue() {
     return true;
@@ -63418,7 +63439,7 @@ class BlockResetTimerWidget {
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      return cycleUsageDisplayMode(item);
+      return cycleUsageDisplayMode(item, ["compact"]);
     }
     if (action === "toggle-invert") {
       return toggleUsageInverted(item);
@@ -63459,12 +63480,8 @@ class BlockResetTimerWidget {
     const remainingTime = formatUsageDuration(window2.remainingMs, compact2);
     return formatRawOrLabeledValue(item, "Reset: ", remainingTime);
   }
-  getCustomKeybinds() {
-    return [
-      { key: "p", label: "(p)rogress toggle", action: "toggle-progress" },
-      { key: "v", label: "in(v)ert fill", action: "toggle-invert" },
-      { key: "s", label: "(s)hort time", action: "toggle-compact" }
-    ];
+  getCustomKeybinds(item) {
+    return getUsageTimerCustomKeybinds(item);
   }
   supportsRawValue() {
     return true;
@@ -63485,6 +63502,33 @@ function makeTimerProgressBar3(percent, width) {
   const emptyWidth = width - filledWidth;
   return "█".repeat(filledWidth) + "░".repeat(emptyWidth);
 }
+function isWeeklyResetHoursOnly(item) {
+  return isMetadataFlagEnabled(item, "hours");
+}
+function toggleWeeklyResetHoursOnly(item) {
+  return toggleMetadataFlag(item, "hours");
+}
+function getWeeklyResetModifierText(item) {
+  const displayMode = getUsageDisplayMode(item);
+  const modifiers = [];
+  if (displayMode === "progress") {
+    modifiers.push("progress bar");
+  } else if (displayMode === "progress-short") {
+    modifiers.push("short bar");
+  }
+  if (isUsageInverted(item)) {
+    modifiers.push("inverted");
+  }
+  if (!isUsageProgressMode(displayMode)) {
+    if (isUsageCompact(item)) {
+      modifiers.push("compact");
+    }
+    if (isWeeklyResetHoursOnly(item)) {
+      modifiers.push("hours only");
+    }
+  }
+  return makeModifierText(modifiers);
+}
 
 class WeeklyResetTimerWidget {
   getDefaultColor() {
@@ -63502,12 +63546,12 @@ class WeeklyResetTimerWidget {
   getEditorDisplay(item) {
     return {
       displayText: this.getDisplayName(),
-      modifierText: getUsageDisplayModifierText(item, { includeCompact: true })
+      modifierText: getWeeklyResetModifierText(item)
     };
   }
   handleEditorAction(action, item) {
     if (action === "toggle-progress") {
-      return cycleUsageDisplayMode(item);
+      return cycleUsageDisplayMode(item, ["compact", "hours"]);
     }
     if (action === "toggle-invert") {
       return toggleUsageInverted(item);
@@ -63515,12 +63559,16 @@ class WeeklyResetTimerWidget {
     if (action === "toggle-compact") {
       return toggleUsageCompact(item);
     }
+    if (action === "toggle-hours") {
+      return toggleWeeklyResetHoursOnly(item);
+    }
     return null;
   }
   render(item, context, settings) {
     const displayMode = getUsageDisplayMode(item);
     const inverted = isUsageInverted(item);
     const compact2 = isUsageCompact(item);
+    const useDays = !isWeeklyResetHoursOnly(item);
     if (context.isPreview) {
       const previewPercent = inverted ? 90 : 10;
       if (isUsageProgressMode(displayMode)) {
@@ -63528,7 +63576,7 @@ class WeeklyResetTimerWidget {
         const progressBar = makeTimerProgressBar3(previewPercent, barWidth);
         return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${previewPercent.toFixed(1)}%`);
       }
-      return formatRawOrLabeledValue(item, "Weekly Reset: ", compact2 ? "36h30m" : "36hr 30m");
+      return formatRawOrLabeledValue(item, "Weekly Reset: ", formatUsageDuration(WEEKLY_PREVIEW_DURATION_MS, compact2, useDays));
     }
     const usageData = context.usageData ?? {};
     const window2 = resolveWeeklyUsageWindow(usageData);
@@ -63545,15 +63593,15 @@ class WeeklyResetTimerWidget {
       const percentage = percent.toFixed(1);
       return formatRawOrLabeledValue(item, "Weekly Reset ", `[${progressBar}] ${percentage}%`);
     }
-    const remainingTime = formatUsageDuration(window2.remainingMs, compact2);
+    const remainingTime = formatUsageDuration(window2.remainingMs, compact2, useDays);
     return formatRawOrLabeledValue(item, "Weekly Reset: ", remainingTime);
   }
-  getCustomKeybinds() {
-    return [
-      { key: "p", label: "(p)rogress toggle", action: "toggle-progress" },
-      { key: "v", label: "in(v)ert fill", action: "toggle-invert" },
-      { key: "s", label: "(s)hort time", action: "toggle-compact" }
-    ];
+  getCustomKeybinds(item) {
+    const keybinds = getUsageTimerCustomKeybinds(item);
+    if (!item || !isUsageProgressMode(getUsageDisplayMode(item))) {
+      keybinds.push({ key: "h", label: "(h)ours only", action: "toggle-hours" });
+    }
+    return keybinds;
   }
   supportsRawValue() {
     return true;
@@ -63562,9 +63610,11 @@ class WeeklyResetTimerWidget {
     return true;
   }
 }
+var WEEKLY_PREVIEW_DURATION_MS;
 var init_WeeklyResetTimer = __esm(() => {
   init_usage();
   init_usage_display();
+  WEEKLY_PREVIEW_DURATION_MS = 36.5 * 60 * 60 * 1000;
 });
 
 // src/widgets/ContextBar.ts
@@ -63902,12 +63952,15 @@ class SkillsWidget {
       { event: "UserPromptSubmit" }
     ];
   }
-  getCustomKeybinds() {
-    return [
+  getCustomKeybinds(item) {
+    const keybinds = [
       { key: "v", label: "(v)iew: last/count/list", action: "cycle-mode" },
-      { key: "h", label: "(h)ide when empty", action: TOGGLE_HIDE_EMPTY_ACTION },
-      { key: "l", label: "(l)imit", action: EDIT_LIST_LIMIT_ACTION }
+      { key: "h", label: "(h)ide when empty", action: TOGGLE_HIDE_EMPTY_ACTION }
     ];
+    if (item && this.getMode(item) === "list") {
+      keybinds.push({ key: "l", label: "(l)imit", action: EDIT_LIST_LIMIT_ACTION });
+    }
+    return keybinds;
   }
   getEditorDisplay(item) {
     const modifiers = [MODE_LABELS[this.getMode(item)]];
@@ -63925,7 +63978,8 @@ class SkillsWidget {
   handleEditorAction(action, item) {
     if (action === "cycle-mode") {
       const next = MODES[(MODES.indexOf(this.getMode(item)) + 1) % MODES.length] ?? "current";
-      return { ...item, metadata: { ...item.metadata, mode: next } };
+      const nextItem = next === "list" ? item : removeMetadataKeys(item, [LIST_LIMIT_KEY]);
+      return { ...nextItem, metadata: { ...nextItem.metadata, mode: next } };
     }
     if (action === TOGGLE_HIDE_EMPTY_ACTION) {
       return toggleMetadataFlag(item, HIDE_WHEN_EMPTY_KEY);
@@ -64102,6 +64156,124 @@ var init_ThinkingEffort = __esm(() => {
   init_jsonl();
 });
 
+// src/widgets/VimMode.ts
+function getFormat(item) {
+  const f = item.metadata?.format;
+  return FORMATS.includes(f ?? "") ? f : DEFAULT_FORMAT;
+}
+function setFormat(item, format) {
+  if (format === DEFAULT_FORMAT) {
+    const { format: removedFormat, ...restMetadata } = item.metadata ?? {};
+    return {
+      ...item,
+      metadata: Object.keys(restMetadata).length > 0 ? restMetadata : undefined
+    };
+  }
+  return {
+    ...item,
+    metadata: {
+      ...item.metadata ?? {},
+      format
+    }
+  };
+}
+function isNerdFontEnabled(item) {
+  return item.metadata?.[NERD_FONT_METADATA_KEY] === "true";
+}
+function toggleNerdFont(item) {
+  if (!isNerdFontEnabled(item)) {
+    return {
+      ...item,
+      metadata: {
+        ...item.metadata ?? {},
+        [NERD_FONT_METADATA_KEY]: "true"
+      }
+    };
+  }
+  const { [NERD_FONT_METADATA_KEY]: removedNerdFont, ...restMetadata } = item.metadata ?? {};
+  return {
+    ...item,
+    metadata: Object.keys(restMetadata).length > 0 ? restMetadata : undefined
+  };
+}
+function formatMode(mode, format, icon) {
+  const letter = mode === "NORMAL" ? "N" : mode === "INSERT" ? "I" : mode[0] ?? mode;
+  switch (format) {
+    case "icon-dash-letter":
+      return `${icon}-${letter}`;
+    case "icon-letter":
+      return `${icon} ${letter}`;
+    case "icon":
+      return icon;
+    case "letter":
+      return letter;
+    case "word":
+      return mode;
+  }
+}
+
+class VimModeWidget {
+  getDefaultColor() {
+    return "green";
+  }
+  getDescription() {
+    return "Displays current vim editor mode";
+  }
+  getDisplayName() {
+    return "Vim Mode";
+  }
+  getCategory() {
+    return "Core";
+  }
+  getEditorDisplay(item) {
+    const modifiers = [getFormat(item)];
+    if (isNerdFontEnabled(item)) {
+      modifiers.push("nerd font");
+    }
+    return {
+      displayText: this.getDisplayName(),
+      modifierText: `(${modifiers.join(", ")})`
+    };
+  }
+  handleEditorAction(action, item) {
+    if (action === CYCLE_FORMAT_ACTION) {
+      const currentFormat = getFormat(item);
+      const nextFormat = FORMATS[(FORMATS.indexOf(currentFormat) + 1) % FORMATS.length] ?? DEFAULT_FORMAT;
+      return setFormat(item, nextFormat);
+    }
+    if (action === TOGGLE_NERD_FONT_ACTION) {
+      return toggleNerdFont(item);
+    }
+    return null;
+  }
+  render(item, context, _settings) {
+    const format = getFormat(item);
+    const icon = isNerdFontEnabled(item) ? VIM_NERD_FONT_ICON : VIM_ICON;
+    if (context.isPreview)
+      return formatMode("NORMAL", format, icon);
+    const mode = context.data?.vim?.mode;
+    if (mode === undefined)
+      return null;
+    return formatMode(mode, format, icon);
+  }
+  getCustomKeybinds() {
+    return [
+      { key: "f", label: "(f)ormat", action: CYCLE_FORMAT_ACTION },
+      { key: "n", label: "(n)erd font", action: TOGGLE_NERD_FONT_ACTION }
+    ];
+  }
+  supportsRawValue() {
+    return false;
+  }
+  supportsColors(_item) {
+    return true;
+  }
+}
+var VIM_ICON = "v", VIM_NERD_FONT_ICON = "", FORMATS, DEFAULT_FORMAT = "icon-dash-letter", CYCLE_FORMAT_ACTION = "cycle-format", TOGGLE_NERD_FONT_ACTION = "toggle-nerd-font", NERD_FONT_METADATA_KEY = "nerdFont";
+var init_VimMode = __esm(() => {
+  FORMATS = ["icon-dash-letter", "icon-letter", "icon", "letter", "word"];
+});
+
 // src/widgets/index.ts
 var init_widgets = __esm(async () => {
   init_GitBranch();
@@ -64122,6 +64294,7 @@ var init_widgets = __esm(async () => {
   init_WeeklyResetTimer();
   init_ContextBar();
   init_ThinkingEffort();
+  init_VimMode();
   await __promiseAll([
     init_TokensInput(),
     init_TokensOutput(),
@@ -64180,7 +64353,8 @@ var init_widget_manifest = __esm(async () => {
     { 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: "thinking-effort", create: () => new ThinkingEffortWidget },
+    { type: "vim-mode", create: () => new VimModeWidget }
   ];
   LAYOUT_WIDGET_MANIFEST = [
     {
@@ -64489,7 +64663,7 @@ var init_config = __esm(() => {
 });
 
 // src/utils/claude-settings.ts
-import { execSync as execSync6 } from "child_process";
+import { execSync as execSync5 } from "child_process";
 import * as fs10 from "fs";
 import * as os8 from "os";
 import * as path8 from "path";
@@ -64598,7 +64772,7 @@ async function isInstalled() {
 function isBunxAvailable() {
   try {
     const command = process.platform === "win32" ? "where bunx" : "which bunx";
-    execSync6(command, { stdio: "ignore" });
+    execSync5(command, { stdio: "ignore" });
     return true;
   } catch {
     return false;
@@ -65195,7 +65369,7 @@ function openExternalUrl(url2) {
 }
 
 // src/utils/powerline.ts
-import { execSync as execSync7 } from "child_process";
+import { execSync as execSync6 } from "child_process";
 import * as fs11 from "fs";
 import * as os10 from "os";
 import * as path9 from "path";
@@ -65329,7 +65503,7 @@ async function installPowerlineFonts() {
       if (fs11.existsSync(tempDir)) {
         fs11.rmSync(tempDir, { recursive: true, force: true });
       }
-      execSync7(`git clone --depth=1 https://github.com/powerline/fonts.git "${tempDir}"`, {
+      execSync6(`git clone --depth=1 https://github.com/powerline/fonts.git "${tempDir}"`, {
         stdio: "pipe",
         encoding: "utf8"
       });
@@ -65337,14 +65511,14 @@ async function installPowerlineFonts() {
         const installScript = path9.join(tempDir, "install.sh");
         if (fs11.existsSync(installScript)) {
           fs11.chmodSync(installScript, 493);
-          execSync7(`cd "${tempDir}" && ./install.sh`, {
+          execSync6(`cd "${tempDir}" && ./install.sh`, {
             stdio: "pipe",
             encoding: "utf8",
             shell: "/bin/bash"
           });
           if (platform4 === "linux") {
             try {
-              execSync7("fc-cache -f -v", {
+              execSync6("fc-cache -f -v", {
                 stdio: "pipe",
                 encoding: "utf8"
               });
@@ -67322,7 +67496,7 @@ function handleNormalInputMode({
   setMoveMode,
   setShowClearConfirm,
   openWidgetPicker,
-  getVisibleCustomKeybinds,
+  getCustomKeybindsForWidget,
   setCustomEditorWidget
 }) {
   if (key.upArrow && widgets.length > 0) {
@@ -67399,7 +67573,7 @@ function handleNormalInputMode({
       if (!widgetImpl?.getCustomKeybinds) {
         return;
       }
-      const customKeybinds = getVisibleCustomKeybinds(widgetImpl, currentWidget);
+      const customKeybinds = getCustomKeybindsForWidget(widgetImpl, currentWidget);
       const matchedKeybind = customKeybinds.find((kb) => kb.key === input);
       if (matchedKeybind && !key.ctrl) {
         if (widgetImpl.handleEditorAction) {
@@ -67419,24 +67593,6 @@ function handleNormalInputMode({
   }
 }
 
-// src/tui/components/items-editor/keybind-visibility.ts
-function isProgressMode(widget) {
-  const mode = widget.metadata?.display;
-  return mode === "progress" || mode === "progress-short";
-}
-function shouldShowCustomKeybind(widget, keybind) {
-  if (keybind.action === "edit-list-limit") {
-    return widget.type === "skills" && widget.metadata?.mode === "list";
-  }
-  if (keybind.action === "toggle-invert") {
-    return isProgressMode(widget);
-  }
-  if (keybind.action === "toggle-compact") {
-    return !isProgressMode(widget);
-  }
-  return true;
-}
-
 // src/tui/components/ItemsEditor.tsx
 var jsx_dev_runtime12 = __toESM(require_jsx_dev_runtime(), 1);
 var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
@@ -67473,11 +67629,11 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
   const handleEditorCancel = () => {
     setCustomEditorWidget(null);
   };
-  const getVisibleCustomKeybinds = (widgetImpl, widget) => {
+  const getCustomKeybindsForWidget = (widgetImpl, widget) => {
     if (!widgetImpl.getCustomKeybinds) {
       return [];
     }
-    return widgetImpl.getCustomKeybinds().filter((keybind) => shouldShowCustomKeybind(widget, keybind));
+    return widgetImpl.getCustomKeybinds(widget);
   };
   const openWidgetPicker = (action) => {
     if (widgetCatalog.length === 0) {
@@ -67562,7 +67718,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
       setMoveMode,
       setShowClearConfirm,
       openWidgetPicker,
-      getVisibleCustomKeybinds,
+      getCustomKeybindsForWidget,
       setCustomEditorWidget
     });
   });
@@ -67599,7 +67755,7 @@ var ItemsEditor = ({ widgets, onUpdate, onBack, lineNumber, settings }) => {
     const widgetImpl = getWidget(currentWidget.type);
     if (widgetImpl) {
       canToggleRaw = widgetImpl.supportsRawValue();
-      customKeybinds = getVisibleCustomKeybinds(widgetImpl, currentWidget);
+      customKeybinds = getCustomKeybindsForWidget(widgetImpl, currentWidget);
     } else {
       canToggleRaw = false;
     }
@@ -70307,7 +70463,8 @@ var StatusJSONSchema = exports_external.looseObject({
     ]).nullable().optional(),
     used_percentage: CoercedNumberSchema.nullable().optional(),
     remaining_percentage: CoercedNumberSchema.nullable().optional()
-  }).nullable().optional()
+  }).nullable().optional(),
+  vim: exports_external.object({ mode: exports_external.string().optional() }).nullable().optional()
 });
 
 // src/ccstatusline.ts
@@ -70414,8 +70571,8 @@ async function ensureWindowsUtf8CodePage() {
     return;
   }
   try {
-    const { execFileSync } = await import("child_process");
-    execFileSync("chcp.com", ["65001"], { stdio: "ignore" });
+    const { execFileSync: execFileSync2 } = await import("child_process");
+    execFileSync2("chcp.com", ["65001"], { stdio: "ignore" });
   } catch {}
 }
 async function renderMultipleLines(data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline",
-  "version": "2.2.4",
+  "version": "2.2.5",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",
@@ -22,21 +22,22 @@
     "docs:clean": "rm -rf docs"
   },
   "devDependencies": {
-    "@eslint/js": "^9.33.0",
+    "@eslint/js": "^10.0.1",
     "@stylistic/eslint-plugin": "^5.2.3",
     "@types/bun": "latest",
     "@types/pluralize": "^0.0.33",
     "@types/react": "^19.1.10",
     "chalk": "^5.5.0",
-    "eslint": "^9.33.0",
+    "eslint": "^10.0.0",
     "eslint-import-resolver-typescript": "^4.4.4",
     "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-import-newlines": "^1.4.0",
+    "eslint-plugin-import-newlines": "^2.0.0",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^7.0.1",
+    "globals": "^14.0.0",
     "https-proxy-agent": "^7.0.0",
     "ink": "6.2.0",
-    "ink-gradient": "^3.0.0",
+    "ink-gradient": "^4.0.0",
     "ink-select-input": "^6.2.0",
     "pluralize": "^8.0.0",
     "react": "^19.1.1",