cloving 0.1.21 → 0.1.22

package/dist/commands/generate/code.js

@@ -3,328 +3,20 @@ 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 prompts_1 = require("@inquirer/prompts");
-const cli_highlight_1 = __importDefault(require("cli-highlight"));
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-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 config_utils_2 = require("../../utils/config_utils");
 const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
-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 = `### Request
-
-Generate code that does the following: ${prompt}
-
-### Description of 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 += `### Example of a well-structured response
-
-Here are the files that I would like to generate:
-
-1. **src/commands/generate/shell.ts**
-
-\`\`\`typescript
-import inquirer from 'inquirer'
-import highlight from 'cli-highlight'
-import { execSync } from 'child_process'
-import ncp from 'copy-paste'
-import { extractMarkdown } from '../../utils/string_utils'
-import { getConfig } from '../../utils/config_utils'
-import ClovingGPT from '../../cloving_gpt'
-import type { ClovingGPTOptions } from '../../utils/types'
-
-const generateShellPrompt = (prompt: string | undefined): string => {
-  const shell = execSync('echo $SHELL').toString().trim()
-  const os = 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:
-\`\`\`
-
-### Request
-
-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;
-};
-const generateExplainCodePrompt = (prompt) => {
-    return `${prompt}
-
-## Task
-
-Please briefly explain how the code works in this.`;
-};
-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]);
-            try {
-                console.log((0, cli_highlight_1.default)(lines.slice(1, -1).join('\n'), { language }));
-            }
-            catch (error) {
-                // don't highlight if it fails
-                console.log(lines.slice(1, -1).join('\n'));
-            }
-            console.log(lines.slice(-1)[0]);
-        }
-        else {
-            console.log((0, cli_highlight_1.default)(code, { language: 'markdown' }));
-        }
-    });
-};
-const saveGeneratedFiles = async (files, fileContents) => {
-    for (const file of files) {
-        if (fileContents[file]) {
-            const filePath = path_1.default.resolve(file);
-            await fs_1.default.promises.mkdir(path_1.default.dirname(filePath), { recursive: true });
-            await fs_1.default.promises.writeFile(filePath, fileContents[file]);
-            console.log(`${file} has been saved.`);
-        }
-        else {
-            console.log(`File content not found for ${file}.`);
-        }
-    }
-};
-const updateContextFiles = async (contextFiles, files, fileContents) => {
-    for (const file of files) {
-        if (fileContents[file]) {
-            contextFiles[file] = fileContents[file];
-        }
-    }
-};
-const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles, options) => {
-    const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
-    if (options.save) {
-        await saveGeneratedFiles(files, fileContents);
-        await updateContextFiles(contextFiles, files, fileContents);
-        return;
-    }
-    const action = await (0, prompts_1.select)({
-        message: 'What would you like to do?',
-        choices: [
-            { name: 'Revise', value: 'revise' },
-            { name: 'Explain', value: 'explain' },
-            { 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' },
-        ],
-    });
-    switch (action) {
-        case 'revise':
-            const newPrompt = await (0, prompts_1.input)({
-                message: 'How would you like to modify the output:',
-            });
-            let includeMoreFiles = true;
-            while (includeMoreFiles) {
-                const contextFile = await (0, prompts_1.input)({
-                    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);
-                }
-                else {
-                    includeMoreFiles = false;
-                }
-            }
-            const newRawCodeCommand = await generateCode(gpt, newPrompt, allSrcFiles, contextFiles, rawCodeCommand);
-            displayGeneratedCode(newRawCodeCommand);
-            await handleUserAction(gpt, newRawCodeCommand, newPrompt, allSrcFiles, contextFiles, options);
-            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':
-            let copyAnother = true;
-            while (copyAnother) {
-                const fileToCopy = await (0, prompts_1.select)({
-                    message: 'Which file do you want to copy to the clipboard?',
-                    choices: files.map(file => ({ name: file, value: file })),
-                });
-                if (fileContents[fileToCopy]) {
-                    copy_paste_1.default.copy(fileContents[fileToCopy], () => {
-                        console.log(`${fileToCopy} copied to clipboard`);
-                    });
-                }
-                else {
-                    console.log('File content not found.');
-                }
-                const copyMore = await (0, prompts_1.confirm)({
-                    message: 'Do you want to copy another file?',
-                    default: true,
-                });
-                copyAnother = copyMore;
-            }
-            break;
-        case 'copyAll':
-            copy_paste_1.default.copy(rawCodeCommand, () => {
-                console.log('Entire response copied to clipboard');
-            });
-            break;
-        case 'save':
-            let saveAnother = true;
-            while (saveAnother) {
-                const fileToSave = await (0, prompts_1.select)({
-                    message: 'Which file do you want to save?',
-                    choices: files.map(file => ({ name: file, value: file })),
-                });
-                if (fileContents[fileToSave]) {
-                    const filePath = path_1.default.resolve(fileToSave);
-                    await fs_1.default.promises.mkdir(path_1.default.dirname(filePath), { recursive: true });
-                    await fs_1.default.promises.writeFile(filePath, fileContents[fileToSave]);
-                    console.log(`${fileToSave} has been saved.`);
-                    await updateContextFiles(contextFiles, [fileToSave], fileContents);
-                }
-                else {
-                    console.log('File content not found.');
-                }
-                const saveMore = await (0, prompts_1.confirm)({
-                    message: 'Do you want to save another file?',
-                    default: true,
-                });
-                saveAnother = saveMore;
-            }
-            break;
-        case 'saveAll':
-            await saveGeneratedFiles(files, fileContents);
-            await updateContextFiles(contextFiles, files, fileContents);
-            console.log('All files have been saved.');
-            break;
-        case 'done':
-            break;
-    }
-};
+const CodeManager_1 = __importDefault(require("../../managers/CodeManager"));
 const code = async (options) => {
-    let { prompt, files } = options;
-    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+    options.silent = (0, config_utils_2.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
     const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, false);
-    let contextFiles = {};
-    try {
-        if (files) {
-            let expandedFiles = [];
-            for (const file of files) {
-                const filePath = path_1.default.resolve(file);
-                if (await fs_1.default.promises.stat(filePath).then(stat => stat.isDirectory()).catch(() => false)) {
-                    const dirFiles = await (0, command_utils_1.getAllFilesInDirectory)(filePath);
-                    expandedFiles = expandedFiles.concat(dirFiles.map(f => path_1.default.relative(process.cwd(), f)));
-                }
-                else {
-                    expandedFiles.push(path_1.default.relative(process.cwd(), filePath));
-                }
-            }
-            files = expandedFiles;
-            for (const file of files) {
-                const filePath = path_1.default.resolve(file);
-                if (await fs_1.default.promises.stat(filePath).then(stat => stat.isFile()).catch(() => false)) {
-                    const content = await fs_1.default.promises.readFile(filePath, 'utf-8');
-                    contextFiles[file] = content;
-                }
-            }
-        }
-        else {
-            let includeMoreFiles = true;
-            while (includeMoreFiles) {
-                const contextFile = await (0, prompts_1.input)({
-                    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);
-                }
-                else {
-                    includeMoreFiles = false;
-                }
-            }
-        }
-        if (!prompt) {
-            const userPrompt = await (0, prompts_1.input)({
-                message: 'What would you like the code to do:',
-            });
-            prompt = userPrompt;
-        }
-        let rawCodeCommand = await generateCode(gpt, prompt, allSrcFiles, contextFiles);
-        displayGeneratedCode(rawCodeCommand);
-        if (options.save) {
-            const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
-            await saveGeneratedFiles(files, fileContents);
-            await updateContextFiles(contextFiles, files, fileContents);
-        }
-        else {
-            await handleUserAction(gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles, options);
-        }
-        if (options.interactive) {
-            let continueInteractive = true;
-            while (continueInteractive) {
-                const newPrompt = await (0, prompts_1.input)({
-                    message: 'Revise the code (or press enter to finish):',
-                });
-                if (newPrompt.trim() === '') {
-                    continueInteractive = false;
-                }
-                else {
-                    let includeMoreFiles = true;
-                    while (includeMoreFiles) {
-                        const contextFile = await (0, prompts_1.input)({
-                            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);
-                        }
-                        else {
-                            includeMoreFiles = false;
-                        }
-                    }
-                    rawCodeCommand = await generateCode(gpt, newPrompt, allSrcFiles, contextFiles, rawCodeCommand);
-                    displayGeneratedCode(rawCodeCommand);
-                    if (options.save || options.interactive) {
-                        const [files, fileContents] = (0, string_utils_1.extractFilesAndContent)(rawCodeCommand);
-                        await saveGeneratedFiles(files, fileContents);
-                        await updateContextFiles(contextFiles, files, fileContents);
-                    }
-                    else {
-                        await handleUserAction(gpt, rawCodeCommand, newPrompt, allSrcFiles, contextFiles, options);
-                    }
-                }
-            }
-        }
+    const codeManager = new CodeManager_1.default(gpt, options, allSrcFiles);
+    if (options.prompt) {
+        await codeManager.processCode(options.prompt);
     }
-    catch (error) {
-        console.error('Could not generate code', error);
+    else {
+        console.error('No prompt provided.');
     }
 };
 exports.default = code;

package/dist/commands/generate/commit.js

@@ -7,27 +7,9 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const string_utils_1 = require("../../utils/string_utils");
+const git_utils_1 = require("../../utils/git_utils");
 const config_utils_1 = require("../../utils/config_utils");
 const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
-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);
@@ -40,7 +22,7 @@ const commit = async (options) => {
             return;
         }
         // Generate the prompt for commit message
-        const prompt = generateCommitMessagePrompt(diff);
+        const prompt = (0, git_utils_1.generateCommitMessagePrompt)(diff);
         // Instantiate ClovingGPT and get the commit message
         const rawCommitMessage = await gpt.generateText({ prompt });
         // Clean the commit message using extractMarkdown

package/dist/commands/proxy.js

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

package/dist/commands/tokens.js

@@ -0,0 +1,43 @@
+"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 config_utils_1 = require("../utils/config_utils");
+const command_utils_1 = require("../utils/command_utils");
+const tokens = async (options) => {
+    let contextFiles = {};
+    let files = options.files || '.';
+    let prompt = '';
+    let expandedFiles = [];
+    for (const file of files) {
+        const filePath = path_1.default.resolve(file);
+        if (await fs_1.default.promises.stat(filePath).then(stat => stat.isDirectory()).catch(() => false)) {
+            const dirFiles = await (0, command_utils_1.getAllFilesInDirectory)(filePath);
+            expandedFiles = expandedFiles.concat(dirFiles.map(f => path_1.default.relative(process.cwd(), f)));
+        }
+        else {
+            expandedFiles.push(path_1.default.relative(process.cwd(), filePath));
+        }
+    }
+    files = expandedFiles;
+    for (const file of files) {
+        const filePath = path_1.default.resolve(file);
+        if (await fs_1.default.promises.stat(filePath).then(stat => stat.isFile()).catch(() => false)) {
+            const content = await fs_1.default.promises.readFile(filePath, 'utf-8');
+            contextFiles[file] = content;
+        }
+    }
+    const contextFileContents = Object.keys(contextFiles).map((file) => `### Contents of ${file}\n\n${contextFiles[file]}\n\n`).join('\n');
+    prompt += `
+### Description of App
+
+${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+
+${contextFileContents}`;
+    const tokens = Math.ceil(prompt.length / 4).toLocaleString();
+    console.log(`Estimated tokens: ${tokens}`);
+};
+exports.default = tokens;

package/dist/index.js

@@ -9,7 +9,10 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const config_1 = __importDefault(require("./commands/config"));
 const init_1 = __importDefault(require("./commands/init"));
+const proxy_1 = __importDefault(require("./commands/proxy"));
+const tokens_1 = __importDefault(require("./commands/tokens"));
 const models_1 = __importDefault(require("./commands/models"));
+const chat_1 = __importDefault(require("./commands/chat"));
 const shell_1 = __importDefault(require("./commands/generate/shell"));
 const code_1 = __importDefault(require("./commands/generate/code"));
 const commit_1 = __importDefault(require("./commands/generate/commit"));
@@ -41,11 +44,31 @@ program
     .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)')
     .action(init_1.default);
+program
+    .command('chat')
+    .option('-f, --files <filenames...>', 'Specify filenames of files with context to use for generating code')
+    .option('-t, --temperature <temperature>', 'Temperature for the model (default 0.2)')
+    .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5:sonnet-20240620)')
+    .description('Start an interactive chat with cloving')
+    .action(chat_1.default);
+program
+    .command('proxy')
+    .option('-f, --files <filenames...>', 'Specify filenames of files with context to use for generating code')
+    .option('-t, --temperature <temperature>', 'Temperature for the model (default 0.2)')
+    .option('-m, --model <model>', 'Select the model to use (e.g., openai, claude, ollama, ollama:llama3, claude:claude-3-5:sonnet-20240620)')
+    .description('Start a proxy server to use with cloving')
+    .action(proxy_1.default);
 program
     .command('models')
     .alias('m')
     .description('List available models')
     .action(models_1.default);
+program
+    .command('tokens')
+    .alias('t')
+    .option('-f, --files <filenames...>', 'Specify filenames of files with context to use for generating code')
+    .description('Estimate the number of tokens in the current working directory or specified files')
+    .action(tokens_1.default);
 program
     .command('commit')
     .alias('c')