erosolar-cli 1.7.405 → 1.7.407

package/dist/shell/interactiveShell.js

@@ -5,7 +5,7 @@ import { createInterface } from 'node:readline/promises';
 import { AssistantBlockRenderer } from '../ui/assistantBlockRenderer.js';
 import { display } from '../ui/display.js';
 import { compactRenderer } from '../ui/compactRenderer.js';
-import { theme } from '../ui/theme.js';
+import { theme, icons } from '../ui/theme.js';
 import { getContextWindowTokens } from '../core/contextWindow.js';
 import { ensureSecretForProvider, getSecretDefinitionForProvider, getSecretValue, listSecretDefinitions, MissingSecretError, maskSecret, setSecretValue, } from '../core/secretStore.js';
 import { saveActiveProfilePreference, saveModelPreference, loadToolSettings, saveToolSettings, clearToolSettings, clearActiveProfilePreference, loadSessionPreferences, saveSessionPreferences, loadFeatureFlags, saveFeatureFlags, toggleFeatureFlag, FEATURE_FLAG_INFO, } from '../core/preferences.js';
@@ -43,6 +43,7 @@ import { enterStreamingMode, exitStreamingMode } from '../ui/globalWriteLock.js'
 import { setGlobalAIEnhancer } from '../tools/localExplore.js';
 import { createProvider } from '../providers/providerFactory.js';
 import { getParallelAgentManager } from '../subagents/parallelAgentManager.js';
+import { formatThinkingContent } from '../ui/textHighlighter.js';
 const execAsync = promisify(exec);
 const DROPDOWN_COLORS = [
     theme.primary,
@@ -147,6 +148,7 @@ export class InteractiveShell {
     customCommandMap;
     sessionRestoreConfig;
     _enabledPlugins;
+    autoVerificationInFlight = false;
     // Auto-test tracking
     autoTestInFlight = false;
     // AlphaZero learning tracking
@@ -254,6 +256,11 @@ export class InteractiveShell {
             description: 'Show available and loaded plugins',
             category: 'configuration',
         });
+        this.slashCommands.push({
+            command: '/contextlog',
+            description: 'Show recent context compaction summaries',
+            category: 'context',
+        });
         this.slashCommands.push({
             command: '/offsec',
             description: 'AlphaZero offensive security run (start/status/next)',
@@ -1374,13 +1381,14 @@ export class InteractiveShell {
             return;
         }
         this.assistantStreamActive = true;
-        this.assistantStreamPhase = null;
+        // Default to thought phase so the first output after a prompt is the assistant's thinking.
+        this.assistantStreamPhase = 'thought';
         this.assistantStreamHeaderShown = false;
         this.assistantStreamBuffer = '';
         this.assistantStreamMetadata = metadata;
         this.assistantStreamHadContent = false;
     }
-    streamAssistantChunk(chunk, _channel) {
+    streamAssistantChunk(chunk, channel) {
         if (!chunk) {
             return;
         }
@@ -1389,6 +1397,9 @@ export class InteractiveShell {
                 contextWindowTokens: this.activeContextWindowTokens,
             });
         }
+        // Route chunks based on channel for proper phase tracking
+        // The agent sends 'thought' channel for reasoning chunks already wrapped in <thinking> tags
+        // The tag parsing in processAssistantStreamChunk will handle phase transitions
         this.processAssistantStreamChunk(chunk);
     }
     finalizeAssistantStream() {
@@ -1445,13 +1456,17 @@ export class InteractiveShell {
         if (content.trim().length > 0) {
             this.assistantStreamHadContent = true;
         }
-        if (!this.assistantStreamPhase) {
-            this.setAssistantStreamPhase('response');
-        }
+        // If no explicit phase has been set yet, keep the stream labeled as "thought"
+        // until a <response> tag arrives so operators see thinking first.
+        this.setAssistantStreamPhase(this.assistantStreamPhase ?? 'thought');
         if (this.assistantStreamPhase) {
             this.renderAssistantStreamHeader(this.assistantStreamPhase);
         }
-        this.enqueueAssistantStream(content);
+        let output = content;
+        if (this.assistantStreamPhase === 'thought') {
+            output = this.formatThoughtDisplay(content, { streaming: true });
+        }
+        this.enqueueAssistantStream(output);
     }
     setAssistantStreamPhase(phase) {
         if (this.assistantStreamPhase === phase) {
@@ -1530,11 +1545,12 @@ export class InteractiveShell {
         if (!normalized) {
             return;
         }
+        const formatted = type === 'thought' ? this.formatThoughtDisplay(normalized) : normalized;
         if (this.assistantBlocksEnabled && this.assistantBlockRenderer) {
-            this.renderAssistantBlock(type, normalized, metadata);
+            this.renderAssistantBlock(type, formatted, metadata);
             return;
         }
-        this.renderAssistantFallback(type, normalized, metadata);
+        this.renderAssistantFallback(type, formatted, metadata);
     }
     renderAssistantFallback(type, content, metadata) {
         const header = this.formatAssistantHeader(type, metadata);
@@ -1542,6 +1558,21 @@ export class InteractiveShell {
         const block = `\n${header}\n${compact}\n\n`;
         this.enqueueAssistantStream(block);
     }
+    formatThoughtDisplay(content, options = {}) {
+        const normalized = content.replace(/\r\n/g, '\n');
+        if (options.streaming) {
+            return formatThinkingContent(normalized);
+        }
+        const lines = normalized.split('\n');
+        return lines
+            .map((line, index) => {
+            const prefix = index === 0 ? theme.info(icons.action) : theme.ui.muted(icons.subaction);
+            const trimmed = line.trim();
+            const body = trimmed ? formatThinkingContent(trimmed) : '';
+            return body ? `${prefix} ${body}` : `${prefix}`;
+        })
+            .join('\n');
+    }
     formatAssistantHeader(type, metadata) {
         if (this.assistantBlocksEnabled && this.assistantBlockRenderer) {
             return this.assistantBlockRenderer.formatHeader(type, metadata);
@@ -2241,6 +2272,9 @@ export class InteractiveShell {
                 case '/context':
                     await this.refreshWorkspaceContextCommand(input);
                     break;
+                case '/contextlog':
+                    this.showContextSummaryLog(input);
+                    break;
                 case '/agents':
                     this.showAgentsMenu();
                     break;
@@ -2539,6 +2573,66 @@ export class InteractiveShell {
             display.showWarning('Workspace snapshot refreshed, but the agent failed to rebuild. Run /doctor for details.');
         }
     }
+    showContextSummaryLog(input) {
+        const agent = this.agent;
+        if (!agent) {
+            display.showWarning('No active agent session. Start one to inspect context summaries.');
+            return;
+        }
+        const contextManager = agent.getContextManager();
+        if (!contextManager?.getSummaryLog) {
+            display.showWarning('Context summary logging is unavailable in this session.');
+            return;
+        }
+        const tokens = input.trim().split(/\s+/).slice(1);
+        let limit = 5;
+        for (const token of tokens) {
+            if (!token)
+                continue;
+            const normalized = token.toLowerCase();
+            if (/^\d+$/.test(token)) {
+                limit = Math.min(Math.max(parseInt(token, 10), 1), 20);
+            }
+            else if (normalized.startsWith('limit=')) {
+                const value = parseInt(normalized.split('=')[1] ?? '', 10);
+                if (!Number.isNaN(value)) {
+                    limit = Math.min(Math.max(value, 1), 20);
+                }
+            }
+        }
+        const entries = contextManager.getSummaryLog(limit);
+        if (!entries.length) {
+            display.showInfo('No context summaries captured yet.');
+            return;
+        }
+        const lines = [];
+        lines.push(`${theme.primary('Context summaries')} ${theme.ui.muted(`(latest ${entries.length})`)}`);
+        for (const entry of entries) {
+            const timestamp = new Date(entry.timestamp).toLocaleString();
+            const headerParts = [
+                theme.ui.muted(timestamp),
+                theme.info(entry.method),
+                `removed ${theme.error(String(entry.removed))}`,
+                `kept ${theme.success(String(entry.preserved))}`,
+            ];
+            if (entry.reason) {
+                headerParts.push(theme.ui.muted(entry.reason));
+            }
+            if (entry.model) {
+                headerParts.push(theme.ui.muted(`model=${entry.model}`));
+            }
+            lines.push(headerParts.join(' · '));
+            if (entry.summary) {
+                const trimmed = entry.summary.length > 600 ? `${entry.summary.slice(0, 600)}…` : entry.summary;
+                lines.push(trimmed);
+            }
+            else {
+                lines.push(theme.ui.muted('(no summary text — simple prune)'));
+            }
+            lines.push(''); // spacer
+        }
+        display.showSystemMessage(lines.join('\n'));
+    }
     parseContextOverrideTokens(input) {
         const overrides = {};
         let hasOverride = false;
@@ -5815,7 +5909,25 @@ What's the next action?`;
         }
         if (name === 'bash' || name === 'execute_bash') {
             const command = String(entry.args['command'] ?? '').toLowerCase();
-            return command.includes('npm test') || command.includes('yarn test') || command.includes('pnpm test');
+            const patterns = [
+                'npm test',
+                'yarn test',
+                'pnpm test',
+                'bun test',
+                'go test',
+                'cargo test',
+                'pytest',
+                'python -m pytest',
+                'tox',
+                'mvn test',
+                './mvnw test',
+                'gradle test',
+                './gradlew test',
+                'dotnet test',
+                'make test',
+                'swift test',
+            ];
+            return patterns.some((pattern) => command.includes(pattern));
         }
         return false;
     }
@@ -5892,10 +6004,31 @@ What's the next action?`;
         }
         if (name === 'bash' || name === 'execute_bash') {
             const command = String(entry.args['command'] ?? '').toLowerCase();
-            return (command.includes('npm run build') ||
-                command.includes('yarn build') ||
-                command.includes('pnpm build') ||
-                command.includes('tsc'));
+            const makeBuild = command.startsWith('make') && !command.includes('make test') && !command.includes('make lint');
+            const patterns = [
+                'npm run build',
+                'yarn build',
+                'pnpm build',
+                'bun run build',
+                'bun build',
+                'tsc',
+                'cargo build',
+                'go build',
+                'python -m build',
+                'mvn -b -dskiptests package',
+                'mvn package',
+                'mvn install',
+                './mvnw -b -dskiptests package',
+                './mvnw package',
+                './mvnw install',
+                'gradle build',
+                'gradle assemble',
+                './gradlew build',
+                './gradlew assemble',
+                'dotnet build',
+                'swift build',
+            ];
+            return makeBuild || patterns.some((pattern) => command.includes(pattern));
         }
         return false;
     }
@@ -6083,8 +6216,8 @@ What's the next action?`;
                     this.requestPromptRefresh();
                 },
                 onContextSquishing: (message) => {
-                    // Show notification in UI when auto context squishing occurs
-                    display.showSystemMessage(`🔄 ${message}`);
+                    // Stream notification in UI when auto context squishing occurs
+                    display.stream(`\n🔄 ${message}\n`);
                     this.statusTracker.pushOverride('context-squish', 'Auto-squishing context', {
                         detail: 'Reducing conversation history to fit within token limits',
                         tone: 'warning',
@@ -6092,7 +6225,7 @@ What's the next action?`;
                 },
                 onContextRecovery: (attempt, maxAttempts, message) => {
                     // Show recovery progress in UI
-                    display.showSystemMessage(`⚡ Context Recovery (${attempt}/${maxAttempts}): ${message}`);
+                    display.stream(`\n⚡ Context Recovery (${attempt}/${maxAttempts}): ${message}\n`);
                 },
                 onContextPruned: (removedCount, stats) => {
                     // Clear squish overlay if active
@@ -6100,19 +6233,23 @@ What's the next action?`;
                     // Show notification that context was pruned
                     const method = stats['method'];
                     const percentage = stats['percentage'];
+                    const summarized = stats['summarized'] === true;
                     if (method === 'emergency-recovery') {
-                        display.showSystemMessage(`✅ Context recovery complete. Removed ${removedCount} messages. Context now at ${percentage ?? 'unknown'}%`);
+                        display.stream(`\n✅ Context recovery complete. Removed ${removedCount} messages. Context now at ${percentage ?? 'unknown'}%\n`);
                     }
                     // Update context usage in UI
                     if (typeof percentage === 'number') {
                         this.updateContextUsage(percentage);
                     }
+                    if (summarized) {
+                        display.showSystemMessage('Context summary captured. View the latest summaries with /contextlog.');
+                    }
                     // Ensure prompt remains visible at bottom after context messages
                     this.renderPromptArea();
                 },
                 onContinueAfterRecovery: () => {
                     // Update UI to show we're continuing after context recovery
-                    display.showSystemMessage(`🔄 Continuing after context recovery...`);
+                    display.stream(`\n🔄 Continuing after context recovery...\n`);
                     this.updateStatusMessage('Retrying with reduced context...');
                     this.renderPromptArea();
                 },
@@ -6244,8 +6381,8 @@ What's the next action?`;
                 ].join('\n');
             case 'balanced':
             default:
-                // Balanced is the default; avoid injecting extra prompt text to keep context lean.
-                return null;
+                // Balanced mode: show thinking for complex reasoning, planning, or multi-step tasks
+                return 'When reasoning through complex tasks, planning approaches, or making decisions, wrap your thought process in <thinking> tags before your response. Keep thinking concise and focused on the decision-making process.';
         }
     }
     buildDisplayMetadata(metadata) {
@@ -6279,10 +6416,18 @@ What's the next action?`;
         if (!operations.length) {
             return;
         }
-        const summaryLine = compactRenderer.formatCompactLine(operations, {
+        let summaryLine = compactRenderer.formatCompactLine(operations, {
             showIcons: true,
             showTimings: true,
         });
+        const warnings = this.uiAdapter.getRecentWarnings(since);
+        if (warnings.length) {
+            const limited = warnings.slice(0, 3);
+            const formattedWarnings = limited
+                .map((warning) => `${icons.warning} ${warning.tool}: ${warning.text}`)
+                .join(' • ');
+            summaryLine = `${summaryLine}   ${theme.warning('[warnings]')} ${formattedWarnings}`;
+        }
         if (!summaryLine.trim()) {
             this.lastToolSummaryRenderedAt = Date.now();
             return;