Fix sidebar workspace reorder by drag (regressed in #18837)

[austinywang]

Dragging a workspace in the vertical sidebar no longer reordered it. Caused by #18837 (48ba209, "Drop a sidebar workspace onto a pane to merge its tabs").

Cause

#18837 added the Bonsplit tab drag type to every sidebar row drag, so pane drop targets could treat the row as a merge. AppKit sends a drag to the frontmost view that is registered for one of its types and contains the pointer. It does not consult hitTest (see CloudSurfaceDropGateView.swift). In SidebarWorkspaceTableContainerView, bonsplitDropView is a full-size view stacked above reorderDropView and registered for that Bonsplit type. After #18837 it received every row drag. BonsplitTabDragPayload.transfer returns nil for a sidebar reorder pasteboard (also #18837), so the overlay rejected the drag, and the reorder view beneath never saw it.

The other suspects don't touch this path. #18303 and #18693 change the Cloud tree outline, and #19593 is a Bonsplit submodule bump for tab-bar motion.

Fix

SidebarBonsplitTabWorkspaceDropView now forwards dragging callbacks for sidebar reorder drags (pasteboard has SidebarTabDragPayload's type) to the container's reorderDropView. Bonsplit tab drags from panes keep their existing handling. Merge-onto-pane from #18837 is unchanged: pane destinations still read the row's merge capability, and inside the sidebar the reorder wins.

Tests

SidebarWorkspaceReorderDropOverlayHitTestingTests.workspaceRowDragOverBonsplitOverlayStillReorders builds the real container and checks that the Bonsplit overlay is the frontmost registered destination for a row drag carrying both types. It then drives entered, updated, prepare, perform and conclude on that overlay and expects the reorder view's update and drop callbacks to fire. The test was committed before the fix (dc42c54). On that commit the overlay returns [] because the transfer is nil. Neither red nor green was run locally (local xcodebuild tests are not allowed), so hosted CI gives the green result.

Changelog

• Fixed: Dragging a workspace in the sidebar reorders it again.

🤖 Generated with Claude Code

---

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

---

Summary by cubic

Fixes dragging a workspace in the sidebar to reorder it, which regressed in #18837.

#18837 made every sidebar row drag carry the Bonsplit pane-merge type, so AppKit routed those drags to the frontmost registered destination—the full-size Bonsplit overlay—which rejected them, and the reorder view beneath never saw them. The Bonsplit overlay now forwards sidebar reorder drags to the reorder view, while dropping a row onto a pane still merges its tabs.

^{Written for commit 9610feb. Summary will update on new commits.}

[github-actions]

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

[github-actions]

Merge receipt for 9610febfa7, merged 2026-10-12 21:34:07 UTC

• Not verified at merge: backend migrations applied (not reported), ci-status (not reported), CI fast guards (in progress), plan (in progress)
• Verified: Fast static checks, web-validation
• Skipped by policy: web-build, web-database-tests, web-tests
• Full suite: runs on main after merge.

Labeled merged-unverified: if main breaks near this merge, look here first.

[coderabbitai]

Note

Currently processing new changes in this PR. This may take a few minutes, please wait...

⚙️ Run configuration

• Configuration used: Repository: manaflow-ai/cmux/.coderabbit.yaml
• Review profile: ASSERTIVE
• Plan: Advanced
• Run ID: b92d97c1-8c98-4c18-b31e-28ba39d1f3e0

---

📥 Commits

Reviewing files that changed from the base of the PR and between f1f9774 and 9610feb.

---

📒 Files selected for processing (3)

• Sources/Sidebar/AppKitList/SidebarWorkspaceTableContainerView.swift
• Sources/Sidebar/SidebarBonsplitTabWorkspaceDropView.swift
• cmuxTests/SidebarWorkspaceReorderDropOverlayHitTestingTests.swift

---

 _________________________________________________________________________________________________________________________________________________________________
< Don't use wizard code you don't understand. Wizards can generate reams of code. Make sure you understand all of it before you incorporate it into your project. >
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------
  \
   \   \
        \ /\
        ( )
      .( o ).

✨ Finishing Touches

📝 Generate docstrings

• Commit to this branch
• Create a new PR

---

🧪 Generate unit tests (beta)

• Commit to this branch
• Create a new PR

---

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

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

---

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

[austinywang]

Correctness review (subagent), posted after merge:

• Root cause confirmed: Drop a sidebar workspace onto a pane to merge its tabs #18837 put the Bonsplit tab type on sidebar row drags. AppKit routes drags by registered type and geometry, so the full-size Bonsplit overlay above the reorder view captured and rejected them. No other change since v0.65.0 touches this path.
• Critical: forwarding draggingEnded(_:) to SidebarWorkspaceReorderDropView raises an unrecognized selector, because NSView doesn't implement draggingEnded: at runtime (verified). Fixed in Fix a crash when a sidebar workspace drag ends (from #20015) #20018.
• Everything else checks out. Entered, updated, exited, prepare, perform and conclude forward correctly. Merge-onto-pane and pane tab drags into the sidebar are unchanged. The SwiftUI sidebar paths aren't affected.