dsh-neotui 0.1.4 → 0.1.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "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"); }],
@@ -1386,6 +1387,7 @@ export class JobsPanel extends Popup {
       title: "后台任务（Ctrl+J 查看详情）", lines: [],
       buttons: [{ label: "关闭(q)", action: "close" }],
       onAction: () => app.closeOverlay(),
+      scrollable: true, // expanded details scroll instead of being clipped
     });
     this.app = app;
     this.jobs = jobs;
@@ -1394,19 +1396,44 @@ export class JobsPanel extends Popup {
     this.rowOf = [];           // rendered line → job index (-1 = chrome/detail)
     this.rebuild();
   }
+  /** Width-aware character cut (no ellipsis — continuation chunks follow). */
+  static #cutWidth(s, w) {
+    let out = "", cw = 0;
+    for (const ch of s) {
+      const c = strWidth(ch);
+      if (cw + c > w) break;
+      out += ch; cw += c;
+    }
+    return out;
+  }
   #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).
+    const names = { label: "命令", detail: "结果", startedAt: "开始于", finishedAt: "结束于" };
     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;
+      if (["status", "kind"].includes(k)) continue;
       const s = v !== null && typeof v === "object" ? JSON.stringify(v) : String(v ?? "");
       if (s === "") continue;
-      lines.push([{ t: `      ${k}: ${truncate(s, this.w - 14)}`, fg: K.DIM }]);
-      if (lines.length > 8) break;
+      const key = names[k] ?? k;
+      let rest = s;
+      let first = true;
+      while (rest.length > 0 || first) {
+        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);
+        first = false;
+        if (lines.length > 200) break; // pathological safety, never reached in practice
+      }
     }
     return lines;
   }
   rebuild() {
-    let lines = [[{ t: "  这些任务在后台运行,不阻塞会话 — Enter/→/l 展开,←/h 折叠,q 关闭", fg: K.DIM }]];
+    let lines = [[{ t: "  这些任务在后台运行,不阻塞会话 — Enter/→/l 展开,←/h 折叠,PgUp/PgDn 滚动,q 关闭", fg: K.DIM }]];
     const rowOf = [-1];
     const jobs = this.jobs;
     if (jobs.length === 0) {
@@ -1427,11 +1454,19 @@ export class JobsPanel extends Popup {
       rowOf.push(i);
       if (open) for (const fl of this.#detailLines(j)) { lines.push(fl); rowOf.push(-1); }
     }
-    if (lines.length > this.h - 3) {
-      lines = [...lines.slice(0, this.h - 4), [{ t: `  …共 ${jobs.length} 个任务`, fg: K.FAINT }]];
-    }
+    // keep the full content — the panel scrolls now (no more hard clip)
     this.lines = lines;
     this.rowOf = rowOf;
+    this.#ensureVisible();
+  }
+  /** Keep the selected job row inside the scrollable viewport. */
+  #ensureVisible() {
+    const avail = this.contentRows();
+    const row = this.rowOf.findIndex((r) => r === this.sel);
+    if (row < 0) return;
+    if (row < this.scrollY) this.scrollY = row;
+    else if (row >= this.scrollY + avail) this.scrollY = row - avail + 1;
+    this.scrollY = Math.max(0, Math.min(this.scrollY, this.maxScroll()));
   }
   #toggle(i) {
     if (this.expanded.has(i)) this.expanded.delete(i);
@@ -1459,7 +1494,7 @@ export class JobsPanel extends Popup {
     return super.onKey(ev);
   }
   onMouse(ev) {
-    if (super.onMouse(ev)) return true; // buttons
+    if (super.onMouse(ev)) return true; // buttons + wheel scrolling
     if (ev.kind === "press" && ev.button === 0) {
       const i = ev.y - this.y - 1;
       const jIdx = this.rowOf[i];

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();
@@ -1970,10 +1972,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 +2496,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}（请手动重启）`);

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,17 @@ 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 "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 +526,7 @@ export class Input extends Widget {
           }
           return false;
         }
+        this.#touch();
         this.insert(ev.text);
         return true;
       case "enter":
@@ -510,12 +556,23 @@ export class Popup extends Widget {
     this.btnIdx = 0;
     this.onAction = opts.onAction ?? null;
     this.fg = opts.fg;
+    // opt-in vertical scrolling: content longer than the box scrolls with
+    // PgUp/PgDn/up/down/wheel instead of being clipped away
+    this.scrollable = opts.scrollable ?? false;
+    this.scrollY = 0;
+  }
+  contentRows() {
+    // rows between the border and the buttons row
+    return this.h - 2 - (this.buttons.length ? 1 : 0);
+  }
+  maxScroll() {
+    return Math.max(0, this.lines.length - this.contentRows());
   }
   render(screen) {
     screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, " ", { bg: T.BG2 });
     screen.box(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, { fg: this.fg ?? 0x67b7ff, bg: T.BG2 }, this.title);
     let ly = this.y + 1;
-    for (const line of this.lines) {
+    const draw = (line) => {
       if (Array.isArray(line)) {
         // styled line: array of segments
         let px = this.x + 2;
@@ -532,6 +589,23 @@ export class Popup extends Widget {
         screen.text(this.x + 2, ly, truncate(String(line), this.w - 4), { fg: T.TXT, bg: T.BG2 });
       }
       ly++;
+    };
+    if (this.scrollable) {
+      const avail = this.contentRows();
+      this.scrollY = Math.max(0, Math.min(this.scrollY, this.maxScroll()));
+      const start = this.scrollY;
+      for (let i = 0; i < avail; i++) {
+        const line = this.lines[start + i];
+        if (line === undefined) break;
+        draw(line);
+      }
+      if (this.maxScroll() > 0) {
+        // "↑N" / "↓N" overflow indicators on the border row
+        if (this.scrollY > 0) screen.text(this.x + this.w - 6, this.y, ` ↑${this.scrollY}`, { fg: T.ACCENT, bg: T.BG2 });
+        if (this.scrollY < this.maxScroll()) screen.text(this.x + this.w - 8, this.y + this.h - 1, ` ↓${this.maxScroll() - this.scrollY}`, { fg: T.ACCENT, bg: T.BG2 });
+      }
+    } else {
+      for (const line of this.lines) draw(line);
     }
     // buttons on last row
     if (this.buttons.length) {
@@ -550,6 +624,10 @@ export class Popup extends Widget {
     }
   }
   onMouse(ev) {
+    if (this.scrollable) {
+      if (ev.kind === "wheel-up") { this.scrollY = Math.max(0, this.scrollY - 3); return true; }
+      if (ev.kind === "wheel-down") { this.scrollY = Math.min(this.maxScroll(), this.scrollY + 3); return true; }
+    }
     if (ev.kind === "press" && ev.button === 0 && this.buttons.length) {
       let bx = this.x + 2;
       const by = this.y + this.h - 2;
@@ -566,6 +644,10 @@ export class Popup extends Widget {
   }
   onKey(ev) {
     if (ev.type !== "key") return false;
+    if (this.scrollable) {
+      if (ev.name === "pgup") { this.scrollY = Math.max(0, this.scrollY - this.contentRows()); return true; }
+      if (ev.name === "pgdn") { this.scrollY = Math.min(this.maxScroll(), this.scrollY + this.contentRows()); return true; }
+    }
     if (ev.name === "escape") { this.onAction?.({ label: "__cancel__", action: "__cancel__" }, -1); return true; }
     if (ev.name === "tab") { this.btnIdx = (this.btnIdx + 1) % Math.max(1, this.buttons.length); return true; }
     if (ev.name === "left") { this.btnIdx = Math.max(0, this.btnIdx - 1); return true; }