fix: surface conflicting PRs#2247
Open
shrirajpawar4 wants to merge 2 commits into
Open
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
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.
Summary
conflictingsession status for open PRs with merge conflictswaiting_inputpr_conflictingnotifications so conflicts reach the user even if the agent is pausedNotes
This intentionally keeps the change scoped to merge conflicts. The broader behavior where
waiting_inputcan mask other PR-derived statuses is related to #290 and should be handled separately.A new SQLite migration is included because notification
typehas a CHECK constraint and existing migrations should not be edited.fix for #2173
Test
go test ./internal/service/session ./internal/lifecycle ./internal/notifygo test ./internal/httpd/...npm run frontend:typecheckcd frontend && npm exec vitest run src/renderer/types/workspace.test.ts src/renderer/components/NotificationCenter.test.tsx