SMB: Show connection status in volume picker

- Add `SmbConnectionState` enum (Direct/OsMount) to `LocationInfo`
- Add `smb_connection_state()` to `Volume` trait, SmbVolume maps its atomic state
- Enrich volume lists: volumes with `fs_type == "smbfs"` without smb2 session show as OsMount
- Extract `is_smb_fs_type()` helper in `volumes/mod.rs`
- Green/yellow CSS circle indicator in dropdown and breadcrumb
- Yellow state shows submenu trigger (CSS right-pointing triangle) with "Connect directly for faster access" item
- Breadcrumb: yellow circle + down arrow inside a clickable button, opens popup menu
- All arrows are CSS triangles for consistent rendering across fonts
- Submenu: fixed positioning to escape dropdown overflow clip, keyboard nav (ArrowRight/Left/Enter/Escape)
- Single cursor: main menu highlight suppressed when submenu is open

Author: vdavid

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

@@ -862,7 +862,7 @@ fn should_emit_synthetic_diff(volume_id: Option<&str>) -> bool {
         None => true, // No volume_id means local filesystem
         Some(id) => get_volume_manager()
             .get(id)
-            .map_or(true, |v| v.supports_local_fs_access()),
+            .is_none_or(|v| v.supports_local_fs_access()),
     }
 }
 

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

@@ -4,6 +4,7 @@ use serde::Serialize;
 use tokio::time::Duration;
 
 use super::util::{TimedOut, blocking_with_timeout_flag};
+use crate::file_system::get_volume_manager;
 use crate::volumes::{self, DEFAULT_VOLUME_ID, LocationCategory, VolumeInfo, VolumeSpaceInfo};
 
 /// Result of resolving a path to its containing volume.
@@ -19,13 +20,37 @@ pub struct PathVolumeResolution {
 const VOLUME_TIMEOUT: Duration = Duration::from_secs(2);
 
 /// Lists all mounted volumes, including connected MTP devices.
+/// Enriches SMB volumes with their connection state from the VolumeManager.
 #[tauri::command]
 pub async fn list_volumes() -> TimedOut<Vec<VolumeInfo>> {
     let mut result = blocking_with_timeout_flag(VOLUME_TIMEOUT, vec![], volumes::list_mounted_volumes).await;
     append_mtp_volumes(&mut result.data).await;
+    enrich_smb_connection_state(&mut result.data);
     result
 }
 
+/// Enriches volume entries with SMB connection state from the VolumeManager.
+///
+/// For each volume, looks up the registered Volume in VolumeManager and checks
+/// if it reports an `smb_connection_state`. This adds the green/yellow indicator
+/// for SMB shares in the frontend volume picker.
+fn enrich_smb_connection_state(volumes: &mut [VolumeInfo]) {
+    use crate::volumes::SmbConnectionState;
+
+    let manager = get_volume_manager();
+    for vol in volumes.iter_mut() {
+        if let Some(registered) = manager.get(&vol.id) {
+            vol.smb_connection_state = registered.smb_connection_state();
+        }
+
+        // SMB shares without a direct smb2 connection show as OsMount (yellow).
+        // This covers pre-existing mounts registered as LocalPosixVolume at startup.
+        if vol.smb_connection_state.is_none() && volumes::is_smb_fs_type(vol.fs_type.as_deref()) {
+            vol.smb_connection_state = Some(SmbConnectionState::OsMount);
+        }
+    }
+}
+
 /// Gets the default volume ID (root filesystem).
 #[tauri::command]
 pub fn get_default_volume_id() -> String {
@@ -74,6 +99,7 @@ pub async fn resolve_path_volume(path: String) -> PathVolumeResolution {
                 fs_type: Some("smbfs".to_string()),
                 supports_trash: false,
                 is_read_only: false,
+                smb_connection_state: None,
             }),
             timed_out: false,
         };
@@ -132,6 +158,7 @@ async fn append_mtp_volumes(volumes: &mut Vec<VolumeInfo>) {
                 is_read_only: storage.is_read_only,
                 fs_type: Some("mtp".to_string()),
                 supports_trash: false,
+                smb_connection_state: None,
             });
         }
     }

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

@@ -73,6 +73,7 @@ pub async fn resolve_path_volume(path: String) -> PathVolumeResolution {
                 fs_type: Some("cifs".to_string()),
                 supports_trash: false,
                 is_read_only: false,
+                smb_connection_state: None,
             }),
             timed_out: false,
         };
@@ -132,6 +133,7 @@ async fn append_mtp_volumes(volumes: &mut Vec<VolumeInfo>) {
                 is_read_only: storage.is_read_only,
                 fs_type: Some("mtp".to_string()),
                 supports_trash: false,
+                smb_connection_state: None,
             });
         }
     }

apps/desktop/src-tauri/src/file_system/volume/CLAUDE.md

@@ -39,6 +39,7 @@ Optional methods default to `Err(VolumeError::NotSupported)` or `false`, so new
 - `supports_streaming()` — enables chunked MTP-to-MTP transfers. Only `MtpVolume` returns `true`.
 - `local_path()` — returns `Some` only for local volumes; allows `copyfile(2)` fast-path in copy operations. `SmbVolume` returns `None` so copies go through smb2 instead of the slow OS mount.
 - `supports_local_fs_access()` — whether `std::fs` operations (stat, read_dir) work on this volume's paths. Default `true`. `MtpVolume` returns `false`. Used to skip synthetic entry diffs for protocol-only volumes.
+- `smb_connection_state()` — returns `Some(SmbConnectionState)` for SMB volumes (green/yellow indicator in volume picker). Default `None`. Only `SmbVolume` implements it.
 - `on_unmount()` — lifecycle hook called before unregistration. `SmbVolume` uses it to disconnect its smb2 session. Default is no-op.
 - `scanner()` / `watcher()` — drive indexing hooks; `None` by default.
 

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

@@ -254,6 +254,14 @@ pub trait Volume: Send + Sync {
     // Lifecycle: Optional, default no-op
     // ========================================
 
+    /// Returns the SMB connection state if this is an SMB volume.
+    ///
+    /// 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> {
+        None
+    }
+
     /// Called when the volume is about to be unmounted/unregistered.
     ///
     /// Implementations can use this to clean up resources (disconnect network

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

@@ -369,6 +369,14 @@ impl Volume for SmbVolume {
         Ok(fs_info_to_space_info(&info))
     }
 
+    fn smb_connection_state(&self) -> Option<crate::volumes::SmbConnectionState> {
+        match self.connection_state() {
+            ConnectionState::Direct => Some(crate::volumes::SmbConnectionState::Direct),
+            ConnectionState::OsMount => Some(crate::volumes::SmbConnectionState::OsMount),
+            ConnectionState::Disconnected => None,
+        }
+    }
+
     fn on_unmount(&self) {
         debug!("SmbVolume::on_unmount: disconnecting share={}", self.share_name);
 

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

@@ -35,6 +35,9 @@ pub struct VolumeInfo {
     pub supports_trash: bool,
     /// Whether this location is read-only.
     pub is_read_only: bool,
+    /// SMB connection state indicator. Always `None` on stub platforms.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub smb_connection_state: Option<String>,
 }
 
 /// Information about volume space.
@@ -73,6 +76,7 @@ pub fn list_volumes() -> Vec<VolumeInfo> {
                 fs_type: None,
                 supports_trash: true,
                 is_read_only: false,
+                smb_connection_state: None,
             });
         }
     }
@@ -88,6 +92,7 @@ pub fn list_volumes() -> Vec<VolumeInfo> {
         fs_type: None,
         supports_trash: true,
         is_read_only: false,
+        smb_connection_state: None,
     });
 
     // Add home directory
@@ -101,6 +106,7 @@ pub fn list_volumes() -> Vec<VolumeInfo> {
         fs_type: None,
         supports_trash: true,
         is_read_only: false,
+        smb_connection_state: None,
     });
 
     locations

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

@@ -156,6 +156,10 @@ async fn do_emit() {
     #[cfg(any(target_os = "macos", target_os = "linux"))]
     append_mtp_volumes(&mut volumes).await;
 
+    // Enrich SMB volumes with connection state from VolumeManager
+    #[cfg(target_os = "macos")]
+    enrich_smb_connection_state(&mut volumes);
+
     debug!(
         "Emitting volumes-changed ({} volumes, timed_out={})",
         volumes.len(),
@@ -170,6 +174,24 @@ async fn do_emit() {
     }
 }
 
+/// Enriches volume entries with SMB connection state from the VolumeManager.
+#[cfg(target_os = "macos")]
+fn enrich_smb_connection_state(volumes: &mut [LocationInfo]) {
+    use crate::volumes::SmbConnectionState;
+
+    let manager = crate::file_system::get_volume_manager();
+    for vol in volumes.iter_mut() {
+        if let Some(registered) = manager.get(&vol.id) {
+            vol.smb_connection_state = registered.smb_connection_state();
+        }
+
+        // SMB shares without a direct smb2 connection show as OsMount (yellow)
+        if vol.smb_connection_state.is_none() && crate::volumes::is_smb_fs_type(vol.fs_type.as_deref()) {
+            vol.smb_connection_state = Some(SmbConnectionState::OsMount);
+        }
+    }
+}
+
 /// Appends connected MTP device storages to the volume list.
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 async fn append_mtp_volumes(volumes: &mut Vec<LocationInfo>) {
@@ -198,6 +220,7 @@ async fn append_mtp_volumes(volumes: &mut Vec<LocationInfo>) {
                 is_read_only: storage.is_read_only,
                 fs_type: Some("mtp".to_string()),
                 supports_trash: false,
+                smb_connection_state: None,
             });
         }
     }

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

@@ -6,7 +6,7 @@ macOS volume and location discovery, plus live mount/unmount watching via FSEven
 
 | File | Purpose |
 |---|---|
-| `mod.rs` | `LocationInfo` type and `VolumeInfo` type alias (`pub use LocationInfo as VolumeInfo` for backwards compatibility), `LocationCategory` enum. `list_locations()`, `get_volume_space()`, `parse_cloud_provider_name()`, `get_mount_point()` (statfs-based mount resolution with APFS firmlink normalization), `resolve_path_volume_fast()` (builds `VolumeInfo` from statfs without enumerating volumes), and private helpers using `objc2`/`objc2_foundation`. |
+| `mod.rs` | `LocationInfo` type and `VolumeInfo` type alias (`pub use LocationInfo as VolumeInfo` for backwards compatibility), `LocationCategory` enum, `SmbConnectionState` enum. `list_locations()`, `get_volume_space()`, `parse_cloud_provider_name()`, `get_mount_point()` (statfs-based mount resolution with APFS firmlink normalization), `resolve_path_volume_fast()` (builds `VolumeInfo` from statfs without enumerating volumes), and private helpers using `objc2`/`objc2_foundation`. |
 | `watcher.rs` | `notify` (FSEvents) watcher on `/Volumes`. Detects mount/unmount by diffing against `KNOWN_VOLUMES`. Registers/unregisters with `VolumeManager` via `register_volume_with_manager`/`unregister_volume_from_manager` (coupling to `file_system::get_volume_manager()`). Emits `volume-mounted` / `volume-unmounted` Tauri events (still needed — `DualPaneExplorer` uses `volume-unmounted` with the volume path to redirect panes off ejected volumes). Triggers `volume_broadcast::emit_volumes_changed()` on changes. Spawns a mount-settle watcher that polls `fsid` until the volume metadata is ready. |
 
 ## Location categories
@@ -52,6 +52,14 @@ KNOWN_VOLUMES: OnceLock<Mutex<HashSet<String>>>
 | `pCloud` | pCloud |
 | anything else | first `-`-delimited segment |
 
+## Gotchas
+
+**Gotcha**: Use `is_smb_fs_type()` to detect SMB volumes, never raw `"smbfs"` / `"cifs"` string comparisons
+**Why**: The helper in `mod.rs` handles both macOS (`smbfs`) and Linux (`cifs`) in one place. Raw string comparisons scatter platform knowledge and are easy to get wrong.
+
+**Gotcha**: `LocationInfo` enrichment with `VolumeManager` data happens in two places
+**Why**: `commands/volumes.rs::enrich_smb_connection_state` (for `list_volumes` IPC calls) and `volume_broadcast.rs::enrich_smb_connection_state` (for `volumes-changed` push events). Both must stay in sync. The pattern is: build the base `LocationInfo` from OS APIs, then cross-reference `VolumeManager` to add runtime state (`smb_connection_state`). If new enrichment fields are added, update both call sites.
+
 ## Key decisions
 
 **Decision**: Use `OnceLock` for all three watcher statics (`APP_HANDLE`, `WATCHER`, `KNOWN_VOLUMES`)

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

@@ -13,6 +13,20 @@ 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,
+}
+
 /// Category of a location item.
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "snake_case")]
@@ -44,6 +58,9 @@ pub struct LocationInfo {
     pub supports_trash: bool,
     /// Whether this location is read-only (for example, MTP devices with locked storage).
     pub is_read_only: bool,
+    /// SMB connection state indicator. Only set for volumes with an active `SmbVolume`.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub smb_connection_state: Option<SmbConnectionState>,
 }
 
 /// Default volume ID for the root filesystem.
@@ -65,6 +82,11 @@ pub fn supports_trash_for_fs_type(fs_type: Option<&str>) -> bool {
     }
 }
 
+/// Returns true if the filesystem type is SMB (macOS `smbfs` or Linux `cifs`).
+pub fn is_smb_fs_type(fs_type: Option<&str>) -> bool {
+    matches!(fs_type, Some("smbfs" | "cifs"))
+}
+
 /// Resolve a path to its mount point and filesystem type via `statfs()`.
 ///
 /// On APFS firmlinks, normalizes `/System/Volumes/Data` to `/` (because
@@ -155,6 +177,7 @@ pub fn resolve_path_volume_fast(path: &str) -> Option<VolumeInfo> {
             fs_type: Some(fs_type),
             supports_trash,
             is_read_only: false,
+            smb_connection_state: None,
         })
     })
 }
@@ -284,6 +307,7 @@ fn get_favorites() -> Vec<LocationInfo> {
                 fs_type,
                 supports_trash,
                 is_read_only: false,
+                smb_connection_state: None,
             }
         })
         .collect()
@@ -324,6 +348,7 @@ fn get_main_volume() -> Option<LocationInfo> {
                     fs_type,
                     supports_trash,
                     is_read_only: false,
+                    smb_connection_state: None,
                 });
             }
         }
@@ -403,6 +428,7 @@ pub fn get_attached_volumes() -> Vec<LocationInfo> {
                 fs_type,
                 supports_trash,
                 is_read_only: false,
+                smb_connection_state: None,
             });
         }
 
@@ -433,6 +459,7 @@ pub fn get_cloud_drives() -> Vec<LocationInfo> {
             fs_type,
             supports_trash,
             is_read_only: false,
+            smb_connection_state: None,
         });
     }
 
@@ -460,6 +487,7 @@ pub fn get_cloud_drives() -> Vec<LocationInfo> {
                         fs_type,
                         supports_trash,
                         is_read_only: false,
+                        smb_connection_state: None,
                     });
                 }
             }
@@ -522,6 +550,7 @@ fn get_network_locations() -> Vec<LocationInfo> {
         fs_type: None,
         supports_trash: false,
         is_read_only: false,
+        smb_connection_state: None,
     });
 
     locations