dsh-neotui 0.4.4-pre.0 → 0.4.4

package/CHANGELOG.md

@@ -1,11 +1,15 @@
 # Changelog
 
-## 0.4.4-pre.0 — 2026-08-26
+## 0.4.4 — 2026-08-26
 
-> PRE-RELEASE：`npm install dsh-neotui@pre`；`latest` 仍为 0.4.3，不会自动升级。
+### Fixed
+
+- **兼容 dsh 0.1.2-rc.1**：dsh-base 收编 storage 行与 session-projection-cache 后，组合树同 id 条目按新加载器规则去重（app 补丁仅保留裸 id 覆盖行做 attach 隔离）；`dsh-host-apiproxy` 包停更，其 /api 网关职责并入 connection 行的 node 半端（旧包在新版下启动即崩）；补挂 message-feedback 行。
 
 ### Added
 
+- **统一前缀体系**：Ctrl+Space 面板前缀页与前缀引擎共用同一张表（which-key 模式）——面板内按键与 NORMAL 前缀同义，`p` 在面板内链入窗格子表（权限迁至 `a`）；`Ctrl+H`/`Ctrl+L` 切换主窗口标签页（上一/下一，`Shift+Tab` 保留；`Ctrl+H` 原技能键释放）；前缀触发字符可在 tui-config.json `prefixKeys` 段重定义（`Ctrl+K` 打开配置）。
+
 - **窗口/标签页操作模型重构**：会话列表/窗口模式——`Ctrl+←→` 或 `Tab` 在「会话列表 ↔ 主窗口」间切换，`Shift+Tab` 在主窗口内循环标签页（对话/轨迹/子代理/后台任务，顶部标签条）；INSERT 内所有结构键保持编辑语义不冲突；侧栏预览卡片触发键 `p`（仅列表窗口作用域生效）。
 - **nvim 式逐层前缀键**：NORMAL 下按 `p` 进入待定层（状态栏提示 + Esc/2s/错误键取消），
   - `p r/l/u/n`：把当前窗口向 右/左/上/下 分屏（新窗口自动成为**空白会话**窗口，窗口=会话容器；(p c) 关窗后会话保留在侧栏，关掉全部主窗口自动生成空白会话保底）；

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.4.4-pre.0",
+  "version": "0.4.4",
   "description": "Keyboard-first Vim/tmux-style terminal client for DeepSeek Harness",
   "type": "module",
   "engines": {

package/src/config.js

@@ -75,6 +75,21 @@ export function busyEnter() {
 /** Persist the newest 20 unique cross-session search queries (oldest→newest). */
 
 
+/** 前缀键字符表（leader/面板首屏与窗格子表共用）。可在 tui-config.json 的
+ *  prefixKeys 段覆盖单键（如 { "rewind": "R" }）；非法字符回退默认。 */
+const PREFIX_KEY_DEFAULTS = {
+  search: "s", model: "m", theme: "d", history: "h", rewind: "r",
+  config: "c", help: "?", editor: "G", permission: "a", panes: "p",
+};
+export function prefixKeys() {
+  const raw = loadTuiConfig().prefixKeys ?? {};
+  const out = { ...PREFIX_KEY_DEFAULTS };
+  for (const [k, v] of Object.entries(raw)) {
+    if (k in out && typeof v === "string" && v.length === 1) out[k] = v;
+  }
+  return out;
+}
+
 /** Last ~50 user prompts typed into the chat input (persisted, deduped). */
 export function promptHistory() {
   const raw = loadTuiConfig().promptHistory;

package/src/keybindings.js

@@ -38,7 +38,7 @@ export const DEFAULT_KEYBINDINGS = {
   workspace: { mode: "normal", key: "Ctrl+W", key2: "" },
   settings: { mode: "normal", key: "Ctrl+S", key2: "" },
   subagent: { mode: "normal", key: "", key2: "" }, // freed: subagent lives on the unified panel page 2 (Ctrl+T → Tab)
-  skills: { mode: "normal", key: "Ctrl+H", key2: "" },
+  skills: { mode: "normal", key: "", key2: "" }, // freed: Ctrl+H is now tabPrev
   goal: { mode: "normal", key: "Ctrl+G", key2: "" },
   jobs: { mode: "normal", key: "", key2: "" }, // freed: jobs live on the unified panel page 3 (Ctrl+T → Tab)
   queue: { mode: "normal", key: "", key2: "" }, // freed: queue lives on the unified panel page 3 (Ctrl+T → Tab)
@@ -53,13 +53,15 @@ export const DEFAULT_KEYBINDINGS = {
   themePicker: { mode: "normal", key: "", key2: "" }, // freed: theme picker moved to the Ctrl+Space prefix page (d)
   logoPicker: { mode: "normal", key: "Ctrl+R", key2: "" },
   help: { mode: "normal", key: "Shift+/", key2: "Shift+?" }, // 场景帮助（Shift+/ 或 Shift+?）——按焦点路由
+  tabNext: { mode: "normal", key: "Ctrl+L", key2: "" }, // 主窗口标签页下一页
+  tabPrev: { mode: "normal", key: "Ctrl+H", key2: "" }, // 主窗口标签页上一页
   quitDouble: { mode: "normal", key: "Ctrl+C", key2: "" },
   quit: { mode: "all", key: "Ctrl+Q", key2: "" },
 };
 
 /** App-level dispatch precedence: the first matching binding wins. */
 export const KEYBINDING_ORDER = [
-  "sessionFilter", "help", "panel", "panePrev", "paneNext", "permissionRotate", "editConfig", "addWorkspace", "commandPalette", "modePicker", "themePicker", "logoPicker", "copySelection", "quitDouble", "quit",
+  "sessionFilter", "help", "tabNext", "tabPrev", "panel", "panePrev", "paneNext", "permissionRotate", "editConfig", "addWorkspace", "commandPalette", "modePicker", "themePicker", "logoPicker", "copySelection", "quitDouble", "quit",
   "model", "trajectory", "workspace", "settings", "subagent", "skills", "goal",
   "jobs", "queue", "busyEnter", "attachments", "stepJump", "sidebar",
 ];

package/src/panels.js

@@ -1761,17 +1761,8 @@ export class ControlPanel extends Widget {
     ];
   }
   prefixRows() {
-    return [
-      ["s", "跨会话全文搜索", "Ctrl+F 已释放", () => { this.app.closeOverlay(); this.app.startSearch(); this.app.redraw(); }],
-      ["h", "输入历史搜索（可筛选）", "最近 50 条提问", () => { this.app.closeOverlay(); this.app.showHistorySearch(); }],
-      ["?", "帮助（按场景）", "Shift+/ 或前缀 ?", () => { this.app.closeOverlay(); this.app.showHelp(this.app.focusBeforePanel ?? null); }],
-      ["G", "外部编辑器编辑输入", "$VISUAL · 非零退出保留原稿", () => { this.app.closeOverlay(); this.app.editExternal(); }],
-      ["r", "回退（分支会话 + 原消息回填）", "/rewind", () => { this.app.closeOverlay(); this.app.showRewindPicker(); }],
-      ["m", "切换模型", "Ctrl+M 已释放", () => { this.app.closeOverlay(); this.app.overlay = buildModelPicker(this.app); this.app.redraw(); }],
-      ["d", "配色主题", "Ctrl+D 已释放", () => { this.app.closeOverlay(); this.app.showThemePicker(); }],
-      ["p", "权限模式（沙箱 + 审批）", "F8 已释放", () => { this.app.closeOverlay(); this.app.showPermissionPicker(); }],
-      ["c", "打开配置文件（tui-config.json）", "等价: Ctrl+K", () => { this.app.closeOverlay(); this.app.editConfigFile(); }],
-    ];
+    // 前缀页 = 引擎同一张表的可视化（which-key）；键路由走同一引擎。
+    return this.app.prefixRowsData();
   }
   items() {
     if (this.page === 0) return this.prefixRows().map(([k, d, hint, action]) => [`${k}  ${d}`, hint, action]);
@@ -1837,7 +1828,7 @@ export class ControlPanel extends Widget {
       else if(this.page===1){const [mode,key1,key2]=label.split("\t");s.text(this.x+2,this.y+2+i,pad(mode,9),{fg:T.PURPLE,bg:sel?T.MENUSEL:T.PANEL,attrs:sel?1:0});s.text(this.x+13,this.y+2+i,pad(truncate(key1,16),17),{fg:T.ACCENT,bg:sel?T.MENUSEL:T.PANEL,attrs:sel?1:0});s.text(this.x+31,this.y+2+i,pad(truncate(key2,16),17),{fg:T.ACCENT,bg:sel?T.MENUSEL:T.PANEL,attrs:sel?1:0});s.text(this.x+49,this.y+2+i,truncate(it[1],this.w-52),{fg:T.OK,bg:sel?T.MENUSEL:T.PANEL,attrs:sel?1:0});}
       else{s.text(this.x + 2, this.y + 2 + i, truncate(label, this.w - 34), { fg: sel ? T.BOLD : T.TXT, bg: sel ? T.MENUSEL : T.PANEL, attrs: sel ? 1 : 0 });if (it[1]) s.text(this.x + this.w - 30, this.y + 2 + i, truncate(it[1], 28), { fg: T.FAINT, bg: sel ? T.MENUSEL : T.PANEL });}
     }
-    s.text(this.x + 2, this.y + this.h - 1, this.page===0?"按 r 执行 · ↑↓/Enter 也可以 · Esc 关闭":this.page===1?"↑↓ 选择 · Enter 编辑 · Shift+Tab 轮换模式 · Alt+Enter 恢复默认 · Esc 关闭":this.page===3?`/ 筛选插件 · Ctrl+/ 清除 · ↑↓ 选择 · Esc 关闭${this.pluginQuery?` · ${this.pluginQuery}`:""}`:"↑↓ 选择 · Enter 执行 · Esc 关闭", { fg: T.FAINT });
+    s.text(this.x + 2, this.y + this.h - 1, this.page===0?"按行首键执行（同 NORMAL 前缀层） · ↑↓/Enter 也可以 · Esc 关闭":this.page===1?"↑↓ 选择 · Enter 编辑 · Shift+Tab 轮换模式 · Alt+Enter 恢复默认 · Esc 关闭":this.page===3?`/ 筛选插件 · Ctrl+/ 清除 · ↑↓ 选择 · Esc 关闭${this.pluginQuery?` · ${this.pluginQuery}`:""}`:"↑↓ 选择 · Enter 执行 · Esc 关闭", { fg: T.FAINT });
   }
   onKey(ev) {
     if(this.page===3&&this.pluginFilter){if(ev.type==="text"){this.pluginQuery+=ev.text;this.sel=0;return true;}if(ev.type==="key"&&ev.name==="backspace"){this.pluginQuery=this.pluginQuery.slice(0,-1);this.sel=0;return true;}if(ev.type==="key"&&ev.name==="enter"){this.pluginFilter=false;return true;}if(ev.type==="key"&&ev.ctrl&&(ev.key==="/"||ev.key==="_")){this.pluginFilter=false;this.pluginQuery="";return true;}}

package/src/views.js

@@ -10,7 +10,7 @@ import { tmpdir, homedir } from "node:os";
 import { createRequire } from "node:module";
 import { Widget, ScrollView, Input, Popup, Menu, StatusBar, wrapIndex } from "./widgets.js";
 import { UploadPicker } from "./file-picker.js";
-import { userPrefix, saveTuiConfig, loadTuiConfig, userName, busyEnter, foldDefaults, keyBindings, tuiConfigFile, reloadTuiConfig, searchHistory, rememberSearchQuery, promptHistory, rememberPrompt } from "./config.js";
+import { userPrefix, saveTuiConfig, loadTuiConfig, userName, busyEnter, foldDefaults, keyBindings, tuiConfigFile, reloadTuiConfig, searchHistory, rememberSearchQuery, promptHistory, rememberPrompt, prefixKeys } from "./config.js";
 import { bindingMatchFor, matchKeyBinding, CHAT_BINDING_ORDER, SIDEBAR_BINDING_ORDER, KEYBINDING_ORDER, INPUT_BINDING_ORDER, INPUT_EDIT_BINDING_ORDER } from "./keybindings.js";
 export { userPrefix, saveTuiConfig, loadTuiConfig, userName, busyEnter, foldDefaults, promptHistory, rememberPrompt } from "./config.js";
 import {
@@ -4194,6 +4194,28 @@ export class App {
     return walk(this.winTree, rootRect);
   }
 
+  /** Prefix rows for the panel reference page — THE SAME table the engine
+   *  dispatches (single source of truth; chars from prefixKeys config). */
+  prefixRowsData() {
+    const k = prefixKeys();
+    const t = this.#prefixTables().main;
+    const meta = [
+      ["search", "跨会话全文搜索", "Ctrl+F 已释放"],
+      ["history", "输入历史搜索（可筛选）", "最近 50 条提问"],
+      ["rewind", "回退（分支会话 + 原消息回填）", "/rewind"],
+      ["model", "切换模型", "Ctrl+M 已释放"],
+      ["theme", "配色主题", "Ctrl+D 已释放"],
+      ["permission", "权限模式（沙箱 + 审批）", "F8 已释放"],
+      ["config", "打开配置文件（改 prefixKeys 前缀键）", "Ctrl+K"],
+      ["help", "帮助（按场景）", "Shift+/ 或前缀 ?"],
+      ["editor", "外部编辑器编辑输入", "$VISUAL · 非零退出保留原稿"],
+      ["panes", "窗格/分屏子表", "p r/l/u/n/c（NORMAL 亦可用）"],
+    ];
+    return meta
+      .filter(([action]) => t.entries[k[action]])
+      .map(([action, desc, hint]) => [k[action], desc, hint, () => { this.closeOverlay(); t.entries[k[action]](); }]);
+  }
+
   /** Public window-tree inspection (tests/diagnostics). */
   splitLeaves() { return this.#leaves(); }
   mainLeafCount() { return this.#mainLeaves().length; }
@@ -5530,6 +5552,8 @@ export class App {
       case "help": this.showHelp(); return true;
       case "panePrev": this.focusWindow(-1); return true;
       case "paneNext": this.focusWindow(1); return true;
+      case "tabNext": this.#tabCycle(1); return true;
+      case "tabPrev": this.#tabCycle(-1); return true;
       case "permissionRotate": this.rotatePermission(); return true;
       case "editConfig": this.editConfigFile(); return true;
       case "quit": this.stop(); return true;
@@ -5743,12 +5767,37 @@ export class App {
     return false;
   }
 
+  /** Tab cycling shared by Shift+Tab (structural) and Ctrl+H/L bindings:
+   *  from the list window, focus the main window first. */
+  #tabCycle(delta) {
+    if (this.focusedWindow !== "main") this.setFocusedWindow("main");
+    this.cycleTab(delta);
+    return true;
+  }
+
   // ---- chained prefix layers (nvim-style pending keys) ----
 
   /** Generic pending-layer tables. The p table is the first user; future
    *  g/z tables register here too. Entries: (ev) => run. */
   #prefixTables() {
+    const k = prefixKeys();
     return {
+      // 主表：Ctrl+Space 面板首屏与 NORMAL 前缀层共用（同一张表，同一语义）
+      main: {
+        hint: `${k.search}=搜索 ${k.model}=模型 ${k.theme}=主题 ${k.history}=历史 ${k.rewind}=回退 ${k.config}=配置 ${k.help}=帮助 ${k.editor}=编辑 ${k.permission}=权限 ${k.panes}=窗格 · Esc 取消`,
+        entries: {
+          [k.search]: () => { this.closeOverlay(); this.startSearch(); this.redraw(); },
+          [k.model]: () => { this.closeOverlay(); this.overlay = buildModelPicker(this); this.redraw(); },
+          [k.theme]: () => { this.closeOverlay(); this.showThemePicker(); },
+          [k.history]: () => { this.closeOverlay(); this.showHistorySearch(); },
+          [k.rewind]: () => { this.closeOverlay(); this.showRewindPicker(); },
+          [k.config]: () => { this.closeOverlay(); this.editConfigFile(); },
+          [k.help]: () => { this.closeOverlay(); this.showHelp(this.focusBeforePanel ?? null); },
+          [k.editor]: () => { this.closeOverlay(); this.editExternal(); },
+          [k.permission]: () => { this.closeOverlay(); this.showPermissionPicker(); },
+          [k.panes]: () => { this.closeOverlay(); this.armPrefix("p"); },
+        },
+      },
       p: {
         hint: "p · r=右 l=左 u=上 n=下 c=关窗 · Esc/2s 取消",
         entries: {
@@ -5761,6 +5810,17 @@ export class App {
       },
     };
   }
+  /** Arm a pending layer programmatically (e.g. the panel chaining into p). */
+  armPrefix(key) {
+    const table = this.#prefixTables()[key];
+    if (!table) return false;
+    this.pendingPrefix = { table, key, timer: null };
+    this.pendingPrefix.timer = setTimeout(() => {
+      if (this.pendingPrefix?.key === key) this.#cancelPrefix();
+    }, this.prefixTimeoutMs);
+    this.redraw();
+    return true;
+  }
   #handlePrefixKey(ev) {
     if (ev.type !== "key") return false;
     const pending = this.pendingPrefix;
@@ -5774,12 +5834,7 @@ export class App {
     // Arm only from a main window, not in INSERT (list window: p = preview).
     if (ev.name === "char" && ev.key === "p" && !ev.ctrl && !ev.alt && !ev.shift
         && this.focusedWindow === "main" && !this.#inInsertMode()) {
-      const table = this.#prefixTables().p;
-      this.pendingPrefix = { table, key: "p", timer: null };
-      this.pendingPrefix.timer = setTimeout(() => {
-        if (this.pendingPrefix?.key === "p") this.#cancelPrefix();
-      }, this.prefixTimeoutMs);
-      this.redraw();
+      this.armPrefix("p");
       return true;
     }
     return false;