cloving 0.1.0 → 0.1.1-8.1

package/dist/commands/init.js

@@ -7,14 +7,15 @@ exports.init = void 0;
 const fs_1 = __importDefault(require("fs"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
-const string_utils_1 = require("../utils/string_utils");
+const prompts_1 = require("@inquirer/prompts");
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
 const ignore_1 = __importDefault(require("ignore"));
-const string_utils_2 = require("../utils/string_utils");
+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 init = async (options) => {
-    options.silent = (0, command_utils_1.getConfig)().silent || false;
+    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);
@@ -22,33 +23,30 @@ const init = async (options) => {
         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.
+${specialFileNames.join("\n")}
 
-  This will provide better context for future Cloving requests.
+Cloving will send AI a request to summarize the technologies used in this project.
 
-  For increased privacy, you can run \`cloving config\` and make sure to configure a local ollama model (llama3:70b-instruct currently works well for this) so that this data is not sent to an AI service provider.
-  `);
+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.
+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, command_utils_1.getConfig)();
-    if (!config || !config?.primaryModel || !config?.models) {
+    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)()) {
-        const continueAnswer = await (0, command_utils_1.promptUser)('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? [Yn] ');
-        if (continueAnswer.toLowerCase() !== 'y' && continueAnswer.trim() !== '') {
-            console.log('Operation aborted by the user.');
-            return;
-        }
+        const technologies = await (0, prompts_1.input)({
+            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.',
+        });
+        specialFileContents['description'] = technologies;
     }
     const tempFilePath = path_1.default.join(os_1.default.tmpdir(), `describe_${Date.now()}.tmp`);
     try {
@@ -68,10 +66,6 @@ const init = async (options) => {
             }
         });
         const limitedFileList = filteredFileList.slice(0, 100);
-        if (specialFileNames.length === 0) {
-            console.error('No special files found.');
-            return;
-        }
         const projectDetails = {
             files: limitedFileList,
             specialFiles: specialFileContents
@@ -80,10 +74,65 @@ const init = async (options) => {
 ${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 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:
 
 {
@@ -91,18 +140,24 @@ Here is an example response:
     {
       "name": "TypeScript",
       "version": "~> 5.5.3"
-      "primary": true
+      "primary": true,
+      "directory": "src",
+      "extension": ".ts"
     },
     {
       "name": "JavaScript",
-      "version": "ES6+"
+      "version": "ES6+",
+      "directory": "src",
+      "extension": ".js"
     }
   ],
   "frameworks": [
     {
       "name": "Node.js",
       "type": "Runtime environment",
-      "primary": true
+      "primary": true,
+      "directory": "src",
+      "extension": ".js"
     }
   ],
   "testingFrameworks": [
@@ -140,21 +195,19 @@ Here is an example response:
   ],
   "projectType": "Command-line tool",
 }`;
-        if (process.env.DEBUG === '1') {
-            (0, string_utils_1.estimateTokens)(prompt).then(tokenCount => {
-                console.log(`Estimated token count: ${tokenCount}`);
-            });
-        }
         const aiChatResponse = await gpt.generateText({ prompt });
-        const cleanAiChatResponse = (0, string_utils_2.extractJsonMetadata)(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('[done] 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, command_utils_1.promptUser)('Do you want to review the generated data? [Yn] ');
-            if (reviewAnswer.toLowerCase() === 'y' || reviewAnswer.trim() === '') {
+            const reviewAnswer = await (0, prompts_1.confirm)({
+                message: 'Do you want to review the generated data?',
+                default: true,
+            });
+            if (reviewAnswer) {
                 console.log(cleanAiChatResponse);
             }
         }

package/dist/commands/models.js

@@ -1,17 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// models.ts
 const claude_1 = require("../cloving_gpt/adapters/claude");
 const openai_1 = require("../cloving_gpt/adapters/openai");
 const ollama_1 = require("../cloving_gpt/adapters/ollama");
+const gemini_1 = require("../cloving_gpt/adapters/gemini");
+const mistral_1 = require("../cloving_gpt/adapters/mistral");
 const listModels = async () => {
+    claude_1.ClaudeAdapter.listSupportedModels();
+    gemini_1.GeminiAdapter.listSupportedModels();
+    mistral_1.MistralAdapter.listSupportedModels();
     try {
         await ollama_1.OllamaAdapter.listSupportedModels();
     }
     catch (error) {
         // do nothing, no ollama server running
     }
-    claude_1.ClaudeAdapter.listSupportedModels();
     openai_1.OpenAIAdapter.listSupportedModels();
 };
 exports.default = listModels;

package/dist/commands/project/build.js

@@ -0,0 +1,88 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildProject = void 0;
+const copy_paste_1 = __importDefault(require("copy-paste"));
+const fs_1 = require("fs");
+const cli_highlight_1 = __importDefault(require("cli-highlight"));
+const prompts_1 = require("@inquirer/prompts");
+const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
+const config_utils_1 = require("../../utils/config_utils");
+const git_utils_1 = require("../../utils/git_utils");
+const string_utils_1 = require("../../utils/string_utils");
+const generatePrompt = async (projectName, projectTask, filesList, incompletePlanItem) => {
+    const context = [];
+    for (const codeFile of filesList) {
+        if (await fs_1.promises?.stat(codeFile).then(stat => stat.isFile()).catch(() => false)) {
+            const fileContents = await fs_1.promises.readFile(codeFile, 'utf-8');
+            context.push(`### **Contents of ${codeFile}**\n\n${fileContents}\n\n### **End of ${codeFile}**`);
+        }
+    }
+    return `==== begin task description ====
+Task name: ${projectName}
+Task description: ${projectTask}
+==== end task description ====
+
+${context}
+
+Please implement the following plan item, please include full file path names in all code snippets:
+
+${incompletePlanItem}`;
+};
+const buildProject = async (options) => {
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+    const gpt = new cloving_gpt_1.default(options);
+    const projectName = (0, git_utils_1.getCurrentBranchName)();
+    const projectConfig = (0, config_utils_1.getProjectConfig)(projectName);
+    // Filter out completed plan items for selection
+    const planItems = Object.entries(projectConfig.plan || {});
+    if (planItems.length === 0) {
+        console.log('No plan items found.');
+        process.exit(1);
+    }
+    // Use @inquirer/prompts to select a plan item
+    const selectedPlanItemKey = await (0, prompts_1.select)({
+        message: 'Select a plan item:',
+        choices: planItems.map(([key, item]) => ({ name: key, value: key })),
+    });
+    const selectedPlanItem = planItems.find(([key]) => key === selectedPlanItemKey);
+    if (!selectedPlanItem) {
+        console.log('Selected plan item not found.');
+        process.exit(1);
+    }
+    const planText = `## **${selectedPlanItem[0]}**\n\n${selectedPlanItem[1].details.join('\n\n')}`;
+    const prompt = await generatePrompt(projectName, projectConfig.task, projectConfig.files || [], planText);
+    const projectCode = await gpt.generateText({ prompt });
+    (0, string_utils_1.parseMarkdownInstructions)(projectCode).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' }));
+        }
+    });
+    // Prompt the user to copy the project to the clipboard using @inquirer/prompts
+    const copyToClipboard = await (0, prompts_1.confirm)({
+        message: 'Do you want to copy this project to the clipboard?',
+        default: true,
+    });
+    if (copyToClipboard) {
+        copy_paste_1.default.copy(projectCode, () => {
+            console.log('Project copied to clipboard');
+        });
+    }
+};
+exports.buildProject = buildProject;
+exports.default = exports.buildProject;

package/dist/commands/project/complete.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.completeProject = void 0;
+const config_utils_1 = require("../../utils/config_utils");
+const git_utils_1 = require("../../utils/git_utils");
+const completeProject = async (options) => {
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+    const projectName = (0, git_utils_1.getCurrentBranchName)();
+    (0, config_utils_1.removeProjectConfig)(projectName);
+};
+exports.completeProject = completeProject;
+exports.default = exports.completeProject;

package/dist/commands/project/init.js

@@ -0,0 +1,82 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initProject = void 0;
+const fs_1 = require("fs");
+const prompts_1 = require("@inquirer/prompts");
+const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
+const config_utils_1 = require("../../utils/config_utils");
+const git_utils_1 = require("../../utils/git_utils");
+const config_utils_2 = require("../../utils/config_utils");
+const generatePrompt = async (projectName, projectTask) => {
+    const filesList = await (0, config_utils_2.getAllFiles)({}, false);
+    return `Here is a description of my app:
+
+${JSON.stringify((0, config_utils_2.getClovingConfig)(), null, 2)}
+
+Here is a list of all my source files:
+
+==== begin list of source files ====
+${filesList.join("\n")}
+==== end list of source files ====
+
+Please enumerate all the files in the provided list that are pertinent for this task:
+
+==== begin task description ====
+Task name: ${projectName}
+Task description: ${projectTask}
+==== end task description ====
+
+Also, list any test files that might be relevant to these files.
+
+Give me this output format for your answer:
+
+## files
+
+app/models/foo.rb
+app/views/baz/bar.html.erb
+
+## relevant test files
+
+test/models/foo_test.rb
+test/controllers/baz_controller_test.rb`;
+};
+const initProject = async (options) => {
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+    const gpt = new cloving_gpt_1.default(options);
+    const defaultBranchName = await (0, git_utils_1.getDefaultBranchName)();
+    const projectName = (0, git_utils_1.getCurrentBranchName)();
+    if (projectName === defaultBranchName) {
+        console.log(`You are on the ${defaultBranchName} branch. Please checkout to a git branch and try again. For example: git branch -b my-new-project`);
+        process.exit(1);
+    }
+    const projectTask = await (0, prompts_1.input)({
+        message: 'Describe the task you want to accomplish with this project:',
+    });
+    const prompt = await generatePrompt(projectName, projectTask);
+    const contextFiles = await gpt.generateText({ prompt });
+    // Initialize variables
+    const lines = [];
+    const files = [];
+    // Read each line of the context files
+    contextFiles.split('\n').forEach((line) => {
+        if (line.trim()) {
+            lines.push(line.trim());
+        }
+    });
+    for (const codeFile of lines) {
+        if (await fs_1.promises?.stat(codeFile).then(stat => stat.isFile()).catch(() => false)) {
+            files.push(codeFile);
+        }
+    }
+    const projectConfig = {
+        name: projectName,
+        task: projectTask,
+        files
+    };
+    (0, config_utils_1.saveProjectConfig)(projectName, projectConfig);
+};
+exports.initProject = initProject;
+exports.default = exports.initProject;

package/dist/commands/project/plan.js

@@ -0,0 +1,108 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.planProject = void 0;
+const fs_1 = require("fs");
+const cloving_gpt_1 = __importDefault(require("../../cloving_gpt"));
+const config_utils_1 = require("../../utils/config_utils");
+const git_utils_1 = require("../../utils/git_utils");
+const parsePlan = (plan) => {
+    const lines = plan.split('\n').map(line => line.trim());
+    const structured = {};
+    let currentTitle = null;
+    let currentDetails = [];
+    lines.forEach(line => {
+        const sectionMatch = line.match(/^#### \d+\. \*\*(.+)\*\*$/);
+        const detailMatch = line.match(/^-\s*\*\*(.+)\*\*:?\s*(.+)$/);
+        if (sectionMatch) {
+            if (currentTitle) {
+                structured[currentTitle] = {
+                    details: currentDetails
+                };
+            }
+            currentTitle = sectionMatch[1];
+            currentDetails = [];
+        }
+        else if (detailMatch && currentDetails) {
+            currentDetails.push(`${detailMatch[1]}: ${detailMatch[2]}`);
+        }
+        else if (currentDetails && line.startsWith('- ')) {
+            currentDetails.push(line.replace(/^- /, ''));
+        }
+    });
+    if (currentTitle) {
+        structured[currentTitle] = {
+            details: currentDetails
+        };
+    }
+    return structured;
+};
+const generatePrompt = async (projectName, projectTask, filesList) => {
+    const context = [];
+    for (const codeFile of filesList) {
+        if (await fs_1.promises?.stat(codeFile).then(stat => stat.isFile()).catch(() => false)) {
+            const fileContents = await fs_1.promises.readFile(codeFile, 'utf-8');
+            context.push(`### **Contents of ${codeFile}**\n\n${fileContents}\n\n### **End of ${codeFile}**`);
+        }
+    }
+    return `==== begin task description ====
+Task name: ${projectName}
+Task description: ${projectTask}
+==== end task description ====
+
+${context}
+
+Please create a plan to execute this project. Do not include the Implementation Steps. Only include Plan for Project Execution.
+
+Here is an example plan. Do not use any of the information from this plan in your response, only use it as a template to create your own plan.
+
+==== begin example plan ====
+### Plan for Project Execution
+
+#### 1. **Understanding Existing Code**
+   - **Review existing command implementations**: Familiarize yourself with the structure and implementation style of existing commands such as project init and project plan.
+   - **Identify utility functions**: Note the utility functions being used across the commands, such as those in config_utils, git_utils, and command_utils.
+
+#### 2. **Design New Commands**
+   - **Define functionalities**: Clearly outline what each new command should accomplish:
+     - project build: This command should compile or prepare the project based on the planned actions.
+     - project complete: This command should finalize the project, possibly including cleanup, documentation, or deployment steps.
+
+#### 3. **Implement project build**
+   - **Create build.ts**: Implement the logic for building the project.
+     - **Generate prompt**: Create a prompt that describes the build process based on the project configuration.
+     - **Invoke AI Model**: Use an AI model to generate the steps or scripts needed to build the project.
+     - **Execute Build Steps**: Implement logic to execute the build steps.
+
+#### 4. **Implement project complete**
+   - **Create complete.ts**: Implement the logic for completing the project.
+     - **Generate prompt**: Create a prompt that describes the completion process based on the project configuration.
+     - **Invoke AI Model**: Use an AI model to generate the steps or scripts needed to complete the project.
+     - **Execute Completion Steps**: Implement logic to execute the completion steps.
+
+#### 5. **Integration and Testing**
+   - **Integrate new commands**: Ensure the new commands are integrated into the existing command structure.
+   - **Unit tests**: Develop unit tests for the new commands to ensure they function correctly.
+   - **End-to-end tests**: Run end-to-end tests to validate the entire workflow from project initialization to completion.
+
+#### 6. **Documentation and Cleanup**
+   - **Update README**: Document the new commands and their usage.
+   - **Code cleanup**: Refactor and clean up any redundant code or comments.
+==== end example plan ====`;
+};
+const planProject = async (options) => {
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
+    const gpt = new cloving_gpt_1.default(options);
+    const projectName = (0, git_utils_1.getCurrentBranchName)();
+    const projectConfig = (0, config_utils_1.getProjectConfig)(projectName);
+    const prompt = await generatePrompt(projectName, projectConfig.task, projectConfig.files || []);
+    const projectPlan = await gpt.generateText({ prompt });
+    const planItems = parsePlan(projectPlan);
+    console.log(planItems);
+    projectConfig.plan = planItems;
+    (0, config_utils_1.saveProjectConfig)(projectName, projectConfig);
+};
+exports.planProject = planProject;
+exports.default = exports.planProject;

package/dist/commands/review.js

@@ -8,9 +8,9 @@ const child_process_1 = require("child_process");
 const git_utils_1 = require("../utils/git_utils");
 const string_utils_1 = require("../utils/string_utils");
 const cloving_gpt_1 = __importDefault(require("../cloving_gpt"));
-const command_utils_1 = require("../utils/command_utils");
+const config_utils_1 = require("../utils/config_utils");
 const review = async (options) => {
-    options.silent = (0, command_utils_1.getConfig)().silent || false;
+    options.silent = (0, config_utils_1.getConfig)(options).globalSilent || false;
     const gpt = new cloving_gpt_1.default(options);
     try {
         // Define the prompt for analysis