gitpt 1.2.0 → 1.4.0

package/dist/commands/middleware/setupMiddleware/setupLocalLLM.js

@@ -0,0 +1,60 @@
+import chalk from "chalk";
+import inquirer from "inquirer";
+import { saveConfig } from "../../../config.js";
+import { getAvailableModels } from "./getAvailableModels.js";
+import { selectModel } from "./selectModel.js";
+/**
+ * Set up a local LLM configuration
+ */
+export const setupLocalLLM = async (existingConfig) => {
+    console.log(chalk.blue("Local LLM Setup"));
+    const endpointAnswer = await inquirer.prompt([
+        {
+            type: "input",
+            name: "localLLMEndpoint",
+            message: "Enter local LLM API endpoint (e.g., http://127.0.0.1:1234):",
+            default: existingConfig.customLLMEndpoint || "http://127.0.0.1:1234",
+            validate: (input) => {
+                if (!input)
+                    return "API endpoint is required";
+                if (!input.startsWith("http://") && !input.startsWith("https://")) {
+                    return "Must be a valid URL starting with http:// or https://";
+                }
+                return true;
+            },
+        },
+    ]);
+    console.log(chalk.gray("Trying to fetch available models from local LLM server..."));
+    const models = await getAvailableModels({
+        baseURLOverride: endpointAnswer.localLLMEndpoint,
+    });
+    let selectedModel;
+    if (models.length > 0) {
+        console.log(chalk.green(`✓ Found ${models.length} models available on your local LLM server`));
+        selectedModel = await selectModel(models, existingConfig.model);
+    }
+    else {
+        console.log(chalk.yellow("Could not fetch models from local LLM server, please enter model name manually"));
+        const modelAnswer = await inquirer.prompt([
+            {
+                type: "input",
+                name: "model",
+                message: "Enter model name to use with local endpoint:",
+                default: existingConfig.model,
+                validate: (input) => (input ? true : "Model name is required"),
+            },
+        ]);
+        selectedModel = modelAnswer.model;
+    }
+    const updatedConfig = {
+        ...existingConfig,
+        provider: "local",
+        model: selectedModel,
+        customLLMEndpoint: endpointAnswer.localLLMEndpoint,
+    };
+    // Save the config
+    saveConfig(updatedConfig);
+    console.log(chalk.green("✓ Local LLM configuration saved"));
+    console.log(chalk.gray("Testing connection to local LLM..."));
+    return updatedConfig;
+};

package/dist/commands/middleware/setupMiddleware/setupOpenRouter.d.ts

@@ -0,0 +1,2 @@
+import { GitPTConfig } from "../../../config.js";
+export declare const setupOpenRouter: (existingConfig: GitPTConfig) => Promise<GitPTConfig>;

package/dist/commands/middleware/setupMiddleware/setupOpenRouter.js

@@ -0,0 +1,66 @@
+import chalk from "chalk";
+import inquirer from "inquirer";
+import { OPENROUTER_API_URL } from "../../../llm/index.js";
+import { saveConfig } from "../../../config.js";
+import { getAvailableModels } from "./getAvailableModels.js";
+import { getOrUpdateApiKey } from "./getOrUpdateApiKey.js";
+import { selectModel } from "./selectModel.js";
+export const setupOpenRouter = async (existingConfig) => {
+    // Get API key - either the existing one or a new one
+    const apiKey = await getOrUpdateApiKey(existingConfig.apiKey);
+    if (!apiKey) {
+        console.error(chalk.red("API key is required for OpenRouter."));
+        process.exit(1);
+    }
+    // Update the config with the potentially new API key
+    const updatedConfig = { ...existingConfig, apiKey };
+    // Display current model if any
+    if (updatedConfig.model) {
+        console.log("Current model:", chalk.yellow(updatedConfig.model));
+        console.log("");
+    }
+    try {
+        console.log(chalk.gray("Fetching available models from OpenRouter..."));
+        const models = await getAvailableModels({
+            baseURLOverride: OPENROUTER_API_URL,
+        });
+        if (models.length > 0) {
+            console.log(chalk.green(`✓ Found ${models.length} models available with your API key`));
+        }
+        else {
+            console.log(chalk.yellow("No models found from OpenRouter. Please specify a model manually."));
+        }
+        const selectedModel = await selectModel(models, updatedConfig.model);
+        const finalConfig = {
+            ...updatedConfig,
+            model: selectedModel,
+            useLocalLLM: false,
+        };
+        // Save the config
+        saveConfig(finalConfig);
+        console.log(chalk.green(`✓ Model set to: ${chalk.yellow(selectedModel)}`));
+        return finalConfig;
+    }
+    catch (error) {
+        console.error(chalk.yellow(`Error fetching models: ${error}`));
+        // Fallback to manual input if API call fails
+        const modelAnswer = await inquirer.prompt([
+            {
+                type: "input",
+                name: "model",
+                message: "Enter model identifier:",
+                validate: (input) => input ? true : "Model identifier is required",
+            },
+        ]);
+        const selectedModel = modelAnswer.model;
+        const finalConfig = {
+            ...updatedConfig,
+            model: selectedModel,
+            useLocalLLM: false,
+        };
+        // Save the config
+        saveConfig(finalConfig);
+        console.log(chalk.green(`✓ Model set to: ${chalk.yellow(selectedModel)}`));
+        return finalConfig;
+    }
+};

package/dist/commands/middleware/setupMiddleware/types.d.ts

@@ -0,0 +1,13 @@
+export interface Model {
+    id: string;
+    name?: string;
+    context_length?: number;
+    pricing?: {
+        prompt: number;
+        completion: number;
+    };
+}
+export interface ModelResponse {
+    data: Model[];
+    object?: string;
+}

package/dist/commands/middleware/setupMiddleware/types.js

@@ -0,0 +1 @@
+export {};

package/dist/commands/model.d.ts

@@ -1 +1 @@
-export declare function modelCommand(modelId?: string): Promise<void>;
+export declare const modelCommand: () => Promise<void>;

package/dist/commands/model.js

@@ -1,114 +1,6 @@
-import inquirer from 'inquirer';
-import chalk from 'chalk';
-import fetch from 'node-fetch';
-import { getConfig, saveConfig } from '../utils/config.js';
-// List of popular models available on OpenRouter
-const POPULAR_MODELS = [
-    { name: 'Claude 3 Opus - Anthropic', value: 'anthropic/claude-3-opus:beta' },
-    { name: 'Claude 3 Sonnet - Anthropic', value: 'anthropic/claude-3-sonnet:beta' },
-    { name: 'Claude 3 Haiku - Anthropic', value: 'anthropic/claude-3-haiku:beta' },
-    { name: 'GPT-4o - OpenAI', value: 'openai/gpt-4o' },
-    { name: 'GPT-4 Turbo - OpenAI', value: 'openai/gpt-4-turbo' },
-    { name: 'GPT-3.5 Turbo - OpenAI', value: 'openai/gpt-3.5-turbo' },
-    { name: 'Other (specify model identifier)', value: 'custom' }
-];
-async function fetchAvailableModels(apiKey) {
-    try {
-        const response = await fetch('https://openrouter.ai/api/v1/models', {
-            headers: {
-                'Authorization': `Bearer ${apiKey}`,
-                'HTTP-Referer': 'https://github.com/bartaxyz/GitPT',
-            }
-        });
-        if (!response.ok) {
-            throw new Error(`Failed to fetch models: ${response.status} ${response.statusText}`);
-        }
-        const data = await response.json();
-        return data.data;
-    }
-    catch (error) {
-        console.error(chalk.red('Error fetching models:'), error);
-        return [];
-    }
-}
-export async function modelCommand(modelId) {
-    console.log(chalk.blue('GitPT Model Selection'));
-    // Check if config exists
-    const existingConfig = getConfig();
-    if (!existingConfig) {
-        console.error(chalk.red('GitPT is not configured. Please run "gitpt setup" first.'));
-        process.exit(1);
-    }
-    let selectedModel;
-    // If a model ID is provided directly, use it
-    if (modelId) {
-        selectedModel = modelId;
-        // Update config with the new model while keeping the existing API key
-        saveConfig({
-            apiKey: existingConfig.apiKey,
-            model: selectedModel
-        });
-        console.log(chalk.green(`✓ Model set to: ${chalk.yellow(selectedModel)}`));
-        return;
-    }
-    // Otherwise, show interactive selection
-    console.log('Current model:', chalk.yellow(existingConfig.model));
-    console.log('');
-    try {
-        // Try to fetch available models from OpenRouter
-        console.log(chalk.gray('Fetching available models from OpenRouter...'));
-        const availableModels = await fetchAvailableModels(existingConfig.apiKey);
-        let modelChoices;
-        if (availableModels.length > 0) {
-            // Convert available models to choices format
-            modelChoices = availableModels.map(model => ({
-                name: `${model.name} (Context: ${model.context_length})`,
-                value: model.id
-            }));
-            // Add custom option at the end
-            modelChoices.push({ name: 'Other (specify model identifier)', value: 'custom' });
-            console.log(chalk.green(`✓ Found ${availableModels.length} models available with your API key`));
-        }
-        else {
-            // Fallback to predefined list if API call fails
-            console.log(chalk.yellow('Could not fetch models from OpenRouter, using predefined list'));
-            modelChoices = POPULAR_MODELS;
-        }
-        const answers = await inquirer.prompt([
-            {
-                type: 'list',
-                name: 'modelChoice',
-                message: 'Select an AI model:',
-                choices: modelChoices,
-                default: () => {
-                    // Try to find current model in the list to set as default
-                    const currentIndex = modelChoices.findIndex(choice => choice.value === existingConfig.model);
-                    return currentIndex >= 0 ? currentIndex : 0;
-                }
-            },
-            {
-                type: 'input',
-                name: 'customModel',
-                message: 'Enter model identifier:',
-                when: (answers) => answers.modelChoice === 'custom',
-                validate: (input) => {
-                    if (!input)
-                        return 'Model identifier is required';
-                    return true;
-                }
-            }
-        ]);
-        // Get the selected model
-        selectedModel = answers.modelChoice === 'custom' ? answers.customModel : answers.modelChoice;
-        // Save the updated configuration
-        saveConfig({
-            apiKey: existingConfig.apiKey,
-            model: selectedModel
-        });
-        console.log(chalk.green(`✓ Model updated to: ${chalk.yellow(selectedModel)}`));
-    }
-    catch (error) {
-        console.error(chalk.red('Error updating model:'), error);
-        process.exit(1);
-    }
-}
+import chalk from "chalk";
+import { setupMiddleware } from "./middleware/setupMiddleware/index.js";
+export const modelCommand = async () => {
+    console.log(chalk.blue("GitPT Model Selection"));
+    await setupMiddleware({ context: "model" });
+};

package/dist/commands/pr/context/systemPrompt.d.ts

@@ -0,0 +1 @@
+export declare const systemPrompt = "\nYou are a helpful assistant that generates clear, informative GitHub pull request titles and descriptions.\n\nFor the title:\n- Keep it concise (under 80 characters)\n- Start with a verb in present tense (e.g., \"Add\", \"Fix\", \"Update\")\n- Clearly summarize the main purpose of the changes\n\nFor the description:\n- Start with a brief summary (1-2 sentences) of what the PR accomplishes\n- Include a more detailed explanation of changes if needed\n- List key changes as bullet points if there are multiple components\n- Include any relevant context that reviewers should know\n- End with any testing instructions if applicable\n\nFormat the description in Markdown with sections.\nDo not include \"PR\" or \"Pull Request\" in the title.\n";

package/dist/commands/pr/context/systemPrompt.js

@@ -0,0 +1,18 @@
+export const systemPrompt = `
+You are a helpful assistant that generates clear, informative GitHub pull request titles and descriptions.
+
+For the title:
+- Keep it concise (under 80 characters)
+- Start with a verb in present tense (e.g., "Add", "Fix", "Update")
+- Clearly summarize the main purpose of the changes
+
+For the description:
+- Start with a brief summary (1-2 sentences) of what the PR accomplishes
+- Include a more detailed explanation of changes if needed
+- List key changes as bullet points if there are multiple components
+- Include any relevant context that reviewers should know
+- End with any testing instructions if applicable
+
+Format the description in Markdown with sections.
+Do not include "PR" or "Pull Request" in the title.
+`;

package/dist/commands/pr/context/userPrompt.d.ts

@@ -0,0 +1 @@
+export declare const userPrompt: (context: string) => string;

package/dist/commands/pr/context/userPrompt.js

@@ -0,0 +1,22 @@
+export const userPrompt = (context) => `
+Generate a pull request title and description for the following changes:
+
+${context}
+
+Format your response exactly like this example:
+Title: Add user authentication with JWT
+Description: 
+## Summary
+This PR adds user authentication using JWT tokens.
+
+## Changes
+- Implement login and registration endpoints
+- Add JWT generation and validation
+- Update user model with password hashing
+- Add authorization middleware
+
+## How to test
+1. Register a new user with \`/api/register\`
+2. Login with the new user credentials
+3. Use the returned token to access protected endpoints
+`;

package/dist/commands/pr/generatePRDetails.d.ts

@@ -0,0 +1,4 @@
+export declare const generatePRDetails: () => Promise<{
+    title: string;
+    body: string;
+}>;

package/dist/commands/pr/generatePRDetails.js

@@ -0,0 +1,35 @@
+import chalk from "chalk";
+import { getConfig } from "../../config.js";
+import { getLLMClient } from "../../llm/index.js";
+import { systemPrompt } from "./context/systemPrompt.js";
+import { userPrompt } from "./context/userPrompt.js";
+import { getPRContext } from "./getPRContext.js";
+export const generatePRDetails = async () => {
+    const { model } = getConfig();
+    const context = getPRContext().join("\n\n");
+    const userPromptWithContext = userPrompt(context);
+    const llmClient = getLLMClient();
+    try {
+        const response = await llmClient.chat.completions.create({
+            model: model,
+            messages: [
+                { role: "system", content: systemPrompt },
+                { role: "user", content: userPromptWithContext },
+            ],
+            max_completion_tokens: 1000,
+        });
+        const result = response.choices[0].message?.content?.trim();
+        if (!result) {
+            throw new Error("No response from LLM");
+        }
+        const titleMatch = result.match(/Title:\s*(.+?)(?:\n|$)/);
+        const descMatch = result.match(/Description:\s*\n([\s\S]+)$/);
+        const title = titleMatch ? titleMatch[1].trim() : "";
+        const body = descMatch ? descMatch[1].trim() : result;
+        return { title, body };
+    }
+    catch (error) {
+        console.error(chalk.red("Error generating PR details:"), error);
+        throw new Error("Failed to generate PR details");
+    }
+};

package/dist/commands/pr/getPRContext.d.ts

@@ -0,0 +1 @@
+export declare const getPRContext: () => string[];

package/dist/commands/pr/getPRContext.js

@@ -0,0 +1,65 @@
+import chalk from "chalk";
+import { execSync } from "child_process";
+import { git } from "../../services/git/index.js";
+export const getPRContext = () => {
+    const currentBranch = git.getCurrentBranch();
+    const baseBranch = git.getDefaultBranch();
+    // Get context for PR
+    const commitMessages = git.getCommitsSinceBaseBranch(baseBranch);
+    const changedFiles = git.getChangedFiles(baseBranch);
+    // Check if we have any content to work with
+    if (commitMessages.length === 0 && changedFiles.length === 0) {
+        console.log(chalk.yellow("No commits or changed files detected."));
+        console.log(chalk.yellow("Will attempt to generate PR details using branch name and repository context."));
+    }
+    // Get additional context from repository
+    let repoName = "";
+    let repoDescription = "";
+    try {
+        // Try to get repo information from GitHub CLI
+        const repoInfo = JSON.parse(execSync("gh repo view --json name,description").toString().trim());
+        repoName = repoInfo.name || "";
+        repoDescription = repoInfo.description || "";
+    }
+    catch (error) {
+        // Continue without this info
+    }
+    console.log(chalk.blue("Generating PR title and description..."));
+    // Build a rich context for the AI
+    let contextSections = [
+        `Branch: ${currentBranch}`,
+        `Base branch: ${baseBranch}`,
+    ];
+    // Add repository info if available
+    if (repoName) {
+        contextSections.push(`Repository: ${repoName}`);
+    }
+    if (repoDescription) {
+        contextSections.push(`Repository description: ${repoDescription}`);
+    }
+    // Add commit messages if available
+    if (commitMessages.length > 0) {
+        contextSections.push("Commit messages in this branch:", commitMessages.map((msg) => `- ${msg}`).join("\n"));
+    }
+    else {
+        contextSections.push("No commit messages available.");
+        // Try to extract intent from branch name if no commits
+        if (currentBranch.includes("/")) {
+            const branchParts = currentBranch.split("/");
+            const branchType = branchParts[0]; // e.g., "feature", "fix", "chore"
+            const branchDescription = branchParts
+                .slice(1)
+                .join("/")
+                .replace(/-/g, " ");
+            contextSections.push("Branch name analysis:", `Type: ${branchType}`, `Description: ${branchDescription}`);
+        }
+    }
+    // Add changed files if available
+    if (changedFiles.length > 0) {
+        contextSections.push("Files changed in this branch:", changedFiles.map((file) => `- ${file}`).join("\n"));
+    }
+    else {
+        contextSections.push("No file changes detected.");
+    }
+    return contextSections;
+};

package/dist/commands/{pr.d.ts → pr/index.d.ts}

@@ -6,5 +6,5 @@ interface PullRequestOptions {
     edit?: boolean;
     [key: string]: any;
 }
-export declare function prCreateCommand(options?: PullRequestOptions): Promise<void>;
+export declare const prCreateCommand: (options?: PullRequestOptions) => Promise<void>;
 export {};

package/dist/commands/pr/index.js

@@ -0,0 +1,66 @@
+import chalk from "chalk";
+import inquirer from "inquirer";
+import { capabilitiesMiddleware } from "../middleware/capabilitiesMiddleware/index.js";
+import { setupMiddleware } from "../middleware/setupMiddleware/index.js";
+import { gh } from "../../services/gh/index.js";
+import { git } from "../../services/git/index.js";
+import { generatePRDetails } from "./generatePRDetails.js";
+export const prCreateCommand = async (options = {}) => {
+    capabilitiesMiddleware(["git", "gh"]);
+    await setupMiddleware();
+    try {
+        const baseBranch = options.base || git.getDefaultBranch();
+        let title = options.title || "";
+        let body = options.body || "";
+        // Generate PR details if not provided
+        if (!title || !body) {
+            const generatedDetails = await generatePRDetails();
+            title = title || generatedDetails.title;
+            body = body || generatedDetails.body;
+            console.log(chalk.green("✓ PR details generated"));
+            console.log("");
+            console.log(chalk.cyan("Title:"));
+            console.log(title);
+            console.log("");
+            console.log(chalk.cyan("Description:"));
+            console.log(body);
+            console.log("");
+        }
+        // Allow editing PR details
+        if (options.edit !== false) {
+            const answers = await inquirer.prompt([
+                {
+                    type: "input",
+                    name: "title",
+                    message: "Edit PR title:",
+                    default: title,
+                },
+                {
+                    type: "editor",
+                    name: "body",
+                    message: "Edit PR description:",
+                    default: body,
+                },
+                {
+                    type: "confirm",
+                    name: "draft",
+                    message: "Create as draft PR?",
+                    default: options.draft || false,
+                },
+            ]);
+            title = answers.title;
+            body = answers.body;
+            const isDraft = answers.draft;
+            // Create the PR
+            gh.createPullRequest(title, body, baseBranch, isDraft);
+        }
+        else {
+            // Create the PR without editing
+            gh.createPullRequest(title, body, baseBranch, options.draft || false);
+        }
+    }
+    catch (error) {
+        console.error(chalk.red("Error:"), error instanceof Error ? error.message : String(error));
+        process.exit(1);
+    }
+};

package/dist/commands/setup.d.ts

@@ -1 +1,3 @@
-export declare function setupCommand(): Promise<void>;
+export declare const setupCommand: (options?: {
+    clearConfig?: boolean;
+}) => Promise<void>;

package/dist/commands/setup.js

@@ -1,60 +1,15 @@
-import inquirer from 'inquirer';
-import chalk from 'chalk';
-import { saveConfig, clearConfig } from '../utils/config.js';
-// List of popular models available on OpenRouter
-const POPULAR_MODELS = [
-    { name: 'Claude 3 Opus - Anthropic', value: 'anthropic/claude-3-opus:beta' },
-    { name: 'Claude 3 Sonnet - Anthropic', value: 'anthropic/claude-3-sonnet:beta' },
-    { name: 'Claude 3 Haiku - Anthropic', value: 'anthropic/claude-3-haiku:beta' },
-    { name: 'GPT-4o - OpenAI', value: 'openai/gpt-4o' },
-    { name: 'GPT-4 Turbo - OpenAI', value: 'openai/gpt-4-turbo' },
-    { name: 'GPT-3.5 Turbo - OpenAI', value: 'openai/gpt-3.5-turbo' },
-    { name: 'Other (specify model identifier)', value: 'custom' }
-];
-export async function setupCommand() {
-    console.log(chalk.blue('GitPT Setup'));
-    console.log('This will configure GitPT to use OpenRouter for generating commit messages.');
-    console.log('If you don\'t have an OpenRouter account yet, sign up at https://openrouter.ai');
-    console.log('');
-    const answers = await inquirer.prompt([
-        {
-            type: 'input',
-            name: 'apiKey',
-            message: 'Enter your OpenRouter API key:',
-            validate: (input) => {
-                if (!input)
-                    return 'API key is required';
-                return true;
-            }
-        },
-        {
-            type: 'list',
-            name: 'modelChoice',
-            message: 'Select an AI model:',
-            choices: POPULAR_MODELS
-        },
-        {
-            type: 'input',
-            name: 'customModel',
-            message: 'Enter model identifier:',
-            when: (answers) => answers.modelChoice === 'custom',
-            validate: (input) => {
-                if (!input)
-                    return 'Model identifier is required';
-                return true;
-            }
-        }
-    ]);
-    // Clear existing config before saving new one
-    clearConfig();
-    // Save the new configuration
-    const model = answers.modelChoice === 'custom' ? answers.customModel : answers.modelChoice;
-    saveConfig({
-        apiKey: answers.apiKey,
-        model: model
-    });
-    console.log(chalk.green('✓ GitPT configuration saved successfully'));
-    console.log(`Model set to: ${chalk.yellow(model)}`);
-    console.log('');
-    console.log(`Use ${chalk.cyan('gitpt commit')} to create commits with AI-generated messages.`);
-}
+import chalk from "chalk";
+import { clearConfig } from "../config.js";
+import { setupMiddleware } from "./middleware/setupMiddleware/index.js";
+export const setupCommand = async (options = {}) => {
+    console.log(chalk.blue("GitPT Setup"));
+    console.log("This will configure GitPT to use an LLM for generating commit messages.");
+    console.log("You can use either OpenRouter (remote service) or a local LLM.");
+    console.log("");
+    if (options.clearConfig) {
+        clearConfig();
+    }
+    await setupMiddleware({ context: "setup" });
+    console.log("");
+    console.log(`Use ${chalk.cyan("gitpt commit")} to create commits with AI-generated messages.`);
+};

package/dist/config.d.ts

@@ -0,0 +1,18 @@
+export interface GitPTConfig {
+    provider?: "openrouter" | "local";
+    customLLMEndpoint?: string;
+    model?: string;
+    apiKey?: string;
+}
+export declare const getConfig: () => GitPTConfig;
+export declare const saveConfig: (newConfig: GitPTConfig) => void;
+export declare enum ConfigErrors {
+    CustomLLMEndpointRequired = "Custom LLM endpoint is required for local LLM provider.",
+    APIKeyRequired = "API key is required for OpenRouter provider.",
+    ModelRequired = "Model is required."
+}
+export declare const validateConfig: () => {
+    isValid: boolean;
+    errors?: string[];
+};
+export declare const clearConfig: () => void;