cloving 0.1.22 → 0.1.23

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;
         }
@@ -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/package.json

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