cloving 0.3.5 → 0.3.7

package/README.md

@@ -1,6 +1,12 @@
-# Cloving - CLI Code Generation with AI
+# Cloving
 
-Cloving CLI is a command line utility which integrates AI into your development workflow. It provides AI-powered code generation, commit message generation, code reviews, unit test generation, and more.
+An AI pair-programmer for the command line.
+
+LLM-powered shell commands, code generation, commit messages, code reviews, unit test generation, and more. Works with most popular LLMs including OpenAI, Claude, Gemini, Ollama, and more.
+
+[![asciicast](https://asciinema.org/a/SCcxw4B2XFQaTD0GeDTk0xbuq.svg)](https://asciinema.org/a/SCcxw4B2XFQaTD0GeDTk0xbuq)
+
+Cloving CLI is a command line utility which integrates AI into your development workflow.
 
 What makes the Cloving CLI different from other AI tools is that it builds sophisticated context-aware prompts to generate code, commit messages, and more.
 

package/dist/cloving_gpt/index.js

@@ -169,7 +169,7 @@ class ClovingGPT {
             if (errorMessage === '') {
                 errorMessage = 'connection error';
             }
-            console.error(`Error communicating with the GPT server (${this.adapter.getEndpoint(this.stream)})\n\n${JSON.stringify(error.response?.data || "''", null, 2)}\n`);
+            console.error(`Error communicating with the GPT server (${this.adapter.getEndpoint(this.stream)})\n\n${colors_1.default.red.bold(JSON.stringify(error.response?.data || "''", null, 2))}\n`);
             throw error;
         }
     }

package/dist/commands/config.js

@@ -2,7 +2,7 @@
 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 prompt_utils_1 = require("../utils/prompt_utils");
 const prompts_1 = require("@inquirer/prompts");
 const config = async () => {
     let currentConfig = (0, config_utils_1.getConfig)({});
@@ -10,7 +10,7 @@ const config = async () => {
     if (!currentConfig.models) {
         currentConfig.models = {};
     }
-    const models = await (0, command_utils_1.fetchModels)();
+    const models = await (0, prompt_utils_1.fetchModels)();
     if (models.length === 0) {
         console.error('No models available.');
         throw new Error('No models available');

package/dist/commands/generate/context.js

@@ -8,10 +8,10 @@ const copy_paste_1 = __importDefault(require("copy-paste"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const prompts_1 = require("@inquirer/prompts");
-const command_utils_1 = require("../../utils/command_utils");
+const prompt_utils_1 = require("../../utils/prompt_utils");
 const config_utils_1 = require("../../utils/config_utils");
 const generateContextPrompt = (files, contextFiles) => {
-    const specialFileContents = (0, command_utils_1.collectSpecialFileContents)();
+    const specialFileContents = (0, prompt_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');
@@ -55,7 +55,7 @@ const context = async (options) => {
                     message: 'Enter the relative path of a file or directory you would like to include as context (or press enter to continue):',
                 });
                 if (contextFile) {
-                    contextFiles = await (0, command_utils_1.addFileOrDirectoryToContext)(contextFile, contextFiles, options);
+                    contextFiles = await (0, prompt_utils_1.addFileOrDirectoryToContext)(contextFile, contextFiles, options);
                 }
                 else {
                     includeMoreFiles = false;

package/dist/commands/init.js

@@ -4,225 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
-const fs_1 = __importDefault(require("fs"));
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const prompts_1 = require("@inquirer/prompts");
-const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
-const ignore_1 = __importDefault(require("ignore"));
-const string_utils_1 = require("../utils/string_utils");
-const config_utils_1 = require("../utils/config_utils");
-const command_utils_1 = require("../utils/command_utils");
-// Main function for the describe command
+const InitManager_1 = __importDefault(require("../managers/InitManager"));
 const init = async (options) => {
-    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
-    const gpt = new cloving_gpt_1.default(options);
-    const specialFileContents = (0, command_utils_1.collectSpecialFileContents)();
-    const specialFileNames = Object.keys(specialFileContents).map((file) => ' - ' + file);
-    // Initialize chat history
-    const chatHistory = [
-        {
-            role: 'system',
-            content: `You are an AI assistant helping to initialize a project by analyzing its structure and technologies.
-
-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 a typescript interface for the expected response:
-
-interface LanguageConfig {
-  name: string
-  version?: string
-  primary?: boolean
-  directory: string
-  extension: string
-}
-
-interface FrameworkConfig {
-  name: string
-  type: string
-  version?: string
-  primary?: boolean
-  directory?: string
-  extension?: string
-}
-
-interface TestingFrameworkConfig {
-  name: string
-  type: string
-  version?: string
-  directory?: string
-}
-
-interface BuildToolConfig {
-  name: string
-  type: string
-  version?: string
-}
-
-interface LinterConfig {
-  name: string
-  version?: string
-  type?: string
-}
-
-interface DatabaseConfig {
-  name: string
-  primary?: boolean
-}
-
-export interface ClovingfileConfig {
-  languages: LanguageConfig[]
-  frameworks: FrameworkConfig[]
-  testingFrameworks?: TestingFrameworkConfig[]
-  buildTools: BuildToolConfig[]
-  packageManager: string
-  linters: LinterConfig[]
-  databases?: DatabaseConfig[]
-  projectType: string
-}
-
-Here is an example response:
-
-{
-  "languages": [
-    {
-      "name": "TypeScript",
-      "version": "~> 5.5.3"
-      "primary": true,
-      "directory": "src",
-      "extension": ".ts"
-    },
-    {
-      "name": "JavaScript",
-      "version": "ES6+",
-      "directory": "src",
-      "extension": ".js"
-    }
-  ],
-  "frameworks": [
-    {
-      "name": "Node.js",
-      "type": "Runtime environment",
-      "primary": true,
-      "directory": "src",
-      "extension": ".js"
-    }
-  ],
-  "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",
-}`,
-        },
-    ];
-    if (!options.silent) {
-        if (specialFileNames.length > 0) {
-            console.log(`Cloving will analyze the list of files and the contents of the following files:
-
-${specialFileNames.join('\n')}
-
-Cloving will send AI a request to summarize the technologies used in this project.
-
-This will provide better context for future Cloving requests.`);
-        }
-        else {
-            console.log(`
-This script will analyze the list of files in the current directory using GPT to summarize the
-technologies used. This will provide better context for future Cloving requests.
-      `);
-        }
-    }
-    const config = (0, config_utils_1.getConfig)(options);
-    if (!config || !config?.models) {
-        console.error('No cloving configuration found. Please run `cloving config`');
-        return;
-    }
-    if (!(0, command_utils_1.checkForSpecialFiles)()) {
-        console.error('No dependencies files detected. Please add a dependency file (e.g. package.json, Gemfile, requirements.txt, etc.) to your project and run `cloving init` again.');
-        return;
-    }
-    const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `describe_${Date.now()}.tmp`);
-    try {
-        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);
-        }
-        const fileList = await (0, command_utils_1.generateFileList)();
-        const filteredFileList = fileList.filter((file) => {
-            try {
-                return !ig.ignores(file);
-            }
-            catch (error) {
-                return false;
-            }
-        });
-        const limitedFileList = filteredFileList.slice(0, 100);
-        const projectDetails = {
-            files: limitedFileList,
-            specialFiles: specialFileContents,
-        };
-        const prompt = `Here is a JSON object describing my project:
-${JSON.stringify(projectDetails, null, 2)}`;
-        chatHistory.push({ role: 'user', content: prompt });
-        const aiChatResponse = await gpt.generateText({ prompt, messages: chatHistory });
-        chatHistory.push({ role: 'assistant', content: aiChatResponse });
-        const cleanAiChatResponse = (0, string_utils_1.extractJsonMetadata)(aiChatResponse);
-        fs_1.default.writeFileSync(tempFilePath, cleanAiChatResponse);
-        // Save the AI chat response to cloving.json
-        fs_1.default.writeFileSync('cloving.json', cleanAiChatResponse);
-        console.log('Project data saved to cloving.json');
-        // Prompt the user if they want to review the generated cloving.json
-        if (!options.silent) {
-            const reviewAnswer = await (0, prompts_1.confirm)({
-                message: 'Do you want to review the generated data?',
-                default: true,
-            });
-            if (reviewAnswer) {
-                console.log(cleanAiChatResponse);
-            }
-        }
-        // Clean up
-        fs_1.default.unlinkSync(tempFilePath);
-    }
-    catch (error) {
-        console.error('Error describing the project:', error.message);
-    }
+    const initManager = new InitManager_1.default(options);
+    await initManager.initialize();
 };
 exports.init = init;
 exports.default = exports.init;

package/dist/commands/tokens.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const config_utils_1 = require("../utils/config_utils");
-const command_utils_1 = require("../utils/command_utils");
+const prompt_utils_1 = require("../utils/prompt_utils");
 const tokens = async (options) => {
     let contextFiles = {};
     let files = options.files || '.';
@@ -18,7 +18,7 @@ const tokens = async (options) => {
             .stat(filePath)
             .then((stat) => stat.isDirectory())
             .catch(() => false)) {
-            const dirFiles = await (0, command_utils_1.getAllFilesInDirectory)(filePath);
+            const dirFiles = await (0, prompt_utils_1.getAllFilesInDirectory)(filePath);
             expandedFiles = expandedFiles.concat(dirFiles.map((f) => path_1.default.relative(process.cwd(), f)));
         }
         else {

package/dist/index.js

@@ -17,12 +17,12 @@ const commit_1 = __importDefault(require("./commands/generate/commit"));
 const context_1 = __importDefault(require("./commands/generate/context"));
 const unit_tests_1 = __importDefault(require("./commands/generate/unit_tests"));
 const review_1 = __importDefault(require("./commands/generate/review"));
-const command_utils_1 = require("./utils/command_utils");
+const prompt_utils_1 = require("./utils/prompt_utils");
 const program = new commander_1.Command();
 program
     .name('cloving')
     .description('Integrate AI into your development workflow for generating commit messages, code reviews, and unit tests.')
-    .version((0, command_utils_1.getPackageVersion)());
+    .version((0, prompt_utils_1.getPackageVersion)());
 program
     .command('config')
     .description('Configure cloving with your API key and models to use')
@@ -71,6 +71,7 @@ generate
     .command('shell')
     .alias('sh')
     .description('Generate a shell command based on a prompt')
+    .option('-e, --exec', 'Automatically execute the generated shell command')
     .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)')
     .option('-p, --prompt <prompt>', 'Specify the prompt to use')

package/dist/managers/BlockManager.js

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const events_1 = require("events");
+// Passes through string chunks, looking for code blocks, when it finds one, it starts buffering until it finds the end of the block
+// Then it emits the code block and clears the buffer and continues
+class BlockManager extends events_1.EventEmitter {
+    constructor() {
+        super(...arguments);
+        this.buffer = '';
+        this.codeBuffer = '';
+        this.isBufferingCode = false;
+        this.isWaitingForContent = false;
+    }
+    // add content to the buffer, watching for code blocks along the way
+    addContent(content) {
+        // when getting ` , just add it to the buffer until we get a char that isn't `
+        if (content.includes('`')) {
+            this.isWaitingForContent = true;
+            this.buffer += content;
+            return;
+        }
+        else if (this.isWaitingForContent) {
+            content = this.buffer + content;
+            this.buffer = '';
+        }
+        const codeBlockMarker = '\n```';
+        let markerIndex = content.indexOf(codeBlockMarker);
+        if (content.startsWith('```'))
+            markerIndex = 0;
+        if (markerIndex !== -1) {
+            if (this.isBufferingCode) {
+                // End of code block
+                this.codeBuffer += content.slice(0, markerIndex + codeBlockMarker.length);
+                const rest = content.slice(markerIndex + codeBlockMarker.length);
+                this.emit('endGeneratingCode');
+                this.emitCodeBlock();
+                this.emit('content', rest);
+            }
+            else {
+                // Start of code block
+                this.emitBuffer(content.slice(0, markerIndex));
+                this.codeBuffer = content.slice(markerIndex);
+                this.emit('startGeneratingCode');
+                this.isBufferingCode = true;
+            }
+        }
+        else {
+            // No code block marker found
+            if (this.isBufferingCode) {
+                this.codeBuffer += content;
+            }
+            else {
+                this.buffer += content;
+            }
+        }
+        if (!this.isBufferingCode && this.buffer) {
+            this.emitBuffer();
+        }
+    }
+    emitBuffer(additionalContent = '') {
+        const contentToEmit = this.buffer + additionalContent;
+        if (contentToEmit) {
+            this.emit('content', contentToEmit);
+            this.clearBuffer();
+        }
+    }
+    emitCodeBlock() {
+        if (this.codeBuffer.length > 0) {
+            const codeParts = this.parseCodeBuffer();
+            if (codeParts) {
+                const { language, currentStart, newEnd, currentCode, newCode } = codeParts;
+                this.emit('codeBlock', {
+                    language,
+                    currentStart,
+                    newEnd,
+                    currentCode,
+                    newCode,
+                    raw: this.codeBuffer,
+                });
+                this.emit('content', this.buffer);
+                this.clearBuffer();
+            }
+            else {
+                this.emit('content', this.codeBuffer);
+                this.clearBuffer();
+            }
+        }
+    }
+    /**
+     * Parses a code buffer into its constituent parts.
+     *
+     * This function takes a code buffer as a string, splits it into lines, and identifies the language,
+     * current start index, divider index, and new end index. It then extracts the current code and new code
+     * from the buffer based on these indices.
+     *
+     * @return {{ language: string, currentStart: string, newEnd: string, current: string, newCode: string, afterCode: string }}
+     *   An object containing the language, current start, new end, current code, and new code.
+     */
+    parseCodeBuffer() {
+        const lines = this.codeBuffer.split('\n');
+        const language = lines[0].trim().slice(3); // Remove '```' from the language line
+        const currentStartIndex = lines.findIndex((line) => line.startsWith('<<<<<<< CURRENT'));
+        const dividerIndex = lines.findIndex((line) => line === '=======');
+        const newEndIndex = lines.findIndex((line) => line.startsWith('>>>>>>> NEW'));
+        if (currentStartIndex === -1 || dividerIndex === -1 || newEndIndex === -1) {
+            return null;
+        }
+        const currentCode = lines.slice(currentStartIndex + 1, dividerIndex).join('\n');
+        const newCode = lines.slice(dividerIndex + 1, newEndIndex).join('\n');
+        return {
+            language,
+            currentStart: lines[currentStartIndex],
+            newEnd: lines[newEndIndex],
+            currentCode,
+            newCode,
+        };
+    }
+    clearBuffer() {
+        this.buffer = '';
+        this.codeBuffer = '';
+        this.isBufferingCode = false;
+        this.isWaitingForContent = false;
+    }
+}
+exports.default = BlockManager;