git-ai-review 2.2.1 → 2.3.0

package/README.md

@@ -68,7 +68,7 @@ Recommended: install multiple for resilient fallback behavior.
 
 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 a provider was unavailable on the previous run, it is rotated to the end of the chain on the next attempt (state stored in `.git/ai-review-last-unavailable`, cleared on success). If all are unavailable, review fails.
+Default fallback chain: Codex → Copilot → Claude. If a provider was unavailable on the previous run, it is rotated to the end of the chain on the next attempt (state stored in `.git/ai-review-last-unavailable`). The rotation persists until the unavailable provider is retried and found available again, preventing repeated preflight failures. If all are unavailable, review fails.
 
 When a reviewer is explicitly selected via `--claude`, `--codex`, or `--copilot`, the preflight check is skipped entirely — the CLI tool handles its own authentication.
 
@@ -185,6 +185,19 @@ Use `--verbose` to print:
 
 This is useful for debugging prompt behavior and model integration issues.
 
+## Token usage
+
+After each review, token usage is printed to stdout when available:
+
+```
+Tokens: input: 1234, output: 567
+```
+
+- **Input tokens**: tokens sent to the model (your prompt, diff, schema, AGENTS.md context).
+- **Output tokens**: tokens generated by the model (the review JSON response).
+
+For Claude, usage is reliably extracted from the CLI's JSON envelope. For Codex and Copilot, usage is extracted on a best-effort basis from CLI output and may not always be available.
+
 ## Example setup in a target repo
 
 ```bash

package/dist/review.d.ts

@@ -1,4 +1,4 @@
-import type { ParsedReview, ReviewReport, ReviewRunnerResult } from './types.js';
+import type { ParsedReview, ReviewReport, ReviewRunnerResult, TokenUsage } from './types.js';
 export type ReviewerName = 'codex' | 'copilot' | 'claude';
 export declare function buildFallbackOrder(lastUnavailable: string | null): ReviewerName[];
 export declare function readLastUnavailable(cwd: string): string | null;
@@ -36,6 +36,8 @@ export interface ResolveBinaryOptions {
 }
 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 extractTokenUsage(usage: unknown): TokenUsage | undefined;
+export declare function extractTokenUsageFromText(text: string): TokenUsage | undefined;
 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

@@ -183,6 +183,24 @@ function validateParsedReview(parsed) {
     }
     return parsed;
 }
+export function extractTokenUsage(usage) {
+    if (!usage || typeof usage !== 'object')
+        return undefined;
+    const u = usage;
+    const input = typeof u.input_tokens === 'number' ? u.input_tokens : undefined;
+    const output = typeof u.output_tokens === 'number' ? u.output_tokens : undefined;
+    if (input === undefined && output === undefined)
+        return undefined;
+    return { input_tokens: input, output_tokens: output };
+}
+export function extractTokenUsageFromText(text) {
+    // Find a JSON object that contains both input_tokens and output_tokens as siblings
+    const objectPattern = /\{[^{}]*"input_tokens"\s*:\s*(\d+)[^{}]*"output_tokens"\s*:\s*(\d+)[^{}]*\}/;
+    const match = text.match(objectPattern);
+    if (!match)
+        return undefined;
+    return { input_tokens: Number(match[1]), output_tokens: Number(match[2]) };
+}
 export function parseSubagentOutput(raw) {
     const trimmed = String(raw || '').trim();
     if (!trimmed) {
@@ -296,16 +314,18 @@ async function runClaude(prompt, verbose, skipPreflight = false) {
             return { available: false };
         }
         let reviewPayload = trimmed;
+        let usage;
         try {
             const envelope = JSON.parse(trimmed);
             if (envelope && typeof envelope === 'object' && typeof envelope.result === 'string') {
                 reviewPayload = envelope.result;
+                usage = extractTokenUsage(envelope.usage);
             }
         }
         catch {
             // not an envelope — use raw output
         }
-        return { available: true, result: parseSubagentOutput(reviewPayload) };
+        return { available: true, result: parseSubagentOutput(reviewPayload), usage };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -360,7 +380,8 @@ function runCodex(prompt, verbose, skipPreflight = false) {
             console.error(`Codex: execution failed${err ? `: ${err}` : ''} — skipping.`);
             return { available: false };
         }
-        return { available: true, result: parseSubagentOutput(readFileSync(resultPath, 'utf8')) };
+        const usage = extractTokenUsageFromText(run.stdout || '');
+        return { available: true, result: parseSubagentOutput(readFileSync(resultPath, 'utf8')), usage };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -405,7 +426,8 @@ function runCopilot(prompt, verbose, skipPreflight = false) {
             console.error('Copilot: empty response — skipping.');
             return { available: false };
         }
-        return { available: true, result: parseSubagentOutput(stdout) };
+        const usage = extractTokenUsageFromText(run.stderr || '');
+        return { available: true, result: parseSubagentOutput(stdout), usage };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -441,7 +463,7 @@ export function evaluateResults(claude, codex, copilot) {
     }
     return { pass: true, reason: `AI review approved by: ${passed.join(', ')}.` };
 }
-function printReview(model, result) {
+function printReview(model, result, usage) {
     const label = result.status === 'fail'
         ? `${model} review FAILED`
         : result.findings.length > 0
@@ -454,6 +476,15 @@ function printReview(model, result) {
         console.log(`- [${finding.severity}] ${finding.title} (${at})`);
         console.log(`  ${finding.details}`);
     }
+    if (usage) {
+        const parts = [];
+        if (usage.input_tokens !== undefined)
+            parts.push(`input: ${usage.input_tokens}`);
+        if (usage.output_tokens !== undefined)
+            parts.push(`output: ${usage.output_tokens}`);
+        if (parts.length > 0)
+            console.log(`Tokens: ${parts.join(', ')}`);
+    }
 }
 export async function runReview(cwd = process.cwd(), options = {}, deps = {}) {
     const verbose = options.verbose === true;
@@ -531,7 +562,7 @@ export async function runReview(cwd = process.cwd(), options = {}, deps = {}) {
         if (firstUnavailable) {
             writeLastUnavailable(cwd, firstUnavailable);
         }
-        else {
+        else if (!lastUnavailable || !DEFAULT_FALLBACK_ORDER.includes(lastUnavailable) || results[lastUnavailable].available) {
             clearLastUnavailable(cwd);
         }
     }
@@ -544,19 +575,19 @@ export async function runReview(cwd = process.cwd(), options = {}, deps = {}) {
     runtimeDeps.writeReport(reportPath, report);
     runtimeDeps.log(`AI review raw report saved: ${reportPath}`);
     if (claude.available) {
-        printReview('Claude', claude.result);
+        printReview('Claude', claude.result, claude.usage);
     }
     else {
         console.log('\nClaude: unavailable — skipped.');
     }
     if (codex.available) {
-        printReview('Codex', codex.result);
+        printReview('Codex', codex.result, codex.usage);
     }
     else {
         console.log('\nCodex: unavailable — skipped.');
     }
     if (copilot.available) {
-        printReview('Copilot', copilot.result);
+        printReview('Copilot', copilot.result, copilot.usage);
     }
     else {
         console.log('\nCopilot: unavailable — skipped.');

package/dist/types.d.ts

@@ -10,11 +10,16 @@ export interface ParsedReview {
     summary: string;
     findings: ReviewFinding[];
 }
+export interface TokenUsage {
+    input_tokens?: number;
+    output_tokens?: number;
+}
 export type ReviewRunnerResult = {
     available: false;
 } | {
     available: true;
     result: ParsedReview;
+    usage?: TokenUsage;
 };
 export interface ReviewReport {
     claude: ParsedReview | {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-ai-review",
-  "version": "2.2.1",
+  "version": "2.3.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",