erosolar-cli 2.1.214 → 2.1.216

package/dist/shell/interactiveShell.js

@@ -160,7 +160,11 @@ export class InteractiveShell {
     lastUserQuery = '';
     lastAssistantResponse = null;
     responseRendered = false;
-    autoContinueNoticeShown = false;
+    remainingIssueFixQueued = false;
+    lastBuildStatus = null;
+    lastTestStatus = null;
+    lastRunToolCount = null;
+    lastRunDurationSeconds = null;
     lastFailure = null;
     lastAutoTestRun = null;
     // Auto-build tracking
@@ -183,6 +187,9 @@ export class InteractiveShell {
     statusMessageOverride = null;
     inlineCommandActive = false;
     inlinePanelScopeActive = false;
+    inlinePanelBase = [];
+    inlinePanelNotices = [];
+    inlinePanelClearTimer = null;
     promptRefreshTimer = null;
     launchPaletteShown = false;
     version;
@@ -410,6 +417,7 @@ export class InteractiveShell {
         const workspace = this.abbreviatePath(this.workingDir);
         const version = this.version || this.getPackageInfo().version || 'dev';
         const frame = (content) => theme.gradient.primary(content);
+        // eslint-disable-next-line no-control-regex
         const stripAnsi = (value) => value.replace(/\u001B\[[0-?]*[ -/]*[@-~]/g, '');
         const padCenter = (text, width) => {
             const len = stripAnsi(text).length;
@@ -942,8 +950,8 @@ export class InteractiveShell {
             return;
         }
         const message = enabled
-            ? '▶️ Auto-continue on. After a response, the agent may keep working to verify/fix automatically. (Ctrl+Shift+G to toggle)'
-            : '⏹️ Auto-continue off. Runs will stop after responses; no automatic follow-ups. (Ctrl+Shift+G to toggle)';
+            ? '▶️ Auto-continue on. Verification can rerun after fixes automatically. (Ctrl+Shift+G to toggle)'
+            : '⏹️ Auto-continue off. Single verification pass only; no automatic retries. (Ctrl+Shift+G to toggle)';
         display.showSystemMessage(message);
     }
     toggleCriticalApprovalMode(source) {
@@ -1205,15 +1213,14 @@ export class InteractiveShell {
         }
         const trimmed = input.trim();
         if (!trimmed) {
-            display.showWarning('Enter a number, "save", "defaults", or "cancel".');
+            this.appendInlineNotice('Enter a number, "save", "defaults", or "cancel".', 'warning');
             this.syncRendererInput();
             return;
         }
         const normalized = trimmed.toLowerCase();
         if (normalized === 'cancel') {
             this.pendingInteraction = null;
-            display.showInfo('Tool selection cancelled.');
-            this.clearInlinePanel();
+            this.showInlineStatus('Tool selection cancelled.', 'info', { autoClearMs: 1600 });
             this.syncRendererInput();
             return;
         }
@@ -1224,9 +1231,14 @@ export class InteractiveShell {
             return;
         }
         if (normalized === 'save') {
-            await this.persistToolSelection(pending);
+            const result = await this.persistToolSelection(pending);
             this.pendingInteraction = null;
-            this.clearInlinePanel();
+            if (result) {
+                this.showInlineStatus(result.message, result.tone ?? 'info', { autoClearMs: 1800 });
+            }
+            else {
+                this.clearInlinePanel();
+            }
             this.syncRendererInput();
             return;
         }
@@ -1234,11 +1246,11 @@ export class InteractiveShell {
         if (Number.isFinite(choice)) {
             const option = pending.options[choice - 1];
             if (!option) {
-                display.showWarning('That option is not available.');
+                this.appendInlineNotice('That option is not available.', 'warning');
             }
             else {
                 if (option.locked) {
-                    display.showInfo('The default tool package is always enabled and cannot be toggled.');
+                    this.appendInlineNotice('The default tool package is always enabled and cannot be toggled.', 'info');
                 }
                 else {
                     if (pending.selection.has(option.id)) {
@@ -1253,26 +1265,24 @@ export class InteractiveShell {
             this.syncRendererInput();
             return;
         }
-        display.showWarning('Enter a number, "save", "defaults", or "cancel".');
+        this.appendInlineNotice('Enter a number, "save", "defaults", or "cancel".', 'warning');
         this.syncRendererInput();
     }
     async persistToolSelection(interaction) {
         if (setsEqual(interaction.selection, interaction.initialSelection)) {
-            display.showInfo('No changes to save.');
-            return;
+            return { message: 'No changes to save.', tone: 'info' };
         }
         const defaults = buildEnabledToolSet(null, this.profile);
         if (setsEqual(interaction.selection, defaults)) {
             clearToolSettings();
-            display.showInfo('Tool settings cleared. Defaults will be used on the next launch.');
-            return;
+            return { message: 'Tool settings cleared. Defaults will be used on the next launch.', tone: 'info' };
         }
         const ordered = interaction.options
             .filter((option) => !option.locked)
             .map((option) => option.id)
             .filter((id) => interaction.selection.has(id));
         saveToolSettings({ enabledTools: ordered });
-        display.showInfo('Tool settings saved. Restart the CLI to apply them.');
+        return { message: 'Tool settings saved. Restart the CLI to apply them.', tone: 'success' };
     }
     async handleAgentSelectionInput(input) {
         const pending = this.pendingInteraction;
@@ -1281,58 +1291,69 @@ export class InteractiveShell {
         }
         if (!this.agentMenu) {
             this.pendingInteraction = null;
-            display.showWarning('Agent selection is unavailable in this CLI.');
+            this.showInlineStatus('Agent selection is unavailable in this CLI.', 'warning', { autoClearMs: 1600 });
             this.syncRendererInput();
             return;
         }
         const trimmed = input.trim();
         if (!trimmed) {
-            display.showWarning('Enter a number or type "cancel".');
+            this.appendInlineNotice('Enter a number or type "cancel".', 'warning');
             this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
-            display.showInfo('Agent selection cancelled.');
-            this.clearInlinePanel();
+            this.showInlineStatus('Agent selection cancelled.', 'info', { autoClearMs: 1600 });
             this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice)) {
-            display.showWarning('Please enter a valid number.');
+            this.appendInlineNotice('Please enter a valid number.', 'warning');
             this.syncRendererInput();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
-            display.showWarning('That option is not available.');
+            this.appendInlineNotice('That option is not available.', 'warning');
             this.syncRendererInput();
             return;
         }
-        await this.persistAgentSelection(option.name);
         this.pendingInteraction = null;
-        this.clearInlinePanel();
+        const result = await this.persistAgentSelection(option.name);
+        if (result) {
+            this.showInlineStatus(result.message, result.tone ?? 'info', { autoClearMs: 2000 });
+        }
+        else {
+            this.clearInlinePanel();
+        }
         this.syncRendererInput();
     }
     async persistAgentSelection(profileName) {
         if (!this.agentMenu) {
-            return;
+            return null;
         }
         const currentDefault = this.agentMenu.persistedProfile ?? this.agentMenu.defaultProfile;
         if (profileName === currentDefault) {
-            display.showInfo(`${this.agentMenuLabel(profileName)} is already configured for the next launch.`);
-            return;
+            return {
+                message: `${this.agentMenuLabel(profileName)} is already configured for the next launch.`,
+                tone: 'info',
+            };
         }
         if (profileName === this.agentMenu.defaultProfile) {
             clearActiveProfilePreference();
             this.agentMenu.persistedProfile = null;
-            display.showInfo(`${this.agentMenuLabel(profileName)} restored as the default agent. Restart the CLI to switch.`);
-            return;
+            return {
+                message: `${this.agentMenuLabel(profileName)} restored as the default agent. Restart the CLI to switch.`,
+                tone: 'success',
+            };
         }
         saveActiveProfilePreference(profileName);
         this.agentMenu.persistedProfile = profileName;
-        display.showInfo(`${this.agentMenuLabel(profileName)} will load the next time you start the CLI. Restart to switch now.`);
+        return {
+            message: `${this.agentMenuLabel(profileName)} will load the next time you start the CLI. Restart to switch now.`,
+            tone: 'success',
+        };
     }
     /**
      * Show plan approval UI with interactive step selection
@@ -1385,7 +1406,7 @@ export class InteractiveShell {
         lines.push(`  ${theme.primary('cancel')}   Cancel planning`);
         lines.push(`  ${theme.primary('[text]')}   Submit your own solution instead`);
         lines.push('');
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
         this.syncRendererInput();
     }
     async handlePlanApprovalInput(input) {
@@ -1394,7 +1415,7 @@ export class InteractiveShell {
             return;
         const trimmed = input.trim();
         if (!trimmed) {
-            display.showWarning('Enter a command or your own solution.');
+            this.appendInlineNotice('Enter a command or your own solution.', 'warning');
             this.syncRendererInput();
             return;
         }
@@ -1402,7 +1423,7 @@ export class InteractiveShell {
         // Cancel
         if (lower === 'cancel' || lower === 'c') {
             this.pendingInteraction = null;
-            display.showInfo('Plan cancelled. You can continue with a different approach.');
+            this.showInlineStatus('Plan cancelled. You can continue with a different approach.', 'info', { autoClearMs: 1800 });
             this.syncRendererInput();
             return;
         }
@@ -1422,7 +1443,7 @@ export class InteractiveShell {
         if (lower === 'go' || lower === 'g' || lower === 'yes' || lower === 'y') {
             const selectedSteps = pending.steps.filter(s => pending.selectedSteps.has(s.id));
             if (selectedSteps.length === 0) {
-                display.showWarning('No steps selected. Select steps or enter your own solution.');
+                this.appendInlineNotice('No steps selected. Select steps or enter your own solution.', 'warning');
                 this.syncRendererInput();
                 return;
             }
@@ -1449,13 +1470,13 @@ export class InteractiveShell {
         // User submitted their own solution - treat as custom input
         if (trimmed.length > 10) {
             this.pendingInteraction = null;
-            display.showInfo('Using your custom solution...');
+            this.showInlineStatus('Using your custom solution...', 'info', { autoClearMs: 1400 });
             // Send the custom solution as the implementation request
             const customPrompt = `The user has provided their own solution instead of the plan. Please implement this:\n\n${trimmed}`;
             await this.enqueuePromptForProcessing(customPrompt, 'programmatic');
             return;
         }
-        display.showWarning('Invalid input. Enter a step number, command (go/cancel/all/none), or your own solution.');
+        this.appendInlineNotice('Invalid input. Enter a step number, command (go/cancel/all/none), or your own solution.', 'warning');
         this.syncRendererInput();
     }
     async runWithCriticalApproval(label, detail, action) {
@@ -1501,7 +1522,7 @@ export class InteractiveShell {
         }
         lines.push('');
         lines.push('Type "yes" to proceed or "no" to cancel.');
-        display.showSystemMessage(lines.join('\n'));
+        this.showInlinePanel(lines);
         this.syncRendererInput();
     }
     async handleCriticalApprovalInput(input) {
@@ -1511,23 +1532,25 @@ export class InteractiveShell {
         }
         const normalized = input.trim().toLowerCase();
         if (!normalized) {
-            display.showWarning('Enter "yes" to proceed or "no" to cancel.');
+            this.appendInlineNotice('Enter "yes" to proceed or "no" to cancel.', 'warning');
             this.syncRendererInput();
             return;
         }
         if (normalized === 'yes' || normalized === 'y') {
             this.pendingInteraction = null;
             await pending.onApprove();
+            this.showInlineStatus('Approved.', 'success', { autoClearMs: 1400 });
             this.syncRendererInput();
             return;
         }
         if (normalized === 'no' || normalized === 'n' || normalized === 'cancel' || normalized === 'c') {
             this.pendingInteraction = null;
             pending.onCancel?.();
+            this.showInlineStatus('Action cancelled.', 'info', { autoClearMs: 1400 });
             this.syncRendererInput();
             return;
         }
-        display.showWarning('Please respond with "yes" to proceed or "no" to cancel.');
+        this.appendInlineNotice('Please respond with "yes" to proceed or "no" to cancel.', 'warning');
         this.syncRendererInput();
     }
     setupHandlers() {
@@ -1635,6 +1658,28 @@ export class InteractiveShell {
     }
     describeStatusDetail(detail) {
         const parts = detail?.trim() ? [detail.trim()] : [];
+        // Build/test health
+        if (this.lastBuildStatus) {
+            parts.push(this.lastBuildStatus === 'ok' ? 'build ok' : 'build failing');
+        }
+        if (this.lastTestStatus) {
+            parts.push(this.lastTestStatus === 'ok' ? 'tests ok' : 'tests failing');
+        }
+        // Recent run metrics
+        if (this.lastRunDurationSeconds !== null) {
+            const durationLabel = this.formatElapsedTime(this.lastRunDurationSeconds);
+            const toolsLabel = this.lastRunToolCount != null ? `${this.lastRunToolCount} tool${this.lastRunToolCount === 1 ? '' : 's'}` : '';
+            parts.push(`last ${durationLabel}${toolsLabel ? ` · ${toolsLabel}` : ''}`);
+        }
+        // Dirty workspace indicator
+        if (this.hasRecordedWrites()) {
+            parts.push('writes dirty');
+        }
+        // Context headroom warning
+        const ctxPercent = this.computeContextPercent();
+        if (ctxPercent !== null && ctxPercent >= 85) {
+            parts.push(`ctx ${ctxPercent}%`);
+        }
         // Show queued prompts in the prompt inbox (Ctrl+Enter during streaming)
         const inboxDepth = this.promptInbox.length + (this.promptInFlight ? 1 : 0);
         if (inboxDepth > 0) {
@@ -1700,6 +1745,15 @@ export class InteractiveShell {
         const provider = this.providerLabel(this.sessionState.provider);
         return `${provider} · ${this.sessionState.model}`;
     }
+    hasRecordedWrites() {
+        return this._fileChangeTracker.getAllChanges().length > 0;
+    }
+    computeContextPercent() {
+        if (!this.latestTokenUsage.used || !this.latestTokenUsage.limit || this.latestTokenUsage.limit <= 0) {
+            return null;
+        }
+        return Math.min(100, Math.max(0, Math.round((this.latestTokenUsage.used / this.latestTokenUsage.limit) * 100)));
+    }
     refreshContextGauge() {
         // First try to get context window from provider API (real value)
         // Fall back to static model mapping only if provider API is not available
@@ -1736,7 +1790,7 @@ export class InteractiveShell {
             // Ignore errors - keep using static mapping
         }
     }
-    updateContextUsage(percentage, autoCompactThreshold = CONTEXT_AUTOCOMPACT_PERCENT) {
+    updateContextUsage(percentage, _autoCompactThreshold = CONTEXT_AUTOCOMPACT_PERCENT) {
         this.uiAdapter.updateContextUsage(percentage);
         this.terminalInput.setContextUsage(percentage);
     }
@@ -1756,7 +1810,7 @@ export class InteractiveShell {
             profile: this.profileLabel,
             workspace: workspaceDisplay,
             directory: workspaceDisplay,
-            writes: this.describeEditGuardMode(),
+            writes: `${this.describeEditGuardMode()} · ${this.hasRecordedWrites() ? 'dirty' : 'clean'}`,
             sessionLabel: this.describeSessionLabel(),
             thinkingLabel: (this.thinkingMode || 'off').toString(),
             autosave: this.autosaveEnabled,
@@ -2510,7 +2564,7 @@ export class InteractiveShell {
         }
         switch (this.pendingInteraction.type) {
             case 'model-loading':
-                display.showInfo('Still fetching model options. Please wait a moment.');
+                this.appendInlineNotice('Still fetching model options. Please wait a moment.', 'info');
                 this.syncRendererInput();
                 return true;
             case 'model-provider':
@@ -2544,7 +2598,7 @@ export class InteractiveShell {
     async processSlashCommand(input) {
         const [command] = input.split(/\s+/);
         if (!command) {
-            display.showWarning('Enter a slash command.');
+            this.showSlashWarning('Enter a slash command.');
             this.syncRendererInput();
             return;
         }
@@ -2720,7 +2774,7 @@ export class InteractiveShell {
                     break;
                 default:
                     if (!(await this.tryCustomSlashCommand(command, input))) {
-                        display.showWarning(`Unknown command "${command}".`);
+                        this.showInlineStatus(`Unknown command "${command}".`, 'warning', { autoClearMs: 1800 });
                     }
                     break;
             }
@@ -2740,7 +2794,7 @@ export class InteractiveShell {
         }
         const args = fullInput.slice(command.length).trim();
         if (custom.requireInput && !args) {
-            display.showWarning(`${command} requires additional input.`);
+            this.showSlashWarning(`${command} requires additional input.`);
             return true;
         }
         const prompt = buildCustomCommandPrompt(custom, args, {
@@ -2750,10 +2804,10 @@ export class InteractiveShell {
             model: this.sessionState.model,
         }).trim();
         if (!prompt) {
-            display.showWarning(`Custom command ${command} did not produce any text. Check ${custom.source} for errors.`);
+            this.showSlashWarning(`Custom command ${command} did not produce any text. Check ${custom.source} for errors.`);
             return true;
         }
-        display.showInfo(`Running ${command} from ${custom.source}...`);
+        this.showSlashInfo(`Running ${command} from ${custom.source}...`);
         await this.processRequest(prompt);
         return true;
     }
@@ -2832,7 +2886,7 @@ export class InteractiveShell {
     }
     async runRepoChecksCommand() {
         if (this.isProcessing) {
-            display.showWarning('Wait for the active response to finish before running checks.');
+            this.showSlashWarning('Wait for the active response to finish before running checks.');
             return;
         }
         const call = {
@@ -2840,34 +2894,34 @@ export class InteractiveShell {
             name: 'run_repo_checks',
             arguments: {},
         };
-        display.showInfo('Running repo checks (npm test/build/lint when available)...');
+        this.showSlashInfo('Running repo checks (npm test/build/lint when available)...');
         const output = await this.runtimeSession.toolRuntime.execute(call);
         display.showSystemMessage(output);
     }
     async refreshWorkspaceContextCommand(input) {
         if (this.isProcessing) {
-            display.showWarning('Wait for the active response to finish before refreshing the snapshot.');
+            this.showSlashWarning('Wait for the active response to finish before refreshing the snapshot.');
             return;
         }
         const { overrides, error } = this.parseContextOverrideTokens(input);
         if (error) {
-            display.showWarning(`${error} ${this.describeContextOverrideUsage()}`);
+            this.showSlashWarning(`${error} ${this.describeContextOverrideUsage()}`);
             return;
         }
         if (overrides) {
             this.workspaceOptions = { ...this.workspaceOptions, ...overrides };
         }
-        display.showInfo('Refreshing workspace snapshot...');
+        this.showSlashInfo('Refreshing workspace snapshot...');
         const context = buildWorkspaceContext(this.workingDir, this.workspaceOptions);
         const profileConfig = this.runtimeSession.refreshWorkspaceContext(context);
         const tools = this.runtimeSession.toolRuntime.listProviderTools();
         this.baseSystemPrompt = buildInteractiveSystemPrompt(profileConfig.systemPrompt, profileConfig.label, tools);
         if (this.rebuildAgent()) {
-            display.showInfo(`Workspace snapshot refreshed (${this.describeWorkspaceOptions()}).`);
+            this.showSlashInfo(`Workspace snapshot refreshed (${this.describeWorkspaceOptions()}).`);
             this.resetChatBoxAfterModelSwap();
         }
         else {
-            display.showWarning('Workspace snapshot refreshed, but the agent failed to rebuild. Run /doctor for details.');
+            this.showSlashWarning('Workspace snapshot refreshed, but the agent failed to rebuild. Run /doctor for details.');
         }
     }
     parseContextOverrideTokens(input) {
@@ -2942,7 +2996,7 @@ export class InteractiveShell {
                 this.clearAutosaveCommand();
                 return;
             default:
-                display.showWarning('Usage: /sessions [list|save <title>|load <id>|delete <id>|new <title>|autosave on|off|clear]');
+                this.showSlashWarning('Usage: /sessions [list|save <title>|load <id>|delete <id>|new <title>|autosave on|off|clear]');
                 return;
         }
     }
@@ -2979,7 +3033,7 @@ export class InteractiveShell {
                 case 'view': {
                     const identifier = filtered.shift();
                     if (!identifier) {
-                        display.showWarning('Usage: /skills show <skill-id> [sections=metadata,body]');
+                        this.showSlashWarning('Usage: /skills show <skill-id> [sections=metadata,body]');
                         return;
                     }
                     let sectionsArg;
@@ -3009,13 +3063,13 @@ export class InteractiveShell {
                     break;
                 }
                 default:
-                    display.showWarning('Usage: /skills [list|refresh|show <id> [sections=a,b]]');
+                    this.showSlashWarning('Usage: /skills [list|refresh|show <id> [sections=a,b]]');
                     break;
             }
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            display.showError(`Skill command failed: ${message}`);
+            this.showInlineStatus(`Skill command failed: ${message}`, 'error');
         }
     }
     async invokeSkillTool(name, args) {
@@ -3029,16 +3083,15 @@ export class InteractiveShell {
     handleThinkingCommand(input) {
         const value = input.slice('/thinking'.length).trim().toLowerCase();
         if (!value) {
-            display.showInfo(`Thinking mode is currently ${theme.info(this.thinkingMode)}. Usage: /thinking [balanced|extended].` +
-                ' Press Tab any time to toggle.');
+            this.showSlashInfo(`Thinking mode is currently ${theme.info(this.thinkingMode)}. Usage: /thinking [balanced|extended]. Press Tab any time to toggle.`);
             return;
         }
         if (value !== 'balanced' && value !== 'extended') {
-            display.showWarning('Usage: /thinking [balanced|extended]');
+            this.showSlashWarning('Usage: /thinking [balanced|extended]');
             return;
         }
         if (this.isProcessing) {
-            display.showWarning('Wait until the current request finishes before changing thinking mode.');
+            this.showSlashWarning('Wait until the current request finishes before changing thinking mode.');
             return;
         }
         this.thinkingMode = value;
@@ -3063,20 +3116,20 @@ export class InteractiveShell {
             .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.`);
+            this.showSlashInfo(`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.');
+            this.showSlashWarning('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.');
+            this.showSlashWarning('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.');
+            this.showSlashWarning('No active agent is available. Try again in a moment.');
             return;
         }
         const history = agent.getHistory();
@@ -3084,7 +3137,7 @@ export class InteractiveShell {
         for (const rawPath of paths) {
             const filePath = resolve(this.workingDir, rawPath);
             if (!existsSync(filePath)) {
-                display.showWarning(`File not found: ${rawPath}`);
+                this.showSlashWarning(`File not found: ${rawPath}`);
                 continue;
             }
             let stats;
@@ -3092,15 +3145,15 @@ export class InteractiveShell {
                 stats = statSync(filePath);
             }
             catch (error) {
-                display.showWarning(`Unable to read file: ${rawPath} (${error instanceof Error ? error.message : 'unknown error'})`);
+                this.showSlashWarning(`Unable to read file: ${rawPath} (${error instanceof Error ? error.message : 'unknown error'})`);
                 continue;
             }
             if (!stats.isFile()) {
-                display.showWarning(`Not a file: ${rawPath}`);
+                this.showSlashWarning(`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.`);
+                this.showSlashWarning(`Skipped ${rawPath} (${Math.round(stats.size / 1024)}KB) — limit is ${Math.round(MAX_ATTACHMENT_BYTES / 1024)}KB.`);
                 continue;
             }
             let buffer;
@@ -3108,11 +3161,11 @@ export class InteractiveShell {
                 buffer = readFileSync(filePath);
             }
             catch (error) {
-                display.showWarning(`Failed to read ${rawPath}: ${error instanceof Error ? error.message : String(error)}`);
+                this.showSlashWarning(`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.`);
+                this.showSlashWarning(`Skipped ${rawPath} — binary files are not attached.`);
                 continue;
             }
             let content = buffer.toString('utf-8');
@@ -3135,7 +3188,7 @@ export class InteractiveShell {
             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.');
+            this.showSlashWarning('No attachments were added. Ensure files exist, are under the size limit, and are text.');
             return;
         }
         agent.loadHistory(history);
@@ -3162,7 +3215,7 @@ export class InteractiveShell {
         const summary = this._fileChangeTracker.getSummary();
         const changes = this._fileChangeTracker.getAllChanges();
         if (changes.length === 0) {
-            display.showInfo('No files modified in this session.');
+            this.showSlashInfo('No files modified in this session.');
             return;
         }
         const lines = [];
@@ -3206,7 +3259,7 @@ export class InteractiveShell {
     showImprovementSuggestions() {
         const suggestions = this.alphaZeroMetrics.getImprovementSuggestions();
         if (suggestions.length === 0) {
-            display.showInfo('No improvement suggestions at this time. Keep using the shell to generate metrics!');
+            this.showSlashInfo('No improvement suggestions at this time. Keep using the shell to generate metrics!');
             return;
         }
         const lines = [
@@ -3240,8 +3293,8 @@ export class InteractiveShell {
                 const newValue = args[1] === 'on' ? true : args[1] === 'off' ? false : undefined;
                 const updated = toggleFeatureFlag(matchedKey, newValue);
                 const status = updated[matchedKey] ? theme.success('enabled') : theme.ui.muted('disabled');
-                display.showInfo(`Feature "${FEATURE_FLAG_INFO[matchedKey].label}" is now ${status}.`);
-                display.showInfo('Changes will take effect on next launch or after /features refresh.');
+                this.showSlashInfo(`Feature "${FEATURE_FLAG_INFO[matchedKey].label}" is now ${status}.`);
+                this.showSlashInfo('Changes will take effect on next launch or after /features refresh.');
                 return;
             }
             else if (featureName === 'all') {
@@ -3252,11 +3305,11 @@ export class InteractiveShell {
                     updated[key] = newValue;
                 }
                 saveFeatureFlags(updated);
-                display.showInfo(`All features ${newValue ? theme.success('enabled') : theme.ui.muted('disabled')}.`);
+                this.showSlashInfo(`All features ${newValue ? theme.success('enabled') : theme.ui.muted('disabled')}.`);
                 return;
             }
             else {
-                display.showWarning(`Unknown feature: ${featureName}`);
+                this.showSlashWarning(`Unknown feature: ${featureName}`);
             }
         }
         // Show features menu
@@ -3294,10 +3347,10 @@ export class InteractiveShell {
         if (subcommand === 'commit') {
             const result = commitLearning(args.slice(1).join(' ') || 'Manual learning checkpoint', this.workingDir);
             if (result.success) {
-                display.showInfo(`Learning committed: ${result.commitHash}`);
+                this.showSlashInfo(`Learning committed: ${result.commitHash}`);
             }
             else {
-                display.showWarning(`Could not commit: ${result.error}`);
+                this.showSlashWarning(`Could not commit: ${result.error}`);
             }
             return;
         }
@@ -3892,7 +3945,7 @@ export class InteractiveShell {
         if (subcommand === 'generate') {
             const targetPath = args[1];
             if (!targetPath) {
-                display.showWarning('Usage: /test generate <file-path>');
+                this.showSlashWarning('Usage: /test generate <file-path>');
                 return;
             }
             display.showSystemMessage(theme.gradient.primary(`🧪 Generating Test Flows for ${targetPath}...`));
@@ -4076,12 +4129,12 @@ export class InteractiveShell {
     async saveSessionCommand(title) {
         const agent = this.agent;
         if (!agent) {
-            display.showWarning('Start a conversation before saving a session.');
+            this.showSlashWarning('Start a conversation before saving a session.');
             return;
         }
         const history = agent.getHistory();
         if (!history || history.length <= 1) {
-            display.showWarning('You need at least one user message before saving a session.');
+            this.showSlashWarning('You need at least one user message before saving a session.');
             return;
         }
         const summary = saveSessionSnapshot({
@@ -4098,17 +4151,17 @@ export class InteractiveShell {
         this.updateActiveSession(summary, true);
         this.sessionResumeNotice = null;
         this.autosaveIfEnabled();
-        display.showInfo(`Session saved as "${summary.title}" (id ${this.formatSessionId(summary.id)}).`);
+        this.showSlashInfo(`Session saved as "${summary.title}" (id ${this.formatSessionId(summary.id)}).`);
     }
     async loadSessionCommand(selector) {
         const summary = this.resolveSessionBySelector(selector);
         if (!summary) {
-            display.showWarning('No session matches that selection.');
+            this.showSlashWarning('No session matches that selection.');
             return;
         }
         const stored = loadSessionById(summary.id);
         if (!stored) {
-            display.showWarning('Failed to load that session. It may have been corrupted or deleted.');
+            this.showSlashWarning('Failed to load that session. It may have been corrupted or deleted.');
             return;
         }
         this.cachedHistory = stored.messages;
@@ -4117,28 +4170,28 @@ export class InteractiveShell {
         if (this.agent) {
             this.agent.loadHistory(stored.messages);
             this.sessionResumeNotice = null;
-            display.showInfo(`Loaded session "${summary.title}".`);
+            this.showSlashInfo(`Loaded session "${summary.title}".`);
             this.refreshContextGauge();
             this.captureHistorySnapshot();
             this.pendingHistoryLoad = null;
         }
         else {
             this.pendingHistoryLoad = stored.messages;
-            display.showInfo(`Session "${summary.title}" queued to load once the agent is ready.`);
+            this.showSlashInfo(`Session "${summary.title}" queued to load once the agent is ready.`);
         }
         this.autosaveIfEnabled();
     }
     deleteSessionCommand(selector) {
         const summary = this.resolveSessionBySelector(selector);
         if (!summary) {
-            display.showWarning('No session matches that selection.');
+            this.showSlashWarning('No session matches that selection.');
             return;
         }
         if (!deleteSession(summary.id)) {
-            display.showWarning('Unable to delete that session.');
+            this.showSlashWarning('Unable to delete that session.');
             return;
         }
-        display.showInfo(`Deleted session "${summary.title}".`);
+        this.showSlashInfo(`Deleted session "${summary.title}".`);
         if (this.activeSessionId === summary.id) {
             this.activeSessionId = null;
             this.activeSessionTitle = null;
@@ -4160,22 +4213,22 @@ export class InteractiveShell {
         this.sessionResumeNotice = null;
         saveSessionPreferences({ lastSessionId: null });
         clearAutosaveSnapshot(this.profile);
-        display.showInfo('Started a new empty session.');
+        this.showSlashInfo('Started a new empty session.');
         this.refreshContextGauge();
     }
     toggleAutosaveCommand(value) {
         if (!value) {
-            display.showWarning('Usage: /sessions autosave on|off');
+            this.showSlashWarning('Usage: /sessions autosave on|off');
             return;
         }
         const normalized = value.toLowerCase();
         if (normalized !== 'on' && normalized !== 'off') {
-            display.showWarning('Usage: /sessions autosave on|off');
+            this.showSlashWarning('Usage: /sessions autosave on|off');
             return;
         }
         this.autosaveEnabled = normalized === 'on';
         saveSessionPreferences({ autosave: this.autosaveEnabled });
-        display.showInfo(`Autosave ${this.autosaveEnabled ? 'enabled' : 'disabled'}.`);
+        this.showSlashInfo(`Autosave ${this.autosaveEnabled ? 'enabled' : 'disabled'}.`);
         if (!this.autosaveEnabled) {
             clearAutosaveSnapshot(this.profile);
         }
@@ -4186,7 +4239,7 @@ export class InteractiveShell {
     }
     clearAutosaveCommand() {
         clearAutosaveSnapshot(this.profile);
-        display.showInfo('Cleared autosave history.');
+        this.showSlashInfo('Cleared autosave history.');
     }
     // ==================== Erosolar-CLI Style Commands ====================
     async handleRewindCommand(_input) {
@@ -4314,7 +4367,7 @@ export class InteractiveShell {
     }
     showCompactionHistory() {
         if (!this.contextCompactionLog.length) {
-            display.showInfo('No context compactions recorded yet.');
+            this.showSlashInfo('No context compactions recorded yet.');
             return;
         }
         const entries = [...this.contextCompactionLog].slice(-10).reverse();
@@ -4346,7 +4399,7 @@ export class InteractiveShell {
         }
         display.clear();
         clearAutosaveSnapshot(this.profile);
-        display.showInfo('Conversation cleared. Starting fresh.');
+        this.showSlashInfo('Conversation cleared. Starting fresh.');
         this.syncRendererInput();
     }
     async handleDiffCommand() {
@@ -4354,7 +4407,7 @@ export class InteractiveShell {
             await execAsync('git rev-parse --is-inside-work-tree', { cwd: this.workingDir });
         }
         catch {
-            display.showWarning('Not a git repository. No diff to show.');
+            this.showSlashWarning('Not a git repository. No diff to show.');
             return;
         }
         const cachedResults = [];
@@ -4394,7 +4447,7 @@ export class InteractiveShell {
             // ignore diff errors
         }
         if (results.length === 0 && cachedResults.length === 0) {
-            display.showInfo('No changes detected. Working tree is clean.');
+            this.showSlashInfo('No changes detected. Working tree is clean.');
             return;
         }
         display.showSystemMessage([...cachedResults, ...results].join('\n'));
@@ -4452,11 +4505,11 @@ export class InteractiveShell {
             // Show session list and auto-select the most recent
             const sessions = listSessions(this.profile);
             if (sessions.length > 0) {
-                display.showInfo('Resuming most recent session...');
+                this.showSlashInfo('Resuming most recent session...');
                 await this.loadSessionCommand('1');
             }
             else {
-                display.showWarning('No previous sessions found. Use /sessions to manage sessions.');
+                this.showSlashWarning('No previous sessions found. Use /sessions to manage sessions.');
             }
         }
     }
@@ -4475,18 +4528,18 @@ export class InteractiveShell {
     }
     async handleReviewCommand() {
         if (this.isProcessing) {
-            display.showWarning('Wait for the current operation to finish.');
+            this.showSlashWarning('Wait for the current operation to finish.');
             return;
         }
-        display.showInfo('Triggering code review of pending changes...');
+        this.showSlashInfo('Triggering code review of pending changes...');
         await this.processRequest('Please review all the code changes we made in this session. Look for bugs, security issues, and improvements.');
     }
     async handleSecurityReviewCommand() {
         if (this.isProcessing) {
-            display.showWarning('Wait for the current operation to finish.');
+            this.showSlashWarning('Wait for the current operation to finish.');
             return;
         }
-        display.showInfo('Running comprehensive security review...');
+        this.showSlashInfo('Running comprehensive security review...');
         await this.processRequest('Please perform a comprehensive security review of the codebase. Check for OWASP top 10 vulnerabilities, insecure patterns, and potential attack vectors.');
     }
     handleBugCommand() {
@@ -4552,7 +4605,7 @@ export class InteractiveShell {
             this.setCriticalApprovalMode('approval', 'command');
             return;
         }
-        display.showWarning('Usage: /approvals [auto|ask|status]');
+        this.showSlashWarning('Usage: /approvals [auto|ask|status]');
     }
     handlePermissionsCommand() {
         const lines = [];
@@ -4602,38 +4655,39 @@ export class InteractiveShell {
                 const currentVersion = this.version || this.getPackageInfo().version || '1.7.458';
                 const updateInfo = await checkForUpdates(currentVersion);
                 if (!updateInfo) {
-                    display.showWarning('Unable to check for updates (network issue or timeout).');
+                    this.showSlashWarning('Unable to check for updates (network issue or timeout).');
                     return;
                 }
                 if (!updateInfo.updateAvailable) {
-                    display.showSuccess(`You're on the latest version (v${updateInfo.current}).`);
+                    this.showSlashSuccess(`You're on the latest version (v${updateInfo.current}).`);
                     return;
                 }
                 // Show update info and perform update immediately (no interactive prompt)
-                display.showInfo(`Update available: v${updateInfo.current} → v${updateInfo.latest}`);
+                this.showSlashInfo(`Update available: v${updateInfo.current} → v${updateInfo.latest}`);
                 await performUpdate(updateInfo, (msg) => this.streamEventBlock(msg));
             }
             catch (error) {
-                display.showError(`Update check failed: ${error instanceof Error ? error.message : String(error)}`);
+                const detail = error instanceof Error ? error.message : String(error);
+                this.showInlineStatus(`Update check failed: ${detail}`, 'error');
             }
             return;
         }
         if (subcommand === 'auto' || subcommand === 'always') {
             saveSessionPreferences({ autoUpdate: true });
-            display.showSuccess('Auto-update enabled. Updates will install automatically.');
+            this.showSlashSuccess('Auto-update enabled. Updates will install automatically.');
             return;
         }
         if (subcommand === 'skip' || subcommand === 'never' || subcommand === 'off') {
             saveSessionPreferences({ autoUpdate: false });
-            display.showInfo('Auto-update disabled. Updates will be skipped silently.');
+            this.showSlashInfo('Auto-update disabled. Updates will be skipped silently.');
             return;
         }
         if (subcommand === 'ask' || subcommand === 'prompt' || subcommand === 'reset' || subcommand === 'notify') {
             saveSessionPreferences({ autoUpdate: null });
-            display.showInfo('Update preference reset. You will see a notification when updates are available.');
+            this.showSlashInfo('Update preference reset. You will see a notification when updates are available.');
             return;
         }
-        display.showWarning('Usage: /update [check|auto|skip|notify|status]');
+        this.showSlashWarning('Usage: /update [check|auto|skip|notify|status]');
     }
     handleInitCommand(input) {
         const tokens = input.split(/\s+/).slice(1);
@@ -4641,7 +4695,7 @@ export class InteractiveShell {
         const target = join(this.workingDir, 'AGENTS.md');
         if (confirm) {
             if (existsSync(target)) {
-                display.showWarning(`AGENTS.md already exists at ${target}.`);
+                this.showSlashWarning(`AGENTS.md already exists at ${target}.`);
                 return;
             }
             const template = [
@@ -4668,11 +4722,11 @@ export class InteractiveShell {
             ].join('\n');
             try {
                 writeFileSync(target, `${template}\n`, { flag: 'wx' });
-                display.showInfo(`Created ${target}. Update it with project-specific guidance for Codex.`);
+                this.showSlashSuccess(`Created ${target}. Update it with project-specific guidance for Codex.`);
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
-                display.showError(`Failed to create AGENTS.md: ${message}`);
+                this.showInlineStatus(`Failed to create AGENTS.md: ${message}`, 'error');
             }
             return;
         }
@@ -4695,10 +4749,10 @@ export class InteractiveShell {
     }
     async handleCompactCommand() {
         if (this.isProcessing) {
-            display.showWarning('Wait for the current operation to finish.');
+            this.showSlashWarning('Wait for the current operation to finish.');
             return;
         }
-        display.showInfo('Compacting conversation context...');
+        this.showSlashInfo('Compacting conversation context...');
         await this.performContextCompaction('Manual /compact request');
     }
     // ==================== End Erosolar-CLI Style Commands ====================
@@ -4859,9 +4913,136 @@ export class InteractiveShell {
         return `${shown.join(', ')}${suffix}`;
     }
     showInlinePanel(lines) {
+        const normalized = (lines ?? [])
+            .map(line => line.replace(/\s+$/g, ''))
+            .filter(line => line.trim().length > 0);
+        // Reset any pending auto-clear timer whenever we render a fresh panel
+        if (this.inlinePanelClearTimer) {
+            clearTimeout(this.inlinePanelClearTimer);
+            this.inlinePanelClearTimer = null;
+        }
+        this.inlinePanelBase = normalized;
+        this.inlinePanelNotices = [];
+        this.flushInlinePanel();
+    }
+    appendInlineNotice(message, tone = 'info') {
+        const normalized = message.trim();
+        if (!normalized)
+            return;
+        this.inlinePanelNotices.push({ text: normalized, tone });
+        // Keep the most recent notices to prevent runaway growth
+        const MAX_NOTICES = 3;
+        if (this.inlinePanelNotices.length > MAX_NOTICES) {
+            this.inlinePanelNotices = this.inlinePanelNotices.slice(-MAX_NOTICES);
+        }
+        this.flushInlinePanel();
+    }
+    showInlineStatus(message, tone = 'info', options) {
+        const normalized = message.trim();
+        if (!normalized) {
+            this.clearInlinePanel();
+            return;
+        }
+        if (this.inlinePanelClearTimer) {
+            clearTimeout(this.inlinePanelClearTimer);
+            this.inlinePanelClearTimer = null;
+        }
+        this.inlinePanelBase = [];
+        this.inlinePanelNotices = [{ text: normalized, tone }];
+        this.flushInlinePanel();
+        if (options?.autoClearMs && options.autoClearMs > 0) {
+            this.inlinePanelClearTimer = setTimeout(() => {
+                this.clearInlinePanel();
+            }, options.autoClearMs);
+        }
+    }
+    flushInlinePanel() {
+        if (!this.inlinePanelBase.length && !this.inlinePanelNotices.length) {
+            display.clearInlinePanel();
+            return;
+        }
+        const lines = [...this.inlinePanelBase];
+        if (this.inlinePanelNotices.length) {
+            if (lines.length) {
+                lines.push('');
+            }
+            for (const notice of this.inlinePanelNotices) {
+                lines.push(this.formatInlineNotice(notice));
+            }
+        }
         display.showInlinePanel(lines);
     }
+    formatInlineNotice(notice) {
+        const prefix = (() => {
+            switch (notice.tone) {
+                case 'success':
+                    return theme.success('✓');
+                case 'warning':
+                    return theme.warning('!');
+                case 'error':
+                    return theme.error('✖');
+                case 'info':
+                default:
+                    return theme.info('ℹ');
+            }
+        })();
+        return `${prefix} ${notice.text}`;
+    }
+    showSlashWarning(message) {
+        const normalized = message.trim();
+        if (!normalized)
+            return;
+        if (this.inlineCommandActive || this.pendingInteraction) {
+            if (this.inlinePanelBase.length) {
+                this.appendInlineNotice(normalized, 'warning');
+            }
+            else {
+                this.showInlineStatus(normalized, 'warning', { autoClearMs: 1800 });
+            }
+            this.syncRendererInput();
+            return;
+        }
+        display.showWarning(normalized);
+    }
+    showSlashInfo(message) {
+        const normalized = message.trim();
+        if (!normalized)
+            return;
+        if (this.inlineCommandActive || this.pendingInteraction) {
+            if (this.inlinePanelBase.length) {
+                this.appendInlineNotice(normalized, 'info');
+            }
+            else {
+                this.showInlineStatus(normalized, 'info', { autoClearMs: 1600 });
+            }
+            this.syncRendererInput();
+            return;
+        }
+        display.showInfo(normalized);
+    }
+    showSlashSuccess(message) {
+        const normalized = message.trim();
+        if (!normalized)
+            return;
+        if (this.inlineCommandActive || this.pendingInteraction) {
+            if (this.inlinePanelBase.length) {
+                this.appendInlineNotice(normalized, 'success');
+            }
+            else {
+                this.showInlineStatus(normalized, 'success', { autoClearMs: 1600 });
+            }
+            this.syncRendererInput();
+            return;
+        }
+        display.showSuccess(normalized);
+    }
     clearInlinePanel() {
+        if (this.inlinePanelClearTimer) {
+            clearTimeout(this.inlinePanelClearTimer);
+            this.inlinePanelClearTimer = null;
+        }
+        this.inlinePanelBase = [];
+        this.inlinePanelNotices = [];
         display.clearInlinePanel();
     }
     shouldCaptureInlinePanel() {
@@ -4884,9 +5065,8 @@ export class InteractiveShell {
             const providerStatuses = await quickCheckProviders();
             const providerOptions = this.buildProviderOptionsWithDiscovery(providerStatuses);
             if (!providerOptions.length) {
-                display.showWarning('No providers are available.');
                 this.pendingInteraction = null;
-                this.clearInlinePanel();
+                this.showInlineStatus('No providers are available.', 'warning');
                 this.syncRendererInput();
                 return;
             }
@@ -4906,9 +5086,8 @@ export class InteractiveShell {
             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.showInlineStatus('Failed to load model list. Try again in a moment.', 'error');
             this.syncRendererInput();
         }
     }
@@ -5039,9 +5218,8 @@ export class InteractiveShell {
             }
         }
         if (!allModels.length) {
-            display.showWarning(`No models available for ${option.label}.`);
             this.pendingInteraction = null;
-            this.clearInlinePanel();
+            this.showInlineStatus(`No models available for ${option.label}.`, 'warning');
             return;
         }
         const lines = [
@@ -5079,7 +5257,7 @@ export class InteractiveShell {
     showToolsMenu() {
         const options = getToolToggleOptions();
         if (!options.length) {
-            display.showWarning('No configurable tools are available.');
+            this.showInlineStatus('No configurable tools are available.', 'warning', { autoClearMs: 1600 });
             return;
         }
         const selection = buildEnabledToolSet(loadToolSettings(), this.profile);
@@ -5422,7 +5600,7 @@ export class InteractiveShell {
     }
     showAgentsMenu() {
         if (!this.agentMenu) {
-            display.showWarning('Agent selection is not available in this CLI.');
+            this.showSlashWarning('Agent selection is not available in this CLI.');
             return;
         }
         const lines = [
@@ -5464,27 +5642,26 @@ export class InteractiveShell {
         }
         const trimmed = input.trim();
         if (!trimmed) {
-            display.showWarning('Enter a number or type cancel.');
+            this.appendInlineNotice('Enter a number or type cancel.', 'warning');
             this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
-            display.showInfo('Model selection cancelled.');
-            this.clearInlinePanel();
+            this.showInlineStatus('Model selection cancelled.', 'info', { autoClearMs: 1400 });
             this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         const optionCount = pending.options.length;
         if (!Number.isFinite(choice) || choice < 1 || choice > optionCount) {
-            display.showWarning(`Enter a number between 1 and ${optionCount}.`);
+            this.appendInlineNotice(`Enter a number between 1 and ${optionCount}.`, 'warning');
             this.syncRendererInput();
             return;
         }
         const option = pending.options[choice - 1];
         if (!option) {
-            display.showWarning(`Enter a number between 1 and ${optionCount}.`);
+            this.appendInlineNotice(`Enter a number between 1 and ${optionCount}.`, 'warning');
             this.syncRendererInput();
             return;
         }
@@ -5499,7 +5676,7 @@ export class InteractiveShell {
         const trimmed = input.trim();
         const optionCount = pending.options.length;
         if (!trimmed) {
-            display.showWarning(`Enter 1-${optionCount}, "back", or "cancel".`);
+            this.appendInlineNotice(`Enter 1-${optionCount}, "back", or "cancel".`, 'warning');
             this.syncRendererInput();
             return;
         }
@@ -5510,20 +5687,19 @@ export class InteractiveShell {
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
-            display.showInfo('Model selection cancelled.');
-            this.clearInlinePanel();
+            this.showInlineStatus('Model selection cancelled.', 'info', { autoClearMs: 1400 });
             this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice) || choice < 1 || choice > optionCount) {
-            display.showWarning(`Enter 1-${optionCount}, "back", or "cancel".`);
+            this.appendInlineNotice(`Enter 1-${optionCount}, "back", or "cancel".`, 'warning');
             this.syncRendererInput();
             return;
         }
         const preset = pending.options[choice - 1];
         if (!preset) {
-            display.showWarning(`Enter 1-${optionCount}, "back", or "cancel".`);
+            this.appendInlineNotice(`Enter 1-${optionCount}, "back", or "cancel".`, 'warning');
             this.syncRendererInput();
             return;
         }
@@ -5547,13 +5723,16 @@ export class InteractiveShell {
             reasoningEffort: preset.reasoningEffort,
         };
         this.applyPresetReasoningDefaults();
-        if (this.rebuildAgent()) {
-            display.showInfo(`Switched to ${preset.label}.`);
+        const rebuilt = this.rebuildAgent();
+        if (rebuilt) {
             this.refreshSessionContext();
             this.persistSessionPreference();
             this.resetChatBoxAfterModelSwap();
+            this.showInlineStatus(`Switched to ${preset.label}.`, 'success', { autoClearMs: 1600 });
+        }
+        else {
+            this.showInlineStatus(`Failed to switch to ${preset.label}. Run /doctor for details.`, 'warning');
         }
-        this.clearInlinePanel();
     }
     async handleSecretSelection(input) {
         const pending = this.pendingInteraction;
@@ -5563,26 +5742,25 @@ export class InteractiveShell {
         const trimmed = input.trim();
         const optionCount = pending.options.length;
         if (!trimmed) {
-            display.showWarning(`Enter 1-${optionCount} or "cancel".`);
+            this.appendInlineNotice(`Enter 1-${optionCount} or "cancel".`, 'warning');
             this.syncRendererInput();
             return;
         }
         if (trimmed.toLowerCase() === 'cancel') {
             this.pendingInteraction = null;
-            display.showInfo('Secret management cancelled.');
-            this.clearInlinePanel();
+            this.showInlineStatus('Secret management cancelled.', 'info', { autoClearMs: 1600 });
             this.syncRendererInput();
             return;
         }
         const choice = Number.parseInt(trimmed, 10);
         if (!Number.isFinite(choice) || choice < 1 || choice > optionCount) {
-            display.showWarning(`Enter 1-${optionCount} or "cancel".`);
+            this.appendInlineNotice(`Enter 1-${optionCount} or "cancel".`, 'warning');
             this.syncRendererInput();
             return;
         }
         const secret = pending.options[choice - 1];
         if (!secret) {
-            display.showWarning(`Enter 1-${optionCount} or "cancel".`);
+            this.appendInlineNotice(`Enter 1-${optionCount} or "cancel".`, 'warning');
             this.syncRendererInput();
             return;
         }
@@ -5601,7 +5779,7 @@ export class InteractiveShell {
         }
         const trimmed = input.trim();
         if (!trimmed) {
-            display.showWarning('Enter a value or type cancel.');
+            this.appendInlineNotice('Enter a value or type cancel.', 'warning');
             this.syncRendererInput();
             return;
         }
@@ -5609,14 +5787,12 @@ export class InteractiveShell {
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
             this.terminalInput.setSecretMode(false);
-            display.showInfo('Secret unchanged.');
-            this.clearInlinePanel();
+            this.showInlineStatus('Secret unchanged.', 'info', { autoClearMs: 1600 });
             this.syncRendererInput();
             return;
         }
         try {
             setSecretValue(pending.secret.id, trimmed);
-            display.showInfo(`${pending.secret.label} updated.`);
             this.pendingInteraction = null;
             const deferred = this.pendingSecretRetry;
             this.pendingSecretRetry = null;
@@ -5628,15 +5804,15 @@ export class InteractiveShell {
             if (deferred) {
                 await deferred();
             }
+            this.showInlineStatus(`${pending.secret.label} updated.`, 'success', { autoClearMs: 1600 });
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            display.showError(message);
+            this.showInlineStatus(message, 'error');
             this.pendingInteraction = null;
             this.pendingSecretRetry = null;
         }
         this.terminalInput.setSecretMode(false);
-        this.clearInlinePanel();
         this.syncRendererInput();
     }
     async processRequest(request, options) {
@@ -5665,7 +5841,7 @@ export class InteractiveShell {
         }
         // Reset per-request render tracking
         this.responseRendered = false;
-        this.autoContinueNoticeShown = false;
+        this.remainingIssueFixQueued = false;
         if (this.shouldLogPrompt(request)) {
             this.logUserPrompt(request);
         }
@@ -5677,6 +5853,7 @@ export class InteractiveShell {
         this.syncRendererInput();
         this.renderer?.render();
         const requestStartTime = Date.now(); // Alpha Zero 2 timing
+        let elapsedMs = null;
         // Clear previous parallel agents and start fresh for new request
         const parallelManager = getParallelAgentManager();
         parallelManager.clear();
@@ -5718,7 +5895,7 @@ export class InteractiveShell {
             this.captureHistorySnapshot();
             this.autosaveIfEnabled();
             // Track metrics with Alpha Zero 2
-            const elapsedMs = Date.now() - requestStartTime;
+            elapsedMs = Date.now() - requestStartTime;
             this.alphaZeroMetrics.recordMessage(elapsedMs);
             if (!responseText?.trim()) {
                 display.showWarning('The provider returned an empty response. Check your API key/provider selection or retry the prompt.');
@@ -5835,6 +6012,8 @@ export class InteractiveShell {
                 });
                 this.responseRendered = true;
             }
+            this.lastRunDurationSeconds = elapsedMs !== null ? Math.max(0, Math.round(elapsedMs / 1000)) : null;
+            this.lastRunToolCount = this.currentToolCalls.length;
             this.finishStreamingFormatter(undefined, { refreshPrompt: false, mode: 'complete' });
             display.stopThinking(false);
             this.uiUpdates.setMode('processing');
@@ -6144,20 +6323,31 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`
         if (!this.verificationEnabled) {
             return;
         }
-        if (!this.autoContinueEnabled) {
-            if (!this.autoContinueNoticeShown) {
-                display.showSystemMessage('⏹️ Auto-continue is off; skipping post-run verification/fixes.');
-                this.autoContinueNoticeShown = true;
-            }
-            return;
-        }
         void (async () => {
+            const allowRetry = this.autoContinueEnabled;
+            let attempt = 0;
+            let buildOk = false;
+            let testsOk = false;
             try {
-                const buildOk = await this.enforceAutoBuild(trigger);
-                if (!buildOk) {
-                    return;
+                do {
+                    attempt++;
+                    buildOk = await this.enforceAutoBuild(trigger);
+                    testsOk = buildOk
+                        ? await this.enforceAutoTests(trigger, assistantResponse, verificationContext)
+                        : false;
+                    if (allowRetry && !(buildOk && testsOk)) {
+                        display.showSystemMessage('🔁 Auto-continue enabled: retrying verification after fixes...');
+                    }
+                } while (allowRetry && attempt < 2 && !(buildOk && testsOk));
+                // If verification still shows issues, queue a follow-up fix
+                const issueSignals = [];
+                if (!buildOk)
+                    issueSignals.push('Build is failing after verification.');
+                if (!testsOk)
+                    issueSignals.push('Tests are still failing after verification.');
+                if (issueSignals.length) {
+                    this.maybeQueueRemainingIssueFixes(issueSignals.join('\n'), 'verification');
                 }
-                await this.enforceAutoTests(trigger, assistantResponse, verificationContext);
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);
@@ -6167,22 +6357,22 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`
     }
     async enforceAutoTests(trigger, assistantResponse, verificationContext) {
         if (this.autoTestInFlight) {
-            return;
+            return true;
         }
         if (!this.verificationEnabled) {
-            return;
+            return true;
         }
         const latestChange = this.getLatestFileChangeTimestamp();
         if (!latestChange) {
-            return;
+            return true;
         }
         const latestTest = this.getLatestTestTimestamp();
         if (latestTest && latestChange <= latestTest) {
-            return;
+            return true;
         }
         if (!this.lastBuildSucceededAt || this.lastBuildSucceededAt < latestChange) {
             display.showSystemMessage('⏭️ Skipping auto-tests because no successful build is recorded for the latest changes.');
-            return;
+            return true;
         }
         this.autoTestInFlight = true;
         const command = 'npm test -- --runInBand';
@@ -6200,6 +6390,8 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`
             const summary = this.buildTestSummary(command, combinedOutput, true);
             display.showTestEvent(summary);
             this.statusTracker.clearOverride('tests');
+            this.lastTestStatus = 'ok';
+            return true;
         }
         catch (error) {
             combinedOutput = this.formatCommandError(error);
@@ -6210,6 +6402,8 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`
                 detail: 'Auto-run npm test failed',
                 tone: 'danger',
             });
+            this.lastTestStatus = 'fail';
+            return false;
         }
         finally {
             try {
@@ -6256,6 +6450,7 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`
                 const finishedAt = Date.now();
                 this.lastAutoBuildRun = finishedAt;
                 this.lastBuildSucceededAt = finishedAt;
+                this.lastBuildStatus = 'ok';
                 const outputText = [stdout, stderr].filter(Boolean).join('\n').trim();
                 display.showSystemMessage('✅ Build succeeded.');
                 if (outputText && outputText.length < 500) {
@@ -6269,6 +6464,7 @@ When truly finished with ALL tasks, explicitly state "TASK_FULLY_COMPLETE".`
                 const finishedAt = Date.now();
                 this.lastAutoBuildRun = finishedAt;
                 this.lastBuildSucceededAt = null;
+                this.lastBuildStatus = 'fail';
                 const errorOutput = this.formatCommandError(error);
                 display.showWarning('⚠️ Build failed. Feeding errors back to agent...');
                 if (errorOutput) {
@@ -6455,6 +6651,94 @@ Return ONLY JSON array:
         }
         display.showTestEvent(results.join('\n'));
     }
+    /**
+     * Detect remaining issues in a completion response and queue a follow-up fix if needed.
+     * Runs once per request to avoid infinite loops.
+     */
+    maybeQueueRemainingIssueFixes(response, source) {
+        if (this.remainingIssueFixQueued) {
+            return;
+        }
+        const issues = this.detectRemainingIssues(response);
+        if (!issues.length) {
+            return;
+        }
+        const uniqueIssues = Array.from(new Set(issues)).slice(0, 6);
+        const fixPrompt = `You indicated the task was complete but there are remaining issues (${source}):
+
+${uniqueIssues.map(issue => `- ${issue}`).join('\n')}
+
+Please fix these now. Re-run build/tests as needed. End with TASK_FULLY_COMPLETE when everything truly passes.`;
+        this.remainingIssueFixQueued = true;
+        display.showSystemMessage('🔧 Detected remaining issues after completion; queuing a follow-up fix run.');
+        this.enqueueFollowUpAction({ type: 'continuous', text: fixPrompt });
+        this.refreshQueueIndicators();
+    }
+    /**
+     * Extract probable remaining issues from assistant text.
+     * Looks for explicit "Remaining" sections and common failure phrases.
+     */
+    detectRemainingIssues(response) {
+        const issues = [];
+        const lines = response.split('\n');
+        // Capture bullet points after a "Remaining" style heading
+        let capturing = false;
+        for (const rawLine of lines) {
+            const line = rawLine.trim();
+            if (!line) {
+                capturing = false;
+                continue;
+            }
+            if (/^(remaining issues?|todos?|pending|open items?|outstanding)/i.test(line)) {
+                capturing = true;
+                continue;
+            }
+            if (capturing && /^[-\d.]+\s+/i.test(line)) {
+                issues.push(line.replace(/^[-\d.]+\s+/, '').trim());
+                continue;
+            }
+            if (capturing && /^[•]/.test(line)) {
+                issues.push(line.replace(/^•\s*/, '').trim());
+                continue;
+            }
+            if (capturing && /^[|]/.test(line)) {
+                // table row bullet capture: | detail |
+                const cell = line.split('|').map(cell => cell.trim()).filter(Boolean);
+                if (cell.length >= 2) {
+                    issues.push(cell.slice(0, -1).join(' - '));
+                }
+                continue;
+            }
+        }
+        // Direct pattern checks for common unresolved states
+        const patterns = [
+            { regex: /\btests?\s+(are\s+)?(still\s+)?failing\b/i, label: 'Tests are failing' },
+            { regex: /\b(test suites?|tests)\s+failing\b/i, label: 'Tests are failing' },
+            { regex: /\bbuild (is )?(still )?failing\b/i, label: 'Build is failing' },
+            { regex: /\bparsing errors?\b/i, label: 'Parsing errors remain' },
+            { regex: /\bmissing\s+(env|environment)\s+vars?\b/i, label: 'Missing environment variables' },
+            { regex: /\bneeds?\s+(manual|further)\s+(setup|config|configuration)\b/i, label: 'Manual setup/config required' },
+            { regex: /\bnot\s+(integrated|deployed|wired)\b/i, label: 'Integration is not complete' },
+            { regex: /\bremaining\s+(issues?|tasks?|items?)\b/i, label: 'Remaining issues noted' },
+            { regex: /\bblocked\b/i, label: 'Blocked condition mentioned' },
+        ];
+        for (const { regex, label } of patterns) {
+            if (regex.test(response)) {
+                issues.push(label);
+            }
+        }
+        // If the response explicitly lists "remaining" phrases inline
+        const inlineMatches = response.match(/remaining\s+[^\n]{0,80}/gi);
+        if (inlineMatches) {
+            for (const match of inlineMatches) {
+                issues.push(match.trim());
+            }
+        }
+        return issues
+            .map(issue => issue.trim())
+            .filter(issue => issue.length > 0)
+            .slice(0, 10);
+    }
     buildTestSummary(command, output, success) {
         const lines = output.split('\n').map(line => line.trim()).filter(Boolean);
         const passFailLines = lines.filter(line => /^(PASS|FAIL)\s+/i.test(line)).slice(0, 6);
@@ -6600,6 +6884,9 @@ Return ONLY JSON array:
                             usage: metadata.usage ?? null,
                             source: metadata.wasStreamed ? 'stream' : 'final',
                         });
+                        if (finalContent) {
+                            this.maybeQueueRemainingIssueFixes(finalContent, 'final-response');
+                        }
                         if (renderedFinal || finalContent) {
                             this.responseRendered = true;
                         }
@@ -6695,6 +6982,12 @@ Return ONLY JSON array:
                         this.renderer?.setActivity('Thinking');
                     }
                 },
+                onEditExplanation: (payload) => {
+                    const label = payload.files.length ? payload.files.join(', ') : payload.toolName ?? 'edit';
+                    const header = label ? `Edit explanation (${label})` : 'Edit explanation';
+                    display.showSystemMessage(`${header}:\n${payload.explanation}`);
+                    this.ui.controller.recordAssistantThought(payload.explanation);
+                },
                 onVerificationNeeded: (response, context) => {
                     this.lastAssistantResponse = response;
                     void this.runAutoQualityChecks('verification', response, context);
@@ -6713,7 +7006,7 @@ Return ONLY JSON array:
                     display.showSystemMessage(`⚡ Retry ${attempt}/${maxAttempts}: ${shortError}${error.message.length > 100 ? '...' : ''}`);
                     this.renderer?.setActivity(`Retrying (${attempt}/${maxAttempts})...`);
                 },
-            });
+            }, undefined, { explainEdits: true });
             // Register global AI enhancer for explore tool - uses active model by default
             this.registerExploreAIEnhancer();
             // Fetch real context window from provider API (async, updates in background)
@@ -7496,19 +7789,19 @@ Return ONLY JSON array:
         const providerOptions = this.buildProviderOptions();
         const match = providerOptions.find((opt) => opt.provider.toLowerCase() === targetProvider || opt.label.toLowerCase() === targetProvider);
         if (!match) {
-            display.showWarning(`Unknown provider "${targetProvider}".`);
+            this.showSlashWarning(`Unknown provider "${targetProvider}".`);
             const available = providerOptions.map((opt) => opt.provider).join(', ');
-            display.showInfo(`Available providers: ${available}`);
+            this.showSlashInfo(`Available providers: ${available}`);
             return;
         }
         if (match.provider === this.sessionState.provider) {
-            display.showInfo(`Already using ${match.label}.`);
+            this.showSlashInfo(`Already using ${match.label}.`);
             return;
         }
         // Get default model for the provider
         const models = MODEL_PRESETS.filter((preset) => preset.provider === match.provider);
         if (!models.length) {
-            display.showWarning(`No models available for ${match.label}.`);
+            this.showSlashWarning(`No models available for ${match.label}.`);
             return;
         }
         const defaultModel = models[0];
@@ -7526,21 +7819,21 @@ Return ONLY JSON array:
         if (this.rebuildAgent()) {
             this.persistSessionPreference();
             this.refreshSessionContext();
-            display.showInfo(`Switched from ${this.providerLabel(oldProvider)}/${oldModel} to ${match.label}/${defaultModel.id}`);
+            this.showSlashSuccess(`Switched from ${this.providerLabel(oldProvider)}/${oldModel} to ${match.label}/${defaultModel.id}`);
             this.resetChatBoxAfterModelSwap();
         }
         else {
             // Revert on failure
             this.sessionState.provider = oldProvider;
             this.sessionState.model = oldModel;
-            display.showError(`Failed to switch to ${match.label}. Reverted to ${this.providerLabel(oldProvider)}.`);
+            this.showInlineStatus(`Failed to switch to ${match.label}. Reverted to ${this.providerLabel(oldProvider)}.`, 'error');
         }
     }
     /**
      * Discover models from provider APIs.
      */
     async discoverModelsCommand() {
-        display.showInfo('Discovering models from provider APIs...');
+        this.showSlashInfo('Discovering models from provider APIs...');
         try {
             const result = await discoverAllModels();
             const lines = [
@@ -7572,7 +7865,7 @@ Return ONLY JSON array:
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            display.showError(`Discovery failed: ${message}`);
+            this.showInlineStatus(`Discovery failed: ${message}`, 'error');
         }
     }
     /**
@@ -7581,8 +7874,8 @@ Return ONLY JSON array:
     showConfiguredProviders() {
         const providerOptions = this.buildProviderOptions();
         if (!providerOptions.length) {
-            display.showWarning('No providers are configured.');
-            display.showInfo('Set an API key: OPENAI_API_KEY, ANTHROPIC_API_KEY, GEMINI_API_KEY, etc.');
+            this.showSlashWarning('No providers are configured.');
+            this.showSlashInfo('Set an API key: OPENAI_API_KEY, ANTHROPIC_API_KEY, GEMINI_API_KEY, etc.');
             return;
         }
         const lines = [
@@ -7616,8 +7909,8 @@ Return ONLY JSON array:
                 {
                     const provider = tokens[1]?.toLowerCase();
                     if (!provider) {
-                        display.showWarning('Usage: /local use <provider>');
-                        display.showInfo('Example: /local use ollama');
+                        this.showSlashWarning('Usage: /local use <provider>');
+                        this.showSlashInfo('Example: /local use ollama');
                         return;
                     }
                     await this.handleProviderCommand(`/provider ${provider}`);
@@ -7638,7 +7931,7 @@ Return ONLY JSON array:
             { id: 'vllm', label: 'vLLM', url: 'http://localhost:8000', envVar: 'VLLM_BASE_URL' },
             { id: 'llamacpp', label: 'llama.cpp', url: 'http://localhost:8080', envVar: 'LLAMACPP_BASE_URL' },
         ];
-        display.showInfo('Scanning for local LLM servers...');
+        this.showSlashInfo('Scanning for local LLM servers...');
         const results = [];
         for (const provider of localProviders) {
             const baseUrl = process.env[provider.envVar] || provider.url;