cloving 0.1.22 → 0.1.24

package/dist/commands/generate/unit_tests.js

@@ -64,7 +64,8 @@ Enumerate all the files in the provided list${gitDiff ? ' and git diff' : ''} as
 Also, list any test files that might be relevant to these files.`;
 };
 const handleUserAction = async (analysis, autoSave = false) => {
-    const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(analysis);
+    const fileContents = (0, string_utils_1.extractFilesAndContent)(analysis);
+    const files = Object.keys(fileContents);
     if (autoSave) {
         for (const file of files) {
             if (fileContents[file]) {

package/dist/managers/ChatManager.js

@@ -13,7 +13,7 @@ const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
 const git_utils_1 = require("../utils/git_utils");
 const string_utils_1 = require("../utils/string_utils");
 const command_utils_1 = require("../utils/command_utils");
-const PREAMBLE = `Don't apologize and when generating code, always include filenames in bold with paths to the code files mentioned and do not be lazy and ask me to keep the existing code or show things like previous code remains unchanged, always include existing code in the response.`;
+const PREAMBLE = `When generating code, don't apologize and wherever possible include filenames in bold with paths to the code files mentioned and do not be lazy and ask me to keep the existing code or show things like previous code remains unchanged, always include existing code in the response.`;
 class ChatManager {
     constructor(options) {
         this.options = options;
@@ -24,6 +24,7 @@ class ChatManager {
         this.isMultilineMode = false;
         this.contextFiles = {};
         this.prompt = '';
+        this.isProcessing = false;
         options.stream = true;
         options.silent = true;
         this.gpt = new cloving_gpt_1.default(options);
@@ -69,6 +70,9 @@ class ChatManager {
         }
     }
     async handleLine(line) {
+        if (this.isProcessing) {
+            return;
+        }
         if (this.isMultilineMode) {
             if (line.trim() === '```') {
                 this.isMultilineMode = false;
@@ -84,17 +88,17 @@ class ChatManager {
         else if (line.trim() === '```') {
             this.isMultilineMode = true;
             this.multilineInput = '';
-            console.log('Entering multiline mode. Type ``` on a new line to end.');
+            console.log('Entering multiline mode. Type ``` on a new line to end.\n');
             this.rl.prompt();
             return;
         }
-        const trimmedLine = line.trim().toLowerCase();
+        const trimmedLine = line.trim();
         if (trimmedLine === '') {
             this.rl.prompt();
             return;
         }
         this.updateCommandHistory(trimmedLine);
-        if (trimmedLine === 'exit') {
+        if (trimmedLine.toLowerCase() === 'exit') {
             this.rl.close();
             return;
         }
@@ -143,9 +147,9 @@ class ChatManager {
     async handleSave() {
         const lastResponse = this.chatHistory.filter(msg => msg.role === 'assistant').pop();
         if (lastResponse) {
-            const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(lastResponse.content);
-            if (files.length > 0) {
-                await (0, string_utils_1.saveGeneratedFiles)(files, fileContents);
+            const fileContents = (0, string_utils_1.extractFilesAndContent)(lastResponse.content);
+            if (Object.keys(fileContents).length > 0) {
+                await (0, string_utils_1.saveGeneratedFiles)(fileContents);
                 console.info('Files have been saved.');
             }
             else {
@@ -192,6 +196,12 @@ class ChatManager {
         }
     }
     async processUserInput(input) {
+        if (this.isProcessing) {
+            console.log('Please wait for the current request to complete.');
+            return;
+        }
+        this.isProcessing = true;
+        this.chunkManager = new ChunkManager_1.default();
         try {
             this.chatHistory.push({ role: 'user', content: input });
             this.prompt = this.generatePrompt(input);
@@ -214,10 +224,14 @@ class ChatManager {
             });
             responseStream.data.on('end', () => {
                 this.chatHistory.push({ role: 'assistant', content: accumulatedContent.trim() });
+                this.isProcessing = false;
+                process.stdout.write('\n');
                 this.rl.prompt();
             });
             responseStream.data.on('error', (error) => {
                 console.error('Error streaming response:', error);
+                this.isProcessing = false;
+                process.stdout.write('\n');
                 this.rl.prompt();
             });
         }
@@ -242,7 +256,8 @@ class ChatManager {
             }
             // get token estimate for prompt
             const promptTokens = Math.ceil(this.prompt.length / 4).toLocaleString();
-            console.error(`Error processing a ${promptTokens} token prompt:`, errorMessage, `(${errorNumber})`);
+            console.error(`Error processing a ${promptTokens} token prompt:`, errorMessage, `(${errorNumber})\n`);
+            this.isProcessing = false;
             this.rl.prompt();
         }
     }
@@ -250,13 +265,23 @@ class ChatManager {
         const contextFileContents = Object.keys(this.contextFiles)
             .map((file) => `### Contents of ${file}\n\n${this.contextFiles[file]}\n\n`)
             .join('\n');
-        return `${contextFileContents}
+        const allButLast = this.chatHistory.slice(0, -1).map(msg => `${msg.role.toUpperCase()}: ${msg.content}`).join('\n\n');
+        const lastUserMessage = this.chatHistory.slice(-1).map(msg => msg.content).join('\n\n');
+        return `### Request
+
+${lastUserMessage}
+
+${contextFileContents}
+
+### Full Chat History Context
+
+${allButLast}
 
-### Task
+### Current Request
 
 ${PREAMBLE}
 
-${this.chatHistory.map(msg => `${msg.role.toUpperCase()}: ${msg.content}`).join('\n\n')}`;
+${lastUserMessage}`;
     }
     handleClose() {
         console.log('Goodbye!');

package/dist/managers/CodeManager.js

@@ -99,18 +99,19 @@ Do not use any data from the example response structure, only use the structure.
             }
         });
     }
-    async updateContextFiles(files, fileContents) {
-        for (const file of files) {
+    async updateContextFiles(fileContents) {
+        for (const file of Object.keys(fileContents)) {
             if (fileContents[file]) {
                 this.contextFiles[file] = fileContents[file];
             }
         }
     }
     async handleUserAction(rawCodeCommand, prompt) {
-        const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
+        const fileContents = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
+        const files = Object.keys(fileContents);
         if (this.options.save) {
-            await (0, string_utils_1.saveGeneratedFiles)(files, fileContents);
-            await this.updateContextFiles(files, fileContents);
+            await (0, string_utils_1.saveGeneratedFiles)(fileContents);
+            await this.updateContextFiles(fileContents);
             return;
         }
         const action = await (0, prompts_1.select)({
@@ -190,7 +191,7 @@ Do not use any data from the example response structure, only use the structure.
                         await fs_1.default.promises.mkdir(path_1.default.dirname(filePath), { recursive: true });
                         await fs_1.default.promises.writeFile(filePath, fileContents[fileToSave]);
                         console.log(`${fileToSave} has been saved.`);
-                        await this.updateContextFiles([fileToSave], fileContents);
+                        await this.updateContextFiles({ [fileToSave]: fileContents[fileToSave] });
                     }
                     else {
                         console.log('File content not found.');
@@ -203,8 +204,8 @@ Do not use any data from the example response structure, only use the structure.
                 }
                 break;
             case 'saveAll':
-                await (0, string_utils_1.saveGeneratedFiles)(files, fileContents);
-                await this.updateContextFiles(files, fileContents);
+                await (0, string_utils_1.saveGeneratedFiles)(fileContents);
+                await this.updateContextFiles(fileContents);
                 console.log('All files have been saved.');
                 break;
             case 'done':
@@ -268,9 +269,9 @@ Please briefly explain how the code works in this.`;
             let rawCodeCommand = await this.generateCode(prompt);
             this.displayGeneratedCode(rawCodeCommand);
             if (this.options.save) {
-                const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
-                await (0, string_utils_1.saveGeneratedFiles)(files, fileContents);
-                await this.updateContextFiles(files, fileContents);
+                const fileContents = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
+                await (0, string_utils_1.saveGeneratedFiles)(fileContents);
+                await this.updateContextFiles(fileContents);
             }
             else {
                 await this.handleUserAction(rawCodeCommand, prompt);
@@ -300,9 +301,9 @@ Please briefly explain how the code works in this.`;
                         rawCodeCommand = await this.generateCode(newPrompt, rawCodeCommand);
                         this.displayGeneratedCode(rawCodeCommand);
                         if (this.options.save || this.options.interactive) {
-                            const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
-                            await (0, string_utils_1.saveGeneratedFiles)(files, fileContents);
-                            await this.updateContextFiles(files, fileContents);
+                            const fileContents = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
+                            await (0, string_utils_1.saveGeneratedFiles)(fileContents);
+                            await this.updateContextFiles(fileContents);
                         }
                         else {
                             await this.handleUserAction(rawCodeCommand, newPrompt);

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.1.20",
+  "version": "0.1.23",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -49,6 +49,7 @@
     "eslint-plugin-jsdoc": "^48.11.0",
     "eslint-plugin-n": "^17.10.1",
     "eslint-plugin-promise": "^7.0.0",
+    "express": "^4.19.2",
     "ignore": "^5.3.1",
     "ini": "^4.1.3",
     "isbinaryfile": "^5.0.2",
@@ -57,7 +58,9 @@
     "vite-node": "^2.0.5"
   },
   "devDependencies": {
+    "@types/body-parser": "^1.19.5",
     "@types/copy-paste": "^1.1.33",
+    "@types/express": "^4.17.21",
     "@types/ini": "^4.1.1",
     "@types/inquirer": "^9.0.7",
     "@types/jest": "^29.5.12",

package/dist/utils/string_utils.js

@@ -98,30 +98,59 @@ const parseMarkdownInstructions = (input) => {
 exports.parseMarkdownInstructions = parseMarkdownInstructions;
 const extractFilesAndContent = (rawCodeCommand) => {
     if (!rawCodeCommand)
-        return [[], {}];
+        return {};
     const files = [];
     const fileContents = {};
-    const matches = rawCodeCommand.match(/(\*{2})([^\*]+)(\*{2})/g);
-    if (!matches)
-        return [files, fileContents];
-    for (const match of matches) {
-        const fileName = match.replace(/\*{2}/g, '').trim();
-        const escapedFileName = fileName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-        const regex = new RegExp(`\\*\\*${escapedFileName}\\*\\*\\n\\n\\\`{3}([\\s\\S]+?)\\\`{3}(\n|$)`, 'g');
-        const contentMatch = regex.exec(rawCodeCommand);
-        if (contentMatch) {
-            files.push(fileName);
-            let content = contentMatch[1];
-            // Remove the first word after the opening triple backticks
-            content = content.split('\n').map((line, idx) => idx === 0 ? line.replace(/^\w+\s*/, '') : line).join('\n');
-            fileContents[fileName] = content.trim();
+    let currentIndex = 0;
+    const commandLength = rawCodeCommand.length;
+    while (currentIndex < commandLength) {
+        let fileNameStart = rawCodeCommand.indexOf('**', currentIndex);
+        if (fileNameStart === -1)
+            break;
+        let fileNameEnd = rawCodeCommand.indexOf('**', fileNameStart + 2);
+        if (fileNameEnd === -1)
+            break;
+        let nextBoldStart = rawCodeCommand.indexOf('**', fileNameEnd + 2);
+        let nextCodeStart = rawCodeCommand.indexOf('\n```', fileNameEnd + 2);
+        while (nextBoldStart !== -1 && nextCodeStart > nextBoldStart) {
+            fileNameStart = nextBoldStart;
+            fileNameEnd = rawCodeCommand.indexOf('**', fileNameStart + 2);
+            nextBoldStart = rawCodeCommand.indexOf('**', fileNameEnd + 2);
+            nextCodeStart = rawCodeCommand.indexOf('\n```', fileNameEnd + 2);
         }
+        const fileName = rawCodeCommand.slice(fileNameStart + 2, fileNameEnd).trim();
+        files.push(fileName);
+        const codeBlockStart = rawCodeCommand.indexOf('\n```', fileNameEnd);
+        if (codeBlockStart === -1)
+            break;
+        let codeBlockEnd = codeBlockStart + 4;
+        while (codeBlockEnd < commandLength) {
+            if (rawCodeCommand.slice(codeBlockEnd, codeBlockEnd + 5) === '\n```\n') {
+                break;
+            }
+            else if (rawCodeCommand.slice(codeBlockEnd, codeBlockEnd + 4) === '\n```' && codeBlockEnd + 4 === commandLength) {
+                break;
+            }
+            codeBlockEnd++;
+        }
+        if (codeBlockEnd >= commandLength)
+            break;
+        let content = rawCodeCommand.slice(codeBlockStart + 4, codeBlockEnd).trim();
+        const firstNewlineIndex = content.indexOf('\n');
+        if (firstNewlineIndex !== -1) {
+            content = content.slice(firstNewlineIndex + 1);
+        }
+        else {
+            content = content.replace(/^\w+\s*/, '');
+        }
+        fileContents[fileName] = content.trim();
+        currentIndex = codeBlockEnd + 5;
     }
-    return [files, fileContents];
+    return fileContents;
 };
 exports.extractFilesAndContent = extractFilesAndContent;
-const saveGeneratedFiles = async (files, fileContents) => {
-    for (const file of files) {
+const saveGeneratedFiles = async (fileContents) => {
+    for (const file of Object.keys(fileContents)) {
         if (fileContents[file]) {
             const filePath = path_1.default.resolve(file);
             await fs_1.default.promises.mkdir(path_1.default.dirname(filePath), { recursive: true });

package/package.json

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