[6.x] New Asset Exists Modal Resolution Feature

[jackmcdade]

Works with uploading and moving assets. Resolves #14381.

asset-conflicts.mp4

---

Note

Medium Risk
Touches asset upload/move flows across both CP UI and backend action/controller responses; mistakes could lead to unintended overwrites, skipped moves, or stale cache/metadata behavior.

Overview
Adds a new asset conflict resolution flow for both uploading and moving assets when a filename already exists, prompting users via new CP modals to cancel, keep both (timestamp), or overwrite, with optional apply to all handling.

On the backend, MoveAsset now detects destination conflicts and either resolves per strategy (including deleting existing repository entries and clearing Glide cache on overwrite) or returns structured conflict payloads via a new AssetConflictException handled by ActionController; uploads now return a 409 JSON conflict payload from AssetsController. Frontend upload/move handling is updated to queue conflicts, retry/skip uploads accordingly, support multi-selection drag moves, and bust image caches after overwrite/timestamp resolutions; Asset::move also now clears the old meta cache key to avoid stale metadata after moves.

^{Reviewed by Cursor Bugbot for commit 73ae1c9. Bugbot is set up for automated code reviews on this repo. Configure here.}

[cursor]

Cursor Bugbot has reviewed your changes and found 1 potential issue.

There are 2 total unresolved issues (including 1 from previous review).

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 29b4b4c. Configure here.}