dsh-ssh-tui 0.3.1 → 0.3.3

package/lib/tui.js

@@ -7,7 +7,8 @@
  *
  * 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, else local 80 ms
+ * or an SSH tier from a CSI 6n round-trip (default 160 ms).
  */
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
@@ -59,19 +60,46 @@ const PROVIDER_TEMPLATES = {
         defaultModels: ['deepseek-v4-flash'],
     },
 };
-const RENDER_INTERVAL_MS = 120;
+const RENDER_INTERVAL_MS = 160;
+const LOCAL_PAINT_INTERVAL_MS = 80;
 const WAIT_INDICATOR_MS = 8000;
 const MIN_PAINT_INTERVAL_MS = 40;
 const MAX_PAINT_INTERVAL_MS = 1000;
+const DSR_PROBE_TIMEOUT_MS = 800;
 /**
- * Paint cadence for jump-host / proxied SSH. Token ticks coalesce into one
- * frame; the default stays snappy, slower links raise `DSH_TUI_PAINT_MS`.
+ * Explicit env/config always wins. Otherwise local TTYs stay snappy and SSH
+ * sessions pick a tier from a measured round-trip (CSI 6n), falling back to
+ * 160 ms when the probe is missing.
  */
-export function resolvePaintIntervalMs(configured, env = process.env) {
+export function resolvePaintIntervalMs(configured, env = process.env, options = {}) {
     const raw = configured ?? Number.parseInt(env.DSH_TUI_PAINT_MS ?? '', 10);
-    if (!Number.isFinite(raw) || raw <= 0)
+    if (Number.isFinite(raw) && raw > 0) {
+        return Math.min(MAX_PAINT_INTERVAL_MS, Math.max(MIN_PAINT_INTERVAL_MS, Math.floor(raw)));
+    }
+    if (options.ssh === true)
+        return paintIntervalForRtt(options.rttMs);
+    return LOCAL_PAINT_INTERVAL_MS;
+}
+/** True when this process is attached to an SSH session (jump host / proxy). */
+export function detectSshSession(env = process.env) {
+    return Boolean(env.SSH_CONNECTION || env.SSH_CLIENT || env.SSH_TTY);
+}
+/** Map a CSI-6n round-trip to a paint cadence. Unknown RTT uses the SSH default. */
+export function paintIntervalForRtt(rttMs) {
+    if (rttMs === undefined || !Number.isFinite(rttMs) || rttMs < 0)
         return RENDER_INTERVAL_MS;
-    return Math.min(MAX_PAINT_INTERVAL_MS, Math.max(MIN_PAINT_INTERVAL_MS, Math.floor(raw)));
+    if (rttMs < 50)
+        return LOCAL_PAINT_INTERVAL_MS;
+    if (rttMs < 150)
+        return 160;
+    if (rttMs < 350)
+        return 250;
+    return 400;
+}
+export function paintLinkLabel(kind, intervalMs, probed) {
+    if (kind === 'local')
+        return `本机绘制 ${intervalMs}ms`;
+    return probed ? `SSH 绘制 ${intervalMs}ms` : `SSH 绘制 ${intervalMs}ms（未测到往返）`;
 }
 /** One incremental paint as a single stdout write (one SSH packet when corked). */
 export function composePaintOutput(options) {
@@ -994,10 +1022,58 @@ export function isEscapePrefix(text) {
         return true;
     if (/^\x1b\[\d+~?$/u.test(text))
         return true;
+    if (/^\x1b\[\d+(?:;\d+)?R?$/u.test(text))
+        return true;
     if (/^\x1b\[<(?:\d*;?)*[Mm]?$/u.test(text))
         return true;
     return false;
 }
+/** Parse a Device Status Report cursor reply (`CSI row;col R`). */
+export function parseCursorPositionReply(text) {
+    const match = /^\x1b\[(\d+);(\d+)R$/u.exec(text);
+    if (match === null)
+        return undefined;
+    return { row: Number(match[1]), column: Number(match[2]) };
+}
+/**
+ * Round-trip to the attached terminal via CSI 6n. Returns undefined when the
+ * reply never arrives (dumb pipe, blocked DSR). Does not interpret the
+ * coordinates — only the elapsed milliseconds matter.
+ */
+export async function probeTerminalRttMs(stdin = process.stdin, stdout = process.stdout, timeoutMs = DSR_PROBE_TIMEOUT_MS) {
+    if (!stdin.isTTY || !stdout.isTTY)
+        return undefined;
+    return await new Promise(resolve => {
+        let buffer = '';
+        let settled = false;
+        const started = Date.now();
+        const finish = (value) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            stdin.removeListener('data', onData);
+            resolve(value);
+        };
+        const onData = (chunk) => {
+            buffer += chunk.toString('utf8');
+            if (parseCursorPositionReply(buffer) !== undefined) {
+                finish(Math.max(0, Date.now() - started));
+                return;
+            }
+            if (buffer.length > 32 && !buffer.includes('\x1b['))
+                finish(undefined);
+        };
+        const timer = setTimeout(() => finish(undefined), timeoutMs);
+        stdin.on('data', onData);
+        try {
+            stdout.write('\x1b[6n');
+        }
+        catch {
+            finish(undefined);
+        }
+    });
+}
 /** Parse a tool call's raw arguments JSON into an object; null when unparsable. */
 function parseJsonArgs(args) {
     try {
@@ -1086,6 +1162,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 +1285,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)
@@ -1813,9 +1915,13 @@ export class SshTui {
     lastPaintWidth = 0;
     lastPaintHeight = 0;
     paintIntervalMs;
+    paintLink = 'local';
+    paintProbed = false;
     searchHits = [];
     searchIndex = -1;
     searchQuery = '';
+    planNudgePending = false;
+    pendingReveal;
     constructor(ctx, agent, config) {
         this.ctx = ctx;
         this.agent = agent;
@@ -1836,7 +1942,10 @@ export class SshTui {
         this.presetId = config.presetId ?? 'standard';
         this.presetName = config.presetName ?? this.presetId;
         this.useAlternateScreen = process.env.DSH_TUI_NO_ALT_SCREEN !== '1' && process.env.DSH_TUI_NO_ALT_SCREEN !== 'true';
-        this.paintIntervalMs = resolvePaintIntervalMs(config.paintIntervalMs);
+        this.paintLink = detectSshSession() ? 'ssh' : 'local';
+        this.paintIntervalMs = resolvePaintIntervalMs(config.paintIntervalMs, process.env, {
+            ssh: this.paintLink === 'ssh',
+        });
         this.pushRow({ kind: 'brand-logo' });
         this.pushRow({ kind: 'system', text: 'DeepSeek Harness — SSH TUI' });
         this.pushRow({ kind: 'system', text: '输入 /help 查看快捷键 · /find 搜索思考/计划/子代理/回复 · 空输入时 ↑/↓ 选卡片' });
@@ -1845,7 +1954,6 @@ export class SshTui {
     start() {
         process.stdin.setRawMode(true);
         process.stdin.resume();
-        process.stdin.on('data', this.handleData);
         process.stdout.on('resize', this.markDirty);
         process.on('SIGWINCH', this.markDirty);
         this.disposers.push(this.ctx.on('session/event', this.handleSessionEvent), this.ctx.on('agent/status', this.handleStatus), this.ctx.on('agent/error', this.handleError), this.ctx.on('agent/disposed', this.handleDisposed), this.ctx.on('agent/inbox/claimed', this.handleInboxClaimed), this.ctx.on('agent/inbox/discarded', this.handleInboxDiscarded), this.ctx.on('agent/request', this.handleAgentRequest), this.ctx.on('subagent/start', this.handleSubagentStart), this.ctx.on('subagent/end', this.handleSubagentEnd), this.ctx.on('approval/request', this.handleApproval));
@@ -1859,6 +1967,30 @@ export class SshTui {
         if (this.resumePicker) {
             void this.runResumeCommand('', true);
         }
+        void this.calibratePaintInterval().finally(() => {
+            if (this.disposed)
+                return;
+            process.stdin.on('data', this.handleData);
+            this.startRenderTimer();
+        });
+        void this.maybeRunOnboarding().catch((error) => {
+            if (this.disposed)
+                return;
+            this.pushRow({ kind: 'error', text: `首次配置检查失败: ${errorChain(error)}` });
+            this.markDirty();
+        });
+        void this.syncSubagentToProvider(this.currentProviderId()).catch((error) => {
+            if (this.disposed)
+                return;
+            this.pushRow({ kind: 'error', text: `同步子代理模型失败: ${errorChain(error)}` });
+            this.markDirty();
+        });
+    }
+    startRenderTimer() {
+        if (this.renderTimer !== undefined) {
+            clearInterval(this.renderTimer);
+            this.renderTimer = undefined;
+        }
         this.renderTimer = setInterval(() => {
             const now = Date.now();
             if (this.agent.status === 'running')
@@ -1871,13 +2003,9 @@ export class SshTui {
             if (animating && now - this.lastPaintAt >= Math.max(this.paintIntervalMs, 200)) {
                 this.dirty = true;
             }
-            // While a turn is waiting on the provider with no new events, repaint at
-            // most once per second so slow SSH links do not drown in redraws.
             const idleWaiting = this.agent.status === 'running' && !this.dirty;
             if (idleWaiting && now - this.lastPaintAt < 1000)
                 return;
-            // Running with no fresh events only needs the seconds-bearing status
-            // line refreshed; force one repaint per second instead of every tick.
             if (this.agent.status === 'running' && !this.dirty && now - this.lastPaintAt >= 1000) {
                 this.dirty = true;
             }
@@ -1887,18 +2015,33 @@ export class SshTui {
             }
         }, this.paintIntervalMs);
         this.renderTimer.unref?.();
-        void this.maybeRunOnboarding().catch((error) => {
-            if (this.disposed)
-                return;
-            this.pushRow({ kind: 'error', text: `首次配置检查失败: ${errorChain(error)}` });
-            this.markDirty();
-        });
-        void this.syncSubagentToProvider(this.currentProviderId()).catch((error) => {
-            if (this.disposed)
-                return;
-            this.pushRow({ kind: 'error', text: `同步子代理模型失败: ${errorChain(error)}` });
-            this.markDirty();
+    }
+    async calibratePaintInterval() {
+        const envOverride = Number.parseInt(process.env.DSH_TUI_PAINT_MS ?? '', 10);
+        if (Number.isFinite(envOverride) && envOverride > 0) {
+            this.paintProbed = false;
+            this.pushRow({
+                kind: 'system',
+                text: `${paintLinkLabel(this.paintLink, this.paintIntervalMs, false)} · DSH_TUI_PAINT_MS`,
+            });
+            return;
+        }
+        if (this.paintLink !== 'ssh') {
+            this.pushRow({ kind: 'system', text: paintLinkLabel('local', this.paintIntervalMs, false) });
+            return;
+        }
+        const rtt = await probeTerminalRttMs();
+        if (this.disposed)
+            return;
+        this.paintProbed = rtt !== undefined;
+        this.paintIntervalMs = resolvePaintIntervalMs(undefined, {}, { ssh: true, rttMs: rtt });
+        this.pushRow({
+            kind: 'system',
+            text: rtt === undefined
+                ? paintLinkLabel('ssh', this.paintIntervalMs, false)
+                : `${paintLinkLabel('ssh', this.paintIntervalMs, true)} · 往返 ${Math.round(rtt)}ms`,
         });
+        this.markDirty();
     }
     /** Replay the durable session log so a resumed session renders its history. */
     replayHistory() {
@@ -2166,6 +2309,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 +2343,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 +2372,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 +2478,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 +2506,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 +2516,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 +2530,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 +2552,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 +2566,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 +2606,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 +2654,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 +2676,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 +2691,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 +2707,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 +2731,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 +2764,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 +2791,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 +2985,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 +3010,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();
@@ -2844,6 +3036,7 @@ export class SshTui {
             statusText += ' · Ctrl+T 折叠输入';
         if (this.pendingMessages.size > 0)
             statusText += ` · 排队 ${this.pendingMessages.size}`;
+        statusText += ` · ${this.paintLink === 'ssh' ? 'ssh' : '本机'}${this.paintIntervalMs}ms`;
         const idleMs = Date.now() - this.lastActivity;
         const livePlan = this.findLivePlanRow();
         const waitingQuestions = this.rows.some(row => row.kind === 'question' && row.status === 'waiting');
@@ -2852,6 +3045,9 @@ export class SshTui {
                 ? ' · 计划待审'
                 : ' · 等待用户回答';
         }
+        else if (livePlan?.turnLeftOpen === true) {
+            statusText += ' · 本轮未收尾';
+        }
         else if (livePlan?.active === true || livePlan?.pending === true) {
             statusText += livePlan.pending ? ' · 计划模式切换中' : ' · 计划模式';
         }
@@ -3355,6 +3551,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;
             }
@@ -4641,6 +4848,8 @@ export class SshTui {
             this.markDirty();
             return;
         }
+        if (parseCursorPositionReply(combined) !== undefined)
+            return;
         if (combined === '\x1b[H' || combined === '\x1b[1~') {
             this.cursor = 0;
             this.markDirty();
@@ -5553,6 +5762,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':
@@ -5571,6 +5782,7 @@ export class SshTui {
                         `preset: ${this.presetName}`,
                         `subagents: ${this.activeSubagents.size}`,
                         `plan: ${plan === undefined ? 'off' : plan.pending ? 'pending' : plan.active ? 'on' : 'off'}`,
+                        `paint: ${paintLinkLabel(this.paintLink, this.paintIntervalMs, this.paintProbed)}`,
                         waiting > 0 ? `questions: waiting ${waiting}` : 'questions: none',
                     ];
                     this.pushRow({ kind: 'system', text: lines.join('\n') });