@pi-unipi/btw 2.6.1 → 2.9.0

package/extensions/btw.ts

@@ -26,6 +26,7 @@ import {
   type ExtensionAPI,
   type ExtensionCommandContext,
   type ExtensionContext,
+  type ModelRuntime,
   type ResourceLoader,
 } from "@earendil-works/pi-coding-agent";
 import { type AssistantMessage, type Message, type ThinkingLevel as AiThinkingLevel, type UserMessage } from "@earendil-works/pi-ai";
@@ -161,6 +162,17 @@ function stripDynamicSystemPromptFooter(systemPrompt: string): string {
     .trim();
 }
 
+/**
+ * Extract the canonical ModelRuntime from the extension-facing ModelRegistry
+ * facade. The SDK (>=0.84) exposes `modelRuntime` on AgentSession and expects
+ * it in CreateAgentSessionOptions; the extension context only hands us the
+ * ModelRegistry wrapper, whose `runtime` field is the same instance the
+ * parent session uses (agent-session wires `new ModelRegistry(this._modelRuntime)`).
+ */
+function sessionModelRuntime(ctx: ExtensionCommandContext): ModelRuntime {
+  return (ctx.modelRegistry as unknown as { runtime: ModelRuntime }).runtime;
+}
+
 function createBtwResourceLoader(
   ctx: ExtensionCommandContext,
   appendSystemPrompt: string[] = [BTW_SYSTEM_PROMPT],
@@ -175,7 +187,9 @@ function createBtwResourceLoader(
     getThemes: () => ({ themes: [], diagnostics: [] }),
     getAgentsFiles: () => ({ agentsFiles: [] }),
     getSystemPrompt: () => systemPrompt,
+    getSystemPromptSource: () => undefined,
     getAppendSystemPrompt: () => appendSystemPrompt,
+    getAppendSystemPromptSources: () => [],
     extendResources: () => {},
     reload: async () => {},
   };
@@ -606,9 +620,8 @@ function applyAssistantMessageToTranscript(
   message: AssistantMessage,
   streaming: boolean,
 ): void {
-  const assistantMessage = message;
-  const thinking = extractThinking(assistantMessage);
-  const answer = extractMessageText(assistantMessage);
+  const thinking = extractThinking(message);
+  const answer = extractMessageText(message);
 
   if (thinking) {
     upsertTranscriptTextEntry(state, turnId, "thinking", thinking, streaming);
@@ -972,11 +985,6 @@ function getOverlayTitle(mode: BtwThreadMode): string {
 
 class BtwOverlayComponent extends Container implements Focusable {
   private readonly input: Input;
-  private readonly transcript: Container;
-  private readonly statusText: Text;
-  private readonly modeText: Text;
-  private readonly summaryText: Text;
-  private readonly hintsText: Text;
   private readonly readTranscriptEntries: () => BtwTranscript;
   private readonly getStatus: () => string | null;
   private readonly getMode: () => BtwThreadMode;
@@ -1025,11 +1033,6 @@ class BtwOverlayComponent extends Container implements Focusable {
     this.onDismissCallback = onDismiss;
     this.onUnfocusCallback = onUnfocus;
 
-    this.modeText = new Text("", 1, 0);
-    this.summaryText = new Text("", 1, 0);
-    this.transcript = new Container();
-    this.statusText = new Text("", 1, 0);
-
     this.input = new Input();
     this.input.onSubmit = (value) => {
       this.followTranscript = true;
@@ -1039,8 +1042,6 @@ class BtwOverlayComponent extends Container implements Focusable {
       this.onDismissCallback();
     };
 
-    this.hintsText = new Text("", 1, 0);
-
     const originalHandleInput = this.input.handleInput.bind(this.input);
     this.input.handleInput = (data: string) => {
       if (keybindings.matches(data, "tui.select.cancel")) {
@@ -1092,14 +1093,14 @@ class BtwOverlayComponent extends Container implements Focusable {
       return;
     }
 
-    if (matchesKey(data, Key.pageUp)) {
+    if (matchesKey(data, Key.pageUp) || matchesKey(data, Key.ctrl("pageUp")) || matchesKey(data, Key.alt("pageUp"))) {
       this.followTranscript = false;
       this.transcriptScrollOffset = Math.max(0, this.transcriptScrollOffset - Math.max(1, this.transcriptViewportHeight - 1));
       this.tui.requestRender();
       return;
     }
 
-    if (matchesKey(data, Key.pageDown)) {
+    if (matchesKey(data, Key.pageDown) || matchesKey(data, Key.ctrl("pageDown")) || matchesKey(data, Key.alt("pageDown"))) {
       this.transcriptScrollOffset += Math.max(1, this.transcriptViewportHeight - 1);
       this.tui.requestRender();
       return;
@@ -1182,30 +1183,18 @@ class BtwOverlayComponent extends Container implements Focusable {
     return this.input.getValue();
   }
 
-  getTranscriptEntries(): BtwTranscript {
-    return this.readTranscriptEntries().map((entry) => ({ ...entry }));
-  }
-
   refresh(): void {
     this.modeTextValue = `${getOverlayTitle(this.getMode())} · hidden thread preserved`;
-    this.modeText.setText(this.modeTextValue);
     const entries = this.readTranscriptEntries();
     const exchanges = getCompletedExchangeCount(entries);
     const active = hasStreamingTranscriptEntry(entries) ? " · streaming" : " · idle";
     this.summaryTextValue = `${exchanges} exchange${exchanges === 1 ? "" : "s"}${active}`;
-    this.summaryText.setText(this.summaryTextValue);
 
     this.transcriptLines = buildOverlayTranscript(entries, this.theme);
-    this.transcript.clear();
-    for (const line of this.transcriptLines) {
-      this.transcript.addChild(new Text(line, 1, 0));
-    }
 
     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.hintsText.setText(this.hintsTextValue);
+    this.hintsTextValue = "Enter submit · Alt+/ toggle focus · Escape dismiss · PgUp/Ctrl+PgUp scroll up · PgDn/Ctrl+PgDn scroll down";
     this.tui.requestRender();
   }
 }
@@ -1364,7 +1353,7 @@ export default function (pi: ExtensionAPI) {
     const { session } = await createAgentSession({
       sessionManager: SessionManager.inMemory(),
       model: ctx.model,
-      modelRegistry: ctx.modelRegistry as AgentSession["modelRegistry"],
+      modelRuntime: sessionModelRuntime(ctx),
       thinkingLevel: pi.getThinkingLevel() as SessionThinkingLevel,
       tools: ["read", "bash", "edit", "write"],
       resourceLoader: createBtwResourceLoader(ctx),
@@ -1498,7 +1487,7 @@ export default function (pi: ExtensionAPI) {
       });
   }
 
-  async function dispatchBtwCommand(name: string, args: string, ctx: ExtensionCommandContext): Promise<boolean> {
+  async function dispatchBtwCommand(name: string, args: string, ctx: ExtensionCommandContext): Promise<void> {
     const trimmedArgs = args.trim();
 
     if (name === "btw") {
@@ -1506,7 +1495,7 @@ export default function (pi: ExtensionAPI) {
       if (!question) {
         await ensureBtwSession(ctx, pendingMode);
         await ensureOverlay(ctx);
-        return true;
+        return;
       }
 
       if (pendingMode !== "contextual") {
@@ -1514,7 +1503,7 @@ export default function (pi: ExtensionAPI) {
       }
 
       await runBtw(ctx, question, save, "contextual");
-      return true;
+      return;
     }
 
     if (name === "btw:tangent") {
@@ -1526,11 +1515,11 @@ export default function (pi: ExtensionAPI) {
       if (!question) {
         await ensureBtwSession(ctx, "tangent");
         await ensureOverlay(ctx);
-        return true;
+        return;
       }
 
       await runBtw(ctx, question, save, "tangent");
-      return true;
+      return;
     }
 
     if (name === "btw:new") {
@@ -1544,20 +1533,20 @@ export default function (pi: ExtensionAPI) {
         await ensureOverlay(ctx);
         notify(ctx, "Started a fresh BTW thread.", "info");
       }
-      return true;
+      return;
     }
 
     if (name === "btw:clear") {
       await resetThread(ctx);
       dismissOverlay();
       notify(ctx, "Cleared BTW thread.", "info");
-      return true;
+      return;
     }
 
     if (name === "btw:inject") {
       if (pendingThread.length === 0) {
         notify(ctx, "No BTW thread to inject.", "warning");
-        return true;
+        return;
       }
 
       setOverlayStatus("⏳ injecting into the main session...", ctx);
@@ -1579,13 +1568,13 @@ export default function (pi: ExtensionAPI) {
         setOverlayStatus("Inject failed. Thread preserved for retry or summarize.", ctx);
         notify(ctx, error instanceof Error ? error.message : String(error), "error");
       }
-      return true;
+      return;
     }
 
     if (name === "btw:summarize") {
       if (pendingThread.length === 0) {
         notify(ctx, "No BTW thread to summarize.", "warning");
-        return true;
+        return;
       }
 
       setOverlayStatus("⏳ summarizing...", ctx);
@@ -1608,10 +1597,8 @@ export default function (pi: ExtensionAPI) {
         setOverlayStatus("Summarize failed. Thread preserved for retry or injection.", ctx);
         notify(ctx, error instanceof Error ? error.message : String(error), "error");
       }
-      return true;
+      return;
     }
-
-    return false;
   }
 
   function parseOverlayBtwCommand(value: string): { name: string; args: string } | null {
@@ -1817,7 +1804,7 @@ export default function (pi: ExtensionAPI) {
 
   async function getBtwHandoffThread(
     ctx: ExtensionCommandContext,
-  ): Promise<{ sessionRuntime: BtwSessionRuntime | null; thread: BtwHandoffExchange[] }> {
+  ): Promise<{ thread: BtwHandoffExchange[] }> {
     const sessionRuntime = activeBtwSession ?? (await ensureBtwSession(ctx, pendingMode));
     const thread = sessionRuntime ? extractBtwHandoffThread(sessionRuntime) : [];
     const resolvedThread = thread.length > 0 ? thread : getPendingThreadForHandoff();
@@ -1826,7 +1813,7 @@ export default function (pi: ExtensionAPI) {
       throw new Error("No BTW thread available for handoff.");
     }
 
-    return { sessionRuntime, thread: resolvedThread };
+    return { thread: resolvedThread };
   }
 
   async function summarizeThread(ctx: ExtensionCommandContext, thread: BtwHandoffExchange[]): Promise<string> {
@@ -1843,7 +1830,7 @@ export default function (pi: ExtensionAPI) {
     const { session } = await createAgentSession({
       sessionManager: SessionManager.inMemory(),
       model,
-      modelRegistry: ctx.modelRegistry as AgentSession["modelRegistry"],
+      modelRuntime: sessionModelRuntime(ctx),
       thinkingLevel: "off",
       tools: [],
       resourceLoader: createBtwResourceLoader(ctx, [BTW_SUMMARIZE_SYSTEM_PROMPT]),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pi-unipi/btw",
-  "version": "2.6.1",
-  "description": "A pi extension for parallel side conversations with /unipi:btw — part of the Unipi suite",
+  "version": "2.9.0",
+  "description": "A pi extension for parallel side conversations with /unipi:btw \u2014 part of the Unipi suite",
   "type": "module",
   "main": "extensions/btw.ts",
   "license": "MIT",
@@ -32,16 +32,20 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@earendil-works/pi-ai": "^0.80.0",
-    "@earendil-works/pi-coding-agent": "^0.80.0",
-    "@earendil-works/pi-tui": "^0.80.0"
+    "@earendil-works/pi-ai": "^0.84.0",
+    "@earendil-works/pi-coding-agent": "^0.84.0",
+    "@earendil-works/pi-tui": "^0.84.0"
   },
   "dependencies": {
-    "@pi-unipi/core": "2.6.1"
+    "@pi-unipi/core": "2.9.0"
   },
   "pi": {
-    "extensions": [],
-    "skills": [],
+    "extensions": [
+      "./extensions/btw.ts"
+    ],
+    "skills": [
+      "./skills"
+    ],
     "prompts": [],
     "themes": []
   }