@khalilgharbaoui/opencode-claude-code-plugin 0.61.2 → 0.62.0

package/dist/tui.js

@@ -1155,7 +1155,7 @@ function isReadingCurrent(entry, now = Date.now()) {
 function usagePercent(utilization) {
   return Math.round(utilization * 1e3) / 10;
 }
-function createAccountUsageReader(file = accountUsageStorePath) {
+function createAccountUsageReader(file = accountUsageStorePath, now = Date.now) {
   let identity = "";
   let store = emptyStore();
   const refresh = () => {
@@ -1169,7 +1169,7 @@ function createAccountUsageReader(file = accountUsageStorePath) {
     }
     if (next !== identity) {
       identity = next;
-      store = next === "missing" ? emptyStore() : parseStore(path, Date.now());
+      store = next === "missing" ? emptyStore() : parseStore(path, now());
     }
   };
   return {
@@ -1188,8 +1188,10 @@ function createAccountUsageReader(file = accountUsageStorePath) {
 // src/account-sidebar.ts
 var WARNING_PERCENT = 75;
 var NO_READING_TEXT = "no reading yet";
+var FIVE_HOUR_WINDOW = "five_hour";
 var RESET_WORD = "resets ";
 var SEPARATOR = " \xB7 ";
+var MAX_DETAIL_INDENT = 12;
 var SHORT_WINDOWS = {
   five_hour: "5h",
   seven_day: "7d",
@@ -1202,6 +1204,9 @@ function shortWindowName(window) {
   if (window === "unknown") return "";
   return SHORT_WINDOWS[window] ?? window.replace(/_/g, " ");
 }
+function percentLeft(utilization) {
+  return Math.max(0, Math.round(100 - usagePercent(utilization)));
+}
 var pad = (value) => String(value).padStart(2, "0");
 function sameDay(a, b) {
   return a.getFullYear() === b.getFullYear() && a.getMonth() === b.getMonth() && a.getDate() === b.getDate();
@@ -1222,23 +1227,37 @@ function resetSpellings(entry, now) {
   if (entry.resetsText) return [`${RESET_WORD}${entry.resetsText}`, entry.resetsText];
   return [];
 }
+function stateOf(entry) {
+  if (entry.status === "rejected") return "limited";
+  if (entry.utilization !== null && usagePercent(entry.utilization) >= WARNING_PERCENT) return "warning";
+  return "ok";
+}
 function rank(entry) {
   if (entry.status === "rejected") return 1e3;
   if (entry.utilization === null) return -1;
   return usagePercent(entry.utilization);
 }
-function pressingWindow(windows, now) {
+function pressingWindow(windows, now, except) {
   let best;
   for (const [window, entry] of windows) {
-    if (!isReadingCurrent(entry, now)) continue;
+    if (window === except || !isReadingCurrent(entry, now)) continue;
     if (!best || rank(entry) > rank(best[1])) best = [window, entry];
   }
   return best;
 }
+function levelText(window, entry) {
+  const short = shortWindowName(window);
+  const prefix = short ? `${short} ` : "";
+  if (!entry) return `${prefix}100% left`;
+  if (entry.status === "rejected") return `${prefix}limited`;
+  if (entry.utilization === null) return `${prefix}ok`;
+  return `${prefix}${percentLeft(entry.utilization)}% left`;
+}
 var cells2 = (value) => Array.from(value).length;
 var segmentsCells = (segments) => segments.reduce((sum, segment) => sum + cells2(segment.text), 0);
-function levelRole(state) {
-  return state === "limited" ? "error" : state === "warning" ? "effort" : "ok";
+function levelRole(draft) {
+  if (draft.dimmed) return "muted";
+  return draft.state === "limited" ? "error" : draft.state === "warning" ? "effort" : "ok";
 }
 function fitSegments(segments, budget) {
   const out = [];
@@ -1256,6 +1275,7 @@ function fitSegments(segments, budget) {
     }
     break;
   }
+  while (out.length > 0 && [SEPARATOR, RESET_WORD].includes(out[out.length - 1].text)) out.pop();
   return out;
 }
 function tailSegments(draft, spelling, withTier) {
@@ -1265,10 +1285,8 @@ function tailSegments(draft, spelling, withTier) {
     out2.push({ text: SEPARATOR, role: "muted" }, { text: NO_READING_TEXT, role: "muted" });
     return out2;
   }
-  const out = [
-    { text: SEPARATOR, role: "muted" },
-    { text: draft.level, role: levelRole(draft.state) }
-  ];
+  const out = draft.detail ? [] : [{ text: SEPARATOR, role: "muted" }];
+  out.push({ text: draft.level, role: levelRole(draft) });
   const reset = draft.spellings[Math.min(spelling, draft.spellings.length - 1)];
   if (reset) {
     out.push({ text: SEPARATOR, role: "muted" });
@@ -1280,32 +1298,54 @@ function tailSegments(draft, spelling, withTier) {
   }
   return out;
 }
+function readingDraft(account, name, window, entry, now, detail = false, dimmed = false) {
+  return {
+    account,
+    window,
+    state: entry ? stateOf(entry) : "ok",
+    detail,
+    name,
+    level: levelText(window, entry),
+    dimmed,
+    spellings: entry ? resetSpellings(entry, now) : []
+  };
+}
+function accountDrafts(account, windows, known, now, width) {
+  const name = truncate(account, Math.max(1, Math.floor(width / 2)));
+  const fiveHour = windows?.get(FIVE_HOUR_WINDOW);
+  const current = fiveHour && isReadingCurrent(fiveHour, now) ? fiveHour : void 0;
+  const rolled = fiveHour !== void 0 && !current && known.has(account);
+  if (current || rolled) {
+    const other = windows ? pressingWindow(windows, now, FIVE_HOUR_WINDOW) : void 0;
+    const otherState = other ? stateOf(other[1]) : "ok";
+    const drafts = [readingDraft(account, name, FIVE_HOUR_WINDOW, current, now, false, otherState === "limited")];
+    if (other && otherState !== "ok") {
+      const indent = " ".repeat(Math.min(MAX_DETAIL_INDENT, cells2(name) + cells2(SEPARATOR)));
+      drafts.push(readingDraft(account, indent, other[0], other[1], now, true));
+    }
+    return drafts;
+  }
+  const pressing = windows ? pressingWindow(windows, now) : void 0;
+  if (pressing) return [readingDraft(account, name, pressing[0], pressing[1], now)];
+  if (!known.has(account)) return [];
+  return [
+    {
+      account,
+      window: "",
+      state: "none",
+      detail: false,
+      name,
+      level: "",
+      dimmed: false,
+      tier: known.get(account)?.tier,
+      spellings: []
+    }
+  ];
+}
 function accountUsageLines(usage, now, width = SIDEBAR_ROW_WIDTH, known = /* @__PURE__ */ new Map()) {
   const drafts = [];
   const names = [.../* @__PURE__ */ new Set([...usage.keys(), ...known.keys()])].sort();
-  for (const account of names) {
-    const name = truncate(account, Math.max(1, Math.floor(width / 2)));
-    const windows = usage.get(account);
-    const pressing = windows ? pressingWindow(windows, now) : void 0;
-    if (!pressing) {
-      if (!known.has(account)) continue;
-      drafts.push({
-        account,
-        window: "",
-        state: "none",
-        name,
-        level: "",
-        tier: known.get(account)?.tier,
-        spellings: []
-      });
-      continue;
-    }
-    const [window, entry] = pressing;
-    const state = entry.status === "rejected" ? "limited" : entry.utilization !== null && usagePercent(entry.utilization) >= WARNING_PERCENT ? "warning" : "ok";
-    const short = shortWindowName(window);
-    const level = state === "limited" ? "limited" : entry.utilization === null ? `${short ? `${short} ` : ""}ok` : `${short ? `${short} ` : ""}${Math.round(usagePercent(entry.utilization))}%`;
-    drafts.push({ account, window, state, name, level, spellings: resetSpellings(entry, now) });
-  }
+  for (const account of names) drafts.push(...accountDrafts(account, usage.get(account), known, now, width));
   const budget = (draft) => Math.max(0, width - cells2(draft.name));
   const spelt = drafts.filter((draft) => draft.state !== "none");
   const last = Math.max(0, ...spelt.map((draft) => draft.spellings.length - 1));
@@ -1320,7 +1360,8 @@ function accountUsageLines(usage, now, width = SIDEBAR_ROW_WIDTH, known = /* @__
       account: draft.account,
       window: draft.window,
       state: draft.state,
-      segments: [{ text: draft.name, role: "agent" }, ...fitSegments(tail, budget(draft))]
+      detail: draft.detail,
+      segments: [{ text: draft.name, role: draft.detail ? "muted" : "agent" }, ...fitSegments(tail, budget(draft))]
     };
   });
 }