dsh-neotui 0.1.2 → 0.1.4

package/package.json

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

package/src/api.js

@@ -26,6 +26,7 @@ export class Api {
     this.onStateChange = onStateChange;
     this.ws = null;
     this.hostWs = null;
+    this.muxWs = null;
     this.closed = false;
     this.connected = false;
     this.retryDelay = 500;
@@ -82,7 +83,9 @@ export class Api {
   #connect(url, kind) {
     if (this.closed) return;
     const ws = new WebSocket(url);
-    (kind === "mux" ? this : this).ws = kind === "mux" ? ws : this.hostWs;
+    if (kind === "mux") this.muxWs = ws;
+    else this.hostWs = ws;
+    this.ws = ws; // most recent socket (for diagnostics)
     ws.onopen = () => {
       this.connected = true;
       this.retryDelay = 500;
@@ -130,10 +133,20 @@ export class Api {
     return body.result.value;
   }
 
+  /** Reconnect the mux stream. The host re-pushes the session baseline
+   *  (session/subscribed + session/jobs snapshots) on every fresh mux
+   *  connection, so this doubles as a "refresh jobs snapshots" request —
+   *  e.g. when the connect-time snapshot arrived before a session opened. */
+  refreshMux() {
+    if (this.closed) return;
+    try { this.muxWs?.close(); } catch {}
+    // the onclose handler reconnects with backoff
+  }
+
   close() {
     this.closed = true;
     if (this.reconnectTimer) clearTimeout(this.reconnectTimer);
-    try { this.ws?.close(); } catch {}
+    try { this.muxWs?.close(); } catch {}
     try { this.hostWs?.close(); } catch {}
     try { this.rpcWs?.close(); } catch {}
   }

package/src/md.js

@@ -161,6 +161,9 @@ function highlightLine(line, lang) {
 // Returns array of lines; each line = array of segments.
 
 export function renderMd(text, width, sink = null, opts = {}) {
+  // defensive: snapshot-derived blocks can carry non-string text; a `.replace`
+  // on an object would throw mid-frame and freeze the whole terminal
+  if (typeof text !== "string") text = String(text ?? "");
   const hardBreaks = !!opts.hardBreaks;
   const lines = [];
   const pushLine = (segs = []) => {

package/src/text.js

@@ -26,6 +26,7 @@ export function wcwidth(cp) {
 }
 
 export function strWidth(s) {
+  if (typeof s !== "string") s = String(s ?? "");
   let w = 0;
   for (const ch of s) w += wcwidth(ch.codePointAt(0));
   return w;

package/src/views.js

@@ -860,7 +860,7 @@ export class ChatView extends Widget {
       case "session/title": this.title = frame.title ?? this.title; this.queueRebuild(); break;
       case "session/jobs": {
         this.running = (frame.jobs ?? []).some((j) => j.status === "running");
-        this.app.setJobs(frame.jobs ?? []);
+        this.app.setJobs(frame.jobs ?? [], frame.sessionId);
         break;
       }
       case "session/subscribed": {
@@ -1806,6 +1806,7 @@ export class App {
     this.toastMsg = null;
     this.toastUntil = 0;
     this.jobs = [];
+    this.jobsBySession = new Map(); // sessionId → latest session/jobs snapshot
     this.focused = null;
     this.provider = "";
     this.model = "";
@@ -1938,7 +1939,14 @@ export class App {
   }
 
   setStatus(msg) { this.statusMsg = msg; this.redraw(); }
-  setJobs(jobs) { this.jobs = jobs; this.layout(); this.redraw(); }
+  setJobs(jobs, sessionId = null) {
+    // snapshot buffered per session: the mux baseline arrives at connect
+    // time, possibly before the chat opens that session
+    if (sessionId != null) this.jobsBySession.set(sessionId, jobs);
+    if (sessionId == null || sessionId === this.currentSession) this.jobs = jobs;
+    this.layout();
+    this.redraw();
+  }
 
   #startPolling() {
     // Self-rescheduling so the interval actually tracks run state (a fixed
@@ -2019,7 +2027,6 @@ export class App {
       }
       case "session/event":
       case "session/title":
-      case "session/jobs":
       case "session/subscribed":
       case "session/queue":
         if (this.chat.sessionId === frame.sessionId) {
@@ -2028,6 +2035,13 @@ export class App {
         // refresh list on title updates
         if (frame.type === "session/title") this.refreshSessions();
         break;
+      case "session/jobs":
+        // buffer every session's snapshot even before it is opened (the
+        // connect-time baseline would otherwise be dropped by the filter
+        // below and the footer would stick at "0已完成")
+        this.setJobs(frame.jobs ?? [], frame.sessionId ?? null);
+        if (this.chat.sessionId === frame.sessionId) this.chat.onFrame(frame);
+        break;
       case "session/projection":
         this.projections[frame.key] = frame.value;
         if (frame.key === "tokenUsage") this.tokenUsage = frame.value;
@@ -2323,6 +2337,16 @@ export class App {
 
   async openSession(sessionId) {
     this.currentSession = sessionId;
+    // apply the buffered jobs snapshot; if this session's connect-time
+    // baseline was never seen, reconnect the mux to re-fetch it (the host
+    // re-pushes the full snapshot on every fresh mux connection)
+    const snap = this.jobsBySession.get(sessionId);
+    this.jobs = snap ?? [];
+    if (snap !== undefined) {
+      this.chat.running = snap.some((j) => j.status === "running");
+    } else if (this.api.connected && typeof this.api.refreshMux === "function") {
+      this.api.refreshMux();
+    }
     await this.chat.open(sessionId);
     this.loadFeedback();
     this.updateModel();
@@ -2927,6 +2951,15 @@ export class App {
         if (this.toastMsg && Date.now() > this.toastUntil) { this.toastMsg = null; this.dirty = true; }
       } catch (e) {
         this.log("render error (kept running):", e);
+        // stderr is invisible under the alt screen — record the stack where
+        // it can be read, then flush whatever composed before the throw so
+        // the terminal never sits frozen on the previous frame.
+        try {
+          const dir = process.env.DSH_HOME ?? join(process.env.HOME ?? ".", ".dsh");
+          mkdirSync(dir, { recursive: true });
+          appendFileSync(join(dir, "tui-error.log"), `${new Date().toISOString()} ${e?.stack ?? e}\n`);
+        } catch {}
+        try { this.term?.output?.write?.(this.screen.render()); } catch {}
         this.dirty = true;
       }
       this.timer = setTimeout(tick, 33);