cloving 0.1.18 → 0.1.20

package/dist/cloving_gpt/index.js

@@ -13,6 +13,9 @@ const mistral_1 = require("./adapters/mistral");
 const ollama_1 = require("./adapters/ollama");
 const gemini_1 = require("./adapters/gemini");
 const config_utils_1 = require("../utils/config_utils");
+const fs_1 = __importDefault(require("fs"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
 class ClovingGPT {
     constructor(options) {
         const { model: partialModel } = options;
@@ -52,51 +55,53 @@ class ClovingGPT {
     }
     async reviewPrompt(prompt, endpoint) {
         if (this.silent)
-            return;
+            return prompt;
         const tokenCount = Math.ceil(prompt.length / 4).toLocaleString();
         const reviewPrompt = await (0, prompts_1.confirm)({
-            message: `Do you want to review the ~${tokenCount} token prompt before sending it to ${endpoint}?`,
+            message: `Do you want to review/edit the ~${tokenCount} token prompt before sending it to ${endpoint}?`,
             default: true
         });
         if (reviewPrompt) {
-            const less = (0, child_process_1.spawn)('less', ['-R'], { stdio: ['pipe', process_1.default.stdout, process_1.default.stderr] });
-            less.stdin.write(prompt);
-            less.stdin.end();
-            await new Promise((resolve, reject) => {
-                less.on('close', async (code) => {
+            const tempFile = path_1.default.join(os_1.default.tmpdir(), `cloving_prompt_${Date.now()}.txt`);
+            fs_1.default.writeFileSync(tempFile, prompt);
+            const editor = process_1.default.env.EDITOR || 'nano';
+            const editProcess = (0, child_process_1.spawn)(editor, [tempFile], { stdio: 'inherit' });
+            return new Promise((resolve, reject) => {
+                editProcess.on('close', async (code) => {
                     if (code !== 0) {
-                        console.error('less command exited with an error');
-                        reject(new Error('Less command failed'));
+                        console.error(`${editor} exited with code ${code}`);
+                        fs_1.default.unlinkSync(tempFile);
+                        reject(new Error(`Editor exited with non-zero code`));
                         return;
                     }
-                    const confirmContinue = await (0, prompts_1.confirm)({
-                        message: 'Do you want to continue?',
-                        default: true
-                    });
-                    if (!confirmContinue) {
-                        console.error('Operation cancelled');
-                        process_1.default.exit(1);
+                    const editedPrompt = fs_1.default.readFileSync(tempFile, 'utf-8').trim();
+                    fs_1.default.unlinkSync(tempFile);
+                    if (editedPrompt === '') {
+                        console.log('Prompt is empty.');
+                        resolve(null);
+                        return;
                     }
-                    resolve();
+                    resolve(editedPrompt);
                 });
-                less.stdin.on('error', (err) => {
-                    if (isNodeError(err) && err.code === 'EPIPE') {
-                        resolve();
-                    }
-                    else {
-                        console.error('Pipeline error:', err);
-                        reject(err);
-                    }
+                editProcess.on('error', (err) => {
+                    console.error('Error launching editor:', err);
+                    fs_1.default.unlinkSync(tempFile);
+                    reject(err);
                 });
             });
         }
+        return prompt;
     }
     async generateText(request) {
         request.temperature || (request.temperature = this.temperature);
         const endpoint = this.adapter.getEndpoint();
         const payload = this.adapter.getPayload(request);
         const headers = this.adapter.getHeaders(this.apiKey);
-        await this.reviewPrompt(request.prompt, endpoint);
+        const reviewedPrompt = await this.reviewPrompt(request.prompt, endpoint);
+        if (reviewedPrompt === null) {
+            throw new Error('Operation cancelled by user');
+        }
+        request.prompt = reviewedPrompt;
         try {
             const response = await axios_1.default.post(endpoint, payload, { headers });
             return this.adapter.extractResponse(response.data);
@@ -111,7 +116,4 @@ class ClovingGPT {
         }
     }
 }
-function isNodeError(error) {
-    return error instanceof Error && 'code' in error;
-}
 exports.default = ClovingGPT;

package/dist/commands/generate/code.js

@@ -232,8 +232,20 @@ const code = async (options) => {
     const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, false);
     let contextFiles = {};
     try {
-        if (allSrcFiles) {
-            for (const file of allSrcFiles) {
+        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');

package/dist/commands/generate/review.js

@@ -6,69 +6,111 @@ 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 config_utils_1 = require("../../utils/config_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");
 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);
-    try {
-        // Define the prompt for analysis
-        const gitDiff = await (0, git_utils_1.getGitDiff)();
-        const promptText = `==== begin diff =====
-${gitDiff}
-==== end diff =====
+    let promptText = `### Prompt
+
+${prompt || 'Please provide a code review.'}
 
 ### Example of a well-structured response
 
-# Code Review: Enhanced Code Generation and File Handling
+    # Code Review: Enhanced Code Generation and File Handling
 
-## Changes Overview
+    ## Changes Overview
 
-These changes primarily focus on improving the code generation process and adding more robust file handling capabilities. The main modifications include:
+    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.
+    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
+    ## 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.
+    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
+    ## 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.
+    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
+    ## Potential Bugs and Recommended Fixes
 
-### 1. Possible undefined access in \`extractFilesAndContent\`
+    ### 1. Possible undefined access in \`extractFilesAndContent\`
 
-\`\`\`typescript
-const contentMatch = regex.exec(rawCodeCommand)
-if (contentMatch) {
-  files.push(fileName)
-  let content = contentMatch[1]
-  // ...
-}
-\`\`\`
+    \`\`\`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:
+    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]
-  // ...
-}
-\`\`\`
+    \`\`\`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 =====`;
+        }
+        promptText += `
 
 ### Request
 
@@ -76,6 +118,13 @@ 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

package/dist/index.js

@@ -106,6 +106,8 @@ generate
     .alias('r')
     .description('Review the code for commited changes that differ from the main/master branch')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
+    .option('-f, --files <filenames...>', 'Specify filenames for files you want to review')
+    .option('-p, --prompt <prompt>', 'Add a prompt to the review')
     .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);

package/dist/package.json

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

package/dist/utils/command_utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addFileOrDirectoryToContext = exports.readFileContent = exports.fetchModels = exports.runCommand = exports.generateFileList = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.SPECIAL_FILES = void 0;
+exports.addFileOrDirectoryToContext = exports.readFileContent = exports.fetchModels = exports.runCommand = exports.generateFileList = exports.getAllFilesInDirectory = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.SPECIAL_FILES = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -33,6 +33,18 @@ const collectSpecialFileContents = () => {
 exports.collectSpecialFileContents = collectSpecialFileContents;
 const checkForSpecialFiles = () => exports.SPECIAL_FILES.some(file => fs_1.default.existsSync(file));
 exports.checkForSpecialFiles = checkForSpecialFiles;
+const getAllFilesInDirectory = async (dir) => {
+    const subdirs = await fs_1.default.promises.readdir(dir);
+    const files = await Promise.all(subdirs.map(async (subdir) => {
+        const res = path_1.default.resolve(dir, subdir);
+        if (subdir === 'node_modules' || subdir === '.git') {
+            return [];
+        }
+        return (await fs_1.default.promises.stat(res)).isDirectory() ? (0, exports.getAllFilesInDirectory)(res) : res;
+    }));
+    return files.flat();
+};
+exports.getAllFilesInDirectory = getAllFilesInDirectory;
 const generateFileList = async () => {
     try {
         const lsOutput = await (0, exports.runCommand)('ls', []);

package/package.json

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