Skip to content

Dismiss file-drop hints when the drag interaction ends - #14384

Merged
austinywang merged 6 commits into
mainfrom
12925-split-hint-stuck
Sep 25, 2026
Merged

austinywang merged 6 commits into
mainfrom
12925-split-hint-stuck

Conversation

@austinywang

@austinywang austinywang commented Sep 25, 2026 •

Copy link
Copy Markdown
Contributor

The “Hold Shift to open as split” hint could outlive a file drag when its destination window lost focus or AppKit omitted the usual exit/conclude callbacks. The hint now belongs to the native drag sequence and dismisses on drag end, drop preparation, mouse release, keyboard input, window resignation/closure/detachment, another window becoming key, or app deactivation. Later updates from that same sequence cannot revive it.

Fixes #12925.

The presenter owns only feedback. Focus loss during a browser drop leaves WebKit's prepare/perform/conclude delivery intact. Mouse-up and Escape pass through unchanged so AppKit can finish/cancel the source drag and remove its filename image.

Trade-offs: the hint dismisses immediately rather than fading, and a single eight-second display deadline also hides it during a long, otherwise valid drag. The existing deadline timer is used for this intended UI lifetime; there are no sleeps or polling in app code. The generic badge, file-drop preferences, and keyboard shortcut settings are unchanged. FileDropPaneTarget moved into its own file to keep the existing large file within its budget; neither budget TSV changed.

Validation:

  • Regression commit c58c70840a1db0bbddfc0c267b6b541a77a67fb8: gh workflow run test-e2e.yml --repo manaflow-ai/cmux -f ref=12925-split-hint-stuck -f test_filter=cmuxTests/FileDropOverlayViewLifecycleTests -f record_video=false -f runner=blacksmith-6vcpu-macos-15. Run 36094176207 executed four tests and failed. The three window/application lifecycle assertions demonstrate the missing teardown; the fourth asserted synchronously before the old exit animation finished.
  • python3 scripts/verify-local.py --swift-changed origin/main: Swift syntax, project normalization, test wiring and feature-flag policy passed. ./scripts/lint-pbxproj-test-wiring.sh and python3 scripts/swift_file_length_budget.py passed.
  • ./scripts/localize-changes --base origin/main: no changed UI strings; all nine required catalog locales passed.
  • Final focused test execution and exact-head controller build are pending.

Live verification is incomplete. A tagged baseline build succeeded (job a65f7659609271497a20f2ae, SHA 1eee9111527de24fd06965cae8e482354ebe7017), but the cross-application drag attempt left a visible drop.txt image on the shared desktop. That observation does not establish the reporter's exact browser trigger or prove the source-image problem is repaired. Escape was sent to Finder; no stable-app restart or destructive cleanup was performed. The final native drag-image cancellation still needs verification. Cloud Mac preflight is blocked by its retired macfleet dependency; local full-display recording lacks Screen Recording permission. Baseline HQ publication also failed local certificate verification; controller artifact download succeeded with SHA-256 verification, and feedback 403dc8664c345d15eec622c2 records the publication failure.

— JuniperEmber (registration pending)
run: run_issue_12925_split_hint_20260925
session: cmux144-12925-20260925


View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.


Summary by cubic

Fixes the "Hold Shift to open as split" hint sticking around after a file drag ends, when the destination window lost focus or AppKit skipped its usual exit/conclude callbacks. The hint is now tied to the native drag sequence and dismisses on drag end, drop preparation, mouse release, keyboard input, window resignation/closure/detachment, another window becoming key, or app deactivation. Later updates from the same sequence cannot revive it.

Fixes #12925.

Behavior

  • Hint dismissal doesn't cancel WebKit's drop delivery; mouse-up and Escape pass through unchanged so AppKit can finish/cancel the source drag and remove its drag image.
  • The hint dismisses immediately instead of fading and is hidden by an eight-second display deadline even if the drag continues.
  • FileDropPaneTarget moved into its own file to keep the existing large file within its budget.

Written for commit 55e4147. Summary will update on new commits.

Review in cubic

@coderabbitai

coderabbitai Bot commented Sep 25, 2026 •

Copy link
Copy Markdown

Warning

Review limit reached

Next included review available in 10 seconds.

Check out review usage here.

View limit details

Limit details: You’ve used all 10 included reviews currently available.

You've used all free OSS reviews for now. Wait for the free limit to reset to keep reviewing this public repository.

Learn how review limits work.

Review configuration:

⚙️ Run configuration

Configuration used: Repository: manaflow-ai/cmux/.coderabbit.yaml

Review profile: ASSERTIVE

Plan: Advanced

Run ID: 24536a24-32e3-4446-8478-5a9c3199fc26

📥 Commits

Reviewing files that changed from the base of the PR and between 85a3655 and 55e4147.

📒 Files selected for processing (7)
  • Sources/FileDropHintPresentation.swift
  • Sources/FileDropOverlayView.swift
  • Sources/FileDropOverlayViewHitTesting.swift
  • Sources/FileDropPaneTarget.swift
  • cmux.xcodeproj/project.pbxproj
  • cmuxTests/FileDropOverlayDragCompletionTests.swift
  • cmuxTests/FileDropOverlayViewLifecycleTests.swift

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

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

@github-actions

Copy link
Copy Markdown
Contributor

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

@austinywang
austinywang merged commit 4ff4cde into main Sep 25, 2026
17 checks passed
@austinywang
austinywang deleted the 12925-split-hint-stuck branch September 25, 2026 05:20
rustybret pushed a commit to rustybret/bmux that referenced this pull request Sep 25, 2026
5a81d71 Merge pull request manaflow-ai#14122 from manaflow-ai/issue-14037-window-display-hang
1a5be43 Merge pull request manaflow-ai#13020 from manaflow-ai/13016-sidebar-new-local-workspace
9e61fc2 ci: rebalance app-host shards from measured timings on all seven workers (manaflow-ai#14393)
8848a92 Merge pull request manaflow-ai#14044 from manaflow-ai/13648-ssh-switch-latency
caae250 Merge pull request manaflow-ai#13055 from manaflow-ai/13049-computer-use-onboarding
55dcb23 ci: let a warm owned Mac adopt a near seed instead of its kept build (manaflow-ai#14385)
e4e3d88 fix: harden warm reveal and CI array guards
ac5bdd9 Merge branch 'main' of https://github.com/manaflow-ai/cmux into 13049-computer-use-onboarding
d3865b3 Merge pull request manaflow-ai#14371 from manaflow-ai/14294-helper-staging-leak
bd018b1 ci: run unsigned iOS jobs on owned minis with counted simulator capacity (manaflow-ai#14389)
7ca7818 fix: avoid inheriting SSH cloud directories locally
f7c94b1 ci: run the dedicated step when a PR edits an env-gated test (manaflow-ai#14381)
566c83f ci: follow changed string literals in the reverse test impact report (manaflow-ai#14387)
87bf6ae fix(ci): skip installing the test module when emission is disabled
28147df Merge pull request manaflow-ai#14382 from manaflow-ai/14273-accessibility-children-cycle
4ff4cde Merge pull request manaflow-ai#14384 from manaflow-ai/12925-split-hint-stuck
bf65819 test: assert mounted sidebar and project AX reachability
55e4147 project: group drag tests beside their existing suite
2867b94 test: release MainActor while awaiting hint dismissal
5847394 fix(ci): handle empty app-host output batches
2c52835 Merge branch 'main' of https://github.com/manaflow-ai/cmux into 13648-ssh-switch-latency
e8dd4e0 test: update sidebar regression for scoped Cloud creation
63608eb Merge branch 'main' of https://github.com/manaflow-ai/cmux into 13016-sidebar-new-local-workspace
38ca93f Merge remote-tracking branch 'origin/main' into 14294-helper-staging-leak
209a484 Merge remote-tracking branch 'origin/main' into 14273-accessibility-children-cycle
9193381 fix: compare helper inventory independently of URL normalization
1c2fda2 fix: make sidebar AX queries preserve readable text without setters
373ed39 test: cover upgrades from legacy read-only helper generations
c7a8d40 fix: normalize managed helper directory modes before atomic publication
69827d4 Merge branch 'main' of https://github.com/manaflow-ai/cmux into 12925-split-hint-stuck
088d07e test: preserve sidebar text and forbid AX getter writes
245daa1 refactor: preserve helper installation errors for diagnostics
ce1d8bc test: isolate helper copy failure fixtures within tasks
b7cf47b Merge remote-tracking branch 'origin/main' into 12925-split-hint-stuck
53f6251 fix: scope split hints to the native drag lifetime
c2db719 fix: make helper replacement atomic and bound retries
2724342 Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
8280bd3 fix: handle optional restore bindings in workspace liveness
1f98d5e fix: prepare helper directory parent
fbad4c1 Merge remote-tracking branch 'origin/main' into 14273-accessibility-children-cycle
c59df55 fix: keep sidebar accessibility children acyclic
646d361 Merge remote-tracking branch 'origin/main' into 14294-helper-staging-leak
b9ab24f test: reproduce sidebar accessibility children cycle
7464b12 Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
b690bb1 test: keep canonical build guard stable across CI recipe changes
c58c708 test: cover file-drop hint lifecycle teardown
266fbc7 Merge remote-tracking branch 'origin/main' into 13016-sidebar-new-local-workspace
81f274f fix: make helper cleanup event driven
cd4a936 fix: reject malformed helper staging names
bdd08d0 Merge branch 'main' of https://github.com/manaflow-ai/cmux into 13648-ssh-switch-latency
0c23d10 Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
cfe4407 Merge remote-tracking branch 'origin/main' into 14294-helper-staging-leak
b1f4f89 fix: bound Computer Use helper staging
cdc90c7 test: reproduce helper staging leak
fdbcb3c Merge origin/main into 13049-computer-use-onboarding
c80b7be fix: avoid AppKit frame constrain reentry
21983c5 fix: guard display frame reconciliation against reentry
343b4fb chore: keep renderer changes within file budgets
d8e7469 fix: use warm reveal refresh policy in production path
a1baca1 chore: keep renderer extension within file budget
772d634 fix: retain warm frame state across terminal hides
b92dfdd fix: avoid redundant terminal refresh on warm workspace reveal
ff4795d Merge remote-tracking branch 'origin/main' into 13016-sidebar-new-local-workspace
f8c4493 fix: allow CUA from tagged dev Codex sessions
38e7acf fix: resolve post-merge restore build errors
5fd391f Merge origin/main into 13049-computer-use-onboarding
c9f363f fix: preserve nonblocking scoped feed telemetry
63378ac test: keep first-use Computer Use telemetry nonblocking and scoped
ed9c946 Merge branch 'main' of https://github.com/manaflow-ai/cmux into 13049-computer-use-onboarding
16bfc27 fix: consume relay origin before serializing the ordering environment
3321b39 test: validate relay barriers with the host admission parser
dcf085a fix: retain filtering for remote hook transports
3d60cd8 fix: keep relayed hook ordering out of local process routing
88cca73 test: retain relay origin in feed ordering barriers
126b2db Merge branch 'main' of https://github.com/manaflow-ai/cmux into 13049-computer-use-onboarding
75dde56 Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
cbf9edb fix: preserve relay origin through feed target resolution
24a7c8c test: cover relay-origin feed admission and first-use attachment
e167935 Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
23b1dfc docs: brand the provider as cmux Computer Use
12fd7b0 Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
c4f611a fix: restore Swift parameter separators
203bec4 fix: validate both helper profiles before readiness
a31f9a6 fix: refresh revocation before first-use admission
9e9df10 fix: keep first-use credentials and revocation state current
d5e9bf4 fix: preserve readiness and relay feed admission
d3e906b fix: restore scoped completion before daemon readiness
e17514c test: use the direct capture outcome API
ec9b6e8 fix: report stale capture verification as unavailable
1260836 fix: keep relay routing and Swift 6 compatibility fail closed
267168e Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
edf1834 fix: expose shared feed target resolver to CLI extensions
b4f816d fix: bind onboarding work to view task lifecycle
55ffd3e fix: close Computer Use onboarding admission races
03772a9 test: expose Computer Use onboarding review regressions
5ddf044 Merge remote-tracking branch 'origin/main' into 13049-computer-use-onboarding
a61e770 fix: restore Computer Use test API visibility
5b8d894 fix: expose setup status for Settings snapshot
811990b fix: restore onboarding completion key compatibility
797bbac fix: wire Computer Use Settings host actions
78128dd fix: expose onboarding completion status to UI
b40ea20 fix: expose package transport to capture verification
b1d2670 fix: expose helper startup to capture admission
f8ea3c8 fix: expose runtime seams to package onboarding adapters
138d703 fix: import package transport types for capture verification
72966a2 fix: resolve feed targets through live delivery
e7231ca test: restore Computer Use onboarding target wiring
f0c6c1e fix: adapt Computer Use onboarding to current main architecture
66de110 Merge origin/main into 13049-computer-use-onboarding
bb1d403 fix: close remaining onboarding review findings
d8cff69 docs: document Computer Use core contracts
f9d1a3c docs: describe automatic Computer Use setup
a12ef64 fix: close Computer Use onboarding review gaps
6cb9cf2 Merge origin/main into 13049-computer-use-onboarding
1021c83 fix: notify Computer Use directly at feed ingress
ba61825 fix: present onboarding before helper provisioning
7c0443f fix: accept live owned surface for first-use onboarding
7db2f4b fix: recognize all owned terminal surfaces for first-use setup
73e3144 fix: opt into Computer Use setup from first explicit request
dce767a test: reproduce lost Computer Use hook surface in built CLI
4b40d82 fix: present setup before live session indexing
a8d61c5 fix: make cmux-cua the only Codex computer provider
c0773d9 fix: await live session indexing before first-use setup
82efcbf fix: open Computer Use setup on the first functional tool request
53256c9 test: require setup presentation on the first Computer Use tool
b6625cd fix: recheck grants through the shared daemon control protocol
ac17c49 fix: invalidate stale capture proof and roll back partial admission
1c21a39 fix: keep Computer Use setup status live through completion
1146f41 fix: make Computer Use setup completion runtime-owned and recoverable
3c44d5c test: reject stale Computer Use onboarding completion after disable
b144586 fix: make sidebar New Workspace explicitly local
3e77548 test: cover local workspace creation from sidebar plus menu

# Conflicts:
#	.github/workflows/ci-macos.yml
#	.github/workflows/ci-owned-pool-rescue.yml
#	.github/workflows/ci.yml
#	.github/workflows/ios-screenshots.yml
#	.github/workflows/ios-streamed-validate.yml
#	.github/workflows/iroh-release-gate.yml
#	.github/workflows/test-ios.yml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0.64.25 "Hold shift to open as split" hint popup stuck mid-screen after opening browser window

1 participant