cloving 0.3.12 → 0.3.13

package/dist/cloving_gpt/index.js

@@ -32,7 +32,7 @@ class ClovingGPT {
         const { provider, model, config: modelConfig } = primaryModel;
         this.apiKey = modelConfig.apiKey;
         this.temperature = options.temperature || modelConfig.temperature || 0.2;
-        this.silent = options.silent || modelConfig.silent;
+        this.silent = options.silent || modelConfig.silent || false;
         this.stream = options.stream || false;
         this.timeout = options.timeout || 60000; // Default timeout of 60 seconds
         switch (provider) {

package/dist/commands/config.js

@@ -89,14 +89,14 @@ const config = async () => {
          */
         const review = await (0, prompts_1.confirm)({
             message: `Do you want to review all prompts before they are sent to ${selectedModel}?`,
-            default: true,
+            default: false,
         });
         /**
          * Prompts the user to decide if they trust the selected model with sensitive information.
          */
         const trust = await (0, prompts_1.confirm)({
             message: `Do you trust ${selectedModel} with sensitive information?`,
-            default: false,
+            default: true,
         });
         /**
          * Prompts the user to enter the temperature setting for the selected model.

package/dist/managers/BlockManager.js

@@ -24,14 +24,19 @@ class BlockManager extends events_1.EventEmitter {
             this.buffer = '';
         }
         // if content has multiple \n``` in the string, then we need to split it up
-        if (content.includes('\n```')) {
-            while (content.includes('\n```')) {
-                const index = content.indexOf('\n```');
-                this.processCodeBlocks(content.slice(0, index + 4));
-                content = content.slice(index + 4);
+        const codeBlockRegex = /\n```[\s\S]*?\n```/g;
+        const codeBlocks = content.match(codeBlockRegex);
+        if (codeBlocks) {
+            let lastIndex = 0;
+            for (const block of codeBlocks) {
+                const index = content.indexOf(block, lastIndex);
+                this.processCodeBlocks(content.slice(lastIndex, index));
+                this.processCodeBlocks(block);
+                lastIndex = index + block.length;
             }
+            this.processCodeBlocks(content.slice(lastIndex));
         }
-        if (content !== '') {
+        else {
             this.processCodeBlocks(content);
         }
     }
@@ -95,7 +100,15 @@ class BlockManager extends events_1.EventEmitter {
      */
     parseCodeBuffer() {
         const results = (0, string_utils_1.extractCurrentNewBlocks)(this.codeBuffer);
-        return results[0];
+        if (results.length === 0) {
+            return null;
+        }
+        const block = results[0];
+        if (!block.currentContent || !block.newContent) {
+            console.warn('Incomplete code block detected. Skipping.');
+            return null;
+        }
+        return block;
     }
     clearBuffer() {
         this.buffer = '';

package/dist/managers/ChatManager.js

@@ -11,6 +11,7 @@ const child_process_1 = require("child_process");
 const CommitManager_1 = __importDefault(require("./CommitManager"));
 const ReviewManager_1 = __importDefault(require("./ReviewManager"));
 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"));
@@ -39,7 +40,7 @@ class ChatManager extends StreamManager_1.default {
         this.multilineInput = '';
         this.isMultilineMode = false;
         this.isSilent = false;
-        this.isSilent = options.silent || false;
+        this.isSilent = options.silent || (0, config_utils_1.getConfig)(options).globalSilent || false;
         options.stream = true;
         options.silent = true;
         this.rl = readline_1.default.createInterface({
@@ -98,6 +99,15 @@ class ChatManager extends StreamManager_1.default {
             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;
         }
@@ -133,6 +143,10 @@ class ChatManager extends StreamManager_1.default {
         }
         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();
@@ -178,6 +192,11 @@ class ChatManager extends StreamManager_1.default {
             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':
@@ -438,7 +457,7 @@ class ChatManager extends StreamManager_1.default {
         try {
             await this.refreshContext();
             this.addUserPrompt(this.generatePrompt(input));
-            if (!this.isSilent) {
+            if (!this.gpt.silent) {
                 const fullPrompt = this.chatHistory
                     .map((m) => {
                     const content = m.content
@@ -461,25 +480,11 @@ class ChatManager extends StreamManager_1.default {
                 // 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;
@@ -498,9 +503,26 @@ class ChatManager extends StreamManager_1.default {
             this.handleError(err);
         }
     }
+    askQuestion(prompt) {
+        return new Promise((resolve) => {
+            this.rl.question(colors_1.default.green.bold(prompt), (answer) => {
+                resolve(answer.trim().toLowerCase());
+            });
+        });
+    }
+    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;
+        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);

package/dist/managers/CodeManager.js

@@ -162,22 +162,24 @@ Please briefly explain how the code works in this.`;
             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.generateCode(`${prompts_2.CODEGEN_COULDNT_APPLY}\n\n${summary}`);
-                    return;
-                }
-                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
-                }
+                await this.handleUnapplicableBlocks(summary);
             }
             else {
                 this.retryCount = 0; // Reset the retry count on successful application
             }
         }
-        this.handleUserAction(this.responseString);
+        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/DocsManager.js

@@ -81,6 +81,8 @@ class DocsManager extends StreamManager_1.default {
                 }
             }
         }
+        // Reset responseString after processing
+        this.responseString = '';
     }
 }
 exports.default = DocsManager;

package/dist/managers/InitManager.js

@@ -182,15 +182,28 @@ ${JSON.stringify(projectDetails, null, 2)}`;
         }
         const clovingJson = JSON.parse(cleanAiChatResponse);
         const directoriesToCheck = [
-            ...clovingJson.languages.map((language) => language.directory),
-            ...clovingJson.frameworks.map((framework) => framework.directory),
-            ...clovingJson.testingFrameworks.map((testingFramework) => testingFramework.directory),
+            ...clovingJson.languages.map((language) => ({
+                type: 'Language',
+                name: language.name,
+                directory: language.directory,
+            })),
+            ...clovingJson.frameworks.map((framework) => ({
+                type: 'Framework',
+                name: framework.name,
+                directory: framework.directory,
+            })),
+            ...clovingJson.testingFrameworks.map((testingFramework) => ({
+                type: 'Testing Framework',
+                name: testingFramework.name,
+                directory: testingFramework.directory,
+            })),
         ];
-        const missingDirectories = directoriesToCheck.filter((directory) => !fs_1.default.existsSync(directory));
+        const missingDirectories = directoriesToCheck.filter((item) => !fs_1.default.existsSync(item.directory));
         if (missingDirectories.length > 0) {
+            const missingDirMessages = missingDirectories.map((item) => `${item.type} ${colors_1.default.bold(item.name)}: ${colors_1.default.red.bold(item.directory)}`);
             return [
                 false,
-                `${colors_1.default.red.bold('ERROR:')} The following directories were not found: ${colors_1.default.red.bold(missingDirectories.join(', '))}`,
+                `${colors_1.default.red.bold('ERROR:')} The following directories were not found:\n${missingDirMessages.join('\n')}`,
             ];
         }
         return [true, ''];

package/dist/managers/ProxyManager.js

@@ -73,7 +73,17 @@ class ProxyManager {
     async handleChatCompletions(req, res) {
         try {
             const { messages, stream } = req.body;
-            const content = messages.map((message) => message.content).join('\n\n');
+            if (!Array.isArray(messages)) {
+                return res.status(400).json({ error: 'Invalid request body: messages must be an array' });
+            }
+            const content = messages
+                .map((message) => {
+                if (typeof message !== 'object' || typeof message.content !== 'string') {
+                    throw new Error('Invalid message format');
+                }
+                return message.content;
+            })
+                .join('\n\n');
             const contextFileContents = Object.keys(this.contextFiles)
                 .map((file) => `### Contents of ${file}\n\n${this.contextFiles[file]}\n\n`)
                 .join('\n');
@@ -99,7 +109,14 @@ ${content}`;
         }
         catch (error) {
             console.error('Error processing request:', error);
-            res.status(500).json({ error: 'Internal server error' });
+            if (error instanceof Error && error.message === 'Invalid message format') {
+                res.status(400).json({
+                    error: 'Invalid request body: each message must have a content property of type string',
+                });
+            }
+            else {
+                res.status(500).json({ error: 'Internal server error' });
+            }
         }
     }
     async handleStreamResponse(prompt, res) {

package/dist/managers/StreamManager.js

@@ -142,17 +142,23 @@ class StreamManager extends events_1.EventEmitter {
      * @param {CurrentNewBlock} currentNewBlock - The current and new content of the code block.
      */
     displayCurrentNewBlock(currentNewBlock) {
+        const language = currentNewBlock.language.split('\n')[0];
+        process.stdout.write(colors_1.default.gray.bold(`\`\`\`${language}                                       \n`));
+        process.stdout.write(colors_1.default.gray.bold(`<<<<<<< CURRENT ${currentNewBlock.filePath}\n`));
         try {
-            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```'));
+            process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.currentContent, { language }));
         }
         catch (error) {
-            console.error(colors_1.default.red('Error displaying the code block:'), error);
+            process.stdout.write(currentNewBlock.currentContent);
         }
+        process.stdout.write(colors_1.default.gray.bold('\n=======\n'));
+        try {
+            process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.newContent, { language }));
+        }
+        catch (error) {
+            process.stdout.write(currentNewBlock.newContent);
+        }
+        process.stdout.write(colors_1.default.gray.bold('\n>>>>>>> NEW\n```'));
     }
     /**
      * Displays a raw code block.
@@ -235,27 +241,38 @@ class StreamManager extends events_1.EventEmitter {
      * @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 AI prompt context...\n`);
+        try {
+            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 AI prompt context...\n`);
+            }
+            for (const file of files) {
+                // Skip if the file is not a string
+                if (!file)
+                    continue;
+                try {
+                    const previousCount = Object.keys(this.contextFiles).length;
+                    this.contextFiles = await (0, prompt_utils_2.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`));
+                }
+                catch (fileError) {
+                    console.error(colors_1.default.red(`Error loading context from ${file}:`), fileError);
+                }
+            }
         }
-        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_2.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`));
+        catch (error) {
+            console.error(colors_1.default.red('Error loading context files:'), error);
+            throw new Error('Failed to load context files');
         }
     }
     calculateTotalTokens() {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/utils/prompts/CODEGEN_INSTRUCTIONS.md

@@ -19,18 +19,19 @@
 
 ## *CURRENT/NEW* Block Format
 
-1. **Start a block with a one line description of change**
-1. **Then provide three backticks and the language name.**
+1. **Start a block with a one line description of change followed by three backticks and the language name like this:**
+   About to add documentation to the `UserService` class.
+
    ```typescript
-2. **Next line: seven <, CURRENT, and the file path.**
+2. **Next line: seven <, CURRENT, and the file path like this:**
    <<<<<<< CURRENT path/to/file.ts
-3. **Include the exact existing code to be changed, this section should always have some code characters in it, not just spaces or tabs. The only exception is when creating a brand new file.**
-4. **Divide with seven =.**
+3. **Include the exact existing code to be changed, this section should always have some code characters in it, not just spaces or tabs.**
+4. **Divide with seven = like this:**
    =======
 5. **Add the new code.**
-6. **End with seven > and NEW.**
+6. **End with seven > and NEW like this:**
    >>>>>>> NEW
-7. **Close the block with three backticks.**
+7. **Close the block with three backticks like this:**
    ```
 
 ## Don't Invent Code That Isn't Provided in Context

package/dist/utils/string_utils.js

@@ -474,10 +474,18 @@ const checkBlocksApplicability = async (blocks) => {
     for (const [index, block] of blocks.entries()) {
         const filePath = path_1.default.resolve(block.filePath);
         let fileContent = await readFileContent(filePath);
-        if (fileContent === '') {
+        if (block.newContent.trim() === '') {
+            allApplicable = false;
+            summary.push(`[${index + 1}] ${colors_1.default.red.bold(block.filePath)} ${colors_1.default.red.bold('cannot be applied: New content is empty')}`);
+        }
+        else if (fileContent === '') {
             summary.push(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} can be ${colors_1.default.green.bold('created')}`);
         }
-        else if (block.currentContent.trim() !== '') {
+        else if (block.currentContent.trim() === '') {
+            allApplicable = false;
+            summary.push(`[${index + 1}] ${colors_1.default.red.bold(block.filePath)} ${colors_1.default.red.bold(`cannot be applied: File '${block.filePath}' already exists`)}`);
+        }
+        else {
             const { matchingLines } = await analyzeBlockContent(block, fileContent);
             if (matchingLines.length === 0) {
                 allApplicable = false;
@@ -491,9 +499,6 @@ const checkBlocksApplicability = async (blocks) => {
                 summary.push(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} can be ${colors_1.default.yellow.bold('updated')}`);
             }
         }
-        else {
-            summary.push(`[${index + 1}] ${colors_1.default.green.bold(block.filePath)} can be ${colors_1.default.yellow.bold('updated')}`);
-        }
     }
     return [allApplicable, summary.join('\n')];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",