cloving 0.1.12 → 0.1.14

package/dist/commands/generate/code.js

@@ -6,12 +6,12 @@ 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 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 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');
@@ -62,29 +62,6 @@ Do not add any commentary or context to the message other than the commit messag
 An example of the output for this should look like the following:
 \`\`\`
 
-2. **src/commands/generate/code.ts**
-
-\`\`\`typescript
-import ncp from 'copy-paste'
-import inquirer from 'inquirer'
-import highlight from 'cli-highlight'
-import { collectSpecialFileContents } from '../../utils/command_utils'
-import { getConfig, getClovingConfig, getAllFiles } from '../../utils/config_utils'
-import { parseMarkdownInstructions, extractMarkdown } from '../../utils/string_utils'
-import ClovingGPT from '../../cloving_gpt'
-import type { ClovingGPTOptions } from '../../utils/types'
-import fs from 'fs'
-import path from 'path'
-
-const generateCodePrompt = (prompt: string | undefined, files: string[], contextFiles: Record<string, string>, previousCode?: string): string => {
-  const specialFileContents = 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')
-
-  return 'Here is a description of my app:'
-}
-\`\`\`
-
 ### Request
 
 Generate code that does the following: ${prompt}
@@ -94,8 +71,10 @@ Do not use any data from the example response structure, only use the structure.
 };
 const generateExplainCodePrompt = (prompt) => {
     return `${prompt}
-  
-Please briefly explain how this code works.`;
+
+## 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);
@@ -121,8 +100,33 @@ const displayGeneratedCode = (rawCodeCommand) => {
         }
     });
 };
-const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contextFiles) => {
+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 inquirer_1.default.prompt([
         {
             type: 'list',
@@ -148,9 +152,25 @@ const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contex
                     message: 'How would you like to modify the output:',
                 },
             ]);
+            let includeMoreFiles = true;
+            while (includeMoreFiles) {
+                const { contextFile } = await inquirer_1.default.prompt([
+                    {
+                        type: 'input',
+                        name: 'contextFile',
+                        message: 'Enter the relative path of a file or directory you would like to include as context (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);
+            await handleUserAction(gpt, newRawCodeCommand, newPrompt, allSrcFiles, contextFiles, options);
             break;
         case 'explain':
             const explainPrompt = generateExplainCodePrompt(rawCodeCommand);
@@ -205,9 +225,10 @@ const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contex
                 ]);
                 if (fileContents[fileToSave]) {
                     const filePath = path_1.default.resolve(fileToSave);
-                    fs_1.default.mkdirSync(path_1.default.dirname(filePath), { recursive: true });
-                    fs_1.default.writeFileSync(filePath, fileContents[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.');
@@ -224,80 +245,45 @@ const handleUserAction = async (gpt, rawCodeCommand, prompt, allSrcFiles, contex
             }
             break;
         case 'saveAll':
-            files.forEach(file => {
-                if (fileContents[file]) {
-                    const filePath = path_1.default.resolve(file);
-                    fs_1.default.mkdirSync(path_1.default.dirname(filePath), { recursive: true });
-                    fs_1.default.writeFileSync(filePath, fileContents[file]);
-                    console.log(`${file} has been saved.`);
-                }
-                else {
-                    console.log(`File content not found for ${file}.`);
-                }
-            });
+            await saveGeneratedFiles(files, fileContents);
+            await updateContextFiles(contextFiles, files, fileContents);
             console.log('All files have been saved.');
             break;
         case 'done':
             break;
     }
 };
-const addFilesToContext = async (contextFiles, filePath) => {
-    const stats = fs_1.default.statSync(filePath);
-    if (stats.isDirectory()) {
-        const files = fs_1.default.readdirSync(filePath);
-        for (const file of files) {
-            await addFilesToContext(contextFiles, path_1.default.join(filePath, file));
-        }
-    }
-    else if (stats.isFile()) {
-        const content = fs_1.default.readFileSync(filePath, 'utf-8');
-        contextFiles[filePath] = content;
-    }
-};
 const code = async (options) => {
     let { prompt, files } = options;
     options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
     const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, false);
-    const contextFiles = {};
+    let contextFiles = {};
     try {
         if (files) {
-            files.forEach(async (file) => {
-                await addFilesToContext(contextFiles, file);
-            });
+            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 firstFile = true;
             let includeMoreFiles = true;
             while (includeMoreFiles) {
-                const { includeMore } = await inquirer_1.default.prompt([
+                const { contextFile } = await inquirer_1.default.prompt([
                     {
-                        type: 'confirm',
-                        name: 'includeMore',
-                        message: `Do you want to include any${firstFile ? '' : ' other'} files or directories as context for the prompt?`,
-                        default: false,
+                        type: 'input',
+                        name: 'contextFile',
+                        message: `Enter the relative path of a file or directory you would like to include as context (or press enter to continue):`,
                     },
                 ]);
-                firstFile = false;
-                includeMoreFiles = includeMore;
-                if (includeMoreFiles) {
-                    const { contextFile } = await inquirer_1.default.prompt([
-                        {
-                            type: 'input',
-                            name: 'contextFile',
-                            message: 'Enter the relative path of a file or directory you would like to include as context:',
-                        },
-                    ]);
-                    if (contextFile) {
-                        const filePath = path_1.default.resolve(contextFile);
-                        if (fs_1.default.existsSync(filePath)) {
-                            await addFilesToContext(contextFiles, filePath);
-                            console.log(`Added ${filePath} to context.`);
-                        }
-                        else {
-                            console.log(`File or directory ${contextFile} does not exist.`);
-                        }
-                    }
+                if (contextFile) {
+                    contextFiles = await (0, command_utils_1.addFileOrDirectoryToContext)(contextFile, contextFiles, options);
+                }
+                else {
+                    includeMoreFiles = false;
                 }
             }
         }
@@ -311,20 +297,59 @@ const code = async (options) => {
             ]);
             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) {
-                await addFilesToContext(contextFiles, file);
+        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 inquirer_1.default.prompt([
+                    {
+                        type: 'input',
+                        name: 'newPrompt',
+                        message: 'Revise the code (or press enter to finish):',
+                    },
+                ]);
+                if (newPrompt.trim() === '') {
+                    continueInteractive = false;
+                }
+                else {
+                    let includeMoreFiles = true;
+                    while (includeMoreFiles) {
+                        const { contextFile } = await inquirer_1.default.prompt([
+                            {
+                                type: 'input',
+                                name: 'contextFile',
+                                message: 'Enter the relative path of a file or directory you would like to include as context (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 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);

package/dist/commands/generate/context.js

@@ -0,0 +1,69 @@
+"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 copy_paste_1 = __importDefault(require("copy-paste"));
+const command_utils_1 = require("../../utils/command_utils");
+const config_utils_1 = require("../../utils/config_utils");
+const generateContextPrompt = (files, contextFiles) => {
+    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');
+    return `### Description of App
+
+${JSON.stringify((0, config_utils_1.getClovingConfig)(), null, 2)}
+
+${specialFiles}
+
+${contextFileContents}
+
+### Directory structure
+
+${files.join('\n')}`;
+};
+const context = async (options) => {
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+    const allSrcFiles = await (0, config_utils_1.getAllFiles)(options, false);
+    let contextFiles = {};
+    try {
+        let includeMoreFiles = true;
+        while (includeMoreFiles) {
+            const { contextFile } = await inquirer_1.default.prompt([
+                {
+                    type: 'input',
+                    name: 'contextFile',
+                    message: `Enter the relative path of a file or directory you would like to include as context (or press enter to continue):`,
+                },
+            ]);
+            if (contextFile) {
+                contextFiles = await (0, command_utils_1.addFileOrDirectoryToContext)(contextFile, contextFiles, options);
+            }
+            else {
+                includeMoreFiles = false;
+            }
+        }
+        const contextPrompt = generateContextPrompt(allSrcFiles, contextFiles);
+        console.log('\nGenerated Context Prompt:');
+        console.log((0, cli_highlight_1.default)(contextPrompt, { language: 'markdown' }));
+        const { copyToClipboard } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'copyToClipboard',
+                message: 'Do you want to copy the context prompt to your clipboard?',
+                default: true,
+            },
+        ]);
+        if (copyToClipboard) {
+            copy_paste_1.default.copy(contextPrompt, () => {
+                console.log('Context prompt copied to clipboard');
+            });
+        }
+    }
+    catch (error) {
+        console.error('Could not generate context', error);
+    }
+};
+exports.default = context;

package/dist/commands/generate/shell.js

@@ -31,7 +31,9 @@ ${prompt}`;
 };
 const generateExplainShellPrompt = (prompt) => {
     return `${prompt}
-  
+
+## Task
+
 Please briefly explain how this shell script works.`;
 };
 const generateShell = async (gpt, prompt) => {

package/dist/commands/init.js

@@ -42,18 +42,15 @@ technologies used. This will provide better context for future Cloving requests.
         return;
     }
     if (!(0, command_utils_1.checkForSpecialFiles)()) {
-        const { continueAnswer } = await inquirer_1.default.prompt([
+        const { technologies } = await inquirer_1.default.prompt([
             {
-                type: 'confirm',
-                name: 'continueAnswer',
-                message: 'No special files detected. Are you currently inside a software project\'s main directory? Do you want to continue analyzing this directory for the Cloving setup process?',
-                default: true,
+                type: 'input',
+                name: 'technologies',
+                message: 'No special files detected. Please describe the main technologies used in your project:',
+                validate: (input) => input.trim().length > 0 || 'Please provide a description of the technologies used.',
             },
         ]);
-        if (!continueAnswer) {
-            console.log('Operation aborted by the user.');
-            return;
-        }
+        specialFileContents['description'] = technologies;
     }
     const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `describe_${Date.now()}.tmp`);
     try {
@@ -73,10 +70,6 @@ technologies used. This will provide better context for future Cloving requests.
             }
         });
         const limitedFileList = filteredFileList.slice(0, 100);
-        if (specialFileNames.length === 0) {
-            console.error('No special files found.');
-            return;
-        }
         const projectDetails = {
             files: limitedFileList,
             specialFiles: specialFileContents

package/dist/index.js

@@ -13,6 +13,7 @@ const models_1 = __importDefault(require("./commands/models"));
 const shell_1 = __importDefault(require("./commands/generate/shell"));
 const code_1 = __importDefault(require("./commands/generate/code"));
 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 init_2 = __importDefault(require("./commands/project/init"));
@@ -69,8 +70,10 @@ generate
     .command('code')
     .alias('c')
     .description('Generate code based on a prompt')
+    .option('--save', 'Automatically save all files after generating the code')
+    .option('-i, --interactive', 'Auto-save generated code and then show a new prompt with existing context to revise the code further')
     .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('-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')
     .option('-f, --files <filenames...>', 'Specify filenames of files with context to use for generating code')
     .action(code_1.default);
@@ -80,6 +83,10 @@ generate
     .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(commit_1.default);
+generate
+    .command('context')
+    .description('Create a context string for generating code')
+    .action(context_1.default);
 generate
     .command('unit-tests')
     .alias('u')

package/dist/package.json

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

package/dist/utils/command_utils.js

@@ -3,40 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFileContent = exports.fetchModels = exports.runCommand = exports.generateFileList = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.SPECIAL_FILES = void 0;
+exports.addFileOrDirectoryToContext = exports.readFileContent = exports.fetchModels = exports.runCommand = exports.generateFileList = exports.checkForSpecialFiles = exports.collectSpecialFileContents = exports.SPECIAL_FILES = void 0;
 const child_process_1 = require("child_process");
 const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const config_utils_1 = require("./config_utils");
 exports.SPECIAL_FILES = [
-    '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'
+    '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 collectSpecialFileContents = () => {
     const specialFileContents = {};
@@ -54,9 +31,7 @@ const collectSpecialFileContents = () => {
     return specialFileContents;
 };
 exports.collectSpecialFileContents = collectSpecialFileContents;
-const checkForSpecialFiles = () => {
-    return exports.SPECIAL_FILES.some(file => fs_1.default.existsSync(file));
-};
+const checkForSpecialFiles = () => exports.SPECIAL_FILES.some(file => fs_1.default.existsSync(file));
 exports.checkForSpecialFiles = checkForSpecialFiles;
 const generateFileList = async () => {
     try {
@@ -115,3 +90,28 @@ const readFileContent = (file) => {
     }
 };
 exports.readFileContent = readFileContent;
+const addFileOrDirectoryToContext = async (contextFile, contextFiles, options) => {
+    const filePath = path_1.default.resolve(contextFile);
+    if (await fs_1.default.promises.stat(filePath).then(stat => stat.isDirectory()).catch(() => false)) {
+        // Add all files in the specified directory
+        const files = await (0, config_utils_1.getAllFiles)(options, false);
+        for (const file of files) {
+            // if the file is in the same directory as the context file, add it to the context
+            if (path_1.default.dirname(file) === path_1.default.dirname(filePath)) {
+                const content = await fs_1.default.promises.readFile(file, 'utf-8');
+                contextFiles[path_1.default.relative(process.cwd(), file)] = content;
+            }
+        }
+        console.log(`Added contents of ${contextFile} to context.`);
+    }
+    else 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[contextFile] = content;
+        console.log(`Added ${filePath} to context.`);
+    }
+    else {
+        console.log(`File or directory ${contextFile} does not exist.`);
+    }
+    return contextFiles;
+};
+exports.addFileOrDirectoryToContext = addFileOrDirectoryToContext;

package/package.json

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