cloving 0.1.10 → 0.1.11

package/dist/cloving_gpt/adapters/claude.js

@@ -29,7 +29,7 @@ class ClaudeAdapter {
                 { role: 'user', content: request.prompt }
             ],
             max_tokens: request.maxTokens || 4096,
-            temperature: request.temperature || 0.7
+            temperature: request.temperature || 0.2
         };
     }
     extractResponse(data) {

package/dist/cloving_gpt/adapters/gemini.js

@@ -31,7 +31,7 @@ class GeminiAdapter {
                 }
             ],
             generationConfig: {
-                temperature: 0.7,
+                temperature: 0.2,
                 topK: 40,
                 topP: 0.95,
                 maxOutputTokens: 1024

package/dist/cloving_gpt/adapters/mistral.js

@@ -24,7 +24,7 @@ class MistralAdapter {
             model: this.model.replace(':', '-'),
             messages: [{ role: "user", content: request.prompt }],
             max_tokens: request.maxTokens,
-            temperature: request.temperature || 0.7,
+            temperature: request.temperature || 0.2,
             stream: false
         };
     }

package/dist/cloving_gpt/adapters/openai.js

@@ -24,7 +24,7 @@ class OpenAIAdapter {
             model: this.model.replace(':', '-'),
             messages: [{ role: "user", content: request.prompt }],
             max_tokens: request.maxTokens,
-            temperature: request.temperature || 0.7
+            temperature: request.temperature || 0.2
         };
     }
     extractResponse(data) {

package/dist/cloving_gpt/index.js

@@ -81,7 +81,7 @@ class ClovingGPT {
                         }
                     ]);
                     if (!confirmContinue) {
-                        console.error('User cancelled the operation');
+                        console.error('Operation cancelled');
                         process_1.default.exit(1);
                     }
                     resolve();

package/dist/commands/generate/code.js

@@ -16,7 +16,7 @@ const generateCodePrompt = (prompt, files, contextFiles, previousCode) => {
     const specialFileContents = (0, command_utils_1.collectSpecialFileContents)();
     const specialFiles = Object.keys(specialFileContents).map((file) => `### Contents of ${file}\n\n${JSON.stringify(specialFileContents[file], null, 2)}\n\n`).join('\n');
     const contextFileContents = Object.keys(contextFiles).map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`).join('\n');
-    let promptText = `Here is a description of my app:
+    let promptText = `### Description of App
 
 ${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
 
@@ -87,7 +87,7 @@ const generateCodePrompt = (prompt: string | undefined, files: string[], context
 
 ### Request
 
-I would like to generate code that does the following: ${prompt}
+Generate code that does the following: ${prompt}
 
 Do not use any data from the example response structure, only use the structure. Please generate the code and include filenames 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.`;
     return promptText;
@@ -145,7 +145,8 @@ const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contex
             choices: [
                 { name: 'Revise', value: 'revise' },
                 { name: 'Explain', value: 'explain' },
-                { name: 'Save Source Code to Files', value: 'save' },
+                { name: 'Save a Source Code File', value: 'save' },
+                { name: 'Save All Source Code Files', value: 'saveAll' },
                 { name: 'Copy Source Code to Clipboard', value: 'copySource' },
                 { name: 'Copy Entire Response to Clipboard', value: 'copyAll' },
                 { name: 'Done', value: 'done' },
@@ -158,7 +159,7 @@ const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contex
                 {
                     type: 'input',
                     name: 'newPrompt',
-                    message: 'Enter your revised prompt:',
+                    message: 'How would you like to modify the output:',
                 },
             ]);
             const newRawCodeCommand = await generateCode(gpt, newPrompt, allSrcFiles, contextFiles, rawCodeCommand);
@@ -194,7 +195,7 @@ const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contex
                         type: 'confirm',
                         name: 'copyMore',
                         message: 'Do you want to copy another file?',
-                        default: false,
+                        default: true,
                     },
                 ]);
                 copyAnother = copyMore;
@@ -230,29 +231,96 @@ const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contex
                         type: 'confirm',
                         name: 'saveMore',
                         message: 'Do you want to save another file?',
-                        default: false,
+                        default: true,
                     },
                 ]);
                 saveAnother = saveMore;
             }
             break;
+        case 'saveAll':
+            files.forEach(file => {
+                if (fileContents[file]) {
+                    const filePath = path_1.default.resolve(file);
+                    fs_1.default.mkdirSync(path_1.default.dirname(filePath), { recursive: true });
+                    fs_1.default.writeFileSync(filePath, fileContents[file]);
+                    console.log(`${file} has been saved.`);
+                }
+                else {
+                    console.log(`File content not found for ${file}.`);
+                }
+            });
+            console.log('All files have been saved.');
+            break;
         case 'done':
             break;
     }
 };
+const addFilesToContext = async (contextFiles, filePath) => {
+    const stats = fs_1.default.statSync(filePath);
+    if (stats.isDirectory()) {
+        const files = fs_1.default.readdirSync(filePath);
+        for (const file of files) {
+            await addFilesToContext(contextFiles, path_1.default.join(filePath, file));
+        }
+    }
+    else if (stats.isFile()) {
+        const content = fs_1.default.readFileSync(filePath, 'utf-8');
+        contextFiles[filePath] = content;
+    }
+};
 const code = async (options) => {
     let { prompt, files } = options;
     options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
-    const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, true);
+    const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, false);
     const contextFiles = {};
     try {
+        if (files) {
+            files.forEach(async (file) => {
+                await addFilesToContext(contextFiles, file);
+            });
+        }
+        else {
+            let firstFile = true;
+            let includeMoreFiles = true;
+            while (includeMoreFiles) {
+                const { includeMore } = await inquirer_1.default.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'includeMore',
+                        message: `Do you want to include any${firstFile ? '' : ' other'} files or directories as context for the prompt?`,
+                        default: false,
+                    },
+                ]);
+                firstFile = false;
+                includeMoreFiles = includeMore;
+                if (includeMoreFiles) {
+                    const { contextFile } = await inquirer_1.default.prompt([
+                        {
+                            type: 'input',
+                            name: 'contextFile',
+                            message: 'Enter the relative path of a file or directory you would like to include as context:',
+                        },
+                    ]);
+                    if (contextFile) {
+                        const filePath = path_1.default.resolve(contextFile);
+                        if (fs_1.default.existsSync(filePath)) {
+                            await addFilesToContext(contextFiles, filePath);
+                            console.log(`Added ${filePath} to context.`);
+                        }
+                        else {
+                            console.log(`File or directory ${contextFile} does not exist.`);
+                        }
+                    }
+                }
+            }
+        }
         if (!prompt) {
             const { userPrompt } = await inquirer_1.default.prompt([
                 {
                     type: 'input',
                     name: 'userPrompt',
-                    message: 'What would you like to build:',
+                    message: 'What would you like the code to do:',
                 },
             ]);
             prompt = userPrompt;
@@ -265,40 +333,7 @@ const code = async (options) => {
             }
             // Read the content of the provided files
             for (const file of files) {
-                const content = fs_1.default.readFileSync(file, 'utf-8');
-                contextFiles[file] = content;
-            }
-        }
-        else {
-            // Prompt for additional context files if no files were passed in options
-            let includeMoreFiles = true;
-            while (includeMoreFiles) {
-                const { contextFile } = await inquirer_1.default.prompt([
-                    {
-                        type: 'input',
-                        name: 'contextFile',
-                        message: 'Relative path of an existing file you would like to include as context in the prompt [optional]:',
-                    },
-                ]);
-                if (contextFile) {
-                    const filePath = path_1.default.resolve(contextFile);
-                    if (fs_1.default.existsSync(filePath)) {
-                        const content = fs_1.default.readFileSync(filePath, 'utf-8');
-                        contextFiles[filePath] = content;
-                    }
-                    else {
-                        console.log(`File ${contextFile} does not exist.`);
-                    }
-                }
-                const { includeMore } = await inquirer_1.default.prompt([
-                    {
-                        type: 'confirm',
-                        name: 'includeMore',
-                        message: 'Do you want to include any other files?',
-                        default: false,
-                    },
-                ]);
-                includeMoreFiles = includeMore;
+                await addFilesToContext(contextFiles, file);
             }
         }
         const rawCodeCommand = await generateCode(gpt, prompt, allSrcFiles, contextFiles);

package/dist/commands/generate/shell.js

@@ -34,6 +34,68 @@ const generateExplainShellPrompt = (prompt) => {
   
 Please briefly explain how this shell script works.`;
 };
+const generateShell = async (gpt, prompt) => {
+    const shellPrompt = generateShellPrompt(prompt);
+    return await gpt.generateText({ prompt: shellPrompt });
+};
+const displayGeneratedShell = (rawShellCommand) => {
+    const generatedShell = (0, string_utils_1.extractMarkdown)(rawShellCommand);
+    const generatedShellWithoutShebang = generatedShell.replace(/^#!.*?\s/, '');
+    console.log((0, cli_highlight_1.default)(generatedShellWithoutShebang));
+};
+const handleUserAction = async (gpt, rawShellCommand, prompt) => {
+    const generatedShell = (0, string_utils_1.extractMarkdown)(rawShellCommand);
+    const generatedShellWithoutShebang = generatedShell.replace(/^#!.*?\s/, '');
+    const { action } = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'action',
+            message: 'What would you like to do?',
+            choices: [
+                { name: 'Execute', value: 'execute' },
+                { name: 'Revise', value: 'revise' },
+                { name: 'Explain', value: 'explain' },
+                { name: 'Copy to Clipboard', value: 'copy' },
+                { name: 'Cancel', value: 'cancel' },
+            ],
+        },
+    ]);
+    switch (action) {
+        case 'execute':
+            (0, child_process_1.execSync)(generatedShellWithoutShebang, { stdio: 'inherit' });
+            break;
+        case 'revise':
+            const { newPrompt } = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'newPrompt',
+                    message: 'How would you like to modify the output:',
+                },
+            ]);
+            const newRawShellCommand = await generateShell(gpt, newPrompt);
+            displayGeneratedShell(newRawShellCommand);
+            await handleUserAction(gpt, newRawShellCommand, newPrompt);
+            break;
+        case 'explain':
+            const explainPrompt = generateExplainShellPrompt(generatedShellWithoutShebang);
+            const explainShellCommand = await gpt.generateText({ prompt: explainPrompt });
+            console.log((0, cli_highlight_1.default)(explainShellCommand, { language: 'markdown' }));
+            break;
+        case 'copy':
+            copy_paste_1.default.copy(generatedShellWithoutShebang, (err) => {
+                if (err) {
+                    console.error('Error: Unable to copy to clipboard.', err);
+                }
+                else {
+                    console.log('Script copied to clipboard.');
+                }
+            });
+            break;
+        case 'cancel':
+            console.log('Operation cancelled.');
+            break;
+    }
+};
 const shell = async (options) => {
     let { prompt } = options;
     options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
@@ -49,60 +111,12 @@ const shell = async (options) => {
             ]);
             prompt = userPrompt;
         }
-        // Generate the prompt for commit message
-        const shellPrompt = generateShellPrompt(prompt);
-        // Instantiate ClovingGPT and get the commit message
-        const rawShellCommand = await gpt.generateText({ prompt: shellPrompt });
-        // Clean the commit message using extractMarkdown
-        const generatedShell = (0, string_utils_1.extractMarkdown)(rawShellCommand);
-        // remove #! from the generated shell script
-        const generatedShellWithoutShebang = generatedShell.replace(/^#!.*?\s/, '');
-        console.log((0, cli_highlight_1.default)(generatedShellWithoutShebang));
-        // Inquirer prompt for further actions
-        const { action } = await inquirer_1.default.prompt([
-            {
-                type: 'list',
-                name: 'action',
-                message: 'What would you like to do?',
-                choices: [
-                    { name: 'Execute', value: 'execute' },
-                    { name: 'Revise', value: 'revise' },
-                    { name: 'Explain', value: 'explain' },
-                    { name: 'Copy to Clipboard', value: 'copy' },
-                    { name: 'Cancel', value: 'cancel' },
-                ],
-            },
-        ]);
-        switch (action) {
-            case 'execute':
-                (0, child_process_1.execSync)(generatedShellWithoutShebang, { stdio: 'inherit' });
-                break;
-            case 'revise':
-                // Logic to revise the prompt (not implemented in this example)
-                console.log('Revise option selected. Implement revision logic here.');
-                break;
-            case 'explain':
-                const explainPrompt = generateExplainShellPrompt(generatedShellWithoutShebang);
-                const explainShellCommand = await gpt.generateText({ prompt: explainPrompt });
-                console.log((0, cli_highlight_1.default)(explainShellCommand, { language: 'markdown' }));
-                break;
-            case 'copy':
-                copy_paste_1.default.copy(generatedShellWithoutShebang, (err) => {
-                    if (err) {
-                        console.error('Error: Unable to copy to clipboard.', err);
-                    }
-                    else {
-                        console.log('Script copied to clipboard.');
-                    }
-                });
-                break;
-            case 'cancel':
-                console.log('Operation cancelled.');
-                break;
-        }
+        const rawShellCommand = await generateShell(gpt, prompt);
+        displayGeneratedShell(rawShellCommand);
+        await handleUserAction(gpt, rawShellCommand, prompt);
     }
     catch (error) {
-        console.error('Could not generate shell script');
+        console.error('Could not generate shell script', error);
     }
 };
 exports.default = shell;

package/dist/commands/generate/unit_tests.js

@@ -6,6 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = require("fs");
 const child_process_1 = require("child_process");
 const cli_highlight_1 = __importDefault(require("cli-highlight"));
+const inquirer_1 = __importDefault(require("inquirer"));
+const path_1 = __importDefault(require("path"));
 const git_utils_1 = require("../../utils/git_utils");
 const config_utils_1 = require("../../utils/config_utils");
 const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
@@ -20,33 +22,27 @@ const extractChangedFiles = (gitDiff) => {
 };
 const generatePrompt = (files, srcFiles, testFiles, gitDiff) => {
     const filesList = files.length > 0 ? files.join('\n') : 'No files provided';
-    const diffSection = gitDiff ? `Here is my git diff:\n\n==== begin git diff ====\n${gitDiff}\n==== end git diff ====\n` : '';
-    return `Here is a list of code files I want to generate unit tests for:
+    return `### List of Code Files
 
-==== begin list of files ====
 ${filesList}
-==== end list of files ====
 
-Here is a list of all my source files:
+### List of All Source Files
 
-==== begin list of source files ====
 ${srcFiles}
-==== end list of source files ====
 
-Here is a list of all my test files:
+### List of all test files
 
-==== begin list of test files ====
 ${testFiles}
-==== end list of test files ====
 
-${diffSection}
+### Git Diff Content
 
-Please enumerate all the files in the provided list${gitDiff ? ' and git diff' : ''} as well as the file names of anything that these files interact with.
+${gitDiff}
 
-Also, list any test files that might be relevant to these files.
+## Example Output
 
 Give me this output format for your answer:
 
+\`\`\`plaintext
 ## files
 
 app/models/foo.rb
@@ -55,7 +51,129 @@ app/views/baz/bar.html.erb
 ## relevant test files
 
 test/models/foo_test.rb
-test/controllers/baz_controller_test.rb`;
+test/controllers/baz_controller_test.rb
+\`\`\`
+
+### Request
+
+Please enumerate all the files in the provided list${gitDiff ? ' and git diff' : ''} as well as the file names of anything that these files interact with.
+
+Also, list any test files that might be relevant to these files.`;
+};
+const extractFilesAndContent = (analysis) => {
+    const files = [];
+    const fileContents = {};
+    const matches = analysis.match(/(\*{2})([^\*]+)(\*{2})/g);
+    if (!matches)
+        return [files, fileContents];
+    for (const match of matches) {
+        const fileName = match.replace(/\*{2}/g, '').trim();
+        const regex = new RegExp(`\\*\\*${fileName}\\*\\*\\n\\n\\\`{3}([\\s\\S]+?)\\\`{3}`, 'g');
+        const contentMatch = regex.exec(analysis);
+        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;
+        }
+    }
+    return [files, fileContents];
+};
+const handleUserAction = async (analysis) => {
+    const [files, fileContents] = extractFilesAndContent(analysis);
+    const { action } = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'action',
+            message: 'What would you like to do?',
+            choices: [
+                { name: 'Save a Unit Test File', value: 'save' },
+                { name: 'Save All Unit Test Files', value: 'saveAll' },
+                { name: 'Copy Unit Test to Clipboard', value: 'copyTest' },
+                { name: 'Copy Entire Response to Clipboard', value: 'copyAll' },
+                { name: 'Done', value: 'done' },
+            ],
+        },
+    ]);
+    switch (action) {
+        case 'save':
+            let saveAnother = true;
+            while (saveAnother) {
+                const { fileToSave } = await inquirer_1.default.prompt([
+                    {
+                        type: 'list',
+                        name: 'fileToSave',
+                        message: 'Which unit test file do you want to save?',
+                        choices: files.map(file => ({ name: file, value: file })),
+                    },
+                ]);
+                if (fileContents[fileToSave]) {
+                    const filePath = path_1.default.resolve(fileToSave);
+                    fs_1.promises.mkdir(path_1.default.dirname(filePath), { recursive: true })
+                        .then(() => fs_1.promises.writeFile(filePath, fileContents[fileToSave]))
+                        .then(() => console.log(`${fileToSave} has been saved.`))
+                        .catch((error) => console.error(`Error saving ${fileToSave}:`, error));
+                }
+                else {
+                    console.log('File content not found.');
+                }
+                const { saveMore } = await inquirer_1.default.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'saveMore',
+                        message: 'Do you want to save another file?',
+                        default: false,
+                    },
+                ]);
+                saveAnother = saveMore;
+            }
+            break;
+        case 'saveAll':
+            for (const file of files) {
+                if (fileContents[file]) {
+                    const filePath = path_1.default.resolve(file);
+                    fs_1.promises.mkdir(path_1.default.dirname(filePath), { recursive: true })
+                        .then(() => fs_1.promises.writeFile(filePath, fileContents[file]))
+                        .then(() => console.log(`${file} has been saved.`))
+                        .catch((error) => console.error(`Error saving ${file}:`, error));
+                }
+                else {
+                    console.log(`File content not found for ${file}.`);
+                }
+            }
+            console.log('All unit test files have been saved.');
+            break;
+        case 'copyTest':
+            const { fileToCopy } = await inquirer_1.default.prompt([
+                {
+                    type: 'list',
+                    name: 'fileToCopy',
+                    message: 'Which unit test file do you want to copy to the clipboard?',
+                    choices: files.map(file => ({ name: file, value: file })),
+                },
+            ]);
+            if (fileContents[fileToCopy]) {
+                process.nextTick(() => {
+                    require('copy-paste').copy(fileContents[fileToCopy], () => {
+                        console.log(`${fileToCopy} copied to clipboard`);
+                    });
+                });
+            }
+            else {
+                console.log('File content not found.');
+            }
+            break;
+        case 'copyAll':
+            process.nextTick(() => {
+                require('copy-paste').copy(analysis, () => {
+                    console.log('Entire response copied to clipboard');
+                });
+            });
+            break;
+        case 'done':
+            break;
+    }
 };
 const unitTests = async (options) => {
     const { files } = options;
@@ -88,9 +206,9 @@ const unitTests = async (options) => {
         }
     });
     for (const codeFile of lines) {
-        if (await fs_1.promises?.stat(codeFile).then(stat => stat.isFile()).catch(() => false)) {
+        if (await fs_1.promises.stat(codeFile).then(stat => stat.isFile()).catch(() => false)) {
             const fileContents = await fs_1.promises.readFile(codeFile, 'utf-8');
-            context.push(`### **Contents of ${codeFile}**\n\n${fileContents}\n\n### **End of ${codeFile}**`);
+            context.push(`### Contents of ${codeFile}\n\n${fileContents}\n\n### End of ${codeFile}`);
         }
     }
     // Generate the message for unit test creation
@@ -98,11 +216,11 @@ const unitTests = async (options) => {
     if ((files || []).length > 0) {
         const message = `please create unit tests for these files:
 
-## begin list of files
+## Begin list of files
 ${(files || []).join('\n')}
-## end list of files
+## End list of files
 
-## context
+## Context
 ${context.join('\n\n')}`;
         // Get the model and analysis using ClovingGPT
         analysis = await gpt.generateText({ prompt: message });
@@ -110,16 +228,18 @@ ${context.join('\n\n')}`;
     else {
         const message = `please create unit tests for these changes:
 
-## begin diff
+## Begin diff
 ${await (0, git_utils_1.getGitDiff)()}
-## end diff
+## End diff
 
-## context
+## Context
 
 ${context.join('\n\n')}`;
         // Get the model and analysis using ClovingGPT
         analysis = await gpt.generateText({ prompt: message });
     }
     console.log((0, cli_highlight_1.default)(analysis));
+    // Add the new user action handling
+    await handleUserAction(analysis);
 };
 exports.default = unitTests;

package/dist/index.js

@@ -59,7 +59,7 @@ const generate = program
     .description('Generate various items like unit-tests and code reviews');
 generate
     .command('shell')
-    .alias('s')
+    .alias('sh')
     .description('Generate a shell command based on a prompt')
     .option('-s, --silent', 'Run the command without asking for confirmation of submitting prompts')
     .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5-sonnet-20240620)')

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {

package/dist/utils/config_utils.js

@@ -61,7 +61,8 @@ const getClovingConfig = () => {
         return clovingConfig;
     }
     else {
-        throw new Error(`${exports.CLOVING_CONFIG_PATH} file not found`);
+        console.log(`${exports.CLOVINGFILE_PATH} file not found, please run: cloving init`);
+        process.exit(1);
     }
 };
 exports.getClovingConfig = getClovingConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloving",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "scripts": {
@@ -68,5 +68,10 @@
     "lint-staged": "^15.2.7",
     "ts-jest": "^29.2.0",
     "typescript": "^5.5.3"
+  },
+  "resolutions": {
+    "eslint": "8.57.0",
+    "eslint-plugin-n": "16.6.2",
+    "eslint-plugin-import": "2.29.1"
   }
 }