ccstatusline 2.2.15 → 2.2.17

package/README.md

@@ -47,9 +47,10 @@
 
 ## 🆕 Recent Updates
 
-### v2.2.14 - Version pinning
+### v2.2.14 - v2.2.16 - Version pinning and npm trusted publishing with provenance attestation
 
 - **📌 Version pinning support** - Added support for pinned global installs so Claude Code can keep running a specific ccstatusline version.
+- **🔐 npm provenance attestations** - Published packages now use trusted publishing provenance so users can verify where releases were built while avoiding long-lived npm publish tokens.
 - **🔄 Moving from auto-update installs** - If you currently use an auto-updating install, use the TUI uninstall option first, then reinstall to go through the version pinning flow. Your ccstatusline settings are preserved when uninstalling.
 
 ### v2.2.13 - Weekly model usage, voice status, hooks, and docs

package/dist/ccstatusline.js

@@ -9713,7 +9713,7 @@ Learn more about data fetching with Hooks: https://react.dev/link/hooks-data-fet
           offscreenSubtreeWasHidden = prevOffscreenSubtreeWasHidden;
           offscreenSubtreeIsHidden = prevOffscreenSubtreeIsHidden;
           commitReconciliationEffects(finishedWork);
-          if (flags & 8192 && (root = finishedWork.stateNode, root._visibility = hoistableRoot ? root._visibility & -2 : root._visibility | 1, hoistableRoot && (current2 === null || wasHidden || offscreenSubtreeIsHidden || offscreenSubtreeWasHidden || recursivelyTraverseDisappearLayoutEffects(finishedWork)), supportsMutation))
+          if (flags & 8192 && (root = finishedWork.stateNode, root._visibility = hoistableRoot ? root._visibility & -2 : root._visibility | 1, hoistableRoot && (current2 === null || wasHidden || offscreenSubtreeIsHidden || offscreenSubtreeWasHidden || recursivelyTraverseDisappearLayoutEffects(finishedWork)), supportsMutation)) {
             a:
               if (current2 = null, supportsMutation)
                 for (root = finishedWork;; ) {
@@ -9753,6 +9753,7 @@ Learn more about data fetching with Hooks: https://react.dev/link/hooks-data-fet
                   root.sibling.return = root.return;
                   root = root.sibling;
                 }
+          }
           flags & 4 && (flags = finishedWork.updateQueue, flags !== null && (current2 = flags.retryQueue, current2 !== null && (flags.retryQueue = null, attachSuspenseRetryListeners(finishedWork, current2))));
           break;
         case 19:
@@ -13315,21 +13316,23 @@ var require_react_reconciler = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/string-width/node_modules/strip-ansi/node_modules/ansi-regex/index.js
+// node_modules/ansi-regex/index.js
 function ansiRegex({ onlyFirst = false } = {}) {
   const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
-  const pattern = [
-    `[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?${ST})`,
-    "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))"
-  ].join("|");
+  const osc = `(?:\\u001B\\][\\s\\S]*?${ST})`;
+  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
+  const pattern = `${osc}|${csi}`;
   return new RegExp(pattern, onlyFirst ? undefined : "g");
 }
 
-// node_modules/string-width/node_modules/strip-ansi/index.js
+// node_modules/strip-ansi/index.js
 function stripAnsi(string) {
   if (typeof string !== "string") {
     throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
   }
+  if (!string.includes("\x1B") && !string.includes("›")) {
+    return string;
+  }
   return string.replace(regex, "");
 }
 var regex;
@@ -13431,6 +13434,7 @@ function eastAsianWidth(codePoint, { ambiguousAsWide = false } = {}) {
 }
 var init_get_east_asian_width = __esm(() => {
   init_lookup();
+  init_lookup();
 });
 
 // node_modules/emoji-regex/index.js
@@ -13532,30 +13536,6 @@ var init_measure_text = __esm(() => {
   measure_text_default = measureText;
 });
 
-// node_modules/ansi-regex/index.js
-function ansiRegex2({ onlyFirst = false } = {}) {
-  const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
-  const osc = `(?:\\u001B\\][\\s\\S]*?${ST})`;
-  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
-  const pattern = `${osc}|${csi}`;
-  return new RegExp(pattern, onlyFirst ? undefined : "g");
-}
-
-// node_modules/strip-ansi/index.js
-function stripAnsi2(string) {
-  if (typeof string !== "string") {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
-  }
-  if (!string.includes("\x1B") && !string.includes("›")) {
-    return string;
-  }
-  return string.replace(regex2, "");
-}
-var regex2;
-var init_strip_ansi2 = __esm(() => {
-  regex2 = ansiRegex2();
-});
-
 // node_modules/ansi-styles/index.js
 function assembleStyles2() {
   const codes = new Map;
@@ -13744,7 +13724,7 @@ var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
   const characters = [...word];
   let isInsideEscape = false;
   let isInsideLinkEscape = false;
-  let visible = stringWidth(stripAnsi2(rows.at(-1)));
+  let visible = stringWidth(stripAnsi(rows.at(-1)));
   for (const [index, character] of characters.entries()) {
     const characterLength = stringWidth(character);
     if (visible + characterLength <= columns) {
@@ -13880,7 +13860,7 @@ var ESCAPES, END_CODE = 39, ANSI_ESCAPE_BELL = "\x07", ANSI_CSI = "[", ANSI_OSC
 };
 var init_wrap_ansi = __esm(() => {
   init_string_width();
-  init_strip_ansi2();
+  init_strip_ansi();
   init_ansi_styles2();
   ESCAPES = new Set([
     "\x1B",
@@ -18075,7 +18055,7 @@ var require_backend = __commonJS((exports, module) => {
         987: (module2, __unused_webpack_exports, __webpack_require__2) => {
           if (true) {
             module2.exports = __webpack_require__2(786);
-          } else {}
+          }
         },
         126: (__unused_webpack_module, exports2, __webpack_require__2) => {
           var process4 = __webpack_require__2(169);
@@ -18525,7 +18505,7 @@ var require_backend = __commonJS((exports, module) => {
         189: (module2, __unused_webpack_exports, __webpack_require__2) => {
           if (true) {
             module2.exports = __webpack_require__2(126);
-          } else {}
+          }
         },
         206: function(module2, exports2, __webpack_require__2) {
           var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;
@@ -18540,7 +18520,7 @@ var require_backend = __commonJS((exports, module) => {
           (function(root, factory) {
             if (true) {
               __WEBPACK_AMD_DEFINE_ARRAY__ = [__webpack_require__2(430)], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports2, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module2.exports = __WEBPACK_AMD_DEFINE_RESULT__);
-            } else {}
+            }
           })(this, function ErrorStackParser(StackFrame) {
             var FIREFOX_SAFARI_STACK_REGEXP = /(^|@)\S+:\d+/;
             var CHROME_IE_STACK_REGEXP = /^\s*at .*(\S+:\d+|\(native\))/m;
@@ -19236,7 +19216,7 @@ var require_backend = __commonJS((exports, module) => {
           (function(root, factory) {
             if (true) {
               __WEBPACK_AMD_DEFINE_ARRAY__ = [], __WEBPACK_AMD_DEFINE_FACTORY__ = factory, __WEBPACK_AMD_DEFINE_RESULT__ = typeof __WEBPACK_AMD_DEFINE_FACTORY__ === "function" ? __WEBPACK_AMD_DEFINE_FACTORY__.apply(exports2, __WEBPACK_AMD_DEFINE_ARRAY__) : __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module2.exports = __WEBPACK_AMD_DEFINE_RESULT__);
-            } else {}
+            }
           })(this, function() {
             function _isNumber(n) {
               return !isNaN(parseFloat(n)) && isFinite(n);
@@ -24610,7 +24590,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
           var suffix = "";
           if (true) {
             suffix = " (<anonymous>)";
-          } else {}
+          }
           return `
 ` + prefix + name + suffix;
         }
@@ -27339,7 +27319,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     hasChanges = true;
                     updateMostRecentlyInspectedElementIfNecessary(devtoolsInstance.id);
                   }
-                } else {}
+                }
               }
             } catch (err) {
               _iterator2.e(err);
@@ -29118,7 +29098,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                       if (contentFiber === null) {
                         throw new Error("There should always be an Offscreen Fiber child in a hydrated Suspense boundary.");
                       }
-                    } else {}
+                    }
                     var _isTimedOut = fiber.memoizedState !== null;
                     if (!_isTimedOut) {
                       newSuspenseNode.rects = measureInstance(newInstance);
@@ -29152,7 +29132,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     if (_contentFiber === null) {
                       throw new Error("There should always be an Offscreen Fiber child in a hydrated Suspense boundary.");
                     }
-                  } else {}
+                  }
                   var suspenseState = fiber.memoizedState;
                   var _isTimedOut3 = suspenseState !== null;
                   if (!_isTimedOut3) {
@@ -29252,7 +29232,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                   trackThrownPromisesFromRetryCache(newSuspenseNode, fiber.stateNode);
                   mountSuspenseChildrenRecursively(_contentFiber2, traceNearestHostComponentUpdate, stashedSuspenseParent, stashedSuspensePrevious, stashedSuspenseRemaining);
                   shouldPopSuspenseNode = false;
-                } else {}
+                }
               } else {
                 if (fiber.child !== null) {
                   mountChildrenRecursively(fiber.child, traceNearestHostComponentUpdate);
@@ -29838,7 +29818,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                   shouldPopSuspenseNode = false;
                 } else if (previousHydrated && !nextHydrated) {
                   throw new Error("Encountered a dehydrated Suspense boundary that was previously hydrated.");
-                } else {}
+                }
               } else {
                 if (nextFiber.child !== prevFiber.child) {
                   updateFlags |= updateChildrenRecursively(nextFiber.child, prevFiber.child, traceNearestHostComponentUpdate);
@@ -29884,8 +29864,8 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     recordResetChildren(fiberInstance);
                   }
                   updateFlags &= ~ShouldResetChildren;
-                } else {}
-              } else {}
+                }
+              }
               if ((updateFlags & ShouldResetSuspenseChildren) !== NoUpdate) {
                 if (fiberInstance !== null && fiberInstance.kind === FIBER_INSTANCE) {
                   var _suspenseNode3 = fiberInstance.suspenseNode;
@@ -29893,7 +29873,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     recordResetSuspenseChildren(_suspenseNode3);
                     updateFlags &= ~ShouldResetSuspenseChildren;
                   }
-                } else {}
+                }
               }
               if ((updateFlags & ShouldResetParentSuspenseChildren) !== NoUpdate) {
                 if (fiberInstance !== null && fiberInstance.kind === FIBER_INSTANCE) {
@@ -29902,7 +29882,7 @@ In order to be iterable, non-array objects must have a [Symbol.iterator]() metho
                     updateFlags &= ~ShouldResetParentSuspenseChildren;
                     updateFlags |= ShouldResetSuspenseChildren;
                   }
-                } else {}
+                }
               }
               return updateFlags;
             } finally {
@@ -32966,7 +32946,7 @@ The error thrown in the component is:
               rendererInterface = renderer_attach(hook, id, renderer, global2, shouldStartProfilingNow, profilingSettings);
             } else if (renderer.ComponentTree) {
               rendererInterface = legacy_renderer_attach(hook, id, renderer, global2);
-            } else {}
+            }
           }
           return rendererInterface;
         }
@@ -34421,8 +34401,8 @@ function indentString(string, count = 1, options = {}) {
   if (count === 0) {
     return string;
   }
-  const regex3 = includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
-  return string.replace(regex3, indent.repeat(count));
+  const regex2 = includeEmptyLines ? /^/gm : /^(?!\s*$)/gm;
+  return string.replace(regex2, indent.repeat(count));
 }
 
 // node_modules/ink/build/get-max-width.js
@@ -34528,7 +34508,7 @@ var require_cli_boxes = __commonJS((exports, module) => {
 });
 
 // node_modules/ink/build/colorize.js
-var rgbRegex, ansiRegex3, isNamedColor = (color) => {
+var rgbRegex, ansiRegex2, isNamedColor = (color) => {
   return color in source_default;
 }, colorize = (str, color, type) => {
   if (!color) {
@@ -34545,7 +34525,7 @@ var rgbRegex, ansiRegex3, isNamedColor = (color) => {
     return type === "foreground" ? source_default.hex(color)(str) : source_default.bgHex(color)(str);
   }
   if (color.startsWith("ansi256")) {
-    const matches2 = ansiRegex3.exec(color);
+    const matches2 = ansiRegex2.exec(color);
     if (!matches2) {
       return str;
     }
@@ -34567,7 +34547,7 @@ var rgbRegex, ansiRegex3, isNamedColor = (color) => {
 var init_colorize = __esm(() => {
   init_source();
   rgbRegex = /^rgb\(\s?(\d+),\s?(\d+),\s?(\d+)\s?\)$/;
-  ansiRegex3 = /^ansi256\(\s?(\d+)\s?\)$/;
+  ansiRegex2 = /^ansi256\(\s?(\d+)\s?\)$/;
   colorize_default = colorize;
 });
 
@@ -34777,94 +34757,15 @@ var init_render_node_to_output = __esm(async () => {
   render_node_to_output_default = renderNodeToOutput;
 });
 
-// node_modules/slice-ansi/node_modules/is-fullwidth-code-point/node_modules/get-east-asian-width/lookup-data.js
-var ambiguousRanges2, fullwidthRanges2, halfwidthRanges2, narrowRanges2, wideRanges2;
-var init_lookup_data2 = __esm(() => {
-  ambiguousRanges2 = [161, 161, 164, 164, 167, 168, 170, 170, 173, 174, 176, 180, 182, 186, 188, 191, 198, 198, 208, 208, 215, 216, 222, 225, 230, 230, 232, 234, 236, 237, 240, 240, 242, 243, 247, 250, 252, 252, 254, 254, 257, 257, 273, 273, 275, 275, 283, 283, 294, 295, 299, 299, 305, 307, 312, 312, 319, 322, 324, 324, 328, 331, 333, 333, 338, 339, 358, 359, 363, 363, 462, 462, 464, 464, 466, 466, 468, 468, 470, 470, 472, 472, 474, 474, 476, 476, 593, 593, 609, 609, 708, 708, 711, 711, 713, 715, 717, 717, 720, 720, 728, 731, 733, 733, 735, 735, 768, 879, 913, 929, 931, 937, 945, 961, 963, 969, 1025, 1025, 1040, 1103, 1105, 1105, 8208, 8208, 8211, 8214, 8216, 8217, 8220, 8221, 8224, 8226, 8228, 8231, 8240, 8240, 8242, 8243, 8245, 8245, 8251, 8251, 8254, 8254, 8308, 8308, 8319, 8319, 8321, 8324, 8364, 8364, 8451, 8451, 8453, 8453, 8457, 8457, 8467, 8467, 8470, 8470, 8481, 8482, 8486, 8486, 8491, 8491, 8531, 8532, 8539, 8542, 8544, 8555, 8560, 8569, 8585, 8585, 8592, 8601, 8632, 8633, 8658, 8658, 8660, 8660, 8679, 8679, 8704, 8704, 8706, 8707, 8711, 8712, 8715, 8715, 8719, 8719, 8721, 8721, 8725, 8725, 8730, 8730, 8733, 8736, 8739, 8739, 8741, 8741, 8743, 8748, 8750, 8750, 8756, 8759, 8764, 8765, 8776, 8776, 8780, 8780, 8786, 8786, 8800, 8801, 8804, 8807, 8810, 8811, 8814, 8815, 8834, 8835, 8838, 8839, 8853, 8853, 8857, 8857, 8869, 8869, 8895, 8895, 8978, 8978, 9312, 9449, 9451, 9547, 9552, 9587, 9600, 9615, 9618, 9621, 9632, 9633, 9635, 9641, 9650, 9651, 9654, 9655, 9660, 9661, 9664, 9665, 9670, 9672, 9675, 9675, 9678, 9681, 9698, 9701, 9711, 9711, 9733, 9734, 9737, 9737, 9742, 9743, 9756, 9756, 9758, 9758, 9792, 9792, 9794, 9794, 9824, 9825, 9827, 9829, 9831, 9834, 9836, 9837, 9839, 9839, 9886, 9887, 9919, 9919, 9926, 9933, 9935, 9939, 9941, 9953, 9955, 9955, 9960, 9961, 9963, 9969, 9972, 9972, 9974, 9977, 9979, 9980, 9982, 9983, 10045, 10045, 10102, 10111, 11094, 11097, 12872, 12879, 57344, 63743, 65024, 65039, 65533, 65533, 127232, 127242, 127248, 127277, 127280, 127337, 127344, 127373, 127375, 127376, 127387, 127404, 917760, 917999, 983040, 1048573, 1048576, 1114109];
-  fullwidthRanges2 = [12288, 12288, 65281, 65376, 65504, 65510];
-  halfwidthRanges2 = [8361, 8361, 65377, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, 65512, 65518];
-  narrowRanges2 = [32, 126, 162, 163, 165, 166, 172, 172, 175, 175, 10214, 10221, 10629, 10630];
-  wideRanges2 = [4352, 4447, 8986, 8987, 9001, 9002, 9193, 9196, 9200, 9200, 9203, 9203, 9725, 9726, 9748, 9749, 9776, 9783, 9800, 9811, 9855, 9855, 9866, 9871, 9875, 9875, 9889, 9889, 9898, 9899, 9917, 9918, 9924, 9925, 9934, 9934, 9940, 9940, 9962, 9962, 9970, 9971, 9973, 9973, 9978, 9978, 9981, 9981, 9989, 9989, 9994, 9995, 10024, 10024, 10060, 10060, 10062, 10062, 10067, 10069, 10071, 10071, 10133, 10135, 10160, 10160, 10175, 10175, 11035, 11036, 11088, 11088, 11093, 11093, 11904, 11929, 11931, 12019, 12032, 12245, 12272, 12287, 12289, 12350, 12353, 12438, 12441, 12543, 12549, 12591, 12593, 12686, 12688, 12773, 12783, 12830, 12832, 12871, 12880, 42124, 42128, 42182, 43360, 43388, 44032, 55203, 63744, 64255, 65040, 65049, 65072, 65106, 65108, 65126, 65128, 65131, 94176, 94180, 94192, 94198, 94208, 101589, 101631, 101662, 101760, 101874, 110576, 110579, 110581, 110587, 110589, 110590, 110592, 110882, 110898, 110898, 110928, 110930, 110933, 110933, 110948, 110951, 110960, 111355, 119552, 119638, 119648, 119670, 126980, 126980, 127183, 127183, 127374, 127374, 127377, 127386, 127488, 127490, 127504, 127547, 127552, 127560, 127568, 127569, 127584, 127589, 127744, 127776, 127789, 127797, 127799, 127868, 127870, 127891, 127904, 127946, 127951, 127955, 127968, 127984, 127988, 127988, 127992, 128062, 128064, 128064, 128066, 128252, 128255, 128317, 128331, 128334, 128336, 128359, 128378, 128378, 128405, 128406, 128420, 128420, 128507, 128591, 128640, 128709, 128716, 128716, 128720, 128722, 128725, 128728, 128732, 128735, 128747, 128748, 128756, 128764, 128992, 129003, 129008, 129008, 129292, 129338, 129340, 129349, 129351, 129535, 129648, 129660, 129664, 129674, 129678, 129734, 129736, 129736, 129741, 129756, 129759, 129770, 129775, 129784, 131072, 196605, 196608, 262141];
-});
-
-// node_modules/slice-ansi/node_modules/is-fullwidth-code-point/node_modules/get-east-asian-width/utilities.js
-var isInRange2 = (ranges, codePoint) => {
-  let low = 0;
-  let high = Math.floor(ranges.length / 2) - 1;
-  while (low <= high) {
-    const mid = Math.floor((low + high) / 2);
-    const i = mid * 2;
-    if (codePoint < ranges[i]) {
-      high = mid - 1;
-    } else if (codePoint > ranges[i + 1]) {
-      low = mid + 1;
-    } else {
-      return true;
-    }
-  }
-  return false;
-};
-
-// node_modules/slice-ansi/node_modules/is-fullwidth-code-point/node_modules/get-east-asian-width/lookup.js
-function findWideFastPathRange2(ranges) {
-  let fastPathStart = ranges[0];
-  let fastPathEnd = ranges[1];
-  for (let index = 0;index < ranges.length; index += 2) {
-    const start = ranges[index];
-    const end = ranges[index + 1];
-    if (commonCjkCodePoint2 >= start && commonCjkCodePoint2 <= end) {
-      return [start, end];
-    }
-    if (end - start > fastPathEnd - fastPathStart) {
-      fastPathStart = start;
-      fastPathEnd = end;
-    }
-  }
-  return [fastPathStart, fastPathEnd];
-}
-var minimumAmbiguousCodePoint2, maximumAmbiguousCodePoint2, minimumFullWidthCodePoint2, maximumFullWidthCodePoint2, minimumHalfWidthCodePoint2, maximumHalfWidthCodePoint2, minimumNarrowCodePoint2, maximumNarrowCodePoint2, minimumWideCodePoint2, maximumWideCodePoint2, commonCjkCodePoint2 = 19968, wideFastPathStart2, wideFastPathEnd2, isFullWidth2 = (codePoint) => {
-  if (codePoint < minimumFullWidthCodePoint2 || codePoint > maximumFullWidthCodePoint2) {
-    return false;
-  }
-  return isInRange2(fullwidthRanges2, codePoint);
-}, isWide2 = (codePoint) => {
-  if (codePoint >= wideFastPathStart2 && codePoint <= wideFastPathEnd2) {
-    return true;
-  }
-  if (codePoint < minimumWideCodePoint2 || codePoint > maximumWideCodePoint2) {
-    return false;
-  }
-  return isInRange2(wideRanges2, codePoint);
-};
-var init_lookup2 = __esm(() => {
-  init_lookup_data2();
-  minimumAmbiguousCodePoint2 = ambiguousRanges2[0];
-  maximumAmbiguousCodePoint2 = ambiguousRanges2.at(-1);
-  minimumFullWidthCodePoint2 = fullwidthRanges2[0];
-  maximumFullWidthCodePoint2 = fullwidthRanges2.at(-1);
-  minimumHalfWidthCodePoint2 = halfwidthRanges2[0];
-  maximumHalfWidthCodePoint2 = halfwidthRanges2.at(-1);
-  minimumNarrowCodePoint2 = narrowRanges2[0];
-  maximumNarrowCodePoint2 = narrowRanges2.at(-1);
-  minimumWideCodePoint2 = wideRanges2[0];
-  maximumWideCodePoint2 = wideRanges2.at(-1);
-  [wideFastPathStart2, wideFastPathEnd2] = findWideFastPathRange2(wideRanges2);
-});
-
-// node_modules/slice-ansi/node_modules/is-fullwidth-code-point/node_modules/get-east-asian-width/index.js
-var init_get_east_asian_width2 = __esm(() => {
-  init_lookup2();
-});
-
 // node_modules/slice-ansi/node_modules/is-fullwidth-code-point/index.js
 function isFullwidthCodePoint2(codePoint) {
   if (!Number.isInteger(codePoint)) {
     return false;
   }
-  return isFullWidth2(codePoint) || isWide2(codePoint);
+  return isFullWidth(codePoint) || isWide(codePoint);
 }
 var init_is_fullwidth_code_point = __esm(() => {
-  init_get_east_asian_width2();
+  init_get_east_asian_width();
 });
 
 // node_modules/slice-ansi/index.js
@@ -34923,15 +34824,15 @@ function tokenize(string, endCharacter = Number.POSITIVE_INFINITY) {
         continue;
       }
     }
-    const isFullWidth3 = isFullwidthCodePoint2(codePoint);
+    const isFullWidth2 = isFullwidthCodePoint2(codePoint);
     const character = String.fromCodePoint(codePoint);
     returnValue.push({
       type: "character",
       value: character,
-      isFullWidth: isFullWidth3
+      isFullWidth: isFullWidth2
     });
     index += character.length;
-    visibleCount += isFullWidth3 ? 2 : character.length;
+    visibleCount += isFullWidth2 ? 2 : character.length;
     if (visibleCount >= endCharacter) {
       break;
     }
@@ -39447,8 +39348,8 @@ function emoji() {
 }
 function timeSource(args) {
   const hhmm = `(?:[01]\\d|2[0-3]):[0-5]\\d`;
-  const regex3 = typeof args.precision === "number" ? args.precision === -1 ? `${hhmm}` : args.precision === 0 ? `${hhmm}:[0-5]\\d` : `${hhmm}:[0-5]\\d\\.\\d{${args.precision}}` : `${hhmm}(?::[0-5]\\d(?:\\.\\d+)?)?`;
-  return regex3;
+  const regex2 = typeof args.precision === "number" ? args.precision === -1 ? `${hhmm}` : args.precision === 0 ? `${hhmm}:[0-5]\\d` : `${hhmm}:[0-5]\\d\\.\\d{${args.precision}}` : `${hhmm}(?::[0-5]\\d(?:\\.\\d+)?)?`;
+  return regex2;
 }
 function time(args) {
   return new RegExp(`^${timeSource(args)}$`);
@@ -39477,8 +39378,8 @@ var cuid, cuid2, ulid, xid, ksuid, nanoid, duration, extendedDuration, guid, uui
   const escapedDelim = escapeRegex(delimiter ?? ":");
   return new RegExp(`^(?:[0-9A-F]{2}${escapedDelim}){5}[0-9A-F]{2}$|^(?:[0-9a-f]{2}${escapedDelim}){5}[0-9a-f]{2}$`);
 }, cidrv4, cidrv6, base64, base64url, hostname, domain, e164, dateSource = `(?:(?:\\d\\d[2468][048]|\\d\\d[13579][26]|\\d\\d0[48]|[02468][048]00|[13579][26]00)-02-29|\\d{4}-(?:(?:0[13578]|1[02])-(?:0[1-9]|[12]\\d|3[01])|(?:0[469]|11)-(?:0[1-9]|[12]\\d|30)|(?:02)-(?:0[1-9]|1\\d|2[0-8])))`, date, string = (params) => {
-  const regex3 = params ? `[\\s\\S]{${params?.minimum ?? 0},${params?.maximum ?? ""}}` : `[\\s\\S]*`;
-  return new RegExp(`^${regex3}$`);
+  const regex2 = params ? `[\\s\\S]{${params?.minimum ?? 0},${params?.maximum ?? ""}}` : `[\\s\\S]*`;
+  return new RegExp(`^${regex2}$`);
 }, bigint, integer, number, boolean, _null, _undefined, lowercase, uppercase, hex, md5_hex, md5_base64, md5_base64url, sha1_hex, sha1_base64, sha1_base64url, sha256_hex, sha256_base64, sha256_base64url, sha384_hex, sha384_base64, sha384_base64url, sha512_hex, sha512_base64, sha512_base64url;
 var init_regexes = __esm(() => {
   init_util();
@@ -49099,7 +49000,7 @@ function finalize(ctx, schema) {
     result2.$schema = "http://json-schema.org/draft-07/schema#";
   } else if (ctx.target === "draft-04") {
     result2.$schema = "http://json-schema.org/draft-04/schema#";
-  } else if (ctx.target === "openapi-3.0") {} else {}
+  } else if (ctx.target === "openapi-3.0") {}
   if (ctx.external?.uri) {
     const id = ctx.external.registry.get(schema)?.id;
     if (!id)
@@ -49267,9 +49168,9 @@ var formatMap, stringProcessor = (schema, ctx, _json, _params) => {
       json.pattern = regexes[0].source;
     else if (regexes.length > 1) {
       json.allOf = [
-        ...regexes.map((regex3) => ({
+        ...regexes.map((regex2) => ({
           ...ctx.target === "draft-07" || ctx.target === "draft-04" || ctx.target === "openapi-3.0" ? { type: "string" } : {},
-          pattern: regex3.source
+          pattern: regex2.source
         }))
       ];
     }
@@ -49364,7 +49265,7 @@ var formatMap, stringProcessor = (schema, ctx, _json, _params) => {
     if (val === undefined) {
       if (ctx.unrepresentable === "throw") {
         throw new Error("Literal `undefined` cannot be represented in JSON Schema");
-      } else {}
+      }
     } else if (typeof val === "bigint") {
       if (ctx.unrepresentable === "throw") {
         throw new Error("BigInt literals cannot be represented in JSON Schema");
@@ -50484,10 +50385,10 @@ function hex2(_params) {
 function hash(alg, params) {
   const enc = params?.enc ?? "hex";
   const format = `${alg}_${enc}`;
-  const regex3 = exports_regexes[format];
-  if (!regex3)
+  const regex2 = exports_regexes[format];
+  if (!regex2)
     throw new Error(`Unrecognized hash format: ${format}`);
-  return _stringFormat(ZodCustomStringFormat, format, regex3, params);
+  return _stringFormat(ZodCustomStringFormat, format, regex2, params);
 }
 function number2(params) {
   return _number(ZodNumber, params);
@@ -55256,8 +55157,8 @@ function createUnicodePropertyRegex(pattern) {
     return null;
   }
 }
-function matchesUnicodeProperty(character, regex3) {
-  return regex3?.test(character) ?? false;
+function matchesUnicodeProperty(character, regex2) {
+  return regex2?.test(character) ?? false;
 }
 function isVariationSelector(codePoint) {
   return codePoint >= VARIATION_SELECTOR_START && codePoint <= VARIATION_SELECTOR_END || codePoint >= VARIATION_SELECTOR_SUPPLEMENT_START && codePoint <= VARIATION_SELECTOR_SUPPLEMENT_END;
@@ -55748,8 +55649,8 @@ function getColorAnsiCode(colorName, colorLevel = "ansi16", isBackground = false
   }
   const colored = chalkFn("TEST");
   const escapeChar = "\x1B";
-  const ansiRegex4 = new RegExp(`^(${escapeChar.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\[[^m]+m)`);
-  const match = ansiRegex4.exec(colored);
+  const ansiRegex3 = new RegExp(`^(${escapeChar.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\[[^m]+m)`);
+  const match = ansiRegex3.exec(colored);
   return match?.[1] ?? "";
 }
 function getColorDisplayName(colorName) {
@@ -56138,16 +56039,26 @@ function getTTYForProcess(pid) {
   }
 }
 function getWidthForTTY(tty2) {
-  try {
-    const width = execSync(`stty size < /dev/${tty2} | awk '{print $2}'`, {
-      encoding: "utf8",
-      stdio: ["pipe", "pipe", "ignore"],
-      shell: "/bin/sh"
-    }).trim();
-    return parsePositiveInteger(width);
-  } catch {
-    return null;
+  const devicePath = `/dev/${tty2}`;
+  const attempts = [
+    `stty -F ${devicePath} size`,
+    `stty -f ${devicePath} size`,
+    `stty size < ${devicePath}`
+  ];
+  for (const cmd of attempts) {
+    try {
+      const width = execSync(`${cmd} 2>/dev/null | awk '{print $2}'`, {
+        encoding: "utf8",
+        stdio: ["pipe", "pipe", "ignore"],
+        shell: "/bin/sh"
+      }).trim();
+      const parsed = parsePositiveInteger(width);
+      if (parsed !== null) {
+        return parsed;
+      }
+    } catch {}
   }
+  return null;
 }
 function getTerminalWidth() {
   return probeTerminalWidth();
@@ -56155,7 +56066,7 @@ function getTerminalWidth() {
 function canDetectTerminalWidth() {
   return probeTerminalWidth() !== null;
 }
-var __dirname = "/Users/sirmalloc/Projects/Personal/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.15";
+var __dirname = "/home/runner/work/ccstatusline/ccstatusline/src/utils", PACKAGE_VERSION = "2.2.17";
 var init_terminal = () => {};
 
 // src/utils/renderer.ts
@@ -59529,6 +59440,9 @@ import * as fs3 from "fs";
 import * as https from "https";
 import * as os4 from "os";
 import * as path3 from "path";
+function getUsageApiBucketUtilization(bucket) {
+  return bucket === null ? 0 : bucket?.utilization ?? undefined;
+}
 function parseJsonWithSchema(rawJson, schema) {
   try {
     const parsed = schema.safeParse(JSON.parse(rawJson));
@@ -59569,13 +59483,13 @@ function parseUsageApiResponse(rawJson) {
     return null;
   }
   return {
-    sessionUsage: parsed.five_hour?.utilization ?? undefined,
+    sessionUsage: getUsageApiBucketUtilization(parsed.five_hour),
     sessionResetAt: parsed.five_hour?.resets_at ?? undefined,
-    weeklyUsage: parsed.seven_day?.utilization ?? undefined,
+    weeklyUsage: getUsageApiBucketUtilization(parsed.seven_day),
     weeklyResetAt: parsed.seven_day?.resets_at ?? undefined,
-    weeklySonnetUsage: parsed.seven_day_sonnet === null ? 0 : parsed.seven_day_sonnet?.utilization ?? undefined,
+    weeklySonnetUsage: getUsageApiBucketUtilization(parsed.seven_day_sonnet),
     weeklySonnetResetAt: parsed.seven_day_sonnet?.resets_at ?? undefined,
-    weeklyOpusUsage: parsed.seven_day_opus === null ? 0 : parsed.seven_day_opus?.utilization ?? undefined,
+    weeklyOpusUsage: getUsageApiBucketUtilization(parsed.seven_day_opus),
     weeklyOpusResetAt: parsed.seven_day_opus?.resets_at ?? undefined,
     extraUsageEnabled: parsed.extra_usage?.is_enabled ?? undefined,
     extraUsageLimit: parsed.extra_usage?.monthly_limit ?? undefined,
@@ -59900,9 +59814,11 @@ async function fetchUsageData(options = {}) {
     }
     const usageData = parseUsageApiResponse(response.body);
     if (!usageData) {
+      writeUsageLock(now2 + LOCK_MAX_AGE, "parse-error");
       return getStaleUsageOrError("parse-error", now2, LOCK_MAX_AGE, requiredFields);
     }
     if (usageData.sessionUsage === undefined && usageData.weeklyUsage === undefined) {
+      writeUsageLock(now2 + LOCK_MAX_AGE, "parse-error");
       return getStaleUsageOrError("parse-error", now2, LOCK_MAX_AGE, requiredFields);
     }
     try {
@@ -59911,10 +59827,11 @@ async function fetchUsageData(options = {}) {
     } catch {}
     return cacheUsageData(usageData, now2);
   } catch {
+    writeUsageLock(now2 + LOCK_MAX_AGE, "parse-error");
     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, 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 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, UsageApiBucketSchema, UsageApiResponseSchema, cachedUsageData = null, usageCacheTime = 0, usageErrorCacheMaxAge, USAGE_API_HOST = "api.anthropic.com", USAGE_API_PATH = "/api/oauth/usage", USAGE_API_TIMEOUT_MS = 5000;
 var init_usage_fetch = __esm(async () => {
   init_dist5();
   init_zod();
@@ -59925,7 +59842,7 @@ var init_usage_fetch = __esm(async () => {
   LOCK_FILE = path3.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"]);
+  UsageLockErrorSchema = exports_external.enum(["timeout", "rate-limited", "parse-error"]);
   UsageLockSchema = exports_external.object({
     blockedUntil: exports_external.number(),
     error: UsageLockErrorSchema.optional()
@@ -59945,27 +59862,21 @@ var init_usage_fetch = __esm(async () => {
     extraUsageUtilization: exports_external.number().nullable().optional(),
     error: exports_external.string().nullable().optional()
   });
-  PerModelWeeklyBucketSchema = exports_external.object({
+  UsageApiBucketSchema = exports_external.looseObject({
     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(),
-      resets_at: exports_external.string().nullable().optional()
-    }).optional(),
-    seven_day: exports_external.object({
-      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({
+  UsageApiResponseSchema = exports_external.looseObject({
+    five_hour: UsageApiBucketSchema,
+    seven_day: UsageApiBucketSchema,
+    seven_day_sonnet: UsageApiBucketSchema,
+    seven_day_opus: UsageApiBucketSchema,
+    extra_usage: exports_external.looseObject({
       is_enabled: exports_external.boolean().nullable().optional(),
       monthly_limit: exports_external.number().nullable().optional(),
       used_credits: exports_external.number().nullable().optional(),
       utilization: exports_external.number().nullable().optional()
-    }).optional()
+    }).nullable().optional()
   });
   usageErrorCacheMaxAge = LOCK_MAX_AGE;
 });
@@ -62026,17 +61937,17 @@ var require_picomatch = __commonJS((exports, module) => {
     }
     const opts = options || {};
     const posix = opts.windows;
-    const regex3 = isState ? picomatch.compileRe(glob, options) : picomatch.makeRe(glob, options, false, true);
-    const state = regex3.state;
-    delete regex3.state;
+    const regex2 = isState ? picomatch.compileRe(glob, options) : picomatch.makeRe(glob, options, false, true);
+    const state = regex2.state;
+    delete regex2.state;
     let isIgnored = () => false;
     if (opts.ignore) {
       const ignoreOpts = { ...options, ignore: null, onMatch: null, onResult: null };
       isIgnored = picomatch(opts.ignore, ignoreOpts, returnState);
     }
     const matcher = (input, returnObject = false) => {
-      const { isMatch: isMatch2, match, output } = picomatch.test(input, regex3, options, { glob, posix });
-      const result2 = { glob, state, regex: regex3, posix, input, output, match, isMatch: isMatch2 };
+      const { isMatch: isMatch2, match, output } = picomatch.test(input, regex2, options, { glob, posix });
+      const result2 = { glob, state, regex: regex2, posix, input, output, match, isMatch: isMatch2 };
       if (typeof opts.onResult === "function") {
         opts.onResult(result2);
       }
@@ -62061,7 +61972,7 @@ var require_picomatch = __commonJS((exports, module) => {
     }
     return matcher;
   };
-  picomatch.test = (input, regex3, options, { glob, posix } = {}) => {
+  picomatch.test = (input, regex2, options, { glob, posix } = {}) => {
     if (typeof input !== "string") {
       throw new TypeError("Expected input to be a string");
     }
@@ -62078,16 +61989,16 @@ var require_picomatch = __commonJS((exports, module) => {
     }
     if (match === false || opts.capture === true) {
       if (opts.matchBase === true || opts.basename === true) {
-        match = picomatch.matchBase(input, regex3, options, posix);
+        match = picomatch.matchBase(input, regex2, options, posix);
       } else {
-        match = regex3.exec(output);
+        match = regex2.exec(output);
       }
     }
     return { isMatch: Boolean(match), match, output };
   };
   picomatch.matchBase = (input, glob, options) => {
-    const regex3 = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
-    return regex3.test(utils.basename(input));
+    const regex2 = glob instanceof RegExp ? glob : picomatch.makeRe(glob, options);
+    return regex2.test(utils.basename(input));
   };
   picomatch.isMatch = (str, patterns, options) => picomatch(patterns, options)(str);
   picomatch.parse = (pattern, options) => {
@@ -62107,11 +62018,11 @@ var require_picomatch = __commonJS((exports, module) => {
     if (state && state.negated === true) {
       source = `^(?!${source}).*$`;
     }
-    const regex3 = picomatch.toRegex(source, options);
+    const regex2 = picomatch.toRegex(source, options);
     if (returnState === true) {
-      regex3.state = state;
+      regex2.state = state;
     }
-    return regex3;
+    return regex2;
   };
   picomatch.makeRe = (input, options = {}, returnOutput = false, returnState = false) => {
     if (!input || typeof input !== "string") {
@@ -64985,10 +64896,11 @@ class SessionUsageWidget {
       return formatRawOrLabeledValue(item, "Session: ", `${previewPercent.toFixed(1)}%`);
     }
     const data = context.usageData ?? {};
-    if (data.error)
-      return getUsageErrorMessage(data.error);
-    if (data.sessionUsage === undefined)
+    if (data.sessionUsage === undefined) {
+      if (data.error)
+        return getUsageErrorMessage(data.error);
       return null;
+    }
     const percent = Math.max(0, Math.min(100, data.sessionUsage));
     const renderedPercent = inverted ? 100 - percent : percent;
     const getCursorOptions = () => {
@@ -65079,10 +64991,11 @@ class WeeklyUsageWidget {
       return formatRawOrLabeledValue(item, "Weekly: ", `${previewPercent.toFixed(1)}%`);
     }
     const data = context.usageData ?? {};
-    if (data.error)
-      return getUsageErrorMessage(data.error);
-    if (data.weeklyUsage === undefined)
+    if (data.weeklyUsage === undefined) {
+      if (data.error)
+        return getUsageErrorMessage(data.error);
       return null;
+    }
     const percent = Math.max(0, Math.min(100, data.weeklyUsage));
     const renderedPercent = inverted ? 100 - percent : percent;
     const getCursorOptions = () => {
@@ -65173,10 +65086,11 @@ class WeeklySonnetUsageWidget {
       return formatRawOrLabeledValue(item, LABEL, `${previewPercent.toFixed(1)}%`);
     }
     const data = context.usageData ?? {};
-    if (data.error)
-      return getUsageErrorMessage(data.error);
-    if (data.weeklySonnetUsage === undefined)
+    if (data.weeklySonnetUsage === undefined) {
+      if (data.error)
+        return getUsageErrorMessage(data.error);
       return null;
+    }
     const percent = Math.max(0, Math.min(100, data.weeklySonnetUsage));
     const renderedPercent = inverted ? 100 - percent : percent;
     const getCursorOptions = () => {
@@ -65268,10 +65182,11 @@ class WeeklyOpusUsageWidget {
       return formatRawOrLabeledValue(item, LABEL2, `${previewPercent.toFixed(1)}%`);
     }
     const data = context.usageData ?? {};
-    if (data.error)
-      return getUsageErrorMessage(data.error);
-    if (data.weeklyOpusUsage === undefined)
+    if (data.weeklyOpusUsage === undefined) {
+      if (data.error)
+        return getUsageErrorMessage(data.error);
       return null;
+    }
     const percent = Math.max(0, Math.min(100, data.weeklyOpusUsage));
     const renderedPercent = inverted ? 100 - percent : percent;
     const getCursorOptions = () => {
@@ -68510,7 +68425,7 @@ gradient.rainbow = rainbow;
 gradient.pastel = pastel;
 
 // node_modules/ink-gradient/dist/index.js
-init_strip_ansi2();
+init_strip_ansi();
 var Gradient = (props) => {
   if (props.name && props.colors) {
     throw new Error("The `name` and `colors` props are mutually exclusive");
@@ -68523,7 +68438,7 @@ var Gradient = (props) => {
   } else {
     throw new Error("Either `name` or `colors` prop must be provided");
   }
-  const applyGradient2 = (text) => gradient2.multiline(stripAnsi2(text));
+  const applyGradient2 = (text) => gradient2.multiline(stripAnsi(text));
   const containsBoxDescendant = (nodeChildren) => {
     let hasBox = false;
     const search = (value) => {
@@ -75984,32 +75899,99 @@ var USAGE_WIDGET_TYPES = new Set([
   "reset-timer",
   "weekly-reset-timer"
 ]);
-var PER_MODEL_USAGE_WIDGET_TYPES = new Set([
-  "weekly-sonnet-usage",
-  "weekly-opus-usage"
-]);
+var USAGE_DATA_FIELDS = [
+  "sessionUsage",
+  "sessionResetAt",
+  "weeklyUsage",
+  "weeklyResetAt",
+  "weeklySonnetUsage",
+  "weeklySonnetResetAt",
+  "weeklyOpusUsage",
+  "weeklyOpusResetAt",
+  "extraUsageEnabled",
+  "extraUsageLimit",
+  "extraUsageUsed",
+  "extraUsageUtilization"
+];
+var EMPTY_USAGE_REQUIREMENTS = [];
+var USAGE_WIDGET_REQUIREMENTS = {
+  "session-usage": [{ field: "sessionUsage" }],
+  "weekly-usage": [{ field: "weeklyUsage" }],
+  "weekly-sonnet-usage": [{ field: "weeklySonnetUsage" }],
+  "weekly-opus-usage": [{ field: "weeklyOpusUsage" }],
+  "block-timer": [{ field: "sessionResetAt" }],
+  "reset-timer": [{ field: "sessionResetAt" }],
+  "weekly-reset-timer": [{ field: "weeklyResetAt" }]
+};
+var USAGE_CURSOR_REQUIREMENTS = {
+  "session-usage": { field: "sessionResetAt" },
+  "weekly-usage": { field: "weeklyResetAt" },
+  "weekly-sonnet-usage": { field: "weeklySonnetResetAt", alternatives: ["weeklyResetAt"] },
+  "weekly-opus-usage": { field: "weeklyOpusResetAt", alternatives: ["weeklyResetAt"] }
+};
 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
-  };
+function isUsageCursorEnabled2(item) {
+  return item.metadata?.cursor === "true";
+}
+function getUsageFieldRequirements(lines) {
+  const requirements = [];
   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;
+      requirements.push(...USAGE_WIDGET_REQUIREMENTS[item.type] ?? EMPTY_USAGE_REQUIREMENTS);
+      const cursorRequirement = USAGE_CURSOR_REQUIREMENTS[item.type];
+      if (cursorRequirement && isUsageCursorEnabled2(item)) {
+        requirements.push(cursorRequirement);
       }
     }
   }
   return requirements;
 }
+function hasUsageDataField(data, field) {
+  return data?.[field] !== undefined;
+}
+function isUsageRequirementSatisfied(data, requirement) {
+  if (hasUsageDataField(data, requirement.field)) {
+    return true;
+  }
+  return requirement.alternatives?.some((field) => hasUsageDataField(data, field)) ?? false;
+}
+function getMissingFetchFields(data, requirements) {
+  const missing = new Set;
+  for (const requirement of requirements) {
+    if (!isUsageRequirementSatisfied(data, requirement)) {
+      missing.add(requirement.field);
+    }
+  }
+  return Array.from(missing);
+}
+function hasAnyUsageDataField(data) {
+  return USAGE_DATA_FIELDS.some((field) => data?.[field] !== undefined);
+}
+function pickDefinedUsageFields(data) {
+  return {
+    ...data?.sessionUsage !== undefined ? { sessionUsage: data.sessionUsage } : {},
+    ...data?.sessionResetAt !== undefined ? { sessionResetAt: data.sessionResetAt } : {},
+    ...data?.weeklyUsage !== undefined ? { weeklyUsage: data.weeklyUsage } : {},
+    ...data?.weeklyResetAt !== undefined ? { weeklyResetAt: data.weeklyResetAt } : {},
+    ...data?.weeklySonnetUsage !== undefined ? { weeklySonnetUsage: data.weeklySonnetUsage } : {},
+    ...data?.weeklySonnetResetAt !== undefined ? { weeklySonnetResetAt: data.weeklySonnetResetAt } : {},
+    ...data?.weeklyOpusUsage !== undefined ? { weeklyOpusUsage: data.weeklyOpusUsage } : {},
+    ...data?.weeklyOpusResetAt !== undefined ? { weeklyOpusResetAt: data.weeklyOpusResetAt } : {},
+    ...data?.extraUsageEnabled !== undefined ? { extraUsageEnabled: data.extraUsageEnabled } : {},
+    ...data?.extraUsageLimit !== undefined ? { extraUsageLimit: data.extraUsageLimit } : {},
+    ...data?.extraUsageUsed !== undefined ? { extraUsageUsed: data.extraUsageUsed } : {},
+    ...data?.extraUsageUtilization !== undefined ? { extraUsageUtilization: data.extraUsageUtilization } : {}
+  };
+}
+function mergeUsageData(rateLimitsData, apiData) {
+  return {
+    ...pickDefinedUsageFields(apiData),
+    ...pickDefinedUsageFields(rateLimitsData),
+    ...apiData.error ? { error: apiData.error } : {}
+  };
+}
 function epochSecondsToIsoString(epochSeconds) {
   if (epochSeconds === null || epochSeconds === undefined || !Number.isFinite(epochSeconds)) {
     return;
@@ -76028,10 +76010,7 @@ function extractUsageDataFromRateLimits(rateLimits) {
   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 {
+  const usageData = {
     sessionUsage,
     sessionResetAt,
     weeklyUsage,
@@ -76041,39 +76020,20 @@ function extractUsageDataFromRateLimits(rateLimits) {
     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 getRequiredUsageFields(perModelRequirements) {
-  const requiredFields = [];
-  if (perModelRequirements.sonnet) {
-    requiredFields.push("weeklySonnetUsage");
-  }
-  if (perModelRequirements.opus) {
-    requiredFields.push("weeklyOpusUsage");
-  }
-  return requiredFields;
+  return hasAnyUsageDataField(usageData) ? usageData : null;
 }
 async function prefetchUsageDataIfNeeded(lines, data) {
   if (!hasUsageDependentWidgets(lines)) {
     return null;
   }
   const rateLimitsData = extractUsageDataFromRateLimits(data?.rate_limits);
-  const perModelRequirements = getPerModelUsageRequirements(lines);
-  if (hasCompleteRateLimitsUsageData(rateLimitsData, perModelRequirements)) {
+  const requirements = getUsageFieldRequirements(lines);
+  const missingFields = getMissingFetchFields(rateLimitsData, requirements);
+  if (missingFields.length === 0) {
     return rateLimitsData;
   }
-  return fetchUsageData({ requiredFields: getRequiredUsageFields(perModelRequirements) });
+  const apiData = await fetchUsageData({ requiredFields: missingFields });
+  return mergeUsageData(rateLimitsData, apiData);
 }
 
 // src/ccstatusline.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccstatusline",
-  "version": "2.2.15",
+  "version": "2.2.17",
   "description": "A customizable status line formatter for Claude Code CLI",
   "module": "src/ccstatusline.ts",
   "type": "module",