Transfer complete toast: honest wording when files were skipped

- "Copy complete: 0 files" was misleading whenever the user picked "Skip" upfront and the system honored it. The toast now reports copied vs skipped separately and, for the mixed case, summarizes outcome at the target.
- `WriteCompleteEvent` gains `files_skipped: usize`. Driver-based paths (copy local, volume copy, volume move) read it straight from `TransferLoopOutcome`. Local move (same-FS + cross-FS staging) gets a manual counter threaded through `merge_move_directory` and the conflict-resolution sites. Delete/trash emit 0 (no skip concept there).
- New pure helper `composeTransferCompleteToast` in `transfer/transfer-complete-toast.ts` picks the right wording by op type and copied/skipped split. Move uses "already at target" phrasing instead of copy's "now at target" because the source file stays put when a move is skipped. Single-file cases use singular wording.
- 15 unit tests pin the matrix (copy/move/trash/delete × all-copied / all-skipped / mixed / single).
- Toast `timeoutMs` bumped from 4s to 7s so the longer mixed/all-skipped sentences are readable.
- Reported by a user test.

Author: vdavid

apps/desktop/src-tauri/src/file_system/write_operations/copy.rs

@@ -395,6 +395,7 @@ pub(super) fn copy_files_with_progress_inner(
                 operation_id: operation_id.to_string(),
                 operation_type: WriteOperationType::Copy,
                 files_processed: files_done,
+                files_skipped: outcome.files_skipped,
                 bytes_processed: bytes_done,
             });
             Ok(())

apps/desktop/src-tauri/src/file_system/write_operations/delete.rs

@@ -157,6 +157,7 @@ pub(super) fn delete_files_with_progress_inner(
         operation_id: operation_id.to_string(),
         operation_type: WriteOperationType::Delete,
         files_processed: files_done,
+        files_skipped: 0,
         bytes_processed: bytes_done,
     });
 
@@ -774,6 +775,7 @@ pub(super) async fn delete_volume_files_with_progress_inner(
         operation_id: operation_id.to_string(),
         operation_type: WriteOperationType::Delete,
         files_processed: files_done,
+        files_skipped: 0,
         bytes_processed: bytes_done,
     });
 

apps/desktop/src-tauri/src/file_system/write_operations/move_op.rs

@@ -113,6 +113,7 @@ fn move_with_rename(
     config: &WriteOperationConfig,
 ) -> Result<(), WriteOperationError> {
     let mut files_done = 0;
+    let mut files_skipped = 0usize;
     let mut apply_to_all_resolution: Option<ConflictResolution> = None;
     let mut move_tx = MoveTransaction::new();
 
@@ -143,6 +144,7 @@ fn move_with_rename(
                     state,
                     &mut apply_to_all_resolution,
                     &mut move_tx,
+                    &mut files_skipped,
                 )?;
             } else if dest_path.exists() {
                 // File-to-file (or type mismatch) conflict
@@ -161,6 +163,7 @@ fn move_with_rename(
                     }
                     None => {
                         // Skip this file
+                        files_skipped += 1;
                         continue;
                     }
                 }
@@ -211,6 +214,7 @@ fn move_with_rename(
         operation_id: operation_id.to_string(),
         operation_type: WriteOperationType::Move,
         files_processed: files_done,
+        files_skipped,
         bytes_processed: 0, // Rename doesn't track bytes
     });
 
@@ -235,6 +239,7 @@ fn merge_move_directory(
     state: &Arc<WriteOperationState>,
     apply_to_all_resolution: &mut Option<ConflictResolution>,
     move_tx: &mut MoveTransaction,
+    files_skipped: &mut usize,
 ) -> Result<(), WriteOperationError> {
     let entries = fs::read_dir(source_dir).with_path(source_dir)?;
 
@@ -265,6 +270,7 @@ fn merge_move_directory(
                 state,
                 apply_to_all_resolution,
                 move_tx,
+                files_skipped,
             )?;
         } else if dest_child.exists() {
             // File conflict (or type mismatch)
@@ -283,6 +289,7 @@ fn merge_move_directory(
                 }
                 None => {
                     // Skip: source file stays in place
+                    *files_skipped += 1;
                     continue;
                 }
             }
@@ -336,6 +343,7 @@ fn move_with_staging(
     let mut transaction = CopyTransaction::new();
     let mut files_done = 0;
     let mut bytes_done = 0u64;
+    let mut files_skipped = 0usize;
     let mut last_progress_time = Instant::now();
     let mut apply_to_all_resolution: Option<ConflictResolution> = None;
     let mut created_dirs: HashSet<PathBuf> = HashSet::new();
@@ -445,6 +453,7 @@ fn move_with_staging(
                     state,
                     &mut apply_to_all_resolution,
                     &mut staging_move_tx,
+                    &mut files_skipped,
                 )?;
             } else if final_path.exists() {
                 // File conflict (or type mismatch)
@@ -470,6 +479,7 @@ fn move_with_staging(
                         } else {
                             let _ = fs::remove_file(&staged_path);
                         }
+                        files_skipped += 1;
                         continue;
                     }
                 }
@@ -509,6 +519,7 @@ fn move_with_staging(
         operation_id: operation_id.to_string(),
         operation_type: WriteOperationType::Move,
         files_processed: files_done,
+        files_skipped,
         bytes_processed: bytes_done,
     });
 

apps/desktop/src-tauri/src/file_system/write_operations/trash.rs

@@ -230,6 +230,7 @@ pub(super) fn trash_files_with_progress(
             operation_id: operation_id.to_string(),
             operation_type: WriteOperationType::Trash,
             files_processed: items_done,
+            files_skipped: 0,
             bytes_processed: bytes_done,
         },
     );

apps/desktop/src-tauri/src/file_system/write_operations/types.rs

@@ -181,12 +181,20 @@ impl WriteProgressEvent {
 }
 
 /// Completion event payload.
+///
+/// `files_processed` counts every source the operation considered (transferred + skipped),
+/// matching the driver's `files_done`. `files_skipped` is the subset that was skipped via
+/// conflict resolution (bulk pre-known-conflict skip, per-iter Skip from the resolver, or
+/// closure-side Skip such as same-inode self-copy). For delete/trash, skipping isn't a
+/// concept and the field is always 0. The FE uses both to compose user-facing summaries
+/// like "Copy complete: 3 copied, 2 skipped" instead of the misleading "0 files".
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct WriteCompleteEvent {
     pub operation_id: String,
     pub operation_type: WriteOperationType,
     pub files_processed: usize,
+    pub files_skipped: usize,
     pub bytes_processed: u64,
 }
 

apps/desktop/src-tauri/src/file_system/write_operations/volume_copy.rs

@@ -1157,6 +1157,7 @@ pub(crate) async fn copy_volumes_with_progress(
             operation_id: operation_id.to_string(),
             operation_type: WriteOperationType::Copy,
             files_processed: files_done,
+            files_skipped,
             bytes_processed: bytes_done,
         });
 

apps/desktop/src-tauri/src/file_system/write_operations/volume_move.rs

@@ -483,6 +483,7 @@ pub(super) async fn move_volumes_with_progress(
     let copy_failure_ctx: Option<(VolumeError, PathBuf)> = failure_ctx_cell.lock().unwrap().take();
     let files_done = outcome.files_done;
     let bytes_done = outcome.bytes_done;
+    let files_skipped = outcome.files_skipped;
 
     match outcome.intent {
         PostLoopIntent::Completed => {
@@ -496,6 +497,7 @@ pub(super) async fn move_volumes_with_progress(
                 operation_id: operation_id.to_string(),
                 operation_type: WriteOperationType::Move,
                 files_processed: files_done,
+                files_skipped,
                 bytes_processed: bytes_done,
             });
             Ok(())
@@ -866,6 +868,7 @@ pub(super) async fn move_within_same_volume_with_progress(
 
     let files_moved = outcome.files_done;
     let bytes_moved = outcome.bytes_done;
+    let files_skipped = outcome.files_skipped;
 
     match outcome.intent {
         PostLoopIntent::Completed => {
@@ -879,6 +882,7 @@ pub(super) async fn move_within_same_volume_with_progress(
                 operation_id: operation_id.to_string(),
                 operation_type: WriteOperationType::Move,
                 files_processed: files_moved,
+                files_skipped,
                 bytes_processed: bytes_moved,
             });
             Ok(())

apps/desktop/src/lib/file-explorer/pane/DialogManager.svelte

@@ -70,7 +70,7 @@
             preKnownConflicts: string[],
         ) => void
         onTransferCancel: () => void
-        onTransferComplete: (filesProcessed: number, bytesProcessed: number) => void
+        onTransferComplete: (filesProcessed: number, filesSkipped: number, bytesProcessed: number) => void
         onTransferCancelled: (filesProcessed: number) => void
         onTransferError: (error: WriteOperationError, friendly?: FriendlyError) => void
         onTransferErrorClose: () => void

apps/desktop/src/lib/file-explorer/pane/DualPaneExplorer.svelte

@@ -2572,8 +2572,8 @@
     onTransferCancel={() => {
         dialogs.handleTransferCancel()
     }}
-    onTransferComplete={(files: number, bytes: number) => {
-        dialogs.handleTransferComplete(files, bytes)
+    onTransferComplete={(files: number, skipped: number, bytes: number) => {
+        dialogs.handleTransferComplete(files, skipped, bytes)
     }}
     onTransferCancelled={(files: number) => {
         dialogs.handleTransferCancelled(files)

apps/desktop/src/lib/file-explorer/pane/dialog-state.svelte.ts

@@ -1,7 +1,7 @@
 import { formatBytes, refreshListing } from '$lib/tauri-commands'
 import { listen, findFileIndex } from '$lib/tauri-commands'
-import { formatNumber } from '$lib/file-explorer/selection/selection-info-utils'
 import { addToast } from '$lib/ui/toast'
+import { composeTransferCompleteToast } from '$lib/file-operations/transfer/transfer-complete-toast'
 import { getAppLogger } from '$lib/logging/logger'
 import { moveCursorToNewFolder } from '$lib/file-operations/mkdir/new-folder-operations'
 import type { TransferDialogPropsData } from './transfer-operations'
@@ -344,16 +344,17 @@ export function createDialogState(deps: DialogStateDeps) {
       deps.onRefocus()
     },
 
-    handleTransferComplete(filesProcessed: number, bytesProcessed: number) {
+    handleTransferComplete(filesProcessed: number, filesSkipped: number, bytesProcessed: number) {
       const op = transferProgressProps?.operationType ?? 'copy'
       const opLabel = op === 'copy' ? 'Copy' : op === 'move' ? 'Move' : op === 'trash' ? 'Trash' : 'Delete'
-      log.info(`${opLabel} complete: ${String(filesProcessed)} files (${formatBytes(bytesProcessed)})`)
-      const itemWord = filesProcessed === 1 ? 'file' : 'files'
-      const toastMessage =
-        op === 'trash'
-          ? `Moved ${formatNumber(filesProcessed)} ${itemWord} to trash`
-          : `${opLabel} complete: ${formatNumber(filesProcessed)} ${itemWord}`
-      addToast(toastMessage)
+      log.info(
+        `${opLabel} complete: ${String(filesProcessed)} files (${String(filesSkipped)} skipped, ${formatBytes(bytesProcessed)})`,
+      )
+      const toastMessage = composeTransferCompleteToast({ operationType: op, filesProcessed, filesSkipped })
+      // Bump the timeout for the long mixed/all-skipped sentences (default 4s reads as
+      // a flicker for users still parsing the second clause). 7s comfortably covers the
+      // longest variant without staying around long enough to nag.
+      addToast(toastMessage, { timeoutMs: 7000 })
 
       refreshPanesAfterTransfer()
       getSourcePaneRef()?.clearOperationSnapshot()