dsh-ssh-tui 0.3.0 → 0.3.2

package/lib/tui.js

@@ -5,9 +5,9 @@
  * `ask_user_question` prompts from the keyboard, and drives one configured
  * agent with followup/steer.
  *
- * The renderer uses plain ANSI and a throttled full repaint, which keeps it
- * predictable over slow SSH links and avoids terminal-library dependency
- * drift inside the plugin.
+ * 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 160).
  */
 import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
@@ -21,7 +21,7 @@ import { SessionId } from '@deepseek-ai/dsh-session';
 import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { formatSessionTime, listResumableSessions } from './session-list.js';
 import { defaultReasoningEffort } from './reasoning.js';
-import { DEFAULT_SUBAGENT_MODEL, SUBAGENT_SETTINGS_NAMESPACE, subagentSettingsValue, } from './subagent-model.js';
+import { DEFAULT_SUBAGENT_MODEL, SUBAGENT_SETTINGS_NAMESPACE, defaultSubagentModelForProvider, subagentModelMatchesProvider, subagentSettingsValue, } from './subagent-model.js';
 import { UserQuestionError, } from '@deepseek-ai/dsh-user-questions';
 const PROVIDER_TEMPLATES = {
     official: {
@@ -59,8 +59,48 @@ 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;
+/**
+ * Paint cadence for jump-host / proxied SSH. Token ticks coalesce into one
+ * frame; the default stays snappy, slower links raise `DSH_TUI_PAINT_MS`.
+ */
+export function resolvePaintIntervalMs(configured, env = process.env) {
+    const raw = configured ?? Number.parseInt(env.DSH_TUI_PAINT_MS ?? '', 10);
+    if (!Number.isFinite(raw) || raw <= 0)
+        return RENDER_INTERVAL_MS;
+    return Math.min(MAX_PAINT_INTERVAL_MS, Math.max(MIN_PAINT_INTERVAL_MS, Math.floor(raw)));
+}
+/** One incremental paint as a single stdout write (one SSH packet when corked). */
+export function composePaintOutput(options) {
+    const { width, height, paintRows, previousRows, sizeChanged, chromeChanged, chromeStart } = options;
+    let out = '\x1b[?25l';
+    const prev = sizeChanged ? [] : previousRows;
+    if (sizeChanged)
+        out += '\x1b[H\x1b[J';
+    // Never address row height+1: that scrolls the SSH viewport and leaves
+    // thinking/tool/assistant glyphs sitting on the next card.
+    const rowCount = Math.min(height, paintRows.length);
+    for (let i = 0; i < rowCount; i++) {
+        const current = paintRows[i] ?? '';
+        if (current === prev[i] && !(chromeChanged && i >= chromeStart))
+            continue;
+        const clipped = padAnsiToWidth(current, width);
+        // EL2 *before* the glyphs, from column 1. A full-width write followed
+        // by EL hits DEC auto-margin: the cursor wraps, and EL then blanks the
+        // next card instead of the row we just drew.
+        out += `\x1b[${i + 1};1H\x1b[0m\x1b[2K${clipped}\x1b[0m`;
+    }
+    if (rowCount < height) {
+        out += `\x1b[${rowCount + 1};1H\x1b[J`;
+    }
+    out += '\x1b[0m';
+    const cursorRow = Math.min(height, Math.max(1, options.cursorRow));
+    out += `\x1b[${cursorRow};${Math.max(1, options.cursorColumn)}H\x1b[?25h`;
+    return out;
+}
 const STALL_WARNING_MS = 60000;
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const QUESTION_OPTION_KEYS = '123456789abcdefghijklmnopqrstuvwxyz';
@@ -228,10 +268,23 @@ const LOCAL_COMMANDS = [
     { name: 'quota', description: 'alias of /usage for OpenCode Go quota' },
     { name: 'subagents', description: 'list active subagents; kill <id> to stop one' },
     { name: 'resume', description: 'resume a past session (empty = session picker)' },
-    { name: 'setup', description: 're-open provider / API key setup' },
+    { name: 'setup', description: 'configure an API-key provider (DeepSeek / OpenCode); SuperGrok uses local OAuth' },
+    { name: 'find', description: 'search thinking / plan / subagent / reply cards' },
     { name: 'dialog-test', description: 'verify the question dialog' },
 ];
-function displayWidth(text) {
+/**
+ * Terminal cell width for one string.
+ *
+ * Match glibc wcwidth / typical UTF-8 SSH terminals: CJK ideographs and
+ * fullwidth forms occupy two cells; East-Asian Ambiguous box-drawing and
+ * ornaments (`─`, `●`, `·`, `▸`, `❯`, Braille spinners) occupy one. Counting
+ * those ambiguous glyphs as two made `repeatToWidth('─', cols)` paint a
+ * half-width rule and parked the input cursor half a cell past the text.
+ *
+ * Overflow into the input box is handled by clipping/padding painted rows to
+ * the measured column count, not by inflating glyph width.
+ */
+export function displayWidth(text) {
     let width = 0;
     for (const char of text) {
         if (char === '\t') {
@@ -241,11 +294,19 @@ function displayWidth(text) {
             continue;
         }
         const cp = char.codePointAt(0) ?? 0;
+        if (cp === 0x00ad || (cp >= 0x200b && cp <= 0x200f) || (cp >= 0x2060 && cp <= 0x2064) || cp === 0xfeff) {
+            continue;
+        }
+        if (cp <= 0x1f || (cp >= 0x7f && cp <= 0x9f)) {
+            continue;
+        }
         const wide = (cp >= 0x1100 && cp <= 0x115f) ||
+            cp === 0x2329 || cp === 0x232a ||
             (cp >= 0x2e80 && cp <= 0xa4cf) ||
             (cp >= 0xac00 && cp <= 0xd7a3) ||
             (cp >= 0xf900 && cp <= 0xfaff) ||
-            (cp >= 0xfe30 && cp <= 0xfe4f) ||
+            (cp >= 0xfe10 && cp <= 0xfe19) ||
+            (cp >= 0xfe30 && cp <= 0xfe6f) ||
             (cp >= 0xff00 && cp <= 0xff60) ||
             (cp >= 0xffe0 && cp <= 0xffe6) ||
             (cp >= 0x1f300 && cp <= 0x1faff) ||
@@ -254,6 +315,100 @@ function displayWidth(text) {
     }
     return width;
 }
+/** Pad or clip one already-sanitized line so it occupies exactly `width` cells. */
+export function padToWidth(text, width) {
+    const safe = sanitizeTerminalText(text);
+    if (width <= 0)
+        return '';
+    const clipped = truncateToWidth(safe, width);
+    const used = displayWidth(clipped);
+    return used >= width ? clipped : `${clipped}${' '.repeat(width - used)}`;
+}
+/**
+ * Pad an already-styled ANSI line to `width` cells without resetting SGR.
+ * Diff add/del rows keep their background across the whole terminal row
+ * instead of only the glyphs.
+ */
+export function padAnsiToWidth(text, width) {
+    if (width <= 0)
+        return '';
+    const clipped = clipAnsiToWidth(text, width);
+    const used = visibleWidth(clipped);
+    if (used >= width)
+        return clipped;
+    const pad = ' '.repeat(width - used);
+    // Insert spaces before a trailing SGR reset so backgrounds (diff rows)
+    // and the cell budget both fill the whole terminal row.
+    if (clipped.endsWith('\x1b[0m'))
+        return `${clipped.slice(0, -4)}${pad}\x1b[0m`;
+    return `${clipped}${pad}`;
+}
+/** Visible width of an ANSI-styled line, ignoring CSI / OSC sequences. */
+export function visibleWidth(text) {
+    let used = 0;
+    let index = 0;
+    while (index < text.length) {
+        if (text.charCodeAt(index) === 0x1b) {
+            index = skipAnsiSequence(text, index);
+            continue;
+        }
+        const cp = text.codePointAt(index);
+        if (cp === undefined)
+            break;
+        const char = String.fromCodePoint(cp);
+        used += displayWidth(char);
+        index += char.length;
+    }
+    return used;
+}
+/** Advance past one ESC sequence starting at `index`. */
+function skipAnsiSequence(text, index) {
+    let seqEnd = index + 1;
+    if (seqEnd >= text.length)
+        return text.length;
+    const intro = text.charCodeAt(seqEnd);
+    if (intro === 0x5b) {
+        seqEnd += 1;
+        while (seqEnd < text.length) {
+            const code = text.charCodeAt(seqEnd);
+            seqEnd += 1;
+            if (code >= 0x40 && code <= 0x7e)
+                break;
+        }
+        return seqEnd;
+    }
+    if (intro === 0x5d) {
+        seqEnd += 1;
+        while (seqEnd < text.length) {
+            const code = text.charCodeAt(seqEnd);
+            seqEnd += 1;
+            if (code === 0x07)
+                break;
+            if (code === 0x1b && text.charCodeAt(seqEnd) === 0x5c) {
+                seqEnd += 1;
+                break;
+            }
+        }
+        return seqEnd;
+    }
+    while (seqEnd < text.length) {
+        const code = text.charCodeAt(seqEnd);
+        seqEnd += 1;
+        if (code >= 0x40 && code <= 0x7e)
+            break;
+    }
+    return seqEnd;
+}
+/** Repeat a glyph until it occupies exactly `width` cells. */
+export function repeatToWidth(glyph, width) {
+    if (width <= 0)
+        return '';
+    const unit = displayWidth(glyph);
+    if (unit <= 0)
+        return ' '.repeat(width);
+    const count = Math.max(1, Math.floor(width / unit));
+    return padToWidth(glyph.repeat(count), width);
+}
 /** Strip terminal control sequences and expand tabs for display output. */
 function sanitizeTerminalText(text) {
     return text
@@ -266,6 +421,7 @@ function firstCodePointLength(text) {
     return Array.from(text)[0]?.length ?? 1;
 }
 function wrap(text, width) {
+    const limit = Math.max(1, width);
     const lines = [];
     for (const sourceLine of text.split('\n')) {
         if (sourceLine === '') {
@@ -273,18 +429,21 @@ function wrap(text, width) {
             continue;
         }
         let rest = sanitizeTerminalText(sourceLine);
-        while (displayWidth(rest) > width) {
+        while (displayWidth(rest) > limit) {
             let cut = 0;
             let used = 0;
             for (const char of rest) {
                 const charWidth = displayWidth(char);
-                if (used + charWidth > width)
+                if (charWidth > 0 && used + charWidth > limit)
                     break;
                 used += charWidth;
                 cut += char.length;
             }
-            if (cut === 0)
+            if (cut === 0) {
+                // A single double-width glyph on a 1-cell row still has to occupy a
+                // line; the next wrap continues after it so we never stall.
                 cut = firstCodePointLength(rest);
+            }
             lines.push(rest.slice(0, cut));
             rest = rest.slice(cut);
         }
@@ -364,8 +523,14 @@ function wrapMarkdownSegments(segments, width, prefixSegments = []) {
             const slice = forwardSliceByWidth(rest, available);
             let chunk = slice.text;
             if (chunk === '') {
-                // A wide character does not fit the remaining cell; take one code
-                // point so the loop always makes progress. The terminal wraps it.
+                // A wide character does not fit the remaining cell: wrap to the next
+                // row instead of overflowing that cell into the input area.
+                if (used > 0) {
+                    lines.push(current);
+                    current = [];
+                    used = 0;
+                    continue;
+                }
                 chunk = Array.from(rest)[0] ?? rest.slice(0, 1);
             }
             current.push({ kind: segment.kind, text: chunk });
@@ -503,7 +668,7 @@ export function renderMarkdownLines(text, width, color) {
         if (/^\s*(?:-{3,}|\*{3,}|_{3,})\s*$/u.test(raw) && raw.trim() !== '') {
             lines.push(renderMarkdownBlockLine({
                 base: 'rule',
-                segments: [{ kind: 'text', text: '─'.repeat(Math.max(1, width)) }],
+                segments: [{ kind: 'text', text: repeatToWidth('─', Math.max(1, width)) }],
             }, color));
             continue;
         }
@@ -559,6 +724,37 @@ export function truncateToWidth(text, width) {
         cut = firstCodePointLength(safe);
     return `${safe.slice(0, cut)}…`;
 }
+/**
+ * Clip an already-styled ANSI line to `width` terminal cells without dropping
+ * the reset/SGR sequences. Used by the incremental painter so a leftover wide
+ * glyph cannot wrap into the next row.
+ */
+export function clipAnsiToWidth(text, width) {
+    if (width <= 0)
+        return '';
+    let used = 0;
+    let out = '';
+    let index = 0;
+    while (index < text.length) {
+        if (text.charCodeAt(index) === 0x1b) {
+            const seqEnd = skipAnsiSequence(text, index);
+            out += text.slice(index, seqEnd);
+            index = seqEnd;
+            continue;
+        }
+        const cp = text.codePointAt(index);
+        if (cp === undefined)
+            break;
+        const char = String.fromCodePoint(cp);
+        const charWidth = displayWidth(char);
+        if (used + charWidth > width)
+            break;
+        out += char;
+        used += charWidth;
+        index += char.length;
+    }
+    return out;
+}
 /** Slice up to `maxWidth` display columns from the beginning of `text`. */
 function forwardSliceByWidth(text, maxWidth) {
     let cut = 0;
@@ -877,9 +1073,193 @@ const SUBAGENT_TOOL_NAMES = new Set(['subagent', 'subagent_fork', 'task']);
 const MAX_SUBAGENT_LOGS = 80;
 const TODO_STATUS_MARK = {
     pending: '○',
-    in_progress: '◉',
-    completed: '✓',
+    in_progress: '◐',
+    completed: '●',
 };
+/** True while a plan still belongs in the dock (latest incomplete work). */
+export function planIsLive(plan) {
+    if (plan.archived === true)
+        return false;
+    if (plan.active || plan.pending)
+        return true;
+    if (plan.todos.some(item => item.status !== 'completed'))
+        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')
+        return 'thinking';
+    if (row.kind === 'plan')
+        return 'plan';
+    if (row.kind === 'subagent')
+        return 'subagent';
+    if (row.kind === 'assistant')
+        return 'reply';
+    if (row.kind === 'tool')
+        return 'tool';
+    if (row.kind === 'question')
+        return 'question';
+    if (row.kind === 'goal')
+        return 'goal';
+    return undefined;
+}
+const CARD_CATEGORY_LABEL = {
+    thinking: '思考',
+    plan: '计划',
+    subagent: '子代理',
+    reply: '回复',
+    tool: '工具',
+    question: '提问',
+    goal: '目标',
+};
+const SEARCHABLE_CATEGORIES = ['thinking', 'plan', 'subagent', 'reply'];
+function parseCardCategoryToken(token) {
+    const id = token.trim().toLowerCase();
+    if (id === 'thinking' || id === 'think' || id === '推理' || id === '思考')
+        return 'thinking';
+    if (id === 'plan' || id === '计划')
+        return 'plan';
+    if (id === 'subagent' || id === 'sub' || id === '子代理')
+        return 'subagent';
+    if (id === 'reply' || id === 'assistant' || id === '回复')
+        return 'reply';
+    if (id === 'tool' || id === '工具')
+        return 'tool';
+    if (id === 'question' || id === '提问')
+        return 'question';
+    if (id === 'goal' || id === '目标')
+        return 'goal';
+    return undefined;
+}
+/** Split `/find thinking padAnsi` into an optional category and a query. */
+export function parseFindQuery(raw) {
+    const text = raw.trim();
+    if (text === '')
+        return { query: '' };
+    const match = /^(\S+)(?:\s+(.*))?$/u.exec(text);
+    if (match === null)
+        return { query: text };
+    const category = parseCardCategoryToken(match[1] ?? '');
+    if (category === undefined)
+        return { query: text };
+    return { category, query: (match[2] ?? '').trim() };
+}
+function rowSearchHaystack(row) {
+    switch (row.kind) {
+        case 'reasoning':
+        case 'assistant':
+        case 'user':
+        case 'system':
+        case 'error':
+        case 'brand':
+            return row.text;
+        case 'tool':
+            return `${row.title} ${row.summary} ${row.output} ${row.args}`;
+        case 'subagent':
+            return `${row.label} ${row.lastActivity} ${row.logs.map(entry => entry.text).join('\n')}`;
+        case 'plan':
+            return `${row.planMarkdown ?? ''} ${row.todos.map(item => item.content).join('\n')}`;
+        case 'question':
+            return `${row.title} ${row.summary} ${row.detail ?? ''} ${row.header ?? ''}`;
+        case 'goal':
+            return `${row.objective} ${row.blockedReason ?? ''}`;
+        default:
+            return '';
+    }
+}
+/** Transcript rows matching a `/find` query, newest last. */
+export function matchTranscriptRows(rows, raw) {
+    const { category, query } = parseFindQuery(raw);
+    const needle = query.toLowerCase();
+    return rows.filter(row => {
+        const kind = cardCategoryOf(row);
+        if (kind === undefined)
+            return false;
+        if (category !== undefined && kind !== category)
+            return false;
+        if (needle === '')
+            return SEARCHABLE_CATEGORIES.includes(kind) || category !== undefined;
+        return rowSearchHaystack(row).toLowerCase().includes(needle);
+    });
+}
+/** One-line note under an expanded plan strip. */
+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)
+        return '只规划、不改代码；确认后再执行。';
+    if (running)
+        return '正在按计划执行。';
+    if (allDone)
+        return '计划任务已全部完成。';
+    if (plan.todos.length > 0 || (plan.planMarkdown !== undefined && plan.planMarkdown !== '')) {
+        return '计划还在，尚未全部完成。';
+    }
+    return '计划模式已关闭，可用 /plan 重新进入。';
+}
+/** Compact per-status counts matching the web plan strip. */
+export function todoProgressLabel(todos) {
+    const done = todos.filter(item => item.status === 'completed').length;
+    const active = todos.filter(item => item.status === 'in_progress').length;
+    const pending = todos.length - done - active;
+    const parts = [];
+    if (done > 0)
+        parts.push(`${done} 已完成`);
+    if (active > 0)
+        parts.push(`${active} 进行中`);
+    if (pending > 0)
+        parts.push(`${pending} 待处理`);
+    return parts.join(' · ');
+}
+function todoItemKind(status) {
+    if (status === 'completed')
+        return 'todo-done';
+    if (status === 'in_progress')
+        return 'todo-active';
+    return 'todo-pending';
+}
+function planMarkdownFromArgs(value) {
+    const root = typeof value === 'string' ? parseJsonArgs(value) : value;
+    if (root === null || typeof root !== 'object' || Array.isArray(root))
+        return undefined;
+    const plan = root.plan;
+    return typeof plan === 'string' && plan.trim() !== '' ? plan : undefined;
+}
+/** First markdown heading of an exit_plan_mode plan body. */
+export function planTitleFromMarkdown(markdown) {
+    const match = /^\s*#\s+(.+)$/mu.exec(markdown);
+    const title = match?.[1]?.trim();
+    return title === undefined || title === '' ? undefined : title;
+}
 /** Parse a todo_write payload into displayable plan items. */
 export function parsePlanTodos(value) {
     const root = typeof value === 'string' ? parseJsonArgs(value) : value;
@@ -1025,13 +1405,40 @@ export function presentToolCall(name, args) {
         };
     }
     if (name === 'todo_write' || name === 'todo') {
-        return { title: '计划', summary: todoSummary(parsed) };
+        return { title: '更新待办', summary: todoSummary(parsed) };
     }
     if (name === 'ask_user_question') {
         return { title: '提问用户', summary: askSummary(parsed) };
     }
     if (name === 'exit_plan_mode') {
-        return { title: '退出计划模式', summary: '等待确认计划' };
+        const plan = typeof parsed?.plan === 'string' ? parsed.plan : '';
+        return { title: '提交计划', summary: planTitleFromMarkdown(plan) ?? '等待确认计划' };
+    }
+    if (name === 'read') {
+        const path = typeof parsed?.path === 'string' ? parsed.path
+            : typeof parsed?.file_path === 'string' ? parsed.file_path
+                : typeof parsed?.url === 'string' ? parsed.url
+                    : '';
+        return { title: '读取', summary: path || friendlyArgsSummary(name, args) };
+    }
+    if (name === 'grep') {
+        const pattern = typeof parsed?.pattern === 'string' ? parsed.pattern : '';
+        const path = typeof parsed?.path === 'string' ? parsed.path : '';
+        return { title: '搜索', summary: [pattern, path].filter(Boolean).join('  ') || friendlyArgsSummary(name, args) };
+    }
+    if (name === 'glob') {
+        const pattern = typeof parsed?.pattern === 'string' ? parsed.pattern
+            : typeof parsed?.glob_pattern === 'string' ? parsed.glob_pattern
+                : '';
+        return { title: '匹配文件', summary: pattern || friendlyArgsSummary(name, args) };
+    }
+    if (name === 'web_search') {
+        const query = typeof parsed?.query === 'string' ? parsed.query : typeof parsed?.q === 'string' ? parsed.q : '';
+        return { title: '网页搜索', summary: query || friendlyArgsSummary(name, args) };
+    }
+    if (name === 'web_fetch') {
+        const url = typeof parsed?.url === 'string' ? parsed.url : '';
+        return { title: '抓取网页', summary: url || friendlyArgsSummary(name, args) };
     }
     return { title: name, summary: friendlyArgsSummary(name, args) };
 }
@@ -1212,6 +1619,9 @@ export function toolBodyLines(row, maxLines) {
         }
         return out;
     }
+    const specialized = specializedToolBody(row);
+    if (specialized !== null)
+        return capDisplayLines(specialized, maxLines);
     const out = [];
     const args = parseJsonArgs(row.args);
     if (args !== null && Object.keys(args).length > 0) {
@@ -1236,6 +1646,86 @@ export function toolBodyLines(row, maxLines) {
     }
     return capDisplayLines(out, maxLines);
 }
+function firstString(record, keys) {
+    for (const key of keys) {
+        const value = record[key];
+        if (typeof value === 'string' && value.trim() !== '')
+            return value;
+    }
+    return '';
+}
+function specializedToolBody(row) {
+    const name = row.name ?? '';
+    const args = parseJsonArgs(row.args);
+    if (name === 'todo_write' || name === 'todo') {
+        const todos = parsePlanTodos(args ?? row.args);
+        const out = [{ kind: 'diff-path', text: todoProgressLabel(todos) || '待办列表' }];
+        if (todos.length === 0) {
+            out.push({ kind: 'tool-result', text: '还没有任务' });
+        }
+        else {
+            for (const item of todos) {
+                out.push({ kind: todoItemKind(item.status), text: `${TODO_STATUS_MARK[item.status]} ${item.content}` });
+            }
+        }
+        return out;
+    }
+    if (name === 'exit_plan_mode') {
+        const markdown = planMarkdownFromArgs(args ?? row.args) ?? '';
+        const out = [{ kind: 'diff-path', text: planTitleFromMarkdown(markdown) ?? '待审计划' }];
+        if (markdown === '') {
+            out.push({ kind: 'tool-result', text: '计划正文为空' });
+        }
+        else {
+            for (const line of markdown.split('\n')) {
+                out.push({ kind: 'assistant', text: line });
+            }
+        }
+        return out;
+    }
+    if (name === 'read' && args !== null) {
+        const path = firstString(args, ['path', 'file_path', 'url']);
+        const out = [];
+        if (path !== '')
+            out.push({ kind: 'diff-path', text: path });
+        const offset = typeof args.offset === 'number' ? args.offset : undefined;
+        const limit = typeof args.limit === 'number' ? args.limit : undefined;
+        if (offset !== undefined || limit !== undefined) {
+            out.push({ kind: 'tool-result', text: `offset ${offset ?? 1}${limit === undefined ? '' : ` · limit ${limit}`}` });
+        }
+        if (row.output !== '') {
+            for (const line of truncate(row.output, 40).split('\n')) {
+                out.push({ kind: 'tool-result', text: line });
+            }
+        }
+        else if (row.status === 'running') {
+            out.push({ kind: 'tool-result', text: '读取中…' });
+        }
+        return out.length > 0 ? out : null;
+    }
+    if ((name === 'grep' || name === 'glob') && args !== null) {
+        const pattern = firstString(args, ['pattern', 'glob_pattern', 'query']);
+        const path = firstString(args, ['path', 'glob']);
+        const out = [{ kind: 'diff-path', text: [pattern, path].filter(Boolean).join('  ') || name }];
+        if (row.output !== '') {
+            for (const line of truncate(row.output, 30).split('\n')) {
+                out.push({ kind: 'tool-result', text: line });
+            }
+        }
+        return out;
+    }
+    if ((name === 'web_search' || name === 'web_fetch') && args !== null) {
+        const query = firstString(args, ['query', 'q', 'url']);
+        const out = [{ kind: 'diff-path', text: query || name }];
+        if (row.output !== '') {
+            for (const line of truncate(row.output, 24).split('\n')) {
+                out.push({ kind: 'assistant', text: line });
+            }
+        }
+        return out;
+    }
+    return null;
+}
 /** Recover the shell tools' exit marker, mirroring @deepseek-ai/dsh-shell/render. */
 export function parseExitStatus(text) {
     const signal = /\n\[killed by signal: ([^\]\n]+)\]$/.exec(text);
@@ -1346,6 +1836,14 @@ export class SshTui {
     lastTitleUpdateAt = 0;
     lastPaintRows = [];
     lastChromeKey = '';
+    lastPaintWidth = 0;
+    lastPaintHeight = 0;
+    paintIntervalMs;
+    searchHits = [];
+    searchIndex = -1;
+    searchQuery = '';
+    planNudgePending = false;
+    pendingReveal;
     constructor(ctx, agent, config) {
         this.ctx = ctx;
         this.agent = agent;
@@ -1366,9 +1864,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.pushRow({ kind: 'brand-logo' });
         this.pushRow({ kind: 'system', text: 'DeepSeek Harness — SSH TUI' });
-        this.pushRow({ kind: 'system', text: '输入 /help 查看命令 · /setup 配置提供商 · ↑/↓ 选择卡片 · Enter 展开/折叠 · Ctrl+R 全部展开/收起 · Ctrl+T 折叠输入 · Esc 取消' });
+        this.pushRow({ kind: 'system', text: '输入 /help 查看快捷键 · /find 搜索思考/计划/子代理/回复 · 空输入时 ↑/↓ 选卡片' });
     }
     /** Enter raw mode, switch to the alternate screen, and start listening. */
     start() {
@@ -1397,7 +1896,7 @@ export class SshTui {
                 || this.rows.some(row => (row.kind === 'question' && row.status === 'waiting')
                     || (row.kind === 'plan' && (row.active || row.pending || row.todos.some(item => item.status === 'in_progress')))
                     || (row.kind === 'goal' && (row.phase === 'active' || row.phase === 'blocked')));
-            if (animating && now - this.lastPaintAt >= 200) {
+            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
@@ -1414,7 +1913,7 @@ export class SshTui {
                 this.lastPaintAt = now;
                 this.render();
             }
-        }, RENDER_INTERVAL_MS);
+        }, this.paintIntervalMs);
         this.renderTimer.unref?.();
         void this.maybeRunOnboarding().catch((error) => {
             if (this.disposed)
@@ -1422,6 +1921,12 @@ export class SshTui {
             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();
+        });
     }
     /** Replay the durable session log so a resumed session renders its history. */
     replayHistory() {
@@ -1447,7 +1952,7 @@ export class SshTui {
         if (providerUsesLocalOAuth(provider)) {
             this.pushRow({
                 kind: 'system',
-                text: `当前是 ${describeProviderRoute(provider).kind}（${provider}），使用本机 OAuth token，无需 API Key。如需改回 Key 提供商，输入 /setup。`,
+                text: `当前是 ${describeProviderRoute(provider).kind}（${provider}），走本机 SuperGrok / X Premium OAuth，无需 API Key。用 /model 切换 Grok 模型和思考强度；只有要改成 DeepSeek 官方或 OpenCode 这类 Key 提供商时才需要 /setup。`,
             });
             this.markDirty();
             return;
@@ -1608,6 +2113,24 @@ export class SshTui {
             process.exit(code);
     }
     // ── terminal output ─────────────────────────────────────────────────────
+    /** Capture one painted frame. Used by README screenshot fixtures. */
+    captureFrame(columns = 80, rows = 24) {
+        const previousColumns = process.stdout.columns;
+        const previousRows = process.stdout.rows;
+        const previousWrite = this.write.bind(this);
+        this.write = () => { };
+        process.stdout.columns = columns;
+        process.stdout.rows = rows;
+        try {
+            this.paint();
+            return [...this.lastPaintRows];
+        }
+        finally {
+            this.write = previousWrite;
+            process.stdout.columns = previousColumns;
+            process.stdout.rows = previousRows;
+        }
+    }
     write(chunk) {
         process.stdout.write(chunk);
     }
@@ -1648,24 +2171,137 @@ export class SshTui {
         return this.rows.findLast((row) => row.kind === 'subagent' && row.sessionId === sessionId);
     }
     findLivePlanRow() {
-        return this.rows.findLast((row) => row.kind === 'plan');
+        return this.rows.findLast((row) => row.kind === 'plan' && planIsLive(row));
+    }
+    /** Older / finished plans stay in the scrolling transcript. */
+    archiveStalePlans(keep) {
+        for (const row of this.rows) {
+            if (row.kind !== 'plan' || row === keep)
+                continue;
+            if (row.archived === true)
+                continue;
+            row.archived = true;
+            row.active = false;
+            row.pending = false;
+            row.expanded = false;
+        }
     }
     upsertPlanRow(patch) {
         const existing = this.findLivePlanRow();
-        if (existing !== undefined) {
+        // A new docked plan only starts when the current one is no longer live
+        // (completed / archived). Re-entering plan mode on the same incomplete
+        // list must keep updating that row, not archive it.
+        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;
+            }
+            this.archiveStalePlans(planIsLive(existing) ? existing : undefined);
             return existing;
         }
+        if (existing !== undefined) {
+            existing.archived = true;
+            existing.active = false;
+            existing.pending = false;
+            existing.expanded = false;
+        }
         const row = {
             kind: 'plan',
             active: patch.active ?? false,
             pending: patch.pending ?? false,
             todos: patch.todos ?? [],
+            ...(patch.planMarkdown === undefined ? {} : { planMarkdown: patch.planMarkdown }),
             expanded: false,
+            archived: false,
         };
         this.pushRow(row);
+        this.archiveStalePlans(row);
         return row;
     }
+    /** Whether the live plan strip should occupy the workspace footer. */
+    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();
+        if (plan === undefined)
+            return [];
+        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 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);
+        const marker = plan.expanded ? '▾' : '▸';
+        const focused = this.focusedRow === plan ? '▶ ' : '  ';
+        const header = `${focused}${marker} ${mode}${spinner} · ${summary}${plan.expanded || yieldBottom ? '' : ' · Enter 展开'}`;
+        const lines = [this.styleLine('plan-dock', padToWidth(header, width))];
+        if (yieldBottom || !plan.expanded)
+            return lines;
+        const note = planDockNote(plan);
+        lines.push(this.styleLine('plan-dock', padToWidth(`   ${note}`, width)));
+        if (plan.planMarkdown !== undefined && plan.planMarkdown !== '') {
+            const markdown = renderMarkdownLines(plan.planMarkdown, inner, this.color);
+            const budget = Math.max(4, Math.min(12, markdown.length));
+            for (const line of markdown.slice(0, budget)) {
+                lines.push(`${clipAnsiToWidth(`  ${line}`, width)}\x1b[0m`);
+            }
+            if (markdown.length > budget) {
+                lines.push(this.styleLine('plan-dock', padToWidth(`   … 还有 ${markdown.length - budget} 行计划`, width)));
+            }
+        }
+        if (plan.todos.length === 0) {
+            if (plan.planMarkdown === undefined || plan.planMarkdown === '') {
+                lines.push(this.styleLine('todo-pending', padToWidth('   还没有任务列表', width)));
+            }
+        }
+        else {
+            for (const item of plan.todos) {
+                const mark = TODO_STATUS_MARK[item.status];
+                const kind = todoItemKind(item.status);
+                for (const wrapped of wrap(`${mark} ${item.content}`, inner)) {
+                    lines.push(this.styleLine(kind, padToWidth(`  ${wrapped}`, width)));
+                }
+            }
+        }
+        return lines;
+    }
     paintCollapsibleHeader(addDisplay, row, kind, header, width, colorize) {
         const focused = this.focusedRow === row;
         const marker = row.expanded ? '▾' : '▸';
@@ -1727,6 +2363,87 @@ export class SshTui {
         this.focusedRow = allExpanded ? null : rows[rows.length - 1] ?? null;
         this.markDirty();
     }
+    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' && 'expanded' in row) {
+            row.expanded = true;
+            this.focusedRow = row;
+        }
+        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') {
+            const live = this.findLivePlanRow();
+            if (live !== undefined) {
+                this.focusCard(live);
+                this.pushRow({ kind: 'system', text: `已跳到${CARD_CATEGORY_LABEL[category]}（底栏计划条）。` });
+                this.revealRow(live);
+                return;
+            }
+        }
+        const target = this.rows.findLast(row => cardCategoryOf(row) === category);
+        if (target === undefined) {
+            this.pushRow({ kind: 'system', text: `当前没有${CARD_CATEGORY_LABEL[category]}卡片。` });
+            this.markDirty();
+            return;
+        }
+        this.pushRow({ kind: 'system', text: `已跳到最新${CARD_CATEGORY_LABEL[category]}。` });
+        this.revealRow(target);
+    }
+    applySearchHits(query, hits) {
+        this.searchQuery = query;
+        this.searchHits = hits;
+        if (hits.length === 0) {
+            this.searchIndex = -1;
+            this.pushRow({ kind: 'system', text: query === '' ? '没有可搜索的卡片。' : `没有匹配「${query}」的卡片。` });
+            this.markDirty();
+            return;
+        }
+        this.searchIndex = hits.length - 1;
+        const hit = hits[this.searchIndex];
+        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);
+        const label = parsed.category === undefined ? '' : `${CARD_CATEGORY_LABEL[parsed.category]} `;
+        const hits = matchTranscriptRows(this.rows, arg);
+        this.applySearchHits(`${label}${parsed.query}`.trim(), hits);
+    }
+    stepSearch(delta) {
+        if (this.searchHits.length === 0) {
+            this.pushRow({ kind: 'system', text: '还没有搜索结果。用 /find 思考 padAnsi，或 Ctrl+/ 打开搜索。' });
+            this.markDirty();
+            return;
+        }
+        const count = this.searchHits.length;
+        this.searchIndex = (this.searchIndex + delta + count) % count;
+        const hit = this.searchHits[this.searchIndex];
+        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)
             return;
@@ -1734,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) {
@@ -1766,13 +2485,13 @@ export class SshTui {
                 const focused = this.focusedRow === row;
                 const marker = row.expanded ? '▾' : '▸';
                 const lines = row.text.split('\n').length;
-                const header = `${marker} 已思考 · ${lines} 行${row.expanded ? '' : ' · Ctrl+R 展开'}`;
+                const header = `${marker} 已思考 · ${lines} 行${row.expanded ? '' : ' · Enter 展开'}`;
                 const line = `${focused ? '▶ ' : '  '}${header}`;
                 const styled = this.styleLine('reasoning', line);
                 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;
@@ -1785,10 +2504,13 @@ export class SshTui {
                 // "[33m" text on screen; color the dot between two sanitized halves.
                 const dotColor = !this.color ? undefined : running ? '33' : ok ? '32' : '31';
                 const styleToolHeader = (line) => {
-                    const dotIndex = line.indexOf('●');
+                    const safe = sanitizeTerminalText(line);
+                    if (!this.color)
+                        return safe;
+                    const dotIndex = safe.indexOf('●');
                     if (dotColor === undefined || dotIndex === -1)
-                        return this.styleLine('tool', line);
-                    return `${this.styleLine('tool', line.slice(0, dotIndex))}\x1b[${dotColor}m●${this.styleLine('tool', line.slice(dotIndex + 1))}`;
+                        return this.styleLine('tool', safe);
+                    return `\x1b[33m${safe.slice(0, dotIndex)}\x1b[${dotColor}m●\x1b[33m${safe.slice(dotIndex + 1)}\x1b[0m`;
                 };
                 const spinner = running ? ` ${this.spinnerFrame()}` : '';
                 const state = running ? 'running…' : ok ? 'ok' : 'error';
@@ -1813,8 +2535,11 @@ export class SshTui {
                     addDisplay(styleToolHeader(wrapped), row);
                 }
                 for (const line of toolBodyLines(row, this.maxToolOutputLines)) {
-                    for (const wrapped of wrap(line.text, Math.max(1, width - 2))) {
-                        addDisplay(this.styleLine(line.kind, `  ${wrapped}`));
+                    const inner = Math.max(1, width - 2);
+                    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), row);
                     }
                 }
                 continue;
@@ -1824,21 +2549,24 @@ export class SshTui {
                 const ok = row.status === 'ok';
                 const dotColor = !this.color ? undefined : running ? '33' : ok ? '32' : '31';
                 const styleHeader = (line) => {
-                    const dotIndex = line.indexOf('●');
+                    const safe = sanitizeTerminalText(line);
+                    if (!this.color)
+                        return safe;
+                    const dotIndex = safe.indexOf('●');
                     if (dotColor === undefined || dotIndex === -1)
-                        return this.styleLine('tool', line);
-                    return `${this.styleLine('tool', line.slice(0, dotIndex))}\x1b[${dotColor}m●${this.styleLine('tool', line.slice(dotIndex + 1))}`;
+                        return this.styleLine('tool', safe);
+                    return `\x1b[33m${safe.slice(0, dotIndex)}\x1b[${dotColor}m●\x1b[33m${safe.slice(dotIndex + 1)}\x1b[0m`;
                 };
                 const spinner = running ? ` ${this.spinnerFrame()}` : '';
                 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) {
@@ -1848,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);
                             }
                         }
                     }
@@ -1856,30 +2584,24 @@ export class SshTui {
                 continue;
             }
             if (row.kind === 'plan') {
-                const running = row.todos.some(item => item.status === 'in_progress');
-                const spinner = (row.active || row.pending || running) ? ` ${this.spinnerFrame()}` : '';
-                const mode = row.pending
-                    ? '切换中'
-                    : row.active
-                        ? '计划模式'
-                        : '计划';
-                const header = `● ${mode}${spinner} · ${todoSummary(row.todos)}${row.expanded ? '' : ' · Enter 展开'}`;
-                this.paintCollapsibleHeader(addDisplay, row, 'system', header, width);
+                if (planIsLive(row) && this.findLivePlanRow() === row)
+                    continue;
+                const counts = todoProgressLabel(row.todos);
+                const title = planTitleFromMarkdown(row.planMarkdown ?? '');
+                const summary = title ?? (counts === '' ? '已归档' : counts);
+                const header = `计划 · ${summary}${row.expanded ? '' : ' · Enter 展开'}`;
+                this.paintCollapsibleHeader(addDisplay, row, 'plan-dock', header, width);
                 if (row.expanded) {
-                    addDisplay(this.styleLine('system', row.active
-                        ? '  当前处于计划模式：只规划、不改代码，确认后再执行。'
-                        : '  计划模式已关闭。可用 /plan 重新进入。'));
-                    if (row.pending)
-                        addDisplay(this.styleLine('system', '  模式切换将在下一步生效。'));
-                    if (row.todos.length === 0) {
-                        addDisplay(this.styleLine('tool-result', '  还没有任务列表'));
+                    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}`, row);
+                        }
                     }
-                    else {
-                        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(item.status === 'completed' ? 'system' : 'tool', `  ${wrapped}`));
-                            }
+                    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}`), row);
                         }
                     }
                 }
@@ -1894,18 +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 !== '') {
-                        for (const wrapped of wrap(row.detail, Math.max(1, width - 2))) {
-                            addDisplay(this.styleLine('tool-result', `  ${wrapped}`));
+                        if (row.intent === 'plan-review') {
+                            for (const line of renderMarkdownLines(row.detail, Math.max(1, width - 2), this.color)) {
+                                addDisplay(`  ${line}`, row);
+                            }
+                        }
+                        else {
+                            for (const wrapped of wrap(row.detail, Math.max(1, width - 2))) {
+                                addDisplay(this.styleLine('tool-result', `  ${wrapped}`), row);
+                            }
                         }
                     }
                     addDisplay(this.styleLine('system', waiting
                         ? '  用下方对话框选择，数字/字母选中，Enter 提交，Esc 取消。'
-                        : `  ${row.summary}`));
+                        : `  ${row.summary}`), row);
                 }
                 continue;
             }
@@ -1920,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 !== '') {
@@ -1947,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);
                     }
                 }
             }
@@ -2035,7 +2764,9 @@ export class SshTui {
                     addDialog(`计划待审 ${d.index + 1}/${d.total}${d.question.header === undefined ? '' : ` · ${d.question.header}`}`);
                     addDialog(d.question.question);
                     if (d.question.detail !== undefined && d.question.detail !== '') {
-                        addDialog(truncate(d.question.detail, 12));
+                        for (const line of renderMarkdownLines(d.question.detail, Math.max(1, width - 2), this.color).slice(0, 16)) {
+                            dialogLines.push(this.styleLine('assistant', line));
+                        }
                     }
                 }
                 else {
@@ -2064,12 +2795,11 @@ export class SshTui {
         const fitLine = (text) => truncateToWidth(text, Math.max(1, width));
         const headerLines = [
             this.styleLine('system', fitLine(`DeepSeek Harness — SSH TUI  [${this.presetName}]  ${this.currentSelectionLabel()}`)),
-            this.styleLine('system', '─'.repeat(width)),
+            this.styleLine('system', repeatToWidth('─', width)),
         ];
         if (this.scrollOffset > 0) {
             headerLines.push(this.styleLine('system', fitLine(`↑ 已回看 ${this.scrollOffset} 行 · PgUp/PgDn/滚轮滚动 · Esc 回到底部`)));
         }
-        const inputDivider = this.styleLine('system', '─'.repeat(width));
         this.commandSuggestions = this.dialog === undefined ? this.buildSuggestions() : [];
         if (this.suggestionIndex >= this.commandSuggestions.length) {
             this.suggestionIndex = Math.max(0, this.commandSuggestions.length - 1);
@@ -2087,7 +2817,7 @@ export class SshTui {
         const promptWidth = displayWidth(promptPlain);
         const masked = this.dialog?.kind === 'onboarding' && this.onboarding?.step === 'key';
         const inputView = masked
-            ? { text: '•'.repeat(this.input.length), cursorOffset: this.cursor, folded: false }
+            ? { text: '•'.repeat(this.input.length), cursorOffset: displayWidth('•'.repeat(this.cursor)), folded: false }
             : this.inputFolded
                 ? foldInputView(this.input, this.cursor, Math.max(1, width - promptWidth))
                 : { text: this.input, cursorOffset: displayWidth(this.input.slice(0, this.cursor)), folded: false };
@@ -2132,9 +2862,26 @@ export class SshTui {
             }
         }
         const inputRows = Math.max(1, inputDisplayLines.length);
-        const reserved = RESERVED_BOTTOM_LINES + (inputRows - 1) + headerLines.length + suggestionLines.length + 1; // +1 input divider
+        const yieldPlanDock = this.dialog !== undefined || suggestionLines.length > 0;
+        const planDockLines = this.shouldDockPlan()
+            ? this.paintPlanDock(width, yieldPlanDock)
+            : [];
+        const inputDivider = this.styleLine('system', repeatToWidth('─', width));
+        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);
@@ -2148,9 +2895,14 @@ 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();
+        if (dockPlan !== undefined && planDockLines.length > 0) {
+            const dockTop = headerLines.length + visible.length + 1;
+            this.clickableRows.set(dockTop, dockPlan);
+        }
         const statsText = this.statsText();
         const statsLine = this.styleLine('system', fitLine(statsText === '' ? '— 尚无会话统计' : statsText));
         let statusText = `${this.status}  [${this.presetName}]  ${this.currentSelectionLabel()}`;
@@ -2160,6 +2912,9 @@ export class SshTui {
         statusText += sub.provider === undefined
             ? ` · sub:${sub.model}${subEffort}`
             : ` · sub:${subProvider}/${sub.model}${subEffort}`;
+        if (this.searchHits.length > 0 && this.searchIndex >= 0) {
+            statusText += ` · 搜索 ${this.searchIndex + 1}/${this.searchHits.length}`;
+        }
         if (inputView.folded)
             statusText += ' · 输入已折叠 · Ctrl+T 展开';
         else if (inputRows > 1)
@@ -2174,6 +2929,9 @@ export class SshTui {
                 ? ' · 计划待审'
                 : ' · 等待用户回答';
         }
+        else if (livePlan?.turnLeftOpen === true) {
+            statusText += ' · 本轮未收尾';
+        }
         else if (livePlan?.active === true || livePlan?.pending === true) {
             statusText += livePlan.pending ? ' · 计划模式切换中' : ' · 计划模式';
         }
@@ -2196,6 +2954,7 @@ export class SshTui {
         const paintRows = [
             ...headerLines,
             ...visible,
+            ...planDockLines,
             ...dialogLines,
             inputDivider,
             ...suggestionLines,
@@ -2206,7 +2965,7 @@ export class SshTui {
         // Bottom chrome is force-repainted whenever its state changes while the
         // agent is working; this clears any stale cell left behind by a previous
         // frame even when the row strings happen to be identical.
-        const chromeStart = Math.max(0, paintRows.length - inputRows - 3);
+        const chromeStart = Math.max(0, paintRows.length - inputRows - suggestionLines.length - dialogLines.length - planDockLines.length - 3);
         const chromeKey = [
             this.status,
             this.agent.status,
@@ -2217,33 +2976,37 @@ export class SshTui {
             inputView.folded,
             inputRows,
             paintRows.length,
+            width,
+            height,
             this.pendingMessages.size,
             this.commandSuggestions.length,
             this.suggestionIndex,
             this.activeSubagents.size,
             this.dialog?.kind ?? '',
-            this.findLivePlanRow()?.active === true ? 'plan' : '',
+            planDockLines.join('\n'),
         ].join('\x1f');
         const chromeChanged = chromeKey !== this.lastChromeKey;
-        // Incremental repaint: rewrite only rows whose content changed, so slow
-        // SSH links don't rebuild (and flicker) the whole screen on every tick.
-        this.write('\x1b[?25l');
-        const maxRows = Math.max(paintRows.length, this.lastPaintRows.length);
-        for (let i = 0; i < maxRows; i++) {
-            const current = paintRows[i];
-            if (current === this.lastPaintRows[i] && !(chromeChanged && i >= chromeStart))
-                continue;
-            this.write(`\x1b[${i + 1};1H\x1b[0m${current ?? ''}\x1b[K`);
-        }
-        if (paintRows.length < this.lastPaintRows.length) {
-            this.write(`\x1b[${paintRows.length + 1};1H\x1b[J`);
-        }
-        this.write('\x1b[0m');
-        this.lastPaintRows = paintRows;
-        this.lastChromeKey = chromeKey;
-        const inputTopRow = visible.length + dialogLines.length + suggestionLines.length + headerLines.length + 2;
+        const sizeChanged = width !== this.lastPaintWidth || height !== this.lastPaintHeight;
+        // One stdout write per frame: dirty rows only, so jump-host SSH sees a
+        // single packet instead of one write per line. Clip/pad so leftover
+        // wide glyphs cannot wrap into the input box.
+        const inputTopRow = visible.length + planDockLines.length + dialogLines.length + suggestionLines.length + headerLines.length + 2;
         const row = Math.min(height, inputTopRow + cursorRowOffset);
-        this.write(`\x1b[${row};${Math.max(1, column)}H\x1b[?25h`);
+        this.write(composePaintOutput({
+            width,
+            height,
+            paintRows,
+            previousRows: this.lastPaintRows,
+            sizeChanged,
+            chromeChanged,
+            chromeStart,
+            cursorRow: row,
+            cursorColumn: column,
+        }));
+        this.lastPaintRows = paintRows.length > height ? paintRows.slice(0, height) : paintRows;
+        this.lastChromeKey = chromeKey;
+        this.lastPaintWidth = width;
+        this.lastPaintHeight = height;
     };
     buildSuggestions() {
         const input = this.input;
@@ -2405,9 +3168,13 @@ export class SshTui {
                             kind === 'diff-add' ? '38;5;22;48;5;194' :
                                 kind === 'diff-del' ? '38;5;124;48;5;224' :
                                     kind === 'diff-path' ? '1;36' :
-                                        kind === 'error' ? '31' :
-                                            '90';
-        return `\x1b[${code}m${safe}`;
+                                        kind === 'todo-done' ? '2;32' :
+                                            kind === 'todo-active' ? '1;36' :
+                                                kind === 'todo-pending' ? '90' :
+                                                    kind === 'plan-dock' ? '38;5;180' :
+                                                        kind === 'error' ? '31' :
+                                                            '90';
+        return `\x1b[${code}m${safe}\x1b[0m`;
     }
     // ── event handling ──────────────────────────────────────────────────────
     /**
@@ -2421,10 +3188,15 @@ export class SshTui {
         if (agent === this.agent)
             return resolved;
         const selection = this.subagentSelection.current;
+        const parentProvider = this.selectionRef?.current?.provider ?? this.agent.options.provider ?? this.providerName;
+        const provider = selection.provider ?? parentProvider;
+        const model = subagentModelMatchesProvider(provider, selection.model)
+            ? selection.model
+            : defaultSubagentModelForProvider(provider);
         return {
             ...resolved,
-            ...(selection.provider === undefined ? {} : { provider: selection.provider }),
-            model: selection.model,
+            provider,
+            model,
             ...(selection.reasoningEffort === undefined ? {} : { reasoningEffort: selection.reasoningEffort }),
         };
     };
@@ -2551,6 +3323,11 @@ export class SshTui {
                     expanded: DIFF_TOOL_NAMES.has(event.data.name) && !SUBAGENT_TOOL_NAMES.has(event.data.name),
                 };
                 this.pushRow(row);
+                if (event.data.name === 'exit_plan_mode') {
+                    const markdown = planMarkdownFromArgs(event.data.arguments);
+                    if (markdown !== undefined)
+                        this.upsertPlanRow({ planMarkdown: markdown, expanded: false });
+                }
                 this.streaming = undefined;
                 this.markDirty();
                 break;
@@ -2658,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;
             }
@@ -3096,13 +3884,13 @@ export class SshTui {
         this.removeQueuedDialog(dialog);
         dialog.resolve('cancel');
     }
-    openQuestion(question, index, total, resolve, reject) {
+    openQuestion(question, index, total, resolve, reject, preselected) {
         const dialog = {
             kind: 'questions',
             question,
             index,
             total,
-            selected: new Set(),
+            selected: new Set(preselected !== undefined && preselected >= 0 ? [preselected] : []),
             resolve: (selection) => {
                 this.settleQuestion(dialog, () => resolve(selection));
             },
@@ -3114,9 +3902,9 @@ export class SshTui {
         return dialog;
     }
     /** Open one question dialog and await its answer (cancellation rejects). */
-    askQuestion(question, index = 0, total = 1) {
+    askQuestion(question, index = 0, total = 1, preselected) {
         return new Promise((resolve, reject) => {
-            this.openQuestion(question, index, total, resolve, reject);
+            this.openQuestion(question, index, total, resolve, reject, preselected);
         });
     }
     /** The stored llm-pi-ai profile for one provider route, when settings provide one. */
@@ -3238,11 +4026,12 @@ export class SshTui {
                 options.push({ label: this.MODEL_PAGE_PREV, description: undefined });
             if (hasNext)
                 options.push({ label: this.MODEL_PAGE_NEXT, description: undefined });
+            const currentIndex = page.findIndex(option => option.id === currentModel && option.id !== '__switch_provider__');
             const answer = await this.askQuestion({
                 id: 'model-pick',
                 question: `选择模型（提供商 ${provider} · ${sourceLabel}${hasPrev || hasNext ? `，第 ${currentPage}/${pageCount} 页` : ''}）`,
                 options,
-            });
+            }, 0, 1, currentIndex >= 0 ? currentIndex : undefined);
             const picked = options.find(option => option.label === answer.selected[0]);
             if (picked === undefined)
                 return undefined;
@@ -3271,23 +4060,33 @@ export class SshTui {
             const display = name !== undefined && name !== '' && name !== id ? name : kind.short;
             out.push({ id, label: `${display} · ${id}` });
         };
+        add(current);
         for (const info of llm?.listProviders() ?? [])
             add(info.id, info.name);
-        add(current);
-        add('deepseek-official', 'DeepSeek 官方');
         add('xai', 'SuperGrok');
+        add('deepseek-official', 'DeepSeek 官方');
         add('opencode-go', 'OpenCode Go');
         add('opencode', 'OpenCode Zen');
         return out;
     }
-    /** /model: pick a provider, then a model and reasoning effort on that route. */
+    /** Built-in SuperGrok catalog used when the live adapter list is still warming up. */
+    static XAI_FALLBACK_MODELS = [
+        { id: 'grok-4.6', label: 'Grok 4.6' },
+        { id: 'grok-4.5', label: 'Grok 4.5' },
+        { id: 'grok-4.3', label: 'Grok 4.3' },
+    ];
+    /** /model: stay on the current provider by default; switching providers is opt-in. */
     async runModelCommand() {
         const llm = this.ctx.get('llm');
         const current = this.selectionRef?.current;
         const providers = this.listSelectableProviders();
         let provider = this.currentProviderId();
-        if (providers.length > 1) {
-            const answer = await this.askQuestion({
+        const SWITCH_PROVIDER_ID = '__switch_provider__';
+        const pickProvider = async () => {
+            if (providers.length <= 1)
+                return provider;
+            const currentIndex = Math.max(0, providers.findIndex(option => option.id === provider));
+            const pickedAnswer = await this.askQuestion({
                 id: 'provider-pick',
                 question: '选择提供商',
                 options: providers.map(option => ({
@@ -3296,12 +4095,9 @@ export class SshTui {
                         ? `${describeProviderRoute(option.id).kind} · 当前`
                         : describeProviderRoute(option.id).kind,
                 })),
-            });
-            const picked = providers.find(option => option.label === answer.selected[0]);
-            if (picked === undefined)
-                return;
-            provider = picked.id;
-        }
+            }, 0, 1, currentIndex);
+            return providers.find(option => option.label === pickedAnswer.selected[0])?.id;
+        };
         let modelOptions = [];
         let modelSource = '已配置列表';
         // OpenCode and other third-party routes are interrogated live so the picker
@@ -3348,42 +4144,115 @@ export class SshTui {
                 modelOptions = [];
             }
         }
+        if (modelOptions.length === 0 && providerUsesLocalOAuth(provider)) {
+            modelOptions = SshTui.XAI_FALLBACK_MODELS.map(option => ({ ...option }));
+            modelSource = 'SuperGrok 目录';
+        }
         if (modelOptions.length === 0) {
-            const fallback = current?.model ?? this.agent.options.model ?? 'deepseek-v4-flash';
+            const fallback = current?.model ?? this.agent.options.model ?? (providerUsesLocalOAuth(provider) ? 'grok-4.6' : 'deepseek-v4-flash');
             modelOptions = [{ id: fallback, label: fallback }];
         }
+        if (current?.model !== undefined && !modelOptions.some(option => option.id === current.model)) {
+            modelOptions = [{ id: current.model, label: current.model }, ...modelOptions];
+        }
+        if (providers.length > 1) {
+            modelOptions = [
+                ...modelOptions,
+                { id: SWITCH_PROVIDER_ID, label: '更换提供商…' },
+            ];
+        }
         const selected = await this.pickModelOption(modelOptions, provider, modelSource, current?.model);
         if (selected === undefined)
             return;
-        if (!(await this.ensureProviderModelConfigured(provider, selected.id)))
+        if (selected.id === SWITCH_PROVIDER_ID) {
+            const nextProvider = await pickProvider();
+            if (nextProvider === undefined || nextProvider === provider)
+                return;
+            provider = nextProvider;
+            modelOptions = [];
+            modelSource = '已配置列表';
+            // Reload the model list for the newly chosen provider.
+            if (this.piAiProviderProfile(provider) !== undefined || provider === 'opencode' || provider === 'opencode-go') {
+                try {
+                    modelOptions = await this.discoverEndpointModels(provider);
+                    if (modelOptions.length > 0)
+                        modelSource = '端点实时列表';
+                }
+                catch {
+                    modelOptions = [];
+                }
+            }
+            if (modelOptions.length === 0) {
+                try {
+                    const listed = (await llm?.listModels(provider)) ?? [];
+                    modelOptions = listed.map(model => ({ id: model.id, label: model.name || model.id }));
+                }
+                catch {
+                    modelOptions = [];
+                }
+            }
+            if (modelOptions.length === 0 && providerUsesLocalOAuth(provider)) {
+                modelOptions = SshTui.XAI_FALLBACK_MODELS.map(option => ({ ...option }));
+                modelSource = 'SuperGrok 目录';
+            }
+            if (modelOptions.length === 0) {
+                const fallback = providerUsesLocalOAuth(provider) ? 'grok-4.6' : 'deepseek-v4-flash';
+                modelOptions = [{ id: fallback, label: fallback }];
+            }
+            const switched = await this.pickModelOption(modelOptions, provider, modelSource, undefined);
+            if (switched === undefined)
+                return;
+            return await this.applyModelSelection(provider, switched.id, undefined);
+        }
+        await this.applyModelSelection(provider, selected.id, modelOptions.map(option => option.id).filter(id => id !== SWITCH_PROVIDER_ID));
+    }
+    /** Persist a provider/model/effort choice and keep the subagent on the same family. */
+    async applyModelSelection(provider, modelId, listed = []) {
+        if (!(await this.ensureProviderModelConfigured(provider, modelId)))
             return;
+        const llm = this.ctx.get('llm');
+        const current = this.selectionRef?.current;
         let effortOptions = [];
         try {
-            const info = await llm?.resolveModelInfo(provider, selected.id);
+            const info = await llm?.resolveModelInfo(provider, modelId);
             effortOptions = (info?.reasoning?.efforts ?? []).map(effort => ({ id: String(effort.id), label: effort.name }));
         }
         catch {
             effortOptions = [];
         }
-        if (effortOptions.length === 0) {
-            // No selectable reasoning effort for this model: do not invent
-            // `off/high/max`, which the adapter may reject for the exact model.
+        if (effortOptions.length === 0 && providerUsesLocalOAuth(provider)) {
+            effortOptions = modelId === 'grok-4.6'
+                ? [
+                    { id: 'off', label: 'Off' },
+                    { id: 'low', label: 'Low' },
+                    { id: 'medium', label: 'Medium' },
+                    { id: 'high', label: 'High' },
+                    { id: 'xhigh', label: 'Extra high' },
+                ]
+                : [
+                    { id: 'off', label: 'Off' },
+                    { id: 'low', label: 'Low' },
+                    { id: 'medium', label: 'Medium' },
+                    { id: 'high', label: 'High' },
+                ];
         }
         let effort;
         if (effortOptions.length > 0) {
+            const currentEffort = current?.provider === provider ? String(current?.reasoningEffort ?? '') : '';
+            const currentIndex = Math.max(0, effortOptions.findIndex(option => option.id === currentEffort));
             const effortAnswer = await this.askQuestion({
                 id: 'effort-pick',
-                question: `选择思考强度（${selected.id}）`,
+                question: `选择思考强度（${modelId}）`,
                 options: effortOptions.map(option => ({
                     label: option.label,
-                    description: option.id === String(current?.reasoningEffort) ? '当前' : undefined,
+                    description: option.id === currentEffort ? '当前' : undefined,
                 })),
-            });
+            }, 0, 1, currentIndex);
             effort = effortOptions.find(option => option.label === effortAnswer.selected[0])?.id;
         }
         const next = {
             provider,
-            model: selected.id,
+            model: modelId,
             ...(effort === undefined ? {} : { reasoningEffort: ReasoningEffortId(effort) }),
         };
         if (this.selectionRef !== undefined)
@@ -3393,8 +4262,9 @@ export class SshTui {
         const kind = describeProviderRoute(provider);
         this.pushRow({
             kind: 'system',
-            text: `已切换到 ${kind.kind}：${provider}/${selected.id}（思考强度 ${effort ?? '默认'}${effortOptions.length === 0 ? '，该模型未声明可选强度' : ''}）；下一步请求生效。`,
+            text: `已切换到 ${kind.kind}：${provider}/${modelId}（思考强度 ${effort ?? '默认'}${effortOptions.length === 0 ? '，该模型未声明可选强度' : ''}）；下一步请求生效。`,
         });
+        await this.syncSubagentToProvider(provider, listed.filter(id => id !== '__switch_provider__' && id !== ''));
         this.markDirty();
     }
     /** Provider route the next subagent request should use. */
@@ -3404,6 +4274,40 @@ export class SshTui {
             ?? this.agent.options.provider
             ?? this.providerName;
     }
+    /**
+     * When the parent provider changes (OAuth or API key), keep the subagent
+     * on a same-family model. An explicit leftover DeepSeek flash id after
+     * switching to xAI is treated as stale.
+     */
+    async syncSubagentToProvider(provider, listed = []) {
+        const current = this.subagentSelection.current;
+        if (current.provider !== undefined && current.provider !== provider)
+            return;
+        if (subagentModelMatchesProvider(provider, current.model, listed))
+            return;
+        let catalog = [...listed];
+        if (catalog.length === 0) {
+            try {
+                const { options } = await this.subagentModelOptions(provider);
+                catalog = options.map(option => option.id);
+            }
+            catch {
+                catalog = [];
+            }
+        }
+        const nextModel = defaultSubagentModelForProvider(provider, catalog);
+        if (nextModel === current.model)
+            return;
+        const persisted = await this.saveSubagentSelection({
+            ...current,
+            model: nextModel,
+            reasoningEffort: undefined,
+        });
+        this.pushRow({
+            kind: 'system',
+            text: `子代理已跟随提供商 ${provider}，模型改为 ${nextModel}${persisted ? '' : '（仅当前会话）'}。`,
+        });
+    }
     /** Persist one subagent selection and publish it to the live request waterfall. */
     async saveSubagentSelection(next) {
         this.subagentSelection.current = next;
@@ -3879,9 +4783,39 @@ export class SshTui {
             return;
         }
         if (combined.startsWith('\x1b') && combined.length > 1) {
-            // Alt+<key> sequences: ignore the ESC half instead of triggering cancel,
-            // and type the printable remainder.
-            this.handlePlainText(combined.slice(1));
+            const alt = combined.slice(1);
+            if (alt === '1') {
+                this.jumpToCategory('thinking');
+                return;
+            }
+            if (alt === '2') {
+                this.jumpToCategory('plan');
+                return;
+            }
+            if (alt === '3') {
+                this.jumpToCategory('subagent');
+                return;
+            }
+            if (alt === '4') {
+                this.jumpToCategory('reply');
+                return;
+            }
+            if (alt === 'n' || alt === 'N') {
+                this.stepSearch(1);
+                return;
+            }
+            if (alt === 'p' || alt === 'P') {
+                this.stepSearch(-1);
+                return;
+            }
+            if (alt === 'f' || alt === 'F' || alt === '/') {
+                this.input = '/find ';
+                this.cursor = this.input.length;
+                this.markDirty();
+                return;
+            }
+            // Other Alt+<key>: ignore ESC so it does not cancel, type the remainder.
+            this.handlePlainText(alt);
             return;
         }
         this.handlePlainText(combined);
@@ -3980,6 +4914,10 @@ export class SshTui {
                 void this.requestExit(0);
                 return;
             case '\x0c':
+                this.lastPaintRows = [];
+                this.lastChromeKey = '';
+                this.lastPaintWidth = 0;
+                this.lastPaintHeight = 0;
                 this.dirty = true;
                 this.render();
                 return;
@@ -4019,6 +4957,16 @@ export class SshTui {
             this.handleDialogChar(char);
             return;
         }
+        if (char === '\x07') {
+            this.stepSearch(1);
+            return;
+        }
+        if (char === '\x1f') {
+            this.input = '/find ';
+            this.cursor = this.input.length;
+            this.markDirty();
+            return;
+        }
         if (char === '\t') {
             if (this.suggestionsVisible()) {
                 const selected = this.commandSuggestions[this.suggestionIndex];
@@ -4307,6 +5255,7 @@ export class SshTui {
                     this.selectionRef.current = { provider: 'deepseek-official', model };
                 }
                 this.onSelectionChanged?.({ provider: 'deepseek-official', model });
+                await this.syncSubagentToProvider('deepseek-official', state.models);
                 if (state.baseUrl !== '' && settings !== undefined) {
                     await settings.update(settingsNamespace('llm-deepseek'), { baseURL: state.baseUrl });
                     this.pushRow({ kind: 'system', text: `Base URL 已保存 → ${displayDshPath('settings.yaml')}` });
@@ -4369,6 +5318,7 @@ export class SshTui {
                         this.selectionRef.current = selection;
                     }
                     this.onSelectionChanged?.(selection);
+                    await this.syncSubagentToProvider(state.providerId, state.models);
                     this.pushRow({
                         kind: 'system',
                         text: `配置完成，已记住默认提供商/模型：${state.providerId} / ${model}。以后直接运行 dsh --profile tui 即可（--provider/--model 可临时覆盖）。`,
@@ -4623,10 +5573,12 @@ export class SshTui {
                         ...local,
                         ...dsh,
                         '',
-                        '运行中按 Enter 可插入指示；Esc / Ctrl+C 取消当前轮次。',
-                        '↑/↓ 或 Ctrl+N/P 选择思考、工具、子代理、计划或提问卡片；Enter 展开/折叠；Ctrl+R 全部展开或收起。',
-                        '计划模式、提问用户和当前目标会显示独立卡片；多个子代理默认各自折叠，互不混排。',
-                        '/model 先选提供商（DeepSeek 官方 / SuperGrok 订阅 / OpenCode …），再选模型和思考强度。',
+                        '运行中按 Enter 可插入指示；Esc 取消选择或当前轮次；空闲 Ctrl+C 退出。',
+                        '空输入时 ↑/↓ 选卡片（与 Ctrl+N/P 相同）；Enter 展开；Ctrl+R 全部展开/收起；Ctrl+T 折叠输入。',
+                        'Alt+1 最新思考 · Alt+2 计划 · Alt+3 子代理 · Alt+4 最新回复。',
+                        '/find [思考|计划|子代理|回复] 关键字；Ctrl+/ 或 Alt+/ 打开搜索，Ctrl+G / Alt+N 下一条。',
+                        '/model 默认列出当前提供商的模型；当前是 SuperGrok 时直接选 grok-4.6 / grok-4.5 和思考强度（含 xhigh）。要换提供商再选「更换提供商」。',
+                        '/setup 只用于配置 API Key 提供商。SuperGrok / X Premium 走本机 OAuth，不需要填 Key。',
                         '/status 会标明当前是 DeepSeek 官方、SuperGrok 订阅、OpenCode Go / Zen，还是其它已注册提供商。',
                     ].join('\n'),
                 });
@@ -4680,12 +5632,20 @@ export class SshTui {
                     this.markDirty();
                 });
                 break;
+            case 'find':
+                this.runFindCommand(arg);
+                break;
             case 'clear':
                 this.rows.length = 0;
                 this.streaming = undefined;
                 this.streamingReasoning = undefined;
                 this.thinkingStartedAt = undefined;
                 this.focusedRow = null;
+                this.searchHits = [];
+                this.searchIndex = -1;
+                this.searchQuery = '';
+                this.planNudgePending = false;
+                this.pendingReveal = undefined;
                 this.pushRow({ kind: 'system', text: '转录已清空。子代理、计划与提问卡片会在新事件到达时重新出现。' });
                 break;
             case 'status':
@@ -4753,7 +5713,7 @@ export class SshTui {
                         const activity = card?.lastActivity ? ` · ${card.lastActivity}` : '';
                         return `▶ ${label}  ${sub.id}（${sub.provider}）运行 ${Math.floor((Date.now() - sub.startedAt) / 1000)}s  [${runId.slice(0, 8)}]${activity}`;
                     });
-                    this.pushRow({ kind: 'system', text: `${lines.join('\n')}\n↑/↓ 选择对应卡片，Enter 展开/折叠，Ctrl+R 全部展开或收起。` });
+                    this.pushRow({ kind: 'system', text: `${lines.join('\n')}\n空输入时 ↑/↓ 选卡片，Enter 展开；Alt+3 跳到最新子代理。` });
                 }
                 break;
             }