@narumitw/pi-usage 0.60.1 → 0.60.3

package/dist/index.ts

@@ -1254,6 +1254,26 @@ function normalizeWindow(row, fields) {
   }
   const total = nonnegativeInteger(row[fields.totalField], fields.totalField);
   const count = nonnegativeInteger(row[fields.countField], fields.countField);
+  if (total === 0) {
+    if (count !== 0) {
+      throw new Error(`MiniMax Token Plan ${fields.label} counts were inconsistent.`);
+    }
+    if (percent === void 0) {
+      throw new Error(`MiniMax Token Plan ${fields.label} returned no quota and no percent.`);
+    }
+    return {
+      id: fields.id,
+      label: fields.label,
+      groupId: fields.groupId,
+      groupLabel: fields.groupLabel,
+      remaining: percent,
+      used: 100 - percent,
+      limit: 0,
+      unit: "percent",
+      windowMinutes,
+      resetsAt
+    };
+  }
   const resolved = resolveQuotaCounts(count, total, percent);
   if (!resolved) throw new Error(`MiniMax Token Plan ${fields.label} counts were inconsistent.`);
   return {
@@ -3418,7 +3438,7 @@ function formatMiniMaxReport(lines, report2) {
     if (bucket.groupId !== previousGroup) lines.push(`${bucket.groupLabel ?? "Token Plan"}:`);
     previousGroup = bucket.groupId;
     const reset = bucket.resetsAt ? ` (resets ${formatReset(bucket.resetsAt)})` : "";
-    const value = bucket.period === "unlimited" ? "unlimited" : bucket.limit && bucket.remaining !== void 0 ? `${bucket.remaining} of ${bucket.limit} left \xB7 ${percentRemaining(bucket)}%${reset}` : "unavailable";
+    const value = bucket.period === "unlimited" ? "unlimited" : bucket.unit === "percent" && bucket.remaining !== void 0 ? `${bucket.remaining}% remaining${reset}` : bucket.limit !== void 0 && bucket.remaining !== void 0 ? `${bucket.remaining} of ${bucket.limit} left \xB7 ${percentRemaining(bucket)}%${reset}` : "unavailable";
     lines.push(`${`${bucket.label}:`.padEnd(VALUE_COLUMN)}${value}`);
   }
 }
@@ -3439,7 +3459,11 @@ function formatMiniMaxStatusline(report2, model) {
       parts.push(`unlimited ${window}`);
       continue;
     }
-    if (!bucket.limit || bucket.remaining === void 0) continue;
+    if (bucket.unit === "percent" && bucket.remaining !== void 0) {
+      parts.push(`${bucket.remaining}% ${window}`);
+      continue;
+    }
+    if (bucket.limit === void 0 || bucket.remaining === void 0) continue;
     parts.push(`${percentRemaining(bucket)}% ${window}`);
   }
   return parts.length > 1 ? parts.join(" ") : void 0;
@@ -3451,22 +3475,26 @@ function selectMiniMaxGroup(report2, model) {
     )
   ];
   if (groups.length <= 1) return groups[0];
-  if (model?.provider !== report2.providerId) return void 0;
-  const modelKeys = [model.id, model.name].map(normalizeMiniMaxModelKey).filter((key) => key !== void 0);
-  const candidates = groups.map((group) => {
-    const bucket = report2.buckets.find((candidate) => candidate.groupId === group);
-    const patterns = [bucket?.groupLabel, ...bucket?.modelKeys ?? [], group].map(normalizeMiniMaxModelKey).filter((key) => key !== void 0);
-    return { group, patterns };
-  });
-  const exact = candidates.find(
-    ({ patterns }) => patterns.some((pattern) => !pattern.includes("*") && modelKeys.includes(pattern))
-  );
-  if (exact) return exact.group;
-  return candidates.find(
-    ({ patterns }) => patterns.some(
-      (pattern) => pattern.includes("*") && modelKeys.some((key) => wildcardKeyMatches(pattern, key))
-    )
-  )?.group;
+  if (model && model.provider !== report2.providerId) return void 0;
+  if (model) {
+    const modelKeys = [model.id, model.name].map(normalizeMiniMaxModelKey).filter((key) => key !== void 0);
+    const candidates = groups.map((group) => {
+      const bucket = report2.buckets.find((candidate) => candidate.groupId === group);
+      const patterns = [bucket?.groupLabel, ...bucket?.modelKeys ?? [], group].map(normalizeMiniMaxModelKey).filter((key) => key !== void 0);
+      return { group, patterns };
+    });
+    const exact = candidates.find(
+      ({ patterns }) => patterns.some((pattern) => !pattern.includes("*") && modelKeys.includes(pattern))
+    );
+    if (exact) return exact.group;
+    const wildcard = candidates.find(
+      ({ patterns }) => patterns.some(
+        (pattern) => pattern.includes("*") && modelKeys.some((key) => wildcardKeyMatches(pattern, key))
+      )
+    );
+    if (wildcard) return wildcard.group;
+  }
+  return groups.find((group) => group === "general");
 }
 function normalizeMiniMaxModelKey(value) {
   const key = value?.toLowerCase().replace(/[^a-z0-9*]+/gu, "");
@@ -4177,6 +4205,7 @@ function isTimeoutError(error) {
 }
 
 // src/usage-settings-ui.ts
+import { stripVTControlCharacters } from "node:util";
 import {
   getSettingsListTheme
 } from "@earendil-works/pi-coding-agent";
@@ -4189,11 +4218,25 @@ import {
 } from "@earendil-works/pi-tui";
 var OFF = "Off";
 var ON = "On";
+function fitSettingsRows(lines, maxRows) {
+  if (lines.length <= maxRows) return lines;
+  const content = lines.filter((line) => stripVTControlCharacters(line).trim().length > 0);
+  if (content.length <= maxRows) return content;
+  const selectedIndex = content.findIndex(
+    (line) => /^[→›]\s/u.test(stripVTControlCharacters(line))
+  );
+  if (selectedIndex < 0) return content.slice(0, maxRows);
+  return content.map((line, index) => ({ index, line })).sort(
+    (left, right) => Math.abs(left.index - selectedIndex) - Math.abs(right.index - selectedIndex) || left.index - right.index
+  ).slice(0, maxRows).sort((left, right) => left.index - right.index).map(({ line }) => line);
+}
 async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent, onApplied) {
   if (ctx.mode !== "tui") {
     if (ctx.hasUI) ctx.ui.notify(`Edit settings manually: ${settingsRuntime.get().path}`, "info");
     return false;
   }
+  const { HorizontalRule } = await import("@narumitw/pi-tui-kit");
+  if (parentSignal.aborted || !isCurrent()) return false;
   return await ctx.ui.custom((tui, theme, _keybindings, done) => {
     const localController = new AbortController();
     const signal = AbortSignal.any([parentSignal, localController.signal]);
@@ -4218,6 +4261,7 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
       }
     ];
     const container = new Container();
+    const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
     container.addChild(new Text(theme.fg("accent", theme.bold("pi-usage Settings")), 1, 1));
     let settingsList;
     const cancel = () => {
@@ -4268,7 +4312,16 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
     container.addChild(settingsList);
     parentSignal.addEventListener("abort", cancel, { once: true });
     return {
-      render: (width) => container.render(width),
+      render(width) {
+        const content = container.render(width);
+        const terminalRows = Number.isFinite(tui.terminal?.rows) ? Math.floor(tui.terminal.rows) : 24;
+        const availableRows = Math.max(1, terminalRows - 3);
+        if (content.length + 2 > availableRows) {
+          return fitSettingsRows(content, availableRows);
+        }
+        const [ruleLine = ""] = rule.render(width);
+        return [ruleLine, ...content, ruleLine];
+      },
       invalidate: () => container.invalidate(),
       handleInput(data) {
         if (closing) return;
@@ -4370,10 +4423,8 @@ function usageExtension(pi, dependencies = {}) {
       return;
     }
     if (outcome.state.status !== "ready") {
-      if (safeSetStatus(
-        ctx,
-        outcome.state.status === "auth-unavailable" ? "auth unavailable" : outcome.state.status === "selection-required" ? "selection required" : "usage error"
-      )) {
+      const chip = outcome.state.status === "auth-unavailable" ? "auth unavailable" : outcome.state.status === "selection-required" ? "selection required" : `usage err: ${outcome.state.message.slice(0, 50)}`;
+      if (safeSetStatus(ctx, chip)) {
         if (shouldSchedule && sessionActive) scheduleStatusRefresh(ctx, model);
       }
       return;
@@ -4737,7 +4788,9 @@ function usageExtension(pi, dependencies = {}) {
   const startStatusRefresh = (ctx, model, force) => {
     void refreshCurrentStatus(ctx, model, force).catch((error) => {
       if (isStaleExtensionContextError(error) || isAbortError3(error)) return;
-      safeSetStatus(ctx, "usage error");
+      const message = errorMessage(error);
+      console.error("[pi-usage] refresh failed:", message);
+      safeSetStatus(ctx, `usage err: ${message.slice(0, 50)}`);
     });
   };
   const runMenuOperation = async (ctx, label, parentSignal, operation, cancellable = true) => {