dsh-ssh-tui 0.1.5 → 0.1.7

package/lib/tui.js

@@ -21,6 +21,7 @@ import { SessionId } from '@deepseek-ai/dsh-session';
 import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { formatSessionTime, listResumableSessions } from './session-list.js';
 import { defaultReasoningEffort } from './reasoning.js';
+import { DEFAULT_SUBAGENT_MODEL, SUBAGENT_SETTINGS_NAMESPACE, subagentSettingsValue, } from './subagent-model.js';
 import { UserQuestionError, } from '@deepseek-ai/dsh-user-questions';
 const PROVIDER_TEMPLATES = {
     official: {
@@ -62,6 +63,8 @@ const RENDER_INTERVAL_MS = 120;
 const WAIT_INDICATOR_MS = 8000;
 const STALL_WARNING_MS = 60000;
 const SPINNER = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+const QUESTION_OPTION_KEYS = '123456789abcdefghijklmnopqrstuvwxyz';
+const SUBAGENT_DEFAULT_EFFORT_LABEL = '跟随提供商默认';
 const RESERVED_BOTTOM_LINES = 3; // input line + stats line + status line
 const MAX_TRANSCRIPT_ROWS = 5000;
 const IS_WINDOWS = process.platform === 'win32';
@@ -78,7 +81,12 @@ function displayDshPath(file) {
         }
         return `${home}\\${file}`.replaceAll('/', '\\');
     }
-    return `~/.dsh/${file}`;
+    const userHome = homedir();
+    if (home === userHome)
+        return `~/.dsh/${file}`;
+    if (home.startsWith(`${userHome}/`))
+        return `~/${home.slice(userHome.length + 1)}/${file}`;
+    return join(home, file);
 }
 const DSH_ENV_FILE = join(dshHomeDir(), IS_WINDOWS ? 'env.cmd' : 'env.sh');
 const DEEPSEEK_LOGO_VARIANTS = [
@@ -189,6 +197,8 @@ const DEEPSEEK_LOGO_VARIANTS = [
 const LOCAL_COMMANDS = [
     { name: 'help', description: 'show all available commands' },
     { name: 'model', description: 'select model and reasoning effort (same provider)' },
+    { 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, code, cordis, routing-suite, ...)' },
     { name: 'quit', description: 'exit the TUI' },
     { name: 'exit', description: 'exit the TUI' },
@@ -204,6 +214,12 @@ const LOCAL_COMMANDS = [
 function displayWidth(text) {
     let width = 0;
     for (const char of text) {
+        if (char === '\t') {
+            // Tabs are expanded to spaces before rendering; keep the width
+            // calculation consistent with `sanitizeTerminalText()`.
+            width += 4;
+            continue;
+        }
         const cp = char.codePointAt(0) ?? 0;
         const wide = (cp >= 0x1100 && cp <= 0x115f) ||
             (cp >= 0x2e80 && cp <= 0xa4cf) ||
@@ -218,14 +234,25 @@ function displayWidth(text) {
     }
     return width;
 }
+/** Strip terminal control sequences and expand tabs for display output. */
+function sanitizeTerminalText(text) {
+    return text
+        .replace(/[\x1b\u009b]/gu, '')
+        .replace(/[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/gu, '')
+        .replaceAll('\t', '    ');
+}
+/** UTF-16 length of the first code point, so fallback cuts never split a surrogate pair. */
+function firstCodePointLength(text) {
+    return Array.from(text)[0]?.length ?? 1;
+}
 function wrap(text, width) {
     const lines = [];
-    for (const rawLine of text.split('\n')) {
-        if (rawLine === '') {
+    for (const sourceLine of text.split('\n')) {
+        if (sourceLine === '') {
             lines.push('');
             continue;
         }
-        let rest = rawLine;
+        let rest = sanitizeTerminalText(sourceLine);
         while (displayWidth(rest) > width) {
             let cut = 0;
             let used = 0;
@@ -237,7 +264,7 @@ function wrap(text, width) {
                 cut += char.length;
             }
             if (cut === 0)
-                cut = 1;
+                cut = firstCodePointLength(rest);
             lines.push(rest.slice(0, cut));
             rest = rest.slice(cut);
         }
@@ -247,9 +274,13 @@ function wrap(text, width) {
 }
 function truncate(text, maxLines) {
     const lines = text.split('\n');
+    if (maxLines <= 0)
+        return '';
     if (lines.length <= maxLines)
         return text;
-    const head = lines.slice(0, Math.max(1, maxLines - 1));
+    if (maxLines === 1)
+        return `… ${lines.length - 1} more line(s) …`;
+    const head = lines.slice(0, Math.max(0, maxLines - 2));
     const tail = lines.slice(-1);
     return [...head, `… ${lines.length - head.length - 1} more line(s) …`, ...tail].join('\n');
 }
@@ -354,11 +385,12 @@ function markdownBaseCode(kind) {
 }
 /** Render one pre-wrapped markdown line as ANSI (or plain text without color). */
 function renderMarkdownBlockLine(block, color) {
+    const segments = block.segments.map(segment => ({ ...segment, text: sanitizeTerminalText(segment.text) }));
     if (!color)
-        return block.segments.map(segment => segment.text).join('');
+        return segments.map(segment => segment.text).join('');
     const base = markdownBaseCode(block.base);
     let out = `\x1b[${base}m`;
-    for (const segment of block.segments) {
+    for (const segment of segments) {
         const code = markdownSegmentCode(segment.kind);
         if (code === '') {
             out += segment.text;
@@ -402,7 +434,8 @@ function headingSegments(text, level) {
 export function renderMarkdownLines(text, width, color) {
     const lines = [];
     let inFence = false;
-    for (const raw of text.split('\n')) {
+    for (const sourceLine of text.split('\n')) {
+        const raw = sanitizeTerminalText(sourceLine);
         const fence = /^```([^\n]*)$/u.exec(raw.trim());
         if (fence !== null) {
             inFence = !inFence;
@@ -484,21 +517,27 @@ export function renderMarkdownLines(text, width, color) {
     return lines;
 }
 /** Cut one line to fit a width, appending an ellipsis when truncated. */
-function truncateToWidth(text, width) {
-    if (displayWidth(text) <= width)
-        return text;
+export function truncateToWidth(text, width) {
+    const safe = sanitizeTerminalText(text);
+    if (width <= 0)
+        return '';
+    if (displayWidth(safe) <= width)
+        return safe;
+    if (width === 1)
+        return '…';
+    const limit = width - 1;
     let cut = 0;
     let used = 0;
-    for (const char of text) {
+    for (const char of safe) {
         const charWidth = displayWidth(char);
-        if (used + charWidth > width - 1)
+        if (used + charWidth > limit)
             break;
         used += charWidth;
         cut += char.length;
     }
     if (cut === 0)
-        cut = 1;
-    return `${text.slice(0, cut)}…`;
+        cut = firstCodePointLength(safe);
+    return `${safe.slice(0, cut)}…`;
 }
 /** Slice up to `maxWidth` display columns from the beginning of `text`. */
 function forwardSliceByWidth(text, maxWidth) {
@@ -616,9 +655,11 @@ export function openCodeSourceFor(provider, llmPiAiSection) {
         return null;
     const apiKeyEnv = typeof profile?.apiKeyEnv === 'string' && profile.apiKeyEnv.trim() !== ''
         ? profile.apiKeyEnv
-        : provider === 'opencode' || provider === 'opencode-go'
+        : provider === 'opencode'
             ? 'OPENCODE_API_KEY'
-            : `${provider.replaceAll('-', '_').toUpperCase()}_API_KEY`;
+            : provider === 'opencode-go'
+                ? 'OPENCODE_GO_API_KEY'
+                : `${provider.replaceAll('-', '_').toUpperCase()}_API_KEY`;
     const label = typeof profile?.displayName === 'string' && profile.displayName.trim() !== ''
         ? profile.displayName
         : isGo ? 'OpenCode Go' : 'OpenCode Zen';
@@ -720,6 +761,8 @@ function isEscapePrefix(text) {
         return false;
     if (text === '\x1b[')
         return true;
+    if (text === '\x1bO' || /^\x1bO[A-Z]?$/u.test(text))
+        return true;
     if (/^\x1b\[[A-D]$/u.test(text))
         return true;
     if (/^\x1b\[[HF]$/u.test(text))
@@ -749,11 +792,23 @@ function scalarText(value) {
     }
     return null;
 }
+/** Take the first `max` code points of a string without splitting surrogates. */
+function sliceCodePoints(text, max) {
+    if (max <= 0)
+        return '';
+    return Array.from(text).slice(0, max).join('');
+}
+/** Take the last `max` code points of a string without splitting surrogates. */
+function lastCodePoints(text, max) {
+    if (max <= 0)
+        return '';
+    return Array.from(text).slice(-max).join('');
+}
 /** Prefer the fields a human scans for; fall back to the first scalar pairs. */
 function friendlyArgsSummary(name, args) {
     const parsed = parseJsonArgs(args);
     if (parsed === null)
-        return args.slice(0, 120);
+        return sliceCodePoints(args, 120);
     const preferred = [
         'path', 'file_path', 'file', 'query', 'pattern', 'url', 'command',
         'description', 'content', 'file_text', 'old_string', 'new_string',
@@ -779,7 +834,7 @@ function friendlyArgsSummary(name, args) {
         }
     }
     const summary = parts.join('  ');
-    return summary === '' ? name : summary.slice(0, 160);
+    return summary === '' ? name : sliceCodePoints(summary, 160);
 }
 const SHELL_TOOL_NAMES = new Set(['bash', 'pwsh']);
 const DIFF_TOOL_NAMES = new Set(['edit', 'write', 'str_replace_editor']);
@@ -827,7 +882,7 @@ function diffHunksFromArgs(name, argsRaw) {
 export function presentToolCall(name, args) {
     const parsed = parseJsonArgs(args);
     if (SHELL_TOOL_NAMES.has(name)) {
-        const command = typeof parsed?.command === 'string' ? parsed.command : args.slice(0, 80);
+        const command = typeof parsed?.command === 'string' ? parsed.command : sliceCodePoints(args, 80);
         return {
             title: name,
             summary: `$ ${command}`,
@@ -873,6 +928,17 @@ function diffContentLines(text) {
     const body = text.endsWith('\n') ? text.slice(0, -1) : text;
     return body.split('\n');
 }
+/** Cap one flat diff/body row list to `maxLines` while preserving the final line. */
+function capDisplayLines(lines, maxLines) {
+    const budget = Math.max(1, Math.floor(maxLines));
+    if (lines.length <= budget)
+        return [...lines];
+    const omitted = lines.length - budget + 1;
+    const marker = { kind: 'tool-result', text: `… ${omitted} more line(s) …` };
+    if (budget === 1)
+        return [marker];
+    return [...lines.slice(0, budget - 2), marker, ...lines.slice(-1)];
+}
 /** Flatten hunks into git-style `-`/`+` lines plus the web-compatible footer. */
 export function renderToolDiff(diffs, maxLines) {
     const rows = [];
@@ -901,15 +967,7 @@ export function renderToolDiff(diffs, maxLines) {
         kind: 'tool-result',
         text: `└ +${added} -${removed} · ${paths.size} file${paths.size === 1 ? '' : 's'}`,
     });
-    if (rows.length <= maxLines)
-        return rows;
-    const head = rows.slice(0, Math.max(1, maxLines - 1));
-    const tail = rows.slice(-1);
-    return [
-        ...head,
-        { kind: 'tool-result', text: `… ${rows.length - head.length - 1} more line(s) …` },
-        ...tail,
-    ];
+    return capDisplayLines(rows, maxLines);
 }
 /** Keys whose multiline strings render as indented content blocks. */
 const LONG_TEXT_KEYS = new Set([
@@ -917,6 +975,8 @@ const LONG_TEXT_KEYS = new Set([
     'plan', 'markdown', 'details', 'description', 'text',
 ]);
 const JSON_STRING_CAP = 400;
+const JSON_MAX_DEPTH = 16;
+const JSON_MAX_ENTRIES = 60;
 /** Convert any parsed JSON value into readable indented display lines. */
 export function friendlyJsonLines(value, depth = 0) {
     const pad = '  '.repeat(depth);
@@ -929,11 +989,15 @@ export function friendlyJsonLines(value, depth = 0) {
     if (typeof value === 'number' || typeof value === 'boolean') {
         return [`${pad}${String(value)}`];
     }
+    if (depth >= JSON_MAX_DEPTH) {
+        return [`${pad}…`];
+    }
     if (Array.isArray(value)) {
         if (value.length === 0)
             return [`${pad}[]`];
+        const shown = value.slice(0, JSON_MAX_ENTRIES);
         const lines = [];
-        for (const item of value) {
+        for (const item of shown) {
             if (item !== null && typeof item === 'object') {
                 lines.push(`${pad}-`);
                 lines.push(...friendlyJsonLines(item, depth + 1));
@@ -942,14 +1006,17 @@ export function friendlyJsonLines(value, depth = 0) {
                 lines.push(`${pad}- ${friendlyJsonLines(item, 0)[0] ?? ''}`);
             }
         }
+        if (value.length > shown.length)
+            lines.push(`${pad}… ${value.length - shown.length} more item(s)`);
         return lines;
     }
     if (typeof value === 'object') {
         const entries = Object.entries(value);
         if (entries.length === 0)
             return [`${pad}{}`];
+        const shown = entries.slice(0, JSON_MAX_ENTRIES);
         const lines = [];
-        for (const [key, item] of entries) {
+        for (const [key, item] of shown) {
             if (typeof item === 'string' && item.includes('\n') && LONG_TEXT_KEYS.has(key)) {
                 const contentLines = item.split('\n');
                 lines.push(`${pad}${key}:`);
@@ -969,6 +1036,8 @@ export function friendlyJsonLines(value, depth = 0) {
                 lines.push(`${pad}${key}: ${scalar}`);
             }
         }
+        if (entries.length > shown.length)
+            lines.push(`${pad}… ${entries.length - shown.length} more field(s)`);
         return lines;
     }
     return [`${pad}${String(value)}`];
@@ -1031,7 +1100,7 @@ export function toolBodyLines(row, maxLines) {
             }
         }
     }
-    return out;
+    return capDisplayLines(out, maxLines);
 }
 /** Recover the shell tools' exit marker, mirroring @deepseek-ai/dsh-shell/render. */
 export function parseExitStatus(text) {
@@ -1065,6 +1134,7 @@ export function formatDuration(ms) {
 export function formatTokensPerSecond(tokensPerSecond) {
     return `${Math.round(tokensPerSecond)} tok/s`;
 }
+const GRAPHEME_SEGMENTER = new Intl.Segmenter(undefined, { granularity: 'grapheme' });
 /** Owns one interactive terminal channel and its agent event wiring. */
 export class SshTui {
     ctx;
@@ -1079,6 +1149,8 @@ export class SshTui {
     historyIndex = -1;
     status = 'idle';
     dialog;
+    dialogQueue = [];
+    onboardingCompletion;
     dirty = true;
     disposed = false;
     exiting = false;
@@ -1091,6 +1163,7 @@ export class SshTui {
     resume;
     providerName;
     selectionRef;
+    subagentSelection;
     onSwitchSession;
     onSelectionChanged;
     resumePicker;
@@ -1108,6 +1181,7 @@ export class SshTui {
     lastActivity = Date.now();
     stalledWarningShown = false;
     lastPaintAt = 0;
+    commandAbort;
     activeSubagents = new Map();
     subagentSessions = new Set();
     openToolCalls = new Map();
@@ -1133,6 +1207,7 @@ export class SshTui {
     escapeTimer;
     thinkingStartedAt;
     completionSignaled = false;
+    replaying = false;
     completedAt = 0;
     lastTitleUpdateAt = 0;
     lastPaintRows = [];
@@ -1144,11 +1219,13 @@ export class SshTui {
         this.color = config.color !== false && !noColorEnv && process.env.TERM !== 'dumb';
         this.maxToolOutputLines = Math.max(1, config.maxToolOutputLines ?? 6);
         this.showReasoning = config.showReasoning !== false;
-        this.goodbye = this.ctx.get('tuiGoodbyeMessage')
+        this.goodbye = config.goodbye
+            ?? this.ctx.get('tuiGoodbyeMessage')
             ?? `To resume this session: dsh --profile tui --resume=${this.agent.id}`;
         this.resume = config.resume === true;
         this.providerName = config.provider ?? 'deepseek-official';
         this.selectionRef = config.selectionRef;
+        this.subagentSelection = config.subagentSelection ?? { current: { model: DEFAULT_SUBAGENT_MODEL } };
         this.onSwitchSession = config.onSwitchSession;
         this.onSelectionChanged = config.onSelectionChanged;
         this.resumePicker = config.resumePicker === true;
@@ -1166,7 +1243,7 @@ export class SshTui {
         process.stdin.on('data', this.handleData);
         process.stdout.on('resize', this.markDirty);
         process.on('SIGWINCH', this.markDirty);
-        this.disposers.push(this.ctx.on('session/event', this.handleSessionEvent), this.ctx.on('agent/status', this.handleStatus), this.ctx.on('agent/error', this.handleError), this.ctx.on('agent/disposed', this.handleDisposed), this.ctx.on('agent/inbox/claimed', this.handleInboxClaimed), this.ctx.on('agent/inbox/discarded', this.handleInboxDiscarded), this.ctx.on('subagent/start', this.handleSubagentStart), this.ctx.on('subagent/end', this.handleSubagentEnd), this.ctx.on('approval/request', this.handleApproval));
+        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 = questions.registerProvider({ ask: this.handleUserQuestions });
@@ -1202,14 +1279,27 @@ export class SshTui {
             }
         }, RENDER_INTERVAL_MS);
         this.renderTimer.unref?.();
-        void this.maybeRunOnboarding();
+        void this.maybeRunOnboarding().catch((error) => {
+            if (this.disposed)
+                return;
+            this.pushRow({ kind: 'error', text: `首次配置检查失败: ${errorChain(error)}` });
+            this.markDirty();
+        });
     }
     /** Replay the durable session log so a resumed session renders its history. */
     replayHistory() {
-        for (const event of this.agent.session.events) {
-            this.handleSessionEvent(this.agent.session, event);
+        this.replaying = true;
+        try {
+            for (const event of this.agent.session.events) {
+                this.handleSessionEvent(this.agent.session, event);
+            }
+        }
+        finally {
+            this.replaying = false;
         }
         this.streaming = undefined;
+        this.streamingReasoning = undefined;
+        this.thinkingStartedAt = undefined;
         this.status = this.agent.status === 'running' ? 'running' : 'idle';
         this.dirty = true;
     }
@@ -1222,6 +1312,8 @@ export class SshTui {
         let stored = false;
         if (credentials !== undefined) {
             stored = (await credentials.describe(credentialRef(envRef))).configured;
+            if (this.disposed)
+                return;
         }
         if (!stored) {
             // Belt-and-braces: the file provider may not have its in-memory snapshot
@@ -1230,6 +1322,8 @@ export class SshTui {
                 const credentialFile = join(dshHomeDir(), '.credentials.yaml');
                 if (existsSync(credentialFile)) {
                     const content = await readFile(credentialFile, 'utf8');
+                    if (this.disposed)
+                        return;
                     stored = new RegExp(`^${envRef}\\s*:\\s*\\S`, 'm').test(content);
                 }
             }
@@ -1260,7 +1354,9 @@ export class SshTui {
     }
     /** Run the provider/API-key onboarding wizard. Resolves true when saved. */
     runOnboarding() {
-        return new Promise((resolve) => {
+        if (this.onboardingCompletion !== undefined)
+            return this.onboardingCompletion;
+        this.onboardingCompletion = new Promise((resolve) => {
             this.onboarding = {
                 step: 'provider',
                 providerType: 'official',
@@ -1268,23 +1364,30 @@ export class SshTui {
                 baseUrl: '',
                 key: '',
                 models: [],
-                resolve,
+                saving: false,
+                resolve: (saved) => {
+                    this.onboardingCompletion = undefined;
+                    resolve(saved);
+                },
             };
             this.input = '';
             this.cursor = 0;
             this.dialog = { kind: 'onboarding' };
             this.markDirty();
         });
+        return this.onboardingCompletion;
     }
     cancelOnboarding() {
         const state = this.onboarding;
-        if (state === undefined)
+        if (state === undefined || state.saving)
             return;
         this.onboarding = undefined;
-        this.dialog = undefined;
+        if (this.dialog?.kind === 'onboarding')
+            this.dialog = undefined;
         this.input = '';
         this.cursor = 0;
         state.resolve(false);
+        this.showNextDialog();
         this.markDirty();
     }
     /** Restore the terminal, flush the session, and request process exit. */
@@ -1294,6 +1397,8 @@ export class SshTui {
         this.disposed = true;
         this.exiting = true;
         const dialog = this.dialog;
+        const queued = this.dialogQueue.splice(0);
+        this.dialog = undefined;
         if (dialog !== undefined) {
             if (dialog.kind === 'confirm') {
                 dialog.resolve('cancel');
@@ -1304,10 +1409,23 @@ export class SshTui {
             else {
                 this.cancelOnboarding();
             }
-            this.dialog = undefined;
+        }
+        for (const pending of queued) {
+            if (pending.kind === 'confirm') {
+                pending.resolve('cancel');
+            }
+            else if (pending.kind === 'questions') {
+                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)) {
             dispose();
         }
@@ -1331,7 +1449,7 @@ export class SshTui {
             return;
         this.exiting = true;
         await this.dispose();
-        process.stdout.write(`\n${this.goodbye}\n`);
+        process.stdout.write(`\n${sanitizeTerminalText(this.goodbye)}\n`);
         try {
             await this.ctx.get('sessions')?.flush(this.agent.session);
         }
@@ -1470,9 +1588,16 @@ export class SshTui {
             if (row.kind === 'tool') {
                 const running = row.status === undefined || row.status === 'running';
                 const ok = row.status === 'ok';
-                const dot = this.color
-                    ? running ? '\x1b[33m●\x1b[0m' : ok ? '\x1b[32m●\x1b[0m' : '\x1b[31m●\x1b[0m'
-                    : '●';
+                // The status dot carries its own ANSI color. `styleLine` sanitizes its
+                // input, so embedding the escape sequence there would leave literal
+                // "[33m" text on screen; color the dot between two sanitized halves.
+                const dotColor = !this.color ? undefined : running ? '33' : ok ? '32' : '31';
+                const styleToolHeader = (line) => {
+                    const dotIndex = line.indexOf('●');
+                    if (dotColor === undefined || dotIndex === -1)
+                        return this.styleLine('tool', line);
+                    return `${this.styleLine('tool', line.slice(0, dotIndex))}\x1b[${dotColor}m●${this.styleLine('tool', line.slice(dotIndex + 1))}`;
+                };
                 const state = running ? 'running…' : ok ? 'ok' : 'error';
                 const summary = row.summary === '' ? '' : `  ${row.summary}`;
                 const exit = !running && row.command !== undefined
@@ -1487,20 +1612,12 @@ export class SshTui {
                 const plainHeader = `${marker} ● ${row.title}${summary}  [${state}]${exit}`;
                 if (!row.expanded) {
                     const collapsed = truncateToWidth(`${focused ? '▶ ' : '  '}${plainHeader}`, Math.max(1, width - 2));
-                    const dotIndex = collapsed.indexOf('●');
-                    const withDot = dotIndex === -1
-                        ? collapsed
-                        : `${collapsed.slice(0, dotIndex)}${dot}${collapsed.slice(dotIndex + 1)}`;
-                    const styled = this.styleLine('tool', withDot);
+                    const styled = styleToolHeader(collapsed);
                     addDisplay(focused && this.color ? `\x1b[7m${styled}\x1b[27m` : styled, row);
                     continue;
                 }
-                for (const [index, wrapped] of wrap(plainHeader, width).entries()) {
-                    const dotIndex = index === 0 ? wrapped.indexOf('●') : -1;
-                    const withDot = dotIndex === -1
-                        ? wrapped
-                        : `${wrapped.slice(0, dotIndex)}${dot}${wrapped.slice(dotIndex + 1)}`;
-                    addDisplay(this.styleLine('tool', withDot), row);
+                for (const wrapped of wrap(plainHeader, width)) {
+                    addDisplay(styleToolHeader(wrapped), row);
                 }
                 for (const line of toolBodyLines(row, this.maxToolOutputLines)) {
                     for (const wrapped of wrap(line.text, Math.max(1, width - 2))) {
@@ -1600,7 +1717,7 @@ export class SshTui {
                             addDialog(`  Base URL: ${ob.baseUrl === '' ? (template.defaultBaseUrl || '(默认)') : ob.baseUrl}`);
                             addDialog(`  API 协议: ${template.api ?? 'deepseek-official'}`);
                             addDialog(`  模型: ${ob.models.join(', ')}`);
-                            addDialog(`  API Key:  ${ob.key.slice(0, 6)}…${ob.key.slice(-4)}（长度 ${ob.key.length}）`);
+                            addDialog(`  API Key:  ${sliceCodePoints(ob.key, 6)}…${lastCodePoints(ob.key, 4)}（长度 ${ob.key.length}）`);
                             addDialog('  y = 保存, n = 重填, Esc = 取消');
                             break;
                     }
@@ -1615,13 +1732,14 @@ export class SshTui {
                 const options = d.question.options ?? [];
                 for (const [index, option] of options.entries()) {
                     const marker = d.selected.has(index) ? '●' : '○';
+                    const key = QUESTION_OPTION_KEYS[index] ?? '?';
                     const extra = option.description === undefined ? '' : ` — ${option.description}`;
-                    addDialog(`  ${index + 1} ${marker} ${option.label}${extra}`);
+                    addDialog(`  ${key} ${marker} ${option.label}${extra}`);
                 }
                 if (options.length === 0) {
                     addDialog('  (free text: type below and press Enter)');
                 }
-                addDialog(`  ${d.question.multiSelect === true ? 'digits toggle, Enter submit' : 'digit to select, Enter submit'}, Esc to cancel`);
+                addDialog(`  ${d.question.multiSelect === true ? 'digits/letters toggle, Enter submit' : 'digit/letter to select, Enter submit'}, Esc to cancel`);
             }
         }
         const fitLine = (text) => truncateToWidth(text, Math.max(1, width));
@@ -1641,7 +1759,7 @@ export class SshTui {
         for (const [index, command] of this.commandSuggestions.entries()) {
             const marker = index === this.suggestionIndex ? '›' : ' ';
             const line = `  ${marker} /${command.name.padEnd(14)} ${command.description}${command.local ? '' : '  (dsh)'}`;
-            suggestionLines.push(index === this.suggestionIndex
+            suggestionLines.push(index === this.suggestionIndex && this.color
                 ? `\x1b[7m${fitLine(line)}\x1b[27m`
                 : this.styleLine('system', fitLine(line)));
         }
@@ -1717,6 +1835,12 @@ export class SshTui {
         const statsText = this.statsText();
         const statsLine = this.styleLine('system', fitLine(statsText === '' ? '— 尚无会话统计' : statsText));
         let statusText = `${this.status}  [${this.presetName}]  ${this.currentSelectionLabel()}`;
+        const sub = this.subagentSelection.current;
+        const subProvider = sub.provider ?? this.selectionRef?.current?.provider ?? this.agent.options.provider ?? this.providerName;
+        const subEffort = sub.reasoningEffort === undefined ? '' : `(${sub.reasoningEffort})`;
+        statusText += sub.provider === undefined
+            ? ` · sub:${sub.model}${subEffort}`
+            : ` · sub:${subProvider}/${sub.model}${subEffort}`;
         if (inputView.folded)
             statusText += ' · 输入已折叠 · Ctrl+T 展开';
         else if (inputRows > 1)
@@ -1913,8 +2037,9 @@ export class SshTui {
         this.paint();
     };
     styleLine(kind, text) {
+        const safe = sanitizeTerminalText(text);
         if (!this.color)
-            return text;
+            return safe;
         const code = kind === 'user' ? '36' :
             kind === 'assistant' ? '1;37' :
                 kind === 'reasoning' ? '2;3' :
@@ -1925,9 +2050,27 @@ export class SshTui {
                                     kind === 'diff-path' ? '1;36' :
                                         kind === 'error' ? '31' :
                                             '90';
-        return `\x1b[${code}m${text}`;
+        return `\x1b[${code}m${safe}`;
     }
     // ── event handling ──────────────────────────────────────────────────────
+    /**
+     * Apply the TUI's subagent model selection to every child-agent request.
+     * The parent request is left untouched (its own `/model` waterfall already
+     * owns the route); direct children created by tool-subagent inherit the
+     * parent provider unless `/submodel` stored an explicit subagent provider.
+     */
+    handleAgentRequest = async ({ agent }, next) => {
+        const resolved = await next();
+        if (agent === this.agent)
+            return resolved;
+        const selection = this.subagentSelection.current;
+        return {
+            ...resolved,
+            ...(selection.provider === undefined ? {} : { provider: selection.provider }),
+            model: selection.model,
+            ...(selection.reasoningEffort === undefined ? {} : { reasoningEffort: selection.reasoningEffort }),
+        };
+    };
     handleSessionEvent = (session, event) => {
         if (session.id !== this.agent.id) {
             if (this.subagentSessions.has(session.id))
@@ -2116,6 +2259,9 @@ export class SshTui {
                 }
                 this.stats.steps += 1;
                 this.openStepStats = undefined;
+                // Usage accounting is complete for this step; the map only exists to
+                // deduplicate repeated usage reports during the step.
+                this.usageByStep.delete(`${event.data.turn}:${event.data.step}`);
                 this.markDirty();
                 break;
             }
@@ -2130,7 +2276,12 @@ export class SshTui {
                 this.pendingToolTimes.clear();
                 this.stalledWarningShown = false;
                 this.pendingMessages.clear();
-                if (reason.kind === 'completed' && !this.completionSignaled) {
+                // Aborted/errored turns may close without an assembled
+                // assistant/message; never leave a half-streamed thinking block behind.
+                this.streaming = undefined;
+                this.streamingReasoning = undefined;
+                this.thinkingStartedAt = undefined;
+                if (reason.kind === 'completed' && !this.replaying && !this.completionSignaled) {
                     this.completionSignaled = true;
                     this.completedAt = Date.now();
                     this.updateTerminalTitle();
@@ -2215,7 +2366,7 @@ export class SshTui {
                 break;
             }
             case 'tool/call':
-                this.pushRow({ kind: 'system', text: `${label} ▶ ${event.data.name} ${event.data.arguments.slice(0, 160)}` });
+                this.pushRow({ kind: 'system', text: `${label} ▶ ${event.data.name} ${sliceCodePoints(event.data.arguments, 160)}` });
                 break;
             case 'tool/result': {
                 const output = truncate(collectText(event.data.message.content), 4);
@@ -2260,16 +2411,23 @@ export class SshTui {
         this.markDirty();
     };
     // ── approval and questions ──────────────────────────────────────────────
-    handleApproval = async (request, next) => {
+    handleApproval = async (request, _next) => {
         const agentLabel = request.agent.id === this.agent.id
             ? '当前会话'
             : `子代理 ${request.agent.id}`;
         return new Promise((resolve) => {
+            if (request.signal?.aborted === true) {
+                resolve('cancelled');
+                return;
+            }
+            let dialog;
             const onAbort = () => {
-                this.closeConfirm('cancel');
+                request.signal?.removeEventListener('abort', onAbort);
+                if (dialog !== undefined)
+                    this.abortConfirm(dialog);
             };
             request.signal?.addEventListener('abort', onAbort, { once: true });
-            this.openConfirm(`允许工具 "${request.toolName}"？（${agentLabel}）${request.reason === undefined ? '' : `\n${request.reason}`}`, 'y = 允许一次, n = 拒绝, Esc = 取消', (answer) => {
+            dialog = this.openConfirm(`允许工具 "${request.toolName}"？（${agentLabel}）${request.reason === undefined ? '' : `\n${request.reason}`}`, 'y = 允许一次, n = 拒绝, Esc = 取消', (answer) => {
                 request.signal?.removeEventListener('abort', onAbort);
                 resolve(answer === 'y' ? 'allowed-once' : answer === 'n' ? 'rejected' : 'cancelled');
             });
@@ -2282,54 +2440,114 @@ export class SshTui {
             : `子代理 ${request.agent.id}`;
         for (const [index, question] of request.questions.entries()) {
             const answer = await new Promise((resolve, reject) => {
+                const fail = (error) => {
+                    request.signal?.removeEventListener('abort', onAbort);
+                    reject(error);
+                };
                 const onAbort = () => {
-                    this.dialog = undefined;
-                    reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
+                    request.signal?.removeEventListener('abort', onAbort);
+                    if (dialog !== undefined) {
+                        dialog.reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
+                    }
+                    else {
+                        reject(new UserQuestionError('ask_user_question was interrupted before the user answered', 'ASK_ABORTED'));
+                    }
                 };
+                let dialog;
                 request.signal?.addEventListener('abort', onAbort, { once: true });
+                if (request.signal?.aborted === true) {
+                    onAbort();
+                    return;
+                }
                 const labeled = agentLabel === undefined
                     ? question
                     : { ...question, question: `[${agentLabel}] ${question.question}` };
-                this.openQuestion(labeled, index, request.questions.length, (selection) => {
+                dialog = this.openQuestion(labeled, index, request.questions.length, (selection) => {
                     request.signal?.removeEventListener('abort', onAbort);
                     resolve(selection);
-                }, reject);
+                }, fail);
             });
             answers.push({ id: question.id, selected: answer.selected, custom: answer.custom });
         }
         return { answers };
     };
-    openConfirm(prompt, hint, resolve) {
-        this.dialog = { kind: 'confirm', prompt, hint, resolve };
+    /** Queue one dialog behind an already-open one instead of overwriting it. */
+    openDialog(dialog) {
+        if (this.dialog === undefined) {
+            this.dialog = dialog;
+        }
+        else {
+            this.dialogQueue.push(dialog);
+        }
+        this.markDirty();
+    }
+    showNextDialog() {
+        if (this.dialog !== undefined)
+            return;
+        const next = this.dialogQueue.shift();
+        if (next !== undefined) {
+            this.dialog = next;
+            this.markDirty();
+        }
+    }
+    removeQueuedDialog(dialog) {
+        const index = this.dialogQueue.indexOf(dialog);
+        if (index !== -1)
+            this.dialogQueue.splice(index, 1);
+    }
+    settleQuestion(dialog, finish) {
+        if (this.dialog === dialog) {
+            this.dialog = undefined;
+        }
+        else {
+            this.removeQueuedDialog(dialog);
+        }
+        finish();
+        this.showNextDialog();
         this.markDirty();
     }
+    openConfirm(prompt, hint, resolve) {
+        const dialog = { kind: 'confirm', prompt, hint, resolve };
+        this.openDialog(dialog);
+        return dialog;
+    }
     closeConfirm(value) {
         const dialog = this.dialog;
         if (dialog === undefined || dialog.kind !== 'confirm')
             return;
         this.dialog = undefined;
         dialog.resolve(value);
+        this.showNextDialog();
         this.markDirty();
     }
+    /** Resolve one queued or active confirm from its abort signal. */
+    abortConfirm(dialog) {
+        if (this.dialog === dialog) {
+            this.dialog = undefined;
+            dialog.resolve('cancel');
+            this.showNextDialog();
+            this.markDirty();
+            return;
+        }
+        this.removeQueuedDialog(dialog);
+        dialog.resolve('cancel');
+    }
     openQuestion(question, index, total, resolve, reject) {
-        this.dialog = {
+        const dialog = {
             kind: 'questions',
             question,
             index,
             total,
             selected: new Set(),
             resolve: (selection) => {
-                this.dialog = undefined;
-                resolve(selection);
-                this.markDirty();
+                this.settleQuestion(dialog, () => resolve(selection));
             },
             reject: (error) => {
-                this.dialog = undefined;
-                reject(error);
-                this.markDirty();
+                this.settleQuestion(dialog, () => reject(error));
             },
         };
-        this.markDirty();
+        this.openDialog(dialog);
+        return dialog;
     }
     /** Open one question dialog and await its answer (cancellation rejects). */
     askQuestion(question, index = 0, total = 1) {
@@ -2359,7 +2577,9 @@ export class SshTui {
      * registry, while the TUI wants the endpoint's current list.
      */
     async discoverEndpointModels(provider) {
+        const llmPiAi = this.ctx.get('settings')?.get(settingsNamespace('llm-pi-ai'));
         const profile = this.piAiProviderProfile(provider);
+        const source = openCodeSourceFor(provider, llmPiAi);
         const baseURL = typeof profile?.baseURL === 'string' && profile.baseURL.trim() !== ''
             ? profile.baseURL.trim()
             : this.openCodeListingBaseURL(provider);
@@ -2368,7 +2588,7 @@ export class SshTui {
         const api = typeof profile?.api === 'string' && profile.api.trim() !== '' ? profile.api.trim() : undefined;
         const apiKeyEnv = typeof profile?.apiKeyEnv === 'string' && profile.apiKeyEnv.trim() !== ''
             ? profile.apiKeyEnv.trim()
-            : undefined;
+            : source?.apiKeyEnv;
         const apiKey = apiKeyEnv === undefined ? undefined : await this.resolveCredential(apiKeyEnv);
         const llm = this.ctx.get('llm');
         if (llm === undefined)
@@ -2561,6 +2781,147 @@ export class SshTui {
         this.pushRow({ kind: 'system', text: `模型已切换：${selected.id}（思考强度 ${effort ?? '默认'}）；下一步请求生效。` });
         this.markDirty();
     }
+    /** Provider route the next subagent request should use. */
+    effectiveSubagentProvider() {
+        return this.subagentSelection.current.provider
+            ?? this.selectionRef?.current?.provider
+            ?? this.agent.options.provider
+            ?? this.providerName;
+    }
+    /** Persist one subagent selection and publish it to the live request waterfall. */
+    async saveSubagentSelection(next) {
+        this.subagentSelection.current = next;
+        const settings = this.ctx.get('settings');
+        if (settings === undefined) {
+            this.pushRow({ kind: 'error', text: '设置服务不可用，子代理选择仅当前会话生效。' });
+            this.markDirty();
+            return false;
+        }
+        await settings.replace(SUBAGENT_SETTINGS_NAMESPACE, subagentSettingsValue(next));
+        return true;
+    }
+    /** Resolve the picker model list for one provider (endpoint first, then catalog). */
+    async subagentModelOptions(provider) {
+        const llm = this.ctx.get('llm');
+        let options = [];
+        let source = '已配置列表';
+        if (this.piAiProviderProfile(provider) !== undefined || provider === 'opencode' || provider === 'opencode-go') {
+            const previousStatus = this.status;
+            try {
+                this.status = `正在从端点获取子代理模型列表（${provider}）…`;
+                this.markDirty();
+                options = await this.discoverEndpointModels(provider);
+                if (options.length > 0) {
+                    source = '端点实时列表';
+                    try {
+                        const listed = (await llm?.listModels(provider)) ?? [];
+                        const endpointIds = new Set(options.map(model => model.id));
+                        for (const model of listed) {
+                            if (!endpointIds.has(model.id))
+                                options.push({ id: model.id, label: model.name || model.id });
+                        }
+                    }
+                    catch {
+                        // The endpoint list stands alone when the catalog cannot be read.
+                    }
+                }
+            }
+            catch {
+                options = [];
+            }
+            finally {
+                this.status = previousStatus;
+                this.markDirty();
+            }
+        }
+        if (options.length === 0) {
+            try {
+                const listed = (await llm?.listModels(provider)) ?? [];
+                options = listed.map(model => ({ id: model.id, label: model.name || model.id }));
+            }
+            catch {
+                options = [];
+            }
+        }
+        return { options, source };
+    }
+    /** /submodel: pick (or set) the model subagent children use. */
+    async runSubmodelCommand(arg) {
+        const provider = this.effectiveSubagentProvider();
+        const current = this.subagentSelection.current;
+        const direct = arg.trim();
+        let selectedId = direct;
+        if (selectedId === '') {
+            const { options, source } = await this.subagentModelOptions(provider);
+            if (options.length === 0) {
+                options.push({ id: current.model, label: current.model });
+            }
+            const selected = await this.pickModelOption(options, provider, source, current.model);
+            if (selected === undefined)
+                return;
+            selectedId = selected.id;
+        }
+        if (!(await this.ensureProviderModelConfigured(provider, selectedId)))
+            return;
+        const persisted = await this.saveSubagentSelection({ ...current, model: selectedId });
+        this.pushRow({
+            kind: 'system',
+            text: `${current.provider === undefined
+                ? `子代理模型已切换：${selectedId}（提供方跟随父会话 ${provider}）。`
+                : `子代理模型已切换：${selectedId}（提供方 ${provider}）。`}${persisted ? '' : '（仅当前会话）'}`,
+        });
+        this.markDirty();
+    }
+    /** /subeffort: pick the reasoning effort subagent children use. */
+    async runSubeffortCommand() {
+        const provider = this.effectiveSubagentProvider();
+        const current = this.subagentSelection.current;
+        const llm = this.ctx.get('llm');
+        let effortOptions = [];
+        try {
+            const info = await llm?.resolveModelInfo(provider, current.model);
+            effortOptions = (info?.reasoning?.efforts ?? []).map(effort => ({ id: String(effort.id), label: effort.name }));
+        }
+        catch {
+            effortOptions = [];
+        }
+        if (effortOptions.length === 0) {
+            effortOptions = ['off', 'high', 'max'].map(id => ({ id, label: id }));
+        }
+        const choices = [
+            { id: undefined, label: SUBAGENT_DEFAULT_EFFORT_LABEL },
+            ...effortOptions.map(option => ({ id: option.id, label: option.label })),
+        ];
+        const answer = await this.askQuestion({
+            id: 'subagent-effort-pick',
+            question: `选择子代理思考强度（${provider}/${current.model}）`,
+            options: choices.map(option => ({
+                label: option.label,
+                description: option.id === undefined
+                    ? '清空自定义强度，跟随提供商/模型默认'
+                    : option.id === String(current.reasoningEffort)
+                        ? '当前'
+                        : undefined,
+            })),
+        });
+        const picked = choices.find(option => option.label === answer.selected[0]);
+        if (picked === undefined)
+            return;
+        const next = {
+            ...current,
+            ...(picked.id === undefined
+                ? { reasoningEffort: undefined }
+                : { reasoningEffort: ReasoningEffortId(picked.id) }),
+        };
+        const persisted = await this.saveSubagentSelection(next);
+        this.pushRow({
+            kind: 'system',
+            text: `${picked.id === undefined
+                ? '子代理思考强度已恢复为提供商默认。'
+                : `子代理思考强度已切换：${picked.id}。`}${persisted ? '' : '（仅当前会话）'}`,
+        });
+        this.markDirty();
+    }
     /** /mode: pick an agent preset (standard / minimal / code / cordis / routing-suite / ...). */
     async runModeCommand() {
         const agentPresets = this.ctx.get('agentPresets');
@@ -2617,9 +2978,14 @@ export class SshTui {
                 this.markDirty();
                 return;
             }
+            if (this.onSwitchSession === undefined) {
+                this.pushRow({ kind: 'error', text: '会话切换回调不可用，无法 /resume。' });
+                this.markDirty();
+                return;
+            }
             this.pushRow({ kind: 'system', text: `正在切换到会话 ${target}…` });
             this.markDirty();
-            await this.onSwitchSession?.(target);
+            await this.onSwitchSession(target);
             return;
         }
         const persistence = this.ctx.get('sessionPersistence');
@@ -2639,15 +3005,20 @@ export class SshTui {
             question: '选择要恢复的历史会话',
             options: inspected.map(item => ({
                 label: item.label,
-                description: `${formatSessionTime(item.updatedAt)} · ${item.cwd}`,
+                description: `${item.unreadable === true ? '⚠ 无法读取 · ' : ''}${formatSessionTime(item.updatedAt)} · ${item.cwd}`,
             })),
         });
         const picked = inspected.find(item => item.label === answer.selected[0]);
         if (picked === undefined)
             return;
+        if (this.onSwitchSession === undefined) {
+            this.pushRow({ kind: 'error', text: '会话切换回调不可用，无法 /resume。' });
+            this.markDirty();
+            return;
+        }
         this.pushRow({ kind: 'system', text: `正在切换到会话 ${picked.id}…` });
         this.markDirty();
-        await this.onSwitchSession?.(picked.id);
+        await this.onSwitchSession(picked.id);
     }
     /** Current provider route selected for the running agent. */
     currentProvider() {
@@ -2850,6 +3221,13 @@ export class SshTui {
             this.deleteAtCursor();
             return;
         }
+        const ss3 = /^\x1bO[A-Z]/u.exec(combined);
+        if (ss3 !== null) {
+            const rest = combined.slice(ss3[0].length);
+            if (rest !== '')
+                this.handlePlainText(rest);
+            return;
+        }
         if (isEscapePrefix(combined)) {
             this.escapeBuffer = combined;
             this.escapeTimer = setTimeout(() => {
@@ -2859,7 +3237,12 @@ export class SshTui {
                 if (pending === '\x1b') {
                     this.handleChar('\x1b');
                 }
-                else if (pending.startsWith('\x1b[')) {
+                else if (pending === '\x1bO') {
+                    // ESC O without an SS3 final byte is an Alt+O keystroke, not a
+                    // function key.
+                    this.handlePlainText('O');
+                }
+                else if (pending.startsWith('\x1b[') || pending.startsWith('\x1bO')) {
                     // An escape sequence that never completed: consume it silently
                     // instead of treating its ESC byte as a cancel.
                 }
@@ -2869,15 +3252,15 @@ export class SshTui {
             }, 60);
             return;
         }
-        if (combined.startsWith('\x1b[')) {
-            // Unknown escape sequence — consume without side effects.
+        if (combined.startsWith('\x1b[') || combined.startsWith('\x1bO')) {
+            // Unknown escape sequence (including SS3 function keys) — consume
+            // without side effects.
             return;
         }
-        if (combined.startsWith('\x1b')) {
-            this.handleChar('\x1b');
-            const rest = combined.slice(1);
-            if (rest !== '')
-                this.handlePlainText(rest);
+        if (combined.startsWith('\x1b') && combined.length > 1) {
+            // Alt+<key> sequences: ignore the ESC half instead of triggering cancel,
+            // and type the printable remainder.
+            this.handlePlainText(combined.slice(1));
             return;
         }
         this.handlePlainText(combined);
@@ -3055,23 +3438,20 @@ export class SshTui {
                 this.closeConfirm('cancel');
             return;
         }
-        const digit = /^[0-9]$/u.exec(text)?.[0];
-        if (digit !== undefined) {
-            const index = Number(digit) - 1;
-            if (index >= 0 && index < (dialog.question.options?.length ?? 0)) {
-                if (dialog.question.multiSelect === true) {
-                    if (dialog.selected.has(index))
-                        dialog.selected.delete(index);
-                    else
-                        dialog.selected.add(index);
-                }
-                else {
-                    dialog.selected.clear();
+        const key = text.toLowerCase();
+        const index = QUESTION_OPTION_KEYS.indexOf(key);
+        if (index >= 0 && index < (dialog.question.options?.length ?? 0)) {
+            if (dialog.question.multiSelect === true) {
+                if (dialog.selected.has(index))
+                    dialog.selected.delete(index);
+                else
                     dialog.selected.add(index);
-                }
-                this.markDirty();
             }
-            return;
+            else {
+                dialog.selected.clear();
+                dialog.selected.add(index);
+            }
+            this.markDirty();
         }
         if (text === '\r' || text === '\n') {
             const options = dialog.question.options ?? [];
@@ -3187,8 +3567,10 @@ export class SshTui {
                 return;
             }
             case 'confirm':
+                if (state.saving)
+                    return;
                 if (text === 'y' || text === 'Y') {
-                    this.dialog = undefined;
+                    state.saving = true;
                     this.input = '';
                     this.cursor = 0;
                     void this.saveOnboarding();
@@ -3345,7 +3727,10 @@ export class SshTui {
                     ]);
                     this.pushRow({ kind: 'system', text: `提供商 ${state.providerId} 已保存 → ${displayDshPath('settings.yaml')}` });
                 }
-                await this.saveCredential(credentials, envRef, state.key);
+                // Only store the key when its provider profile actually made it to
+                // settings; otherwise the saved key points at an unusable route.
+                if (saved)
+                    await this.saveCredential(credentials, envRef, state.key);
                 if (saved) {
                     const selection = {
                         provider: state.providerId,
@@ -3370,7 +3755,10 @@ export class SshTui {
         }
         finally {
             this.onboarding = undefined;
+            if (this.dialog?.kind === 'onboarding')
+                this.dialog = undefined;
             state.resolve(saved);
+            this.showNextDialog();
             this.markDirty();
         }
     }
@@ -3398,22 +3786,52 @@ export class SshTui {
         const home = dshHomeDir();
         const file = join(home, IS_WINDOWS ? 'env.cmd' : 'env.sh');
         await mkdir(home, { recursive: true, mode: 0o700 });
+        const escapeRegex = (value) => value.replace(/[.*+?^${}()|[\]\\]/gu, '\\$&');
         if (IS_WINDOWS) {
-            const lines = ['@echo off', 'rem Generated by dsh-ssh-tui onboarding.'];
-            for (const [name, value] of Object.entries(entries)) {
-                lines.push(`set "${name}=${value.replaceAll('"', '')}"`);
+            let previous = '';
+            try {
+                previous = await readFile(file, 'utf8');
             }
+            catch {
+                // File absent: start fresh below.
+            }
+            const preserved = previous.split(/\r?\n/u).filter(Boolean).filter(line => {
+                if (/^@echo off$/iu.test(line.trim()))
+                    return false;
+                if (/^rem Generated by dsh-ssh-tui onboarding\.$/iu.test(line.trim()))
+                    return false;
+                for (const name of Object.keys(entries)) {
+                    if (new RegExp(`^set\\s+"?${escapeRegex(name)}"?=`, 'iu').test(line.trim()))
+                        return false;
+                }
+                return true;
+            });
+            const additions = Object.entries(entries).map(([name, value]) => `set "${name}=${value.replaceAll('"', '')}"`);
+            const lines = ['@echo off', 'rem Generated by dsh-ssh-tui onboarding.', ...preserved, ...additions];
             await writeFile(file, `${lines.join('\r\n')}\r\n`, { mode: 0o600 });
             // Persist for future processes; best-effort, env.cmd remains as a manual fallback.
             await Promise.all(Object.entries(entries).map(([name, value]) => this.setWindowsEnv(name, value))).catch(() => { });
             return;
         }
         const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
-        const lines = ['# Generated by dsh-ssh-tui onboarding.'];
-        for (const [name, value] of Object.entries(entries)) {
-            lines.push(`export ${name}=${quote(value)}`);
+        let previous = '';
+        try {
+            previous = await readFile(file, 'utf8');
+        }
+        catch {
+            // File absent: start fresh below.
         }
-        await writeFile(file, `${lines.join('\n')}\n`, { mode: 0o600 });
+        const preserved = previous.split('\n').filter(Boolean).filter(line => {
+            if (line.trim() === '# Generated by dsh-ssh-tui onboarding.')
+                return false;
+            for (const name of Object.keys(entries)) {
+                if (new RegExp(`^export\\s+${escapeRegex(name)}=`).test(line))
+                    return false;
+            }
+            return true;
+        });
+        const additions = Object.entries(entries).map(([name, value]) => `export ${name}=${quote(value)}`);
+        await writeFile(file, `${['# Generated by dsh-ssh-tui onboarding.', ...preserved, ...additions].join('\n')}\n`, { mode: 0o600 });
         await this.ensurePosixEnvHook();
     }
     /** Persist one variable into the Windows user environment (best-effort). */
@@ -3426,7 +3844,9 @@ export class SshTui {
     }
     /** Idempotently source $DSH_HOME/env.sh from the user's POSIX shell rc files. */
     async ensurePosixEnvHook() {
-        const sourceLine = `[ -f "$HOME/.dsh/env.sh" ] && . "$HOME/.dsh/env.sh"`;
+        const envFile = join(dshHomeDir(), 'env.sh');
+        const quote = (value) => `'${value.replaceAll("'", "'\\''")}'`;
+        const sourceLine = `[ -f ${quote(envFile)} ] && . ${quote(envFile)}`;
         const marker = '# dsh-ssh-tui launch environment';
         const shell = process.env.SHELL ?? '';
         const targets = [];
@@ -3449,7 +3869,7 @@ export class SshTui {
             if (content.includes(marker))
                 continue;
             const line = relative.endsWith('config.fish')
-                ? 'test -f "$HOME/.dsh/env.sh"; and source "$HOME/.dsh/env.sh"'
+                ? `test -f ${quote(envFile)}; and source ${quote(envFile)}`
                 : sourceLine;
             const addition = `${content === '' ? '' : '\n'}${marker}\n${line}\n`;
             await mkdir(dirname(file), { recursive: true, mode: 0o700 });
@@ -3595,6 +4015,28 @@ export class SshTui {
                     this.markDirty();
                 });
                 break;
+            case 'submodel':
+                void this.runSubmodelCommand(arg).catch((error) => {
+                    if (error instanceof UserQuestionError) {
+                        this.pushRow({ kind: 'system', text: '子代理模型选择已取消。' });
+                    }
+                    else {
+                        this.pushRow({ kind: 'error', text: `/submodel failed: ${errorChain(error)}` });
+                    }
+                    this.markDirty();
+                });
+                break;
+            case 'subeffort':
+                void this.runSubeffortCommand().catch((error) => {
+                    if (error instanceof UserQuestionError) {
+                        this.pushRow({ kind: 'system', text: '子代理思考强度选择已取消。' });
+                    }
+                    else {
+                        this.pushRow({ kind: 'error', text: `/subeffort failed: ${errorChain(error)}` });
+                    }
+                    this.markDirty();
+                });
+                break;
             case 'mode':
                 void this.runModeCommand().catch((error) => {
                     if (error instanceof UserQuestionError) {
@@ -3609,6 +4051,9 @@ export class SshTui {
             case 'clear':
                 this.rows.length = 0;
                 this.streaming = undefined;
+                this.streamingReasoning = undefined;
+                this.thinkingStartedAt = undefined;
+                this.focusedRow = null;
                 break;
             case 'status':
                 this.pushRow({
@@ -3660,7 +4105,13 @@ export class SshTui {
                             options: [{ label: 'Option A' }, { label: 'Option B' }],
                         }],
                     agent: this.agent,
-                }).then((answer) => this.pushRow({ kind: 'system', text: `dialog answer: ${JSON.stringify(answer)}` }), (error) => this.pushRow({ kind: 'error', text: `dialog error: ${errorChain(error)}` }));
+                }).then((answer) => {
+                    this.pushRow({ kind: 'system', text: `dialog answer: ${JSON.stringify(answer)}` });
+                    this.markDirty();
+                }, (error) => {
+                    this.pushRow({ kind: 'error', text: `dialog error: ${errorChain(error)}` });
+                    this.markDirty();
+                });
                 break;
             }
             default:
@@ -3670,7 +4121,9 @@ export class SshTui {
                         this.pushRow({ kind: 'error', text: `Unknown command: /${command} (try /help)` });
                         break;
                     }
+                    this.commandAbort?.abort();
                     const controller = new AbortController();
+                    this.commandAbort = controller;
                     void commands.execute(this.agent, text, controller.signal).then((execution) => {
                         if (execution === undefined) {
                             this.pushRow({ kind: 'error', text: `Unknown command: /${command} (try /help)` });
@@ -3687,6 +4140,10 @@ export class SshTui {
                         }
                     }).catch((error) => {
                         this.pushRow({ kind: 'error', text: `/${command} failed: ${errorChain(error)}` });
+                    }).finally(() => {
+                        if (this.commandAbort === controller)
+                            this.commandAbort = undefined;
+                        this.markDirty();
                     });
                 }
                 break;
@@ -3696,21 +4153,76 @@ export class SshTui {
         this.inputFolded = false;
         this.markDirty();
     }
+    /** Grapheme cluster immediately before `cursor`; cursor-internal positions delete it whole. */
+    graphemeBefore(cursor) {
+        if (cursor <= 0)
+            return { start: 0, end: 0 };
+        let previousStart = 0;
+        let previousEnd = 0;
+        for (const segment of GRAPHEME_SEGMENTER.segment(this.input)) {
+            const start = segment.index;
+            const end = start + segment.segment.length;
+            if (cursor === start)
+                return { start: previousStart, end: previousEnd };
+            if (cursor > start && cursor < end)
+                return { start, end };
+            previousStart = start;
+            previousEnd = end;
+        }
+        return { start: previousStart, end: previousEnd };
+    }
+    /** Grapheme cluster containing or following `cursor`. */
+    graphemeAfter(cursor) {
+        for (const segment of GRAPHEME_SEGMENTER.segment(this.input)) {
+            const start = segment.index;
+            const end = start + segment.segment.length;
+            if (cursor === start || (cursor > start && cursor < end))
+                return { start, end };
+        }
+        return undefined;
+    }
     backspace() {
         if (this.cursor === 0)
             return;
-        this.input = `${this.input.slice(0, this.cursor - 1)}${this.input.slice(this.cursor)}`;
-        this.cursor -= 1;
+        const range = this.graphemeBefore(this.cursor);
+        this.input = `${this.input.slice(0, range.start)}${this.input.slice(range.end)}`;
+        this.cursor = range.start;
         this.markDirty();
     }
     deleteAtCursor() {
-        if (this.cursor >= this.input.length)
+        const range = this.graphemeAfter(this.cursor);
+        if (range === undefined)
             return;
-        this.input = `${this.input.slice(0, this.cursor)}${this.input.slice(this.cursor + 1)}`;
+        this.input = `${this.input.slice(0, range.start)}${this.input.slice(range.end)}`;
+        this.cursor = range.start;
         this.markDirty();
     }
     moveCursor(delta) {
-        this.cursor = Math.max(0, Math.min(this.input.length, this.cursor + delta));
+        if (delta < 0) {
+            let target = 0;
+            for (const segment of GRAPHEME_SEGMENTER.segment(this.input)) {
+                if (segment.index >= this.cursor)
+                    break;
+                target = segment.index;
+            }
+            this.cursor = target;
+        }
+        else {
+            let target = this.input.length;
+            for (const segment of GRAPHEME_SEGMENTER.segment(this.input)) {
+                const start = segment.index;
+                const end = start + segment.segment.length;
+                if (start > this.cursor) {
+                    target = start;
+                    break;
+                }
+                if (end > this.cursor) {
+                    target = end;
+                    break;
+                }
+            }
+            this.cursor = target;
+        }
         this.markDirty();
     }
     historyBack() {