fix(web): stack merge dialog closes as soon as you confirm

[flamboh]

Note

🤖 Claude Opus 5.5 on behalf of Oliver

Problem

Confirming Merge stack or Rebase stack held the dialog open until the server finished, with Cancel, the close button, and outside clicks all disabled. A stack merge waits on GitHub's merge-async status, which the server polls for up to five minutes, so you could sit on "Working…" for a long time. Single pull request merges already close their dialog first and report through toasts.

Fix

PullRequestStackMenu now closes the dialog on confirm and shows a loading toast ("Merging stack..." / "Rebasing stack...") that updates in place to the success or error result. Failures read "Could not merge the stack" / "Could not rebase the stack" with the server's message underneath.

The pending flag still disables the menu's stack actions while the request is in flight, so closing early cannot send the same merge twice.

Before

The dialog sits on "Working…" until GitHub finishes merging the stack.

https://gh-file-drop-api-prod-galwoqjslzlnws6s.oliver-boorstein.workers.dev/f/68cb836ee14ccead/stack-merge-before.mp4

After

The dialog closes on confirm; a loading toast turns into the result.

https://gh-file-drop-api-prod-galwoqjslzlnws6s.oliver-boorstein.workers.dev/f/f63c18590a9851fe/stack-merge-after.mp4

Validation

• Merged two-layer GitHub stacks on a sandbox repository through a worktree dev server, recorded above
• vp lint on the changed file
• tsc --noEmit -p apps/web

Mobile has no stack merge, so no change there.

Made with Claude Opus 5.5 in Claude Code (T3 Code).

[macroscopeapp]

Approvability

Verdict: Approved at 2521fcc

Macroscope's review found this PR approvable — This is a localized fix to the existing stack merge/rebase dialog flow: confirmation now dismisses the dialog immediately while a loading toast reports the unchanged backend operation and final result. No defaults, schemas, deployment behavior, or static-analysis suppressions are changed.

^{You can add or adjust custom eligibility rules. Learn more.}

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

• Configuration used: Path: .coderabbit.config.ts
• Review profile: CHILL
• Plan: Advanced
• Run ID: 1284cee9-e63f-472a-8a80-2d488798d6a5

📥 Commits

Reviewing files that changed from the base of the PR and between 30cc788 and 2521fcc.

📒 Files selected for processing (1)

• apps/web/src/components/pullRequest/PullRequestStackMenu.tsx

Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 9 remain after this review.

---

📝 Walkthrough

Walkthrough

Stack actions now show a loading toast that updates with the command result. The confirmation dialog can close while an action is pending, and its Cancel and submit buttons remain enabled.

Changes

Stack action feedback

Layer / File(s)	Summary
Action feedback and dialog behavior apps/web/src/components/pullRequest/PullRequestStackMenu.tsx	The handler clears confirmation and shows a loading toast when a stack action starts. It updates the toast with an action-specific success or failure result. The confirmation dialog can close while pending, and its buttons remain enabled. The submit label stays “Merge stack” or “Rebase stack”.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~8 minutes

Change: Bug fix

Suggested reviewers: juliusmarminge

Merge Risk: ⚪ Minimal · up to 2521f

The stack confirmation closes promptly, and an updating toast reports the command result. No actionable merge risk is established by the reviewed changes.

Security Architecture Review

Security architecture risk: 🔵 Low · up to 2521f

The change preserves existing permission and revision checks while letting users leave the confirmation dialog immediately. No security issue was established, but repeated requests after navigation and interruption recovery have not been fully validated against a live stack.

Retained concerns
No architecture-level concerns identified.

Security review details

Security Blast Radius

• inferred — The changed flow retains the existing environment and repository selection. Its sensitive outcomes remain stack merges or remote branch-history updates under existing account permissions; the inspected comparison establishes no additional repository scope or credential authority.

Trust Boundaries and Controls

• observed — Client-supplied action and revision fields still pass through server capability and viewer-permission checks before provider dispatch. GitHub stack handling rejects mismatched stack identity or expected heads and supplies the target SHA when requesting an asynchronous merge.

Resilience and Maintainability Implications

• inferred — Mounted-component guards and registry-scoped, per-environment serialization contain ordinary repeat submissions. Remount resets component-local pending in both base and head, so serialization must not be interpreted as durable per-stack deduplication. Provider revision checks constrain stale repeats, but duplicate handling while a GitHub merge remains accepted or queued is unverified.

🚥 Pre-merge checks | ✅ 4

✅ Passed checks (4 passed)

Check name	Status	Explanation
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Title check	✅ Passed	The title clearly and concisely describes the main change: closing the stack merge dialog immediately after confirmation.
Description check	✅ Passed	The description explains the problem, fix, validation steps, and UI evidence. It does not include the required Scope and approval section, but the remaining content is sufficiently complete and direct…

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create a new PR

• Autopilot · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

---

_{Comment @coderabbitai help to get the list of available commands.}