dsh-neotui 0.0.33 → 0.1.1

package/package.json

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

@@ -252,26 +252,31 @@ export function renderMd(text, width, sink = null, opts = {}) {
         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/panels.js

@@ -1216,6 +1216,8 @@ export class ControlPanel extends Widget {
       ["n", "新建会话", () => this.app.newSession()],
       ["g g", "滚动到顶", () => { this.app.closeOverlay(); this.app.chat.view.scrollY = 0; }],
       ["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+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"); }],

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;
@@ -784,8 +784,8 @@ export class ChatView extends Widget {
     this.view.follow = true;
   }
 
-  async loadOlder() {
-    if (!this.hasMore || this.loadingOlder || this.minSeq == null) return;
+  async loadOlder(onDone = null) {
+    if (!this.hasMore || this.loadingOlder || this.minSeq == null) { onDone?.(); return; }
     this.loadingOlder = true;
     this.app.setStatus("加载更早记录…");
     try {
@@ -803,6 +803,51 @@ export class ChatView extends Widget {
     }
     this.loadingOlder = false;
     this.#rebuild();
+    onDone?.();
+  }
+
+  /** [ / ] — jump the viewport to the END of the previous (dir -1) or next
+   *  (dir +1) user question. `previous` walks to the question entirely above
+   *  the viewport top (loading older history first when needed); `next` walks
+   *  to the first question that starts below the viewport top. */
+  #jumpQuestion(dir) {
+    this.flushRebuild(); // lineMap must reflect the current nodes array
+    const top = this.view.scrollY;
+    const qs = [];
+    for (let i = 0; i < this.nodes.length; i++) {
+      if (this.nodes[i]?.kind !== "user") continue;
+      let first = -1, last = -1;
+      for (let li = 0; li < this.lineMap.length; li++) {
+        if (this.lineMap[li]?.nodeIdx === i) { if (first < 0) first = li; last = li; }
+      }
+      if (first < 0) continue; // node outside the rendered window
+      qs.push({ first, last });
+    }
+    let target = null;
+    if (dir < 0) {
+      for (let k = qs.length - 1; k >= 0; k--) {
+        if (qs[k].last < top) { target = qs[k]; break; }
+      }
+      if (!target && this.hasMore && this.minSeq != null) {
+        this.loadOlder(() => this.#jumpQuestion(-1)); // after the prepend, retry against the fuller window
+        return true;
+      }
+    } else {
+      target = qs.find((q) => q.first > top) ?? null;
+    }
+    if (!target) {
+      this.app.toast(dir < 0 ? "已到最早的问题" : "已到最后的问题");
+      return false;
+    }
+    // the question's last CONTENT line (skip trailing blank separator rows);
+    // put it ~3 rows into the viewport, never above the question's own start
+    let end = target.last;
+    while (end > target.first && !(this.lines[end] ?? []).some((g) => g.t.trim() !== "")) end--;
+    this.view.anchorLock = null;
+    this.view.follow = false;
+    this.view.scrollY = Math.max(0, Math.max(target.first, end - 3));
+    this.app.redraw();
+    return true;
   }
 
   onFrame(frame) {
@@ -897,7 +942,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 +982,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 +992,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;
@@ -1222,18 +1305,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();
@@ -1487,6 +1585,11 @@ export class ChatView extends Widget {
       return true;
     }
     if (ev.name === "char" && ev.key === "g" && ev.shift) { this.view.anchorLock = null; this.view.follow = true; this.view.scrollY = this.view.maxScroll(); return true; }
+    // [ / ] — jump to the end of the previous / next user question. Guarded by
+    // focus so the sidebar's session-move [ ] keys keep working there.
+    if (ev.name === "char" && (ev.key === "[" || ev.key === "]") && !ev.ctrl && !ev.shift && this.app.focused === this) {
+      return this.#jumpQuestion(ev.key === "[" ? -1 : 1);
+    }
     if (ev.name === "escape" && this.app.searchQuery) { this.app.searchQuery = null; this.queueRebuild(); return true; }
     if (ev.name === "escape" && this.selStart !== null) { this.selStart = this.selEnd = null; this.app.redraw(); return true; }
     if (ev.name === "char" && ev.key === "i" && !ev.ctrl) { this.app.focus(this.input); return true; }
@@ -1715,6 +1818,8 @@ export class App {
     this.overlay = null;       // Picker / Popup / ImagePopup modal
     this.mode = "chat";        // chat | workspace | trajectory
     this.sidebarVisible = true; // Ctrl+B hides the whole session pane (nvim-style)
+    this.sidebarWidth = 30;     // draggable divider: the session pane's column width
+    this.draggingDivider = false;
     this.feedbackMap = new Map(); // messageId → {rating, version}
     this.searchQuery = null;      // active find-in-conversation term (highlight)
     this.findQuery = null;        // term being typed in the find picker
@@ -1726,10 +1831,10 @@ export class App {
     this.skillsPanel = null;
 
     this.sidebar = new SidebarTree(this);
-    this.sidebar.w = 30;
+    this.sidebar.w = this.sidebarWidth;
     this.sidebar.h = screen.h - 1;
-    this.searchInput = new Input({ x: 0, y: 0, w: 30, h: 1, prompt: "/ ", placeholder: "搜索会话…" });
-    this.chat = new ChatView({ x: 30, y: 0, w: screen.w - 30, h: screen.h - 1, app: this });
+    this.searchInput = new Input({ x: 0, y: 0, w: this.sidebarWidth, h: 1, prompt: "/ ", placeholder: "搜索会话…" });
+    this.chat = new ChatView({ x: this.sidebarWidth, y: 0, w: screen.w - this.sidebarWidth, h: screen.h - 1, app: this });
     this.status = new StatusBar({ x: 0, y: screen.h - 1, w: screen.w, h: 1 });
     this.focus(this.chat);
     this.layout();
@@ -1742,11 +1847,12 @@ export class App {
   }
 
   layout() {
-    const x = this.sidebarVisible ? 30 : 0;
+    const x = this.sidebarVisible ? this.sidebarWidth : 0;
     const w = this.screen.w - x;
     const footerH = this.footerHeight();
     const mainH = this.screen.h - 1 - footerH;
-    this.sidebar.x = 0; this.sidebar.y = 0; this.sidebar.w = 30; this.sidebar.h = this.screen.h - 1;
+    this.sidebar.x = 0; this.sidebar.y = 0; this.sidebar.w = this.sidebarWidth; this.sidebar.h = this.screen.h - 1;
+    this.searchInput.w = this.sidebarWidth;
     this.chat.resize(x, 1, w, mainH);
     for (const p of [this.workspacePanel, this.trajectoryPanel, this.settingsPanel, this.subagentPanel, this.skillsPanel]) {
       if (p?.relayout) p.relayout(x, 1, w, mainH);
@@ -2608,7 +2714,7 @@ export class App {
     }
 
     // tab bar clicks (row 0 of the main area)
-    if (ev.type === "mouse" && ev.kind === "press" && ev.button === 0 && ev.y === 0 && ev.x >= (this.sidebarVisible ? 30 : 0)) {
+    if (ev.type === "mouse" && ev.kind === "press" && ev.button === 0 && ev.y === 0 && ev.x >= (this.sidebarVisible ? this.sidebarWidth : 0)) {
       if (this.#clickTab(ev.x)) { this.redraw(); return; }
     }
     // mouse routes by position (click = focus + dispatch)
@@ -2626,6 +2732,23 @@ export class App {
       // unhandled keys fall through to global shortcuts
     }
     if (ev.type === "mouse") {
+      // Draggable sidebar divider: press on the boundary column (±1) starts a
+      // resize; drag events (motion flag) update the width live.
+      const divX = this.sidebarVisible ? this.sidebarWidth : -1;
+      const onDivider = divX >= 0 && ev.y >= 1 && ev.x >= divX - 1 && ev.x <= divX + 1;
+      if (ev.kind === "press" && ev.button === 0 && onDivider) {
+        this.draggingDivider = true;
+        this.redraw();
+        return;
+      }
+      if (this.draggingDivider) {
+        if (ev.kind === "drag" && ev.button === 0) {
+          const nw = Math.max(14, Math.min(ev.x, Math.floor(this.screen.w * 0.6)));
+          if (nw !== this.sidebarWidth) { this.sidebarWidth = nw; this.layout(); this.redraw(); }
+          return;
+        }
+        if (ev.kind === "release" && ev.button === 0) { this.draggingDivider = false; this.redraw(); return; }
+      }
       // Pure mouse motion must never change focus/mode (vim-style: INSERT is
       // keyboard-only). It reaches just the already-focused widget (drag select).
       if (ev.motion) {