dsh-neotui 0.0.3 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "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

@@ -272,7 +272,7 @@ export class WorkspacePanel extends Widget {
       this.workspaces = items;
       const tree = [];
       for (const ws of items) {
-        tree.push({ depth: 0, name: `▣ ${ws.title}`, path: ws.path, isDir: true, open: false, ws: true });
+        tree.push({ depth: 0, name: `▣ ${ws.title}`, title: ws.title, path: ws.path, isDir: true, open: false, ws: true, workspaceId: ws.workspaceId });
       }
       this.tree = tree;
       this.rebuildTree();
@@ -319,6 +319,25 @@ export class WorkspacePanel extends Widget {
     } catch { node.children = []; }
   }
   onMouse(ev) {
+    if (ev.kind === "press" && ev.button === 2) {
+      // Right-click anywhere in the panel: workspace actions (add is the
+      // primary one; tree rows also offer move/rename).
+      const idx = this.treeScroll.scrollY + (ev.y - this.treeScroll.y);
+      const node = this.treeLinesNode(idx);
+      if (node?.ws) {
+        this.app.openMenu([
+          { label: "添加工作区…", action: () => this.app.addWorkspace() },
+          { label: "重命名工作区", action: () => this.app.renameWorkspace(node) },
+          { label: "上移工作区", action: () => this.app.moveWorkspace(node, -1) },
+          { label: "下移工作区", action: () => this.app.moveWorkspace(node, 1) },
+        ], ev);
+      } else {
+        this.app.openMenu([
+          { label: "添加工作区…", action: () => this.app.addWorkspace() },
+        ], ev);
+      }
+      return true;
+    }
     if (ev.x >= this.x + 1 && ev.x < this.x + Math.floor(this.w / 2)) {
       const idx = this.treeScroll.scrollY + (ev.y - this.treeScroll.y);
       const node = this.treeLinesNode(idx);
@@ -378,11 +397,11 @@ export class WorkspacePanel extends Widget {
     }
   }
   render(screen) {
-    screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, " ", {});
+    screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, " ", { bg: T.BG2 });
     const mid = this.x + Math.floor(this.w / 2);
-    screen.put(mid, this.y, "┬", { fg: T.BORDER });
+    screen.put(mid, this.y, "┬", { fg: T.BORDER, bg: T.BG2 });
     screen.vline(mid, this.y + 1, this.y + this.h - 1);
-    screen.text(this.x + 1, this.y, ` 工作区 (${this.workspaces.length}) — 点击目录展开，/ 搜索文件`, { fg: K.DIM });
+    screen.text(this.x + 1, this.y, ` 工作区 (${this.workspaces.length}) — 点击目录展开，/ 搜索文件，右键添加工作区`, { fg: K.DIM, bg: T.BG2 });
     if (this.query) {
       const results = [];
       const walk = (nodes) => {
@@ -427,6 +446,99 @@ export class WorkspacePanel extends Widget {
   }
 }
 
+// ---- DirPicker: yazi-style folder selection buffer ----
+
+export class DirPicker extends Widget {
+  constructor(app, { startPath, onPick, onCancel }) {
+    const w = Math.min(60, app.screen.w - 4), h = Math.min(20, app.screen.h - 4);
+    super({ x: Math.floor((app.screen.w - w) / 2), y: Math.floor((app.screen.h - h) / 2), w, h });
+    this.app = app;
+    this.path = startPath ?? process.cwd();
+    this.onPick = onPick;
+    this.onCancel = onCancel;
+    this.entries = [];
+    this.sel = 0;
+    this.scroll = 0;
+    this.load();
+  }
+  load() {
+    try {
+      this.entries = readdirSync(this.path, { withFileTypes: true })
+        .filter((d) => d.isDirectory() && !d.name.startsWith("."))
+        .map((d) => d.name)
+        .sort((a, b) => a.localeCompare(b));
+    } catch { this.entries = []; }
+    this.sel = 0;
+    this.scroll = 0;
+  }
+  #items() { return ["✓ 选择此目录", "..", ...this.entries]; }
+  render(screen) {
+    screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, " ", { bg: T.BG2 });
+    screen.box(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, { fg: K.ACCENT, bg: T.BG2 }, "选择文件夹");
+    screen.text(this.x + 2, this.y + 1, truncate("📁 " + this.path, this.w - 4), { fg: K.TXT, bg: T.BG2 });
+    const items = this.#items();
+    const lh = Math.max(1, this.h - 3);
+    if (this.sel < this.scroll) this.scroll = this.sel;
+    else if (this.sel >= this.scroll + lh) this.scroll = this.sel - lh + 1;
+    this.scroll = Math.max(0, Math.min(Math.max(0, items.length - lh), this.scroll));
+    for (let i = 0; i < lh; i++) {
+      const idx = this.scroll + i;
+      const it = items[idx];
+      const y = this.y + 2 + i;
+      if (it === undefined) { screen.hline(this.x + 1, this.x + this.w - 2, y, " ", { bg: T.BG2 }); continue; }
+      const sel = idx === this.sel;
+      const label = it === "✓ 选择此目录" ? it : it === ".." ? ".. （上级目录）" : "▸ " + it + "/";
+      const fg = it === "✓ 选择此目录" ? K.OK : it === ".." ? K.DIM : K.TXT;
+      screen.fillRect(this.x + 1, y, this.x + this.w - 2, y, " ", { bg: sel ? T.MENUSEL : T.BG2 });
+      screen.text(this.x + 2, y, truncate(label, this.w - 4), { fg: sel ? 0xffffff : fg, bg: sel ? T.MENUSEL : T.BG2, attrs: sel ? 1 : 0 });
+    }
+    screen.text(this.x + 2, this.y + this.h - 1, "↑↓/jk 移动 · Enter 进入/选择 · h/Backspace 上级 · Esc 取消", { fg: K.FAINT, bg: T.BG2 });
+  }
+  onKey(ev) {
+    if (ev.type !== "key") return false;
+    const items = this.#items();
+    switch (ev.name) {
+      case "up": this.sel = Math.max(0, this.sel - 1); return true;
+      case "down": this.sel = Math.min(items.length - 1, this.sel + 1); return true;
+      case "enter": {
+        const it = items[this.sel];
+        if (it === "✓ 选择此目录") { this.onPick?.(this.path); return true; }
+        if (it === "..") { this.path = dirname(this.path); this.load(); return true; }
+        this.path = join(this.path, it); this.load(); return true;
+      }
+      case "backspace": this.path = dirname(this.path); this.load(); return true;
+      case "char":
+        if (ev.key === "j" && !ev.ctrl) { this.sel = Math.min(items.length - 1, this.sel + 1); return true; }
+        if (ev.key === "k" && !ev.ctrl) { this.sel = Math.max(0, this.sel - 1); return true; }
+        if (ev.key === "h" && !ev.ctrl) { this.path = dirname(this.path); this.load(); return true; }
+        if (ev.key === "l" && !ev.ctrl) {
+          const it = items[this.sel];
+          if (it && it !== "✓ 选择此目录" && it !== "..") { this.path = join(this.path, it); this.load(); }
+          return true;
+        }
+        return false;
+      case "escape": this.onCancel?.(); return true;
+    }
+    return false;
+  }
+  onMouse(ev) {
+    if (ev.kind === "press" && ev.button === 0) {
+      const idx = this.scroll + (ev.y - this.y - 2);
+      const items = this.#items();
+      if (idx >= 0 && idx < items.length) {
+        const it = items[idx];
+        if (it === "✓ 选择此目录") { this.onPick?.(this.path); return true; }
+        if (it === "..") { this.path = dirname(this.path); this.load(); return true; }
+        this.path = join(this.path, it); this.load(); return true;
+      }
+      return true;
+    }
+    if (ev.kind === "wheel-up") { this.sel = Math.max(0, this.sel - 1); return true; }
+    if (ev.kind === "wheel-down") { this.sel = Math.min(this.#items().length - 1, this.sel + 1); return true; }
+    return true;
+  }
+}
+
 // ---- Trajectory view ----
 
 export class TrajectoryPanel extends Widget {

package/src/screen.js

@@ -53,7 +53,13 @@ export class Screen {
     const cell = this.cells[y][x];
     const wide = wcwidth(ch.codePointAt(0)) === 2;
     if (wide && x + 1 >= this.w) ch = " "; // clip wide char at the right edge (terminal wrap corruption)
-    cell.ch = ch; cell.fg = fg; cell.bg = bg; cell.attrs = attrs; cell.link = link;
+    cell.ch = ch; cell.fg = fg;
+    // bg -1 = transparent: KEEP the cell's existing background (the layer
+    // underneath) instead of resetting it to the terminal default — this is
+    // what used to leave "unexplained dark blocks" wherever widgets drew
+    // text/fills without an explicit background.
+    if (bg !== -1) cell.bg = bg;
+    cell.attrs = attrs; cell.link = link;
     cell.wide = wide && x + 1 < this.w;
     if (cell.wide) {
       const cont = this.cells[y][x + 1];
@@ -62,7 +68,7 @@ export class Screen {
         const next = this.cells[y][x + 2];
         next.ch = " "; next.wide = false; next.link = "";
       }
-      cont.ch = ""; cont.fg = fg; cont.bg = bg; cont.attrs = attrs; cont.link = link; cont.wide = false;
+      cont.ch = ""; cont.fg = fg; cont.bg = cell.bg; cont.attrs = attrs; cont.link = link; cont.wide = false;
     }
   }
 

package/src/views.js

@@ -6,7 +6,7 @@ import { readFileSync } from "node:fs";
 import { Widget, List, ScrollView, Input, Popup, Menu, StatusBar } from "./widgets.js";
 import {
   Picker, buildCommandPalette, buildModelPicker, buildModePicker, buildPermissionPicker,
-  modeName, permName, WorkspacePanel, TrajectoryPanel,
+  modeName, permName, WorkspacePanel, TrajectoryPanel, DirPicker,
   ImagePopup, kittyCapable, buildJobsPopup, buildGoalPopup, SettingsPanel, SubagentPanel,
   SkillsPanel, ControlPanel,
 } from "./panels.js";
@@ -541,9 +541,10 @@ export class ChatView extends Widget {
     this.input = new Input({
       x: this.x, y: this.y + this.h - 2, w: this.w, h: 1,
       multi: true, maxLines: 6,
+      bg: T.BG2, border: T.BORDER2,
       placeholder: "输入消息…（Ctrl+J 换行，Enter 发送）",
       onEnter: (v) => this.send(v),
-      onChange: () => this.#inputChanged(),
+      onChange: () => this.inputChanged(),
     });
     this.contextNode = null;
     this.rebuildQueued = false;
@@ -681,18 +682,18 @@ export class ChatView extends Widget {
   }
 
   /** Height of the collapsible todo block (0 when empty or collapsed). */
-  #todoHeight() {
+  todoHeight() {
     const todos = this.app.todos;
     if (!this.todosVisible || !todos || todos.length === 0) return 0;
     return Math.min(todos.length, 6) + 1; // 1 header row + up to 6 todos
   }
 
-  #inputChanged() {
+  inputChanged() {
     // Multi-line input grew/shrunk → reflow view vs input, keep the tail visible.
     const ih = this.input.height();
     const prevIh = this.input.h;
     this.input.h = ih;
-    const th = this.#todoHeight();
+    const th = this.todoHeight();
     this.view.h = this.h - ih - th - 1;
     this.input.y = this.y + this.h - ih;
     if (ih !== prevIh) this.app.layout();
@@ -703,7 +704,7 @@ export class ChatView extends Widget {
     this.x = x; this.y = y; this.w = w; this.h = h;
     const ih = this.input.height();
     this.input.h = ih;
-    const th = this.#todoHeight();
+    const th = this.todoHeight();
     this.view.x = x; this.view.y = y; this.view.w = w; this.view.h = h - ih - th - 1;
     this.input.x = x; this.input.y = y + h - ih; this.input.w = w;
     this.cache.clear();
@@ -965,6 +966,7 @@ export class ChatView extends Widget {
                 { t: open ? "▾ " : "▸ ", fg: K.ACCENT },
                 { t: ` ${b.name ?? "tool"}`, fg: K.TXT, bold: true },
                 { t: ` ${glyph}`, fg: status === "TOOLOK" ? K.OK : status === "TOOLERR" ? K.ERR : K.WARN },
+                { t: open ? " [b 折叠]" : " [b 展开]", fg: K.FAINT },
               ]);
               mark(realIdx, bi);
               if (!open) {
@@ -1124,7 +1126,7 @@ export class ChatView extends Widget {
 
   /** Collapsible todo block between the view and the input (Shift+T toggles). */
   #renderTodos(screen) {
-    const th = this.#todoHeight();
+    const th = this.todoHeight();
     if (th === 0) return;
     const todos = this.app.todos ?? [];
     const y = this.input.y - th - 1;
@@ -1243,7 +1245,7 @@ export class ChatView extends Widget {
       if (ev.shift) {
         this.todosVisible = !this.todosVisible;
         this.app.toast(this.todosVisible ? "任务块：显示（Shift+T 折叠）" : "任务块：折叠（Shift+T 展开）");
-        this.#inputChanged();
+        this.inputChanged();
         return true;
       }
       this.thinkMode = this.thinkMode === "collapsed" ? "expanded" : "collapsed";
@@ -1569,6 +1571,12 @@ export class App {
       this.model = host.model ?? "";
     } catch (e) { this.log(`[app] host.describe: ${e.message}`); }
     await this.refreshSessions();
+    // Open on a blank session at the launch directory (reusing an existing
+    // draft when available) so the blank-session homepage shows immediately
+    // instead of a fully empty chat area.
+    if (!this.currentSession) {
+      await this.newSessionIn(null);
+    }
     this.api.connectMux();
     this.api.connectHost();
     this.api.onFrame = (frame) => this.#onFrame(frame);
@@ -1621,6 +1629,8 @@ export class App {
       case "session/projection":
         this.projections[frame.key] = frame.value;
         if (frame.key === "tokenUsage") this.tokenUsage = frame.value;
+        // the todo block's height depends on the todos projection → reflow
+        if (frame.key === "todos") this.chat.inputChanged();
         break;
       case "approval/resolved":
       case "question/resolved":
@@ -1675,6 +1685,43 @@ export class App {
     } catch (e) { this.toast(`移动失败: ${e.message}`); }
   }
 
+  /** Move a workspace up/down in the durable display order. */
+  async moveWorkspace(node, delta) {
+    const ws = this.workspaceItems?.find((w) => w.workspaceId === node.workspaceId);
+    if (!ws || !this.workspaceItems) { this.toast("找不到工作区"); return; }
+    const ids = this.workspaceItems.map((w) => w.workspaceId);
+    const idx = ids.indexOf(ws.workspaceId);
+    if (idx < 0) return;
+    const target = idx + delta;
+    if (target < 0 || target >= ids.length) return;
+    const beforeWorkspaceId = delta === -1 ? ids[target] : (target + 1 < ids.length ? ids[target + 1] : undefined);
+    try {
+      await this.api.call("workspace.insertBefore", {
+        workspaceId: ws.workspaceId,
+        ...(beforeWorkspaceId !== undefined ? { beforeWorkspaceId } : {}),
+      });
+      await this.refreshSessions();
+    } catch (e) { this.toast(`移动工作区失败: ${e.message}`); }
+  }
+
+  /** Yazi-style folder picker → workspace.create. */
+  addWorkspace() {
+    this.overlay = new DirPicker(this, {
+      startPath: process.cwd(),
+      onPick: async (path) => {
+        this.overlay = null;
+        try {
+          await this.api.call("workspace.create", { path });
+          await this.refreshSessions();
+          this.toast(`已添加工作区: ${path}`);
+        } catch (e) { this.toast(`添加失败: ${e.message}`); }
+        this.redraw();
+      },
+      onCancel: () => { this.overlay = null; this.redraw(); },
+    });
+    this.redraw();
+  }
+
   renameSession(s) {
     this.closeOverlay();
     const input = new Input({ x: 2, y: this.screen.h - 3, w: this.screen.w - 4, h: 1, prompt: "标题: ", allowEmptyEnter: true, onEnter: () => this.#commitRename(s, input) });
@@ -1817,8 +1864,10 @@ export class App {
 
   async newSessionIn(group = null) {
     // Reuse an existing empty draft instead of minting a fresh blank session on
-    // every "new session" click (this is how the meaningless blank sessions pile up).
-    const blank = this.sessions.find((s) => s.blank && !s.running && s.sessionId !== this.currentSession);
+    // every "new session" click (this is how the meaningless blank sessions pile
+    // up). Prefer a draft at the same directory (e.g. the launch cwd on open).
+    const blanks = this.sessions.filter((s) => s.blank && !s.running && s.sessionId !== this.currentSession);
+    const blank = blanks.find((s) => s.cwd === process.cwd()) ?? blanks[0];
     if (blank && (group?.workspaceId == null || this.#sessionInWorkspace(blank.sessionId, group.workspaceId))) {
       await this.refreshSessions();
       this.openSession(blank.sessionId);
@@ -2327,7 +2376,7 @@ export class App {
   renderFrame() {
     this.chat.flushRebuild();
     const s = this.screen;
-    s.clear(T.BG);
+    s.clear(-1, T.BG);
     this.#renderTabBar(s);
     if (this.sidebarVisible) {
       if (this.searchActive) {
@@ -2434,12 +2483,11 @@ export class App {
     if (this.overlay) this.overlay.render(s);
     if (this.toastMsg) {
       // Toasts land in the LOWER half (just above the input/footer) where the
-      // user's attention is while pressing shortcuts — a solid color block,
-      // not a top-of-screen whisper.
+      // user's attention is while pressing shortcuts — a solid color block.
       const w = Math.min(s.w - 4, strWidth(this.toastMsg) + 6);
       const x0 = Math.max(2, Math.floor((s.w - w) / 2));
-      const y = Math.max(1, s.h - this.footerHeight() - 2);
-      s.fillRect(x0 - 1, y - 1, x0 + w, y + 1, " ", { bg: T.ACCENT });
+      const y = Math.max(1, this.chat.input.y - this.chat.todoHeight() - 2);
+      s.fillRect(x0, y, x0 + w - 1, y, " ", { bg: T.ACCENT });
       s.text(x0 + 1, y, truncate(this.toastMsg, w - 2), { fg: T.SELFG, bg: T.ACCENT, attrs: 1 });
     }
     if (this.renameInput && this.popup) this.renameInput.render(s);