erosolar-cli 2.1.49 → 2.1.51

package/dist/shell/interactiveShell.js

@@ -2,10 +2,11 @@ import { stdin as input, stdout as output, exit } from 'node:process';
 import { homedir } from 'node:os';
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
-import { existsSync, readFileSync, writeFileSync } from 'node:fs';
-import { join } from 'node:path';
+import { existsSync, readFileSync, statSync, writeFileSync } from 'node:fs';
+import { join, resolve } from 'node:path';
 import { display } from '../ui/display.js';
 import { theme } from '../ui/theme.js';
+import { getTerminalColumns } from '../ui/layout.js';
 import { StreamingResponseFormatter } from '../ui/streamingFormatter.js';
 import { getContextWindowTokens } from '../core/contextWindow.js';
 import { ensureSecretForProvider, getSecretDefinitionForProvider, getSecretValue, listSecretDefinitions, maskSecret, setSecretValue, } from '../core/secretStore.js';
@@ -82,6 +83,8 @@ const CONTEXT_CLEANUP_SYSTEM_PROMPT = `Summarize earlier IDE collaboration so th
 - Capture decisions, file edits/paths, tool findings, and open questions.
 - Separate finished work from follow-ups; keep it under ~180 words with tight bullets.
 - Respond in plain Markdown only (no tool or shell calls).`;
+const MAX_ATTACHMENT_BYTES = 200 * 1024; // 200KB per attachment
+const MAX_ATTACHMENT_CHARS = 16000; // Guardrail to avoid flooding context
 export class InteractiveShell {
     agent = null;
     profile;
@@ -175,6 +178,8 @@ export class InteractiveShell {
     statusLineState = null;
     statusMessageOverride = null;
     lastPromptBlockNotice = null;
+    inlineCommandActive = false;
+    inlinePanelScopeActive = false;
     promptRefreshTimer = null;
     launchPaletteShown = false;
     version;
@@ -242,6 +247,11 @@ export class InteractiveShell {
             description: 'Show available and loaded plugins',
             category: 'configuration',
         });
+        this.slashCommands.push({
+            command: '/attach',
+            description: 'Attach a local text file into the conversation (truncated, text-only)',
+            category: 'context',
+        });
         this.slashCommands.push({
             command: '/approvals',
             description: 'Switch between auto and approval mode for high-impact actions',
@@ -289,6 +299,17 @@ export class InteractiveShell {
         // Share renderer with Display so all output flows through the unified queue
         this.renderer = this.terminalInput.getRenderer();
         display.setRenderer(this.renderer);
+        display.setInlinePanelHandler((content) => {
+            if (!this.shouldCaptureInlinePanel()) {
+                return false;
+            }
+            const lines = content
+                .split('\n')
+                .map((line) => line.trimEnd())
+                .filter((line) => line.trim().length > 0);
+            this.showInlinePanel(lines);
+            return true;
+        });
         // Initialize Alpha Zero 2 metrics tracking
         this.alphaZeroMetrics = new MetricsTracker(`${this.profile}-${Date.now()}`);
         this.setupStatusTracking();
@@ -388,32 +409,47 @@ export class InteractiveShell {
         const stripAnsi = (value) => value.replace(/\u001B\[[0-?]*[ -/]*[@-~]/g, '');
         const padCenter = (text, width) => {
             const len = stripAnsi(text).length;
-            const left = Math.max(0, Math.floor((width - len) / 2));
-            const right = Math.max(0, width - len - left);
+            if (len >= width)
+                return text;
+            const left = Math.floor((width - len) / 2);
+            const right = width - len - left;
             return ' '.repeat(left) + text + ' '.repeat(right);
         };
-        const width = 62;
-        const top = `╭─${' Claude Code '.padEnd(width - 2, '─')}╮`;
-        const bottom = `╰${'─'.repeat(width)}╯`;
+        const targetWidth = 62;
+        const terminalWidth = getTerminalColumns();
+        const availableWidth = Number.isFinite(terminalWidth) && terminalWidth > 0
+            ? Math.max(28, terminalWidth - 4)
+            : targetWidth;
+        const contentWidth = Math.max(28, Math.min(targetWidth, Math.min(availableWidth, 84)));
+        const clamp = (value) => {
+            const normalized = stripAnsi(value);
+            if (normalized.length <= contentWidth)
+                return value;
+            if (contentWidth <= 1)
+                return normalized.slice(0, contentWidth);
+            return `${normalized.slice(0, contentWidth - 1)}…`;
+        };
+        const brand = 'Erosolar CLI';
+        const label = ` ${brand} `;
+        const labelLength = stripAnsi(label).length;
+        const labelFill = Math.max(0, contentWidth - labelLength);
+        const labelLeft = Math.floor(labelFill / 2);
+        const labelRight = labelFill - labelLeft;
+        const top = `╭${'─'.repeat(labelLeft)}${label}${'─'.repeat(labelRight)}╮`;
+        const bottom = `╰${'─'.repeat(contentWidth)}╯`;
         const userName = process.env['USER'] || 'there';
-        const logoLines = [
-            '╭╼─╾╮   ╭╼─╾╮',
-            '╰╮✺╭╯ ╳ ╰╮✺╭╯',
-            '╭╯✹╰╮   ╭╯✹╰╮',
-            '╰╼─╾╯   ╰╼─╾╯',
-        ];
-        const framedLogo = logoLines.map((line) => frame(`│${padCenter(line, width)}│`));
+        const logo = clamp('⟣╍◎╍⟢');
+        const versionLabel = version ? clamp(`${brand} · v${version}`) : brand;
+        const modelLine = clamp(model);
+        const workspaceLine = clamp(workspace);
+        const welcomeLine = clamp(`Welcome back ${userName}!`);
         const lines = [
             frame(top),
-            frame(`│${padCenter('', width)}│`),
-            frame(`│${padCenter(`Welcome back ${userName}!`, width)}│`),
-            frame(`│${padCenter('', width)}│`),
-            ...framedLogo,
-            frame(`│${padCenter('', width)}│`),
-            frame(`│${padCenter(model, width)}│`),
-            frame(`│${padCenter('Erosolar CLI', width)}│`),
-            frame(`│${padCenter(workspace, width)}│`),
-            frame(`│${padCenter('', width)}│`),
+            frame(`│${padCenter(welcomeLine, contentWidth)}│`),
+            frame(`│${padCenter(logo, contentWidth)}│`),
+            frame(`│${padCenter(modelLine, contentWidth)}│`),
+            frame(`│${padCenter(versionLabel, contentWidth)}│`),
+            frame(`│${padCenter(workspaceLine, contentWidth)}│`),
             frame(bottom),
         ].join('\n');
         if (this.renderer) {
@@ -985,6 +1021,7 @@ export class InteractiveShell {
         if (normalized === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Tool selection cancelled.');
+            this.clearInlinePanel();
             this.syncRendererInput();
             return;
         }
@@ -997,6 +1034,7 @@ export class InteractiveShell {
         if (normalized === 'save') {
             await this.persistToolSelection(pending);
             this.pendingInteraction = null;
+            this.clearInlinePanel();
             this.syncRendererInput();
             return;
         }
@@ -1064,6 +1102,7 @@ export class InteractiveShell {
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Agent selection cancelled.');
+            this.clearInlinePanel();
             this.syncRendererInput();
             return;
         }
@@ -1081,6 +1120,7 @@ export class InteractiveShell {
         }
         await this.persistAgentSelection(option.name);
         this.pendingInteraction = null;
+        this.clearInlinePanel();
         this.syncRendererInput();
     }
     async persistAgentSelection(profileName) {
@@ -1761,13 +1801,16 @@ export class InteractiveShell {
             this.refreshStatusLine();
         }
     }
-    handleStreamChunk(chunk) {
+    handleStreamChunk(chunk, type = 'content') {
         if (!chunk) {
             return;
         }
+        const isReasoning = type === 'reasoning';
+        // Keep pinned status updated for all streaming chunks
+        this.updateStreamingStatusFromChunk(chunk);
         // Suppress raw streaming output in scrollback; keep only status + final message.
-        if (this.streamingOutputSuppressed) {
-            this.updateStreamingStatusFromChunk(chunk);
+        // Reasoning chunks bypass this so the thought process stays visible.
+        if (this.streamingOutputSuppressed && !isReasoning) {
             this.captureStreamingThought(chunk);
             this.streamingContentSeen = true;
             return;
@@ -1776,8 +1819,10 @@ export class InteractiveShell {
             this.streamingFormatter = new StreamingResponseFormatter(output.columns ?? undefined);
             this.pushUiEvent('streaming', this.streamingFormatter.header());
         }
-        this.updateStreamingStatusFromChunk(chunk);
-        const formatted = this.streamingFormatter.formatChunk(chunk);
+        this.streamingFormatter.setMode(isReasoning ? 'reasoning' : 'content');
+        const formatted = isReasoning
+            ? this.streamingFormatter.formatReasoningChunk(chunk)
+            : this.streamingFormatter.formatChunk(chunk);
         this.captureStreamingThought(chunk);
         if (formatted) {
             if (formatted.trim().length > 0) {
@@ -2078,181 +2123,195 @@ export class InteractiveShell {
             this.syncRendererInput();
             return;
         }
-        switch (command) {
-            case '/help':
-            case '/?':
-                this.showHelp();
-                break;
-            case '/features':
-                this.showFeaturesMenu(input);
-                break;
-            case '/approvals':
-                this.handleApprovalsCommand(input);
-                break;
-            case '/learn':
-                this.showLearningStatus(input);
-                break;
-            case '/improve':
-                void this.handleImprovementCommand(input);
-                break;
-            case '/model':
-                this.showModelMenu();
-                break;
-            case '/exit':
-            case '/quit':
-            case '/q':
-                this.shutdown();
-                break;
-            case '/secrets':
-                this.showSecretsMenu();
-                break;
-            case '/tools':
-                this.showToolsMenu();
-                break;
-            case '/mcp':
-                await this.showMcpStatus();
-                break;
-            case '/doctor':
-                this.runDoctor();
-                break;
-            case '/checks':
-                await this.runRepoChecksCommand();
-                break;
-            case '/context':
-                await this.refreshWorkspaceContextCommand(input);
-                break;
-            case '/agents':
-                this.showAgentsMenu();
-                break;
-            case '/sessions':
-                await this.handleSessionCommand(input);
-                break;
-            case '/skills':
-                await this.handleSkillsCommand(input);
-                break;
-            case '/thinking':
-                this.handleThinkingCommand(input);
-                break;
-            case '/autocontinue':
-                this.handleAutoContinueCommand(input);
-                break;
-            case '/shortcuts':
-            case '/keys':
-                this.handleShortcutsCommand();
-                break;
-            case '/changes':
-            case '/summary':
-                this.showFileChangeSummary();
-                break;
-            case '/metrics':
-            case '/stats':
-            case '/perf':
-                this.showAlphaZeroMetrics();
-                break;
-            case '/suggestions':
-                this.showImprovementSuggestions();
-                break;
-            case '/plugins':
-                this.showPluginStatus();
-                break;
-            case '/evolve':
-                void this.handleEvolveCommand(input);
-                break;
-            case '/modular':
-            case '/a0':
-                void this.handleModularCommand(input);
-                break;
-            case '/offsec':
-                void this.handleOffsecCommand(input);
-                break;
-            case '/test':
-            case '/tests':
-                void this.handleTestCommand(input);
-                break;
-            case '/provider':
-                await this.handleProviderCommand(input);
-                break;
-            case '/providers':
-                this.showConfiguredProviders();
-                break;
-            case '/local':
-                await this.handleLocalCommand(input);
-                break;
-            case '/discover':
-                await this.discoverModelsCommand();
-                break;
-            // Erosolar-CLI style commands
-            case '/rewind':
-                await this.handleRewindCommand(input);
-                break;
-            case '/memory':
-                this.handleMemoryCommand(input);
-                break;
-            case '/vim':
-                this.handleVimCommand();
-                break;
-            case '/output-style':
-                this.handleOutputStyleCommand(input);
-                break;
-            case '/cost':
-                this.handleCostCommand();
-                break;
-            case '/usage':
-                this.handleUsageCommand(input);
-                break;
-            case '/clear':
-                this.handleClearCommand();
-                break;
-            case '/resume':
-                await this.handleResumeCommand(input);
-                break;
-            case '/export':
-                this.handleExportCommand(input);
-                break;
-            case '/review':
-                await this.handleReviewCommand();
-                break;
-            case '/security-review':
-                await this.handleSecurityReviewCommand();
-                break;
-            case '/new':
-                this.handleClearCommand();
-                break;
-            case '/undo':
-                await this.handleRewindCommand(input);
-                break;
-            case '/diff':
-                await this.handleDiffCommand();
-                break;
-            case '/mention':
-                this.handleMentionCommand();
-                break;
-            case '/status':
-                this.handleStatusCommand();
-                break;
-            case '/bug':
-                this.handleBugCommand();
-                break;
-            case '/terminal-setup':
-                this.handleTerminalSetupCommand();
-                break;
-            case '/permissions':
-                this.handlePermissionsCommand();
-                break;
-            case '/init':
-                this.handleInitCommand(input);
-                break;
-            case '/compact':
-                await this.handleCompactCommand();
-                break;
-            case '/logout':
-                this.handleLogoutCommand();
-                break;
-            default:
-                if (!(await this.tryCustomSlashCommand(command, input))) {
-                    display.showWarning(`Unknown command "${command}".`);
-                }
-                break;
+        this.clearInlinePanel();
+        this.inlinePanelScopeActive = true;
+        this.inlineCommandActive = true;
+        try {
+            switch (command) {
+                case '/help':
+                case '/?':
+                    this.showHelp();
+                    break;
+                case '/features':
+                    this.showFeaturesMenu(input);
+                    break;
+                case '/approvals':
+                    this.handleApprovalsCommand(input);
+                    break;
+                case '/learn':
+                    this.showLearningStatus(input);
+                    break;
+                case '/improve':
+                    void this.handleImprovementCommand(input);
+                    break;
+                case '/model':
+                    this.showModelMenu();
+                    break;
+                case '/exit':
+                case '/quit':
+                case '/q':
+                    this.shutdown();
+                    break;
+                case '/secrets':
+                    this.showSecretsMenu();
+                    break;
+                case '/tools':
+                    this.showToolsMenu();
+                    break;
+                case '/mcp':
+                    await this.showMcpStatus();
+                    break;
+                case '/doctor':
+                    this.runDoctor();
+                    break;
+                case '/checks':
+                    await this.runRepoChecksCommand();
+                    break;
+                case '/attach':
+                    await this.handleAttachCommand(input);
+                    break;
+                case '/context':
+                    await this.refreshWorkspaceContextCommand(input);
+                    break;
+                case '/agents':
+                    this.showAgentsMenu();
+                    break;
+                case '/sessions':
+                    await this.handleSessionCommand(input);
+                    break;
+                case '/skills':
+                    await this.handleSkillsCommand(input);
+                    break;
+                case '/thinking':
+                    this.handleThinkingCommand(input);
+                    break;
+                case '/autocontinue':
+                    this.handleAutoContinueCommand(input);
+                    break;
+                case '/shortcuts':
+                case '/keys':
+                    this.handleShortcutsCommand();
+                    break;
+                case '/changes':
+                case '/summary':
+                    this.showFileChangeSummary();
+                    break;
+                case '/metrics':
+                case '/stats':
+                case '/perf':
+                    this.showAlphaZeroMetrics();
+                    break;
+                case '/suggestions':
+                    this.showImprovementSuggestions();
+                    break;
+                case '/plugins':
+                    this.showPluginStatus();
+                    break;
+                case '/evolve':
+                    void this.handleEvolveCommand(input);
+                    break;
+                case '/modular':
+                case '/a0':
+                    void this.handleModularCommand(input);
+                    break;
+                case '/offsec':
+                    void this.handleOffsecCommand(input);
+                    break;
+                case '/test':
+                case '/tests':
+                    void this.handleTestCommand(input);
+                    break;
+                case '/provider':
+                    await this.handleProviderCommand(input);
+                    break;
+                case '/providers':
+                    this.showConfiguredProviders();
+                    break;
+                case '/local':
+                    await this.handleLocalCommand(input);
+                    break;
+                case '/discover':
+                    await this.discoverModelsCommand();
+                    break;
+                // Erosolar-CLI style commands
+                case '/rewind':
+                    await this.handleRewindCommand(input);
+                    break;
+                case '/memory':
+                    this.handleMemoryCommand(input);
+                    break;
+                case '/vim':
+                    this.handleVimCommand();
+                    break;
+                case '/output-style':
+                    this.handleOutputStyleCommand(input);
+                    break;
+                case '/cost':
+                    this.handleCostCommand();
+                    break;
+                case '/usage':
+                    this.handleUsageCommand(input);
+                    break;
+                case '/clear':
+                    this.handleClearCommand();
+                    break;
+                case '/resume':
+                    await this.handleResumeCommand(input);
+                    break;
+                case '/export':
+                    this.handleExportCommand(input);
+                    break;
+                case '/review':
+                    await this.handleReviewCommand();
+                    break;
+                case '/security-review':
+                    await this.handleSecurityReviewCommand();
+                    break;
+                case '/new':
+                    this.handleClearCommand();
+                    break;
+                case '/undo':
+                    await this.handleRewindCommand(input);
+                    break;
+                case '/diff':
+                    await this.handleDiffCommand();
+                    break;
+                case '/mention':
+                    this.handleMentionCommand();
+                    break;
+                case '/status':
+                    this.handleStatusCommand();
+                    break;
+                case '/bug':
+                    this.handleBugCommand();
+                    break;
+                case '/terminal-setup':
+                    this.handleTerminalSetupCommand();
+                    break;
+                case '/permissions':
+                    this.handlePermissionsCommand();
+                    break;
+                case '/init':
+                    this.handleInitCommand(input);
+                    break;
+                case '/compact':
+                    await this.handleCompactCommand();
+                    break;
+                case '/logout':
+                    this.handleLogoutCommand();
+                    break;
+                default:
+                    if (!(await this.tryCustomSlashCommand(command, input))) {
+                        display.showWarning(`Unknown command "${command}".`);
+                    }
+                    break;
+            }
+        }
+        finally {
+            this.inlineCommandActive = false;
+            if (!this.pendingInteraction) {
+                this.inlinePanelScopeActive = false;
+            }
         }
         this.syncRendererInput();
     }
@@ -2580,6 +2639,104 @@ export class InteractiveShell {
             : `${theme.info('Thinking off')} (Tab to toggle)`;
         display.showSystemMessage(`${headline}\n${theme.ui.muted(descriptions[this.thinkingMode])}`);
     }
+    async handleAttachCommand(input) {
+        const paths = input
+            .trim()
+            .split(/\s+/)
+            .slice(1)
+            .filter(Boolean);
+        if (!paths.length) {
+            display.showInfo(`Usage: /attach <file> [...]. Text-only, max ${Math.round(MAX_ATTACHMENT_BYTES / 1024)}KB per file; large files are truncated.`);
+            return;
+        }
+        if (this.isProcessing) {
+            display.showWarning('Wait for the current request to finish before attaching files.');
+            return;
+        }
+        if (!this.agent && !this.rebuildAgent()) {
+            display.showWarning('Configure a provider via /secrets before attaching files.');
+            return;
+        }
+        const agent = this.agent;
+        if (!agent) {
+            display.showWarning('No active agent is available. Try again in a moment.');
+            return;
+        }
+        const history = agent.getHistory();
+        const attachedSummaries = [];
+        for (const rawPath of paths) {
+            const filePath = resolve(this.workingDir, rawPath);
+            if (!existsSync(filePath)) {
+                display.showWarning(`File not found: ${rawPath}`);
+                continue;
+            }
+            let stats;
+            try {
+                stats = statSync(filePath);
+            }
+            catch (error) {
+                display.showWarning(`Unable to read file: ${rawPath} (${error instanceof Error ? error.message : 'unknown error'})`);
+                continue;
+            }
+            if (!stats.isFile()) {
+                display.showWarning(`Not a file: ${rawPath}`);
+                continue;
+            }
+            if (stats.size > MAX_ATTACHMENT_BYTES) {
+                display.showWarning(`Skipped ${rawPath} (${Math.round(stats.size / 1024)}KB) — limit is ${Math.round(MAX_ATTACHMENT_BYTES / 1024)}KB.`);
+                continue;
+            }
+            let buffer;
+            try {
+                buffer = readFileSync(filePath);
+            }
+            catch (error) {
+                display.showWarning(`Failed to read ${rawPath}: ${error instanceof Error ? error.message : String(error)}`);
+                continue;
+            }
+            if (this.isBinaryBuffer(buffer)) {
+                display.showWarning(`Skipped ${rawPath} — binary files are not attached.`);
+                continue;
+            }
+            let content = buffer.toString('utf-8');
+            let truncated = false;
+            if (content.length > MAX_ATTACHMENT_CHARS) {
+                content = content.slice(0, MAX_ATTACHMENT_CHARS);
+                truncated = true;
+            }
+            const displayPath = this.abbreviatePath(filePath);
+            const attachmentBlock = [
+                `Attachment: ${displayPath}`,
+                `Size: ${stats.size} bytes${truncated ? ` (truncated to ${MAX_ATTACHMENT_CHARS} chars)` : ''}`,
+                '',
+                '```text',
+                content,
+                '```',
+            ].join('\n');
+            history.push({ role: 'user', content: attachmentBlock });
+            const kb = Math.max(1, Math.round(stats.size / 1024));
+            attachedSummaries.push(`${displayPath} (${kb}KB${truncated ? ', truncated' : ''})`);
+        }
+        if (!attachedSummaries.length) {
+            display.showWarning('No attachments were added. Ensure files exist, are under the size limit, and are text.');
+            return;
+        }
+        agent.loadHistory(history);
+        this.cachedHistory = history;
+        this.refreshContextGauge();
+        this.captureHistorySnapshot();
+        this.autosaveIfEnabled();
+        display.showSystemMessage(`Attached ${attachedSummaries.length} file${attachedSummaries.length === 1 ? '' : 's'}: ${attachedSummaries.join(', ')}`);
+    }
+    isBinaryBuffer(buffer) {
+        const maxScan = Math.min(buffer.length, 8192);
+        for (let i = 0; i < maxScan; i++) {
+            if (buffer[i] === 0) {
+                return true;
+            }
+        }
+        return false;
+    }
     handleShortcutsCommand() {
         // Display keyboard shortcuts help (Erosolar-CLI style)
         display.showSystemMessage(formatShortcutsHelp());
@@ -4517,6 +4674,16 @@ export class InteractiveShell {
         const suffix = values.length > maxItems ? ', …' : '';
         return `${shown.join(', ')}${suffix}`;
     }
+    showInlinePanel(lines) {
+        display.showInlinePanel(lines);
+    }
+    clearInlinePanel() {
+        display.clearInlinePanel();
+    }
+    shouldCaptureInlinePanel() {
+        return (this.inlinePanelScopeActive &&
+            (this.inlineCommandActive || Boolean(this.pendingInteraction)));
+    }
     buildSlashCommandList(header) {
         const lines = [theme.gradient.primary(header), ''];
         for (const command of this.slashCommands) {
@@ -4527,7 +4694,7 @@ export class InteractiveShell {
     async showModelMenu() {
         // Hold input immediately so numeric selections don't get queued as prompts while we fetch
         this.pendingInteraction = { type: 'model-loading' };
-        display.showSystemMessage(theme.ui.muted('Fetching latest models from providers...'));
+        this.showInlinePanel([theme.ui.muted('Fetching latest models from providers...')]);
         try {
             // Fetch live models from all configured providers
             const providerStatuses = await quickCheckProviders();
@@ -4535,6 +4702,7 @@ export class InteractiveShell {
             if (!providerOptions.length) {
                 display.showWarning('No providers are available.');
                 this.pendingInteraction = null;
+                this.clearInlinePanel();
                 this.syncRendererInput();
                 return;
             }
@@ -4550,12 +4718,13 @@ export class InteractiveShell {
                 }),
                 'Type the number of the provider to continue, or type "cancel".',
             ];
-            display.showSystemMessage(lines.join('\n'));
+            this.showInlinePanel(lines);
             this.pendingInteraction = { type: 'model-provider', options: providerOptions };
         }
         catch (error) {
             display.showError('Failed to load model list. Try again in a moment.', error);
             this.pendingInteraction = null;
+            this.clearInlinePanel();
             this.syncRendererInput();
         }
     }
@@ -4688,6 +4857,7 @@ export class InteractiveShell {
         if (!allModels.length) {
             display.showWarning(`No models available for ${option.label}.`);
             this.pendingInteraction = null;
+            this.clearInlinePanel();
             return;
         }
         const lines = [
@@ -4703,7 +4873,7 @@ export class InteractiveShell {
             }),
             'Type the number of the model to select it, type "back" to change provider, or type "cancel".',
         ];
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
         this.pendingInteraction = { type: 'model', provider: option.provider, options: allModels };
     }
     showSecretsMenu() {
@@ -4719,7 +4889,7 @@ export class InteractiveShell {
             }),
             'Enter the number to update a key, or type "cancel".',
         ];
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
         this.pendingInteraction = { type: 'secret-select', options: definitions };
     }
     showToolsMenu() {
@@ -4745,7 +4915,7 @@ export class InteractiveShell {
             '',
             'Enter the number to toggle, "save" to persist, "defaults" to restore recommended tools, or "cancel".',
         ];
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
     }
     formatToolOptionLine(option, index, selection) {
         const enabled = selection.has(option.id);
@@ -4857,7 +5027,7 @@ export class InteractiveShell {
         }
         lines.push('');
         lines.push(theme.ui.muted('Use /tools to enable/disable individual MCP tools.'));
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
     }
     showMcpSetupGuide() {
         const lines = [];
@@ -4933,7 +5103,7 @@ export class InteractiveShell {
         lines.push(`    ${theme.info('description')} - Human-readable description`);
         lines.push('');
         lines.push(`Run ${theme.primary('/mcp examples')} to see example configurations.`);
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
     }
     showMcpExamples() {
         const lines = [];
@@ -5064,7 +5234,7 @@ export class InteractiveShell {
         lines.push(`  ${theme.info('@anthropic/mcp-server-github')} - GitHub API`);
         lines.push('');
         lines.push(`More servers: ${theme.primary('https://github.com/modelcontextprotocol/servers')}`);
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
     }
     showAgentsMenu() {
         if (!this.agentMenu) {
@@ -5077,7 +5247,7 @@ export class InteractiveShell {
             '',
             'Enter the number to save it, or type "cancel".',
         ];
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
         this.pendingInteraction = { type: 'agent-selection', options: this.agentMenu.options };
     }
     formatAgentOptionLine(option, index) {
@@ -5117,6 +5287,7 @@ export class InteractiveShell {
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Model selection cancelled.');
+            this.clearInlinePanel();
             this.syncRendererInput();
             return;
         }
@@ -5154,6 +5325,7 @@ export class InteractiveShell {
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Model selection cancelled.');
+            this.clearInlinePanel();
             this.syncRendererInput();
             return;
         }
@@ -5195,6 +5367,7 @@ export class InteractiveShell {
             this.persistSessionPreference();
             this.resetChatBoxAfterModelSwap();
         }
+        this.clearInlinePanel();
     }
     async handleSecretSelection(input) {
         const pending = this.pendingInteraction;
@@ -5210,6 +5383,7 @@ export class InteractiveShell {
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
             display.showInfo('Secret management cancelled.');
+            this.clearInlinePanel();
             this.syncRendererInput();
             return;
         }
@@ -5225,7 +5399,7 @@ export class InteractiveShell {
             this.syncRendererInput();
             return;
         }
-        display.showSystemMessage(`Enter a new value for ${secret.label} or type "cancel".`);
+        this.showInlinePanel([`Enter a new value for ${secret.label} or type "cancel".`]);
         this.pendingInteraction = { type: 'secret-input', secret };
         this.syncRendererInput();
     }
@@ -5244,6 +5418,7 @@ export class InteractiveShell {
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
             display.showInfo('Secret unchanged.');
+            this.clearInlinePanel();
             this.syncRendererInput();
             return;
         }
@@ -5268,6 +5443,7 @@ export class InteractiveShell {
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
         }
+        this.clearInlinePanel();
         this.syncRendererInput();
     }
     async processRequest(request) {
@@ -5279,6 +5455,8 @@ export class InteractiveShell {
             display.showWarning('Configure an API key via /secrets before sending requests.');
             return;
         }
+        this.inlinePanelScopeActive = false;
+        this.clearInlinePanel();
         const agent = this.agent;
         if (!agent) {
             return;
@@ -5418,6 +5596,8 @@ export class InteractiveShell {
             display.showWarning('Configure an API key via /secrets before sending requests.');
             return;
         }
+        this.inlinePanelScopeActive = false;
+        this.clearInlinePanel();
         const agent = this.agent;
         if (!agent) {
             return;
@@ -6209,8 +6389,8 @@ Return ONLY JSON array:
                 autoContinue: this.autoContinueEnabled,
             };
             this.agent = this.runtimeSession.createAgent(selection, {
-                onStreamChunk: (chunk) => {
-                    this.handleStreamChunk(chunk);
+                onStreamChunk: (chunk, type) => {
+                    this.handleStreamChunk(chunk, type ?? 'content');
                 },
                 onStreamFallback: (info) => this.handleStreamingFallback(info),
                 onAssistantMessage: (content, metadata) => {
@@ -6933,7 +7113,9 @@ Return ONLY JSON array:
         const detailText = info.message?.trim() ?? '';
         const detail = detailText ? ` ${detailText}` : '';
         const reason = info.reason ? ` (${info.reason.replace(/-/g, ' ')})` : '';
-        const partialNote = info.partialResponse ? ' Partial stream captured before failure.' : '';
+        const partialNote = info.partialResponse
+            ? ' Partial stream captured before failure; continuing from it without restarting.'
+            : '';
         const baseMessage = 'Streaming interrupted, retrying without streaming';
         display.showWarning(`${baseMessage}${reason}.${detail}${partialNote}`.trim());
         this.finishStreamingFormatter('Stream interrupted - retrying without streaming', { mode: 'update' });