edsger 0.42.0 → 0.42.1

package/dist/phases/pr-resolve/index.js

@@ -53,8 +53,25 @@ export async function resolveStandalonePR(options) {
             pull_number: prInfo.prNumber,
         });
         const headRef = prData.head.ref;
-        // Clone repo and checkout PR branch
-        const repoPath = prepareWorkspace(owner, repo, headRef, prInfo.prNumber, githubToken, verbose);
+        // Determine clone source: fork PRs need to clone from the fork repo.
+        // head.repo is null when the fork has been deleted — treat as fork with deleted source.
+        const isFork = !prData.head.repo ||
+            prData.head.repo.full_name !== prData.base.repo.full_name;
+        const forkDeleted = !prData.head.repo;
+        const cloneOwner = isFork && !forkDeleted ? prData.head.repo.owner.login : owner;
+        const cloneRepo = isFork && !forkDeleted ? prData.head.repo.name : repo;
+        if (isFork && verbose) {
+            logInfo(forkDeleted
+                ? `Fork PR detected but fork repo has been deleted, will use PR ref from ${owner}/${repo}`
+                : `Fork PR detected: cloning from ${cloneOwner}/${cloneRepo} instead of ${owner}/${repo}`);
+        }
+        // Clone repo and checkout PR branch.
+        // For fork PRs, pass fallback info so prepareWorkspace can fetch the PR ref
+        // from upstream if the fork branch is unavailable.
+        // For deleted forks, clone upstream directly and always use PR ref fallback.
+        const repoPath = prepareWorkspace(cloneOwner, cloneRepo, headRef, prInfo.prNumber, githubToken, verbose, isFork
+            ? { upstreamOwner: owner, upstreamRepo: repo }
+            : undefined);
         try {
             // Run Claude Agent SDK to evaluate and fix comments
             const systemPrompt = createResolveSystemPrompt();

package/dist/phases/pr-resolve/workspace.d.ts

@@ -10,11 +10,17 @@ export declare function buildCredentialArgs(token: string): string[];
  * Get the workspace path for a PR resolve operation.
  */
 export declare function getResolveWorkspacePath(prNumber: number): string;
+export interface ForkFallbackInfo {
+    upstreamOwner: string;
+    upstreamRepo: string;
+}
 /**
  * Clone or reuse a repo for PR resolve.
+ * For fork PRs, clones from the fork repo. If the fork branch is unavailable,
+ * falls back to fetching the PR ref from the upstream repo.
  * Returns the workspace path.
  */
-export declare function prepareWorkspace(owner: string, repo: string, headRef: string, prNumber: number, token: string, verbose?: boolean): string;
+export declare function prepareWorkspace(owner: string, repo: string, headRef: string, prNumber: number, token: string, verbose?: boolean, forkFallback?: ForkFallbackInfo): string;
 /**
  * Push changes from workspace back to remote.
  */

package/dist/phases/pr-resolve/workspace.js

@@ -27,9 +27,11 @@ export function getResolveWorkspacePath(prNumber) {
 }
 /**
  * Clone or reuse a repo for PR resolve.
+ * For fork PRs, clones from the fork repo. If the fork branch is unavailable,
+ * falls back to fetching the PR ref from the upstream repo.
  * Returns the workspace path.
  */
-export function prepareWorkspace(owner, repo, headRef, prNumber, token, verbose) {
+export function prepareWorkspace(owner, repo, headRef, prNumber, token, verbose, forkFallback) {
     const repoPath = getResolveWorkspacePath(prNumber);
     const repoUrl = `https://github.com/${owner}/${repo}.git`;
     const gitCredentialArgs = buildCredentialArgs(token);
@@ -66,16 +68,41 @@ export function prepareWorkspace(owner, repo, headRef, prNumber, token, verbose)
     }
     else {
         logInfo(`Cloning ${owner}/${repo} (branch: ${headRef})...`);
-        execFileSync('git', [
-            ...gitCredentialArgs,
-            'clone',
-            '--branch',
-            headRef,
-            '--single-branch',
-            repoUrl,
-            repoPath,
-        ], { stdio: 'pipe' });
-        logSuccess(`Cloned to ${repoPath}`);
+        try {
+            execFileSync('git', [
+                ...gitCredentialArgs,
+                'clone',
+                '--branch',
+                headRef,
+                '--single-branch',
+                repoUrl,
+                repoPath,
+            ], { stdio: 'pipe' });
+            logSuccess(`Cloned to ${repoPath}`);
+        }
+        catch (error) {
+            // If clone fails and this is a fork PR, fall back to upstream PR ref
+            if (forkFallback) {
+                logInfo(`Fork branch not available, falling back to PR ref from ${forkFallback.upstreamOwner}/${forkFallback.upstreamRepo}`);
+                const upstreamUrl = `https://github.com/${forkFallback.upstreamOwner}/${forkFallback.upstreamRepo}.git`;
+                execFileSync('git', [...gitCredentialArgs, 'clone', upstreamUrl, repoPath], { stdio: 'pipe' });
+                // Fetch the PR ref and check it out
+                execFileSync('git', [
+                    ...gitCredentialArgs,
+                    'fetch',
+                    'origin',
+                    `pull/${prNumber}/head:${headRef}`,
+                ], { cwd: repoPath, stdio: 'pipe' });
+                execSync(`git checkout ${headRef}`, {
+                    cwd: repoPath,
+                    stdio: 'pipe',
+                });
+                logSuccess(`Cloned via PR ref to ${repoPath}`);
+            }
+            else {
+                throw error;
+            }
+        }
     }
     // Configure git user for commits
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "edsger",
-  "version": "0.42.0",
+  "version": "0.42.1",
   "type": "module",
   "bin": {
     "edsger": "dist/index.js"