kodevu 0.1.21 → 0.1.23

package/README.md

@@ -76,7 +76,7 @@ npx kodevu /path/to/your/repo --config ./config.current.json
 ## Config
 
 - `target`: required repository target; can be provided by config or as the CLI positional argument
-- `reviewer`: `codex`, `gemini`, or `auto`; default `auto`
+- `reviewer`: `codex`, `gemini`, `copilot`, or `auto`; default `auto`
 - `prompt`: saved into the report as review context
 - `outputDir`: report output directory; default `~/.kodevu`
 - `outputFormats`: report formats to generate; supports `markdown` and `json`; default `["markdown"]`
@@ -100,7 +100,8 @@ Internal defaults:
 
 - `reviewer: "codex"` uses `codex exec` with the diff embedded in the prompt.
 - `reviewer: "gemini"` uses `gemini -p` in non-interactive mode.
-- `reviewer: "auto"` probes `codex` and `gemini` in `PATH`, then randomly chooses one of the available CLIs for this run.
+- `reviewer: "copilot"` uses `copilot -p` in non-interactive mode.
+- `reviewer: "auto"` probes `codex`, `gemini`, and `copilot` in `PATH`, then randomly chooses one of the available CLIs for this run.
 - Large diffs are truncated before being sent to the reviewer or written into the report once they exceed the configured line or character limits.
 - For Git targets and local SVN working copies, the reviewer command runs from the repository workspace so it can inspect related files beyond the diff when needed.
 - For remote SVN URLs without a local working copy, the review still relies on the diff and change metadata only.
@@ -109,3 +110,4 @@ Internal defaults:
 - If `outputFormats` includes `json`, matching `.json` files are generated alongside Markdown reports.
 - `~/.kodevu/state.json` stores per-project checkpoints keyed by repository identity; only the v2 multi-project structure is supported.
 - If the reviewer command exits non-zero or times out, the report is still written, but the state is not advanced so the change can be retried later.
+- Each report includes a `Token Usage` section recording token consumption for the review task. When the reviewer CLI outputs token statistics (via stderr), those are used directly (`source: "reviewer"`). Otherwise tokens are estimated at ~4 characters per token (`source: "estimate"`). The JSON report contains a `tokenUsage` object with `inputTokens`, `outputTokens`, `totalTokens`, and `source`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kodevu",
-  "version": "0.1.21",
+  "version": "0.1.23",
   "type": "module",
   "description": "Poll SVN revisions or Git commits, send each change diff to a reviewer CLI, and write configurable review reports.",
   "bin": {

package/src/config.js

@@ -4,7 +4,7 @@ import path from "node:path";
 import { findCommandOnPath } from "./shell.js";
 
 const defaultStorageDir = path.join(os.homedir(), ".kodevu");
-const SUPPORTED_REVIEWERS = ["codex", "gemini"];
+const SUPPORTED_REVIEWERS = ["codex", "gemini", "copilot"];
 
 const defaultConfig = {
   reviewer: "auto",
@@ -223,7 +223,7 @@ export async function loadConfig(configPath, cliArgs = {}) {
     config.reviewerWasAutoSelected = true;
   } else if (!SUPPORTED_REVIEWERS.includes(config.reviewer)) {
     throw new Error(
-      `"reviewer" must be one of "codex", "gemini", or "auto"${loadedConfigPath ? ` in ${loadedConfigPath}` : ""}`
+      `"reviewer" must be one of "codex", "gemini", "copilot", or "auto"${loadedConfigPath ? ` in ${loadedConfigPath}` : ""}`
     );
   }
 
@@ -259,13 +259,13 @@ Usage:
 
 Options:
   --config, -c   Optional config json path. If omitted, ./config.json is loaded only when present
-  --reviewer, -r Override reviewer (codex | gemini | auto)
+  --reviewer, -r Override reviewer (codex | gemini | copilot | auto)
   --prompt, -p   Override prompt
   --debug, -d    Print extra debug information to the console
   --help, -h     Show help
 
 Config highlights:
-  reviewer       codex | gemini | auto
+  reviewer       codex | gemini | copilot | auto
   target         Repository target path (Git) or SVN working copy / URL; CLI positional target overrides config
   outputFormats  ["markdown"] by default; set to include "json" when needed
 `);

package/src/review-runner.js

@@ -23,6 +23,117 @@ function debugLog(config, message) {
   }
 }
 
+function estimateTokenCount(text) {
+  if (!text) {
+    return 0;
+  }
+
+  return Math.ceil(text.length / 4);
+}
+
+function parseGeminiTokenUsage(stderr) {
+  if (!stderr) {
+    return null;
+  }
+
+  const patterns = [
+    /input[_ ]tokens?\s*[:=]\s*(\d+)/i,
+    /output[_ ]tokens?\s*[:=]\s*(\d+)/i,
+    /total[_ ]tokens?\s*[:=]\s*(\d+)/i
+  ];
+
+  const inputMatch = stderr.match(patterns[0]);
+  const outputMatch = stderr.match(patterns[1]);
+  const totalMatch = stderr.match(patterns[2]);
+
+  if (!inputMatch && !outputMatch && !totalMatch) {
+    return null;
+  }
+
+  const inputTokens = inputMatch ? Number(inputMatch[1]) : 0;
+  const outputTokens = outputMatch ? Number(outputMatch[1]) : 0;
+  const totalTokens = totalMatch ? Number(totalMatch[1]) : inputTokens + outputTokens;
+
+  return { inputTokens, outputTokens, totalTokens };
+}
+
+function parseCodexTokenUsage(stderr) {
+  if (!stderr) {
+    return null;
+  }
+
+  const patterns = [
+    /input[_ ]tokens?\s*[:=]\s*(\d+)/i,
+    /output[_ ]tokens?\s*[:=]\s*(\d+)/i,
+    /total[_ ]tokens?\s*[:=]\s*(\d+)/i
+  ];
+
+  const inputMatch = stderr.match(patterns[0]);
+  const outputMatch = stderr.match(patterns[1]);
+  const totalMatch = stderr.match(patterns[2]);
+
+  if (!inputMatch && !outputMatch && !totalMatch) {
+    return null;
+  }
+
+  const inputTokens = inputMatch ? Number(inputMatch[1]) : 0;
+  const outputTokens = outputMatch ? Number(outputMatch[1]) : 0;
+  const totalTokens = totalMatch ? Number(totalMatch[1]) : inputTokens + outputTokens;
+
+  return { inputTokens, outputTokens, totalTokens };
+}
+
+function parseCopilotTokenUsage(stderr) {
+  if (!stderr) {
+    return null;
+  }
+
+  const patterns = [
+    /input[_ ]tokens?\s*[:=]\s*(\d+)/i,
+    /output[_ ]tokens?\s*[:=]\s*(\d+)/i,
+    /total[_ ]tokens?\s*[:=]\s*(\d+)/i
+  ];
+
+  const inputMatch = stderr.match(patterns[0]);
+  const outputMatch = stderr.match(patterns[1]);
+  const totalMatch = stderr.match(patterns[2]);
+
+  if (!inputMatch && !outputMatch && !totalMatch) {
+    return null;
+  }
+
+  const inputTokens = inputMatch ? Number(inputMatch[1]) : 0;
+  const outputTokens = outputMatch ? Number(outputMatch[1]) : 0;
+  const totalTokens = totalMatch ? Number(totalMatch[1]) : inputTokens + outputTokens;
+
+  return { inputTokens, outputTokens, totalTokens };
+}
+
+const TOKEN_PARSERS = {
+  gemini: parseGeminiTokenUsage,
+  codex: parseCodexTokenUsage,
+  copilot: parseCopilotTokenUsage
+};
+
+function resolveTokenUsage(reviewerName, stderr, promptText, diffText, responseText) {
+  const parseFn = TOKEN_PARSERS[reviewerName] || parseCopilotTokenUsage;
+  const parsed = parseFn(stderr);
+
+  if (parsed && parsed.totalTokens > 0) {
+    return { ...parsed, source: "reviewer" };
+  }
+
+  const inputTokens = estimateTokenCount((promptText || "") + (diffText || ""));
+  const outputTokens = estimateTokenCount(responseText || "");
+
+  return {
+    inputTokens,
+    outputTokens,
+    totalTokens: inputTokens + outputTokens,
+    source: "estimate"
+  };
+}
+
 const REVIEWERS = {
   codex: {
     displayName: "Codex",
@@ -82,6 +193,25 @@ const REVIEWERS = {
         debug: config.debug
       });
 
+      return {
+        ...execResult,
+        message: execResult.stdout
+      };
+    }
+  },
+  copilot: {
+    displayName: "Copilot",
+    responseSectionTitle: "Copilot Response",
+    emptyResponseText: "_No final response returned from copilot._",
+    async run(config, workingDir, promptText, diffText) {
+      const execResult = await runCommand("copilot", ["-p", promptText], {
+        cwd: workingDir,
+        input: ["Unified diff:", diffText].join("\n\n"),
+        allowFailure: true,
+        timeoutMs: config.commandTimeoutMs,
+        debug: config.debug
+      });
+
       return {
         ...execResult,
         message: execResult.stdout
@@ -314,7 +444,17 @@ function buildPrompt(config, backend, targetInfo, details, reviewDiffPayload) {
   ].join("\n\n");
 }
 
-function buildReport(config, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult) {
+function formatTokenUsage(tokenUsage) {
+  const sourceLabel = tokenUsage.source === "reviewer" ? "reviewer reported" : "estimated (~4 chars/token)";
+  return [
+    `- Input Tokens: \`${tokenUsage.inputTokens}\``,
+    `- Output Tokens: \`${tokenUsage.outputTokens}\``,
+    `- Total Tokens: \`${tokenUsage.totalTokens}\``,
+    `- Token Source: \`${sourceLabel}\``
+  ].join("\n");
+}
+
+function buildReport(config, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult, tokenUsage) {
   const lines = [
     `# ${backend.displayName} Review Report: ${details.displayId}`,
     "",
@@ -328,6 +468,10 @@ function buildReport(config, backend, targetInfo, details, diffPayloads, reviewe
     `- Reviewer Exit Code: \`${reviewerResult.code}\``,
     `- Reviewer Timed Out: \`${reviewerResult.timedOut ? "yes" : "no"}\``,
     "",
+    "## Token Usage",
+    "",
+    formatTokenUsage(tokenUsage),
+    "",
     "## Changed Files",
     "",
     formatChangedPaths(details.changedPaths),
@@ -361,7 +505,7 @@ function buildReport(config, backend, targetInfo, details, diffPayloads, reviewe
   return `${lines.join("\n")}\n`;
 }
 
-function buildJsonReport(config, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult) {
+function buildJsonReport(config, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult, tokenUsage) {
   return {
     repositoryType: backend.displayName,
     target: targetInfo.targetDisplay || config.target,
@@ -374,6 +518,12 @@ function buildJsonReport(config, backend, targetInfo, details, diffPayloads, rev
       exitCode: reviewerResult.code,
       timedOut: Boolean(reviewerResult.timedOut)
     },
+    tokenUsage: {
+      inputTokens: tokenUsage.inputTokens,
+      outputTokens: tokenUsage.outputTokens,
+      totalTokens: tokenUsage.totalTokens,
+      source: tokenUsage.source
+    },
     changedFiles: details.changedPaths.map((item) => ({
       action: item.action,
       path: item.relativePath,
@@ -407,10 +557,20 @@ async function runReviewerPrompt(config, backend, targetInfo, details, diffText)
   const reviewWorkspaceRoot = getReviewWorkspaceRoot(config, backend, targetInfo);
   const diffPayloads = prepareDiffPayloads(config, diffText);
   const promptText = buildPrompt(config, backend, targetInfo, details, diffPayloads.review);
+  const result = await reviewer.run(config, reviewWorkspaceRoot, promptText, diffPayloads.review.text);
+  const tokenUsage = resolveTokenUsage(
+    config.reviewer,
+    result.stderr,
+    promptText,
+    diffPayloads.review.text,
+    result.message
+  );
+
   return {
     reviewer,
     diffPayloads,
-    result: await reviewer.run(config, reviewWorkspaceRoot, promptText, diffPayloads.review.text)
+    result,
+    tokenUsage
   };
 }
 
@@ -469,6 +629,7 @@ async function reviewChange(config, backend, targetInfo, changeId, progress) {
   let reviewer;
   let diffPayloads;
   let reviewerResult;
+  let tokenUsage;
   let currentReviewerConfig;
 
   for (const reviewerName of reviewersToTry) {
@@ -486,6 +647,7 @@ async function reviewChange(config, backend, targetInfo, changeId, progress) {
     reviewer = res.reviewer;
     diffPayloads = res.diffPayloads;
     reviewerResult = res.result;
+    tokenUsage = res.tokenUsage;
 
     if (reviewerResult.code === 0 && !reviewerResult.timedOut) {
       break;
@@ -497,7 +659,8 @@ async function reviewChange(config, backend, targetInfo, changeId, progress) {
   }
 
   progress?.update(0.82, "writing report");
-  const report = buildReport(currentReviewerConfig, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult);
+  debugLog(config, `Token usage: input=${tokenUsage.inputTokens} output=${tokenUsage.outputTokens} total=${tokenUsage.totalTokens} source=${tokenUsage.source}`);
+  const report = buildReport(currentReviewerConfig, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult, tokenUsage);
   const outputFile = path.join(config.outputDir, backend.getReportFileName(changeId));
   const jsonOutputFile = outputFile.replace(/\.md$/i, ".json");
 
@@ -508,7 +671,7 @@ async function reviewChange(config, backend, targetInfo, changeId, progress) {
   if (shouldWriteFormat(config, "json")) {
     await writeJsonFile(
       jsonOutputFile,
-      buildJsonReport(currentReviewerConfig, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult)
+      buildJsonReport(currentReviewerConfig, backend, targetInfo, details, diffPayloads, reviewer, reviewerResult, tokenUsage)
     );
   }