pi-sage 0.2.6 → 0.2.8

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

@@ -371,8 +371,14 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
   let draft = mergeSettings(loaded.settings);
   let scope: SettingsScope = loaded.source === "global" ? "global" : "project";
 
+  const persistDraft = (): void => {
+    const target = getSettingsPathForScope(ctx.cwd, scope);
+    saveSettings(target, draft);
+    ctx.ui.notify(`Saved Sage settings to ${target}`, "info");
+  };
+
   while (true) {
-    const action = await selectPaged(ctx, "Sage settings", [
+    const action = await selectScrollable(ctx, "Sage settings", [
       `Enabled: ${onOff(draft.enabled)}`,
       `Autonomous mode: ${onOff(draft.autonomousEnabled)}`,
       `Explicit requests bypass soft limits: ${onOff(draft.explicitRequestAlwaysAllowed)}`,
@@ -393,20 +399,11 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
       `Sensitive denylist: ${(draft.toolPolicy.sensitivePathDenylist ?? []).join(",")}`,
       `Cost cap/session: ${draft.maxEstimatedCostPerSession ?? "(none)"}`,
       `Save scope: ${scope}`,
-      "Test Sage call",
-      "Save and exit",
-      "Exit without saving"
+      "Test Sage call"
     ]);
 
-    if (!action || action === "Exit without saving") {
-      ctx.ui.notify("Sage settings unchanged", "info");
-      return;
-    }
-
-    if (action === "Save and exit") {
-      const target = getSettingsPathForScope(ctx.cwd, scope);
-      saveSettings(target, draft);
-      ctx.ui.notify(`Saved Sage settings to ${target}`, "info");
+    if (!action) {
+      ctx.ui.notify("Sage settings closed (changes are saved immediately)", "info");
       return;
     }
 
@@ -417,56 +414,88 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
 
     if (action.startsWith("Enabled:")) {
       draft = { ...draft, enabled: !draft.enabled };
+      persistDraft();
       continue;
     }
     if (action.startsWith("Autonomous mode:")) {
       draft = { ...draft, autonomousEnabled: !draft.autonomousEnabled };
+      persistDraft();
       continue;
     }
     if (action.startsWith("Explicit requests bypass soft limits:")) {
       draft = { ...draft, explicitRequestAlwaysAllowed: !draft.explicitRequestAlwaysAllowed };
+      persistDraft();
       continue;
     }
     if (action.startsWith("Model:")) {
       const selected = await pickModel(ctx, draft.model);
-      if (selected) draft = { ...draft, model: selected };
+      if (selected) {
+        draft = { ...draft, model: selected };
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Reasoning level:")) {
-      const selected = await ctx.ui.select("Reasoning level", [...REASONING_LEVELS]);
+      const selected = await selectScrollable(ctx, "Reasoning level", [...REASONING_LEVELS]);
       if (selected && REASONING_LEVELS.includes(selected as ReasoningLevel)) {
         draft = { ...draft, reasoningLevel: selected as ReasoningLevel };
+        persistDraft();
       }
       continue;
     }
     if (action.startsWith("Timeout ms:")) {
-      draft = await setNumberSetting(ctx, draft, "timeoutMs", "Timeout in milliseconds", 1000);
+      const updated = await setNumberSetting(ctx, draft, "timeoutMs", "Timeout in milliseconds", 1000);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Max calls/turn:")) {
-      draft = await setNumberSetting(ctx, draft, "maxCallsPerTurn", "Max Sage calls per turn", 1);
+      const updated = await setNumberSetting(ctx, draft, "maxCallsPerTurn", "Max Sage calls per turn", 1);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Max calls/session:")) {
-      draft = await setNumberSetting(ctx, draft, "maxCallsPerSession", "Max Sage calls per session", 1);
+      const updated = await setNumberSetting(ctx, draft, "maxCallsPerSession", "Max Sage calls per session", 1);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Cooldown turns:")) {
-      draft = await setNumberSetting(ctx, draft, "cooldownTurnsBetweenAutoCalls", "Cooldown turns", 0);
+      const updated = await setNumberSetting(ctx, draft, "cooldownTurnsBetweenAutoCalls", "Cooldown turns", 0);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Max question chars:")) {
-      draft = await setNumberSetting(ctx, draft, "maxQuestionChars", "Max question chars", 256);
+      const updated = await setNumberSetting(ctx, draft, "maxQuestionChars", "Max question chars", 256);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Max context chars:")) {
-      draft = await setNumberSetting(ctx, draft, "maxContextChars", "Max context chars", 512);
+      const updated = await setNumberSetting(ctx, draft, "maxContextChars", "Max context chars", 512);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Tool profile:")) {
-      const selected = await ctx.ui.select("Tool profile", [...TOOL_PROFILES]);
+      const selected = await selectScrollable(ctx, "Tool profile", [...TOOL_PROFILES]);
       if (selected && TOOL_PROFILES.includes(selected as ToolProfile)) {
         draft = { ...draft, toolPolicy: { ...draft.toolPolicy, profile: selected as ToolProfile } };
+        persistDraft();
       }
       continue;
     }
@@ -478,23 +507,40 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
           .map((item) => item.trim())
           .filter(Boolean);
         draft = { ...draft, toolPolicy: { ...draft.toolPolicy, customAllowedTools: tools } };
+        persistDraft();
       }
       continue;
     }
     if (action.startsWith("Max tool calls:")) {
-      draft = await setToolPolicyNumberSetting(ctx, draft, "maxToolCalls", "Max tool calls", 1);
+      const updated = await setToolPolicyNumberSetting(ctx, draft, "maxToolCalls", "Max tool calls", 1);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Max files read:")) {
-      draft = await setToolPolicyNumberSetting(ctx, draft, "maxFilesRead", "Max files read", 1);
+      const updated = await setToolPolicyNumberSetting(ctx, draft, "maxFilesRead", "Max files read", 1);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Max bytes/file:")) {
-      draft = await setToolPolicyNumberSetting(ctx, draft, "maxBytesPerFile", "Max bytes per file", 1024);
+      const updated = await setToolPolicyNumberSetting(ctx, draft, "maxBytesPerFile", "Max bytes per file", 1024);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Max total bytes:")) {
-      draft = await setToolPolicyNumberSetting(ctx, draft, "maxTotalBytesRead", "Max total bytes", 1024);
+      const updated = await setToolPolicyNumberSetting(ctx, draft, "maxTotalBytesRead", "Max total bytes", 1024);
+      if (updated !== draft) {
+        draft = updated;
+        persistDraft();
+      }
       continue;
     }
     if (action.startsWith("Sensitive denylist:")) {
@@ -508,6 +554,7 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
           .map((item) => item.trim())
           .filter(Boolean);
         draft = { ...draft, toolPolicy: { ...draft.toolPolicy, sensitivePathDenylist: denylist } };
+        persistDraft();
       }
       continue;
     }
@@ -519,10 +566,12 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
         const copy = { ...draft };
         delete copy.maxEstimatedCostPerSession;
         draft = copy;
+        persistDraft();
       } else {
         const parsed = Number(trimmed);
         if (Number.isFinite(parsed) && parsed >= 0) {
           draft = { ...draft, maxEstimatedCostPerSession: parsed };
+          persistDraft();
         } else {
           ctx.ui.notify("Invalid cost cap value", "warning");
         }
@@ -530,8 +579,11 @@ async function runSettingsWizard(ctx: ExtensionCommandContext): Promise<void> {
       continue;
     }
     if (action.startsWith("Save scope:")) {
-      const selected = await ctx.ui.select("Save scope", ["project", "global"]);
-      if (selected === "project" || selected === "global") scope = selected;
+      const selected = await selectScrollable(ctx, "Save scope", ["project", "global"]);
+      if (selected === "project" || selected === "global") {
+        scope = selected;
+        persistDraft();
+      }
       continue;
     }
   }
@@ -556,7 +608,7 @@ async function pickModel(ctx: ExtensionContext, currentModel: string): Promise<s
       })
     ];
 
-    const providerChoice = await selectPaged(ctx, "Choose Sage model provider", providerOptions);
+    const providerChoice = await selectScrollable(ctx, "Choose Sage model provider", providerOptions);
     if (!providerChoice) return undefined;
 
     if (providerChoice.startsWith(MODEL_INHERIT_VALUE)) {
@@ -587,8 +639,8 @@ async function pickModel(ctx: ExtensionContext, currentModel: string): Promise<s
       modelOptionMap.set(option, composite);
     }
 
-    const modelChoice = await selectPaged(ctx, `Choose Sage model (${provider})`, modelOptions);
-    if (!modelChoice) return undefined;
+    const modelChoice = await selectScrollable(ctx, `Choose Sage model (${provider})`, modelOptions);
+    if (!modelChoice) continue;
     if (modelChoice === "← Back to providers") continue;
 
     const resolved = modelOptionMap.get(modelChoice);
@@ -664,44 +716,86 @@ function resolveModelSpec(
 
 type HasUIContext = { ui: ExtensionContext["ui"] };
 
-async function selectPaged(
+async function selectScrollable(
   ctx: HasUIContext,
   title: string,
   options: string[],
-  pageSize = 10
+  maxVisible = 10
 ): Promise<string | undefined> {
-  if (options.length <= pageSize) {
-    return await ctx.ui.select(title, options);
-  }
+  if (options.length === 0) return undefined;
 
-  let page = 0;
-  const totalPages = Math.max(1, Math.ceil(options.length / pageSize));
-  const PREV = "← Previous page";
-  const NEXT = "→ Next page";
+  return await ctx.ui.custom<string | undefined>((tui, theme, _keybindings, done) => {
+    let selectedIndex = 0;
 
-  while (true) {
-    const start = page * pageSize;
-    const end = Math.min(start + pageSize, options.length);
-    const pageOptions = options.slice(start, end);
+    const move = (delta: number): void => {
+      const next = selectedIndex + delta;
+      selectedIndex = Math.max(0, Math.min(options.length - 1, next));
+      tui.requestRender();
+    };
 
-    if (page > 0) pageOptions.push(PREV);
-    if (page < totalPages - 1) pageOptions.push(NEXT);
+    const render = (width: number): string[] => {
+      const lines: string[] = [];
+      lines.push(theme.fg("accent", title));
+      lines.push("");
 
-    const selected = await ctx.ui.select(`${title} (${start + 1}-${end} of ${options.length})`, pageOptions);
-    if (!selected) return undefined;
+      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);
 
-    if (selected === PREV && page > 0) {
-      page -= 1;
-      continue;
-    }
+      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);
+      }
 
-    if (selected === NEXT && page < totalPages - 1) {
-      page += 1;
-      continue;
-    }
+      lines.push("");
+      lines.push(theme.fg("muted", `(${selectedIndex + 1}/${options.length})  ↑↓ navigate • enter select • esc back`));
 
-    return selected;
-  }
+      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 (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);
+      }
+    };
+
+    return {
+      render,
+      invalidate: () => {},
+      handleInput
+    };
+  });
 }
 
 function onOff(value: boolean): string {

package/package.json

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