can-i-merge 0.2.0 → 0.3.0

package/README.md

@@ -47,9 +47,11 @@ The **Context Engine** is the real product.
     - OpenAI
     - NVIDIA
     - Gemini
-    - Ollama
+    - Ollama (local LLM)
     - OpenRouter
+    - Custom (any OpenAI-compatible endpoint, including self-hosted/local LLM servers)
 - Provider abstraction
+- Encrypted local credential storage (`--api-key`/`--model`/`--base-url`, saved for future runs)
 - GitHub Action (Planned)
 - VSCode Extension (Planned)
 - MCP Server (Planned)
@@ -112,6 +114,26 @@ Choose AI provider
 can-i-merge --provider claude
 ```
 
+Use a local LLM (e.g. Ollama)
+
+```bash
+can-i-merge --provider ollama --model llama3.1
+```
+
+Point at any custom OpenAI-compatible endpoint (self-hosted, local server, etc.)
+
+```bash
+can-i-merge --provider custom --base-url http://localhost:1234/v1 --model local-model
+```
+
+API key / model / base URL are saved encrypted under `~/.can-i-merge` after the first run, so later runs don't need the flags again:
+
+```bash
+can-i-merge --provider openai --api-key sk-... --model gpt-4.1   # saved
+can-i-merge --provider openai                                    # reuses the saved key/model
+can-i-merge --provider openai --forget-credentials                # removes them
+```
+
 Security review
 
 ```bash
@@ -200,6 +222,9 @@ Move authorization check before JWT validation.
        │ NVIDIA                   │
        │ Gemini                   │
        │ Ollama                   │
+       │ OpenRouter               │
+       │ Custom (any OpenAI-      │
+       │   compatible endpoint)   │
        └──────────────────────────┘
                        │
                        ▼

package/dist/cli/index.js

@@ -15,9 +15,12 @@ import { NoChangesError, runReview } from "../core/index.js";
 import { isGitRepository } from "../git/index.js";
 import { ProviderRegistry } from "../provider/index.js";
 import { ClaudeProvider } from "../provider-anthropic/index.js";
+import { CustomProvider } from "../provider-custom/index.js";
+import { GeminiProvider } from "../provider-gemini/index.js";
 import { NvidiaProvider } from "../provider-nvidia/index.js";
 import { OllamaProvider } from "../provider-ollama/index.js";
 import { OpenAIProvider } from "../provider-openai/index.js";
+import { OpenRouterProvider } from "../provider-openrouter/index.js";
 import { isMergeReady, reportConsole, reportJson } from "../reporter/index.js";
 import { colors } from "../shared/colors.js";
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -37,9 +40,16 @@ const STAGE_MESSAGES = {
 };
 const PROVIDER_ENV_VARS = {
     claude: { apiKey: "ANTHROPIC_API_KEY", model: "ANTHROPIC_MODEL" },
-    openai: { apiKey: "OPENAI_API_KEY", model: "OPENAI_MODEL" },
-    nvidia: { apiKey: "NVIDIA_API_KEY", model: "NVIDIA_MODEL" },
-    ollama: { apiKey: "OLLAMA_API_KEY", model: "OLLAMA_MODEL" },
+    openai: { apiKey: "OPENAI_API_KEY", model: "OPENAI_MODEL", baseURL: "OPENAI_BASE_URL" },
+    nvidia: { apiKey: "NVIDIA_API_KEY", model: "NVIDIA_MODEL", baseURL: "NVIDIA_BASE_URL" },
+    ollama: { apiKey: "OLLAMA_API_KEY", model: "OLLAMA_MODEL", baseURL: "OLLAMA_BASE_URL" },
+    gemini: { apiKey: "GEMINI_API_KEY", model: "GEMINI_MODEL", baseURL: "GEMINI_BASE_URL" },
+    openrouter: {
+        apiKey: "OPENROUTER_API_KEY",
+        model: "OPENROUTER_MODEL",
+        baseURL: "OPENROUTER_BASE_URL",
+    },
+    custom: { apiKey: "CUSTOM_API_KEY", model: "CUSTOM_MODEL", baseURL: "CUSTOM_BASE_URL" },
 };
 function isReviewLevel(value) {
     return REVIEW_LEVELS.includes(value);
@@ -53,6 +63,9 @@ function buildProviderRegistry() {
     registry.register("openai", (config) => new OpenAIProvider(config));
     registry.register("nvidia", (config) => new NvidiaProvider(config));
     registry.register("ollama", (config) => new OllamaProvider(config));
+    registry.register("gemini", (config) => new GeminiProvider(config));
+    registry.register("openrouter", (config) => new OpenRouterProvider(config));
+    registry.register("custom", (config) => new CustomProvider(config));
     return registry;
 }
 export async function main(argv = process.argv) {
@@ -62,9 +75,12 @@ export async function main(argv = process.argv) {
         .description("AI-powered Git Review Pipeline with Intelligent Context Building")
         .version(pkg.version)
         .option("--commit <ref>", "review a specific commit instead of the staged index")
-        .option("--provider <name>", "AI provider to use: claude, openai, nvidia, or ollama", "claude")
+        .option("--provider <name>", "AI provider to use: claude, openai, nvidia, ollama, gemini, openrouter, or custom " +
+        "(any OpenAI-compatible endpoint, including local LLM servers)", "claude")
         .option("--api-key <key>", "API key for the selected provider (saved encrypted for future runs)")
         .option("--model <model>", "model name for the selected provider (saved for future runs)")
+        .option("--base-url <url>", "API base URL for the selected provider, e.g. a local LLM server or other " +
+        "OpenAI-compatible endpoint (saved for future runs; required for --provider custom)")
         .option("--forget-credentials", "remove stored credentials for the selected provider and exit", false)
         .option("--level <level>", "review level: fast, normal, or deep", "normal")
         .option("--type <type>", "review focus: general, security, performance, architecture, or style", "general")
@@ -98,8 +114,12 @@ export async function main(argv = process.argv) {
         process.exitCode = 2;
         return;
     }
-    if (opts.apiKey !== undefined || opts.model !== undefined) {
-        saveProviderConfig(opts.provider, { apiKey: opts.apiKey, model: opts.model });
+    if (opts.apiKey !== undefined || opts.model !== undefined || opts.baseUrl !== undefined) {
+        saveProviderConfig(opts.provider, {
+            apiKey: opts.apiKey,
+            model: opts.model,
+            baseURL: opts.baseUrl,
+        });
         if (!opts.json) {
             console.log(colors.dim(`Saved ${opts.provider} credentials to ~/.can-i-merge (encrypted).`));
         }
@@ -108,10 +128,13 @@ export async function main(argv = process.argv) {
     const envVars = PROVIDER_ENV_VARS[opts.provider];
     const apiKey = opts.apiKey ?? (envVars && process.env[envVars.apiKey]) ?? stored.apiKey;
     const model = opts.model ?? (envVars && process.env[envVars.model]) ?? stored.model;
+    const baseURL = opts.baseUrl ??
+        (envVars?.baseURL && process.env[envVars.baseURL]) ??
+        stored.baseURL;
     const registry = buildProviderRegistry();
     let provider;
     try {
-        provider = registry.create(opts.provider, { apiKey, model });
+        provider = registry.create(opts.provider, { apiKey, model, baseURL });
     }
     catch (err) {
         console.error(colors.red(err instanceof Error ? err.message : String(err)));

package/dist/config/credentialStore.js

@@ -69,7 +69,7 @@ function writeCredentialsFile(contents) {
     ensureConfigDir();
     writeFileSync(CREDENTIALS_FILE, JSON.stringify(contents, null, 2), { mode: 0o600 });
 }
-/** Persist an API key and/or model for a provider, encrypting the API key at rest. */
+/** Persist an API key, model, and/or base URL for a provider, encrypting the API key at rest. */
 export function saveProviderConfig(provider, config) {
     const file = readCredentialsFile();
     const next = { ...file[provider] };
@@ -79,10 +79,13 @@ export function saveProviderConfig(provider, config) {
     if (config.model !== undefined) {
         next.model = config.model;
     }
+    if (config.baseURL !== undefined) {
+        next.baseURL = config.baseURL;
+    }
     file[provider] = next;
     writeCredentialsFile(file);
 }
-/** Load a previously persisted API key/model for a provider, decrypting the API key. */
+/** Load a previously persisted API key/model/base URL for a provider, decrypting the API key. */
 export function loadProviderConfig(provider) {
     const stored = readCredentialsFile()[provider];
     if (!stored) {
@@ -101,6 +104,9 @@ export function loadProviderConfig(provider) {
     if (stored.model) {
         result.model = stored.model;
     }
+    if (stored.baseURL) {
+        result.baseURL = stored.baseURL;
+    }
     return result;
 }
 /** Remove stored credentials for a provider (or all providers if omitted). */

package/dist/provider-custom/customProvider.js

@@ -0,0 +1,38 @@
+/**
+ * Custom provider - talks to any OpenAI chat-completions-compatible
+ * endpoint the user points it at: a self-hosted/local LLM server (LM
+ * Studio, vLLM, llama.cpp server, text-generation-webui, ...), or any
+ * other API that speaks the OpenAI wire format. Unlike the other
+ * OpenAI-compatible providers, there is no default base URL - the caller
+ * must supply one. Delegates the actual request/response handling to the
+ * shared OpenAI-compatible reviewer.
+ */
+import { createOpenAICompatibleReviewer } from "../shared/openaiCompatibleProvider.js";
+export class CustomProvider {
+    name = "custom";
+    delegate;
+    constructor(options = {}) {
+        const baseURL = options.baseURL ?? process.env.CUSTOM_BASE_URL;
+        if (!baseURL) {
+            throw new Error('Missing endpoint URL for the custom provider. Set the CUSTOM_BASE_URL environment variable, or pass --base-url / { baseURL } (e.g. "http://localhost:1234/v1" for a local server, or the base URL of any OpenAI-compatible API).');
+        }
+        const model = options.model ?? process.env.CUSTOM_MODEL;
+        if (!model) {
+            throw new Error("Missing model for the custom provider. Set the CUSTOM_MODEL environment variable, or pass --model / { model }.");
+        }
+        // Many self-hosted/local servers don't require a real API key, but the
+        // OpenAI SDK still needs a non-empty string - fall back to a
+        // placeholder, same as the Ollama provider does.
+        const apiKey = options.apiKey ?? process.env.CUSTOM_API_KEY ?? "not-needed";
+        this.delegate = createOpenAICompatibleReviewer({
+            providerName: this.name,
+            apiKey,
+            model,
+            baseURL,
+            maxOutputTokens: options.maxOutputTokens,
+        });
+    }
+    async review(context) {
+        return this.delegate.review(context);
+    }
+}

package/dist/provider-custom/index.js

@@ -0,0 +1,6 @@
+/**
+ * provider-custom package entry point. Re-exports the Custom provider.
+ * Does NOT register the provider into any registry - that wiring happens
+ * elsewhere (e.g. in the CLI or core composition root).
+ */
+export * from "./customProvider.js";

package/dist/provider-gemini/geminiProvider.js

@@ -0,0 +1,33 @@
+/**
+ * Gemini provider - talks to Google's OpenAI-compatible endpoint for
+ * Gemini models at https://generativelanguage.googleapis.com/v1beta/openai/.
+ * Delegates the actual request/response handling to the shared
+ * OpenAI-compatible reviewer.
+ */
+import { createOpenAICompatibleReviewer } from "../shared/openaiCompatibleProvider.js";
+export const DEFAULT_GEMINI_BASE_URL = "https://generativelanguage.googleapis.com/v1beta/openai/";
+export class GeminiProvider {
+    name = "gemini";
+    delegate;
+    constructor(options = {}) {
+        const apiKey = options.apiKey ?? process.env.GEMINI_API_KEY;
+        if (!apiKey) {
+            throw new Error("Missing Gemini API key. Set the GEMINI_API_KEY environment variable, or pass { apiKey } when constructing GeminiProvider.");
+        }
+        const model = options.model ?? process.env.GEMINI_MODEL;
+        if (!model) {
+            throw new Error('Missing Gemini model. Set the GEMINI_MODEL environment variable, or pass { model } when constructing GeminiProvider (e.g. "gemini-2.5-flash").');
+        }
+        const baseURL = options.baseURL ?? process.env.GEMINI_BASE_URL ?? DEFAULT_GEMINI_BASE_URL;
+        this.delegate = createOpenAICompatibleReviewer({
+            providerName: this.name,
+            apiKey,
+            model,
+            baseURL,
+            maxOutputTokens: options.maxOutputTokens,
+        });
+    }
+    async review(context) {
+        return this.delegate.review(context);
+    }
+}

package/dist/provider-gemini/index.js

@@ -0,0 +1,6 @@
+/**
+ * provider-gemini package entry point. Re-exports the Gemini provider.
+ * Does NOT register the provider into any registry - that wiring happens
+ * elsewhere (e.g. in the CLI or core composition root).
+ */
+export * from "./geminiProvider.js";

package/dist/provider-openrouter/index.js

@@ -0,0 +1,6 @@
+/**
+ * provider-openrouter package entry point. Re-exports the OpenRouter
+ * provider. Does NOT register the provider into any registry - that wiring
+ * happens elsewhere (e.g. in the CLI or core composition root).
+ */
+export * from "./openRouterProvider.js";

package/dist/provider-openrouter/openRouterProvider.js

@@ -0,0 +1,33 @@
+/**
+ * OpenRouter provider - talks to OpenRouter's OpenAI-compatible endpoint at
+ * https://openrouter.ai/api/v1, which fronts many models (Claude, GPT,
+ * Gemini, Llama, and more) behind a single API key. Delegates the actual
+ * request/response handling to the shared OpenAI-compatible reviewer.
+ */
+import { createOpenAICompatibleReviewer } from "../shared/openaiCompatibleProvider.js";
+export const DEFAULT_OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1";
+export class OpenRouterProvider {
+    name = "openrouter";
+    delegate;
+    constructor(options = {}) {
+        const apiKey = options.apiKey ?? process.env.OPENROUTER_API_KEY;
+        if (!apiKey) {
+            throw new Error("Missing OpenRouter API key. Set the OPENROUTER_API_KEY environment variable, or pass { apiKey } when constructing OpenRouterProvider.");
+        }
+        const model = options.model ?? process.env.OPENROUTER_MODEL;
+        if (!model) {
+            throw new Error('Missing OpenRouter model. Set the OPENROUTER_MODEL environment variable, or pass { model } when constructing OpenRouterProvider (e.g. "anthropic/claude-sonnet-5" - see the model catalog at https://openrouter.ai/models).');
+        }
+        const baseURL = options.baseURL ?? process.env.OPENROUTER_BASE_URL ?? DEFAULT_OPENROUTER_BASE_URL;
+        this.delegate = createOpenAICompatibleReviewer({
+            providerName: this.name,
+            apiKey,
+            model,
+            baseURL,
+            maxOutputTokens: options.maxOutputTokens,
+        });
+    }
+    async review(context) {
+        return this.delegate.review(context);
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "can-i-merge",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "AI-powered Git Review Pipeline with Intelligent Context Building",
   "type": "module",
   "main": "dist/index.js",