dsh-ssh-tui 0.3.1 → 0.3.2

package/README.en.md

@@ -35,6 +35,26 @@ Singles: [headless stdout](docs/screenshots/headless.png) · [dsh-ssh-tui](docs/
 
 ## Install
 
+On a remote box with `dsh` and pnpm already installed (no clone):
+
+```sh
+dsh plugin --profile tui add dsh-ssh-tui
+# optional: reuse a SuperGrok / grok-bridge token already on the machine
+dsh plugin --profile tui add github:cyjyyd/dsh-llm-xai-oauth
+dsh plugin --profile headless add github:cyjyyd/dsh-llm-xai-oauth
+```
+
+Smoke the route before opening the TUI. The TUI exits immediately without a TTY:
+
+```sh
+dsh --profile headless "Reply with exactly: tui-install-ok. Do not use tools."
+dsh --profile tui
+```
+
+From a checkout: `bash scripts/smoke-headless.sh` (prints an outcome summary, never a token).
+
+From git:
+
 ```sh
 git clone https://github.com/cyjyyd/dsh-ssh-tui.git
 cd dsh-ssh-tui
@@ -49,14 +69,6 @@ npm run build
 dsh plugin --profile tui add "link:$(pwd)"
 ```
 
-Or install the published npm package directly (requires `@deepseek-ai/dsh` and
-`pnpm`, no local clone needed):
-
-```sh
-dsh plugin --profile tui add dsh-ssh-tui
-# or from a repo checkout: bash scripts/install-npm.sh
-```
-
 For the optional **智能路由模式 (routing-suite)** mode, also run:
 
 ```sh
@@ -151,7 +163,7 @@ The plugin runs on Linux, macOS, and Windows (Node ≥ 22.19):
 | `Ctrl+R` | expand or collapse all cards |
 | `Ctrl+T` | fold the input box (display-only) |
 | `Alt+1` / `2` / `3` / `4` | jump to latest thinking / plan / subagent / reply |
-| `/find [kind] query` | search cards (`thinking` `plan` `subagent` `reply`). `Ctrl+/` or `Alt+/` opens it |
+| `/find [kind] query` | search and jump to the full matching message (`thinking` `plan` `subagent` `reply`). `Ctrl+/` or `Alt+/` opens it |
 | `Ctrl+G` / `Alt+N` | next search hit; `Alt+P` previous |
 | `Esc` | drop selection → scroll to bottom → cancel the running turn |
 | `Ctrl+C` | cancel the running turn; exit when idle |
@@ -195,7 +207,9 @@ into the parent stream.
 The plan strip pins only the **latest incomplete plan**. When the model
 opens a new plan in the same turn, the previous one archives into the
 scrolling transcript and the dock shows the new one. A finished plan says
-「计划任务已全部完成」, not 「计划模式已关闭」. The `/` menu and
+「计划任务已全部完成」, not 「计划模式已关闭」. If a turn ends with open todos, the strip says 「本轮未收尾」, stops
+spinning, and sends one follow-up asking the model to `todo_write` the
+real statuses. The `/` menu and
 approval/question dialogs yield that bottom space. `exit_plan_mode` is
 markdown. `ask_user_question` still opens a dialog and leaves a collapsed
 `提问用户` card. `/goal` is a collapsed `目标` card. `/find thinking foo`
@@ -310,7 +324,7 @@ switching while running.
 
 Each paint is one `stdout.write` of dirty rows only, so a jump host or
 corporate proxy does not see one SSH packet per line. Default cadence is
-about 120 ms. On high-RTT paths raise it:
+about 160 ms, enough for most jump hosts. On a very slow path:
 
 ```sh
 export DSH_TUI_PAINT_MS=250   # 40–1000; higher = fewer packets, choppier stream

package/README.md

@@ -53,7 +53,25 @@ SuperGrok / X Premium 订阅走配套插件 [dsh-llm-xai-oauth](https://github.c
 
 ## 部署指南
 
-### 方式一：一键脚本（推荐）
+远程机器最短路径（已有 `dsh` 和 pnpm，无需 clone）：
+
+```bash
+dsh plugin --profile tui add dsh-ssh-tui
+# 可选：本机已有 SuperGrok / grok-bridge token 时
+dsh plugin --profile tui add github:cyjyyd/dsh-llm-xai-oauth
+dsh plugin --profile headless add github:cyjyyd/dsh-llm-xai-oauth
+```
+
+先确认链路再开 TUI（无 TTY 时 TUI 会直接退出）：
+
+```bash
+dsh --profile headless "Reply with exactly: tui-install-ok. Do not use tools."
+dsh --profile tui          # 必须在真实终端 / SSH 会话里
+```
+
+仓库内也可：`bash scripts/smoke-headless.sh`（记录出口摘要，不打印 token）。
+
+### 方式一：从 git clone 安装
 
 ```bash
 git clone https://github.com/cyjyyd/dsh-ssh-tui.git
@@ -79,14 +97,10 @@ npm run build
 dsh plugin --profile tui add "link:$(pwd)"
 ```
 
-### 方式三：npm 安装（发布后）
-
-前置要求：已全局安装 `@deepseek-ai/dsh`（`npm i -g @deepseek-ai/dsh`）且有 pnpm。
+### 方式三：指定其它 profile 的 npm 安装
 
 ```bash
-dsh plugin --profile tui add dsh-ssh-tui
-# 或在仓库内快捷执行：bash scripts/install-npm.sh
-# 指定其它 profile：bash scripts/install-npm.sh work
+bash scripts/install-npm.sh work
 ```
 
 `dsh plugin add` 会从 npm 拉取包、写入 profile 依赖，并自动把 `dsh-ssh-tui`
@@ -132,7 +146,7 @@ dsh --profile tui --no-color
 | `Ctrl+R` | 全部展开或全部收起 |
 | `Ctrl+T` | 折叠输入框（只影响显示） |
 | `Alt+1` / `2` / `3` / `4` | 跳到最新思考 / 计划 / 子代理 / 回复 |
-| `/find [类] 关键字` | 搜索卡片。类：`思考` `计划` `子代理` `回复`。`Ctrl+/` 或 `Alt+/` 打开 |
+| `/find [类] 关键字` | 搜索并跳到该条完整消息（反色高亮）。类：`思考` `计划` `子代理` `回复`。`Ctrl+/` 或 `Alt+/` 打开 |
 | `Ctrl+G` / `Alt+N` | 下一条搜索结果；`Alt+P` 上一条 |
 | 鼠标左键 | 点击卡片标题展开/收起 |
 | `PgUp` / `PgDn`、滚轮 | 转录回看 |
@@ -171,7 +185,9 @@ SuperGrok / X Premium 走本机 OAuth，不需要填 Key。`/status` 和底栏
 
 计划条只钉**最新一条未完成的计划**。同一轮次里模型再开新计划时，旧计划归档进
 工作区随转录上滚，底栏换成新计划。任务全部完成后计划条会说「计划任务已全部完成」，
-不再误报「计划模式已关闭」。打开 `/` 命令选单或批准/提问对话框时，计划条让出底栏。
+不再误报「计划模式已关闭」。一轮结束时若待办仍是进行中/待处理，计划条改成「本轮未收尾」并停止转圈，
+同时自动追问模型补一次 `todo_write`（同一列表只问一次，不改会话里的旧状态）。
+打开 `/` 命令选单或批准/提问对话框时，计划条让出底栏。
 `exit_plan_mode` 按 markdown 渲染。`ask_user_question` 仍弹对话框，并留下折叠的
 `提问用户` 卡片。`/goal` 是折叠的 `目标` 卡片。`/find 思考 padAnsi` 或 `Alt+1..4`
 可跳到对应类别的最新卡片。
@@ -274,7 +290,7 @@ npm run build
 - **标题栏或铃声不生效**：确认终端支持 OSC 0 与 BEL；铃声可用
   `DSH_TUI_NO_BELL=1` 关闭。
 - **滚轮误触取消**：已加入转义序列缓冲，网络拆包也不会把 `ESC` 当取消。
-- **跳板机 / 多层代理 SSH 发画**：每一帧只发脏行，并且拼成一次 `stdout.write`，避免一行一个 SSH 包。默认约 120 ms 合一帧。穿透代理、RTT 很大时：
+- **跳板机 / 多层代理 SSH 发画**：每一帧只发脏行，并且拼成一次 `stdout.write`，避免一行一个 SSH 包。默认约 160 ms 合一帧，多数跳板机不用改。特别慢时：
   ```bash
   export DSH_TUI_PAINT_MS=250   # 40–1000；越大越省链路，流式字越顿
   ```

package/cordis.patch.yml

@@ -81,4 +81,4 @@
         maxToolOutputLines: 6
         color: !!js ctx.sshTuiStartup.noColor !== true
         # Jump-host SSH: coalesce token ticks into one stdout write per frame.
-        paintIntervalMs: !!js Number.parseInt(process.env.DSH_TUI_PAINT_MS ?? '120', 10) || 120
+        paintIntervalMs: !!js Number.parseInt(process.env.DSH_TUI_PAINT_MS ?? '160', 10) || 160

package/lib/tui.js

@@ -7,7 +7,7 @@
  *
  * The renderer uses plain ANSI and coalesces each frame into one stdout
  * write of dirty rows only — jump-host / proxied SSH should see one packet
- * per paint, not one per line. Cadence is DSH_TUI_PAINT_MS (default 120).
+ * per paint, not one per line. Cadence is DSH_TUI_PAINT_MS (default 160).
  */
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
@@ -59,7 +59,7 @@ const PROVIDER_TEMPLATES = {
         defaultModels: ['deepseek-v4-flash'],
     },
 };
-const RENDER_INTERVAL_MS = 120;
+const RENDER_INTERVAL_MS = 160;
 const WAIT_INDICATOR_MS = 8000;
 const MIN_PAINT_INTERVAL_MS = 40;
 const MAX_PAINT_INTERVAL_MS = 1000;
@@ -1086,6 +1086,28 @@ export function planIsLive(plan) {
         return true;
     return false;
 }
+/** Open todos left behind when a turn ends without a completing todo_write. */
+export function planTurnLeftOpen(plan) {
+    return plan.todos.some(item => item.status !== 'completed');
+}
+/** Mark leftover in-progress/pending todos as display-stale after turn/end. */
+export function applyTurnEndToPlan(plan) {
+    if (!planTurnLeftOpen(plan)) {
+        plan.turnLeftOpen = false;
+        return plan;
+    }
+    plan.turnLeftOpen = true;
+    return plan;
+}
+/** Follow-up that asks the model to close leftover todos. One per open list. */
+export function planCloseNudgeText(plan) {
+    const leftover = plan.todos.filter(item => item.status !== 'completed');
+    const lines = leftover.map(item => `- [${item.status}] ${item.content}`);
+    return [
+        '本轮结束时计划条还有未完成待办。请立刻再调用一次 todo_write，把已经做完的标成 completed，还没做的留 pending。不要开新任务。',
+        ...lines,
+    ].join('\n');
+}
 /** Category for jump / search. Assistant replies are not collapsible cards. */
 export function cardCategoryOf(row) {
     if (row.kind === 'reasoning' || row.kind === 'streaming-reasoning')
@@ -1187,6 +1209,10 @@ export function matchTranscriptRows(rows, raw) {
 export function planDockNote(plan) {
     const running = plan.todos.some(item => item.status === 'in_progress');
     const allDone = plan.todos.length > 0 && plan.todos.every(item => item.status === 'completed');
+    const leftover = plan.todos.filter(item => item.status !== 'completed').length;
+    if (plan.turnLeftOpen === true && leftover > 0) {
+        return `本轮未收尾：还剩 ${leftover} 项待办（会话日志未改）。`;
+    }
     if (plan.pending)
         return '模式切换将在下一步生效。';
     if (plan.active)
@@ -1816,6 +1842,8 @@ export class SshTui {
     searchHits = [];
     searchIndex = -1;
     searchQuery = '';
+    planNudgePending = false;
+    pendingReveal;
     constructor(ctx, agent, config) {
         this.ctx = ctx;
         this.agent = agent;
@@ -2166,6 +2194,10 @@ export class SshTui {
         if (existing !== undefined && planIsLive(existing)) {
             Object.assign(existing, patch);
             existing.archived = false;
+            if (patch.todos !== undefined || patch.active !== undefined || patch.pending !== undefined) {
+                existing.turnLeftOpen = false;
+                this.planNudgePending = false;
+            }
             if (!planIsLive(existing)) {
                 existing.archived = true;
                 existing.expanded = false;
@@ -2196,6 +2228,27 @@ export class SshTui {
     shouldDockPlan() {
         return this.findLivePlanRow() !== undefined;
     }
+    /** One follow-up per leftover list; replay and cancelled turns stay quiet. */
+    queuePlanCloseNudge(plan) {
+        if (this.replaying || this.agentGone || this.planNudgePending)
+            return;
+        if (this.agent.status === 'running')
+            return;
+        this.planNudgePending = true;
+        const text = planCloseNudgeText(plan);
+        this.pushRow({ kind: 'system', text: '已请模型补一次待办状态（本轮只问一次）。' });
+        const message = createUserMessage({
+            content: [{ type: 'text', text }],
+            source: { kind: 'user' },
+        });
+        try {
+            this.agent.followup(message);
+        }
+        catch (error) {
+            this.planNudgePending = false;
+            this.pushRow({ kind: 'error', text: `补待办状态失败：${errorChain(error)}` });
+        }
+    }
     /** Compact web-style plan strip pinned above the input, not in the transcript. */
     paintPlanDock(width, yieldBottom) {
         const plan = this.findLivePlanRow();
@@ -2204,8 +2257,14 @@ export class SshTui {
         const inner = Math.max(1, width - 2);
         const running = plan.todos.some(item => item.status === 'in_progress');
         const allDone = plan.todos.length > 0 && plan.todos.every(item => item.status === 'completed');
-        const spinner = (plan.active || plan.pending || running) ? ` ${this.spinnerFrame()}` : '';
-        const mode = plan.pending ? '切换中' : plan.active ? '计划模式' : running ? '计划' : allDone ? '计划完成' : '计划';
+        const leftOpen = plan.turnLeftOpen === true && !allDone && !plan.pending;
+        const spinner = (plan.pending || ((plan.active || running) && !leftOpen)) ? ` ${this.spinnerFrame()}` : '';
+        const mode = plan.pending ? '切换中'
+            : leftOpen ? '本轮未收尾'
+                : plan.active ? '计划模式'
+                    : running ? '计划'
+                        : allDone ? '计划完成'
+                            : '计划';
         const counts = todoProgressLabel(plan.todos);
         const title = planTitleFromMarkdown(plan.planMarkdown ?? '');
         const summary = title ?? (counts === '' ? '还没有任务' : counts);
@@ -2304,18 +2363,27 @@ export class SshTui {
         this.focusedRow = allExpanded ? null : rows[rows.length - 1] ?? null;
         this.markDirty();
     }
-    focusCard(row) {
+    highlightSearchLine(line) {
+        if (line.includes('\x1b[7m'))
+            return line;
+        return this.color ? `\x1b[7m${line}\x1b[27m` : `» ${line}`;
+    }
+    revealRow(row) {
         if (row === undefined)
             return;
-        if (row.kind === 'assistant') {
-            this.focusedRow = null;
-        }
-        else if ('expanded' in row) {
+        if (row.kind !== 'assistant' && 'expanded' in row) {
+            row.expanded = true;
             this.focusedRow = row;
         }
-        this.scrollOffset = 0;
+        else {
+            this.focusedRow = null;
+        }
+        this.pendingReveal = row;
         this.markDirty();
     }
+    focusCard(row) {
+        this.revealRow(row);
+    }
     /** Jump to the newest card in a category (thinking / plan / subagent / reply). */
     jumpToCategory(category) {
         if (category === 'plan') {
@@ -2323,6 +2391,7 @@ export class SshTui {
             if (live !== undefined) {
                 this.focusCard(live);
                 this.pushRow({ kind: 'system', text: `已跳到${CARD_CATEGORY_LABEL[category]}（底栏计划条）。` });
+                this.revealRow(live);
                 return;
             }
         }
@@ -2332,10 +2401,8 @@ export class SshTui {
             this.markDirty();
             return;
         }
-        if ('expanded' in target)
-            target.expanded = true;
-        this.focusCard(target);
         this.pushRow({ kind: 'system', text: `已跳到最新${CARD_CATEGORY_LABEL[category]}。` });
+        this.revealRow(target);
     }
     applySearchHits(query, hits) {
         this.searchQuery = query;
@@ -2348,14 +2415,12 @@ export class SshTui {
         }
         this.searchIndex = hits.length - 1;
         const hit = hits[this.searchIndex];
-        if (hit !== undefined && 'expanded' in hit)
-            hit.expanded = true;
-        this.focusCard(hit);
         const where = hit === undefined ? '' : CARD_CATEGORY_LABEL[cardCategoryOf(hit) ?? 'reply'];
         this.pushRow({
             kind: 'system',
             text: `找到 ${hits.length} 条${query === '' ? '' : `「${query}」`} · 第 ${hits.length}/${hits.length} 条（${where}）。Ctrl+G / Alt+N 下一条，Alt+P 上一条。`,
         });
+        this.revealRow(hit);
     }
     runFindCommand(arg) {
         const parsed = parseFindQuery(arg);
@@ -2372,14 +2437,12 @@ export class SshTui {
         const count = this.searchHits.length;
         this.searchIndex = (this.searchIndex + delta + count) % count;
         const hit = this.searchHits[this.searchIndex];
-        if (hit !== undefined && 'expanded' in hit)
-            hit.expanded = true;
-        this.focusCard(hit);
         const where = hit === undefined ? '' : CARD_CATEGORY_LABEL[cardCategoryOf(hit) ?? 'reply'];
         this.pushRow({
             kind: 'system',
             text: `搜索「${this.searchQuery}」· 第 ${this.searchIndex + 1}/${count} 条（${where}）。`,
         });
+        this.revealRow(hit);
     }
     paint = () => {
         if (this.exiting)
@@ -2388,19 +2451,21 @@ export class SshTui {
         const height = Math.max(6, process.stdout.rows || 24);
         const display = [];
         const displayRefs = [];
+        const searchHit = this.searchHits[this.searchIndex];
         const addDisplay = (line, ref) => {
-            display.push(line);
+            const hit = ref !== undefined && ref === searchHit;
+            display.push(hit ? this.highlightSearchLine(line) : line);
             displayRefs.push(ref);
         };
-        const pushRow = (kind, text) => {
+        const pushRow = (kind, text, ref) => {
             if (kind === 'assistant') {
                 for (const line of renderMarkdownLines(text, width, this.color)) {
-                    addDisplay(line);
+                    addDisplay(line, ref);
                 }
                 return;
             }
             for (const line of wrap(text, width)) {
-                addDisplay(this.styleLine(kind, line));
+                addDisplay(this.styleLine(kind, line), ref);
             }
         };
         for (const row of this.rows) {
@@ -2426,7 +2491,7 @@ export class SshTui {
                 addDisplay(focused && this.color ? `\x1b[7m${styled}\x1b[27m` : styled, row);
                 if (row.expanded) {
                     for (const wrapped of wrap(row.text, width)) {
-                        addDisplay(this.styleLine('reasoning', wrapped));
+                        addDisplay(this.styleLine('reasoning', wrapped), row);
                     }
                 }
                 continue;
@@ -2474,7 +2539,7 @@ export class SshTui {
                     const fillRow = line.kind === 'diff-add' || line.kind === 'diff-del';
                     for (const wrapped of wrap(line.text, inner)) {
                         const body = fillRow ? padToWidth(`  ${wrapped}`, width) : `  ${wrapped}`;
-                        addDisplay(this.styleLine(line.kind, body));
+                        addDisplay(this.styleLine(line.kind, body), row);
                     }
                 }
                 continue;
@@ -2496,12 +2561,12 @@ export class SshTui {
                 const header = `● ${subagentHeaderText(row)}${spinner}${row.expanded ? '' : ' · Enter 展开'}`;
                 this.paintCollapsibleHeader(addDisplay, row, 'tool', header, width, styleHeader);
                 if (row.expanded) {
-                    addDisplay(this.styleLine('tool-result', `  会话 ${row.sessionId} · ${row.provider}${row.local ? '' : ' · 外部进程'}`));
+                    addDisplay(this.styleLine('tool-result', `  会话 ${row.sessionId} · ${row.provider}${row.local ? '' : ' · 外部进程'}`), row);
                     if (row.stopReason !== undefined) {
-                        addDisplay(this.styleLine('tool-result', `  结束原因：${row.stopReason}`));
+                        addDisplay(this.styleLine('tool-result', `  结束原因：${row.stopReason}`), row);
                     }
                     if (row.logs.length === 0) {
-                        addDisplay(this.styleLine('tool-result', running ? '  等待子代理输出…' : '  没有可见输出'));
+                        addDisplay(this.styleLine('tool-result', running ? '  等待子代理输出…' : '  没有可见输出'), row);
                     }
                     else {
                         for (const entry of row.logs) {
@@ -2511,7 +2576,7 @@ export class SshTui {
                                     ? 'error'
                                     : 'tool-result';
                             for (const wrapped of wrap(entry.text, Math.max(1, width - 2))) {
-                                addDisplay(this.styleLine(kind, `  ${wrapped}`));
+                                addDisplay(this.styleLine(kind, `  ${wrapped}`), row);
                             }
                         }
                     }
@@ -2527,16 +2592,16 @@ export class SshTui {
                 const header = `计划 · ${summary}${row.expanded ? '' : ' · Enter 展开'}`;
                 this.paintCollapsibleHeader(addDisplay, row, 'plan-dock', header, width);
                 if (row.expanded) {
-                    addDisplay(this.styleLine('plan-dock', `   ${planDockNote({ ...row, active: false, pending: false })}`));
+                    addDisplay(this.styleLine('plan-dock', `   ${planDockNote({ ...row, active: false, pending: false })}`), row);
                     if (row.planMarkdown !== undefined && row.planMarkdown !== '') {
                         for (const line of renderMarkdownLines(row.planMarkdown, Math.max(1, width - 2), this.color).slice(0, 8)) {
-                            addDisplay(`  ${line}`);
+                            addDisplay(`  ${line}`, row);
                         }
                     }
                     for (const item of row.todos) {
                         const mark = TODO_STATUS_MARK[item.status];
                         for (const wrapped of wrap(`${mark} ${item.content}`, Math.max(1, width - 2))) {
-                            addDisplay(this.styleLine(todoItemKind(item.status), `  ${wrapped}`));
+                            addDisplay(this.styleLine(todoItemKind(item.status), `  ${wrapped}`), row);
                         }
                     }
                 }
@@ -2551,25 +2616,25 @@ export class SshTui {
                 this.paintCollapsibleHeader(addDisplay, row, waiting ? 'tool' : 'system', header, width);
                 if (row.expanded) {
                     if (row.header !== undefined)
-                        addDisplay(this.styleLine('system', `  ${row.header}`));
+                        addDisplay(this.styleLine('system', `  ${row.header}`), row);
                     for (const wrapped of wrap(row.title, Math.max(1, width - 2))) {
-                        addDisplay(this.styleLine('assistant', `  ${wrapped}`));
+                        addDisplay(this.styleLine('assistant', `  ${wrapped}`), row);
                     }
                     if (row.detail !== undefined && row.detail !== '') {
                         if (row.intent === 'plan-review') {
                             for (const line of renderMarkdownLines(row.detail, Math.max(1, width - 2), this.color)) {
-                                addDisplay(`  ${line}`);
+                                addDisplay(`  ${line}`, row);
                             }
                         }
                         else {
                             for (const wrapped of wrap(row.detail, Math.max(1, width - 2))) {
-                                addDisplay(this.styleLine('tool-result', `  ${wrapped}`));
+                                addDisplay(this.styleLine('tool-result', `  ${wrapped}`), row);
                             }
                         }
                     }
                     addDisplay(this.styleLine('system', waiting
                         ? '  用下方对话框选择，数字/字母选中，Enter 提交，Esc 取消。'
-                        : `  ${row.summary}`));
+                        : `  ${row.summary}`), row);
                 }
                 continue;
             }
@@ -2584,16 +2649,16 @@ export class SshTui {
                 const header = `● 目标${spinner} · ${phase} · ${row.objective}${row.expanded ? '' : ' · Enter 展开'}`;
                 this.paintCollapsibleHeader(addDisplay, row, live ? 'tool' : 'system', header, width);
                 if (row.expanded) {
-                    addDisplay(this.styleLine('system', '  用 /goal 查看、暂停、恢复或清除当前目标。'));
+                    addDisplay(this.styleLine('system', '  用 /goal 查看、暂停、恢复或清除当前目标。'), row);
                     if (row.blockedReason !== undefined) {
                         for (const wrapped of wrap(row.blockedReason, Math.max(1, width - 2))) {
-                            addDisplay(this.styleLine('error', `  ${wrapped}`));
+                            addDisplay(this.styleLine('error', `  ${wrapped}`), row);
                         }
                     }
                 }
                 continue;
             }
-            pushRow(row.kind, row.text);
+            pushRow(row.kind, row.text, row);
         }
         if (this.streaming !== undefined) {
             if (this.showReasoning && this.streaming.reasoning !== '') {
@@ -2611,7 +2676,7 @@ export class SshTui {
                 addDisplay(focused && this.color ? `\x1b[7m${styled}\x1b[27m` : styled, block);
                 if (block.expanded) {
                     for (const wrapped of wrap(this.streaming.reasoning, width)) {
-                        addDisplay(this.styleLine('reasoning', wrapped));
+                        addDisplay(this.styleLine('reasoning', wrapped), block);
                     }
                 }
             }
@@ -2805,6 +2870,18 @@ export class SshTui {
         const reserved = RESERVED_BOTTOM_LINES + (inputRows - 1) + headerLines.length + suggestionLines.length + planDockLines.length + 1;
         const available = Math.max(1, height - reserved - dialogLines.length);
         const maxOffset = Math.max(0, display.length - available);
+        const reveal = this.pendingReveal;
+        if (reveal !== undefined) {
+            this.pendingReveal = undefined;
+            const first = displayRefs.findIndex(ref => ref === reveal);
+            if (first !== -1) {
+                let last = first;
+                while (last + 1 < displayRefs.length && displayRefs[last + 1] === reveal)
+                    last += 1;
+                const span = last - first + 1;
+                this.scrollOffset = Math.max(0, display.length - available - first);
+            }
+        }
         if (this.scrollOffset > maxOffset)
             this.scrollOffset = maxOffset;
         const start = Math.max(0, display.length - available - this.scrollOffset);
@@ -2818,7 +2895,7 @@ export class SshTui {
         this.clickableRows.clear();
         for (let index = 0; index < visibleRefs.length; index++) {
             const ref = visibleRefs[index];
-            if (ref !== undefined)
+            if (ref !== undefined && 'expanded' in ref)
                 this.clickableRows.set(headerLines.length + index + 1, ref);
         }
         const dockPlan = this.findLivePlanRow();
@@ -2852,6 +2929,9 @@ export class SshTui {
                 ? ' · 计划待审'
                 : ' · 等待用户回答';
         }
+        else if (livePlan?.turnLeftOpen === true) {
+            statusText += ' · 本轮未收尾';
+        }
         else if (livePlan?.active === true || livePlan?.pending === true) {
             statusText += livePlan.pending ? ' · 计划模式切换中' : ' · 计划模式';
         }
@@ -3355,6 +3435,17 @@ export class SshTui {
                 if (reason.kind === 'error') {
                     this.pushRow({ kind: 'error', text: `Turn ${event.data.turn} failed: ${reason.error.message}` });
                 }
+                const livePlan = this.findLivePlanRow();
+                if (livePlan !== undefined && reason.kind === 'completed') {
+                    applyTurnEndToPlan(livePlan);
+                    if (livePlan.turnLeftOpen === true) {
+                        this.pushRow({
+                            kind: 'system',
+                            text: planDockNote(livePlan),
+                        });
+                        this.queuePlanCloseNudge(livePlan);
+                    }
+                }
                 this.markDirty();
                 break;
             }
@@ -5553,6 +5644,8 @@ export class SshTui {
                 this.searchHits = [];
                 this.searchIndex = -1;
                 this.searchQuery = '';
+                this.planNudgePending = false;
+                this.pendingReveal = undefined;
                 this.pushRow({ kind: 'system', text: '转录已清空。子代理、计划与提问卡片会在新事件到达时重新出现。' });
                 break;
             case 'status':