Drag&drop: Multi-type pasteboard, terminals now accept drops

- New `native_drag.rs` builds `NSPasteboardItem`s vending `public.file-url`,
  `public.utf8-plain-text` (joined paths on item 0), and `NSFilenamesPboardType`
  (legacy, for stock wry until tauri-apps/wry#1723 ships)
- Permissive op mask (Copy|Link|Generic|Move) so terminals like Warp accept
  the drop instead of rejecting it; macOS arbitrates the actual op via
  modifier keys natively
- Drops `drag` + `tauri-plugin-drag` Rust deps and `@crabnebula/tauri-plugin-drag`
  JS dep; both drag-out paths (single-file and multi-file selection) now route
  through `native_drag.rs` via `start_drag_paths` / `start_selection_drag`
- Removes the `mode` parameter from drag IPC end-to-end — modifier handling
  belongs in the OS, not at drag-start

Author: vdavid

Cargo.lock

@@ -33,7 +33,6 @@
   "dependencies": {
     "@ark-ui/svelte": "^5.21.2",
     "@chenglou/pretext": "^0.0.6",
-    "@crabnebula/tauri-plugin-drag": "^2.1.0",
     "@leeoniya/ufuzzy": "^1.0.19",
     "@logtape/logtape": "^2.0.5",
     "@tauri-apps/api": "^2.10.1",

apps/desktop/package.json

@@ -51,8 +51,6 @@ uuid = { version = "1.19.0", features = ["v4"] }
 tauri-plugin-clipboard-manager = "2"
 notify-debouncer-full = "0.7.0"
 bincode2 = "2"
-tauri-plugin-drag = "2.1.0"
-drag = "2.1.0"
 tauri-plugin-fs = "2.4.4"
 alphanumeric-sort = "1.5"
 chrono = "0.4"

apps/desktop/src-tauri/Cargo.toml

@@ -30,7 +30,6 @@
         "store:default",
         "clipboard-manager:default",
         "mcp-bridge:default",
-        "drag:default",
         "fs:allow-temp-write",
         "fs:allow-remove",
         "updater:default",

apps/desktop/src-tauri/capabilities/default.json

@@ -68,7 +68,7 @@ The frontend has matching TypeScript types in `$lib/tauri-commands/ipc-types.ts`
 - **AI commands** are registered directly from `ai::manager` and `ai::suggestions` — there is no `commands/ai.rs` file.
 - **Platform gates.** `volumes` is macOS-only; `mtp` and `network` are macOS+Linux; `volumes_linux` is Linux-only. Individual functions also use `#[cfg]` where behaviour differs (e.g., `sync_status`).
 - **`delete_files` and `rename_file` accept `volume_id`.** When set to a non-root volume, `delete_files` routes to the volume-aware delete path and skips local `validate_sources` (MTP virtual paths fail `symlink_metadata`). `rename_file` passes `volume_id` through for MTP rename support; permission checks are skipped for non-root volumes.
-- **`start_selection_drag`** requires the main thread. It uses `app.run_on_main_thread()` plus a `std::sync::mpsc` channel to return the result synchronously.
+- **`start_selection_drag` and `start_drag_paths`** require the main thread. Both delegate to a shared `run_drag_on_main_thread` helper that hops via `app.run_on_main_thread()` plus a `std::sync::mpsc` channel and returns the result synchronously. Pasteboard construction lives in `crate::native_drag` (file-URL + shell-escaped text per item).
 - **`list_shares_with_credentials`** has `#[allow(clippy::too_many_arguments)]` because Tauri command parameters must be top-level arguments — no struct bundling.
 - **`set_menu_context` and Close tab (⌘W).** When the main window loses focus, `set_menu_context("other")` disables all
   non-App menu items — but `CLOSE_TAB_ID` is explicitly excluded. On macOS, ⌘W means "close the front window," and the

apps/desktop/src-tauri/src/commands/CLAUDE.md

@@ -3,13 +3,34 @@
 #[cfg(target_os = "macos")]
 use crate::file_system::get_paths_at_indices as ops_get_paths_at_indices;
 #[cfg(target_os = "macos")]
+use crate::native_drag;
+#[cfg(target_os = "macos")]
 use std::path::PathBuf;
 #[cfg(target_os = "macos")]
 use std::sync::mpsc::channel;
 #[cfg(target_os = "macos")]
 use tauri::Manager;
 
-/// Initiates native drag from Rust directly, looking up paths from LISTING_CACHE (macOS only).
+/// Begins a native drag with the given file paths. Used for single-file drags
+/// where the frontend has the path directly (no listing-cache lookup needed).
+#[cfg(target_os = "macos")]
+#[tauri::command]
+pub fn start_drag_paths(app: tauri::AppHandle, paths: Vec<String>, icon_path: String) -> Result<(), String> {
+    let path_bufs: Vec<PathBuf> = paths.into_iter().map(PathBuf::from).collect();
+    if path_bufs.is_empty() {
+        return Err("No valid files to drag".to_string());
+    }
+    run_drag_on_main_thread(&app, path_bufs, PathBuf::from(icon_path))
+}
+
+/// Stub for non-macOS platforms. Returns an error since drag is not yet implemented.
+#[cfg(not(target_os = "macos"))]
+#[tauri::command]
+pub fn start_drag_paths(_app: tauri::AppHandle, _paths: Vec<String>, _icon_path: String) -> Result<(), String> {
+    Err("Drag operation is not yet supported on this platform".to_string())
+}
+
+/// Initiates native drag from Rust directly, looking up paths from `LISTING_CACHE` (macOS only).
 #[cfg(target_os = "macos")]
 #[tauri::command]
 pub fn start_selection_drag(
@@ -18,64 +39,15 @@ pub fn start_selection_drag(
     selected_indices: Vec<usize>,
     include_hidden: bool,
     has_parent: bool,
-    mode: String,
     icon_path: String,
 ) -> Result<(), String> {
-    // Get file paths from the cached listing
     let paths = ops_get_paths_at_indices(&listing_id, &selected_indices, include_hidden, has_parent)?;
 
     if paths.is_empty() {
         return Err("No valid files to drag".to_string());
     }
 
-    // Get the main window
-    let window = app.get_webview_window("main").ok_or("Main window not found")?;
-
-    // Determine drag mode (Send-safe)
-    let is_copy_mode = mode == "copy";
-
-    // Store icon path for use in closure (PathBuf is Send)
-    let icon_path_buf = PathBuf::from(icon_path);
-
-    // Use a channel to get the result from the main thread
-    let (tx, rx) = channel();
-
-    // Run on main thread (required by macOS for drag operations)
-    // Create DragItem inside the closure since it's not Send
-    app.run_on_main_thread(move || {
-        // Build DragItem inside the closure (not Send due to Data variant)
-        let item = drag::DragItem::Files(paths);
-
-        // Load icon from file path
-        let icon = drag::Image::File(icon_path_buf);
-
-        // Create options with the drag mode
-        let options = drag::Options {
-            skip_animatation_on_cancel_or_failure: false,
-            mode: if is_copy_mode {
-                drag::DragMode::Copy
-            } else {
-                drag::DragMode::Move
-            },
-        };
-
-        let result = drag::start_drag(
-            &window,
-            item,
-            icon,
-            |_result, _cursor_pos| {
-                // Callback when drag completes - we don't need to do anything here
-            },
-            options,
-        );
-        let _ = tx.send(result);
-    })
-    .map_err(|e| format!("Failed to run on main thread: {}", e))?;
-
-    // Wait for the result
-    rx.recv()
-        .map_err(|_| "Failed to receive drag result")?
-        .map_err(|e| format!("Drag operation failed: {}", e))
+    run_drag_on_main_thread(&app, paths, PathBuf::from(icon_path))
 }
 
 /// Stub for non-macOS platforms. Returns an error since drag is not yet implemented.
@@ -87,12 +59,28 @@ pub fn start_selection_drag(
     _selected_indices: Vec<usize>,
     _include_hidden: bool,
     _has_parent: bool,
-    _mode: String,
     _icon_path: String,
 ) -> Result<(), String> {
     Err("Drag operation is not yet supported on this platform".to_string())
 }
 
+/// Hops to the AppKit main thread, builds the drag session, and returns synchronously.
+/// `NSDraggingItem`s and the source class are not `Send`, so everything happens inside
+/// the closure; the result travels back via a one-shot channel.
+#[cfg(target_os = "macos")]
+fn run_drag_on_main_thread(app: &tauri::AppHandle, paths: Vec<PathBuf>, icon_path: PathBuf) -> Result<(), String> {
+    let window = app.get_webview_window("main").ok_or("Main window not found")?;
+    let (tx, rx) = channel();
+
+    app.run_on_main_thread(move || {
+        let result = native_drag::start_drag(&window, paths, &icon_path);
+        let _ = tx.send(result);
+    })
+    .map_err(|e| format!("Failed to run on main thread: {}", e))?;
+
+    rx.recv().map_err(|_| "Failed to receive drag result")?
+}
+
 // ============================================================================
 // Self-drag overlay (dynamic drag image swapping)
 // ============================================================================

apps/desktop/src-tauri/src/commands/file_system/drag.rs

@@ -9,11 +9,12 @@
 //! ## Timing invariant
 //!
 //! `SELF_DRAG_ACTIVE` is set via IPC from the frontend and read from AppKit swizzle
-//! callbacks on the main thread. The `@crabnebula/tauri-plugin-drag` `startDrag()`
-//! resolves **before** macOS delivers `draggingEntered:`/`draggingExited:` events.
-//! Therefore, state must **never** be cleared from JS async callbacks that run after
-//! `startDrag` resolves — they race with the swizzle. State is only cleared on drop
-//! (via the Tauri `clear_self_drag_overlay` command from the frontend drop handler).
+//! callbacks on the main thread. The `start_drag_paths` / `start_selection_drag`
+//! commands return **before** macOS delivers `draggingEntered:`/`draggingExited:`
+//! events. Therefore, state must **never** be cleared from JS async callbacks that
+//! run after the start call resolves — they race with the swizzle. State is only
+//! cleared on drop (via the Tauri `clear_self_drag_overlay` command from the
+//! frontend drop handler).
 
 use std::ffi::CString;
 use std::ptr::NonNull;

apps/desktop/src-tauri/src/drag_image_swap.rs

@@ -24,9 +24,6 @@ use env_logger as _;
 use mimalloc as _;
 //noinspection RsUnusedImport
 use notify as _;
-//noinspection RsUnusedImport
-// drag is used by tauri-plugin-drag for drag-and-drop support
-use drag as _;
 //noinspection ALL
 // smb2 crate is used in network/smb_client module (macOS + Linux)
 #[cfg(any(target_os = "macos", target_os = "linux"))]
@@ -97,6 +94,8 @@ mod mcp;
 mod menu;
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 mod mtp;
+#[cfg(target_os = "macos")]
+mod native_drag;
 mod net;
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 mod network;
@@ -199,7 +198,6 @@ pub fn run() {
         .plugin(tauri_plugin_store::Builder::new().build())
         .plugin(tauri_plugin_opener::init())
         .plugin(tauri_plugin_clipboard_manager::init())
-        .plugin(tauri_plugin_drag::init())
         .plugin(tauri_plugin_fs::init())
         .plugin(tauri_plugin_process::init())
         .plugin(tauri_plugin_dialog::init())
@@ -734,6 +732,7 @@ pub fn run() {
             commands::file_system::get_listing_stats,
             commands::file_system::refresh_listing_index_sizes,
             commands::file_system::start_selection_drag,
+            commands::file_system::start_drag_paths,
             commands::file_system::prepare_self_drag_overlay,
             commands::file_system::clear_self_drag_overlay,
             // Git browser (M1: detection, chip, status column)