SMB: Use smb2 consumer test harness, fix port handling

Monster commit

- Replace Cmdr's 11 local Docker container definitions with smb2's consumer test harness (14 containers, extracted on first run via `cargo run --example smb_compose`)
- Delete `test/smb-servers/containers/`, old `docker-compose.yml`, Pi deploy files
- `smb-e2e` Cargo feature now activates `smb2/testing`; examples gated with `required-features`
- `virtual_smb_hosts.rs` injects all 14 virtual hosts using `smb2::testing::*_port()` functions
- Add E2E tests for 50-share enumeration and unicode share rendering
- Update `smb-fixtures.ts`, `e2e-linux.sh`, and all docs for new container names/ports

Port handling fixes (pre-existing bugs):
- Add `port: u16` to `SmbMountInfo` (macOS + Linux) — extract port from `statfs` mount source instead of discarding it
- Thread port through `mount_share` → `mount_share_sync` → SMB URL (`smb://server:port/share`)
- Fix `upgrade_to_smb_volume`, `upgrade_existing_smb_mounts`, `try_upgrade_smb_mount` — use `info.port` instead of hardcoded 445
- Fix `NetworkMountView.svelte` — pass port separately instead of embedding in server string (caused `localhost:10480:10480` double-port)

Mount path disambiguation (partial):
- On EEXIST, read `NetFSMountURLSync` `mountpoints` array instead of hardcoding `/Volumes/{share}`
- Add `find_mount_path_for_share` fallback that scans `/Volumes/` via `statfs` to match server+share
- Full same-name-share collision handling (explicit mount points, volume switcher display) tracked separately

Dev experience fixes:
- Fix `effect_orphan`: move `initAiToastSync()` to synchronous `onMount` (before async IIFE)
- Fix SvelteKit HMR crash (sveltejs/kit#15287): `import.meta.hot.accept` + `invalidate()` in root layout forces clean reload instead of broken route-tree rebuild
- Fix UnoCSS HMR spam: restrict `content.filesystem` in `uno.config.ts` to the 3 files that use icons

Author: vdavid

.gitignore

@@ -47,6 +47,9 @@ target/
 # Auto-generated capability file for playwright-e2e feature (created by build.rs)
 apps/desktop/src-tauri/capabilities/playwright.json
 
+# Extracted smb2 consumer compose files (generated by start.sh / smb_compose example)
+apps/desktop/test/smb-servers/.compose/
+
 # Downloaded llama-server binaries (fetched at build time, not committed)
 apps/desktop/src-tauri/resources/ai/
 

apps/desktop/knip.json

@@ -7,14 +7,6 @@
     "@tauri-apps/cli",
     "@testing-library/svelte",
     "prettier-plugin-svelte",
-    "@wdio/globals",
-    "@wdio/local-runner",
-    "@wdio/mocha-framework",
-    "@wdio/spec-reporter",
-    "@wdio/types",
-    "webdriverio",
-    "@crabnebula/tauri-driver",
-    "@crabnebula/test-runner-backend",
     "axe-core",
     "@iconify-json/lucide"
   ],

apps/desktop/scripts/e2e-linux.sh

@@ -250,18 +250,19 @@ DOCKER_TAURI_BINARY="/target/$LINUX_TARGET/release/Cmdr"
 
 # ── SMB container management ────────────────────────────────────────────────
 # Start Docker SMB containers for network E2E tests. The E2E test container
-# joins the smb-servers_default network so it can reach smb-guest:445 and
-# smb-auth:445 by container name (no host port mapping needed).
+# joins the smb-consumer_default network so it can reach smb-consumer-guest:445
+# and smb-consumer-auth:445 by container name (no host port mapping needed).
+# Containers come from smb2's consumer test harness.
 
-SMB_COMPOSE_DIR="$DESKTOP_DIR/test/smb-servers"
-SMB_NETWORK="smb-servers_default"
+SMB_SERVERS_DIR="$DESKTOP_DIR/test/smb-servers"
+SMB_NETWORK="smb-consumer_default"
 
 start_smb_containers() {
-    if docker compose -f "$SMB_COMPOSE_DIR/docker-compose.yml" ps --format json 2>/dev/null | grep -q '"smb-guest"'; then
+    if docker compose -p smb-consumer ps --format json 2>/dev/null | grep -q '"smb-consumer-guest"'; then
         log_info "SMB containers already running"
     else
         log_info "Starting SMB containers (minimal)..."
-        "$SMB_COMPOSE_DIR/start.sh" minimal
+        "$SMB_SERVERS_DIR/start.sh" minimal
     fi
 
     # Wait for the network to exist (docker compose creates it)
@@ -281,7 +282,7 @@ start_smb_containers
 # CMDR_MCP_ENABLED: release builds disable MCP by default — tests need it
 # --privileged: needed for mount -t cifs inside the container (SYS_ADMIN alone is
 # blocked by Docker's default seccomp profile which denies the mount syscall)
-SMB_ENV_ARGS="-e SMB_E2E_GUEST_HOST=smb-guest -e SMB_E2E_GUEST_PORT=445 -e SMB_E2E_AUTH_HOST=smb-auth -e SMB_E2E_AUTH_PORT=445 -e CMDR_MCP_ENABLED=true"
+SMB_ENV_ARGS="-e SMB_E2E_GUEST_HOST=smb-consumer-guest -e SMB_E2E_GUEST_PORT=445 -e SMB_E2E_AUTH_HOST=smb-consumer-auth -e SMB_E2E_AUTH_PORT=445 -e CMDR_MCP_ENABLED=true"
 SMB_DOCKER_ARGS="--privileged"
 
 if $INTERACTIVE; then

apps/desktop/src-tauri/Cargo.toml

@@ -14,7 +14,7 @@ playwright-e2e = ["dep:tauri-plugin-playwright"]
 # Virtual MTP device for E2E testing (registers a fake Android device). Never enable in production builds.
 virtual-mtp = ["mtp-rs/virtual-device"]
 # Virtual SMB hosts for E2E testing (injects synthetic network hosts). Never enable in production builds.
-smb-e2e = []
+smb-e2e = ["smb2/testing"]
 
 [[bin]]
 name = "Cmdr"
@@ -151,6 +151,14 @@ criterion = { version = "0.8.1", features = ["html_reports"] }
 rand_core = { version = "0.6", features = ["getrandom"] }
 tempfile = "3"
 
+[[example]]
+name = "smb_compose"
+required-features = ["smb-e2e"]
+
+[[example]]
+name = "docker_smb_test"
+required-features = ["smb-e2e"]
+
 [[bench]]
 name = "icon_benchmarks"
 harness = false

apps/desktop/src-tauri/examples/docker_smb_test.rs

@@ -1,7 +1,7 @@
 //! Quick test for Docker SMB servers with custom ports.
 //!
 //! Run with:
-//!   cargo run --example docker_smb_test
+//!   cargo run --example docker_smb_test --features smb-e2e
 //!
 //! NOTE: This example only works on macOS/Linux (requires the `smb2` crate).
 
@@ -10,15 +10,14 @@ mod inner {
     use smb2::{ClientConfig, SmbClient};
     use std::time::Duration;
 
-    const TEST_PORT: u16 = 9445; // smb-guest Docker container
-    const TEST_IP: &str = "127.0.0.1";
-
     #[tokio::main]
     pub async fn main() {
-        println!("Testing Docker SMB container at {}:{}", TEST_IP, TEST_PORT);
+        let port = smb2::testing::guest_port();
+        let ip = "127.0.0.1";
+        println!("Testing Docker SMB container at {}:{}", ip, port);
 
         let config = ClientConfig {
-            addr: format!("{}:{}", TEST_IP, TEST_PORT),
+            addr: format!("{}:{}", ip, port),
             timeout: Duration::from_secs(5),
             username: "Guest".to_string(),
             password: String::new(),

apps/desktop/src-tauri/examples/smb_compose.rs

@@ -0,0 +1,15 @@
+//! Extracts smb2's consumer Docker Compose files to a directory.
+//!
+//! Used by `test/smb-servers/start.sh` to set up the SMB test containers.
+//!
+//! Run with:
+//!   cargo run --example smb_compose --features smb-e2e -- <output_dir>
+
+fn main() {
+    let dir = std::env::args()
+        .nth(1)
+        .unwrap_or_else(|| "test/smb-servers/.compose".to_string());
+    let path = std::path::Path::new(&dir);
+    smb2::testing::write_compose_files(path).expect("Failed to write compose files");
+    println!("{}", path.display());
+}

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

@@ -295,11 +295,13 @@ pub async fn mount_network_share(
     port: Option<u16>,
     timeout_ms: Option<u64>,
 ) -> Result<MountResult, MountError> {
+    let actual_port = port.unwrap_or(445);
     let result = mount::mount_share(
         server.clone(),
         share.clone(),
         username.clone(),
         password.clone(),
+        actual_port,
         timeout_ms,
     )
     .await?;
@@ -313,7 +315,7 @@ pub async fn mount_network_share(
         &result.mount_path,
         username.as_deref(),
         password.as_deref(),
-        port.unwrap_or(445),
+        actual_port,
     )
     .await;
 
@@ -419,7 +421,7 @@ pub async fn upgrade_to_smb_volume(volume_id: String) -> Result<String, String>
         None => (None, None),
     };
 
-    register_smb_volume(&info.server, &info.share, &mount_path, username, password, 445).await;
+    register_smb_volume(&info.server, &info.share, &mount_path, username, password, info.port).await;
 
     // Check if it worked
     if let Some(vol) = manager.get(&volume_id)

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

@@ -234,7 +234,7 @@ pub fn upgrade_existing_smb_mounts() {
                 &mount_path,
                 username,
                 password,
-                445,
+                info.port,
             )
             .await;
             any_upgraded = true;

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

@@ -6,7 +6,7 @@ Discover, browse, and mount SMB network shares. Works on macOS and Linux.
 
 - **Discovery**: `mdns_discovery.rs` — Pure Rust mDNS using `mdns-sd` crate. Cross-platform.
 - **Manual servers**: `manual_servers.rs` — User-added servers via "Connect to server..." dialog. Parses addresses, checks TCP reachability, persists to `manual-servers.json`, and injects synthetic `NetworkHost` entries with `source: Manual` into `DISCOVERY_STATE`. Loaded at startup.
-- **E2E testing**: `virtual_smb_hosts.rs` — Injects synthetic `NetworkHost` entries for Docker SMB containers. Gated behind `smb-e2e` Cargo feature. Never enabled in production.
+- **E2E testing**: `virtual_smb_hosts.rs` — Injects 14 synthetic `NetworkHost` entries for smb2's consumer Docker containers. Ports come from `smb2::testing::*_port()` functions (configurable via `SMB_CONSUMER_*_PORT` env vars, default 10480+). Hosts configurable via `SMB_E2E_*_HOST` env vars (default `localhost`). Gated behind `smb-e2e` Cargo feature. Never enabled in production.
 - **Share listing**: Split across multiple files:
   - `smb_client.rs` — Top-level share-listing entry point; orchestrates guest -> keychain -> prompt auth flow; tries smb2 first, falls back to smbutil (macOS only)
   - `smb_connection.rs` — TCP connection establishment and share listing via `smb2::SmbClient`
@@ -104,6 +104,13 @@ When the user mounts an SMB share, we establish a parallel smb2 connection along
 
 Manual server IDs use the format `manual-{address}-{port}` with dots/colons replaced by dashes. This is deterministic (same address+port always produces the same ID), preventing duplicates. The `manual-` prefix avoids collision with mDNS-derived IDs.
 
+### Mount path disambiguation for same-name shares
+
+When two servers have a share with the same name (for example, two NAS devices both sharing `public`), macOS creates
+disambiguated mount paths (`/Volumes/public`, `/Volumes/public-1`). The mount code reads the actual path from
+`NetFSMountURLSync`'s `mountpoints` array on both success and EEXIST. If the array is empty (some macOS versions don't
+populate it on EEXIST), `find_mount_path_for_share` scans `/Volumes/` and uses `statfs` to match the server+share.
+
 ## Gotchas
 
 - **Don't hold mutex during DNS resolution**: `get_host_for_resolution` / `update_host_resolution` extract host info and release the mutex before blocking DNS, then re-acquire to update. Holding the mutex across network calls risks deadlock.
@@ -113,7 +120,7 @@ Manual server IDs use the format `manual-{address}-{port}` with dots/colons repl
 - **Account name is lowercase**: `make_account_name` lowercases server name for consistency. Prevents duplicate entries for "SERVER" vs "server".
 - **Linux `gio mount` requires GVFS**: The `gvfs-smb` package must be installed. Standard on Ubuntu/Fedora GNOME desktops. KDE desktops may need it explicitly.
 - **`ShareListError` uses internally tagged serde format** (`#[serde(tag = "type")]`) with struct variants. This keeps a flat JSON shape (`{ "type": "protocol_error", "message": "..." }`). The `MissingDependency` variant adds an optional `installCommand` field. When adding new variants, use struct syntax (not tuple).
-- **macOS smbutil and NetFSMountURLSync fail with loopback IP + non-standard port**: `//127.0.0.1:9445` gives "Broken pipe", but `//localhost:9445` works. `build_smbutil_url` and `NetworkMountView.svelte` both fall back to hostname when IP is `127.0.0.1` or `::1`. This matters for E2E testing against Docker containers on localhost.
-- **Mount URL must include port when non-standard**: `NetworkMountView.svelte` appends `:PORT` to the server string when `port !== 445`. Without this, `NetFSMountURLSync` defaults to port 445 and can't reach Docker containers on custom ports.
+- **macOS smbutil and NetFSMountURLSync fail with loopback IP + non-standard port**: `//127.0.0.1:10480` gives "Broken pipe", but `//localhost:10480` works. `build_smbutil_url` and `NetworkMountView.svelte` both fall back to hostname when IP is `127.0.0.1` or `::1`. This matters for E2E testing against Docker containers on localhost.
+- **Mount URL must include port when non-standard**: `mount_share_sync` builds `smb://server:port/share` for non-445 ports. The port is passed as a separate parameter through `mount_share` → `mount_share_sync`, not embedded in the server string (embedding it would cause `build_smb_addr` to double the port: `localhost:10480:10480`). `SmbMountInfo.port` extracts the port from `statfs` mount source for upgrade paths.
 - **Strip `.local` from addr for smb2**: `smb2::Connection::connect()` extracts `server_name` from the addr string and uses it in UNC paths. Passing `"foo.local:445"` creates `\\foo.local\IPC$` which some servers reject. The `build_addr` helper in `smb_connection.rs` handles this.
 - **Manual hosts always set `hostname`**: The share listing pipeline guards on `host.hostname` being truthy. `create_network_host` always sets `hostname` (to the address, even for IPs) so manual hosts flow through the pipeline correctly.

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

@@ -821,15 +821,16 @@ mod tests {
 mod integration_tests {
     use super::*;
 
-    /// Verifies TCP reachability against a Docker SMB container on port 9445.
+    /// Verifies TCP reachability against a Docker SMB container.
     ///
     /// Requires: `./test/smb-servers/start.sh minimal`
     #[tokio::test]
     async fn reachability_docker_smb_guest() {
-        let result = check_reachability("localhost", 9445).await;
+        let port = smb2::testing::guest_port();
+        let result = check_reachability("localhost", port).await;
         assert!(
             result.is_ok(),
-            "Docker SMB container should be reachable on port 9445. Start it with: ./test/smb-servers/start.sh minimal"
+            "Docker SMB container should be reachable on port {port}. Start it with: ./test/smb-servers/start.sh minimal"
         );
     }