@narumitw/pi-usage 0.60.6 → 0.60.7

package/dist/index.ts

@@ -4296,33 +4296,15 @@ import { stripVTControlCharacters } from "node:util";
 import {
   getSettingsListTheme
 } from "@earendil-works/pi-coding-agent";
-import {
-  Container,
-  Key,
-  matchesKey,
-  SettingsList,
-  Text
-} from "@earendil-works/pi-tui";
+import { Key, matchesKey, SettingsList, Text } 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");
+  const { HorizontalRule, renderBoundedFrame } = 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();
@@ -4347,9 +4329,7 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
         values: [OFF, ON]
       }
     ];
-    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 = () => {
       if (closing) return;
@@ -4396,20 +4376,29 @@ async function showUsageSettings(ctx, settingsRuntime, parentSignal, isCurrent,
       },
       cancel
     );
-    container.addChild(settingsList);
     parentSignal.addEventListener("abort", cancel, { once: true });
     return {
       render(width) {
-        const content = container.render(width);
+        const title = new Text(theme.fg("accent", theme.bold("pi-usage Settings")), 1, 0).render(
+          width
+        );
+        const content = settingsList.render(width);
+        const focusedRow = content.findIndex(
+          (line) => /^[→›]\s/u.test(stripVTControlCharacters(line))
+        );
         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];
+        return renderBoundedFrame({
+          width,
+          maxRows: Math.max(1, terminalRows - 3),
+          rule: ruleLine,
+          title,
+          content,
+          priorityRows: focusedRow < 0 ? [] : [focusedRow],
+          focusedRow
+        });
       },
-      invalidate: () => container.invalidate(),
+      invalidate: () => settingsList.invalidate(),
       handleInput(data) {
         if (closing) return;
         if (matchesKey(data, Key.ctrl("c"))) cancel();