updates tests

Author: Mohammod Al Amin Ashik

apps/desktop/src-tauri/build.rs

@@ -12,9 +12,9 @@ fn main() {
             }
         }
     }
-    
+
     // Tell Cargo to re-run this script if tauri.conf.json changes
     println!("cargo:rerun-if-changed=tauri.conf.json");
-    
+
     tauri_build::build()
 }

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

@@ -10,8 +10,8 @@ use tauri::State;
 use tokio::sync::RwLock;
 use uuid::Uuid;
 
-use crate::state::AppState;
 use crate::commands::gateway::GatewayAppState;
+use crate::state::AppState;
 
 /// Response for client listing
 #[derive(Debug, Serialize)]
@@ -28,7 +28,9 @@ pub struct ClientResponse {
 impl From<Client> for ClientResponse {
     fn from(c: Client) -> Self {
         let (mode, locked_id) = match &c.connection_mode {
-            ConnectionMode::Locked { space_id } => ("locked".to_string(), Some(space_id.to_string())),
+            ConnectionMode::Locked { space_id } => {
+                ("locked".to_string(), Some(space_id.to_string()))
+            }
             ConnectionMode::FollowActive => ("follow_active".to_string(), None),
             ConnectionMode::AskOnChange { .. } => ("ask_on_change".to_string(), None),
         };

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

@@ -1,8 +1,8 @@
 //! Commands for managing client-specific custom feature sets
 
-use tauri::State;
 use crate::state::AppState;
 use mcpmux_core::{FeatureSet, FeatureSetType};
+use tauri::State;
 
 /// Find or create a custom feature set for a specific client in a space
 /// This ensures only one custom feature set exists per client per space
@@ -13,20 +13,20 @@ pub async fn find_or_create_client_custom_feature_set(
     space_id: String,
 ) -> Result<FeatureSet, String> {
     let custom_set_name = format!("{} - Custom", client_name);
-    
+
     // First, try to find existing custom feature set
     let existing_sets = state
         .feature_set_repository
         .list_by_space(&space_id)
         .await
         .map_err(|e| format!("Failed to list feature sets: {}", e))?;
-    
+
     // Look for existing custom feature set with this name
-    if let Some(existing) = existing_sets.iter().find(|fs| 
-        fs.name == custom_set_name && 
-        fs.feature_set_type == FeatureSetType::Custom &&
-        !fs.is_deleted
-    ) {
+    if let Some(existing) = existing_sets.iter().find(|fs| {
+        fs.name == custom_set_name
+            && fs.feature_set_type == FeatureSetType::Custom
+            && !fs.is_deleted
+    }) {
         // Load members
         return state
             .feature_set_repository
@@ -35,18 +35,17 @@ pub async fn find_or_create_client_custom_feature_set(
             .map_err(|e| format!("Failed to load feature set: {}", e))?
             .ok_or_else(|| "Feature set not found".to_string());
     }
-    
+
     // No existing set found, create a new one
     let new_set = FeatureSet::new_custom(&custom_set_name, &space_id)
         .with_description(format!("Custom features for {}", client_name))
         .with_icon("⚙️");
-    
+
     state
         .feature_set_repository
         .create(&new_set)
         .await
         .map_err(|e| format!("Failed to create custom feature set: {}", e))?;
-    
+
     Ok(new_set)
 }
-

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

@@ -2,7 +2,9 @@
 //!
 //! IPC commands for generating MCP configuration files for clients.
 
-use mcpmux_core::{ConfigExporter, ConfigFormat, ResolvedTransport, ResolvedServer, TransportConfig};
+use mcpmux_core::{
+    ConfigExporter, ConfigFormat, ResolvedServer, ResolvedTransport, TransportConfig,
+};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
 use std::path::PathBuf;
@@ -78,27 +80,29 @@ async fn build_resolved_servers(
         if let Some(entry) = inst.get_definition() {
             // Build resolved transport from registry transport + input values
             let transport = match &entry.transport {
-                TransportConfig::Stdio { command, args, env, .. } => {
+                TransportConfig::Stdio {
+                    command, args, env, ..
+                } => {
                     // Resolve placeholders in command
                     let resolved_command = resolve_placeholders(command, &inst.input_values);
-                    
+
                     // Resolve placeholders in args
                     let mut resolved_args: Vec<String> = args
                         .iter()
                         .map(|arg| resolve_placeholders(arg, &inst.input_values))
                         .collect();
-                    
+
                     // Append user's extra args
                     resolved_args.extend(inst.args_append.clone());
 
                     // Build env from registry + input values + env_overrides
                     let mut resolved_env = HashMap::new();
-                    
+
                     // 1. Start with registry env
                     for (k, v) in env {
                         resolved_env.insert(k.clone(), resolve_placeholders(v, &inst.input_values));
                     }
-                    
+
                     // 2. Add input values (for api_key type servers)
                     if !mask_credentials {
                         resolved_env.extend(inst.input_values.clone());
@@ -107,7 +111,7 @@ async fn build_resolved_servers(
                             resolved_env.insert(k.clone(), "***MASKED***".to_string());
                         }
                     }
-                    
+
                     // 3. Apply user's env overrides
                     resolved_env.extend(inst.env_overrides.clone());
 
@@ -119,16 +123,16 @@ async fn build_resolved_servers(
                 }
                 TransportConfig::Http { url, headers, .. } => {
                     let resolved_url = resolve_placeholders(url, &inst.input_values);
-                    
+
                     // Resolve headers from registry
                     let mut resolved_headers: HashMap<String, String> = headers
                         .iter()
                         .map(|(k, v)| (k.clone(), resolve_placeholders(v, &inst.input_values)))
                         .collect();
-                    
+
                     // Add user's extra headers
                     resolved_headers.extend(inst.extra_headers.clone());
-                    
+
                     ResolvedTransport::Http {
                         url: resolved_url,
                         headers: resolved_headers,

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

@@ -8,8 +8,8 @@ use tauri::State;
 use tokio::sync::RwLock;
 use uuid::Uuid as StdUuid;
 
-use crate::state::AppState;
 use crate::commands::gateway::GatewayAppState;
+use crate::state::AppState;
 
 /// Add an individual feature (tool/prompt/resource) to a feature set
 #[tauri::command]
@@ -21,7 +21,7 @@ pub async fn add_feature_to_set(
     mode: String,
 ) -> Result<(), String> {
     let app_state = &*state;
-    
+
     let mode = match mode.as_str() {
         "include" => MemberMode::Include,
         "exclude" => MemberMode::Exclude,
@@ -33,12 +33,12 @@ pub async fn add_feature_to_set(
         .add_feature_member(&feature_set_id, &feature_id, mode)
         .await
         .map_err(|e| format!("Failed to add feature to set: {}", e))?;
-    
+
     // Emit domain event if gateway is running
     let gw_state = gateway_state.read().await;
     if let Some(ref gw) = gw_state.gateway_state {
         let gw = gw.read().await;
-        
+
         // Get feature set to access space_id
         if let Ok(Some(fs)) = app_state.feature_set_repository.get(&feature_set_id).await {
             if let Some(space_id_str) = fs.space_id {
@@ -72,12 +72,12 @@ pub async fn remove_feature_from_set(
         .remove_feature_member(&feature_set_id, &feature_id)
         .await
         .map_err(|e| format!("Failed to remove feature from set: {}", e))?;
-    
+
     // Emit domain event if gateway is running
     let gw_state = gateway_state.read().await;
     if let Some(ref gw) = gw_state.gateway_state {
         let gw = gw.read().await;
-        
+
         // Get feature set to access space_id
         if let Ok(Some(fs)) = app_state.feature_set_repository.get(&feature_set_id).await {
             if let Some(space_id_str) = fs.space_id {
@@ -112,4 +112,3 @@ pub async fn get_feature_set_members(
 
     Ok(members)
 }
-

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

@@ -2,17 +2,17 @@
 //!
 //! IPC commands for managing feature sets (permission bundles).
 
+use chrono::Utc;
 use mcpmux_core::{FeatureSet, FeatureSetMember, MemberMode, MemberType};
 use serde::{Deserialize, Serialize};
-use tauri::State;
-use chrono::Utc;
 use std::sync::Arc;
+use tauri::State;
 use tokio::sync::RwLock;
 use tracing::warn;
 use uuid::Uuid as StdUuid;
 
-use crate::state::AppState;
 use crate::commands::gateway::GatewayAppState;
+use crate::state::AppState;
 
 /// Response for feature set member
 #[derive(Debug, Serialize)]
@@ -89,9 +89,9 @@ pub struct UpdateFeatureSetInput {
 /// Input for adding a member to a feature set
 #[derive(Debug, Deserialize)]
 pub struct AddMemberInput {
-    pub member_type: String,  // "feature" or "feature_set"
+    pub member_type: String, // "feature" or "feature_set"
     pub member_id: String,
-    pub mode: Option<String>,  // "include" or "exclude", defaults to "include"
+    pub mode: Option<String>, // "include" or "exclude", defaults to "include"
 }
 
 /// List all feature sets.
@@ -127,7 +127,7 @@ pub async fn list_feature_sets_by_space(
         .list_for_space(&space_id)
         .await
         .map_err(|e: anyhow::Error| e.to_string())?;
-    
+
     let enabled_server_ids: std::collections::HashSet<String> = installed_servers
         .into_iter()
         .filter(|s| s.enabled)
@@ -140,7 +140,9 @@ pub async fn list_feature_sets_by_space(
         .filter(|fs| {
             if fs.feature_set_type == mcpmux_core::FeatureSetType::ServerAll {
                 // Only include if server is enabled
-                fs.server_id.as_ref().is_some_and(|sid| enabled_server_ids.contains(sid))
+                fs.server_id
+                    .as_ref()
+                    .is_some_and(|sid| enabled_server_ids.contains(sid))
             } else {
                 true
             }
@@ -189,11 +191,11 @@ pub async fn create_feature_set(
     gateway_state: State<'_, Arc<RwLock<GatewayAppState>>>,
 ) -> Result<FeatureSetResponse, String> {
     let mut feature_set = FeatureSet::new_custom(&input.name, &input.space_id);
-    
+
     if let Some(desc) = input.description {
         feature_set = feature_set.with_description(desc);
     }
-    
+
     if let Some(icon) = input.icon {
         feature_set = feature_set.with_icon(icon);
     }
@@ -203,12 +205,12 @@ pub async fn create_feature_set(
         .create(&feature_set)
         .await
         .map_err(|e| e.to_string())?;
-    
+
     // Emit domain event if gateway is running
     let gw_state = gateway_state.read().await;
     if let Some(ref gw) = gw_state.gateway_state {
         let gw = gw.read().await;
-        
+
         // Parse space_id as Uuid
         if let Ok(space_uuid) = StdUuid::parse_str(&input.space_id) {
             gw.emit_domain_event(mcpmux_core::DomainEvent::FeatureSetCreated {
@@ -236,18 +238,18 @@ pub async fn delete_feature_set(
         .get(&id)
         .await
         .map_err(|e| e.to_string())?;
-    
+
     state
         .feature_set_repository
         .delete(&id)
         .await
         .map_err(|e| e.to_string())?;
-    
+
     // Emit domain event if gateway is running
     let gw_state = gateway_state.read().await;
     if let Some(ref gw) = gw_state.gateway_state {
         let gw = gw.read().await;
-        
+
         // Only emit if we found the feature set and it has a space_id
         if let Some(fs) = feature_set {
             if let Some(space_id_str) = fs.space_id {
@@ -260,7 +262,7 @@ pub async fn delete_feature_set(
             }
         }
     }
-    
+
     Ok(())
 }
 
@@ -336,7 +338,10 @@ pub async fn update_feature_set(
     let space_id = feature_set.space_id.as_deref().unwrap_or("default");
     let gw_state = gateway_state.read().await;
     if let Some(ref grant_service) = gw_state.grant_service {
-        if let Err(e) = grant_service.notify_feature_set_modified(space_id, &id).await {
+        if let Err(e) = grant_service
+            .notify_feature_set_modified(space_id, &id)
+            .await
+        {
             warn!("[FeatureSet] Failed to emit notifications: {}", e);
         }
     }
@@ -380,9 +385,11 @@ pub async fn add_feature_set_member(
         .unwrap_or(MemberMode::Include);
 
     // Check for duplicates
-    if feature_set.members.iter().any(|m| {
-        m.member_type == member_type && m.member_id == input.member_id
-    }) {
+    if feature_set
+        .members
+        .iter()
+        .any(|m| m.member_type == member_type && m.member_id == input.member_id)
+    {
         return Err("Member already exists in this feature set".to_string());
     }
 
@@ -425,7 +432,10 @@ pub async fn add_feature_set_member(
     let space_id = feature_set.space_id.as_deref().unwrap_or("default");
     let gw_state = gateway_state.read().await;
     if let Some(ref grant_service) = gw_state.grant_service {
-        if let Err(e) = grant_service.notify_feature_set_modified(space_id, &feature_set_id).await {
+        if let Err(e) = grant_service
+            .notify_feature_set_modified(space_id, &feature_set_id)
+            .await
+        {
             warn!("[FeatureSet] Failed to emit notifications: {}", e);
         }
     }
@@ -465,7 +475,10 @@ pub async fn remove_feature_set_member(
     let space_id = feature_set.space_id.as_deref().unwrap_or("default");
     let gw_state = gateway_state.read().await;
     if let Some(ref grant_service) = gw_state.grant_service {
-        if let Err(e) = grant_service.notify_feature_set_modified(space_id, &feature_set_id).await {
+        if let Err(e) = grant_service
+            .notify_feature_set_modified(space_id, &feature_set_id)
+            .await
+        {
             warn!("[FeatureSet] Failed to emit notifications: {}", e);
         }
     }
@@ -544,7 +557,10 @@ pub async fn set_feature_set_members(
     let space_id = feature_set.space_id.as_deref().unwrap_or("default");
     let gw_state = gateway_state.read().await;
     if let Some(ref grant_service) = gw_state.grant_service {
-        if let Err(e) = grant_service.notify_feature_set_modified(space_id, &feature_set_id).await {
+        if let Err(e) = grant_service
+            .notify_feature_set_modified(space_id, &feature_set_id)
+            .await
+        {
             warn!("[FeatureSet] Failed to emit notifications: {}", e);
         }
     }