dsh-ssh-tui 0.1.7 → 0.2.0

package/lib/tui.js

@@ -206,7 +206,7 @@ const LOCAL_COMMANDS = [
     { name: 'status', description: 'show session, provider and model status' },
     { name: 'usage', description: 'show OpenCode Zen billing / Go quota usage' },
     { name: 'quota', description: 'alias of /usage for OpenCode Go quota' },
-    { name: 'subagents', description: 'list active subagents' },
+    { 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: 'dialog-test', description: 'verify the question dialog' },
@@ -637,6 +637,15 @@ function cursorVisualPosition(text, cursor, width) {
     }
     return { row, col };
 }
+/** Build per-model reasoningEfforts from a provider-level reasoning default. */
+function reasoningEffortsForDefault(reasoning) {
+    if (typeof reasoning !== 'string')
+        return undefined;
+    const level = reasoning.trim();
+    if (level === '' || level === 'off')
+        return undefined;
+    return { off: null, [level]: level };
+}
 const OPENCODE_GO_USAGE_URL = 'https://opencode.ai/zen/go/v1/usage';
 const OPENCODE_ZEN_BASE_URL = 'https://opencode.ai/zen/v1';
 /**
@@ -754,7 +763,7 @@ function openCodeApiErrorMessage(payload) {
     return '';
 }
 /** Whether `text` could still grow into a recognized escape sequence. */
-function isEscapePrefix(text) {
+export function isEscapePrefix(text) {
     if (text === '\x1b')
         return true;
     if (!text.startsWith('\x1b'))
@@ -767,7 +776,7 @@ function isEscapePrefix(text) {
         return true;
     if (/^\x1b\[[HF]$/u.test(text))
         return true;
-    if (/^\x1b\[\d~?$/u.test(text))
+    if (/^\x1b\[\d+~?$/u.test(text))
         return true;
     if (/^\x1b\[<(?:\d*;?)*[Mm]?$/u.test(text))
         return true;
@@ -804,6 +813,12 @@ function lastCodePoints(text, max) {
         return '';
     return Array.from(text).slice(-max).join('');
 }
+/** Format a model list compactly: show the first few entries and an ellipsis. */
+function formatModelList(models, max = 5) {
+    const shown = models.slice(0, max);
+    const text = shown.join(', ');
+    return models.length > max ? `${text}…（共 ${models.length} 个）` : text;
+}
 /** Prefer the fields a human scans for; fall back to the first scalar pairs. */
 function friendlyArgsSummary(name, args) {
     const parsed = parseJsonArgs(args);
@@ -838,6 +853,89 @@ function friendlyArgsSummary(name, args) {
 }
 const SHELL_TOOL_NAMES = new Set(['bash', 'pwsh']);
 const DIFF_TOOL_NAMES = new Set(['edit', 'write', 'str_replace_editor']);
+const SUBAGENT_TOOL_NAMES = new Set(['subagent', 'subagent_fork', 'task']);
+const MAX_SUBAGENT_LOGS = 80;
+const TODO_STATUS_MARK = {
+    pending: '○',
+    in_progress: '◉',
+    completed: '✓',
+};
+/** Parse a todo_write payload into displayable plan items. */
+export function parsePlanTodos(value) {
+    const root = typeof value === 'string' ? parseJsonArgs(value) : value;
+    const todos = root !== null && typeof root === 'object' && !Array.isArray(root)
+        ? root.todos
+        : Array.isArray(root) ? root : undefined;
+    if (!Array.isArray(todos))
+        return [];
+    const out = [];
+    for (const item of todos) {
+        if (typeof item !== 'object' || item === null)
+            continue;
+        const content = typeof item.content === 'string'
+            ? item.content.trim()
+            : '';
+        if (content === '')
+            continue;
+        const status = item.status;
+        out.push({
+            content,
+            status: status === 'in_progress' || status === 'completed' ? status : 'pending',
+        });
+    }
+    return out;
+}
+/** Compact todo-list summary: done/total plus the first in-progress task. */
+export function todoSummary(value) {
+    const todos = parsePlanTodos(value);
+    if (todos.length === 0)
+        return '计划列表';
+    const done = todos.filter(item => item.status === 'completed').length;
+    const active = todos.find(item => item.status === 'in_progress');
+    const extra = todos.filter(item => item.status === 'in_progress').length;
+    const head = `${done}/${todos.length} 完成`;
+    if (active === undefined)
+        return head;
+    return extra > 1 ? `${head} · ${active.content} +${extra - 1}` : `${head} · ${active.content}`;
+}
+/** Compact ask_user_question summary from tool arguments. */
+export function askSummary(value) {
+    const root = typeof value === 'string' ? parseJsonArgs(value) : value;
+    const questions = root !== null && typeof root === 'object' && !Array.isArray(root)
+        ? root.questions
+        : undefined;
+    if (!Array.isArray(questions) || questions.length === 0)
+        return '等待回答';
+    const first = questions[0];
+    const text = typeof first === 'object' && first !== null && typeof first.question === 'string'
+        ? first.question
+        : '等待回答';
+    return questions.length > 1 ? `${text}（${questions.length} 题）` : text;
+}
+/** One-line subagent card header used while collapsed. */
+export function subagentHeaderText(row, now = Date.now()) {
+    const elapsed = Math.max(0, Math.floor(((row.endedAt ?? now) - row.startedAt) / 1000));
+    const elapsedLabel = elapsed >= 60 ? `${Math.floor(elapsed / 60)}m${elapsed % 60}s` : `${elapsed}s`;
+    const state = row.status === 'running'
+        ? '运行中'
+        : row.status === 'ok'
+            ? '完成'
+            : row.status === 'aborted'
+                ? '已中断'
+                : '失败';
+    const activity = row.lastActivity === '' ? '' : ` · ${row.lastActivity}`;
+    const id = row.sessionId.slice(0, 8);
+    return `${row.label}  [${id}]  ${state} · ${elapsedLabel}${activity}`;
+}
+function appendSubagentLog(row, entry) {
+    row.logs.push(entry);
+    if (row.logs.length > MAX_SUBAGENT_LOGS)
+        row.logs.splice(0, row.logs.length - MAX_SUBAGENT_LOGS);
+    row.lastActivity = entry.text;
+}
+function planReviewOf(question) {
+    return question.intent?.kind === 'plan-review' && question.detail !== undefined && question.detail !== '';
+}
 /** Derive the intended file change from a mutation tool's arguments. */
 function diffHunksFromArgs(name, argsRaw) {
     const args = parseJsonArgs(argsRaw);
@@ -899,6 +997,22 @@ export function presentToolCall(name, args) {
             ...diff === null || diff === undefined ? {} : { diff },
         };
     }
+    if (SUBAGENT_TOOL_NAMES.has(name)) {
+        const description = typeof parsed?.description === 'string' ? parsed.description.trim() : '';
+        return {
+            title: name === 'subagent_fork' ? '子代理 fork' : '子代理',
+            summary: description === '' ? friendlyArgsSummary(name, args) : description,
+        };
+    }
+    if (name === 'todo_write' || name === 'todo') {
+        return { title: '计划', summary: todoSummary(parsed) };
+    }
+    if (name === 'ask_user_question') {
+        return { title: '提问用户', summary: askSummary(parsed) };
+    }
+    if (name === 'exit_plan_mode') {
+        return { title: '退出计划模式', summary: '等待确认计划' };
+    }
     return { title: name, summary: friendlyArgsSummary(name, args) };
 }
 /** Validate a tool/result meta payload's structured diff, mirroring the web card. */
@@ -1234,7 +1348,7 @@ export class SshTui {
         this.useAlternateScreen = process.env.DSH_TUI_NO_ALT_SCREEN !== '1' && process.env.DSH_TUI_NO_ALT_SCREEN !== 'true';
         this.pushRow({ kind: 'brand-logo' });
         this.pushRow({ kind: 'system', text: 'DeepSeek Harness — SSH TUI' });
-        this.pushRow({ kind: 'system', text: 'Type /help for commands · /setup provider & key · ↑/↓ select · Enter expand/collapse · Ctrl+T fold input · Esc cancels' });
+        this.pushRow({ kind: 'system', text: '输入 /help 查看命令 · /setup 配置提供商 · ↑/↓ 选择卡片 · Enter 展开/折叠 · Ctrl+R 全部展开/收起 · Ctrl+T 折叠输入 · Esc 取消' });
     }
     /** Enter raw mode, switch to the alternate screen, and start listening. */
     start() {
@@ -1258,9 +1372,12 @@ export class SshTui {
             const now = Date.now();
             if (this.agent.status === 'running')
                 this.updateTerminalTitle();
-            if (this.streaming !== undefined
-                && this.streaming.reasoning !== ''
-                && now - this.lastPaintAt >= 200) {
+            const animating = (this.streaming !== undefined && this.streaming.reasoning !== '')
+                || this.activeSubagents.size > 0
+                || 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) {
                 this.dirty = true;
             }
             // While a turn is waiting on the provider with no new events, repaint at
@@ -1324,7 +1441,7 @@ export class SshTui {
                     const content = await readFile(credentialFile, 'utf8');
                     if (this.disposed)
                         return;
-                    stored = new RegExp(`^${envRef}\\s*:\\s*\\S`, 'm').test(content);
+                    stored = new RegExp(`^${escapeRegex(envRef)}\\s*:\\s*\\S`, 'm').test(content);
                 }
             }
             catch {
@@ -1484,13 +1601,60 @@ export class SshTui {
     }
     /** The transcript rows that support per-row expand/collapse. */
     collapsibleRows() {
-        const rows = this.rows.filter((row) => row.kind === 'reasoning' || row.kind === 'tool');
+        const rows = this.rows.filter((row) => row.kind === 'reasoning'
+            || row.kind === 'tool'
+            || row.kind === 'subagent'
+            || row.kind === 'plan'
+            || row.kind === 'question'
+            || row.kind === 'goal');
         if (this.streaming !== undefined && this.streaming.reasoning !== '') {
             this.streamingReasoning ??= { kind: 'streaming-reasoning', expanded: false };
             rows.push(this.streamingReasoning);
         }
         return rows;
     }
+    spinnerFrame(periodMs = 120) {
+        return SPINNER[Math.floor(Date.now() / periodMs) % SPINNER.length] ?? '⠋';
+    }
+    findSubagentRow(sessionId) {
+        return this.rows.findLast((row) => row.kind === 'subagent' && row.sessionId === sessionId);
+    }
+    findLivePlanRow() {
+        return this.rows.findLast((row) => row.kind === 'plan');
+    }
+    upsertPlanRow(patch) {
+        const existing = this.findLivePlanRow();
+        if (existing !== undefined) {
+            Object.assign(existing, patch);
+            return existing;
+        }
+        const row = {
+            kind: 'plan',
+            active: patch.active ?? false,
+            pending: patch.pending ?? false,
+            todos: patch.todos ?? [],
+            expanded: false,
+        };
+        this.pushRow(row);
+        return row;
+    }
+    paintCollapsibleHeader(addDisplay, row, kind, header, width, colorize) {
+        const focused = this.focusedRow === row;
+        const marker = row.expanded ? '▾' : '▸';
+        const prefix = focused ? '▶ ' : '  ';
+        const plain = `${prefix}${marker} ${header}`;
+        const paint = colorize ?? ((line) => this.styleLine(kind, line));
+        if (!row.expanded) {
+            const collapsed = truncateToWidth(plain, Math.max(1, width - 2));
+            const styled = paint(collapsed);
+            addDisplay(focused && this.color ? `\x1b[7m${styled}\x1b[27m` : styled, row);
+            return;
+        }
+        for (const wrapped of wrap(plain, width)) {
+            const styled = paint(wrapped);
+            addDisplay(focused && this.color ? `\x1b[7m${styled}\x1b[27m` : styled, row);
+        }
+    }
     /** Move the expand/collapse focus among reasoning and tool rows. */
     moveCollapsibleFocus(delta) {
         const rows = this.collapsibleRows();
@@ -1598,6 +1762,7 @@ export class SshTui {
                         return this.styleLine('tool', line);
                     return `${this.styleLine('tool', line.slice(0, dotIndex))}\x1b[${dotColor}m●${this.styleLine('tool', line.slice(dotIndex + 1))}`;
                 };
+                const spinner = running ? ` ${this.spinnerFrame()}` : '';
                 const state = running ? 'running…' : ok ? 'ok' : 'error';
                 const summary = row.summary === '' ? '' : `  ${row.summary}`;
                 const exit = !running && row.command !== undefined
@@ -1609,7 +1774,7 @@ export class SshTui {
                     : '';
                 const focused = this.focusedRow === row;
                 const marker = row.expanded ? '▾' : '▸';
-                const plainHeader = `${marker} ● ${row.title}${summary}  [${state}]${exit}`;
+                const plainHeader = `${marker} ● ${row.title}${summary}  [${state}]${exit}${spinner}`;
                 if (!row.expanded) {
                     const collapsed = truncateToWidth(`${focused ? '▶ ' : '  '}${plainHeader}`, Math.max(1, width - 2));
                     const styled = styleToolHeader(collapsed);
@@ -1626,6 +1791,116 @@ export class SshTui {
                 }
                 continue;
             }
+            if (row.kind === 'subagent') {
+                const running = row.status === 'running';
+                const ok = row.status === 'ok';
+                const dotColor = !this.color ? undefined : running ? '33' : ok ? '32' : '31';
+                const styleHeader = (line) => {
+                    const dotIndex = line.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))}`;
+                };
+                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 ? '' : ' · 外部进程'}`));
+                    if (row.stopReason !== undefined) {
+                        addDisplay(this.styleLine('tool-result', `  结束原因：${row.stopReason}`));
+                    }
+                    if (row.logs.length === 0) {
+                        addDisplay(this.styleLine('tool-result', running ? '  等待子代理输出…' : '  没有可见输出'));
+                    }
+                    else {
+                        for (const entry of row.logs) {
+                            const kind = entry.kind === 'assistant'
+                                ? 'assistant'
+                                : entry.kind === 'result' && row.status === 'error'
+                                    ? 'error'
+                                    : 'tool-result';
+                            for (const wrapped of wrap(entry.text, Math.max(1, width - 2))) {
+                                addDisplay(this.styleLine(kind, `  ${wrapped}`));
+                            }
+                        }
+                    }
+                }
+                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 (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', '  还没有任务列表'));
+                    }
+                    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}`));
+                            }
+                        }
+                    }
+                }
+                continue;
+            }
+            if (row.kind === 'question') {
+                const waiting = row.status === 'waiting';
+                const spinner = waiting ? ` ${this.spinnerFrame()}` : '';
+                const state = waiting ? '等待回答' : row.status === 'answered' ? '已回答' : '已取消';
+                const title = row.intent === 'plan-review' ? '计划待审' : '提问用户';
+                const header = `● ${title}${spinner} · ${state} · ${row.summary}${row.expanded ? '' : ' · Enter 展开'}`;
+                this.paintCollapsibleHeader(addDisplay, row, waiting ? 'tool' : 'system', header, width);
+                if (row.expanded) {
+                    if (row.header !== undefined)
+                        addDisplay(this.styleLine('system', `  ${row.header}`));
+                    for (const wrapped of wrap(row.title, Math.max(1, width - 2))) {
+                        addDisplay(this.styleLine('assistant', `  ${wrapped}`));
+                    }
+                    if (row.detail !== undefined && row.detail !== '') {
+                        for (const wrapped of wrap(row.detail, Math.max(1, width - 2))) {
+                            addDisplay(this.styleLine('tool-result', `  ${wrapped}`));
+                        }
+                    }
+                    addDisplay(this.styleLine('system', waiting
+                        ? '  用下方对话框选择，数字/字母选中，Enter 提交，Esc 取消。'
+                        : `  ${row.summary}`));
+                }
+                continue;
+            }
+            if (row.kind === 'goal') {
+                const live = row.phase === 'active' || row.phase === 'blocked';
+                const spinner = live ? ` ${this.spinnerFrame()}` : '';
+                const phase = row.phase === 'active' ? '进行中'
+                    : row.phase === 'paused' ? '已暂停'
+                        : row.phase === 'blocked' ? '受阻'
+                            : row.phase === 'complete' ? '已完成'
+                                : '已清除';
+                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 查看、暂停、恢复或清除当前目标。'));
+                    if (row.blockedReason !== undefined) {
+                        for (const wrapped of wrap(row.blockedReason, Math.max(1, width - 2))) {
+                            addDisplay(this.styleLine('error', `  ${wrapped}`));
+                        }
+                    }
+                }
+                continue;
+            }
             pushRow(row.kind, row.text);
         }
         if (this.streaming !== undefined) {
@@ -1705,7 +1980,9 @@ export class SshTui {
                         case 'models':
                             addDialog(`提供商：${providerLabel}`);
                             addDialog('模型 ID（多个用逗号或空格分隔）：');
-                            addDialog(`  默认：${template.defaultModels.join(', ')}`);
+                            addDialog(ob.models.length > 0
+                                ? `  已获取（${ob.models.length}）：${formatModelList(ob.models, 6)}`
+                                : `  默认：${template.defaultModels.join(', ')}`);
                             if (template.api !== undefined)
                                 addDialog('  Ctrl+F = 从端点获取模型列表');
                             addDialog('  Enter 确认，Esc 取消');
@@ -1716,7 +1993,7 @@ export class SshTui {
                             addDialog(`  Provider ID: ${ob.providerId}`);
                             addDialog(`  Base URL: ${ob.baseUrl === '' ? (template.defaultBaseUrl || '(默认)') : ob.baseUrl}`);
                             addDialog(`  API 协议: ${template.api ?? 'deepseek-official'}`);
-                            addDialog(`  模型: ${ob.models.join(', ')}`);
+                            addDialog(`  模型: ${formatModelList(ob.models, 8)}`);
                             addDialog(`  API Key:  ${sliceCodePoints(ob.key, 6)}…${lastCodePoints(ob.key, 4)}（长度 ${ob.key.length}）`);
                             addDialog('  y = 保存, n = 重填, Esc = 取消');
                             break;
@@ -1725,21 +2002,35 @@ export class SshTui {
             }
             else {
                 const d = this.dialog;
-                addDialog(`Question ${d.index + 1}/${d.total}: ${d.question.question}`);
-                if (d.question.detail !== undefined && d.question.detail !== '') {
-                    addDialog(truncate(d.question.detail, 6));
+                const review = planReviewOf(d.question);
+                if (review) {
+                    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));
+                    }
+                }
+                else {
+                    addDialog(`提问用户 ${d.index + 1}/${d.total}: ${d.question.question}`);
+                    if (d.question.header !== undefined && d.question.header !== '')
+                        addDialog(d.question.header);
+                    if (d.question.detail !== undefined && d.question.detail !== '') {
+                        addDialog(truncate(d.question.detail, 6));
+                    }
                 }
                 const options = d.question.options ?? [];
+                const approve = d.question.intent?.approve;
                 for (const [index, option] of options.entries()) {
                     const marker = d.selected.has(index) ? '●' : '○';
                     const key = QUESTION_OPTION_KEYS[index] ?? '?';
+                    const recommended = option.label === approve ? '（推荐）' : '';
                     const extra = option.description === undefined ? '' : ` — ${option.description}`;
-                    addDialog(`  ${key} ${marker} ${option.label}${extra}`);
+                    addDialog(`  ${key} ${marker} ${option.label}${recommended}${extra}`);
                 }
                 if (options.length === 0) {
-                    addDialog('  (free text: type below and press Enter)');
+                    addDialog('  （自由输入：在下方输入后按 Enter）');
                 }
-                addDialog(`  ${d.question.multiSelect === true ? 'digits/letters toggle, Enter submit' : 'digit/letter to select, Enter submit'}, Esc to cancel`);
+                addDialog(`  ${d.question.multiSelect === true ? '数字/字母切换，Enter 提交' : '数字/字母选择，Enter 提交'}，Esc 取消`);
             }
         }
         const fitLine = (text) => truncateToWidth(text, Math.max(1, width));
@@ -1848,8 +2139,24 @@ export class SshTui {
         if (this.pendingMessages.size > 0)
             statusText += ` · 排队 ${this.pendingMessages.size}`;
         const idleMs = Date.now() - this.lastActivity;
-        if (this.agent.status === 'running' && this.activeSubagents.size > 0) {
-            statusText += ` · 子代理执行中 ${this.activeSubagents.size}`;
+        const livePlan = this.findLivePlanRow();
+        const waitingQuestions = this.rows.some(row => row.kind === 'question' && row.status === 'waiting');
+        if (waitingQuestions || this.dialog?.kind === 'questions') {
+            statusText += this.dialog?.kind === 'questions' && planReviewOf(this.dialog.question)
+                ? ' · 计划待审'
+                : ' · 等待用户回答';
+        }
+        else if (livePlan?.active === true || livePlan?.pending === true) {
+            statusText += livePlan.pending ? ' · 计划模式切换中' : ' · 计划模式';
+        }
+        const liveGoal = this.rows.findLast((row) => row.kind === 'goal');
+        if (liveGoal !== undefined && (liveGoal.phase === 'active' || liveGoal.phase === 'paused' || liveGoal.phase === 'blocked')) {
+            const phase = liveGoal.phase === 'active' ? '目标进行中' : liveGoal.phase === 'paused' ? '目标已暂停' : '目标受阻';
+            statusText += ` · ${phase}`;
+        }
+        if (this.activeSubagents.size > 0) {
+            const spinner = this.spinnerFrame(160);
+            statusText += ` · ${spinner} 子代理 ${this.activeSubagents.size}`;
         }
         else if (this.agent.status === 'running' && this.openToolCalls.size > 0) {
             statusText += ` · 工具执行中 ${this.openToolCalls.size}`;
@@ -1885,6 +2192,9 @@ export class SshTui {
             this.pendingMessages.size,
             this.commandSuggestions.length,
             this.suggestionIndex,
+            this.activeSubagents.size,
+            this.dialog?.kind ?? '',
+            this.findLivePlanRow()?.active === true ? 'plan' : '',
         ].join('\x1f');
         const chromeChanged = chromeKey !== this.lastChromeKey;
         // Incremental repaint: rewrite only rows whose content changed, so slow
@@ -1914,7 +2224,7 @@ export class SshTui {
         const prefix = input.slice(1).toLowerCase();
         const dsh = (this.ctx.get('commands')?.list(this.agent) ?? []).map(command => ({
             name: command.name,
-            description: command.description,
+            description: command.input?.images === true ? `${command.description}（可附图）` : command.description,
             local: false,
         }));
         const all = [
@@ -2004,10 +2314,25 @@ export class SshTui {
             this.lastTitleUpdateAt = now;
             const spinner = SPINNER[Math.floor(now / 800) % SPINNER.length];
             let detail = '运行中';
-            if (this.openToolCalls.size > 0)
-                detail = `运行中 · 工具 ${this.openToolCalls.size}`;
-            else if (this.activeSubagents.size > 0)
+            if (this.dialog?.kind === 'questions') {
+                detail = planReviewOf(this.dialog.question) ? '计划待审' : '等待用户回答';
+            }
+            else if (this.activeSubagents.size > 0) {
                 detail = `运行中 · 子代理 ${this.activeSubagents.size}`;
+            }
+            else if (this.openToolCalls.size > 0) {
+                detail = `运行中 · 工具 ${this.openToolCalls.size}`;
+            }
+            else if (this.findLivePlanRow()?.active === true) {
+                detail = '计划模式';
+            }
+            else {
+                const liveGoal = this.rows.findLast((row) => row.kind === 'goal');
+                if (liveGoal?.phase === 'active')
+                    detail = '目标进行中';
+                else if (liveGoal?.phase === 'blocked')
+                    detail = '目标受阻';
+            }
             this.write(`\x1b]0;dsh ${spinner} ${detail}\x07`);
             return;
         }
@@ -2158,14 +2483,20 @@ export class SshTui {
                     this.recordUsage(event.data.turn, event.data.step, event.data.usage);
                 }
                 const reasoningExpanded = this.streamingReasoning?.expanded ?? false;
+                const interrupted = event.data.interrupted === true;
                 this.streaming = undefined;
                 this.streamingReasoning = undefined;
                 this.thinkingStartedAt = undefined;
+                const interruptedMark = interrupted ? ' ⚠ 已中断' : '';
                 if (reasoning !== '') {
-                    this.pushRow({ kind: 'reasoning', text: reasoning, expanded: reasoningExpanded });
+                    this.pushRow({ kind: 'reasoning', text: `${reasoning}${interruptedMark}`, expanded: reasoningExpanded });
+                }
+                if (text !== '') {
+                    this.pushRow({ kind: 'assistant', text: `${text}${interruptedMark}` });
+                }
+                else if (interrupted && reasoning === '') {
+                    this.pushRow({ kind: 'system', text: '本轮输出已中断，没有可见内容。' });
                 }
-                if (text !== '')
-                    this.pushRow({ kind: 'assistant', text });
                 this.markDirty();
                 break;
             }
@@ -2185,7 +2516,7 @@ export class SshTui {
                     ...present.command === undefined ? {} : { command: present.command },
                     ...present.cwd === undefined ? {} : { cwd: present.cwd },
                     ...present.diff === undefined ? {} : { diff: present.diff },
-                    expanded: DIFF_TOOL_NAMES.has(event.data.name),
+                    expanded: DIFF_TOOL_NAMES.has(event.data.name) && !SUBAGENT_TOOL_NAMES.has(event.data.name),
                 };
                 this.pushRow(row);
                 this.streaming = undefined;
@@ -2298,7 +2629,13 @@ export class SshTui {
                 this.markDirty();
                 break;
             }
+            case 'todo/write': {
+                this.upsertPlanRow({ todos: parsePlanTodos(event.data.todos) });
+                this.markDirty();
+                break;
+            }
             default:
+                this.handleExtensionEvent(event);
                 break;
         }
     };
@@ -2308,6 +2645,7 @@ export class SshTui {
         this.lastActivity = Date.now();
         if (status === 'running') {
             this.completionSignaled = false;
+            this.completedAt = 0;
         }
         else if (!this.completionSignaled && this.status === 'running') {
             this.completionSignaled = true;
@@ -2345,56 +2683,187 @@ export class SshTui {
         this.status = 'disposed';
         this.markDirty();
     };
-    /** Render a live subagent's own session events so its progress is visible. */
+    /** Plan-mode / command / team events that plugins merge into SessionEventMap. */
+    handleExtensionEvent(event) {
+        const type = String(event.type);
+        const data = event.data;
+        if (type === 'plan/mode') {
+            const active = data?.active === true;
+            this.upsertPlanRow({ active, pending: false });
+            this.pushRow({
+                kind: 'system',
+                text: active
+                    ? '已进入计划模式：先规划、等确认后再改代码。可用 /plan off 退出。'
+                    : '已退出计划模式，可以继续执行改动。',
+            });
+            this.markDirty();
+            return;
+        }
+        if (type === 'command/run' && data?.name === 'plan') {
+            const args = String(data.args ?? '').trim();
+            const wantsActive = args !== 'off';
+            const current = this.findLivePlanRow();
+            this.upsertPlanRow({
+                pending: current !== undefined && current.active !== wantsActive,
+                active: current?.active ?? false,
+            });
+            this.pushRow({
+                kind: 'system',
+                text: wantsActive ? '已请求进入计划模式。' : '已请求退出计划模式。',
+            });
+            this.markDirty();
+            return;
+        }
+        if (type === 'goal/change') {
+            this.handleGoalChange(data);
+            return;
+        }
+        if (type.startsWith('team/')) {
+            this.pushRow({ kind: 'system', text: `[团队] ${type}` });
+            this.markDirty();
+        }
+    }
+    handleGoalChange(data) {
+        const payload = data !== null && typeof data === 'object' ? data : {};
+        const existing = this.rows.findLast((row) => row.kind === 'goal');
+        if (payload.operation === 'clear') {
+            if (existing !== undefined) {
+                existing.phase = 'cleared';
+                existing.blockedReason = undefined;
+            }
+            else {
+                this.pushRow({ kind: 'goal', objective: '（已清除）', phase: 'cleared', expanded: false });
+            }
+            this.pushRow({ kind: 'system', text: '当前目标已清除。' });
+            this.markDirty();
+            return;
+        }
+        const goal = payload.goal !== null && typeof payload.goal === 'object' ? payload.goal : {};
+        const objective = typeof goal.objective === 'string' && goal.objective.trim() !== '' ? goal.objective.trim() : '（未命名目标）';
+        const phase = goal.phase === 'paused' || goal.phase === 'blocked' || goal.phase === 'complete' ? goal.phase : 'active';
+        const blocked = goal.blockedReason !== null && typeof goal.blockedReason === 'object'
+            ? goal.blockedReason.message
+            : undefined;
+        const blockedReason = typeof blocked === 'string' ? blocked : undefined;
+        if (existing !== undefined) {
+            existing.objective = objective;
+            existing.phase = phase;
+            existing.blockedReason = blockedReason;
+        }
+        else {
+            this.pushRow({
+                kind: 'goal',
+                objective,
+                phase,
+                ...(blockedReason === undefined ? {} : { blockedReason }),
+                expanded: false,
+            });
+        }
+        const notice = phase === 'active' ? '已设置目标'
+            : phase === 'paused' ? '目标已暂停'
+                : phase === 'blocked' ? '目标受阻'
+                    : '目标已完成';
+        this.pushRow({ kind: 'system', text: `${notice}：${objective}` });
+        this.markDirty();
+    }
+    handleSubagentExtensionEvent(row, event) {
+        const type = String(event.type);
+        const data = event.data;
+        if (type === 'plan/mode') {
+            appendSubagentLog(row, {
+                kind: 'system',
+                text: data?.active === true ? '进入计划模式' : '退出计划模式',
+            });
+            return;
+        }
+        if (type.startsWith('team/')) {
+            appendSubagentLog(row, { kind: 'team', text: `[团队] ${type}` });
+        }
+    }
+    /** Fold a live subagent's own session events into that child's card. */
     handleSubagentSessionEvent = (sessionId, event) => {
-        const label = `[子代理 ${String(sessionId).slice(0, 8)}]`;
+        const row = this.findSubagentRow(String(sessionId));
+        if (row === undefined)
+            return;
         switch (event.type) {
             case 'user/message': {
                 const text = collectText(event.data.content);
                 if (text !== '')
-                    this.pushRow({ kind: 'system', text: `${label} ❯ ${truncate(text, 6)}` });
+                    appendSubagentLog(row, { kind: 'user', text: `❯ ${truncate(text, 4)}` });
                 break;
             }
-            case 'assistant/chunk': {
-                // Child chunks are coalesced into assistant/message to avoid flooding.
+            case 'assistant/chunk':
                 break;
-            }
             case 'assistant/message': {
                 const text = collectText(event.data.message.content);
                 if (text !== '')
-                    this.pushRow({ kind: 'assistant', text: `${label} ${truncate(text, 12)}` });
+                    appendSubagentLog(row, { kind: 'assistant', text: truncate(text, 8) });
                 break;
             }
-            case 'tool/call':
-                this.pushRow({ kind: 'system', text: `${label} ▶ ${event.data.name} ${sliceCodePoints(event.data.arguments, 160)}` });
+            case 'tool/call': {
+                const present = presentToolCall(event.data.name, event.data.arguments);
+                appendSubagentLog(row, { kind: 'tool', text: `▶ ${present.title} ${present.summary}` });
                 break;
+            }
             case 'tool/result': {
-                const output = truncate(collectText(event.data.message.content), 4);
-                const ok = event.data.error === undefined && !event.data.message.content[0]?.isError;
-                this.pushRow({ kind: 'system', text: `${label} ${ok ? '✓' : '✗'} ${event.data.message.source.callId}${output === '' ? '' : `\n  ${output}`}` });
+                const output = truncate(collectText(event.data.message.content), 3);
+                const ok = event.data.error === undefined && event.data.message.content[0]?.isError !== true;
+                appendSubagentLog(row, {
+                    kind: 'result',
+                    text: `${ok ? '✓' : '✗'} ${event.data.message.source.callId}${output === '' ? '' : ` · ${output}`}`,
+                });
                 break;
             }
             case 'turn/end':
-                this.pushRow({ kind: 'system', text: `${label} 轮次结束（${event.data.reason.kind}）` });
+                appendSubagentLog(row, { kind: 'turn', text: `轮次结束（${event.data.reason.kind}）` });
                 break;
             case 'approval/asked':
-                this.pushRow({ kind: 'system', text: `${label} 等待审批：${event.data.toolName}` });
+                appendSubagentLog(row, { kind: 'approval', text: `等待审批：${event.data.toolName}` });
                 break;
             default:
+                this.handleSubagentExtensionEvent(row, event);
                 break;
         }
         this.lastActivity = Date.now();
         this.markDirty();
     };
     handleSubagentStart = (info) => {
+        const sessionId = String(info.id);
         this.activeSubagents.set(String(info.runId), {
-            id: String(info.id),
+            id: sessionId,
             provider: info.provider,
             startedAt: Date.now(),
         });
-        this.subagentSessions.add(String(info.id));
+        this.subagentSessions.add(sessionId);
         this.lastActivity = Date.now();
-        this.pushRow({ kind: 'system', text: `▶ 子代理 ${info.id} 已启动（${info.provider}${info.local ? '' : '，外部进程'}）` });
+        const existing = this.findSubagentRow(sessionId);
+        if (existing !== undefined) {
+            existing.runId = String(info.runId);
+            existing.provider = info.provider;
+            existing.local = info.local;
+            existing.status = 'running';
+            existing.startedAt = Date.now();
+            existing.endedAt = undefined;
+            existing.stopReason = undefined;
+            existing.lastActivity = '已启动';
+            existing.expanded = false;
+            appendSubagentLog(existing, { kind: 'system', text: `已启动（${info.provider}${info.local ? '' : '，外部进程'}）` });
+        }
+        else {
+            this.pushRow({
+                kind: 'subagent',
+                sessionId,
+                runId: String(info.runId),
+                provider: info.provider,
+                local: info.local,
+                label: `子代理 ${info.provider}`,
+                status: 'running',
+                startedAt: Date.now(),
+                lastActivity: '已启动',
+                logs: [{ kind: 'system', text: `已启动（${info.provider}${info.local ? '' : '，外部进程'}）` }],
+                expanded: false,
+            });
+        }
         this.markDirty();
     };
     handleSubagentEnd = (info) => {
@@ -2404,10 +2873,34 @@ export class SshTui {
         const output = info.lastAssistantMessage === undefined
             ? ''
             : truncate(collectText(info.lastAssistantMessage), 6);
-        this.pushRow({
-            kind: 'system',
-            text: `✓ 子代理 ${info.id} 结束（${info.stopReason}）${output === '' ? '' : `\n  ${output}`}`,
-        });
+        const row = this.findSubagentRow(String(info.id)) ?? this.rows.findLast((candidate) => candidate.kind === 'subagent' && candidate.runId === String(info.runId));
+        const failed = info.stopReason !== 'completed';
+        if (row !== undefined) {
+            row.status = info.stopReason === 'aborted' ? 'aborted' : failed ? 'error' : 'ok';
+            row.endedAt = Date.now();
+            row.stopReason = info.stopReason;
+            appendSubagentLog(row, {
+                kind: failed ? 'result' : 'assistant',
+                text: `结束（${info.stopReason}）${output === '' ? '' : ` · ${output}`}`,
+            });
+        }
+        else {
+            this.pushRow({
+                kind: 'subagent',
+                sessionId: String(info.id),
+                runId: String(info.runId),
+                provider: info.provider,
+                local: info.local,
+                label: `子代理 ${info.provider}`,
+                status: info.stopReason === 'aborted' ? 'aborted' : failed ? 'error' : 'ok',
+                startedAt: Date.now(),
+                endedAt: Date.now(),
+                stopReason: info.stopReason,
+                lastActivity: `结束（${info.stopReason}）`,
+                logs: [{ kind: 'system', text: `结束（${info.stopReason}）${output === '' ? '' : ` · ${output}`}` }],
+                expanded: false,
+            });
+        }
         this.markDirty();
     };
     // ── approval and questions ──────────────────────────────────────────────
@@ -2438,38 +2931,77 @@ export class SshTui {
         const agentLabel = request.agent === undefined || request.agent.id === this.agent.id
             ? undefined
             : `子代理 ${request.agent.id}`;
-        for (const [index, question] of request.questions.entries()) {
-            const answer = await new Promise((resolve, reject) => {
-                const fail = (error) => {
-                    request.signal?.removeEventListener('abort', onAbort);
-                    reject(error);
-                };
-                const onAbort = () => {
-                    request.signal?.removeEventListener('abort', onAbort);
-                    if (dialog !== undefined) {
-                        dialog.reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
-                    }
-                    else {
-                        reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
+        const cards = [];
+        for (const question of request.questions) {
+            const card = {
+                kind: 'question',
+                questionId: question.id,
+                title: question.question,
+                ...(question.header === undefined ? {} : { header: question.header }),
+                ...(question.detail === undefined ? {} : { detail: question.detail }),
+                intent: planReviewOf(question) ? 'plan-review' : 'ask',
+                status: 'waiting',
+                summary: question.question,
+                expanded: false,
+            };
+            cards.push(card);
+            this.pushRow(card);
+        }
+        this.markDirty();
+        const settleCards = (status, summary) => {
+            for (const card of cards) {
+                if (card.status === 'waiting') {
+                    card.status = status;
+                    card.summary = summary;
+                }
+            }
+        };
+        try {
+            for (const [index, question] of request.questions.entries()) {
+                const answer = await new Promise((resolve, reject) => {
+                    const fail = (error) => {
+                        request.signal?.removeEventListener('abort', onAbort);
+                        reject(error);
+                    };
+                    const onAbort = () => {
+                        request.signal?.removeEventListener('abort', onAbort);
+                        if (dialog !== undefined) {
+                            dialog.reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
+                        }
+                        else {
+                            reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
+                        }
+                    };
+                    let dialog;
+                    request.signal?.addEventListener('abort', onAbort, { once: true });
+                    if (request.signal?.aborted === true) {
+                        onAbort();
+                        return;
                     }
-                };
-                let dialog;
-                request.signal?.addEventListener('abort', onAbort, { once: true });
-                if (request.signal?.aborted === true) {
-                    onAbort();
-                    return;
+                    const labeled = agentLabel === undefined
+                        ? question
+                        : { ...question, question: `[${agentLabel}] ${question.question}` };
+                    dialog = this.openQuestion(labeled, index, request.questions.length, (selection) => {
+                        request.signal?.removeEventListener('abort', onAbort);
+                        resolve(selection);
+                    }, fail);
+                });
+                answers.push({ id: question.id, selected: answer.selected, custom: answer.custom });
+                const card = cards[index];
+                if (card !== undefined) {
+                    card.status = 'answered';
+                    card.summary = answer.custom !== undefined && answer.custom !== ''
+                        ? answer.custom
+                        : answer.selected.join(', ') || '已回答';
                 }
-                const labeled = agentLabel === undefined
-                    ? question
-                    : { ...question, question: `[${agentLabel}] ${question.question}` };
-                dialog = this.openQuestion(labeled, index, request.questions.length, (selection) => {
-                    request.signal?.removeEventListener('abort', onAbort);
-                    resolve(selection);
-                }, fail);
-            });
-            answers.push({ id: question.id, selected: answer.selected, custom: answer.custom });
+            }
+            settleCards('answered', '已回答');
+            return { answers };
+        }
+        catch (error) {
+            settleCards('cancelled', error instanceof UserQuestionError ? error.message : '已取消');
+            throw error;
         }
-        return { answers };
     };
     /** Queue one dialog behind an already-open one instead of overwriting it. */
     openDialog(dialog) {
@@ -2623,9 +3155,13 @@ export class SshTui {
         }
         if (ids.has(modelId))
             return true;
+        const modelEntry = { id: modelId };
+        const reasoningEfforts = reasoningEffortsForDefault(profile.reasoning);
+        if (reasoningEfforts !== undefined)
+            modelEntry.reasoningEfforts = reasoningEfforts;
         try {
             await settings.mutate(settingsNamespace('llm-pi-ai'), [
-                { op: 'set', path: ['providers', provider, 'models'], value: [...models, { id: modelId }] },
+                { op: 'set', path: ['providers', provider, 'models'], value: [...models, modelEntry] },
             ]);
             this.pushRow({ kind: 'system', text: `模型 ${modelId} 已加入提供商 ${provider} 的配置。` });
             this.markDirty();
@@ -2758,17 +3294,21 @@ export class SshTui {
             effortOptions = [];
         }
         if (effortOptions.length === 0) {
-            effortOptions = ['off', 'high', 'max'].map(id => ({ id, label: id }));
+            // No selectable reasoning effort for this model: do not invent
+            // `off/high/max`, which the adapter may reject for the exact model.
+        }
+        let effort;
+        if (effortOptions.length > 0) {
+            const effortAnswer = await this.askQuestion({
+                id: 'effort-pick',
+                question: `选择思考强度（${selected.id}）`,
+                options: effortOptions.map(option => ({
+                    label: option.label,
+                    description: option.id === String(current?.reasoningEffort) ? '当前' : undefined,
+                })),
+            });
+            effort = effortOptions.find(option => option.label === effortAnswer.selected[0])?.id;
         }
-        const effortAnswer = await this.askQuestion({
-            id: 'effort-pick',
-            question: `选择思考强度（${selected.id}）`,
-            options: effortOptions.map(option => ({
-                label: option.label,
-                description: option.id === String(current?.reasoningEffort) ? '当前' : undefined,
-            })),
-        });
-        const effort = effortOptions.find(option => option.label === effortAnswer.selected[0])?.id;
         const next = {
             provider,
             model: selected.id,
@@ -2778,7 +3318,10 @@ export class SshTui {
             this.selectionRef.current = next;
         this.onSelectionChanged?.(next);
         await this.ctx.get('agentDefaultModel')?.saveSelection(next);
-        this.pushRow({ kind: 'system', text: `模型已切换：${selected.id}（思考强度 ${effort ?? '默认'}）；下一步请求生效。` });
+        this.pushRow({
+            kind: 'system',
+            text: `模型已切换：${selected.id}（思考强度 ${effort ?? '默认'}${effortOptions.length === 0 ? '，该模型未声明可选强度' : ''}）；下一步请求生效。`,
+        });
         this.markDirty();
     }
     /** Provider route the next subagent request should use. */
@@ -2885,8 +3428,13 @@ export class SshTui {
         catch {
             effortOptions = [];
         }
-        if (effortOptions.length === 0) {
-            effortOptions = ['off', 'high', 'max'].map(id => ({ id, label: id }));
+        if (effortOptions.length === 0 && current.reasoningEffort === undefined) {
+            this.pushRow({
+                kind: 'system',
+                text: `模型 ${provider}/${current.model} 未声明可选 reasoning effort，已保持提供商默认；请勿手动设置 high/max。`,
+            });
+            this.markDirty();
+            return;
         }
         const choices = [
             { id: undefined, label: SUBAGENT_DEFAULT_EFFORT_LABEL },
@@ -3657,7 +4205,7 @@ export class SshTui {
                 state.models = ids;
                 this.input = '';
                 this.cursor = 0;
-                this.pushRow({ kind: 'system', text: `已从端点获取 ${ids.length} 个模型（Enter 确认，也可继续修改）。` });
+                this.pushRow({ kind: 'system', text: `已从端点获取 ${ids.length} 个模型：${formatModelList(ids, 6)}（Enter 确认，也可继续修改）。` });
             }
         }
         catch (error) {
@@ -3709,12 +4257,18 @@ export class SshTui {
                 const defaultEffort = model !== undefined && llm !== undefined
                     ? await defaultReasoningEffort(llm, state.providerId, model)
                     : undefined;
+                const reasoningEfforts = defaultEffort === undefined
+                    ? undefined
+                    : { off: null, [defaultEffort]: defaultEffort };
                 const profile = {
                     displayName: template.label,
                     apiKeyEnv: envRef,
                     api: template.api,
                     baseURL: state.baseUrl === '' ? template.defaultBaseUrl : state.baseUrl,
-                    models: state.models.map(id => ({ id })),
+                    models: state.models.map(id => ({
+                        id,
+                        ...(reasoningEfforts === undefined ? {} : { reasoningEfforts }),
+                    })),
                     ...(defaultEffort === undefined ? {} : { reasoning: defaultEffort }),
                 };
                 if (settings === undefined) {
@@ -3786,7 +4340,6 @@ export class SshTui {
         const home = dshHomeDir();
         const file = join(home, IS_WINDOWS ? 'env.cmd' : 'env.sh');
         await mkdir(home, { recursive: true, mode: 0o700 });
-        const escapeRegex = (value) => value.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
         if (IS_WINDOWS) {
             let previous = '';
             try {
@@ -3844,6 +4397,8 @@ export class SshTui {
     }
     /** Idempotently source $DSH_HOME/env.sh from the user's POSIX shell rc files. */
     async ensurePosixEnvHook() {
+        if (process.env.DSH_TUI_NO_RC_HOOK === '1' || process.env.DSH_TUI_NO_RC_HOOK === 'true')
+            return;
         const envFile = join(dshHomeDir(), 'env.sh');
         const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
         const sourceLine = `[ -f ${quote(envFile)} ] && . ${quote(envFile)}`;
@@ -3988,14 +4543,16 @@ export class SshTui {
                     .filter(item => item.name !== 'help' && item.name !== 'exit')
                     .map(item => `/${item.name.padEnd(12)} ${item.description}`);
                 const dsh = (this.ctx.get('commands')?.list(this.agent) ?? [])
-                    .map(item => `/${item.name.padEnd(12)} ${item.description}  (dsh)`);
+                    .map(item => `/${item.name.padEnd(12)} ${item.description}${item.input?.images === true ? '（可附图）' : ''}  (dsh)`);
                 this.pushRow({
                     kind: 'system',
                     text: [
                         ...local,
                         ...dsh,
                         '',
-                        'Enter while running steers the agent; Esc or Ctrl+C cancels the turn.',
+                        '运行中按 Enter 可插入指示；Esc / Ctrl+C 取消当前轮次。',
+                        '↑/↓ 或 Ctrl+N/P 选择思考、工具、子代理、计划或提问卡片；Enter 展开/折叠；Ctrl+R 全部展开或收起。',
+                        '计划模式、提问用户和当前目标会显示独立卡片；多个子代理默认各自折叠，互不混排。',
                     ].join('\n'),
                 });
                 break;
@@ -4054,12 +4611,24 @@ export class SshTui {
                 this.streamingReasoning = undefined;
                 this.thinkingStartedAt = undefined;
                 this.focusedRow = null;
+                this.pushRow({ kind: 'system', text: '转录已清空。子代理、计划与提问卡片会在新事件到达时重新出现。' });
                 break;
             case 'status':
-                this.pushRow({
-                    kind: 'system',
-                    text: `session: ${this.agent.id}\nmodel: ${this.agent.options.model ?? 'default'}\nprovider: ${this.agent.options.provider ?? 'default'}\nstatus: ${this.agent.status}`,
-                });
+                {
+                    const plan = this.findLivePlanRow();
+                    const waiting = this.rows.filter(row => row.kind === 'question' && row.status === 'waiting').length;
+                    const lines = [
+                        `session: ${this.agent.id}`,
+                        `model: ${this.agent.options.model ?? 'default'}`,
+                        `provider: ${this.agent.options.provider ?? 'default'}`,
+                        `status: ${this.agent.status}`,
+                        `preset: ${this.presetName}`,
+                        `subagents: ${this.activeSubagents.size}`,
+                        `plan: ${plan === undefined ? 'off' : plan.pending ? 'pending' : plan.active ? 'on' : 'off'}`,
+                        waiting > 0 ? `questions: waiting ${waiting}` : 'questions: none',
+                    ];
+                    this.pushRow({ kind: 'system', text: lines.join('\n') });
+                }
                 break;
             case 'usage':
             case 'quota':
@@ -4069,12 +4638,43 @@ export class SshTui {
                 });
                 break;
             case 'subagents': {
+                const trimmed = arg.trim();
+                if (trimmed !== '' && trimmed !== 'list') {
+                    const [action, ...ids] = trimmed.split(/\s+/u);
+                    if (action === 'kill' || action === 'stop') {
+                        if (ids.length === 0) {
+                            this.pushRow({ kind: 'error', text: '/subagents kill <session-id> — 缺少子代理会话 ID' });
+                            break;
+                        }
+                        const subagents = this.ctx.get('subagents');
+                        if (subagents === undefined) {
+                            this.pushRow({ kind: 'error', text: 'subagents service is unavailable' });
+                            break;
+                        }
+                        const targets = ids.map(id => SessionId(id));
+                        void subagents.drainContinuableChildren(this.agent, targets).then(() => {
+                            this.pushRow({ kind: 'system', text: `已请求释放子代理：${ids.join(', ')}` });
+                            this.markDirty();
+                        }).catch((error) => {
+                            this.pushRow({ kind: 'error', text: `/subagents kill failed: ${errorChain(error)}` });
+                            this.markDirty();
+                        });
+                        break;
+                    }
+                    this.pushRow({ kind: 'error', text: `/subagents 未知操作 "${action}"（支持 list / kill <id>）` });
+                    break;
+                }
                 if (this.activeSubagents.size === 0) {
                     this.pushRow({ kind: 'system', text: '当前没有活动的子代理。' });
                 }
                 else {
-                    const lines = [...this.activeSubagents.entries()].map(([runId, sub]) => `▶ ${sub.id}（${sub.provider}）运行 ${Math.floor((Date.now() - sub.startedAt) / 1000)}s  [${runId.slice(0, 8)}]`);
-                    this.pushRow({ kind: 'system', text: lines.join('\n') });
+                    const lines = [...this.activeSubagents.entries()].map(([runId, sub]) => {
+                        const card = this.findSubagentRow(sub.id);
+                        const label = card?.label ?? sub.id;
+                        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 全部展开或收起。` });
                 }
                 break;
             }
@@ -4124,7 +4724,7 @@ export class SshTui {
                     this.commandAbort?.abort();
                     const controller = new AbortController();
                     this.commandAbort = controller;
-                    void commands.execute(this.agent, text, controller.signal).then((execution) => {
+                    void commands.execute(this.agent, text, [], controller.signal).then((execution) => {
                         if (execution === undefined) {
                             this.pushRow({ kind: 'error', text: `Unknown command: /${command} (try /help)` });
                             return;
@@ -4247,6 +4847,10 @@ export class SshTui {
 function optionsLength(dialog) {
     return dialog.kind === 'questions' ? dialog.question.options?.length ?? 0 : 0;
 }
+/** Escape a string for safe interpolation into a RegExp source. */
+function escapeRegex(value) {
+    return value.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
+}
 function envRefForId(providerId) {
     return `${providerId.replaceAll('-', '_').toUpperCase()}_API_KEY`;
 }