edsger 0.19.7 → 0.19.9

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

@@ -87,8 +87,12 @@ export declare function fetchUserStories(featureId: string, verbose?: boolean):
 export declare function fetchTestCases(featureId: string, verbose?: boolean): Promise<any[]>;
 /**
  * Fetch complete code refine context
+ * @param featureId - The feature ID
+ * @param githubToken - GitHub token for API access
+ * @param verbose - Enable verbose logging
+ * @param pullRequestUrl - Optional PR URL (for multi-branch features, use branch's PR URL)
  */
-export declare function fetchCodeRefineContext(featureId: string, githubToken: string, verbose?: boolean): Promise<CodeRefineContext>;
+export declare function fetchCodeRefineContext(featureId: string, githubToken: string, verbose?: boolean, pullRequestUrl?: string): Promise<CodeRefineContext>;
 /**
  * Format code refine context for prompt
  */

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

@@ -304,17 +304,23 @@ async function processGitHubContentImages(reviews, reviewThreads, featureId, ver
 }
 /**
  * Fetch complete code refine context
+ * @param featureId - The feature ID
+ * @param githubToken - GitHub token for API access
+ * @param verbose - Enable verbose logging
+ * @param pullRequestUrl - Optional PR URL (for multi-branch features, use branch's PR URL)
  */
-export async function fetchCodeRefineContext(featureId, githubToken, verbose) {
+export async function fetchCodeRefineContext(featureId, githubToken, verbose, pullRequestUrl) {
     // Fetch feature info using shared API
     const feature = await getFeature(featureId, verbose);
-    if (!feature.pull_request_url) {
+    // Use provided PR URL (from branch) or fall back to feature's PR URL
+    const prUrl = pullRequestUrl || feature.pull_request_url;
+    if (!prUrl) {
         throw new Error(`Feature ${featureId} does not have a pull request URL. Cannot perform code refine.`);
     }
     // Parse PR URL
-    const prInfo = parsePullRequestUrl(feature.pull_request_url);
+    const prInfo = parsePullRequestUrl(prUrl);
     if (!prInfo) {
-        throw new Error(`Invalid pull request URL: ${feature.pull_request_url}. Expected format: https://github.com/owner/repo/pull/123`);
+        throw new Error(`Invalid pull request URL: ${prUrl}. Expected format: https://github.com/owner/repo/pull/123`);
     }
     const { owner, repo, prNumber } = prInfo;
     // Initialize Octokit with GitHub token
@@ -338,7 +344,7 @@ export async function fetchCodeRefineContext(featureId, githubToken, verbose) {
         featureId,
         featureName: feature.name,
         featureDescription: feature.description ?? null,
-        pullRequestUrl: feature.pull_request_url,
+        pullRequestUrl: prUrl,
         pullRequestNumber: prNumber,
         owner,
         repo,

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

@@ -10,7 +10,7 @@ import { getFeedbacksForPhase, formatFeedbacksForContext, } from '../../services
 import { createSystemPrompt, createCodeRefinePrompt } from './prompts.js';
 import { preparePhaseGitEnvironment, prepareCustomBranchGitEnvironment, hasUncommittedChanges, getUncommittedFiles, syncFeatBranchWithMain, } from '../../utils/git-branch-manager.js';
 import { getFeature } from '../../api/features/get-feature.js';
-import { getReadyForReviewBranch } from '../../services/branches.js';
+import { getReadyForReviewBranch, } from '../../services/branches.js';
 import { parsePullRequestUrl } from './context.js';
 function userMessage(content) {
     return {
@@ -88,22 +88,41 @@ export const refineCodeFromPRFeedback = async (options, config) => {
             logInfo(`Note: Could not fetch feature branches, using default branch`);
         }
     }
+    // Get PR URL from branch (for multi-branch features) or feature
+    let pullRequestUrl = null;
+    if (currentBranch && currentBranch.pull_request_url) {
+        pullRequestUrl = currentBranch.pull_request_url;
+        if (verbose) {
+            logInfo(`📝 Using PR URL from branch: ${pullRequestUrl}`);
+        }
+    }
+    else {
+        // Fall back to feature's PR URL for single-branch features
+        try {
+            const feature = await getFeature(featureId, verbose);
+            pullRequestUrl = feature.pull_request_url || null;
+        }
+        catch (error) {
+            if (verbose) {
+                logInfo(`Note: Could not fetch feature PR URL`);
+            }
+        }
+    }
     // Sync feat branch with main before preparing git environment
     // This prevents extra commits from appearing in PR when dev branch is rebased
-    try {
-        const feature = await getFeature(featureId, verbose);
-        if (feature.pull_request_url) {
-            const prInfo = parsePullRequestUrl(feature.pull_request_url);
+    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)}`);
+        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
         }
-        // Continue even if sync fails - it's not critical
     }
     // Prepare git environment: switch to the appropriate branch
     const cleanupGit = currentBranch
@@ -114,7 +133,7 @@ export const refineCodeFromPRFeedback = async (options, config) => {
         if (verbose) {
             logInfo('Fetching code refine context from GitHub PR...');
         }
-        const context = await fetchCodeRefineContext(featureId, githubToken, verbose);
+        const context = await fetchCodeRefineContext(featureId, githubToken, verbose, pullRequestUrl || undefined);
         // Check if there are any reviews or comments to address
         if (context.reviews.length === 0 && context.reviewComments.length === 0) {
             if (verbose) {
@@ -131,13 +150,15 @@ export const refineCodeFromPRFeedback = async (options, config) => {
             logInfo(`📋 Found ${context.reviews.length} reviews and ${context.reviewComments.length} comments to address`);
         }
         // Fetch additional feedbacks for code-refine phase
+        // For multi-branch features, filter by the current branch to get branch-specific feedbacks
         let feedbacksInfo;
         try {
-            const feedbacksContext = await getFeedbacksForPhase({ featureId, verbose }, 'code_refine');
+            const feedbacksContext = await getFeedbacksForPhase({ featureId, verbose }, 'code_refine', currentBranch?.id // Pass branch_id if we have a current branch
+            );
             if (feedbacksContext.feedbacks.length > 0) {
                 feedbacksInfo = await formatFeedbacksForContext(feedbacksContext);
                 if (verbose) {
-                    logInfo(`Added ${feedbacksContext.feedbacks.length} human feedbacks to code refine context`);
+                    logInfo(`Added ${feedbacksContext.feedbacks.length} human feedbacks to code refine context${currentBranch ? ` (including branch-specific for "${currentBranch.name}")` : ''}`);
                 }
             }
         }

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

@@ -7,6 +7,7 @@ import { Octokit } from '@octokit/rest';
 import { logInfo, logError } from '../../utils/logger.js';
 import { parsePullRequestUrl, fetchPRReviews } from '../code-refine/context.js';
 import { getFeature } from '../../api/features/get-feature.js';
+import { getReadyForReviewBranch, } from '../../services/branches.js';
 import { fetchPRFileChanges, fetchUnresolvedReviewThreads, resolveReviewThreads, dismissReviews, } from './github.js';
 import { analyzeAllThreads } from './llm-analyzer.js';
 // Re-export types for backward compatibility
@@ -20,15 +21,39 @@ export async function verifyAndResolveComments(options) {
         logInfo(`Starting code refine verification for feature ID: ${featureId}`);
     }
     try {
-        // Fetch feature info using shared API
-        const feature = await getFeature(featureId, verbose);
-        if (!feature.pull_request_url) {
+        // For multi-branch features, find the branch that is ready for review
+        let currentBranch = null;
+        try {
+            currentBranch = await getReadyForReviewBranch({ featureId, verbose });
+            if (currentBranch && verbose) {
+                logInfo(`📋 Found ready_for_review branch: ${currentBranch.name}`);
+            }
+        }
+        catch (error) {
+            if (verbose) {
+                logInfo(`Note: Could not fetch feature branches`);
+            }
+        }
+        // Get PR URL from branch (for multi-branch features) or feature
+        let pullRequestUrl = null;
+        if (currentBranch && currentBranch.pull_request_url) {
+            pullRequestUrl = currentBranch.pull_request_url;
+            if (verbose) {
+                logInfo(`📝 Using PR URL from branch: ${pullRequestUrl}`);
+            }
+        }
+        else {
+            // Fall back to feature's PR URL for single-branch features
+            const feature = await getFeature(featureId, verbose);
+            pullRequestUrl = feature.pull_request_url || null;
+        }
+        if (!pullRequestUrl) {
             throw new Error(`Feature ${featureId} does not have a pull request URL. Cannot perform verification.`);
         }
         // Parse PR URL
-        const prInfo = parsePullRequestUrl(feature.pull_request_url);
+        const prInfo = parsePullRequestUrl(pullRequestUrl);
         if (!prInfo) {
-            throw new Error(`Invalid pull request URL: ${feature.pull_request_url}. Expected format: https://github.com/owner/repo/pull/123`);
+            throw new Error(`Invalid pull request URL: ${pullRequestUrl}. Expected format: https://github.com/owner/repo/pull/123`);
         }
         const { owner, repo, prNumber } = prInfo;
         // Initialize Octokit with GitHub token (supports both REST and GraphQL)

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

@@ -84,8 +84,12 @@ export declare function fetchUserStories(featureId: string, verbose?: boolean):
 export declare function fetchTestCases(featureId: string, verbose?: boolean): Promise<any[]>;
 /**
  * Fetch complete code review context
+ * @param featureId - The feature ID
+ * @param githubToken - GitHub token for API access
+ * @param verbose - Enable verbose logging
+ * @param pullRequestUrl - Optional PR URL (for multi-branch features, use branch's PR URL)
  */
-export declare function fetchCodeReviewContext(featureId: string, githubToken: string, verbose?: boolean): Promise<CodeReviewContext>;
+export declare function fetchCodeReviewContext(featureId: string, githubToken: string, verbose?: boolean, pullRequestUrl?: string): Promise<CodeReviewContext>;
 /**
  * Format code review context for prompt
  */

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

@@ -167,17 +167,23 @@ export async function fetchTestCases(featureId, verbose) {
 }
 /**
  * Fetch complete code review context
+ * @param featureId - The feature ID
+ * @param githubToken - GitHub token for API access
+ * @param verbose - Enable verbose logging
+ * @param pullRequestUrl - Optional PR URL (for multi-branch features, use branch's PR URL)
  */
-export async function fetchCodeReviewContext(featureId, githubToken, verbose) {
+export async function fetchCodeReviewContext(featureId, githubToken, verbose, pullRequestUrl) {
     // Fetch feature info using shared API
     const feature = await getFeature(featureId, verbose);
-    if (!feature.pull_request_url) {
+    // Use provided PR URL (from branch) or fall back to feature's PR URL
+    const prUrl = pullRequestUrl || feature.pull_request_url;
+    if (!prUrl) {
         throw new Error(`Feature ${featureId} does not have a pull request URL. Cannot perform code review.`);
     }
     // Parse PR URL
-    const prInfo = parsePullRequestUrl(feature.pull_request_url);
+    const prInfo = parsePullRequestUrl(prUrl);
     if (!prInfo) {
-        throw new Error(`Invalid pull request URL: ${feature.pull_request_url}. Expected format: https://github.com/owner/repo/pull/123`);
+        throw new Error(`Invalid pull request URL: ${prUrl}. Expected format: https://github.com/owner/repo/pull/123`);
     }
     const { owner, repo, prNumber } = prInfo;
     // Initialize Octokit with GitHub token
@@ -199,7 +205,7 @@ export async function fetchCodeReviewContext(featureId, githubToken, verbose) {
         featureId,
         featureName: feature.name,
         featureDescription: feature.description ?? null,
-        pullRequestUrl: feature.pull_request_url,
+        pullRequestUrl: prUrl,
         pullRequestNumber: prNumber,
         owner,
         repo,

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

@@ -8,7 +8,8 @@ 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 } from '../../services/branches.js';
+import { getReadyForReviewBranch, } from '../../services/branches.js';
+import { getFeature } from '../../api/features/get-feature.js';
 function userMessage(content) {
     return {
         type: 'user',
@@ -144,6 +145,26 @@ export const reviewPullRequest = async (options, config) => {
             logInfo(`Note: Could not fetch feature branches, using default branch`);
         }
     }
+    // Get PR URL from branch (for multi-branch features) or feature
+    let pullRequestUrl = null;
+    if (currentBranch && currentBranch.pull_request_url) {
+        pullRequestUrl = currentBranch.pull_request_url;
+        if (verbose) {
+            logInfo(`📝 Using PR URL from branch: ${pullRequestUrl}`);
+        }
+    }
+    else {
+        // Fall back to feature's PR URL for single-branch features
+        try {
+            const feature = await getFeature(featureId, verbose);
+            pullRequestUrl = feature.pull_request_url || null;
+        }
+        catch (error) {
+            if (verbose) {
+                logInfo(`Note: Could not fetch feature PR URL`);
+            }
+        }
+    }
     // Prepare git environment: switch to the appropriate branch
     const cleanupGit = currentBranch
         ? prepareCustomBranchGitEnvironment(branchName, 'main', verbose)
@@ -153,7 +174,7 @@ export const reviewPullRequest = async (options, config) => {
         if (verbose) {
             logInfo('Fetching code review context from GitHub PR...');
         }
-        const context = await fetchCodeReviewContext(featureId, githubToken, verbose);
+        const context = await fetchCodeReviewContext(featureId, githubToken, verbose, pullRequestUrl || undefined);
         // Check if there are any files to review
         if (context.files.length === 0) {
             if (verbose) {
@@ -170,13 +191,15 @@ export const reviewPullRequest = async (options, config) => {
             logInfo(`📋 Found ${context.files.length} files to review across ${context.commits.length} commits`);
         }
         // Fetch additional feedbacks for code-review phase
+        // For multi-branch features, filter by the current branch to get branch-specific feedbacks
         let feedbacksInfo;
         try {
-            const feedbacksContext = await getFeedbacksForPhase({ featureId, verbose }, 'code_review');
+            const feedbacksContext = await getFeedbacksForPhase({ featureId, verbose }, 'code_review', currentBranch?.id // Pass branch_id if we have a current branch
+            );
             if (feedbacksContext.feedbacks.length > 0) {
                 feedbacksInfo = await formatFeedbacksForContext(feedbacksContext);
                 if (verbose) {
-                    logInfo(`Added ${feedbacksContext.feedbacks.length} human feedbacks to code review context`);
+                    logInfo(`Added ${feedbacksContext.feedbacks.length} human feedbacks to code review context${currentBranch ? ` (including branch-specific for "${currentBranch.name}")` : ''}`);
                 }
             }
         }

package/dist/phases/functional-testing/analyzer.js

@@ -7,7 +7,7 @@ import { fetchFunctionalTestingContext, formatContextForPrompt, } from './contex
 import { updateFeatureStatus } from '../../api/features/index.js';
 import { createTestReport, } from './test-report-creator.js';
 import { preparePhaseGitEnvironment, prepareCustomBranchGitEnvironment, } from '../../utils/git-branch-manager.js';
-import { getReadyForReviewBranch } from '../../services/branches.js';
+import { getReadyForReviewBranch, } from '../../services/branches.js';
 function userMessage(content) {
     return {
         type: 'user',
@@ -57,13 +57,15 @@ export const runFunctionalTesting = async (options, config, checklistContext) =>
         }
         const context = await fetchFunctionalTestingContext(featureId, verbose);
         // Fetch feedbacks for functional testing phase
+        // For multi-branch features, include branch-specific feedbacks
         let feedbacksInfo;
         try {
-            const feedbacksContext = await getFeedbacksForPhase({ featureId, verbose }, 'functional_testing');
+            const feedbacksContext = await getFeedbacksForPhase({ featureId, verbose }, 'functional_testing', currentBranch?.id // Pass branch_id if we have a current branch
+            );
             if (feedbacksContext.feedbacks.length > 0) {
                 feedbacksInfo = await formatFeedbacksForContext(feedbacksContext);
                 if (verbose) {
-                    logInfo(`Added ${feedbacksContext.feedbacks.length} human feedbacks to testing context`);
+                    logInfo(`Added ${feedbacksContext.feedbacks.length} human feedbacks to testing context${currentBranch ? ` (including branch-specific for "${currentBranch.name}")` : ''}`);
                 }
             }
         }

package/package.json

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