Bugfix: Fix Linux compilation for SMB code

- Move `SmbConnectionState`, `path_to_id`, `DEFAULT_VOLUME_ID` from macOS-only `volumes` to shared `file_system::volume` module
- Move `unicode-normalization` from macOS-only deps to cross-platform (needed for SMB path normalization on Linux too)
- Add `get_smb_mount_info` to `volumes_linux` (reads `/proc/mounts` for CIFS entries)
- Add stub `unmount_smb_shares_from_host` to `mount_linux.rs`
- Use cfg-switched imports for `get_smb_mount_info` in `commands/network.rs` and `file_system/mod.rs`
- oxfmt reformatting in `CHANGELOG.md`

Author: vdavid

CHANGELOG.md

@@ -43,8 +43,7 @@ The format is based on [keep a changelog](https://keepachangelog.com/en/1.1.0/),
 ### Fixed
 
 - Copy progress: per-file counter now increments per individual file during directory copies, not per top-level item.
-  Stale scan events from previous operations are rejected
-  ([d10d9cc](https://github.com/vdavid/cmdr/commit/d10d9cc))
+  Stale scan events from previous operations are rejected ([d10d9cc](https://github.com/vdavid/cmdr/commit/d10d9cc))
 - SMB faster deletes — skip stat round-trip, halves round-trips for bulk deletes. Rollback now includes the in-progress
   item ([0e7f072](https://github.com/vdavid/cmdr/commit/0e7f072))
 - Copy cancellation — directory tree copies now check cancellation between each file instead of looping without checking
@@ -76,13 +75,13 @@ The format is based on [keep a changelog](https://keepachangelog.com/en/1.1.0/),
 
 ### Non-app
 
-- Replace `smb`/`smb-rpc` crates with custom `smb2` crate — cleaner API, proper error types, no NDR debug-format
-  parsing hacks ([2d7904f](https://github.com/vdavid/cmdr/commit/2d7904f))
+- Replace `smb`/`smb-rpc` crates with custom `smb2` crate — cleaner API, proper error types, no NDR debug-format parsing
+  hacks ([2d7904f](https://github.com/vdavid/cmdr/commit/2d7904f))
 - CI: upgrade actions to Node.js 24 ([e5820bb](https://github.com/vdavid/cmdr/commit/e5820bb))
 - Testing: fix multiple E2E flakes — MTP cache staleness, theme race, hidden files toggle, Docker shell quoting
   ([5009971](https://github.com/vdavid/cmdr/commit/5009971), [52faf43](https://github.com/vdavid/cmdr/commit/52faf43))
-- Suppress noisy `tao` and indexing dev logs
-  ([21b041b](https://github.com/vdavid/cmdr/commit/21b041b), [9bf0e00](https://github.com/vdavid/cmdr/commit/9bf0e00))
+- Suppress noisy `tao` and indexing dev logs ([21b041b](https://github.com/vdavid/cmdr/commit/21b041b),
+  [9bf0e00](https://github.com/vdavid/cmdr/commit/9bf0e00))
 
 ## [0.10.0] - 2026-04-08
 

apps/desktop/src-tauri/Cargo.toml

@@ -117,10 +117,10 @@ bytes = "1"
 mdns-sd = { version = "0.18", features = ["logging"] }
 # SMB2/3 protocol client for share enumeration (pure Rust, pipelined I/O)
 smb2 = { git = "https://github.com/vdavid/smb2", branch = "main" }
+# NFD normalization for APFS collation and SMB path normalization
+unicode-normalization = "0.1"
 
 [target.'cfg(target_os = "macos")'.dependencies]
-# Drive indexing: NFD normalization for APFS case-insensitive collation
-unicode-normalization = "0.1"
 file_icon_provider = "1.0.0"
 core-foundation = "0.10.1"
 core-services = "1.0.0"

apps/desktop/src-tauri/src/commands/network.rs

@@ -345,7 +345,7 @@ pub(crate) async fn register_smb_volume(
 
     match connect_smb_volume(share, mount_path, server, share, username, password, port).await {
         Ok(volume) => {
-            let volume_id = crate::volumes::path_to_id(mount_path);
+            let volume_id = crate::file_system::volume::path_to_id(mount_path);
             // Use register (overwrite) so SmbVolume always wins over any
             // LocalPosixVolume the watcher may have registered in the race window.
             get_volume_manager().register(&volume_id, Arc::new(volume));
@@ -372,7 +372,10 @@ pub(crate) async fn register_smb_volume(
 #[tauri::command]
 pub async fn upgrade_to_smb_volume(volume_id: String) -> Result<String, String> {
     use crate::file_system::get_volume_manager;
+    #[cfg(target_os = "macos")]
     use crate::volumes::get_smb_mount_info;
+    #[cfg(target_os = "linux")]
+    use crate::volumes_linux::get_smb_mount_info;
 
     let manager = get_volume_manager();
 

apps/desktop/src-tauri/src/file_system/mod.rs

@@ -162,6 +162,11 @@ pub fn get_volume_manager() -> &'static VolumeManager {
 /// a parallel smb2 session for each. Non-blocking: failures are logged and skipped.
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 pub fn upgrade_existing_smb_mounts() {
+    #[cfg(target_os = "macos")]
+    use crate::volumes::get_smb_mount_info;
+    #[cfg(target_os = "linux")]
+    use crate::volumes_linux::get_smb_mount_info;
+
     if !is_direct_smb_enabled() {
         log::debug!("Direct SMB connections disabled, skipping startup upgrade");
         return;
@@ -181,7 +186,7 @@ pub fn upgrade_existing_smb_mounts() {
                 }
                 let path = vol.root().to_string_lossy().to_string();
                 // Check if it's an SMB mount
-                let info = crate::volumes::get_smb_mount_info(&path)?;
+                let info = get_smb_mount_info(&path)?;
                 let _ = info; // We just need to know it's SMB
                 Some((id, path))
             })
@@ -206,7 +211,7 @@ pub fn upgrade_existing_smb_mounts() {
 
         let mut any_upgraded = false;
         for (_volume_id, mount_path) in volumes_to_upgrade {
-            let info = match crate::volumes::get_smb_mount_info(&mount_path) {
+            let info = match get_smb_mount_info(&mount_path) {
                 Some(info) => info,
                 None => continue,
             };

apps/desktop/src-tauri/src/file_system/volume/mod.rs

@@ -15,6 +15,33 @@ use std::path::Path;
 use std::sync::atomic::AtomicBool;
 use tokio::sync::mpsc;
 
+/// SMB connection state for the frontend indicator.
+///
+/// `Direct` means Cmdr's smb2 session is active (fast path).
+/// `OsMount` means only the OS mount is alive (fallback path).
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum SmbConnectionState {
+    /// smb2 session active — fast path (green indicator).
+    Direct,
+    /// Using OS mount only — slower fallback (yellow indicator).
+    OsMount,
+}
+
+/// Default volume ID for the root filesystem.
+pub const DEFAULT_VOLUME_ID: &str = "root";
+
+/// Convert a mount path to a safe ID string.
+pub(crate) fn path_to_id(path: &str) -> String {
+    if path == "/" {
+        return DEFAULT_VOLUME_ID.to_string();
+    }
+    path.chars()
+        .filter(|c| c.is_alphanumeric() || *c == '-')
+        .collect::<String>()
+        .to_lowercase()
+}
+
 /// Describes what mutation occurred, so `notify_mutation` can update the listing cache.
 pub enum MutationEvent {
     /// A file or directory was created. Contains the entry name.
@@ -330,7 +357,7 @@ pub trait Volume: Send + Sync {
     ///
     /// Only `SmbVolume` returns `Some`. Used by the frontend to show a connection
     /// quality indicator (green = direct smb2, yellow = OS mount fallback).
-    fn smb_connection_state(&self) -> Option<crate::volumes::SmbConnectionState> {
+    fn smb_connection_state(&self) -> Option<SmbConnectionState> {
         None
     }
 

apps/desktop/src-tauri/src/file_system/volume/smb.rs

@@ -5,7 +5,9 @@
 //! but all Cmdr file operations go through smb2's pipelined I/O for better
 //! performance and fail-fast behavior.
 
-use super::{CopyScanResult, ScanConflict, SourceItemInfo, SpaceInfo, Volume, VolumeError};
+use super::{
+    CopyScanResult, ScanConflict, SmbConnectionState, SourceItemInfo, SpaceInfo, Volume, VolumeError, path_to_id,
+};
 use crate::file_system::listing::FileEntry;
 use log::{debug, info, warn};
 use smb2::client::tree::Tree;
@@ -1028,10 +1030,10 @@ impl Volume for SmbVolume {
         Ok(conflicts)
     }
 
-    fn smb_connection_state(&self) -> Option<crate::volumes::SmbConnectionState> {
+    fn smb_connection_state(&self) -> Option<SmbConnectionState> {
         match self.connection_state() {
-            ConnectionState::Direct => Some(crate::volumes::SmbConnectionState::Direct),
-            ConnectionState::OsMount => Some(crate::volumes::SmbConnectionState::OsMount),
+            ConnectionState::Direct => Some(SmbConnectionState::Direct),
+            ConnectionState::OsMount => Some(SmbConnectionState::OsMount),
             ConnectionState::Disconnected => None,
         }
     }
@@ -1481,7 +1483,7 @@ pub async fn connect_smb_volume(
     let mut client = SmbClient::connect(config).await?;
     let tree = client.connect_share(share_name).await?;
     let runtime_handle = tokio::runtime::Handle::current();
-    let volume_id = crate::volumes::path_to_id(mount_path);
+    let volume_id = path_to_id(mount_path);
 
     let vol = SmbVolume::new(
         name,

apps/desktop/src-tauri/src/mtp/connection/file_ops.rs

@@ -42,7 +42,10 @@ impl MtpConnectionManager {
     ///
     /// The `on_progress` callback receives `(bytes_done, bytes_total)` and returns `ControlFlow::Break(())`
     /// to cancel the transfer. On cancellation, the partial file is removed.
-    #[allow(clippy::too_many_arguments, reason = "mirrors download_file with added on_progress callback")]
+    #[allow(
+        clippy::too_many_arguments,
+        reason = "mirrors download_file with added on_progress callback"
+    )]
     pub async fn download_file_with_progress(
         &self,
         device_id: &str,
@@ -134,7 +137,10 @@ impl MtpConnectionManager {
                 message: format!("Failed to create local file: {}", e),
             })?;
 
-        // Write chunks to file (must complete before releasing device lock)
+        // Write chunks to file (must complete before releasing device lock).
+        // MTP USB transfers must be fully consumed — breaking mid-stream corrupts
+        // the session and makes the device unresponsive for subsequent operations.
+        // On cancel: stop writing to disk, but keep draining the USB stream.
         let mut bytes_written = 0u64;
         let mut cancelled = false;
         while let Some(chunk_result) = download.next_chunk().await {
@@ -143,19 +149,23 @@ impl MtpConnectionManager {
                 message: format!("Download error: {}", e),
             })?;
 
-            file.write_all(&chunk).await.map_err(|e| MtpConnectionError::Other {
-                device_id: device_id.to_string(),
-                message: format!("Failed to write local file: {}", e),
-            })?;
+            if !cancelled {
+                file.write_all(&chunk).await.map_err(|e| MtpConnectionError::Other {
+                    device_id: device_id.to_string(),
+                    message: format!("Failed to write local file: {}", e),
+                })?;
 
-            bytes_written += chunk.len() as u64;
+                bytes_written += chunk.len() as u64;
 
-            // Report progress and check for cancellation
-            if let Some(ref cb) = on_progress
-                && cb(bytes_written, total_size).is_break() {
+                // Report progress and check for cancellation
+                if let Some(ref cb) = on_progress
+                    && cb(bytes_written, total_size).is_break()
+                {
                     cancelled = true;
-                    break;
+                    // Don't break — keep draining the USB stream to keep the session healthy
                 }
+            }
+            // else: cancelled, just drain remaining chunks without writing
         }
 
         // Release device lock after download completes

apps/desktop/src-tauri/src/network/mount_linux.rs

@@ -248,6 +248,14 @@ pub async fn mount_share(
     }
 }
 
+/// Unmounts all SMB shares from a given host.
+///
+/// Linux GVFS unmount via `gio mount -u` is not wired up yet — returns empty.
+pub fn unmount_smb_shares_from_host(_server_name: &str, _server_ip: Option<&str>) -> Vec<String> {
+    log::debug!("unmount_smb_shares_from_host not yet implemented on Linux");
+    Vec::new()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

apps/desktop/src-tauri/src/volumes/mod.rs

@@ -13,19 +13,7 @@ use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::path::Path;
 
-/// SMB connection state for the frontend indicator.
-///
-/// Only set for volumes backed by an `SmbVolume` in the `VolumeManager`.
-/// `Direct` means Cmdr's smb2 session is active (fast path).
-/// `OsMount` means only the OS mount is alive (fallback path).
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "snake_case")]
-pub enum SmbConnectionState {
-    /// smb2 session active — fast path (green indicator).
-    Direct,
-    /// Using OS mount only — slower fallback (yellow indicator).
-    OsMount,
-}
+pub use crate::file_system::volume::SmbConnectionState;
 
 /// Category of a location item.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
@@ -655,16 +643,7 @@ fn get_volume_name(url: &objc2_foundation::NSURL, path: &str) -> String {
     }
 }
 
-/// Convert path to a safe ID.
-pub(crate) fn path_to_id(path: &str) -> String {
-    if path == "/" {
-        return DEFAULT_VOLUME_ID.to_string();
-    }
-    path.chars()
-        .filter(|c| c.is_alphanumeric() || *c == '-')
-        .collect::<String>()
-        .to_lowercase()
-}
+pub(crate) use crate::file_system::volume::path_to_id;
 
 /// Get icon for a path as base64-encoded WebP.
 fn get_icon_for_path(path: &str) -> Option<String> {

apps/desktop/src-tauri/src/volumes_linux/mod.rs

@@ -10,11 +10,64 @@
 
 pub mod watcher;
 
+pub use crate::file_system::volume::SmbConnectionState;
+
 use crate::file_system::linux_mounts::{self, MountEntry};
 use serde::{Deserialize, Serialize};
 use std::collections::HashSet;
 use std::path::Path;
 
+/// Information about an SMB mount extracted from `/proc/mounts`.
+#[derive(Debug, Clone)]
+pub struct SmbMountInfo {
+    /// Server hostname or IP (for example, "192.168.1.111").
+    pub server: String,
+    /// Share name (for example, "naspi").
+    pub share: String,
+    /// Username if present in the mount source (for example, "david").
+    pub username: Option<String>,
+}
+
+/// Extracts SMB server, share, and username from a mount path via `/proc/mounts`.
+///
+/// On Linux, CIFS mounts have a device field like:
+/// - `//192.168.1.111/share` (no credentials in device)
+/// - `//user@192.168.1.111/share` (some configurations)
+///
+/// Returns `None` if the path is not a CIFS mount or parsing fails.
+pub fn get_smb_mount_info(mount_path: &str) -> Option<SmbMountInfo> {
+    let mounts = linux_mounts::parse_proc_mounts();
+    let entry = mounts
+        .iter()
+        .filter(|e| e.fstype == "cifs")
+        .find(|e| e.mountpoint == mount_path)?;
+    parse_smb_mount_source(&entry.device)
+}
+
+/// Parses an SMB mount source string like `//user@host/share` or `//host/share`.
+fn parse_smb_mount_source(source: &str) -> Option<SmbMountInfo> {
+    let rest = source.strip_prefix("//")?;
+    let (server_part, share) = rest.split_once('/')?;
+    if share.is_empty() {
+        return None;
+    }
+
+    let (username, server) = if let Some((user, host)) = server_part.split_once('@') {
+        (Some(user.to_string()), host.to_string())
+    } else {
+        (None, server_part.to_string())
+    };
+
+    // Strip port if present (for example, "192.168.1.111:9445")
+    let server = server.split(':').next().unwrap_or(&server).to_string();
+
+    Some(SmbMountInfo {
+        server,
+        share: share.to_string(),
+        username,
+    })
+}
+
 /// Category of a location item.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
@@ -454,16 +507,7 @@ pub fn find_volume_for_path(path: &str) -> Option<String> {
         .map(|loc| loc.id.clone())
 }
 
-/// Convert a mount path to a safe ID string.
-pub(crate) fn path_to_id(path: &str) -> String {
-    if path == "/" {
-        return DEFAULT_VOLUME_ID.to_string();
-    }
-    path.chars()
-        .filter(|c| c.is_alphanumeric() || *c == '-')
-        .collect::<String>()
-        .to_lowercase()
-}
+pub(crate) use crate::file_system::volume::path_to_id;
 
 /// Extract a display name from a mount path.
 fn mount_display_name(mountpoint: &str) -> String {