pi-better-btw-plus 1.1.1 → 1.3.0

package/README.md

@@ -77,6 +77,7 @@ Press `Esc` to close it. Reopen with `/btw` or `Alt+W` to continue where you lef
 | `Alt+N` | Start an empty conversation |
 | `Alt+E` | Export the transcript to `$CWD/.agents/eval/pi-better-btw-<timestamp>.md` |
 | `Ctrl+L` | Open the fork model picker (scoped + authenticated models; `↑/↓` select, `Enter` confirm, `Esc` cancel) |
+| `Alt+Shift+C` | Copy the whole input editor text (paste markers expanded — exactly what a submit would send) |
 
 In Read-only Mode (default), the read-only lane is **enforced**: attempting an out-of-lane tool call is hard-blocked with a prompt injection; a second violation escalates the wording and aborts the turn (a `🚧 lane blocked` status line). Executed-but-failed read-only calls are re-grounded by an `afterToolCall` note. Edit mode (`Alt+T`) is unaffected.
 
@@ -121,6 +122,7 @@ What changed since I opened this side chat?
 | Double-click | Select the whole rendered line |
 | `Ctrl+C` / `Ctrl+Shift+C` | Copy the active mouse selection (the selection is kept until you click elsewhere, so repeated presses re-copy) |
 | `Ctrl+X` | Copy the last assistant message |
+| `Alt+Shift+C` | Copy the whole input editor text (paste markers expanded — exactly what a submit would send; empty input shows `Input is empty`) |
 | `Ctrl+V` / `Alt+V` | Paste the system clipboard at the cursor (same normalization + `[paste #N …]` markers as right-click paste) |
 | Mouse right-click (chat area) | Copy the retained mouse selection (fires on release, keeps the highlight) |
 | Mouse right-click (input editor) | Paste the system clipboard at the cursor (editor normalization + `[paste #N …]` markers for large pastes) |
@@ -217,7 +219,7 @@ Structure:
 │   ├── side-chat-mouse.ts    # minimal SGR mouse parsing
 │   ├── clipboard-read.ts    # platform clipboard read (win32 / darwin / linux + OSC 52 fallback)
 │   ├── retry.ts             # turn-level retry: classifyRetryable + runWithRetry
-│   ├── shortcuts.ts         # hotkey bindings (Alt+W / Alt+T)
+│   ├── shortcuts.ts         # hotkey bindings (Alt+W bg / Alt+T mode / Alt+Shift+C copy input)
 │   ├── model-switch.ts       # Ctrl+L fork model picker: list building + thinking clamp
 │   ├── side-chat-export.ts   # Alt+E transcript export
 │   ├── tool-wrapper.ts       # write-path overlap warnings

package/README.zh-CN.md

@@ -79,6 +79,7 @@ pi install npm:pi-better-btw-plus
 | `Alt+N` | 开始空白对话 |
 | `Alt+E` | 导出对话记录到 `$CWD/.agents/eval/pi-better-btw-<timestamp>.md` |
 | `Ctrl+L` | 打开 fork 模型选择器（scoped + 已认证模型；`↑/↓` 选择，`Enter` 确认，`Esc` 取消） |
+| `Alt+Shift+C` | 复制输入编辑器全部文本（paste 标记展开——与提交给 agent 的内容一致） |
 
 在Readonly Mode(default),只读车道是**强制的**：越权调用工具会被硬阻断并注入prompt；第二次违规会升级措辞并中止该轮，提示（`🚧 lane blocked` 状态行）。已执行但失败的只读调用会被 `afterToolCall` 备注再次归位。编辑模式（`Alt+T`）不受影响。
 
@@ -122,6 +123,7 @@ What changed since I opened this side chat?
 | 双击 | 选择整行 |
 | `Ctrl+C` / `Ctrl+Shift+C` | 复制当前鼠标选择（选择保留到下次点击，可重复复制） |
 | `Ctrl+X` | 复制最后一条 assistant 消息 |
+| `Alt+Shift+C` | 复制输入编辑器全部文本（paste 标记展开——与提交给 agent 的内容一致；空输入提示 `Input is empty`） |
 | `Ctrl+V` / `Alt+V` | 把系统剪贴板粘贴到光标处（归一化 + `[paste #N …]` 标记，同右键粘贴） |
 | 鼠标右键（聊天区） | 复制保留的鼠标选择（松开时触发，保持高亮） |
 | 鼠标右键（输入框） | 把系统剪贴板粘贴到光标处（编辑器归一化 + 大段 `[paste #N …]` 标记） |
@@ -219,7 +221,7 @@ btw 上下文保留主线的 system prompt 于 system 槽位，并逐字注入 f
 │   ├── clipboard-read.ts    # 平台剪贴板读取（win32 / darwin / linux + OSC 52 兜底）
 │   ├── retry.ts             # turn 级重试引擎：classifyRetryable + runWithRetry
 │   ├── model-switch.ts      # Ctrl+L fork 模型选择器：列表构建 + thinking 钳制
-│   ├── shortcuts.ts         # 快捷键绑定（Alt+W / Alt+T）
+│   ├── shortcuts.ts         # 快捷键绑定（Alt+W 后台 / Alt+T 模式 / Alt+Shift+C 复制输入）
 │   ├── side-chat-export.ts   # Alt+E 对话导出
 │   ├── tool-wrapper.ts       # 写路径重叠警告
 │   └── file-activity-tracker.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-better-btw-plus",
-  "version": "1.1.1",
+  "version": "1.3.0",
   "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

@@ -28,9 +28,16 @@ export const KEYBINDINGS = {
   /** Read-only / edit mode toggle (Ctrl+T freed for pi's thinking toggle). */
   toggleMode: { keys: ["alt+t"], hint: "A+t" },
   /** Copy the active mouse selection (pi `tui.input.copy` parity). */
-  copySelection: { keys: ["ctrl+c", "ctrl+shift+c"], hint: "C+c copy" },
+  /**
+   * Copy the active mouse selection (pi `tui.input.copy` parity). Without
+   * one, bare Ctrl+C clears the input box (pi `app.clear` parity, spec #22);
+   * Ctrl+Shift+C stays a forced copy.
+   */
+  copySelection: { keys: ["ctrl+c", "ctrl+shift+c"], hint: "C+c copy/clear" },
   /** 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" },
   /** Paste clipboard text (pi `app.clipboard.pasteImage` parity). */
   paste: { keys: ["ctrl+v", "alt+v"], hint: "C+v paste" },
 } as const satisfies Record<string, Keybinding>;

package/srcs/side-chat-messages.ts

@@ -57,8 +57,9 @@ export class SideChatMessages implements Component {
   private totalLines = 0;
   /**
    * Active mouse selection over the visible chat lines ({@link CellPos} in
-   * rendered-line coordinates). Cleared on scroll / content changes and on
-   * the next press; kept after copy so Ctrl+C can copy again (B+C scheme).
+   * rendered-line coordinates). Cleared on scroll / content changes, on the
+   * next press, and after a successful copy (spec #22: Ctrl+C with no
+   * selection clears the input instead of re-copying).
    */
   private selection: { anchor: CellPos; focus: CellPos } | null = null;
   /** Plain (ANSI-stripped) text of the last rendered lines, for hit-testing and copy. */

package/srcs/side-chat-overlay.ts

@@ -134,6 +134,8 @@ const PASTE_EMPTY_STATUS = "Clipboard is empty";
 const PASTE_STATUS_CLEAR_MS = 1200;
 /** Ctrl+X hint when the side chat has produced no assistant reply yet. */
 const NO_ASSISTANT_MESSAGE_STATUS = "No assistant message to copy yet";
+/** Alt+Shift+C hint when the input editor is empty (issue #23). */
+const INPUT_EMPTY_STATUS = "Input is empty";
 
 /**
  * Shared-prefix layout (#9, reverses decision #6): the main lane's system
@@ -269,14 +271,20 @@ export class SideChatOverlay implements Component, Focusable {
    * Copy the current mouse selection to the clipboard (native → wl-copy /
    * xclip → OSC 52 cascade via {@link copyToClipboard}, matching the main
    * app's tree selector) and show a transient status. Copying is hotkey-only:
-   * `Ctrl+C` / `Ctrl+Shift+C` with an active mouse selection. The selection
-   * stays highlighted so a second copy key press re-copies. Returns false when
-   * there is nothing to copy.
+   * `Ctrl+C` / `Ctrl+Shift+C` with an active mouse selection. A successful
+   * copy consumes the selection (spec #22: Ctrl+C then returns to clearing
+   * the input); a failed copy keeps it so the user can retry. Returns false
+   * when there is nothing to copy.
    */
   async copySelectionToClipboard(): Promise<boolean> {
     const text = this.messages.getSelectedText();
     if (!text) return false;
-    return this.copyTextWithFeedback(text);
+    const ok = await this.copyTextWithFeedback(text);
+    if (ok) {
+      this.messages.clearSelection();
+      this.options.tui.requestRender();
+    }
+    return ok;
   }
 
   /**
@@ -902,14 +910,33 @@ export class SideChatOverlay implements Component, Focusable {
       this.openModelPicker();
       return;
     }
+    if (matchesAnyKey(data, KEYBINDINGS.copyInput.keys)) {
+      // 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.
+      const text = this.editor.getExpandedText();
+      if (!text) {
+        this.status.flash(INPUT_EMPTY_STATUS, COPIED_STATUS_CLEAR_MS);
+        return;
+      }
+      void this.copyTextWithFeedback(text, "input");
+      return;
+    }
     if (matchesAnyKey(data, KEYBINDINGS.copySelection.keys)) {
       // Hotkey copy: with an active mouse selection, Ctrl+C / Ctrl+Shift+C
-      // copies it. Without one, fall through so Ctrl+C keeps the editor's
-      // own semantics.
+      // copies it. Without one, Ctrl+C clears the input box (pi `app.clear`
+      // parity, spec #22); Ctrl+Shift+C falls through — pi binds no such
+      // key, so it stays a forced copy (terminal habit).
       if (this.messages.hasSelection()) {
         void this.copySelectionToClipboard();
         return;
       }
+      if (matchesKey(data, KEYBINDINGS.copySelection.keys[0])) {
+        this.editor.setText("");
+        this.options.tui.requestRender();
+        return;
+      }
     }
     if (matchesAnyKey(data, KEYBINDINGS.copyLastMessage.keys)) {
       // app.message.copy parity: copy the last assistant message — no
@@ -1206,7 +1233,7 @@ export function buildSideChatHintLines(options: {
   const rightClickHint = features.rightClickCopyPaste
     ? " · R-click copy/paste"
     : "";
-  const primary = `${scrollHint} · ${KEYBINDINGS.copySelection.hint} · ${KEYBINDINGS.copyLastMessage.hint} · ${KEYBINDINGS.paste.hint}${rightClickHint} · ${modeHint} · ${escHint} · Enter send`;
+  const primary = `${scrollHint} · ${KEYBINDINGS.copySelection.hint} · ${KEYBINDINGS.copyLastMessage.hint} · ${KEYBINDINGS.copyInput.hint} · ${KEYBINDINGS.paste.hint}${rightClickHint} · ${modeHint} · ${escHint} · Enter send`;
   const secondary = `${ALT_ACTIONS_BASE}${features.modelSwitch ? ` · ${KEYBINDINGS.modelPicker.hint}` : ""}`;
   return [primary, secondary];
 }