@narumitw/pi-btw 0.58.0 → 0.59.0

package/dist/index.ts

@@ -6,23 +6,14 @@ import {
   clampThinkingLevel,
   getSupportedThinkingLevels
 } from "@earendil-works/pi-ai";
-import {
-  BorderedLoader
-} from "@earendil-works/pi-coding-agent";
+import { BorderedLoader } from "@earendil-works/pi-coding-agent";
 
 // src/bring-to-main.ts
-import {
-  Key,
-  matchesKey,
-  truncateToWidth,
-  visibleWidth
-} from "@earendil-works/pi-tui";
+import { Key, matchesKey, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
 var RESERVED_APP_ROWS = 3;
 var GRAPHEME_SEGMENTER = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 function getAnsweredTurns(turns) {
-  return turns.filter(
-    (turn) => turn.kind === "answered"
-  );
+  return turns.filter((turn) => turn.kind === "answered");
 }
 function buildQuickBringToMainSegments(turns, scope) {
   const answered = getAnsweredTurns(turns);
@@ -82,9 +73,7 @@ function segmentsFromTextRange(lines, anchor, cursor) {
   return segments;
 }
 function estimateBringToMainTokens(segments) {
-  return Math.ceil(
-    Buffer.byteLength(segments.map((segment) => segment.text).join("\n"), "utf8") / 4
-  );
+  return Math.ceil(Buffer.byteLength(segments.map((segment) => segment.text).join("\n"), "utf8") / 4);
 }
 function summarizeBringToMain(segments) {
   return {
@@ -94,10 +83,8 @@ function summarizeBringToMain(segments) {
   };
 }
 function formatBtwBringToMain(segments) {
-  const body = segments.map(
-    (segment) => `${segment.role === "user" ? "User" : "Assistant"}:
-${escapeBringToMainText(segment.text)}`
-  ).join("\n\n");
+  const body = segments.map((segment) => `${segment.role === "user" ? "User" : "Assistant"}:
+${escapeBringToMainText(segment.text)}`).join("\n\n");
   return [
     "The following context was brought back from a /btw side discussion.",
     "Treat it as discussion context, not as work already completed.",
@@ -151,10 +138,7 @@ var BtwTextRangeSelector = class {
     const availableRows = Math.max(1, this.tui.terminal.rows - RESERVED_APP_ROWS);
     const showStatus = availableRows >= 4;
     const showFooter = availableRows >= 3;
-    const viewportHeight = Math.max(
-      1,
-      availableRows - 1 - (showStatus ? 1 : 0) - (showFooter ? 1 : 0)
-    );
+    const viewportHeight = Math.max(1, availableRows - 1 - (showStatus ? 1 : 0) - (showFooter ? 1 : 0));
     this.keepCursorVisible(viewportHeight);
     const textWidth = Math.max(1, safeWidth - visibleWidth("\u25CF> Assistant \u2502 "));
     this.keepCursorHorizontallyVisible(textWidth);
@@ -185,20 +169,10 @@ var BtwTextRangeSelector = class {
     const footer = visibleWidth(detailedFooter) <= safeWidth ? detailedFooter : criticalFooter;
     return fitRows(
       [
-        truncateToWidth(
-          this.theme.fg("accent", this.theme.bold("Select text to bring to main")),
-          safeWidth,
-          ""
-        ),
+        truncateToWidth(this.theme.fg("accent", this.theme.bold("Select text to bring to main")), safeWidth, ""),
         ...showStatus ? [truncateToWidth(this.theme.fg("muted", status), safeWidth, "")] : [],
         ...rows,
-        ...showFooter ? [
-          truncateToWidth(
-            this.theme.fg(this.warning ? "warning" : "muted", footer),
-            safeWidth,
-            ""
-          )
-        ] : []
+        ...showFooter ? [truncateToWidth(this.theme.fg(this.warning ? "warning" : "muted", footer), safeWidth, "")] : []
       ],
       availableRows
     );
@@ -383,9 +357,7 @@ var BtwTextRangeSelector = class {
   }
   keepCursorHorizontallyVisible(width) {
     const characters = splitGraphemes(this.lines[this.cursor.line]?.text ?? "");
-    const displayWidths = characters.map(
-      (character) => visibleWidth(escapeTerminalControls(character))
-    );
+    const displayWidths = characters.map((character) => visibleWidth(escapeTerminalControls(character)));
     const currentWidth = displayWidths[this.cursor.column] ?? 0;
     let usedWidth = 1 + Math.min(currentWidth, Math.max(0, width - 1));
     let offset = this.cursor.column;
@@ -460,10 +432,7 @@ function escapeBringToMainText(text) {
       return `\\x${code.toString(16).padStart(2, "0")}`;
     }
     return character;
-  }).join("").replace(/<btw_context(?=[ \t\r\n>])/g, "&lt;btw_context").replace(
-    /<\/btw_context[ \t\r\n]*>/g,
-    (terminator) => terminator.replaceAll("<", "&lt;").replaceAll(">", "&gt;")
-  );
+  }).join("").replace(/<btw_context(?=[ \t\r\n>])/g, "&lt;btw_context").replace(/<\/btw_context[ \t\r\n]*>/g, (terminator) => terminator.replaceAll("<", "&lt;").replaceAll(">", "&gt;"));
 }
 function escapeTerminalControls(text) {
   return [...text].map((character) => {
@@ -539,20 +508,7 @@ var SPECIAL = {
   up: 57419,
   down: 57420
 };
-var FUNCTION_INPUTS = [
-  "OP",
-  "OQ",
-  "OR",
-  "OS",
-  "[15~",
-  "[17~",
-  "[18~",
-  "[19~",
-  "[20~",
-  "[21~",
-  "[23~",
-  "[24~"
-];
+var FUNCTION_INPUTS = ["OP", "OQ", "OR", "OS", "[15~", "[17~", "[18~", "[19~", "[20~", "[21~", "[23~", "[24~"];
 var LEGACY_INPUTS = [
   ...Array.from({ length: 128 }, (_, code) => String.fromCharCode(code)),
   ...Array.from({ length: 128 }, (_, code) => `\x1B${String.fromCharCode(code)}`),
@@ -574,8 +530,7 @@ function normalizeBtwKey(value) {
     return void 0;
   if (!Object.hasOwn(SPECIAL, base) && base !== "clear" && !/^f(?:[1-9]|1[0-2])$/u.test(base) && !(base.length === 1 && (/^[a-z0-9]$/u.test(base) || SYMBOLS.includes(base))))
     return void 0;
-  if ((base === "escape" || base.startsWith("f") && base.length > 1) && parts.length)
-    return void 0;
+  if ((base === "escape" || base.startsWith("f") && base.length > 1) && parts.length) return void 0;
   if (base === "clear" && (parts.length > 1 || parts.length === 1 && !["ctrl", "shift"].includes(parts[0] ?? "")))
     return void 0;
   return [...MODIFIERS.filter((part) => parts.includes(part)), base].join("+");
@@ -583,10 +538,7 @@ function normalizeBtwKey(value) {
 function inputsFor(key) {
   const parts = key.split("+");
   const base = parts.pop() ?? "";
-  const modifier = MODIFIERS.reduce(
-    (mask, part, bit) => mask | (parts.includes(part) ? 1 << bit : 0),
-    0
-  );
+  const modifier = MODIFIERS.reduce((mask, part, bit) => mask | (parts.includes(part) ? 1 << bit : 0), 0);
   const code = SPECIAL[base] ?? (base.length === 1 ? base.charCodeAt(0) : void 0);
   const inputs = code === void 0 ? LEGACY_INPUTS : [...LEGACY_INPUTS, `\x1B[${code};${modifier + 1}u`];
   return inputs.filter((input) => matchesKey2(input, key));
@@ -613,9 +565,7 @@ function reservedKeys(keybindings, copyOnSelect) {
     "ctrl+j",
     "pageUp",
     "pageDown",
-    ...Object.keys(TUI_KEYBINDINGS).flatMap(
-      (id) => keybindings.getKeys(id)
-    ),
+    ...Object.keys(TUI_KEYBINDINGS).flatMap((id) => keybindings.getKeys(id)),
     ...!copyOnSelect ? keybindings.getKeys("app.message.copy") : []
   ];
 }
@@ -660,9 +610,7 @@ function resolveShortcutSnapshot(overrides = {}, keybindings, copyOnSelect = tru
     const inputs = inputsFor(key);
     if (!inputs.length) return void 0;
     if (action === "exit" && key === "ctrl+c") return key;
-    if (reserved.some(
-      (other) => typeof other === "string" && inputs.some((input) => matchesKey2(input, other))
-    ))
+    if (reserved.some((other) => typeof other === "string" && inputs.some((input) => matchesKey2(input, other))))
       return void 0;
     return key;
   };
@@ -710,8 +658,7 @@ function resolveShortcutSnapshot(overrides = {}, keybindings, copyOnSelect = tru
 }
 function validateBtwShortcutEdit(action, value, overrides, keybindings, copyOnSelect) {
   if (value === void 0) return void 0;
-  if (!normalizeBtwKey(value))
-    return "Invalid key combination. Use a Pi key name such as ctrl+q or f6.";
+  if (!normalizeBtwKey(value)) return "Invalid key combination. Use a Pi key name such as ctrl+q or f6.";
   const next = { ...overrides, [action]: value };
   const resolved = resolveBtwShortcuts(next, keybindings, copyOnSelect);
   const previous = resolveBtwShortcuts(overrides, keybindings, copyOnSelect);
@@ -949,45 +896,40 @@ function createBtwFullscreenTui(parent, theme, keybindings, copyOnSelect, manual
     );
   }
   const styleSearchMatch = (text) => theme.bg("searchMatchBg", theme.fg("searchMatchText", text));
-  const fullscreen = new BtwTuiAltScreen(
-    parent.terminal,
-    parent.getShowHardwareCursor(),
-    void 0,
-    {
-      mouse: true,
-      copyOnSelect,
-      searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
-      scrollToEndIndicator: () => {
-        const unavailableKeyIdentities = /* @__PURE__ */ new Set([keyInputIdentity(Key2.ctrl("c"))]);
-        for (const action of ALT_SCREEN_ACTIONS_BEFORE_BOTTOM) {
-          for (const actionKey of keybindings.getKeys(action)) {
-            unavailableKeyIdentities.add(keyInputIdentity(String(actionKey)));
-          }
+  const fullscreen = new BtwTuiAltScreen(parent.terminal, parent.getShowHardwareCursor(), void 0, {
+    mouse: true,
+    copyOnSelect,
+    searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
+    scrollToEndIndicator: () => {
+      const unavailableKeyIdentities = /* @__PURE__ */ new Set([keyInputIdentity(Key2.ctrl("c"))]);
+      for (const action of ALT_SCREEN_ACTIONS_BEFORE_BOTTOM) {
+        for (const actionKey of keybindings.getKeys(action)) {
+          unavailableKeyIdentities.add(keyInputIdentity(String(actionKey)));
         }
-        if (!copyOnSelect) {
-          for (const copyKey of keybindings.getKeys("app.message.copy")) {
-            unavailableKeyIdentities.add(keyInputIdentity(String(copyKey)));
-          }
-        }
-        const key = keybindings.getKeys("tui.altScreen.bottom").map((candidate) => keyInputIdentity(String(candidate))).find(
-          (identity) => identity && canMatchKeyInput(identity) && !unavailableKeyIdentities.has(identity) && formatEffectiveKeyLabel(identity)
-        );
-        const label = theme.fg("text", " \u2193 Jump to latest message");
-        const shortcut = key ? theme.fg("muted", ` \xB7 ${formatEffectiveKeyLabel(key)}`) : "";
-        return theme.bg("selectedBg", `${label}${shortcut} `);
-      },
-      searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
-      openUrl,
-      copySelection: async (text) => {
-        try {
-          await copyToClipboard2(text);
-          return true;
-        } catch {
-          return false;
+      }
+      if (!copyOnSelect) {
+        for (const copyKey of keybindings.getKeys("app.message.copy")) {
+          unavailableKeyIdentities.add(keyInputIdentity(String(copyKey)));
         }
       }
+      const key = keybindings.getKeys("tui.altScreen.bottom").map((candidate) => keyInputIdentity(String(candidate))).find(
+        (identity) => identity && canMatchKeyInput(identity) && !unavailableKeyIdentities.has(identity) && formatEffectiveKeyLabel(identity)
+      );
+      const label = theme.fg("text", " \u2193 Jump to latest message");
+      const shortcut = key ? theme.fg("muted", ` \xB7 ${formatEffectiveKeyLabel(key)}`) : "";
+      return theme.bg("selectedBg", `${label}${shortcut} `);
+    },
+    searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
+    openUrl,
+    copySelection: async (text) => {
+      try {
+        await copyToClipboard2(text);
+        return true;
+      } catch {
+        return false;
+      }
     }
-  );
+  });
   if (!copyOnSelect) {
     let isInBracketedPaste = false;
     fullscreen.addInputListenerBeforeViewport((data) => {
@@ -1040,6 +982,7 @@ var BtwFullscreenHost = class {
   cancelActiveCustom;
   hardCancelActiveCustom;
   removeHardCancelListener;
+  removeUpstreamAbortListener;
   started = false;
   disposed = false;
   finished = false;
@@ -1050,6 +993,7 @@ var BtwFullscreenHost = class {
   parentRestoreQueued = false;
   parentRestorePromise;
   cleanupError;
+  lifetimeController = new AbortController();
   setParentOverlay(overlay) {
     this.parentOverlay = overlay;
   }
@@ -1061,11 +1005,13 @@ var BtwFullscreenHost = class {
   dispose() {
     if (this.disposed || this.finished) return;
     this.disposed = true;
+    this.lifetimeController.abort();
     this.cancelActiveCustom?.();
   }
   async start() {
     if (this.started || this.finished) return;
     this.started = true;
+    this.watchUpstreamCancellation();
     let outcome;
     try {
       if (this.disposed) throw new FullscreenUiDisposedError();
@@ -1099,6 +1045,7 @@ var BtwFullscreenHost = class {
         reportWarnings();
         if (pasteGuard.consume(data) || !shortcuts.matches(data, "exit")) return void 0;
         this.disposed = true;
+        this.lifetimeController.abort();
         try {
           this.hardCancelActiveCustom?.();
         } finally {
@@ -1121,6 +1068,14 @@ var BtwFullscreenHost = class {
     this.finished = true;
     this.done(outcome);
   }
+  watchUpstreamCancellation() {
+    const signal = this.ctx.signal;
+    if (!signal) return;
+    const onAbort = () => this.dispose();
+    signal.addEventListener("abort", onAbort, { once: true });
+    this.removeUpstreamAbortListener = () => signal.removeEventListener("abort", onAbort);
+    if (signal.aborted) onAbort();
+  }
   queueParentRestore() {
     if (this.parentRestoreQueued || this.parentRestoreAttempted) return;
     this.parentRestoreQueued = true;
@@ -1135,6 +1090,13 @@ var BtwFullscreenHost = class {
     });
   }
   restoreParent() {
+    const removeUpstreamAbortListener = this.removeUpstreamAbortListener;
+    this.removeUpstreamAbortListener = void 0;
+    try {
+      removeUpstreamAbortListener?.();
+    } catch (error) {
+      this.cleanupError ??= error;
+    }
     const removeHardCancelListener = this.removeHardCancelListener;
     this.removeHardCancelListener = void 0;
     try {
@@ -1183,8 +1145,13 @@ var BtwFullscreenHost = class {
         return typeof value === "function" ? value.bind(target) : value;
       }
     });
+    const signal = this.ctx.signal ? AbortSignal.any([this.ctx.signal, this.lifetimeController.signal]) : this.lifetimeController.signal;
     return new Proxy(this.ctx, {
-      get: (target, property) => property === "ui" ? ui : Reflect.get(target, property, target)
+      get: (target, property) => {
+        if (property === "ui") return ui;
+        if (property === "signal") return signal;
+        return Reflect.get(target, property, target);
+      }
     });
   }
   showCustom(factory, options) {
@@ -1343,15 +1310,7 @@ import { basename, dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 
 // src/side-thread.ts
-var BTW_THINKING_LEVELS = [
-  "off",
-  "minimal",
-  "low",
-  "medium",
-  "high",
-  "xhigh",
-  "max"
-];
+var BTW_THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
 function createSideThread(conversationContext) {
   return { conversationContext, turns: [] };
 }
@@ -1365,10 +1324,7 @@ function buildSideThreadMessages(thread, question) {
     return messages;
   }
   const [first, ...rest] = answeredTurns;
-  messages.push(
-    createUserMessage(buildUserPrompt(first.question, thread.conversationContext)),
-    first.response
-  );
+  messages.push(createUserMessage(buildUserPrompt(first.question, thread.conversationContext)), first.response);
   for (const turn of rest) {
     messages.push(createUserMessage(buildFollowUpPrompt(turn.question)), turn.response);
   }
@@ -1434,13 +1390,7 @@ function buildUserPrompt(question, conversationContext) {
   ].join("\n");
 }
 function buildFollowUpPrompt(question) {
-  return [
-    "Continue the same side conversation.",
-    "",
-    "<side_question>",
-    question,
-    "</side_question>"
-  ].join("\n");
+  return ["Continue the same side conversation.", "", "<side_question>", question, "</side_question>"].join("\n");
 }
 function createUserMessage(text) {
   return {
@@ -1632,9 +1582,7 @@ async function readSettingsContents(settingsPath) {
       throw new Error(`settings file exceeds ${MAX_SETTINGS_BYTES} bytes`);
     }
     try {
-      return new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(
-        buffer.subarray(0, offset)
-      );
+      return new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(buffer.subarray(0, offset));
     } catch {
       throw new Error("settings file is not valid UTF-8");
     }
@@ -1652,10 +1600,7 @@ async function publishSettings(settingsPath, document, signal, beforeRename) {
   const directory = dirname(settingsPath);
   await mkdir(directory, { recursive: true });
   signal?.throwIfAborted();
-  const temporaryPath = join(
-    directory,
-    `.${basename(settingsPath)}.${process.pid}.${randomUUID()}.tmp`
-  );
+  const temporaryPath = join(directory, `.${basename(settingsPath)}.${process.pid}.${randomUUID()}.tmp`);
   try {
     await writeFile(temporaryPath, contents, {
       encoding: "utf8",
@@ -1736,11 +1681,7 @@ async function showBtwCommandMenu(ctx, options) {
   };
   const shortcutValue = (settings, action) => {
     if (!keybindings) return "Default";
-    const effective = resolveBtwShortcuts(
-      settings.keybindings,
-      keybindings,
-      effectiveFullscreenCopyOnSelect(settings)
-    );
+    const effective = resolveBtwShortcuts(settings.keybindings, keybindings, effectiveFullscreenCopyOnSelect(settings));
     const configured = settings.keybindings?.[action];
     if (configured !== void 0 && !effective.keys[action].includes(configured)) {
       return `Fallback (${effective.label(action)}; saved ${formatKeyLabel2(configured)})`;
@@ -1749,8 +1690,7 @@ async function showBtwCommandMenu(ctx, options) {
     return `${source} (${effective.label(action)})`;
   };
   const saveShortcut = async (state, value, signal) => {
-    if (!keybindings || state.kind !== "valid" || signal.aborted)
-      return { kind: "rejected" };
+    if (!keybindings || state.kind !== "valid" || signal.aborted) return { kind: "rejected" };
     const action = shortcut;
     const manager = keybindings;
     const validate = (settings) => validateBtwShortcutEdit(
@@ -1792,10 +1732,7 @@ async function showBtwCommandMenu(ctx, options) {
     }
     return { kind: "valid", settings: loaded.kind === "loaded" ? loaded.settings : {} };
   };
-  const currentMainThinkingLevel = clampToAvailableThinkingLevel(
-    options.currentThinkingLevel,
-    levels
-  );
+  const currentMainThinkingLevel = clampToAvailableThinkingLevel(options.currentThinkingLevel, levels);
   const displayThinkingLevel = (settings) => settings.thinkingLevel === void 0 ? SAME_AS_MAIN_THREAD : clampToAvailableThinkingLevel(settings.thinkingLevel, levels);
   const displayThinkingSummary = (settings) => settings.thinkingLevel === void 0 ? `${SAME_AS_MAIN_THREAD} (currently ${currentMainThinkingLevel})` : displayThinkingLevel(settings);
   const displayRememberSummary = (settings) => {
@@ -1923,8 +1860,7 @@ async function showBtwCommandMenu(ctx, options) {
     },
     actions: {
       "edit-shortcut": ({ itemId }) => {
-        if (!BTW_SHORTCUT_ACTIONS.includes(itemId))
-          return { kind: "rejected" };
+        if (!BTW_SHORTCUT_ACTIONS.includes(itemId)) return { kind: "rejected" };
         shortcut = itemId;
         return { kind: "to", screen: "shortcut" };
       },
@@ -1962,10 +1898,7 @@ async function showBtwCommandMenu(ctx, options) {
       "set-remember": async ({ value, signal }) => {
         if (value !== "On" && value !== "Off") return { kind: "rejected" };
         try {
-          await updateSettings(
-            { rememberThinkingLevelChanges: value === "On" },
-            { settingsPath, signal }
-          );
+          await updateSettings({ rememberThinkingLevelChanges: value === "On" }, { settingsPath, signal });
           if (signal.aborted) return { kind: "rejected" };
           notifySafely(ctx, `Remember thinking level changes: ${value}.`, "info");
           return { kind: "stay" };
@@ -1977,10 +1910,7 @@ async function showBtwCommandMenu(ctx, options) {
       "set-fullscreen-copy": async ({ value, signal }) => {
         if (value !== "On" && value !== "Off") return { kind: "rejected" };
         try {
-          await updateSettings(
-            { fullscreenCopyOnSelect: value === "On" },
-            { settingsPath, signal }
-          );
+          await updateSettings({ fullscreenCopyOnSelect: value === "On" }, { settingsPath, signal });
           if (signal.aborted) return { kind: "rejected" };
           notifySafely(ctx, `Copy selection automatically: ${value}.`, "info");
           return { kind: "stay" };
@@ -2145,80 +2075,77 @@ async function pickMainEntry(pi, ctx, dependencies = {}) {
       controller.abort(new Error("The main-thread tree picker closed"));
     }
   };
-  const result = await showBtwCustomPreservingEditor(
-    ctx,
-    (tui, _theme, _keybindings, done) => {
-      let settled = false;
-      let selector;
-      const finish = (value) => {
-        if (settled) return;
-        settled = true;
-        abortCopies();
-        done(value);
-      };
-      const onCopy = (entryId, displayText) => {
-        if (settled) return;
-        const text = entryId ? rawCopyText.get(entryId) : displayText;
-        if (!text) {
-          notifySafely2(ctx, "Selected entry has no text to copy", "warning");
-          return;
-        }
-        const controller = new AbortController();
-        copyControllers.add(controller);
-        let operation;
-        try {
-          operation = copy(text, controller.signal);
-        } catch (error) {
-          operation = Promise.reject(error);
+  const result = await showBtwCustomPreservingEditor(ctx, (tui, _theme, _keybindings, done) => {
+    let settled = false;
+    let selector;
+    const finish = (value) => {
+      if (settled) return;
+      settled = true;
+      abortCopies();
+      done(value);
+    };
+    const onCopy = (entryId, displayText) => {
+      if (settled) return;
+      const text = entryId ? rawCopyText.get(entryId) : displayText;
+      if (!text) {
+        notifySafely2(ctx, "Selected entry has no text to copy", "warning");
+        return;
+      }
+      const controller = new AbortController();
+      copyControllers.add(controller);
+      let operation;
+      try {
+        operation = copy(text, controller.signal);
+      } catch (error) {
+        operation = Promise.reject(error);
+      }
+      let task;
+      task = operation.then(() => {
+        if (!settled) notifySafely2(ctx, "Copied selected message", "info");
+      }).catch((error) => {
+        if (!settled && !controller.signal.aborted) {
+          notifySafely2(ctx, `Could not copy selected message: ${formatError4(error)}`, "error");
         }
-        let task;
-        task = operation.then(() => {
-          if (!settled) notifySafely2(ctx, "Copied selected message", "info");
-        }).catch((error) => {
-          if (!settled && !controller.signal.aborted) {
-            notifySafely2(ctx, `Could not copy selected message: ${formatError4(error)}`, "error");
-          }
-        }).finally(() => {
-          copyControllers.delete(controller);
-          copyTasks.delete(task);
-        });
-        copyTasks.add(task);
-      };
-      const restoreLabel = (entryId) => {
-        const previous = savedLabels.get(entryId);
-        selector?.setViewLabel?.(entryId, previous?.label, previous?.labelTimestamp);
-        tui.requestRender();
-      };
-      const onLabelChange = (entryId, label) => {
-        if (settled) return;
-        try {
-          if (!ctx.sessionManager.getEntry(entryId)) {
-            restoreLabel(entryId);
-            notifySafely2(ctx, "The selected main-thread entry is no longer available", "warning");
-            return;
-          }
-          const persistedLabel = label === void 0 ? void 0 : sanitizeSingleLine(label);
-          pi.setLabel(entryId, persistedLabel);
-          savedLabels.set(entryId, { label: persistedLabel });
-          selector?.setViewLabel?.(entryId, persistedLabel);
-          tui.requestRender();
-        } catch (error) {
+      }).finally(() => {
+        copyControllers.delete(controller);
+        copyTasks.delete(task);
+      });
+      copyTasks.add(task);
+    };
+    const restoreLabel = (entryId) => {
+      const previous = savedLabels.get(entryId);
+      selector?.setViewLabel?.(entryId, previous?.label, previous?.labelTimestamp);
+      tui.requestRender();
+    };
+    const onLabelChange = (entryId, label) => {
+      if (settled) return;
+      try {
+        if (!ctx.sessionManager.getEntry(entryId)) {
           restoreLabel(entryId);
-          notifySafely2(ctx, `Could not update tree label: ${formatError4(error)}`, "error");
+          notifySafely2(ctx, "The selected main-thread entry is no longer available", "warning");
+          return;
         }
-      };
-      selector = createSelector({
-        tree,
-        currentLeafId,
-        terminalRows: tui.terminal.rows,
-        onSelect: (entryId) => finish({ kind: "selected", entryId }),
-        onCancel: () => finish({ kind: "back" }),
-        onCopy,
-        onLabelChange
-      });
-      return new MainThreadTreePickerComponent(selector, () => finish({ kind: "closed" }));
-    }
-  );
+        const persistedLabel = label === void 0 ? void 0 : sanitizeSingleLine(label);
+        pi.setLabel(entryId, persistedLabel);
+        savedLabels.set(entryId, { label: persistedLabel });
+        selector?.setViewLabel?.(entryId, persistedLabel);
+        tui.requestRender();
+      } catch (error) {
+        restoreLabel(entryId);
+        notifySafely2(ctx, `Could not update tree label: ${formatError4(error)}`, "error");
+      }
+    };
+    selector = createSelector({
+      tree,
+      currentLeafId,
+      terminalRows: tui.terminal.rows,
+      onSelect: (entryId) => finish({ kind: "selected", entryId }),
+      onCancel: () => finish({ kind: "back" }),
+      onCopy,
+      onLabelChange
+    });
+    return new MainThreadTreePickerComponent(selector, () => finish({ kind: "closed" }));
+  });
   abortCopies();
   await Promise.allSettled([...copyTasks]);
   return result ?? { kind: "closed" };
@@ -2254,8 +2181,7 @@ function sanitizeEntryForDisplay(entry) {
   switch (entry.type) {
     case "message": {
       const message = { ...entry.message };
-      if ("content" in entry.message)
-        message.content = sanitizeDisplayContent(entry.message.content);
+      if ("content" in entry.message) message.content = sanitizeDisplayContent(entry.message.content);
       for (const key of ["role", "errorMessage", "command", "toolName"]) {
         const value = message[key];
         if (typeof value === "string") message[key] = sanitizeSingleLine(value);
@@ -2389,6 +2315,49 @@ function formatError4(error) {
   return error instanceof Error ? error.message : String(error);
 }
 
+// src/transcript-markdown.ts
+var MERMAID_MARKDOWN_MODULE = "@narumitw/pi-tui-kit/markdown";
+var noMarkdownTransformers = () => [];
+async function prepareBtwTranscriptMarkdown(turns, pendingQuestion, signal) {
+  const documents = turns.flatMap(
+    (turn) => turn.kind === "answered" ? [turn.question, turn.answer] : [turn.question]
+  );
+  if (pendingQuestion) documents.push(pendingQuestion);
+  if (!documents.some((document) => /mermaid/iu.test(document))) return noMarkdownTransformers;
+  if (signal?.aborted) return void 0;
+  const markdownModule = await settleUnlessAborted(
+    import(MERMAID_MARKDOWN_MODULE),
+    signal
+  );
+  if (!markdownModule || signal?.aborted) return void 0;
+  const { createMermaidMarkdownTransformer, prepareMermaidMarkdownRenderer } = markdownModule;
+  const preparations = /* @__PURE__ */ new Set();
+  for (const document of documents) {
+    const preparation = prepareMermaidMarkdownRenderer(document);
+    if (preparation) preparations.add(preparation);
+  }
+  if (preparations.size > 0 && !await settleUnlessAborted(Promise.all(preparations), signal)) return void 0;
+  if (signal?.aborted) return void 0;
+  return (theme) => {
+    const transformer = createMermaidMarkdownTransformer(theme);
+    return transformer ? [transformer] : [];
+  };
+}
+async function settleUnlessAborted(operation, signal) {
+  if (!signal) return operation;
+  let onAbort;
+  const aborted = new Promise((resolve) => {
+    onAbort = () => resolve(void 0);
+    signal.addEventListener("abort", onAbort, { once: true });
+    if (signal.aborted) onAbort();
+  });
+  try {
+    return await Promise.race([operation, aborted]);
+  } finally {
+    if (onAbort) signal.removeEventListener("abort", onAbort);
+  }
+}
+
 // src/transcript-pager.ts
 import {
   AssistantMessageComponent,
@@ -2427,7 +2396,7 @@ var BtwTranscriptPager = class {
     this.onAction = onAction;
     this.options = options;
     this.shortcuts = getBtwShortcuts(tui, options.thinking?.keybindings);
-    this.transcriptComponents = buildTranscriptComponents(turns, this.theme);
+    this.transcriptComponents = buildTranscriptComponents(turns, this.theme, void 0, options.markdownTransformers);
     this.canBringToMain = turns.some((turn) => turn.kind === "answered");
     this.thinkingLevel = options.thinking?.level;
     const editorTheme = {
@@ -2497,17 +2466,10 @@ var BtwTranscriptPager = class {
     const safeWidth = Math.max(1, width);
     const editorLines = this.editor.render(safeWidth);
     const availableRows = Math.max(1, this.tui.terminal.rows - RESERVED_APP_LINES);
-    const viewportHeight = Math.max(
-      0,
-      availableRows - editorLines.length - TRANSCRIPT_CHROME_LINES
-    );
+    const viewportHeight = Math.max(0, availableRows - editorLines.length - TRANSCRIPT_CHROME_LINES);
     const contentLines = renderTranscriptLines(this.transcriptComponents, safeWidth);
     this.lastContentLineCount = contentLines.length;
-    this.scrollView.updateLayout(
-      contentLines.length,
-      viewportHeight,
-      () => this.tui.requestRender()
-    );
+    this.scrollView.updateLayout(contentLines.length, viewportHeight, () => this.tui.requestRender());
     return fitComposerLayout(
       renderSideThreadHeader(safeWidth, this.theme, this.thinkingLevel),
       contentLines.slice(this.scrollView.scrollTop, this.scrollView.scrollTop + viewportHeight),
@@ -2638,7 +2600,12 @@ var BtwAnsweringView = class {
     this.onCancel = onCancel;
     this.options = options;
     this.shortcuts = getBtwShortcuts(tui, options.steering?.thinking?.keybindings);
-    this.transcriptComponents = buildTranscriptComponents(turns, this.theme, pendingQuestion);
+    this.transcriptComponents = buildTranscriptComponents(
+      turns,
+      this.theme,
+      pendingQuestion,
+      options.markdownTransformers
+    );
     this.thinkingLevel = options.steering?.thinking?.level ?? thinkingLevel;
     this.loader = new Loader(
       this.tui,
@@ -2722,10 +2689,7 @@ var BtwAnsweringView = class {
     const safeWidth = Math.max(1, width);
     const availableRows = Math.max(1, this.tui.terminal.rows - RESERVED_APP_LINES);
     const editorLines = this.editor?.render(safeWidth) ?? [];
-    const steeringCapacity = Math.max(
-      0,
-      availableRows - editorLines.length - TRANSCRIPT_CHROME_LINES
-    );
+    const steeringCapacity = Math.max(0, availableRows - editorLines.length - TRANSCRIPT_CHROME_LINES);
     const steeringLines = renderSteeringLines(
       this.options.steering?.questions ?? [],
       safeWidth,
@@ -2738,11 +2702,7 @@ var BtwAnsweringView = class {
     );
     const contentLines = renderTranscriptLines(this.transcriptComponents, safeWidth);
     this.lastContentLineCount = contentLines.length;
-    this.scrollView.updateLayout(
-      contentLines.length,
-      viewportHeight,
-      () => this.tui.requestRender()
-    );
+    this.scrollView.updateLayout(contentLines.length, viewportHeight, () => this.tui.requestRender());
     return fitComposerLayout(
       renderSideThreadHeader(safeWidth, this.theme, this.thinkingLevel),
       contentLines.slice(this.scrollView.scrollTop, this.scrollView.scrollTop + viewportHeight),
@@ -2847,12 +2807,7 @@ var BtwAnsweringView = class {
   }
   createSteeringComponent() {
     return {
-      render: (width) => renderSteeringLines(
-        this.options.steering?.questions ?? [],
-        width,
-        this.theme,
-        MAX_STEERING_DISPLAY_LINES
-      ),
+      render: (width) => renderSteeringLines(this.options.steering?.questions ?? [], width, this.theme, MAX_STEERING_DISPLAY_LINES),
       invalidate() {
       }
     };
@@ -2867,21 +2822,18 @@ var BtwAnsweringView = class {
     return Math.max(0, this.lastContentLineCount - this.scrollView.viewportHeight);
   }
 };
-function buildTranscriptComponents(turns, theme, pendingQuestion) {
+function buildTranscriptComponents(turns, theme, pendingQuestion, markdownTransformers = []) {
   const components = turns.flatMap((turn) => {
     const question = new UserMessageComponent(
       escapeTerminalControls2(turn.question),
       getMarkdownTheme(),
-      1
+      1,
+      markdownTransformers
     );
     if (turn.kind === "error") {
-      const error = new Markdown(
-        `Error: ${escapeTerminalControls2(turn.answer)}`,
-        1,
-        1,
-        getMarkdownTheme(),
-        { color: (text) => theme.fg("error", text) }
-      );
+      const error = new Markdown(`Error: ${escapeTerminalControls2(turn.answer)}`, 1, 1, getMarkdownTheme(), {
+        color: (text) => theme.fg("error", text)
+      });
       return [question, error];
     }
     const response = {
@@ -2890,11 +2842,11 @@ function buildTranscriptComponents(turns, theme, pendingQuestion) {
       stopReason: "stop",
       errorMessage: void 0
     };
-    return [question, new AssistantMessageComponent(response, true, getMarkdownTheme(), "", 1)];
+    return [question, new AssistantMessageComponent(response, true, getMarkdownTheme(), "", 1, markdownTransformers)];
   });
   if (pendingQuestion) {
     components.push(
-      new UserMessageComponent(escapeTerminalControls2(pendingQuestion), getMarkdownTheme(), 1)
+      new UserMessageComponent(escapeTerminalControls2(pendingQuestion), getMarkdownTheme(), 1, markdownTransformers)
     );
   }
   return components;
@@ -2929,26 +2881,16 @@ function renderSteeringLines(questions, width, theme, maxLines) {
   if (maxLines === 1 && questions.length > 1) {
     return [
       truncateToWidth3(
-        theme.fg(
-          "dim",
-          `Steering (+${questions.length - 1} more): ${formatQuestion(questions[0] ?? "")}`
-        ),
+        theme.fg("dim", `Steering (+${questions.length - 1} more): ${formatQuestion(questions[0] ?? "")}`),
         width
       )
     ];
   }
   const hasOverflow = questions.length > maxLines;
   const questionLimit = hasOverflow ? Math.max(1, maxLines - 1) : maxLines;
-  const lines = questions.slice(0, questionLimit).map(
-    (question) => truncateToWidth3(theme.fg("dim", `Steering: ${formatQuestion(question)}`), width)
-  );
+  const lines = questions.slice(0, questionLimit).map((question) => truncateToWidth3(theme.fg("dim", `Steering: ${formatQuestion(question)}`), width));
   if (hasOverflow) {
-    lines.push(
-      truncateToWidth3(
-        theme.fg("dim", `Steering: \u2026 +${questions.length - questionLimit} more`),
-        width
-      )
-    );
+    lines.push(truncateToWidth3(theme.fg("dim", `Steering: \u2026 +${questions.length - questionLimit} more`), width));
   }
   return lines;
 }
@@ -2998,15 +2940,16 @@ async function resolveBtwModel({
       const fallbackAction = sameAsCurrent ? "no distinct current model is available" : `falling back to ${fallback}`;
       try {
         const auth = await modelRegistry.getApiKeyAndHeaders(configuredModel);
-        if (auth.ok && hasRequestAuth(auth)) return { model: configuredModel, auth };
+        if (auth.ok && hasRequestAuth(auth)) {
+          return {
+            model: auth.baseUrl ? { ...configuredModel, baseUrl: auth.baseUrl } : configuredModel,
+            auth
+          };
+        }
         const reason = auth.ok ? "has no request credentials" : auth.error;
-        reportWarning(
-          `pi-btw model ${settings.model} is unavailable (${reason}); ${fallbackAction}.`
-        );
+        reportWarning(`pi-btw model ${settings.model} is unavailable (${reason}); ${fallbackAction}.`);
       } catch (error) {
-        reportWarning(
-          `pi-btw model ${settings.model} credentials failed (${formatError5(error)}); ${fallbackAction}.`
-        );
+        reportWarning(`pi-btw model ${settings.model} credentials failed (${formatError5(error)}); ${fallbackAction}.`);
       }
       if (sameAsCurrent) return void 0;
     }
@@ -3014,7 +2957,12 @@ async function resolveBtwModel({
   if (!currentModel) return void 0;
   try {
     const auth = await modelRegistry.getApiKeyAndHeaders(currentModel);
-    if (auth.ok && hasRequestAuth(auth)) return { model: currentModel, auth };
+    if (auth.ok && hasRequestAuth(auth)) {
+      return {
+        model: auth.baseUrl ? { ...currentModel, baseUrl: auth.baseUrl } : currentModel,
+        auth
+      };
+    }
   } catch {
   }
   return void 0;
@@ -3051,9 +2999,7 @@ function btw(pi, dependencies = {}) {
   const runFullscreen = dependencies.runFullscreen ?? runBtwFullscreen;
   const resumableThreads = /* @__PURE__ */ new Map();
   let nextThreadNumber = 1;
-  const listResumeThreads = () => [...resumableThreads.values()].reverse().filter((state) => state.thread.turns.length > 0 && state.title).sort(
-    (first, second) => second.updatedAt - first.updatedAt || second.createdAt - first.createdAt
-  ).map((state) => ({
+  const listResumeThreads = () => [...resumableThreads.values()].reverse().filter((state) => state.thread.turns.length > 0 && state.title).sort((first, second) => second.updatedAt - first.updatedAt || second.createdAt - first.createdAt).map((state) => ({
     id: state.id,
     title: state.title ?? "Untitled side thread",
     questionCount: state.thread.turns.length
@@ -3083,11 +3029,7 @@ function btw(pi, dependencies = {}) {
             }
             const branch = ctx.sessionManager.getBranch(treeResult.entryId);
             if (branch.at(-1)?.id !== treeResult.entryId) {
-              notifySafely3(
-                ctx,
-                "The selected main-thread branch is no longer available",
-                "warning"
-              );
+              notifySafely3(ctx, "The selected main-thread branch is no longer available", "warning");
               continue;
             }
             selectedConversationContext = buildConversationContext(branch);
@@ -3164,9 +3106,7 @@ async function showCommandMenuForBtw(pi, ctx, resumeThreads) {
   const loaded = await readBtwSettings();
   const settings = loaded.kind === "loaded" ? loaded.settings : {};
   const configured = settings.model ? parseBtwModelReference(settings.model) : void 0;
-  const configuredModel = configured ? availableModels.find(
-    (model2) => model2.provider === configured.provider && model2.id === configured.modelId
-  ) : void 0;
+  const configuredModel = configured ? availableModels.find((model2) => model2.provider === configured.provider && model2.id === configured.modelId) : void 0;
   const model = configuredModel ?? currentModel;
   return showBtwCommandMenu(ctx, {
     currentThinkingLevel,
@@ -3230,10 +3170,7 @@ async function runBtwThread({
   const thinkingLevels = getSupportedThinkingLevels(selected.model);
   const pendingWrites = /* @__PURE__ */ new Set();
   const steeringQuestions = [];
-  let activeThinkingLevel = clampThinkingLevel(
-    selected.model,
-    state?.thinkingLevel ?? thinkingLevel
-  );
+  let activeThinkingLevel = clampThinkingLevel(selected.model, state?.thinkingLevel ?? thinkingLevel);
   if (state) state.thinkingLevel = activeThinkingLevel;
   let pendingQuestion = initialQuestion;
   let composerDraft;
@@ -3259,13 +3196,7 @@ async function runBtwThread({
   try {
     while (true) {
       if (!pendingQuestion) {
-        const action = await interact(
-          thread,
-          thread.turns.length > 0,
-          ctx,
-          composerDraft,
-          createThinkingControl()
-        );
+        const action = await interact(thread, thread.turns.length > 0, ctx, composerDraft, createThinkingControl());
         if (action.kind === "close") return { kind: "closed" };
         if (action.kind === "bringToMain") {
           const choice = await chooseBringToMainAction(thread, ctx);
@@ -3351,20 +3282,13 @@ async function chooseBringToMain(thread, ctx, dependencies = {}) {
       );
       let selectedQuestion;
       while (true) {
-        const questionResult = await showMenu(
-          ctx,
-          "Start from which question?",
-          questions,
-          selectedQuestion
-        );
+        const questionResult = await showMenu(ctx, "Start from which question?", questions, selectedQuestion);
         if (questionResult.kind === "close") return { kind: "closed" };
         if (questionResult.kind === "back") break;
         const answeredTurnIndex = questions.indexOf(questionResult.value);
         if (answeredTurnIndex < 0) continue;
         selectedQuestion = questionResult.value;
-        const choice = makeChoice(
-          buildQuickBringToMainSegments(thread.turns, { kind: "from", answeredTurnIndex })
-        );
+        const choice = makeChoice(buildQuickBringToMainSegments(thread.turns, { kind: "from", answeredTurnIndex }));
         const preview = await showPreview(ctx, choice.draft, choice.summary);
         if (preview.kind === "close") return { kind: "closed" };
         if (preview.kind === "back") continue;
@@ -3487,10 +3411,7 @@ async function loadBringToMainDraft(draft, ctx, summary) {
   const existing = ctx.ui.getEditorText();
   if (!existing.trim()) {
     ctx.ui.setEditorText(draft);
-    ctx.ui.notify(
-      `Brought ${describeContent()} to the main editor. Review and submit when ready.`,
-      "info"
-    );
+    ctx.ui.notify(`Brought ${describeContent()} to the main editor. Review and submit when ready.`, "info");
     return "loaded";
   }
   const appendOption = "Append after current draft  Recommended";
@@ -3517,11 +3438,10 @@ ${draft}`);
     if (action.value !== replaceOption) continue;
     const current = ctx.ui.getEditorText();
     const characters = [...current].length;
-    const confirmed = await showBtwMenu(
-      ctx,
-      `Replace the current ${characters}-character editor draft?`,
-      ["Back  Keep current editor text", "\u26A0 Replace current draft  Cannot be undone"]
-    );
+    const confirmed = await showBtwMenu(ctx, `Replace the current ${characters}-character editor draft?`, [
+      "Back  Keep current editor text",
+      "\u26A0 Replace current draft  Cannot be undone"
+    ]);
     if (confirmed.kind === "close") return "closed";
     if (confirmed.kind === "back" || confirmed.value === "Back  Keep current editor text") continue;
     if (confirmed.value !== "\u26A0 Replace current draft  Cannot be undone") continue;
@@ -3533,63 +3453,72 @@ ${draft}`);
       continue;
     }
     ctx.ui.setEditorText(draft);
-    ctx.ui.notify(
-      `Replaced the main-editor draft with ${describeContent()}. Review and submit when ready.`,
-      "info"
-    );
+    ctx.ui.notify(`Replaced the main-editor draft with ${describeContent()}. Review and submit when ready.`, "info");
     return "loaded";
   }
 }
 function truncatePreview(text) {
   return text.length <= 72 ? text : `${text.slice(0, 69)}\u2026`;
 }
+async function prepareCurrentTranscriptMarkdown(thread, pendingQuestion, ctx) {
+  while (true) {
+    const turnCount = thread.turns.length;
+    const createMarkdownTransformers = ctx.signal ? await prepareBtwTranscriptMarkdown(thread.turns, pendingQuestion, ctx.signal) : await prepareBtwTranscriptMarkdown(thread.turns, pendingQuestion);
+    if (!createMarkdownTransformers || ctx.signal?.aborted) return void 0;
+    if (thread.turns.length === turnCount) return createMarkdownTransformers;
+  }
+}
 async function askThreadQuestion(thread, question, selected, thinkingLevel, ctx, steering) {
-  return ctx.ui.custom(
-    (tui, theme, keybindings, done) => {
-      let settled = false;
-      const view = new BtwAnsweringView(
-        tui,
-        theme,
-        thread.turns,
-        question,
-        () => {
-          if (settled) return;
-          settled = true;
-          done({ kind: "aborted" });
-        },
-        thinkingLevel,
-        {
-          steering: {
-            questions: steering.questions,
-            onSubmit: steering.submit,
-            thinking: { ...steering.thinking, keybindings }
-          }
-        }
-      );
-      completeSideThreadTurn({
-        thread,
-        question,
-        model: selected.model,
-        thinkingLevel,
-        auth: selected.auth,
-        signal: view.signal,
-        completeSimple: createModelRegistryCompleteSimple(ctx.modelRegistry),
-        sessionId: readBtwSessionId(ctx)
-      }).then((result) => {
+  const createMarkdownTransformers = await prepareCurrentTranscriptMarkdown(thread, question, ctx);
+  if (!createMarkdownTransformers) return { kind: "aborted" };
+  return ctx.ui.custom((tui, theme, keybindings, done) => {
+    let settled = false;
+    const view = new BtwAnsweringView(
+      tui,
+      theme,
+      thread.turns,
+      question,
+      () => {
         if (settled) return;
         settled = true;
-        view.finish();
-        done(result);
-      });
-      return view;
-    }
-  );
+        done({ kind: "aborted" });
+      },
+      thinkingLevel,
+      {
+        markdownTransformers: createMarkdownTransformers(theme),
+        steering: {
+          questions: steering.questions,
+          onSubmit: steering.submit,
+          thinking: { ...steering.thinking, keybindings }
+        }
+      }
+    );
+    completeSideThreadTurn({
+      thread,
+      question,
+      model: selected.model,
+      thinkingLevel,
+      auth: selected.auth,
+      signal: view.signal,
+      completeSimple: createModelRegistryCompleteSimple(ctx.modelRegistry),
+      sessionId: readBtwSessionId(ctx)
+    }).then((result) => {
+      if (settled) return;
+      settled = true;
+      view.finish();
+      done(result);
+    });
+    return view;
+  });
 }
 async function showThreadComposer(thread, startAtBottom, ctx, initialQuestion, thinking) {
+  const createMarkdownTransformers = await prepareCurrentTranscriptMarkdown(thread, initialQuestion, ctx);
+  if (!createMarkdownTransformers) return { kind: "close" };
   return ctx.ui.custom(
     (tui, theme, keybindings, done) => new BtwTranscriptPager(tui, theme, thread.turns, done, {
       startAtBottom,
       initialQuestion,
+      markdownTransformers: createMarkdownTransformers(theme),
       thinking: { ...thinking, keybindings }
     })
   );