pi-sage 0.2.8 → 0.2.10

package/.pi/extensions/sage/index.ts

@@ -1,4 +1,5 @@
-import type { ExtensionAPI, ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import { DynamicBorder, type ExtensionAPI, type ExtensionCommandContext, type ExtensionContext } from "@mariozechner/pi-coding-agent";
+import { Container, type SelectItem, SelectList, Text } from "@mariozechner/pi-tui";
 import { Type } from "@sinclair/typebox";
 import {
   evaluateSoftBudget,
@@ -377,8 +378,10 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
     ctx.ui.notify(`Saved Sage settings to ${target}`, "info");
   };
 
+  let rootSelectionIndex = 0;
+
   while (true) {
-    const action = await selectScrollable(ctx, "Sage settings", [
+    const rootOptions = [
       `Enabled: ${onOff(draft.enabled)}`,
       `Autonomous mode: ${onOff(draft.autonomousEnabled)}`,
       `Explicit requests bypass soft limits: ${onOff(draft.explicitRequestAlwaysAllowed)}`,
@@ -400,13 +403,18 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
       `Cost cap/session: ${draft.maxEstimatedCostPerSession ?? "(none)"}`,
       `Save scope: ${scope}`,
       "Test Sage call"
-    ]);
+    ];
+
+    const action = await selectScrollable(ctx, "Sage settings", rootOptions, 10, rootSelectionIndex);
 
     if (!action) {
       ctx.ui.notify("Sage settings closed (changes are saved immediately)", "info");
       return;
     }
 
+    const selectedIndex = rootOptions.indexOf(action);
+    if (selectedIndex >= 0) rootSelectionIndex = selectedIndex;
+
     if (action === "Test Sage call") {
       await runSettingsTestCall(ctx, draft);
       continue;
@@ -720,82 +728,58 @@ async function selectScrollable(
   ctx: HasUIContext,
   title: string,
   options: string[],
-  maxVisible = 10
+  maxVisible = 10,
+  initialSelectedIndex = 0
 ): Promise<string | undefined> {
   if (options.length === 0) return undefined;
 
-  return await ctx.ui.custom<string | undefined>((tui, theme, _keybindings, done) => {
-    let selectedIndex = 0;
+  const items: SelectItem[] = options.map((option, index) => ({
+    value: String(index),
+    label: option
+  }));
+
+  const selectedValue = await ctx.ui.custom<string | undefined>((tui, theme, _keybindings, done) => {
+    const container = new Container();
+    container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+    container.addChild(new Text(theme.fg("accent", title), 1, 0));
+    container.addChild(new Text("", 0, 0));
+
+    const selectList = new SelectList(items, Math.max(3, Math.min(maxVisible, items.length)), {
+      selectedPrefix: (text) => theme.fg("accent", text),
+      selectedText: (text) => theme.fg("accent", text),
+      description: (text) => theme.fg("muted", text),
+      scrollInfo: (text) => theme.fg("dim", text),
+      noMatch: (text) => theme.fg("warning", text)
+    });
 
-    const move = (delta: number): void => {
-      const next = selectedIndex + delta;
-      selectedIndex = Math.max(0, Math.min(options.length - 1, next));
-      tui.requestRender();
-    };
+    selectList.setSelectedIndex(initialSelectedIndex);
 
-    const render = (width: number): string[] => {
-      const lines: string[] = [];
-      lines.push(theme.fg("accent", title));
-      lines.push("");
+    selectList.onSelect = (item) => done(item.value);
+    selectList.onCancel = () => done(undefined);
+    container.addChild(selectList);
 
-      const visible = Math.max(3, Math.min(maxVisible, options.length));
-      const start = Math.max(0, Math.min(selectedIndex - Math.floor(visible / 2), options.length - visible));
-      const end = Math.min(options.length, start + visible);
+    container.addChild(new Text("", 0, 0));
+    container.addChild(new Text(theme.fg("dim", "↑↓ navigate • enter select • esc back"), 1, 0));
+    container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
 
-      for (let i = start; i < end; i += 1) {
-        const option = options[i] ?? "";
-        const prefix = i === selectedIndex ? "→ " : "  ";
-        const raw = `${prefix}${option}`;
-        lines.push(i === selectedIndex ? theme.fg("accent", raw) : raw);
+    return {
+      render: (width: number) => container.render(width),
+      invalidate: () => container.invalidate(),
+      handleInput: (data: string) => {
+        selectList.handleInput(data);
+        tui.requestRender();
       }
-
-      lines.push("");
-      lines.push(theme.fg("muted", `(${selectedIndex + 1}/${options.length})  ↑↓ navigate • enter select • esc back`));
-
-      return lines.map((line) => (line.length > width ? `${line.slice(0, Math.max(0, width - 1))}…` : line));
     };
+  });
 
-    const handleInput = (data: string): void => {
-      const isUp = data.includes("\u001b[A") || data.includes("\u001bOA");
-      const isDown = data.includes("\u001b[B") || data.includes("\u001bOB");
-      const isEnter = data.includes("\r") || data.includes("\n") || data.includes("\u001bOM");
-      const isEscLike = data.startsWith("\u001b");
+  if (selectedValue === undefined) return undefined;
 
-      if (isUp) {
-        move(-1);
-        return;
-      }
-      if (isDown) {
-        move(1);
-        return;
-      }
-      if (data === "k" || data === "K") {
-        move(-1);
-        return;
-      }
-      if (data === "j" || data === "J") {
-        move(1);
-        return;
-      }
-      if (isEnter) {
-        done(options[selectedIndex]);
-        return;
-      }
-      if (data.includes("\u0003")) {
-        done(undefined);
-        return;
-      }
-      if (isEscLike) {
-        done(undefined);
-      }
-    };
+  const selectedIndex = Number(selectedValue);
+  if (!Number.isInteger(selectedIndex) || selectedIndex < 0 || selectedIndex >= options.length) {
+    return undefined;
+  }
 
-    return {
-      render,
-      invalidate: () => {},
-      handleInput
-    };
-  });
+  return options[selectedIndex];
 }
 
 function onOff(value: boolean): string {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-sage",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "private": false,
   "type": "module",
   "description": "Interactive-only advisory Sage extension for Pi",