SMB: Add "Connect to server" for manual hosts

- "Connect to server..." pseudo-row in network browser with dialog for entering hostname, IP, IP:port, or smb:// URL
- Backend: address parsing, TCP reachability check (5s timeout), persistence to `manual-servers.json`, injection into `DISCOVERY_STATE` at startup
- `HostSource` enum (`Discovered` | `Manual`) on `NetworkHost` with backward-compatible `#[serde(default)]`
- Native context menu on hosts: Disconnect (unmounts via `diskutil`), Forget server, Forget saved password
- F8 to remove manual hosts with confirmation
- `autoMountShare` on `ShareBrowser`: typing `smb://server/share` auto-mounts the share
- MCP tools: `connect_to_server`, `remove_manual_server`
- MCP state encodes `source=manual|discovered` for each host
- Port now passed through `mountNetworkShare` so `register_smb_volume` uses the correct port for smb2 direct connections
- Atomic writes (temp + rename) for `manual-servers.json` and `known-shares.json`
- Fix panic on SMB volume mount: `tokio::spawn` → `tauri::async_runtime::spawn` in fsevents watcher thread (no Tokio runtime)
- 35 unit tests + 3 integration tests (behind `smb-e2e` feature)

Author: vdavid

apps/desktop/coverage-allowlist.json

@@ -53,6 +53,9 @@
     "file-operations/mkdir/NewFolderDialog.svelte": {
       "reason": "UI modal, logic tested in new-folder-utils.test.ts"
     },
+    "file-explorer/network/ConnectToServerDialog.svelte": {
+      "reason": "Network dialog, depends on Tauri connectToServer command"
+    },
     "file-explorer/network/NetworkBrowser.svelte": { "reason": "Network component, needs Tauri integration" },
     "file-explorer/pane/PaneResizer.svelte": { "reason": "Mouse drag UI component, difficult to unit test" },
     "file-explorer/network/NetworkLoginForm.svelte": { "reason": "Network component, needs Tauri integration" },

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

@@ -34,6 +34,7 @@ pub async fn resolve_host(host_id: String) -> Option<NetworkHost> {
             hostname: info.hostname,
             ip_address: info.ip_address,
             port: info.port,
+            source: info.source,
         });
     }
 
@@ -487,3 +488,37 @@ pub(crate) async fn get_keychain_password(
     .ok()
     .flatten()
 }
+
+// --- Disconnect Command ---
+
+/// Unmounts all SMB shares mounted from a given server.
+/// Returns the list of mount paths that were unmounted.
+#[tauri::command]
+pub async fn disconnect_network_host(
+    _host_id: String,
+    host_name: String,
+    ip_address: Option<String>,
+) -> Result<Vec<String>, String> {
+    let result =
+        tokio::task::spawn_blocking(move || mount::unmount_smb_shares_from_host(&host_name, ip_address.as_deref()))
+            .await
+            .map_err(|e| format!("Disconnect task failed: {}", e))?;
+
+    Ok(result)
+}
+
+// --- Manual Server Commands ---
+
+use crate::network::manual_servers::{self, ManualConnectResult};
+
+/// Connects to a manually-specified server: parses, checks reachability, persists, and injects.
+#[tauri::command]
+pub async fn connect_to_server(address: String, app_handle: tauri::AppHandle) -> Result<ManualConnectResult, String> {
+    manual_servers::add_manual_server(&address, &app_handle).await
+}
+
+/// Removes a manually-added server by ID.
+#[tauri::command]
+pub fn remove_manual_server(server_id: String, app_handle: tauri::AppHandle) -> Result<(), String> {
+    manual_servers::remove_manual_server(&server_id, &app_handle)
+}

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

@@ -1,6 +1,7 @@
 use crate::ignore_poison::IgnorePoison;
 use crate::menu::{
-    CLOSE_TAB_ID, CommandScope, MenuState, build_context_menu, build_tab_context_menu, menu_id_to_command,
+    CLOSE_TAB_ID, CommandScope, MenuState, build_context_menu, build_network_host_context_menu, build_tab_context_menu,
+    menu_id_to_command,
 };
 #[cfg(any(target_os = "macos", target_os = "linux"))]
 use std::process::Command;
@@ -219,6 +220,34 @@ pub fn show_tab_context_menu(
     Ok(())
 }
 
+/// Shows a native context menu for a network host (fire-and-forget).
+/// The selected action is delivered asynchronously via a `network-host-context-action` Tauri event
+/// from `on_menu_event`.
+#[tauri::command]
+pub fn show_network_host_context_menu(
+    window: Window<tauri::Wry>,
+    host_id: String,
+    host_name: String,
+    is_manual: bool,
+    has_credentials: bool,
+) -> Result<(), String> {
+    let app = window.app_handle().clone();
+
+    let menu = build_network_host_context_menu(&app, is_manual, has_credentials).map_err(|e| e.to_string())?;
+
+    // Store context so on_menu_event can include host info in the emitted event
+    {
+        let state = app.state::<MenuState<tauri::Wry>>();
+        let mut ctx = state.network_host_context.lock_ignore_poison();
+        ctx.host_id = host_id;
+        ctx.host_name = host_name;
+    }
+
+    menu.popup(window).map_err(|e| e.to_string())?;
+
+    Ok(())
+}
+
 /// Updates the File menu "Pin tab" / "Unpin tab" label based on the active tab's pin state.
 #[tauri::command]
 pub fn update_pin_tab_menu<R: Runtime>(app: AppHandle<R>, is_pinned: bool) -> Result<(), String> {

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

@@ -725,15 +725,18 @@ impl Volume for SmbVolume {
     }
 
     fn on_unmount(&self) {
-        debug!("SmbVolume::on_unmount: disconnecting share={}", self.share_name);
-
         // Transition to Disconnected
         self.state.store(ConnectionState::Disconnected as u8, Ordering::Relaxed);
 
-        // Drop the smb2 session (graceful disconnect)
+        // Drop the smb2 session. This is fully synchronous — dropping the TCP
+        // stream calls close() on the socket fd. The server handles abrupt
+        // disconnects fine, so no async graceful disconnect is needed.
+        // Important: this runs on the notify-rs fsevents thread (no Tokio runtime).
         if let Ok(mut guard) = self.smb.lock() {
             *guard = None;
         }
+
+        debug!("SmbVolume cleanup for {}: smb2 session dropped", self.share_name);
     }
 }
 

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

@@ -117,8 +117,9 @@ mod volumes_linux;
 mod stubs;
 
 use menu::{
-    CLOSE_TAB_ID, CommandScope, EDIT_COPY_ID, EDIT_CUT_ID, EDIT_PASTE_ID, MenuState, SHOW_HIDDEN_FILES_ID,
-    SORT_ASCENDING_ID, SORT_BY_CREATED_ID, SORT_BY_EXTENSION_ID, SORT_BY_MODIFIED_ID, SORT_BY_NAME_ID, SORT_BY_SIZE_ID,
+    CLOSE_TAB_ID, CommandScope, EDIT_COPY_ID, EDIT_CUT_ID, EDIT_PASTE_ID, MenuState, NETWORK_HOST_DISCONNECT_ID,
+    NETWORK_HOST_FORGET_PASSWORD_ID, NETWORK_HOST_FORGET_SERVER_ID, SHOW_HIDDEN_FILES_ID, SORT_ASCENDING_ID,
+    SORT_BY_CREATED_ID, SORT_BY_EXTENSION_ID, SORT_BY_MODIFIED_ID, SORT_BY_NAME_ID, SORT_BY_SIZE_ID,
     SORT_DESCENDING_ID, TAB_CLOSE_ID, TAB_CLOSE_OTHERS_ID, TAB_PIN_ID, VIEW_MODE_BRIEF_ID, VIEW_MODE_FULL_ID,
     VIEWER_WORD_WRAP_ID, ViewMode, menu_id_to_command,
 };
@@ -348,6 +349,10 @@ pub fn run() {
             #[cfg(any(target_os = "macos", target_os = "linux"))]
             network::known_shares::load_known_shares(app.handle());
 
+            // Load manually-added servers and inject into discovery state
+            #[cfg(any(target_os = "macos", target_os = "linux"))]
+            network::manual_servers::load_manual_servers(app.handle());
+
             // Drag image detection swizzle is installed in RunEvent::Ready (not here)
             // because wry 0.54+ registers the WryWebView ObjC class lazily — it doesn't
             // exist in the runtime until the first webview is created, which happens after
@@ -562,6 +567,32 @@ pub fn run() {
                 return;
             }
 
+            // === Network host context menu actions ===
+            if id == NETWORK_HOST_FORGET_SERVER_ID
+                || id == NETWORK_HOST_FORGET_PASSWORD_ID
+                || id == NETWORK_HOST_DISCONNECT_ID
+            {
+                let menu_state = app.state::<MenuState<tauri::Wry>>();
+                let ctx = menu_state.network_host_context.lock_ignore_poison();
+                let action = if id == NETWORK_HOST_FORGET_SERVER_ID {
+                    "forget-server"
+                } else if id == NETWORK_HOST_FORGET_PASSWORD_ID {
+                    "forget-password"
+                } else {
+                    "disconnect"
+                };
+                let _ = app.emit_to(
+                    "main",
+                    "network-host-context-action",
+                    serde_json::json!({
+                        "action": action,
+                        "hostId": ctx.host_id,
+                        "hostName": ctx.host_name,
+                    }),
+                );
+                return;
+            }
+
             // === Clipboard exception: file clipboard in main window, native text clipboard elsewhere ===
             // Custom MenuItems for Cut/Copy/Paste route through execute-command in the main window
             // so the frontend can decide between file and text clipboard. In non-main windows
@@ -673,6 +704,7 @@ pub fn run() {
             commands::icons::clear_directory_icon_cache,
             commands::ui::show_file_context_menu,
             commands::ui::show_tab_context_menu,
+            commands::ui::show_network_host_context_menu,
             commands::ui::update_pin_tab_menu,
             commands::ui::show_main_window,
             commands::ui::update_menu_context,
@@ -824,6 +856,12 @@ pub fn run() {
             commands::network::mount_network_share,
             #[cfg(any(target_os = "macos", target_os = "linux"))]
             commands::network::upgrade_to_smb_volume,
+            #[cfg(any(target_os = "macos", target_os = "linux"))]
+            commands::network::connect_to_server,
+            #[cfg(any(target_os = "macos", target_os = "linux"))]
+            commands::network::remove_manual_server,
+            #[cfg(any(target_os = "macos", target_os = "linux"))]
+            commands::network::disconnect_network_host,
             #[cfg(not(any(target_os = "macos", target_os = "linux")))]
             stubs::network::list_network_hosts,
             #[cfg(not(any(target_os = "macos", target_os = "linux")))]
@@ -860,6 +898,12 @@ pub fn run() {
             stubs::network::mount_network_share,
             #[cfg(not(any(target_os = "macos", target_os = "linux")))]
             stubs::network::upgrade_to_smb_volume,
+            #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+            stubs::network::connect_to_server,
+            #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+            stubs::network::remove_manual_server,
+            #[cfg(not(any(target_os = "macos", target_os = "linux")))]
+            stubs::network::disconnect_network_host,
             // Accent color command (macOS reads NSColor, Linux reads gsettings, others return fallback)
             #[cfg(target_os = "macos")]
             accent_color::get_accent_color,

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

@@ -21,7 +21,7 @@ Expose Cmdr functionality to AI agents via the Model Context Protocol (MCP). Age
 
 ### Tools (`tools.rs`)
 
-27 semantic tools grouped by category:
+29 semantic tools grouped by category:
 - Navigation (6): `select_volume` (also accepts MTP volume names), `nav_to_path` (supports `mtp://` paths, skips filesystem existence check), `nav_to_parent`, `nav_back`, `nav_forward`, `scroll_to`
 - Cursor/Selection (3): `move_cursor`, `open_under_cursor`, `select`
 - File operations (6): `copy`, `move`, `delete`, `mkdir`, `mkfile`, `refresh`. `copy`/`move` accept optional `autoConfirm` (bool) and `onConflict` (`skip_all`|`overwrite_all`|`rename_all`). `delete` accepts optional `autoConfirm`. When `autoConfirm` is true, the dialog opens and immediately confirms.
@@ -31,6 +31,7 @@ Expose Cmdr functionality to AI agents via the Model Context Protocol (MCP). Age
 - App (3): `switch_pane`, `swap_panes`, `quit`
 - Search (2): `search` (structured file search across the drive index, optional `scope` for path/exclude filtering), `ai_search` (natural language search using configured LLM, optional `scope` merged with AI-inferred scope)
 - Settings (1): `set_setting` (change a setting value via round-trip to frontend)
+- Network (2): `connect_to_server` (add a manual SMB server by address, checks TCP reachability), `remove_manual_server` (remove a manually-added server by host ID)
 - Async (1): `await` (poll PaneStateStore until a condition is met — `has_item`, `item_count_gte`, `path`, or `path_contains`. Supports `after_generation` to avoid matching stale state)
 
 ### Resources (`resources.rs`)

apps/desktop/src-tauri/src/mcp/executor.rs

@@ -144,6 +144,9 @@ pub async fn execute_tool<R: Runtime>(app: &AppHandle<R>, name: &str, params: &V
         "ai_search" => execute_ai_search(params).await,
         // Settings commands
         "set_setting" => execute_set_setting(app, params).await,
+        // Network commands
+        "connect_to_server" => execute_connect_to_server(app, params).await,
+        "remove_manual_server" => execute_remove_manual_server(app, params),
         // Async wait
         "await" => execute_await(app, params).await,
         _ => Err(ToolError::invalid_params(format!("Unknown tool: {name}"))),
@@ -1035,6 +1038,37 @@ async fn execute_await<R: Runtime>(app: &AppHandle<R>, params: &Value) -> ToolRe
     }
 }
 
+// ── Network tools ────────────────────────────────────────────────────
+
+/// Execute `connect_to_server`: parse address, TCP check, persist, inject.
+async fn execute_connect_to_server<R: Runtime>(app: &AppHandle<R>, params: &Value) -> ToolResult {
+    let address = params
+        .get("address")
+        .and_then(|v| v.as_str())
+        .ok_or_else(|| ToolError::invalid_params("Missing 'address' parameter"))?;
+
+    match crate::network::manual_servers::add_manual_server(address, app).await {
+        Ok(result) => Ok(json!(format!(
+            "OK: Connected to {} (host ID: {})",
+            result.host.name, result.host.id
+        ))),
+        Err(e) => Err(ToolError::internal(e)),
+    }
+}
+
+/// Execute `remove_manual_server`: remove from storage and discovery state.
+fn execute_remove_manual_server<R: Runtime>(app: &AppHandle<R>, params: &Value) -> ToolResult {
+    let host_id = params
+        .get("host_id")
+        .and_then(|v| v.as_str())
+        .ok_or_else(|| ToolError::invalid_params("Missing 'host_id' parameter"))?;
+
+    match crate::network::manual_servers::remove_manual_server(host_id, app) {
+        Ok(()) => Ok(json!(format!("OK: Removed server {}", host_id))),
+        Err(e) => Err(ToolError::internal(e)),
+    }
+}
+
 // ── Search tools ──────────────────────────────────────────────────────
 
 use crate::search::PatternType;

apps/desktop/src-tauri/src/mcp/tests.rs

@@ -105,11 +105,11 @@ fn test_tool_input_schemas_are_valid() {
 #[test]
 fn test_total_tool_count() {
     let tools = get_all_tools();
-    // 6 nav + 2 cursor + 1 select + 6 file_op + 3 view + 1 tab + 1 dialog + 3 app + 2 search + 1 settings + 1 await = 27
+    // 6 nav + 2 cursor + 1 select + 6 file_op + 3 view + 1 tab + 1 dialog + 3 app + 2 search + 1 settings + 2 network + 1 await = 29
     assert_eq!(
         tools.len(),
-        27,
-        "Expected 27 tools, got {}. Did you add/remove tools?",
+        29,
+        "Expected 29 tools, got {}. Did you add/remove tools?",
         tools.len()
     );
 }

apps/desktop/src-tauri/src/mcp/tools.rs

@@ -450,6 +450,41 @@ fn get_search_tools() -> Vec<Tool> {
     ]
 }
 
+/// Get network tools.
+fn get_network_tools() -> Vec<Tool> {
+    vec![
+        Tool {
+            name: "connect_to_server".to_string(),
+            description: "Add a manual SMB server by address. Checks TCP reachability then adds to the host list."
+                .to_string(),
+            input_schema: json!({
+                "type": "object",
+                "properties": {
+                    "address": {
+                        "type": "string",
+                        "description": "Server address: hostname, IP, IP:port, or smb:// URL"
+                    }
+                },
+                "required": ["address"]
+            }),
+        },
+        Tool {
+            name: "remove_manual_server".to_string(),
+            description: "Remove a manually-added server from the host list.".to_string(),
+            input_schema: json!({
+                "type": "object",
+                "properties": {
+                    "host_id": {
+                        "type": "string",
+                        "description": "Host ID to remove (for example, manual-192-168-1-100-9445)"
+                    }
+                },
+                "required": ["host_id"]
+            }),
+        },
+    ]
+}
+
 /// Get async waiting tools.
 fn get_await_tools() -> Vec<Tool> {
     vec![Tool {
@@ -520,6 +555,7 @@ pub fn get_all_tools() -> Vec<Tool> {
     tools.extend(get_app_tools());
     tools.extend(get_search_tools());
     tools.extend(get_settings_tools());
+    tools.extend(get_network_tools());
     tools.extend(get_await_tools());
     tools
 }
@@ -631,11 +667,18 @@ mod tests {
         assert!(required.contains(&json!("value")));
     }
 
+    #[test]
+    fn test_network_tools_count() {
+        let tools = get_network_tools();
+        // connect_to_server, remove_manual_server
+        assert_eq!(tools.len(), 2);
+    }
+
     #[test]
     fn test_all_tools_count() {
         let tools = get_all_tools();
-        // 6 nav + 2 cursor + 1 selection + 6 file_op + 3 view + 1 tab + 1 dialog + 3 app + 2 search + 1 settings + 1 await = 27
-        assert_eq!(tools.len(), 27);
+        // 6 nav + 2 cursor + 1 selection + 6 file_op + 3 view + 1 tab + 1 dialog + 3 app + 2 search + 1 settings + 2 network + 1 await = 29
+        assert_eq!(tools.len(), 29);
     }
 
     #[test]