dsh-neotui 0.1.5 → 0.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "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

@@ -1218,6 +1218,7 @@ export class ControlPanel extends Widget {
       ["G", "滚动到底", () => { this.app.closeOverlay(); this.app.chat.view.scrollY = this.app.chat.view.maxScroll(); }],
       ["[", "上一提问的终点", () => { this.app.closeOverlay(); this.app.focus(this.app.chat); this.app.chat.onKey({ type: "key", name: "char", key: "[", text: "[", ctrl: false, alt: false, shift: false }); }],
       ["]", "下一提问的终点", () => { this.app.closeOverlay(); this.app.focus(this.app.chat); this.app.chat.onKey({ type: "key", name: "char", key: "]", text: "]", ctrl: false, alt: false, shift: false }); }],
+      ["Ctrl+L", "输入栏 展开/折叠", () => { this.app.closeOverlay(); this.app.focus(this.app.chat.input); this.app.chat.input.onKey({ type: "key", name: "char", key: "l", text: "l", ctrl: true, alt: false, shift: false }); }],
       ["Ctrl+P", "控制面板", () => { this.page = 1; this.sel = 0; this.app.redraw(); }],
       ["Ctrl+M", "切换模型", () => { this.app.overlay = buildModelPicker(this.app); }],
       ["Ctrl+T", "轨迹视图", () => { this.app.closeOverlay(); this.app.setMode("trajectory"); }],
@@ -1408,16 +1409,26 @@ export class JobsPanel extends Popup {
   #detailLines(j) {
     // 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). 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", "label"].includes(k)) continue;
-      const s = v !== null && typeof v === "object" ? JSON.stringify(v) : String(v ?? "");
+      if (["status", "kind"].includes(k)) continue;
+      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;
       let first = true;
       while (rest.length > 0 || first) {
-        const head = first ? `${k}: ` : "     ";
+        const head = first ? `${key}: ` : "     ";
         const take = JobsPanel.#cutWidth(rest, budget - strWidth(head));
         lines.push([{ t: `      ${head}${take}`, fg: K.DIM }]);
         rest = rest.slice(take.length);

package/src/term.js

@@ -30,6 +30,7 @@ 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;
@@ -81,6 +82,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;
@@ -95,34 +114,38 @@ export class Term {
       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 +154,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 });

package/src/views.js

@@ -580,9 +580,9 @@ export class ChatView extends Widget {
     });
     this.input = new Input({
       x: this.x, y: this.y + this.h - 2, w: this.w, h: 1,
-      multi: true, maxLines: 6,
+      multi: true, maxLines: 6, app: this.app,
       bg: T.PANEL,
-      placeholder: "输入消息…（Shift+Enter / Ctrl+J 换行，Enter 发送）",
+      placeholder: "输入消息…（Shift+Enter/Ctrl+J 换行，Ctrl+L 展开，Enter 发送）",
       onEnter: (v) => this.send(v),
       onChange: () => this.inputChanged(),
     });
@@ -731,10 +731,12 @@ export class ChatView extends Widget {
 
   inputChanged() {
     // Multi-line input grew/shrunk → reflow view vs input, keep the tail visible.
-    const ih = this.input.height();
+    // The expanded (Ctrl+L) input may claim the whole window: clamp so the
+    // scroll view keeps at least one row.
+    const th = this.todoHeight();
+    const ih = Math.min(this.input.height(), Math.max(1, this.h - th - 2));
     const prevIh = this.input.h;
     this.input.h = ih;
-    const th = this.todoHeight();
     this.view.h = this.h - ih - th - 1;
     this.input.y = this.y + this.h - ih;
     if (ih !== prevIh) this.app.layout();
@@ -743,9 +745,9 @@ export class ChatView extends Widget {
 
   resize(x, y, w, h) {
     this.x = x; this.y = y; this.w = w; this.h = h;
-    const ih = this.input.height();
-    this.input.h = ih;
     const th = this.todoHeight();
+    const ih = Math.min(this.input.height(), Math.max(1, h - th - 2));
+    this.input.h = ih;
     this.view.x = x; this.view.y = y; this.view.w = w; this.view.h = h - ih - th - 1;
     this.input.x = x; this.input.y = y + h - ih; this.input.w = w;
     this.cache.clear();
@@ -1807,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 = "";
@@ -1970,10 +1973,16 @@ export class App {
       this.model = host.model ?? "";
     } catch (e) { this.log(`[app] host.describe: ${e.message}`); }
     await this.refreshSessions();
-    // Open on a blank session at the launch directory (reusing an existing
-    // draft when available) so the blank-session homepage shows immediately
-    // instead of a fully empty chat area.
-    if (!this.currentSession) {
+    // A /restart handoff carries the session to reopen: resume it instead of
+    // minting a fresh blank session (which was leaking a stray "new session"
+    // into 未分组 on every restart).
+    const resumeId = process.env.DSH_TUI_RESUME_SESSION;
+    if (resumeId && this.sessions.some((s) => s.sessionId === resumeId)) {
+      await this.openSession(resumeId);
+    } else if (!this.currentSession) {
+      // Open on a blank session at the launch directory (reusing an existing
+      // draft when available) so the blank-session homepage shows immediately
+      // instead of a fully empty chat area.
       await this.newSessionIn(null);
     }
     this.api.connectMux();
@@ -2488,7 +2497,10 @@ export class App {
     try {
       const { spawn } = await import("node:child_process");
       const argv = process.argv.slice(1);
-      const child = spawn("sh", ["-c", 'sleep 1; exec "$@"', "sh", ...argv], { detached: true, stdio: "inherit" });
+      // hand the CURRENT session to the new instance so it reopens it instead
+      // of minting a fresh blank session (the "strange new session" in 未分组)
+      const env = { ...process.env, DSH_TUI_RESUME_SESSION: this.currentSession ?? "" };
+      const child = spawn("sh", ["-c", 'sleep 1; exec "$@"', "sh", ...argv], { detached: true, stdio: "inherit", env });
       child.unref();
     } catch (e) {
       this.toast(`重启失败: ${e.message}（请手动重启）`);
@@ -2838,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

@@ -253,6 +253,11 @@ export class Input extends Widget {
     this.border = opts.border ?? T.BORDER2;
     this.multi = opts.multi ?? false;
     this.maxLines = opts.maxLines ?? 6;
+    this.baseMaxLines = this.maxLines; // restored when the input collapses
+    this.expanded = false;             // Ctrl+L: drop the line cap and fill the window
+    this.app = opts.app ?? null;
+    this.pendingPaste = null;          // large-paste stage 1: held-back clipboard text
+    this.pendingPlaceholder = null;    // the "[已复制 N 行内容]" marker currently shown
     this.onChange = opts.onChange ?? null;
     this.allowEmptyEnter = opts.allowEmptyEnter ?? false;
     this.history = [];
@@ -313,6 +318,7 @@ export class Input extends Widget {
   /** Rendered height: 1, or wrapped rows capped at maxLines when multi. */
   height() { return this.multi ? Math.max(1, Math.min(this.maxLines, this.#visualRows().length)) : 1; }
   setValue(v, opts = {}) {
+    this.#touch();
     this.value = String(v);
     this.cursor = this.#cps().length;
     this.selectAll = Boolean(opts.select);  // first insert/text replaces the whole value
@@ -416,15 +422,45 @@ export class Input extends Widget {
     }
     return false;
   }
+  /** Any manual edit cancels the held-back paste (the placeholder stays as
+   *  ordinary text). */
+  #touch() { this.pendingPaste = null; this.pendingPlaceholder = null; }
+  /** Claude-Code-style two-stage paste: the first Ctrl+Shift+V of a large
+   *  clipboard shows a "[已复制 N 行内容]" placeholder; pasting the same
+   *  content again inserts it in full, like a normal paste. */
+  #paste(text) {
+    text = String(text ?? "");
+    const large = text.includes("\n") || text.length > 300;
+    if (large) {
+      if (this.pendingPaste && this.pendingPaste.text === text) {
+        const full = this.pendingPaste.text;
+        const placeholder = this.pendingPlaceholder;
+        this.#touch();
+        if (this.value === placeholder) this.setValue(full);
+        else this.insert(full);
+        this.app?.toast?.("已粘贴完整内容");
+        return true;
+      }
+      const lines = text.split("\n").length;
+      this.pendingPaste = { text };
+      this.pendingPlaceholder = `[已复制 ${lines} 行内容]`;
+      this.insert(this.pendingPlaceholder);
+      this.app?.toast?.("再次 Ctrl+Shift+V 粘贴完整内容（Ctrl+L 展开输入栏）");
+      return true;
+    }
+    this.#touch();
+    this.insert(text);
+    return true;
+  }
   onKey(ev) {
-    if (ev.type === "text") { this.insert(ev.text); return true; }
+    if (ev.type === "text") { return this.#paste(ev.text ?? ""); }
     if (ev.type !== "key") return false;
     switch (ev.name) {
       case "backspace":
-        if (this.cursor > 0) { this.#deleteAt(this.cursor - 1); this.cursor--; this.onChange?.(); }
+        if (this.cursor > 0) { this.#touch(); this.#deleteAt(this.cursor - 1); this.cursor--; this.onChange?.(); }
         return true;
       case "delete":
-        if (this.cursor < this.#cps().length) { this.#deleteAt(this.cursor); this.onChange?.(); }
+        if (this.cursor < this.#cps().length) { this.#touch(); this.#deleteAt(this.cursor); this.onChange?.(); }
         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;
@@ -463,8 +499,18 @@ export class Input extends Widget {
         if (ev.ctrl) {
           switch (ev.key) {
             case "j": if (this.multi) { this.insert("\n"); return true; } return false;
-            case "u": this.value = this.#cps().slice(this.cursor).join(""); this.cursor = 0; this.onChange?.(); return true;
-            case "k": this.value = this.#cps().slice(0, this.cursor).join(""); this.onChange?.(); return true;
+            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": {
+              // expand/collapse the input: expanded drops the 6-line cap and
+              // lets the editor fill the window above the input
+              this.expanded = !this.expanded;
+              this.maxLines = this.expanded ? 1000 : this.baseMaxLines;
+              this.onChange?.();
+              this.app?.toast?.(this.expanded ? "输入栏已展开（Ctrl+L 折叠）" : "输入栏已折叠（Ctrl+L 展开）");
+              return true;
+            }
             case "a": this.cursor = 0; return true;
             case "e": this.cursor = this.#cps().length; return true;
             case "w": {
@@ -481,6 +527,7 @@ export class Input extends Widget {
           }
           return false;
         }
+        this.#touch();
         this.insert(ev.text);
         return true;
       case "enter":