@narumitw/pi-btw 0.55.4 → 0.56.1

package/dist/index.ts

@@ -503,10 +503,13 @@ var FullscreenUiDisposedError = class extends Error {
     this.name = "FullscreenUiDisposedError";
   }
 };
-async function runBtwFullscreen(ctx, run, dependencies = {}) {
-  const createTui = dependencies.createTui ?? ((parent, theme) => createBtwFullscreenTui(
+async function runBtwFullscreen(ctx, run, options = {}, dependencies = {}) {
+  const createTui = dependencies.createTui ?? ((parent, theme, keybindings, fullscreenOptions) => createBtwFullscreenTui(
     parent,
     theme,
+    keybindings,
+    fullscreenOptions.copyOnSelect ?? true,
+    dependencies.manualSelectionCopySupported ?? hasManualSelectionCopyApi(),
     dependencies.openUrl ?? openUrlInBrowser,
     dependencies.copyToClipboard ?? copyToHostClipboard
   ));
@@ -529,7 +532,8 @@ async function runBtwFullscreen(ctx, run, dependencies = {}) {
           }
           done(value);
         },
-        createTui
+        createTui,
+        options
       );
       return host;
     },
@@ -550,7 +554,7 @@ async function runBtwFullscreen(ctx, run, dependencies = {}) {
 var btwInputListeners = /* @__PURE__ */ new WeakMap();
 function dispatchBtwInput(listeners, data) {
   let current = data;
-  for (const group of [listeners.beforeViewport, listeners.regular]) {
+  for (const group of [listeners.beforeAll, listeners.beforeViewport, listeners.regular]) {
     for (const listener of group) {
       const result = listener(current);
       if (result?.consume) return result;
@@ -560,10 +564,14 @@ function dispatchBtwInput(listeners, data) {
   return current === data ? void 0 : { data: current };
 }
 var BtwTuiAltScreen = class extends TuiAltScreen {
+  hasFocusedOverlay() {
+    return this.isOverlayFocused();
+  }
   addInputListener(listener) {
     let listeners = btwInputListeners.get(this);
     if (!listeners) {
       const registeredListeners = {
+        beforeAll: /* @__PURE__ */ new Set(),
         beforeViewport: /* @__PURE__ */ new Set(),
         regular: /* @__PURE__ */ new Set()
       };
@@ -574,6 +582,12 @@ var BtwTuiAltScreen = class extends TuiAltScreen {
     listeners.regular.add(listener);
     return () => listeners.regular.delete(listener);
   }
+  addInputListenerBeforeAll(listener) {
+    const listeners = btwInputListeners.get(this);
+    if (!listeners) return super.addInputListener(listener);
+    listeners.beforeAll.add(listener);
+    return () => listeners.beforeAll.delete(listener);
+  }
   addInputListenerBeforeViewport(listener) {
     const listeners = btwInputListeners.get(this);
     if (!listeners) return super.addInputListener(listener);
@@ -586,26 +600,64 @@ var BtwTuiAltScreen = class extends TuiAltScreen {
       super.removeInputListener(listener);
       return;
     }
+    listeners.beforeAll.delete(listener);
     listeners.beforeViewport.delete(listener);
     listeners.regular.delete(listener);
   }
 };
-function createBtwFullscreenTui(parent, theme, openUrl, copyToClipboard2) {
+var BRACKETED_PASTE_START = "\x1B[200~";
+var BRACKETED_PASTE_END = "\x1B[201~";
+function hasManualSelectionCopyApi() {
+  return typeof TuiAltScreen.prototype.hasActiveSelection === "function" && typeof TuiAltScreen.prototype.copyActiveSelectionToClipboard === "function";
+}
+function createBtwFullscreenTui(parent, theme, keybindings, copyOnSelect, manualSelectionCopySupported, openUrl, copyToClipboard2) {
+  if (!copyOnSelect && !manualSelectionCopySupported) {
+    throw new Error(
+      "Manual fullscreen selection copying is unavailable in this Pi version; update Pi or enable automatic selection copying."
+    );
+  }
   const styleSearchMatch = (text) => theme.bg("searchMatchBg", theme.fg("searchMatchText", text));
-  return new BtwTuiAltScreen(parent.terminal, parent.getShowHardwareCursor(), void 0, {
-    mouse: true,
-    searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
-    searchCurrentMatchStyle: (text) => theme.bold(theme.inverse(styleSearchMatch(text))),
-    openUrl,
-    copySelection: async (text) => {
-      try {
-        await copyToClipboard2(text);
-        return true;
-      } catch {
-        return false;
+  const fullscreen = new BtwTuiAltScreen(
+    parent.terminal,
+    parent.getShowHardwareCursor(),
+    void 0,
+    {
+      mouse: true,
+      copyOnSelect,
+      searchMatchStyle: (text) => theme.underline(styleSearchMatch(text)),
+      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) => {
+      const wasInBracketedPaste = isInBracketedPaste;
+      const startsBracketedPaste = data.includes(BRACKETED_PASTE_START);
+      if (startsBracketedPaste) isInBracketedPaste = true;
+      if (isInBracketedPaste && data.includes(BRACKETED_PASTE_END)) {
+        isInBracketedPaste = false;
+      }
+      if (wasInBracketedPaste || startsBracketedPaste || fullscreen.hasFocusedOverlay() || isKeyRelease(data) || !keybindings.matches(data, "app.message.copy")) {
+        return void 0;
+      }
+      if (!fullscreen.hasActiveSelection()) {
+        fullscreen.flash("No selection to copy");
+        return { consume: true };
+      }
+      void fullscreen.copyActiveSelectionToClipboard().catch(() => fullscreen.flash("Copy failed"));
+      return { consume: true };
+    });
+  }
+  return fullscreen;
 }
 function openUrlInBrowser(target) {
   const [command, args] = process.platform === "darwin" ? ["open", [target]] : process.platform === "win32" ? ["rundll32", ["url.dll,FileProtocolHandler", target]] : ["xdg-open", [target]];
@@ -613,7 +665,7 @@ function openUrlInBrowser(target) {
   }).unref();
 }
 var BtwFullscreenHost = class {
-  constructor(parent, theme, keybindings, ctx, run, done, createTui) {
+  constructor(parent, theme, keybindings, ctx, run, done, createTui, options) {
     this.parent = parent;
     this.theme = theme;
     this.keybindings = keybindings;
@@ -621,6 +673,7 @@ var BtwFullscreenHost = class {
     this.run = run;
     this.done = done;
     this.createTui = createTui;
+    this.options = options;
     queueMicrotask(() => void this.start());
   }
   parent;
@@ -630,6 +683,7 @@ var BtwFullscreenHost = class {
   run;
   done;
   createTui;
+  options;
   fullscreen;
   parentOverlay;
   cancelActiveCustom;
@@ -639,9 +693,10 @@ var BtwFullscreenHost = class {
   disposed = false;
   finished = false;
   parentStopped = false;
-  parentRestarted = false;
+  parentRestoreAttempted = false;
   fullscreenCreated = false;
   fullscreenStopped = false;
+  parentRestoreQueued = false;
   cleanupError;
   setParentOverlay(overlay) {
     this.parentOverlay = overlay;
@@ -665,16 +720,16 @@ var BtwFullscreenHost = class {
       this.parent.stop({ preserveScreen: true });
       this.parentStopped = true;
       if (this.disposed) throw new FullscreenUiDisposedError();
-      this.fullscreen = this.createTui(this.parent, this.theme);
+      this.fullscreen = this.createTui(this.parent, this.theme, this.keybindings, this.options);
       this.fullscreenCreated = true;
       this.fullscreen.start();
-      const addHardCancelListener = this.fullscreen.addInputListenerBeforeViewport?.bind(this.fullscreen) ?? this.fullscreen.addInputListener.bind(this.fullscreen);
+      const addHardCancelListener = this.fullscreen.addInputListenerBeforeAll?.bind(this.fullscreen) ?? this.fullscreen.addInputListenerBeforeViewport?.bind(this.fullscreen) ?? this.fullscreen.addInputListener.bind(this.fullscreen);
       this.removeHardCancelListener = addHardCancelListener((data) => {
         if (isKeyRelease(data) || !matchesKey2(data, Key2.ctrl("c"))) return void 0;
         try {
           this.hardCancelActiveCustom?.();
         } finally {
-          this.restoreParent();
+          this.queueParentRestore();
         }
         return { consume: true };
       });
@@ -692,9 +747,22 @@ var BtwFullscreenHost = class {
     this.finished = true;
     this.done(outcome);
   }
+  queueParentRestore() {
+    if (this.parentRestoreQueued || this.parentRestoreAttempted) return;
+    this.parentRestoreQueued = true;
+    queueMicrotask(() => {
+      this.parentRestoreQueued = false;
+      this.restoreParent();
+    });
+  }
   restoreParent() {
-    this.removeHardCancelListener?.();
+    const removeHardCancelListener = this.removeHardCancelListener;
     this.removeHardCancelListener = void 0;
+    try {
+      removeHardCancelListener?.();
+    } catch (error) {
+      this.cleanupError ??= error;
+    }
     if (this.fullscreenCreated && !this.fullscreenStopped) {
       this.fullscreenStopped = true;
       try {
@@ -703,7 +771,7 @@ var BtwFullscreenHost = class {
         this.cleanupError ??= error;
       }
     }
-    if (!this.parentStopped || this.parentRestarted) return;
+    if (!this.parentStopped || this.parentRestoreAttempted) return;
     const parentOverlay = this.parentOverlay;
     this.parentOverlay = void 0;
     try {
@@ -712,8 +780,8 @@ var BtwFullscreenHost = class {
       this.cleanupError ??= error;
     }
     try {
+      this.parentRestoreAttempted = true;
       this.parent.start();
-      this.parentRestarted = true;
       this.parent.renderNow(false);
     } catch (error) {
       this.cleanupError ??= error;
@@ -1020,6 +1088,7 @@ Use the provided conversation context only as background. Answer the user's side
 
 // src/settings.ts
 var BTW_SETTINGS_FILE = "pi-btw.json";
+var DEFAULT_FULLSCREEN_COPY_ON_SELECT = true;
 var DEFAULT_REMEMBER_THINKING_LEVEL_CHANGES = true;
 var MAX_SETTINGS_BYTES = 64 * 1024;
 var mutationQueues = /* @__PURE__ */ new Map();
@@ -1044,6 +1113,11 @@ function normalizeBtwSettings(value) {
     if (typeof remember !== "boolean") return void 0;
     settings.rememberThinkingLevelChanges = remember;
   }
+  if (Object.hasOwn(value, "fullscreenCopyOnSelect")) {
+    const copyOnSelect = Reflect.get(value, "fullscreenCopyOnSelect");
+    if (typeof copyOnSelect !== "boolean") return void 0;
+    settings.fullscreenCopyOnSelect = copyOnSelect;
+  }
   return settings;
 }
 function parseBtwModelReference(reference) {
@@ -1052,6 +1126,9 @@ function parseBtwModelReference(reference) {
   if (separator <= 0 || separator === reference.length - 1) return void 0;
   return { provider: reference.slice(0, separator), modelId: reference.slice(separator + 1) };
 }
+function effectiveFullscreenCopyOnSelect(settings) {
+  return settings.fullscreenCopyOnSelect ?? DEFAULT_FULLSCREEN_COPY_ON_SELECT;
+}
 function effectiveRememberThinkingLevelChanges(settings) {
   return settings.rememberThinkingLevelChanges ?? DEFAULT_REMEMBER_THINKING_LEVEL_CHANGES;
 }
@@ -1189,6 +1266,10 @@ function applyBtwSettingsPatch(current, patch) {
   if (Object.hasOwn(patch, "rememberThinkingLevelChanges")) {
     updated.rememberThinkingLevelChanges = patch.rememberThinkingLevelChanges;
   }
+  if (Object.hasOwn(patch, "fullscreenCopyOnSelect")) {
+    if (patch.fullscreenCopyOnSelect === void 0) delete updated.fullscreenCopyOnSelect;
+    else updated.fullscreenCopyOnSelect = patch.fullscreenCopyOnSelect;
+  }
   return updated;
 }
 function isSettingsDocument(value) {
@@ -1246,7 +1327,8 @@ async function showBtwCommandMenu(ctx, options) {
         kind: "actions",
         title: "Pi BTW",
         lines: [
-          `Thinking: ${displayThinkingSummary(state.settings)} \xB7 Remember changes: ${displayRememberSummary(state.settings)}`
+          `Thinking: ${displayThinkingSummary(state.settings)} \xB7 Remember changes: ${displayRememberSummary(state.settings)}`,
+          `Copy on select: ${effectiveFullscreenCopyOnSelect(state.settings) ? "On" : "Off"}`
         ],
         items: [
           {
@@ -1272,7 +1354,7 @@ async function showBtwCommandMenu(ctx, options) {
           {
             id: "settings",
             label: "Settings",
-            description: "Choose pi-btw thinking level and fixed-level shortcut memory",
+            description: "Choose thinking, shortcut memory, and selection copying",
             to: state.kind === "invalid" ? "invalid" : "settings"
           }
         ],
@@ -1311,6 +1393,14 @@ async function showBtwCommandMenu(ctx, options) {
             currentValue: effectiveRememberThinkingLevelChanges(state.settings) ? "On" : "Off",
             values: ["On", "Off"],
             action: "set-remember"
+          },
+          {
+            id: "fullscreenCopyOnSelect",
+            label: "Copy selection automatically",
+            description: "Copy mouse selections immediately instead of with the configured copy key.",
+            currentValue: effectiveFullscreenCopyOnSelect(state.settings) ? "On" : "Off",
+            values: ["On", "Off"],
+            action: "set-fullscreen-copy"
           }
         ]
       }),
@@ -1368,6 +1458,21 @@ async function showBtwCommandMenu(ctx, options) {
           if (!signal.aborted) notifySaveFailure(ctx, error);
           return { kind: "rejected" };
         }
+      },
+      "set-fullscreen-copy": async ({ value, signal }) => {
+        if (value !== "On" && value !== "Off") return { kind: "rejected" };
+        try {
+          await updateSettings(
+            { fullscreenCopyOnSelect: value === "On" },
+            { settingsPath, signal }
+          );
+          if (signal.aborted) return { kind: "rejected" };
+          notifySafely(ctx, `Copy selection automatically: ${value}.`, "info");
+          return { kind: "stay" };
+        } catch (error) {
+          if (!signal.aborted) notifySaveFailure(ctx, error);
+          return { kind: "rejected" };
+        }
       }
     }
   });
@@ -2475,29 +2580,33 @@ function btw(pi, dependencies = {}) {
       }
       const startingTurnCount = state?.thread.turns.length ?? 0;
       try {
-        await runFullscreen(ctx, (fullscreenCtx) => {
-          if (!state) {
-            const createdAt = Date.now();
-            state = {
-              id: `btw-${nextThreadNumber}`,
-              thread: createSideThread(
-                selectedConversationContext ?? buildConversationContext(fullscreenCtx.sessionManager.getBranch())
-              ),
-              thinkingLevel: settings.thinkingLevel ?? pi.getThinkingLevel(),
-              createdAt,
-              updatedAt: createdAt
-            };
-            nextThreadNumber += 1;
-          }
-          return runThread({
-            initialQuestion: question || void 0,
-            selected: resolution.selected,
-            thinkingLevel: state.thinkingLevel,
-            rememberThinkingLevelChanges: !sameAsMainThinkingLevel && effectiveRememberThinkingLevelChanges(settings),
-            state,
-            ctx: fullscreenCtx
-          });
-        });
+        await runFullscreen(
+          ctx,
+          (fullscreenCtx) => {
+            if (!state) {
+              const createdAt = Date.now();
+              state = {
+                id: `btw-${nextThreadNumber}`,
+                thread: createSideThread(
+                  selectedConversationContext ?? buildConversationContext(fullscreenCtx.sessionManager.getBranch())
+                ),
+                thinkingLevel: settings.thinkingLevel ?? pi.getThinkingLevel(),
+                createdAt,
+                updatedAt: createdAt
+              };
+              nextThreadNumber += 1;
+            }
+            return runThread({
+              initialQuestion: question || void 0,
+              selected: resolution.selected,
+              thinkingLevel: state.thinkingLevel,
+              rememberThinkingLevelChanges: !sameAsMainThinkingLevel && effectiveRememberThinkingLevelChanges(settings),
+              state,
+              ctx: fullscreenCtx
+            });
+          },
+          { copyOnSelect: effectiveFullscreenCopyOnSelect(settings) }
+        );
       } finally {
         if (state?.title && state.thread.turns.length > 0) {
           if (state.thread.turns.length > startingTurnCount) {