dsh-neotui 0.1.9 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Neo-TUI: mouse-driven terminal UI client for DeepSeek Harness (B-tier per dsh-tui-design.md)",
   "type": "module",
   "bin": {

package/src/views.js

@@ -1824,6 +1824,7 @@ export class App {
     this.sidebarVisible = true; // Ctrl+B hides the whole session pane (nvim-style)
     this.sidebarWidth = 30;     // draggable divider: the session pane's column width
     this.draggingDivider = false;
+    this.inputDrag = false;     // mouse drag-selection inside the input is active
     this.feedbackMap = new Map(); // messageId → {rating, version}
     this.searchQuery = null;      // active find-in-conversation term (highlight)
     this.findQuery = null;        // term being typed in the find picker
@@ -2768,6 +2769,13 @@ export class App {
       // unhandled keys fall through to global shortcuts
     }
     if (ev.type === "mouse") {
+      // input drag-selection: the gesture continues across motion events
+      // even when the pointer leaves the input area
+      if (ev.kind === "release" && ev.button === 0 && this.inputDrag) {
+        this.inputDrag = false;
+        if (this.chat.input.onMouse(ev)) this.redraw();
+        return;
+      }
       // Draggable sidebar divider: press on the boundary column (±1) starts a
       // resize; drag events (motion flag) update the width live.
       const divX = this.sidebarVisible ? this.sidebarWidth : -1;
@@ -2788,6 +2796,10 @@ export class App {
       // Pure mouse motion must never change focus/mode (vim-style: INSERT is
       // keyboard-only). It reaches just the already-focused widget (drag select).
       if (ev.motion) {
+        if (this.inputDrag) {
+          if (this.chat.input.onMouse(ev)) this.redraw();
+          return;
+        }
         if (this.focused?.onMouse?.(ev)) this.redraw();
         return;
       }
@@ -2795,9 +2807,15 @@ export class App {
         this.focus(this.sidebar);
         if (this.sidebar.onMouse(ev)) this.redraw();
       } else if (this.chat.input.inside(ev.x, ev.y)) {
-        // Clicking the input only positions the cursor while already in INSERT
-        // mode; it never enters INSERT on its own (i / Esc control the mode).
-        if (this.focused === this.chat.input) {
+        // mouse SELECTION in the input works regardless of mode; typing stays
+        // gated behind i / Esc (vim-style)
+        if (ev.kind === "press" && ev.button === 0) {
+          this.inputDrag = true;
+          if (this.chat.input.onMouse(ev)) this.redraw();
+        } else if (ev.kind === "release" && ev.button === 0) {
+          this.inputDrag = false;
+          if (this.chat.input.onMouse(ev)) this.redraw();
+        } else if (this.focused === this.chat.input) {
           if (this.chat.input.onMouse(ev)) this.redraw();
         } else if (ev.kind === "press") {
           this.toast("按 i 进入输入（vim 式）");

package/src/widgets.js

@@ -258,6 +258,8 @@ export class Input extends Widget {
     this.app = opts.app ?? null;
     this.pendingPaste = null;          // large-paste stage 1: held-back clipboard text
     this.pasteMark = null;             // code-point span of the immutable "[已复制…]" token
+    this.selStart = null;              // drag-selection [start, end) code-point span
+    this.selEnd = null;
     this.onChange = opts.onChange ?? null;
     this.allowEmptyEnter = opts.allowEmptyEnter ?? false;
     this.history = [];
@@ -333,12 +335,13 @@ export class Input extends Widget {
       this.#touch();
     }
     this.#edit(at, at, text);
-    this.onChange?.();
   }
   /** EVERY edit goes through here so the immutable paste token behaves as
    *  one unit: deleting any part of it removes it whole, typing inside it
-   *  replaces it, edits elsewhere just shift it. */
+   *  replaces it, edits elsewhere just shift it. Always notifies onChange —
+   *  the second-paste swap must reflow the layout just like typing. */
   #edit(from, to, text = "") {
+    this.selStart = this.selEnd = null; // edits consume the selection
     const cps = this.#cps();
     const t = Array.from(text);
     const m = this.pasteMark;
@@ -351,6 +354,7 @@ export class Input extends Widget {
       this.pasteMark = null;
       this.pendingPaste = null;
       this.value = cps.join("");
+      this.onChange?.();
       return;
     }
     if (m && to <= m.start) {
@@ -360,6 +364,7 @@ export class Input extends Widget {
     cps.splice(from, to - from, ...t);
     this.cursor = from + t.length;
     this.value = cps.join("");
+    this.onChange?.();
   }
   #deleteAt(idx) {
     this.#edit(idx, idx + 1);
@@ -419,6 +424,21 @@ export class Input extends Widget {
         screen.text(this.x + 1, y, r.text, { fg: this.fg, bg: this.bg });
       }
     }
+    // drag-selection highlight: invert the selected columns per wrapped row
+    if (this.selStart !== null && this.selEnd !== null && this.selEnd > this.selStart) {
+      for (let ri = start; ri < Math.min(rows.length, start + h); ri++) {
+        const r = rows[ri];
+        const lo = Math.max(r.start, this.selStart);
+        const hi = Math.min(r.end, this.selEnd);
+        if (lo >= hi) continue;
+        const rowY = this.y + (ri - start);
+        const text = Array.from(r.text);
+        const preW = strWidth(text.slice(0, lo - r.start).join(""));
+        const selW = strWidth(text.slice(lo - r.start, hi - r.start).join(""));
+        const x0 = this.x + (ri === 0 ? strWidth(this.prompt) : 1) + preW;
+        screen.invertRect(x0, rowY, Math.min(this.x + this.w - 1, x0 + Math.max(0, selW - 1)), rowY);
+      }
+    }
     // Native terminal caret (blinking bar) is positioned by the app after the
     // frame; store the cell it should occupy (the char at the cursor index).
     const curY = this.y + (curRow - start);
@@ -433,6 +453,7 @@ export class Input extends Widget {
         const row = start + Math.max(0, Math.min(h - 1, ev.y - this.y));
         const rx = ev.x - this.x - (row === 0 ? strWidth(this.prompt) : 1);
         this.cursor = this.#indexAtVisual(row, Math.max(0, rx));
+        this.#snapCursor();
       } else {
         const rx = ev.x - this.x - strWidth(this.prompt);
         let w = 0, idx = 0;
@@ -443,11 +464,52 @@ export class Input extends Widget {
           idx++;
         }
         this.cursor = idx;
+        this.#snapCursor();
       }
+      // press anchors a drag-selection at the cursor
+      this.selStart = this.cursor;
+      this.selEnd = this.cursor;
+      return true;
+    }
+    if ((ev.kind === "drag" || ev.kind === "release") && ev.button === 0 && this.selStart !== null) {
+      // extend the selection with the pointer (clamped to the text)
+      if (this.multi) {
+        const h = this.height();
+        const start = this.scrollY ?? 0;
+        const row = start + Math.max(0, Math.min(h - 1, ev.y - this.y));
+        const rx = ev.x - this.x - (row === 0 ? strWidth(this.prompt) : 1);
+        this.cursor = this.#indexAtVisual(row, Math.max(0, rx));
+      } else {
+        const rx = ev.x - this.x - strWidth(this.prompt);
+        let w = 0, idx = 0;
+        for (const ch of Array.from(this.value)) {
+          const cw = strWidth(ch);
+          if (rx < w + cw / 2) break;
+          w += cw;
+          idx++;
+        }
+        this.cursor = idx;
+      }
+      this.#snapCursor();
+      this.selEnd = this.cursor;
+      if (this.selEnd < this.selStart) { const t = this.selStart; this.selStart = this.selEnd; this.selEnd = t; }
       return true;
     }
     return false;
   }
+  /** The paste token is a single cursor unit: the caret never rests inside
+   *  its span — LEFT from the end hops to its start, RIGHT from the start
+   *  hops to its end, and clicks/moves snap to the nearest boundary.
+   *  dir: -1 = leftward movement → start, +1 = rightward → end, 0 = nearest. */
+  #snapCursor(dir = 0) {
+    const m = this.pasteMark;
+    if (!m) return;
+    if (this.cursor > m.start && this.cursor < m.end) {
+      if (dir < 0) this.cursor = m.start;
+      else if (dir > 0) this.cursor = m.end;
+      else this.cursor = this.cursor - m.start < m.end - this.cursor ? m.start : m.end;
+    }
+  }
   /** Cancel the held-back paste AND its token. */
   #touch() { this.pendingPaste = null; this.pasteMark = null; }
   /** Claude-Code-style two-stage paste: the first Ctrl+Shift+V of a large
@@ -485,38 +547,44 @@ export class Input extends Widget {
     if (ev.type !== "key") return false;
     switch (ev.name) {
       case "backspace":
-        if (this.cursor > 0) { this.#edit(this.cursor - 1, this.cursor); this.onChange?.(); }
+        if (this.cursor > 0) this.#edit(this.cursor - 1, this.cursor);
         return true;
       case "delete":
-        if (this.cursor < this.#cps().length) { this.#edit(this.cursor, this.cursor + 1); this.onChange?.(); }
+        if (this.cursor < this.#cps().length) this.#edit(this.cursor, this.cursor + 1);
         return true;
-      case "left": this.selectAll = false; this.cursor = Math.max(0, this.cursor - 1); return true;
-      case "right": this.selectAll = false; this.cursor = Math.min(this.#cps().length, this.cursor + 1); return true;
+      case "left": this.selectAll = false; this.selStart = this.selEnd = null; this.cursor = Math.max(0, this.cursor - 1); this.#snapCursor(-1); return true;
+      case "right": this.selectAll = false; this.selStart = this.selEnd = null; this.cursor = Math.min(this.#cps().length, this.cursor + 1); this.#snapCursor(1); return true;
       case "home": {
+        this.selStart = this.selEnd = null;
         if (this.multi) { const rows = this.#visualRows(); const { row } = this.#cursorVisual(); this.cursor = rows[row].start; }
         else this.cursor = 0;
+        this.#snapCursor();
         return true;
       }
       case "end": {
+        this.selStart = this.selEnd = null;
         if (this.multi) { const rows = this.#visualRows(); const { row } = this.#cursorVisual(); this.cursor = rows[row].end; }
         else this.cursor = this.#cps().length;
+        this.#snapCursor();
         return true;
       }
       case "up":
+        this.selStart = this.selEnd = null;
         if (this.multi) {
           const rows = this.#visualRows();
           const { row, col } = this.#cursorVisual();
-          if (row > 0) this.cursor = this.#indexAtVisual(row - 1, col);
+          if (row > 0) { this.cursor = this.#indexAtVisual(row - 1, col); this.#snapCursor(); }
         } else if (this.history.length) {
           this.histIdx = this.histIdx < 0 ? this.history.length - 1 : Math.max(0, this.histIdx - 1);
           this.setValue(this.history[this.histIdx] ?? "");
         }
         return true;
       case "down":
+        this.selStart = this.selEnd = null;
         if (this.multi) {
           const rows = this.#visualRows();
           const { row, col } = this.#cursorVisual();
-          if (row < rows.length - 1) this.cursor = this.#indexAtVisual(row + 1, col);
+          if (row < rows.length - 1) { this.cursor = this.#indexAtVisual(row + 1, col); this.#snapCursor(); }
         } else if (this.histIdx >= 0) {
           this.histIdx++;
           if (this.histIdx >= this.history.length) { this.histIdx = -1; this.setValue(""); }
@@ -527,9 +595,24 @@ export class Input extends Widget {
         if (ev.ctrl) {
           switch (ev.key) {
             case "j": if (this.multi) { this.insert("\n"); return true; } return false;
-            case "c": this.#touch(); this.value = ""; this.cursor = 0; this.selectAll = false; this.onChange?.(); this.app?.toast?.("已清空输入栏"); return true;
-            case "u": this.#edit(0, this.cursor); this.onChange?.(); return true;
-            case "k": this.#edit(this.cursor, this.#cps().length); this.onChange?.(); return true;
+            case "c": {
+              // a drag-selection copies it; otherwise Ctrl+C clears the input
+              if (this.selStart !== null && this.selEnd !== null && this.selEnd > this.selStart) {
+                const text = Array.from(this.value).slice(this.selStart, this.selEnd).join("");
+                this.selStart = this.selEnd = null;
+                this.app?.copyText?.(text);
+                return true;
+              }
+              this.#touch();
+              this.value = "";
+              this.cursor = 0;
+              this.selectAll = false;
+              this.onChange?.();
+              this.app?.toast?.("已清空输入栏");
+              return true;
+            }
+            case "u": this.#edit(0, this.cursor); return true;
+            case "k": this.#edit(this.cursor, this.#cps().length); return true;
             case "l": {
               // expand/collapse the input: expanded drops the 6-line cap and
               // lets the editor fill the window above the input