[teamleaderleo]

Bug

The bookmark edit bubble ("Bookmark added" / "Edit bookmark", cmux.bookmarks.edit) closed as soon as its Folder picker opened.

The bubble is a NativePopupHost panel. The Folder picker is a ThemedPicker, a pop-up button whose menu is AppKit's own NSMenu, which runs in a window of its own. When that menu opened it took the keys from the bubble, and the panel's resignKey() called the host's onLostKeys, which treated the key loss as a dismiss. The host's click and Escape monitors had the same gap: they only knew the panel itself and the toggle control, so a menu opened from inside the popup counted as "outside".

Fix

NativePopupHost now treats a menu opened from inside its popup, and a window parented under its panel, as part of the popup:

• While the popup is shown it watches NSMenu.didBeginTrackingNotification and didEndTrackingNotification. A menu counts as the popup's own when a view in the panel owns it (a pop-up button's menu, a context menu) or when the event that opened it was in the popup. The menu bar's menus never count.
• While one of those menus is tracking, or a window parented under the panel is key, losing the keys does not dismiss the popup, a click outside does not dismiss it, and Escape closes only the menu.
• When the last such menu ends, the popup takes the keys back. An ActiveAppKeyPanel still only takes them while the app is active.

So a pick, a click elsewhere or Escape closes only the inner menu, and the bubble stays.

Unchanged:

• Opening. Menus still open on the click with no fade-in, and the close fade is untouched.
• The other NativePopupHost callers (Page Info) close themselves before opening children, so they never hit the new path.
• With no menu of its own open, a popup that loses the keys to another window or to an unrelated menu still closes, as before.

The menu observers are added in watch and removed in unwatch, together with the existing monitors, so they live only while the popup is shown.

Tests

CmuxNextDesignTests/NativePopupHostChildMenuTests builds a visible window with a bubble-shaped keyed popup that holds a ThemedPopUpButton, the control ThemedPicker makes:

• thePickersMenuTakingTheKeysLeavesTheBubbleOpen: the picker's menu begins tracking and the panel resigns key, then a pick ends the menu. The bubble stays open and onDismiss never fires. It fails before the fix.
• losingTheKeysToSomethingElseStillClosesTheBubble: an unrelated menu begins tracking and the panel resigns key. The bubble closes once. It passes before and after.

The first commit adds only the tests, so it shows the red; the second commit is the fix.

Risk: low. The change is contained in the shared native popup host, and nothing changes for popups that open no child menu.

🤖 Generated with Claude Code

Agent session: agent session

[github-actions]

cmux status _{(one comment, edited in place; each line is updated by the job that owns it)}

Review 5a432fd: HQ feed card · gallery before/after runs · checks

App of this head (app.zip, kept 1 day)

gh workflow run reload-build.yml -R manaflow-ai/cmux --ref feat-cmux-next -f tag=pr28704 -f ref=fix/popup-host-keeps-child-menus -f platform=macos -f backend_mode=local

web and size checks: green

Shipped in:

• cmux NEXT nightly 1.0.0-nightly.4130052256501 (28aa638015)

The feat-cmux-next push run https://github.com/manaflow-ai/cmux/actions/runs/41255987285 at 97d2420 failed: cmux-next fleet Release compile.
Those jobs last passed at 914d05f. This pull request is one of 5 merged since: #28752, #28728, #28723, #28704, #28691.
If the failure is in your change, fix forward on feat-cmux-next. Pull requests run only the tiers their paths reach (docs/ci/cmux-next-tiers.md); label a batch PR full-ci to run them all before merging.

[blacksmith-sh]

Found 2 test failures on Blacksmith runners:

Failures

Test	View Logs
test_a_picked_signing_label_has_a_rerun_alternative (main.RunsOnFallbackTests.test_ a_picked_signing_label_has_a_rerun_alternative)/ test_a_picked_signing_label_has_a_rerun_alternative (main.RunsOnFallbackTests.test_ a_picked_signing_label_has_a_rerun_alternative)	View Logs
test_no_runs_on_chain_ends_on_the_reserved_side_label (main.RunsOnFallbackTests.tes t_no_runs_on_chain_ends_on_the_reserved_side_label)/ test_no_runs_on_chain_ends_on_the_reserved_side_label (main.RunsOnFallbackTests.tes t_no_runs_on_chain_ends_on_the_reserved_side_label)	View Logs

^{Need help on this PR? Tag @codesmith-bot with what you need.}

[cursor]

Bugbot needs on-demand usage enabled

Bugbot uses usage-based billing for this team and requires on-demand usage to be enabled.

A team admin can enable on-demand usage in the Cursor dashboard.

[teamleaderleo]

Review (codex gpt-6-astra high, next-review): SHIP at cb464cd

SHIP at cb464cd
Visual verdict: no images; Leo tries the build

Static review found no blocking defect. AppKit tests could not run in this Linux box, which has no Swift toolchain.

1. [P2] [follow-up] Packages/macOS/CmuxNext/Tests/CmuxNextDesignTests/NativePopupHostChildMenuTests.swift:32: The fixture uses show’s default makeKey: false, and tests never assert key restoration. Removing menuEnded’s makeKey() would leave these tests passing. Add coverage starting with a key panel, transferring focus, and verifying that focus returns after the menu closes.

2. [P2] [follow-up] Packages/macOS/CmuxNext/Sources/CmuxNextDesign/Overlay/NativePopupHost.swift:238: No screenshots were supplied. Validate the native Folder picker interaction on macOS, including selection, outside click, and Escape.

Follow-ups:

• Add coverage for actual key transfer and restoration.
• Capture and visually verify the Folder picker interaction on macOS.

[cmux-bot]

cmux-bot approves cb464cd: an independent review passed this exact head (next-review receipt by teamleaderleo). A push needs a new review; a later BLOCK at this head dismisses this approval.

A newer verdict blocks edd2696 (no independent SHIP at the head).

[teamleaderleo]

Review (next-review patch-id; carried): SHIP at edd2696

The independent SHIP at cb464cd carries to this head: the PR's own change (git diff $(git merge-base feat-cmux-next HEAD) HEAD) has the same git patch-id --verbatim (58d87826928ab394) at both heads, and no merge between them was resolved by hand. Nothing new to review. A newer BLOCK, or any change to the PR's own diff, ends the carry.

[teamleaderleo]

Review (next-review patch-id; carried): SHIP at aeeea58

The independent SHIP at cb464cd carries to this head: the PR's own change (git diff $(git merge-base feat-cmux-next HEAD) HEAD) has the same git patch-id --verbatim (58d87826928ab394) at both heads, and no merge between them was resolved by hand. Nothing new to review. A newer BLOCK, or any change to the PR's own diff, ends the carry.