dsh-neotui 0.0.32 → 0.1.0

package/package.json

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

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, sink = null) {
+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, sink = null) {
 
   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 = () => {
@@ -244,26 +252,31 @@ export function renderMd(text, width, sink = null) {
         const lang = inCode || "text";
         const hw = Math.max(2, width - 4);
         const codeLines = codeBuf.length === 0 ? [""] : codeBuf;
-        let maxLen = Math.max(...codeLines.map((l) => strWidth(l)), 1);
-        const barW = Math.min(hw, maxLen + 2);
-        // 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)
+        if (sink?.codeBlocks) sink.codeBlocks.push({ text: codeBuf.join("\n"), lineIdx: lines.length, lang });
+        // Fixed-width box: EVERY row is exactly (hw + 4) columns wide —
+        // top `┌…[复制]…┐`, content `│ … │`, bottom `└…┘` — so the corners
+        // always sit above the vertical bars, never above the code text.
         const btn = "[复制]";
         const btnW = strWidth(btn);
-        const topLen = Math.max(1, barW - btnW - 4);
+        const inner = hw + 2;                       // columns between the corners
+        const leftLen = Math.max(1, inner - btnW - 2);
         const tag = lang && lang !== "text" ? " " + lang : "";
-        if (sink?.codeBlocks) sink.codeBlocks.push({ text: codeBuf.join("\n"), lineIdx: lines.length, lang });
         lines.push([
-          SEG("┌" + "─".repeat(topLen) + " ", { fg: C.hr }),
+          SEG("┌" + "─".repeat(leftLen) + " ", { 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 })]);
+          for (const row of wrapSegs(hls, hw)) {
+            const rowW = strWidth(row.map((g) => g.t ?? "").join(""));
+            const segs = [SEG("│ ", { fg: C.hr }), ...row];
+            if (rowW < hw) segs.push(SEG(" ".repeat(hw - rowW)));
+            segs.push(SEG(" │", { fg: C.hr }));
+            lines.push(segs);
+          }
         }
-        lines.push([SEG("└" + "─".repeat(Math.max(1, barW - 2)) + "┘", { fg: C.hr })]);
+        lines.push([SEG("└" + "─".repeat(inner) + "┘", { fg: C.hr })]);
         inCode = null;
       }
       i++;

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/theme.js

@@ -56,7 +56,7 @@ function themeFile() {
   return join(base, "tui-theme.txt");
 }
 
-let current = "dark";
+let current = "gruvbox";
 const ORDER = ["dark", "light", "gruvbox"];
 
 try {

package/src/views.js

@@ -566,7 +566,7 @@ export class ChatView extends Widget {
     this.expandedTools = new Set();
     this.collapsedBlocks = new Set(); // per-block COLLAPSE (default expanded): `${realIdx}:${bi}`
     this.thinkMode = "expanded";        // think blocks: expanded by default (t toggles)
-    this.bashMode = "expanded";         // tool blocks: expanded | collapsed (b toggles)
+    this.bashMode = "collapsed";        // tool blocks: collapsed by default (b toggles)
     this.todosVisible = true;           // todo block above the input (Shift+T toggles)
     this.todoSeen = false;             // once seen, the todo box keeps its height
     this.running = false;
@@ -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(),
     });
@@ -897,7 +897,20 @@ export class ChatView extends Widget {
     // 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 };
+    // press-time BLOCK signature: the streaming tail re-derives between press
+    // and release (syncTail replaces the block objects), so the positional
+    // nodeIdx:blockIdx key can drift; the signature lets release re-locate
+    // the same block by content instead.
+    let pressSig = null;
+    if (info && info.blockIdx !== null) {
+      const b = this.nodes[info.nodeIdx]?.blocks?.[info.blockIdx];
+      if (b) pressSig = {
+        nodeId: this.nodes[info.nodeIdx]?.id ?? null,
+        kind: b.kind,
+        prefix: String(b.text ?? b.args ?? "").slice(0, 40),
+      };
+    }
+    return { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow, pressX, pressSeg, pressSig };
   }
 
   /** The line-segment under a screen x on a rendered line (for the code
@@ -924,9 +937,9 @@ export class ChatView extends Widget {
       const ref = node?.images?.[info.imgIdx];
       if (ref) { this.app.openImage(ref, { all: node.images, index: info.imgIdx }); return true; }
     }
-    const node = this.nodes[info.nodeIdx];
+    let node = this.nodes[info.nodeIdx];
     if (!node) return false;
-    const { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow, pressX, pressSeg } = ctx ?? this.#anchorCtx(info);
+    const { lineKey, topKey, topFirst, topOffset, match, firstNonEmpty, preHeaderIdx, preHeaderRow, pressY, pressRow, pressX, pressSeg, pressSig } = ctx ?? this.#anchorCtx(info);
     // code block [复制] button: copy the raw code, no toggle (hit identity
     // and segment locked at press time)
     if (pressSeg?.copyCode) {
@@ -934,6 +947,31 @@ export class ChatView extends Widget {
       this.app.toast("已复制代码块");
       return true;
     }
+    // The stream re-derives between press and release: if the positional
+    // block no longer matches the press-time signature, re-locate the SAME
+    // block by kind + content prefix (node id when the node carries one).
+    if (pressSig && info.blockIdx !== null) {
+      const cur = node.blocks?.[info.blockIdx];
+      const same = cur && cur.kind === pressSig.kind && String(cur.text ?? cur.args ?? "").slice(0, 40) === pressSig.prefix;
+      if (!same) {
+        let found = null;
+        for (let ni = 0; ni < this.nodes.length && !found; ni++) {
+          const n = this.nodes[ni];
+          if (pressSig.nodeId && n?.id && n.id !== pressSig.nodeId) continue;
+          for (let bi = 0; bi < (n?.blocks ?? []).length; bi++) {
+            const b = n.blocks[bi];
+            if (b.kind === pressSig.kind && String(b.text ?? b.args ?? "").slice(0, 40) === pressSig.prefix) {
+              found = { nodeIdx: ni, blockIdx: bi };
+              break;
+            }
+          }
+        }
+        if (found) {
+          info = { ...info, ...found };
+          node = this.nodes[found.nodeIdx];
+        }
+      }
+    }
     // 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;
@@ -992,6 +1030,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);
@@ -1091,7 +1137,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);
@@ -1154,7 +1202,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 无结果 —
@@ -1212,18 +1260,33 @@ export class ChatView extends Widget {
               beginCard("CARD");
               // 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.
+              // The 🐳 marker distinguishes formal output from 💭 think and
+              // ▸ tool blocks at a glance. Code blocks inside render as boxes
+              // with a [复制] button.
               const key = `${realIdx}:${bi}`;
               const text = b.text ?? "";
               const mdW = Math.max(10, w - 6 - strWidth(stepTag));
               const sink = { codeBlocks: [] };
               const md = renderMd(text, mdW, sink);
+              const whale = { t: "  🐳", fg: K.ACCENT, bold: true };
+              const step = { t: stepTag || " ", fg: K.FAINT };
               if (md.length > 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); }
+                // When the message STARTS with a code box, the whale+step
+                // marker gets its own line so the box's top border keeps the
+                // same indent as its content rows (corners over bars, not
+                // shifted right by the marker).
+                const firstIsBoxTop = md[0].some((g) => g.copyCode);
+                if (firstIsBoxTop) {
+                  lines.push([whale, step]);
+                  mark(realIdx, bi);
+                  for (const ln of md) { lines.push([{ t: "  " }, ...ln]); mark(realIdx, bi); }
+                } else {
+                  lines.push([whale, step, ...md[0]]);
+                  mark(realIdx, bi);
+                  for (const ln of md.slice(1)) { lines.push([{ t: "  " }, ...ln]); mark(realIdx, bi); }
+                }
               } else {
-                lines.push([{ t: "  " + stepTag, fg: K.FAINT }]);
+                lines.push([whale, step]);
                 mark(realIdx, bi);
               }
               sep();
@@ -1483,6 +1546,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();
@@ -1857,6 +1921,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() {
@@ -2150,6 +2225,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
@@ -2623,8 +2711,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);
         }
@@ -2674,13 +2765,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; }