edsger 0.19.9 → 0.19.10

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

@@ -16,6 +16,7 @@ import { logPhaseResult } from '../../utils/pipeline-logger.js';
 import { runFeatureAnalysisPhase, runTechnicalDesignPhase, runBranchPlanningPhase, runCodeImplementationPhase, runFunctionalTestingPhase, runCodeRefinePhase, runCodeReviewPhase, } from './executors/phase-executor.js';
 /**
  * Map workflow phase names (underscore format) to phase runner functions
+ * Note: code_refine includes built-in verification loop (similar to technical_design)
  */
 const PHASE_RUNNERS = {
     feature_analysis: runFeatureAnalysisPhase,

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

@@ -1,8 +1,11 @@
 /**
  * Code Refine Analyzer
  * Processes GitHub PR review feedback and refines code accordingly
+ * Includes built-in verification loop that resolves PR comments and dismisses reviews
  */
 import { EdsgerConfig } from '../../types/index.js';
+import { type CodeRefineVerificationResult } from '../code-refine-verification/index.js';
+export declare const MAX_REFINE_ITERATIONS = 10;
 export interface CodeRefineOptions {
     featureId: string;
     githubToken: string;
@@ -34,8 +37,12 @@ export interface CodeRefineResult {
     summary?: string;
     filesModified?: string[];
     commitsCreated?: number;
+    iterations?: number;
+    verificationResult?: CodeRefineVerificationResult;
 }
 /**
- * Main code refine function
+ * 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>;

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

@@ -1,6 +1,7 @@
 /**
  * Code Refine Analyzer
  * Processes GitHub PR review feedback and refines code accordingly
+ * Includes built-in verification loop that resolves PR comments and dismisses reviews
  */
 import { query } from '@anthropic-ai/claude-agent-sdk';
 import { logInfo, logError } from '../../utils/logger.js';
@@ -12,6 +13,9 @@ import { preparePhaseGitEnvironment, prepareCustomBranchGitEnvironment, hasUncom
 import { getFeature } from '../../api/features/get-feature.js';
 import { getReadyForReviewBranch, } from '../../services/branches.js';
 import { parsePullRequestUrl } from './context.js';
+import { verifyAndResolveComments, } from '../code-refine-verification/index.js';
+// Maximum number of refine + verification iterations
+export const MAX_REFINE_ITERATIONS = 10;
 function userMessage(content) {
     return {
         type: 'user',
@@ -58,7 +62,9 @@ const pushChanges = (verbose) => {
     }
 };
 /**
- * Main code refine function
+ * 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 const refineCodeFromPRFeedback = async (options, config) => {
     const { featureId, githubToken, verbose } = options;
@@ -129,13 +135,14 @@ export const refineCodeFromPRFeedback = async (options, config) => {
         ? prepareCustomBranchGitEnvironment(branchName, 'main', verbose)
         : preparePhaseGitEnvironment(featureId, 'main', verbose);
     try {
-        // Fetch code refine context (PR reviews and comments)
+        // Fetch initial code refine context (PR reviews and comments)
         if (verbose) {
             logInfo('Fetching code refine context from GitHub PR...');
         }
-        const context = await fetchCodeRefineContext(featureId, githubToken, verbose, pullRequestUrl || undefined);
+        const initialContext = 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 (initialContext.reviews.length === 0 &&
+            initialContext.reviewComments.length === 0) {
             if (verbose) {
                 logInfo('✅ No review comments or change requests found. Nothing to refine.');
             }
@@ -144,129 +151,43 @@ export const refineCodeFromPRFeedback = async (options, config) => {
                 status: 'success',
                 message: 'No review feedback to address',
                 summary: 'No change requests or review comments found on the PR',
+                iterations: 0,
             };
         }
         if (verbose) {
-            logInfo(`📋 Found ${context.reviews.length} reviews and ${context.reviewComments.length} comments to address`);
+            logInfo(`📋 Found ${initialContext.reviews.length} reviews and ${initialContext.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', 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${currentBranch ? ` (including branch-specific for "${currentBranch.name}")` : ''}`);
-                }
-            }
-        }
-        catch (error) {
+        // Iterative refine → verification loop
+        let currentIteration = 0;
+        let verificationFailureContext;
+        let lastRefineResult = null;
+        let lastVerificationResult = null;
+        while (currentIteration < MAX_REFINE_ITERATIONS) {
+            currentIteration++;
             if (verbose) {
-                logInfo(`Note: Could not fetch feedbacks (${error instanceof Error ? error.message : String(error)})`);
-            }
-        }
-        // Feature branch switching is handled by preparePhaseGitEnvironment above
-        // Create prompt for code refine
-        const systemPrompt = createSystemPrompt();
-        const refinePrompt = createCodeRefinePrompt(featureId, context, feedbacksInfo, options.verificationFailureContext);
-        let lastAssistantResponse = '';
-        let structuredRefineResult = null;
-        if (verbose) {
-            logInfo('Starting Claude Code query for code refine...');
-        }
-        // Use Claude Code SDK to refine the code
-        for await (const message of query({
-            prompt: prompt(refinePrompt),
-            options: {
-                systemPrompt: {
-                    type: 'preset',
-                    preset: 'claude_code',
-                    append: systemPrompt,
-                },
-                model: config.claude.model || 'sonnet',
-                maxTurns: 2000,
-                permissionMode: 'bypassPermissions',
-            },
-        })) {
-            if (verbose) {
-                logInfo(`Received message type: ${message.type}`);
-            }
-            // Stream the code refine process
-            if (message.type === 'assistant' && message.message?.content) {
-                for (const content of message.message.content) {
-                    if (content.type === 'text') {
-                        lastAssistantResponse += content.text + '\n';
-                        if (verbose) {
-                            console.log(`\n🔧 ${content.text}`);
-                        }
-                    }
-                    else if (content.type === 'tool_use') {
-                        if (verbose) {
-                            console.log(`\n🛠️ ${content.name}: ${content.input.description || 'Running...'}`);
-                        }
-                    }
-                }
-            }
-            else if (message.type === 'result') {
-                if (message.subtype === 'success') {
-                    logInfo('\n🛠️ Code refine completed, parsing results...');
-                    try {
-                        const responseText = message.result || lastAssistantResponse;
-                        let jsonResult = null;
-                        const jsonBlockMatch = responseText.match(/```json\s*\n([\s\S]*?)\n\s*```/);
-                        if (jsonBlockMatch) {
-                            jsonResult = JSON.parse(jsonBlockMatch[1]);
-                        }
-                        else {
-                            jsonResult = JSON.parse(responseText);
-                        }
-                        if (jsonResult && jsonResult.refine_result) {
-                            structuredRefineResult = jsonResult.refine_result;
-                        }
-                        else {
-                            throw new Error('Invalid JSON structure');
-                        }
-                    }
-                    catch (error) {
-                        logError(`Failed to parse structured refine result: ${error}`);
-                        structuredRefineResult = parseCodeRefineResponse(message.result || lastAssistantResponse);
-                    }
+                if (currentIteration === 1) {
+                    logInfo(`\n🔄 Starting refine iteration ${currentIteration}/${MAX_REFINE_ITERATIONS}`);
                 }
                 else {
-                    logError(`\n⚠️  Code refine incomplete: ${message.subtype}`);
-                    if (message.subtype === 'error_max_turns') {
-                        logError('💡 Try simplifying the changes or reducing scope');
-                    }
-                    if (lastAssistantResponse) {
-                        try {
-                            const responseText = lastAssistantResponse;
-                            let jsonResult = null;
-                            const jsonBlockMatch = responseText.match(/```json\s*\n([\s\S]*?)\n\s*```/);
-                            if (jsonBlockMatch) {
-                                jsonResult = JSON.parse(jsonBlockMatch[1]);
-                                if (jsonResult && jsonResult.refine_result) {
-                                    structuredRefineResult = jsonResult.refine_result;
-                                }
-                            }
-                            else {
-                                structuredRefineResult = parseCodeRefineResponse(lastAssistantResponse);
-                            }
-                        }
-                        catch (error) {
-                            logError(`Failed to parse assistant response: ${error}`);
-                        }
-                    }
+                    logInfo(`\n🔄 Retry iteration ${currentIteration}/${MAX_REFINE_ITERATIONS}: Improving based on verification feedback...`);
                 }
             }
-        }
-        // Push changes to remote
-        if (structuredRefineResult) {
-            // Verify all changes are committed before pushing
+            // Execute refine for this iteration
+            const refineResult = await executeRefineIteration(featureId, githubToken, config, pullRequestUrl || undefined, currentBranch, verificationFailureContext, verbose);
+            if (refineResult.status === 'error') {
+                // Refine failed - return error
+                return {
+                    featureId,
+                    status: 'error',
+                    message: refineResult.message || 'Code refine failed',
+                    iterations: currentIteration,
+                };
+            }
+            lastRefineResult = refineResult;
+            // Push changes before verification
             if (hasUncommittedChanges()) {
                 const uncommittedFiles = getUncommittedFiles();
-                const errorMsg = `Code refine completed but there are uncommitted changes. All changes must be committed before verification.
+                const errorMsg = `Code refine completed but there are uncommitted changes.
 
 Uncommitted files:
 ${uncommittedFiles.join('\n')}
@@ -277,6 +198,7 @@ Please ensure Claude Code commits all changes before completing the refine phase
                     featureId,
                     status: 'error',
                     message: errorMsg,
+                    iterations: currentIteration,
                 };
             }
             if (verbose) {
@@ -284,24 +206,6 @@ Please ensure Claude Code commits all changes before completing the refine phase
             }
             try {
                 pushChanges(verbose);
-                const { summary, files_modified, commits_created } = structuredRefineResult;
-                if (verbose) {
-                    logInfo(`Code refine completed for feature: ${featureId}`);
-                    if (files_modified?.length > 0) {
-                        logInfo(`Files modified: ${files_modified.join(', ')}`);
-                    }
-                    if (commits_created) {
-                        logInfo(`Commits created: ${commits_created}`);
-                    }
-                }
-                return {
-                    featureId,
-                    status: 'success',
-                    message: 'Code successfully refined based on PR feedback',
-                    summary: summary || 'Code refined based on PR review feedback',
-                    filesModified: files_modified || [],
-                    commitsCreated: commits_created || 1,
-                };
             }
             catch (pushError) {
                 logError(`Failed to push changes: ${pushError}`);
@@ -309,16 +213,77 @@ Please ensure Claude Code commits all changes before completing the refine phase
                     featureId,
                     status: 'error',
                     message: `Code refined but failed to push: ${pushError}`,
+                    iterations: currentIteration,
                 };
             }
-        }
-        else {
-            return {
+            // Run verification
+            if (verbose) {
+                logInfo('\n🔍 Running verification to check if all comments are addressed...');
+            }
+            const verificationResult = await verifyAndResolveComments({
                 featureId,
-                status: 'error',
-                message: 'Code refine failed or incomplete',
-            };
+                githubToken,
+                config,
+                verbose,
+            });
+            lastVerificationResult = verificationResult;
+            // If verification passed, we're done!
+            if (verificationResult.status === 'success') {
+                if (verbose) {
+                    logInfo('✅ Verification passed! All PR comments have been addressed and resolved.');
+                }
+                return {
+                    featureId,
+                    status: 'success',
+                    message: verificationResult.message,
+                    summary: lastRefineResult.summary || 'Code refined based on PR review feedback',
+                    filesModified: lastRefineResult.files_modified || [],
+                    commitsCreated: lastRefineResult.commits_created || 1,
+                    iterations: currentIteration,
+                    verificationResult,
+                };
+            }
+            // Verification failed - prepare context for retry
+            if (currentIteration < MAX_REFINE_ITERATIONS) {
+                const verificationData = verificationResult.data;
+                const suggestions = verificationData.suggestions || [];
+                const unresolvedCommentDetails = verificationData.unresolvedCommentDetails || [];
+                const unresolvedReviewDetails = verificationData.unresolvedReviewDetails;
+                verificationFailureContext = {
+                    attempt: currentIteration + 1,
+                    suggestions,
+                    unresolvedCommentDetails,
+                    unresolvedReviewDetails,
+                };
+                if (verbose) {
+                    logInfo(`\n⚠️  Verification failed: ${verificationResult.message}`);
+                    if (suggestions.length > 0) {
+                        logInfo(`💡 Suggestions for next iteration:`);
+                        suggestions.forEach((suggestion) => {
+                            logInfo(`   ${suggestion}`);
+                        });
+                    }
+                    logInfo(`\n🔄 Will retry... (${MAX_REFINE_ITERATIONS - currentIteration} attempts remaining)`);
+                }
+            }
+            else {
+                // Max iterations reached
+                if (verbose) {
+                    logInfo(`\n⚠️  Maximum iterations (${MAX_REFINE_ITERATIONS}) reached. Verification still failing.`);
+                }
+            }
         }
+        // Return last verification result (which failed)
+        return {
+            featureId,
+            status: 'error',
+            message: lastVerificationResult?.message || 'Verification failed after max iterations',
+            summary: lastRefineResult?.summary,
+            filesModified: lastRefineResult?.files_modified || [],
+            commitsCreated: lastRefineResult?.commits_created || 1,
+            iterations: currentIteration,
+            verificationResult: lastVerificationResult || undefined,
+        };
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -334,6 +299,136 @@ Please ensure Claude Code commits all changes before completing the refine phase
         cleanupGit();
     }
 };
+/**
+ * Execute a single refine iteration
+ */
+async function executeRefineIteration(featureId, githubToken, config, pullRequestUrl, currentBranch, verificationFailureContext, verbose) {
+    // Fetch code refine context (PR reviews and comments)
+    const context = await fetchCodeRefineContext(featureId, githubToken, verbose, pullRequestUrl);
+    // Fetch additional feedbacks for code-refine phase
+    let feedbacksInfo;
+    try {
+        const feedbacksContext = await getFeedbacksForPhase({ featureId, verbose }, 'code_refine', currentBranch?.id);
+        if (feedbacksContext.feedbacks.length > 0) {
+            feedbacksInfo = await formatFeedbacksForContext(feedbacksContext);
+            if (verbose) {
+                logInfo(`Added ${feedbacksContext.feedbacks.length} human feedbacks to code refine context${currentBranch ? ` (including branch-specific for "${currentBranch.name}")` : ''}`);
+            }
+        }
+    }
+    catch (error) {
+        if (verbose) {
+            logInfo(`Note: Could not fetch feedbacks (${error instanceof Error ? error.message : String(error)})`);
+        }
+    }
+    // Create prompt for code refine
+    const systemPrompt = createSystemPrompt();
+    const refinePrompt = createCodeRefinePrompt(featureId, context, feedbacksInfo, verificationFailureContext);
+    let lastAssistantResponse = '';
+    let structuredRefineResult = null;
+    if (verbose) {
+        logInfo('Starting Claude Code query for code refine...');
+    }
+    // Use Claude Code SDK to refine the code
+    for await (const message of query({
+        prompt: prompt(refinePrompt),
+        options: {
+            systemPrompt: {
+                type: 'preset',
+                preset: 'claude_code',
+                append: systemPrompt,
+            },
+            model: config.claude.model || 'sonnet',
+            maxTurns: 2000,
+            permissionMode: 'bypassPermissions',
+        },
+    })) {
+        if (verbose) {
+            logInfo(`Received message type: ${message.type}`);
+        }
+        // Stream the code refine process
+        if (message.type === 'assistant' && message.message?.content) {
+            for (const content of message.message.content) {
+                if (content.type === 'text') {
+                    lastAssistantResponse += content.text + '\n';
+                    if (verbose) {
+                        console.log(`\n🔧 ${content.text}`);
+                    }
+                }
+                else if (content.type === 'tool_use') {
+                    if (verbose) {
+                        console.log(`\n🛠️ ${content.name}: ${content.input.description || 'Running...'}`);
+                    }
+                }
+            }
+        }
+        else if (message.type === 'result') {
+            if (message.subtype === 'success') {
+                logInfo('\n🛠️ Code refine completed, parsing results...');
+                try {
+                    const responseText = message.result || lastAssistantResponse;
+                    let jsonResult = null;
+                    const jsonBlockMatch = responseText.match(/```json\s*\n([\s\S]*?)\n\s*```/);
+                    if (jsonBlockMatch) {
+                        jsonResult = JSON.parse(jsonBlockMatch[1]);
+                    }
+                    else {
+                        jsonResult = JSON.parse(responseText);
+                    }
+                    if (jsonResult && jsonResult.refine_result) {
+                        structuredRefineResult = jsonResult.refine_result;
+                    }
+                    else {
+                        throw new Error('Invalid JSON structure');
+                    }
+                }
+                catch (error) {
+                    logError(`Failed to parse structured refine result: ${error}`);
+                    structuredRefineResult = parseCodeRefineResponse(message.result || lastAssistantResponse);
+                }
+            }
+            else {
+                logError(`\n⚠️  Code refine incomplete: ${message.subtype}`);
+                if (message.subtype === 'error_max_turns') {
+                    logError('💡 Try simplifying the changes or reducing scope');
+                }
+                if (lastAssistantResponse) {
+                    try {
+                        const responseText = lastAssistantResponse;
+                        let jsonResult = null;
+                        const jsonBlockMatch = responseText.match(/```json\s*\n([\s\S]*?)\n\s*```/);
+                        if (jsonBlockMatch) {
+                            jsonResult = JSON.parse(jsonBlockMatch[1]);
+                            if (jsonResult && jsonResult.refine_result) {
+                                structuredRefineResult = jsonResult.refine_result;
+                            }
+                        }
+                        else {
+                            structuredRefineResult = parseCodeRefineResponse(lastAssistantResponse);
+                        }
+                    }
+                    catch (error) {
+                        logError(`Failed to parse assistant response: ${error}`);
+                    }
+                }
+            }
+        }
+    }
+    if (structuredRefineResult) {
+        return {
+            status: 'success',
+            summary: structuredRefineResult.summary,
+            files_modified: structuredRefineResult.files_modified,
+            commits_created: structuredRefineResult.commits_created,
+        };
+    }
+    else {
+        return {
+            status: 'error',
+            message: 'Code refine failed or incomplete',
+        };
+    }
+}
 function parseCodeRefineResponse(response) {
     const summaryMatch = response.match(/## Refine Summary\n([\s\S]*?)(?=\n##|\n\n|$)/);
     const summary = summaryMatch

package/package.json

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