pi-btw 0.3.8 → 0.4.1

package/README.md

@@ -1,6 +1,6 @@
 # pi-btw
 
-A small [pi](https://github.com/badlogic/pi-mono) extension that adds a `/btw` side conversation channel.
+A small [pi](https://github.com/earendil-works/pi-mono) extension that adds a `/btw` side conversation channel.
 
 `/btw` opens a real pi sub-session with coding-tool access, and it runs immediately even while the main agent is still busy.
 

package/extensions/btw.ts

@@ -2,7 +2,6 @@ import {
   buildSessionContext,
   createAgentSession,
   createExtensionRuntime,
-  codingTools,
   SessionManager,
   type AgentSession,
   type AgentSessionEvent,
@@ -10,8 +9,8 @@ import {
   type ExtensionCommandContext,
   type ExtensionContext,
   type ResourceLoader,
-} from "@mariozechner/pi-coding-agent";
-import { type AssistantMessage, type Message, type ThinkingLevel as AiThinkingLevel, type UserMessage } from "@mariozechner/pi-ai";
+} from "@earendil-works/pi-coding-agent";
+import { type AssistantMessage, type Message, type ThinkingLevel as AiThinkingLevel, type UserMessage } from "@earendil-works/pi-ai";
 import {
   Box,
   Container,
@@ -26,7 +25,7 @@ import {
   type KeybindingsManager,
   type OverlayHandle,
   type TUI,
-} from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-tui";
 
 const BTW_MESSAGE_TYPE = "btw-note";
 const BTW_ENTRY_TYPE = "btw-thread-entry";
@@ -56,6 +55,11 @@ const BTW_CONTINUE_THREAD_ASSISTANT_TEXT = "Understood, continuing our side conv
 type SessionThinkingLevel = "off" | AiThinkingLevel;
 type BtwThreadMode = "contextual" | "tangent";
 type SessionModel = NonNullable<ExtensionCommandContext["model"]>;
+/**
+ * Loose model reference parsed from `/btw:model <provider> <id> <api>` and persisted to
+ * session entries. Resolved to a full SessionModel via ctx.modelRegistry.find(...).
+ */
+type BtwModelRef = Pick<SessionModel, "provider" | "id" | "api">;
 
 type BtwDetails = {
   question: string;
@@ -216,7 +220,7 @@ function parseBtwArgs(args: string): ParsedBtwArgs {
 function parseBtwModelArgs(args: string):
   | { action: "show" }
   | { action: "clear" }
-  | { action: "set"; model: SessionModel }
+  | { action: "set"; model: BtwModelRef }
   | { action: "invalid"; message: string } {
   const trimmed = args.trim();
   if (!trimmed) {
@@ -233,7 +237,7 @@ function parseBtwModelArgs(args: string):
   }
 
   const [provider, id, api] = parts;
-  return { action: "set", model: { provider, id, api } };
+  return { action: "set", model: { provider, id, api } as BtwModelRef };
 }
 
 function parseBtwThinkingArgs(args: string):
@@ -997,6 +1001,9 @@ function notify(ctx: ExtensionContext | ExtensionCommandContext, message: string
   }
 }
 
+/** Fixed overlay rows outside the transcript viewport (must match render() structure). */
+const BTW_OVERLAY_CHROME_LINES = 9;
+
 function getOverlayTitle(mode: BtwThreadMode): string {
   return mode === "tangent" ? "BTW tangent" : "BTW";
 }
@@ -1081,6 +1088,9 @@ class BtwOverlayComponent extends Container implements Focusable {
 
     this.hintsText = new Text("", 1, 0);
 
+    // Enable SGR mouse reporting so wheel/touchpad events reach handleInput().
+    this.tui.terminal?.write?.("\x1b[?1000h\x1b[?1006h");
+
     const originalHandleInput = this.input.handleInput.bind(this.input);
     this.input.handleInput = (data: string) => {
       if (keybindings.matches(data, "app.clear")) {
@@ -1107,17 +1117,17 @@ class BtwOverlayComponent extends Container implements Focusable {
   private frameLine(content: string, innerWidth: number): string {
     const truncated = truncateToWidth(content, innerWidth, "");
     const padding = Math.max(0, innerWidth - visibleWidth(truncated));
-    return `${this.theme.fg("borderMuted", "│")}${truncated}${" ".repeat(padding)}${this.theme.fg("borderMuted", "│")}`;
+    return `${this.theme.fg("border", "│")}${truncated}${" ".repeat(padding)}${this.theme.fg("border", "│")}`;
   }
 
   private ruleLine(innerWidth: number): string {
-    return this.theme.fg("borderMuted", `├${"─".repeat(innerWidth)}┤`);
+    return this.theme.fg("border", `├${"─".repeat(innerWidth)}┤`);
   }
 
   private borderLine(innerWidth: number, edge: "top" | "bottom"): string {
     const left = edge === "top" ? "┌" : "└";
     const right = edge === "top" ? "┐" : "┘";
-    return this.theme.fg("borderMuted", `${left}${"─".repeat(innerWidth)}${right}`);
+    return this.theme.fg("border", `${left}${"─".repeat(innerWidth)}${right}`);
   }
 
   private wrapTranscript(innerWidth: number): string[] {
@@ -1137,22 +1147,53 @@ class BtwOverlayComponent extends Container implements Focusable {
     return Math.max(18, Math.min(32, Math.floor(terminalRows * 0.78)));
   }
 
+  private scrollTranscript(delta: number): void {
+    if (delta < 0) {
+      this.followTranscript = false;
+    }
+    this.transcriptScrollOffset = Math.max(0, this.transcriptScrollOffset + delta);
+    this.tui.requestRender();
+  }
+
+  dispose(): void {
+    this.tui.terminal?.write?.("\x1b[?1000l\x1b[?1006l");
+  }
+
+  private getMouseScrollDelta(data: string): number | null {
+    const match = data.match(/^\x1b\[<(\d+);\d+;\d+[Mm]$/);
+    if (!match) {
+      return null;
+    }
+
+    const button = Number(match[1]);
+    if ((button & 64) !== 64) {
+      return null;
+    }
+
+    return (button & 1) === 0 ? -3 : 3;
+  }
+
   handleInput(data: string): void {
     if (matchesBtwFocusShortcut(data)) {
       this.onUnfocusCallback();
       return;
     }
 
-    if (matchesKey(data, Key.pageUp)) {
-      this.followTranscript = false;
-      this.transcriptScrollOffset = Math.max(0, this.transcriptScrollOffset - Math.max(1, this.transcriptViewportHeight - 1));
-      this.tui.requestRender();
+    const mouseScrollDelta = this.getMouseScrollDelta(data);
+    if (mouseScrollDelta !== null) {
+      this.scrollTranscript(mouseScrollDelta);
+      return;
+    }
+
+    if (matchesKey(data, Key.pageUp) || matchesKey(data, Key.up)) {
+      const step = matchesKey(data, Key.pageUp) ? Math.max(1, this.transcriptViewportHeight - 1) : 1;
+      this.scrollTranscript(-step);
       return;
     }
 
-    if (matchesKey(data, Key.pageDown)) {
-      this.transcriptScrollOffset += Math.max(1, this.transcriptViewportHeight - 1);
-      this.tui.requestRender();
+    if (matchesKey(data, Key.pageDown) || matchesKey(data, Key.down)) {
+      const step = matchesKey(data, Key.pageDown) ? Math.max(1, this.transcriptViewportHeight - 1) : 1;
+      this.scrollTranscript(step);
       return;
     }
 
@@ -1168,19 +1209,25 @@ class BtwOverlayComponent extends Container implements Focusable {
     // the row stays geometrically stable while the overlay still owns keyboard input.
     this.input.focused = false;
     try {
-      const inputLine = this.input.render(targetWidth)[0] ?? "";
-      return `${this.theme.fg("borderMuted", "│")}${inputLine}${this.theme.fg("borderMuted", "│")}`;
+      const renderedInputLine = this.input.render(targetWidth)[0] ?? "";
+      const inputLine = truncateToWidth(renderedInputLine, targetWidth, "");
+      const padding = Math.max(0, targetWidth - visibleWidth(inputLine));
+      return `${this.theme.fg("border", "│")}${inputLine}${" ".repeat(padding)}${this.theme.fg("border", "│")}`;
     } finally {
       this.input.focused = previousFocused;
     }
   }
 
+  private fitRenderedLine(line: string, width: number): string {
+    return visibleWidth(line) > width ? truncateToWidth(line, width, "") : line;
+  }
+
   override render(width: number): string[] {
     const dialogWidth = Math.max(24, width);
     const innerWidth = Math.max(22, dialogWidth - 2);
     const transcriptLines = this.wrapTranscript(innerWidth);
     const dialogHeight = this.getDialogHeight();
-    const chromeHeight = 8;
+    const chromeHeight = BTW_OVERLAY_CHROME_LINES;
     const transcriptHeight = Math.max(6, dialogHeight - chromeHeight);
     this.transcriptViewportHeight = transcriptHeight;
 
@@ -1225,7 +1272,7 @@ class BtwOverlayComponent extends Container implements Focusable {
     lines.push(this.frameLine(this.theme.fg("dim", this.hintsTextValue.trim()), innerWidth));
     lines.push(this.borderLine(innerWidth, "bottom"));
 
-    return lines;
+    return lines.map((line) => this.fitRenderedLine(line, width));
   }
 
   setDraft(value: string): void {
@@ -1259,7 +1306,7 @@ class BtwOverlayComponent extends Container implements Focusable {
     const status = this.getStatus() ?? "Ready. Enter submits; Escape dismisses without clearing.";
     this.statusTextValue = status;
     this.statusText.setText(this.statusTextValue);
-    this.hintsTextValue = "Enter submit · Alt+/ toggle focus · Escape dismiss · PgUp/PgDn scroll";
+    this.hintsTextValue = "Scroll wheel ↑↓ PgUp/PgDn · Enter · Alt+/ focus · Esc";
     this.hintsText.setText(this.hintsTextValue);
     this.tui.requestRender();
   }
@@ -1555,7 +1602,8 @@ export default function (pi: ExtensionAPI) {
       model: settings.model,
       modelRegistry: ctx.modelRegistry as AgentSession["modelRegistry"],
       thinkingLevel: settings.thinkingLevel,
-      tools: codingTools,
+      // Match pi's default coding-agent toolset (read/bash/edit/write).
+      tools: ["read", "bash", "edit", "write"],
       resourceLoader: createBtwResourceLoader(ctx),
     });
 
@@ -1650,6 +1698,7 @@ export default function (pi: ExtensionAPI) {
           };
           runtime.close = () => {
             overlayDraft = overlay.getDraft();
+            overlay.dispose();
             closeRuntime();
           };
 
@@ -1760,7 +1809,19 @@ export default function (pi: ExtensionAPI) {
         return true;
       }
 
-      await setBtwModelOverride(ctx, parsed.action === "clear" ? null : parsed.model);
+      if (parsed.action === "clear") {
+        await setBtwModelOverride(ctx, null);
+        return true;
+      }
+      const ref = parsed.model;
+      const resolved = ctx.modelRegistry.find(ref.provider, ref.id);
+      if (!resolved) {
+        const message = `Unknown model ${ref.provider}/${ref.id}. Use /login or /models to add it before setting it as the BTW override.`;
+        setOverlayStatus(message, ctx);
+        notify(ctx, message, "error");
+        return true;
+      }
+      await setBtwModelOverride(ctx, resolved);
       return true;
     }
 
@@ -1911,17 +1972,22 @@ export default function (pi: ExtensionAPI) {
 
     for (let i = 0; i < branch.length; i++) {
       if (isCustomEntry(branch[i], BTW_MODEL_OVERRIDE_TYPE)) {
-        const details = branch[i].data as BtwModelOverrideDetails | undefined;
-        btwModelOverride =
-          details?.action === "set"
-            ? { provider: details.provider, id: details.id, api: details.api }
-            : details?.action === "clear"
-              ? null
-              : btwModelOverride;
+        const details = (branch[i] as unknown as { data?: BtwModelOverrideDetails }).data;
+        if (details?.action === "set") {
+          const resolved = ctx.modelRegistry.find(details.provider, details.id);
+          if (resolved) {
+            btwModelOverride = resolved;
+          } else {
+            // Configured override is no longer in the registry; drop it on restore.
+            btwModelOverride = null;
+          }
+        } else if (details?.action === "clear") {
+          btwModelOverride = null;
+        }
       }
 
       if (isCustomEntry(branch[i], BTW_THINKING_OVERRIDE_TYPE)) {
-        const details = branch[i].data as BtwThinkingOverrideDetails | undefined;
+        const details = (branch[i] as unknown as { data?: BtwThinkingOverrideDetails }).data;
         btwThinkingOverride =
           details?.action === "set"
             ? details.thinkingLevel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-btw",
-  "version": "0.3.8",
+  "version": "0.4.1",
   "description": "A pi extension for parallel side conversations with /btw",
   "type": "module",
   "license": "MIT",
@@ -42,9 +42,9 @@
     "image": "https://raw.githubusercontent.com/dbachelder/pi-btw/main/docs/btw-overlay.png"
   },
   "peerDependencies": {
-    "@mariozechner/pi-ai": "^0.66.1",
-    "@mariozechner/pi-coding-agent": "^0.66.1",
-    "@mariozechner/pi-tui": "^0.66.1"
+    "@earendil-works/pi-ai": ">=0.74.0 <1",
+    "@earendil-works/pi-coding-agent": ">=0.74.0 <1",
+    "@earendil-works/pi-tui": ">=0.74.0 <1"
   },
   "devDependencies": {
     "typescript": "^6.0.2",