cloving 0.1.23 → 0.2.0

package/README.md

@@ -159,6 +159,43 @@ Options:
 - `-m, --model <model>`: Select the model to use
 - `-p, --prompt <prompt>`: Specify the prompt to use
 
+### Interactive Chat
+
+Start an interactive chat session with the AI:
+```bash
+cloving chat
+```
+Options:
+- `-f, --files <filenames...>`: Specify filenames of files with context to use for the chat
+- `-t, --temperature <temperature>`: Set the temperature for the model (default 0.2)
+- `-m, --model <model>`: Select the model to use
+
+### Proxy Server
+
+Start a proxy server to use with Cloving:
+```bash
+cloving proxy
+```
+Options:
+- `-f, --files <filenames...>`: Specify filenames of files with context to use for generating code
+- `-t, --temperature <temperature>`: Set the temperature for the model (default 0.2)
+- `-m, --model <model>`: Select the model to use
+
+The proxy server allows you to integrate Cloving with other tools or applications. It starts a local server that can receive requests and forward them to the AI model, returning the responses. This is useful for creating custom integrations or using Cloving in scenarios where a direct CLI interaction isn't suitable.
+
+### Token Estimation
+
+Estimate the number of tokens in the current working directory or specified files:
+```bash
+cloving tokens
+```
+or
+```bash
+cloving t
+```
+Options:
+- `-f, --files <filenames...>`: Specify filenames of files to estimate tokens for
+
 ### Generating Context
 
 Create a context string for generating prompts outside of the cloving cli:
@@ -179,30 +216,6 @@ Options:
 - `-f, --files <filenames...>`: Specify filenames for the unit tests
 - `-m, --model <model>`: Select the model to use
 
-### Project Commands
-
-Cloving now includes commands for managing entire projects:
-
-- Initialize a new project inside a git branch:
-  ```bash
-  cloving project init
-  ```
-
-- Plan the steps to complete the project:
-  ```bash
-  cloving project plan
-  ```
-
-- Generate code to build the project:
-  ```bash
-  cloving project build
-  ```
-
-- Clean up and finalize the project:
-  ```bash
-  cloving project complete
-  ```
-
 ## Command Line Options
 
 Usage: `cloving [command] [options]`
@@ -214,6 +227,9 @@ Options:
 Commands:
 - `config`: Configure Cloving with your API key and models to use
 - `init`: Setup Cloving in the current directory
+- `chat`: Start an interactive chat with Cloving
+- `tokens`: Estimate the number of tokens in the current working directory or specified files
+- `proxy`: Start a proxy server to use with Cloving
 - `models`: List available models
 - `commit`: Alias for cloving generate commit
 - `generate`: Generate various items like unit-tests and code reviews
@@ -223,11 +239,6 @@ Commands:
   - `shell`: Generate a shell command based on a prompt
   - `unit-tests`: Generate unit tests
   - `review`: Review the code for committed changes
-- `project`: Commands for managing Cloving projects
-  - `init`: Setup a new Cloving project inside a git branch
-  - `plan`: Plan the steps to complete the project
-  - `build`: Generate code to build the project
-  - `complete`: Clean up and finalize the project
 
 Most commands support the following options:
 - `-s, --silent`: Run the command without asking for confirmation of submitting prompts

package/dist/cloving_gpt/index.js

@@ -149,12 +149,13 @@ class ClovingGPT {
             const response = await axios_1.default.post(endpoint, payload, { headers });
             return this.adapter.extractResponse(response.data);
         }
-        catch (error) {
+        catch (err) {
+            const error = err;
             let errorMessage = error instanceof Error ? error.message : 'connection error';
             if (errorMessage === '') {
                 errorMessage = 'connection error';
             }
-            console.error(`Error communicating with the GPT server (${this.adapter.getEndpoint(this.stream)}):`, errorMessage);
+            console.error(`Error communicating with the GPT server (${this.adapter.getEndpoint(this.stream)})\n\n${JSON.stringify(error.response?.data || "''", null, 2)}\n`);
             throw error;
         }
     }

package/dist/commands/generate/code.js

@@ -6,17 +6,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_utils_1 = require("../../utils/config_utils");
 const config_utils_2 = require("../../utils/config_utils");
 const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
+const ChatManager_1 = __importDefault(require("../../managers/ChatManager"));
 const CodeManager_1 = __importDefault(require("../../managers/CodeManager"));
 const code = async (options) => {
     options.silent = (0, config_utils_2.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
-    const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, false);
-    const codeManager = new CodeManager_1.default(gpt, options, allSrcFiles);
-    if (options.prompt) {
-        await codeManager.processCode(options.prompt);
+    if (options.interactive) {
+        options.silent = (0, config_utils_2.getConfig)(options).globalSilent || false;
+        options.stream = true;
+        const chatManager = new ChatManager_1.default(options);
+        await chatManager.initialize();
     }
     else {
-        console.error('No prompt provided.');
+        const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, false);
+        const codeManager = new CodeManager_1.default(gpt, options, allSrcFiles);
+        if (options.prompt) {
+            await codeManager.processCode(options.prompt);
+        }
+        else {
+            console.error('No prompt provided.');
+        }
     }
 };
 exports.default = code;

package/dist/commands/generate/review.js

@@ -3,204 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_highlight_1 = __importDefault(require("cli-highlight"));
-const prompts_1 = require("@inquirer/prompts");
-const copy_paste_1 = __importDefault(require("copy-paste"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 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 ReviewManager_1 = __importDefault(require("../../managers/ReviewManager"));
 const config_utils_1 = require("../../utils/config_utils");
 const review = async (options) => {
-    let { prompt, files } = options;
     options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
-    let promptText = `### Prompt
-
-${prompt || 'Please provide a code review.'}
-
-### Example of a well-structured response
-
-    # Code Review: Enhanced Code Generation and File Handling
-
-    ## Changes Overview
-
-    These changes primarily focus on improving the code generation process and adding more robust file handling capabilities. The main modifications include:
-
-    1. Enhancing the code generation prompt with a structured example response.
-    2. Implementing a new function to extract file names and contents from the generated code.
-    3. Adding a new option to save generated code directly to files.
-    4. Improving the copy-to-clipboard functionality to allow copying individual files.
-    5. Removing an unused import in the review.ts file.
-
-    ## Reason for Changes
-
-    The changes aim to enhance the usability and flexibility of the code generation tool by providing clearer prompts, better file management, and more control over the generated code.
-
-    ## Detailed Description
-
-    1. **Enhanced Code Generation Prompt** - The \`generateCodePrompt\` function now includes a structured example of a well-formatted response. This helps guide the AI to produce more consistent and usable output, making it easier to parse and use the generated code.
-    2. **File Extraction Function** - A new function \`extractFilesAndContent\` has been added to parse the raw code command and extract individual file names and their contents. This enables more granular control over the generated code, allowing for file-specific operations.
-    3. **Save to File Option** - A new 'Save Source Code to Files' option has been added to the user action menu. This feature allows users to save generated code directly to files in the appropriate directory structure.
-    4. **Improved Copy to Clipboard** - The 'Copy Source Code to Clipboard' option has been enhanced to allow users to choose specific files to copy, rather than copying all generated code at once.
-    5. **Removed Unused Import** - The unused import of \`execFileSync\` from 'child_process' has been removed from the review.ts file, improving code cleanliness.
-
-    ## Potential Bugs and Recommended Fixes
-
-    ### 1. Possible undefined access in \`extractFilesAndContent\`
-
-    \`\`\`typescript
-    const contentMatch = regex.exec(rawCodeCommand)
-    if (contentMatch) {
-      files.push(fileName)
-      let content = contentMatch[1]
-      // ...
-    }
-    \`\`\`
-
-    There's a potential for \`contentMatch[1]\` to be undefined if the regex doesn't capture any groups. To fix this, add a null check:
-
-    \`\`\`typescript
-    const contentMatch = regex.exec(rawCodeCommand)
-    if (contentMatch && contentMatch[1]) {
-      files.push(fileName)
-      let content = contentMatch[1]
-      // ...
-    }
-    \`\`\`
-`;
-    let contextFiles = {};
-    try {
-        // Define the prompt for analysis
-        if (files) {
-            let expandedFiles = [];
-            for (const file of files) {
-                const filePath = path_1.default.resolve(file);
-                if (await fs_1.default.promises.stat(filePath).then(stat => stat.isDirectory()).catch(() => false)) {
-                    const dirFiles = await (0, command_utils_1.getAllFilesInDirectory)(filePath);
-                    expandedFiles = expandedFiles.concat(dirFiles.map(f => path_1.default.relative(process.cwd(), f)));
-                }
-                else {
-                    expandedFiles.push(path_1.default.relative(process.cwd(), filePath));
-                }
-            }
-            files = expandedFiles;
-            for (const file of files) {
-                const filePath = path_1.default.resolve(file);
-                if (await fs_1.default.promises.stat(filePath).then(stat => stat.isFile()).catch(() => false)) {
-                    const content = await fs_1.default.promises.readFile(filePath, 'utf-8');
-                    contextFiles[file] = content;
-                }
-            }
-            const contextFileContents = Object.keys(contextFiles).map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`).join('\n');
-            promptText += `
-### Description of App
-
-${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
-
-${contextFileContents}
-
-`;
-        }
-        else {
-            const gitDiff = await (0, git_utils_1.getGitDiff)();
-            promptText = `==== begin diff =====
-${gitDiff}
-==== end diff =====`;
-        }
-        if (files) {
-            promptText += `
-
-### Request
-
-I would like you to explain the code and document a description of it.
-List any bugs in the new code as well as recommended fixes for those bugs with code examples.
-Format the output of this code review in Markdown format.`;
-        }
-        else {
-            promptText += `
-
-### Request
-
-Do not use any data from the example response structure, only use the structure.
-I would like you to explain why these change are being made and document a description of these changes.
-Also list any bugs in the new code as well as recommended fixes for those bugs with code examples.
-Format the output of this code review in Markdown format.`;
-        }
-        if (prompt) {
-            promptText += `
-
-### Additional Context
-
-${prompt}`;
-        }
-        // get the analysis
-        const analysis = await gpt.generateText({ prompt: promptText });
-        // Print the analysis to the console
-        (0, string_utils_1.parseMarkdownInstructions)(analysis).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' }));
-            }
-        });
-        // Modified Function to extract specific sections from the analysis
-        const extractSection = (section) => {
-            const regex = new RegExp(`## ${section}[\\s\\S]*?(?=\\n## Potential Bugs and Recommended Fixes|$)`, 'g');
-            const match = analysis.match(regex);
-            return match ? match[0].trim() : '';
-        };
-        // Prompt the user with options for copying to clipboard
-        const clipboardOption = await (0, prompts_1.select)({
-            message: 'What would you like to copy to the clipboard?',
-            choices: [
-                { name: 'Copy only the Changes Overview', value: 'Changes Overview' },
-                { name: 'Copy only the Potential Bugs and Recommended Fixes', value: 'Potential Bugs and Recommended Fixes' },
-                { name: 'Copy everything', value: 'Everything' },
-                { name: 'Done', value: 'Done' }
-            ]
-        });
-        let contentToCopy = '';
-        switch (clipboardOption) {
-            case 'Changes Overview':
-                contentToCopy = extractSection('Changes Overview');
-                break;
-            case 'Potential Bugs and Recommended Fixes':
-                contentToCopy = extractSection('Potential Bugs and Recommended Fixes');
-                break;
-            case 'Everything':
-                contentToCopy = analysis;
-                break;
-            case 'Done':
-                console.log('No content copied to clipboard.');
-                return;
-        }
-        if (contentToCopy) {
-            copy_paste_1.default.copy(contentToCopy, (err) => {
-                if (err) {
-                    console.error('Error: Unable to copy to clipboard.', err);
-                }
-                else {
-                    console.log('Selected content copied to clipboard');
-                }
-            });
-        }
-    }
-    catch (error) {
-        console.error('Error during analysis:', error.message);
-    }
+    const reviewManager = new ReviewManager_1.default(gpt, options);
+    await reviewManager.review();
 };
 exports.default = review;

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/commands/init.js

@@ -42,11 +42,8 @@ technologies used. This will provide better context for future Cloving requests.
         return;
     }
     if (!(0, command_utils_1.checkForSpecialFiles)()) {
-        const technologies = await (0, prompts_1.input)({
-            message: 'No special files detected. Please describe the main technologies used in your project:',
-            validate: (input) => input.trim().length > 0 || 'Please provide a description of the technologies used.',
-        });
-        specialFileContents['description'] = technologies;
+        console.error('No dependencies files detected. Please add a dependency file (e.g. package.json, Gemfile, requirements.txt, etc.) to your project and run `cloving init` again.');
+        return;
     }
     const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `describe_${Date.now()}.tmp`);
     try {

package/dist/index.js

@@ -19,10 +19,6 @@ const commit_1 = __importDefault(require("./commands/generate/commit"));
 const context_1 = __importDefault(require("./commands/generate/context"));
 const unit_tests_1 = __importDefault(require("./commands/generate/unit_tests"));
 const review_1 = __importDefault(require("./commands/generate/review"));
-const init_2 = __importDefault(require("./commands/project/init"));
-const plan_1 = __importDefault(require("./commands/project/plan"));
-const build_1 = __importDefault(require("./commands/project/build"));
-const complete_1 = __importDefault(require("./commands/project/complete"));
 // Function to get version from package.json
 const getPackageVersion = () => {
     const packagePath = (0, path_1.join)(__dirname, 'package.json');
@@ -134,29 +130,4 @@ generate
     .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')
     .option('-t, --temperature <temperature>', 'Temperature for the model (default 0.2)')
     .action(review_1.default);
-// Project commands
-const project = program
-    .command('project')
-    .alias('p')
-    .description('Commands for cloving a project');
-project
-    .command('init')
-    .alias('i')
-    .description('Setup a new cloving project inside a git branch')
-    .action(init_2.default);
-project
-    .command('plan')
-    .alias('p')
-    .description('Plan the steps to complete the project')
-    .action(plan_1.default);
-project
-    .command('build')
-    .alias('b')
-    .description('Generate code to build the project')
-    .action(build_1.default);
-project
-    .command('complete')
-    .alias('c')
-    .description('Clean up and finalize the project')
-    .action(complete_1.default);
 program.parse(process.argv);

package/dist/managers/ChatManager.js

@@ -9,6 +9,7 @@ const fs_1 = __importDefault(require("fs"));
 const readline_1 = __importDefault(require("readline"));
 const child_process_1 = require("child_process");
 const ChunkManager_1 = __importDefault(require("./ChunkManager"));
+const ReviewManager_1 = __importDefault(require("./ReviewManager"));
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
 const git_utils_1 = require("../utils/git_utils");
 const string_utils_1 = require("../utils/string_utils");
@@ -124,6 +125,9 @@ class ChatManager {
             case 'commit':
                 await this.handleCommit();
                 break;
+            case 'review':
+                await this.handleReview();
+                break;
             default:
                 if (this.isGitCommand(command)) {
                     this.executeGitCommand(command);
@@ -144,26 +148,36 @@ class ChatManager {
             console.error('No response to copy.');
         }
     }
+    async handleReview() {
+        this.gpt.stream = false;
+        const reviewManager = new ReviewManager_1.default(this.gpt, this.options);
+        await reviewManager.review();
+        this.gpt.stream = true;
+    }
     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.');
+                this.rl.prompt();
             }
             else {
                 console.info('No files found to save in the last response.');
+                this.rl.prompt();
             }
         }
         else {
             console.error('No response to save files from.');
+            this.rl.prompt();
         }
     }
     async handleCommit() {
         const diff = (0, child_process_1.execSync)('git diff HEAD').toString().trim();
         if (!diff) {
             console.error('No changes to commit.');
+            this.rl.prompt();
             return;
         }
         this.prompt = (0, git_utils_1.generateCommitMessagePrompt)(diff);
@@ -183,6 +197,7 @@ class ChatManager {
             if (err)
                 throw err;
         });
+        this.rl.prompt();
     }
     isGitCommand(command) {
         return command.split(' ').length <= 3 && command.startsWith('git ');
@@ -194,6 +209,7 @@ class ChatManager {
         catch (error) {
             console.error('Error running command:', error);
         }
+        this.rl.prompt();
     }
     async processUserInput(input) {
         if (this.isProcessing) {

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,48 +269,13 @@ 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);
             }
-            if (this.options.interactive) {
-                let continueInteractive = true;
-                while (continueInteractive) {
-                    const newPrompt = await (0, prompts_1.input)({
-                        message: 'Revise the code (or press enter to finish):',
-                    });
-                    if (newPrompt.trim() === '') {
-                        continueInteractive = false;
-                    }
-                    else {
-                        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):',
-                            });
-                            if (contextFile) {
-                                this.contextFiles = await (0, command_utils_1.addFileOrDirectoryToContext)(contextFile, this.contextFiles, this.options);
-                            }
-                            else {
-                                includeMoreFiles = false;
-                            }
-                        }
-                        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);
-                        }
-                        else {
-                            await this.handleUserAction(rawCodeCommand, newPrompt);
-                        }
-                    }
-                }
-            }
         }
         catch (error) {
             console.error('Could not generate code', error);

package/dist/managers/ReviewManager.js

@@ -0,0 +1,208 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_highlight_1 = __importDefault(require("cli-highlight"));
+const prompts_1 = require("@inquirer/prompts");
+const copy_paste_1 = __importDefault(require("copy-paste"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+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 config_utils_1 = require("../utils/config_utils");
+class ReviewManager {
+    constructor(gpt, options) {
+        this.contextFiles = {};
+        this.gpt = gpt;
+        this.options = options;
+    }
+    async loadContextFiles() {
+        if (this.options.files) {
+            let expandedFiles = [];
+            for (const file of this.options.files) {
+                const filePath = path_1.default.resolve(file);
+                if (await fs_1.default.promises.stat(filePath).then(stat => stat.isDirectory()).catch(() => false)) {
+                    const dirFiles = await (0, command_utils_1.getAllFilesInDirectory)(filePath);
+                    expandedFiles = expandedFiles.concat(dirFiles.map(f => path_1.default.relative(process.cwd(), f)));
+                }
+                else {
+                    expandedFiles.push(path_1.default.relative(process.cwd(), filePath));
+                }
+            }
+            this.options.files = expandedFiles;
+            for (const file of this.options.files) {
+                const filePath = path_1.default.resolve(file);
+                if (await fs_1.default.promises.stat(filePath).then(stat => stat.isFile()).catch(() => false)) {
+                    const content = await fs_1.default.promises.readFile(filePath, 'utf-8');
+                    this.contextFiles[file] = content;
+                }
+            }
+        }
+    }
+    generatePrompt() {
+        let promptText = `### Prompt
+
+${this.options.prompt || 'Please provide a code review.'}
+
+### Example of a well-structured response
+
+    # Code Review: Enhanced Code Generation and File Handling
+
+    ## Changes Overview
+
+    These changes primarily focus on improving the code generation process and adding more robust file handling capabilities. The main modifications include:
+
+    1. Enhancing the code generation prompt with a structured example response.
+    2. Implementing a new function to extract file names and contents from the generated code.
+    3. Adding a new option to save generated code directly to files.
+    4. Improving the copy-to-clipboard functionality to allow copying individual files.
+    5. Removing an unused import in the review.ts file.
+
+    ## Reason for Changes
+
+    The changes aim to enhance the usability and flexibility of the code generation tool by providing clearer prompts, better file management, and more control over the generated code.
+
+    ## Detailed Description
+
+    1. **Enhanced Code Generation Prompt** - The \`generateCodePrompt\` function now includes a structured example of a well-formatted response. This helps guide the AI to produce more consistent and usable output, making it easier to parse and use the generated code.
+    2. **File Extraction Function** - A new function \`extractFilesAndContent\` has been added to parse the raw code command and extract individual file names and their contents. This enables more granular control over the generated code, allowing for file-specific operations.
+    3. **Save to File Option** - A new 'Save Source Code to Files' option has been added to the user action menu. This feature allows users to save generated code directly to files in the appropriate directory structure.
+    4. **Improved Copy to Clipboard** - The 'Copy Source Code to Clipboard' option has been enhanced to allow users to choose specific files to copy, rather than copying all generated code at once.
+    5. **Removed Unused Import** - The unused import of \`execFileSync\` from 'child_process' has been removed from the review.ts file, improving code cleanliness.
+
+    ## Potential Bugs and Recommended Fixes
+
+    ### 1. Possible undefined access in \`extractFilesAndContent\`
+
+    \`\`\`typescript
+    const contentMatch = regex.exec(rawCodeCommand)
+    if (contentMatch) {
+      files.push(fileName)
+      let content = contentMatch[1]
+      // ...
+    }
+    \`\`\`
+
+    There's a potential for \`contentMatch[1]\` to be undefined if the regex doesn't capture any groups. To fix this, add a null check:
+
+    \`\`\`typescript
+    const contentMatch = regex.exec(rawCodeCommand)
+    if (contentMatch && contentMatch[1]) {
+      files.push(fileName)
+      let content = contentMatch[1]
+      // ...
+    }
+    \`\`\`
+`;
+        if (this.options.files) {
+            const contextFileContents = Object.keys(this.contextFiles).map((file) => `### Contents of ${file}\n\n${this.contextFiles[file]}\n\n`).join('\n');
+            promptText += `
+### Description of App
+
+${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+
+${contextFileContents}
+
+### Request
+
+I would like you to explain the code and document a description of it.
+List any bugs in the new code as well as recommended fixes for those bugs with code examples.
+Format the output of this code review in Markdown format.`;
+        }
+        else {
+            promptText += `
+
+### Request
+
+Do not use any data from the example response structure, only use the structure.
+I would like you to explain why these change are being made and document a description of these changes.
+Also list any bugs in the new code as well as recommended fixes for those bugs with code examples.
+Format the output of this code review in Markdown format.`;
+        }
+        return promptText;
+    }
+    async getGitDiffPrompt() {
+        const gitDiff = await (0, git_utils_1.getGitDiff)();
+        return `==== begin diff =====
+${gitDiff}
+==== end diff =====
+
+${this.generatePrompt()}`;
+    }
+    displayAnalysis(analysis) {
+        (0, string_utils_1.parseMarkdownInstructions)(analysis).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(analysis) {
+        const extractSection = (section) => {
+            const regex = new RegExp(`## ${section}[\\s\\S]*?(?=\\n## Potential Bugs and Recommended Fixes|$)`, 'g');
+            const match = analysis.match(regex);
+            return match ? match[0].trim() : '';
+        };
+        const clipboardOption = await (0, prompts_1.select)({
+            message: 'What would you like to copy to the clipboard?',
+            choices: [
+                { name: 'Copy only the Changes Overview', value: 'Changes Overview' },
+                { name: 'Copy only the Potential Bugs and Recommended Fixes', value: 'Potential Bugs and Recommended Fixes' },
+                { name: 'Copy everything', value: 'Everything' },
+                { name: 'Done', value: 'Done' }
+            ]
+        });
+        let contentToCopy = '';
+        switch (clipboardOption) {
+            case 'Changes Overview':
+                contentToCopy = extractSection('Changes Overview');
+                break;
+            case 'Potential Bugs and Recommended Fixes':
+                contentToCopy = extractSection('Potential Bugs and Recommended Fixes');
+                break;
+            case 'Everything':
+                contentToCopy = analysis;
+                break;
+            case 'Done':
+                console.log('No content copied to clipboard.');
+                return;
+        }
+        if (contentToCopy) {
+            copy_paste_1.default.copy(contentToCopy, (err) => {
+                if (err) {
+                    console.error('Error: Unable to copy to clipboard.', err);
+                }
+                else {
+                    console.log('Selected content copied to clipboard');
+                }
+            });
+        }
+    }
+    async review() {
+        try {
+            await this.loadContextFiles();
+            const prompt = this.options.files ? this.generatePrompt() : await this.getGitDiffPrompt();
+            const analysis = await this.gpt.generateText({ prompt });
+            this.displayAnalysis(analysis);
+            await this.handleUserAction(analysis);
+        }
+        catch (error) {
+            console.error('Error during analysis:', error.message);
+        }
+    }
+}
+exports.default = ReviewManager;

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.1.20",
+  "version": "0.1.25",
   "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.23",
+  "version": "0.2.0",
   "packageManager": "yarn@1.22.22",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",