minovative-mind-cli 2.5.2 → 2.6.1

package/dist/services/agent.d.ts

@@ -48,13 +48,61 @@ export { AsyncInputHandler } from './agent/inputHandler.js';
  * @param workspaceRoot - The relative or absolute path representing the active workspace environment.
  * @param version - The Semantic Version string of the active tool distribution.
  */
+/**
+ * Starts and orchestrates the primary interactive command-line interface (REPL) loop.
+ *
+ * This is the central control loop of the CLI application. It runs indefinitely until
+ * the user explicitly issues an exit directive (e.g., typing "exit", "quit", `/` command menu selections,
+ * or using keyboard breaks like Ctrl+C).
+ *
+ * ### Architectural Pipeline:
+ * 1. **User Input Collection**:
+ *    - Captures multiline text strings by checking for trailing backslash characters (`\`).
+ *    - Prevents visual terminal glitches during multi-line typing on varying themes.
+ *    - Automatically handles command menu redirection when users enter a forward slash (`/`).
+ *    - Intercepts and filters OS clipboard paste buffers to allow inserting massive scripts cleanly.
+ *
+ * 2. **Slash Commands Processing**:
+ *    - Delegated to `handleSlashCommand` within `src/services/agent/slashCommands.ts`.
+ *
+ * 3. **Workspace Context Gathering & Intention Routing**:
+ *    - Leverages the Context Agent (`gatherContext`) to perform exploratory scans of the active repository.
+ *    - Identifies user intention to hot-swap system prompt strategies (`CHAT` for conversational assistance vs. `EXECUTE` for multi-turn modifications).
+ *    - Compresses gathered repo structures and file contents using high-speed Flash-Lite engines to respect context boundaries and budget costs.
+ *
+ * 4. **Model Execution & Self-Correction Feedback Loop**:
+ *    - Passes the target request to Gemini alongside compressed workspace injections.
+ *    - Recursively processes tool invocations via `processResponse`.
+ *    - Runs static validation checks (`verifyChangedFiles`) against mutated files to check for compiler/linter bugs.
+ *    - If files fail validation, enters a self-healing loop by submitting raw diagnostic errors directly back to the AI for remediation.
+ *
+ * @param workspaceRoot - The relative or absolute path representing the active workspace environment.
+ * @param version - The Semantic Version string of the active tool distribution.
+ * @returns A promise that resolves when the agent loop terminates.
+ */
 export declare function startAgentLoop(workspaceRoot: string, version: string): Promise<void>;
+/**
+ * Executes a single conversational or execution turn with the AI agent.
+ *
+ * Handles context gathering, model routing (Auto vs Flash vs Flash-Lite), orchestrator delegation
+ * (if sub-agents are active), tool execution loops, verification, and session auto-saving.
+ *
+ * @param workspaceRoot - The absolute or relative path to the root of the active workspace.
+ * @param userInput - The prompt or instruction entered by the user.
+ * @param chat - The active ProxyChatSession instance maintaining message history.
+ * @param inputHandler - The AsyncInputHandler instance for managing keyboard interrupts and queueing.
+ * @param chatSessionState - Object tracking session statistics, token counts, credit usage, and model metrics.
+ * @param isPlanMode - Flag indicating whether plan mode (read-only architecture planning) is active.
+ * @param cachedContextResult - Optional pre-gathered context result to bypass duplicate investigation turns.
+ * @returns An object containing optional plan mode actions or context results, or void.
+ */
 export declare function executeSingleTurn(workspaceRoot: string, userInput: string, chat: any, inputHandler: AsyncInputHandler, chatSessionState: {
     id: string;
     title: string;
     totalTokens: number;
     totalInputTokens: number;
     totalOutputTokens: number;
+    totalCreditsUsed: number;
     latestUsageMetadata?: any;
     previousUsageMetadata?: any;
     modelUsageCounts?: Record<string, number>;
@@ -62,3 +110,29 @@ export declare function executeSingleTurn(workspaceRoot: string, userInput: stri
     planModeReturn?: string;
     contextResult?: any;
 } | void>;
+/**
+ * Raw chat history entry count threshold to trigger chat history summarization.
+ * 12 entries = 6 conversational user/model turns.
+ */
+export declare const HISTORY_SUMMARIZATION_THRESHOLD = 12;
+/**
+ * Checks and summarizes older chat history entries if the active session's history
+ * exceeds HISTORY_SUMMARIZATION_THRESHOLD entries.
+ *
+ * Preserves the most recent 4 entries (2 turns) intact for conversational continuity,
+ * replacing all preceding turns with a single summarized pair in the chat history.
+ *
+ * @param chat - The active ProxyChatSession instance.
+ * @returns True if history was summarized and updated; false otherwise.
+ */
+/**
+ * Summarizes older chat history entries if the active session's history
+ * exceeds {@link HISTORY_SUMMARIZATION_THRESHOLD} entries.
+ *
+ * Preserves the most recent 4 entries (2 turns) intact for conversational continuity,
+ * replacing all preceding turns with a single summarized pair in the chat history.
+ *
+ * @param chat - The active ProxyChatSession instance.
+ * @returns A promise resolving to true if history was summarized and updated; false otherwise.
+ */
+export declare function summarizeHistoryIfNeeded(chat: any): Promise<boolean>;

package/dist/services/agent.js

@@ -26,8 +26,8 @@ import { markedTerminal } from 'marked-terminal';
 const execAsync = promisify(exec);
 import { debugLog, isDebugOn } from '../utils/logger.js';
 import { ensureProjectStorage, ensureIgnored, readCache, writeCache, invalidateCacheForDependents, } from '../utils/projectStorage.js';
-import { GEMINI_MODELS } from '../utils/config.js';
-import { createSharedChatSession, getGeneralChatConfig, getPlanExecutionConfig, compressTextUsingFlashLite, generateChatTitle, getGlobalActiveModel, setGlobalActiveModel, } from './ai.js';
+import { GEMINI_MODELS, isByokEnabled } from '../utils/config.js';
+import { createSharedChatSession, getGeneralChatConfig, getPlanExecutionConfig, compressTextUsingFlashLite, generateChatTitle, getGlobalActiveModel, setGlobalActiveModel, summarizeChatHistory, } from './ai.js';
 import { getAndResetTurnUsage } from './proxyClient.js';
 import { changeLogger } from './changeLogger.js';
 import { chatHistoryService } from './chatHistoryService.js';
@@ -77,6 +77,38 @@ export { AsyncInputHandler } from './agent/inputHandler.js';
  * @param workspaceRoot - The relative or absolute path representing the active workspace environment.
  * @param version - The Semantic Version string of the active tool distribution.
  */
+/**
+ * Starts and orchestrates the primary interactive command-line interface (REPL) loop.
+ *
+ * This is the central control loop of the CLI application. It runs indefinitely until
+ * the user explicitly issues an exit directive (e.g., typing "exit", "quit", `/` command menu selections,
+ * or using keyboard breaks like Ctrl+C).
+ *
+ * ### Architectural Pipeline:
+ * 1. **User Input Collection**:
+ *    - Captures multiline text strings by checking for trailing backslash characters (`\`).
+ *    - Prevents visual terminal glitches during multi-line typing on varying themes.
+ *    - Automatically handles command menu redirection when users enter a forward slash (`/`).
+ *    - Intercepts and filters OS clipboard paste buffers to allow inserting massive scripts cleanly.
+ *
+ * 2. **Slash Commands Processing**:
+ *    - Delegated to `handleSlashCommand` within `src/services/agent/slashCommands.ts`.
+ *
+ * 3. **Workspace Context Gathering & Intention Routing**:
+ *    - Leverages the Context Agent (`gatherContext`) to perform exploratory scans of the active repository.
+ *    - Identifies user intention to hot-swap system prompt strategies (`CHAT` for conversational assistance vs. `EXECUTE` for multi-turn modifications).
+ *    - Compresses gathered repo structures and file contents using high-speed Flash-Lite engines to respect context boundaries and budget costs.
+ *
+ * 4. **Model Execution & Self-Correction Feedback Loop**:
+ *    - Passes the target request to Gemini alongside compressed workspace injections.
+ *    - Recursively processes tool invocations via `processResponse`.
+ *    - Runs static validation checks (`verifyChangedFiles`) against mutated files to check for compiler/linter bugs.
+ *    - If files fail validation, enters a self-healing loop by submitting raw diagnostic errors directly back to the AI for remediation.
+ *
+ * @param workspaceRoot - The relative or absolute path representing the active workspace environment.
+ * @param version - The Semantic Version string of the active tool distribution.
+ * @returns A promise that resolves when the agent loop terminates.
+ */
 export async function startAgentLoop(workspaceRoot, version) {
     // Initialize project-level storage and ensure it is safely ignored from version control
     ensureProjectStorage(workspaceRoot);
@@ -92,6 +124,7 @@ export async function startAgentLoop(workspaceRoot, version) {
         totalTokens: 0,
         totalInputTokens: 0,
         totalOutputTokens: 0,
+        totalCreditsUsed: 0,
         modelUsageCounts: {},
     };
     chat.setSessionInfo(chatSessionState.id, workspaceRoot);
@@ -114,6 +147,8 @@ export async function startAgentLoop(workspaceRoot, version) {
         }
         return originalEmit(event, ...args);
     };
+    // Add space at the bottom to prevent terminal UI flickering when the cursor is at the absolute bottom
+    process.stdout.write('\n\n\n\x1b[3A');
     console.log(pc.dim('\nType your coding request below. Type "exit" or "quit" to leave.\n'));
     while (true) {
         if (chat.getRawHistory().length === 0 && chatSessionState.title !== '') {
@@ -122,6 +157,7 @@ export async function startAgentLoop(workspaceRoot, version) {
             chatSessionState.totalTokens = 0;
             chatSessionState.totalInputTokens = 0;
             chatSessionState.totalOutputTokens = 0;
+            chatSessionState.totalCreditsUsed = 0;
             chatSessionState.modelUsageCounts = {};
             chatSessionState.latestUsageMetadata = undefined;
             chatSessionState.previousUsageMetadata = undefined;
@@ -171,7 +207,7 @@ export async function startAgentLoop(workspaceRoot, version) {
                         label: '/workspaces',
                         hint: 'Manage external workspaces for cross-project development',
                     },
-                    { value: '/config-key', label: '/config-key', hint: 'BYOK (Bring Your Own Key) Configuration' },
+                    { value: '/config-key', label: '/config-key', hint: 'BYOK — Use your own Google AI Studio API key' },
                     { value: '/stats', label: '/stats', hint: 'View current session statistics and configuration' },
                     { value: '/commit', label: '/commit', hint: 'Auto-commit changes with AI message' },
                     { value: '/revert', label: '/revert', hint: 'Undo last change' },
@@ -253,6 +289,21 @@ export async function startAgentLoop(workspaceRoot, version) {
         }
     }
 }
+/**
+ * Executes a single conversational or execution turn with the AI agent.
+ *
+ * Handles context gathering, model routing (Auto vs Flash vs Flash-Lite), orchestrator delegation
+ * (if sub-agents are active), tool execution loops, verification, and session auto-saving.
+ *
+ * @param workspaceRoot - The absolute or relative path to the root of the active workspace.
+ * @param userInput - The prompt or instruction entered by the user.
+ * @param chat - The active ProxyChatSession instance maintaining message history.
+ * @param inputHandler - The AsyncInputHandler instance for managing keyboard interrupts and queueing.
+ * @param chatSessionState - Object tracking session statistics, token counts, credit usage, and model metrics.
+ * @param isPlanMode - Flag indicating whether plan mode (read-only architecture planning) is active.
+ * @param cachedContextResult - Optional pre-gathered context result to bypass duplicate investigation turns.
+ * @returns An object containing optional plan mode actions or context results, or void.
+ */
 export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHandler, chatSessionState, isPlanMode, cachedContextResult) {
     return runWithAgentId('main', async () => {
         const { resetTurnAccumulator } = await import('./metrics.js');
@@ -265,6 +316,20 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
             inputHandler.start(spinner);
             changeLogger.startChangeSet(userInput);
             let finalInput = userInput;
+            // Stage 0: Summarize chat history if length threshold is met
+            if (!cachedContextResult) {
+                const isDebug = isDebugOn();
+                if (!inputHandler.isCurrentlyPrompting() && !isDebug) {
+                    spinner.start('Checking conversation history...');
+                }
+                const historySummarized = await summarizeHistoryIfNeeded(chat);
+                if (historySummarized) {
+                    debugLog('Chat history was summarized and compressed prior to context investigation.');
+                }
+                if (!inputHandler.isCurrentlyPrompting() && !isDebug) {
+                    spinner.stop();
+                }
+            }
             // Stage 1: Gather Workspace Context and route intentions
             spinner.start('🔍 Investigating workspace...');
             let gatherRes = { targetAgent: 'EXECUTE', chainedMessages: [], contextResult: cachedContextResult || null };
@@ -273,13 +338,26 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
                 if (collector)
                     collector.startTimer('contextGather');
                 const chatHistory = chat.getRecentHistory(3);
+                const toolLogs = [];
                 gatherRes = await gatherContext(workspaceRoot, userInput, chatHistory, inputHandler, ac.signal, (msg) => {
                     if (!inputHandler.isCurrentlyPrompting()) {
                         spinner.message(`🔍 Investigating workspace... ${pc.dim(msg)}`);
                     }
+                }, (toolMsg, label) => {
+                    const formattedLog = `${pc.dim(`[${label}]`)} ${toolMsg}`;
+                    toolLogs.push(formattedLog);
+                    if (!inputHandler.isCurrentlyPrompting()) {
+                        spinner.message(`🔍 Investigating workspace... ${formattedLog}`);
+                    }
                 });
                 if (collector)
                     collector.stopTimer('contextGather');
+                // Print all collected logs at once to prevent flickering, while spinner is stopped
+                if (toolLogs.length > 0) {
+                    spinner.stop();
+                    toolLogs.forEach(log => p.log.step(log));
+                    spinner.start(`🔍 Context gathered successfully.`);
+                }
             }
             let latestUsage = undefined;
             // Collect any inputs that were queued while the Context Agent was investigating
@@ -379,6 +457,7 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
             catch { }
             if (!isPlanMode && effectiveTargetAgent === 'EXECUTE' && isSubAgentsEnabled()) {
                 spinner.stop(); // Clear the spinner before delegating
+                inputHandler.clearSpinner(); // Prevent prompt from reviving the old spinner
                 process.stdout.write('\x1b[2K\r');
                 const orchestrator = new Orchestrator(workspaceRoot, chatSessionState.id, inputHandler);
                 const handledByOrchestrator = await orchestrator.runOrchestration(finalInput, dynamicSystemInstruction, ac.signal);
@@ -413,6 +492,7 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
                     chatSessionState.totalTokens += usage.totalTokenCount;
                     chatSessionState.totalInputTokens += (usage.promptTokens || 0) + (usage.cachedTokens || 0);
                     chatSessionState.totalOutputTokens += usage.candidatesTokens || 0;
+                    chatSessionState.totalCreditsUsed += usage.creditsUsed || 0;
                     if (usage.cachedTokens && usage.cachedTokens > 0) {
                         const totalInputTokens = (usage.promptTokens || 0) + usage.cachedTokens;
                         const percentSaved = totalInputTokens > 0 ? Math.round((usage.cachedTokens / totalInputTokens) * 100) : 0;
@@ -459,6 +539,7 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
                             totalTokens: chatSessionState.totalTokens,
                             totalInputTokens: chatSessionState.totalInputTokens,
                             totalOutputTokens: chatSessionState.totalOutputTokens,
+                            totalCreditsUsed: chatSessionState.totalCreditsUsed,
                             gitBranch: gitBranch || undefined,
                             autoApprove: getApprovalMode() === 'skip-all',
                             subAgents: isSubAgentsEnabled(),
@@ -559,6 +640,7 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
                 chatSessionState.totalTokens += usage.totalTokenCount || 0;
                 chatSessionState.totalInputTokens += (usage.promptTokens || 0) + (usage.cachedTokens || 0);
                 chatSessionState.totalOutputTokens += usage.candidatesTokens || 0;
+                chatSessionState.totalCreditsUsed += usage.creditsUsed || 0;
             }
             // Auto-save chat history
             const history = chat.getRawHistory();
@@ -579,6 +661,7 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
                             totalTokens: chatSessionState.totalTokens,
                             totalInputTokens: chatSessionState.totalInputTokens,
                             totalOutputTokens: chatSessionState.totalOutputTokens,
+                            totalCreditsUsed: chatSessionState.totalCreditsUsed,
                             gitBranch: gitBranch || undefined,
                             autoApprove: getApprovalMode() === 'skip-all',
                             subAgents: isSubAgentsEnabled(),
@@ -603,6 +686,7 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
                     totalTokens: chatSessionState.totalTokens,
                     totalInputTokens: chatSessionState.totalInputTokens,
                     totalOutputTokens: chatSessionState.totalOutputTokens,
+                    totalCreditsUsed: chatSessionState.totalCreditsUsed,
                     gitBranch: gitBranch || undefined,
                     autoApprove: getApprovalMode() === 'skip-all',
                     subAgents: isSubAgentsEnabled(),
@@ -636,31 +720,43 @@ export async function executeSingleTurn(workspaceRoot, userInput, chat, inputHan
                         ],
                     });
                     if (planAction === 'choose_model') {
+                        const byokEnabled = await isByokEnabled();
+                        const options = [
+                            // {
+                            //   value: 'claude-opus-5',
+                            //   label: 'Claude 5 Opus',
+                            //   hint: 'For hardcore & complex problems',
+                            // },
+                            {
+                                value: 'gemini-3.1-pro-preview',
+                                label: 'Gemini 3.1 Pro',
+                                hint: 'For hardcore & complex problems',
+                            },
+                            // {
+                            //   value: 'claude-sonnet-5',
+                            //   label: 'Claude 5 Sonnet',
+                            //   hint: 'Best for raw speed and cost efficiency',
+                            // },
+                            {
+                                value: 'gemini-3.6-flash',
+                                label: 'Gemini 3.6 Flash',
+                                hint: 'Balanced performance & fast',
+                            },
+                            {
+                                value: 'gemini-3.5-flash-lite',
+                                label: 'Gemini 3.5 Flash-Lite',
+                                hint: 'Best for raw speed and cost efficiency',
+                            },
+                            {
+                                value: 'auto',
+                                label: 'Auto (Flash-Lite / Flash)',
+                                hint: 'Dynamically routes between Gemini 3.5 Flash-Lite and Gemini 3.6 based on prompt complexity',
+                            },
+                        ].filter(o => !(byokEnabled && o.value.includes('claude')));
                         const selectedModel = await p['select']({
                             message: `Select AI Model (Current: ${pc.cyan(currentModel)})`,
                             initialValue: currentModel,
-                            options: [
-                                {
-                                    value: 'gemini-3.1-pro-preview',
-                                    label: 'Gemini 3.1 Pro',
-                                    hint: 'The Pro model for complex logic',
-                                },
-                                {
-                                    value: 'gemini-3.6-flash',
-                                    label: 'Gemini 3.6 Flash',
-                                    hint: 'Balanced performance',
-                                },
-                                {
-                                    value: 'gemini-3.5-flash-lite',
-                                    label: 'Gemini 3.5 Flash-Lite',
-                                    hint: 'Best for speed and cost efficiency',
-                                },
-                                {
-                                    value: 'auto',
-                                    label: 'Auto (Flash-Lite / Flash)',
-                                    hint: 'Dynamically routes between Gemini 3.5 Flash-Lite and Gemini 3.6 based on prompt complexity',
-                                },
-                            ],
+                            options: options,
                         });
                         if (!p.isCancel(selectedModel)) {
                             chat.setModel(selectedModel);
@@ -704,7 +800,7 @@ async function collectUserInput(history, isPlanMode) {
     while (true) {
         const userInputRaw = await historyText({
             message: isMultiLine ? '  ' : isPlanMode ? pc.cyan('(Plan Mode) ❯') : pc.magenta('❯'),
-            placeholder: isMultiLine ? '' : 'Use "\\" for new lines',
+            placeholder: isMultiLine ? '' : 'Use ' + String.fromCharCode(92) + ' for new lines',
             history,
         });
         if (p.isCancel(userInputRaw)) {
@@ -720,7 +816,7 @@ async function collectUserInput(history, isPlanMode) {
         }
         let line = (userInputRaw || '');
         // Require a space before the backslash to prevent Windows directory paths (e.g., C:\foo\) from triggering multiline
-        if (line.trimEnd().endsWith(' \\')) {
+        if (line.trimEnd().endsWith(' ' + String.fromCharCode(92))) {
             const cleanLine = line.trimEnd().slice(0, -2);
             lines.push(cleanLine);
             isMultiLine = true;
@@ -782,6 +878,64 @@ async function compressContextFiles(workspaceRoot, contextResult) {
     }
     return compressedFiles;
 }
+/**
+ * Raw chat history entry count threshold to trigger chat history summarization.
+ * 12 entries = 6 conversational user/model turns.
+ */
+export const HISTORY_SUMMARIZATION_THRESHOLD = 12;
+/**
+ * Checks and summarizes older chat history entries if the active session's history
+ * exceeds HISTORY_SUMMARIZATION_THRESHOLD entries.
+ *
+ * Preserves the most recent 4 entries (2 turns) intact for conversational continuity,
+ * replacing all preceding turns with a single summarized pair in the chat history.
+ *
+ * @param chat - The active ProxyChatSession instance.
+ * @returns True if history was summarized and updated; false otherwise.
+ */
+/**
+ * Summarizes older chat history entries if the active session's history
+ * exceeds {@link HISTORY_SUMMARIZATION_THRESHOLD} entries.
+ *
+ * Preserves the most recent 4 entries (2 turns) intact for conversational continuity,
+ * replacing all preceding turns with a single summarized pair in the chat history.
+ *
+ * @param chat - The active ProxyChatSession instance.
+ * @returns A promise resolving to true if history was summarized and updated; false otherwise.
+ */
+export async function summarizeHistoryIfNeeded(chat) {
+    const history = chat.getRawHistory();
+    if (!history || history.length < HISTORY_SUMMARIZATION_THRESHOLD) {
+        return false;
+    }
+    try {
+        // Keep the most recent 4 entries (2 full user/model turns) intact
+        const recentCount = 4;
+        const olderHistory = history.slice(0, history.length - recentCount);
+        const recentHistory = history.slice(history.length - recentCount);
+        debugLog(`Summarizing ${olderHistory.length} older chat history entries...`);
+        const summaryText = await summarizeChatHistory(olderHistory);
+        if (summaryText && summaryText.trim().length > 0) {
+            const summaryContent = [
+                {
+                    role: 'user',
+                    parts: [{ text: `[PREVIOUS CONVERSATION SUMMARY]:\n${summaryText.trim()}` }],
+                },
+                {
+                    role: 'model',
+                    parts: [{ text: 'Understood. I have reviewed and absorbed the summary of our preceding conversation.' }],
+                },
+            ];
+            chat.loadRawHistory([...summaryContent, ...recentHistory]);
+            debugLog(`Chat history compressed successfully from ${history.length} to ${summaryContent.length + recentHistory.length} entries.`);
+            return true;
+        }
+    }
+    catch (error) {
+        debugLog(`Failed to summarize chat history: ${error?.message || error}`);
+    }
+    return false;
+}
 async function executeSelfCorrectionLoop(chat, initialResult, workspaceRoot, inputHandler, effectiveTargetAgent, signal, spinner, originalUserInput, isPlanMode) {
     let correctionAttempts = 0;
     const MAX_CORRECTIONS = 5;
@@ -795,16 +949,24 @@ async function executeSelfCorrectionLoop(chat, initialResult, workspaceRoot, inp
         if (finalText === '[Generation stopped by user]')
             break;
         const historyLengthBefore = chat.getRawHistory().length;
-        finalText = await processResponse(chat, result, workspaceRoot, inputHandler, agentState, signal);
+        const currentText = await processResponse(chat, result, workspaceRoot, inputHandler, agentState, signal);
         const historyLengthAfter = chat.getRawHistory().length;
         const usedTools = historyLengthAfter > historyLengthBefore;
-        debugLog(`processResponse returned finalText (length ${finalText.length}): "${finalText.substring(0, 10)}..."`);
-        if (finalText === '[Generation stopped by user]') {
+        debugLog(`processResponse returned text (length ${currentText.length}): "${currentText.substring(0, 10)}..."`);
+        if (currentText === '[Generation stopped by user]') {
+            finalText = currentText;
             break;
         }
-        if (finalText.startsWith('[The AI repeatedly returned empty responses')) {
+        if (currentText.startsWith('[The AI repeatedly returned empty responses')) {
+            finalText = currentText;
             break;
         }
+        if (correctionAttempts === 0) {
+            finalText = currentText;
+        }
+        else if (currentText && !currentText.includes('[INTENT_VERIFIED]')) {
+            finalText += '\n\n### Subsequent Fixes:\n' + currentText;
+        }
         const currentChanges = changeLogger.getCurrentChangeSet()?.changes || [];
         // If the correction cycle is active but no new changes were registered, the model gave up
         if (isFixingCodeError && currentChanges.length <= previousChangeCount && !usedTools) {

package/dist/services/ai.d.ts

@@ -88,6 +88,11 @@ export declare function createIntentRouterSession(): any;
 export declare function createExecutionComplexitySession(): any;
 export declare function createInvestigationComplexitySession(): any;
 export declare function createWebSearchAgentSession(): any;
+export declare function createHistorySummarizerSession(): any;
+/**
+ * Summarizes an array of Content history entries using Gemini Flash Lite.
+ */
+export declare function summarizeChatHistory(history: Content[]): Promise<string>;
 /**
  * Generates a concise title for a chat session based on the user's first message.
  */