dsh-neotui 0.0.5 → 0.0.7

package/package.json

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

package/src/views.js

@@ -111,12 +111,12 @@ function diffText(oldText, newText, width) {
 
 // ---- Chat node model ----
 
-function nodeForEvents(events, log) {
-  const nodes = [];
+/** Apply ONE event onto a mutable nodes array (shared by full-window
+ *  derivation and the incremental mux merge — the two paths must agree). */
+function applyEvent(nodes, event, view, log) {
   const cur = () => nodes[nodes.length - 1];
-  for (const { event, view } of events) {
-    const d = event.data ?? {};
-    switch (event.type) {
+  const d = event.data ?? {};
+  switch (event.type) {
       case "user/message": {
         const text = partsToText(d.content ?? d.message?.content);
         const images = partsToImages(d.content ?? d.message?.content);
@@ -238,7 +238,12 @@ function nodeForEvents(events, log) {
         }
       }
     }
-  }
+}
+
+/** Re-derive the whole node list from a complete event window (open/poll). */
+function nodeForEvents(events, log) {
+  const nodes = [];
+  for (const { event, view } of events) applyEvent(nodes, event, view, log);
   return nodes;
 }
 
@@ -541,7 +546,7 @@ 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,
-      bg: T.BG2, border: T.BORDER2,
+      bg: T.PANEL,
       placeholder: "输入消息…（Ctrl+J 换行，Enter 发送）",
       onEnter: (v) => this.send(v),
       onChange: () => this.inputChanged(),
@@ -557,23 +562,13 @@ export class ChatView extends Widget {
   }
 
   /** Queue a rebuild; flushed on the next frame render (throttles streaming). */
-  /** Merge freshly arrived events (mux frames or poll results) into the tail. */
+  /** Merge freshly arrived events (mux frames) into the tail INCREMENTALLY —
+   *  each event mutates this.nodes directly via the same applyEvent the
+   *  full-window re-derivation uses, so a lone reasoning-delta appends to the
+   *  existing block instead of wiping it (the old "shows then deleted" bug). */
   mergeEvents(entries) {
-    const nodes = nodeForEvents(entries, this.app.log);
-    if (nodes.length === 0) return;
-    const last = nodes[nodes.length - 1];
-    const mine = this.nodes[this.nodes.length - 1];
-    // Only merge into the ACTIVE streaming node; a newly started turn is pushed
-    // as its own node (merging into a finalized turn would overwrite it).
-    if (last.kind === "assistant" && mine && mine.kind === "assistant" && mine.streaming) {
-      mine.blocks = last.blocks;
-      mine.images = last.images ?? mine.images;
-      mine.id = last.id ?? mine.id;
-      mine.streaming = last.streaming;
-      mine.finalized = false;
-    } else {
-      this.nodes.push(...nodes);
-      this.expanded.add(this.nodes.length - 1);
+    for (const { event, view } of entries) {
+      applyEvent(this.nodes, event, view, this.app.log);
     }
     this.running = this.nodes.some((n) => n.kind === "assistant" && n.streaming);
     this.queueRebuild();
@@ -737,6 +732,9 @@ export class ChatView extends Widget {
       this.nodes = [{ kind: "system", text: `加载失败: ${e.message}` }];
     }
     this.#rebuild();
+    // Jump to the LIVE tail (the newest content) on open — the view would
+    // otherwise sit at the top showing the oldest turns.
+    this.view.scrollY = this.view.maxScroll();
   }
 
   async loadOlder() {
@@ -1094,7 +1092,6 @@ export class ChatView extends Widget {
     const isBlank = this.app.sessions.find((s) => s.sessionId === this.sessionId)?.blank ?? false;
     if (this.nodes.length === 0 && isBlank) {
       this.#renderWelcome(screen);
-      screen.hline(this.x, this.x + this.w - 1, this.input.y - 1, "─", { fg: T.BORDER2 });
       this.input.render(screen);
       return;
     }
@@ -1120,7 +1117,6 @@ export class ChatView extends Widget {
       }
     }
     this.#renderTodos(screen);
-    screen.hline(this.x, this.x + this.w - 1, this.input.y - 1, "─", { fg: T.BORDER2 });
     this.input.render(screen);
   }
 

package/src/widgets.js

@@ -336,7 +336,6 @@ export class Input extends Widget {
     if (!this.multi) {
       // single-line: horizontal scroll (search/rename/picker inputs)
       screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y, " ", { bg: this.bg });
-      screen.hline(this.x, this.x + this.w - 1, this.y, "─", { fg: this.border, bg: this.bg });
       const promptW = strWidth(this.prompt);
       const inner = Math.max(0, this.w - promptW - 2);
       screen.text(this.x, this.y, this.prompt, { fg: T.ACCENT, bg: this.bg });
@@ -358,7 +357,6 @@ export class Input extends Widget {
     const rows = this.#visualRows();
     const h = Math.min(this.maxLines, rows.length);
     screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y + h - 1, " ", { bg: this.bg });
-    screen.hline(this.x, this.x + this.w - 1, this.y, "─", { fg: this.border, bg: this.bg });
     if (this.value === "" && this.placeholder) {
       screen.text(this.x, this.y, this.prompt, { fg: T.ACCENT, bg: this.bg });
       screen.text(this.x + strWidth(this.prompt), this.y, truncate(this.placeholder, this.w - strWidth(this.prompt) - 2), { fg: T.FAINT, bg: this.bg });