edsger 0.21.10 → 0.22.0

package/dist/commands/workflow/config/phase-configs.js

@@ -14,7 +14,7 @@ import { getGitHubConfig } from '../../../api/github.js';
 /**
  * Wrapper for code-refine phase to inject GitHub token
  */
-const executeCodeRefine = async (options, config) => {
+const executeCodeRefine = async (options, config, checklistContext) => {
     const githubConfig = await getGitHubConfig(options.featureId, options.verbose);
     if (!githubConfig.configured || !githubConfig.token) {
         return {
@@ -27,7 +27,7 @@ const executeCodeRefine = async (options, config) => {
         featureId: options.featureId,
         githubToken: githubConfig.token,
         verbose: options.verbose,
-    }, config);
+    }, config, checklistContext);
 };
 /**
  * Wrapper for code-refine-verification phase to inject GitHub token
@@ -51,7 +51,7 @@ const executeCodeRefineVerification = async (options, config) => {
 /**
  * Wrapper for code-review phase to inject GitHub token
  */
-const executeCodeReview = async (options, config) => {
+const executeCodeReview = async (options, config, checklistContext) => {
     const githubConfig = await getGitHubConfig(options.featureId, options.verbose);
     if (!githubConfig.configured || !githubConfig.token) {
         return {
@@ -64,7 +64,7 @@ const executeCodeReview = async (options, config) => {
         featureId: options.featureId,
         githubToken: githubConfig.token,
         verbose: options.verbose,
-    }, config);
+    }, config, checklistContext);
 };
 // Pipeline phase configurations
 export const phaseConfigs = [

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

@@ -117,6 +117,7 @@ export const implementFeatureCode = async (options, config, checklistContext) =>
     let actualBaseBranch = baseBranch;
     let rebaseTargetBranch;
     let originalBaseBranch;
+    let baseBranchCompleted = false;
     if (currentBranch && currentBranch.base_branch_id) {
         try {
             const allBranches = await getBranches({
@@ -127,6 +128,7 @@ export const implementFeatureCode = async (options, config, checklistContext) =>
             actualBaseBranch = baseBranchInfo.baseBranch;
             rebaseTargetBranch = baseBranchInfo.rebaseTargetBranch;
             originalBaseBranch = baseBranchInfo.originalBaseBranch;
+            baseBranchCompleted = baseBranchInfo.baseBranchCompleted || false;
             if (verbose) {
                 logInfo(`🔗 Branch chaining detected:`);
                 logInfo(`   Current branch: ${currentBranch.name}`);
@@ -197,6 +199,7 @@ export const implementFeatureCode = async (options, config, checklistContext) =>
             model: DEFAULT_MODEL,
         },
         forcePushAfterRebase: featSyncedToMain, // Trigger GitHub to recalculate PR diff
+        baseBranchCompleted, // Tell conflict resolver to use --theirs for all conflicts
     });
     try {
         // Fetch all required context information via MCP endpoints

package/dist/phases/code-refine/index.d.ts

@@ -4,12 +4,14 @@
  * Includes built-in verification loop that resolves PR comments and dismisses reviews
  */
 import { EdsgerConfig } from '../../types/index.js';
+import { ChecklistPhaseContext } from '../../services/checklist.js';
 import { type CodeRefineVerificationResult } from '../code-refine-verification/index.js';
 export declare const MAX_REFINE_ITERATIONS = 10;
 export interface CodeRefineOptions {
     featureId: string;
     githubToken: string;
     verbose?: boolean;
+    checklistContext?: ChecklistPhaseContext | null;
     verificationFailureContext?: {
         attempt: number;
         suggestions: string[];
@@ -39,10 +41,19 @@ export interface CodeRefineResult {
     commitsCreated?: number;
     iterations?: number;
     verificationResult?: CodeRefineVerificationResult;
+    data?: {
+        checklist_item_results?: Array<{
+            checklist_item_id: string;
+            is_passed: boolean;
+            value?: any;
+            notes?: string;
+        }>;
+        [key: string]: any;
+    };
 }
 /**
  * Main code refine function with built-in verification loop
  * Similar to technical-design, this includes an iterative improvement cycle:
  * refine → verification → improve → re-refine (if needed)
  */
-export declare const refineCodeFromPRFeedback: (options: CodeRefineOptions, config: EdsgerConfig) => Promise<CodeRefineResult>;
+export declare const refineCodeFromPRFeedback: (options: CodeRefineOptions, config: EdsgerConfig, checklistContext?: ChecklistPhaseContext | null) => Promise<CodeRefineResult>;

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

@@ -66,7 +66,7 @@ const pushChanges = (verbose) => {
  * Similar to technical-design, this includes an iterative improvement cycle:
  * refine → verification → improve → re-refine (if needed)
  */
-export const refineCodeFromPRFeedback = async (options, config) => {
+export const refineCodeFromPRFeedback = async (options, config, checklistContext) => {
     const { featureId, githubToken, verbose } = options;
     if (verbose) {
         logInfo(`Starting code refine for feature ID: ${featureId}`);
@@ -79,6 +79,7 @@ export const refineCodeFromPRFeedback = async (options, config) => {
     let baseBranchForRebase = 'main'; // Default base branch for rebase
     let rebaseTargetBranchForRebase; // Target for --onto rebase (e.g., main)
     let originalBaseBranchForRebase; // For --onto when base was squash-merged
+    let baseBranchCompletedForRebase = false;
     try {
         // Get all branches to determine base branch info
         allBranches = await getBranches({ featureId, verbose });
@@ -102,6 +103,7 @@ export const refineCodeFromPRFeedback = async (options, config) => {
             rebaseTargetBranchForRebase = baseBranchInfo.rebaseTargetBranch;
             // When base branch is merged (squash merge), we need originalBaseBranch for --onto
             originalBaseBranchForRebase = baseBranchInfo.originalBaseBranch;
+            baseBranchCompletedForRebase = baseBranchInfo.baseBranchCompleted || false;
             if (verbose) {
                 if (!currentBranch.base_branch_id) {
                     // No base branch - first branch in chain
@@ -175,6 +177,7 @@ export const refineCodeFromPRFeedback = async (options, config) => {
                 model: DEFAULT_MODEL,
             },
             forcePushAfterRebase: featSyncedToMain,
+            baseBranchCompleted: baseBranchCompletedForRebase,
         })
         : await preparePhaseGitEnvironmentAsync(featureId, 'main', verbose, true, {
             model: DEFAULT_MODEL,
@@ -223,7 +226,7 @@ export const refineCodeFromPRFeedback = async (options, config) => {
                 }
             }
             // Execute refine for this iteration
-            const refineResult = await executeRefineIteration(featureId, githubToken, config, pullRequestUrl || undefined, currentBranch, verificationFailureContext, verbose);
+            const refineResult = await executeRefineIteration(featureId, githubToken, config, pullRequestUrl || undefined, currentBranch, verificationFailureContext, checklistContext, verbose);
             if (refineResult.status === 'error') {
                 // Refine failed - return error
                 return {
@@ -299,6 +302,9 @@ Please ensure Claude Code commits all changes before completing the refine phase
                     commitsCreated: lastRefineResult.commits_created || 1,
                     iterations: currentIteration,
                     verificationResult,
+                    data: {
+                        checklist_item_results: lastRefineResult.checklist_item_results,
+                    },
                 };
             }
             // Verification failed - prepare context for retry
@@ -361,7 +367,7 @@ Please ensure Claude Code commits all changes before completing the refine phase
 /**
  * Execute a single refine iteration
  */
-async function executeRefineIteration(featureId, githubToken, config, pullRequestUrl, currentBranch, verificationFailureContext, verbose) {
+async function executeRefineIteration(featureId, githubToken, config, pullRequestUrl, currentBranch, verificationFailureContext, checklistContext, verbose) {
     // Fetch code refine context (PR reviews and comments)
     const context = await fetchCodeRefineContext(featureId, githubToken, verbose, pullRequestUrl);
     // Fetch additional feedbacks for code-refine phase
@@ -381,8 +387,8 @@ async function executeRefineIteration(featureId, githubToken, config, pullReques
         }
     }
     // Create prompt for code refine
-    const systemPrompt = createSystemPrompt();
-    const refinePrompt = createCodeRefinePrompt(featureId, context, feedbacksInfo, verificationFailureContext);
+    const systemPrompt = createSystemPrompt(checklistContext);
+    const refinePrompt = createCodeRefinePrompt(featureId, context, feedbacksInfo, verificationFailureContext, checklistContext);
     let lastAssistantResponse = '';
     let structuredRefineResult = null;
     if (verbose) {
@@ -479,6 +485,7 @@ async function executeRefineIteration(featureId, githubToken, config, pullReques
             summary: structuredRefineResult.summary,
             files_modified: structuredRefineResult.files_modified,
             commits_created: structuredRefineResult.commits_created,
+            checklist_item_results: structuredRefineResult.checklist_item_results,
         };
     }
     else {

package/dist/phases/code-refine/prompts.d.ts

@@ -1,4 +1,5 @@
 import { type CodeRefineContext } from './context.js';
 import { CodeRefineOptions } from './index.js';
-export declare function createSystemPrompt(): string;
-export declare function createCodeRefinePrompt(featureId: string, context: CodeRefineContext, feedbacksInfo?: string, verificationFailureContext?: CodeRefineOptions['verificationFailureContext']): string;
+import { ChecklistPhaseContext } from '../../services/checklist.js';
+export declare function createSystemPrompt(checklistContext?: ChecklistPhaseContext | null): string;
+export declare function createCodeRefinePrompt(featureId: string, context: CodeRefineContext, feedbacksInfo?: string, verificationFailureContext?: CodeRefineOptions['verificationFailureContext'], checklistContext?: ChecklistPhaseContext | null): string;

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

@@ -1,5 +1,35 @@
 import { formatContextForPrompt } from './context.js';
-export function createSystemPrompt() {
+import { formatChecklistsForContext, } from '../../services/checklist.js';
+export function createSystemPrompt(checklistContext) {
+    const checklistInstructions = checklistContext &&
+        checklistContext.checklists &&
+        checklistContext.checklists.length > 0
+        ? `
+
+**MANDATORY Checklist Compliance**:
+If you are provided with checklists in the context, you MUST satisfy ALL of them during your code refinement work. Checklists are mandatory requirements that define quality standards and cannot be ignored or skipped.
+
+- Review each checklist carefully and ensure your refinements address every requirement
+- You MUST include ALL provided checklist item IDs in the "checklist_item_results" field of your JSON response
+- CRITICAL: Use the exact UUID from the "ID:" field in each checklist ITEM, NOT the item title or description
+- Set "is_passed": true for each checklist item you have completed successfully
+- Provide appropriate "value" based on the item type (boolean: true/false, text: descriptive text, number: numeric value)
+- If you cannot satisfy a checklist item requirement, set "is_passed": false and explain why in the "notes" field
+- The system will validate that all checklists have been addressed - missing checklists will cause the pipeline to fail`
+        : '';
+    const checklistJsonField = checklistContext &&
+        checklistContext.checklists &&
+        checklistContext.checklists.length > 0
+        ? `,
+    "checklist_item_results": [
+      {
+        "checklist_item_id": "EXACT_CHECKLIST_ITEM_UUID_FROM_ID_FIELD",
+        "is_passed": true,
+        "value": "Result value based on item type (boolean, text, number, etc.)",
+        "notes": "Optional notes about this specific checklist item"
+      }
+    ]`
+        : '';
     return `You are an expert software engineer specializing in addressing code review feedback. Your goal is to carefully analyze review comments and refine the code to address all concerns raised by human reviewers.
 
 **Your Role**: Refine code based on PR review feedback while maintaining code quality and functionality.
@@ -35,6 +65,7 @@ export function createSystemPrompt() {
 - DO NOT leave any uncommitted changes in the working directory
 - Verification will fail if there are uncommitted changes
 - Use clear, descriptive commit messages that explain what feedback was addressed
+${checklistInstructions}
 
 **CRITICAL - Result Format**:
 You MUST end your response with a JSON object containing the code refine results in this EXACT format:
@@ -53,18 +84,22 @@ You MUST end your response with a JSON object containing the code refine results
         "resolution": "Description of how it was addressed",
         "files": ["path/to/file.ts"]
       }
-    ]
+    ]${checklistJsonField}
   }
 }
 \`\`\`
 
 Focus on systematic code refinement based on the provided PR review feedback.`;
 }
-export function createCodeRefinePrompt(featureId, context, feedbacksInfo, verificationFailureContext) {
+export function createCodeRefinePrompt(featureId, context, feedbacksInfo, verificationFailureContext, checklistContext) {
     let contextInfo = formatContextForPrompt(context);
     if (feedbacksInfo) {
         contextInfo = contextInfo + '\n\n' + feedbacksInfo;
     }
+    if (checklistContext && checklistContext.checklists.length > 0) {
+        const checklistInfo = formatChecklistsForContext(checklistContext);
+        contextInfo = contextInfo + '\n\n' + checklistInfo;
+    }
     // Add verification failure context if this is a retry
     let verificationSection = '';
     if (verificationFailureContext) {
@@ -183,7 +218,17 @@ BEFORE you generate the final JSON result, you MUST complete this checklist:
    - All review feedback has been addressed
 
 **FAILURE TO COMMIT ALL CHANGES WILL CAUSE THE PIPELINE TO FAIL**
-
+${checklistContext && checklistContext.checklists.length > 0
+        ? `
+## MANDATORY - Checklist Compliance
+You MUST satisfy ALL checklist items provided in the context and include results in your JSON response.
+- Use the exact UUID from each checklist item's "ID:" field as the "checklist_item_id"
+- Ensure your code refinements satisfy each checklist requirement
+- Set "is_passed" to true if the requirement is met, false otherwise
+- Provide detailed "notes" for any items that are not passed
+- ALL checklist items must be included - missing items will cause pipeline failure
+`
+        : ''}
 You are currently on the \`dev/${featureId}\` branch. Make your changes, commit them, and they will be pushed to the remote repository.
 
 Begin by analyzing all the review feedback and creating a plan to address each comment.`;

package/dist/phases/code-review/index.d.ts

@@ -3,10 +3,12 @@
  * Reviews GitHub PR code and creates review comments with REQUEST_CHANGES
  */
 import { EdsgerConfig } from '../../types/index.js';
+import { ChecklistPhaseContext } from '../../services/checklist.js';
 export interface CodeReviewOptions {
     featureId: string;
     githubToken: string;
     verbose?: boolean;
+    checklistContext?: ChecklistPhaseContext | null;
 }
 export interface ReviewComment {
     path: string;
@@ -22,8 +24,17 @@ export interface CodeReviewResult {
     reviewUrl?: string;
     commentsCount?: number;
     summary?: string;
+    data?: {
+        checklist_item_results?: Array<{
+            checklist_item_id: string;
+            is_passed: boolean;
+            value?: any;
+            notes?: string;
+        }>;
+        [key: string]: any;
+    };
 }
 /**
  * Main code review function
  */
-export declare const reviewPullRequest: (options: CodeReviewOptions, config: EdsgerConfig) => Promise<CodeReviewResult>;
+export declare const reviewPullRequest: (options: CodeReviewOptions, config: EdsgerConfig, checklistContext?: ChecklistPhaseContext | null) => Promise<CodeReviewResult>;

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

@@ -8,6 +8,7 @@ import { logInfo, logError } from '../../utils/logger.js';
 import { Octokit } from '@octokit/rest';
 import { fetchCodeReviewContext, formatContextForPrompt, } from './context.js';
 import { getFeedbacksForPhase, formatFeedbacksForContext, } from '../../services/feedbacks.js';
+import { formatChecklistsForContext, } from '../../services/checklist.js';
 import { preparePhaseGitEnvironmentAsync, prepareCustomBranchGitEnvironmentAsync, syncFeatBranchWithMain, } from '../../utils/git-branch-manager.js';
 import { getBranches, getBaseBranchInfo, updateBranch, } from '../../services/branches.js';
 import { getGitHubConfig } from '../../api/github.js';
@@ -118,7 +119,7 @@ function findClosestPosition(targetLine, lineToPosition) {
 /**
  * Main code review function
  */
-export const reviewPullRequest = async (options, config) => {
+export const reviewPullRequest = async (options, config, checklistContext) => {
     const { featureId, githubToken, verbose } = options;
     if (verbose) {
         logInfo(`Starting code review for feature ID: ${featureId}`);
@@ -131,6 +132,7 @@ export const reviewPullRequest = async (options, config) => {
     let baseBranchForRebase = 'main'; // Default base branch for rebase
     let rebaseTargetBranchForRebase; // Target for --onto rebase (e.g., main)
     let originalBaseBranchForRebase; // For --onto when base was squash-merged
+    let baseBranchCompletedForRebase = false;
     try {
         // Get all branches to determine base branch info
         allBranches = await getBranches({ featureId, verbose });
@@ -155,6 +157,7 @@ export const reviewPullRequest = async (options, config) => {
             rebaseTargetBranchForRebase = baseBranchInfo.rebaseTargetBranch;
             // When base branch is merged (squash merge), we need originalBaseBranch for --onto
             originalBaseBranchForRebase = baseBranchInfo.originalBaseBranch;
+            baseBranchCompletedForRebase = baseBranchInfo.baseBranchCompleted || false;
             if (verbose) {
                 if (!currentBranch.base_branch_id) {
                     // No base branch - first branch in chain
@@ -228,6 +231,7 @@ export const reviewPullRequest = async (options, config) => {
                 model: DEFAULT_MODEL,
             },
             forcePushAfterRebase: featSyncedToMain,
+            baseBranchCompleted: baseBranchCompletedForRebase,
         })
         : await preparePhaseGitEnvironmentAsync(featureId, 'main', verbose, true, {
             model: DEFAULT_MODEL,
@@ -277,8 +281,8 @@ export const reviewPullRequest = async (options, config) => {
             }
         }
         // Create prompt for code review
-        const systemPrompt = createSystemPrompt(config);
-        const reviewPrompt = createCodeReviewPrompt(featureId, context, feedbacksInfo);
+        const systemPrompt = createSystemPrompt(config, checklistContext);
+        const reviewPrompt = createCodeReviewPrompt(featureId, context, feedbacksInfo, checklistContext);
         let lastAssistantResponse = '';
         let structuredReviewResult = null;
         if (verbose) {
@@ -367,7 +371,7 @@ export const reviewPullRequest = async (options, config) => {
         }
         // Create GitHub review with comments
         if (structuredReviewResult) {
-            const { summary, comments, overall_assessment } = structuredReviewResult;
+            const { summary, comments, overall_assessment, checklist_item_results } = structuredReviewResult;
             // Initialize Octokit
             const octokit = new Octokit({ auth: githubToken });
             if (!comments || comments.length === 0) {
@@ -402,6 +406,7 @@ export const reviewPullRequest = async (options, config) => {
                     reviewUrl: review.data.html_url,
                     commentsCount: 0,
                     summary: summary || 'No issues found',
+                    data: { checklist_item_results },
                 };
             }
             if (verbose) {
@@ -479,6 +484,7 @@ export const reviewPullRequest = async (options, config) => {
                     reviewUrl: review.data.html_url,
                     commentsCount: 0,
                     summary: summary || 'Code review completed (comments filtered)',
+                    data: { checklist_item_results },
                 };
             }
             if (verbose) {
@@ -515,6 +521,7 @@ export const reviewPullRequest = async (options, config) => {
                 reviewUrl: review.data.html_url,
                 commentsCount: comments.length,
                 summary: summary || 'Code review completed',
+                data: { checklist_item_results },
             };
         }
         else {
@@ -539,7 +546,36 @@ export const reviewPullRequest = async (options, config) => {
         cleanupGit();
     }
 };
-function createSystemPrompt(_config) {
+function createSystemPrompt(_config, checklistContext) {
+    const checklistInstructions = checklistContext &&
+        checklistContext.checklists &&
+        checklistContext.checklists.length > 0
+        ? `
+
+**MANDATORY Checklist Compliance**:
+If you are provided with checklists in the context, you MUST evaluate ALL of them during your code review. Checklists are mandatory requirements that define quality standards and cannot be ignored or skipped.
+
+- Review each checklist carefully and evaluate whether the code satisfies every requirement
+- You MUST include ALL provided checklist item IDs in the "checklist_item_results" field of your JSON response
+- CRITICAL: Use the exact UUID from the "ID:" field in each checklist ITEM, NOT the item title or description
+- Set "is_passed": true for each checklist item the code satisfies
+- Provide appropriate "value" based on the item type (boolean: true/false, text: descriptive text, number: numeric value)
+- If the code does not satisfy a checklist item requirement, set "is_passed": false and explain why in the "notes" field
+- The system will validate that all checklists have been addressed - missing checklists will cause the pipeline to fail`
+        : '';
+    const checklistJsonField = checklistContext &&
+        checklistContext.checklists &&
+        checklistContext.checklists.length > 0
+        ? `,
+    "checklist_item_results": [
+      {
+        "checklist_item_id": "EXACT_CHECKLIST_ITEM_UUID_FROM_ID_FIELD",
+        "is_passed": true,
+        "value": "Result value based on item type (boolean, text, number, etc.)",
+        "notes": "Optional notes about this specific checklist item"
+      }
+    ]`
+        : '';
     return `You are an expert code reviewer specializing in thorough, constructive code reviews. Your goal is to analyze pull request code and identify issues, potential bugs, code quality concerns, and areas for improvement.
 
 **Your Role**: Review pull request code and provide detailed, actionable feedback.
@@ -562,6 +598,7 @@ function createSystemPrompt(_config) {
 - Be respectful and professional
 - Focus on issues that truly matter, not nitpicks
 - If code looks good overall, provide positive feedback
+${checklistInstructions}
 
 **CRITICAL - Result Format**:
 You MUST end your response with a JSON object containing the review results in this EXACT format:
@@ -583,7 +620,7 @@ You MUST end your response with a JSON object containing the review results in t
       "critical": 0,
       "major": 0,
       "minor": 0
-    }
+    }${checklistJsonField}
   }
 }
 \`\`\`
@@ -601,11 +638,15 @@ You MUST end your response with a JSON object containing the review results in t
 
 Focus on providing valuable, actionable code review feedback.`;
 }
-function createCodeReviewPrompt(featureId, context, feedbacksInfo) {
+function createCodeReviewPrompt(featureId, context, feedbacksInfo, checklistContext) {
     let contextInfo = formatContextForPrompt(context);
     if (feedbacksInfo) {
         contextInfo = contextInfo + '\n\n' + feedbacksInfo;
     }
+    if (checklistContext && checklistContext.checklists.length > 0) {
+        const checklistInfo = formatChecklistsForContext(checklistContext);
+        contextInfo = contextInfo + '\n\n' + checklistInfo;
+    }
     return `Review the pull request code for feature: ${featureId}
 
 ${contextInfo}
@@ -653,7 +694,17 @@ Follow this systematic approach:
 - Consider the context and requirements
 - Be professional and constructive
 - If code is good, say so!
-
+${checklistContext && checklistContext.checklists.length > 0
+        ? `
+## MANDATORY - Checklist Compliance
+You MUST evaluate ALL checklist items provided in the context and include results in your JSON response.
+- Use the exact UUID from each checklist item's "ID:" field as the "checklist_item_id"
+- Evaluate whether the code satisfies each checklist requirement
+- Set "is_passed" to true if the requirement is met, false otherwise
+- Provide detailed "notes" for any items that are not passed
+- ALL checklist items must be included - missing items will cause pipeline failure
+`
+        : ''}
 Begin by analyzing the changed files and identifying any issues or improvements.`;
 }
 function parseCodeReviewResponse(response) {

package/dist/services/branches.d.ts

@@ -78,6 +78,7 @@ export declare function getBaseBranchInfo(branch: Branch, allBranches: Branch[],
     originalBaseBranch?: string;
     needsRebase: boolean;
     baseBranchMerged: boolean;
+    baseBranchCompleted?: boolean;
 }>;
 /**
  * Get branch by ID

package/dist/services/branches.js

@@ -192,14 +192,21 @@ export async function getBaseBranchInfo(branch, allBranches, mainBranch = 'main'
     }
     // Check if base branch is completed (feat merged to main)
     if (baseBranch.status === 'completed') {
-        // Base branch's feat is already squash-merged to main
-        // Just rebase directly to main - no need for --onto
-        // Main already contains all the changes, so a normal rebase will work correctly
+        // Base branch's feat was squash-merged to main, and feat was likely synced
+        // to main during the base branch's code-implementation phase.
+        // This means origin/feat/base = origin/main, so --onto would not help
+        // (it would replay all commits including the old squash commit).
+        //
+        // Use a normal rebase to main instead. The dev branch may carry an old
+        // squash commit (S1) from feat that conflicts with main's squash (S2).
+        // This is expected and handled by the conflict resolver (resolveConflicts: true).
+        // baseBranchCompleted tells the resolver to use "theirs" (main) for all conflicts,
+        // so the old commit becomes empty and gets dropped by git rebase.
         return {
             baseBranch: mainBranch,
-            // Don't set originalBaseBranch - we want a normal rebase, not --onto
             needsRebase: false,
             baseBranchMerged: true,
+            baseBranchCompleted: true,
         };
     }
     // Check if base branch is merged (dev merged to feat, but feat not yet merged to main)

package/dist/utils/conflict-resolver.d.ts

@@ -17,6 +17,12 @@ export interface ConflictResolverConfig {
      * to only replay commits after this branch.
      */
     originalBaseBranch?: string;
+    /**
+     * When true, the base branch's feat was already squash-merged to main.
+     * All conflicts should be resolved by accepting "theirs" (main's version)
+     * so duplicate commits from the base branch become empty and get dropped.
+     */
+    baseBranchCompleted?: boolean;
 }
 /**
  * Result of conflict resolution

package/dist/utils/conflict-resolver.js

@@ -17,8 +17,8 @@ function* createPromptGenerator(prompt) {
 /**
  * Create a system prompt for conflict resolution
  */
-function createConflictResolutionSystemPrompt() {
-    return `You are a skilled software engineer completing a git rebase operation that has conflicts.
+function createConflictResolutionSystemPrompt(baseBranchCompleted) {
+    const basePrompt = `You are a skilled software engineer completing a git rebase operation that has conflicts.
 
 Your task is to resolve ALL merge conflicts and complete the rebase successfully.
 
@@ -31,15 +31,28 @@ WORKFLOW:
    d. Run "git add <file>" to stage the resolved file
 3. After ALL conflicts are resolved, run "git rebase --continue"
 4. If more conflicts appear from subsequent commits, repeat steps 1-3
-5. Continue until the rebase is complete (no more rebase in progress)
-
+5. Continue until the rebase is complete (no more rebase in progress)`;
+    const resolutionRules = baseBranchCompleted
+        ? `
+CONFLICT RESOLUTION RULES:
+- The base branch has already been squash-merged to main. The conflicts are caused by
+  old commits from the base branch being replayed on top of main which already has those changes.
+- For EVERY conflict, accept "theirs" (main's version) by running: git checkout --theirs <file> && git add <file>
+- This will make the duplicate commits empty, and git rebase will automatically drop them.
+- Do NOT try to merge changes intelligently - main already has the final correct version.
+- After resolving all conflicts with --theirs, run "git rebase --continue"
+- If git says "No changes - did you forget to use 'git add'?", run "git rebase --skip" to skip the empty commit`
+        : `
 CONFLICT RESOLUTION RULES:
 - Remove ALL conflict markers (<<<<<<, =======, >>>>>>>)
 - Merge changes intelligently - don't just pick one side
 - Preserve functionality from both sides when possible
 - If changes are truly incompatible, prefer theirs (incoming) as it's usually newer
 - Ensure the resulting code is syntactically correct
-- DO NOT add comments explaining the merge
+- DO NOT add comments explaining the merge`;
+    return (basePrompt +
+        resolutionRules +
+        `
 
 IMPORTANT:
 - Use "git status" to check progress
@@ -47,7 +60,7 @@ IMPORTANT:
 - Use the Edit tool to fix conflicts (remove markers, merge content)
 - Use Bash for git commands (git add, git rebase --continue)
 - Keep working until "git status" shows no rebase in progress
-- If you encounter an error you cannot resolve, explain what went wrong`;
+- If you encounter an error you cannot resolve, explain what went wrong`);
 }
 /**
  * Create the initial prompt describing the rebase task
@@ -88,7 +101,7 @@ Start by running "git status" to see the current state.`;
  * @returns Result of the conflict resolution
  */
 export async function resolveConflictsWithAgent(config = {}) {
-    const { model = 'sonnet', verbose, maxTurns = 100, featureBranch, baseBranch, originalBaseBranch, } = config;
+    const { model = 'sonnet', verbose, maxTurns = 100, featureBranch, baseBranch, originalBaseBranch, baseBranchCompleted, } = config;
     const resolvedFiles = [];
     if (verbose) {
         logInfo(`\n🔧 Starting automatic conflict resolution with Claude agent...`);
@@ -105,7 +118,7 @@ export async function resolveConflictsWithAgent(config = {}) {
         }
         logInfo(`   Initial conflicts: ${initialConflictFiles.length} file(s)`);
     }
-    const systemPrompt = createConflictResolutionSystemPrompt();
+    const systemPrompt = createConflictResolutionSystemPrompt(baseBranchCompleted);
     const userPrompt = createRebaseTaskPrompt(currentBranch, targetBranch, initialConflictFiles, originalBaseBranch);
     try {
         let lastMessage = '';

package/dist/utils/git-branch-manager.d.ts

@@ -200,6 +200,12 @@ export interface RebaseWithConflictResolutionOptions {
         model?: string;
         maxTurns?: number;
     };
+    /**
+     * When true, indicates the base branch's feat was already squash-merged to main.
+     * The conflict resolver should use "theirs" (main) for all conflicts to drop
+     * duplicate commits from the base branch.
+     */
+    baseBranchCompleted?: boolean;
     /**
      * Force push the branch after rebase.
      * This is needed when feat branch was synced to main, to trigger

package/dist/utils/git-branch-manager.js

@@ -689,7 +689,7 @@ export async function syncFeatBranchWithMain(featBranch, githubToken, owner, rep
  * @returns Object containing the previous branch name and conflict resolution result
  */
 export async function switchToFeatureBranchAndRebaseAsync(options) {
-    const { featureBranch, baseBranch = 'main', rebaseTargetBranch, originalBaseBranch, verbose, resolveConflicts = false, conflictResolverConfig, forcePushAfterRebase = false, } = options;
+    const { featureBranch, baseBranch = 'main', rebaseTargetBranch, originalBaseBranch, verbose, resolveConflicts = false, conflictResolverConfig, forcePushAfterRebase = false, baseBranchCompleted = false, } = options;
     // Determine the actual target branch for rebase
     // If rebaseTargetBranch is set (e.g., main), use it; otherwise use baseBranch
     const actualRebaseTarget = rebaseTargetBranch || baseBranch;
@@ -871,6 +871,7 @@ export async function switchToFeatureBranchAndRebaseAsync(options) {
                 featureBranch,
                 baseBranch,
                 originalBaseBranch,
+                baseBranchCompleted,
             });
             if (result.success) {
                 if (verbose) {

package/package.json

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