commit-agent-cli 0.1.7 → 0.2.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024
+Copyright (c) 2026 Sung Oh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -1,6 +1,6 @@
 # commit-agent-cli
 
-> AI-powered git commit message generator using Claude Sonnet 4.5 and LangGraph
+> AI-powered git commit message generator using Claude Sonnet 4.5 / Opus 4.5 or Google Gemini and LangGraph
 
 Generate intelligent, context-aware commit messages by simply typing `commit`.
 
@@ -20,12 +20,14 @@ commit
 ## First-Time Setup
 
 You'll be prompted to:
-1. Enter your [Anthropic API Key](https://console.anthropic.com)
-2. Choose commit message preferences (conventional commits, verbosity)
+1. Select your AI Provider (Anthropic Claude or Google Gemini)
+2. Choose your preferred model
+3. Enter your API Key ([Anthropic Console](https://console.anthropic.com) or [Google AI Studio](https://aistudio.google.com/app/apikey))
+4. Choose commit message preferences (conventional commits, verbosity)
 
 ## Features
 
-Powered by Claude Sonnet 4.5, this tool autonomously explores your codebase to generate intelligent commit messages with full transparency into its reasoning process. Supports customizable commit styles with secure local configuration storage.
+Powered by Claude Sonnet 4.5 / Opus 4.5 or Google Gemini, this tool autonomously explores your codebase to generate intelligent commit messages with full transparency into its reasoning process. Supports customizable commit styles with secure local configuration storage and the ability to switch between AI providers at any time.
 
 ## Documentation
 
@@ -34,7 +36,7 @@ Powered by Claude Sonnet 4.5, this tool autonomously explores your codebase to g
 ## Requirements
 
 - Node.js 18+
-- Anthropic API key
+- Anthropic API key OR Google AI API key
 
 ## License
 

package/dist/index.js

@@ -157,6 +157,7 @@ async function isGitRepository() {
 
 // src/agent.ts
 import { ChatAnthropic } from "@langchain/anthropic";
+import { ChatGoogleGenerativeAI } from "@langchain/google-genai";
 import { HumanMessage, SystemMessage } from "@langchain/core/messages";
 import { StateGraph, MessagesAnnotation } from "@langchain/langgraph";
 import { ToolNode } from "@langchain/langgraph/prebuilt";
@@ -323,15 +324,29 @@ var tools = [
 
 // src/agent.ts
 var app = null;
-function getApp() {
+var currentConfig = null;
+function getApp(config) {
+  if (app && currentConfig && (currentConfig.provider !== config.provider || currentConfig.model !== config.model)) {
+    app = null;
+  }
   if (app) return app;
-  const model = new ChatAnthropic({
-    model: "claude-sonnet-4-5-20250929",
-    temperature: 0,
-    // It will automatically look for ANTHROPIC_API_KEY in process.env if not provided,
-    // but explicit assignment ensures it picks up dynamic changes if any.
-    apiKey: process.env.ANTHROPIC_API_KEY
-  }).bindTools(tools);
+  currentConfig = config;
+  let model;
+  if (config.provider === "anthropic") {
+    model = new ChatAnthropic({
+      model: config.model,
+      temperature: 0,
+      apiKey: process.env.ANTHROPIC_API_KEY
+    }).bindTools(tools);
+  } else {
+    model = new ChatGoogleGenerativeAI({
+      model: config.model,
+      temperature: 0,
+      apiKey: process.env.GOOGLE_API_KEY,
+      thinkingBudget: 0
+      // Disable thinking to prevent quota issues
+    }).bindTools(tools);
+  }
   const toolNode = new ToolNode(tools);
   async function agent(state) {
     const { messages } = state;
@@ -349,9 +364,13 @@ function getApp() {
   app = workflow.compile();
   return app;
 }
-async function generateCommitMessage(diff, preferences, userFeedback) {
-  const conventionalGuide = preferences.useConventionalCommits ? "Use conventional commit format with prefixes like feat:, fix:, chore:, docs:, style:, refactor:, test:, etc." : "Do NOT use conventional commit prefixes. Write natural commit messages.";
+async function generateCommitMessage(diff, preferences, config, userFeedback) {
+  const conventionalGuide = preferences.useConventionalCommits ? "Use conventional commit format with prefixes like feat:, fix:, chore:, docs:, style:, refactor:, test:, etc." : "Do NOT use conventional commit prefixes (no feat:, fix:, etc.). Write natural, plain commit messages without any prefixes.";
   const styleGuide = preferences.commitMessageStyle === "descriptive" ? 'Be descriptive and detailed. Explain the "why" behind changes when relevant. Multi-line messages are encouraged.' : "Be concise and to the point. Keep it short, ideally one line.";
+  const customGuideSection = preferences.customGuideline ? `
+
+CUSTOM GUIDELINES (MUST FOLLOW):
+${preferences.customGuideline}` : "";
   const systemPrompt = `You are an expert developer. Your task is to generate a commit message for the provided git diff.
 
 The diff provided is OPTIMIZED for token efficiency - it includes file changes, stats, and minimal context.
@@ -376,9 +395,10 @@ Commit Message Rules:
 3. Focus on WHAT changed (clear from diff) and WHY if obvious from context
 4. OUTPUT FORMAT: Your response must be ONLY the commit message. No explanations.
 5. Do NOT use markdown code blocks or formatting
-6. If multi-line, use proper git commit format (subject line, blank line, body)
+6. If multi-line, use proper git commit format (subject line, blank line, body)${customGuideSection}
 
 CRITICAL: Your ENTIRE response should be the commit message itself, nothing else.
+IMPORTANT: Follow the conventional commit rule strictly - if told NOT to use prefixes, do NOT use them at all.
 
 DEFAULT ACTION: Read the diff, generate the message, done. NO TOOLS.
 `;
@@ -391,7 +411,7 @@ ${diff}${userFeedback ? `
 User feedback on previous attempt: ${userFeedback}
 Please adjust the commit message based on this feedback.` : ""}`)
   ];
-  const graph = getApp();
+  const graph = getApp(config);
   const result = await graph.invoke({ messages });
   const lastMsg = result.messages[result.messages.length - 1];
   let content = lastMsg.content;
@@ -435,100 +455,265 @@ var packageJson = JSON.parse(
 );
 var notifier = updateNotifier({
   pkg: packageJson,
-  updateCheckInterval: 1e3 * 60 * 60
-  // Check once per hour (was 24h)
+  updateCheckInterval: 0
+  // Always check for updates (no cache)
 });
 if (notifier.update && notifier.update.current !== notifier.update.latest) {
   const currentVersion = notifier.update.current;
   const latestVersion = notifier.update.latest;
-  const boxWidth = 67;
-  const padLine = (content, width) => {
-    const visibleLength = content.replace(/\u001b\[[0-9;]*m/g, "").length;
-    const padding = width - visibleLength;
-    return content + " ".repeat(Math.max(0, padding));
+  const line1Text = `${packageJson.name} update available! ${currentVersion} \u2192 ${latestVersion}`;
+  const line2Text = `Run npm install -g ${packageJson.name}@latest to update.`;
+  const maxLength = Math.max(line1Text.length, line2Text.length);
+  const boxWidth = maxLength + 2;
+  const padLine = (text2, visibleLength) => {
+    const padding = boxWidth - visibleLength;
+    return text2 + " ".repeat(Math.max(0, padding));
   };
+  const line1Colored = ` ${packageJson.name} update available! ${import_picocolors.default.cyan(currentVersion)} \u2192 ${import_picocolors.default.green(import_picocolors.default.bold(latestVersion))}`;
+  const line2Colored = ` Run ${import_picocolors.default.cyan(import_picocolors.default.bold(`npm install -g ${packageJson.name}@latest`))} to update.`;
+  const horizontalBorder = "\u2500".repeat(boxWidth);
   console.log("");
-  console.log(import_picocolors.default.yellow("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("", boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("  " + import_picocolors.default.bold("New version of commit-cli is available!"), boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("", boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("  Current: " + import_picocolors.default.dim(currentVersion) + "  \u2192  Latest: " + import_picocolors.default.green(import_picocolors.default.bold(latestVersion)), boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("", boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("  " + import_picocolors.default.dim("Update after you finish by running:"), boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("  " + import_picocolors.default.cyan(import_picocolors.default.bold(`npm install -g ${packageJson.name}@latest`)), boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2502") + padLine("", boxWidth) + import_picocolors.default.yellow("\u2502"));
-  console.log(import_picocolors.default.yellow("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F"));
+  console.log(import_picocolors.default.yellow("\u256D" + horizontalBorder + "\u256E"));
+  console.log(import_picocolors.default.yellow("\u2502") + padLine(line1Colored, line1Text.length + 1) + import_picocolors.default.yellow("\u2502"));
+  console.log(import_picocolors.default.yellow("\u2502") + padLine(line2Colored, line2Text.length + 1) + import_picocolors.default.yellow("\u2502"));
+  console.log(import_picocolors.default.yellow("\u2570" + horizontalBorder + "\u256F"));
   console.log("");
 }
-notifier.notify({ defer: false, isGlobal: true });
 var CONFIG_PATH = join2(homedir(), ".commit-cli.json");
-async function getStoredKey() {
+var ANTHROPIC_MODELS = {
+  "claude-sonnet-4-20250514": "Claude Sonnet 4.5",
+  "claude-opus-4-20250514": "Claude Opus 4.5"
+};
+var GOOGLE_MODELS = {
+  "gemini-3-flash-preview": "Gemini 3.0 Flash Preview",
+  "gemini-3-pro-preview": "Gemini 3.0 Pro Preview"
+};
+async function getStoredConfig() {
   try {
     const data = await readFile2(CONFIG_PATH, "utf-8");
-    return JSON.parse(data).ANTHROPIC_API_KEY;
+    return JSON.parse(data);
   } catch {
     return null;
   }
 }
-async function storeKey(key) {
+async function storeConfig(config) {
   try {
-    await writeFile(CONFIG_PATH, JSON.stringify({ ANTHROPIC_API_KEY: key }), { mode: 384 });
+    await writeFile(CONFIG_PATH, JSON.stringify(config, null, 2), { mode: 384 });
   } catch (err) {
   }
 }
-async function getStoredPreferences() {
-  try {
-    const data = await readFile2(CONFIG_PATH, "utf-8");
-    const config = JSON.parse(data);
-    return config.preferences || null;
-  } catch {
-    return null;
+async function setupProviderAndModel() {
+  const providerChoice = await select({
+    message: "Select AI Provider:",
+    options: [
+      { value: "anthropic", label: "Anthropic (Claude)" },
+      { value: "google", label: "Google (Gemini)" }
+    ],
+    initialValue: "anthropic"
+  });
+  if (isCancel(providerChoice)) {
+    cancel("Operation cancelled.");
+    process.exit(0);
   }
-}
-async function storePreferences(prefs) {
-  try {
-    let config = {};
-    try {
-      const data = await readFile2(CONFIG_PATH, "utf-8");
-      config = JSON.parse(data);
-    } catch {
+  const provider = providerChoice;
+  let model;
+  if (provider === "anthropic") {
+    const modelChoice = await select({
+      message: "Select Anthropic Model:",
+      options: [
+        { value: "claude-sonnet-4-20250514", label: "Claude Sonnet 4.5 (Recommended)" },
+        { value: "claude-opus-4-20250514", label: "Claude Opus 4.5 (Most Capable)" }
+      ],
+      initialValue: "claude-sonnet-4-20250514"
+    });
+    if (isCancel(modelChoice)) {
+      cancel("Operation cancelled.");
+      process.exit(0);
     }
-    config.preferences = prefs;
-    await writeFile(CONFIG_PATH, JSON.stringify(config, null, 2), { mode: 384 });
-  } catch (err) {
+    model = modelChoice;
+  } else {
+    const modelChoice = await select({
+      message: "Select Google Model:",
+      options: [
+        { value: "gemini-3-flash-preview", label: "Gemini 3.0 Flash Preview (Fast)" },
+        { value: "gemini-3-pro-preview", label: "Gemini 3.0 Pro Preview (Most Capable)" }
+      ],
+      initialValue: "gemini-3-flash-preview"
+    });
+    if (isCancel(modelChoice)) {
+      cancel("Operation cancelled.");
+      process.exit(0);
+    }
+    model = modelChoice;
   }
+  return { provider, model };
 }
-async function main() {
-  intro(import_picocolors.default.bgBlue(import_picocolors.default.white(" commit-cli ")));
-  let apiKey = process.env.ANTHROPIC_API_KEY;
-  if (!apiKey) {
-    apiKey = await getStoredKey() || void 0;
-  }
-  if (!apiKey) {
+async function promptForApiKey(provider) {
+  if (provider === "anthropic") {
     const key = await text({
-      message: "Enter your Anthropic API Key (sk-...):",
+      message: "Enter your Anthropic API Key (sk-ant-...):",
       placeholder: "sk-ant-api...",
       validate: (value) => {
         if (!value) return "API Key is required";
-        if (!value.startsWith("sk-")) return "Invalid API Key format (should start with sk-)";
+        if (!value.startsWith("sk-ant-")) return "Invalid API Key format (should start with sk-ant-)";
       }
     });
     if (isCancel(key)) {
       cancel("Operation cancelled.");
       process.exit(0);
     }
-    apiKey = key;
-    await storeKey(apiKey);
+    return key;
+  } else {
+    const key = await text({
+      message: "Enter your Google AI API Key:",
+      placeholder: "AIza...",
+      validate: (value) => {
+        if (!value) return "API Key is required";
+      }
+    });
+    if (isCancel(key)) {
+      cancel("Operation cancelled.");
+      process.exit(0);
+    }
+    return key;
+  }
+}
+async function showSettingsMenu(currentConfig2) {
+  const providerLabel = currentConfig2.provider === "anthropic" ? "Anthropic (Claude)" : "Google (Gemini)";
+  const modelName = currentConfig2.provider === "anthropic" ? ANTHROPIC_MODELS[currentConfig2.model] || currentConfig2.model : GOOGLE_MODELS[currentConfig2.model] || currentConfig2.model;
+  note(`Current: ${providerLabel} - ${modelName}`, "Current Configuration");
+  const settingChoice = await select({
+    message: "What would you like to change?",
+    options: [
+      { value: "provider", label: "Change AI Provider & Model" },
+      { value: "apikey", label: "Update API Key" },
+      { value: "preferences", label: "Change Commit Preferences" },
+      { value: "cancel", label: "Cancel" }
+    ]
+  });
+  if (isCancel(settingChoice) || settingChoice === "cancel") {
+    return null;
+  }
+  const newConfig = { ...currentConfig2 };
+  if (settingChoice === "provider") {
+    const modelConfig = await setupProviderAndModel();
+    newConfig.provider = modelConfig.provider;
+    newConfig.model = modelConfig.model;
+    const keyField = modelConfig.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "GOOGLE_API_KEY";
+    if (!newConfig[keyField]) {
+      const apiKey = await promptForApiKey(modelConfig.provider);
+      newConfig[keyField] = apiKey;
+    }
+    await storeConfig(newConfig);
+    return newConfig;
+  } else if (settingChoice === "apikey") {
+    const apiKey = await promptForApiKey(currentConfig2.provider);
+    const keyField = currentConfig2.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "GOOGLE_API_KEY";
+    newConfig[keyField] = apiKey;
+    await storeConfig(newConfig);
+    return newConfig;
+  } else if (settingChoice === "preferences") {
+    const useConventional = await select({
+      message: "Use conventional commit prefixes (feat:, fix:, chore:, etc.)?",
+      options: [
+        { value: true, label: "Yes" },
+        { value: false, label: "No" }
+      ],
+      initialValue: currentConfig2.preferences?.useConventionalCommits ?? true
+    });
+    if (isCancel(useConventional)) {
+      return null;
+    }
+    const styleChoice = await select({
+      message: "Prefer descriptive commit messages?",
+      options: [
+        { value: true, label: "Descriptive (detailed explanations)" },
+        { value: false, label: "Concise (short and to the point)" }
+      ],
+      initialValue: currentConfig2.preferences?.commitMessageStyle === "descriptive"
+    });
+    if (isCancel(styleChoice)) {
+      return null;
+    }
+    const addCustomGuideline = await select({
+      message: "Add custom commit message guideline?",
+      options: [
+        { value: true, label: "Yes, add custom guideline" },
+        { value: false, label: "No, use defaults" }
+      ],
+      initialValue: false
+    });
+    if (isCancel(addCustomGuideline)) {
+      return null;
+    }
+    let customGuideline = currentConfig2.preferences?.customGuideline;
+    if (addCustomGuideline) {
+      const guidelineInput = await text({
+        message: "Enter your custom commit message guideline:",
+        placeholder: "e.g., Always mention ticket number, use imperative mood...",
+        initialValue: currentConfig2.preferences?.customGuideline || ""
+      });
+      if (isCancel(guidelineInput)) {
+        return null;
+      }
+      customGuideline = guidelineInput.trim() || void 0;
+    } else {
+      customGuideline = void 0;
+    }
+    newConfig.preferences = {
+      useConventionalCommits: useConventional,
+      commitMessageStyle: styleChoice ? "descriptive" : "concise",
+      customGuideline
+    };
+    await storeConfig(newConfig);
+    return newConfig;
+  }
+  return null;
+}
+async function main() {
+  intro(import_picocolors.default.bgBlue(import_picocolors.default.white(" commit-cli ")));
+  let config = await getStoredConfig();
+  if (config && config.ANTHROPIC_API_KEY && !config.provider) {
+    note("Upgrading your configuration to support multiple AI providers...", "Configuration Update");
+    config.provider = "anthropic";
+    config.model = "claude-sonnet-4-20250514";
+    await storeConfig(config);
+    note("Configuration upgraded! You can now switch providers anytime using the settings menu.", "Upgrade Complete");
+  }
+  if (!config || !config.provider || !config.model) {
+    note("Welcome! Let's set up your AI provider and preferences", "First Time Setup");
+    const modelConfig = await setupProviderAndModel();
+    const apiKey2 = await promptForApiKey(modelConfig.provider);
+    config = {
+      provider: modelConfig.provider,
+      model: modelConfig.model,
+      ...modelConfig.provider === "anthropic" ? { ANTHROPIC_API_KEY: apiKey2 } : { GOOGLE_API_KEY: apiKey2 }
+    };
+    await storeConfig(config);
+  }
+  const apiKeyField = config.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "GOOGLE_API_KEY";
+  const envKeyField = config.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "GOOGLE_API_KEY";
+  let apiKey = process.env[envKeyField];
+  if (!apiKey) {
+    apiKey = config[apiKeyField] || void 0;
+  }
+  if (!apiKey) {
+    apiKey = await promptForApiKey(config.provider);
+    config[apiKeyField] = apiKey;
+    await storeConfig(config);
+  }
+  if (config.provider === "anthropic") {
+    process.env.ANTHROPIC_API_KEY = apiKey;
+  } else {
+    process.env.GOOGLE_API_KEY = apiKey;
   }
-  process.env.ANTHROPIC_API_KEY = apiKey;
   const isRepo = await isGitRepository();
   if (!isRepo) {
     cancel("Current directory is not a git repository.");
     process.exit(1);
   }
-  let preferences = await getStoredPreferences();
+  let preferences = config.preferences;
   if (!preferences) {
-    note("Let's set up your commit message preferences (one-time setup)", "First Time Setup");
     const useConventional = await select({
       message: "Use conventional commit prefixes (feat:, fix:, chore:, etc.)?",
       options: [
@@ -553,12 +738,38 @@ async function main() {
       cancel("Operation cancelled.");
       process.exit(0);
     }
+    const addCustomGuideline = await select({
+      message: "Add custom commit message guideline? (optional)",
+      options: [
+        { value: false, label: "No, use defaults" },
+        { value: true, label: "Yes, add custom guideline" }
+      ],
+      initialValue: false
+    });
+    if (isCancel(addCustomGuideline)) {
+      cancel("Operation cancelled.");
+      process.exit(0);
+    }
+    let customGuideline;
+    if (addCustomGuideline) {
+      const guidelineInput = await text({
+        message: "Enter your custom commit message guideline:",
+        placeholder: "e.g., Always mention ticket number, use imperative mood..."
+      });
+      if (isCancel(guidelineInput)) {
+        cancel("Operation cancelled.");
+        process.exit(0);
+      }
+      customGuideline = guidelineInput.trim() || void 0;
+    }
     preferences = {
       useConventionalCommits: useConventional,
-      commitMessageStyle: styleChoice ? "descriptive" : "concise"
+      commitMessageStyle: styleChoice ? "descriptive" : "concise",
+      customGuideline
     };
-    await storePreferences(preferences);
-    note(`Preferences saved! You can change these by editing ${CONFIG_PATH}`, "Setup Complete");
+    config.preferences = preferences;
+    await storeConfig(config);
+    note(`Preferences saved! You can change these anytime in the settings menu.`, "Setup Complete");
   }
   const s = spinner();
   s.start("Analyzing staged changes...");
@@ -575,11 +786,11 @@ async function main() {
   while (!confirmed) {
     s.start("Generating commit message (Agent is exploring)...");
     try {
-      commitMessage = await generateCommitMessage(diff, preferences, userFeedback);
+      commitMessage = await generateCommitMessage(diff, preferences, config, userFeedback);
       userFeedback = void 0;
     } catch (error) {
       s.stop("Generation failed.");
-      if (error.message?.includes("401") || error.message?.includes("authentication_error") || error.message?.includes("invalid x-api-key") || error.message?.includes("invalid api key")) {
+      if (error.message?.includes("401") || error.message?.includes("authentication_error") || error.message?.includes("invalid x-api-key") || error.message?.includes("invalid api key") || error.message?.includes("API key not valid")) {
         cancel("Invalid API Key detected.");
         const retryWithNewKey = await select({
           message: "Would you like to enter a new API key?",
@@ -593,21 +804,16 @@ async function main() {
           cancel("Operation cancelled.");
           process.exit(0);
         }
-        const newKey = await text({
-          message: "Enter your Anthropic API Key (sk-...):",
-          placeholder: "sk-ant-api...",
-          validate: (value) => {
-            if (!value) return "API Key is required";
-            if (!value.startsWith("sk-")) return "Invalid API Key format (should start with sk-)";
-          }
-        });
-        if (isCancel(newKey)) {
-          cancel("Operation cancelled.");
-          process.exit(0);
-        }
+        const newKey = await promptForApiKey(config.provider);
         apiKey = newKey;
-        process.env.ANTHROPIC_API_KEY = apiKey;
-        await storeKey(apiKey);
+        const keyField = config.provider === "anthropic" ? "ANTHROPIC_API_KEY" : "GOOGLE_API_KEY";
+        config[keyField] = apiKey;
+        await storeConfig(config);
+        if (config.provider === "anthropic") {
+          process.env.ANTHROPIC_API_KEY = apiKey;
+        } else {
+          process.env.GOOGLE_API_KEY = apiKey;
+        }
         note("API Key updated. Retrying...", "Key Updated");
         continue;
       }
@@ -651,16 +857,31 @@ async function main() {
     const action = await select({
       message: "Do you want to use this message?",
       options: [
-        { value: true, label: "Yes, commit" },
-        { value: false, label: "No, regenerate or cancel" }
+        { value: "commit", label: "Yes, commit" },
+        { value: "regenerate", label: "No, regenerate" },
+        { value: "settings", label: "Change settings" }
       ]
     });
     if (isCancel(action)) {
       cancel("Operation cancelled.");
       process.exit(0);
     }
-    if (action) {
+    if (action === "commit") {
       confirmed = true;
+    } else if (action === "settings") {
+      const settingsResult = await showSettingsMenu(config);
+      if (settingsResult) {
+        config = settingsResult;
+        preferences = config.preferences || preferences;
+        if (config.provider === "anthropic") {
+          process.env.ANTHROPIC_API_KEY = config.ANTHROPIC_API_KEY || "";
+          delete process.env.GOOGLE_API_KEY;
+        } else {
+          process.env.GOOGLE_API_KEY = config.GOOGLE_API_KEY || "";
+          delete process.env.ANTHROPIC_API_KEY;
+        }
+        note("Settings updated! Regenerating with new configuration...", "Updated");
+      }
     } else {
       const nextStep = await select({
         message: "Try again?",

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "commit-agent-cli",
-    "version": "0.1.7",
-    "description": "AI-powered git commit CLI using LangGraph and Claude 4.5",
+    "version": "0.2.1",
+    "description": "AI-powered git commit CLI using LangGraph and Claude 4.5 or Gemini",
     "main": "dist/index.js",
     "types": "./dist/index.d.ts",
     "type": "module",
@@ -38,6 +38,7 @@
         "@clack/prompts": "^0.7.0",
         "@langchain/anthropic": "^0.3.0",
         "@langchain/core": "^0.3.0",
+        "@langchain/google-genai": "^0.1.2",
         "@langchain/langgraph": "^0.2.0",
         "ai": "^3.3.33",
         "commit-agent-cli": "^0.1.0",