pi-better-btw-plus 1.3.0 → 1.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-btw-plus",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "pi extension: /btw side-chat overlay — maintained fork of @yceachan/pi-better-btw (+ right-click copy/paste, fork model switch, turn-level retry)",
   "type": "module",
   "keywords": [

package/srcs/shortcuts.ts

@@ -6,6 +6,17 @@ export const SIDE_CHAT_SHORTCUT: KeyId = "alt+w";
 interface Keybinding {
   readonly keys: readonly KeyId[];
   readonly hint: string;
+  /**
+   * Raw terminal encodings that also trigger this action, besides the
+   * parser-recognizable `keys`. Needed because pi-tui's parser cannot express
+   * alt+shift+letter: its legacy branch only maps ESC+lowercase to alt+letter,
+   * and its modifyOtherKeys parse drops the shift bit. Terminals without the
+   * kitty keyboard protocol (Windows Terminal < 1.25) deliver Alt+Shift+C as
+   * the legacy ESC+'C' form (shift folded into case), which parseKey returns
+   * undefined for — so the binding must match the raw bytes too. Only
+   * copyInput needs this today.
+   */
+  readonly raw?: readonly string[];
 }
 
 /**
@@ -37,7 +48,7 @@ export const KEYBINDINGS = {
   /** Copy the last side-chat assistant message (pi `app.message.copy` parity). */
   copyLastMessage: { keys: ["ctrl+x"], hint: "C+x last" },
   /** Copy all input editor text (expanded paste markers — submit semantics). */
-  copyInput: { keys: ["alt+shift+c"], hint: "A+⇧C all" },
+  copyInput: { keys: ["alt+shift+c"], raw: ["\x1bC", "\x1b[27;3;99~"], hint: "A+⇧C all" },
   /** Paste clipboard text (pi `app.clipboard.pasteImage` parity). */
   paste: { keys: ["ctrl+v", "alt+v"], hint: "C+v paste" },
 } as const satisfies Record<string, Keybinding>;
@@ -46,3 +57,9 @@ export const KEYBINDINGS = {
 export function matchesAnyKey(data: string, keys: readonly KeyId[]): boolean {
   return keys.some((key) => matchesKey(data, key));
 }
+
+/** True when `data` matches a binding's keys or one of its raw encodings. */
+export function matchesKeybinding(data: string, kb: Keybinding): boolean {
+  if (kb.raw?.includes(data)) return true;
+  return matchesAnyKey(data, kb.keys);
+}

package/srcs/side-chat-overlay.ts

@@ -62,7 +62,7 @@ import {
   modelKey,
   type ModelChoice,
 } from "./model-switch.ts";
-import { KEYBINDINGS, matchesAnyKey } from "./shortcuts.ts";
+import { KEYBINDINGS, matchesAnyKey, matchesKeybinding } from "./shortcuts.ts";
 import { wrapToolsWithOverlapDetection } from "./tool-wrapper.ts";
 import type { SideChatFeatures } from "./config.ts";
 import type { RetryPolicy } from "./retry.ts";
@@ -910,11 +910,13 @@ export class SideChatOverlay implements Component, Focusable {
       this.openModelPicker();
       return;
     }
-    if (matchesAnyKey(data, KEYBINDINGS.copyInput.keys)) {
+    if (matchesKeybinding(data, KEYBINDINGS.copyInput)) {
       // Copy the whole input editor text (issue #23): expanded paste
       // markers — exactly what a submit would send. Read-only, unlike
       // Ctrl+C's clear lane it never touches the draft; an empty input
-      // flashes a hint instead of copying.
+      // flashes a hint instead of copying. `matchesKeybinding` also accepts
+      // the raw legacy ESC+C form that terminals without the kitty protocol
+      // (Windows Terminal < 1.25) deliver for Alt+Shift+C.
       const text = this.editor.getExpandedText();
       if (!text) {
         this.status.flash(INPUT_EMPTY_STATUS, COPIED_STATUS_CLEAR_MS);