opencara 0.24.2 → 0.25.0

package/dist/index.js

@@ -1790,7 +1790,7 @@ function fetchPRRef(bareRepoPath, prNumber, ghAvailable) {
     bareRepoPath
   );
 }
-function addWorktree(bareRepoPath, worktreeKey) {
+function addWorktree(bareRepoPath, worktreeKey, targetRef) {
   validatePathSegment(worktreeKey, "worktreeKey");
   const repoName = path4.basename(bareRepoPath, ".git");
   const worktreeBase = path4.join(path4.dirname(bareRepoPath), `${repoName}-worktrees`);
@@ -1799,7 +1799,7 @@ function addWorktree(bareRepoPath, worktreeKey) {
     return worktreePath;
   }
   fs4.mkdirSync(worktreeBase, { recursive: true });
-  gitExec("git", ["worktree", "add", "--detach", worktreePath, "FETCH_HEAD"], bareRepoPath);
+  gitExec("git", ["worktree", "add", "--detach", worktreePath, targetRef], bareRepoPath);
   return worktreePath;
 }
 function removeWorktree(bareRepoPath, worktreePath) {
@@ -1819,6 +1819,9 @@ function repoKeyFromBarePath(bareRepoPath) {
   const owner = path4.basename(path4.dirname(bareRepoPath));
   return `${owner}/${repoName}`;
 }
+function resolveFetchedPrCommit(bareRepoPath) {
+  return gitExec("git", ["rev-parse", "--verify", "FETCH_HEAD"], bareRepoPath).trim();
+}
 async function checkoutWorktree(owner, repo, prNumber, baseDir, _taskId, sparseOptions) {
   validatePathSegment(owner, "owner");
   validatePathSegment(repo, "repo");
@@ -1829,8 +1832,9 @@ async function checkoutWorktree(owner, repo, prNumber, baseDir, _taskId, sparseO
   return withRepoLock(repoKey, () => {
     const { bareRepoPath, cloned } = ensureBareClone(owner, repo, baseDir, ghAvailable);
     fetchPRRef(bareRepoPath, prNumber, ghAvailable);
-    const worktreePath = addWorktree(bareRepoPath, wtKey);
-    gitExec("git", ["checkout", "--detach", "--force", "FETCH_HEAD"], worktreePath);
+    const prHeadCommit = resolveFetchedPrCommit(bareRepoPath);
+    const worktreePath = addWorktree(bareRepoPath, wtKey, prHeadCommit);
+    gitExec("git", ["checkout", "--detach", "--force", prHeadCommit], worktreePath);
     if (useSparse) {
       configureSparseCheckout(worktreePath, sparseOptions.diffPaths);
     }
@@ -1876,18 +1880,71 @@ function gitExec(command, args, cwd, opts) {
     throw new Error(sanitizeTokens(message));
   }
 }
-function diffFromWorktree(bareRepoPath, worktreePath, baseRef, ghAvailable, maxDiffBytes = 128 * 1024 * 1024) {
-  if (!/^[A-Za-z0-9_./-]+$/.test(baseRef) || baseRef.startsWith("-")) {
-    throw new Error(`Invalid base ref: ${baseRef}`);
-  }
+var DEFAULT_BRANCH_FALLBACKS = ["main", "master"];
+function isValidBranchName(name) {
+  if (!name) return false;
+  if (name.startsWith("-")) return false;
+  if (name.includes("..")) return false;
+  return /^[A-Za-z0-9_./-]+$/.test(name);
+}
+function fetchBranch(bareRepoPath, branch, ghAvailable) {
   const credArgs = ghAvailable ? ["-c", `credential.helper=${GH_CREDENTIAL_HELPER}`] : [];
   gitExec(
     "git",
-    [...credArgs, "fetch", "--force", "origin", `${baseRef}:refs/remotes/origin/${baseRef}`],
+    [...credArgs, "fetch", "--force", "origin", `${branch}:refs/remotes/origin/${branch}`],
     bareRepoPath
   );
+}
+function isRemoteRefMissingError(err) {
+  const msg = err instanceof Error ? err.message : String(err);
+  return /couldn't find remote ref/i.test(msg) || /couldnt find remote ref/i.test(msg) || /no such ref/i.test(msg) || /remote ref.*not found/i.test(msg) || /unknown revision or path not in the working tree/i.test(msg);
+}
+function deriveDefaultBranch(bareRepoPath, ghAvailable) {
+  try {
+    const out = gitExec("git", ["symbolic-ref", "refs/remotes/origin/HEAD"], bareRepoPath).trim();
+    const prefix = "refs/remotes/origin/";
+    if (out.startsWith(prefix)) {
+      const branch = out.slice(prefix.length);
+      if (isValidBranchName(branch)) {
+        try {
+          fetchBranch(bareRepoPath, branch, ghAvailable);
+          return branch;
+        } catch {
+        }
+      }
+    }
+  } catch {
+  }
+  for (const candidate of DEFAULT_BRANCH_FALLBACKS) {
+    try {
+      fetchBranch(bareRepoPath, candidate, ghAvailable);
+      return candidate;
+    } catch {
+    }
+  }
+  throw new Error("Cannot derive default branch: origin/HEAD, main, and master all failed");
+}
+function diffFromWorktree(bareRepoPath, worktreePath, baseRef, ghAvailable, maxDiffBytes = 128 * 1024 * 1024) {
+  let resolvedBaseRef;
+  if (baseRef) {
+    if (!isValidBranchName(baseRef)) {
+      throw new Error(`Invalid base ref: ${baseRef}`);
+    }
+    try {
+      fetchBranch(bareRepoPath, baseRef, ghAvailable);
+      resolvedBaseRef = baseRef;
+    } catch (err) {
+      if (!isRemoteRefMissingError(err)) {
+        throw err;
+      }
+      resolvedBaseRef = void 0;
+    }
+  }
+  if (!resolvedBaseRef) {
+    resolvedBaseRef = deriveDefaultBranch(bareRepoPath, ghAvailable);
+  }
   try {
-    return gitExec("git", ["diff", `origin/${baseRef}...HEAD`], worktreePath, {
+    return gitExec("git", ["diff", `origin/${resolvedBaseRef}...HEAD`], worktreePath, {
       maxBuffer: maxDiffBytes
     });
   } catch (err) {
@@ -4683,6 +4740,12 @@ function registerShutdownHandlers(controller, log, graceMs = SHUTDOWN_GRACE_MS)
   };
 }
 var NON_RETRYABLE_STATUSES = /* @__PURE__ */ new Set([401, 403, 404]);
+function build404Hint(isGhAuthenticated) {
+  if (isGhAuthenticated) {
+    return ". Diff fetch returned 404. Possible causes: (a) PR not found, (b) the installation can't access this repo, or (c) a transient GitHub outage. See any `[fetchDiffViaGh]` warning above for the underlying `gh api` error.";
+  }
+  return ". If this is a private repo, ensure gh CLI is installed and authenticated: gh auth login";
+}
 function toApiDiffUrl(webUrl) {
   const match = webUrl.match(/^https?:\/\/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)(?:\.diff)?$/);
   if (!match) return null;
@@ -4744,7 +4807,7 @@ function computeRoles(agent) {
   return ["review", "summary", "implement", "fix"];
 }
 var DIFF_FETCH_TIMEOUT_MS = 6e4;
-async function fetchDiffHttp(url, headers, signal, maxDiffSizeKb) {
+async function fetchDiffHttp(url, headers, signal, maxDiffSizeKb, isGhAuthenticatedFn = isGhAvailable) {
   const maxBytes = maxDiffSizeKb ? maxDiffSizeKb * 1024 : Infinity;
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), DIFF_FETCH_TIMEOUT_MS);
@@ -4765,7 +4828,7 @@ async function fetchDiffHttp(url, headers, signal, maxDiffSizeKb) {
   clearTimeout(timer);
   signal?.removeEventListener("abort", onParentAbort);
   if (!response.ok) {
-    const hint = response.status === 404 ? ". If this is a private repo, ensure gh CLI is installed and authenticated: gh auth login" : "";
+    const hint = response.status === 404 ? build404Hint(isGhAuthenticatedFn()) : "";
     const msg = `Failed to fetch diff: ${response.status} ${response.statusText}${hint}`;
     if (NON_RETRYABLE_STATUSES.has(response.status)) {
       throw new NonRetryableError(msg);
@@ -5050,7 +5113,12 @@ async function handleTask(client, agentId, task, reviewDeps, consumptionDeps, ag
       );
       taskReviewDeps = { ...reviewDeps, codebaseDir: null };
     }
-    if (taskCheckoutPath && taskBareRepoPath && base_ref) {
+    if (taskCheckoutPath && taskBareRepoPath) {
+      if (!base_ref) {
+        logWarn(
+          `  Warning: task ${task_id} has no base_ref \u2014 deriving default branch from worktree`
+        );
+      }
       try {
         const ghAvailable = isGhAvailable();
         const maxDiffBytes = reviewDeps.maxDiffSizeKb ? reviewDeps.maxDiffSizeKb * 1024 : void 0;
@@ -5073,23 +5141,16 @@ async function handleTask(client, agentId, task, reviewDeps, consumptionDeps, ag
         diffContent = gitDiff;
         log(`  Diff generated via git (${Math.round(diffContent.length / 1024)}KB)`);
       } catch (err) {
+        const message = err.message;
         if (err instanceof DiffTooLargeError) {
-          logError(`  ${err.message}`);
-          await safeReject(
-            client,
-            task_id,
-            agentId,
-            `Cannot access diff: ${err.message}`,
-            logger
-          );
-          return { diffFetchFailed: true };
+          logError(`  ${message}`);
+        } else {
+          logError(`  git diff failed for task ${task_id}: ${message}`);
         }
-        logWarn(
-          `  Warning: git diff failed (${err.message}) \u2014 falling back to API fetch`
-        );
+        await safeReject(client, task_id, agentId, `Cannot access diff: ${message}`, logger);
+        return { diffFetchFailed: true };
       }
-    }
-    if (!diffContent) {
+    } else {
       try {
         const result = await fetchDiff(diff_url, owner, repo, pr_number, {
           githubToken: client.currentToken,
@@ -5732,7 +5793,7 @@ function sleep2(ms, signal) {
 async function startAgent(agentId, platformUrl, agentInfo, reviewDeps, consumptionDeps, options) {
   const client = new ApiClient(platformUrl, {
     authToken: options?.authToken,
-    cliVersion: "0.24.2",
+    cliVersion: "0.25.0",
     versionOverride: options?.versionOverride,
     onTokenRefresh: options?.onTokenRefresh
   });
@@ -6097,7 +6158,7 @@ async function startBatchAgents(config, agents, pollIntervalMs, oauthToken, opti
   const { versionOverride, verbose, instancesOverride, agentOwner, userOrgs } = options;
   const client = new ApiClient(config.platformUrl, {
     authToken: oauthToken,
-    cliVersion: "0.24.2",
+    cliVersion: "0.25.0",
     versionOverride,
     onTokenRefresh: () => getValidToken(config.platformUrl, { configPath: config.authFile })
   });
@@ -6446,7 +6507,7 @@ agentCommand.command("start").description("Start agents in polling mode").option
       }
       config = loadConfig();
     }
-    console.log(formatVersionBanner("0.24.2", "86722e7"));
+    console.log(formatVersionBanner("0.25.0", "a984ae2"));
     if (config.agents && config.agents.length > 0) {
       const toolEntries = config.agents.map((a) => ({
         tool: a.tool,
@@ -7268,7 +7329,7 @@ var statusCommand = new Command4("status").description("Show agent config, conne
 });
 
 // src/index.ts
-var program = new Command5().name("opencara").description("OpenCara \u2014 distributed AI code review agent").version(`${"0.24.2"} (${"86722e7"})`);
+var program = new Command5().name("opencara").description("OpenCara \u2014 distributed AI code review agent").version(`${"0.25.0"} (${"a984ae2"})`);
 program.addCommand(agentCommand);
 program.addCommand(authCommand());
 program.addCommand(dedupCommand());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencara",
-  "version": "0.24.2",
+  "version": "0.25.0",
   "description": "Distributed AI code review agent — poll, review, and submit PR reviews using your own AI tools",
   "type": "module",
   "license": "MIT",