Merge branch 'main' into feat/connect-ides

Author: its-mash

Cargo.lock

@@ -18,6 +18,7 @@
   "dependencies": {
     "@monaco-editor/react": "^4.7.0",
     "@tauri-apps/api": "^2.10.1",
+    "@tauri-apps/plugin-dialog": "^2",
     "@tauri-apps/plugin-opener": "^2",
     "@tauri-apps/plugin-process": "^2",
     "@tauri-apps/plugin-updater": "^2",

apps/desktop/package.json

@@ -21,6 +21,7 @@ tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }
 tauri-plugin-deep-link = "2"
 tauri-plugin-updater = "2"
 tauri-plugin-autostart = "2"
+tauri-plugin-dialog = "2"
 image = { version = "0.25", default-features = false, features = ["png"] }
 serde.workspace = true
 serde_json.workspace = true

apps/desktop/src-tauri/Cargo.toml

@@ -16,6 +16,7 @@
     "core:window:allow-set-focus",
     "opener:default",
     "deep-link:default",
-    "updater:default"
+    "updater:default",
+    "dialog:default"
   ]
 }

apps/desktop/src-tauri/capabilities/default.json

@@ -188,6 +188,7 @@ pub fn run() {
 
     tauri::Builder::default()
         .plugin(tauri_plugin_opener::init())
+        .plugin(tauri_plugin_dialog::init())
         .plugin(tauri_plugin_deep_link::init())
         .plugin(tauri_plugin_autostart::init(
             tauri_plugin_autostart::MacosLauncher::LaunchAgent,

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

@@ -8,6 +8,7 @@
  */
 
 import { useEffect, useState, useCallback } from 'react';
+import { open } from '@tauri-apps/plugin-dialog';
 import {
   ChevronDown,
   ChevronRight,
@@ -17,6 +18,7 @@ import {
   Loader2,
   Clock,
   FileJson,
+  FolderOpen,
 } from 'lucide-react';
 import { ServerActionMenu } from './ServerActionMenu';
 import type { ServerViewModel, ServerDefinition, InstalledServerState, InputDefinition } from '../../types/registry';
@@ -1338,16 +1340,67 @@ export function ServersPage() {
                           className="input w-full"
                         />
                       );
-                    case 'password':
+                    case 'select':
                       return (
-                        <input
-                          type="password"
+                        <select
                           value={currentValue}
                           onChange={(e) => handleChange(e.target.value)}
-                          placeholder={input.placeholder || `Enter ${input.label.toLowerCase()}...`}
                           className="input w-full"
                           data-testid={`config-input-${input.id}`}
-                        />
+                        >
+                          <option value="">{input.placeholder || `Select ${input.label.toLowerCase()}...`}</option>
+                          {(input.options ?? []).map((opt) => (
+                            <option key={opt.value} value={opt.value}>
+                              {opt.label}
+                            </option>
+                          ))}
+                        </select>
+                      );
+                    case 'file_path':
+                      return (
+                        <div className="flex gap-2">
+                          <input
+                            type="text"
+                            value={currentValue}
+                            onChange={(e) => handleChange(e.target.value)}
+                            placeholder={input.placeholder || 'Select a file...'}
+                            className="input w-full"
+                            data-testid={`config-input-${input.id}`}
+                          />
+                          <button
+                            type="button"
+                            className="btn btn-secondary shrink-0 px-2"
+                            onClick={async () => {
+                              const selected = await open({ multiple: false });
+                              if (selected) handleChange(selected);
+                            }}
+                          >
+                            <FolderOpen className="w-4 h-4" />
+                          </button>
+                        </div>
+                      );
+                    case 'directory_path':
+                      return (
+                        <div className="flex gap-2">
+                          <input
+                            type="text"
+                            value={currentValue}
+                            onChange={(e) => handleChange(e.target.value)}
+                            placeholder={input.placeholder || 'Select a directory...'}
+                            className="input w-full"
+                            data-testid={`config-input-${input.id}`}
+                          />
+                          <button
+                            type="button"
+                            className="btn btn-secondary shrink-0 px-2"
+                            onClick={async () => {
+                              const selected = await open({ directory: true });
+                              if (selected) handleChange(selected);
+                            }}
+                          >
+                            <FolderOpen className="w-4 h-4" />
+                          </button>
+                        </div>
                       );
                     case 'text':
                     default:

apps/desktop/src/features/servers/ServersPage.tsx

@@ -8,8 +8,10 @@ export interface InputDefinition {
   label: string;
   description?: string;
   /** Input type - determines how the field is rendered */
-  type?: 'text' | 'password' | 'boolean' | 'number' | 'url';
+  type?: 'text' | 'boolean' | 'number' | 'url' | 'select' | 'file_path' | 'directory_path';
   required?: boolean;
+  /** Predefined options for select input type */
+  options?: { value: string; label: string; description?: string }[];
   secret?: boolean;
   placeholder?: string;
   /** URL to obtain credentials/values */

apps/desktop/src/types/registry.ts

@@ -11,6 +11,7 @@
 
 use std::ffi::OsString;
 use std::sync::OnceLock;
+#[cfg(unix)]
 use tracing::{debug, info, warn};
 
 /// Cached shell PATH, resolved once on first access.

crates/mcpmux-gateway/src/pool/transport/shell_env.rs

@@ -24,6 +24,11 @@ vi.mock('@tauri-apps/plugin-updater', () => ({
   Update: vi.fn(),
 }));
 
+// Mock Tauri dialog plugin
+vi.mock('@tauri-apps/plugin-dialog', () => ({
+  open: vi.fn(),
+}));
+
 // Mock Tauri process plugin
 vi.mock('@tauri-apps/plugin-process', () => ({
   relaunch: vi.fn(),