pi-sage 0.2.9 → 0.2.11

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

@@ -378,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)}`,
@@ -401,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;
@@ -721,7 +728,8 @@ async function selectScrollable(
   ctx: HasUIContext,
   title: string,
   options: string[],
-  maxVisible = 10
+  maxVisible = 10,
+  initialSelectedIndex = 0
 ): Promise<string | undefined> {
   if (options.length === 0) return undefined;
 
@@ -744,6 +752,8 @@ async function selectScrollable(
       noMatch: (text) => theme.fg("warning", text)
     });
 
+    selectList.setSelectedIndex(initialSelectedIndex);
+
     selectList.onSelect = (item) => done(item.value);
     selectList.onCancel = () => done(undefined);
     container.addChild(selectList);
@@ -838,19 +848,89 @@ async function runSettingsTestCall(ctx: ExtensionContext, settings: SageSettings
     return;
   }
 
-  try {
-    const result = await runSageSingleShot({
-      cwd: ctx.cwd,
-      model: resolvedModel,
-      reasoningLevel: settings.reasoningLevel,
-      timeoutMs: Math.min(settings.timeoutMs, 45_000),
-      question: "Reply with 'Sage test OK' and one short sentence.",
-      toolPolicy: settings.toolPolicy
-    });
+  type TestOutcome = { status: "ok" | "error" | "cancelled"; message: string };
+
+  const outcome = await ctx.ui.custom<TestOutcome | undefined>((tui, theme, _keybindings, done) => {
+    const controller = new AbortController();
+    const container = new Container();
+
+    container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+    container.addChild(new Text(theme.fg("accent", "Sage test call"), 1, 0));
+    container.addChild(new Text(theme.fg("dim", `Model: ${resolvedModel}`), 1, 0));
+    container.addChild(new Text("", 0, 0));
+
+    const spinnerFrames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
+    let spinnerIndex = 0;
+    const statusLine = new Text(theme.fg("muted", `${spinnerFrames[spinnerIndex]} Running test...`), 1, 0);
+    container.addChild(statusLine);
 
-    ctx.ui.notify(`Sage test succeeded (${result.latencyMs}ms)`, "info");
-  } catch (error) {
-    const message = error instanceof Error ? error.message : "Unknown test failure";
-    ctx.ui.notify(`Sage test failed: ${message}`, "error");
+    container.addChild(new Text("", 0, 0));
+    container.addChild(new Text(theme.fg("dim", "Esc to cancel"), 1, 0));
+    container.addChild(new DynamicBorder((s: string) => theme.fg("accent", s)));
+
+    let finished = false;
+    const finish = (result: TestOutcome): void => {
+      if (finished) return;
+      finished = true;
+      clearInterval(spinnerTimer);
+      done(result);
+    };
+
+    const spinnerTimer = setInterval(() => {
+      if (finished) return;
+      spinnerIndex = (spinnerIndex + 1) % spinnerFrames.length;
+      statusLine.setText(theme.fg("muted", `${spinnerFrames[spinnerIndex]} Running test...`));
+      tui.requestRender();
+    }, 120);
+
+    void (async () => {
+      try {
+        const result = await runSageSingleShot({
+          cwd: ctx.cwd,
+          model: resolvedModel,
+          reasoningLevel: settings.reasoningLevel,
+          timeoutMs: Math.min(settings.timeoutMs, 45_000),
+          question: "Reply with 'Sage test OK' and one short sentence.",
+          toolPolicy: settings.toolPolicy,
+          signal: controller.signal
+        });
+
+        finish({ status: "ok", message: `Sage test succeeded (${result.latencyMs}ms)` });
+      } catch (error) {
+        if (controller.signal.aborted) {
+          finish({ status: "cancelled", message: "Sage test cancelled" });
+          return;
+        }
+
+        const message = error instanceof Error ? error.message : "Unknown test failure";
+        finish({ status: "error", message: `Sage test failed: ${message}` });
+      }
+    })();
+
+    return {
+      render: (width: number) => container.render(width),
+      invalidate: () => container.invalidate(),
+      handleInput: (data: string) => {
+        if (data === "\u001b") {
+          controller.abort();
+          finish({ status: "cancelled", message: "Sage test cancelled" });
+          return;
+        }
+      }
+    };
+  });
+
+  if (!outcome) return;
+
+  if (outcome.status === "ok") {
+    ctx.ui.notify(outcome.message, "info");
+    return;
   }
+
+  if (outcome.status === "cancelled") {
+    ctx.ui.notify(outcome.message, "warning");
+    return;
+  }
+
+  ctx.ui.notify(outcome.message, "error");
 }

package/package.json

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