dsh-neotui 0.0.31 → 0.0.33

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "dsh-neotui",
-  "version": "0.0.31",
+  "version": "0.0.33",
   "description": "Neo-TUI: mouse-driven terminal UI client for DeepSeek Harness (B-tier per dsh-tui-design.md)",
   "type": "module",
-  "bin": { "dsh-neotui": "bin/dsh-tui.js" },
+  "bin": {
+    "dsh-neotui": "bin/dsh-tui.js"
+  },
   "exports": {
     ".": "./src/index.js",
     "./package.json": "./package.json"

package/src/md.js

@@ -160,7 +160,8 @@ function highlightLine(line, lang) {
 // ---- block renderer ----
 // Returns array of lines; each line = array of segments.
 
-export function renderMd(text, width) {
+export function renderMd(text, width, sink = null, opts = {}) {
+  const hardBreaks = !!opts.hardBreaks;
   const lines = [];
   const pushLine = (segs = []) => {
     if (segs.length === 0) segs = [SEG(" ")];
@@ -178,8 +179,15 @@ export function renderMd(text, width) {
 
   const flushPara = () => {
     if (para.length === 0) return;
-    const segs = parseInline(para.join(" "));
-    lines.push(...wrapSegs(segs, width));
+    if (hardBreaks) {
+      // verbatim line breaks: each source line renders on its own row
+      for (const line of para) {
+        lines.push(...wrapSegs(parseInline(line), width));
+      }
+    } else {
+      const segs = parseInline(para.join(" "));
+      lines.push(...wrapSegs(segs, width));
+    }
     para = [];
   };
   const flushQuote = () => {
@@ -246,10 +254,19 @@ export function renderMd(text, width) {
         const codeLines = codeBuf.length === 0 ? [""] : codeBuf;
         let maxLen = Math.max(...codeLines.map((l) => strWidth(l)), 1);
         const barW = Math.min(hw, maxLen + 2);
-        // a fence WITHOUT a language gets no label — the bare "text" tag next
-        // to the box corner just looks like a rendering artifact
+        // web-style box with a click-to-copy button in the top-right corner;
+        // a fence WITHOUT a language gets no label (the bare "text" tag next
+        // to the corner looked like a rendering artifact)
+        const btn = "[复制]";
+        const btnW = strWidth(btn);
+        const topLen = Math.max(1, barW - btnW - 4);
         const tag = lang && lang !== "text" ? " " + lang : "";
-        lines.push([SEG("┌" + "─".repeat(Math.max(1, barW - 2)) + "┐" + tag, { fg: C.hr })]);
+        if (sink?.codeBlocks) sink.codeBlocks.push({ text: codeBuf.join("\n"), lineIdx: lines.length, lang });
+        lines.push([
+          SEG("┌" + "─".repeat(topLen) + " ", { fg: C.hr }),
+          SEG(btn, { fg: C.link, bold: true, copyCode: codeBuf.join("\n") }),
+          SEG(" ┐" + tag, { fg: C.hr }),
+        ]);
         for (const cl of codeLines) {
           const hls = highlightLine(cl, lang);
           lines.push([SEG("│ ", { fg: C.hr }), ...wrapSegs(hls, hw, { pad: true }).map((l) => l).flatMap((l, k) => (k === 0 ? l : [SEG("  ", { fg: C.hr }), ...l])), SEG(" │", { fg: C.hr })]);

package/src/term.js

@@ -29,6 +29,7 @@ export class Term {
     this.onEvent = onEvent ?? (() => {});
     this.onResize = onResize ?? (() => {});
     this.kitty = kitty;
+    this.kittyActive = false;  // set when the terminal answers the CSI ? u query
     this.decoder = new StringDecoder("utf8");
     this.buf = "";
     this.started = false;
@@ -52,7 +53,7 @@ export class Term {
     o.write("\x1b[?1006h"); // SGR extended coordinates
     o.write("\x1b[?2004h"); // bracketed paste
     o.write("\x1b[?7l");    // no autowrap (we clip ourselves)
-    if (this.kitty) o.write("\x1b[>1u"); // kitty: disambiguate escape codes
+    if (this.kitty) { o.write("\x1b[>1u"); o.write("\x1b[?u"); }
     this.resizeHandler = () => this.#resize();
     process.on("SIGWINCH", this.resizeHandler);
     this.#resize();
@@ -206,7 +207,13 @@ export class Term {
       this.#mouse(params, final);
       return;
     }
-    if (prefix === "?") return; // private responses (cursor pos, kitty flags) — ignored
+    if (prefix === "?") {
+      // CSI ? flags u — the terminal answered our kitty-protocol query, so
+      // it DOES honor the protocol (WezTerm etc. reply with the flags it
+      // supports; terminals with the feature off reply nothing at all).
+      if (final === "u") this.kittyActive = true;
+      return; // other private responses (cursor pos) stay ignored
+    }
     if (prefix === ">") return;
     if (final === "Z") { // Shift+Tab (backtab)
       this.#emit({ type: "key", name: "backtab", ctrl: false, alt: false, shift: true });
@@ -244,8 +251,13 @@ export class Term {
   }
 
   #kittyKey(params) {
-    const [cp = 0, mod = 1] = params.split(";").filter((s) => s !== "").map(Number);
-    const ctrl = !!(mod & 4), alt = !!(mod & 2), shift = !!(mod & 1);
+    // kitty: CSI code[:alternates] ; modifiers[:event-type] u — the modifier
+    // value is 1 + the bitmask (shift=1, alt=2, ctrl=4), and the event-type
+    // sub-field (press/repeat/release) rides after a colon on the modifier.
+    const [cpRaw = "0", modRaw = "1"] = params.split(";");
+    const cp = Number(String(cpRaw).split(":")[0]) || 0;
+    const m = (Number(String(modRaw).split(":")[0]) || 1) - 1;
+    const ctrl = !!(m & 4), alt = !!(m & 2), shift = !!(m & 1);
     let name = KITTY_KEY_NAMES[cp];
     if (name === "tab" && shift) name = "backtab";
     if (name) {

package/src/views.js

@@ -582,7 +582,7 @@ export class ChatView extends Widget {
       x: this.x, y: this.y + this.h - 2, w: this.w, h: 1,
       multi: true, maxLines: 6,
       bg: T.PANEL,
-      placeholder: "输入消息…（Ctrl+J 换行，Enter 发送）",
+      placeholder: "输入消息…（Shift+Enter / Ctrl+J 换行，Enter 发送）",
       onEnter: (v) => this.send(v),
       onChange: () => this.inputChanged(),
     });
@@ -594,6 +594,7 @@ export class ChatView extends Widget {
     this.pressY = null;
     this.pressInfo = null;  // hit identity locked at press time
     this.pressCtx = null;
+    this.pressX = null;
     this.selStart = null;
     this.selEnd = null;
     this.stepState = { step: null }; // step/start tracking for the mux merge path
@@ -871,7 +872,7 @@ export class ChatView extends Widget {
    *  shift the hit identity between press and release (the 4-line mystery:
    *  the rendered frame and the hit test were consistent, but the identity
    *  was re-resolved at release against a stream that had moved). */
-  #anchorCtx(info, pressY = null) {
+  #anchorCtx(info, pressY = null, pressX = null) {
     const lineKey = (m) => (m ? `${m.nodeIdx}:${m.blockIdx ?? "n"}` : null);
     const topKey = lineKey(this.lineMap[this.view.scrollY]) ?? null;
     let topFirst = -1;
@@ -893,7 +894,24 @@ export class ChatView extends Widget {
     const preHeaderIdx = info ? firstNonEmpty(match) : -1;
     const preHeaderRow = preHeaderIdx >= 0 ? preHeaderIdx - this.view.scrollY : null;
     const pressRow = pressY !== null && pressY !== undefined && pressY >= 0 ? pressY - this.view.scrollY : null;
-    return { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow };
+    // the segment under the cursor at PRESS time (code-block [复制] hit test):
+    // re-resolving it at release would let a streaming rebuild move the line
+    const pressSeg = pressY !== null && pressY !== undefined && pressY >= 0 ? this.#segAtLine(pressY, pressX) : null;
+    return { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow, pressX, pressSeg };
+  }
+
+  /** The line-segment under a screen x on a rendered line (for the code
+   *  block's [复制] button hit test). */
+  #segAtLine(y, x) {
+    const line = this.lines[y];
+    if (!line || x == null || x < 0) return null;
+    let px = this.view.x;
+    for (const g of line) {
+      const w = strWidth(g.t ?? "");
+      if (x >= px && x < px + w) return g;
+      px += w;
+    }
+    return null;
   }
 
   /** Toggle the block/node under a line-mark, then re-anchor the viewport.
@@ -908,7 +926,18 @@ export class ChatView extends Widget {
     }
     const node = this.nodes[info.nodeIdx];
     if (!node) return false;
-    const { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow } = ctx ?? this.#anchorCtx(info);
+    const { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow, pressX, pressSeg } = ctx ?? this.#anchorCtx(info);
+    // code block [复制] button: copy the raw code, no toggle (hit identity
+    // and segment locked at press time)
+    if (pressSeg?.copyCode) {
+      this.app.copyText(pressSeg.copyCode);
+      this.app.toast("已复制代码块");
+      return true;
+    }
+    // formal text blocks are NOT collapsible: clicking them is a no-op
+    if (node.kind === "assistant" && info.blockIdx !== null && node.blocks[info.blockIdx]?.kind === "text") {
+      return true;
+    }
     let collapsing = false;
     if (process.env.DSH_TUI_DEBUG_CLICK) {
       this.#clickLog(`toggle mark=${JSON.stringify(info)} kind=${node.kind} blockIdx=${info.blockIdx} preHeaderRow=${preHeaderRow} topKey=${topKey} topOffset=${topOffset}`);
@@ -963,6 +992,14 @@ export class ChatView extends Widget {
           collapsing = open;
           if (open) { this.expanded.delete(key); this.collapsedBlocks.add(key); }
           else { this.collapsedBlocks.delete(key); this.expanded.add(key); }
+        } else if (b.kind === "tool") {
+          // same two-state override, driven by bashMode: in all-collapsed
+          // mode (b) a click expands this block alone; a second click folds
+          // it again — never a no-op.
+          const open = this.expanded.has(key) || (this.bashMode !== "collapsed" && !this.collapsedBlocks.has(key));
+          collapsing = open;
+          if (open) { this.expanded.delete(key); this.collapsedBlocks.add(key); }
+          else { this.collapsedBlocks.delete(key); this.expanded.add(key); }
         } else {
           collapsing = !this.collapsedBlocks.has(key);
           if (this.collapsedBlocks.has(key)) this.collapsedBlocks.delete(key);
@@ -1062,7 +1099,9 @@ export class ChatView extends Widget {
           // message text starts on that same line (no blank first row).
           const prefix = userPrefix();
           const pw = strWidth(prefix);
-          const md = renderMd(shown, Math.max(10, w - 4 - pw));
+          // The user's own submitted text keeps its line breaks verbatim
+          // (what they typed is what they see); only the width wraps.
+          const md = renderMd(shown, Math.max(10, w - 4 - pw), null, { hardBreaks: true });
           if (md.length === 0) {
             lines.push([{ t: "  " + prefix, fg: K.OK, bold: true }]);
             mark(realIdx);
@@ -1125,7 +1164,7 @@ export class ChatView extends Widget {
               sep();
             } else if (b.kind === "tool") {
               const key = `${realIdx}:${bi}`;
-              const open = this.bashMode !== "collapsed" && !this.collapsedBlocks.has(key);
+              const open = this.expanded.has(key) || (this.bashMode !== "collapsed" && !this.collapsedBlocks.has(key));
               const exitCode = b.view?.view?.exitCode;
               // A tool only TICKS while its turn is live. A finalized turn
               // whose result never matched (orphan) must freeze at 无结果 —
@@ -1181,27 +1220,20 @@ export class ChatView extends Widget {
               sep();
             } else {
               beginCard("CARD");
-              // Text blocks collapse per-block like tool/reasoning blocks:
-              // collapsed shows a 3-line preview + trailer, expanded the whole
-              // text. Clicking (or the right-click 展开/折叠) toggles it.
+              // FORMAL text output is NOT collapsible — the user's message
+              // content must stay readable; only think/tool blocks fold.
+              // Code blocks inside render as boxes with a [复制] button.
               const key = `${realIdx}:${bi}`;
-              const open = !this.collapsedBlocks.has(key);
               const text = b.text ?? "";
-              const glyph = open ? "▾" : "▸";
               const mdW = Math.max(10, w - 6 - strWidth(stepTag));
-              const md = open
-                ? renderMd(text, mdW)
-                : renderMd(truncateText(text, 600), mdW).slice(0, 3);
+              const sink = { codeBlocks: [] };
+              const md = renderMd(text, mdW, sink);
               if (md.length > 0) {
-                lines.push([{ t: "  " }, { t: glyph + " ", fg: K.FAINT }, { t: stepTag, fg: K.FAINT }, ...md[0]]);
+                lines.push([{ t: "  " }, { t: stepTag, fg: K.FAINT }, ...md[0]]);
                 mark(realIdx, bi);
                 for (const ln of md.slice(1)) { lines.push([{ t: "  " }, ...ln]); mark(realIdx, bi); }
               } else {
-                lines.push([{ t: "  " + glyph + " " + stepTag, fg: K.FAINT }]);
-                mark(realIdx, bi);
-              }
-              if (!open && text.length > 0) {
-                lines.push([{ t: `  …共 ${text.length} 字（点击展开）`, fg: K.FAINT }]);
+                lines.push([{ t: "  " + stepTag, fg: K.FAINT }]);
                 mark(realIdx, bi);
               }
               sep();
@@ -1365,7 +1397,8 @@ export class ChatView extends Widget {
         // between press and release, so resolving the block at release would
         // toggle a block a few lines away from the one the user saw.
         this.pressInfo = this.lineMap?.[this.pressY] ?? null;
-        this.pressCtx = this.pressInfo ? this.#anchorCtx(this.pressInfo, this.pressY) : null;
+        this.pressX = ev.x;
+        this.pressCtx = this.pressInfo ? this.#anchorCtx(this.pressInfo, this.pressY, ev.x) : null;
         if (process.env.DSH_TUI_DEBUG_CLICK) {
           const t = this.lines[this.pressY]?.map((g) => g.t).join("") ?? "";
           this.#clickLog(`press screenY=${ev.y} screenX=${ev.x} lineIdx=${this.pressY} mark=${JSON.stringify(this.pressInfo)} text="${t.slice(0, 40)}" scrollY=${this.view.scrollY} viewY=${this.view.y} viewH=${this.view.h} assumedH=${this.app.screen?.h} assumedW=${this.app.screen?.w} ttyRows=${process.stdout.rows} ttyCols=${process.stdout.columns} inputY=${this.input.y} inputH=${this.input.h} todoH=${this.todoHeight()} footerH=${this.app.footerHeight?.() ?? "?"}`);
@@ -1407,8 +1440,11 @@ export class ChatView extends Widget {
           const node = this.nodes[info.nodeIdx];
           const items = [
             { label: "复制消息", action: () => this.app.copyNode(info.nodeIdx) },
-            { label: "展开 / 折叠", action: () => this.#toggleAt(info) },
           ];
+          const clickedBlock = node?.kind === "assistant" && info.blockIdx !== null ? node.blocks[info.blockIdx] : null;
+          if (clickedBlock?.kind !== "text") {
+            items.push({ label: "展开 / 折叠", action: () => this.#toggleAt(info) });
+          }
           if (node?.id) {
             items.push({ label: "转跳轨迹", action: () => this.app.jumpToTrajectoryNode(info.nodeIdx) });
           }
@@ -1457,6 +1493,7 @@ export class ChatView extends Widget {
     if (ev.name === "char" && ev.key === "/" && !ev.ctrl) { this.app.startSearch(); return true; }
     if (ev.name === "char" && ev.key === "b" && !ev.ctrl) {
       this.bashMode = this.bashMode === "collapsed" ? "expanded" : "collapsed";
+      this.expanded.clear();
       this.collapsedBlocks.clear();
       this.app.toast(this.bashMode === "collapsed" ? "工具块：折叠（b 展开）" : "工具块：展开（b 折叠）");
       this.queueRebuild();
@@ -1831,6 +1868,17 @@ export class App {
     this.api.onHostFrame = (frame) => this.#onHostFrame(frame);
     this.api.onStateChange = (s) => { this.connState = s; this.redraw(); };
     this.#startPolling();
+    // WezTerm ships with enable_kitty_keyboard = false: the terminal ignores
+    // our CSI > 1u request AND the CSI ? u query, so Shift+Enter arrives as a
+    // plain CR (indistinguishable from Enter). Detect the dead query and say
+    // so once, instead of letting Shift+Enter silently submit.
+    if (this.term?.kitty && !this.term?.kittyActive) {
+      setTimeout(() => {
+        if (!this.term?.kittyActive) {
+          this.toast("终端未开启 kitty 键盘协议：Shift+Enter 换行不可用（可用 Ctrl+J）。WezTerm 请在配置中设置 enable_kitty_keyboard = true 后重启终端");
+        }
+      }, 1500);
+    }
   }
 
   async refreshSessions() {
@@ -2124,6 +2172,19 @@ export class App {
     this.refreshSessions();
   }
 
+  /** ESC 打断: cancel the current turn if it is running. The chat's live
+   *  `running` flag (jobs mux frames + streaming nodes) is the fast source;
+   *  the (≤5s-fresh) session list is the fallback. Returns true if a cancel
+   *  request was actually sent. */
+  #interruptIfRunning() {
+    if (!this.currentSession) return false;
+    const running = this.chat.running || !!this.sessions.find((s) => s.sessionId === this.currentSession)?.running;
+    if (!running) return false;
+    this.cancelSession({ sessionId: this.currentSession });
+    this.toast("已请求中断当前回合");
+    return true;
+  }
+
   async newSessionIn(group = null) {
     // Reuse an existing empty draft instead of minting a fresh blank session on
     // every "new session" click (this is how the meaningless blank sessions pile
@@ -2597,8 +2658,11 @@ export class App {
       // typing and Ctrl+J / Shift+Enter newlines behave like a normal editor.
       if (this.focused === this.chat.input) {
         if (ev.name === "escape") {
+          // one ESC press: interrupt a running turn AND leave insert —
+          // otherwise the key just exits insert (vim muscle memory).
+          const interrupted = this.#interruptIfRunning();
           this.focus(this.chat);
-          this.toast("已退出输入（i 重新进入）");
+          if (!interrupted) this.toast("已退出输入（i 重新进入）");
         } else {
           this.chat.input.onKey(ev);
         }
@@ -2648,13 +2712,11 @@ export class App {
       if (ev.name === "char" && ev.key === "/" && !ev.ctrl && this.focused !== this.chat.input) { this.startSearch(); this.redraw(); return; }
       if (ev.name === "char" && ev.key === "n" && !ev.ctrl && this.focused === this.sidebar) { this.newSession(); return; }
       if (ev.name === "escape") {
+        // Esc in NORMAL mode interrupts a running turn (one press, regardless
+        // of focus); otherwise it steps back toward the chat view.
+        if (this.#interruptIfRunning()) return;
         if (this.focused === this.sidebar) { this.focus(this.chat); this.redraw(); }
-        else {
-          // Esc in NORMAL mode interrupts a running turn (insert→normal→interrupt).
-          const cur = this.sessions.find((s) => s.sessionId === this.currentSession);
-          if (cur?.running) { this.cancelSession(cur); this.toast("已请求中断当前回合"); }
-          else if (this.mode !== "chat") this.setMode("chat");
-        }
+        else if (this.mode !== "chat") this.setMode("chat");
         return;
       }
       if (ev.name === "char" && ev.key === "i" && this.focused === this.sidebar) { this.focus(this.chat.input); this.redraw(); return; }