cloving 0.3.13 → 0.3.15

package/dist/managers/ChatManager.js

@@ -100,7 +100,6 @@ class ChatManager extends StreamManager_1.default {
         }
         const trimmedLine = line.trim();
         if (this.isPastedCode(trimmedLine)) {
-            console.log('Detected pasted code. Processing as multiline input...');
             this.multilineInput = trimmedLine;
             this.isMultilineMode = true;
             await this.handleCommand(this.multilineInput);
@@ -609,8 +608,8 @@ ${prompt}
 
 ### Note
 
-Whenever possible, break up the changes into pieces and make sure every change is in its own CURRENT / NEW block.
-Do not allow empty CURRENT blocks and if you add content to the CURRENT block, you also have to add the same content to the NEW block.`;
+Whenever possible, break up the changes into pieces and make sure every change is in its own *CURRENT/NEW* Blocks.
+Do not allow empty CURRENT blocks in *CURRENT/NEW* Blocks and if you add content to the CURRENT block, you also have to add the same content to the NEW block.`;
     }
     handleClose() {
         console.log('Goodbye!');

package/dist/managers/StreamManager.js

@@ -146,14 +146,14 @@ class StreamManager extends events_1.EventEmitter {
         process.stdout.write(colors_1.default.gray.bold(`\`\`\`${language}                                       \n`));
         process.stdout.write(colors_1.default.gray.bold(`<<<<<<< CURRENT ${currentNewBlock.filePath}\n`));
         try {
-            process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.currentContent, { language }));
+            process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.currentContent));
         }
         catch (error) {
             process.stdout.write(currentNewBlock.currentContent);
         }
         process.stdout.write(colors_1.default.gray.bold('\n=======\n'));
         try {
-            process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.newContent, { language }));
+            process.stdout.write((0, cli_highlight_1.default)(currentNewBlock.newContent));
         }
         catch (error) {
             process.stdout.write(currentNewBlock.newContent);

package/dist/package.json

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

package/package.json

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

package/dist/abstract_gpt/index.js

@@ -1,55 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const axios_1 = __importDefault(require("axios"));
-class AbstractGPT {
-    constructor() {
-        const clovingModel = process.env.CLOVING_MODEL;
-        this.apiKey = process.env.CLOVING_API_KEY || '';
-        if (!clovingModel || !this.apiKey) {
-            throw new Error("CLOVING_MODEL and CLOVING_API_KEY environment variables must be set");
-        }
-        const [provider, model] = clovingModel.split(':');
-        this.provider = provider;
-        this.model = model;
-    }
-    getEndpoint() {
-        switch (this.provider) {
-            case 'openai':
-                return `https://api.openai.com/v1/engines/${this.model}/completions`;
-            case 'claude':
-                return `https://api.anthropic.com/v1/claude/${this.model}`;
-            case 'gpt4all':
-                return `https://api.gpt4all.io/v1/models/${this.model}/completions`;
-            default:
-                throw new Error(`Unsupported provider: ${this.provider}`);
-        }
-    }
-    async generateText(request) {
-        const endpoint = this.getEndpoint();
-        const response = await axios_1.default.post(endpoint, {
-            model: this.model,
-            prompt: request.prompt,
-            max_tokens: request.maxTokens || 100,
-            temperature: request.temperature || 0.7
-        }, {
-            headers: {
-                'Authorization': `Bearer ${this.apiKey}`,
-                'Content-Type': 'application/json'
-            }
-        });
-        switch (this.provider) {
-            case 'openai':
-                return response.data.choices[0].text;
-            case 'claude':
-                return response.data.completion;
-            case 'gpt4all':
-                return response.data.text;
-            default:
-                throw new Error(`Unsupported provider: ${this.provider}`);
-        }
-    }
-}
-exports.default = AbstractGPT;

package/dist/cloving_gpt/adapters/Adapter.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/dist/cloving_gpt/adapters/gpt4all.js

@@ -1,29 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GPT4AllAdapter = void 0;
-class GPT4AllAdapter {
-    constructor(model) {
-        this.model = model;
-    }
-    getEndpoint() {
-        return `https://api.gpt4all.io/v1/models/${this.model}/completions`;
-    }
-    getHeaders(apiKey) {
-        return {
-            'Authorization': `Bearer ${apiKey}`,
-            'Content-Type': 'application/json'
-        };
-    }
-    getPayload(request) {
-        return {
-            model: this.model,
-            prompt: request.prompt,
-            max_tokens: request.maxTokens,
-            temperature: request.temperature || 0.7
-        };
-    }
-    extractResponse(data) {
-        return data.text;
-    }
-}
-exports.GPT4AllAdapter = GPT4AllAdapter;

package/dist/commands/analyze.js

@@ -1,47 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const readline_1 = __importDefault(require("readline"));
-const child_process_1 = require("child_process");
-const git_utils_1 = require("../utils/git_utils");
-const model_utils_1 = require("../utils/model_utils");
-const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
-const analyze = async () => {
-    try {
-        // Define the prompt for analysis
-        const gitDiff = await (0, git_utils_1.getGitDiff)();
-        const model = (0, model_utils_1.getModel)();
-        const prompt = `Explain why the change is 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.
-
-${gitDiff}`;
-        // Instantiate ClovingGPT and get the analysis
-        const gpt = new cloving_gpt_1.default();
-        const analysis = await gpt.generateText({ prompt });
-        // Print the analysis to the console
-        console.log(analysis);
-        // Prompt the user to copy the analysis to the clipboard
-        const rl = readline_1.default.createInterface({
-            input: process.stdin,
-            output: process.stdout
-        });
-        rl.question('Do you want to copy the analysis to the clipboard? [Y/n] ', (answer) => {
-            if (answer.toLowerCase() === 'y' || answer === '') {
-                try {
-                    (0, child_process_1.execFileSync)('pbcopy', { input: analysis });
-                    console.log('Analysis copied to clipboard');
-                }
-                catch (error) {
-                    console.error('Error: pbcopy command not found. Unable to copy to clipboard.');
-                }
-            }
-            rl.close();
-        });
-    }
-    catch (error) {
-        console.error('Error during analysis:', error.message);
-    }
-};
-exports.default = analyze;

package/dist/commands/check.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = (options) => {
-    if (options.verbose)
-        console.log('Verbose mode enabled');
-    console.log('Checking something...');
-};

package/dist/commands/commit.js

@@ -1,44 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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) => {
-    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
-    const gpt = new cloving_gpt_1.default(options);
-    try {
-        // Generate the prompt for commit message
-        const prompt = (0, git_utils_1.generateCommitMessagePrompt)();
-        // Instantiate ClovingGPT and get the commit message
-        const rawCommitMessage = await gpt.generateText({ prompt });
-        // Clean the commit message using extractMarkdown
-        const commitMessage = (0, string_utils_1.extractMarkdown)(rawCommitMessage);
-        // Write the commit message to a temporary file
-        const tempCommitFilePath = path_1.default.join('.git', 'SUGGESTED_COMMIT_EDITMSG');
-        fs_1.default.writeFileSync(tempCommitFilePath, commitMessage);
-        // Commit the changes using the generated commit message
-        try {
-            (0, child_process_1.execFileSync)('git', ['commit', '-a', '--edit', '--file', tempCommitFilePath], { stdio: 'inherit' });
-        }
-        catch (commitError) {
-            // If commit is canceled (non-zero exit), handle it here
-            console.log('Commit was canceled or failed.');
-        }
-        // Remove the temporary file using fs
-        fs_1.default.unlink(tempCommitFilePath, (err) => {
-            if (err)
-                throw err;
-        });
-    }
-    catch (error) {
-        console.error('Could not generate commit message');
-    }
-};
-exports.default = generateAndCommitMessage;

package/dist/commands/describe.js

@@ -1,235 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = void 0;
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const child_process_1 = require("child_process");
-const string_utils_1 = require("../utils/string_utils");
-const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
-const readline_1 = __importDefault(require("readline"));
-const ignore_1 = __importDefault(require("ignore"));
-// List of special files to check
-const specialFiles = [
-    'package.json',
-    'Gemfile',
-    'requirements.txt',
-    'Pipfile',
-    'pyproject.toml',
-    'pom.xml',
-    'build.gradle',
-    '.csproj',
-    'packages.config',
-    'composer.json',
-    'CMakeLists.txt',
-    'conanfile.txt',
-    'conanfile.py',
-    'go.mod',
-    'Cargo.toml',
-    'Package.swift',
-    'build.gradle.kts',
-    'Podfile',
-    'Cartfile',
-    'cpanfile',
-    'DESCRIPTION',
-    'mix.exs',
-    'build.sbt',
-    'pubspec.yaml',
-    'stack.yaml',
-    'cabal.project',
-    'Project.toml',
-    'rockspec',
-    'rebar.config',
-    'project.clj'
-];
-const runCommand = (command, args) => {
-    return new Promise((resolve, reject) => {
-        const process = (0, child_process_1.spawn)(command, args);
-        const output = [];
-        process.stdout.on('data', (data) => {
-            output.push(data.toString());
-        });
-        process.stderr.on('data', (data) => {
-            console.error(`stderr: ${data}`);
-        });
-        process.on('close', (code) => {
-            if (code !== 0) {
-                reject(new Error(`${command} process exited with code ${code}`));
-            }
-            else {
-                resolve(output.join('').trim().split('\n'));
-            }
-        });
-    });
-};
-const generateFileList = async () => {
-    try {
-        const lsOutput = await runCommand('ls', []);
-        const findOutput = await runCommand('find', ['.']);
-        const cleanedFindOutput = findOutput.map(file => file.startsWith('./') ? file.slice(2) : file);
-        const files = [...lsOutput, ...cleanedFindOutput];
-        const uniqueFiles = Array.from(new Set(files));
-        return uniqueFiles.filter(file => file && !file.includes('.git') && !file.includes('node_modules') && !file.includes('tmp'));
-    }
-    catch (error) {
-        console.error('Error generating file list:', error.message);
-        return [];
-    }
-};
-const collectSpecialFileContents = () => {
-    const specialFileContents = {};
-    for (const file of specialFiles) {
-        if (fs_1.default.existsSync(file)) {
-            try {
-                const content = fs_1.default.readFileSync(file, 'utf-8');
-                specialFileContents[file] = file.endsWith('.json') ? JSON.parse(content) : content;
-            }
-            catch (error) {
-                specialFileContents[file] = fs_1.default.readFileSync(file, 'utf-8');
-            }
-        }
-    }
-    return specialFileContents;
-};
-// Main function for the describe command
-const describe = async () => {
-    // Generate a temporary file path
-    const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `describe_${Date.now()}.tmp`);
-    try {
-        // Read .gitignore and create ignore instance
-        const gitignorePath = path_1.default.join(process.cwd(), '.gitignore');
-        const ig = (0, ignore_1.default)();
-        if (fs_1.default.existsSync(gitignorePath)) {
-            const gitignoreContent = fs_1.default.readFileSync(gitignorePath, 'utf-8');
-            ig.add(gitignoreContent);
-        }
-        // Generate the file list excluding .git, node_modules and matching .gitignore patterns
-        const fileList = await generateFileList();
-        const filteredFileList = fileList.filter(file => {
-            try {
-                return !ig.ignores(file);
-            }
-            catch (error) {
-                return false;
-            }
-        });
-        // Limit the file list to the first 100 files
-        const limitedFileList = filteredFileList.slice(0, 100);
-        // Collect the contents of special files
-        const specialFileContents = collectSpecialFileContents();
-        // Generate the JSON object for the AI chat model
-        const projectDetails = {
-            files: limitedFileList,
-            specialFiles: specialFileContents
-        };
-        const prompt = `Here is a JSON object describing my project:
-${JSON.stringify(projectDetails, null, 2)}
-
-Please return JSON-formatted metadata about the project, including:
-- The programming language(s) used
-- The detected framework(s) (if any)
-- The version of the language(s)
-
-Here is an example response:
-
-{
-  "languages": [
-    {
-      "name": "TypeScript",
-      "version": "~> 5.5.3"
-      "primary": true
-    },
-    {
-      "name": "JavaScript",
-      "version": "ES6+"
-    }
-  ],
-  "frameworks": [
-    {
-      "name": "Node.js",
-      "type": "Runtime environment",
-      "primary": true
-    }
-  ],
-  "testingFrameworks": [
-    {
-      "name": "Jest",
-      "type": "Testing framework",
-      "version": "29.7.0"
-      "directory": "tests"
-    },
-  ],
-  "buildTools": [
-    {
-      "name": "TypeScript Compiler (tsc)",
-      "type": "Transpiler"
-    },
-    {
-      "name": "Vite",
-      "type": "Build tool",
-      "version": "5.3.3"
-    }
-  ],
-  "packageManager": "Yarn",
-  "linters": [
-    {
-      "name": "ESLint",
-      "version": "9.6.0"
-    }
-  ],
-  "databases": [
-    {
-      "name": "MongoDB",
-      "version": "5.0.3",
-      "primary": true
-    }
-  ],
-  "projectType": "Command-line tool",
-}`;
-        // Estimate and print token count if DEBUG=1
-        if (process.env.DEBUG === '1') {
-            (0, string_utils_1.estimateTokens)(prompt).then(tokenCount => {
-                console.log(`Estimated token count: ${tokenCount}`);
-            });
-        }
-        // Instantiate ClovingGPT and get the AI chat response
-        const gpt = new cloving_gpt_1.default();
-        const aiChatResponse = await gpt.generateText({ prompt });
-        // Write the AI chat response to a temporary file
-        fs_1.default.writeFileSync(tempFilePath, aiChatResponse);
-        // Extract JSON metadata from the AI response
-        const jsonMetadata = (0, string_utils_1.extractJsonMetadata)(aiChatResponse);
-        if (jsonMetadata) {
-            console.log(jsonMetadata);
-        }
-        else {
-            console.log(aiChatResponse);
-        }
-        const response = jsonMetadata || aiChatResponse;
-        // Clean up
-        fs_1.default.unlinkSync(tempFilePath);
-        // Ask user if they want to save the result to cloving.json
-        const rl = readline_1.default.createInterface({
-            input: process.stdin,
-            output: process.stdout
-        });
-        rl.question('Do you want to save this file to cloving.json to improve the context of future cloving requests? [Yn] ', (answer) => {
-            rl.close();
-            if (answer.toLowerCase() === 'y' || answer.trim() === '') {
-                fs_1.default.writeFileSync('cloving.json', response);
-                console.log('File saved to cloving.json');
-            }
-            else {
-                console.log('File not saved.');
-            }
-        });
-    }
-    catch (error) {
-        console.error('Error describing the project:', error.message);
-    }
-};
-exports.describe = describe;
-exports.default = exports.describe;

package/dist/commands/generate/documentation.js

@@ -1,11 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const DocumentationManager_1 = __importDefault(require("../../managers/DocumentationManager"));
-const documentation = async (options) => {
-    const documentationManager = new DocumentationManager_1.default(options);
-    await documentationManager.generateDocumentation();
-};
-exports.default = documentation;

package/dist/commands/generate/fizzbuzz.js

@@ -1,35 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fizzbuzzCommand = void 0;
-const commander_1 = require("commander");
-const inquirer_1 = __importDefault(require("inquirer"));
-const cli_highlight_1 = __importDefault(require("cli-highlight"));
-const copy_paste_1 = __importDefault(require("copy-paste"));
-const fizzbuzz_utils_1 = require("../../utils/fizzbuzz_utils");
-exports.fizzbuzzCommand = new commander_1.Command('fizzbuzz')
-    .description('Generate FizzBuzz sequence')
-    .action(async () => {
-    const answers = await inquirer_1.default.prompt([
-        {
-            type: 'number',
-            name: 'start',
-            message: 'Enter the starting number:',
-            default: 1,
-        },
-        {
-            type: 'number',
-            name: 'end',
-            message: 'Enter the ending number:',
-            default: 100,
-        },
-    ]);
-    const fizzBuzzArray = (0, fizzbuzz_utils_1.generateFizzBuzzArray)(answers.start, answers.end);
-    const output = fizzBuzzArray.join('\n');
-    console.log((0, cli_highlight_1.default)(output, { language: 'plaintext', ignoreIllegals: true }));
-    copy_paste_1.default.copy(output, () => {
-        console.log('FizzBuzz sequence copied to clipboard!');
-    });
-});

package/dist/commands/generate/init.js

@@ -1,15 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
-const config_utils_1 = require("../../utils/config_utils");
-class InitCommand {
-    constructor(options) {
-        this.options = options;
-        this.chatHistory = [];
-        options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
-        this.gpt = new cloving_gpt_1.default(options);
-    }
-}

package/dist/commands/generate/sh.js

@@ -1,95 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const inquirer_1 = __importDefault(require("inquirer"));
-const cli_highlight_1 = __importDefault(require("cli-highlight"));
-const child_process_1 = require("child_process");
-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 cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
-const generateShellPrompt = (prompt) => {
-    const shell = (0, child_process_1.execSync)('echo $SHELL').toString().trim();
-    const os = (0, child_process_1.execSync)('echo $OSTYPE').toString().trim();
-    return `Generate an executable ${shell} script that works on ${os}. Try to make it a single line if possible and as simple and straightforward as possible.
-
-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:
-
-\`\`\`sh
-find . -type f -name "*.ts" -exec sed -i '' 's/old/new/g' {} +
-\`\`\`
-
-Don't use that script, it is only an example.
-
-Here is the description of what I want the script to do:
-
-${prompt}`;
-};
-const generateExplainShellPrompt = (prompt) => {
-    return `${prompt}
-  
-Please briefly explain how this shell script works.`;
-};
-const sh = async (options) => {
-    let { prompt } = options;
-    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
-    const gpt = new cloving_gpt_1.default(options);
-    try {
-        if (!prompt) {
-            prompt = await (0, command_utils_1.promptUser)('What would you like to do: ');
-        }
-        // 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':
-                (0, child_process_1.execFileSync)('pbcopy', { input: generatedShellWithoutShebang });
-                console.log('Script copied to clipboard.');
-                break;
-            case 'cancel':
-                console.log('Operation cancelled.');
-                break;
-        }
-    }
-    catch (error) {
-        console.error('Could not generate shell script');
-    }
-};
-exports.default = sh;