Skip to content

Use the merge queue for pull requests that require it - #2452

Merged
bradseiler merged 2 commits into
mainfrom
honor/github-merge-queue
Nov 4, 2026
Merged

Use the merge queue for pull requests that require it#2452
bradseiler merged 2 commits into
mainfrom
honor/github-merge-queue

Conversation

@bradseiler

@bradseiler bradseiler commented Nov 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Why

Buzz offers direct merge actions even when a pull request’s target branch requires GitHub’s merge queue, so choosing Squash and merge fails.

What

Show Queue for merge and its confirmation on queue-required branches, then display Queued for merge after GitHub accepts the request. Other branches retain their existing merge options.

How

Read GitHub’s target-branch queue flag and current queue membership with the existing checklist. Enqueue the confirmed head commit, hide direct merge methods for queue-required branches, and invalidate confirmations when the head, base, or queue requirement changes. GitHub validates queue admission; rejection stays visible for retry.

Risk

Limited to the bundled GitHub checklist and merge actions. No live GitHub enqueue was performed during agent testing.

Testing

Exercised the existing GitHub actions fixture in Chromium and WebKit through queue confirmation and queued status, in both themes at 1100px and 390px with enlarged text, using pointer and keyboard activation. Read-only GitHub GraphQL introspection and a PR query confirmed the queue fields and expectedHeadOid input.

Try /tests/fixtures/github-actions.html?ready&queue on this worktree’s dev server: choose Queue for merge, confirm, and expect Queued for merge. Native app behavior and human acceptance remain deferred. The full local Vitest run was stopped after failures and timeouts outside the GitHub plugin, including Settings, Inbox, message reactions, profile navigation and relay discovery; broad validation remains incomplete. The first pre-push run timed out in app page composition while that broad run was active; the unchanged page-composition test passed in 8 seconds after the broad run stopped. No automated browser cases added or removed; queue state/failure/confirmation regressions are covered in colocated component tests.

Updated with main’s agent-harness test fix from #2444 to clear the existing baseline CI failure. The merge-queue feature diff is unchanged; CI is rerunning on the updated branch.

Generated with Codex

@bradseiler Honor
fix(github): queue pull requests when the target requires it
0668fd4 
Co-authored-by: Honor <e0bf479eeebe47dde1e35705212a4df70616a7bc834d907ddfb18cf0405f8b1b@seiler-test.communities.public.builderlabstaging.xyz>
Signed-off-by: Brad Seiler <seiler@squareup.com>
@bradseiler
bradseiler marked this pull request as ready for review November 4, 2026 19:01
@bradseiler
bradseiler requested a review from a team as a code owner November 4, 2026 19:01
@bradseiler
Merge main to include the agent-harness CI fix
d2583ff 
Co-authored-by: Honor <e0bf479eeebe47dde1e35705212a4df70616a7bc834d907ddfb18cf0405f8b1b@seiler-test.communities.public.builderlabstaging.xyz>

* origin/main:
  feat(agents): identify plugins in native hook output (#2299)
  [4/5] Add protection to the Codex harness plugin (#1879)
  feat(search): show member counts on channel results (#2333)
  Fix the mute icon flashing when selecting a channel (#2287)
  feat(agents): open a working agent's transcript from its activity (#2276)
  test(agents): refuse a real relay workflow mention in the harness kit (#2444)
  fix(agents): catch up every event watch on the kinds it watches (#1852)
  Keep local artifact collections current (#1507)
  feat(members): add several people to a chat in one write (#2010)

Signed-off-by: Brad Seiler <seiler@squareup.com>
kazemek21
kazemek21 approved these changes Nov 4, 2026
View reviewed changes

@kazemek21 kazemek21 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Kyle reviewed this PR and the Nexus review-tracker notes and approved with no comments.

Posted by Codex (gpt-6.1-sol) on behalf of kylez

@bradseiler
bradseiler merged commit 93e691a into main Nov 4, 2026
41 checks passed
@bradseiler
bradseiler deleted the honor/github-merge-queue branch November 4, 2026 23:05
wpfleger96 added a commit that referenced this pull request Nov 4, 2026
@wpfleger96
Merge remote-tracking branch 'origin/main' into hayt/bbpublic-vanilla…
9b3f559 
…-nip-fi

* origin/main:
  perf(search): name searched people from the profile search response (#2353)
  Use the merge queue for pull requests that require it (#2452)
  fix(browser): load scheme-less address input over https, falling back to http (#2467)
wpfleger96 added a commit that referenced this pull request Nov 4, 2026
@wpfleger96
Merge remote-tracking branch 'origin/main' into wpfleger/agent-sideba…
4c8ad14 
…r-load-perf

* origin/main: (31 commits)
  test: fix invitation and coordination checks on main (#2517)
  perf(search): name searched people from the profile search response (#2353)
  Use the merge queue for pull requests that require it (#2452)
  fix(browser): load scheme-less address input over https, falling back to http (#2467)
  fix(identity): stop one-click key unlinks and show the linked backed-up key (#2486)
  fix(test): observe coordination transition events (#2297)
  fix(profiles): keep the next view's profile reads through a shrink (#2395)
  fix(channels): show Add and Send message errors above the Manage members list (#2421)
  fix(threads): keep reply hooks off agent activity bubbles (#2422)
  fix(channels): offer only Copy link in a not-joined preview's sidebar actions (#2425)
  test: scope row menu placement checks to active section rows (#2493)
  feat(relay): detach channel windows to a point in history (#2042)
  feat(identity): decide a missing backup choice from community membership (#2378)
  Offer Builderlab decisions in FI builds (#2227)
  feat(inbox): preview recent Inbox activity when hovering the sidebar row (#2347)
  Add collapsible Solo and Team sidebar sections (#2296)
  fix(codex): open long Codex transcripts a page of items at a time (#2259)
  Keep Solo model and effort choices per chat (#2342)
  feat(sidebar): smooth channel reordering with bounded motion (#2108)
  Connect legacy agents from DMs and channel mentions (#2423)
  ...
michaelneale added a commit that referenced this pull request Nov 4, 2026
@michaelneale
Merge remote-tracking branch 'origin/main' into mesh-tool-relay
b2bcd3f 
* origin/main: (31 commits)
  test: fix invitation and coordination checks on main (#2517)
  perf(search): name searched people from the profile search response (#2353)
  Use the merge queue for pull requests that require it (#2452)
  fix(browser): load scheme-less address input over https, falling back to http (#2467)
  fix(identity): stop one-click key unlinks and show the linked backed-up key (#2486)
  fix(test): observe coordination transition events (#2297)
  fix(profiles): keep the next view's profile reads through a shrink (#2395)
  fix(channels): show Add and Send message errors above the Manage members list (#2421)
  fix(threads): keep reply hooks off agent activity bubbles (#2422)
  fix(channels): offer only Copy link in a not-joined preview's sidebar actions (#2425)
  test: scope row menu placement checks to active section rows (#2493)
  feat(relay): detach channel windows to a point in history (#2042)
  feat(identity): decide a missing backup choice from community membership (#2378)
  Offer Builderlab decisions in FI builds (#2227)
  feat(inbox): preview recent Inbox activity when hovering the sidebar row (#2347)
  Add collapsible Solo and Team sidebar sections (#2296)
  fix(codex): open long Codex transcripts a page of items at a time (#2259)
  Keep Solo model and effort choices per chat (#2342)
  feat(sidebar): smooth channel reordering with bounded motion (#2108)
  Connect legacy agents from DMs and channel mentions (#2423)
  ...

Signed-off-by: Michael Neale <michael.neale@gmail.com>
damienrj added a commit to damienrj/buzz-app that referenced this pull request Nov 4, 2026
@damienrj
Merge remote-tracking branch 'origin/main' into claude/private-github…
f3be240 
…-clone-auth-ab8b97

* origin/main:
  feat(workflows): suggest channel members for @ in Send Message text (block#2309)
  AIDA-2344: Exclude muted channels from Dock (block#2313)
  feat(search): add slack-style message search operators on desktop (block#2463)
  test: fix invitation and coordination checks on main (block#2517)
  perf(search): name searched people from the profile search response (block#2353)
  Use the merge queue for pull requests that require it (block#2452)

Signed-off-by: damienrj <damien@squareup.com>
johnmatthewtennant added a commit that referenced this pull request Nov 5, 2026
@johnmatthewtennant
Merge main into jtennant/damon/github-settings-name
7cbf275 
* origin/main:
  fix(messages): keep the hover toolbar while its menu is open (#2439)
  feat(workflows): suggest channel members for @ in Send Message text (#2309)
  AIDA-2344: Exclude muted channels from Dock (#2313)
  feat(search): add slack-style message search operators on desktop (#2463)
  test: fix invitation and coordination checks on main (#2517)
  perf(search): name searched people from the profile search response (#2353)
  Use the merge queue for pull requests that require it (#2452)
cheng-block added a commit to cheng-block/buzz-app that referenced this pull request Nov 5, 2026
@cheng-block
Merge remote-tracking branch 'upstream/main' into cheng/fix-link-cjk-…
34d411f 
…punctuation

* upstream/main: (78 commits)
  fix(plugins): read Square HTTPS sources with the Block SSH agent (block#2465)
  feat(plugins): let agents request plugin changes for owner review (block#2280)
  fix(messages): keep the hover toolbar while its menu is open (block#2439)
  feat(workflows): suggest channel members for @ in Send Message text (block#2309)
  AIDA-2344: Exclude muted channels from Dock (block#2313)
  feat(search): add slack-style message search operators on desktop (block#2463)
  test: fix invitation and coordination checks on main (block#2517)
  perf(search): name searched people from the profile search response (block#2353)
  Use the merge queue for pull requests that require it (block#2452)
  fix(browser): load scheme-less address input over https, falling back to http (block#2467)
  fix(identity): stop one-click key unlinks and show the linked backed-up key (block#2486)
  fix(test): observe coordination transition events (block#2297)
  fix(profiles): keep the next view's profile reads through a shrink (block#2395)
  fix(channels): show Add and Send message errors above the Manage members list (block#2421)
  fix(threads): keep reply hooks off agent activity bubbles (block#2422)
  fix(channels): offer only Copy link in a not-joined preview's sidebar actions (block#2425)
  test: scope row menu placement checks to active section rows (block#2493)
  feat(relay): detach channel windows to a point in history (block#2042)
  feat(identity): decide a missing backup choice from community membership (block#2378)
  Offer Builderlab decisions in FI builds (block#2227)
  ...

Signed-off-by: Cheng Peng <cheng@block.xyz>

# Conflicts:
#	docs/buzz-help.md
gilgtm added a commit that referenced this pull request Nov 5, 2026
@gilgtm
Merge remote-tracking branch 'origin/main' into gil/inbox-retry-cance…
d97fcea 
…lled-read

* origin/main: (28 commits)
  Run native Codex through plugin execution targets (#2150)
  test: split Solo access browser scenarios (#2499)
  feat(agents): let any agent change Buzz settings through the MCP (#2248)
  Let plugins decorate host sidebar rows and add sort modes (#1853)
  NEXUS-4082: Keep the new-message boundary stable during a visit (#2083)
  feat(agents): move version history into settings (#2374)
  fix(agents): read goose Activity by saved session ids and render memory bodies on open (#2466)
  feat(channels): starter channels: admin switch and relay auto_join flag (#1624)
  fix(plugins): read Square HTTPS sources with the Block SSH agent (#2465)
  feat(plugins): let agents request plugin changes for owner review (#2280)
  fix(messages): keep the hover toolbar while its menu is open (#2439)
  feat(workflows): suggest channel members for @ in Send Message text (#2309)
  AIDA-2344: Exclude muted channels from Dock (#2313)
  feat(search): add slack-style message search operators on desktop (#2463)
  test: fix invitation and coordination checks on main (#2517)
  perf(search): name searched people from the profile search response (#2353)
  Use the merge queue for pull requests that require it (#2452)
  fix(browser): load scheme-less address input over https, falling back to http (#2467)
  fix(identity): stop one-click key unlinks and show the linked backed-up key (#2486)
  fix(test): observe coordination transition events (#2297)
  ...

Signed-off-by: Gil Birman <gil@squareup.com>
Co-authored-by: Claude <noreply@anthropic.com>

# Conflicts:
#	docs/buzz-help.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kazemek21 kazemek21 kazemek21 approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@bradseiler @kazemek21