gitpt 1.3.0 → 1.6.1

package/dist/llm/providers/openrouter/index.d.ts

@@ -0,0 +1,9 @@
+import { GitPTConfig } from "../../../config.js";
+import { OpenAICompatibleProvider } from "../openaiCompatible.js";
+export declare class OpenRouterProvider extends OpenAICompatibleProvider {
+    static readonly id = "openrouter";
+    static readonly label = "OpenRouter (remote)";
+    static readonly baseURL = "https://openrouter.ai/api/v1";
+    static setup(existingConfig: GitPTConfig): Promise<GitPTConfig>;
+    protected baseURL(): string;
+}

package/dist/llm/providers/openrouter/index.js

@@ -0,0 +1,16 @@
+import { OPENROUTER_API_URL } from "../../index.js";
+import { OpenAICompatibleProvider, setupApiKeyProvider, } from "../openaiCompatible.js";
+export class OpenRouterProvider extends OpenAICompatibleProvider {
+    static id = "openrouter";
+    static label = "OpenRouter (remote)";
+    static baseURL = OPENROUTER_API_URL;
+    static setup(existingConfig) {
+        return setupApiKeyProvider(existingConfig, {
+            baseURL: OpenRouterProvider.baseURL,
+            label: OpenRouterProvider.label,
+        });
+    }
+    baseURL() {
+        return OpenRouterProvider.baseURL;
+    }
+}

package/dist/llm/registry.d.ts

@@ -0,0 +1,8 @@
+import type { Provider, ProviderClass } from "./providers/base.js";
+export declare const PROVIDERS: ProviderClass[];
+export declare const getProviderClass: (id: string | undefined) => ProviderClass | undefined;
+export declare const getProvider: () => Provider;
+export declare const validateConfig: () => {
+    isValid: boolean;
+    errors: string[];
+};

package/dist/llm/registry.js

@@ -0,0 +1,43 @@
+import { getConfig } from "../config.js";
+import { AnthropicProvider } from "./providers/anthropic/index.js";
+import { getApiKey } from "./providers/apiKey.js";
+import { AppleProvider } from "./providers/apple/index.js";
+import { LocalProvider } from "./providers/local/index.js";
+import { OpenAIProvider } from "./providers/openai/index.js";
+import { OpenRouterProvider } from "./providers/openrouter/index.js";
+export const PROVIDERS = [
+    AppleProvider,
+    OpenRouterProvider,
+    OpenAIProvider,
+    AnthropicProvider,
+    LocalProvider,
+];
+export const getProviderClass = (id) => PROVIDERS.find((p) => p.id === id);
+export const getProvider = () => {
+    const { provider, model } = getConfig();
+    const ProviderImpl = getProviderClass(provider);
+    if (!ProviderImpl) {
+        throw new Error(`Unknown provider: ${provider ?? "(none)"}. Run "gitpt setup".`);
+    }
+    return new ProviderImpl(model ?? "");
+};
+export const validateConfig = () => {
+    const { provider, customLLMEndpoint, model } = getConfig();
+    const errors = [];
+    const spec = getProviderClass(provider);
+    if (!spec) {
+        errors.push("No provider configured. Run 'gitpt setup'.");
+    }
+    else {
+        if (spec.requiresApiKey && !getApiKey()) {
+            errors.push(`API key is required for ${spec.label}.`);
+        }
+        if (spec.requiresEndpoint && !customLLMEndpoint) {
+            errors.push(`Custom endpoint is required for ${spec.label}.`);
+        }
+    }
+    if (!model) {
+        errors.push("Model is required.");
+    }
+    return { isValid: errors.length === 0, errors };
+};

package/dist/{commands/middleware/setupMiddleware → llm/setup}/getAvailableModels.d.ts

@@ -1,4 +1,5 @@
 import { Model } from "openai/resources/models";
 export declare const getAvailableModels: (options?: {
     baseURLOverride?: string;
+    apiKey?: string;
 }) => Promise<Model[]>;

package/dist/{commands/middleware/setupMiddleware → llm/setup}/getAvailableModels.js

@@ -1,7 +1,7 @@
-import { getLLMClient } from "../../../llm/index.js";
+import { getLLMClient } from "../index.js";
 export const getAvailableModels = async (options) => {
-    const { baseURLOverride } = options || {};
-    let modelsList = await getLLMClient({ baseURLOverride }).models.list();
+    const { baseURLOverride, apiKey } = options || {};
+    let modelsList = await getLLMClient({ baseURLOverride, apiKey }).models.list();
     const modelsData = modelsList.data;
     while (modelsList.hasNextPage()) {
         modelsList = await modelsList.getNextPage();

package/dist/{commands/middleware/setupMiddleware → llm/setup}/selectModel.d.ts

@@ -2,4 +2,4 @@ import { Model } from "./types.js";
 /**
  * Show a list of models to select from
  */
-export declare const selectModel: (models: Model[], existingModel?: string) => Promise<string>;
+export declare const selectModel: (models: Model[], existingModel?: string, notes?: string[]) => Promise<string>;

package/dist/{commands/middleware/setupMiddleware → llm/setup}/selectModel.js

@@ -1,11 +1,14 @@
+import chalk from "chalk";
 import inquirer from "inquirer";
 /**
  * Show a list of models to select from
  */
-export const selectModel = async (models, existingModel) => {
+export const selectModel = async (models, existingModel, notes) => {
     const modelChoices = models.map((model) => ({
         name: model.name
-            ? `${model.name} (Context: ${model.context_length})`
+            ? model.context_length
+                ? `${model.name} (Context: ${model.context_length})`
+                : model.name
             : model.id,
         value: model.id,
     }));
@@ -13,12 +16,19 @@ export const selectModel = async (models, existingModel) => {
         name: "Other (specify model identifier)",
         value: "custom",
     });
+    const choices = [...modelChoices];
+    if (notes && notes.length > 0) {
+        choices.push(new inquirer.Separator(" "));
+        for (const note of notes) {
+            choices.push(new inquirer.Separator(chalk.gray(note)));
+        }
+    }
     const answers = await inquirer.prompt([
         {
             type: "list",
             name: "modelChoice",
             message: "Select an AI model:",
-            choices: modelChoices,
+            choices,
             default: () => {
                 const currentIndex = modelChoices.findIndex((choice) => choice.value === existingModel);
                 return currentIndex >= 0 ? currentIndex : 0;

package/dist/llm/setup/types.js

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

package/dist/llm/tokenCount.d.ts

@@ -0,0 +1,3 @@
+export declare const RESERVED_OUTPUT_TOKENS = 1024;
+export declare const countTokens: (text: string) => number;
+export declare const getContextWindow: () => Promise<number>;

package/dist/llm/tokenCount.js

@@ -0,0 +1,4 @@
+import { getProvider } from "./registry.js";
+export const RESERVED_OUTPUT_TOKENS = 1024;
+export const countTokens = (text) => getProvider().countTokens(text);
+export const getContextWindow = () => getProvider().getContextWindow();

package/dist/services/git/getStagedChanges.js

@@ -2,7 +2,7 @@ import chalk from "chalk";
 import { execSync } from "child_process";
 export const getStagedChanges = () => {
     try {
-        return execSync("git diff --staged").toString();
+        return execSync("git diff --staged --function-context").toString();
     }
     catch (error) {
         console.error(chalk.red("Error getting staged changes:"), error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitpt",
-  "version": "1.3.0",
+  "version": "1.6.1",
   "description": "CLI tool that helps you write commit messages & pull request descriptions using AI",
   "main": "dist/index.js",
   "type": "module",
@@ -16,6 +16,9 @@
     "typecheck": "tsc --noEmit",
     "build": "tsc",
     "test": "npm run typecheck",
+    "test:apple": "npm run build && node tests/apple-foundation-models/run.mjs",
+    "bench:apple": "npm run build && node tests/apple-foundation-models/benchmark.mjs",
+    "check:prompt": "npm run build && node tests/snapshots/check.mjs",
     "prepublishOnly": "npm run build"
   },
   "repository": {
@@ -50,6 +53,7 @@
     "configstore": "^7.0.0",
     "inquirer": "^12.5.2",
     "node-fetch": "^3.3.2",
-    "openai": "^4.100.0"
+    "openai": "^4.100.0",
+    "ora": "^8.2.0"
   }
 }

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

@@ -1 +0,0 @@
-export declare const getOrUpdateApiKey: (existingApiKey?: string) => Promise<string>;

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

@@ -1,39 +0,0 @@
-import inquirer from "inquirer";
-import { maskApiKey } from "../../../utils/maskApiKey.js";
-export const getOrUpdateApiKey = async (existingApiKey) => {
-    // For setup command, handle API key selection
-    if (existingApiKey) {
-        // If we have an existing API key, ask if the user wants to keep it or use a new one
-        const useExistingKeyAnswer = await inquirer.prompt([
-            {
-                type: "list",
-                name: "useExistingKey",
-                message: "OpenRouter API key:",
-                choices: [
-                    {
-                        name: `Use existing key (${maskApiKey(existingApiKey)})`,
-                        value: true,
-                    },
-                    { name: "Enter a new API key", value: false },
-                ],
-            },
-        ]);
-        if (useExistingKeyAnswer.useExistingKey) {
-            return existingApiKey;
-        }
-    }
-    // If no existing key or user wants a new one, prompt for a new API key
-    const apiKeyAnswer = await inquirer.prompt([
-        {
-            type: "input",
-            name: "apiKey",
-            message: "Enter your OpenRouter API key:",
-            validate: (input) => {
-                if (!input)
-                    return "API key is required";
-                return true;
-            },
-        },
-    ]);
-    return apiKeyAnswer.apiKey;
-};

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

@@ -1,5 +0,0 @@
-import { GitPTConfig } from "../../../config.js";
-/**
- * Set up a local LLM configuration
- */
-export declare const setupLocalLLM: (existingConfig: GitPTConfig) => Promise<GitPTConfig>;

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

@@ -1,60 +0,0 @@
-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

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

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

@@ -1,66 +0,0 @@
-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;
-    }
-};