edsger 0.40.0 → 0.40.1

package/dist/phases/pr-execution/file-assigner.d.ts

@@ -38,6 +38,18 @@ export declare function removeDeletedFilesFromPRs(changedFiles: ChangedFileInfo[
         change_type: string;
     }[];
 }, verbose?: boolean) => Promise<unknown>, verbose?: boolean): Promise<number>;
+/**
+ * Remove files from PR file lists that are no longer in the current diff.
+ * Used after rebase when the full diff against main may differ from what
+ * was previously recorded in PR file lists.
+ * Returns the number of PRs updated.
+ */
+export declare function removeStaleFilesFromPRs(changedFiles: ChangedFileInfo[], pullRequests: PullRequest[], updater?: (prId: string, updates: {
+    files: {
+        path: string;
+        change_type: string;
+    }[];
+}, verbose?: boolean) => Promise<unknown>, verbose?: boolean): Promise<number>;
 /**
  * Detect unassigned files and use LLM to assign them to existing PRs.
  * Returns the number of files assigned, or 0 if none needed assignment.

package/dist/phases/pr-execution/file-assigner.js

@@ -194,6 +194,40 @@ export async function removeDeletedFilesFromPRs(changedFiles, pullRequests, upda
     }
     return updatedCount;
 }
+/**
+ * Remove files from PR file lists that are no longer in the current diff.
+ * Used after rebase when the full diff against main may differ from what
+ * was previously recorded in PR file lists.
+ * Returns the number of PRs updated.
+ */
+export async function removeStaleFilesFromPRs(changedFiles, pullRequests, updater = updatePullRequest, verbose) {
+    const currentPaths = new Set(changedFiles.map((f) => f.path));
+    let updatedCount = 0;
+    for (const pr of pullRequests) {
+        if (!pr.files || pr.files.length === 0) {
+            continue;
+        }
+        const filtered = pr.files.filter((f) => currentPaths.has(f.path));
+        if (filtered.length === pr.files.length) {
+            continue;
+        }
+        const removed = pr.files.length - filtered.length;
+        try {
+            await updater(pr.id, { files: filtered }, verbose);
+            updatedCount++;
+            if (verbose) {
+                logInfo(`   Cleaned PR "${pr.name}": removed ${removed} stale file(s)`);
+            }
+        }
+        catch (error) {
+            logError(`Failed to clean PR ${pr.id}: ${error instanceof Error ? error.message : String(error)}`);
+        }
+    }
+    if (verbose && updatedCount > 0) {
+        logInfo(`🧹 Removed stale files from ${updatedCount} PR(s)`);
+    }
+    return updatedCount;
+}
 /**
  * Detect unassigned files and use LLM to assign them to existing PRs.
  * Returns the number of files assigned, or 0 if none needed assignment.

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

@@ -6,7 +6,7 @@ import { getPullRequests } from '../../services/pull-requests.js';
 import { getCurrentBranch, returnToMainBranch, } from '../../utils/git-branch-manager.js';
 import { logDebug, logError, logInfo } from '../../utils/logger.js';
 import { fetchPRExecutionContext } from './context.js';
-import { assignNewFilesToPRs, removeDeletedFilesFromPRs, } from './file-assigner.js';
+import { assignNewFilesToPRs, removeDeletedFilesFromPRs, removeStaleFilesFromPRs, } from './file-assigner.js';
 import { buildExecutionErrorResult, buildExecutionSuccessResult, buildNoChangeResult, } from './outcome.js';
 import { pushBranchAndBuildUrl, updatePRDatabaseRecord, } from './pr-executor.js';
 import { createIncrementalSyncPrompt, createIncrementalSyncSystemPrompt, createPRExecutionPrompt, createPRExecutionSystemPrompt, } from './prompts.js';
@@ -67,16 +67,31 @@ export const executeFeaturePRs = async (options, config) => {
             return buildNoChangeResult(featureId, context.pullRequests.length);
         }
         // ======================================
-        // Assign unassigned files to PRs (incremental sync only)
+        // Reconcile file assignments
         // ======================================
         let activePullRequests = context.pullRequests;
-        if (context.isIncrementalSync) {
-            // Remove deleted files from PR file lists
-            const deletedCount = await removeDeletedFilesFromPRs(context.changedFiles, activePullRequests, undefined, verbose);
-            // Assign new/modified files not covered by any PR
+        // Reconcile file lists against the current diff.
+        if (context.changedFiles.length > 0) {
+            let needsRefetch = false;
+            if (context.isIncrementalSync) {
+                // Incremental: only remove explicitly deleted files
+                const deletedCount = await removeDeletedFilesFromPRs(context.changedFiles, activePullRequests, undefined, verbose);
+                if (deletedCount > 0)
+                    needsRefetch = true;
+            }
+            else {
+                // Full re-execution (e.g. after rebase): remove any PR files that
+                // are no longer in the current diff against main
+                const staleCount = await removeStaleFilesFromPRs(context.changedFiles, activePullRequests, undefined, verbose);
+                if (staleCount > 0)
+                    needsRefetch = true;
+            }
+            // Assign changed files not covered by any PR
+            if (needsRefetch) {
+                activePullRequests = await getPullRequests({ featureId, verbose });
+            }
             const assignedCount = await assignNewFilesToPRs(context.changedFiles, activePullRequests, verbose);
-            if (assignedCount > 0 || deletedCount > 0) {
-                // Re-fetch PR records so prompts use the updated file lists
+            if (assignedCount > 0) {
                 activePullRequests = await getPullRequests({ featureId, verbose });
             }
         }

package/package.json

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