dsh-neotui 0.2.1 → 0.2.3

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## 0.2.2 — 2026-08-16
+
+### Added
+
+- 底栏在子代理状态后显示“有 x 条命令正在排队 Ctrl+N 查看详情”。
+- Ctrl+N 打开精简排队命令面板；每条命令一行，支持 `dd` 删除。
+
+### Changed
+
+- AskUser 窗口按实际内容自适应高度，长内容才启用滚动。
+- 选项标签与描述只显示一次，完整描述按终端宽度换行。
+- 自定义答案常驻在选项下一行并支持最多六行自动换行。
+- 长正文使用 Ctrl+↑/Ctrl+↓、PgUp/PgDn、Home/End 和滚轮翻页。
+- 权限审批窗口保留完整原因和命令，明确显示滚动提示与位置。
+
+### Fixed
+
+- AskUser 自定义回答、真实跳过项、精确鼠标 hitbox 和文本光标编辑。
+- 权限申请窗口支持 ↑/↓ 逐行滚动，不改变安全默认“拒绝”。
+- 超长审批命令不再只保留前六行。
+- Queue 面板移除未要求的编辑与 steering 操作，`dd` 同时兼容 text/key 事件。
+
 ## 0.2.1 — 2026-08-16
 
 ### Fixed

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.1",
+  "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;
@@ -1751,18 +1752,17 @@ export class QueuePanel extends Popup {
     const items = app.queueItems ?? [];
     const w = Math.max(24, Math.min(84, app.screen.w - 4));
     const h = Math.max(7, Math.min(24, app.screen.h - 4));
-    super({ x: Math.max(0, Math.floor((app.screen.w - w) / 2)), y: Math.max(0, Math.floor((app.screen.h - h) / 2)), w, h, title: "消息队列", lines: [], buttons: [{ label: "关闭", action: "close" }], onAction: () => app.closeOverlay(), scrollable: true });
-    this.app = app; this.items = items; this.sel = 0; this.pending = false; this.editInput = null; this.rebuild();
+    super({ x: Math.max(0, Math.floor((app.screen.w - w) / 2)), y: Math.max(0, Math.floor((app.screen.h - h) / 2)), w, h, title: "排队命令 · ↑↓ 选择 · dd 删除 · Esc 关闭", lines: [], buttons: [], scrollable: true });
+    this.app = app; this.items = items; this.sel = 0; this.pending = false; this.dArmed=false; this.rebuild();
   }
   rebuild() {
-    const lines = [[{ t: ` ↑↓选择 · e 编辑 · s 立即 steering · d 删除 · Esc关闭${this.pending ? " · 操作中…" : ""}`, fg: this.pending ? K.WARN : K.DIM }]];
+    const lines = [];
     for (let i = 0; i < this.items.length; i++) {
       const item = this.items[i];
       const text = partsText(item.message?.content).replace(/\s+/g, " ");
       lines.push([{ t: `${i === this.sel ? "▸" : " "} ${item.placement === "queued" ? "⏳" : item.placement === "steering" ? "↪" : "ℹ"} ${truncate(text || item.id, this.w - 8)}`, fg: i === this.sel ? T.SELFG : K.TXT, bg: i === this.sel ? T.MENUSEL : -1 }]);
     }
     if (!this.items.length) lines.push([{ t: " （队列为空）", fg: K.FAINT }]);
-    if (this.editInput) lines.push([{ t: ` 编辑: ${truncate(this.editInput.value, this.w - 8)}`, fg: K.ACCENT }]);
     this.lines = lines;
   }
   syncItems(items) {
@@ -1782,7 +1782,6 @@ export class QueuePanel extends Popup {
       const action = kind === "edit" ? { kind, content: [{ type: "text", text: content }] } : { kind };
       await this.app.api.call("session.updateQueue", { sessionId: this.app.currentSession, itemId: item.id, action });
       if (kind === "remove") this.syncItems(this.items.filter((row) => row.id !== item.id));
-      this.editInput = null;
     } catch (e) {
       const code = this.#errorCode(e);
       if (code === "queue-item-not-found" || /queue-item-not-found/.test(e.message ?? "")) {
@@ -1793,31 +1792,19 @@ export class QueuePanel extends Popup {
       } else this.app.toast(`队列操作失败: ${e.message}`);
     } finally { this.pending = false; this.rebuild(); this.app.redraw(); }
   }
-  #beginEdit() {
-    const item = this.items[this.sel];
-    if (!item || item.placement !== "queued") { this.app.toast("只有排队消息可以编辑"); return; }
-    this.editInput = new Input({ x: this.x + 2, y: this.y + this.h - 3, w: this.w - 4, h: 1, prompt: "编辑: ", allowEmptyEnter: false, onEnter: (value) => this.#mutate("edit", value) });
-    this.editInput.setValue(partsText(item.message?.content));
-    this.rebuild();
-  }
   onKey(ev) {
-    if (this.editInput) {
-      if (ev.type === "key" && ev.name === "escape") { this.editInput = null; this.rebuild(); return true; }
-      if (this.editInput.onKey(ev)) { this.rebuild(); this.app.redraw(); return true; }
-    }
+    const ch=ev.type==="text"?ev.text:ev.type==="key"&&ev.name==="char"?ev.key:null;
+    if(ch==="d"){if(this.dArmed){this.dArmed=false;this.#mutate("remove");}else{this.dArmed=true;this.app.toast("再按 d 删除这条排队命令");}return true;}
     if (ev.type === "key") {
       if (ev.name === "escape") { this.app.closeOverlay(); return true; }
-      if (ev.name === "up") { this.sel = Math.max(0, this.sel - 1); this.rebuild(); return true; }
-      if (ev.name === "down") { this.sel = Math.min(this.items.length - 1, this.sel + 1); this.rebuild(); return true; }
-      if (ev.name === "char" && ev.key === "e" && !ev.ctrl) { this.#beginEdit(); return true; }
-      if (ev.name === "char" && ev.key === "s" && !ev.ctrl) { this.#mutate("steer"); return true; }
-      if (ev.name === "char" && ev.key === "d" && !ev.ctrl) { this.#mutate("remove"); return true; }
+      if (ev.name === "up") { this.dArmed=false;this.sel = Math.max(0, this.sel - 1); this.rebuild(); return true; }
+      if (ev.name === "down") { this.dArmed=false;this.sel = Math.min(this.items.length - 1, this.sel + 1); this.rebuild(); return true; }
     }
-    return super.onKey(ev);
+    this.dArmed=false;return false;
   }
   onMouse(ev) {
     if (ev.kind === "press" && ev.button === 0) {
-      const idx = ev.y - this.y - 2;
+      const idx = ev.y - this.y - 1;
       if (idx >= 0 && idx < this.items.length) { this.sel = idx; this.rebuild(); this.app.redraw(); return true; }
     }
     return super.onMouse(ev);

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; }
       }
@@ -2344,14 +2417,31 @@ function truncateText(s, n) {
   return s.length > n ? s.slice(0, n) + "\n…(截断)" : s;
 }
 
+function wrapDisplayText(value, width) {
+  const out = [];
+  for (const raw of String(value ?? "").split("\n")) {
+    if (!raw) { out.push(""); continue; }
+    let line = "", used = 0;
+    for (const g of graphemes(raw)) {
+      const gw = graphemeWidth(g);
+      if (line && used + gw > width) { out.push(line); line = ""; used = 0; }
+      line += g; used += gw;
+    }
+    out.push(line);
+  }
+  return out;
+}
+
 // ---- Question popup ----
 
 export class QuestionPopup extends Popup {
   constructor({ app, frame }) {
     const questions = frame.questions ?? [];
     const planReview = questions.length === 1 && questions[0]?.intent?.kind === "plan-review";
-    const w = Math.max(12, Math.min(planReview ? 88 : 72, app.screen.w - 2));
-    const h = Math.max(5, Math.min(Math.max(5, app.screen.h - 2), planReview ? app.screen.h - 2 : questions.length * 5 + 8));
+    const w = Math.max(12, Math.min(planReview ? 96 : 92, app.screen.w - 2));
+    const wrapCount=(value,width)=>wrapDisplayText(value,width).length;
+    const estimated=questions.reduce((n,q)=>n+1+wrapCount(q.question??"",w-4)+(q.detail?wrapCount(q.detail,w-4):0)+(q.options??[]).reduce((m,o)=>m+1+(o.description?wrapCount(o.description,w-10):0),0)+(q.intent?.kind==="plan-review"?0:4),0)+2;
+    const h=Math.max(10,Math.min(app.screen.h-2,estimated));
     super({
       x: Math.max(0, Math.floor((app.screen.w - w) / 2)), y: Math.max(0, Math.floor((app.screen.h - h) / 2)),
       w, h, title: planReview ? "✎ 计划审阅" : "❓ 需要你的回答",
@@ -2387,44 +2477,44 @@ export class QuestionPopup extends Popup {
     const q = this.questions[this.questionIdx];
     if (!q) return;
     const draft = this.drafts[this.questionIdx];
-    let ly = this.y + 1;
-    screen.text(this.x + 2, ly++, truncate(`▎ ${q.header ?? `问题 ${this.questionIdx + 1}/${this.questions.length}`}`, this.w - 4), { fg: K.ACCENT, bold: true });
-    screen.text(this.x + 2, ly++, truncate(q.question ?? "", this.w - 4), { fg: K.TXT });
-    if (this.planReview) screen.text(this.x + 2, ly++, "Enter 执行计划 · ↓ 继续规划 · Esc 取消审阅", { fg: K.FAINT });
     const opts = q.options ?? [];
-    if (q.detail) {
-      const detailLines = String(q.detail).split("\n");
-      const optionRows = opts.reduce((n, option) => n + (option.description ? 2 : 1), 0);
-      const room = Math.max(1, this.y + this.h - 4 - ly - optionRows);
-      const maxScroll = Math.max(0, detailLines.length - room);
-      this.detailScrollY = Math.max(0, Math.min(this.detailScrollY, maxScroll));
-      this.detailPage = room;
-      const visible = detailLines.slice(this.detailScrollY, this.detailScrollY + room);
-      for (const detail of visible) screen.text(this.x + 2, ly++, truncate(detail, this.w - 4), { fg: K.DIM });
-      if (this.planReview && detailLines.length > room && ly < this.y + this.h - 3) {
-        const start = this.detailScrollY + 1, end = Math.min(detailLines.length, this.detailScrollY + room);
-        screen.text(this.x + 2, ly++, `计划 ${start}–${end} / ${detailLines.length} 行 · PgUp/PgDn/Home/End/滚轮`, { fg: K.FAINT });
-      }
-    }
+    const optionDescriptionRows=opts.reduce((n,o)=>n+(o.description?wrapDisplayText(o.description,this.w-10).length:0),0);
+    const actionRows = opts.length + optionDescriptionRows + (this.planReview ? 0 : Math.min(6,Math.max(3,wrapDisplayText(draft.custom||"在此输入…",this.w-10).length))+2);
+    const actionTop = Math.max(this.y + 5, this.y + this.h - 1 - Math.min(actionRows,this.h-6));
+    const doc = [
+      { text: `▎ ${q.header ?? `问题 ${this.questionIdx + 1}/${this.questions.length}`}`, fg: K.ACCENT, bold: true },
+      ...wrapDisplayText(q.question ?? "", this.w - 4).map((text) => ({ text, fg: K.TXT })),
+      ...(q.detail ? wrapDisplayText(q.detail, this.w - 4).map((text) => ({ text, fg: K.DIM })) : []),
+    ];
+
+    const room = Math.max(1, actionTop - (this.y + 1));
+    const maxScroll = Math.max(0, doc.length - room);
+    this.detailScrollY = Math.max(0, Math.min(this.detailScrollY, maxScroll)); this.detailPage = room; this.detailTotal = doc.length;
+    let ly = this.y + 1;
+    for (const line of doc.slice(this.detailScrollY, this.detailScrollY + room)) screen.text(this.x + 2, ly++, truncate(line.text, this.w - 4), { fg: line.fg, attrs: line.bold ? 1 : 0 });
+    if(maxScroll>0){screen.text(this.x+this.w-26,this.y,`正文 Ctrl+↑↓ 翻页 ${this.detailScrollY+1}-${Math.min(doc.length,this.detailScrollY+room)}/${doc.length}`,{fg:K.ACCENT,bg:T.BG2});}
+    screen.hline(this.x+1,this.x+this.w-2,actionTop-1,"─",{fg:T.BORDER2,bg:T.BG2});screen.text(this.x+3,actionTop-1," 回答（↑/↓ 选择） ",{fg:K.ACCENT,bg:T.BG2});
+    ly=actionTop;
     this.optionRows = []; this.optionHitboxes = [];
-    for (let i = 0; i < opts.length && ly < this.y + this.h - 3; i++) {
+    for (let i = 0; i < opts.length; i++) {
       this.optionRows[i] = ly;
       const chosen = draft.selected.includes(opts[i].label);
       const cursor = this.selIdx === i;
       const glyph = q.multiSelect ? (chosen ? "☑" : "☐") : (chosen ? "●" : "○");
       const optionText=truncate(` ${cursor ? "▸" : " "} ${glyph} ${opts[i].label}`, this.w - 6);
-      this.optionHitboxes[i]={x1:this.x+2,x2:this.x+2+strWidth(optionText)-1,y1:ly,y2:ly+(opts[i].description?1:0)};
+      const descLines=opts[i].description?wrapDisplayText(opts[i].description,this.w-10):[];
+      this.optionHitboxes[i]={x1:this.x+2,x2:this.x+2+strWidth(optionText)-1,y1:ly,y2:ly+descLines.length};
       screen.text(this.x + 2, ly++, optionText, { fg: cursor ? T.SELFG : K.TXT, bg: cursor ? T.MENUSEL : -1 });
-      if (opts[i].description && ly < this.y + this.h - 3) screen.text(this.x + 7, ly++, truncate(opts[i].description, this.w - 10), { fg: K.FAINT });
+      for(const line of descLines)screen.text(this.x+7,ly++,line,{fg:K.FAINT,bg:cursor?T.MENUSEL:-1});
     }
-    if (!this.planReview && ly < this.y + this.h - 3) {
+    if (!this.planReview) {
       this.optionRows[opts.length] = ly;
       const cursor = this.selIdx === opts.length;
       const customText=truncate(` ${cursor ? "▸" : " "} ✎ 输入自己的回答`, this.w - 6);
       this.optionHitboxes[opts.length]={x1:this.x+2,x2:this.x+2+strWidth(customText)-1,y1:ly,y2:ly};
       screen.text(this.x + 2, ly++, customText, { fg: cursor ? T.SELFG : K.ACCENT, bg: cursor ? T.MENUSEL : -1 });
-      if(ly<this.y+this.h-3){const chars=Array.from(draft.custom),shown=this.customEditing?[...chars.slice(0,this.customCursor),"▏",...chars.slice(this.customCursor)].join(""):draft.custom;const inputText=truncate(`   > ${shown||"在此输入…"}`,this.w-8);screen.text(this.x+2,ly++,inputText,{fg:this.customEditing?K.TXT:K.FAINT,bg:this.customEditing?T.BG2:-1});}
-      if(ly<this.y+this.h-3){this.optionRows[opts.length+1]=ly;const skip=this.selIdx===opts.length+1,skipText=` ${skip?"▸":" "} ↷ 跳过此问题`;this.optionHitboxes[opts.length+1]={x1:this.x+2,x2:this.x+2+strWidth(skipText)-1,y1:ly,y2:ly};screen.text(this.x+2,ly++,skipText,{fg:skip?T.SELFG:K.FAINT,bg:skip?T.MENUSEL:-1});}
+      {const chars=Array.from(draft.custom),shown=this.customEditing?[...chars.slice(0,this.customCursor),"▏",...chars.slice(this.customCursor)].join(""):draft.custom;const inputLines=wrapDisplayText(shown||"在此输入…",this.w-10).slice(-6);for(let i=0;i<inputLines.length;i++)screen.text(this.x+4,ly++,`${i===0?"> ":"  "}${inputLines[i]}`,{fg:this.customEditing?K.TXT:K.FAINT,bg:this.customEditing?T.BG2:-1});}
+      {this.optionRows[opts.length+1]=ly;const skip=this.selIdx===opts.length+1,skipText=` ${skip?"▸":" "} ↷ 跳过此问题`;this.optionHitboxes[opts.length+1]={x1:this.x+2,x2:this.x+2+strWidth(skipText)-1,y1:ly,y2:ly};screen.text(this.x+2,ly++,skipText,{fg:skip?T.SELFG:K.FAINT,bg:skip?T.MENUSEL:-1});}
     }
   }
 
@@ -2441,8 +2531,9 @@ export class QuestionPopup extends Popup {
   }
 
   onMouse(ev) {
-    if (this.planReview && (ev.kind === "wheel-up" || ev.kind === "wheel-down")) {
-      this.detailScrollY = Math.max(0, this.detailScrollY + (ev.kind === "wheel-up" ? -3 : 3));
+    if (ev.kind === "wheel-up" || ev.kind === "wheel-down") {
+      const max=Math.max(0,(this.detailTotal??0)-(this.detailPage??1));
+      this.detailScrollY = Math.max(0,Math.min(max,this.detailScrollY + (ev.kind === "wheel-up" ? -3 : 3)));
       this.app.redraw(); return true;
     }
     if (ev.kind === "press" && ev.button === 0) {
@@ -2469,14 +2560,16 @@ export class QuestionPopup extends Popup {
     const choices = count + (this.planReview ? 0 : 2);
     if (ev.type === "text") { if(this.customEditing||this.selIdx===count){this.customEditing=true;draft.selected=[];const chars=Array.from(draft.custom);chars.splice(this.customCursor,0,...Array.from(ev.text));draft.custom=chars.join("");this.customCursor+=Array.from(ev.text).length;draft.skipped=false;return true;} return false; }
     if (ev.type !== "key") return false;
-    if (this.planReview && ["pageup", "pagedown", "home", "end"].includes(ev.name)) {
-      const total = String(q?.detail ?? "").split("\n").length;
+    if (["pageup", "pagedown", "home", "end"].includes(ev.name)) {
+      const total=this.detailTotal??0,max=Math.max(0,total-this.detailPage);
       if (ev.name === "pageup") this.detailScrollY = Math.max(0, this.detailScrollY - this.detailPage);
-      else if (ev.name === "pagedown") this.detailScrollY = Math.min(Math.max(0, total - this.detailPage), this.detailScrollY + this.detailPage);
+      else if (ev.name === "pagedown") this.detailScrollY = Math.min(max, this.detailScrollY + this.detailPage);
       else if (ev.name === "home") this.detailScrollY = 0;
-      else this.detailScrollY = Math.max(0, total - this.detailPage);
+      else this.detailScrollY = max;
       this.app.redraw(); return true;
     }
+    if(!this.customEditing&&ev.ctrl&&ev.name==="up"){this.detailScrollY=Math.max(0,this.detailScrollY-this.detailPage);return true;}
+    if(!this.customEditing&&ev.ctrl&&ev.name==="down"){this.detailScrollY=Math.min(Math.max(0,(this.detailTotal??0)-this.detailPage),this.detailScrollY+this.detailPage);return true;}
     if(this.customEditing&&ev.name==="left"){this.customCursor=Math.max(0,this.customCursor-1);return true;}
     if(this.customEditing&&ev.name==="right"){this.customCursor=Math.min(Array.from(draft.custom).length,this.customCursor+1);return true;}
     if(this.customEditing&&ev.name==="home"){this.customCursor=0;return true;}
@@ -2538,13 +2631,14 @@ export class ApprovalPopup extends Popup {
     const maxW = Math.max(12, app.screen.w - 2);
     const w = Math.min(72, maxW);
     const command = app.chat?.toolCommandForCall?.(frame.callId) ?? null;
-    const lines = [
-      [{ t: ` ${frame.reason ?? `工具 ${frame.toolName ?? "tool"} 请求越权执行`}`, fg: K.WARN }],
-    ];
-    if (command) lines.push([{ t: " 将执行:", fg: K.DIM, underline: true }], ...String(command).split("\n").slice(0, 6).map((line) => [{ t: "  " + truncate(line, w - 4), fg: K.TXT }]));
+    const wrap=(value,width)=>{const out=[];for(const raw of String(value??"").split("\n")){const gs=graphemes(raw);let line="",used=0;for(const g of gs){const gw=graphemeWidth(g);if(used+gw>width&&line){out.push(line);line="";used=0;}line+=g;used+=gw;}out.push(line);}return out;};
+    const reason=frame.reason ?? `工具 ${frame.toolName ?? "tool"} 请求越权执行`;
+    const lines = [[{t:" 请求原因",fg:K.DIM,underline:true}],...wrap(reason,w-6).map(line=>[{t:`  ${line}`,fg:K.WARN}])];
+    if (command) lines.push([{ t: " 将执行", fg: K.DIM, underline: true }], ...wrap(command,w-6).map((line) => [{ t: "  " + line, fg: K.TXT }]));
+    lines.push([{t:" 导航：↑/↓ 逐行 · PgUp/PgDn 翻页 · 滚轮 · ←/→ 选择",fg:K.FAINT}]);
     super({
-      x: Math.max(0, Math.floor((app.screen.w - w) / 2)), y: Math.max(0, Math.floor(app.screen.h / 2) - 4),
-      w, h: Math.min(app.screen.h, command ? 10 : 7), title: "⚠ 工具需要授权",
+      x: Math.max(0, Math.floor((app.screen.w - w) / 2)), y: Math.max(0, Math.floor((app.screen.h - Math.min(app.screen.h - 2, Math.max(10, Math.min(24, lines.length + 4)))) / 2)),
+      w, h: Math.min(app.screen.h - 2, Math.max(10, Math.min(24, lines.length + 4))), title: "⚠ 工具需要授权 · 可滚动",
       lines,
       buttons: [
         { label: "允许一次", action: "allowed-once" },
@@ -2575,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 = [];
@@ -2605,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
@@ -2672,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) {
@@ -2804,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"
@@ -3477,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); }
@@ -3526,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;
@@ -3805,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
@@ -3823,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; }
@@ -3837,7 +3960,7 @@ export class App {
       if (ev.ctrl && ev.key === "t") { this.setMode("trajectory"); return; }
       if (ev.ctrl && ev.key === "e") { this.quickJumpStep(); return; }
       if (ev.ctrl && ev.key === "j") { this.showJobs(); return; }
-      if (ev.ctrl && ev.key === "u") { this.showQueue(); return; }
+      if (ev.ctrl && ev.key === "n") { this.showQueue(); return; }
       if (ev.ctrl && ev.key === "y") {
         const next = busyEnter() === "queue" ? "steer" : "queue";
         saveTuiConfig({ busyEnter: next });
@@ -4031,7 +4154,6 @@ export class App {
     if (rawGoal && !["complete", "completed", "cleared"].includes(rawGoal.phase)) {
       row0.left.push({ t: ` 🎯 ${truncate(rawGoal.objective ?? "目标", 14)} · Ctrl+G `, fg: T.SELFG, bg: T.WARN, bold: true });
     }
-    if (this.queueItems.length) row0.left.push({ t: ` ⏳队列 ${this.queueItems.length} (Ctrl+U) `, fg: T.SELFG, bg: T.WARN, bold: true });
     if (this.sidebarVisible) row0.left.push({ t: " " + truncate(t || "（未选择会话）", 40) + " ", fg: T.TXT, bg: T.STATUSBG });
     else row0.left.push({ t: " " + truncate(t || "（未选择会话）", 40) + " ", fg: T.TXT, bg: T.STATUSBG });
     if (cur?.running) row0.left.push({ t: " ●运行 ", fg: T.OK, bg: T.STATUSBG });
@@ -4118,6 +4240,7 @@ export class App {
       row2.left.push({ t: ` ${done}已完成${failed > 0 ? ` ${failed}失败` : ""} `, fg: done > 0 ? T.OK : T.FAINT, bg: T.STATUSBG });
       row2.left.push({ t: ` ${subStats.running > 0 ? `${subStats.running} 个子代理运行中` : "没有子代理运行"} ${subStats.completed}已完成 `, fg: subStats.running > 0 ? T.PURPLE : T.FAINT, bg: T.STATUSBG, bold: subStats.running > 0 });
       if (sub) row2.left.push({ t: ` 🛰 ${truncate(sub.label ?? sub.mode ?? "子代理", 20)} `, fg: T.PURPLE, bg: T.STATUSBG });
+      if(this.queueItems.length)row2.left.push({t:` 有${this.queueItems.length}条命令正在排队 Ctrl+N查看详情 `,fg:T.SELFG,bg:T.WARN,bold:true});
       row2.right.push({ t: " Ctrl+J 任务/子代理 ", fg: T.DIM, bg: T.STATUSBG });
       rows.push(row2);
     }

package/src/widgets.js

@@ -788,8 +788,8 @@ export class Popup extends Widget {
       }
       if (this.maxScroll() > 0) {
         // "↑N" / "↓N" overflow indicators on the border row
-        if (this.scrollY > 0) screen.text(this.x + this.w - 6, this.y, ` ↑${this.scrollY}`, { fg: T.ACCENT, bg: T.BG2 });
-        if (this.scrollY < this.maxScroll()) screen.text(this.x + this.w - 8, this.y + this.h - 1, ` ↓${this.maxScroll() - this.scrollY}`, { fg: T.ACCENT, bg: T.BG2 });
+        if (this.scrollY > 0) screen.text(this.x + this.w - 10, this.y, ` ↑ ${this.scrollY}/${this.lines.length}`, { fg: T.ACCENT, bg: T.BG2 });
+        if (this.scrollY < this.maxScroll()) screen.text(this.x + this.w - 12, this.y + this.h - 1, ` ↓ ${this.scrollY + this.contentRows()}/${this.lines.length}`, { fg: T.ACCENT, bg: T.BG2 });
       }
     } else {
       for (const line of this.lines) draw(line);
@@ -832,6 +832,8 @@ export class Popup extends Widget {
   onKey(ev) {
     if (ev.type !== "key") return false;
     if (this.scrollable) {
+      if (ev.name === "up") { this.scrollY = Math.max(0, this.scrollY - 1); return true; }
+      if (ev.name === "down") { this.scrollY = Math.min(this.maxScroll(), this.scrollY + 1); return true; }
       if (ev.name === "pgup") { this.scrollY = Math.max(0, this.scrollY - this.contentRows()); return true; }
       if (ev.name === "pgdn") { this.scrollY = Math.min(this.maxScroll(), this.scrollY + this.contentRows()); return true; }
     }