dsh-neotui 0.2.2 → 0.2.3

package/README.md

@@ -131,7 +131,7 @@ Kitty graphics 可用时，图片在文件选择器和附件预览中等比例
 - `queue`：加入下一回合队列；
 - `steer`：追加到当前回合。
 
-`Ctrl+Y` 切换策略，`Ctrl+U` 打开队列。队列面板使用 `e` 编辑、`s` steering、`d` 删除、`Esc` 关闭。
+`Ctrl+Y` 切换策略，`Ctrl+N` 打开排队命令详情。队列面板每条命令一行，使用 `↑/↓` 选择、`dd` 删除、`Esc` 关闭。
 
 ## 快捷键
 
@@ -144,14 +144,15 @@ Kitty graphics 可用时，图片在文件选择器和附件预览中等比例
 | NORMAL | `Ctrl+F` | 跨会话模糊定位 |
 | NORMAL | `Ctrl+B` | 显示/隐藏侧栏 |
 | NORMAL | `Ctrl+M` | 模型与思考强度 |
-| NORMAL | `F8` / `F9` | 权限策略 / Agent 模式 |
+| NORMAL | `Shift+Tab` / `F8` | 权限模式轮换 |
+| NORMAL | `F9` | Agent 模式 |
 | NORMAL | `Ctrl+W` | 工作区 |
 | NORMAL | `Ctrl+Shift+W` | 添加工作区 |
 | NORMAL | `Ctrl+T` | 轨迹视图 |
-| NORMAL | `Shift+Tab` | 对话/轨迹切换 |
+| NORMAL | `Tab` | 对话/轨迹切换 |
 | NORMAL | `Ctrl+E` | 按 step 快速跳转 |
 | NORMAL | `Ctrl+J` | 后台任务与 Subagent |
-| NORMAL | `Ctrl+U` | 消息队列 |
+| NORMAL | `Ctrl+N` | 排队命令详情 |
 | NORMAL | `Ctrl+G` | Goal / TODO |
 | NORMAL | `Ctrl+S` | Settings |
 | NORMAL | `Ctrl+A` | Subagent |

package/package.json

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

package/src/config.js

@@ -74,7 +74,8 @@ export const DEFAULT_KEYBINDINGS = {
   leaveInsert: { mode: "insert", key: "Esc" }, sessionFilter: { mode: "normal", key: "/" }, newSession: { mode: "normal", key: "n" },
   top: { mode: "normal", key: "g g" }, bottom: { mode: "normal", key: "G" }, prevQuestion: { mode: "normal", key: "[" }, nextQuestion: { mode: "normal", key: "]" },
   expandInput: { mode: "insert", key: "Ctrl+L" }, copyInput: { mode: "insert", key: "Ctrl+Shift+C" }, panel: { mode: "all", key: "Ctrl+Space" },
-  model: { mode: "normal", key: "Ctrl+M" }, trajectory: { mode: "normal", key: "Ctrl+T" }, homeSwitch: { mode: "normal", key: "Shift+Tab" },
+  model: { mode: "normal", key: "Ctrl+M" }, trajectory: { mode: "normal", key: "Ctrl+T" }, homeSwitch: { mode: "normal", key: "Tab" },
+  permissionRotate: { mode: "normal", key: "Shift+Tab" },
   workspace: { mode: "normal", key: "Ctrl+W" }, settings: { mode: "normal", key: "Ctrl+S" }, subagent: { mode: "normal", key: "Ctrl+A" },
   skills: { mode: "normal", key: "Ctrl+K" }, goal: { mode: "normal", key: "Ctrl+G" }, jobs: { mode: "normal", key: "Ctrl+J" },
   stepJump: { mode: "normal", key: "Ctrl+E" }, sidebar: { mode: "normal", key: "Ctrl+B" }, quit: { mode: "all", key: "Ctrl+Q" },

package/src/panels.js

@@ -1453,7 +1453,7 @@ export class ControlPanel extends Widget {
     const b=keyBindings();
     const row=(id,desc)=>[`${(b[id]?.mode??"all").toUpperCase()}\t${b[id]?.key??""}`,desc,null,id];
     return [
-      row("think","思考块 展开/折叠"),row("tools","工具块 展开/折叠"),row("insert","进入输入"),row("leaveInsert","退出输入"),row("sessionFilter","筛选会话"),row("newSession","新建会话"),row("top","滚动到顶"),row("bottom","滚动到底"),row("prevQuestion","上一提问的终点"),row("nextQuestion","下一提问的终点"),row("expandInput","输入栏 展开/折叠"),row("copyInput","复制输入栏选区"),row("panel","控制面板"),row("model","切换模型"),row("trajectory","轨迹视图"),row("homeSwitch","对话/轨迹切换"),row("workspace","工作区"),row("settings","设置"),row("subagent","子代理"),row("skills","技能"),row("goal","目标"),row("jobs","后台任务"),row("stepJump","步骤转跳"),row("sidebar","侧栏显示/隐藏"),row("quit","退出"),
+      row("think","思考块 展开/折叠"),row("tools","工具块 展开/折叠"),row("insert","进入输入"),row("leaveInsert","退出输入"),row("sessionFilter","筛选会话"),row("newSession","新建会话"),row("top","滚动到顶"),row("bottom","滚动到底"),row("prevQuestion","上一提问的终点"),row("nextQuestion","下一提问的终点"),row("expandInput","输入栏 展开/折叠"),row("copyInput","复制输入栏选区"),row("panel","控制面板"),row("model","切换模型"),row("trajectory","轨迹视图"),row("homeSwitch","对话/轨迹切换"),row("permissionRotate","权限模式轮换"),row("workspace","工作区"),row("settings","设置"),row("subagent","子代理"),row("skills","技能"),row("goal","目标"),row("jobs","后台任务"),row("stepJump","步骤转跳"),row("sidebar","侧栏显示/隐藏"),row("quit","退出"),
     ];
   }
   items() {
@@ -1669,7 +1669,8 @@ export class JobsPanel extends Popup {
       for (let i = 0; i < this.subagents.length; i++) {
         const child = this.subagents[i], bg = i === this.sel ? T.MENUSEL : T.BG2;
         const status = child.activity ?? child.status ?? child.mode ?? "idle";
-        lines.push([{ t: ` ${i === this.sel ? "▸" : " "} 🛰 ${truncate(child.label ?? child.sessionId ?? child.id ?? "子代理", 42)} `, fg: K.TXT, bg, bold: i === this.sel }, { t: status, fg: status === "running" ? K.WARN : K.DIM, bg }]); rowOf.push(i);
+        const open = this.expanded.has(i);
+        lines.push([{ t: ` ${open ? "▾" : "▸"} 🛰 ${truncate(child.label ?? child.sessionId ?? child.id ?? "子代理", 42)} `, fg: K.TXT, bg, bold: i === this.sel }, { t: status, fg: status === "running" ? K.WARN : K.DIM, bg }]); rowOf.push(i);
         if (this.expanded.has(i)) for (const [key, value] of Object.entries(child)) { lines.push([{ t: `      ${key}: ${truncate(typeof value === "object" ? JSON.stringify(value) : value, this.w - 16)}`, fg: K.DIM }]); rowOf.push(-1); }
       }
       this.lines = lines; this.rowOf = rowOf; this.#ensureVisible(); return;

package/src/views.js

@@ -5,6 +5,7 @@ import { truncate, strWidth, bars, fmtDuration, fmtClock, fmtDateTime, graphemes
 import { readFileSync, appendFileSync, mkdirSync } from "node:fs";
 import { join } from "node:path";
 import { spawnSync } from "node:child_process";
+import { createRequire } from "node:module";
 import { Widget, List, ScrollView, Input, Popup, Menu, StatusBar } from "./widgets.js";
 import { UploadPicker } from "./file-picker.js";
 import { userPrefix, saveTuiConfig, loadTuiConfig, userName, busyEnter, foldDefaults, keyBindings, DEFAULT_KEYBINDINGS } from "./config.js";
@@ -20,6 +21,67 @@ import { T, themeName, cycleTheme } from "./theme.js";
 // Live theme accessor: K.K.DIM etc. resolve against the active palette at render time.
 const K = new Proxy({}, { get(_k, key) { return T[key]; } });
 
+const require = createRequire(import.meta.url);
+export const TUI_VERSION = (() => {
+  try { return JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version; }
+  catch { return "unknown"; }
+})();
+let dshVersionCache = null;
+export function installedDshVersion(run = spawnSync) {
+  if (dshVersionCache) return dshVersionCache;
+  if (process.env.DSH_VERSION) return (dshVersionCache = process.env.DSH_VERSION.replace(/^v/, ""));
+  try {
+    const file = require.resolve("@deepseek-ai/dsh/package.json");
+    const version = JSON.parse(readFileSync(file, "utf8")).version;
+    if (version) return (dshVersionCache = version);
+  } catch {}
+  try {
+    const result = run("dsh", ["--version"], { encoding: "utf8", timeout: 2000 });
+    const version = String(result.stdout ?? "").trim().replace(/^v/, "");
+    if (result.status === 0 && version) return (dshVersionCache = version);
+  } catch {}
+  return (dshVersionCache = "unknown");
+}
+
+async function latestNpmVersion(name) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), 5000);
+  try {
+    const response = await fetch(`https://registry.npmjs.org/${encodeURIComponent(name)}/latest`, {
+      headers: { accept: "application/json" }, signal: controller.signal,
+    });
+    if (!response.ok) throw new Error(`HTTP ${response.status}`);
+    const body = await response.json();
+    if (typeof body?.version !== "string" || !body.version) throw new Error("缺少版本号");
+    return body.version;
+  } finally { clearTimeout(timer); }
+}
+
+/** Semver comparison for update checks. Returns null for an unparseable value,
+ * otherwise -1/0/1 for left older/equal/newer than right. In particular, a
+ * locally newer build must never be advertised as "可更新" to an older npm tag. */
+function compareSemver(left, right) {
+  const parse = (value) => {
+    const match = /^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/.exec(String(value ?? ""));
+    if (!match) return null;
+    return { core: match.slice(1, 4).map(Number), pre: match[4]?.split(".") ?? [] };
+  };
+  const a = parse(left), b = parse(right);
+  if (!a || !b) return null;
+  for (let i = 0; i < 3; i++) if (a.core[i] !== b.core[i]) return a.core[i] > b.core[i] ? 1 : -1;
+  if (a.pre.length === 0 || b.pre.length === 0) return a.pre.length === b.pre.length ? 0 : a.pre.length === 0 ? 1 : -1;
+  const n = Math.max(a.pre.length, b.pre.length);
+  for (let i = 0; i < n; i++) {
+    if (a.pre[i] === undefined || b.pre[i] === undefined) return a.pre[i] === b.pre[i] ? 0 : a.pre[i] === undefined ? -1 : 1;
+    if (a.pre[i] === b.pre[i]) continue;
+    const ai = /^\d+$/.test(a.pre[i]), bi = /^\d+$/.test(b.pre[i]);
+    if (ai && bi) return Number(a.pre[i]) > Number(b.pre[i]) ? 1 : -1;
+    if (ai !== bi) return ai ? -1 : 1;
+    return a.pre[i] > b.pre[i] ? 1 : -1;
+  }
+  return 0;
+}
+
 // ---- Tool card renderers (host-computed view models) ----
 
 function renderToolCard(view, width, expanded) {
@@ -913,7 +975,6 @@ export class ChatView extends Widget {
     this.thinkMode = fd.think ? "expanded" : "collapsed";   // t toggles
     this.bashMode = fd.bash ? "expanded" : "collapsed";     // b toggles
     this.todosVisible = fd.todos;                           // Shift+T toggles
-    this.todoSeen = false;             // once seen, the todo box keeps its height
     this.running = false;
     this.hasMore = false;
     this.loadingOlder = false;
@@ -1100,20 +1161,15 @@ export class ChatView extends Widget {
     }
   }
 
-  /** Height of the collapsible todo block. FROZEN at the max (1 header + 6
-   *  items) once the session has ever shown todos: the harness updates the
-   *  list in the background while the user reads, and a height that tracks
-   *  the count reflows the whole layout every time (the idle 2-line shifts). */
+  /** Height of the collapsible todo block: one framed row per visible task,
+   *  capped at six items. Short lists must not reserve blank body rows. */
   todoHeight() {
     const todos = this.app.todos;
     const subagent = this.app.projections.subagent;
-    let h = 0;
-    if (subagent) h++;
-    if (!todos || todos.length === 0) { this.todoSeen = false; return h; }
-    this.todoSeen = true;
-    // The task dock owns a framed header and footer. Folded keeps the framed
-    // two-row strip visible rather than blending one text row into transcript.
-    return h + (this.todosVisible ? 8 : 2);
+    const subagentRows = subagent ? 1 : 0;
+    if (!todos || todos.length === 0) return subagentRows;
+    // Header + actual body rows + footer. Folded retains only the frame.
+    return subagentRows + (this.todosVisible ? Math.min(todos.length, 6) + 2 : 2);
   }
 
   divingNode() { return [...this.nodes].reverse().find((node) => node.kind === "turn-progress") ?? null; }
@@ -1980,8 +2036,20 @@ export class ChatView extends Widget {
     let y = this.view.y + 1;
     const put = (t, fg, bold) => { if (y < this.view.y + this.view.h) { screen.text(cx, y, t, { fg, attrs: bold ? 1 : 0 }); } y++; };
     put("", 0, false);
-    put("  DeepSeek Harness", T.HEADING, true);
-    put("  dsh-neotui", T.FAINT, false);
+    this.welcomeVersionRows = [];
+    const versionLine = (name, version, key, fg, bold) => {
+      const check = this.app.versionChecks?.[key];
+      const status = check?.state === "checking" ? "← 检查更新…"
+        : check?.state === "current" ? "← 已是最新"
+        : check?.state === "update" ? `← 可更新 ${check.latest}`
+        : check?.state === "error" ? "← 检查失败（点击重试）"
+        : "← 检查更新";
+      const text = `  ${name} ${version === "unknown" ? "版本未知" : `v${version}`}  ${status}`;
+      put(text, fg, bold);
+      this.welcomeVersionRows[y - 1] = { key, x1: cx, x2: cx + strWidth(text) - 1 };
+    };
+    versionLine("DeepSeek Harness", this.app.dshVersion ?? "unknown", "dsh", T.HEADING, true);
+    versionLine("dsh-neotui", TUI_VERSION, "tui", T.FAINT, false);
     put("", 0, false);
     if (this.app.currentSession == null) {
       put("  打开一个会话开始，或 Ctrl+N 新建", T.DIM, false);
@@ -1990,6 +2058,7 @@ export class ChatView extends Widget {
     put("  请选择模式（F9 或点击下方，选择后立即生效）：", T.WARN, true);
     put("", 0, false);
     this.welcomeModes = [];
+    const currentPreset = this.app.sessions.find((s) => s.sessionId === this.app.currentSession)?.agentPreset;
     const presets = [
       ["standard", "标准模式", "完整编码 Agent（文件/Shell/检索/Skills/目标/子代理）"],
       ["code", "PTC 模式", "标准模式能力 + Code Mode SDK 单程序多步操作"],
@@ -1998,8 +2067,10 @@ export class ChatView extends Widget {
     ];
     for (const [id, name, desc] of presets) {
       if (y < this.view.y + this.view.h) {
-        screen.text(cx, y, `  ○ ${name}`, { fg: T.ACCENT, attrs: 1 });
-        screen.text(cx + 2 + strWidth(`○ ${name}`) + 1, y, truncate(desc, this.view.w - 20), { fg: T.DIM });
+        const selected = id === currentPreset;
+        const label = `${selected ? "●" : "○"} ${name}${selected ? " [当前]" : ""}`;
+        screen.text(cx, y, `  ${label}`, { fg: selected ? T.OK : T.ACCENT, bg: selected ? T.MENUSEL : -1, attrs: 1 });
+        screen.text(cx + 2 + strWidth(label) + 1, y, truncate(desc, Math.max(1, this.view.w - strWidth(label) - 8)), { fg: selected ? T.TXT : T.DIM, bg: selected ? T.MENUSEL : -1 });
         this.welcomeModes[y] = id;
       }
       y++;
@@ -2148,6 +2219,8 @@ export class ChatView extends Widget {
       if (this.app.focused !== this.app.chat?.input) this.app.focus(this);
       // Welcome-screen mode click: select the preset under the cursor.
       if (this.nodes.length === 0 && ev.kind === "press" && ev.button === 0) {
+        const versionHit = this.welcomeVersionRows?.[ev.y];
+        if (versionHit && ev.x >= versionHit.x1 && ev.x <= versionHit.x2) { this.app.checkUpdates(versionHit.key, true); return true; }
         const id = this.welcomeModes[ev.y];
         if (id) { this.app.selectPreset(id); return true; }
       }
@@ -2596,11 +2669,12 @@ export class ApprovalPopup extends Popup {
 // ---- App ----
 
 export class App {
-  constructor({ screen, term, api, base, log }) {
+  constructor({ screen, term, api, base, log, versionFetcher = latestNpmVersion }) {
     this.screen = screen;
     this.term = term;
     this.api = api;
     this.log = log ?? (() => {});
+    this.versionFetcher = versionFetcher;
     this.popup = null;
     this.activePrompt = null;
     this.promptQueue = [];
@@ -2626,6 +2700,11 @@ export class App {
     this.tokenUsage = null;
     this.sessions = [];
     this.currentSession = null;
+    this.dshVersion = installedDshVersion();
+    this.versionChecks = {
+      dsh: { state: "idle", latest: null },
+      tui: { state: "idle", latest: null },
+    };
     this.searchActive = false;
     this.overlay = null;       // Picker / Popup / ImagePopup modal
     this.mode = "chat";        // chat | workspace | trajectory
@@ -2693,6 +2772,31 @@ export class App {
     this.setMode(this.mode === "trajectory" ? "chat" : "trajectory");
   }
 
+  async checkUpdates(target = null, notify = false) {
+    const specs = {
+      dsh: { package: "@deepseek-ai/dsh", current: this.dshVersion, label: "DeepSeek Harness" },
+      tui: { package: "dsh-neotui", current: TUI_VERSION, label: "dsh-neotui" },
+    };
+    const keys = target ? [target] : Object.keys(specs);
+    await Promise.all(keys.map(async (key) => {
+      const spec = specs[key];
+      if (!spec) return;
+      this.versionChecks[key] = { state: "checking", latest: null };
+      this.redraw();
+      try {
+        const latest = await this.versionFetcher(spec.package);
+        const comparison = compareSemver(spec.current, latest);
+        const state = comparison === null ? (latest === spec.current ? "current" : "update") : comparison < 0 ? "update" : "current";
+        this.versionChecks[key] = { state, latest };
+        if (notify) this.toast(state === "current" ? `${spec.label} 已是最新版本 ${spec.current}` : `${spec.label} 可更新: ${spec.current} → ${latest}`);
+      } catch (error) {
+        this.versionChecks[key] = { state: "error", latest: null };
+        if (notify) this.toast(`${spec.label} 更新检查失败: ${error.message}`);
+      }
+      this.redraw();
+    }));
+  }
+
   /** Chat → trajectory: open the trajectory panel at the step containing a
    *  chat node (right-click menu), loading older steps on demand. */
   async jumpToTrajectoryNode(nodeIdx) {
@@ -2825,6 +2929,7 @@ export class App {
       this.provider = host.provider ?? "";
       this.model = host.model ?? "";
     } catch (e) { this.log(`[app] host.describe: ${e.message}`); }
+    void this.checkUpdates();
     await this.refreshSessions();
     // A /restart handoff carries the session to reopen: resume it instead of
     // minting a fresh blank session (which was leaking a stray "new session"
@@ -3498,7 +3603,9 @@ export class App {
     }
     try {
       await this.api.call("agentPreset.select", { sessionId: this.currentSession, agentPreset: id });
+      if (sess) sess.agentPreset = id;
       this.toast(`模式已切换: ${modeName(id)}`);
+      this.redraw();
       this.refreshSessions();
     } catch (e) {
       if (e.code === "agent-preset-locked") { this.toast("会话已开始，模式固定；已设为新会话默认"); this.setDefaultPreset(id); }
@@ -3547,7 +3654,7 @@ export class App {
     } catch (e) { this.toast(`权限切换失败: ${e.message}`); }
   }
 
-  /** F8: cycle read-only → workspace-write → danger-full-access (full access gates). */
+  /** Shift+Tab/F8: cycle read-only → workspace-write → danger-full-access. */
   rotatePermission() {
     const order = ["read-only", "workspace-write", "danger-full-access"];
     const cur = this.projections.permissions?.currentValue;
@@ -3826,12 +3933,8 @@ export class App {
         this.redraw();
         return;
       }
-      if (ev.name === "backtab" && !ev.ctrl) {
-        if (this.mode === "trajectory") this.setMode("chat");
-        else if (this.mode === "chat") this.setMode("trajectory");
-        this.redraw();
-        return;
-      }
+      if (ev.name === "tab" && !ev.ctrl) { this.toggleChatTrajectory(); return; }
+      if (ev.name === "backtab" && !ev.ctrl) { this.rotatePermission(); return; }
       if (ev.ctrl && ev.key === "q") { this.stop(); return; }
       if (ev.ctrl && ev.key === "c") {
         // NORMAL-mode Ctrl+C: two presses within the toast window exit the
@@ -3844,7 +3947,6 @@ export class App {
         this.toast("再按一次 Ctrl+C 退出 TUI");
         return;
       }
-      if (ev.ctrl && ev.key === "n") { this.focus(this.chat); this.redraw(); return; }
       if (ev.ctrl && ev.key === "o") { this.overlay = new AttachmentPanel(this); this.focus(this.overlay); this.redraw(); return; }
       if (ev.ctrl && ev.key === "b") { this.toggleSidebar(); return; }
       if (ev.ctrl && ev.key === "p") { this.overlay = new ControlPanel(this, { startPage: 1 }); this.redraw(); return; }