dsh-ssh-tui 0.3.10 → 0.4.1

package/lib/tui.js

@@ -24,7 +24,7 @@ import { settingsNamespace } from '@deepseek-ai/dsh-settings';
 import { formatFooterCwd, formatSessionTime, listResumableSessions } from './session-list.js';
 import { applySavedLocale, getLocale, localeDisplayName, localeFromTag, setLocale, t, UI_LOCALE_NAMESPACE, } from './i18n/index.js';
 import { defaultReasoningEffort } from './reasoning.js';
-import { checkForPluginUpdate } from './update-check.js';
+import { checkForPluginUpdate, installPluginLatest } from './update-check.js';
 import { ROUTE_MEMORY_NAMESPACE, parseRouteMemory, rememberedRouteFor, upsertRememberedRoute, } from './route-memory.js';
 import { AGENT_DEFAULT_MODEL_SETTINGS_NAMESPACE } from '@deepseek-ai/dsh-agent-default-model';
 import { DEFAULT_SUBAGENT_MODEL, SUBAGENT_SETTINGS_NAMESPACE, defaultSubagentModelForProvider, describeSubagentFit, subagentModelMatchesProvider, subagentSettingsValue, } from './subagent-model.js';
@@ -286,6 +286,8 @@ export function formatQuotaBar(remainingPercent, width = 8) {
 }
 export function footerIdentityParts(input) {
     const parts = [];
+    if (input.compactView === true)
+        parts.push(`[${t('view.footerCompact')}]`);
     if (input.preset !== undefined && input.preset !== '')
         parts.push(`[${input.preset}]`);
     if (input.cwdLabel !== undefined && input.cwdLabel !== '')
@@ -582,12 +584,18 @@ const LOCAL_COMMANDS = [
     { 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' },
 ];
 function localizedCommands() {
-    return LOCAL_COMMANDS.map(command => (command.name === 'language' || command.name === 'lang'
-        ? { name: command.name, description: t('lang.cmd') }
-        : command));
+    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;
+    });
 }
 /**
  * Terminal cell width for one string.
@@ -646,21 +654,39 @@ export function shimmerText(text, nowMs, color) {
     }
     return out;
 }
-/** One-line wait copy: current tool, else the user's last prompt. */
+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.
+ */
+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('')}…`;
+}
+/** 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');
     if (toolTitle !== '') {
-        return {
-            header: t('wait.working'),
-            detail: toolSummary === '' ? toolTitle : `${toolTitle}  ${toolSummary}`,
-        };
+        const extra = toolSummary === '' ? '' : `  ${Array.from(toolSummary).slice(0, 40).join('')}`;
+        return { header, detail: `${toolTitle}${extra}` };
     }
-    const prompt = (input.prompt ?? '').replace(/\s+/gu, ' ').trim();
-    if (prompt !== '') {
-        return { header: t('wait.working'), detail: prompt };
-    }
-    return { header: t('wait.working') };
+    return { header };
 }
 export function displayWidth(text) {
     let width = 0;
@@ -1836,6 +1862,45 @@ function friendlyArgsSummary(name, args) {
 }
 const SHELL_TOOL_NAMES = new Set(['bash', 'pwsh']);
 const DIFF_TOOL_NAMES = new Set(['edit', 'write', 'str_replace_editor']);
+export function parseWorkspaceView(raw) {
+    const id = raw.trim().toLowerCase();
+    if (id === 'detailed' || id === 'detail' || id === 'full' || id === '详细')
+        return 'detailed';
+    if (id === 'compact' || id === 'minimal' || id === 'min' || id === '极简')
+        return 'compact';
+    return undefined;
+}
+export function countDiffLines(hunks) {
+    if (hunks === undefined || hunks.length === 0)
+        return 0;
+    let total = 0;
+    for (const hunk of hunks) {
+        const added = hunk.newText === '' ? 0 : hunk.newText.split('\n').length;
+        if (hunk.oldText === null) {
+            total += added;
+            continue;
+        }
+        const removed = hunk.oldText === '' ? 0 : hunk.oldText.split('\n').length;
+        total += added + removed;
+    }
+    return total;
+}
+export function compactToolGroups(tools) {
+    const edits = [];
+    const calls = [];
+    for (const tool of tools) {
+        if (DIFF_TOOL_NAMES.has(tool.name) || (tool.diff !== undefined && tool.diff.length > 0))
+            edits.push(tool);
+        else
+            calls.push(tool);
+    }
+    return {
+        edits,
+        calls,
+        editLines: edits.reduce((sum, tool) => sum + Math.max(1, countDiffLines(tool.diff)), 0),
+        failedCalls: calls.filter(tool => tool.status === 'error').length,
+    };
+}
 const SUBAGENT_TOOL_NAMES = new Set(['subagent', 'subagent_fork', 'task']);
 /**
  * Tool calls that already have a dedicated transcript card (goal/change,
@@ -2726,6 +2791,7 @@ export class SshTui {
     color;
     maxToolOutputLines;
     showReasoning;
+    workspaceView = 'detailed';
     goodbye;
     resume;
     providerName;
@@ -2812,6 +2878,7 @@ 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.workspaceView = this.readWorkspaceView();
         this.goodbye = config.goodbye
             ?? this.ctx.get('tuiGoodbyeMessage')
             ?? `To resume this session: dsh --profile tui --resume=${this.agent.id}`;
@@ -2879,11 +2946,114 @@ export class SshTui {
         });
     }
     async notifyPluginUpdate() {
-        const notice = await checkForPluginUpdate(PLUGIN_VERSION);
-        if (this.disposed || notice === undefined)
+        const info = await checkForPluginUpdate(PLUGIN_VERSION);
+        if (this.disposed || info === undefined)
             return;
-        this.pushRow({ kind: 'system', text: notice });
-        this.markDirty();
+        const skipped = this.readSkippedUpdate();
+        if (skipped !== undefined && skipped === info.latest)
+            return;
+        try {
+            const answer = await this.askQuestion({
+                id: 'plugin-update',
+                question: t('update.pick', { latest: info.latest, current: info.current }),
+                options: [
+                    { label: t('update.now'), description: t('update.nowDesc', { command: info.command }) },
+                    { label: t('update.later'), description: t('update.laterDesc') },
+                    { label: t('update.skip'), description: t('update.skipDesc', { latest: info.latest }) },
+                ],
+            }, 0, 1, 0);
+            if (this.disposed)
+                return;
+            const picked = answer.selected[0];
+            if (picked === t('update.skip')) {
+                await this.persistSkippedUpdate(info.latest);
+                this.pushRow({ kind: 'system', text: t('update.skipDesc', { latest: info.latest }) });
+                this.markDirty();
+                return;
+            }
+            if (picked !== t('update.now'))
+                return;
+            this.pushRow({ kind: 'system', text: t('update.installing', { latest: info.latest }) });
+            this.markDirty();
+            const result = await installPluginLatest(info.profile);
+            if (this.disposed)
+                return;
+            if (result.ok) {
+                this.pushRow({ kind: 'system', text: t('update.installed', { latest: info.latest, profile: info.profile }) });
+            }
+            else {
+                this.pushRow({ kind: 'error', text: t('update.failed', { error: result.output === '' ? info.command : result.output }) });
+                this.pushRow({ kind: 'system', text: t('update.manual', { command: info.command }) });
+            }
+            this.markDirty();
+        }
+        catch {
+            if (this.disposed)
+                return;
+            this.pushRow({ kind: 'system', text: info.notice });
+            this.markDirty();
+        }
+    }
+    readSkippedUpdate() {
+        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
+            return undefined;
+        const skip = raw.skipUpdate;
+        return typeof skip === 'string' && skip.trim() !== '' ? skip.trim() : undefined;
+    }
+    async persistSkippedUpdate(latest) {
+        await this.mergeUiSettings({ skipUpdate: latest });
+    }
+    async mergeUiSettings(patch) {
+        const settings = this.ctx.get('settings');
+        if (settings === undefined)
+            return;
+        const raw = settings.get(UI_LOCALE_NAMESPACE);
+        const previous = raw !== null && typeof raw === 'object' && !Array.isArray(raw)
+            ? raw
+            : {};
+        await settings.replace(UI_LOCALE_NAMESPACE, { ...previous, ...patch });
+    }
+    readWorkspaceView() {
+        const raw = this.ctx.get('settings')?.get(UI_LOCALE_NAMESPACE);
+        if (raw === null || typeof raw !== 'object' || Array.isArray(raw))
+            return 'detailed';
+        return parseWorkspaceView(String(raw.view ?? '')) ?? 'detailed';
+    }
+    isCompactView() {
+        return this.workspaceView === 'compact';
+    }
+    /** Test helper: switch the workspace view without going through /view. */
+    setWorkspaceView(view) {
+        this.workspaceView = view;
+    }
+    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 title = kind === 'edits'
+            ? (groups.edits.length > 1
+                ? t('compact.editsFiles', { lines: groups.editLines, files: groups.edits.length })
+                : t('compact.edits', { lines: groups.editLines }))
+            : (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)
+            return;
+        const items = kind === 'edits' ? groups.edits : groups.calls;
+        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);
+        }
     }
     startRenderTimer() {
         if (this.renderTimer !== undefined) {
@@ -3160,6 +3330,22 @@ export class SshTui {
     }
     /** The transcript rows that support per-row expand/collapse. */
     collapsibleRows() {
+        const compact = this.isCompactView();
+        if (compact) {
+            const groups = compactToolGroups(this.rows.filter((row) => row.kind === 'tool'));
+            const rows = this.rows.filter((row) => row.kind === 'subagent'
+                || row.kind === 'plan'
+                || row.kind === 'question'
+                || row.kind === 'goal'
+                || row.kind === 'compaction');
+            const callAnchor = groups.calls.at(-1);
+            const editAnchor = 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'
@@ -3178,16 +3364,12 @@ export class SshTui {
         return SPINNER[Math.floor(Date.now() / periodMs) % SPINNER.length] ?? '⠋';
     }
     /**
-     * Codex wait card: shown while the turn is running and there is no live
-     * thinking/reply stream. A live tool keeps the card so the detail line can
-     * name what is happening (Codex `update_details`).
+     * Codex wait card: shown while the turn is running. Thinking/reply streams
+     * feed the shimmer header; a live tool becomes the detail line.
      */
     waitCardVisible() {
         if (this.agent.status !== 'running')
             return false;
-        if (this.streaming !== undefined && (this.streaming.reasoning !== '' || 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')
@@ -3205,14 +3387,21 @@ export class SshTui {
     }
     waitCardSource() {
         const liveTool = this.rows.findLast((row) => row.kind === 'tool' && (row.status === undefined || row.status === 'running'));
-        if (liveTool !== undefined) {
-            return { toolTitle: liveTool.title, toolSummary: liveTool.summary, prompt: this.waitPrompt };
-        }
         const liveSub = this.rows.findLast((row) => row.kind === 'subagent' && row.status === 'running');
-        if (liveSub !== undefined) {
-            return { toolTitle: liveSub.label, toolSummary: liveSub.lastActivity, prompt: this.waitPrompt };
-        }
-        return { prompt: this.waitPrompt };
+        return {
+            ...(liveTool === undefined ? {} : { toolTitle: liveTool.title, toolSummary: liveTool.summary }),
+            ...(liveTool !== undefined || liveSub === undefined
+                ? {}
+                : { 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) {
+        return plan.active === true
+            || plan.pending === true
+            || plan.todos.some(item => item.status === 'in_progress');
     }
     findSubagentRow(sessionId) {
         return this.rows.findLast((row) => row.kind === 'subagent' && row.sessionId === sessionId);
@@ -3249,6 +3438,9 @@ export class SshTui {
                 existing.archived = true;
                 existing.expanded = false;
             }
+            else if (patch.expanded === undefined && this.planShouldDefaultExpand(existing)) {
+                existing.expanded = true;
+            }
             this.archiveStalePlans(planIsLive(existing) ? existing : undefined);
             return existing;
         }
@@ -3264,7 +3456,13 @@ export class SshTui {
             pending: patch.pending ?? false,
             todos: patch.todos ?? [],
             ...(patch.planMarkdown === undefined ? {} : { planMarkdown: patch.planMarkdown }),
-            expanded: false,
+            expanded: this.planShouldDefaultExpand({
+                kind: 'plan',
+                active: patch.active ?? false,
+                pending: patch.pending ?? false,
+                todos: patch.todos ?? [],
+                expanded: false,
+            }),
             archived: false,
         };
         this.pushRow(row);
@@ -3662,7 +3860,13 @@ export class SshTui {
                 addDisplay(this.styleLine(kind, line), ref);
             }
         };
+        const compact = this.isCompactView();
+        const compactGroups = compact
+            ? compactToolGroups(this.rows.filter((row) => row.kind === 'tool'))
+            : undefined;
         for (const row of this.rows) {
+            if (compact && (row.kind === 'reasoning' || row.kind === 'prompt' || row.kind === 'tool'))
+                continue;
             if (row.kind === 'brand-logo') {
                 const variant = DEEPSEEK_LOGO_VARIANTS.find(candidate => candidate.width <= width - 2)
                     ?? DEEPSEEK_LOGO_VARIANTS[DEEPSEEK_LOGO_VARIANTS.length - 1];
@@ -3872,7 +4076,7 @@ export class SshTui {
             pushRow(row.kind, row.text, row);
         }
         if (this.streaming !== undefined) {
-            if (this.showReasoning && this.streaming.reasoning !== '') {
+            if (!compact && this.showReasoning && this.streaming.reasoning !== '') {
                 const block = this.streamingReasoning ??= { kind: 'streaming-reasoning', expanded: false };
                 const focused = this.focusedRow === block;
                 const marker = block.expanded ? '▾' : '▸';
@@ -3903,7 +4107,17 @@ export class SshTui {
                 }
             }
         }
-        else if (this.waitCardVisible()) {
+        if (compact && compactGroups !== undefined) {
+            const editAnchor = compactGroups.edits.at(-1);
+            const callAnchor = compactGroups.calls.at(-1);
+            if (callAnchor !== undefined) {
+                this.paintCompactSummary(addDisplay, callAnchor, 'calls', compactGroups, width);
+            }
+            if (editAnchor !== undefined) {
+                this.paintCompactSummary(addDisplay, editAnchor, 'edits', compactGroups, width);
+            }
+        }
+        if (this.waitCardVisible()) {
             const copy = waitCardCopy(this.waitCardSource());
             const started = this.waitStartedAt ?? Date.now();
             const elapsed = fmtElapsedCompact((Date.now() - started) / 1000);
@@ -4183,6 +4397,7 @@ export class SshTui {
             multiLineInput: inputRows > 1,
             queued: this.pendingMessages.size,
             cwdLabel: formatFooterCwd(this.workspaceCwd()),
+            compactView: this.isCompactView(),
         };
         const activity = footerActivity(footer);
         const activityText = activity.kind === 'compacting'
@@ -5969,13 +6184,41 @@ export class SshTui {
             this.pushRow({ kind: 'error', text: t('lang.settingsMissing') });
         }
         else {
-            await settings.replace(UI_LOCALE_NAMESPACE, { language: next });
+            await this.mergeUiSettings({ language: next });
             applySavedLocale({ language: next });
         }
         this.forceFullPaint = true;
         this.pushRow({ kind: 'system', text: t('lang.switched', { name: localeDisplayName(next) }) });
         this.markDirty();
     }
+    /** /view: detailed (see the work) vs compact (Codex-like summary). */
+    async runViewCommand(arg) {
+        const direct = parseWorkspaceView(arg);
+        let next = direct;
+        if (next === undefined && arg.trim() !== '') {
+            this.pushRow({ kind: 'error', text: t('view.unknown', { id: arg.trim() }) });
+            this.markDirty();
+            return;
+        }
+        if (next === undefined) {
+            const current = this.workspaceView;
+            const answer = await this.askQuestion({
+                id: 'view-pick',
+                question: t('view.pick'),
+                options: [
+                    { label: t('view.detailed'), description: current === 'detailed' ? t('view.current') : t('view.detailedDesc') },
+                    { label: t('view.compact'), description: current === 'compact' ? t('view.current') : t('view.compactDesc') },
+                ],
+            }, 0, 1, current === 'compact' ? 1 : 0);
+            const picked = answer.selected[0];
+            next = picked === t('view.compact') ? 'compact' : 'detailed';
+        }
+        this.workspaceView = next;
+        await this.mergeUiSettings({ view: next });
+        this.forceFullPaint = true;
+        this.pushRow({ kind: 'system', text: t('view.switched', { name: next === 'compact' ? t('view.compact') : t('view.detailed') }) });
+        this.markDirty();
+    }
     /** /mode: pick an agent preset (standard / minimal / ptc / cordis / routing-suite / ...). */
     async runModeCommand() {
         const agentPresets = this.ctx.get('agentPresets');
@@ -6625,7 +6868,10 @@ export class SshTui {
                 this.moveCollapsibleFocus(-1);
                 return;
             case '\x12':
-                this.toggleAllCollapsible();
+                if (this.focusedRow === null)
+                    this.toggleCollapsible();
+                else
+                    this.toggleAllCollapsible();
                 return;
             case '\x14':
                 this.inputFolded = !this.inputFolded;
@@ -7392,6 +7638,17 @@ export class SshTui {
                     this.markDirty();
                 });
                 break;
+            case 'view':
+                void this.runViewCommand(arg).catch((error) => {
+                    if (error instanceof UserQuestionError) {
+                        this.pushRow({ kind: 'system', text: t('help.modeCancel') });
+                    }
+                    else {
+                        this.pushRow({ kind: 'error', text: `/view failed: ${errorChain(error)}` });
+                    }
+                    this.markDirty();
+                });
+                break;
             case 'find':
                 this.runFindCommand(arg);
                 break;