Add conflict resolution, PR comments, and CI to storm continue#35
Merged
casperpanduro merged 3 commits intomainfrom Mar 16, 2026
Merged
Add conflict resolution, PR comments, and CI to storm continue#35casperpanduro merged 3 commits intomainfrom
casperpanduro merged 3 commits intomainfrom
Conversation
- Add mergeBaseBranch() to detect and surface merge conflicts to the agent
- Add fetchPRCommentsAndSessionId() to fetch regular PR comments (not just inline review comments)
- Add {{ conflicts }} and {{ pr.comments }} template placeholders
- Update default continue template with conflict resolution instructions
- Add CI workflow to run typecheck and tests on PRs
- Add processContinue tests for merge and conflict detection
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
bun's mock.module leaks across test files when run in the same process, causing false failures. Run each file separately. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
`bun test` runs all files in one process; `bun run test` uses the package.json script that runs each file separately. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
storm continuenow merges the base branch after checkout. If there are conflicts, they're surfaced to the agent via a{{ conflicts }}template placeholder so it can resolve them.{{ pr.comments }}, so feedback left as normal comments is visible to the agent..github/workflows/ci.ymlto run typecheck and tests on PRs targeting main.Test plan
bun test— all 52 tests pass (3 new tests for processContinue)storm continue <pr-number> --dry-runon a PR with comments — verify comments appear in prompt🤖 Generated with Claude Code