edsger 0.42.1 → 0.43.0

package/dist/phases/pr-resolve/__tests__/checklist-learner.test.js

@@ -26,8 +26,8 @@ function makeMap(entries) {
     return new Map(entries);
 }
 // ── buildLearnerPrompt ──────────────────────────────────────
-describe('buildLearnerPrompt', () => {
-    it('includes addressed comment count in header', () => {
+void describe('buildLearnerPrompt', () => {
+    void it('includes addressed comment count in header', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Fixed' },
             { comment_id: 'comment_2', action: 'changed', reply: 'Done' },
@@ -40,7 +40,7 @@ describe('buildLearnerPrompt', () => {
         const prompt = buildLearnerPrompt(comments, threads, map);
         assert.ok(prompt.includes('2 review comment(s)'));
     });
-    it('includes reviewer, file path, line, and comment body', () => {
+    void it('includes reviewer, file path, line, and comment body', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Added null check' },
         ];
@@ -60,7 +60,7 @@ describe('buildLearnerPrompt', () => {
         assert.ok(prompt.includes('Missing null check here'));
         assert.ok(prompt.includes('Added null check'));
     });
-    it('includes resolution text for each comment', () => {
+    void it('includes resolution text for each comment', () => {
         const comments = [
             {
                 comment_id: 'comment_1',
@@ -73,7 +73,7 @@ describe('buildLearnerPrompt', () => {
         const prompt = buildLearnerPrompt(comments, threads, map);
         assert.ok(prompt.includes('**Resolution**: Refactored to use try/catch'));
     });
-    it('includes summary when provided', () => {
+    void it('includes summary when provided', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Fixed' },
         ];
@@ -83,7 +83,7 @@ describe('buildLearnerPrompt', () => {
         assert.ok(prompt.includes('## Overall Summary'));
         assert.ok(prompt.includes('Improved error handling across 3 files'));
     });
-    it('omits summary section when not provided', () => {
+    void it('omits summary section when not provided', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Fixed' },
         ];
@@ -92,7 +92,7 @@ describe('buildLearnerPrompt', () => {
         const prompt = buildLearnerPrompt(comments, threads, map);
         assert.ok(!prompt.includes('## Overall Summary'));
     });
-    it('handles comment with no matching thread gracefully', () => {
+    void it('handles comment with no matching thread gracefully', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Fixed' },
         ];
@@ -105,7 +105,7 @@ describe('buildLearnerPrompt', () => {
         // Should NOT include reviewer info since thread was not found
         assert.ok(!prompt.includes('**Reviewer**'));
     });
-    it('handles comment_id not in map gracefully', () => {
+    void it('handles comment_id not in map gracefully', () => {
         const comments = [
             { comment_id: 'comment_99', action: 'changed', reply: 'Fixed' },
         ];
@@ -113,7 +113,7 @@ describe('buildLearnerPrompt', () => {
         assert.ok(prompt.includes('## comment_99'));
         assert.ok(prompt.includes('**Resolution**: Fixed'));
     });
-    it('omits line when null', () => {
+    void it('omits line when null', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Fixed' },
         ];
@@ -123,7 +123,7 @@ describe('buildLearnerPrompt', () => {
         assert.ok(prompt.includes('**File**: src/index.ts'));
         assert.ok(!prompt.includes('**Line**'));
     });
-    it('uses threadById map correctly for multiple comments', () => {
+    void it('uses threadById map correctly for multiple comments', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Fix A' },
             { comment_id: 'comment_3', action: 'changed', reply: 'Fix C' },
@@ -146,7 +146,7 @@ describe('buildLearnerPrompt', () => {
         // comment_2 was not in addressedComments, should not appear
         assert.ok(!prompt.includes('Issue B'));
     });
-    it('includes instructions section', () => {
+    void it('includes instructions section', () => {
         const comments = [
             { comment_id: 'comment_1', action: 'changed', reply: 'Fixed' },
         ];

package/dist/phases/pr-resolve/__tests__/prompts.test.js

@@ -34,26 +34,26 @@ function makeThread(id, overrides) {
         },
     };
 }
-describe('createResolveSystemPrompt', () => {
-    it('includes decision criteria', () => {
+void describe('createResolveSystemPrompt', () => {
+    void it('includes decision criteria', () => {
         const prompt = createResolveSystemPrompt();
         assert.ok(prompt.includes('Make the change when'));
         assert.ok(prompt.includes('Skip the change when'));
     });
-    it('specifies comment_id format', () => {
+    void it('specifies comment_id format', () => {
         const prompt = createResolveSystemPrompt();
         assert.ok(prompt.includes('comment_id'));
         assert.ok(prompt.includes('comment_1'));
     });
-    it('includes result format', () => {
+    void it('includes result format', () => {
         const prompt = createResolveSystemPrompt();
         assert.ok(prompt.includes('resolve_result'));
         assert.ok(prompt.includes('"action"'));
         assert.ok(prompt.includes('"reply"'));
     });
 });
-describe('createResolveUserPrompt', () => {
-    it('uses sequential comment IDs not thread IDs', () => {
+void describe('createResolveUserPrompt', () => {
+    void it('uses sequential comment IDs not thread IDs', () => {
         const threads = [makeThread('PRRT_kwDOxx_1'), makeThread('PRRT_kwDOxx_2')];
         const { prompt, commentIdToThreadId } = createResolveUserPrompt(threads);
         // Should use comment_1, comment_2 in the prompt
@@ -67,20 +67,20 @@ describe('createResolveUserPrompt', () => {
         assert.strictEqual(commentIdToThreadId.get('comment_2'), 'PRRT_kwDOxx_2');
         assert.strictEqual(commentIdToThreadId.size, 2);
     });
-    it('includes file path and line number', () => {
+    void it('includes file path and line number', () => {
         const threads = [makeThread('t1', { path: 'src/auth.ts', line: 42 })];
         const { prompt } = createResolveUserPrompt(threads);
         assert.ok(prompt.includes('src/auth.ts'));
         assert.ok(prompt.includes('42'));
     });
-    it('includes comment body', () => {
+    void it('includes comment body', () => {
         const threads = [
             makeThread('t1', { body: 'This should use a const instead of let' }),
         ];
         const { prompt } = createResolveUserPrompt(threads);
         assert.ok(prompt.includes('This should use a const instead of let'));
     });
-    it('includes follow-up comments', () => {
+    void it('includes follow-up comments', () => {
         const threads = [
             makeThread('t1', {
                 body: 'Main comment',
@@ -92,12 +92,12 @@ describe('createResolveUserPrompt', () => {
         assert.ok(prompt.includes('I disagree because...'));
         assert.ok(prompt.includes('@dev'));
     });
-    it('includes instruction to use exact comment IDs', () => {
+    void it('includes instruction to use exact comment IDs', () => {
         const threads = [makeThread('t1'), makeThread('t2'), makeThread('t3')];
         const { prompt } = createResolveUserPrompt(threads);
         assert.ok(prompt.includes('comment_1, comment_2, comment_3'));
     });
-    it('handles threads with no comments gracefully', () => {
+    void it('handles threads with no comments gracefully', () => {
         const emptyThread = {
             id: 'empty',
             isResolved: false,
@@ -108,7 +108,7 @@ describe('createResolveUserPrompt', () => {
         // Empty thread should be skipped (no comment nodes to index)
         assert.strictEqual(commentIdToThreadId.size, 0);
     });
-    it('returns correct count in header', () => {
+    void it('returns correct count in header', () => {
         const threads = [makeThread('t1'), makeThread('t2')];
         const { prompt } = createResolveUserPrompt(threads);
         assert.ok(prompt.includes('2 unresolved review comment(s)'));

package/dist/phases/pr-resolve/__tests__/resolve-mapping.test.js

@@ -45,8 +45,8 @@ function makeThread(id, body) {
         },
     };
 }
-describe('resolve comment→thread mapping (integration)', () => {
-    it('correctly maps comment_ids to thread IDs', () => {
+void describe('resolve comment→thread mapping (integration)', () => {
+    void it('correctly maps comment_ids to thread IDs', () => {
         const threads = [
             makeThread('PRRT_aaa', 'Use const'),
             makeThread('PRRT_bbb', 'Add error handling'),
@@ -75,7 +75,7 @@ describe('resolve comment→thread mapping (integration)', () => {
         assert.strictEqual(result.addressed[1].threadId, 'PRRT_bbb');
         assert.strictEqual(result.skipped[0].threadId, 'PRRT_ccc');
     });
-    it('reports errors for unknown comment_ids', () => {
+    void it('reports errors for unknown comment_ids', () => {
         const threads = [makeThread('PRRT_aaa', 'Fix bug')];
         const { commentIdToThreadId } = createResolveUserPrompt(threads);
         const agentResult = [
@@ -87,7 +87,7 @@ describe('resolve comment→thread mapping (integration)', () => {
         assert.strictEqual(result.errors.length, 1);
         assert.ok(result.errors[0].includes('comment_99'));
     });
-    it('handles agent returning partial results', () => {
+    void it('handles agent returning partial results', () => {
         const threads = [
             makeThread('PRRT_aaa', 'Fix A'),
             makeThread('PRRT_bbb', 'Fix B'),
@@ -105,7 +105,7 @@ describe('resolve comment→thread mapping (integration)', () => {
         assert.strictEqual(result.errors.length, 0);
         // comment_2 was not mentioned - no error, just not processed
     });
-    it('handles empty agent result', () => {
+    void it('handles empty agent result', () => {
         const threads = [makeThread('PRRT_aaa', 'Fix')];
         const { commentIdToThreadId } = createResolveUserPrompt(threads);
         const result = processResolveResult([], commentIdToThreadId);
@@ -113,7 +113,7 @@ describe('resolve comment→thread mapping (integration)', () => {
         assert.strictEqual(result.skipped.length, 0);
         assert.strictEqual(result.errors.length, 0);
     });
-    it('preserves reply text in all cases', () => {
+    void it('preserves reply text in all cases', () => {
         const threads = [
             makeThread('PRRT_aaa', 'Fix this'),
             makeThread('PRRT_bbb', 'Change that'),

package/dist/phases/pr-resolve/__tests__/types.test.js

@@ -1,43 +1,43 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { isResolveResult } from '../types.js';
-describe('isResolveResult', () => {
-    it('returns true for valid ResolveResult', () => {
+void describe('isResolveResult', () => {
+    void it('returns true for valid ResolveResult', () => {
         assert.ok(isResolveResult({
             comments: [
                 { comment_id: 'comment_1', action: 'changed', reply: 'Fixed' },
             ],
         }));
     });
-    it('returns true when optional fields are present', () => {
+    void it('returns true when optional fields are present', () => {
         assert.ok(isResolveResult({
             comments: [],
             files_modified: ['a.ts'],
             summary: 'Done',
         }));
     });
-    it('returns true for empty comments array', () => {
+    void it('returns true for empty comments array', () => {
         assert.ok(isResolveResult({ comments: [] }));
     });
-    it('returns false for null', () => {
+    void it('returns false for null', () => {
         assert.ok(!isResolveResult(null));
     });
-    it('returns false for undefined', () => {
+    void it('returns false for undefined', () => {
         assert.ok(!isResolveResult(undefined));
     });
-    it('returns false for string', () => {
+    void it('returns false for string', () => {
         assert.ok(!isResolveResult('not an object'));
     });
-    it('returns false for number', () => {
+    void it('returns false for number', () => {
         assert.ok(!isResolveResult(42));
     });
-    it('returns false when comments is missing', () => {
+    void it('returns false when comments is missing', () => {
         assert.ok(!isResolveResult({ files_modified: ['a.ts'] }));
     });
-    it('returns false when comments is not an array', () => {
+    void it('returns false when comments is not an array', () => {
         assert.ok(!isResolveResult({ comments: 'not-array' }));
     });
-    it('returns false for empty object', () => {
+    void it('returns false for empty object', () => {
         assert.ok(!isResolveResult({}));
     });
 });

package/dist/phases/pr-resolve/__tests__/workspace.test.js

@@ -16,8 +16,8 @@ function createTempRepo() {
     execSync('git commit -m "init"', { cwd: dir, stdio: 'pipe' });
     return dir;
 }
-describe('buildCredentialArgs', () => {
-    it('returns 4 args with credential helper config', () => {
+void describe('buildCredentialArgs', () => {
+    void it('returns 4 args with credential helper config', () => {
         const args = buildCredentialArgs('my-token');
         assert.strictEqual(args.length, 4);
         assert.strictEqual(args[0], '-c');
@@ -26,12 +26,12 @@ describe('buildCredentialArgs', () => {
         assert.ok(args[3].includes('my-token'));
         assert.ok(args[3].includes('x-access-token'));
     });
-    it('escapes token in credential helper', () => {
+    void it('escapes token in credential helper', () => {
         const args = buildCredentialArgs('token-with-special-chars!@#');
         assert.ok(args[3].includes('token-with-special-chars!@#'));
     });
 });
-describe('hasUncommittedChanges', () => {
+void describe('hasUncommittedChanges', () => {
     let repoPath;
     beforeEach(() => {
         repoPath = createTempRepo();
@@ -39,18 +39,18 @@ describe('hasUncommittedChanges', () => {
     afterEach(() => {
         rmSync(repoPath, { recursive: true, force: true });
     });
-    it('returns false for clean repo', () => {
+    void it('returns false for clean repo', () => {
         assert.strictEqual(hasUncommittedChanges(repoPath), false);
     });
-    it('returns true after modifying a file', () => {
+    void it('returns true after modifying a file', () => {
         writeFileSync(join(repoPath, 'README.md'), '# Modified');
         assert.strictEqual(hasUncommittedChanges(repoPath), true);
     });
-    it('returns true for new untracked file', () => {
+    void it('returns true for new untracked file', () => {
         writeFileSync(join(repoPath, 'new-file.txt'), 'content');
         assert.strictEqual(hasUncommittedChanges(repoPath), true);
     });
-    it('returns false after staging and committing', () => {
+    void it('returns false after staging and committing', () => {
         writeFileSync(join(repoPath, 'new.txt'), 'x');
         execSync('git add . && git commit -m "add"', {
             cwd: repoPath,
@@ -58,11 +58,11 @@ describe('hasUncommittedChanges', () => {
         });
         assert.strictEqual(hasUncommittedChanges(repoPath), false);
     });
-    it('returns false for non-existent path', () => {
+    void it('returns false for non-existent path', () => {
         assert.strictEqual(hasUncommittedChanges('/tmp/nonexistent-repo-xyz'), false);
     });
 });
-describe('hasNewCommits', () => {
+void describe('hasNewCommits', () => {
     let repoPath;
     let bareRemote;
     beforeEach(() => {
@@ -89,10 +89,10 @@ describe('hasNewCommits', () => {
         rmSync(repoPath, { recursive: true, force: true });
         rmSync(bareRemote, { recursive: true, force: true });
     });
-    it('returns false when HEAD matches remote', () => {
+    void it('returns false when HEAD matches remote', () => {
         assert.strictEqual(hasNewCommits(repoPath, 'main'), false);
     });
-    it('returns true after a local commit not pushed', () => {
+    void it('returns true after a local commit not pushed', () => {
         writeFileSync(join(repoPath, 'new.txt'), 'hello');
         execSync('git add . && git commit -m "local"', {
             cwd: repoPath,
@@ -100,7 +100,7 @@ describe('hasNewCommits', () => {
         });
         assert.strictEqual(hasNewCommits(repoPath, 'main'), true);
     });
-    it('returns false after pushing local commit', () => {
+    void it('returns false after pushing local commit', () => {
         writeFileSync(join(repoPath, 'new.txt'), 'hello');
         execSync('git add . && git commit -m "local" && git push origin main', {
             cwd: repoPath,

package/dist/phases/pr-resolve/checklist-learner.js

@@ -9,24 +9,48 @@
 import { query } from '@anthropic-ai/claude-agent-sdk';
 import { createChecklistsMcpServer } from '../../commands/checklists/tools.js';
 import { logInfo, logWarning } from '../../utils/logger.js';
-const LEARNER_SYSTEM_PROMPT = `You are a software quality engineer. Your task is to analyse review comments that were addressed during a PR resolve and distil them into actionable checklist items for the code_review phase.
+const LEARNER_SYSTEM_PROMPT = `You are a software quality engineer. Your task is to analyse review comments that were addressed during a PR resolve and distil them into actionable checklist items — assigned to the most appropriate phase(s) so issues are caught as early as possible.
+
+## Available Phases (earliest → latest)
+
+| Phase | When it runs | Good for |
+|-------|-------------|----------|
+| \`feature_analysis\` | Requirements gathering | Requirement gaps, scope issues, edge cases |
+| \`user_stories_analysis\` | User story refinement | Acceptance criteria gaps, missing scenarios |
+| \`test_cases_analysis\` | Test planning | Missing test coverage, untested edge cases |
+| \`technical_design\` | Architecture & design | Design flaws, API contract issues, data modelling |
+| \`branch_planning\` | Work breakdown | Dependency issues, ordering problems |
+| \`code_implementation\` | Writing code | Coding patterns, error handling, security, performance |
+| \`code_testing\` | Unit/integration tests | Test quality, assertion coverage, mocking issues |
+| \`code_refine\` | Code polish | Readability, naming, documentation |
+| \`code_review\` | Final review | Cross-cutting concerns not caught earlier |
 
 ## Workflow
 
 1. **Read** the addressed review comments provided below.
-2. **Query existing checklists** using \`list_checklists\` with phase "code_review" to see what already exists.
+2. **Query existing checklists** using \`list_checklists\` (without a phase filter) to see what already exists across all phases.
 3. **Identify patterns** — group related comments into categories (e.g., error handling, naming, security, performance, testing).
-4. **Update or create checklist items**:
-   - If an existing checklist covers the category, add new items to it (skip if a similar item already exists).
-   - If no suitable checklist exists, create a new one.
-5. **Summarise** what you added or updated.
+4. **Decide the best phase(s)** for each pattern — prefer earlier phases where the issue could have been prevented. A checklist item can belong to multiple phases if appropriate.
+5. **Update or create checklist items**:
+   - If an existing checklist covers the category and phase, add new items to it (skip if a similar item already exists).
+   - If no suitable checklist exists, create a new one with the appropriate phases.
+6. **Summarise** what you added or updated, and explain why you chose each phase.
+
+## Phase Selection Guidelines
+
+- **Shift left**: If an issue could have been prevented in an earlier phase, assign it there. For example, a missing null check found in code review should become a \`code_implementation\` checklist item.
+- **Security & error handling** → typically \`code_implementation\`
+- **Missing test cases or edge cases** → \`test_cases_analysis\` or \`code_testing\`
+- **Design or architecture issues** → \`technical_design\`
+- **Missing requirements or acceptance criteria** → \`feature_analysis\` or \`user_stories_analysis\`
+- **Code style, readability, naming** → \`code_refine\`
+- **Only use \`code_review\`** for cross-cutting concerns that genuinely can't be checked earlier.
 
 ## Rules
 
-- Only create items for **genuine quality patterns** — things that should be checked in every code review.
+- Only create items for **genuine quality patterns** — things that should be checked repeatedly.
 - Skip one-off nits, purely stylistic preferences, or context-specific fixes that won't generalise.
 - Role: \`developer\`
-- Phases: \`["code_review"]\`
 - Item type: \`boolean\` (yes/no checkable)
 - Keep item titles concise (< 80 chars). Use the description for details.
 - Do NOT duplicate items that already exist in the checklists.
@@ -72,7 +96,7 @@ export function buildLearnerPrompt(addressedComments, unresolvedThreads, comment
         sections.push('');
     }
     sections.push('## Instructions');
-    sections.push('Based on the patterns above, query existing code_review checklists and create or update items to prevent these issues from recurring.');
+    sections.push('Based on the patterns above, query existing checklists across all phases and create or update items in the most appropriate phase(s) to prevent these issues from recurring. Prefer earlier phases where the issue could have been caught sooner.');
     return sections.join('\n');
 }
 /**
@@ -112,6 +136,7 @@ export async function learnFromReviewFeedback(input) {
             if (message.type === 'result') {
                 if (message.subtype === 'success') {
                     logInfo('Checklist learning completed.');
+                    // eslint-disable-next-line max-depth
                     if (verbose && message.result) {
                         logInfo(message.result);
                     }

package/dist/phases/pr-resolve/index.js

@@ -22,6 +22,7 @@ export { isResolveResult } from './types.js';
 /**
  * Resolve PR change requests: evaluate each comment, fix or explain.
  */
+// eslint-disable-next-line complexity
 export async function resolveStandalonePR(options) {
     const { pullRequestUrl, githubToken, owner, repo, verbose, prId } = options;
     logInfo(`Starting PR resolve: ${pullRequestUrl}`);
@@ -69,9 +70,17 @@ export async function resolveStandalonePR(options) {
         // For fork PRs, pass fallback info so prepareWorkspace can fetch the PR ref
         // from upstream if the fork branch is unavailable.
         // For deleted forks, clone upstream directly and always use PR ref fallback.
-        const repoPath = prepareWorkspace(cloneOwner, cloneRepo, headRef, prInfo.prNumber, githubToken, verbose, isFork
-            ? { upstreamOwner: owner, upstreamRepo: repo }
-            : undefined);
+        const repoPath = prepareWorkspace({
+            owner: cloneOwner,
+            repo: cloneRepo,
+            headRef,
+            prNumber: prInfo.prNumber,
+            token: githubToken,
+            verbose,
+            forkFallback: isFork
+                ? { upstreamOwner: owner, upstreamRepo: repo }
+                : undefined,
+        });
         try {
             // Run Claude Agent SDK to evaluate and fix comments
             const systemPrompt = createResolveSystemPrompt();
@@ -104,6 +113,7 @@ export async function resolveStandalonePR(options) {
                     logInfo('Agent completed, parsing results...');
                     const responseText = message.result || lastAssistantResponse;
                     const parsed = tryExtractResult(responseText, 'resolve_result');
+                    // eslint-disable-next-line max-depth
                     if (isResolveResult(parsed)) {
                         resolveResult = parsed;
                     }
@@ -114,17 +124,19 @@ export async function resolveStandalonePR(options) {
                 else {
                     logError(`Agent incomplete: ${message.subtype}`);
                     // Try to salvage partial results from last response
+                    // eslint-disable-next-line max-depth
                     if (lastAssistantResponse) {
                         const salvaged = tryExtractResult(lastAssistantResponse, 'resolve_result');
+                        // eslint-disable-next-line max-depth
                         if (isResolveResult(salvaged)) {
                             resolveResult = salvaged;
                         }
                     }
                 }
             }
-            // Commit and push any changes the agent made
+            // Fallback: commit any leftover uncommitted changes the agent didn't commit itself
             if (hasUncommittedChanges(repoPath)) {
-                logInfo('Committing changes...');
+                logInfo('Committing remaining uncommitted changes...');
                 execSync('git add -A', { cwd: repoPath, stdio: 'pipe' });
                 execSync('git commit -m "Resolve PR review comments\n\nAutomated resolution by Edsger AI"', { cwd: repoPath, stdio: 'pipe' });
             }
@@ -142,13 +154,16 @@ export async function resolveStandalonePR(options) {
                 for (const comment of comments) {
                     // Map comment_id back to real GraphQL thread ID
                     const threadId = commentIdToThreadId.get(comment.comment_id);
+                    // eslint-disable-next-line max-depth
                     if (!threadId) {
                         logError(`Unknown comment_id "${comment.comment_id}", skipping reply`);
                         threadsErrored++;
                         continue;
                     }
+                    // eslint-disable-next-line max-depth
                     try {
                         const replied = await replyToReviewThread(octokit, threadId, comment.reply, verbose);
+                        // eslint-disable-next-line max-depth
                         if (replied && comment.action === 'changed') {
                             // Resolve the thread since the change was made
                             await resolveReviewThread(octokit, threadId, verbose);
@@ -178,6 +193,7 @@ export async function resolveStandalonePR(options) {
                             ? 'Changes were made to address review feedback. Please re-review.'
                             : 'Reviewed this comment. No changes were made at this time.';
                         const replied = await replyToReviewThread(octokit, thread.id, genericReply, verbose);
+                        // eslint-disable-next-line max-depth
                         if (replied) {
                             threadsSkipped++;
                         }
@@ -212,6 +228,14 @@ export async function resolveStandalonePR(options) {
                     // Non-critical
                 }
             }
+            // Clean up workspace on success
+            try {
+                rmSync(repoPath, { recursive: true, force: true });
+                logInfo(`Cleaned up workspace: ${repoPath}`);
+            }
+            catch {
+                // ignore cleanup errors
+            }
             return {
                 status: 'success',
                 message: `Resolved ${threadsAddressed} threads, skipped ${threadsSkipped}, ${threadsErrored} errors`,
@@ -228,14 +252,6 @@ export async function resolveStandalonePR(options) {
             logInfo(`Workspace preserved for inspection: ${repoPath}`);
             throw innerError;
         }
-        // Only clean up on success
-        try {
-            rmSync(repoPath, { recursive: true, force: true });
-            logInfo(`Cleaned up workspace: ${repoPath}`);
-        }
-        catch {
-            // ignore cleanup errors
-        }
     }
     catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);

package/dist/phases/pr-resolve/prompts.js

@@ -27,7 +27,8 @@ export function createResolveSystemPrompt() {
 2. For each comment, examine the relevant code
 3. If you agree: make the change in the file
 4. If you disagree: skip it (do NOT modify the file for that comment)
-5. After processing all comments, output a JSON summary
+5. After making all changes, commit them with a descriptive message summarizing what was resolved (do NOT push)
+6. After committing, output a JSON summary
 
 **CRITICAL - Result Format**:
 After making all changes, you MUST output a JSON result. Use the exact comment_id from each comment (comment_1, comment_2, etc.):

package/dist/phases/pr-resolve/workspace.d.ts

@@ -8,19 +8,29 @@
 export declare function buildCredentialArgs(token: string): string[];
 /**
  * Get the workspace path for a PR resolve operation.
+ * Includes owner/repo to avoid collisions when resolving PRs from different repos.
  */
-export declare function getResolveWorkspacePath(prNumber: number): string;
+export declare function getResolveWorkspacePath(owner: string, repo: string, prNumber: number): string;
 export interface ForkFallbackInfo {
     upstreamOwner: string;
     upstreamRepo: string;
 }
+export interface PrepareWorkspaceOptions {
+    owner: string;
+    repo: string;
+    headRef: string;
+    prNumber: number;
+    token: string;
+    verbose?: boolean;
+    forkFallback?: ForkFallbackInfo;
+}
 /**
  * Clone or reuse a repo for PR resolve.
  * For fork PRs, clones from the fork repo. If the fork branch is unavailable,
  * falls back to fetching the PR ref from the upstream repo.
  * Returns the workspace path.
  */
-export declare function prepareWorkspace(owner: string, repo: string, headRef: string, prNumber: number, token: string, verbose?: boolean, forkFallback?: ForkFallbackInfo): string;
+export declare function prepareWorkspace(options: PrepareWorkspaceOptions): string;
 /**
  * Push changes from workspace back to remote.
  */

package/dist/phases/pr-resolve/workspace.js

@@ -21,9 +21,10 @@ export function buildCredentialArgs(token) {
 }
 /**
  * Get the workspace path for a PR resolve operation.
+ * Includes owner/repo to avoid collisions when resolving PRs from different repos.
  */
-export function getResolveWorkspacePath(prNumber) {
-    return join(homedir(), 'edsger', `pr-resolve-${prNumber}`);
+export function getResolveWorkspacePath(owner, repo, prNumber) {
+    return join(homedir(), 'edsger', `pr-resolve-${owner}-${repo}-${prNumber}`);
 }
 /**
  * Clone or reuse a repo for PR resolve.
@@ -31,8 +32,9 @@ export function getResolveWorkspacePath(prNumber) {
  * falls back to fetching the PR ref from the upstream repo.
  * Returns the workspace path.
  */
-export function prepareWorkspace(owner, repo, headRef, prNumber, token, verbose, forkFallback) {
-    const repoPath = getResolveWorkspacePath(prNumber);
+export function prepareWorkspace(options) {
+    const { owner, repo, headRef, prNumber, token, verbose, forkFallback } = options;
+    const repoPath = getResolveWorkspacePath(owner, repo, prNumber);
     const repoUrl = `https://github.com/${owner}/${repo}.git`;
     const gitCredentialArgs = buildCredentialArgs(token);
     if (existsSync(join(repoPath, '.git'))) {