Skip to content

fix(backend): treat GitHub PRs with merged_at as merged #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefan-ernst merged 2 commits into from
Oct 5, 2026
Merged

fix(backend): treat GitHub PRs with merged_at as merged #309

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2235e9
fix(backend): treat GitHub PRs with merged_at as merged
spatialy Oct 5, 2026
cd36d6e
test(scm): move GitHub merged PR regression test to core-tests
stefan-ernst Oct 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/scm/github.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1395,6 +1395,13 @@ type githubPullRequest struct {
ClosedAt *time.Time `json:"closed_at"`
}

// toPullRequest converts a GitHub pull request to the provider-neutral type.
//
// GitHub's list endpoint (GET /repos/{owner}/{repo}/pulls) omits the `merged`
// field, so Merged is always false for listed PRs; only the single-PR endpoint
// sets it. `merged_at` is present on both, so a non-nil MergedAt also counts as
// merged. Without it, sync stored merged PRs as "closed" and never emitted
// scm_pr_merged or ran smart commits (Windshiftapp/core#304).
func (pr githubPullRequest) toPullRequest() PullRequest {
return PullRequest{
ID: pr.ID,
Expand All @@ -1407,7 +1414,7 @@ func (pr githubPullRequest) toPullRequest() PullRequest {
HeadRepo: pr.Head.Repo.FullName,
HeadSHA: pr.Head.SHA,
BaseBranch: pr.Base.Ref,
IsMerged: pr.Merged,
IsMerged: pr.Merged || pr.MergedAt != nil,
IsDraft: pr.Draft,
Author: pr.User.toUser(),
CreatedAt: pr.CreatedAt,
Expand Down
Loading