edsger 0.19.12 → 0.19.13

package/dist/phases/code-refine/index.js

@@ -9,10 +9,9 @@ import { execSync } from 'child_process';
 import { fetchCodeRefineContext, } from './context.js';
 import { getFeedbacksForPhase, formatFeedbacksForContext, } from '../../services/feedbacks.js';
 import { createSystemPrompt, createCodeRefinePrompt } from './prompts.js';
-import { preparePhaseGitEnvironment, prepareCustomBranchGitEnvironment, hasUncommittedChanges, getUncommittedFiles, syncFeatBranchWithMain, } from '../../utils/git-branch-manager.js';
+import { preparePhaseGitEnvironment, prepareCustomBranchGitEnvironment, hasUncommittedChanges, getUncommittedFiles, } from '../../utils/git-branch-manager.js';
 import { getFeature } from '../../api/features/get-feature.js';
-import { getReviewedBranch, updateBranch, } from '../../services/branches.js';
-import { parsePullRequestUrl } from './context.js';
+import { getBranches, getBaseBranchInfo, updateBranch, } from '../../services/branches.js';
 import { verifyAndResolveComments, } from '../code-refine-verification/index.js';
 // Maximum number of refine + verification iterations
 export const MAX_REFINE_ITERATIONS = 10;
@@ -75,8 +74,12 @@ export const refineCodeFromPRFeedback = async (options, config) => {
     // (status = 'reviewed' after code-review phase) and use its branch_name for refine
     let branchName = `dev/${featureId}`; // Default for single-branch features
     let currentBranch = null;
+    let allBranches = [];
+    let baseBranchForRebase = 'main'; // Default base branch for rebase
     try {
-        currentBranch = await getReviewedBranch({ featureId, verbose });
+        // Get all branches to determine base branch info
+        allBranches = await getBranches({ featureId, verbose });
+        currentBranch = allBranches.find((b) => b.status === 'reviewed') || null;
         if (currentBranch && currentBranch.branch_name) {
             // Use branch_name directly (already stored as dev/...)
             branchName = currentBranch.branch_name;
@@ -84,6 +87,22 @@ export const refineCodeFromPRFeedback = async (options, config) => {
                 logInfo(`📋 Found reviewed branch: ${currentBranch.name}`);
                 logInfo(`   Using dev branch: ${branchName}`);
             }
+            // Determine the correct base branch for rebase using base_branch_id
+            const baseBranchInfo = await getBaseBranchInfo(currentBranch, allBranches, 'main');
+            if (baseBranchInfo.baseBranchMerged) {
+                // Base branch is merged (or no base branch) - rebase from main
+                baseBranchForRebase = 'main';
+                if (verbose && currentBranch.base_branch_id) {
+                    logInfo(`   Base branch is merged, will rebase from main`);
+                }
+            }
+            else {
+                // Base branch not merged - rebase from base branch's dev branch
+                baseBranchForRebase = baseBranchInfo.baseBranch;
+                if (verbose) {
+                    logInfo(`   Will rebase from base branch: ${baseBranchForRebase}`);
+                }
+            }
         }
         else if (verbose) {
             logInfo(`ℹ️ No reviewed branch found, using default: ${branchName}`);
@@ -114,25 +133,9 @@ export const refineCodeFromPRFeedback = async (options, config) => {
             }
         }
     }
-    // Sync feat branch with main before preparing git environment
-    // This prevents extra commits from appearing in PR when dev branch is rebased
-    if (pullRequestUrl) {
-        try {
-            const prInfo = parsePullRequestUrl(pullRequestUrl);
-            if (prInfo) {
-                await syncFeatBranchWithMain(featureId, githubToken, prInfo.owner, prInfo.repo, 'main', verbose);
-            }
-        }
-        catch (error) {
-            if (verbose) {
-                logInfo(`⚠️  Could not sync feat branch: ${error instanceof Error ? error.message : String(error)}`);
-            }
-            // Continue even if sync fails - it's not critical
-        }
-    }
-    // Prepare git environment: switch to the appropriate branch
+    // Prepare git environment: switch to the appropriate branch and rebase from correct base
     const cleanupGit = currentBranch
-        ? prepareCustomBranchGitEnvironment(branchName, 'main', verbose)
+        ? prepareCustomBranchGitEnvironment(branchName, baseBranchForRebase, verbose)
         : preparePhaseGitEnvironment(featureId, 'main', verbose);
     try {
         // Fetch initial code refine context (PR reviews and comments)

package/dist/phases/code-review/index.js

@@ -8,7 +8,7 @@ import { Octokit } from '@octokit/rest';
 import { fetchCodeReviewContext, formatContextForPrompt, } from './context.js';
 import { getFeedbacksForPhase, formatFeedbacksForContext, } from '../../services/feedbacks.js';
 import { preparePhaseGitEnvironment, prepareCustomBranchGitEnvironment, } from '../../utils/git-branch-manager.js';
-import { getReadyForReviewBranch, updateBranch, } from '../../services/branches.js';
+import { getBranches, getBaseBranchInfo, updateBranch, } from '../../services/branches.js';
 import { getFeature } from '../../api/features/get-feature.js';
 function userMessage(content) {
     return {
@@ -126,8 +126,12 @@ export const reviewPullRequest = async (options, config) => {
     // and use its branch_name for review (branch_name is stored as dev/...)
     let branchName = `dev/${featureId}`; // Default for single-branch features
     let currentBranch = null;
+    let allBranches = [];
+    let baseBranchForRebase = 'main'; // Default base branch for rebase
     try {
-        currentBranch = await getReadyForReviewBranch({ featureId, verbose });
+        // Get all branches to determine base branch info
+        allBranches = await getBranches({ featureId, verbose });
+        currentBranch = allBranches.find((b) => b.status === 'ready_for_review') || null;
         if (currentBranch && currentBranch.branch_name) {
             // Use branch_name directly (already stored as dev/...)
             branchName = currentBranch.branch_name;
@@ -135,6 +139,22 @@ export const reviewPullRequest = async (options, config) => {
                 logInfo(`📋 Found ready_for_review branch: ${currentBranch.name}`);
                 logInfo(`   Using dev branch: ${branchName}`);
             }
+            // Determine the correct base branch for rebase using base_branch_id
+            const baseBranchInfo = await getBaseBranchInfo(currentBranch, allBranches, 'main');
+            if (baseBranchInfo.baseBranchMerged) {
+                // Base branch is merged (or no base branch) - rebase from main
+                baseBranchForRebase = 'main';
+                if (verbose && currentBranch.base_branch_id) {
+                    logInfo(`   Base branch is merged, will rebase from main`);
+                }
+            }
+            else {
+                // Base branch not merged - rebase from base branch's dev branch
+                baseBranchForRebase = baseBranchInfo.baseBranch;
+                if (verbose) {
+                    logInfo(`   Will rebase from base branch: ${baseBranchForRebase}`);
+                }
+            }
         }
         else if (verbose) {
             logInfo(`ℹ️ No ready_for_review branch found, using default: ${branchName}`);
@@ -165,9 +185,9 @@ export const reviewPullRequest = async (options, config) => {
             }
         }
     }
-    // Prepare git environment: switch to the appropriate branch
+    // Prepare git environment: switch to the appropriate branch and rebase from correct base
     const cleanupGit = currentBranch
-        ? prepareCustomBranchGitEnvironment(branchName, 'main', verbose)
+        ? prepareCustomBranchGitEnvironment(branchName, baseBranchForRebase, verbose)
         : preparePhaseGitEnvironment(featureId, 'main', verbose);
     try {
         // Fetch code review context (PR data, files, commits)

package/dist/services/branches.d.ts

@@ -62,9 +62,10 @@ export declare function allBranchesCompleted(options: PipelinePhaseOptions): Pro
 /**
  * Get the base branch information for a branch.
  * Returns:
- * - If base_branch_id is set and that branch is merged: use main
- * - If base_branch_id is set and that branch is not merged: use that branch's branch_name
- * - If base_branch_id is null: use main
+ * - If base_branch_id is null: use main (first branch in chain)
+ * - If base_branch_id is set and that branch is merged: use base branch's feat branch
+ *   (merged means dev merged to feat, not to main)
+ * - If base_branch_id is set and that branch is not merged: use base branch's dev branch
  */
 export declare function getBaseBranchInfo(branch: Branch, allBranches: Branch[], mainBranch?: string): Promise<{
     baseBranch: string;

package/dist/services/branches.js

@@ -159,12 +159,13 @@ export async function allBranchesCompleted(options) {
 /**
  * Get the base branch information for a branch.
  * Returns:
- * - If base_branch_id is set and that branch is merged: use main
- * - If base_branch_id is set and that branch is not merged: use that branch's branch_name
- * - If base_branch_id is null: use main
+ * - If base_branch_id is null: use main (first branch in chain)
+ * - If base_branch_id is set and that branch is merged: use base branch's feat branch
+ *   (merged means dev merged to feat, not to main)
+ * - If base_branch_id is set and that branch is not merged: use base branch's dev branch
  */
 export async function getBaseBranchInfo(branch, allBranches, mainBranch = 'main') {
-    // No base branch - start from main
+    // No base branch - start from main (first branch in chain)
     if (!branch.base_branch_id) {
         return {
             baseBranch: mainBranch,
@@ -182,10 +183,23 @@ export async function getBaseBranchInfo(branch, allBranches, mainBranch = 'main'
             baseBranchMerged: true,
         };
     }
-    // Check if base branch is merged
+    // Check if base branch is merged (dev merged to feat)
     if (baseBranch.status === 'merged') {
-        // Base branch is merged to main - we should base on main and rebase if needed
-        return { baseBranch: mainBranch, needsRebase: true, baseBranchMerged: true };
+        // Base branch's dev is merged to feat - rebase from base branch's feat branch
+        // Convert dev/xxx/1-name to feat/xxx/1-name
+        if (!baseBranch.branch_name) {
+            return {
+                baseBranch: mainBranch,
+                needsRebase: false,
+                baseBranchMerged: true,
+            };
+        }
+        const featBranchName = baseBranch.branch_name.replace(/^dev\//, 'feat/');
+        return {
+            baseBranch: featBranchName,
+            needsRebase: true,
+            baseBranchMerged: true,
+        };
     }
     // Base branch is not merged - we should base on that branch
     if (!baseBranch.branch_name) {

package/package.json

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