dsh-ssh-tui 0.4.0 → 0.5.0

package/lib/tui.js

@@ -20,8 +20,12 @@ import { StringDecoder } from 'node:string_decoder';
 import { credentialRef } from '@deepseek-ai/dsh-credentials';
 import { createUserMessage, errorChain, ReasoningEffortId } from '@deepseek-ai/dsh-llm';
 import { SessionId } from '@deepseek-ai/dsh-session';
-import { settingsNamespace } from '@deepseek-ai/dsh-settings';
+import { sessionEvents, settingsNamespace } from './dsh-compat.js';
+import { classifyApproval, commandFromArgs, parseAutoApprovalMode } from './auto-approval.js';
+import { buildReviewUserMessage, parseReviewOutput, REVIEW_SYSTEM_PROMPT } from './approval-reviewer.js';
+import { loadProviderCatalog, mergeProviderEntries } from './provider-catalog.js';
 import { formatFooterCwd, formatSessionTime, listResumableSessions } from './session-list.js';
+import { detachFromSshSession, DisplayHost, sessionSockPath } from './display-sock.js';
 import { applySavedLocale, getLocale, localeDisplayName, localeFromTag, setLocale, t, UI_LOCALE_NAMESPACE, } from './i18n/index.js';
 import { defaultReasoningEffort } from './reasoning.js';
 import { checkForPluginUpdate, installPluginLatest } from './update-check.js';
@@ -88,12 +92,29 @@ function providerTemplates() {
         },
     };
 }
+/**
+ * The template the wizard's current step works against: the five pinned
+ * shapes, or the web-catalog preset chosen through option 6.
+ */
+function onboardTemplate(state) {
+    if (state.providerType === 'catalog') {
+        return {
+            label: state.catalog?.name ?? state.catalog?.id ?? '',
+            defaultId: state.catalog?.id ?? '',
+            defaultBaseUrl: '',
+            defaultModels: state.catalog?.modelIds ?? [],
+        };
+    }
+    return providerTemplates()[state.providerType];
+}
 const RENDER_INTERVAL_MS = 160;
 const LOCAL_PAINT_INTERVAL_MS = 80;
 const WAIT_INDICATOR_MS = 8000;
 const MIN_PAINT_INTERVAL_MS = 40;
 const MAX_PAINT_INTERVAL_MS = 1000;
 const DSR_PROBE_TIMEOUT_MS = 800;
+/** Give a running turn this long to settle after cancel before we flush anyway. */
+const HANGUP_CANCEL_TIMEOUT_MS = 10_000;
 /** Compact token count, matching the web stats line (517 / 12.2K / 1.2M). */
 export function formatTokens(n) {
     const scaled = (value) => value >= 100 ? String(Math.round(value)) : String(Math.round(value * 10) / 10);
@@ -132,6 +153,50 @@ export function resolvePaintIntervalMs(configured, env = process.env, options =
 export function detectSshSession(env = process.env) {
     return Boolean(env.SSH_CONNECTION || env.SSH_CLIENT || env.SSH_TTY);
 }
+/** Node errno on a write/close that means the TTY is gone (SSH drop, HUP). */
+export function isHangupErrno(error) {
+    const code = error?.code;
+    return code === 'EIO' || code === 'EPIPE' || code === 'ENXIO' || code === 'ECONNRESET';
+}
+const HANGUP_SIGNAL_NAMES = ['SIGHUP', 'SIGTERM', 'SIGINT'];
+/**
+ * Replace launcher SIGTERM/SIGINT/SIGHUP handlers with `handler`. SSH drop
+ * otherwise lets `dsh` dispose the whole tree before this plugin can detach.
+ */
+export function captureHangupSignals(handler) {
+    for (const name of HANGUP_SIGNAL_NAMES) {
+        process.removeAllListeners(name);
+        process.prependListener(name, handler);
+    }
+}
+export function releaseHangupSignals(handler) {
+    for (const name of HANGUP_SIGNAL_NAMES) {
+        process.removeListener(name, handler);
+    }
+}
+/** After detach, extra HUP/TERM from sshd must not kill the leftover Host. */
+export function ignoreFurtherHangupSignals() {
+    const ignore = () => { };
+    for (const name of HANGUP_SIGNAL_NAMES) {
+        process.removeAllListeners(name);
+        process.on(name, ignore);
+    }
+}
+/**
+ * Wait until `isIdle` is true or `timeoutMs` elapses. Used after cancel so a
+ * hangup can flush a settled session log instead of tearing a live write.
+ */
+export async function waitUntilIdleOrTimeout(isIdle, timeoutMs, now = Date.now, wait = (ms) => new Promise(resolve => {
+    setTimeout(resolve, ms);
+})) {
+    const deadline = now() + Math.max(0, timeoutMs);
+    while (!isIdle()) {
+        if (now() >= deadline)
+            return 'timeout';
+        await wait(Math.min(50, Math.max(0, deadline - now())));
+    }
+    return 'idle';
+}
 /** Map a CSI-6n round-trip to a paint cadence. Unknown RTT uses the SSH default. */
 export function paintIntervalForRtt(rttMs) {
     if (rttMs === undefined || !Number.isFinite(rttMs) || rttMs < 0)
@@ -297,6 +362,9 @@ export function footerIdentityParts(input) {
         parts.push(model);
     if (input.subDiffers)
         parts.push(`sub:${input.subModel}`);
+    if (input.balanceText !== undefined && input.balanceText !== '') {
+        parts.push(input.balanceText);
+    }
     if (input.quotaPercent !== undefined) {
         parts.push(formatFooterQuota(input.quotaPercent, input.quotaCode));
     }
@@ -386,6 +454,8 @@ const PLUGIN_VERSION = (() => {
     }
 })();
 const STALL_WARNING_MS = 60000;
+const DEFAULT_DETACHED_IDLE_MS = 6 * 60 * 60 * 1000;
+const PICKER_WINDOW = 12;
 const CTRL_C_EXIT_WINDOW_MS = 2000;
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
 const QUESTION_OPTION_KEYS = '123456789abcdefghijklmnopqrstuvwxyz';
@@ -542,6 +612,7 @@ export function formatStatusReport(input) {
         `plan: ${input.plan}`,
         formatQuotaStatusLine(input.quota),
         `paint: ${input.paint}`,
+        `disconnect: ${input.disconnect ?? 'pause'}`,
         input.waitingQuestions > 0 ? `questions: waiting ${input.waitingQuestions}` : 'questions: none',
     ];
 }
@@ -566,36 +637,41 @@ export function providerUsesLocalOAuth(provider) {
     return id === 'xai' || id === 'grok' || id.startsWith('xai-');
 }
 const LOCAL_COMMANDS = [
-    { name: 'help', description: 'show all available commands' },
-    { name: 'model', description: 'select model and reasoning effort for the current provider' },
-    { name: 'provider', description: 'switch provider, then model and reasoning effort' },
-    { name: 'submodel', description: `select subagent model (default ${DEFAULT_SUBAGENT_MODEL}, same provider as parent)` },
-    { name: 'subeffort', description: 'select subagent reasoning effort (default follows provider)' },
-    { name: 'mode', description: 'switch agent mode / preset (standard, minimal, ptc, cordis, routing-suite, ...)' },
-    { name: 'quit', description: 'exit the TUI' },
-    { name: 'exit', description: 'exit the TUI' },
-    { name: 'clear', description: 'clear the transcript view' },
-    { name: 'status', description: 'show session, route, quota window, subagent fit, paint, and plugin version' },
-    { name: 'usage', description: 'show remaining quota or account balance for the current provider' },
-    { name: 'balance', description: 'alias of /usage: DeepSeek / OpenAI-compatible balance, or subscription 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: 'add or update an API-key provider without wiping other saved routes' },
-    { name: 'find', description: 'search thinking / plan / subagent / reply cards' },
-    { name: 'language', description: 'switch UI language (zh / en); empty opens a picker' },
-    { name: 'lang', description: 'alias of /language' },
-    { name: 'view', description: 'switch workspace view (detailed / compact); empty opens a picker' },
-    { name: 'dialog-test', description: 'verify the question dialog' },
+    { name: 'help', key: 'cmd.help' },
+    { name: 'model', key: 'cmd.model' },
+    { name: 'effort', key: 'cmd.effort' },
+    { name: 'provider', key: 'cmd.provider' },
+    { name: 'submodel', key: 'cmd.submodel' },
+    { name: 'subeffort', key: 'cmd.subeffort' },
+    { name: 'mode', key: 'cmd.mode' },
+    { name: 'quit', key: 'cmd.quit' },
+    { name: 'exit', key: 'cmd.quit', aliasOf: 'quit' },
+    { name: 'clear', key: 'cmd.clear' },
+    { name: 'status', key: 'cmd.status' },
+    { name: 'disconnect', key: 'cmd.disconnect' },
+    { name: 'approval', key: 'cmd.approval' },
+    { name: 'view', key: 'cmd.view' },
+    { name: 'usage', key: 'cmd.usage' },
+    { name: 'balance', key: 'cmd.usage', aliasOf: 'usage' },
+    { name: 'subagents', key: 'cmd.subagents' },
+    { name: 'resume', key: 'cmd.resume' },
+    { name: 'setup', key: 'cmd.setup' },
+    { name: 'find', key: 'cmd.find' },
+    { name: 'language', key: 'cmd.language' },
+    { name: 'lang', key: 'cmd.language', aliasOf: 'language' },
+    { name: 'dialog-test', key: 'cmd.dialog-test' },
 ];
+function commandDescription(name, aliasOf) {
+    if (aliasOf !== undefined)
+        return t('cmd.aliasOf', { name: aliasOf });
+    return t(`cmd.${name}`);
+}
 function localizedCommands() {
-    return LOCAL_COMMANDS.map(command => {
-        if (command.name === 'language' || command.name === 'lang') {
-            return { name: command.name, description: t('lang.cmd') };
-        }
-        if (command.name === 'view')
-            return { name: command.name, description: t('view.cmd') };
-        return command;
-    });
+    return LOCAL_COMMANDS.map(command => ({
+        name: command.name,
+        description: commandDescription(command.name, 'aliasOf' in command ? command.aliasOf : undefined),
+        ...('aliasOf' in command ? { aliasOf: command.aliasOf } : {}),
+    }));
 }
 /**
  * Terminal cell width for one string.
@@ -654,40 +730,111 @@ export function shimmerText(text, nowMs, color) {
     }
     return out;
 }
-const WAIT_SUMMARY_MAX = 18;
 /**
- * Codex-style short status from reasoning: first `**bold**` / heading, else
- * the first short clause. Keeps the wait card in sync with what the model is
- * doing instead of repeating the user's prompt.
+ * Codex `extract_first_bold`: the first **closed** `**bold**` in the thinking
+ * stream, else the first markdown heading. An unclosed `**` means the title
+ * has not arrived yet, so return undefined and keep the default header —
+ * never fall back to hard-truncated reasoning, reply, or prompt text.
  */
-export function waitSummaryFromReasoning(text, maxChars = WAIT_SUMMARY_MAX) {
-    const raw = text.replace(/\r\n?/gu, '\n').trim();
-    if (raw === '')
-        return undefined;
-    const bold = /\*\*([^*]{2,80})\*\*/u.exec(raw)?.[1]
-        ?? /^#{1,6}\s+(.+)$/mu.exec(raw)?.[1];
-    const source = (bold ?? raw.split('\n').find(line => line.trim() !== '') ?? '').replace(/\s+/gu, ' ').trim();
-    if (source === '')
-        return undefined;
-    const clause = source.split(/[。！？!?\n]/u)[0]?.trim() ?? source;
-    const chars = Array.from(clause);
-    if (chars.length <= maxChars)
-        return clause;
-    return `${chars.slice(0, Math.max(2, maxChars - 1)).join('')}…`;
+export function waitSummaryFromReasoning(text) {
+    const raw = text.replace(/\r\n?/gu, '\n');
+    const chars = Array.from(raw);
+    for (let i = 0; i + 1 < chars.length; i += 1) {
+        if (chars[i] !== '*' || chars[i + 1] !== '*')
+            continue;
+        let j = i + 2;
+        while (j + 1 < chars.length && !(chars[j] === '*' && chars[j + 1] === '*'))
+            j += 1;
+        if (j + 1 >= chars.length)
+            return undefined;
+        const inner = chars.slice(i + 2, j).join('').replace(/\s+/gu, ' ').trim();
+        return inner === '' ? undefined : inner;
+    }
+    const heading = /^#{1,6}\s+(.+)$/mu.exec(raw)?.[1];
+    const source = heading?.replace(/\s+/gu, ' ').trim() ?? '';
+    return source === '' ? undefined : source;
 }
 /** Wait-card header + optional detail. Header tracks model work when known. */
 export function waitCardCopy(input) {
     const toolTitle = input.toolTitle?.trim() ?? '';
     const toolSummary = input.toolSummary?.trim() ?? '';
-    const fromReasoning = waitSummaryFromReasoning(input.reasoning ?? '');
-    const fromReply = waitSummaryFromReasoning(input.reply ?? '');
-    const header = fromReasoning ?? fromReply ?? t('wait.working');
+    const header = waitSummaryFromReasoning(input.reasoning ?? '') ?? t('wait.working');
     if (toolTitle !== '') {
-        const extra = toolSummary === '' ? '' : `  ${Array.from(toolSummary).slice(0, 40).join('')}`;
-        return { header, detail: `${toolTitle}${extra}` };
+        return { header, detail: toolSummary === '' ? toolTitle : `${toolTitle}  ${toolSummary}` };
     }
     return { header };
 }
+const WAIT_DETAIL_PREFIX = '  └ ';
+const WAIT_DETAIL_MAX_LINES = 3;
+/**
+ * Codex `wrapped_details_lines`: word-wrap the wait-card detail under the
+ * `  └ ` prefix, continue wrapped rows at the prefix width, cap at 3 rows and
+ * end the last one with an ellipsis when the text does not fit.
+ */
+export function wrapWaitDetails(detail, width, maxLines = WAIT_DETAIL_MAX_LINES) {
+    const prefixWidth = displayWidth(WAIT_DETAIL_PREFIX);
+    const contentWidth = Math.max(1, width - prefixWidth);
+    const rows = [];
+    let current = '';
+    const flush = () => {
+        if (current !== '')
+            rows.push(current);
+        current = '';
+    };
+    for (const word of detail.split(/\s+/u)) {
+        if (word === '')
+            continue;
+        let rest = word;
+        while (displayWidth(rest) > contentWidth) {
+            flush();
+            let cut = 0;
+            let used = 0;
+            for (const char of rest) {
+                const charWidth = displayWidth(char);
+                if (used + charWidth > contentWidth)
+                    break;
+                used += charWidth;
+                cut += char.length;
+            }
+            if (cut === 0)
+                cut = firstCodePointLength(rest);
+            rows.push(rest.slice(0, cut));
+            rest = rest.slice(cut);
+        }
+        if (rest === '')
+            continue;
+        if (current === '')
+            current = rest;
+        else if (displayWidth(current) + 1 + displayWidth(rest) <= contentWidth)
+            current += ` ${rest}`;
+        else {
+            flush();
+            current = rest;
+        }
+    }
+    flush();
+    if (rows.length === 0)
+        return [];
+    const overflow = rows.length > maxLines;
+    const kept = overflow ? rows.slice(0, maxLines) : rows;
+    if (overflow) {
+        // Codex rewrites the last kept row with an explicit ellipsis so it reads
+        // as "more below", even when the row itself still has spare room.
+        const last = kept[maxLines - 1] ?? '';
+        const limit = Math.max(1, contentWidth - 1);
+        let cut = 0;
+        let used = 0;
+        for (const char of last) {
+            const charWidth = displayWidth(char);
+            if (used + charWidth > limit)
+                break;
+            used += charWidth;
+            cut += char.length;
+        }
+        kept[maxLines - 1] = `${last.slice(0, cut)}…`;
+    }
+    return kept.map((line, index) => index === 0 ? `${WAIT_DETAIL_PREFIX}${line}` : `${' '.repeat(prefixWidth)}${line}`);
+}
 export function displayWidth(text) {
     let width = 0;
     for (const char of text) {
@@ -1463,24 +1610,17 @@ export function quotaAlertText(snapshot, window) {
     });
 }
 /**
- * How often to re-fetch quota, based on the tightest window.
- * Counted in model steps (not conversation turns): a turn with several
- * tool/LLM steps should refresh more often because it spends more quota.
- * Hourly/5h: every 10 steps, every 4 when near a threshold.
- * Weekly: every 50 steps, every 10 when near.
- * Monthly: every 80 steps, every 20 when near.
+ * How often to re-fetch quota or prepaid balance, counted in model steps.
+ * Default is every 10 steps. Near a remaining-percent threshold, hourly
+ * windows refresh every 4 steps.
  */
 export function quotaRefreshEverySteps(window) {
     if (window === undefined)
         return 10;
     const near = window.remainingPercent <= QUOTA_NEAR_THRESHOLD_PERCENT;
-    if (window.period === 'hourly')
-        return near ? 4 : 10;
-    if (window.period === 'weekly')
-        return near ? 10 : 50;
-    if (window.period === 'monthly')
-        return near ? 20 : 80;
-    return near ? 10 : 50;
+    if (window.period === 'hourly' && near)
+        return 4;
+    return 10;
 }
 /** @deprecated Same cadence as {@link quotaRefreshEverySteps}; the name predates step accounting. */
 export const quotaRefreshEveryTurns = quotaRefreshEverySteps;
@@ -1694,6 +1834,18 @@ export function parseOpenAiCompatibleBalance(payload, provider, path) {
         return undefined;
     return { provider, plan: provider, lines, sourcePath: path };
 }
+/** Compact footer chip: `余额 86.42 CNY`. Prefers remaining/available lines. */
+export function formatFooterBalance(snapshot) {
+    const preferred = snapshot.lines.find(line => /剩余|可用|余额|available|remaining|credit/iu.test(line.label))
+        ?? snapshot.lines[0];
+    if (preferred === undefined)
+        return undefined;
+    const amount = preferred.amount.trim();
+    if (amount === '')
+        return undefined;
+    const currency = preferred.currency === undefined || preferred.currency === '' ? '' : ` ${preferred.currency}`;
+    return t('footer.balance', { amount: `${amount}${currency}` });
+}
 export function formatAccountBalance(snapshot) {
     const header = [`${snapshot.plan} 余额（${snapshot.provider}）`];
     if (snapshot.available === false)
@@ -1803,6 +1955,14 @@ function parseJsonArgs(args) {
         return null;
     }
 }
+function firstString(record, keys) {
+    for (const key of keys) {
+        const value = record[key];
+        if (typeof value === 'string' && value.trim() !== '')
+            return value;
+    }
+    return '';
+}
 /** A short scalar rendering of one argument value, or null for objects/arrays. */
 function scalarText(value) {
     if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
@@ -1862,6 +2022,46 @@ function friendlyArgsSummary(name, args) {
 }
 const SHELL_TOOL_NAMES = new Set(['bash', 'pwsh']);
 const DIFF_TOOL_NAMES = new Set(['edit', 'write', 'str_replace_editor']);
+/** Sliding window of `windowSize` items that keeps `cursor` visible. */
+export function pickerWindowStart(cursor, total, windowSize = PICKER_WINDOW) {
+    if (total <= windowSize)
+        return 0;
+    const maxStart = Math.max(0, total - windowSize);
+    const start = cursor - Math.floor((windowSize - 1) / 2);
+    return Math.max(0, Math.min(maxStart, start));
+}
+export function parseDisconnectPolicy(raw) {
+    const id = raw.trim().toLowerCase();
+    if (id === 'pause' || id === 'cancel' || id === '暂停')
+        return 'pause';
+    if (id === 'continue' || id === 'keep' || id === '继续')
+        return 'continue';
+    return undefined;
+}
+const UNDECLARED_EFFORT_IDS = ['off', 'low', 'medium', 'high', 'max', 'xhigh'];
+const DEFAULT_EFFORT_ALIASES = new Set(['default', 'none', 'auto', 'reset', '默认']);
+function effortChoices(ids) {
+    return ids.map(id => ({ id, label: t(`effort.option.${id}`) }));
+}
+function undeclaredEffortChoices() {
+    return effortChoices(UNDECLARED_EFFORT_IDS);
+}
+function localOAuthEffortChoices(modelId) {
+    return effortChoices(modelId === 'grok-4.6'
+        ? ['off', 'low', 'medium', 'high', 'xhigh']
+        : ['off', 'low', 'medium', 'high']);
+}
+/** Parse `/effort high` / `/subeffort default`. Empty or unknown → undefined. */
+export function parseEffortArg(raw) {
+    const id = raw.trim().toLowerCase();
+    if (id === '')
+        return undefined;
+    if (DEFAULT_EFFORT_ALIASES.has(id))
+        return { kind: 'default' };
+    if (/^[a-z][a-z0-9_-]{0,31}$/u.test(id))
+        return { kind: 'id', id };
+    return undefined;
+}
 export function parseWorkspaceView(raw) {
     const id = raw.trim().toLowerCase();
     if (id === 'detailed' || id === 'detail' || id === 'full' || id === '详细')
@@ -1885,6 +2085,72 @@ export function countDiffLines(hunks) {
     }
     return total;
 }
+/** Added / removed line counts for a diff (`oldText: null` means a new file). */
+export function countDiffAddDel(hunks) {
+    const stat = { add: 0, del: 0 };
+    if (hunks === undefined)
+        return stat;
+    for (const hunk of hunks) {
+        stat.add += hunk.newText === '' ? 0 : hunk.newText.split('\n').length;
+        if (hunk.oldText !== null) {
+            stat.del += hunk.oldText === '' ? 0 : hunk.oldText.split('\n').length;
+        }
+    }
+    return stat;
+}
+/**
+ * Git diffstat token, deletions first like `-13 +24`. Zero parts drop out
+ * (a new file shows only `+24`); empty when the diff has no counted lines.
+ */
+export function diffStatToken(add, del) {
+    const parts = [];
+    if (del > 0)
+        parts.push(`-${del}`);
+    if (add > 0)
+        parts.push(`+${add}`);
+    return parts.join(' ');
+}
+const READ_TOOL_NAMES = new Set(['read']);
+const TOOL_FLIP_MS = 280;
+export function toolTargetPath(name, args, fallback = '') {
+    const parsed = parseJsonArgs(args);
+    if (parsed === null)
+        return fallback;
+    if (READ_TOOL_NAMES.has(name)) {
+        return firstString(parsed, ['path', 'file_path', 'url']) || fallback;
+    }
+    if (DIFF_TOOL_NAMES.has(name)) {
+        return firstString(parsed, ['file_path', 'path']) || fallback;
+    }
+    return fallback;
+}
+export function countOutputLines(text) {
+    if (text === '')
+        return 0;
+    const body = text.endsWith('\n') ? text.slice(0, -1) : text;
+    return body === '' ? 0 : body.split('\n').length;
+}
+function mergeableToolKind(name) {
+    if (READ_TOOL_NAMES.has(name))
+        return 'read';
+    if (DIFF_TOOL_NAMES.has(name))
+        return 'edit';
+    return undefined;
+}
+/**
+ * Consecutive same-path reads (or edits) collapse onto one card.
+ * A → B → C → A becomes four cards; A ×5 stays one card with repeats=5.
+ */
+export function canMergeToolCall(previous, next) {
+    if (previous === undefined)
+        return false;
+    const kind = mergeableToolKind(next.name);
+    if (kind === undefined || mergeableToolKind(previous.name) !== kind)
+        return false;
+    const previousPath = toolTargetPath(previous.name, previous.args, previous.summary);
+    const nextPath = toolTargetPath(next.name, next.args);
+    return previousPath !== '' && previousPath === nextPath;
+}
 export function compactToolGroups(tools) {
     const edits = [];
     const calls = [];
@@ -1897,10 +2163,30 @@ export function compactToolGroups(tools) {
     return {
         edits,
         calls,
-        editLines: edits.reduce((sum, tool) => sum + Math.max(1, countDiffLines(tool.diff)), 0),
         failedCalls: calls.filter(tool => tool.status === 'error').length,
     };
 }
+/**
+ * Split compact-view tools into the bursts that belong with each assistant
+ * reply: tools after reply N sit with that reply, until the next reply.
+ */
+export function compactToolBursts(rows) {
+    const bursts = [];
+    let current = { after: undefined, tools: [] };
+    bursts.push(current);
+    for (const row of rows) {
+        if (row.kind === 'assistant') {
+            current = { after: row, tools: [] };
+            bursts.push(current);
+            continue;
+        }
+        if (row.kind === 'tool')
+            current.tools.push(row);
+    }
+    return bursts
+        .map(burst => ({ after: burst.after, groups: compactToolGroups(burst.tools) }))
+        .filter(burst => burst.groups.calls.length > 0 || burst.groups.edits.length > 0);
+}
 const SUBAGENT_TOOL_NAMES = new Set(['subagent', 'subagent_fork', 'task']);
 /**
  * Tool calls that already have a dedicated transcript card (goal/change,
@@ -2432,10 +2718,10 @@ export function toolStateLabel(status) {
         return 'error';
     return 'running…';
 }
-/** Header + SGR spans: default title, dim operand, colored ● and [ok]/[error]. */
+/** Header + SGR spans: default title, dim operand, colored ●. `[ok]` is omitted — the green dot is enough. */
 export function buildToolHeader(input) {
     const running = input.status === undefined || input.status === 'running';
-    const state = toolStateLabel(input.status);
+    const stateToken = input.status === 'ok' ? '' : `[${toolStateLabel(input.status)}]`;
     const exit = !running && input.command !== undefined
         ? input.signal !== undefined
             ? `  [信号 ${input.signal}]`
@@ -2445,25 +2731,56 @@ export function buildToolHeader(input) {
         : '';
     const spinner = input.spinner ?? '';
     const prefix = input.focused ? '▶ ' : '  ';
-    const marker = input.expanded ? '▾' : '▸';
+    const flipping = input.flipping === true;
+    const marker = flipping ? '◇' : input.expanded ? '▾' : '▸';
     const lead = `${prefix}${marker} ● ${input.title}`;
     const summaryText = input.summary === '' ? '' : `  ${input.summary}`;
-    const stateToken = `[${state}]`;
-    const tail = `  ${stateToken}${exit}${spinner}`;
-    const plain = `${lead}${summaryText}${tail}`;
+    const statToken = input.diffStat === undefined ? '' : diffStatToken(input.diffStat.add, input.diffStat.del);
+    const statText = statToken === '' ? '' : `  ${statToken}`;
+    const stateGap = stateToken === '' ? '' : '  ';
+    const tail = `${stateGap}${stateToken}${exit}${spinner}`;
+    const plain = `${lead}${summaryText}${statText}${tail}`;
     const stateCode = toolStateColor(input.status);
     const dotIndex = lead.indexOf('●');
-    const stateIndex = lead.length + summaryText.length + 2;
+    const stateIndex = stateToken === '' ? -1 : lead.length + summaryText.length + statText.length + stateGap.length;
     const segments = [];
+    if (flipping) {
+        const markerIndex = prefix.length;
+        segments.push({ start: markerIndex, end: markerIndex + marker.length, sgr: '36' });
+    }
     if (dotIndex >= 0)
         segments.push({ start: dotIndex, end: dotIndex + '●'.length, sgr: stateCode });
     if (summaryText.length > 0) {
         segments.push({ start: lead.length, end: lead.length + summaryText.length, sgr: '90' });
     }
-    segments.push({ start: stateIndex, end: stateIndex + stateToken.length + exit.length, sgr: stateCode });
+    if (statToken !== '') {
+        // Git diffstat colors: deletions red, additions green. The token sits
+        // two cells after the summary, deletions before the joining space.
+        const statStart = lead.length + summaryText.length + 2;
+        const delEnd = statToken.indexOf(' +');
+        if (statToken.startsWith('-')) {
+            segments.push({
+                start: statStart,
+                end: statStart + (delEnd === -1 ? statToken.length : delEnd),
+                sgr: '31',
+            });
+        }
+        if (delEnd !== -1) {
+            const addStart = statStart + delEnd + 1;
+            segments.push({ start: addStart, end: statStart + statToken.length, sgr: '32' });
+        }
+    }
+    if (stateIndex >= 0) {
+        segments.push({ start: stateIndex, end: stateIndex + stateToken.length + exit.length, sgr: stateCode });
+    }
+    else if (exit !== '') {
+        const exitIndex = lead.length + summaryText.length + statText.length;
+        segments.push({ start: exitIndex, end: exitIndex + exit.length, sgr: stateCode });
+    }
     if (spinner !== '') {
+        const spinnerStart = (stateIndex >= 0 ? stateIndex + stateToken.length + exit.length : lead.length + summaryText.length + statText.length + exit.length);
         segments.push({
-            start: stateIndex + stateToken.length + exit.length,
+            start: spinnerStart,
             end: plain.length,
             sgr: '90',
         });
@@ -2657,14 +2974,6 @@ export function toolBodyLines(row, maxLines) {
     }
     return unlimited ? out : 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, maxLines = Number.MAX_SAFE_INTEGER) {
     const name = row.name ?? '';
     const args = parseJsonArgs(row.args);
@@ -2773,12 +3082,25 @@ export class SshTui {
     agent;
     rows = [];
     streaming;
+    autoApprovalMode = 'off';
+    autoAllowedCount = 0;
+    autoDeniedCount = 0;
+    aiReviewCount = 0;
+    /** Host knobs folded from the session log: auto mode needs approval=ask to see requests. */
+    hostSandboxMode;
+    hostApprovalPolicy;
+    approvalMismatchWarned = false;
+    /** Web-aligned provider presets from the host's pi-ai catalog (undefined until loaded / when unreachable). */
+    catalogPresets;
+    catalogLoad;
     input = '';
     cursor = 0;
     inputFolded = false;
     inPaste = false;
     history = [];
     historyIndex = -1;
+    /** Live input parked while browsing history with ↑. Restored by ↓ past the newest item. */
+    historyDraft = '';
     status = 'idle';
     dialog;
     dialogQueue = [];
@@ -2786,6 +3108,21 @@ export class SshTui {
     dirty = true;
     disposed = false;
     exiting = false;
+    hangingUp = false;
+    onDirectResize = () => {
+        this.forceFullPaint = true;
+        this.dirty = true;
+        this.paint();
+    };
+    headlessDisplay;
+    disconnectPolicy;
+    detachedIdleTimer;
+    displayDetached = false;
+    displayHost;
+    relayColumns;
+    relayRows;
+    onHangup;
+    onReattach;
     renderTimer;
     decoder = new StringDecoder('utf8');
     color;
@@ -2816,6 +3153,7 @@ export class SshTui {
     stalledWarningShown = false;
     lastPaintAt = 0;
     commandAbort;
+    seenCommandDoneIds = new Set();
     activeSubagents = new Map();
     subagentSessions = new Set();
     openToolCalls = new Map();
@@ -2841,7 +3179,6 @@ export class SshTui {
     escapeTimer;
     thinkingStartedAt;
     waitStartedAt;
-    waitPrompt;
     completionSignaled = false;
     replaying = false;
     completedAt = 0;
@@ -2863,6 +3200,7 @@ export class SshTui {
     sessionTitle = '';
     llmRetry;
     quotaSnapshot;
+    balanceSnapshot;
     quotaAlerted = new Set();
     quotaStepsSinceRefresh = 0;
     quotaRefreshInFlight = false;
@@ -2879,6 +3217,7 @@ export class SshTui {
         this.maxToolOutputLines = Math.max(1, config.maxToolOutputLines ?? 6);
         this.showReasoning = config.showReasoning !== false;
         this.workspaceView = this.readWorkspaceView();
+        this.autoApprovalMode = this.readAutoApprovalMode();
         this.goodbye = config.goodbye
             ?? this.ctx.get('tuiGoodbyeMessage')
             ?? `To resume this session: dsh --profile tui --resume=${this.agent.id}`;
@@ -2888,6 +3227,10 @@ export class SshTui {
         this.subagentSelection = config.subagentSelection ?? { current: { model: DEFAULT_SUBAGENT_MODEL } };
         this.onSwitchSession = config.onSwitchSession;
         this.onSelectionChanged = config.onSelectionChanged;
+        this.onHangup = config.onHangup;
+        this.onReattach = config.onReattach;
+        this.headlessDisplay = config.headlessDisplay === true;
+        this.disconnectPolicy = config.disconnectPolicy ?? this.readDisconnectPolicy();
         this.resumePicker = config.resumePicker === true;
         this.presetId = config.presetId ?? 'standard';
         this.presetName = config.presetName ?? this.presetId;
@@ -2905,15 +3248,31 @@ export class SshTui {
     }
     /** Enter raw mode, switch to the alternate screen, and start listening. */
     start() {
+        detachFromSshSession();
+        captureHangupSignals(this.handleHangupSignal);
+        this.bindAgentEvents();
+        void this.ensureDisplayHost().catch((error) => {
+            if (this.disposed)
+                return;
+            this.pushRow({ kind: 'error', text: `显示通道启动失败: ${errorChain(error)}` });
+            this.markDirty();
+        });
+        if (this.headlessDisplay) {
+            this.displayDetached = true;
+            this.startRenderTimer();
+            this.bootBackgroundTasks();
+            return;
+        }
         process.stdin.setRawMode(true);
         process.stdin.resume();
-        process.stdout.on('resize', this.markDirty);
-        process.on('SIGWINCH', this.markDirty);
-        this.disposers.push(this.ctx.on('session/event', this.handleSessionEvent), this.ctx.on('agent/status', this.handleStatus), this.ctx.on('agent/error', this.handleError), this.ctx.on('agent/disposed', this.handleDisposed), this.ctx.on('agent/inbox/claimed', this.handleInboxClaimed), this.ctx.on('agent/inbox/discarded', this.handleInboxDiscarded), this.ctx.on('agent/request', this.handleAgentRequest), this.ctx.on('subagent/start', this.handleSubagentStart), this.ctx.on('subagent/end', this.handleSubagentEnd), this.ctx.on('approval/request', this.handleApproval));
-        const questions = this.ctx.get('userQuestions');
-        if (questions !== undefined) {
-            this.userQuestionDisposer = installUserQuestionAnswerer(this.ctx, questions, this.handleUserQuestions);
-        }
+        process.stdout.on('resize', this.onDirectResize);
+        if (process.platform !== 'win32') {
+            process.on('SIGWINCH', this.onDirectResize);
+        }
+        process.stdin.prependListener('end', this.handleHangupStream);
+        process.stdin.prependListener('close', this.handleHangupStream);
+        process.stdout.on('error', this.handleIoError);
+        process.stdin.on('error', this.handleIoError);
         this.write(`${this.useAlternateScreen ? '\x1b[?1049h' : ''}\x1b[?1000h\x1b[?1006h\x1b[?2004h\x1b[?25l`);
         this.render();
         this.updateTerminalTitle();
@@ -2926,6 +3285,23 @@ export class SshTui {
             process.stdin.on('data', this.handleData);
             this.startRenderTimer();
         });
+        this.bootBackgroundTasks();
+    }
+    bindAgentEvents() {
+        this.disposers.push(this.ctx.on('session/event', this.handleSessionEvent), this.ctx.on('agent/status', this.handleStatus), this.ctx.on('agent/error', this.handleError), this.ctx.on('agent/disposed', this.handleDisposed), this.ctx.on('agent/inbox/claimed', this.handleInboxClaimed), this.ctx.on('agent/inbox/discarded', this.handleInboxDiscarded), this.ctx.on('agent/request', this.handleAgentRequest), this.ctx.on('subagent/start', this.handleSubagentStart), this.ctx.on('subagent/end', this.handleSubagentEnd), this.ctx.on('approval/request', this.handleApproval));
+        const questions = this.ctx.get('userQuestions');
+        if (questions !== undefined) {
+            this.userQuestionDisposer = installUserQuestionAnswerer(this.ctx, questions, this.handleUserQuestions);
+        }
+    }
+    bootBackgroundTasks() {
+        // Warm the web-aligned provider catalog so /setup has it ready instantly
+        // (runs on both the interactive and the detached-display path).
+        this.catalogLoad = loadProviderCatalog([process.argv[1], this.ctx.baseUrl]);
+        this.catalogLoad.then(presets => {
+            this.catalogPresets = presets;
+            this.markDirty();
+        }).catch(() => { });
         void this.maybeRunOnboarding().catch((error) => {
             if (this.disposed)
                 return;
@@ -3020,6 +3396,51 @@ export class SshTui {
             return 'detailed';
         return parseWorkspaceView(String(raw.view ?? '')) ?? 'detailed';
     }
+    readDisconnectPolicy() {
+        const env = parseDisconnectPolicy(process.env.DSH_TUI_DISCONNECT ?? '');
+        if (env !== undefined)
+            return env;
+        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
+            return 'pause';
+        return parseDisconnectPolicy(String(raw.disconnect ?? '')) ?? 'pause';
+    }
+    readAutoApprovalMode() {
+        const env = parseAutoApprovalMode(process.env.DSH_TUI_AUTO_APPROVAL ?? '');
+        if (env !== undefined)
+            return env;
+        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
+            return 'off';
+        return parseAutoApprovalMode(String(raw.autoApproval ?? '')) ?? 'off';
+    }
+    detachedIdleMs() {
+        const raw = Number.parseInt(process.env.DSH_TUI_DETACHED_IDLE_MS ?? '', 10);
+        if (Number.isFinite(raw) && raw > 0)
+            return raw;
+        return DEFAULT_DETACHED_IDLE_MS;
+    }
+    clearDetachedIdleTimer() {
+        if (this.detachedIdleTimer !== undefined)
+            clearTimeout(this.detachedIdleTimer);
+        this.detachedIdleTimer = undefined;
+    }
+    armDetachedIdleTimer() {
+        this.clearDetachedIdleTimer();
+        const idleMs = this.detachedIdleMs();
+        this.detachedIdleTimer = setTimeout(() => {
+            if (this.disposed || this.exiting)
+                return;
+            if (this.displayHost?.attached === true)
+                return;
+            if (this.agent.status === 'running') {
+                this.armDetachedIdleTimer();
+                return;
+            }
+            void this.requestExit(0);
+        }, idleMs);
+        this.detachedIdleTimer.unref?.();
+    }
     isCompactView() {
         return this.workspaceView === 'compact';
     }
@@ -3027,32 +3448,75 @@ export class SshTui {
     setWorkspaceView(view) {
         this.workspaceView = view;
     }
+    paintCompactBurst(addDisplay, groups, width) {
+        const callAnchor = groups.calls.at(-1);
+        const editAnchor = groups.edits.at(-1);
+        if (callAnchor !== undefined)
+            this.paintCompactSummary(addDisplay, callAnchor, 'calls', groups, width);
+        if (editAnchor !== undefined)
+            this.paintCompactSummary(addDisplay, editAnchor, 'edits', groups, width);
+    }
     paintCompactSummary(addDisplay, anchor, kind, groups, width) {
-        const focused = this.focusedRow === anchor;
-        const marker = anchor.expanded ? '▾' : '▸';
-        const running = kind === 'edits'
-            ? groups.edits.some(item => item.status === undefined || item.status === 'running')
-            : groups.calls.some(item => item.status === undefined || item.status === 'running');
-        const spinner = running ? ` ${this.spinnerFrame()}` : '';
+        const items = kind === 'edits' ? groups.edits : groups.calls;
+        const running = items.some(item => item.status === undefined || item.status === 'running');
+        const failed = items.length > 0 && items.every(item => item.status === 'error');
+        const status = running ? 'running' : failed ? 'error' : 'ok';
+        const addDel = { add: 0, del: 0 };
+        if (kind === 'edits') {
+            for (const item of groups.edits) {
+                const stat = countDiffAddDel(item.diff);
+                addDel.add += stat.add;
+                addDel.del += stat.del;
+            }
+        }
         const title = kind === 'edits'
             ? (groups.edits.length > 1
-                ? t('compact.editsFiles', { lines: groups.editLines, files: groups.edits.length })
-                : t('compact.edits', { lines: groups.editLines }))
+                ? t('compact.editsFiles', { files: groups.edits.length })
+                : t('compact.edits'))
             : (groups.failedCalls > 0
                 ? t('compact.toolsFailed', { count: groups.calls.length, failed: groups.failedCalls })
                 : t('compact.tools', { count: groups.calls.length }));
-        const header = `${focused ? '▶ ' : '  '}${marker} ● ${title}${spinner}${anchor.expanded ? '' : t('card.expand')}`;
-        const styled = this.styleLine(groups.failedCalls > 0 && kind === 'calls' ? 'error' : 'tool', header);
-        addDisplay(focused && this.color ? `\x1b[7m${styled}\x1b[27m` : styled, anchor);
-        if (!anchor.expanded)
+        const header = buildToolHeader({
+            focused: this.focusedRow === anchor,
+            expanded: anchor.expanded,
+            title,
+            summary: '',
+            status,
+            spinner: running ? ` ${this.spinnerFrame()}` : '',
+            flipping: items.some(item => item.flipUntil !== undefined && Date.now() < item.flipUntil),
+            ...(kind === 'edits' && (addDel.add > 0 || addDel.del > 0) ? { diffStat: addDel } : {}),
+        });
+        const headerSegments = this.color ? header.segments : [];
+        if (!anchor.expanded) {
+            const collapsed = truncateToWidth(header.plain, Math.max(1, width - 2));
+            const styled = headerSegments.length === 0
+                ? this.styleLine('tool', collapsed)
+                : paintSegmentedLine(collapsed, 0, collapsed.length, headerSegments);
+            addDisplay(this.focusedRow === anchor && this.color ? `\x1b[7m${styled}\x1b[27m` : styled, anchor);
             return;
-        const items = kind === 'edits' ? groups.edits : groups.calls;
+        }
+        const expandedHeaderLines = headerSegments.length === 0
+            ? wrap(header.plain, width).map(line => this.styleLine('tool', line))
+            : wrapSegmented(header.plain, Math.max(1, width), headerSegments);
+        for (const wrapped of expandedHeaderLines) {
+            addDisplay(this.focusedRow === anchor && this.color ? `\x1b[7m${wrapped}\x1b[27m` : wrapped, anchor);
+        }
         for (const item of items) {
-            const state = item.status === 'error' ? 'error' : item.status === 'ok' ? 'ok' : 'running…';
-            const extra = kind === 'edits'
-                ? `${countDiffLines(item.diff) || 1} ${getLocale() === 'en' ? 'lines' : '行'}`
-                : item.summary;
-            addDisplay(this.styleLine('system', truncateToWidth(`    ${item.title}  ${extra}  [${state}]`, width)), item);
+            if (kind === 'edits') {
+                const stat = countDiffAddDel(item.diff);
+                const token = diffStatToken(stat.add, stat.del);
+                const extra = token === ''
+                    ? `${countDiffLines(item.diff) || 1} ${getLocale() === 'en' ? 'lines' : '行'}`
+                    : token;
+                addDisplay(this.styleLine('tool-result', truncateToWidth(`    ${item.title}  ${extra}`, width)), item);
+                for (const line of toolBodyLines(item, Number.MAX_SAFE_INTEGER)) {
+                    this.paintToolBodyLine(addDisplay, item, line, width);
+                }
+                continue;
+            }
+            const extra = item.summary;
+            const state = item.status === 'error' ? '  [error]' : item.status === 'ok' ? '' : '  [running…]';
+            addDisplay(this.styleLine('tool-result', truncateToWidth(`    ${item.title}  ${extra}${state}`, width)), item);
         }
     }
     startRenderTimer() {
@@ -3067,7 +3531,8 @@ export class SshTui {
             const animating = (this.streaming !== undefined && this.streaming.reasoning !== '')
                 || this.activeSubagents.size > 0
                 || this.waitCardVisible()
-                || this.rows.some(row => (row.kind === 'question' && row.status === 'waiting')
+                || this.rows.some(row => (row.kind === 'tool' && row.flipUntil !== undefined && now < row.flipUntil)
+                    || (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'))
                     || (row.kind === 'compaction' && row.status === 'running'));
@@ -3110,7 +3575,7 @@ export class SshTui {
     replayHistory() {
         this.replaying = true;
         try {
-            for (const event of this.agent.session.events) {
+            for (const event of sessionEvents(this.agent.session)) {
                 this.handleSessionEvent(this.agent.session, event);
             }
         }
@@ -3192,12 +3657,25 @@ export class SshTui {
                 baseUrl: '',
                 key: '',
                 models: [],
+                catalogPresets: undefined,
+                catalog: undefined,
+                providerCursor: 0,
                 saving: false,
                 resolve: (saved) => {
                     this.onboardingCompletion = undefined;
                     resolve(saved);
                 },
             };
+            // Web-aligned catalog presets warm at construction; adopt whatever is
+            // ready now and update the open wizard when the load settles.
+            const state = this.onboarding;
+            state.catalogPresets = this.catalogPresets;
+            void this.catalogLoad?.then(presets => {
+                if (this.onboarding === state && state.catalogPresets === undefined && presets !== undefined) {
+                    state.catalogPresets = presets;
+                    this.markDirty();
+                }
+            });
             this.input = '';
             this.cursor = 0;
             this.dialog = { kind: 'onboarding' };
@@ -3218,12 +3696,64 @@ export class SshTui {
         this.showNextDialog();
         this.markDirty();
     }
-    /** Restore the terminal, flush the session, and request process exit. */
+    /**
+     * Drop the TTY without disposing the agent. Safe to call when the fd is
+     * already dead: DECSET restore is best-effort and never throws.
+     */
+    detachDisplay() {
+        if (this.displayDetached)
+            return;
+        if (this.renderTimer !== undefined)
+            clearInterval(this.renderTimer);
+        this.renderTimer = undefined;
+        if (this.escapeTimer !== undefined)
+            clearTimeout(this.escapeTimer);
+        this.escapeTimer = undefined;
+        process.stdin.removeListener('data', this.handleData);
+        process.stdout.removeListener('resize', this.onDirectResize);
+        process.stdout.removeListener('error', this.handleIoError);
+        process.stdin.removeListener('error', this.handleIoError);
+        process.stdin.removeListener('end', this.handleHangupStream);
+        process.stdin.removeListener('close', this.handleHangupStream);
+        process.removeListener('SIGWINCH', this.onDirectResize);
+        if (!this.hangingUp)
+            releaseHangupSignals(this.handleHangupSignal);
+        try {
+            process.stdin.setRawMode(false);
+        }
+        catch {
+            // stdin may already be closed after SIGHUP.
+        }
+        try {
+            process.stdin.pause();
+        }
+        catch {
+            // ignore
+        }
+        try {
+            process.stdout.write('\x1b]0;\x07');
+            process.stdout.write('\x1b[0m\x1b[2J\x1b[3J\x1b[H');
+            process.stdout.write(`\x1b[?1000l\x1b[?1006l\x1b[?2004l\x1b[?25h${this.useAlternateScreen ? '\x1b[?1049l' : ''}`);
+        }
+        catch (error) {
+            if (!isHangupErrno(error)) {
+                try {
+                    process.stderr.write(`dsh-ssh-tui: failed to restore terminal: ${errorChain(error)}\n`);
+                }
+                catch {
+                    // both pipes gone
+                }
+            }
+        }
+        this.displayDetached = true;
+    }
+    /** Restore the terminal and drop event wiring. Does not flush or exit. */
     async dispose() {
         if (this.disposed)
             return;
         this.disposed = true;
         this.exiting = true;
+        this.clearDetachedIdleTimer();
         const dialog = this.dialog;
         const queued = this.dialogQueue.splice(0);
         this.dialog = undefined;
@@ -3246,12 +3776,6 @@ export class SshTui {
                 pending.reject(new UserQuestionError('TUI closed before the question was answered', 'ASK_ABORTED'));
             }
         }
-        if (this.renderTimer !== undefined)
-            clearInterval(this.renderTimer);
-        this.renderTimer = undefined;
-        if (this.escapeTimer !== undefined)
-            clearTimeout(this.escapeTimer);
-        this.escapeTimer = undefined;
         this.commandAbort?.abort();
         this.commandAbort = undefined;
         for (const dispose of this.disposers.splice(0)) {
@@ -3259,31 +3783,123 @@ export class SshTui {
         }
         this.userQuestionDisposer?.();
         this.userQuestionDisposer = undefined;
-        process.stdin.removeListener('data', this.handleData);
-        process.stdout.removeListener('resize', this.markDirty);
-        process.removeListener('SIGWINCH', this.markDirty);
-        process.stdin.setRawMode(false);
-        process.stdin.pause();
-        this.write('\x1b]0;\x07');
-        // Clear every screen (regular + scrollback) before restoring the terminal.
-        // In no-alternate-screen mode this removes the last painted frame that
-        // would otherwise stay behind the shell prompt after exit.
-        this.write('\x1b[0m\x1b[2J\x1b[3J\x1b[H');
-        this.write(`\x1b[?1000l\x1b[?1006l\x1b[?2004l\x1b[?25h${this.useAlternateScreen ? '\x1b[?1049l' : ''}`);
+        this.detachDisplay();
+        const host = this.displayHost;
+        this.displayHost = undefined;
+        if (host !== undefined)
+            await host.close();
     }
     /** Human-facing exit with goodbye and flush; called from key handling. */
     async requestExit(code) {
-        if (this.exiting)
+        if (this.hangingUp)
+            return;
+        if (this.disposed)
+            return;
+        this.exiting = true;
+        this.clearDetachedIdleTimer();
+        this.displayHost?.sendGoodbye();
+        await this.dispose();
+        if (!this.headlessDisplay)
+            this.writeGoodbye();
+        await this.flushSession();
+        this.exitProcess(code);
+    }
+    /**
+     * True while the session is doing work the user would lose by killing the
+     * Host: a running turn (thinking / reply / tools), live subagents, in-flight
+     * compaction, or an LLM retry. Idle (including a waiting approval dialog
+     * after the turn has already settled) is not busy — hangup then exits
+     * instead of leaving a leftover process.
+     */
+    isBusyForHangupKeepalive() {
+        if (this.agent.status === 'running')
+            return true;
+        if (this.activeSubagents.size > 0)
+            return true;
+        if (this.streaming !== undefined)
+            return true;
+        if (this.openToolCalls.size > 0)
+            return true;
+        if (this.llmRetry !== undefined)
+            return true;
+        if (this.rows.some(row => row.kind === 'compaction' && row.status === 'running'))
+            return true;
+        return false;
+    }
+    /**
+     * SSH / TTY hangup: drop the local display, flush, and either keep the Host
+     * (busy: thinking / reply / tools / subagents) or exit (idle).
+     * When keeping the Host, `pause` cancels the turn; `continue` lets it finish.
+     * Ctrl+C is not a hangup.
+     */
+    async handleHangup() {
+        if (this.hangingUp || this.disposed)
+            return;
+        this.hangingUp = true;
+        ignoreFurtherHangupSignals();
+        this.detachDisplay();
+        const busy = this.isBusyForHangupKeepalive();
+        const pauseTurn = this.disconnectPolicy !== 'continue';
+        if (pauseTurn && this.agent.status === 'running') {
+            try {
+                this.agent.cancel({ kind: 'user' });
+            }
+            catch {
+                // cancel is best-effort; we still flush below.
+            }
+            await waitUntilIdleOrTimeout(() => this.agent.status !== 'running', HANGUP_CANCEL_TIMEOUT_MS);
+        }
+        await this.flushSession();
+        const keepHost = this.displayHost !== undefined && busy;
+        if (keepHost) {
+            this.hangingUp = false;
+            this.armDetachedIdleTimer();
+            await this.onHangup?.();
             return;
+        }
         this.exiting = true;
         await this.dispose();
-        process.stdout.write(`\n${sanitizeTerminalText(this.goodbye)}\n`);
+        this.exitProcess(129);
+    }
+    handleHangupSignal = () => {
+        void this.handleHangup();
+    };
+    handleHangupStream = () => {
+        void this.handleHangup();
+    };
+    handleIoError = (error) => {
+        if (isHangupErrno(error))
+            void this.handleHangup();
+    };
+    writeGoodbye() {
+        try {
+            process.stdout.write(`\n${sanitizeTerminalText(this.goodbye)}\n`);
+        }
+        catch (error) {
+            if (!isHangupErrno(error)) {
+                try {
+                    process.stderr.write(`dsh-ssh-tui: failed to write goodbye: ${errorChain(error)}\n`);
+                }
+                catch {
+                    // both pipes gone
+                }
+            }
+        }
+    }
+    async flushSession() {
         try {
             await this.ctx.get('sessions')?.flush(this.agent.session);
         }
         catch (error) {
-            process.stdout.write(`dsh-ssh-tui: failed to flush session: ${errorChain(error)}\n`);
+            try {
+                process.stderr.write(`dsh-ssh-tui: failed to flush session: ${errorChain(error)}\n`);
+            }
+            catch {
+                // stderr may be gone after hangup
+            }
         }
+    }
+    exitProcess(code) {
         const exit = this.ctx.get('appExit');
         if (exit !== undefined)
             exit(code);
@@ -3309,12 +3925,147 @@ export class SshTui {
             process.stdout.rows = previousRows;
         }
     }
-    write(chunk) {
-        process.stdout.write(chunk);
+    screenColumns() {
+        if (this.headlessDisplay || this.displayDetached) {
+            return this.relayColumns ?? process.stdout.columns ?? 80;
+        }
+        return process.stdout.columns ?? 80;
     }
-    markDirty = () => {
-        this.dirty = true;
+    screenRows() {
+        if (this.headlessDisplay || this.displayDetached) {
+            return this.relayRows ?? process.stdout.rows ?? 24;
+        }
+        return process.stdout.rows ?? 24;
+    }
+    write(chunk) {
+        const host = this.displayHost;
+        if (host?.attached === true) {
+            host.sendStdout(chunk);
+            if (this.displayDetached)
+                return;
+        }
+        else if (this.displayDetached) {
+            return;
+        }
+        try {
+            process.stdout.write(chunk);
+        }
+        catch (error) {
+            if (isHangupErrno(error)) {
+                void this.handleHangup();
+                return;
+            }
+            throw error;
+        }
+    }
+    async ensureDisplayHost() {
+        if (this.displayHost !== undefined || this.disposed)
+            return;
+        const host = new DisplayHost(sessionSockPath(String(this.agent.id)), {
+            onStdin: (bytes) => {
+                if (this.disposed)
+                    return;
+                this.handleData(bytes);
+            },
+            onResize: (columns, rows) => {
+                const changed = this.relayColumns !== columns || this.relayRows !== rows;
+                this.relayColumns = columns;
+                this.relayRows = rows;
+                if (this.displayHost?.attached === true && this.displayDetached) {
+                    this.attachRelayDisplay();
+                    return;
+                }
+                if (changed) {
+                    this.forceFullPaint = true;
+                    this.dirty = true;
+                    this.paint();
+                }
+            },
+            onRtt: (rttMs) => {
+                this.applyProbedRtt(rttMs);
+            },
+            onDetach: () => {
+                if (this.disposed || this.hangingUp)
+                    return;
+                void this.handleHangup();
+            },
+            onAttach: () => {
+                if (this.disposed)
+                    return;
+                if (this.relayColumns !== undefined && this.relayRows !== undefined) {
+                    this.attachRelayDisplay();
+                }
+            },
+        });
+        await host.listen();
+        if (this.disposed) {
+            await host.close();
+            return;
+        }
+        this.displayHost = host;
+    }
+    /** Re-open DECSET and start painting to an attached Display relay. */
+    attachRelayDisplay() {
+        this.displayDetached = false;
+        this.hangingUp = false;
+        this.clearDetachedIdleTimer();
+        this.lastActivity = Date.now();
+        this.stalledWarningShown = false;
+        this.lastPaintRows = [];
+        this.lastChromeKey = '';
+        this.lastTranscriptStart = -1;
+        this.write(`${this.useAlternateScreen ? '\x1b[?1049h' : ''}\x1b[?1000h\x1b[?1006h\x1b[?2004h\x1b[?25l`);
+        this.forceFullPaint = true;
+        this.dirty = true;
+        this.paint();
+        this.startRenderTimer();
+        void this.onReattach?.();
+    }
+    currentDisconnectPolicy() {
+        return this.disconnectPolicy;
+    }
+    applyProbedRtt(rttMs) {
+        const envOverride = Number.parseInt(process.env.DSH_TUI_PAINT_MS ?? '', 10);
+        this.paintLink = 'ssh';
+        this.paintProbed = rttMs !== undefined;
+        this.paintRttMs = rttMs;
+        if (!(Number.isFinite(envOverride) && envOverride > 0)) {
+            this.paintIntervalMs = resolvePaintIntervalMs(undefined, {}, { ssh: true, rttMs });
+            this.startRenderTimer();
+        }
+        this.markDirty();
+    }
+    markDirty = () => {
+        this.dirty = true;
     };
+    toolCardSummary(row) {
+        const repeats = row.repeats ?? 1;
+        const parts = [];
+        if (row.summary !== '')
+            parts.push(row.summary);
+        if (repeats > 1)
+            parts.push(t('tool.repeatCount', { count: repeats }));
+        if (READ_TOOL_NAMES.has(row.name) && (row.totalChars !== undefined || row.totalLines !== undefined)) {
+            const chars = row.totalChars ?? 0;
+            const lines = row.totalLines ?? 0;
+            parts.push(t('tool.readStats', { chars: formatTokens(chars), lines: String(lines) }));
+        }
+        return parts.join(' · ');
+    }
+    mergeIntoToolCard(previous, next) {
+        previous.callId = next.callId;
+        previous.name = next.name;
+        previous.args = next.args;
+        previous.title = next.title;
+        previous.summary = next.summary;
+        previous.status = 'running';
+        previous.output = '';
+        previous.exitCode = undefined;
+        previous.signal = undefined;
+        previous.repeats = (previous.repeats ?? 1) + 1;
+        if (!this.replaying)
+            previous.flipUntil = Date.now() + TOOL_FLIP_MS;
+    }
     /** Append one transcript row, bounding memory on long sessions. */
     pushRow(row) {
         this.rows.push(row);
@@ -3331,19 +4082,31 @@ export class SshTui {
     /** The transcript rows that support per-row expand/collapse. */
     collapsibleRows() {
         const compact = this.isCompactView();
-        const rows = this.rows.filter((row) => {
-            if (compact && (row.kind === 'reasoning' || row.kind === 'prompt'))
-                return false;
-            return row.kind === 'reasoning'
-                || row.kind === 'tool'
-                || row.kind === 'subagent'
+        if (compact) {
+            const rows = this.rows.filter((row) => row.kind === 'subagent'
                 || row.kind === 'plan'
                 || row.kind === 'question'
                 || row.kind === 'goal'
-                || row.kind === 'compaction'
-                || row.kind === 'prompt';
-        });
-        if (!compact && this.streaming !== undefined && this.streaming.reasoning !== '') {
+                || row.kind === 'compaction');
+            for (const burst of compactToolBursts(this.rows)) {
+                const callAnchor = burst.groups.calls.at(-1);
+                const editAnchor = burst.groups.edits.at(-1);
+                if (callAnchor !== undefined)
+                    rows.push(callAnchor);
+                if (editAnchor !== undefined)
+                    rows.push(editAnchor);
+            }
+            return rows;
+        }
+        const rows = this.rows.filter((row) => row.kind === 'reasoning'
+            || row.kind === 'tool'
+            || row.kind === 'subagent'
+            || row.kind === 'plan'
+            || row.kind === 'question'
+            || row.kind === 'goal'
+            || row.kind === 'compaction'
+            || row.kind === 'prompt');
+        if (this.streaming !== undefined && this.streaming.reasoning !== '') {
             this.streamingReasoning ??= { kind: 'streaming-reasoning', expanded: false };
             rows.push(this.streamingReasoning);
         }
@@ -3353,26 +4116,27 @@ export class SshTui {
         return SPINNER[Math.floor(Date.now() / periodMs) % SPINNER.length] ?? '⠋';
     }
     /**
-     * Codex wait card: shown while the turn is running. Thinking/reply streams
-     * feed the shimmer header; a live tool becomes the detail line.
+     * Codex wait card: shown while the turn is running. The live thinking
+     * stream feeds the shimmer header; a live tool becomes the detail rows.
+     * While the reply itself is streaming, the transcript paints those tokens
+     * and the card yields (Codex hides the status row once output commits).
      */
     waitCardVisible() {
         if (this.agent.status !== 'running')
             return false;
+        if (this.streaming?.text)
+            return false;
         if (this.rows.some(row => row.kind === 'compaction' && row.status === 'running'))
             return false;
         if (this.dialog?.kind === 'questions' || this.dialog?.kind === 'confirm')
             return false;
         return true;
     }
-    beginWait(prompt) {
+    beginWait() {
         this.waitStartedAt = Date.now();
-        const trimmed = prompt?.replace(/\s+/gu, ' ').trim();
-        this.waitPrompt = trimmed === undefined || trimmed === '' ? this.waitPrompt : trimmed;
     }
     endWait() {
         this.waitStartedAt = undefined;
-        this.waitPrompt = undefined;
     }
     waitCardSource() {
         const liveTool = this.rows.findLast((row) => row.kind === 'tool' && (row.status === undefined || row.status === 'running'));
@@ -3383,8 +4147,6 @@ export class SshTui {
                 ? {}
                 : { toolTitle: liveSub.label, toolSummary: liveSub.lastActivity }),
             ...(this.streaming?.reasoning ? { reasoning: this.streaming.reasoning } : {}),
-            ...(this.streaming?.text ? { reply: this.streaming.text } : {}),
-            ...(this.waitPrompt === undefined ? {} : { prompt: this.waitPrompt }),
         };
     }
     planShouldDefaultExpand(plan) {
@@ -3684,8 +4446,8 @@ export class SshTui {
     }
     toggleCard(target) {
         if (target.kind === 'tool' && !target.expanded) {
-            const width = Math.max(10, process.stdout.columns || 80);
-            const height = Math.max(6, process.stdout.rows || 24);
+            const width = Math.max(10, this.screenColumns());
+            const height = Math.max(6, this.screenRows());
             const body = toolBodyLines(target, Number.MAX_SAFE_INTEGER);
             const bodyRows = wrappedToolBodyLineCount(body, width);
             if (!toolBodyFitsWorkspace(bodyRows, this.workspaceRowsFor(width, height))) {
@@ -3711,8 +4473,8 @@ export class SshTui {
             this.focusedRow = null;
         }
         else {
-            const width = Math.max(10, process.stdout.columns || 80);
-            const height = Math.max(6, process.stdout.rows || 24);
+            const width = Math.max(10, this.screenColumns());
+            const height = Math.max(6, this.screenRows());
             const workspace = this.workspaceRowsFor(width, height);
             for (const row of rows) {
                 if (row.kind === 'tool') {
@@ -3736,8 +4498,8 @@ export class SshTui {
         if (row === undefined)
             return;
         if (row.kind === 'tool') {
-            const width = Math.max(10, process.stdout.columns || 80);
-            const height = Math.max(6, process.stdout.rows || 24);
+            const width = Math.max(10, this.screenColumns());
+            const height = Math.max(6, this.screenRows());
             const body = toolBodyLines(row, Number.MAX_SAFE_INTEGER);
             const bodyRows = wrappedToolBodyLineCount(body, width);
             if (!toolBodyFitsWorkspace(bodyRows, this.workspaceRowsFor(width, height))) {
@@ -3823,8 +4585,8 @@ export class SshTui {
     paint = () => {
         if (this.exiting)
             return;
-        const width = Math.max(10, process.stdout.columns || 80);
-        const height = Math.max(6, process.stdout.rows || 24);
+        const width = Math.max(10, this.screenColumns());
+        const height = Math.max(6, this.screenRows());
         if (this.dialog?.kind === 'inspect') {
             this.paintInspectOverlay(width, height);
             return;
@@ -3850,24 +4612,21 @@ export class SshTui {
             }
         };
         const compact = this.isCompactView();
-        const compactGroups = compact
-            ? compactToolGroups(this.rows.filter((row) => row.kind === 'tool'))
-            : undefined;
-        const compactEditCard = compactGroups?.edits[0];
-        const compactCallCard = compactGroups?.calls[0];
+        const compactBursts = compact ? compactToolBursts(this.rows) : [];
+        const compactBurstByReply = new Map();
+        for (const burst of compactBursts) {
+            if (burst.after !== undefined)
+                compactBurstByReply.set(burst.after, burst);
+        }
+        let paintedLeadingCompact = false;
         for (const row of this.rows) {
-            if (compact && (row.kind === 'reasoning' || row.kind === 'prompt'))
-                continue;
-            if (compact && compactGroups !== undefined && row.kind === 'tool') {
-                if (row === compactEditCard) {
-                    this.paintCompactSummary(addDisplay, row, 'edits', compactGroups, width);
-                    continue;
-                }
-                if (row === compactCallCard) {
-                    this.paintCompactSummary(addDisplay, row, 'calls', compactGroups, width);
-                    continue;
-                }
+            if (compact && (row.kind === 'reasoning' || row.kind === 'prompt' || row.kind === 'tool'))
                 continue;
+            if (compact && !paintedLeadingCompact && (row.kind === 'assistant' || row.kind === 'user')) {
+                const leading = compactBursts.find(burst => burst.after === undefined);
+                if (leading !== undefined)
+                    this.paintCompactBurst(addDisplay, leading.groups, width);
+                paintedLeadingCompact = true;
             }
             if (row.kind === 'brand-logo') {
                 const variant = DEEPSEEK_LOGO_VARIANTS.find(candidate => candidate.width <= width - 2)
@@ -3903,12 +4662,16 @@ export class SshTui {
                     focused,
                     expanded: row.expanded,
                     title: toolTitle(row.name) || row.title,
-                    summary: row.summary,
+                    summary: this.toolCardSummary(row),
                     status: row.status,
                     command: row.command,
                     signal: row.signal,
                     exitCode: row.exitCode,
                     spinner: running ? ` ${this.spinnerFrame()}` : '',
+                    flipping: row.flipUntil !== undefined && Date.now() < row.flipUntil,
+                    ...(row.diff !== undefined && row.diff.length > 0
+                        ? { diffStat: countDiffAddDel(row.diff) }
+                        : {}),
                 });
                 const headerSegments = this.color ? header.segments : [];
                 if (!row.expanded) {
@@ -4076,6 +4839,13 @@ export class SshTui {
                 continue;
             }
             pushRow(row.kind, row.text, row);
+            if (compact && row.kind === 'assistant') {
+                const burst = compactBurstByReply.get(row);
+                const lastAssistant = this.rows.findLast((item) => item.kind === 'assistant');
+                if (burst !== undefined && (row !== lastAssistant || this.streaming === undefined)) {
+                    this.paintCompactBurst(addDisplay, burst.groups, width);
+                }
+            }
         }
         if (this.streaming !== undefined) {
             if (!compact && this.showReasoning && this.streaming.reasoning !== '') {
@@ -4109,6 +4879,18 @@ export class SshTui {
                 }
             }
         }
+        if (compact) {
+            const lastAssistant = this.rows.findLast((row) => row.kind === 'assistant');
+            if (this.streaming !== undefined) {
+                const openBurst = compactBursts.find(burst => burst.after === lastAssistant);
+                if (openBurst !== undefined)
+                    this.paintCompactBurst(addDisplay, openBurst.groups, width);
+            }
+            const leading = compactBursts.find(burst => burst.after === undefined);
+            if (leading !== undefined && !paintedLeadingCompact) {
+                this.paintCompactBurst(addDisplay, leading.groups, width);
+            }
+        }
         if (this.waitCardVisible()) {
             const copy = waitCardCopy(this.waitCardSource());
             const started = this.waitStartedAt ?? Date.now();
@@ -4119,8 +4901,8 @@ export class SshTui {
                 ? `${spinner} ${shimmerText(copy.header, Date.now(), true)}  ${this.styleLine('system', hint)}`
                 : `${spinner} ${copy.header}  ${hint}`;
             addDisplay(header);
-            if (copy.detail !== undefined && copy.detail !== '') {
-                addDisplay(this.styleLine('system', `  └ ${copy.detail}`));
+            for (const line of wrapWaitDetails(copy.detail ?? '', width)) {
+                addDisplay(this.styleLine('system', line));
             }
         }
         const dialogLines = [];
@@ -4137,32 +4919,47 @@ export class SshTui {
             else if (this.dialog.kind === 'onboarding') {
                 const ob = this.onboarding;
                 if (ob !== undefined) {
-                    const template = providerTemplates()[ob.providerType];
+                    const template = onboardTemplate(ob);
                     const providerLabel = `${template.label}${template.defaultBaseUrl === '' ? '' : `（${template.defaultBaseUrl}）`}`;
                     switch (ob.step) {
-                        case 'provider':
+                        case 'provider': {
+                            const options = this.mergedProviderEntries(ob);
                             addDialog(t('onboard.title'));
-                            addDialog(t('onboard.opt1'));
-                            addDialog(t('onboard.opt2'));
-                            addDialog(t('onboard.opt3'));
-                            addDialog(t('onboard.opt4'));
-                            addDialog(t('onboard.opt5'));
+                            if (options.length === 0) {
+                                addDialog(t('onboard.catalogEmpty'));
+                                break;
+                            }
+                            const start = pickerWindowStart(ob.providerCursor, options.length);
+                            const end = Math.min(options.length, start + PICKER_WINDOW);
+                            if (start > 0)
+                                addDialog(`  ↑ 还有 ${start} 项`);
+                            for (let index = start; index < end; index += 1) {
+                                const option = options[index];
+                                if (option === undefined)
+                                    continue;
+                                const focused = index === ob.providerCursor ? '›' : ' ';
+                                addDialog(` ${focused} ○ ${option.label}${option.detail === '' ? '' : ` — ${option.detail}`}`);
+                            }
+                            if (end < options.length)
+                                addDialog(`  ↓ 还有 ${options.length - end} 项`);
+                            if (this.input.trim() !== '')
+                                addDialog(t('onboard.catalogHint', { count: options.length }));
                             addDialog(t('onboard.pickHint'));
                             break;
+                        }
                         case 'id':
                             addDialog(t('onboard.providerLine', { label: providerLabel }));
                             addDialog(t('onboard.idPrompt'));
                             addDialog(t('onboard.default', { value: template.defaultId }));
                             addDialog(t('onboard.enterEsc'));
                             break;
-                        case 'key':
-                            addDialog(t('onboard.providerLine', { label: providerLabel }));
-                            addDialog(t('onboard.keyPrompt'));
-                            addDialog(t('onboard.enterEsc'));
-                            break;
                         case 'base-url':
                             addDialog(t('onboard.providerLine', { label: providerLabel }));
-                            addDialog(t('onboard.basePrompt', { fallback: template.defaultBaseUrl || t('onboard.baseFallback') }));
+                            addDialog(t('onboard.basePrompt', {
+                                fallback: template.defaultBaseUrl !== ''
+                                    ? template.defaultBaseUrl
+                                    : ob.providerType === 'catalog' ? t('onboard.baseFallbackCatalog') : t('onboard.baseFallback'),
+                            }));
                             addDialog(t('onboard.enterEsc'));
                             break;
                         case 'models':
@@ -4173,6 +4970,8 @@ export class SshTui {
                                 : t('onboard.default', { value: template.defaultModels.join(', ') }));
                             if (template.api !== undefined)
                                 addDialog(t('onboard.ctrlF'));
+                            if (ob.providerType === 'catalog')
+                                addDialog(t('onboard.modelsCatalogHint'));
                             addDialog(t('onboard.enterEsc'));
                             break;
                         case 'confirm':
@@ -4180,7 +4979,9 @@ export class SshTui {
                             addDialog(t('onboard.confirmProvider', { label: providerLabel }));
                             addDialog(`  Provider ID: ${ob.providerId}`);
                             addDialog(t('onboard.confirmBase', { url: ob.baseUrl === '' ? (template.defaultBaseUrl || t('onboard.defaultParen')) : ob.baseUrl }));
-                            addDialog(t('onboard.confirmApi', { api: template.api ?? 'deepseek-official' }));
+                            addDialog(t('onboard.confirmApi', {
+                                api: template.api ?? (ob.providerType === 'catalog' ? t('onboard.apiCatalog') : 'deepseek-official'),
+                            }));
                             addDialog(t('onboard.confirmModels', { list: formatModelList(ob.models, 8) }));
                             addDialog(t('onboard.confirmKey', {
                                 head: sliceCodePoints(ob.key, 6),
@@ -4214,17 +5015,27 @@ export class SshTui {
                 }
                 const options = d.question.options ?? [];
                 const approve = d.question.intent?.approve;
-                for (const [index, option] of options.entries()) {
+                const start = pickerWindowStart(d.cursor, options.length);
+                const end = Math.min(options.length, start + PICKER_WINDOW);
+                if (start > 0)
+                    addDialog(`  ↑ 还有 ${start} 项`);
+                for (let index = start; index < end; index += 1) {
+                    const option = options[index];
+                    if (option === undefined)
+                        continue;
                     const marker = d.selected.has(index) ? '●' : '○';
-                    const key = QUESTION_OPTION_KEYS[index] ?? '?';
+                    const key = QUESTION_OPTION_KEYS[index] ?? '↕';
+                    const focused = index === d.cursor ? '›' : ' ';
                     const recommended = option.label === approve ? '（推荐）' : '';
                     const extra = option.description === undefined ? '' : ` — ${option.description}`;
-                    addDialog(`  ${key} ${marker} ${option.label}${recommended}${extra}`);
+                    addDialog(` ${focused}${key} ${marker} ${option.label}${recommended}${extra}`);
                 }
+                if (end < options.length)
+                    addDialog(`  ↓ 还有 ${options.length - end} 项`);
                 if (options.length === 0) {
                     addDialog('  （自由输入：在下方输入后按 Enter）');
                 }
-                addDialog(`  ${d.question.multiSelect === true ? '数字/字母切换，Enter 提交' : '数字/字母选择，Enter 提交'}，Esc 取消`);
+                addDialog(`  ${d.question.multiSelect === true ? '↑/↓ 或数字/字母切换，Enter 提交' : '↑/↓ 或数字/字母选择，Enter 提交'}，Esc 取消`);
             }
         }
         const fitLine = (text) => truncateToWidth(text, Math.max(1, width));
@@ -4240,13 +5051,24 @@ export class SshTui {
             this.suggestionIndex = Math.max(0, this.commandSuggestions.length - 1);
         }
         const suggestionLines = [];
-        for (const [index, command] of this.commandSuggestions.entries()) {
+        const suggestionStart = pickerWindowStart(this.suggestionIndex, this.commandSuggestions.length);
+        const suggestionEnd = Math.min(this.commandSuggestions.length, suggestionStart + PICKER_WINDOW);
+        if (suggestionStart > 0) {
+            suggestionLines.push(this.styleLine('system', fitLine(`  ${t('suggest.moreAbove', { count: suggestionStart })}`)));
+        }
+        for (let index = suggestionStart; index < suggestionEnd; index += 1) {
+            const command = this.commandSuggestions[index];
+            if (command === undefined)
+                continue;
             const marker = index === this.suggestionIndex ? '›' : ' ';
             const line = `  ${marker} /${command.name.padEnd(14)} ${command.description}${command.local ? '' : '  (dsh)'}`;
             suggestionLines.push(index === this.suggestionIndex && this.color
                 ? `\x1b[7m${fitLine(line)}\x1b[27m`
                 : this.styleLine('system', fitLine(line)));
         }
+        if (suggestionEnd < this.commandSuggestions.length) {
+            suggestionLines.push(this.styleLine('system', fitLine(`  ${t('suggest.moreBelow', { count: this.commandSuggestions.length - suggestionEnd })}`)));
+        }
         const promptPlain = this.color ? '❯ ' : '> ';
         const prompt = this.color ? `\x1b[36m${promptPlain.trimEnd()}\x1b[0m ` : promptPlain;
         const promptWidth = displayWidth(promptPlain);
@@ -4292,7 +5114,7 @@ export class SshTui {
             : [];
         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 available = Math.max(0, height - reserved - dialogLines.length);
         const maxOffset = Math.max(0, display.length - available);
         const reveal = this.pendingReveal;
         if (reveal !== undefined) {
@@ -4350,11 +5172,14 @@ export class SshTui {
         const idleMs = Date.now() - this.lastActivity;
         const livePlan = this.findLivePlanRow();
         const liveGoal = this.rows.findLast((row) => row.kind === 'goal');
+        const current = this.selectionRef?.current;
+        const provider = this.currentProviderId();
         const quotaWindow = this.quotaSnapshot === undefined ? undefined : tightestQuotaWindow(this.quotaSnapshot);
+        const balanceText = this.balanceSnapshot !== undefined && this.balanceSnapshot.provider === provider
+            ? formatFooterBalance(this.balanceSnapshot)
+            : undefined;
         const waitingQuestions = this.rows.some(row => row.kind === 'question' && row.status === 'waiting');
         const compacting = this.rows.some(row => row.kind === 'compaction' && row.status === 'running');
-        const current = this.selectionRef?.current;
-        const provider = this.currentProviderId();
         const parentModel = current?.model ?? this.agent.options.model ?? '';
         const sub = this.subagentSelection.current;
         const footer = {
@@ -4382,6 +5207,7 @@ export class SshTui {
             ...(quotaWindow === undefined || this.quotaSnapshot === undefined || this.quotaSnapshot.provider !== provider
                 ? {}
                 : { quotaCode: this.quotaSnapshot.plan, quotaPercent: quotaWindow.remainingPercent }),
+            ...(balanceText === undefined ? {} : { balanceText }),
             ...(this.searchHits.length > 0 && this.searchIndex >= 0
                 ? { search: { index: this.searchIndex, total: this.searchHits.length } }
                 : {}),
@@ -4432,6 +5258,7 @@ export class SshTui {
             this.suggestionIndex,
             this.activeSubagents.size,
             this.dialog?.kind ?? '',
+            this.dialog?.kind === 'questions' ? String(this.dialog.cursor) : '',
             planDockLines.join('\n'),
             String(chromeStart),
         ].join('\x1f');
@@ -4483,19 +5310,34 @@ export class SshTui {
         if (!input.startsWith('/'))
             return [];
         const prefix = input.slice(1).toLowerCase();
-        const dsh = (this.ctx.get('commands')?.list(this.agent) ?? []).map(command => ({
-            name: command.name,
-            description: command.input?.images === true ? `${command.description}（可附图）` : command.description,
-            local: false,
-        }));
-        const all = [
-            ...localizedCommands().map(command => ({ name: command.name, description: command.description, local: true })),
-            ...dsh,
-        ];
+        const local = localizedCommands()
+            .filter(command => command.name !== 'dialog-test' && (prefix !== '' || command.aliasOf === undefined))
+            .map(command => ({ name: command.name, description: command.description, local: true }));
+        const seen = new Set(local.map(command => command.name));
+        const dsh = (this.ctx.get('commands')?.list(this.agent) ?? [])
+            .filter(command => !seen.has(command.name))
+            .map(command => {
+            const descKey = `cmd.${command.name}`;
+            const desc = t(descKey, undefined, command.description);
+            return {
+                name: command.name,
+                description: command.input?.images === true
+                    ? t('cmd.withImagesSuffix', { desc })
+                    : desc,
+                local: false,
+            };
+        });
+        const all = [...local, ...dsh];
         const filtered = prefix === ''
             ? all
             : all.filter(command => command.name.startsWith(prefix) || command.name.includes(prefix));
-        return filtered.slice(0, 12);
+        if (prefix === '')
+            return filtered;
+        return filtered.sort((a, b) => {
+            const aStart = a.name.startsWith(prefix) ? 0 : 1;
+            const bStart = b.name.startsWith(prefix) ? 0 : 1;
+            return aStart - bStart;
+        });
     }
     suggestionsVisible() {
         return this.commandSuggestions.length > 0 && this.dialog === undefined;
@@ -4598,11 +5440,13 @@ export class SshTui {
         const disabled = process.env.DSH_TUI_NO_BELL === '1' || process.env.DSH_TUI_NO_BELL === 'true';
         if (disabled)
             return;
-        process.stdout.write('\x07');
+        this.write('\x07');
     }
     render = () => {
         if (!this.dirty || this.exiting)
             return;
+        if ((this.displayDetached || this.headlessDisplay) && this.displayHost?.attached !== true)
+            return;
         if (this.agent.status === 'running'
             && Date.now() - this.lastActivity > STALL_WARNING_MS
             && !this.stalledWarningShown
@@ -4680,7 +5524,7 @@ export class SshTui {
                     if (sourceKind === 'user') {
                         this.pushRow({ kind: 'user', text: `❯ ${text}` });
                         if (!this.replaying)
-                            this.beginWait(text);
+                            this.beginWait();
                     }
                     else if (isPromptInjectionMessage(sourceKind, text, source.plugin)) {
                         this.pushPromptInjection(text, source.plugin);
@@ -4776,21 +5620,34 @@ export class SshTui {
                 this.pendingToolTimes.set(String(event.data.callId), event.time);
                 if (!HIDDEN_TOOL_NAMES.has(event.data.name)) {
                     const present = presentToolCall(event.data.name, event.data.arguments);
-                    const row = {
-                        kind: 'tool',
-                        callId: event.data.callId,
-                        name: event.data.name,
-                        args: event.data.arguments,
-                        status: 'running',
-                        output: '',
-                        title: present.title,
-                        summary: present.summary,
-                        ...present.command === undefined ? {} : { command: present.command },
-                        ...present.cwd === undefined ? {} : { cwd: present.cwd },
-                        ...present.diff === undefined ? {} : { diff: present.diff },
-                        expanded: false,
-                    };
-                    this.pushRow(row);
+                    const previous = this.rows.findLast((candidate) => candidate.kind === 'tool');
+                    if (canMergeToolCall(previous, { name: event.data.name, args: event.data.arguments })) {
+                        this.mergeIntoToolCard(previous, {
+                            callId: event.data.callId,
+                            name: event.data.name,
+                            args: event.data.arguments,
+                            title: present.title,
+                            summary: present.summary,
+                            ...present.diff === undefined ? {} : { diff: present.diff },
+                        });
+                    }
+                    else {
+                        const row = {
+                            kind: 'tool',
+                            callId: event.data.callId,
+                            name: event.data.name,
+                            args: event.data.arguments,
+                            status: 'running',
+                            output: '',
+                            title: present.title,
+                            summary: present.summary,
+                            ...present.command === undefined ? {} : { command: present.command },
+                            ...present.cwd === undefined ? {} : { cwd: present.cwd },
+                            ...present.diff === undefined ? {} : { diff: present.diff },
+                            expanded: false,
+                        };
+                        this.pushRow(row);
+                    }
                 }
                 if (event.data.name === 'exit_plan_mode') {
                     const markdown = planMarkdownFromArgs(event.data.arguments);
@@ -4813,7 +5670,9 @@ export class SshTui {
                 if (row !== undefined) {
                     const metaDiffs = diffMetaDiffs(event.data.meta);
                     if (metaDiffs !== null) {
-                        row.diff = metaDiffs;
+                        row.diff = (row.repeats ?? 1) > 1 && row.diff !== undefined && row.diff.length > 0
+                            ? [...row.diff, ...metaDiffs]
+                            : metaDiffs;
                     }
                     const isShell = SHELL_TOOL_NAMES.has(row.name);
                     if (isShell) {
@@ -4831,6 +5690,10 @@ export class SshTui {
                         || event.data.message.content[0]?.isError === true
                         || (isShell && ((row.exitCode !== undefined && row.exitCode !== 0) || row.signal !== undefined));
                     row.status = failed ? 'error' : 'ok';
+                    if (READ_TOOL_NAMES.has(row.name)) {
+                        row.totalChars = (row.totalChars ?? 0) + row.output.length;
+                        row.totalLines = (row.totalLines ?? 0) + countOutputLines(row.output);
+                    }
                 }
                 else {
                     const present = presentToolCall(event.data.message.source.callId, '');
@@ -4882,6 +5745,14 @@ export class SshTui {
                 this.markDirty();
                 break;
             }
+            case 'sandbox/mode':
+                this.hostSandboxMode = String(event.data.mode ?? '');
+                break;
+            case 'approval/policy':
+                this.hostApprovalPolicy = String(event.data.policy ?? '');
+                if (this.hostApprovalPolicy === 'never')
+                    this.warnApprovalMismatch();
+                break;
             case 'turn/start':
                 this.stalledWarningShown = false;
                 this.llmRetry = undefined;
@@ -5161,19 +6032,48 @@ export class SshTui {
         });
         this.markDirty();
     }
+    formatCommandText(text) {
+        const permMatch = text.match(/^current preset (\S+) \(available: (.+)\)$/);
+        if (permMatch) {
+            const current = permMatch[1] ?? '';
+            const avail = permMatch[2] ?? '';
+            const localize = (name) => {
+                const key = `preset.${name}`;
+                const trans = t(key);
+                return trans !== key ? t('preset.named', { name, label: trans }) : name;
+            };
+            const currentLabel = localize(current);
+            const availLabel = avail.split(', ').map(s => localize(s.trim())).join(t('list.sep'));
+            return t('permission.currentInfo', { current: currentLabel, available: availLabel });
+        }
+        const permSwitched = text.match(/^preset (\S+)$/);
+        if (permSwitched) {
+            const name = permSwitched[1] ?? '';
+            const key = `preset.${name}`;
+            const trans = t(key);
+            const label = trans !== key ? t('preset.named', { name, label: trans }) : name;
+            return t('permission.switched', { preset: label });
+        }
+        return text;
+    }
     handleCommandDone(data) {
         const payload = data !== null && typeof data === 'object' ? data : {};
+        const commandId = typeof payload.commandId === 'string' ? payload.commandId : '';
+        if (commandId !== '')
+            this.seenCommandDoneIds.add(commandId);
         const kind = typeof payload.kind === 'string' ? payload.kind : '';
         const text = typeof payload.text === 'string' ? payload.text.trim() : '';
         if (kind === 'error') {
-            this.pushRow({ kind: 'error', text: text === '' ? '命令失败。' : text });
+            const errText = this.formatCommandText(text);
+            this.pushRow({ kind: 'error', text: errText === '' ? t('command.failed') : errText });
             if (this.status.startsWith('压缩'))
                 this.status = this.agent.status === 'running' ? 'running' : 'idle';
             this.markDirty();
             return;
         }
-        if (text !== '')
-            this.pushRow({ kind: 'system', text });
+        if (text !== '') {
+            this.pushRow({ kind: 'system', text: this.formatCommandText(text) });
+        }
         this.markDirty();
     }
     handleGoalChange(data) {
@@ -5369,7 +6269,170 @@ export class SshTui {
         this.markDirty();
     };
     // ── approval and questions ──────────────────────────────────────────────
+    hasLiveDisplay() {
+        if (this.disposed || this.exiting)
+            return false;
+        if (this.headlessDisplay || this.displayDetached)
+            return this.displayHost?.attached === true;
+        return true;
+    }
+    waitForLiveDisplay(signal) {
+        if (this.hasLiveDisplay())
+            return Promise.resolve();
+        return new Promise((resolve, reject) => {
+            let settled = false;
+            const finish = (ok) => {
+                if (settled)
+                    return;
+                settled = true;
+                signal?.removeEventListener('abort', onAbort);
+                clearInterval(timer);
+                if (ok)
+                    resolve();
+                else
+                    reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
+            };
+            const onAbort = () => { finish(false); };
+            signal?.addEventListener('abort', onAbort, { once: true });
+            const timer = setInterval(() => {
+                if (this.disposed || this.exiting) {
+                    finish(false);
+                    return;
+                }
+                if (this.hasLiveDisplay())
+                    finish(true);
+            }, 200);
+            timer.unref?.();
+        });
+    }
+    /**
+     * Auto mode rides the approval waterfall: when the host approval policy is
+     * `never` no request is ever produced, so the classifier silently does
+     * nothing. Say so instead of letting the user believe a guard is active.
+     */
+    warnApprovalMismatch() {
+        if (this.autoApprovalMode !== 'auto' || this.approvalMismatchWarned)
+            return;
+        if (this.hostApprovalPolicy !== 'never')
+            return;
+        this.approvalMismatchWarned = true;
+        this.pushRow({ kind: 'system', text: t('approval.mismatchNever') });
+        this.markDirty();
+    }
+    /**
+     * AI review for rule-table `ask` outcomes: one shot at the subagent
+     * model route with a compact, injection-fenced context. Returns
+     * 'allow' | 'deny', or undefined when the reviewer is unavailable or its
+     * output was unusable (caller falls back to prompt/reject).
+     */
+    async reviewUnknownWithModel(request, command) {
+        const llm = this.ctx.get('llm');
+        if (llm === undefined)
+            return undefined;
+        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, [], this.selectionRef?.current?.model);
+        // 最近模型输出/思考（≤2 段）与最新用户消息（≤400 字）
+        const segments = [];
+        for (let i = this.rows.length - 1; i >= 0 && segments.length < 2; i -= 1) {
+            const row = this.rows[i];
+            if (row !== undefined && (row.kind === 'assistant' || row.kind === 'reasoning') && row.text.trim() !== '') {
+                segments.unshift(row.text);
+            }
+        }
+        let userText = '';
+        for (let i = this.rows.length - 1; i >= 0; i -= 1) {
+            const row = this.rows[i];
+            if (row !== undefined && row.kind === 'user') {
+                userText = row.text.replace(/^❯\s*/u, '');
+                break;
+            }
+        }
+        const signals = [request.signal, AbortSignal.timeout(15_000)].filter(s => s !== undefined);
+        const signal = signals.length > 0 ? AbortSignal.any(signals) : undefined;
+        const options = {
+            provider,
+            model,
+            messages: [createUserMessage({
+                    content: [{ type: 'text', text: buildReviewUserMessage({
+                                userText,
+                                segments,
+                                toolName: request.toolName,
+                                command: command ?? `(无命令参数，工具：${request.toolName})`,
+                            }) }],
+                    source: { kind: 'plugin', plugin: 'dsh-ssh-tui' },
+                })],
+            system: REVIEW_SYSTEM_PROMPT,
+            maxTokens: 200,
+            sessionId: this.agent.session.id,
+            signal,
+        };
+        this.aiReviewCount += 1;
+        let text = '';
+        for await (const chunk of llm.stream(options)) {
+            if (chunk.type === 'text-delta')
+                text += chunk.text;
+        }
+        const verdict = parseReviewOutput(text);
+        if (verdict === undefined)
+            return undefined;
+        this.pushRow({
+            kind: 'system',
+            text: t('approval.reviewRow', {
+                verdict: verdict.approved ? t('approval.reviewApproved') : t('approval.reviewRejected'),
+                risk: verdict.risk,
+                authorization: verdict.authorization,
+                reason: verdict.reason,
+            }),
+        });
+        this.markDirty();
+        return verdict.approved ? 'allow' : 'deny';
+    }
     handleApproval = async (request, _next) => {
+        // Auto mode classifies BEFORE waiting for a display, Codex-style: allow
+        // shapes approve, danger shapes REJECT (the model reads the rejection and
+        // adapts instead of paging the human), unknown shapes ask only while a
+        // human is attached — detached turns reject so they complete instead of
+        // stalling toward the idle kill.
+        if (this.autoApprovalMode === 'auto') {
+            const row = request.callId === undefined
+                ? undefined
+                : this.rows.findLast((candidate) => candidate.kind === 'tool' && candidate.callId === request.callId);
+            const command = row === undefined ? undefined : commandFromArgs(row.name, row.args);
+            const decision = classifyApproval(request.toolName, command);
+            if (decision === 'allow') {
+                this.autoAllowedCount += 1;
+                return 'allowed-once';
+            }
+            if (decision === 'deny') {
+                this.autoDeniedCount += 1;
+                return 'rejected';
+            }
+            // Unknown shape: the rule table cannot judge it — hand it to the
+            // subagent-configured model with compact context (AI review). Without
+            // a display there is nobody to fall back on, so unreviewable asks
+            // reject and the turn completes instead of stalling.
+            const reviewed = await this.reviewUnknownWithModel(request, command);
+            if (reviewed === 'allow') {
+                this.autoAllowedCount += 1;
+                return 'allowed-once';
+            }
+            if (reviewed === 'deny' || !this.hasLiveDisplay()) {
+                this.autoDeniedCount += 1;
+                return 'rejected';
+            }
+        }
+        if (!this.hasLiveDisplay()) {
+            try {
+                await this.waitForLiveDisplay(request.signal);
+            }
+            catch {
+                return 'cancelled';
+            }
+        }
         const agentLabel = request.agent.id === this.agent.id
             ? '当前会话'
             : `子代理 ${request.agent.id}`;
@@ -5392,6 +6455,8 @@ export class SshTui {
         });
     };
     handleUserQuestions = async (request) => {
+        if (!this.hasLiveDisplay())
+            await this.waitForLiveDisplay(request.signal);
         const answers = [];
         const agentLabel = request.agent === undefined || request.agent.id === this.agent.id
             ? undefined
@@ -5536,6 +6601,7 @@ export class SshTui {
             index,
             total,
             selected: new Set(preselected !== undefined && preselected >= 0 ? [preselected] : []),
+            cursor: preselected !== undefined && preselected >= 0 ? preselected : 0,
             resolve: (selection) => {
                 this.settleQuestion(dialog, () => resolve(selection));
             },
@@ -5637,13 +6703,9 @@ export class SshTui {
             return false;
         }
     }
-    /** How many endpoint-listed models fit on one picker page alongside navigation. */
-    MODEL_PAGE_SIZE = 7;
-    MODEL_PAGE_PREV = '« 上一页';
-    MODEL_PAGE_NEXT = '» 下一页';
     /**
-     * One pick across a possibly long model list, paging through the digit
-     * dialog so an endpoint with dozens of models stays selectable.
+     * One pick across a possibly long model list. The question dialog keeps a
+     * 12-row sliding window so dozens of models stay selectable with ↑/↓.
      */
     async pickModelOption(modelOptions, provider, sourceLabel, currentModel) {
         const seen = new Set();
@@ -5655,40 +6717,19 @@ export class SshTui {
         });
         if (unique.length === 0)
             return undefined;
-        let offset = 0;
-        for (;;) {
-            const page = unique.slice(offset, offset + this.MODEL_PAGE_SIZE);
-            const hasPrev = offset > 0;
-            const hasNext = offset + this.MODEL_PAGE_SIZE < unique.length;
-            const pageCount = Math.max(1, Math.ceil(unique.length / this.MODEL_PAGE_SIZE));
-            const currentPage = Math.floor(offset / this.MODEL_PAGE_SIZE) + 1;
-            const options = page.map(option => ({
+        const currentIndex = unique.findIndex(option => option.id === currentModel && option.id !== '__switch_provider__');
+        const answer = await this.askQuestion({
+            id: 'model-pick',
+            question: `选择模型（提供商 ${provider} · ${sourceLabel}${unique.length > PICKER_WINDOW ? ` · ${unique.length} 个，↑/↓ 翻看` : ''}）`,
+            options: unique.map(option => ({
                 label: option.label,
                 description: option.id === currentModel ? '当前' : undefined,
-            }));
-            if (hasPrev)
-                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;
-            if (picked.label === this.MODEL_PAGE_NEXT) {
-                offset += this.MODEL_PAGE_SIZE;
-                continue;
-            }
-            if (picked.label === this.MODEL_PAGE_PREV) {
-                offset = Math.max(0, offset - this.MODEL_PAGE_SIZE);
-                continue;
-            }
-            return page.find(option => option.label === picked.label);
-        }
+            })),
+        }, 0, 1, currentIndex >= 0 ? currentIndex : undefined);
+        const picked = answer.selected[0];
+        if (picked === undefined)
+            return undefined;
+        return unique.find(option => option.label === picked);
     }
     /** Live adapter routes the TUI can switch to, plus the current selection. */
     listSelectableProviders() {
@@ -5860,38 +6901,38 @@ export class SshTui {
             effortOptions = [];
         }
         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 rememberedEffort = this.rememberedRoute(provider)?.reasoningEffort ?? preferredEffort ?? '';
-            const currentEffort = current?.provider === provider
-                ? String(current?.reasoningEffort ?? '')
-                : rememberedEffort;
-            const currentIndex = Math.max(0, effortOptions.findIndex(option => option.id === currentEffort));
-            const effortAnswer = await this.askQuestion({
-                id: 'effort-pick',
-                question: `选择思考强度（${modelId}）`,
-                options: effortOptions.map(option => ({
-                    label: option.label,
-                    description: option.id === currentEffort ? '当前' : undefined,
-                })),
-            }, 0, 1, currentIndex);
-            effort = effortOptions.find(option => option.label === effortAnswer.selected[0])?.id;
+            effortOptions = localOAuthEffortChoices(modelId);
         }
+        const isUndeclared = effortOptions.length === 0;
+        const available = isUndeclared ? undeclaredEffortChoices() : effortOptions;
+        const choices = [
+            {
+                id: undefined,
+                label: t('footer.effortDefault'),
+                desc: isUndeclared ? t('effort.descUndeclared') : t('effort.descFollow'),
+            },
+            ...available.map(opt => ({
+                id: opt.id,
+                label: opt.label,
+                desc: undefined,
+            })),
+        ];
+        const rememberedEffort = this.rememberedRoute(provider)?.reasoningEffort ?? preferredEffort ?? '';
+        const currentEffort = current?.provider === provider
+            ? String(current?.reasoningEffort ?? '')
+            : rememberedEffort;
+        const currentIndex = Math.max(0, choices.findIndex(option => option.id === (currentEffort === '' ? undefined : currentEffort)));
+        const effortAnswer = await this.askQuestion({
+            id: 'effort-pick',
+            question: isUndeclared
+                ? t('effort.pickUndeclared', { model: modelId })
+                : t('effort.pick', { model: modelId }),
+            options: choices.map(option => ({
+                label: option.label,
+                description: option.id === (currentEffort === '' ? undefined : currentEffort) ? t('disconnect.current') : option.desc,
+            })),
+        }, 0, 1, currentIndex);
+        const effort = choices.find(option => option.label === effortAnswer.selected[0])?.id;
         const next = {
             provider,
             model: modelId,
@@ -5903,9 +6944,11 @@ export class SshTui {
         await this.persistDefaultSelection(next);
         await this.rememberRoute(next);
         const kind = describeProviderRoute(provider);
+        const effortText = effort ?? t('effort.defaultShort');
+        const note = isUndeclared && effort !== undefined ? t('effort.manualNote') : '';
         this.pushRow({
             kind: 'system',
-            text: `已切换到 ${kind.kind}：${provider}/${modelId}（思考强度 ${effort ?? '默认'}${effortOptions.length === 0 ? '，该模型未声明可选强度' : ''}）；下一步请求生效。`,
+            text: t('effort.switchedModel', { kind: kind.kind, provider, model: modelId, effort: effortText, note }),
         });
         const listedIds = listed.filter(id => id !== '__switch_provider__' && id !== '');
         const previousProvider = current?.provider ?? this.agent.options.provider ?? this.providerName;
@@ -6002,10 +7045,16 @@ export class SshTui {
         });
     }
     clearQuotaForProvider(provider) {
-        if (this.quotaSnapshot !== undefined && this.quotaSnapshot.provider === provider)
+        const quotaSame = this.quotaSnapshot !== undefined && this.quotaSnapshot.provider === provider;
+        const balanceSame = this.balanceSnapshot !== undefined && this.balanceSnapshot.provider === provider;
+        if (quotaSame && balanceSame)
             return;
-        this.quotaSnapshot = undefined;
-        this.quotaAlerted.clear();
+        if (!quotaSame) {
+            this.quotaSnapshot = undefined;
+            this.quotaAlerted.clear();
+        }
+        if (!balanceSame)
+            this.balanceSnapshot = undefined;
         this.quotaStepsSinceRefresh = 0;
         this.markDirty();
     }
@@ -6093,8 +7142,98 @@ export class SshTui {
         });
         this.markDirty();
     }
+    /** /effort: pick or set the reasoning effort for the current model. */
+    async runEffortCommand(arg) {
+        const provider = this.currentProviderId();
+        const current = this.selectionRef?.current;
+        if (current === undefined || current.model === undefined) {
+            this.pushRow({ kind: 'error', text: t('effort.noModel') });
+            this.markDirty();
+            return;
+        }
+        const modelId = current.model;
+        const llm = this.ctx.get('llm');
+        let declaredOptions = [];
+        try {
+            const info = await llm?.resolveModelInfo(provider, modelId);
+            declaredOptions = (info?.reasoning?.efforts ?? []).map(e => ({ id: String(e.id), label: e.name }));
+        }
+        catch {
+            declaredOptions = [];
+        }
+        if (declaredOptions.length === 0 && providerUsesLocalOAuth(provider)) {
+            declaredOptions = localOAuthEffortChoices(modelId);
+        }
+        const parsed = parseEffortArg(arg ?? '');
+        if ((arg ?? '').trim() !== '') {
+            if (parsed === undefined) {
+                this.pushRow({ kind: 'error', text: t('effort.unknown', { id: (arg ?? '').trim() }) });
+                this.markDirty();
+                return;
+            }
+            const allowed = declaredOptions.length === 0
+                ? UNDECLARED_EFFORT_IDS
+                : declaredOptions.map(option => option.id);
+            if (parsed.kind === 'id' && !allowed.includes(parsed.id)) {
+                this.pushRow({ kind: 'error', text: t('effort.unknown', { id: parsed.id }) });
+                this.markDirty();
+                return;
+            }
+            await this.setReasoningEffort(provider, modelId, parsed.kind === 'default' ? undefined : parsed.id, declaredOptions.length === 0);
+            return;
+        }
+        const isUndeclared = declaredOptions.length === 0;
+        const available = isUndeclared ? undeclaredEffortChoices() : declaredOptions;
+        const currentEffort = current.reasoningEffort === undefined ? undefined : String(current.reasoningEffort);
+        const choices = [
+            {
+                id: undefined,
+                label: t('footer.effortDefault'),
+                desc: isUndeclared ? t('effort.descUndeclared') : t('effort.descFollow'),
+            },
+            ...available.map(opt => ({
+                id: opt.id,
+                label: opt.label,
+                desc: undefined,
+            })),
+        ];
+        const currentIndex = Math.max(0, choices.findIndex(c => c.id === currentEffort));
+        const answer = await this.askQuestion({
+            id: 'effort-pick',
+            question: isUndeclared
+                ? t('effort.pickCurrentUndeclared', { provider, model: modelId })
+                : t('effort.pickCurrent', { provider, model: modelId }),
+            options: choices.map(c => ({
+                label: c.label,
+                description: c.id === currentEffort ? t('disconnect.current') : c.desc,
+            })),
+        }, 0, 1, currentIndex);
+        const picked = choices.find(c => c.label === answer.selected[0]);
+        if (picked === undefined)
+            return;
+        await this.setReasoningEffort(provider, modelId, picked.id, isUndeclared);
+    }
+    async setReasoningEffort(provider, modelId, effort, isUndeclared) {
+        const next = {
+            provider,
+            model: modelId,
+            ...(effort === undefined ? {} : { reasoningEffort: ReasoningEffortId(effort) }),
+        };
+        if (this.selectionRef !== undefined)
+            this.selectionRef.current = next;
+        this.onSelectionChanged?.(next);
+        await this.persistDefaultSelection(next);
+        await this.rememberRoute(next);
+        const effortText = effort ?? t('effort.defaultExplicit');
+        const note = isUndeclared && effort !== undefined ? t('effort.manualNote') : '';
+        this.pushRow({
+            kind: 'system',
+            text: t('effort.updated', { provider, model: modelId, effort: effortText, note }),
+        });
+        this.markDirty();
+    }
     /** /subeffort: pick the reasoning effort subagent children use. */
-    async runSubeffortCommand() {
+    async runSubeffortCommand(arg) {
         const provider = this.effectiveSubagentProvider();
         const current = this.subagentSelection.current;
         const llm = this.ctx.get('llm');
@@ -6106,30 +7245,58 @@ export class SshTui {
         catch {
             effortOptions = [];
         }
-        if (effortOptions.length === 0 && current.reasoningEffort === undefined) {
+        const parsed = parseEffortArg(arg ?? '');
+        if ((arg ?? '').trim() !== '') {
+            if (parsed === undefined) {
+                this.pushRow({ kind: 'error', text: t('effort.unknown', { id: (arg ?? '').trim() }) });
+                this.markDirty();
+                return;
+            }
+            const allowed = effortOptions.length === 0
+                ? UNDECLARED_EFFORT_IDS
+                : effortOptions.map(option => option.id);
+            if (parsed.kind === 'id' && !allowed.includes(parsed.id)) {
+                this.pushRow({ kind: 'error', text: t('effort.unknown', { id: parsed.id }) });
+                this.markDirty();
+                return;
+            }
+            const targetEffort = parsed.kind === 'default' ? undefined : parsed.id;
+            const next = {
+                ...current,
+                ...(targetEffort === undefined ? { reasoningEffort: undefined } : { reasoningEffort: ReasoningEffortId(targetEffort) }),
+            };
+            const persisted = await this.saveSubagentSelection(next);
             this.pushRow({
                 kind: 'system',
-                text: `模型 ${provider}/${current.model} 未声明可选 reasoning effort，已保持提供商默认；请勿手动设置 high/max。`,
+                text: `${targetEffort === undefined
+                    ? t('effort.subDefault')
+                    : t('effort.subSwitched', { effort: targetEffort })}${persisted ? '' : t('effort.sessionOnly')}`,
             });
             this.markDirty();
             return;
         }
+        const isUndeclared = effortOptions.length === 0;
+        const available = isUndeclared ? undeclaredEffortChoices() : effortOptions;
         const choices = [
-            { id: undefined, label: SUBAGENT_DEFAULT_EFFORT_LABEL() },
-            ...effortOptions.map(option => ({ id: option.id, label: option.label })),
+            {
+                id: undefined,
+                label: SUBAGENT_DEFAULT_EFFORT_LABEL(),
+                desc: isUndeclared ? t('effort.subDescUndeclared') : t('effort.subDescFollow'),
+            },
+            ...available.map(option => ({ id: option.id, label: option.label, desc: undefined })),
         ];
+        const currentEffort = current.reasoningEffort === undefined ? undefined : String(current.reasoningEffort);
+        const currentIndex = Math.max(0, choices.findIndex(c => c.id === currentEffort));
         const answer = await this.askQuestion({
             id: 'subagent-effort-pick',
-            question: `选择子代理思考强度（${provider}/${current.model}）`,
+            question: isUndeclared
+                ? t('effort.pickSubUndeclared', { provider, model: current.model })
+                : t('effort.pickSub', { provider, model: current.model }),
             options: choices.map(option => ({
                 label: option.label,
-                description: option.id === undefined
-                    ? '清空自定义强度，跟随提供商/模型默认'
-                    : option.id === String(current.reasoningEffort)
-                        ? '当前'
-                        : undefined,
+                description: option.id === currentEffort ? t('disconnect.current') : option.desc,
             })),
-        });
+        }, 0, 1, currentIndex);
         const picked = choices.find(option => option.label === answer.selected[0]);
         if (picked === undefined)
             return;
@@ -6143,8 +7310,8 @@ export class SshTui {
         this.pushRow({
             kind: 'system',
             text: `${picked.id === undefined
-                ? '子代理思考强度已恢复为提供商默认。'
-                : `子代理思考强度已切换：${picked.id}。`}${persisted ? '' : '（仅当前会话）'}`,
+                ? t('effort.subDefault')
+                : t('effort.subSwitched', { effort: picked.id })}${persisted ? '' : t('effort.sessionOnly')}`,
         });
         this.markDirty();
     }
@@ -6211,6 +7378,37 @@ export class SshTui {
         this.pushRow({ kind: 'system', text: t('view.switched', { name: next === 'compact' ? t('view.compact') : t('view.detailed') }) });
         this.markDirty();
     }
+    /** /disconnect: pause (default) or continue the turn after SSH drop. */
+    async runDisconnectCommand(arg) {
+        const direct = parseDisconnectPolicy(arg);
+        let next = direct;
+        if (next === undefined && arg.trim() !== '') {
+            this.pushRow({ kind: 'error', text: t('disconnect.unknown', { id: arg.trim() }) });
+            this.markDirty();
+            return;
+        }
+        if (next === undefined) {
+            const current = this.disconnectPolicy;
+            const answer = await this.askQuestion({
+                id: 'disconnect-pick',
+                question: t('disconnect.pick'),
+                options: [
+                    { label: t('disconnect.pause'), description: current === 'pause' ? t('disconnect.current') : t('disconnect.pauseDesc') },
+                    { label: t('disconnect.continue'), description: current === 'continue' ? t('disconnect.current') : t('disconnect.continueDesc') },
+                ],
+            }, 0, 1, current === 'continue' ? 1 : 0);
+            const picked = answer.selected[0];
+            next = picked === t('disconnect.continue') ? 'continue' : 'pause';
+        }
+        this.disconnectPolicy = next;
+        await this.mergeUiSettings({ disconnect: next });
+        this.forceFullPaint = true;
+        this.pushRow({
+            kind: 'system',
+            text: t('disconnect.switched', { name: next === 'continue' ? t('disconnect.continue') : t('disconnect.pause') }),
+        });
+        this.markDirty();
+    }
     /** /mode: pick an agent preset (standard / minimal / ptc / cordis / routing-suite / ...). */
     async runModeCommand() {
         const agentPresets = this.ctx.get('agentPresets');
@@ -6237,7 +7435,7 @@ export class SshTui {
         if (selected === undefined)
             return;
         const selectedName = selected.name ?? selected.id;
-        const hasWork = this.agent.session.events.some(event => event.type === 'turn/start');
+        const hasWork = sessionEvents(this.agent.session).some(event => event.type === 'turn/start');
         if (!hasWork) {
             await agentPresets.recompose(this.agent.ctx, selected.id);
             this.presetId = selected.id;
@@ -6382,9 +7580,8 @@ export class SshTui {
             const quota = await this.refreshQuota({ reason: 'command', announce: true });
             if (quota !== undefined)
                 return;
-            const balance = await this.fetchAccountBalance(this.currentProviderId());
-            if (balance !== undefined) {
-                this.pushRow({ kind: 'system', text: formatAccountBalance(balance) });
+            if (this.balanceSnapshot !== undefined) {
+                this.pushRow({ kind: 'system', text: formatAccountBalance(this.balanceSnapshot) });
                 return;
             }
             const provider = this.currentProviderId();
@@ -6433,14 +7630,37 @@ export class SshTui {
             const provider = this.currentProviderId();
             const snapshot = await this.fetchQuotaSnapshot(provider);
             if (snapshot !== undefined) {
+                this.balanceSnapshot = undefined;
                 this.applyQuotaSnapshot(snapshot, options.announce);
                 return snapshot;
             }
+            try {
+                const balance = await this.fetchAccountBalance(provider);
+                if (balance !== undefined) {
+                    this.balanceSnapshot = balance;
+                    this.quotaSnapshot = undefined;
+                    this.quotaAlerted.clear();
+                    if (options.announce)
+                        this.pushRow({ kind: 'system', text: formatAccountBalance(balance) });
+                    this.markDirty();
+                    return undefined;
+                }
+            }
+            catch (error) {
+                if (options.reason === 'command')
+                    throw error;
+                this.markDirty();
+                return this.quotaSnapshot;
+            }
             if (this.quotaSnapshot !== undefined && this.quotaSnapshot.provider !== provider) {
                 this.quotaSnapshot = undefined;
                 this.quotaAlerted.clear();
                 this.markDirty();
             }
+            if (this.balanceSnapshot !== undefined && this.balanceSnapshot.provider !== provider) {
+                this.balanceSnapshot = undefined;
+                this.markDirty();
+            }
             return undefined;
         }
         finally {
@@ -6578,6 +7798,12 @@ export class SshTui {
                     if (this.dialog?.kind === 'inspect') {
                         this.scrollInspectOrTranscript(-1);
                     }
+                    else if (this.moveQuestionCursor(-1)) {
+                        return;
+                    }
+                    else if (this.dialog?.kind === 'onboarding' && this.moveProviderCursor(-1)) {
+                        return;
+                    }
                     else if (this.suggestionsVisible()) {
                         this.suggestionIndex = Math.max(0, this.suggestionIndex - 1);
                         this.markDirty();
@@ -6593,6 +7819,12 @@ export class SshTui {
                     if (this.dialog?.kind === 'inspect') {
                         this.scrollInspectOrTranscript(1);
                     }
+                    else if (this.moveQuestionCursor(1)) {
+                        return;
+                    }
+                    else if (this.dialog?.kind === 'onboarding' && this.moveProviderCursor(1)) {
+                        return;
+                    }
                     else if (this.suggestionsVisible()) {
                         this.suggestionIndex = Math.min(this.commandSuggestions.length - 1, this.suggestionIndex + 1);
                         this.markDirty();
@@ -6633,11 +7865,11 @@ export class SshTui {
             return;
         }
         if (combined === '\x1b[5~') {
-            this.scrollInspectOrTranscript(Math.max(3, Math.floor((process.stdout.rows || 24) / 2)));
+            this.scrollInspectOrTranscript(Math.max(3, Math.floor(this.screenRows() / 2)));
             return;
         }
         if (combined === '\x1b[6~') {
-            this.scrollInspectOrTranscript(-Math.max(3, Math.floor((process.stdout.rows || 24) / 2)));
+            this.scrollInspectOrTranscript(-Math.max(3, Math.floor(this.screenRows() / 2)));
             return;
         }
         if (parseCursorPositionReply(combined) !== undefined)
@@ -6768,9 +8000,10 @@ export class SshTui {
         const normalized = text.replaceAll('\r\n', '\n').replaceAll('\r', '\n');
         if (normalized === '')
             return;
+        this.leaveHistoryBrowse();
         this.input = `${this.input.slice(0, this.cursor)}${normalized}${this.input.slice(this.cursor)}`;
         this.cursor += normalized.length;
-        const cols = Math.max(10, process.stdout.columns || 80);
+        const cols = Math.max(10, this.screenColumns());
         const lineWidth = Math.max(1, cols - 2);
         if (normalized.includes('\n') || displayWidth(this.input) > lineWidth)
             this.inputFolded = true;
@@ -6844,12 +8077,14 @@ export class SshTui {
                 this.markDirty();
                 return;
             case '\x15':
+                this.leaveHistoryBrowse();
                 this.input = '';
                 this.cursor = 0;
                 this.inputFolded = false;
                 this.markDirty();
                 return;
             case '\x0b':
+                this.leaveHistoryBrowse();
                 this.input = this.input.slice(0, this.cursor);
                 this.markDirty();
                 return;
@@ -6902,11 +8137,27 @@ export class SshTui {
             return;
         }
         if (char >= ' ' && char !== '\x7f') {
+            this.leaveHistoryBrowse();
             this.input = `${this.input.slice(0, this.cursor)}${char}${this.input.slice(this.cursor)}`;
             this.cursor += char.length;
             this.markDirty();
         }
     }
+    moveQuestionCursor(delta) {
+        const dialog = this.dialog;
+        if (dialog === undefined || dialog.kind !== 'questions')
+            return false;
+        const count = dialog.question.options?.length ?? 0;
+        if (count === 0)
+            return false;
+        dialog.cursor = Math.max(0, Math.min(count - 1, dialog.cursor + delta));
+        if (dialog.question.multiSelect !== true) {
+            dialog.selected.clear();
+            dialog.selected.add(dialog.cursor);
+        }
+        this.markDirty();
+        return true;
+    }
     handleDialogChar(text) {
         const dialog = this.dialog;
         if (dialog === undefined)
@@ -6933,6 +8184,7 @@ export class SshTui {
         const key = text.toLowerCase();
         const index = QUESTION_OPTION_KEYS.indexOf(key);
         if (index >= 0 && index < (dialog.question.options?.length ?? 0)) {
+            dialog.cursor = index;
             if (dialog.question.multiSelect === true) {
                 if (dialog.selected.has(index))
                     dialog.selected.delete(index);
@@ -6976,31 +8228,86 @@ export class SshTui {
             this.markDirty();
         }
     }
+    /**
+     * The wizard's first-step list: the pinned templates plus the web-catalog
+     * presets (deduped), filtered by the search box text.
+     */
+    mergedProviderEntries(state) {
+        const templates = providerTemplates();
+        const templateEntries = [
+            { key: 'template:official', label: templates.official.label, detail: 'api.deepseek.com' },
+            { key: 'template:opencode-go', label: templates['opencode-go'].label, detail: 'opencode.ai/zen/go · Responses' },
+            { key: 'template:openai-completions', label: templates['openai-completions'].label, detail: 'openai-completions' },
+            { key: 'template:openai-responses', label: templates['openai-responses'].label, detail: 'openai-responses' },
+            { key: 'template:anthropic-messages', label: templates['anthropic-messages'].label, detail: 'anthropic-messages' },
+        ];
+        return mergeProviderEntries(templateEntries, state.catalogPresets ?? [], ['deepseek', 'opencode-go'], this.input);
+    }
+    moveProviderCursor(delta) {
+        const state = this.onboarding;
+        if (state === undefined || state.step !== 'provider')
+            return false;
+        const total = this.mergedProviderEntries(state).length;
+        if (total === 0)
+            return false;
+        state.providerCursor = Math.max(0, Math.min(total - 1, state.providerCursor + delta));
+        this.markDirty();
+        return true;
+    }
     handleOnboardingChar(text) {
         const state = this.onboarding;
         if (state === undefined)
             return;
         switch (state.step) {
-            case 'provider':
-                {
-                    const selected = text === '1' ? 'official'
-                        : text === '2' ? 'opencode-go'
-                            : text === '3' ? 'openai-completions'
-                                : text === '4' ? 'openai-responses'
-                                    : text === '5' ? 'anthropic-messages'
-                                        : undefined;
-                    if (selected !== undefined) {
-                        state.providerType = selected;
-                        state.providerId = '';
-                        state.baseUrl = '';
-                        state.key = '';
-                        state.models = [];
-                        this.input = '';
-                        this.cursor = 0;
+            case 'provider': {
+                const options = this.mergedProviderEntries(state);
+                if (text === '\r' || text === '\n') {
+                    const index = Math.min(state.providerCursor, options.length - 1);
+                    const entry = options[index];
+                    if (entry === undefined) {
+                        this.markDirty();
+                        return;
+                    }
+                    state.providerId = '';
+                    state.baseUrl = '';
+                    state.key = '';
+                    state.models = [];
+                    this.input = '';
+                    this.cursor = 0;
+                    if (entry.catalog !== undefined) {
+                        state.providerType = 'catalog';
+                        state.catalog = entry.catalog;
+                        state.step = 'id';
+                    }
+                    else {
+                        state.providerType = entry.key.slice('template:'.length);
                         this.advanceOnboarding();
                     }
+                    this.markDirty();
+                    return;
+                }
+                if (text === '\x7f') {
+                    if (this.input !== '') {
+                        this.input = this.input.slice(0, -1);
+                        state.providerCursor = 0;
+                    }
+                    this.markDirty();
+                    return;
+                }
+                let changed = false;
+                for (const char of text) {
+                    if (char >= ' ' && char !== '\x7f') {
+                        this.input = `${this.input.slice(0, this.cursor)}${char}${this.input.slice(this.cursor)}`;
+                        this.cursor += char.length;
+                        changed = true;
+                    }
+                }
+                if (changed) {
+                    state.providerCursor = 0;
+                    this.markDirty();
                 }
                 return;
+            }
             case 'id':
             case 'base-url':
             case 'key':
@@ -7012,7 +8319,7 @@ export class SshTui {
                 if (text === '\r' || text === '\n') {
                     const value = this.input.trim();
                     if (state.step === 'id') {
-                        const template = providerTemplates()[state.providerType];
+                        const template = onboardTemplate(state);
                         const id = value === '' ? template.defaultId : value;
                         if (!/^[a-z0-9][a-z0-9-]*$/u.test(id)) {
                             this.pushRow({ kind: 'error', text: 'Provider ID 只能包含小写字母、数字和连字符，且不能以连字符开头。' });
@@ -7022,7 +8329,7 @@ export class SshTui {
                         state.providerId = id;
                     }
                     else if (state.step === 'key') {
-                        if (value === '') {
+                        if (value === '' && state.providerType !== 'catalog') {
                             this.pushRow({ kind: 'error', text: 'API Key 不能为空，请重新输入。' });
                             this.markDirty();
                             return;
@@ -7030,7 +8337,7 @@ export class SshTui {
                         state.key = value;
                     }
                     else if (state.step === 'models') {
-                        const template = providerTemplates()[state.providerType];
+                        const template = onboardTemplate(state);
                         const parsed = value === ''
                             ? template.defaultModels
                             : value.split(/[\s,，]+/u).filter(Boolean);
@@ -7109,12 +8416,12 @@ export class SshTui {
         const state = this.onboarding;
         if (state === undefined || state.step !== 'models')
             return;
-        const template = providerTemplates()[state.providerType];
+        const template = onboardTemplate(state);
         const providerType = state.providerType;
         const baseUrl = state.baseUrl;
         const key = state.key;
         const baseURL = baseUrl === '' ? template.defaultBaseUrl : baseUrl;
-        if (baseURL === '') {
+        if (baseURL === '' && providerType !== 'catalog') {
             this.pushRow({ kind: 'error', text: '请先填写 Base URL 再获取模型列表。' });
             this.markDirty();
             return;
@@ -7127,7 +8434,10 @@ export class SshTui {
             if (llm === undefined)
                 throw new Error('llm 服务不可用');
             const discovered = await discoverProviderModels(llm, {
-                baseURL,
+                ...(providerType === 'catalog' && state.catalog !== undefined && baseURL === ''
+                    ? {}
+                    : { baseURL }),
+                ...(providerType === 'catalog' && state.catalog !== undefined ? { provider: state.catalog.id } : {}),
                 ...(template.api === undefined ? {} : { api: template.api }),
                 ...(key === '' ? {} : { apiKey: key }),
             }, AbortSignal.timeout(15_000));
@@ -7167,7 +8477,7 @@ export class SshTui {
         try {
             const credentials = this.ctx.get('credentials');
             const settings = this.ctx.get('settings');
-            const template = providerTemplates()[state.providerType];
+            const template = onboardTemplate(state);
             if (state.providerType === 'official') {
                 const envRef = 'DEEPSEEK_API_KEY';
                 await this.saveCredential(credentials, envRef, state.key);
@@ -7226,15 +8536,24 @@ export class SshTui {
                         mergedIds.push(id);
                     }
                 }
+                // Catalog routes mirror the web's model settings: an empty profile is
+                // valid — the installed catalog serves endpoint, protocol, and models,
+                // and an absent key defers to the provider's own environment auth.
+                const catalogRoute = state.providerType === 'catalog' && state.catalog !== undefined;
+                const keyless = catalogRoute && state.key === '';
                 const profile = {
                     displayName: typeof existing?.displayName === 'string' && existing.displayName.trim() !== ''
                         ? existing.displayName
                         : template.label,
-                    apiKeyEnv: envRef,
+                    ...(keyless ? {} : { apiKeyEnv: envRef }),
                     api: template.api ?? existing?.api,
-                    baseURL: state.baseUrl === ''
-                        ? (typeof existing?.baseURL === 'string' && existing.baseURL !== '' ? existing.baseURL : template.defaultBaseUrl)
-                        : state.baseUrl,
+                    ...(catalogRoute && state.baseUrl === ''
+                        ? {}
+                        : {
+                            baseURL: state.baseUrl === ''
+                                ? (typeof existing?.baseURL === 'string' && existing.baseURL !== '' ? existing.baseURL : template.defaultBaseUrl)
+                                : state.baseUrl,
+                        }),
                     models: mergedIds.map(id => ({
                         id,
                         ...(reasoningEfforts === undefined ? {} : { reasoningEfforts }),
@@ -7253,7 +8572,7 @@ export class SshTui {
                 }
                 // Only store the key when its provider profile actually made it to
                 // settings; otherwise the saved key points at an unusable route.
-                if (saved)
+                if (saved && !keyless)
                     await this.saveCredential(credentials, envRef, state.key);
                 if (saved) {
                     const selection = {
@@ -7507,6 +8826,8 @@ export class SshTui {
         if (text === '')
             return;
         if (text.startsWith('/')) {
+            this.historyIndex = this.history.length;
+            this.historyDraft = '';
             this.runCommand(text);
             return;
         }
@@ -7514,6 +8835,7 @@ export class SshTui {
             return;
         this.history.push(text);
         this.historyIndex = this.history.length;
+        this.historyDraft = '';
         this.input = '';
         this.cursor = 0;
         this.inputFolded = false;
@@ -7527,7 +8849,7 @@ export class SshTui {
             this.agent.steer(message);
         }
         else {
-            this.beginWait(text);
+            this.beginWait();
             this.agent.followup(message);
         }
         this.markDirty();
@@ -7538,10 +8860,16 @@ export class SshTui {
         switch (command) {
             case 'help': {
                 const local = localizedCommands()
-                    .filter(item => item.name !== 'help' && item.name !== 'exit')
+                    .filter(item => item.name !== 'help' && item.aliasOf === undefined)
                     .map(item => `/${item.name.padEnd(12)} ${item.description}`);
+                const seen = new Set(localizedCommands().map(item => item.name));
                 const dsh = (this.ctx.get('commands')?.list(this.agent) ?? [])
-                    .map(item => `/${item.name.padEnd(12)} ${item.description}${item.input?.images === true ? '（可附图）' : ''}  (dsh)`);
+                    .filter(item => !seen.has(item.name))
+                    .map(item => {
+                    const descKey = `cmd.${item.name}`;
+                    const desc = t(descKey, undefined, item.description);
+                    return `/${item.name.padEnd(12)} ${item.input?.images === true ? t('cmd.withImagesSuffix', { desc }) : desc}  (dsh)`;
+                });
                 this.pushRow({
                     kind: 'system',
                     text: [
@@ -7555,6 +8883,7 @@ export class SshTui {
                         t('help.intro5'),
                         t('help.intro6'),
                         t('help.intro7'),
+                        t('help.intro8'),
                     ].join('\n'),
                 });
                 break;
@@ -7574,6 +8903,17 @@ export class SshTui {
                     this.markDirty();
                 });
                 break;
+            case 'effort':
+                void this.runEffortCommand(arg).catch((error) => {
+                    if (error instanceof UserQuestionError) {
+                        this.pushRow({ kind: 'system', text: t('help.effortCancel') });
+                    }
+                    else {
+                        this.pushRow({ kind: 'error', text: `/effort failed: ${errorChain(error)}` });
+                    }
+                    this.markDirty();
+                });
+                break;
             case 'provider':
                 void this.runProviderCommand().catch((error) => {
                     if (error instanceof UserQuestionError) {
@@ -7597,7 +8937,7 @@ export class SshTui {
                 });
                 break;
             case 'subeffort':
-                void this.runSubeffortCommand().catch((error) => {
+                void this.runSubeffortCommand(arg).catch((error) => {
                     if (error instanceof UserQuestionError) {
                         this.pushRow({ kind: 'system', text: t('help.subeffortCancel') });
                     }
@@ -7641,6 +8981,17 @@ export class SshTui {
                     this.markDirty();
                 });
                 break;
+            case 'disconnect':
+                void this.runDisconnectCommand(arg).catch((error) => {
+                    if (error instanceof UserQuestionError) {
+                        this.pushRow({ kind: 'system', text: t('help.modeCancel') });
+                    }
+                    else {
+                        this.pushRow({ kind: 'error', text: `/disconnect failed: ${errorChain(error)}` });
+                    }
+                    this.markDirty();
+                });
+                break;
             case 'find':
                 this.runFindCommand(arg);
                 break;
@@ -7650,7 +9001,6 @@ export class SshTui {
                 this.streamingReasoning = undefined;
                 this.thinkingStartedAt = undefined;
                 this.waitStartedAt = undefined;
-                this.waitPrompt = undefined;
                 this.focusedRow = null;
                 this.searchHits = [];
                 this.searchIndex = -1;
@@ -7681,6 +9031,7 @@ export class SshTui {
                         activeSubagents: this.activeSubagents.size,
                         plan: plan === undefined ? 'off' : plan.pending ? 'pending' : plan.active ? 'on' : 'off',
                         paint: formatLinkQualityChip(this.paintLink, this.paintIntervalMs, this.paintRttMs, this.paintProbed),
+                        disconnect: this.disconnectPolicy,
                         waitingQuestions: waiting,
                         ...(quota === undefined ? {} : { quota }),
                         parentModel: model,
@@ -7751,6 +9102,40 @@ export class SshTui {
                     this.markDirty();
                 });
                 break;
+            case 'approval': {
+                const requested = arg === '' ? 'toggle' : arg;
+                if (requested === 'status') {
+                    this.pushRow({
+                        kind: 'system',
+                        text: this.autoApprovalMode === 'auto'
+                            ? t('approval.statusAuto', { allowed: this.autoAllowedCount, denied: this.autoDeniedCount })
+                            : t('approval.statusOff'),
+                    });
+                    this.markDirty();
+                    break;
+                }
+                const next = requested === 'toggle'
+                    ? this.autoApprovalMode === 'auto' ? 'off' : 'auto'
+                    : parseAutoApprovalMode(requested);
+                if (next === undefined) {
+                    this.pushRow({ kind: 'error', text: t('approval.unknown', { arg }) });
+                    this.markDirty();
+                    break;
+                }
+                this.autoApprovalMode = next;
+                void this.mergeUiSettings({ autoApproval: next }).catch((error) => {
+                    this.pushRow({ kind: 'error', text: `/approval failed: ${errorChain(error)}` });
+                    this.markDirty();
+                });
+                this.pushRow({
+                    kind: 'system',
+                    text: next === 'auto' ? t('approval.autoOn') : t('approval.autoOff'),
+                });
+                if (next === 'auto')
+                    this.warnApprovalMismatch();
+                this.markDirty();
+                break;
+            }
             case 'setup':
                 void this.runOnboarding();
                 break;
@@ -7791,14 +9176,16 @@ export class SshTui {
                             this.pushRow({ kind: 'error', text: `Unknown command: /${command} (try /help)` });
                             return;
                         }
-                        const result = execution.result;
-                        if (result.kind === 'success') {
-                            if (result.text !== undefined && result.text !== '') {
-                                this.pushRow({ kind: 'system', text: result.text });
-                            }
+                        // command/run + command/done already paint via handleCommandDone
+                        // when the session log is live. Fall back if those events never
+                        // arrived (no persistence, or a handler that skipped the log).
+                        if (this.seenCommandDoneIds.has(String(execution.commandId)))
+                            return;
+                        if (execution.result.kind === 'error') {
+                            this.pushRow({ kind: 'error', text: this.formatCommandText(execution.result.text) });
                         }
-                        else {
-                            this.pushRow({ kind: 'error', text: result.text });
+                        else if (execution.result.text !== undefined && execution.result.text !== '') {
+                            this.pushRow({ kind: 'system', text: this.formatCommandText(execution.result.text) });
                         }
                     }).catch((error) => {
                         this.pushRow({ kind: 'error', text: `/${command} failed: ${errorChain(error)}` });
@@ -7846,6 +9233,7 @@ export class SshTui {
     backspace() {
         if (this.cursor === 0)
             return;
+        this.leaveHistoryBrowse();
         const range = this.graphemeBefore(this.cursor);
         this.input = `${this.input.slice(0, range.start)}${this.input.slice(range.end)}`;
         this.cursor = range.start;
@@ -7855,6 +9243,7 @@ export class SshTui {
         const range = this.graphemeAfter(this.cursor);
         if (range === undefined)
             return;
+        this.leaveHistoryBrowse();
         this.input = `${this.input.slice(0, range.start)}${this.input.slice(range.end)}`;
         this.cursor = range.start;
         this.markDirty();
@@ -7890,6 +9279,8 @@ export class SshTui {
     historyBack() {
         if (this.history.length === 0)
             return;
+        if (this.historyIndex === this.history.length)
+            this.historyDraft = this.input;
         if (this.historyIndex <= 0)
             return;
         this.historyIndex -= 1;
@@ -7898,13 +9289,22 @@ export class SshTui {
         this.markDirty();
     }
     historyForward() {
-        if (this.historyIndex >= this.history.length)
+        if (this.historyIndex < 0 || this.historyIndex >= this.history.length)
             return;
         this.historyIndex += 1;
-        this.input = this.history[this.historyIndex] ?? '';
+        this.input = this.historyIndex >= this.history.length
+            ? this.historyDraft
+            : (this.history[this.historyIndex] ?? '');
         this.cursor = this.input.length;
         this.markDirty();
     }
+    /** Typing while browsing history detaches from the saved item. */
+    leaveHistoryBrowse() {
+        if (this.historyIndex >= 0 && this.historyIndex < this.history.length) {
+            this.historyIndex = this.history.length;
+            this.historyDraft = this.input;
+        }
+    }
 }
 function optionsLength(dialog) {
     return dialog.kind === 'questions' ? dialog.question.options?.length ?? 0 : 0;
@@ -7972,6 +9372,12 @@ export function mountTui(ctx, config) {
             stopWaiting();
             await controller?.dispose();
         },
+        async handleHangup() {
+            await controller?.handleHangup();
+        },
+        disconnectPolicy() {
+            return controller?.currentDisconnectPolicy() ?? 'pause';
+        },
     };
 }
 //# sourceMappingURL=tui.js.map