updates tests

Author: Mohammod Al Amin Ashik

.github/workflows/ci.yml

@@ -6,16 +6,20 @@ on:
   pull_request:
     branches: [main]
 
+# Cancel in-progress runs when a new commit is pushed to the same PR.
+# PR: same group per PR so new push cancels previous run. Push to main: unique group so no cancel.
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.sha }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 
 env:
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: 1
   # Cache keys for better hit rates
   RUST_CACHE_KEY: v1
   PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/.cache/ms-playwright
+  # Linux: pkg-config must find glib-2.0.pc (set before any cargo step; only used on Linux)
+  PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 
 jobs:
   # ─────────────────────────────────────────────────────────────
@@ -28,12 +32,13 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           components: rustfmt, clippy
-      - uses: Swatinem/rust-cache@v2
 
       - name: Install Linux deps
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
+          sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
+
+      - uses: Swatinem/rust-cache@v2
 
       - name: Format check
         run: cargo fmt --all --check
@@ -85,16 +90,17 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.target }}
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.target }}
 
-      # Linux dependencies for Tauri
+      # Linux dependencies for Tauri (before rust-cache so cargo can find glib)
       - name: Install Linux deps
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
+          sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.target }}
 
       # Install cargo-nextest
       - name: Install nextest
@@ -134,6 +140,13 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.target }}
+
+      - name: Install Linux deps
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
+
       - uses: Swatinem/rust-cache@v2
         with:
           key: ${{ matrix.target }}-build
@@ -143,12 +156,6 @@ jobs:
           node-version: 20
           cache: 'pnpm'
 
-      - name: Install Linux deps
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
-
       - run: pnpm install --frozen-lockfile
       - run: pnpm build
         env:
@@ -216,9 +223,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-        with:
-          key: ${{ matrix.os }}-e2e
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
@@ -229,7 +233,11 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
+          sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          key: ${{ matrix.os }}-e2e
 
       # Cache tauri-driver binary
       - name: Cache tauri-driver

.github/workflows/e2e-tauri-comment.yml

@@ -7,6 +7,9 @@ on:
   issue_comment:
     types: [created]
 
+env:
+  PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
+
 jobs:
   e2e-tauri:
     # Only run when comment on a PR contains /e2e-tauri
@@ -44,6 +47,13 @@ jobs:
           ref: ${{ steps.pr.outputs.sha }}
 
       - uses: dtolnay/rust-toolchain@stable
+
+      - name: Install Linux deps
+        if: matrix.os == 'ubuntu-latest'
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y pkg-config libglib2.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
+
       - uses: Swatinem/rust-cache@v2
         with:
           key: ${{ matrix.os }}-e2e-comment
@@ -54,12 +64,6 @@ jobs:
           node-version: 20
           cache: 'pnpm'
 
-      - name: Install Linux deps
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev webkit2gtk-driver xvfb
-
       - name: Cache tauri-driver
         uses: actions/cache@v4
         id: tauri-driver-cache

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)
 }
-