git-ai-review 2.0.2 → 2.1.0

package/README.md

@@ -36,7 +36,7 @@ This package is licensed under **MPL-2.0**.
 
 ## What it does
 
-`git-ai-review` uses your locally installed AI CLIs to review staged changes before they are committed. You can run it on demand with a single command (`npx git-ai-review review`) or install it as a git hook so every commit is reviewed automatically.
+`git-ai-review` uses your locally installed AI CLIs to review staged changes before they are committed. You can run it on demand with a single command (`npx git-ai-review review`), review the diff between two branches (`npx git-ai-review diff main feature-branch`), or install it as a git hook so every commit is reviewed automatically.
 
 - Uses your local **Codex CLI** as the primary reviewer.
 - Falls back to **Copilot CLI**, then **Claude CLI** when the previous reviewer is unavailable.
@@ -55,9 +55,11 @@ This package is licensed under **MPL-2.0**.
 At least one reviewer CLI must be installed and authenticated on each developer machine.
 Recommended: install multiple for resilient fallback behavior.
 
-- Codex CLI (`codex`) with active login (`codex login`) — primary reviewer
-- Copilot CLI (`copilot`) with active login (`copilot auth`)
-- Claude CLI (`claude`)
+- Codex CLI (`codex`) with active login (`codex login`) or `OPENAI_API_KEY` env var — primary reviewer
+- Copilot CLI (`copilot`) with active login (`copilot auth`) or `GITHUB_TOKEN` env var
+- Claude CLI (`claude`) with `ANTHROPIC_API_KEY` env var or OAuth login
+
+When an API token env var is set, the network preflight check for that reviewer is skipped — this is useful in CI environments or when interactive OAuth login is not available.
 
 Default fallback chain: Codex → Copilot → Claude. If all are unavailable, review fails.
 
@@ -89,6 +91,10 @@ npx git-ai-review review --verbose
 npx git-ai-review review --codex
 npx git-ai-review review --copilot
 npx git-ai-review review --claude
+npx git-ai-review diff main
+npx git-ai-review diff main feature-branch
+npx git-ai-review diff main feature-branch --verbose
+npx git-ai-review diff main feature-branch --codex
 npx git-ai-review pre-commit
 npx git-ai-review pre-commit --verbose
 npx git-ai-review install
@@ -102,6 +108,9 @@ npm run git-ai-review -- review --verbose
 npm run git-ai-review -- review --codex
 npm run git-ai-review -- review --copilot
 npm run git-ai-review -- review --claude
+npm run git-ai-review -- diff main
+npm run git-ai-review -- diff main feature-branch
+npm run git-ai-review -- diff main feature-branch --verbose
 npm run git-ai-review -- pre-commit
 npm run git-ai-review -- pre-commit --verbose
 npm run git-ai-review -- install
@@ -114,6 +123,7 @@ npm run git-ai-review -- install
 - `review --codex`: force Codex reviewer only (skip Copilot/Claude fallback).
 - `review --copilot`: force Copilot reviewer only (skip Codex/Claude).
 - `review --claude`: force Claude reviewer only (skip Codex/Copilot).
+- `diff <base> [head]`: run AI review for the diff between two branches/refs. Uses three-dot diff (`base...head`) to show changes introduced on `head` since it diverged from `base`. If `head` is omitted, defaults to `HEAD`. Supports the same `--verbose` and reviewer flags as `review`.
 - `pre-commit`: run lock-aware pre-commit flow (recommended for hooks).
 - `pre-commit --verbose`: same as pre-commit, but with detailed prompt/raw model logs.
 - `install`: install hook script and set `core.hooksPath`.
@@ -138,6 +148,9 @@ In each target repository:
 
 ## Environment variables
 
+- `ANTHROPIC_API_KEY`: Anthropic API token for Claude — skips network preflight when set.
+- `OPENAI_API_KEY`: OpenAI API token for Codex — skips network preflight when set.
+- `GITHUB_TOKEN`: GitHub token for Copilot — skips network preflight when set.
 - `CODEX_BIN`: custom Codex executable path/name.
 - `COPILOT_BIN`: custom Copilot executable path/name.
 - `CLAUDE_BIN`: custom Claude executable path/name.

package/dist/cli.js

@@ -1,9 +1,10 @@
 /* SPDX-License-Identifier: MPL-2.0
  * Copyright (c) 2026 ai-review contributors
  */
-import { runReview } from './review.js';
+import { runReview, buildPrompt } from './review.js';
 import { runPreCommit } from './precommit.js';
 import { installPreCommitHook } from './install.js';
+import { getDiffBetweenRefs } from './git.js';
 const DEFAULT_CLI_DEPS = {
     runReview,
     runPreCommit,
@@ -15,9 +16,10 @@ function printHelp(log) {
     log('git-ai-review <command> [options]');
     log('');
     log('Commands:');
-    log('  review      Run AI review for staged changes');
-    log('  pre-commit  Run lock-aware pre-commit flow');
-    log('  install     Install .githooks/pre-commit and set core.hooksPath');
+    log('  review                Run AI review for staged changes');
+    log('  diff <base> [head]    Run AI review for diff between branches');
+    log('  pre-commit            Run lock-aware pre-commit flow');
+    log('  install               Install .githooks/pre-commit and set core.hooksPath');
     log('');
     log('Options:');
     log('  --codex     Force Codex reviewer only (skip Copilot/Claude fallback)');
@@ -55,6 +57,20 @@ export async function runCli(argv = process.argv.slice(2), deps = DEFAULT_CLI_DE
         const result = await deps.runReview(cwd, { verbose, reviewer });
         return result.pass ? 0 : 1;
     }
+    if (command === 'diff') {
+        const positional = args.filter((a) => !a.startsWith('--'));
+        const base = positional[0];
+        const head = positional[1] || 'HEAD';
+        if (!base) {
+            deps.log('Error: diff command requires a base branch. Usage: git-ai-review diff <base> [head]');
+            return 1;
+        }
+        const result = await deps.runReview(cwd, { verbose, reviewer }, {
+            getStagedDiff: () => getDiffBetweenRefs(base, head, cwd),
+            buildPrompt: (diff, promptCwd) => buildPrompt(diff, promptCwd, `Branch diff (${base}...${head})`),
+        });
+        return result.pass ? 0 : 1;
+    }
     if (command === 'pre-commit') {
         return await deps.runPreCommit(cwd, { verbose, reviewer });
     }

package/dist/git.d.ts

@@ -1,2 +1,3 @@
 export declare function git(args: string[], cwd?: string): string;
+export declare function getDiffBetweenRefs(base: string, head: string, cwd?: string): string;
 export declare function getGitPath(name: string): string;

package/dist/git.js

@@ -5,6 +5,9 @@ import { execFileSync } from 'node:child_process';
 export function git(args, cwd = process.cwd()) {
     return execFileSync('git', args, { cwd, encoding: 'utf8' }).trim();
 }
+export function getDiffBetweenRefs(base, head, cwd = process.cwd()) {
+    return git(['diff', '--no-color', `${base}...${head}`, '--'], cwd);
+}
 export function getGitPath(name) {
     try {
         return git(['rev-parse', '--git-path', name]);

package/dist/review.d.ts

@@ -20,6 +20,8 @@ export interface VerboseRunnerOutput {
 }
 export declare function logVerboseRunnerOutput(output: VerboseRunnerOutput, log?: (message: string) => void): void;
 export declare function needsShellForBinary(binary: string, osPlatform?: NodeJS.Platform): boolean;
+export declare function hasApiToken(envVarName: string, env?: NodeJS.ProcessEnv): boolean;
+export declare function checkPreflight(name: string, tokenEnvVar: string, urls: string[], verbose: boolean, reach?: (url: string) => boolean): boolean;
 export declare function resolveCommandFromPath(candidate: string): string | null;
 export declare function resolveCodexMacAppBinary(osPlatform?: NodeJS.Platform, pathExists?: (path: string) => boolean): string | null;
 export interface ResolveBinaryOptions {
@@ -28,6 +30,7 @@ export interface ResolveBinaryOptions {
     resolveCodexFallback?: () => string | null;
 }
 export declare function resolveBinary(envName: string, candidates: string[], options?: ResolveBinaryOptions): string | null;
+export declare function buildPrompt(diff: string, cwd?: string, diffLabel?: string): string;
 export declare function parseSubagentOutput(raw: string): ParsedReview;
 export declare function buildSpawnOptions(cwd: string, env: Record<string, string>, osPlatform?: NodeJS.Platform): {
     cwd: string;

package/dist/review.js

@@ -36,6 +36,20 @@ function canReach(url) {
         return false;
     }
 }
+export function hasApiToken(envVarName, env = process.env) {
+    return Boolean(env[envVarName]?.trim());
+}
+export function checkPreflight(name, tokenEnvVar, urls, verbose, reach = canReach) {
+    if (hasApiToken(tokenEnvVar)) {
+        if (verbose)
+            console.log(`${name}: using API token (${tokenEnvVar}) — skipping network preflight.`);
+        return true;
+    }
+    if (urls.some(reach))
+        return true;
+    console.error(`${name}: network preflight failed — skipping.`);
+    return false;
+}
 export function resolveCommandFromPath(candidate) {
     if (!/^[a-zA-Z0-9_./-]+$/.test(candidate)) {
         return null;
@@ -96,7 +110,7 @@ export function resolveBinary(envName, candidates, options = {}) {
 function getStagedDiff() {
     return git(['diff', '--cached', '--no-color']);
 }
-function buildPrompt(diff, cwd = process.cwd()) {
+export function buildPrompt(diff, cwd = process.cwd(), diffLabel = 'Staged diff') {
     const context = buildAgentsContext(cwd);
     return [
         ...resolvePromptHeaderLines(),
@@ -114,7 +128,7 @@ function buildPrompt(diff, cwd = process.cwd()) {
         'Respond with ONLY a JSON object matching this schema (no markdown, no backticks, no explanation):',
         JSON.stringify(REVIEW_SCHEMA, null, 2),
         '',
-        'Staged diff:',
+        `${diffLabel}:`,
         diff,
     ].join('\n');
 }
@@ -208,8 +222,7 @@ async function runClaude(prompt, verbose) {
         console.error('Claude: binary not found in PATH (or CLAUDE_BIN not set) — skipping.');
         return { available: false };
     }
-    if (!canReach('https://api.anthropic.com')) {
-        console.error('Claude: network preflight failed (api.anthropic.com) — skipping.');
+    if (!checkPreflight('Claude', 'ANTHROPIC_API_KEY', ['https://api.anthropic.com'], verbose)) {
         return { available: false };
     }
     try {
@@ -267,8 +280,7 @@ function runCodex(prompt, verbose) {
         console.error('Codex: binary not found in PATH (or CODEX_BIN not set) — skipping.');
         return { available: false };
     }
-    if (!canReach('https://api.openai.com/v1/models') && !canReach('https://chatgpt.com')) {
-        console.error('Codex: network preflight failed — skipping.');
+    if (!checkPreflight('Codex', 'OPENAI_API_KEY', ['https://api.openai.com/v1/models', 'https://chatgpt.com'], verbose)) {
         return { available: false };
     }
     const tempDir = mkdtempSync(join(tmpdir(), 'ai-review-codex-'));
@@ -326,8 +338,7 @@ function runCopilot(prompt, verbose) {
         console.error('Copilot: binary not found in PATH (or COPILOT_BIN not set) — skipping.');
         return { available: false };
     }
-    if (!canReach('https://api.github.com')) {
-        console.error('Copilot: network preflight failed (api.github.com) — skipping.');
+    if (!checkPreflight('Copilot', 'GITHUB_TOKEN', ['https://api.github.com'], verbose)) {
         return { available: false };
     }
     try {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "git-ai-review",
-  "version": "2.0.2",
-  "description": "Review your git diff with local Codex CLI or Copilot CLI — run manually in one command or automatically as a git hook",
+  "version": "2.1.0",
+  "description": "Review your git diff with local Codex CLI, Copilot CLI, or Claude CLI — run manually in one command or automatically as a git hook",
   "type": "module",
   "main": "dist/cli.js",
   "bin": {
@@ -28,10 +28,19 @@
     "pre-commit",
     "ai",
     "codex",
-    "copilot"
+    "copilot",
+    "claude"
   ],
   "author": "Sergei Poletaev <spylogsster@gmail.com>",
   "license": "MPL-2.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/spylogsster/git-ai-review.git"
+  },
+  "homepage": "https://github.com/spylogsster/git-ai-review#readme",
+  "bugs": {
+    "url": "https://github.com/spylogsster/git-ai-review/issues"
+  },
   "devDependencies": {
     "@types/node": "^22.13.1",
     "tsx": "^4.20.6",