@narumitw/pi-btw 0.55.2 → 0.55.3

package/dist/index.ts

@@ -481,6 +481,9 @@ import {
   copyToClipboard as copyToHostClipboard
 } from "@earendil-works/pi-coding-agent";
 import {
+  isKeyRelease,
+  Key as Key2,
+  matchesKey as matchesKey2,
   TuiAltScreen,
   truncateToWidth as truncateToWidth2
 } from "@earendil-works/pi-tui";
@@ -509,23 +512,31 @@ async function runBtwFullscreen(ctx, run, dependencies = {}) {
   ));
   let liveEditorText = ctx.ui.getEditorText();
   let restoreEditor = false;
+  let host;
   const outcome = await ctx.ui.custom(
-    (parent, theme, keybindings, done) => new BtwFullscreenHost(
-      parent,
-      theme,
-      keybindings,
-      ctx,
-      run,
-      (value) => {
-        try {
-          liveEditorText = ctx.ui.getEditorText();
-          restoreEditor = true;
-        } catch {
-        }
-        done(value);
-      },
-      createTui
-    )
+    (parent, theme, keybindings, done) => {
+      host = new BtwFullscreenHost(
+        parent,
+        theme,
+        keybindings,
+        ctx,
+        run,
+        (value) => {
+          try {
+            liveEditorText = ctx.ui.getEditorText();
+            restoreEditor = true;
+          } catch {
+          }
+          done(value);
+        },
+        createTui
+      );
+      return host;
+    },
+    {
+      overlay: true,
+      onHandle: (handle) => host?.setParentOverlay(handle)
+    }
   );
   if (restoreEditor) {
     try {
@@ -536,9 +547,52 @@ async function runBtwFullscreen(ctx, run, dependencies = {}) {
   if (outcome.kind === "failed") throw outcome.error;
   return outcome.value;
 }
+var btwInputListeners = /* @__PURE__ */ new WeakMap();
+function dispatchBtwInput(listeners, data) {
+  let current = data;
+  for (const group of [listeners.beforeViewport, listeners.regular]) {
+    for (const listener of group) {
+      const result = listener(current);
+      if (result?.consume) return result;
+      if (result?.data !== void 0) current = result.data;
+    }
+  }
+  return current === data ? void 0 : { data: current };
+}
+var BtwTuiAltScreen = class extends TuiAltScreen {
+  addInputListener(listener) {
+    let listeners = btwInputListeners.get(this);
+    if (!listeners) {
+      const registeredListeners = {
+        beforeViewport: /* @__PURE__ */ new Set(),
+        regular: /* @__PURE__ */ new Set()
+      };
+      btwInputListeners.set(this, registeredListeners);
+      super.addInputListener((data) => dispatchBtwInput(registeredListeners, data));
+      listeners = registeredListeners;
+    }
+    listeners.regular.add(listener);
+    return () => listeners.regular.delete(listener);
+  }
+  addInputListenerBeforeViewport(listener) {
+    const listeners = btwInputListeners.get(this);
+    if (!listeners) return super.addInputListener(listener);
+    listeners.beforeViewport.add(listener);
+    return () => listeners.beforeViewport.delete(listener);
+  }
+  removeInputListener(listener) {
+    const listeners = btwInputListeners.get(this);
+    if (!listeners) {
+      super.removeInputListener(listener);
+      return;
+    }
+    listeners.beforeViewport.delete(listener);
+    listeners.regular.delete(listener);
+  }
+};
 function createBtwFullscreenTui(parent, theme, openUrl, copyToClipboard2) {
   const styleSearchMatch = (text) => theme.bg("searchMatchBg", theme.fg("searchMatchText", text));
-  return new TuiAltScreen(parent.terminal, parent.getShowHardwareCursor(), void 0, {
+  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))),
@@ -577,10 +631,21 @@ var BtwFullscreenHost = class {
   done;
   createTui;
   fullscreen;
+  parentOverlay;
   cancelActiveCustom;
+  hardCancelActiveCustom;
+  removeHardCancelListener;
   started = false;
   disposed = false;
   finished = false;
+  parentStopped = false;
+  parentRestarted = false;
+  fullscreenCreated = false;
+  fullscreenStopped = false;
+  cleanupError;
+  setParentOverlay(overlay) {
+    this.parentOverlay = overlay;
+  }
   render(width) {
     return [truncateToWidth2(this.theme.fg("muted", "Opening btw side thread\u2026"), width)];
   }
@@ -595,44 +660,64 @@ var BtwFullscreenHost = class {
     if (this.started || this.finished) return;
     this.started = true;
     let outcome;
-    let parentStopped = false;
-    let fullscreenCreated = false;
     try {
       if (this.disposed) throw new FullscreenUiDisposedError();
       this.parent.stop({ preserveScreen: true });
-      parentStopped = true;
+      this.parentStopped = true;
       if (this.disposed) throw new FullscreenUiDisposedError();
       this.fullscreen = this.createTui(this.parent, this.theme);
-      fullscreenCreated = true;
+      this.fullscreenCreated = true;
       this.fullscreen.start();
+      const addHardCancelListener = 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();
+        }
+        return { consume: true };
+      });
       outcome = { kind: "completed", value: await this.run(this.createContext()) };
     } catch (error) {
       outcome = { kind: "failed", error };
     }
-    let cleanupError;
     try {
       this.cancelActiveCustom?.();
     } catch (error) {
-      cleanupError = error;
+      this.cleanupError ??= error;
     }
-    if (fullscreenCreated) {
+    this.restoreParent();
+    if (this.cleanupError !== void 0) outcome = { kind: "failed", error: this.cleanupError };
+    this.finished = true;
+    this.done(outcome);
+  }
+  restoreParent() {
+    this.removeHardCancelListener?.();
+    this.removeHardCancelListener = void 0;
+    if (this.fullscreenCreated && !this.fullscreenStopped) {
+      this.fullscreenStopped = true;
       try {
         this.fullscreen?.stop({ preserveScreen: true });
       } catch (error) {
-        cleanupError ??= error;
+        this.cleanupError ??= error;
       }
     }
-    if (parentStopped) {
-      try {
-        this.parent.start();
-        this.parent.renderNow(false);
-      } catch (error) {
-        cleanupError ??= error;
-      }
+    if (!this.parentStopped || this.parentRestarted) return;
+    const parentOverlay = this.parentOverlay;
+    this.parentOverlay = void 0;
+    try {
+      parentOverlay?.setHidden(true);
+    } catch (error) {
+      this.cleanupError ??= error;
+    }
+    try {
+      this.parent.start();
+      this.parentRestarted = true;
+      this.parent.renderNow(false);
+    } catch (error) {
+      this.cleanupError ??= error;
     }
-    if (cleanupError !== void 0) outcome = { kind: "failed", error: cleanupError };
-    this.finished = true;
-    this.done(outcome);
   }
   createContext() {
     const ui = new Proxy(this.ctx.ui, {
@@ -706,6 +791,7 @@ var BtwFullscreenHost = class {
         if (promiseSettled || !hasPendingValue) return;
         promiseSettled = true;
         this.cancelActiveCustom = void 0;
+        this.hardCancelActiveCustom = void 0;
         if (!factorySettled) {
           resolve(pendingValue);
           return;
@@ -729,6 +815,7 @@ var BtwFullscreenHost = class {
         closed = true;
         promiseSettled = true;
         this.cancelActiveCustom = void 0;
+        this.hardCancelActiveCustom = void 0;
         try {
           unmount();
           reject(error);
@@ -741,6 +828,16 @@ var BtwFullscreenHost = class {
         disposeComponent();
         if (!promiseSettled) fail(new FullscreenUiDisposedError());
       };
+      this.hardCancelActiveCustom = () => {
+        if (promiseSettled) return;
+        try {
+          component?.handleInput?.("");
+        } catch (error) {
+          fail(error);
+          return;
+        }
+        this.cancelActiveCustom?.();
+      };
       let created;
       try {
         created = factory(fullscreen, this.theme, this.keybindings, close);
@@ -789,7 +886,7 @@ import {
   copyToClipboard,
   TreeSelectorComponent
 } from "@earendil-works/pi-coding-agent";
-import { Key as Key2, matchesKey as matchesKey2 } from "@earendil-works/pi-tui";
+import { Key as Key3, matchesKey as matchesKey3 } from "@earendil-works/pi-tui";
 
 // src/settings.ts
 import { randomUUID } from "node:crypto";
@@ -1386,7 +1483,7 @@ var MainThreadTreePickerComponent = class {
     return this.selector.render(width);
   }
   handleInput(data) {
-    if (matchesKey2(data, Key2.ctrl("c"))) {
+    if (matchesKey3(data, Key3.ctrl("c"))) {
       this.onClose();
       return;
     }
@@ -1678,10 +1775,10 @@ import {
 import {
   CURSOR_MARKER,
   Editor,
-  Key as Key3,
+  Key as Key4,
   Loader,
   Markdown,
-  matchesKey as matchesKey3,
+  matchesKey as matchesKey4,
   ScrollView,
   truncateToWidth as truncateToWidth3,
   VStack,
@@ -1794,12 +1891,12 @@ var BtwTranscriptPager = class {
   }
   handleInput(data) {
     if (this.finished) return;
-    if (matchesKey3(data, Key3.ctrl("c"))) {
+    if (matchesKey4(data, Key4.ctrl("c"))) {
       this.finished = true;
       this.onAction({ kind: "close" });
       return;
     }
-    if (this.canBringToMain && matchesKey3(data, Key3.ctrl("r"))) {
+    if (this.canBringToMain && matchesKey4(data, Key4.ctrl("r"))) {
       this.finished = true;
       this.onAction({ kind: "bringToMain", questionDraft: this.editor.getExpandedText() });
       return;
@@ -1816,12 +1913,12 @@ var BtwTranscriptPager = class {
       }
       return;
     }
-    if (matchesKey3(data, Key3.pageUp)) {
+    if (matchesKey4(data, Key4.pageUp)) {
       this.scrollView.scrollBy(-Math.max(1, this.scrollView.viewportHeight));
       this.tui.requestRender();
       return;
     }
-    if (matchesKey3(data, Key3.pageDown)) {
+    if (matchesKey4(data, Key4.pageDown)) {
       this.scrollView.scrollBy(Math.max(1, this.scrollView.viewportHeight));
       this.tui.requestRender();
       return;
@@ -2018,7 +2115,7 @@ var BtwAnsweringView = class {
   }
   handleInput(data) {
     if (this.finished) return;
-    if (matchesKey3(data, Key3.ctrl("c"))) {
+    if (matchesKey4(data, Key4.ctrl("c"))) {
       this.finished = true;
       this.loader.stop();
       this.controller.abort();
@@ -2037,12 +2134,12 @@ var BtwAnsweringView = class {
       }
       return;
     }
-    if (matchesKey3(data, Key3.pageUp)) {
+    if (matchesKey4(data, Key4.pageUp)) {
       this.scrollView.scrollBy(-Math.max(1, this.scrollView.viewportHeight));
       this.tui.requestRender();
       return;
     }
-    if (matchesKey3(data, Key3.pageDown)) {
+    if (matchesKey4(data, Key4.pageDown)) {
       this.scrollView.scrollBy(Math.max(1, this.scrollView.viewportHeight));
       this.tui.requestRender();
       return;