gut-cli 0.1.14 → 0.1.16

package/dist/index.js

@@ -108,12 +108,16 @@ var FALLBACK_ENV_MAP = {
 };
 async function getKeytar() {
   try {
-    return await import("keytar");
+    const keytar = await import("keytar");
+    return keytar.default || keytar;
   } catch {
     return null;
   }
 }
 async function saveApiKey(provider, apiKey) {
+  if (provider === "ollama") {
+    throw new Error("Ollama does not require an API key");
+  }
   const keytar = await getKeytar();
   if (!keytar) {
     throw new Error("Keychain not available. Set environment variable instead.");
@@ -121,6 +125,9 @@ async function saveApiKey(provider, apiKey) {
   await keytar.setPassword(SERVICE_NAME, PROVIDER_KEY_MAP[provider], apiKey);
 }
 async function getApiKey(provider) {
+  if (provider === "ollama") {
+    return null;
+  }
   const envKey = process.env[ENV_VAR_MAP[provider]];
   if (envKey) return envKey;
   const fallbackKey = process.env[FALLBACK_ENV_MAP[provider]];
@@ -130,6 +137,9 @@ async function getApiKey(provider) {
   return keytar.getPassword(SERVICE_NAME, PROVIDER_KEY_MAP[provider]);
 }
 async function deleteApiKey(provider) {
+  if (provider === "ollama") {
+    throw new Error("Ollama does not use an API key");
+  }
   const keytar = await getKeytar();
   if (!keytar) {
     throw new Error("Keychain not available.");
@@ -137,20 +147,22 @@ async function deleteApiKey(provider) {
   return keytar.deletePassword(SERVICE_NAME, PROVIDER_KEY_MAP[provider]);
 }
 async function listProviders() {
-  const providers = ["gemini", "openai", "anthropic"];
+  const apiKeyProviders = ["gemini", "openai", "anthropic"];
   const results = await Promise.all(
-    providers.map(async (provider) => ({
+    apiKeyProviders.map(async (provider) => ({
       provider,
       hasKey: !!await getApiKey(provider)
     }))
   );
+  results.push({ provider: "ollama", hasKey: true });
   return results;
 }
 function getProviderDisplayName(provider) {
   const names = {
     gemini: "Google Gemini",
     openai: "OpenAI",
-    anthropic: "Anthropic Claude"
+    anthropic: "Anthropic Claude",
+    ollama: "Ollama (Local)"
   };
   return names[provider];
 }
@@ -270,6 +282,7 @@ import { generateText, generateObject } from "ai";
 import { createGoogleGenerativeAI } from "@ai-sdk/google";
 import { createOpenAI } from "@ai-sdk/openai";
 import { createAnthropic } from "@ai-sdk/anthropic";
+import { createOllama } from "ollama-ai-provider";
 import { z } from "zod";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { join as join2, dirname } from "path";
@@ -378,7 +391,18 @@ function isValidLanguage(lang) {
 // src/lib/ai.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
-var GUT_ROOT = join2(__dirname, "..");
+function findGutRoot() {
+  let current = __dirname;
+  for (let i = 0; i < 5; i++) {
+    const gutPath = join2(current, ".gut");
+    if (existsSync2(gutPath)) {
+      return current;
+    }
+    current = dirname(current);
+  }
+  return join2(__dirname, "..");
+}
+var GUT_ROOT = findGutRoot();
 function loadTemplate(name) {
   const templatePath = join2(GUT_ROOT, ".gut", `${name}.md`);
   if (existsSync2(templatePath)) {
@@ -410,29 +434,45 @@ function applyTemplate(userTemplate, templateName, variables) {
 var DEFAULT_MODELS = {
   gemini: "gemini-2.0-flash",
   openai: "gpt-4o-mini",
-  anthropic: "claude-sonnet-4-20250514"
+  anthropic: "claude-sonnet-4-20250514",
+  ollama: "llama3.2"
 };
 async function getModel(options) {
-  const apiKey = await getApiKey(options.provider);
-  if (!apiKey) {
-    throw new Error(
-      `No API key found for ${options.provider}. Run: gut auth login --provider ${options.provider}`
-    );
-  }
   const modelName = options.model || DEFAULT_MODELS[options.provider];
+  async function resolveApiKey() {
+    if (options.apiKey) return options.apiKey;
+    return getApiKey(options.provider);
+  }
+  if (options.provider !== "ollama") {
+    const apiKey = await resolveApiKey();
+    if (!apiKey) {
+      throw new Error(
+        `No API key found for ${options.provider}. Run: gut auth login --provider ${options.provider}`
+      );
+    }
+  }
   switch (options.provider) {
     case "gemini": {
+      const apiKey = await resolveApiKey();
       const google = createGoogleGenerativeAI({ apiKey });
       return google(modelName);
     }
     case "openai": {
+      const apiKey = await resolveApiKey();
       const openai = createOpenAI({ apiKey });
       return openai(modelName);
     }
     case "anthropic": {
+      const apiKey = await resolveApiKey();
       const anthropic = createAnthropic({ apiKey });
       return anthropic(modelName);
     }
+    case "ollama": {
+      const ollama = createOllama({
+        baseURL: options.ollamaBaseUrl || "http://localhost:11434/api"
+      });
+      return ollama(modelName);
+    }
   }
 }
 async function generateCommitMessage(diff, options, template) {
@@ -614,11 +654,12 @@ async function searchCommits(query, commits, options, maxResults = 5, template)
     schema: CommitSearchSchema,
     prompt
   });
-  const enrichedMatches = result.object.matches.map((match) => {
+  const enrichedMatches = result.object.matches.map((match, index) => {
     const commit = commits.find((c) => c.hash.startsWith(match.hash));
     if (!commit) {
       return null;
     }
+    const relevance = index === 0 ? "high" : index < 3 ? "medium" : "low";
     return {
       hash: commit.hash,
       message: commit.message,
@@ -626,15 +667,9 @@ async function searchCommits(query, commits, options, maxResults = 5, template)
       email: commit.email,
       date: commit.date,
       reason: match.reason,
-      relevance: "high"
-      // First results are most relevant
+      relevance
     };
   }).filter((m) => m !== null);
-  enrichedMatches.forEach((match, index) => {
-    if (index === 0) match.relevance = "high";
-    else if (index < 3) match.relevance = "medium";
-    else match.relevance = "low";
-  });
   return {
     matches: enrichedMatches,
     summary: result.object.summary