dsh-neotui 0.4.3 → 0.4.4

package/src/panels.js

@@ -2,7 +2,7 @@
 // timeline, jobs/goal panels, and the terminal image viewer (kitty graphics
 // protocol with external-viewer / chafa fallbacks).
 import { Widget, ScrollView, Input, Popup, wrapIndex } from "./widgets.js";
-import { strWidth, truncate, pad, graphemes, graphemeWidth, bytesLabel, prettyJson } from "./text.js";
+import { strWidth, truncate, pad, graphemes, graphemeWidth, bytesLabel, prettyJson, fmtDuration } from "./text.js";
 import { renderMd, C } from "./md.js";
 import { readdirSync, statSync, readFileSync, writeFileSync, existsSync } from "node:fs";
 import { tmpdir } from "node:os";
@@ -1361,7 +1361,12 @@ export class TrajectoryPanel extends Widget {
       const flash = this.flashKey === this.stepKey(step) && Date.now() < this.flashUntil;
       const rowBg = flash ? T.ACCENT : bg;
       const selected = this.stepKey(step) === this.selectedStepKey;
-      const label = `${selected ? "=>" : "  "} ${open ? "▾" : "▸"} step ${String(step.step).padStart(3)}  ${pad(dur, 8)}  ${summary}  ${open ? "[折叠]" : "[展开]"}`;
+      const srcKind = (step.events ?? []).find((e) => e.type === "user/message")?.data?.source?.kind;
+      let summary2 = summary;
+      let srcPrefix = "";
+      const srcLabel = srcKind ? sourceBadge(srcKind) : "";
+      if (srcKind === "plugin" || srcKind === "goal") { srcPrefix = `${sourceBadge(srcKind)} `; summary2 = `${srcKind === "goal" ? `目标轮 ${step.events.find((e) => e.type === "user/message")?.data?.source?.round ?? "?"}` : "注入上下文"} · ${summary}`; }
+      const label = `${selected ? "=>" : "  "} ${open ? "▾" : "▸"} ${srcPrefix}step ${String(step.step).padStart(3)}  ${pad(dur, 8)}  ${summary2}  ${open ? "[折叠]" : "[展开]"}`;
       const segs = [{ t: label, fg: flash ? T.SELFG : K.TXT, bg: rowBg, bold: true }];
       const fill = w - strWidth(label);
       if (fill > 0) segs.push({ t: " ".repeat(fill), bg: rowBg });
@@ -1716,7 +1721,10 @@ export class ControlPanel extends Widget {
     const h = Math.min(24, 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.pages = ["快捷键", "命令", "设置", "插件"];
+    // Prefix-key page (leader, nvim-style EDITING logic only): a one-key
+    // command page as the START page; the keys fire only while this page is
+    // shown, so it never leaks into normal mode.
+    this.pages = ["前缀", "快捷键", "命令", "设置", "插件"];
     this.page = startPage;
     this.pluginQuery = ""; this.pluginFilter = false;
     this.sel = 0;
@@ -1752,9 +1760,14 @@ export class ControlPanel extends Widget {
       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("undoInput","输入撤销"),row("redoInput","输入重做"),row("insertFilePicker","输入中打开文件选择器"),row("pasteImage","输入中粘贴剪贴板图片"),row("copySelection","复制正文选区"),row("addWorkspace","添加工作区"),row("commandPalette","命令面板"),row("modePicker","模式选择器"),row("themePicker","配色主题选择器"),row("logoPicker","欢迎页 logo（预设/自定义/关闭）"),row("quitDouble","双击 Ctrl+C 退出"),row("panel","控制面板"),row("model","切换模型"),row("trajectory","轨迹视图"),row("panePrev","pane 焦点 ← 上一窗格"),row("paneNext","pane 焦点 → 下一窗格"),row("permissionRotate","权限模式轮换"),row("workspace","工作区"),row("settings","设置"),row("subagent","子代理"),row("skills","技能"),row("goal","目标"),row("jobs","后台任务"),row("queue","后台队列"),row("busyEnter","运行中 Enter 策略"),row("attachments","附件管理"),row("stepJump","步骤转跳"),row("sidebar","侧栏显示/隐藏"),row("editConfig","编辑配置文件（默认编辑器）"),row("quit","退出"),
     ];
   }
+  prefixRows() {
+    // 前缀页 = 引擎同一张表的可视化（which-key）；键路由走同一引擎。
+    return this.app.prefixRowsData();
+  }
   items() {
-    if (this.page === 0) return this.shortcutItems();
-    if (this.page === 1) {
+    if (this.page === 0) return this.prefixRows().map(([k, d, hint, action]) => [`${k}  ${d}`, hint, action]);
+    if (this.page === 1) return this.shortcutItems();
+    if (this.page === 2) {
       return this.commands.map((c) => [
         `/${c.name}${c.input?.hint ? " " + c.input.hint : ""}`,
         c.description,
@@ -1766,7 +1779,7 @@ export class ControlPanel extends Widget {
         },
       ]);
     }
-    if (this.page === 2) {
+    if (this.page === 3) {
       return [
         ["模型管理（含思考强度）", "切换模型并选择思考强度", () => { this.app.overlay = buildModelPicker(this.app); }],
         ["模式（Agent 预设）", "标准 / PTC / 极简 / 创造", () => { this.app.overlay = buildModePicker(this.app); this.app.redraw(); }],
@@ -1778,7 +1791,7 @@ export class ControlPanel extends Widget {
         ["复制会话 ID", "", () => this.app.copyText(this.app.currentSession ?? "")],
       ];
     }
-    if (this.plugins) {
+    if (this.page === 4 && this.plugins) {
       const q=this.pluginQuery.toLowerCase();
       return this.plugins.filter((pl)=>!q||`${pl.moduleName} ${pl.fiberPhase??""}`.toLowerCase().includes(q)).map((pl) => [`${pl.enabled ? "●" : "○"} ${pl.moduleName}`, pl.fiberPhase ?? "", null]);
     }
@@ -1801,7 +1814,8 @@ export class ControlPanel extends Widget {
     if (this.sel < this.scroll) this.scroll = this.sel;
     else if (this.sel >= this.scroll + visible) this.scroll = this.sel - visible + 1;
     this.scroll = Math.max(0, Math.min(Math.max(0, items.length - visible), this.scroll));
-    if(this.page===0){s.text(this.x+2,this.y+1,"MODE",{fg:T.PURPLE,bg:T.PANEL,attrs:1});s.text(this.x+13,this.y+1,"KEY1",{fg:T.ACCENT,bg:T.PANEL,attrs:1});s.text(this.x+31,this.y+1,"KEY2",{fg:T.ACCENT,bg:T.PANEL,attrs:1});s.text(this.x+49,this.y+1,"FUNCTION",{fg:T.OK,bg:T.PANEL,attrs:1});}
+    if(this.page===0){s.text(this.x+2,this.y+1,"KEY",{fg:T.PURPLE,bg:T.PANEL,attrs:1});s.text(this.x+13,this.y+1,"ACTION",{fg:T.OK,bg:T.PANEL,attrs:1});s.text(this.x+this.w-24,this.y+1,"等价命令",{fg:T.ACCENT,bg:T.PANEL,attrs:1});}
+    if(this.page===1){s.text(this.x+2,this.y+1,"MODE",{fg:T.PURPLE,bg:T.PANEL,attrs:1});s.text(this.x+13,this.y+1,"KEY1",{fg:T.ACCENT,bg:T.PANEL,attrs:1});s.text(this.x+31,this.y+1,"KEY2",{fg:T.ACCENT,bg:T.PANEL,attrs:1});s.text(this.x+49,this.y+1,"FUNCTION",{fg:T.OK,bg:T.PANEL,attrs:1});}
     if(this.page===3&&this.pluginFilter){s.text(this.x+2,this.y+1,`/ ${this.pluginQuery}`,{fg:T.ACCENT,bg:T.PANEL,attrs:1});}
     for (let i = 0; i < visible; i++) {
       const idx = this.scroll + i;
@@ -1810,10 +1824,11 @@ export class ControlPanel extends Widget {
       const sel = idx === this.sel;
       s.fillRect(this.x + 1, this.y + 2 + i, this.x + this.w - 2, this.y + 2 + i, " ", { bg: sel ? T.MENUSEL : T.PANEL });
       const label = it[0];
-      if(this.page===0){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});}
+      if(this.page===0){const [k, d2] = label.split("  ", 2);s.text(this.x+2,this.y+2+i,pad(k,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(d2, 30), 32),{fg:T.OK,bg:sel?T.MENUSEL:T.PANEL,attrs:sel?1:0});s.text(this.x+this.w-24,this.y+2+i,truncate(it[1]??"",22),{fg:T.ACCENT,bg:sel?T.MENUSEL:T.PANEL});}
+      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?"↑↓ 选择 · 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;}}
@@ -1822,6 +1837,13 @@ export class ControlPanel extends Widget {
     if(this.page===3&&ev.name==="char"&&ev.key==="/"){this.pluginFilter=true;this.pluginQuery="";return true;}
     if(this.page===3&&ev.ctrl&&(ev.key==="/"||ev.key==="_")){this.pluginQuery="";return true;}
     if (ev.name === "escape") { this.app.closeOverlay(); return true; }
+    // Prefix page: a plain one-key press fires the mapped command — but ONLY
+    // while the prefix page itself is on screen (leader-style EDITING logic).
+    if (this.page === 0 && ev.name === "char" && !ev.ctrl && !ev.alt) {
+      const key = ev.key ?? "";
+      const row = this.prefixRows().find(([k]) => k === key || (k === key.toUpperCase() && ev.shift && k !== key));
+      if (row) { row[3](); this.app.redraw(); return true; }
+    }
     if(this.page===0&&ev.name==="backtab"){const it=this.items()[this.sel],id=it?.[3];if(id){const b=keyBindings()[id],modes=["normal","insert","all"],mode=modes[(modes.indexOf(b.mode)+1)%3];setKeyBinding(id,{...b,mode});this.app.toast(`适用模式: ${mode.toUpperCase()}`);}return true;}
     if(this.page===0&&ev.alt&&ev.name==="enter"){const id=this.items()[this.sel]?.[3];if(id){resetKeyBinding(id);this.app.toast("已恢复默认快捷键");}return true;}
     if (ev.name === "tab" || ev.name === "right") {
@@ -2278,7 +2300,7 @@ export class QueuePanel extends Popup {
 
 export class GoalPanel extends Popup {
   constructor(app) {
-    super({ x: 4, y: 2, w: Math.max(24, Math.min(84, app.screen.w - 8)), h: Math.max(10, Math.min(28, app.screen.h - 4)), title: "目标与任务", lines: [], buttons: [], scrollable: true });
+    super({ x: 4, y: 2, w: Math.max(24, Math.min(96, app.screen.w - 8)), h: Math.max(10, Math.min(app.screen.h - 4, 34)), title: "目标与任务", lines: [], buttons: [], scrollable: true });
     this.app = app; this.busy = false; this.actionSel = 0; this.actions = []; this.actionRows = []; this.rebuild();
   }
   /** Called by App when a live goal/todo projection arrives while open. */
@@ -2292,6 +2314,14 @@ export class GoalPanel extends Popup {
     else {
       lines.push([{ t: ` 目标: ${goal.objective ?? goal}`, fg: K.TXT, bold: true }]);
       lines.push([{ t: ` 阶段: ${goal.phase ?? "active"} · 轮次 ${this.app.goalData?.roundsStarted ?? 0}/${goal.maxGoalRounds ?? "∞"} · 修订 ${goal.revision ?? "?"}`, fg: K.DIM }]);
+      const rounds = (this.app.chat?.nodes ?? []).filter((n) => n?.kind === "goal-round" || n?.source?.kind === "goal");
+      if (rounds.length) {
+        lines.push([{ t: "" }, { t: " ◆ 目标延续轮（自动进入）", fg: K.PURPLE, bold: true }]);
+        for (const r of rounds) {
+          const text = (r.blocks ?? []).filter((b) => b?.type === "text").map((b) => b.text ?? "").join("").replace(/\s+/g, " ").trim();
+          lines.push([{ t: `  ◆ ${r.source?.round ?? "?"}轮 · ${truncate(text || r.id || "（无文本）", Math.max(12, this.w - 12))}`, fg: K.DIM }]);
+        }
+      }
       if (goal.blockedReason?.message) lines.push([{ t: ` 阻塞: ${goal.blockedReason.message}`, fg: K.ERR }]);
     }
     this.actions = goal ? [
@@ -4742,3 +4772,381 @@ export class SkillsPanel extends Widget {
     return false;
   }
 }
+
+/** Open a scrollable detail Popup over `returnTo` (restored as app.overlay on
+ *  Escape/q). `lines` may be raw string lines or styled segment arrays. */
+function openDetailPopup(app, returnTo, title, lines) {
+  const w = Math.max(40, Math.min(110, app.screen.w - 4));
+  const h = Math.max(12, Math.min(36, app.screen.h - 4));
+  const pop = new Popup({
+    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: [], scrollable: true,
+    onAction: () => { app.overlay = returnTo; app.redraw(); },
+  });
+  for (const line of (lines ?? [])) {
+    pop.lines.push(Array.isArray(line) ? line.map((seg) => ({ ...seg })) : [{ t: String(line), fg: K.TXT }]);
+  }
+  const base = pop.onKey.bind(pop);
+  pop.onKey = (ev) => {
+    if (ev.type === "key" && (ev.name === "escape" || (ev.name === "char" && ev.key === "q" && !ev.ctrl))) {
+      app.overlay = returnTo; app.redraw(); return true;
+    }
+    return base(ev);
+  };
+  app.overlay = pop;
+  app.redraw();
+  return pop;
+}
+
+/** Pretty, bounded JSON-ish summary of an entry for the detail popup. */
+function detailText(value) {
+  const s = prettyJson(JSON.stringify(value));
+  return (s ?? JSON.stringify(value, null, 2) ?? String(value)).slice(0, 6000);
+}
+
+/** Message-source badge: ● direct prompt (user) · ◇ injected context
+ *  (plugin: cron/inject/skill…) · ◆ goal continuation round · ● unknown. */
+export function sourceBadge(kind) {
+  return kind === "user" ? "●" : kind === "plugin" ? "◇" : kind === "goal" ? "◆" : "●";
+}
+export function sourceGroup(kind) {
+  return kind === "user" ? "排队提问" : kind === "plugin" ? "注入上下文" : kind === "goal" ? "目标延续" : "排队提问";
+}
+/** 徽标图例（页脚小字）。 */
+export function sourceLegend() {
+  return "● 提问 · ◇ 注入 · ◆ 目标轮";
+}
+
+// ---- SubagentPage (main-area pane 子代理): single-column subagent list ----
+
+export class SubagentPage extends Widget {
+  constructor(app) {
+    super({ x: 0, y: 1, w: app.screen.w, h: Math.max(2, app.screen.h - 1) });
+    this.app = app;
+    this.entries = [];
+    this.error = null;
+    this.loading = false;
+    this.sel = 0;
+    this.rows = [];       // { kind:"header"|"item", item? } flattened selectable view
+    this.selector = [];   // entry indices selectable in order
+    this.view = new ScrollView({ x: this.x, y: this.y, w: this.w, h: this.h, showScrollbar: true });
+    this.loadToken = 0;
+    this.inputMode = false;
+    this.input = new Input({
+      x: this.x, y: this.y + this.h - 1, w: this.w, h: 1,
+      placeholder: "给选中子代理发消息…（continuable · i 聚焦 · Esc 回列表）",
+      onEnter: (v) => this.send(v),
+    });
+  }
+  relayout(x, y, w, h) {
+    this.x = x; this.y = y; this.w = w; this.h = h;
+    this.view.x = x; this.view.y = y; this.view.w = w; this.view.h = Math.max(1, h - 1);
+    this.input.x = x; this.input.y = y + h - 1; this.input.w = w;
+  }
+  onActivate() { this.ensureLoaded(); }
+  ensureLoaded() {
+    if (this.loading || (this.entries.length > 0 && this.error == null)) return;
+    this.load();
+  }
+  /** Live refresh (frame injection), throttled to one call per second. */
+  reload() {
+    const now = Date.now();
+    if (this.loading) return;
+    if (this.lastReloadAt != null && now - this.lastReloadAt < 1000) return;
+    this.lastReloadAt = now;
+    this.load();
+  }
+  async load() {
+    const token = ++this.loadToken;
+    this.loading = true;
+    this.error = null;
+    try {
+      const res = await this.app.api.call("subagent.list", { parentSessionId: this.app.currentSession });
+      if (token !== this.loadToken) return;
+      this.entries = res.items ?? res.entries ?? [];
+    } catch (e) {
+      if (token !== this.loadToken) return;
+      this.entries = [];
+      this.error = e.message;
+      this.app.toast(`子代理加载失败: ${e.message}`);
+    }
+    this.loading = false;
+    this.sel = 0;
+    this.#rebuild();
+    this.app.redraw();
+  }
+  #parentOf(e) { return e.parentSessionId ?? e.parentId ?? e.parent ?? null; }
+  #statusOf(e) {
+    return e.activity ?? e.state ?? e.status ?? (e.done ? "inactive" : "idle");
+  }
+  #elapsedMs(e) {
+    if (e.elapsed != null) return e.elapsed;
+    if (e.duration != null) return e.duration;
+    if (typeof e.settledMs === "number") return e.settledMs;
+    if (typeof e.timing?.settledMs === "number") return e.timing.settledMs;
+    if (typeof e.startedAt === "number" && typeof e.finishedAt === "number") return e.finishedAt - e.startedAt;
+    if (typeof e.startedAt === "number") return Date.now() - e.startedAt;
+    return null;
+  }
+  #modelOf(e) {
+    if (typeof e.model === "string") return e.model;
+    if (e.model?.id) return `${e.model.provider ? e.model.provider + "/" : ""}${e.model.id}`;
+    if (typeof e.modelId === "string") return e.modelId;
+    return null;
+  }
+  #tokensOf(e) {
+    const t = e.tokenUsage ?? e.tokens ?? e.tokenCount;
+    if (t == null) return null;
+    const total = typeof t === "object" ? (t.total ?? t.input + (t.output ?? 0) ?? null) : t;
+    return total == null ? null : total;
+  }
+  #exitReason(e) {
+    return e.exitReason ?? e.stoppedReason ?? e.reason ?? e.error?.message ?? null;
+  }
+  #shortId(e, w) {
+    const label = e.label ?? e.sessionId ?? e.id;
+    return truncate(String(label ?? "子代理"), w);
+  }
+  #rebuild() {
+    const w = Math.max(20, this.w - 2);
+    const rows = [], selector = [];
+    for (let i = 0; i < this.entries.length; i++) {
+      const e = this.entries[i];
+      const parent = this.#parentOf(e);
+      if (parent != null) {
+        const prev = i > 0 ? this.#parentOf(this.entries[i - 1]) : undefined;
+        if (prev !== parent) rows.push({ kind: "header", text: `▼ 父会话 ${truncate(String(parent), 30)} / 子代理` });
+      } else if (i === 0) {
+        rows.push({ kind: "header", text: "▼ 父会话 / 子代理" });
+      }
+      const running = this.#statusOf(e) === "running";
+      const model = this.#modelOf(e);
+      const elapsed = this.#elapsedMs(e);
+      const tokens = this.#tokensOf(e);
+      const exit = this.#exitReason(e);
+      const idw = Math.max(10, w - 14);
+      let line = `${running ? "●" : "○"} ${this.#shortId(e, idw)}`;
+      if (model) line += ` · ${truncate(String(model), 18)}`;
+      if (elapsed != null) line += ` · ${fmtDuration(elapsed)}`;
+      if (tokens != null) line += ` · ${tokens} tok`;
+      if (exit) line += ` · ${truncate(String(exit), 22)}`;
+      rows.push({ kind: "item", item: e, index: i, text: line, running });
+      selector.push(i);
+    }
+    if (this.entries.length === 0) {
+      rows.push({ kind: "empty", text: this.error ? ` 子代理加载失败: ${this.error}` : " 暂无子代理" });
+    }
+    this.rows = rows;
+    this.selector = selector;
+    if (this.sel >= selector.length) this.sel = Math.max(0, selector.length - 1);
+  }
+  render(screen) {
+    screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, " ", { bg: T.BG });
+    if (this.entries.length === 0 && !this.loading) {
+      const msg = this.error ? `子代理加载失败: ${this.error}` : "暂无子代理";
+      screen.text(this.x + 1, this.y + 1, msg, { fg: this.error ? K.ERR : K.FAINT });
+      return;
+    }
+    // Render rows through the shared ScrollView so scrolling works.
+    this.view.setLines(this.rows.map((row) => {
+      if (row.kind === "header") return [{ t: row.text, fg: K.ACCENT, bold: true }];
+      if (row.kind === "empty") return [{ t: row.text, fg: row.text.startsWith("子代理加载失败") ? K.ERR : K.FAINT }];
+      const sel = this.selector[this.sel] === row.index;
+      const fg = row.running ? K.OK : sel ? T.SELFG : K.TXT;
+      const bg = sel ? T.MENUSEL : -1;
+      return [{ t: row.text, fg, bg, bold: sel }];
+    }), { keep: true });
+    this.view.render(screen);
+    // selection highlight is handled above via bg; ensure selected row visible
+    const selIdx = this.selector[this.sel];
+    if (selIdx != null) {
+      const rowPos = this.rows.findIndex((r) => r.kind === "item" && r.index === selIdx);
+      const selLine = this.rows.slice(0, rowPos + 1).filter((r) => r.kind !== "empty").length - 1;
+      if (selLine < this.view.scrollY) this.view.scrollY = selLine;
+      else if (selLine >= this.view.scrollY + this.view.h) this.view.scrollY = selLine - this.view.h + 1;
+    }
+    screen.fillRect(this.x, this.y + this.h - 2, this.x + this.w - 1, this.y + this.h - 1, " ", { bg: this.inputMode ? T.BG2 : T.BG });
+    screen.text(this.x + 1, this.y + this.h - 2, " ↑↓ 选择 · Enter 详情 · r 刷新 · i 给子代理发消息 · q/Esc 返回聊天", { fg: K.FAINT });
+    this.input.render(screen);
+  }
+  /** Continuable message to the selected subagent (original panel parity). */
+  async send(text) {
+    const child = this.entries[this.selector[this.sel]];
+    if (!child) { this.app.toast("先选择子代理"); return; }
+    try {
+      await this.app.api.call("subagent.prompt", {
+        parentSessionId: this.app.currentSession,
+        childSessionId: child.id,
+        mode: "continuable",
+        content: [{ type: "text", text }],
+        clientTimeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+      });
+      this.app.toast(`已发送给 ${child.id.slice(0, 8)}`);
+      this.input.setValue("");
+      this.reload();
+    } catch (e) { this.app.toast(`发送失败: ${e.message}`); }
+  }
+  openDetail() {
+    const e = this.entries[this.selector[this.sel]];
+    if (!e) return;
+    openDetailPopup(this.app, this.app.overlay, "子代理详情", detailText(e).split("\n"));
+  }
+  onKey(ev) {
+    if (ev.type !== "key") return false;
+    if (this.inputMode) {
+      if (ev.name === "escape") { this.inputMode = false; this.input.setValue(""); this.app.redraw(); return true; }
+      this.input.onKey(ev);
+      return true;
+    }
+    if (ev.name === "char" && (ev.key === "i" || ev.key === "I") && !ev.ctrl) { this.inputMode = true; this.app.redraw(); return true; }
+    if (ev.name === "tab") { this.inputMode = true; this.app.redraw(); return true; }
+    if (ev.name === "char" && ev.key === "r" && !ev.ctrl) { this.load(); return true; }
+    if (ev.name === "up" || ev.name === "down") {
+      if (this.selector.length === 0) return false;
+      const next = wrapIndex(this.sel + (ev.name === "up" ? -1 : 1), this.selector.length);
+      this.sel = next;
+      this.app.redraw();
+      return true;
+    }
+    if (ev.name === "enter") { this.openDetail(); return true; }
+    if (ev.name === "pgup") { this.view.scroll(-this.view.h); this.app.redraw(); return true; }
+    if (ev.name === "pgdn") { this.view.scroll(this.view.h); this.app.redraw(); return true; }
+    return false;
+  }
+  onMouse(ev) {
+    if (ev.kind === "press" && ev.button === 0) {
+      const line = ev.y - this.view.y + this.view.scrollY;
+      const row = this.rows[line];
+      if (row?.kind === "item") {
+        this.sel = this.selector.indexOf(row.index);
+        this.openDetail();
+      }
+      return true;
+    }
+    return this.view.onMouse(ev);
+  }
+}
+
+// ---- TasksPage (main-area pane 后台任务): background jobs + queue, source-kind badges ----
+
+export class TasksPage extends Widget {
+  constructor(app) {
+    super({ x: 0, y: 1, w: app.screen.w, h: Math.max(2, app.screen.h - 1) });
+    this.app = app;
+    this.sel = 0;
+    this.groups = [];
+    this.selector = [];
+    this.view = new ScrollView({ x: this.x, y: this.y, w: this.w, h: this.h, showScrollbar: true });
+  }
+  relayout(x, y, w, h) {
+    this.x = x; this.y = y; this.w = w; this.h = h;
+    this.view.x = x; this.view.y = y; this.view.w = w; this.view.h = h;
+  }
+  onActivate() { this.#rebuild(); }
+  /** One normalized entry: queue item or job. */
+  #entries() {
+    const out = [];
+    for (const item of (this.app.queueItems ?? [])) {
+      const src = item?.source?.kind ?? item?.message?.source?.kind ?? "unknown";
+      out.push({ kind: "queue", badge: this.#badgeFor(src), group: this.#groupFor(src), src, item, text: this.#queueSummary(item) });
+    }
+    for (const job of (this.app.jobs ?? [])) {
+      const src = job?.source?.kind ?? "unknown";
+      out.push({ kind: "job", badge: this.#badgeFor(src), group: this.#groupFor(src), src, job, text: this.#jobSummary(job) });
+    }
+    return out;
+  }
+  #badgeFor(src) { return sourceBadge(src); }
+  #groupFor(src) { return sourceGroup(src); }
+  #queueSummary(item) {
+    const text = partsText(item?.message?.content).replace(/\s+/g, " ").trim();
+    return truncate(text || item?.id || "（无文本）", 56);
+  }
+  #jobSummary(job) {
+    let s = truncate(job?.label ?? job?.kind ?? "任务", 56);
+    if (job?.status) s += ` · ${job.status}`;
+    return s;
+  }
+  #durationMs(entry) {
+    const e = entry.kind === "job" ? entry.job : entry.item;
+    if (e?.elapsed != null) return e.elapsed;
+    if (e?.duration != null) return e.duration;
+    if (typeof e?.startedAt === "number" && typeof e?.finishedAt === "number") return e.finishedAt - e.startedAt;
+    if (typeof e?.startedAt === "number") return Date.now() - e.startedAt;
+    return null;
+  }
+  #hasLogTail(entry) {
+    const e = entry.kind === "job" ? entry.job : entry.item;
+    return !!(e?.logTail ?? e?.tail ?? e?.result);
+  }
+  #exitCode(entry) {
+    const e = entry.kind === "job" ? entry.job : entry.item;
+    return e?.exitCode ?? e?.code ?? (e?.status === "failed" ? 1 : null);
+  }
+  #rebuild() {
+    const entries = this.#entries();
+    const groupOrder = [{ name: "排队提问", badge: "●" }, { name: "注入上下文", badge: "◇" }, { name: "目标延续", badge: "◆" }];
+    const rows = [], selector = [];
+    for (const g of groupOrder) {
+      const members = entries.filter((e) => e.group === g.name);
+      if (members.length === 0) continue;
+      rows.push({ kind: "header", text: `${g.badge} ${g.name}（${members.length}）` });
+      for (const entry of members) {
+        const srcTag = entry.src === "unknown" ? " (unknown source)" : "";
+        let text = `${entry.badge} ${entry.text}${srcTag}`;
+        const dur = this.#durationMs(entry);
+        if (dur != null) text += ` · ${fmtDuration(dur)}`;
+        const code = this.#exitCode(entry);
+        if (code != null) text += ` · exit ${code}`;
+        if (this.#hasLogTail(entry)) text += " …";
+        rows.push({ kind: "item", entry, text, index: selector.length });
+        selector.push(entries.indexOf(entry));
+      }
+    }
+    if (rows.length === 0) rows.push({ kind: "empty", text: " 暂无后台任务或排队命令" });
+    this.groups = rows;
+    this.selector = selector;
+    if (this.sel >= selector.length) this.sel = Math.max(0, selector.length - 1);
+  }
+  render(screen) {
+    screen.fillRect(this.x, this.y, this.x + this.w - 1, this.y + this.h - 1, " ", { bg: T.BG });
+    this.view.setLines(this.groups.map((row) => {
+      if (row.kind === "header") return [{ t: row.text, fg: K.ACCENT, bold: true }];
+      if (row.kind === "empty") return [{ t: row.text, fg: K.FAINT }];
+      const sel = this.selector[this.sel] === row.index;
+      return [{ t: row.text, fg: sel ? T.SELFG : K.TXT, bg: sel ? T.MENUSEL : -1, bold: sel }];
+    }), { keep: true });
+    this.view.render(screen);
+    screen.text(this.x + 1, this.y + this.h - 1, " ↑↓ 选择 · Enter 详情 · q/Esc 返回聊天", { fg: K.FAINT });
+  }
+  openDetail() {
+    const rowIdx = this.selector[this.sel];
+    const entry = this.#entries()[rowIdx];
+    if (!entry) return;
+    const raw = entry.kind === "job" ? entry.job : entry.item;
+    openDetailPopup(this.app, this.app.overlay, "任务详情", detailText(raw).split("\n"));
+  }
+  onKey(ev) {
+    if (ev.type !== "key") return false;
+    if (ev.name === "up" || ev.name === "down") {
+      if (this.selector.length === 0) return false;
+      this.sel = wrapIndex(this.sel + (ev.name === "up" ? -1 : 1), this.selector.length);
+      this.app.redraw();
+      return true;
+    }
+    if (ev.name === "enter") { this.openDetail(); return true; }
+    if (ev.name === "pgup") { this.view.scroll(-this.view.h); this.app.redraw(); return true; }
+    if (ev.name === "pgdn") { this.view.scroll(this.view.h); this.app.redraw(); return true; }
+    return false;
+  }
+  onMouse(ev) {
+    if (ev.type === "mouse" && ev.kind === "press" && ev.button === 0) {
+      const line = ev.y - this.view.y + this.view.scrollY;
+      const row = this.groups[line];
+      if (row?.kind === "item") { this.sel = this.selector.indexOf(row.index); this.openDetail(); }
+      return true;
+    }
+    return this.view.onMouse(ev);
+  }
+}

package/src/side-question.mjs

@@ -0,0 +1,75 @@
+// side-question.mjs — /btw 侧问的独立执行器（子进程，密钥一次性使用）。
+// 只在子进程内存中读取 ~/.dsh/.credentials.yaml 的 DEEPSEEK_API_KEY，
+// 直调 DeepSeek API（无工具、单轮），stdout 只输出答案 JSON。
+// ── 重要 ── 绝不打印/回显密钥；错误消息不包含请求头内容。
+import { readFileSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+
+/** env-style credential 文件解析（仅取键名列表，值不落日志）。 */
+export function parseCredentials(text) {
+  const out = {};
+  for (const line of String(text).split("\n")) {
+    // YAML "KEY: value" 或 env "KEY=value" 两种形态
+    const m = /^\s*([A-Za-z_][A-Za-z0-9_]*)\s*(?::|=)\s*(.*?)\s*$/.exec(line);
+    if (m) out[m[1]] = m[2].replace(/^["']|["']$/g, "");
+  }
+  return out;
+}
+
+/** 侧问题请求体（系统围栏 + 会话摘要上下文 + 问题）。 */
+export function buildMessages(question, context = "") {
+  const system = `<system-reminder>This is a side question from the user. Answer it directly in a single response.
+
+IMPORTANT CONTEXT:
+- You are a separate, lightweight agent spawned to answer this one question
+- The main agent is NOT interrupted - it continues working independently
+- You share the conversation context but are a separate instance
+
+CRITICAL CONSTRAINTS:
+- You have NO tools - you cannot read files, run commands, search, or take actions
+- This is a one-off response; there will be no follow-up turns
+- Answer only with what you know from the conversation context
+- Never promise to take any action; if you do not know, say so
+
+Simply answer the question with the information you have.</system-reminder>`;
+  const msgs = [{ role: "system", content: system }];
+  if (context) msgs.push({ role: "user", content: `对话摘要（供参考，非问题本身）：\n${context}` });
+  msgs.push({ role: "user", content: question });
+  return msgs;
+}
+
+/** 直调 DeepSeek 聊天补全（无工具、单轮）。fetchImpl 可注入（测试）。 */
+export async function callDeepSeek(apiKey, messages, { baseUrl = "https://api.deepseek.com", model = "deepseek-chat", fetchImpl = fetch } = {}) {
+  const res = await fetchImpl(`${baseUrl}/chat/completions`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json", Authorization: `Bearer ${apiKey}` },
+    body: JSON.stringify({ model, messages, temperature: 0.6, max_tokens: 2048 }),
+  });
+  if (!res.ok) throw new Error(`API 响应 ${res.status}`);
+  const data = await res.json();
+  const answer = data?.choices?.[0]?.message?.content?.trim();
+  if (!answer) throw new Error("模型未返回内容");
+  return answer;
+}
+
+// ── CLI 入口：node src/side-question.mjs --question "..." [--context "..."] [--credentials path] ──
+if (import.meta.url === `file://${process.argv[1]}`) {
+  const args = process.argv.slice(2);
+  const opt = (name) => args.indexOf(name) >= 0 ? args[args.indexOf(name) + 1] : null;
+  const question = opt("--question");
+  const context = opt("--context") ?? "";
+  if (!question) { console.error("缺少 --question"); process.exit(1); }
+  const credPath = opt("--credentials") ?? join(process.env.DSH_HOME ?? join(homedir(), ".dsh"), ".credentials.yaml");
+  try {
+    const creds = parseCredentials(readFileSync(credPath, "utf8"));
+    const key = creds.DEEPSEEK_API_KEY;
+    if (!key) { console.error("credentials 中未找到 DEEPSEEK_API_KEY"); process.exit(1); }
+    const answer = await callDeepSeek(key, buildMessages(question, context));
+    process.stdout.write(JSON.stringify({ ok: true, answer }));
+  } catch (e) {
+    // 只输出通用错误（不含密钥与请求头）
+    console.error(`side-question 失败: ${e?.message ?? e}`);
+    process.exit(1);
+  }
+}

package/src/term.js

@@ -30,6 +30,8 @@ export class Term {
     this.onResize = onResize ?? (() => {});
     this.kitty = kitty;
     this.kittyActive = false;  // set when the terminal answers the CSI ? u query
+    this.cellSize = null;      // [w, h] chars + pixels from CSI 6/4 t replies
+    this.pixelSize = null;     // [w, h] pixels
     this.handoff = process.env.DSH_TUI_RESTART_HANDOFF === "1";
     this.escTimer = null;      // pending lone-ESC fallback (split-sequence safety)
     this.decoder = new StringDecoder("utf8");
@@ -58,6 +60,8 @@ export class Term {
     o.write("\x1b[?2004h"); // bracketed paste
     o.write("\x1b[?7l");    // no autowrap (we clip ourselves)
     if (this.kitty) { o.write("\x1b[>1u"); o.write("\x1b[?u"); }
+    // Cell/pixel geometry probes (XTerm rep): CSI 14 t → pixels, CSI 16 t → chars.
+    o.write("\x1b[14t\x1b[16t");
     this.resizeHandler = () => this.#resize();
     process.on("SIGWINCH", this.resizeHandler);
     this.#resize();
@@ -285,6 +289,23 @@ export class Term {
       return; // other private responses (cursor pos) stay ignored
     }
     if (prefix === ">") return;
+    if (prefix === "" && (final === "t") && params.startsWith("4;")) {
+      const [, ph, pw] = params.split(";").map(Number);
+      if (ph && pw) this.pixelSize = [pw, ph];
+      return;
+    }
+    if (prefix === "" && final === "t" && params.startsWith("6;")) {
+      const [, chh, chw] = params.split(";").map(Number);
+      if (chh && chw) {
+        this.cellSize = [chw, chh];
+        if (this.pixelSize) {
+          // exact cell aspect ratio (pixels per char) — 实际几何而非假设 2:1
+          const [pw, ph] = this.pixelSize, [cw, ch] = this.cellSize;
+          this.cellAspect = { w: pw / cw, h: ph / ch, ratio: (pw / cw) / (ph / ch) };
+        }
+      }
+      return;
+    }
     if (final === "Z") { // Shift+Tab (backtab)
       this.#emit({ type: "key", name: "backtab", ctrl: false, alt: false, shift: true });
       return;