dsh-neotui 0.1.6 → 0.1.8

package/package.json

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

package/src/panels.js

@@ -1410,13 +1410,19 @@ export class JobsPanel extends Popup {
     // Expanded = EVERYTHING: every field, full values — long commands wrap
     // across lines instead of being truncated (the web clips them; we don't).
     // `label` carries the full command, so it is shown here too (the header
-    // row keeps only a 36-column preview of it).
+    // row keeps only a 36-column preview of it). Epoch timestamps render as
+    // Beijing time, not raw millisecond integers.
     const names = { label: "命令", detail: "结果", startedAt: "开始于", finishedAt: "结束于" };
+    const fmtBeijing = (ms) => {
+      if (typeof ms !== "number" || !isFinite(ms)) return String(ms ?? "");
+      return new Date(ms).toLocaleString("sv-SE", { timeZone: "Asia/Shanghai", hour12: false }).replace("T", " ") + "（北京时间）";
+    };
     const lines = [];
     const budget = Math.max(20, this.w - 10);
     for (const [k, v] of Object.entries(j)) {
       if (["status", "kind"].includes(k)) continue;
-      const s = v !== null && typeof v === "object" ? JSON.stringify(v) : String(v ?? "");
+      let s = v !== null && typeof v === "object" ? JSON.stringify(v) : String(v ?? "");
+      if (k === "startedAt" || k === "finishedAt") s = fmtBeijing(v);
       if (s === "") continue;
       const key = names[k] ?? k;
       let rest = s;

package/src/term.js

@@ -30,10 +30,12 @@ export class Term {
     this.onResize = onResize ?? (() => {});
     this.kitty = kitty;
     this.kittyActive = false;  // set when the terminal answers the CSI ? u query
+    this.escTimer = null;      // pending lone-ESC fallback (split-sequence safety)
     this.decoder = new StringDecoder("utf8");
     this.buf = "";
     this.started = false;
     this.pasteBuf = null;
+    this.pasting = false;  // inside a bracketed paste (200~ … 201~)
     this.w = (output.columns || 80); this.h = (output.rows || 24);
   }
 
@@ -81,6 +83,24 @@ export class Term {
 
   #emit(ev) { this.onEvent(ev); }
 
+  /** A lone ESC waits briefly for the rest of its sequence; if nothing
+   *  arrives it becomes the standalone Escape key. */
+  #armEscFallback() {
+    if (this.escTimer) return;
+    this.escTimer = setTimeout(() => {
+      this.escTimer = null;
+      if (this.buf === "\x1b") {
+        this.buf = "";
+        this.#emit({ type: "key", name: "escape", ctrl: false, alt: false, shift: false });
+      } else {
+        this.#parse(); // more bytes arrived: re-parse the pending ESC
+      }
+    }, 30);
+  }
+  #clearEscFallback() {
+    if (this.escTimer) { clearTimeout(this.escTimer); this.escTimer = null; }
+  }
+
   #feed(s) {
     if (!s) return;
     this.buf += s;
@@ -89,40 +109,67 @@ export class Term {
 
   #parse() {
     const buf = this.buf;
+    const PASTE_END = "\x1b[201~";
     let i = 0;
     while (i < buf.length) {
+      // Inside a bracketed paste: collect raw content up to the END marker
+      // and emit it as ONE text event — otherwise a large paste arrives as
+      // many small text chunks and the input's two-stage paste never fires.
+      if (this.pasting) {
+        const end = buf.indexOf(PASTE_END, i);
+        if (end === -1) {
+          // keep any partial END-marker suffix in the buffer for reassembly
+          let keep = 0;
+          for (let k = 1; k < PASTE_END.length; k++) {
+            if (buf.length - k >= 0 && buf.endsWith(PASTE_END.slice(0, k))) keep = k;
+          }
+          this.pasteBuf += buf.slice(i, buf.length - keep);
+          i = buf.length - keep;
+          break;
+        }
+        this.pasteBuf += buf.slice(i, end);
+        this.pasting = false;
+        this.#emit({ type: "text", text: this.pasteBuf });
+        this.pasteBuf = "";
+        i = end + PASTE_END.length;
+        continue;
+      }
       const ch = buf[i];
       if (ch === "\x1b") {
         // escape sequence
         const next = buf[i + 1];
+        if (next !== undefined) this.#clearEscFallback();
         if (next === "[") {
           const r = this.#parseCsi(buf, i + 2);
-          if (r === null) { i = buf.length; break; } // incomplete
+          if (r === null) break; // incomplete: retain the sequence head
           i = r.next;
         } else if (next === "O") {
           const fin = buf[i + 2];
-          if (fin === undefined) { i = buf.length; break; }
+          if (fin === undefined) break; // incomplete: retain
           const name = KEY_NAMES[fin];
           if (name) this.#emit({ type: "key", name, ctrl: false, alt: false, shift: false });
           i += 3;
         } else if (next === "]") {
           // OSC: skip to BEL or ST
           let j = i + 2;
+          let terminated = false;
           while (j < buf.length) {
-            if (buf[j] === "\x07") { j++; break; }
-            if (buf[j] === "\x1b" && buf[j + 1] === "\\") { j += 2; break; }
+            if (buf[j] === "\x07") { terminated = true; j++; break; }
+            if (buf[j] === "\x1b" && buf[j + 1] === "\\") { terminated = true; j += 2; break; }
             j++;
           }
-          if (j > buf.length && buf[buf.length - 1] !== "\x07") { i = buf.length; break; }
+          if (!terminated) break; // incomplete OSC: retain the head
           i = j;
         } else if (next === "P" || next === "X" || next === "^" || next === "_") {
           // DCS / SOS / PM / APC: skip to ST (or BEL)
           let j = i + 2;
+          let terminated = false;
           while (j < buf.length) {
-            if (buf[j] === "\x07") { j++; break; }
-            if (buf[j] === "\x1b" && buf[j + 1] === "\\") { j += 2; break; }
+            if (buf[j] === "\x07") { terminated = true; j++; break; }
+            if (buf[j] === "\x1b" && buf[j + 1] === "\\") { terminated = true; j += 2; break; }
             j++;
           }
+          if (!terminated) break; // incomplete: retain the head
           i = j;
         } else if (next !== undefined) {
           // ESC + char = alt key
@@ -131,11 +178,14 @@ export class Term {
           else this.#emit({ type: "key", name: "char", key: next.toLowerCase(), text: next, ctrl: false, alt: true, shift: false });
           i += 2;
         } else {
-          // Lone ESC at end of buffer = the standalone Escape key. Terminals
-          // deliver escape sequences atomically, so a bare \x1b is never the
-          // head of a sequence that will arrive in a later chunk.
-          this.#emit({ type: "key", name: "escape", ctrl: false, alt: false, shift: false });
-          i++;
+          // Lone ESC at the end of the buffer. A pty does NOT deliver escape
+          // sequences atomically: during a restart-handoff burst a mouse
+          // report can split across chunks, and emitting "escape key" here
+          // turned the remainder into input text (raw SGR bytes sent to the
+          // session). Hold the ESC and re-parse on the next chunk; only treat
+          // it as the Escape key if nothing follows within a short window.
+          this.#armEscFallback();
+          break; // retain the lone ESC
         }
       } else if (ch === "\r") {
         this.#emit({ type: "key", name: "enter", ctrl: false, alt: false, shift: false });
@@ -236,6 +286,13 @@ export class Term {
         return;
       }
       const [n = 0, mod = 1] = nums;
+      if (n === 200) { this.pasting = true; this.pasteBuf = ""; return; } // bracketed paste START
+      if (n === 201) { // bracketed paste END (normally consumed by the collector)
+        this.pasting = false;
+        if (this.pasteBuf !== "") this.#emit({ type: "text", text: this.pasteBuf });
+        this.pasteBuf = "";
+        return;
+      }
       const name = TILDE_NAMES[n];
       if (!name) return;
       const ctrl = !!(mod - 1 & 4), alt = !!(mod - 1 & 2), shift = !!(mod - 1 & 1);

package/src/views.js

@@ -1809,6 +1809,7 @@ export class App {
     this.toastUntil = 0;
     this.jobs = [];
     this.jobsBySession = new Map(); // sessionId → latest session/jobs snapshot
+    this.ctrlCUntil = null;         // NORMAL-mode double-Ctrl+C exit window
     this.focused = null;
     this.provider = "";
     this.model = "";
@@ -2849,6 +2850,17 @@ export class App {
         return;
       }
       if (ev.ctrl && ev.key === "q") { this.stop(); return; }
+      if (ev.ctrl && ev.key === "c") {
+        // NORMAL-mode Ctrl+C: two presses within the toast window exit the
+        // process; the first press just warns (insert mode owns Ctrl+C for
+        // clearing the input).
+        if (this.focused === this.chat?.input) return false;
+        const now = Date.now();
+        if (this.ctrlCUntil != null && now < this.ctrlCUntil) { this.stop(); return; }
+        this.ctrlCUntil = now + 3000;
+        this.toast("再按一次 Ctrl+C 退出 TUI");
+        return;
+      }
       if (ev.ctrl && ev.key === "n") { this.focus(this.chat); this.redraw(); return; }
       if (ev.ctrl && ev.key === "b") { this.toggleSidebar(); return; }
       if (ev.ctrl && ev.key === "p") { this.overlay = new ControlPanel(this, { startPage: 1 }); this.redraw(); return; }

package/src/widgets.js

@@ -499,6 +499,7 @@ 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.#touch(); this.value = this.#cps().slice(this.cursor).join(""); this.cursor = 0; this.onChange?.(); return true;
             case "k": this.#touch(); this.value = this.#cps().slice(0, this.cursor).join(""); this.onChange?.(); return true;
             case "l": {