dsh-neotui 0.0.9 → 0.0.11

package/README.md

@@ -59,8 +59,12 @@ tui/app/            dsh-neotui-app bundle：cordis.patch.yml + tui-startup/tui-r
 | 设置次级页 | 在「设置」页内 **Shift+Tab** 翻次级页（常规 / 插件） |
 | 主页切换 | **Shift+Tab** 在对话 ↔ 轨迹之间切换；顶部标签页（对话/轨迹/工作区/设置/技能/子代理）可点击直达 |
 | 输入模式 | `i` 或点击进入，**Esc 退出**（nvim normal/insert）；未聚焦时字母=快捷键，多字粘贴直接输入 |
-| 思考/工具折叠 | `t` 思考块展开折叠，`b` 工具块（bash 等）展开折叠；右键消息 →「展开 / 折叠」折叠单个输出块 |
+| 思考/工具折叠 | `t` 思考块展开折叠，`b` 工具块（bash 等）展开折叠；右键消息 →「展开 / 折叠」折叠单个输出块；正文文本块同样支持点击/右键折叠（▸/▾ + 「…共 N 字」尾注）；展开的思考块渲染**全文**，不再截断 |
+| 右键菜单 | 菜单打开后**再次右键**任意位置：立即关闭当前菜单并在新位置打开新菜单（OS 式）；左键点击菜单外仍是关闭 |
 | 对话 ↔ 轨迹转跳 | 对话里右键消息 →「转跳轨迹」定位到对应 step（自动展开+高亮）；轨迹里右键 step →「转跳对话」回到该消息 |
+| 步骤快速转跳 | **Ctrl+E**：fzf 式过滤 step 列表（编号/耗时/工具/消息预览），回车定位到该 step 的轨迹窗口 |
+| 轨迹窗口导航 | 转跳后只显示 `step±20` 窗口；**PgUp/PgDn** 上下各加载 10 步，**Home/End** 跳到最早/最新 20 步，`r` 回最新 |
+| 后台任务 | **Ctrl+J** 后台任务面板（Enter/→/l 展开详情，←/h 折叠，q 关闭）；状态栏只显示「N 个任务正在后台运行 · M已完成 (Ctrl+J 查看详情)」 |
 | 右键文件夹 → 新建会话（归属该工作区） | `n` |
 | 滚轮翻页 / 拖拽 | PgUp / PgDn / gg / G |
 | 点击展开思考块/工具卡 | — |
@@ -95,14 +99,17 @@ tui/app/            dsh-neotui-app bundle：cordis.patch.yml + tui-startup/tui-r
 - footer（powerline 风格，2–3 行）：第 1 行身份（工作区/会话/运行态/🎯目标/✎计划/模型），第 2 行用量（ctx 条+%、入/出/缓存/共 token、⚙步/回合/首响），第 3 行任务（有 job 时）
 - 折叠块预览：bash 折叠后显示命令概要（view.title 或 command），思考折叠后显示前 3 行
 - 会话内搜索：**Ctrl+F** 模糊搜本会话消息/工具名，回车跳转
-- 轨迹详情：点击回合行弹窗（工具调用 + 耗时），`/` 过滤回合；**增量加载**（每页 20 回合逐页渲染，最近回合秒开，600 回合封顶，不再阻塞等待全量历史）
-- 轨迹 详细/简略：每个 step 右键 →「展开（详细）/ 折叠（简略）」内联展开事件列表（仿对话页）；step 左键单击无反应（详情走右键菜单）；跳转定位的 step 自动展开 + 高亮闪烁
+- 轨迹详情：点击回合行弹窗（工具调用 + 耗时），`/` 过滤回合；**增量加载**（每页 20 回合逐页渲染，最近回合秒开，历史步骤按需翻页，不再阻塞等待全量历史）
+- 轨迹 详细/简略：每个 step 左键单击（▸/▾）或右键菜单第一项 →「展开（详细）/ 折叠（简略）」内联展开事件列表（仿对话页）；跳转定位的 step 自动展开 + 高亮闪烁
+- 轨迹窗口模型：转跳只显示 `step±20`；PgUp/PgDn 按 10 步扩展窗口（按需向后翻页加载），Home 加载到 step 1–20，End 回到最新 20 步，窗口指示行显示「窗口 step A–B · 共 N 步」
 - 工作区文件搜索：工作区面板内直接打字（`/`）模糊搜文件名，回车预览
-- 消息反馈：助手消息右键 👍/👎（`messageFeedback/put` Typert RPC），已评状态回显、可删除
+- 消息反馈：助手消息右键 👍/👎（`messageFeedback/put` Typert RPC，`{request:…}` 载荷），已评状态回显、可删除
 - 图片画廊：多图时 ←/→ 切换，标题显示 (N/M) + 尺寸
 - 会话内搜索高亮：Ctrl+F 跳转后匹配词高亮（黄底），Esc 清除
 - 轨迹逐事件详情：点击回合 → 事件列表 → 选事件看全文
-- 用户消息前缀：自己发的消息第一行直接显示内容并带 `用户名 > ` 前缀（默认取系统登录名），环境变量 `DSH_TUI_USER_PREFIX` 可自定义，如 `DSH_TUI_USER_PREFIX=edabchann dsh --profile dsh-neotui`
+- 用户消息前缀：自己发的消息第一行直接显示内容并带 `用户名 > ` 前缀（默认取系统登录名）；**设置页新增「TUI 界面」命名空间**，编辑 `userPrefix` 并 Ctrl+S 即时生效（持久化到 `$DSH_HOME/tui-config.json`）；环境变量 `DSH_TUI_USER_PREFIX` 亦可覆盖
+- 块计时：流式块实时显示 `已经过 X秒/分/小时`，完成后冻结为 `已完成,耗时 X`（工具失败显示 `失败,耗时 X`）；缺失 block-end 也不会出现永远走动的计时器
+- 块编号：think/tool/text 块头部标注所属 `(step N)`，与轨迹页的 step 编号对应，Ctrl+E 可据此快速转跳
 - 主题持久化：切主题写入 `$DSH_HOME/tui-theme.txt`（或 XDG config），重启保留
 - 输入模式标识：标签栏右侧 NORMAL/INSERT 指示，Esc 退出输入
 - 实时流：merge 修复（新回合不再覆盖旧回合）、活跃时 500ms 轮询、流式思考/工具自动展开

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-neotui",
-  "version": "0.0.9",
+  "version": "0.0.11",
   "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/config.js

@@ -0,0 +1,64 @@
+// config.js — TUI-local config (display name/prefix etc.), persisted as JSON
+// next to the theme file: $DSH_HOME/tui-config.json (or XDG config dir).
+import { readFileSync, writeFileSync, mkdirSync } from "node:fs";
+import { join, dirname } from "node:path";
+import { userInfo } from "node:os";
+
+export function tuiConfigFile() {
+  const base = process.env.DSH_HOME ?? (process.env.XDG_CONFIG_HOME ?? join(process.env.HOME ?? ".", ".config"));
+  return join(base, "tui-config.json");
+}
+
+let cache = { file: null, data: null, at: 0 };
+
+/** Read the TUI config ({} when absent); cached for 1s per file path. */
+export function loadTuiConfig() {
+  const now = Date.now();
+  const file = tuiConfigFile();
+  if (cache.file === file && cache.data && now - cache.at < 1000) return cache.data;
+  let data;
+  try {
+    data = JSON.parse(readFileSync(file, "utf8"));
+  } catch {
+    data = {};
+  }
+  cache = { file, data, at: now };
+  return data;
+}
+
+/** Merge a patch into the TUI config and write it back. Returns success. */
+export function saveTuiConfig(patch) {
+  const file = tuiConfigFile();
+  const cfg = { ...loadTuiConfig(), ...patch };
+  try {
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(file, JSON.stringify(cfg, null, 2) + "\n");
+    cache = { file, data: cfg, at: Date.now() };
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+let OS_USERNAME = null;
+function osUsername() {
+  if (OS_USERNAME !== null) return OS_USERNAME;
+  try { OS_USERNAME = userInfo().username; } catch { OS_USERNAME = ""; }
+  return OS_USERNAME;
+}
+
+/** Effective display name: config → env → OS login → fallback. */
+export function userName() {
+  const cfg = loadTuiConfig();
+  return cfg.userPrefix
+    || process.env.DSH_TUI_USER_PREFIX
+    || osUsername()
+    || process.env.USER
+    || process.env.LOGNAME
+    || "user";
+}
+
+/** "edabchann > " style prefix for the user's own messages. */
+export function userPrefix() {
+  return `${userName()} > `;
+}

package/src/panels.js

@@ -10,6 +10,7 @@ import { join, basename, extname } from "node:path";
 import { spawn, execFileSync } from "node:child_process";
 
 import { T, cycleTheme, themeName } from "./theme.js";
+import { loadTuiConfig, saveTuiConfig, userPrefix, userName } from "./config.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]; } });
 
@@ -555,17 +556,32 @@ export class TrajectoryPanel extends Widget {
     this.allEvents = [];
     this.sessionId = null;
     this.expandedSteps = new Set(); // step identity keys rendered 详细 (expanded)
-    this.flashStep = null;          // step just jumped to (brief highlight)
+    this.flashStep = null;          // step NUMBER just jumped to (brief highlight)
     this.flashUntil = 0;
     this.loadPromise = null;        // dedupes concurrent load(currentSession)
     this.loadTarget = null;
-    // No onClick: LEFT click on a step does nothing (details live in the
-    // right-click menu and in the per-step 详细/简略 expansion).
-    this.view = new ScrollView({ x: this.x, y: this.y, w: this.w, h: this.h, showScrollbar: true });
+    this.winLo = null;              // visible step-number window [winLo, winHi]; null = follow the tail
+    this.winHi = null;
+    // LEFT click toggles a step's 详细/简略 expansion (the ▸/▾ triangle).
+    this.view = new ScrollView({ x: this.x, y: this.y, w: this.w, h: this.h, showScrollbar: true, onClick: (y) => this.#clickLine(y) });
     this.stepLines = [];
     this.query = "";
   }
 
+  /** Total step count from the session stats (falls back to the newest loaded). */
+  totalSteps() {
+    return this.stats?.steps ?? (this.steps[this.steps.length - 1]?.step ?? this.steps.length);
+  }
+
+  /** LEFT click: toggle the step under the cursor; the "▲ 更早步骤" row loads
+   *  one more window-width upward. */
+  #clickLine(y) {
+    if (this.hasMore && y === 1) { this.extendUp(); return true; }
+    const si = this.stepLines[y];
+    if (si !== undefined) { this.#toggleStep(si); return true; }
+    return false;
+  }
+
   #eventSummary(e) {
     const d = e.data ?? {};
     if (e.type === "user/message") return `❯ ${String(d.content?.[0]?.text ?? "").slice(0, 40)}`;
@@ -619,9 +635,17 @@ export class TrajectoryPanel extends Widget {
     const step = this.steps[si];
     if (!step) return;
     const key = this.stepKey(step);
+    // Anchor: keep the step header at its current viewport row across the
+    // expand/collapse layout change (rows are added/removed BELOW it).
+    const headerLine = this.stepLines.indexOf(si);
+    const topRow = headerLine >= 0 ? headerLine - this.view.scrollY : null;
     if (this.expandedSteps.has(key)) this.expandedSteps.delete(key);
     else this.expandedSteps.add(key);
     this.buildLines();
+    if (topRow !== null) {
+      const li2 = this.stepLines.indexOf(si);
+      if (li2 >= 0) this.view.scrollY = Math.max(0, Math.min(li2 - topRow, this.view.maxScroll()));
+    }
     this.app.redraw();
   }
 
@@ -641,15 +665,98 @@ export class TrajectoryPanel extends Widget {
     return -1;
   }
 
-  /** Scroll to a step: auto-expand, highlight, center its line. */
-  jumpToStep(si) {
+  /** Load older pages until step `loStep` is covered (or the session's first
+   *  step is reached). Used by jumps and Home — many pages when going far. */
+  async ensureLoaded(loStep, maxPages = 80) {
+    for (let i = 0; i < maxPages; i++) {
+      if (!this.hasMore) break;
+      if (this.steps.length && this.steps[0].step <= loStep) break;
+      this.app.setStatus(`加载更早轨迹…（当前最早 step ${this.steps[0]?.step ?? "?"}）`);
+      await this.loadOlder();
+    }
+    this.app.setStatus("");
+  }
+
+  /** Set the visible step-number window and re-render. */
+  setWindow(lo, hi) {
+    this.winLo = lo;
+    this.winHi = hi;
+    this.buildLines();
+  }
+
+  /** Step number at the top of the viewport (for anchoring after growth). */
+  #topVisibleStep() {
+    const si = this.stepLines[this.view.scrollY];
+    return si !== undefined ? this.steps[si]?.step : null;
+  }
+
+  /** Scroll so the given step number sits at the top of the viewport. */
+  #anchorScroll(stepNum) {
+    const li = this.stepLines.findIndex((si) => this.steps[si]?.step === stepNum);
+    if (li >= 0) this.view.scrollY = Math.max(0, li);
+  }
+
+  /** Scroll to a step: open a ±20 window around it (loading older pages on
+   *  demand), auto-expand and highlight the step. */
+  async jumpToStep(si) {
     if (si < 0 || si >= this.steps.length) return;
+    const S = this.steps[si].step;
     this.expandedSteps.add(this.stepKey(this.steps[si]));
-    this.buildLines(si);
-    const li = this.stepLines.indexOf(si);
-    this.view.scrollY = li >= 0 ? Math.max(0, li - 2) : 0;
-    this.flashStep = si;
+    this.flashStep = S;
     this.flashUntil = Date.now() + 3000;
+    await this.ensureLoaded(Math.max(1, S - 20));
+    // ensureLoaded re-segments → re-find the step index by its number
+    const si2 = this.steps.findIndex((s) => s.step === S);
+    this.setWindow(Math.max(1, S - 20), Math.min(this.totalSteps(), S + 20));
+    const li = si2 >= 0 ? this.stepLines.indexOf(si2) : -1;
+    this.view.scrollY = li >= 0 ? Math.max(0, li - 2) : 0;
+    this.app.redraw();
+  }
+
+  /** PgUp: extend the window 10 steps upward (loading older if needed),
+   *  keeping the view anchored on the step that was at the top. */
+  async extendUp() {
+    const N = this.totalSteps();
+    if (this.winLo == null) { this.winLo = Math.max(1, N - 19); this.winHi = N; }
+    if (this.winLo <= 1 && this.steps.length && this.steps[0].step <= 1) {
+      this.app.toast("已到最早步骤");
+      return;
+    }
+    const anchor = this.#topVisibleStep() ?? this.winLo;
+    this.winLo = Math.max(1, this.winLo - 10);
+    if (!this.steps.length || this.steps[0].step > this.winLo) await this.ensureLoaded(this.winLo);
+    this.buildLines();
+    this.#anchorScroll(anchor);
+    this.app.redraw();
+  }
+
+  /** PgDn: extend the window 10 steps downward (the newer steps are already
+   *  loaded — the tail is always kept). */
+  extendDown() {
+    const N = this.totalSteps();
+    if (this.winLo == null) { this.winLo = Math.max(1, N - 19); this.winHi = N; }
+    if (this.winHi >= N) { this.app.toast("已到最新步骤"); return; }
+    this.winHi = Math.min(N, this.winHi + 10);
+    this.buildLines();
+    this.app.redraw();
+  }
+
+  /** Home: jump to the very first steps (loading all the way back). */
+  async gotoHome() {
+    await this.ensureLoaded(1);
+    this.setWindow(1, 20);
+    const li = this.stepLines.findIndex((si) => this.steps[si]?.step === 1);
+    this.view.scrollY = li >= 0 ? li : 0;
+    this.app.toast("已跳到最早步骤（step 1–20）");
+    this.app.redraw();
+  }
+
+  /** End: jump to the newest steps. */
+  gotoEnd() {
+    const N = this.totalSteps();
+    this.setWindow(Math.max(1, N - 19), N);
+    this.view.scrollY = this.view.maxScroll();
+    this.app.toast(`已跳到最新步骤（step ${Math.max(1, N - 19)}–${N}）`);
     this.app.redraw();
   }
 
@@ -664,11 +771,17 @@ export class TrajectoryPanel extends Widget {
       await this.loadOlder();
       si = this.indexOfMessage(messageId);
     }
+    if (si < 0 && messageId) {
+      // still not found — the message is far back; scan everything (bounded)
+      await this.ensureLoaded(1, 60);
+      si = this.indexOfMessage(messageId);
+    }
     if (si >= 0) {
-      this.jumpToStep(si);
-      this.app.toast(`已定位到 step ${this.steps[si].step}`);
+      const S = this.steps[si].step;
+      await this.jumpToStep(si);
+      this.app.toast(`已定位到 step ${S}`);
     } else if (this.steps.length) {
-      this.jumpToStep(this.steps.length - 1);
+      await this.jumpToStep(this.steps.length - 1);
       this.app.toast(messageId ? "对应步骤不在已加载窗口" : "消息未关联步骤，已到最新步骤");
     }
   }
@@ -751,19 +864,24 @@ export class TrajectoryPanel extends Widget {
       if (cur) cur.events.push(event);
     }
     if (cur && cur.events.length) steps.push(cur);
-    this.steps = steps.slice(-600);
+    // Keep every loaded step: Home/End navigation pages across the whole
+    // session, so older steps must survive until `r` re-fetches fresh.
+    this.steps = steps;
   }
-  buildLines(aroundSi = null) {
+  buildLines() {
     const w = Math.max(40, this.w - 2);
+    const N = this.totalSteps();
+    const lo = this.winLo ?? Math.max(1, N - 19);
+    const hi = this.winHi ?? N;
     const lines = [];
-    lines.push([{ t: "轨迹 — 步骤时间轴（右键：展开/折叠 · 转跳对话 · 查看详情；r 刷新）", fg: K.ACCENT, bold: true }]);
-    if (this.hasMore) lines.push([{ t: "▲ 更早步骤（点击 / PgUp 加载）", fg: K.FAINT }]);
+    lines.push([{ t: "轨迹 — 步骤时间轴（左键展开/折叠 · PgUp/PgDn 上下加载 · Home/End 首尾 · Ctrl+E 转跳 · r 刷新）", fg: K.ACCENT, bold: true }]);
+    if (this.hasMore) lines.push([{ t: "▲ 更早步骤（点击 / PgUp 向上加载 10 步）", fg: K.FAINT }]);
     else lines.push([{ t: "" }]);
     const st = this.stats;
     if (st) {
       lines.push([{ t: `回合 ${st.turns} · 步骤 ${st.steps} · LLM ${fmtMs(st.llmMs)} · 工具 ${fmtMs(st.toolMs)}`, fg: K.DIM }]);
     }
-    lines.push([{ t: `步骤（已加载 ${this.steps.length}${this.hasMore ? "+" : ""}）：`, fg: K.DIM, underline: true }]);
+    lines.push([{ t: `窗口 step ${lo}–${hi} · 共 ${N} 步${this.winLo == null ? "（跟随最新）" : ""}：`, fg: K.DIM, underline: true }]);
     this.stepLines = [];
     const list = this.query
       ? this.steps.filter((t) => t.events.some((e) => {
@@ -771,15 +889,8 @@ export class TrajectoryPanel extends Widget {
         const hay = `${e.type} ${d.name ?? ""} ${typeof d.content === "string" ? d.content : ""}`.toLowerCase();
         return hay.includes(this.query.toLowerCase());
       }))
-      : this.steps;
-    // Render a window of 40 steps (newest at the top). A jump to an older
-    // step centers the window around it so its line actually exists.
-    let windowStart = Math.max(0, list.length - 40);
-    if (!this.query && aroundSi !== null && aroundSi >= 0) {
-      const li = list.indexOf(this.steps[aroundSi]);
-      if (li >= 0) windowStart = Math.max(0, Math.min(li - 8, list.length - 40));
-    }
-    for (const step of list.slice(windowStart, windowStart + 40).reverse()) {
+      : this.steps.filter((s) => s.step >= lo && s.step <= hi);
+    for (const step of list.reverse()) {
       const si = this.steps.indexOf(step);
       const tools = [...new Set(step.events.filter((e) => e.type === "tool/call").map((e) => e.data?.name))];
       const hasResult = step.events.some((e) => e.type === "tool/result");
@@ -789,7 +900,7 @@ export class TrajectoryPanel extends Widget {
       const bg = tools.length ? (hasResult ? T.TOOLOK : T.TOOLBG) : hasReasoning ? T.THINKBG : T.CARD;
       const summary = tools.slice(0, 3).join(",") || (hasReasoning ? "模型推理" : "纯文本");
       const open = this.expandedSteps.has(this.stepKey(step));       // 详细
-      const flash = this.flashStep === si && Date.now() < this.flashUntil;
+      const flash = this.flashStep === step.step && Date.now() < this.flashUntil;
       const rowBg = flash ? T.ACCENT : bg;
       const label = `${open ? "▾" : "▸"} step ${String(step.step).padStart(3)}  ${pad(dur, 8)}  ${summary}  ${open ? "[折叠]" : "[展开]"}`;
       const segs = [{ t: label, fg: flash ? T.SELFG : K.TXT, bg: rowBg, bold: true }];
@@ -843,15 +954,11 @@ export class TrajectoryPanel extends Widget {
       // leak into the chat view's context menu underneath.
       return this.view.inside(ev.x, ev.y);
     }
-    // wheel / scrollbar drag keep working
+    // wheel / scrollbar / LEFT-click toggle keep working (view.onClick)
     if (this.view.onMouse(ev)) return true;
-    // LEFT click on a step: no reaction — but swallow it so it cannot leak
-    // through to the chat view underneath (which shares this rectangle).
-    if (ev.kind === "press" && ev.button === 0 && this.view.inside(ev.x, ev.y)) {
-      const y = ev.y - this.view.y + this.view.scrollY;
-      if (this.hasMore && y === 1) this.loadOlder(); // "▲ 更早步骤" row
-      return true;
-    }
+    // swallow left-clicks on non-step rows (header/stats) so they cannot
+    // leak through to the chat view underneath (which shares this rectangle).
+    if (ev.kind === "press" && ev.button === 0 && this.view.inside(ev.x, ev.y)) return true;
     return false;
   }
   onKey(ev) {
@@ -863,14 +970,22 @@ 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);
+    if (ev.name === "char" && ev.key === "r" && !ev.ctrl) {
+      this.winLo = this.winHi = null;
+      this.steps = [];
+      this.load(this.sessionId);
+      return true;
+    }
+    if (ev.name === "pgup") { this.extendUp(); return true; }
+    if (ev.name === "pgdn") { this.extendDown(); return true; }
+    if (ev.name === "home") { this.gotoHome(); return true; }
+    if (ev.name === "end") { this.gotoEnd(); return true; }
+    if (ev.name === "up" || ev.name === "down") return this.view.onKey(ev);
     return false;
   }
 }
 
-function fmtMs(ms) {
+export function fmtMs(ms) {
   if (ms == null || isNaN(ms)) return "—";
   if (ms < 1000) return `${Math.round(ms)}ms`;
   if (ms < 60000) return `${(ms / 1000).toFixed(1)}s`;
@@ -1069,7 +1184,8 @@ export class ControlPanel extends Widget {
       ["Ctrl+A", "子代理", () => { this.app.closeOverlay(); this.app.setMode("subagent"); }],
       ["Ctrl+K", "技能", () => { this.app.closeOverlay(); this.app.setMode("skills"); }],
       ["Ctrl+G", "目标", () => this.app.showGoal()],
-      ["Ctrl+J", "任务", () => this.app.showJobs()],
+      ["Ctrl+J", "后台任务", () => this.app.showJobs()],
+      ["Ctrl+E", "步骤转跳（fzf 式）", () => this.app.quickJumpStep()],
       ["Ctrl+B", "侧栏 显示/隐藏", () => this.app.toggleSidebar()],
       ["Ctrl+Q", "退出", () => this.app.stop()],
     ];
@@ -1217,21 +1333,98 @@ export class ControlPanel extends Widget {
 
 // ---- Jobs & goal popups ----
 
-export function buildJobsPopup(app) {
-  const jobs = app.jobs ?? [];
-  const lines = jobs.length === 0
-    ? [[{ t: "（当前没有任务帧）", fg: K.FAINT }]]
-    : jobs.map((j) => {
+/** Background-job list (Ctrl+J) with per-job expand/collapse: Enter/→/l 展开,
+ *  ←/h 折叠, ↑↓/j k 选择, q/Esc 关闭, click toggles too. */
+export class JobsPanel extends Popup {
+  constructor(app) {
+    const jobs = app.jobs ?? [];
+    super({
+      x: 5, y: 3, w: Math.min(84, app.screen.w - 8), h: Math.min(Math.max(jobs.length + 5, 7), 24),
+      title: "后台任务（Ctrl+J 查看详情）", lines: [],
+      buttons: [{ label: "关闭(q)", action: "close" }],
+      onAction: () => app.closeOverlay(),
+    });
+    this.app = app;
+    this.jobs = jobs;
+    this.expanded = new Set(); // job indexes rendered expanded
+    this.sel = 0;
+    this.rowOf = [];           // rendered line → job index (-1 = chrome/detail)
+    this.rebuild();
+  }
+  #detailLines(j) {
+    const lines = [];
+    for (const [k, v] of Object.entries(j)) {
+      if (["status", "kind", "label"].includes(k)) continue;
+      const s = v !== null && typeof v === "object" ? JSON.stringify(v) : String(v ?? "");
+      if (s === "") continue;
+      lines.push([{ t: `      ${k}: ${truncate(s, this.w - 14)}`, fg: K.DIM }]);
+      if (lines.length > 8) break;
+    }
+    return lines;
+  }
+  rebuild() {
+    let lines = [[{ t: "  这些任务在后台运行,不阻塞会话 — Enter/→/l 展开,←/h 折叠,q 关闭", fg: K.DIM }]];
+    const rowOf = [-1];
+    const jobs = this.jobs;
+    if (jobs.length === 0) {
+      lines.push([{ t: "  （当前没有任务帧）", fg: K.FAINT }]);
+      rowOf.push(-1);
+    }
+    for (let i = 0; i < jobs.length; i++) {
+      const j = jobs[i];
       const icon = j.status === "running" ? "⚙" : j.status === "completed" ? "✓" : j.status === "failed" ? "✗" : "·";
       const color = j.status === "running" ? K.WARN : j.status === "completed" ? K.OK : j.status === "failed" ? K.ERR : K.DIM;
-      return [{ t: ` ${icon} ${truncate(j.kind, 14)}`, fg: color, bold: true }, { t: ` ${truncate(j.label, 44)}`, fg: K.TXT }, { t: ` ${j.status}`, fg: K.DIM }];
-    });
-  return new Popup({
-    x: 6, y: 3, w: Math.min(80, app.screen.w - 12), h: Math.min(jobs.length + 4, 20), title: "任务",
-    lines: [[{ t: "" }], ...lines],
-    buttons: [{ label: "关闭", action: "close" }],
-    onAction: () => app.closeOverlay(),
-  });
+      const open = this.expanded.has(i);
+      const bg = i === this.sel ? T.MENUSEL : T.BG2;
+      lines.push([
+        { t: ` ${open ? "▾" : "▸"} ${icon} ${truncate(j.kind, 14)}`, fg: color, bold: true, bg },
+        { t: ` ${truncate(j.label, 36)}`, fg: K.TXT, bg },
+        { t: ` ${j.status}`, fg: K.DIM, bg },
+      ]);
+      rowOf.push(i);
+      if (open) for (const fl of this.#detailLines(j)) { lines.push(fl); rowOf.push(-1); }
+    }
+    if (lines.length > this.h - 3) {
+      lines = [...lines.slice(0, this.h - 4), [{ t: `  …共 ${jobs.length} 个任务`, fg: K.FAINT }]];
+    }
+    this.lines = lines;
+    this.rowOf = rowOf;
+  }
+  #toggle(i) {
+    if (this.expanded.has(i)) this.expanded.delete(i);
+    else this.expanded.add(i);
+    this.rebuild();
+    this.app.redraw();
+  }
+  onKey(ev) {
+    if (ev.type === "key") {
+      if (ev.name === "escape" || (ev.name === "char" && ev.key === "q" && !ev.ctrl)) { this.app.closeOverlay(); return true; }
+      if (this.jobs.length === 0) return super.onKey(ev);
+      if (ev.name === "up" || (ev.name === "char" && ev.key === "k" && !ev.ctrl)) {
+        this.sel = Math.max(0, this.sel - 1); this.rebuild(); return true;
+      }
+      if (ev.name === "down" || (ev.name === "char" && ev.key === "j" && !ev.ctrl)) {
+        this.sel = Math.min(this.jobs.length - 1, this.sel + 1); this.rebuild(); return true;
+      }
+      if (ev.name === "right" || ev.name === "enter" || (ev.name === "char" && ev.key === "l" && !ev.ctrl)) {
+        if (this.jobs[this.sel]) { this.expanded.add(this.sel); this.rebuild(); } return true;
+      }
+      if (ev.name === "left" || (ev.name === "char" && ev.key === "h" && !ev.ctrl)) {
+        this.expanded.delete(this.sel); this.rebuild(); return true;
+      }
+    }
+    return super.onKey(ev);
+  }
+  onMouse(ev) {
+    if (super.onMouse(ev)) return true; // buttons
+    if (ev.kind === "press" && ev.button === 0) {
+      const i = ev.y - this.y - 1;
+      const jIdx = this.rowOf[i];
+      if (jIdx >= 0) { this.sel = jIdx; this.#toggle(jIdx); return true; }
+      return true;
+    }
+    return false;
+  }
 }
 
 export function buildGoalPopup(app) {
@@ -1298,11 +1491,19 @@ export class SettingsPanel extends Widget {
       const d = await this.app.api.call("settings.describe");
       this.namespaces = d.namespaces ?? [];
       this.writable = d.writable;
-      this.selectNs(0);
     } catch (e) {
       this.app.toast(`设置加载失败: ${e.message}`);
       this.app.setMode("chat");
+      return;
     }
+    // TUI-local settings ride the same tree editor, but persist to the TUI
+    // config file instead of the host settings (settings.mutate knows nothing
+    // about them). userPrefix = the chat's "edabchann > " display name.
+    this.namespaces.unshift({
+      ns: "TUI 界面", applies: "live", local: true,
+      value: { userPrefix: userName() },
+    });
+    this.selectNs(0);
   }
   selectNs(i) {
     this.nsIdx = Math.max(0, Math.min(this.namespaces.length - 1, i));
@@ -1354,9 +1555,10 @@ export class SettingsPanel extends Widget {
     this.nsList.render(screen);
     const ns = this.currentNs();
     if (ns) {
-      screen.text(this.x + 28, this.y, ` ${ns.ns}  rev${ns.revision}  ${this.writable === false ? "(只读)" : ""}`, { fg: K.ACCENT, bold: true });
+      const revTag = ns.local ? "" : ` rev${ns.revision}`;
+      screen.text(this.x + 28, this.y, ` ${ns.ns}${revTag}  ${this.writable === false && !ns.local ? "(只读)" : ""}`, { fg: K.ACCENT, bold: true });
       const pend = this.pendingOps.length ? `  ⚠ ${this.pendingOps.length} 项待保存` : "";
-      if (pend) screen.text(this.x + 28 + strWidth(` ${ns.ns}  rev${ns.revision}  `), this.y, pend, { fg: K.WARN });
+      if (pend) screen.text(this.x + 28 + strWidth(` ${ns.ns}${revTag}  `), this.y, pend, { fg: K.WARN });
     }
     this.tree.render(screen);
     if (this.editing) {
@@ -1426,6 +1628,21 @@ export class SettingsPanel extends Widget {
   async save() {
     const ns = this.currentNs();
     if (!ns || this.pendingOps.length === 0) { this.app.toast("没有待保存的修改"); return; }
+    if (ns.local) {
+      // TUI-local config: write the config file, apply instantly.
+      const v = applyOps(ns.value, this.pendingOps);
+      const name = String(v.userPrefix ?? "").trim();
+      if (saveTuiConfig({ userPrefix: name })) {
+        this.pendingOps = [];
+        this.app.toast(name ? `已保存显示名 “${name}”（即时生效）` : "已清除自定义显示名（回到系统用户名）");
+        this.app.chat.cache.clear();
+        this.app.chat.queueRebuild();
+        await this.load();
+      } else {
+        this.app.toast("保存失败：无法写入 TUI 配置文件");
+      }
+      return;
+    }
     try {
       await this.app.api.call("settings.mutate", { ns: ns.ns, ops: this.pendingOps, expectedRevision: ns.revision });
       this.pendingOps = [];

package/src/text.js

@@ -53,6 +53,16 @@ export function pad(s, w, align = "left") {
   return align === "right" ? sp + s : s + sp;
 }
 
+/** Chinese-unit duration: 12秒 / 3分05秒 / 1小时02分03秒. */
+export function fmtDuration(ms) {
+  if (ms == null || isNaN(ms) || ms < 0) return "—";
+  const s = Math.floor(ms / 1000);
+  const h = Math.floor(s / 3600), m = Math.floor((s % 3600) / 60), sec = s % 60;
+  if (h > 0) return `${h}小时${String(m).padStart(2, "0")}分${String(sec).padStart(2, "0")}秒`;
+  if (m > 0) return `${m}分${String(sec).padStart(2, "0")}秒`;
+  return `${sec}秒`;
+}
+
 export function hexRgb(hex) {
   const m = /^#?([0-9a-f]{6})$/i.exec(String(hex).trim());
   if (!m) return null;

package/src/views.js

@@ -1,36 +1,22 @@
 // views.js — App composition: session list + chat timeline + approvals + status.
 import { Screen } from "./screen.js";
 import { renderMd, C } from "./md.js";
-import { truncate, strWidth, bars } from "./text.js";
+import { truncate, strWidth, bars, fmtDuration } from "./text.js";
 import { readFileSync } from "node:fs";
-import { userInfo } from "node:os";
 import { Widget, List, ScrollView, Input, Popup, Menu, StatusBar } from "./widgets.js";
+import { userPrefix, saveTuiConfig, loadTuiConfig, userName } from "./config.js";
+export { userPrefix, saveTuiConfig, loadTuiConfig, userName } from "./config.js";
 import {
   Picker, buildCommandPalette, buildModelPicker, buildModePicker, buildPermissionPicker,
   modeName, permName, WorkspacePanel, TrajectoryPanel, DirPicker,
-  ImagePopup, kittyCapable, buildJobsPopup, buildGoalPopup, SettingsPanel, SubagentPanel,
-  SkillsPanel, ControlPanel,
+  ImagePopup, kittyCapable, buildGoalPopup, SettingsPanel, SubagentPanel,
+  SkillsPanel, ControlPanel, JobsPanel, fmtMs,
 } from "./panels.js";
 
 import { T, themeName } 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]; } });
 
-// ---- User-message prefix ----
-// "edabchann > " style marker on the first line of every message the user
-// sent. Customizable via the DSH_TUI_USER_PREFIX env var; defaults to the
-// OS login username (process.env.USER as a fallback).
-let OS_USERNAME = null;
-function osUsername() {
-  if (OS_USERNAME !== null) return OS_USERNAME;
-  try { OS_USERNAME = userInfo().username; } catch { OS_USERNAME = ""; }
-  return OS_USERNAME;
-}
-export function userPrefix() {
-  const name = process.env.DSH_TUI_USER_PREFIX || osUsername() || process.env.USER || process.env.LOGNAME || "user";
-  return `${name} > `;
-}
-
 // ---- Tool card renderers (host-computed view models) ----
 
 function renderToolCard(view, width, expanded) {
@@ -128,17 +114,23 @@ function diffText(oldText, newText, width) {
 // ---- Chat node model ----
 
 /** Apply ONE event onto a mutable nodes array (shared by full-window
- *  derivation and the incremental mux merge — the two paths must agree). */
-function applyEvent(nodes, event, view, log) {
+ *  derivation and the incremental mux merge — the two paths must agree).
+ *  `state` carries the current step number across calls ({ step: number }). */
+function applyEvent(nodes, event, view, log, state = null) {
+  const st = state ?? { step: null };
   const cur = () => nodes[nodes.length - 1];
   const d = event.data ?? {};
   switch (event.type) {
+      case "step/start": {
+        st.step = d.step ?? (st.step ?? 0) + 1;
+        break;
+      }
       case "user/message": {
         const text = partsToText(d.content ?? d.message?.content);
         const images = partsToImages(d.content ?? d.message?.content);
         const id = d.id ?? null;
-        if (text !== null) nodes.push({ kind: "user", text, images, id });
-        else if (images) nodes.push({ kind: "user", text: "", images, id });
+        if (text !== null) nodes.push({ kind: "user", text, images, id, step: st.step });
+        else if (images) nodes.push({ kind: "user", text: "", images, id, step: st.step });
         break;
       }
       case "assistant/message": {
@@ -153,6 +145,10 @@ function applyEvent(nodes, event, view, log) {
           else if (p.type === "tool-call") { /* handled by tool/call event */ }
           else blocks.push({ kind: "other", text: JSON.stringify(p).slice(0, 500) });
         }
+        // Finalization stamps: endedAt marks when the message completed. The
+        // block start time is left untouched so syncTail's inheritStarts can
+        // carry the ORIGINAL block start across re-derivations.
+        for (const b of blocks) b.endedAt = event.time ?? Date.now();
         const images = partsToImages(d.message?.content);
         const id = d.message?.id ?? null;
         const last = cur();
@@ -162,7 +158,7 @@ function applyEvent(nodes, event, view, log) {
           last.id = id ?? last.id;
           last.streaming = false;
         } else {
-          nodes.push({ kind: "assistant", blocks, images, id, streaming: false });
+          nodes.push({ kind: "assistant", blocks, images, id, streaming: false, step: st.step });
         }
         break;
       }
@@ -170,7 +166,7 @@ function applyEvent(nodes, event, view, log) {
         const ch = d.chunk ?? {};
         let node = cur();
         if (!node || node.kind !== "assistant" || node.finalized) {
-          node = { kind: "assistant", blocks: [], streaming: true, finalized: false };
+          node = { kind: "assistant", blocks: [], streaming: true, finalized: false, step: st.step };
           nodes.push(node);
         }
         node.streaming = true;
@@ -192,7 +188,7 @@ function applyEvent(nodes, event, view, log) {
           }
         } else if (ch.type === "block-end") {
           const b = node.blocks[ch.index ?? 0];
-          if (b) b.streaming = false;
+          if (b) { b.streaming = false; b.endedAt = event.time ?? b.endedAt; }
         }
         break;
       }
@@ -212,14 +208,15 @@ function applyEvent(nodes, event, view, log) {
           if (d.arguments !== undefined) block.args = d.arguments;
           if (view?.view !== undefined) block.view = view.view;
           block.result = null;
+          if (block.startedAt === undefined) block.startedAt = event.time ?? Date.now();
           break;
         }
         let node = cur();
         if (!node || node.kind !== "assistant") {
-          node = { kind: "assistant", blocks: [], streaming: true, finalized: false };
+          node = { kind: "assistant", blocks: [], streaming: true, finalized: false, step: st.step };
           nodes.push(node);
         }
-        node.blocks.push({ kind: "tool", name: d.name, args: d.arguments, callId, view: view?.view, result: null });
+        node.blocks.push({ kind: "tool", name: d.name, args: d.arguments, callId, view: view?.view, result: null, startedAt: event.time ?? Date.now() });
         break;
       }
       case "tool/result": {
@@ -227,12 +224,23 @@ function applyEvent(nodes, event, view, log) {
         const text = partsToText(d.message?.content);
         const node = nodes.findLast((nd) => nd.kind === "assistant" && nd.blocks.some((b) => b.kind === "tool" && b.callId === callId));
         const block = node?.blocks.find((b) => b.kind === "tool" && b.callId === callId);
-        if (block) block.result = text ?? JSON.stringify(d).slice(0, 400);
+        if (block) {
+          block.result = text ?? JSON.stringify(d).slice(0, 400);
+          block.endedAt = event.time ?? Date.now();
+        }
         break;
       }
       case "step/end": {
         const node = cur();
-        if (node && node.kind === "assistant") { node.streaming = false; node.finalized = true; }
+        if (node && node.kind === "assistant") {
+          node.streaming = false;
+          node.finalized = true;
+          // a missed block-end must not leave a forever-running timer
+          for (const b of node.blocks ?? []) {
+            b.streaming = false;
+            if (b.endedAt === undefined) b.endedAt = event.time ?? Date.now();
+          }
+        }
         break;
       }
       case "session/title": {
@@ -245,7 +253,7 @@ function applyEvent(nodes, event, view, log) {
       }
       default: {
         // known benign control events: silently ignored
-        const KNOWN = new Set(["turn/start", "turn/end", "step/start", "step/end", "todo/write",
+        const KNOWN = new Set(["turn/start", "turn/end", "todo/write",
           "agent/inbox/spliced", "request/header", "request/context", "permission/preset",
           "sandbox/mode", "approval/policy", "session/title-llm-request", "command/done", "command/failed"]);
         if (!KNOWN.has(event.type) && !SEEN_TYPES.has(event.type)) {
@@ -259,7 +267,8 @@ function applyEvent(nodes, event, view, log) {
 /** Re-derive the whole node list from a complete event window (open/poll). */
 function nodeForEvents(events, log) {
   const nodes = [];
-  for (const { event, view } of events) applyEvent(nodes, event, view, log);
+  const state = { step: null };
+  for (const { event, view } of events) applyEvent(nodes, event, view, log, state);
   return nodes;
 }
 
@@ -583,6 +592,7 @@ export class ChatView extends Widget {
     this.pressY = null;
     this.selStart = null;
     this.selEnd = null;
+    this.stepState = { step: null }; // step/start tracking for the mux merge path
   }
 
   /** Queue a rebuild; flushed on the next frame render (throttles streaming). */
@@ -592,7 +602,7 @@ export class ChatView extends Widget {
    *  existing block instead of wiping it (the old "shows then deleted" bug). */
   mergeEvents(entries) {
     for (const { event, view } of entries) {
-      applyEvent(this.nodes, event, view, this.app.log);
+      applyEvent(this.nodes, event, view, this.app.log, this.stepState);
     }
     this.running = this.nodes.some((n) => n.kind === "assistant" && n.streaming);
     this.queueRebuild();
@@ -682,6 +692,7 @@ export class ChatView extends Widget {
   }
 
   jumpToNode(idx) {
+    this.flushRebuild(); // lineMap must reflect the current nodes array
     if (idx < 0 || idx >= this.nodes.length) return false;
     for (let li = 0; li < this.lineMap.length; li++) {
       if (this.lineMap[li]?.nodeIdx === idx) {
@@ -825,6 +836,9 @@ export class ChatView extends Widget {
   }
 
   #clickLine(y, ev) {
+    // A queued (deferred) rebuild would leave lineMap one frame behind the
+    // nodes array; flush first so the click maps to the CURRENT node/block.
+    this.flushRebuild();
     // map rendered line back to node via cached line→node map
     const info = this.lineMap?.[y];
     if (info) {
@@ -836,7 +850,7 @@ export class ChatView extends Widget {
       const node = this.nodes[info.nodeIdx];
       if (node?.kind === "assistant" && info.blockIdx !== null) {
         const b = node.blocks[info.blockIdx];
-        if (b && (b.kind === "tool" || b.kind === "reasoning" || b.kind === "other")) {
+        if (b && (b.kind === "tool" || b.kind === "reasoning" || b.kind === "other" || b.kind === "text")) {
           const key = `${info.nodeIdx}:${info.blockIdx}`;
           if (b.kind === "reasoning") {
             // clean two-state override: expand ⇄ collapse (never a no-op click)
@@ -877,7 +891,6 @@ export class ChatView extends Widget {
     if (this.hasMore) { lines.push([{ t: "▲ 更早的记录", fg: K.FAINT }]); mark(-1); }
     if (skipCount > 0) { lines.push([{ t: `… 更早 ${skipCount} 条记录（PgUp 加载）`, fg: K.FAINT }]); mark(-1); }
 
-    const MAX_TEXT = 4000;
     for (let ni = 0; ni < nodes.length; ni++) {
       const node = nodes[ni];
       const realIdx = ni + skipCount;
@@ -891,7 +904,7 @@ export class ChatView extends Widget {
           return ".";
         }).join("")
         : "";
-      const ckey = `${realIdx}|${w}|${expKey}|${blockKeys}|${this.thinkMode}|${this.bashMode}|${node.streaming ? "s" : "f"}|${themeName()}`;
+      const ckey = `${realIdx}|${w}|${expKey}|${blockKeys}|${this.thinkMode}|${this.bashMode}|${node.streaming ? "s" : "f"}|${themeName()}|${node.step ?? "-"}|${userPrefix()}`;
       // Streaming nodes re-render every frame: their text grows without any
       // change to the cache key, so caching them freezes the live think/tool/text.
       const hit = node.streaming ? undefined : this.cache.get(ckey);
@@ -966,19 +979,27 @@ export class ChatView extends Widget {
           if (blocks.length === 0) { lines.push([{ t: "  …", fg: K.FAINT }]); mark(realIdx); break; }
           for (let bi = 0; bi < blocks.length; bi++) {
             const b = blocks[bi];
+            const stepTag = node.step != null ? ` (step ${node.step})` : "";
             if (b.kind === "reasoning") {
               const key = `${realIdx}:${bi}`;
               const manuallyCollapsed = this.collapsedBlocks.has(key);
               const manuallyExpanded = this.expanded.has(key);
               const open = manuallyExpanded || (!manuallyCollapsed && this.thinkMode === "expanded");
               beginCard("THINKBG");
-              const thinkMeta = b.streaming
-                ? ` · ${fmtElapsed(Date.now() - (b.startedAt ?? Date.now()))}`
-                : `（${b.text?.length ?? 0} 字）`;
+              // Live blocks tick (已经过…); finished blocks freeze at their
+              // total (已完成,耗时…). No timestamps → no bogus timer shown.
+              let timing = "";
+              if (b.streaming) {
+                timing = ` 已经过 ${fmtDuration(Date.now() - (b.startedAt ?? Date.now()))}`;
+              } else if (b.startedAt !== undefined && b.endedAt !== undefined) {
+                timing = ` 已完成,耗时 ${fmtDuration(b.endedAt - b.startedAt)}`;
+              }
+              const thinkMeta = `${stepTag}（${b.text?.length ?? 0} 字）${timing}`;
               lines.push([{ t: "💭 思考" + (b.streaming ? "…" : "") + thinkMeta + (open ? " [t 折叠]" : " [t 展开]"), fg: K.FAINT }]);
               mark(realIdx, bi);
               if (open) {
-                for (const ln of renderMd(truncateText(b.text, MAX_TEXT), w - 4)) { lines.push([{ t: "  " }, ...ln]); mark(realIdx, bi); }
+                // Expanded = the WHOLE reasoning (no hidden remainder).
+                for (const ln of renderMd(b.text ?? "", w - 4)) { lines.push([{ t: "  " }, ...ln]); mark(realIdx, bi); }
               } else {
                 // collapsed: three-line preview
                 for (const ln of renderMd(truncateText(b.text, 400), w - 4).slice(0, 3)) {
@@ -995,10 +1016,18 @@ export class ChatView extends Widget {
               const glyph = b.result == null && !b.done ? "⏳" : exitCode !== undefined && exitCode !== 0 ? "✗" : "✓";
               const card = b.view ? renderToolCard(b.view, w, open) : [];
               beginCard(status);
+              let timing = "";
+              if (b.result == null && !b.done) {
+                timing = ` 已经过 ${fmtDuration(Date.now() - (b.startedAt ?? Date.now()))}`;
+              } else if (b.startedAt !== undefined && b.endedAt !== undefined) {
+                const failed = exitCode !== undefined && exitCode !== 0;
+                timing = ` ${failed ? "失败" : "已完成"},耗时 ${fmtDuration(b.endedAt - b.startedAt)}`;
+              }
               lines.push([
                 { 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: stepTag + timing, fg: K.DIM },
                 { t: open ? " [b 折叠]" : " [b 展开]", fg: K.FAINT },
               ]);
               mark(realIdx, bi);
@@ -1025,14 +1054,34 @@ export class ChatView extends Widget {
               sep();
             } else if (b.kind === "other") {
               beginCard("THINKBG");
-              lines.push([{ t: "  " + truncate(b.text, w - 4), fg: K.DIM }]);
+              lines.push([{ t: "  " + stepTag + truncate(b.text, w - 4 - strWidth(stepTag)), fg: K.DIM }]);
               mark(realIdx, bi);
               sep();
             } else {
               beginCard("CARD");
+              // Text blocks collapse per-block like tool/reasoning blocks:
+              // collapsed shows a 3-line preview + trailer, expanded the whole
+              // text. Clicking (or the right-click 展开/折叠) toggles it.
+              const key = `${realIdx}:${bi}`;
+              const open = !this.collapsedBlocks.has(key);
               const text = b.text ?? "";
-              for (const ln of renderMd(text, w - 4)) { lines.push([{ t: "  " }, ...ln]); mark(realIdx); }
-              mark(realIdx, bi);
+              const glyph = open ? "▾" : "▸";
+              const mdW = Math.max(10, w - 6 - strWidth(stepTag));
+              const md = open
+                ? renderMd(text, mdW)
+                : renderMd(truncateText(text, 600), mdW).slice(0, 3);
+              if (md.length > 0) {
+                lines.push([{ t: "  " }, { t: glyph + " ", fg: K.FAINT }, { t: stepTag, fg: K.FAINT }, ...md[0]]);
+                mark(realIdx, bi);
+                for (const ln of md.slice(1)) { lines.push([{ t: "  " }, ...ln]); mark(realIdx, bi); }
+              } else {
+                lines.push([{ t: "  " + glyph + " " + stepTag, fg: K.FAINT }]);
+                mark(realIdx, bi);
+              }
+              if (!open && text.length > 0) {
+                lines.push([{ t: `  …共 ${text.length} 字（点击展开）`, fg: K.FAINT }]);
+                mark(realIdx, bi);
+              }
               sep();
             }
           }
@@ -1214,6 +1263,7 @@ export class ChatView extends Widget {
         return true;
       }
       if (ev.kind === "press" && ev.button === 2) {
+        this.flushRebuild(); // keep lineMap current with the nodes array
         const y = ev.y - this.view.y + this.view.scrollY;
         const info = this.lineMap?.[y];
         if (info) {
@@ -1257,13 +1307,13 @@ export class ChatView extends Widget {
       case "pgup": if (this.view.scrollY === 0) { this.loadOlder(); return true; } return this.view.scroll(-this.view.h);
       case "pgdn": return this.view.scroll(this.view.h);
     }
-    if (ev.name === "char" && ev.key === "g" && !ev.ctrl) {
+    if (ev.name === "char" && ev.key === "g" && !ev.ctrl && !ev.shift) {
       if (this.gKey) { this.gKey = false; this.view.scrollY = 0; return true; }
       this.gKey = true;
       this.app.toast("再按 g 回顶");
       return true;
     }
-    if (ev.name === "char" && ev.key === "G") { this.view.scrollY = this.view.maxScroll(); return true; }
+    if (ev.name === "char" && ev.key === "g" && ev.shift) { this.view.scrollY = this.view.maxScroll(); return true; }
     if (ev.name === "escape" && this.app.searchQuery) { this.app.searchQuery = null; this.queueRebuild(); return true; }
     if (ev.name === "escape" && this.selStart !== null) { this.selStart = this.selEnd = null; this.app.redraw(); return true; }
     if (ev.name === "char" && ev.key === "i" && !ev.ctrl) { this.app.focus(this.input); return true; }
@@ -1317,13 +1367,6 @@ function toolSummary(b) {
   return null;
 }
 
-function fmtElapsed(ms) {
-  if (ms == null || isNaN(ms) || ms < 0) return "0.0s";
-  if (ms < 1000) return `${(ms / 1000).toFixed(1)}s`;
-  if (ms < 60000) return `${(ms / 1000).toFixed(0)}s`;
-  return `${Math.floor(ms / 60000)}m${Math.floor((ms % 60000) / 1000)}s`;
-}
-
 function fmtTokens(n) {
   if (n == null || isNaN(n)) return "0";
   if (n >= 1e6) return (n / 1e6).toFixed(1) + "M";
@@ -1857,18 +1900,26 @@ export class App {
   async loadFeedback() {
     if (!this.currentSession) return;
     try {
-      const res = await this.api.rpcCall("messageFeedback/list", { sessionId: this.currentSession });
+      const res = await this.api.rpcCall("messageFeedback/list", { request: { sessionId: this.currentSession } });
       this.feedbackMap = new Map();
-      for (const item of res.items ?? []) this.feedbackMap.set(item.messageId, item);
+      for (const item of res?.value?.items ?? res?.items ?? []) this.feedbackMap.set(item.messageId, item);
     } catch { this.feedbackMap = new Map(); }
   }
 
   async feedback(messageId, rating) {
     const existing = this.feedbackMap?.get(messageId);
     try {
-      const item = await this.api.rpcCall("messageFeedback/put", {
-        sessionId: this.currentSession, messageId, rating, ifVersion: existing?.version ?? null,
+      const res = await this.api.rpcCall("messageFeedback/put", {
+        request: {
+          sessionId: this.currentSession, messageId, rating,
+          ifVersion: existing?.version ?? null,
+        },
       });
+      if (res?.ok === false) {
+        this.toast(`反馈失败: ${res.error?.code ?? res.error?.message ?? "unknown"}`);
+        return;
+      }
+      const item = res?.value ?? res;
       this.feedbackMap = this.feedbackMap ?? new Map();
       this.feedbackMap.set(messageId, item);
       this.toast(rating === "positive" ? "已记录 👍" : "已记录 👎");
@@ -1879,7 +1930,13 @@ export class App {
     const existing = this.feedbackMap?.get(messageId);
     if (!existing) return;
     try {
-      await this.api.rpcCall("messageFeedback/delete", { sessionId: this.currentSession, messageId, ifVersion: existing.version });
+      const res = await this.api.rpcCall("messageFeedback/delete", {
+        request: { sessionId: this.currentSession, messageId, ifVersion: existing.version },
+      });
+      if (res?.ok === false) {
+        this.toast(`删除反馈失败: ${res.error?.code ?? res.error?.message ?? "unknown"}`);
+        return;
+      }
       this.feedbackMap.delete(messageId);
       this.toast("已删除反馈");
     } catch (e) { this.toast(`删除反馈失败: ${e.message}`); }
@@ -2054,11 +2111,51 @@ export class App {
     else this.toast("先打开一个会话");
   }
 
-  showJobs() { this.overlay = buildJobsPopup(this); this.redraw(); }
+  showJobs() { this.overlay = new JobsPanel(this); this.redraw(); }
   showGoal() { this.overlay = buildGoalPopup(this); this.redraw(); }
   showModePicker() { this.overlay = buildModePicker(this); this.redraw(); }
   showPermissionPicker() { this.overlay = buildPermissionPicker(this); this.redraw(); }
 
+  /** Ctrl+E: fzf-style quick jump to a step — type to fuzzy-filter the step
+   *  list, Enter opens the trajectory window around the picked step. */
+  async quickJumpStep() {
+    if (!this.currentSession) { this.toast("先打开一个会话"); return; }
+    if (!this.trajectoryPanel) this.trajectoryPanel = new TrajectoryPanel(this);
+    const tp = this.trajectoryPanel;
+    if (tp.sessionId !== this.currentSession || tp.steps.length === 0) {
+      this.setStatus("加载步骤列表…");
+      await tp.load(this.currentSession);
+      this.setStatus("");
+    }
+    const total = tp.stats?.steps ?? (tp.steps[tp.steps.length - 1]?.step ?? tp.steps.length);
+    const items = [...tp.steps].reverse().map((st) => {
+      const si = tp.steps.indexOf(st);
+      const tools = [...new Set(st.events.filter((e) => e.type === "tool/call").map((e) => e.data?.name))];
+      const t0 = st.events[0]?.time, t1 = st.events[st.events.length - 1]?.time;
+      const dur = t0 && t1 ? fmtMs(t1 - t0) : "—";
+      const userMsg = st.events.find((e) => e.type === "user/message")?.data?.content?.[0]?.text ?? "";
+      return {
+        label: `step ${st.step}  ${dur}  ${tools.slice(0, 3).join(",") || "纯文本"}  ${truncate(String(userMsg), 24)}`,
+        hint: `${st.events.length} 事件`,
+        keywords: `step ${st.step} ${tools.join(" ")} ${userMsg}`,
+        stepIdx: si,
+      };
+    });
+    const w = Math.min(76, this.screen.w - 8), h = Math.min(20, this.screen.h - 4);
+    this.overlay = new Picker({
+      x: Math.floor((this.screen.w - w) / 2), y: Math.floor((this.screen.h - h) / 2),
+      w, h, title: `步骤转跳（step 1–${total} · Ctrl+E）— 输入过滤,回车定位`,
+      items,
+      onCancel: () => this.closeOverlay(),
+      onPick: (it) => {
+        this.closeOverlay();
+        this.setMode("trajectory");
+        this.trajectoryPanel.jumpToStep(it.stepIdx);
+      },
+    });
+    this.redraw();
+  }
+
   /** Select one of the four agent presets (modes). */
   async selectPreset(id) {
     if (!this.currentSession) { this.toast("先打开一个会话"); return; }
@@ -2216,16 +2313,29 @@ export class App {
     }
     if (this.menu) {
       const before = this.menu;
-      if (ev.type === "key") this.menu.onKey(ev);
-      else if (ev.type === "mouse") {
-        if (ev.kind === "press" && ev.button === 0 && !this.menu.inside(ev.x, ev.y)) { this.menu = null; this.swallowRelease = true; }
-        else {
+      if (ev.type === "key") { this.menu.onKey(ev); this.redraw(); return; }
+      if (ev.type === "mouse") {
+        if (ev.kind === "press" && ev.button === 0 && !this.menu.inside(ev.x, ev.y)) {
+          this.menu = null; this.swallowRelease = true; this.redraw(); return;
+        }
+        if (ev.kind === "press" && ev.button === 2) {
+          if (this.menu.inside(ev.x, ev.y)) { this.redraw(); return; } // right-click on the menu itself: keep it open
+          // OS-style: a right-click anywhere else closes the current menu and
+          // the SAME press falls through to open a fresh menu at the new spot.
+          this.menu = null;
+          this.swallowRelease = true;
+          this.redraw();
+          // fall through to the normal mouse routing below
+        } else {
           this.menu.onMouse(ev);
           if (ev.kind === "press" && this.menu !== before) this.swallowRelease = true;
+          this.redraw();
+          return;
         }
+      } else {
+        this.redraw();
+        return;
       }
-      this.redraw();
-      return;
     }
     if (this.overlay) {
       const before = this.overlay;
@@ -2338,6 +2448,7 @@ export class App {
         this.setMode("workspace"); return;
       }
       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 === "g") { this.showGoal(); return; }
       if (ev.ctrl && ev.key === "f") { this.findInConversation(); return; }
@@ -2368,7 +2479,14 @@ export class App {
         return;
       }
       if (ev.text.length === 1) {
-        const asKey = { type: "key", name: "char", key: ev.text, text: ev.text, ctrl: false, alt: false, shift: false };
+        // Legacy terminals deliver Shift+letter as the UPPERCASE char with no
+        // modifier info — recover the shift flag from the case so Shift+T
+        // (todo fold) and G (scroll bottom) work everywhere.
+        const asKey = {
+          type: "key", name: "char",
+          key: ev.text.toLowerCase(), text: ev.text,
+          ctrl: false, alt: false, shift: ev.text !== ev.text.toLowerCase(),
+        };
         if (this.chat.onKey(asKey)) { this.redraw(); return; }
         if (this.focused && this.focused !== this.chat.input && this.focused.onKey(asKey)) { this.redraw(); return; }
         this.toast("按 i 进入输入");
@@ -2532,16 +2650,18 @@ export class App {
       if (stats.ttftMs) row1.right.push({ t: ` 首响${Math.round(stats.ttftMs / stats.ttftSteps)}ms `, fg: T.FAINT, bg: T.STATUSBG });
     }
     rows.push(row1);
-    // ── row 2: jobs (only when present) ──
+    // ── row 2: background jobs — one summary line, never per-job noise ──
     if (this.jobs?.length) {
-      const running = this.jobs.filter((j) => j.status === "running");
+      const running = this.jobs.filter((j) => j.status === "running").length;
+      const done = this.jobs.filter((j) => j.status === "completed").length;
+      const failed = this.jobs.filter((j) => j.status === "failed").length;
       const row2 = { left: [], right: [] };
-      for (const j of this.jobs.slice(0, 4)) {
-        const icon = j.status === "running" ? "⚙" : j.status === "completed" ? "✓" : j.status === "failed" ? "✗" : "·";
-        const fg = j.status === "running" ? T.WARN : j.status === "completed" ? T.OK : j.status === "failed" ? T.ERR : T.DIM;
-        row2.left.push({ t: ` ${icon} ${truncate(j.label ?? j.kind, 22)} `, fg, bg: T.STATUSBG });
-      }
-      if (running.length) row2.right.push({ t: ` ${running.length} 运行中 `, fg: T.WARN, bg: T.STATUSBG });
+      row2.left.push({
+        t: ` ${running > 0 ? `${running} 个任务正在后台运行` : "没有任务正在后台运行"} `,
+        fg: running > 0 ? T.WARN : T.FAINT, bg: T.STATUSBG,
+      });
+      row2.left.push({ t: ` ${done}已完成${failed > 0 ? ` ${failed}失败` : ""} `, fg: done > 0 ? T.OK : T.FAINT, bg: T.STATUSBG });
+      row2.right.push({ t: " Ctrl+J 查看详情 ", fg: T.DIM, bg: T.STATUSBG });
       rows.push(row2);
     }
     this.status.rows = rows;