dsh-neotui 0.0.0 → 0.0.2

package/README.md

@@ -2,16 +2,39 @@
 
 DeepSeek Harness 的终端客户端（B 档范围，按 `../dsh-tui-design.md`）。纯 Node 标准库，零依赖。
 
-## 运行
+## 安装（推荐：从 npm 装成 profile）
 
 ```bash
-npx dsh --profile ntui                       # 自带宿主：TUI + 内嵌 API（推荐，已装到 ~/.dsh/profiles/ntui）
-npx dsh --profile ntui --session <id>        # 启动即打开某会话
-npx dsh --profile ntui --cwd ~/work          # 新建会话的默认目录
-npx dsh --profile ntui --port 3981           # 内嵌 API 指定端口（默认 0 = 系统分配）
-npx dsh --profile ntui --attach 3080          # 共存调试：连已运行的 web 宿主（存储自动隔离，不碰 $DSH_HOME）
+npm i -g pnpm                              # 首次需要 pnpm（dsh plugin 通过它安装）
+dsh plugin --profile dsh-neotui add dsh-neotui-app   # 装 bundle，自动加入 profile 层栈
+dsh --profile dsh-neotui                   # 启动
+```
+
+## 本地开发（从源码跑）
+
+克隆后先自链核心包（app bundle 通过包名 `dsh-neotui` 引核心，Node 会从真实路径向上找 `node_modules`）：
+
+```bash
+ln -sfn .. node_modules/dsh-neotui        # 仓库根自链，让 app/src 能 import "dsh-neotui"
+```
+
+然后把 profile 的两条软链指到本仓库（`~/.dsh/profiles/node_modules/`）：
+
+```bash
+ln -sfn "$(pwd)"        ~/.dsh/profiles/node_modules/dsh-neotui
+ln -sfn "$(pwd)/app"    ~/.dsh/profiles/node_modules/dsh-neotui-app
+```
+
+启动（本地开发 profile `~/.dsh/profiles/dsh-neotui`）：
+
+```bash
+dsh --profile dsh-neotui
+dsh --profile dsh-neotui --session <id>
+dsh --profile dsh-neotui --cwd ~/work
+dsh --profile dsh-neotui --port 3981
+dsh --profile dsh-neotui --attach 3080     # 共存调试：连已运行的 web 宿主（存储隔离，不碰 $DSH_HOME）
 
-node bin/dsh-tui.js                     # 纯客户端模式：连接已运行的 web 宿主（默认 3080）
+node bin/dsh-tui.js                        # 纯客户端模式：连接已运行的 web 宿主（默认 3080）
 node bin/dsh-tui.js --base http://host:port
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.0.0",
+  "version": "0.0.2",
   "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/panels.js

@@ -496,6 +496,15 @@ export class TrajectoryPanel extends Widget {
     this.buildLines();
   }
   async load(sessionId) {
+    // Re-entry into the same session reuses the already-built steps — instant,
+    // like the web view (which keeps its timeline in memory). A fresh session
+    // or an explicit refresh (r) re-fetches the recent window.
+    if (this.sessionId === sessionId && this.steps.length > 0) {
+      this.loading = false;
+      this.buildLines();
+      this.app.redraw();
+      return;
+    }
     this.sessionId = sessionId;
     this.loading = true;
     this.steps = [];
@@ -506,8 +515,8 @@ export class TrajectoryPanel extends Widget {
     this.app.setStatus("加载轨迹…");
     try {
       // One bounded call for the recent steps (maxMessages = model messages =
-      // steps). Instant, and older steps load on demand via PgUp/click.
-      const h = await this.app.api.call("session.history", { sessionId, maxMessages: 40 });
+      // steps). Older steps load on demand via PgUp/click.
+      const h = await this.app.api.call("session.history", { sessionId, maxMessages: 20 });
       this.stats = h.projections?.values?.sessionStats ?? null;
       this.minSeq = h.events[0]?.event?.seq ?? null;
       this.hasMore = h.hasMore;
@@ -557,7 +566,7 @@ export class TrajectoryPanel extends Widget {
   buildLines() {
     const w = Math.max(40, this.w - 2);
     const lines = [];
-    lines.push([{ t: "轨迹 — 步骤时间轴（每行一个色块，点击查看详情）", fg: K.ACCENT, bold: true }]);
+    lines.push([{ t: "轨迹 — 步骤时间轴（每行一个色块，点击查看详情 · r 刷新）", fg: K.ACCENT, bold: true }]);
     if (this.hasMore) lines.push([{ t: "▲ 更早步骤（点击 / PgUp 加载）", fg: K.FAINT }]);
     else lines.push([{ t: "" }]);
     const st = this.stats;
@@ -609,6 +618,7 @@ export class TrajectoryPanel extends Widget {
       return true;
     }
     if (ev.name === "backspace") { this.query = this.query.slice(0, -1); this.buildLines(); this.app.redraw(); return true; }
+    if (ev.name === "char" && ev.key === "r" && !ev.ctrl) { this.steps = []; this.load(this.sessionId); return true; }
     if (ev.name === "pgup") { if (this.view.scrollY === 0 && this.hasMore) { this.loadOlder(); return true; } return this.view.scroll(-this.view.h); }
     if (ev.name === "pgdn" || ev.name === "up" || ev.name === "down") return this.view.onKey(ev);
     return false;

package/src/term.js

@@ -128,7 +128,13 @@ export class Term {
           if (cp === 13) this.#emit({ type: "key", name: "enter", ctrl: false, alt: true, shift: false });
           else this.#emit({ type: "key", name: "char", key: next.toLowerCase(), text: next, ctrl: false, alt: true, shift: false });
           i += 2;
-        } else { i = buf.length; break; }
+        } else {
+          // Lone ESC at end of buffer = the standalone Escape key. Terminals
+          // deliver escape sequences atomically, so a bare \x1b is never the
+          // head of a sequence that will arrive in a later chunk.
+          this.#emit({ type: "key", name: "escape", ctrl: false, alt: false, shift: false });
+          i++;
+        }
       } else if (ch === "\r") {
         this.#emit({ type: "key", name: "enter", ctrl: false, alt: false, shift: false });
         i++;

package/src/views.js

@@ -1511,10 +1511,18 @@ export class App {
   setJobs(jobs) { this.jobs = jobs; this.layout(); this.redraw(); }
 
   #startPolling() {
-    this.pollTimer = setInterval(() => {
+    // Self-rescheduling so the interval actually tracks run state (a fixed
+    // setInterval would freeze at the idle 1500ms forever).
+    let ticks = 0;
+    const tick = () => {
       if (this.chat.sessionId) this.chat.pollTail();
-      this.refreshSessions();
-    }, this.chat.pollSlow ? 2000 : (this.chat.running ? 500 : 1500));
+      // session.list is expensive (~100ms); refresh the sidebar every ~5s, not
+      // on every streaming poll.
+      if (ticks++ % 10 === 0) this.refreshSessions();
+      const delay = this.chat.pollSlow ? 2000 : (this.chat.running ? 500 : 1500);
+      this.pollTimer = setTimeout(tick, delay);
+    };
+    this.pollTimer = setTimeout(tick, 500);
   }
 
   async init() {
@@ -2007,9 +2015,6 @@ export class App {
       tx += strWidth(seg);
     }
     if (this.currentSession == null) s.text(x + w - 16, 0, "未选会话", { fg: T.FAINT, bg: T.PANEL });
-    const modeLabel = this.focused === this.chat?.input ? " INSERT " : " NORMAL ";
-    const modeColor = this.focused === this.chat?.input ? T.OK : T.FAINT;
-    s.text(x + w - strWidth(modeLabel), 0, modeLabel, { fg: modeColor, bg: T.PANEL, attrs: 1 });
   }
 
   #clickTab(px) {
@@ -2135,6 +2140,19 @@ export class App {
     }
     // global keys
     if (ev.type === "key") {
+      // INSERT mode: Esc exits, everything else goes to the input for editing.
+      // Global shortcuts (Ctrl+P, Ctrl+B, F7, …) are disabled here so plain
+      // typing and Ctrl+J / Shift+Enter newlines behave like a normal editor.
+      if (this.focused === this.chat.input) {
+        if (ev.name === "escape") {
+          this.focus(this.chat);
+          this.toast("已退出输入（i 重新进入）");
+        } else {
+          this.chat.input.onKey(ev);
+        }
+        this.redraw();
+        return;
+      }
       if (this.searchActive && (ev.ctrl && ev.key === " " || ev.name === "f7")) {
         this.overlay = new ControlPanel(this, { startPage: 0 });
         this.redraw();
@@ -2174,11 +2192,13 @@ 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") {
-        if (this.focused === this.chat.input) {
-          this.focus(this.chat);
-          this.toast("已退出输入（i 重新进入）");
-          this.redraw();
-        } else if (this.focused === this.sidebar) { this.focus(this.chat); this.redraw(); }
+        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");
+        }
         return;
       }
       if (ev.name === "char" && ev.key === "i" && this.focused === this.sidebar) { this.focus(this.chat.input); this.redraw(); return; }
@@ -2297,6 +2317,10 @@ export class App {
     const rows = [];
     // ── row 0: identity ──
     const row0 = { left: [], right: [] };
+    // Editing-mode badge first (near the input at the bottom): INSERT is loud,
+    // NORMAL is subtle — the user's eyes are at the input line, not the top.
+    const editing = this.focused === this.chat?.input;
+    row0.left.push({ t: editing ? " INSERT " : " NORMAL ", fg: editing ? T.OK : T.FAINT, bg: T.STATUSBG, bold: editing });
     // Left badge: the session's permission/mode (e.g. "工作区写入/创造模式"),
     // which is far more meaningful than a static "工作区" label.
     const perm = this.projections.permissions?.currentValue;

package/src/widgets.js

@@ -401,6 +401,7 @@ export class Input extends Widget {
         this.insert(ev.text);
         return true;
       case "enter":
+        if (ev.shift && this.multi) { this.insert("\n"); return true; }  // Shift+Enter = newline
         if (this.value.trim() === "" && !this.allowEmptyEnter) return false;
         const v = this.value;
         this.history.push(v);