Fix PR creation logic #920
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
billxinli
approved these changes
Nov 18, 2025
Replaces undefined return with OpenPrResult discriminated union type: - Distinguishes failure reasons: already_exists, validation_error, permission_denied, network_error, unknown - Enables caller to handle specific error cases appropriately - Provides detailed error information including validation details This foundational change enables better error handling in subsequent commits.
Previously, the socket fix command would only create a PR once and then never again because it checked for branch existence instead of PR existence. Since branches persist after PR creation, subsequent runs would skip PR creation entirely. Changes: - Check for open PR existence instead of branch existence - Add stale branch cleanup before creating new branches - Move GitHub token check before git operations for early validation - Integrate cleanup functions for proper branch lifecycle management - Add comprehensive error handling for all PR creation failure types - Remove unused gitDeleteRemoteBranch import This ensures PRs can be recreated after being closed/merged and prevents branch accumulation from failed PR attempts.
Extract branch cleanup operations into a separate module to improve code organization and testability. Each cleanup function has a specific purpose based on the branch lifecycle stage. Added functions: - cleanupStaleBranch: Delete both remote and local for branches without PRs - cleanupFailedPrBranches: Clean up after PR creation failure - cleanupSuccessfulPrLocalBranch: Remove only local branch after PR success - cleanupErrorBranches: Handle cleanup after unexpected errors Tests: - 8 unit tests with mocked git functions - 5 integration tests with real git repositories in tmpdir
jdalton
force-pushed
the
jdalton/fix-pr-creation-logic
branch
from
db211c9 to
e1fbda4
Compare
Contributor
Author
|
@cursor review |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes bug where PRs fail to be created on subsequent runs when branch exists from previous failed attempts.
Changes:
Note
Checks for existing open PRs, cleans up stale branches, adds structured PR creation errors, and integrates new branch cleanup utilities with tests; updates reach help snapshots.
src/commands/fix/coana-fix.mts):cleanupStaleBranch.openSocketFixPrresult for detailed failure handling (already exists, validation, permission, network, unknown) and clean up branches accordingly.cleanupSuccessfulPrLocalBranch.cleanupErrorBranches; reset back to base branch.src/commands/fix/branch-cleanup.mts):cleanupStaleBranch,cleanupFailedPrBranches,cleanupSuccessfulPrLocalBranch,cleanupErrorBrancheswith unit and integration tests.src/commands/fix/pull-request.mts):openSocketFixPrnow returns a discriminatedOpenPrResultwith explicit error reasons and logging.--reach-concurrencyand--reach-disable-analysis-splittingand ordering tweaks.spawnCoanaDlxlocal-path execution formatting/refactor insrc/utils/dlx.mts.Written by Cursor Bugbot for commit e1fbda4. Configure here.