cloving 0.3.11 → 0.3.13

package/dist/managers/ChatManager.js

@@ -4,21 +4,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const copy_paste_1 = __importDefault(require("copy-paste"));
-const readline_1 = __importDefault(require("readline"));
-const child_process_1 = require("child_process");
 const colors_1 = __importDefault(require("colors"));
-const axios_1 = __importDefault(require("axios"));
 const cli_highlight_1 = __importDefault(require("cli-highlight"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const readline_1 = __importDefault(require("readline"));
+const child_process_1 = require("child_process");
 const CommitManager_1 = __importDefault(require("./CommitManager"));
-const ChunkManager_1 = __importDefault(require("./ChunkManager"));
-const BlockManager_1 = __importDefault(require("./BlockManager"));
 const ReviewManager_1 = __importDefault(require("./ReviewManager"));
-const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
 const string_utils_1 = require("../utils/string_utils");
 const config_utils_1 = require("../utils/config_utils");
 const prompt_utils_1 = require("../utils/prompt_utils");
+const prompts_1 = require("../utils/prompts");
+const StreamManager_1 = __importDefault(require("./StreamManager"));
 const specialCommands = [
     'save',
     'commit',
@@ -32,36 +28,27 @@ const specialCommands = [
     'help',
     'exit',
 ];
-class ChatManager {
+class ChatManager extends StreamManager_1.default {
     /**
      * Creates an instance of ChatManager.
      * @param {ClovingGPTOptions} options - Configuration options for the ChatManager.
      */
     constructor(options) {
-        this.options = options;
-        this.chatHistory = [];
+        super(options);
         this.commandHistory = [];
         this.historyIndex = -1;
         this.multilineInput = '';
         this.isMultilineMode = false;
-        this.contextFiles = {};
-        this.prompt = '';
-        this.isProcessing = false;
         this.isSilent = false;
-        this.retryCount = 0;
-        this.maxRetries = 3;
-        this.isSilent = options.silent || false;
+        this.isSilent = options.silent || (0, config_utils_1.getConfig)(options).globalSilent || false;
         options.stream = true;
         options.silent = true;
-        this.gpt = new cloving_gpt_1.default(options);
         this.rl = readline_1.default.createInterface({
             input: process.stdin,
             output: process.stdout,
             prompt: colors_1.default.green.bold('cloving> '),
             historySize: 1000,
         });
-        this.chunkManager = new ChunkManager_1.default();
-        this.blockManager = new BlockManager_1.default();
     }
     /**
      * Initializes the ChatManager by loading context files, displaying a welcome message,
@@ -74,8 +61,7 @@ class ChatManager {
         console.log(`\n🍀 🍀 🍀 ${colors_1.default.bold('Welcome to Cloving REPL')} 🍀 🍀 🍀\n`);
         this.displayAvailableCommands();
         console.log('\nWhat would you like to do?');
-        this.rl.prompt();
-        this.setupEventListeners();
+        this.setupReadline();
     }
     displayAvailableCommands() {
         console.log(`Type a freeform request or question to interact with your Cloving AI pair programmer.\n`);
@@ -93,69 +79,15 @@ class ChatManager {
         console.log(` - ${colors_1.default.yellow(colors_1.default.bold('exit'))}             Quit this session`);
     }
     /**
-     * Checks for the latest version of the app from GitHub and compares it with the current version.
-     * If a new version is available, it notifies the user.
-     * @private
-     * @returns {Promise<void>}
-     */
-    async checkForLatestVersion() {
-        try {
-            const response = await axios_1.default.get('https://api.github.com/repos/cloving-ai/cloving-cli/releases/latest');
-            const latestVersion = response.data.tag_name;
-            const currentVersion = `v${(0, prompt_utils_1.getPackageVersion)()}`;
-            if (latestVersion !== currentVersion) {
-                console.log(colors_1.default.bgWhite.black(`\n 🚀 A new version of Cloving is available: ${latestVersion}    `));
-                console.log(colors_1.default.bgWhite.black(`    You are currently using version: ${currentVersion}          `));
-                console.log(colors_1.default.bgWhite.black(`    To upgrade, run: ${colors_1.default.bgWhite.black.bold('npm install -g cloving@latest')}   `));
-            }
-        }
-        catch (error) {
-            // ignore errors
-        }
-    }
-    /**
-     * Sets up event listeners for the readline interface and process input.
+     * Sets up readline and event listeners for the readline interface and process input.
      * @private
      */
-    setupEventListeners() {
+    setupReadline() {
+        this.rl.prompt();
         this.rl.on('line', this.handleLine.bind(this));
         this.rl.on('close', this.handleClose.bind(this));
         process.stdin.on('keypress', this.handleKeypress.bind(this));
     }
-    /**
-     * Loads context files specified in the options or defaults to the primary language's directory.
-     * @private
-     * @returns {Promise<void>}
-     */
-    async loadContextFiles() {
-        const config = (0, config_utils_1.getClovingConfig)();
-        const primaryLanguage = config.languages.find((lang) => lang.primary);
-        const defaultDirectory = primaryLanguage ? primaryLanguage.directory : '.';
-        const testingDirectories = config.testingFrameworks?.map((framework) => framework.directory) || [];
-        const testingDirectory = testingDirectories[0];
-        let files = this.options.files || [defaultDirectory, testingDirectory].filter(Boolean);
-        if (files.length > 0) {
-            console.log(`\nBuilding chat session context...\n`);
-        }
-        for (const file of files) {
-            // Skip if the file is not a string
-            if (!file)
-                continue;
-            const previousCount = Object.keys(this.contextFiles).length;
-            this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(file, this.contextFiles, this.options);
-            const newCount = Object.keys(this.contextFiles).length;
-            const addedCount = newCount - previousCount;
-            const totalTokens = this.calculateTotalTokens();
-            console.log(colors_1.default.cyan(`📁 Loaded context from: ${colors_1.default.bold(file)}`));
-            console.log(colors_1.default.green(`   ✅ Added ${addedCount} file(s) to context`));
-            console.log(colors_1.default.yellow(`   📊 Total tokens in context: ${totalTokens.toLocaleString()}\n`));
-        }
-    }
-    calculateTotalTokens() {
-        return Object.values(this.contextFiles).reduce((total, content) => {
-            return total + Math.ceil(content.length / 4);
-        }, 0);
-    }
     /**
      * Handles each line of input from the user.
      * @private
@@ -167,6 +99,15 @@ class ChatManager {
             return;
         }
         const trimmedLine = line.trim();
+        if (this.isPastedCode(trimmedLine)) {
+            console.log('Detected pasted code. Processing as multiline input...');
+            this.multilineInput = trimmedLine;
+            this.isMultilineMode = true;
+            await this.handleCommand(this.multilineInput);
+            this.multilineInput = '';
+            this.isMultilineMode = false;
+            return;
+        }
         if (this.handleMultilineInput(trimmedLine)) {
             return;
         }
@@ -202,6 +143,10 @@ class ChatManager {
         }
         return false;
     }
+    isPastedCode(line) {
+        // Check if the line contains multiple lines (indicating a paste)
+        return line.includes('\n') || line.length > 100;
+    }
     handleExitCommand(command) {
         if (command.toLowerCase() === 'exit') {
             this.rl.close();
@@ -247,6 +192,11 @@ class ChatManager {
             if (matchingCommand) {
                 command = matchingCommand.split(' ')[0]; // Use only the command part without arguments
             }
+            else {
+                console.log(`No matching command found for '${command}'. Processing as user input.`);
+                await this.processUserInput(command);
+                return;
+            }
         }
         switch (command) {
             case 'help':
@@ -365,23 +315,6 @@ class ChatManager {
         }
         this.rl.prompt();
     }
-    async refreshContext() {
-        await this.reloadContextFiles();
-        const updatedSystemPrompt = (0, prompt_utils_1.generateCodegenPrompt)(this.contextFiles);
-        this.chatHistory[0] = { role: 'user', content: updatedSystemPrompt };
-        this.chatHistory[1] = { role: 'assistant', content: 'What would you like to do?' };
-    }
-    async reloadContextFiles() {
-        for (const filePath in this.contextFiles) {
-            try {
-                const content = await fs_1.default.promises.readFile(path_1.default.resolve(filePath), 'utf8');
-                this.contextFiles[filePath] = content;
-            }
-            catch (error) {
-                console.error(`Error reading file ${filePath}:`, error);
-            }
-        }
-    }
     isRemoveCommand(command) {
         return command.startsWith('rm ');
     }
@@ -458,14 +391,14 @@ class ChatManager {
     async handleReview() {
         this.options.stream = false;
         const reviewManager = new ReviewManager_1.default(this.options);
-        await reviewManager.review();
+        await reviewManager.generateReview();
         this.options.stream = true;
         this.rl.prompt();
     }
     async handleCommit() {
         this.options.stream = false;
         const commitManager = new CommitManager_1.default(this.options);
-        await commitManager.commit();
+        await commitManager.generateCommit();
         this.options.stream = true;
         this.rl.prompt();
     }
@@ -521,12 +454,10 @@ class ChatManager {
             return;
         }
         this.isProcessing = true;
-        this.chunkManager = new ChunkManager_1.default();
         try {
             await this.refreshContext();
-            this.prompt = this.generatePrompt(input);
-            this.addChatHistory(this.prompt);
-            if (!this.isSilent) {
+            this.addUserPrompt(this.generatePrompt(input));
+            if (!this.gpt.silent) {
                 const fullPrompt = this.chatHistory
                     .map((m) => {
                     const content = m.content
@@ -549,25 +480,11 @@ class ChatManager {
                 // Review the prompt using the REPL
                 const tokenCount = Math.ceil(fullPrompt.length / 4).toLocaleString();
                 console.log(`${colors_1.default.yellow.bold('INFORMATION')} The generated prompt is approximately ${tokenCount} tokens long. Would you like to review the prompt before sending it? ${colors_1.default.gray('(Y/n)')}`);
-                const reviewPrompt = await new Promise((resolve) => {
-                    this.rl.question(colors_1.default.green.bold('cloving> '), (answer) => {
-                        resolve(answer.trim().toLowerCase());
-                    });
-                });
+                const reviewPrompt = await this.askQuestion('cloving> ');
                 if (reviewPrompt.startsWith('y') || reviewPrompt === '') {
-                    console.log(colors_1.default.gray.bold('\n---------------------- PROMPT START ----------------------\n'));
-                    const promptParts = fullPrompt.split('\n```');
-                    const highlightedPrompt = promptParts
-                        .map((part, index) => index % 2 === 1 ? (0, cli_highlight_1.default)(part, { language: 'typescript' }) : part)
-                        .join('\n```');
-                    console.log(highlightedPrompt);
-                    console.log(colors_1.default.gray.bold('\n---------------------- PROMPT END ----------------------\n'));
+                    this.reviewPrompt(fullPrompt);
                     console.log(`Do you want to proceed with this prompt? ${colors_1.default.gray('(Y/n)')}`);
-                    const confirmPrompt = await new Promise((resolve) => {
-                        this.rl.question(colors_1.default.green.bold('cloving> '), (answer) => {
-                            resolve(answer.trim().toLowerCase());
-                        });
-                    });
+                    const confirmPrompt = await this.askQuestion('cloving> ');
                     if (!confirmPrompt.startsWith('y') && confirmPrompt !== '') {
                         console.log('Operation cancelled by user.');
                         this.isProcessing = false;
@@ -580,120 +497,40 @@ class ChatManager {
                 prompt: this.prompt,
                 messages: this.chatHistory,
             });
-            let accumulatedContent = '';
-            this.handleResponseStream(responseStream, accumulatedContent);
+            this.handleResponseStream(responseStream);
         }
         catch (err) {
             this.handleError(err);
         }
     }
-    addChatHistory(input) {
-        this.chatHistory.push({ role: 'user', content: input });
-    }
-    /**
-     * Handles the streaming response from the AI model.
-     * This method processes the incoming data chunks, converts them to readable output,
-     * and manages the accumulated content.
-     *
-     * @param responseStream - The stream of response data from the AI model.
-     * @param accumulatedContent - A string to accumulate the complete response content.
-     */
-    handleResponseStream(responseStream, accumulatedContent) {
-        let animationInterval;
-        this.blockManager = new BlockManager_1.default();
-        this.chunkManager = new ChunkManager_1.default();
-        this.blockManager.on('startGeneratingCode', () => {
-            process.stdout.write(colors_1.default.gray.bold('\nGenerating code...  '));
-            let animationIndex = 0;
-            const animationChars = ['/', '|', '\\', '-'];
-            animationInterval = setInterval(() => {
-                process.stdout.write('\b'.repeat(1));
-                process.stdout.write(colors_1.default.gray.bold(animationChars[animationIndex]));
-                animationIndex = (animationIndex + 1) % animationChars.length;
-            }, 100);
-        });
-        this.blockManager.on('endGeneratingCode', () => {
-            clearInterval(animationInterval);
-            process.stdout.write('\b'.repeat(100));
-        });
-        this.blockManager.on('content', (content) => {
-            process.stdout.write(content);
-            accumulatedContent += content;
-        });
-        this.blockManager.on('codeBlock', (codeBlock) => {
-            const { currentNewBlock } = codeBlock;
-            if (currentNewBlock?.currentContent && currentNewBlock?.newContent) {
-                // Current/New format
-                process.stdout.write(colors_1.default.gray.bold(`\`\`\`${currentNewBlock.language}                                       \n`));
-                process.stdout.write(colors_1.default.gray.bold(`<<<<<<< CURRENT ${currentNewBlock.filePath}\n`));
-                process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.currentContent, { language: currentNewBlock.language }));
-                process.stdout.write(colors_1.default.gray.bold('\n=======\n'));
-                process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.newContent, { language: currentNewBlock.language }));
-                process.stdout.write(colors_1.default.gray.bold('\n>>>>>>> NEW\n```'));
-            }
-            else {
-                if (codeBlock.raw) {
-                    // Raw format
-                    process.stdout.write(`                                       \n`);
-                    process.stdout.write((0, cli_highlight_1.default)(codeBlock.raw));
-                }
-                else {
-                    process.stdout.write(`                                       \n`);
-                }
-            }
-            accumulatedContent += codeBlock.raw;
-        });
-        // Handle content chunks from the ChunkManager
-        this.chunkManager.on('content', (buffer) => {
-            let convertedStream = this.gpt.convertStream(buffer);
-            while (convertedStream !== null) {
-                const { output, lastChar } = convertedStream;
-                // buffer the output to the BlockManager
-                this.blockManager.addContent(output);
-                // clear the buffer from the ChunkManager
-                this.chunkManager.clearBuffer(lastChar);
-                // Try to convert the rest of the buffer to a string
-                buffer = buffer.slice(lastChar);
-                convertedStream = this.gpt.convertStream(buffer);
-            }
-        });
-        // Handle incoming data chunks from the response stream
-        responseStream.data.on('data', (chunk) => {
-            // Convert the chunk to a string and add it to the ChunkManager
-            if (!chunk)
-                return;
-            // a chunk is a JSON object with different keys depending on the AI service provider
-            const chunkString = chunk.toString();
-            this.chunkManager.addChunk(chunkString);
-        });
-        // Handle the end of the response stream
-        responseStream.data.on('end', () => {
-            // Finalize the response when the stream ends
-            this.finalizeResponse(accumulatedContent);
-        });
-        // Handle any errors in the response stream
-        responseStream.data.on('error', (error) => {
-            console.error('Error streaming response:', error);
-            this.isProcessing = false;
-            process.stdout.write('\n');
-            this.rl.prompt();
+    askQuestion(prompt) {
+        return new Promise((resolve) => {
+            this.rl.question(colors_1.default.green.bold(prompt), (answer) => {
+                resolve(answer.trim().toLowerCase());
+            });
         });
     }
-    async finalizeResponse(accumulatedContent) {
-        this.chatHistory.push({ role: 'assistant', content: accumulatedContent.trim() });
+    reviewPrompt(fullPrompt) {
+        console.log(colors_1.default.gray.bold('\n---------------------- PROMPT START ----------------------\n'));
+        const promptParts = fullPrompt.split('\n```');
+        const highlightedPrompt = promptParts
+            .map((part, index) => (index % 2 === 1 ? (0, cli_highlight_1.default)(part, { language: 'typescript' }) : part))
+            .join('\n```');
+        console.log(highlightedPrompt);
+        console.log(colors_1.default.gray.bold('\n---------------------- PROMPT END ----------------------\n'));
+    }
+    async finalizeResponse() {
+        this.addAssistantResponse(this.responseString);
         this.isProcessing = false;
-        if (accumulatedContent) {
-            const currentNewBlocks = (0, string_utils_1.extractCurrentNewBlocks)(accumulatedContent);
+        process.stdout.write('\b'.repeat(100));
+        if (this.responseString !== '') {
+            const currentNewBlocks = (0, string_utils_1.extractCurrentNewBlocks)(this.responseString);
             const [canApply, summary] = await (0, string_utils_1.checkBlocksApplicability)(currentNewBlocks);
             if (!canApply) {
                 if (this.retryCount < this.maxRetries) {
                     console.log(`\n\n${summary}\n\n${colors_1.default.yellow.bold('WARNING')} Some of the provided code blocks could not be automatically applied. Retrying (Attempt ${this.retryCount + 1}/${this.maxRetries})...\n`);
                     this.retryCount++;
-                    this.processUserInput(`Some of the provided code blocks could not be applied,
-please match the existing code with a few more lines of context and make sure it is a character for character exact match.
-Never use "rest of the existing code" or "rest of the code" in your response, instead break the code block into smaller blocks.
-
-${summary}`);
+                    this.processUserInput(`${prompts_1.CODEGEN_COULDNT_APPLY}\n\n${summary}`);
                     return;
                 }
                 else {
@@ -720,8 +557,7 @@ You can follow up with another request or:
   `);
         this.rl.prompt();
     }
-    handleError(err) {
-        const error = err;
+    handleError(error) {
         let errorMessage = error.message || 'An error occurred.';
         const errorNumber = error.response?.status || 'unknown';
         switch (errorNumber) {
@@ -738,7 +574,6 @@ You can follow up with another request or:
                 errorMessage = 'Internal server error';
                 break;
         }
-        const promptTokens = Math.ceil(this.prompt.length / 4).toLocaleString();
         const statusMessage = error.response?.data?.statusMessage;
         console.error(colors_1.default.red(`\nError (${errorNumber}) while submitting the prompt to the AI API\n\n${statusMessage}\n`));
         this.isProcessing = false;
@@ -774,7 +609,8 @@ ${prompt}
 
 ### Note
 
-Whenever possible, break up the changes into pieces and make sure every change is in its own CURRENT / NEW block.`;
+Whenever possible, break up the changes into pieces and make sure every change is in its own CURRENT / NEW block.
+Do not allow empty CURRENT blocks and if you add content to the CURRENT block, you also have to add the same content to the NEW block.`;
     }
     handleClose() {
         console.log('Goodbye!');

package/dist/managers/CodeManager.js

@@ -5,14 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const prompts_1 = require("@inquirer/prompts");
 const cli_highlight_1 = __importDefault(require("cli-highlight"));
+const colors_1 = __importDefault(require("colors"));
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
+const config_utils_1 = require("../utils/config_utils");
 const prompt_utils_1 = require("../utils/prompt_utils");
 const string_utils_1 = require("../utils/string_utils");
-class CodeManager {
+const prompts_2 = require("../utils/prompts");
+const StreamManager_1 = __importDefault(require("./StreamManager"));
+class CodeManager extends StreamManager_1.default {
     constructor(options) {
-        this.options = options;
-        this.contextFiles = {};
-        this.chatHistory = [];
+        super(options);
+        options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+        options.stream = true;
         this.gpt = new cloving_gpt_1.default(options);
     }
     async initialize() {
@@ -26,7 +30,7 @@ class CodeManager {
                 let includeMoreFiles = true;
                 while (includeMoreFiles) {
                     const contextFile = await (0, prompts_1.input)({
-                        message: `Enter the relative path of a file or directory you would like to include as context (or press enter to continue):`,
+                        message: `Enter the relative path of a file or directory you would like to include as context (or press enter to continue): `,
                     });
                     if (contextFile) {
                         this.contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(contextFile, this.contextFiles, this.options);
@@ -42,26 +46,7 @@ class CodeManager {
                 });
                 this.options.prompt = userPrompt;
             }
-            let response = await this.generateCode(this.options.prompt);
-            const currentNewBlocks = (0, string_utils_1.extractCurrentNewBlocks)(response);
-            const [canApply, summary] = await (0, string_utils_1.checkBlocksApplicability)(currentNewBlocks);
-            if (!canApply) {
-                console.log('The generated code could not be automatically applied. It will try again asking for more details.');
-                console.log(`Some of the provided code blocks could not be applied,
-please match the existing code with a few more lines of context and make sure it is a character for character exact match.
-
-${summary}`);
-                response = await this.generateCode(this.options.prompt);
-                this.displayGeneratedCode(response);
-            }
-            this.displayGeneratedCode(response);
-            if (this.options.save) {
-                const currentNewBlocks = (0, string_utils_1.extractCurrentNewBlocks)(response);
-                await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(currentNewBlocks);
-            }
-            else {
-                await this.handleUserAction(response, this.options.prompt);
-            }
+            await this.generateCode(this.options.prompt);
         }
         catch (err) {
             const error = err;
@@ -69,35 +54,26 @@ ${summary}`);
         }
     }
     async generateCode(userPrompt) {
+        await this.checkForLatestVersion();
+        await this.loadContextFiles();
         if (this.chatHistory.length === 0) {
-            const systemPrompt = (0, prompt_utils_1.generateCodegenPrompt)(this.contextFiles);
-            this.chatHistory.push({ role: 'user', content: systemPrompt });
-            this.chatHistory.push({ role: 'assistant', content: 'What would you like to do?' });
+            this.addUserPrompt((0, prompt_utils_1.generateCodegenPrompt)(this.contextFiles));
+            this.addAssistantResponse('What would you like to do?');
+        }
+        this.addUserPrompt(userPrompt);
+        try {
+            const responseStream = await this.gpt.streamText({
+                prompt: userPrompt,
+                messages: this.chatHistory,
+            });
+            this.handleResponseStream(responseStream);
+        }
+        catch (err) {
+            const error = err;
+            console.error('Error streaming response:', error.message);
         }
-        this.chatHistory.push({ role: 'user', content: userPrompt });
-        return await this.gpt.generateText({ prompt: userPrompt, messages: this.chatHistory });
-    }
-    displayGeneratedCode(rawCodeCommand) {
-        (0, string_utils_1.parseMarkdownInstructions)(rawCodeCommand).map((code) => {
-            if (code.trim().startsWith('```')) {
-                const lines = code.split('\n');
-                const language = code.match(/```(\w+)/)?.[1] || 'plaintext';
-                console.log(lines[0]);
-                try {
-                    console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
-                }
-                catch (error) {
-                    // don't highlight if it fails
-                    console.log(lines.slice(1, -1).join('\n'));
-                }
-                console.log(lines.slice(-1)[0]);
-            }
-            else {
-                console.log((0, cli_highlight_1.default)(code, { language: 'markdown' }));
-            }
-        });
     }
-    async handleUserAction(response, prompt) {
+    async handleUserAction(response) {
         const currentNewBlocks = (0, string_utils_1.extractCurrentNewBlocks)(response);
         const files = Array.from(new Set(currentNewBlocks.map((block) => block.filePath)));
         if (this.options.save) {
@@ -133,9 +109,7 @@ ${summary}`);
                         includeMoreFiles = false;
                     }
                 }
-                const newResponse = await this.generateCode(newPrompt);
-                this.displayGeneratedCode(newResponse);
-                await this.handleUserAction(newResponse, newPrompt);
+                await this.generateCode(newPrompt);
                 break;
             case 'explain':
                 const explainPrompt = this.generateExplainCodePrompt(response);
@@ -163,7 +137,7 @@ ${summary}`);
                 break;
             case 'saveAll':
                 await (0, string_utils_1.applyAndSaveCurrentNewBlocks)(currentNewBlocks);
-                console.log('All files have been saved.');
+                console.log(colors_1.default.green('\nAll files have been saved.'));
                 break;
             case 'done':
                 break;
@@ -176,5 +150,36 @@ ${summary}`);
 
 Please briefly explain how the code works in this.`;
     }
+    /**
+     * Finalizes the response processing.
+     * This method should be overridden to provide specific finalization behavior.
+     * @protected
+     */
+    async finalizeResponse() {
+        this.addAssistantResponse(this.responseString);
+        this.isProcessing = false;
+        if (this.responseString !== '') {
+            const currentNewBlocks = (0, string_utils_1.extractCurrentNewBlocks)(this.responseString);
+            const [canApply, summary] = await (0, string_utils_1.checkBlocksApplicability)(currentNewBlocks);
+            if (!canApply) {
+                await this.handleUnapplicableBlocks(summary);
+            }
+            else {
+                this.retryCount = 0; // Reset the retry count on successful application
+            }
+        }
+        await this.handleUserAction(this.responseString);
+    }
+    async handleUnapplicableBlocks(summary) {
+        if (this.retryCount < this.maxRetries) {
+            console.log(`\n\n${summary}\n\n${colors_1.default.yellow.bold('WARNING')} Some of the provided code blocks could not be automatically applied. Retrying (Attempt ${this.retryCount + 1}/${this.maxRetries})...\n`);
+            this.retryCount++;
+            await this.generateCode(`${prompts_2.CODEGEN_COULDNT_APPLY}\n\n${summary}`);
+        }
+        else {
+            console.log(`\n\n${colors_1.default.red.bold('ERROR')} Failed to generate a diff that could be cleanly applied after ${this.maxRetries} attempts. Please review the changes manually and try again.\n`);
+            this.retryCount = 0; // Reset the retry count for future attempts
+        }
+    }
 }
 exports.default = CodeManager;

package/dist/managers/CommitManager.js

@@ -15,7 +15,7 @@ class CommitManager {
         options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
         this.gpt = new cloving_gpt_1.default(options);
     }
-    async commit() {
+    async generateCommit() {
         try {
             // Get the git diff
             const diff = (0, child_process_1.execSync)('git diff HEAD').toString().trim();