edsger 0.21.3 → 0.21.5

package/dist/commands/workflow/feature-coordinator.js

@@ -14,7 +14,6 @@ import { markWorkflowPhaseCompleted } from '../../api/features/update-feature.js
 import { logError, logInfo, logWarning } from '../../utils/logger.js';
 import { logPhaseResult } from '../../utils/pipeline-logger.js';
 import { runFeatureAnalysisPhase, runTechnicalDesignPhase, runBranchPlanningPhase, runCodeImplementationPhase, runFunctionalTestingPhase, runCodeRefinePhase, runCodeReviewPhase, } from './executors/phase-executor.js';
-import { handlePullRequestCreation } from '../../phases/pull-request/handler.js';
 /**
  * Map workflow phase names (underscore format) to phase runner functions
  * Note: code_refine includes built-in verification loop (similar to technical_design)
@@ -104,8 +103,6 @@ export async function runFeatureWorkflow(options, config) {
         }
         // 3. Execute each pending phase in order
         const results = [];
-        // Check if workflow includes a pull_request phase
-        const hasPullRequestPhase = pendingPhases.some((p) => p.phase === 'pull_request');
         for (const workflowPhase of pendingPhases) {
             const result = await executePhase(workflowPhase.phase, options, config);
             results.push(result);
@@ -116,37 +113,8 @@ export async function runFeatureWorkflow(options, config) {
                 }
                 break;
             }
-            // Auto-create PR after successful code_implementation if no pull_request phase in workflow
-            if (workflowPhase.phase === 'code_implementation' &&
-                result.status === 'success' &&
-                !hasPullRequestPhase) {
-                if (verbose) {
-                    logInfo('\n📝 Creating pull request for implemented code...');
-                }
-                const prCreated = await handlePullRequestCreation({
-                    featureId,
-                    results,
-                    verbose,
-                });
-                const prResult = {
-                    featureId,
-                    phase: 'pull-request',
-                    status: prCreated ? 'success' : 'error',
-                    message: prCreated
-                        ? 'Pull request created successfully'
-                        : 'Pull request creation failed',
-                    data: {},
-                };
-                logPhaseResult(prResult, verbose);
-                results.push(prResult);
-                // If PR creation failed, stop workflow
-                if (!prCreated) {
-                    if (verbose) {
-                        logInfo('\n⛔ Stopping workflow execution: pull-request failed');
-                    }
-                    break;
-                }
-            }
+            // Note: PR creation is now handled within the code-implementation phase itself,
+            // so we no longer need to create it here after code_implementation succeeds.
         }
         if (verbose) {
             const successCount = results.filter((r) => r.status === 'success').length;

package/dist/phases/code-implementation/branch-pr-creator.js

@@ -42,6 +42,7 @@ export function devBranchToFeatBranch(devBranchName) {
 }
 /**
  * Push a branch to remote
+ * Falls back to force-with-lease if normal push fails (e.g., after rebase)
  */
 async function pushBranch(branchName, verbose) {
     try {
@@ -66,8 +67,27 @@ async function pushBranch(branchName, verbose) {
                 return { success: true };
             }
             catch (retryError) {
-                const errorMessage = retryError instanceof Error ? retryError.message : String(retryError);
-                return { success: false, error: errorMessage };
+                // If push still fails (likely non-fast-forward after rebase),
+                // use force-with-lease for safer force push
+                if (verbose) {
+                    logInfo(`⚠️  Push rejected, attempting force push with lease...`);
+                }
+                try {
+                    execSync(`git push --force-with-lease origin ${branchName}`, {
+                        encoding: 'utf-8',
+                        stdio: verbose ? 'inherit' : 'pipe',
+                    });
+                    if (verbose) {
+                        logInfo(`✅ Successfully force pushed ${branchName}`);
+                    }
+                    return { success: true };
+                }
+                catch (forceError) {
+                    const errorMessage = forceError instanceof Error
+                        ? forceError.message
+                        : String(forceError);
+                    return { success: false, error: errorMessage };
+                }
             }
         }
     }

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

@@ -856,6 +856,7 @@ const parseImplementationResponse = (response, featureId) => {
 };
 /**
  * Push branch to remote repository
+ * Falls back to force-with-lease if normal push fails (e.g., after rebase)
  */
 async function pushToRemote(branchName, verbose) {
     try {
@@ -883,11 +884,31 @@ async function pushToRemote(branchName, verbose) {
                 return { success: true };
             }
             catch (retryError) {
-                const errorMessage = retryError instanceof Error ? retryError.message : String(retryError);
-                return {
-                    success: false,
-                    error: errorMessage,
-                };
+                // If push still fails (likely non-fast-forward after rebase),
+                // use force-with-lease for safer force push
+                // force-with-lease ensures we don't overwrite others' work by checking remote state
+                if (verbose) {
+                    logInfo(`⚠️  Push rejected, attempting force push with lease...`);
+                }
+                try {
+                    execSync(`git push --force-with-lease origin ${branchName}`, {
+                        encoding: 'utf-8',
+                        stdio: verbose ? 'inherit' : 'pipe',
+                    });
+                    if (verbose) {
+                        logInfo(`✅ Successfully force pushed ${branchName}`);
+                    }
+                    return { success: true };
+                }
+                catch (forceError) {
+                    const errorMessage = forceError instanceof Error
+                        ? forceError.message
+                        : String(forceError);
+                    return {
+                        success: false,
+                        error: errorMessage,
+                    };
+                }
             }
         }
     }

package/dist/phases/pull-request/creator.js

@@ -85,6 +85,7 @@ const switchToBranch = (branch, verbose) => {
 };
 /**
  * Push current branch to remote
+ * Falls back to force-with-lease if normal push fails (e.g., after rebase)
  */
 const pushBranch = (branch, verbose) => {
     try {
@@ -97,7 +98,22 @@ const pushBranch = (branch, verbose) => {
         }
     }
     catch (error) {
-        throw new Error(`Failed to push branch: ${error}`);
+        // If push fails (likely non-fast-forward after rebase),
+        // use force-with-lease for safer force push
+        if (verbose) {
+            console.log(`⚠️  Push rejected, attempting force push with lease...`);
+        }
+        try {
+            execSync(`git push --force-with-lease origin ${branch}`, {
+                encoding: 'utf-8',
+            });
+            if (verbose) {
+                console.log(`✅ Successfully force pushed ${branch}`);
+            }
+        }
+        catch (forceError) {
+            throw new Error(`Failed to push branch: ${forceError}`);
+        }
     }
 };
 /**

package/package.json

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