cloving 0.1.7 → 0.1.9

package/README.md

@@ -1,5 +1,3 @@
-Here's the updated README.md incorporating the latest changes:
-
 # Cloving
 
 Cloving is an innovative CLI tool designed to seamlessly integrate AI into various aspects of the developer workflow. It enhances productivity and code quality by leveraging AI for tasks such as generating commit messages, conducting code reviews, creating unit tests, and even assisting with entire project lifecycles.

package/dist/cloving_gpt/adapters/claude.js

@@ -23,7 +23,7 @@ class ClaudeAdapter {
     }
     getPayload(request) {
         return {
-            model: this.model,
+            model: this.model.replace(':', '-'),
             system: 'You are a computer programmer giving advice on how to write better code.',
             messages: [
                 { role: 'user', content: request.prompt }
@@ -50,10 +50,10 @@ class ClaudeAdapter {
 }
 exports.ClaudeAdapter = ClaudeAdapter;
 ClaudeAdapter.supportedModels = [
-    'claude:claude-3-5-sonnet-20240620',
-    'claude:claude-3-opus-20240229',
-    'claude:claude-3-sonnet-20240229',
-    'claude:claude-3-haiku-20240307',
+    'claude:claude-3-5:sonnet-20240620',
+    'claude:claude-3:opus-20240229',
+    'claude:claude-3:sonnet-20240229',
+    'claude:claude-3:haiku-20240307',
     // Add more supported models here as needed
 ];
 // Example usage:

package/dist/cloving_gpt/adapters/openai.js

@@ -21,7 +21,7 @@ class OpenAIAdapter {
     }
     getPayload(request) {
         return {
-            model: this.model,
+            model: this.model.replace(':', '-'),
             messages: [{ role: "user", content: request.prompt }],
             max_tokens: request.maxTokens,
             temperature: request.temperature || 0.7
@@ -33,9 +33,9 @@ class OpenAIAdapter {
 }
 exports.OpenAIAdapter = OpenAIAdapter;
 OpenAIAdapter.supportedModels = [
-    'openai:gpt-4o',
-    'openai:gpt-4-turbo',
-    'openai:gpt-3.5-turbo',
-    'openai:text-embedding-3-large',
+    'openai:gpt:4o',
+    'openai:gpt:4-turbo',
+    'openai:gpt:3.5-turbo',
+    'openai:text-embedding:3-large',
     // Add more supported models here as needed
 ];

package/dist/cloving_gpt/index.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
-const readline_1 = __importDefault(require("readline"));
 const child_process_1 = require("child_process");
 const process_1 = __importDefault(require("process"));
+const inquirer_1 = __importDefault(require("inquirer"));
 const claude_1 = require("./adapters/claude");
 const openai_1 = require("./adapters/openai");
 const gpt4all_1 = require("./adapters/gpt4all");
@@ -22,7 +22,7 @@ class ClovingGPT {
         }
         const primaryModel = (0, config_utils_1.getPrimaryModel)(partialModel);
         if (!primaryModel) {
-            console.log('No primary model found in the configuration. Please run: cloving config');
+            console.log('No AI API models found in the cloving configuration. Please run: cloving config');
             process_1.default.exit(1);
         }
         const { provider, model, config: modelConfig } = primaryModel;
@@ -45,68 +45,60 @@ class ClovingGPT {
                 throw new Error(`Unsupported provider: ${provider}`);
         }
     }
-    async askUserToConfirm(prompt, message) {
+    async reviewPrompt(prompt, endpoint) {
         if (this.silent)
-            return true;
-        const rl = readline_1.default.createInterface({
-            input: process_1.default.stdin,
-            output: process_1.default.stdout
-        });
-        return new Promise((resolve) => {
-            rl.question(message, (answer) => {
-                rl.close();
-                answer = answer.trim().toLowerCase();
-                if (answer === 'y' || answer === '') {
-                    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();
-                    less.on('close', (code) => {
-                        if (code !== 0) {
-                            console.error('less command exited with an error');
-                            resolve(false);
-                            return;
-                        }
-                        const rlConfirm = readline_1.default.createInterface({
-                            input: process_1.default.stdin,
-                            output: process_1.default.stdout
-                        });
-                        rlConfirm.question('Do you still want to continue? [Yn]: ', (confirmAnswer) => {
-                            rlConfirm.close();
-                            confirmAnswer = confirmAnswer.trim().toLowerCase();
-                            if (confirmAnswer !== 'y' && confirmAnswer !== '') {
-                                console.error('User cancelled the operation');
-                                process_1.default.exit(1);
-                            }
-                            else {
-                                resolve(true);
-                            }
-                        });
-                    });
-                    less.stdin.on('error', (err) => {
-                        if (isNodeError(err) && err.code === 'EPIPE') {
-                            resolve(true);
-                        }
-                        else {
-                            console.error('Pipeline error:', err);
-                            resolve(false);
+            return;
+        const tokenCount = Math.ceil(prompt.length / 4).toLocaleString();
+        const { reviewPrompt } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'reviewPrompt',
+                message: `Do you want to review 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) => {
+                    if (code !== 0) {
+                        console.error('less command exited with an error');
+                        reject(new Error('Less command failed'));
+                        return;
+                    }
+                    const { confirmContinue } = await inquirer_1.default.prompt([
+                        {
+                            type: 'confirm',
+                            name: 'confirmContinue',
+                            message: 'Do you want to continue?',
+                            default: true
                         }
-                    });
-                }
-                else {
-                    resolve(true);
-                }
+                    ]);
+                    if (!confirmContinue) {
+                        console.error('User cancelled the operation');
+                        process_1.default.exit(1);
+                    }
+                    resolve();
+                });
+                less.stdin.on('error', (err) => {
+                    if (isNodeError(err) && err.code === 'EPIPE') {
+                        resolve();
+                    }
+                    else {
+                        console.error('Pipeline error:', err);
+                        reject(err);
+                    }
+                });
             });
-        });
+        }
     }
     async generateText(request) {
         const endpoint = this.adapter.getEndpoint();
         const payload = this.adapter.getPayload(request);
         const headers = this.adapter.getHeaders(this.apiKey);
-        const tokenCount = Math.ceil(request.prompt.length / 4).toLocaleString();
-        const shouldContinue = await this.askUserToConfirm(request.prompt, `Do you want to review the ~${tokenCount} token prompt before sending it to ${endpoint}? [Yn]: `);
-        if (!shouldContinue) {
-            throw 'Operation cancelled by the user.';
-        }
+        await this.reviewPrompt(request.prompt, endpoint);
         try {
             const response = await axios_1.default.post(endpoint, payload, { headers });
             return this.adapter.extractResponse(response.data);

package/dist/commands/config.js

@@ -1,11 +1,15 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = void 0;
 const config_utils_1 = require("../utils/config_utils");
 const command_utils_1 = require("../utils/command_utils");
+const inquirer_1 = __importDefault(require("inquirer"));
 const config = async () => {
     let currentConfig = (0, config_utils_1.getConfig)({});
-    // Ensure models is initialized properly
+    // Ensure models are initialized properly
     if (!currentConfig.models) {
         currentConfig.models = {};
     }
@@ -16,32 +20,92 @@ const config = async () => {
     }
     let continueConfig = true;
     while (continueConfig) {
-        console.log('Available models:');
-        models.forEach((model, index) => console.log(`${index + 1}. ${model}`));
-        const modelIndex = parseInt(await (0, command_utils_1.promptUser)('Select a model by number: '), 10) - 1;
-        if (isNaN(modelIndex) || modelIndex < 0 || modelIndex >= models.length) {
-            throw new Error('Invalid selection');
-        }
-        const selectedModel = models[modelIndex];
-        const apiKey = await (0, command_utils_1.promptUser)(`Enter your API key for ${selectedModel}: `);
+        const providers = [...new Set(models.map(model => model.split(':')[0]))];
+        const { selectedProvider } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'selectedProvider',
+                message: 'Select a provider:',
+                choices: providers.map(provider => ({ name: provider, value: provider })),
+            },
+        ]);
+        const providerModels = models.filter(model => model.startsWith(selectedProvider));
+        const modelCategories = [...new Set(providerModels.map(model => model.split(':')[1]))];
+        const { selectedCategory } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'selectedCategory',
+                message: 'Select a category:',
+                choices: modelCategories.map(category => ({ name: category, value: category })),
+            },
+        ]);
+        const specificModels = providerModels.filter(model => model.split(':')[1] === selectedCategory);
+        const { modelIndex } = await inquirer_1.default.prompt([
+            {
+                type: 'list',
+                name: 'modelIndex',
+                message: 'Select an AI model you\'d like to use:',
+                choices: specificModels.map((model, index) => ({ name: model, value: index })),
+                pageSize: specificModels.length,
+            },
+        ]);
+        const selectedModel = specificModels[modelIndex];
+        const { apiKey } = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'apiKey',
+                message: `Enter your API key for ${selectedModel}: `,
+            },
+        ]);
         const [provider, ...modelParts] = selectedModel.split(':');
         const model = modelParts.join(':');
         if (!currentConfig.models[provider]) {
             currentConfig.models[provider] = {};
         }
-        const setAsPrimary = await (0, command_utils_1.promptUser)('Do you want to use this model as a primary model? [Yn]: ');
-        const primary = setAsPrimary.toLowerCase() === 'y' || setAsPrimary === '';
-        const priorityNumber = await (0, command_utils_1.promptUser)('Enter the priority for this model (0-100, higher priority will be used as long as the prompt fits the context token limit): [' + (primary ? 100 : 0) + ']');
-        const priority = primary ? 100 : parseInt(priorityNumber, 10);
-        const silentResponse = await (0, command_utils_1.promptUser)('Do you want to review all prompts before they are sent to this model? [Yn]: ');
-        const silent = !(silentResponse.toLowerCase() === 'y' || silentResponse === '');
-        const trustResponse = await (0, command_utils_1.promptUser)('Do you trust this model with sensitive information? [Yn]: ');
-        const trust = trustResponse.toLowerCase() === 'y' || trustResponse === '';
+        const { primary } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'primary',
+                message: 'Set this model as the primary? Primary models are used by default if your prompt fits within its context window. You can configure backup models for larger prompts.',
+                default: true,
+            },
+        ]);
+        const { priority } = await inquirer_1.default.prompt([
+            {
+                type: 'input',
+                name: 'priority',
+                message: 'Enter the priority for this model (0-100). Higher priority AI APIs are chosen as long as the prompt fits its context window:',
+                default: primary ? '100' : '0',
+                validate: (input) => {
+                    const num = parseInt(input, 10);
+                    if (isNaN(num) || num < 0 || num > 100) {
+                        return 'Please enter a valid number between 0 and 100.';
+                    }
+                    return true;
+                },
+            },
+        ]);
+        const { review } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'review',
+                message: `Do you want to review all prompts before they are sent to ${selectedModel}?`,
+                default: true,
+            },
+        ]);
+        const { trust } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'trust',
+                message: `Do you trust ${selectedModel} with sensitive information?`,
+                default: false,
+            },
+        ]);
         const modelConfig = {
             apiKey,
             primary,
-            priority,
-            silent,
+            priority: parseInt(priority, 10),
+            silent: !review,
             trust,
         };
         currentConfig.models[provider][model] = modelConfig;
@@ -55,10 +119,15 @@ const config = async () => {
                 }
             }
         }
-        const anotherModel = await (0, command_utils_1.promptUser)('Do you want to configure another model? [Yn]: ');
-        if (anotherModel.toLowerCase() !== 'y' && anotherModel !== '') {
-            continueConfig = false;
-        }
+        const { anotherModel } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'anotherModel',
+                message: 'Do you want to configure another model?',
+                default: true,
+            },
+        ]);
+        continueConfig = anotherModel;
     }
     (0, config_utils_1.saveConfig)(currentConfig);
 };

package/dist/commands/generate/code.js

@@ -0,0 +1,187 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const copy_paste_1 = __importDefault(require("copy-paste"));
+const inquirer_1 = __importDefault(require("inquirer"));
+const cli_highlight_1 = __importDefault(require("cli-highlight"));
+const command_utils_1 = require("../../utils/command_utils");
+const config_utils_1 = require("../../utils/config_utils");
+const string_utils_1 = require("../../utils/string_utils");
+const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+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:
+
+${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+
+${specialFiles}
+
+${contextFileContents}
+
+### Directory structure
+
+${files.join('\n')}
+
+`;
+    if (previousCode) {
+        promptText += `### Previously generated code
+
+${previousCode}
+
+`;
+    }
+    promptText += `### Request
+
+I would like to generate code that does the following: ${prompt}
+
+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;
+};
+const generateExplainCodePrompt = (prompt) => {
+    return `${prompt}
+  
+Please briefly explain how this code works.`;
+};
+const generateCode = async (gpt, prompt, allSrcFiles, contextFiles, previousCode) => {
+    const codePrompt = generateCodePrompt(prompt, allSrcFiles, contextFiles, previousCode);
+    return await gpt.generateText({ prompt: codePrompt });
+};
+const displayGeneratedCode = (rawCodeCommand) => {
+    (0, string_utils_1.parseMarkdownInstructions)(rawCodeCommand).map(code => {
+        if (code.trim().startsWith('```')) {
+            const lines = code.split('\n');
+            const language = code.match(/```(\w+)/)?.[1] || 'plaintext';
+            console.log(lines[0]);
+            console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
+            console.log(lines.slice(-1)[0]);
+        }
+        else {
+            console.log((0, cli_highlight_1.default)(code, { language: 'markdown' }));
+        }
+    });
+};
+const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles) => {
+    const { action } = await inquirer_1.default.prompt([
+        {
+            type: 'list',
+            name: 'action',
+            message: 'What would you like to do?',
+            choices: [
+                { name: 'Revise', value: 'revise' },
+                { name: 'Explain', value: 'explain' },
+                { name: 'Copy Source Code to Clipboard', value: 'copySource' },
+                { name: 'Copy Entire Response to Clipboard', value: 'copyAll' },
+                { name: 'Cancel', value: 'cancel' },
+            ],
+        },
+    ]);
+    switch (action) {
+        case 'revise':
+            const { newPrompt } = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'newPrompt',
+                    message: 'Enter your revised prompt:',
+                },
+            ]);
+            const newRawCodeCommand = await generateCode(gpt, newPrompt, allSrcFiles, contextFiles, rawCodeCommand);
+            displayGeneratedCode(newRawCodeCommand);
+            await handleUserAction(gpt, newRawCodeCommand, newPrompt, allSrcFiles, contextFiles);
+            break;
+        case 'explain':
+            const explainPrompt = generateExplainCodePrompt(rawCodeCommand);
+            const explainCodeCommand = await gpt.generateText({ prompt: explainPrompt });
+            console.log((0, cli_highlight_1.default)(explainCodeCommand, { language: 'markdown' }));
+            break;
+        case 'copySource':
+            const sourceCode = (0, string_utils_1.extractMarkdown)(rawCodeCommand);
+            copy_paste_1.default.copy(sourceCode, () => {
+                console.log('Source code to clipboard');
+            });
+            break;
+        case 'copyAll':
+            copy_paste_1.default.copy(rawCodeCommand, () => {
+                console.log('Entire response copied to clipboard');
+            });
+            break;
+        case 'cancel':
+            console.log('Operation cancelled.');
+            break;
+    }
+};
+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 contextFiles = {};
+    try {
+        if (!prompt) {
+            const { userPrompt } = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'userPrompt',
+                    message: 'What would you like to build:',
+                },
+            ]);
+            prompt = userPrompt;
+        }
+        if (files && files.length > 0) {
+            // Check if the files exist
+            const nonExistentFiles = files.filter(file => !fs_1.default.existsSync(file));
+            if (nonExistentFiles.length > 0) {
+                throw new Error(`The following files do not exist: ${nonExistentFiles.join(', ')}`);
+            }
+            // 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;
+            }
+        }
+        const rawCodeCommand = await generateCode(gpt, prompt, allSrcFiles, contextFiles);
+        displayGeneratedCode(rawCodeCommand);
+        await handleUserAction(gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles);
+    }
+    catch (error) {
+        console.error('Could not generate code', error);
+    }
+};
+exports.default = code;

package/dist/commands/generate/commit.js

@@ -6,16 +6,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
-const git_utils_1 = require("../../utils/git_utils");
 const string_utils_1 = require("../../utils/string_utils");
 const config_utils_1 = require("../../utils/config_utils");
 const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
-const generateAndCommitMessage = async (options) => {
+const generateCommitMessagePrompt = (diff) => {
+    return `Generate a concise and meaningful commit message based on a diff.
+
+Do not add any commentary or context to the message other than the commit message itself.
+
+An example of the output for this should look like the following:
+
+\`\`\`plaintext
+Update dependencies and package versions
+
+- Upgrade Ruby gems including aws-sdk, honeybadger, irb, and rubocop
+- Update Node.js packages including esbuild, tinymce, and trix
+- Bump TypeScript and ESLint related packages to latest versions
+\`\`\`
+
+Here is the diff to help you write the commit message:
+
+${diff}`;
+};
+const commit = async (options) => {
     options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
     try {
+        // Get the git diff
+        const diff = (0, child_process_1.execSync)('git diff HEAD').toString().trim();
+        // Check if the diff is blank
+        if (!diff) {
+            console.error('No changes to commit.');
+            return;
+        }
         // Generate the prompt for commit message
-        const prompt = (0, git_utils_1.generateCommitMessagePrompt)();
+        const prompt = generateCommitMessagePrompt(diff);
         // Instantiate ClovingGPT and get the commit message
         const rawCommitMessage = await gpt.generateText({ prompt });
         // Clean the commit message using extractMarkdown
@@ -38,7 +63,7 @@ const generateAndCommitMessage = async (options) => {
         });
     }
     catch (error) {
-        console.error('Could not generate commit message');
+        console.error('Could not generate commit message:', error);
     }
 };
-exports.default = generateAndCommitMessage;
+exports.default = commit;

package/dist/commands/generate/review.js

@@ -5,12 +5,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const child_process_1 = require("child_process");
 const cli_highlight_1 = __importDefault(require("cli-highlight"));
+const inquirer_1 = __importDefault(require("inquirer"));
 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 config_utils_1 = require("../../utils/config_utils");
 const string_utils_2 = require("../../utils/string_utils");
-const command_utils_1 = require("../../utils/command_utils");
 const review = async (options) => {
     options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
@@ -39,8 +39,15 @@ ${gitDiff}`;
             }
         });
         // Prompt the user to copy the analysis to the clipboard
-        const answer = await (0, command_utils_1.promptUser)('Do you want to copy the analysis to the clipboard? [Y/n] ');
-        if (answer.toLowerCase() === 'y' || answer === '') {
+        const { copyToClipboard } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'copyToClipboard',
+                message: 'Do you want to copy the analysis to the clipboard?',
+                default: true
+            }
+        ]);
+        if (copyToClipboard) {
             try {
                 (0, child_process_1.execFileSync)('pbcopy', { input: markdown });
                 console.log('Analysis copied to clipboard');