fix(e2e): add testids for FeatureSet panel close button and overlay

- Add data-testid='featureset-panel-close' to X close button
- Add data-testid='featureset-panel-overlay' to backdrop overlay
- Update featureset.wdio.ts to click close button/overlay instead of Escape key

Fixes TC-FS-004 and Cleanup tests failing because panel was blocking navigation

Author: Mohammod Al Amin Ashik

.github/actions/install-linux-deps/action.yml

@@ -1,5 +1,5 @@
 name: Install Linux deps
-description: Install build and runtime deps for Tauri app on Ubuntu
+description: Install build and runtime deps for Tauri app on Ubuntu (with caching)
 inputs:
   e2e:
     description: Include E2E desktop deps (webkit2gtk-driver, xvfb, gnome-keyring)
@@ -12,22 +12,31 @@ inputs:
 runs:
   using: composite
   steps:
-    - name: Install Linux deps
+    # Cache apt packages to avoid re-downloading on every run
+    # Uses awalsh128/cache-apt-pkgs-action for efficient caching
+    - name: Cache apt packages (base)
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: build-essential pkg-config libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev
+        version: 1.0
+
+    - name: Cache apt packages (E2E)
+      if: ${{ inputs.e2e == 'true' }}
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: webkit2gtk-driver xvfb gnome-keyring
+        version: 1.0
+
+    - name: Verify glib installation
+      if: ${{ inputs.verify_glib == 'true' }}
       shell: bash
       run: |
-        BASE_DEPS="build-essential pkg-config libglib2.0-dev libgtk-3-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf libsecret-1-dev"
-        E2E_DEPS="webkit2gtk-driver xvfb gnome-keyring"
-        sudo apt-get update
-        if [ "${{ inputs.e2e }}" = "true" ]; then
-          sudo apt-get install -y $BASE_DEPS $E2E_DEPS
-        else
-          sudo apt-get install -y $BASE_DEPS
-        fi
-        if [ "${{ inputs.verify_glib }}" = "true" ]; then
-          echo "=== Verifying glib-2.0 installation ==="
-          dpkg -l | grep libglib2.0-dev || echo "libglib2.0-dev not installed"
-          find /usr -name 'glib-2.0.pc' 2>/dev/null || echo "glib-2.0.pc not found"
-          pkg-config --modversion glib-2.0 || echo "pkg-config cannot find glib-2.0"
-          pkg-config --exists 'glib-2.0 >= 2.70' && echo "glib-2.0 >= 2.70 found" || (echo "ERROR: glib-2.0 >= 2.70 not found"; exit 1)
-        fi
-        echo "PKG_CONFIG_PATH=$(pkg-config --variable pc_path pkg-config)" >> $GITHUB_ENV
+        echo "=== Verifying glib-2.0 installation ==="
+        dpkg -l | grep libglib2.0-dev || echo "libglib2.0-dev not installed"
+        find /usr -name 'glib-2.0.pc' 2>/dev/null || echo "glib-2.0.pc not found"
+        pkg-config --modversion glib-2.0 || echo "pkg-config cannot find glib-2.0"
+        pkg-config --exists 'glib-2.0 >= 2.70' && echo "glib-2.0 >= 2.70 found" || (echo "ERROR: glib-2.0 >= 2.70 not found"; exit 1)
+
+    - name: Set PKG_CONFIG_PATH
+      shell: bash
+      run: echo "PKG_CONFIG_PATH=$(pkg-config --variable pc_path pkg-config)" >> $GITHUB_ENV

.github/workflows/ci.yml

@@ -21,6 +21,8 @@ permissions:
 env:
   CARGO_TERM_COLOR: always
   RUST_BACKTRACE: 1
+  # Faster git fetches for cargo
+  CARGO_NET_GIT_FETCH_WITH_CLI: true
   # Cache keys for better hit rates
   RUST_CACHE_KEY: v1
   PLAYWRIGHT_BROWSERS_PATH: ${{ github.workspace }}/.cache/ms-playwright
@@ -81,6 +83,19 @@ jobs:
           node-version: 20
           cache: 'pnpm'
 
+      # Cache pnpm store for faster installs
+      - name: Get pnpm store directory
+        shell: bash
+        run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Cache pnpm store
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: pnpm-store-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-store-${{ runner.os }}-
+
       - run: pnpm install --frozen-lockfile
       - run: pnpm typecheck
       - run: pnpm lint
@@ -132,9 +147,12 @@ jobs:
         with:
           targets: ${{ matrix.target }}
 
+      # Share cache between rust-test and build jobs for faster compilation
       - uses: Swatinem/rust-cache@v2
         with:
           key: ${{ matrix.target }}
+          shared-key: rust-${{ matrix.target }}
+          cache-on-failure: true
 
       # Install cargo-nextest
       - name: Install nextest
@@ -171,6 +189,7 @@ jobs:
 
   # ─────────────────────────────────────────────────────────────
   # Build Verification (ensures app compiles on all platforms)
+  # Runs after checks pass; uses cached Rust build artifacts
   # ─────────────────────────────────────────────────────────────
   build:
     needs: [rust-check, ts-check]
@@ -199,23 +218,64 @@ jobs:
         env:
           PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 
+      # Use shared cache key so builds benefit from rust-test artifacts
       - uses: Swatinem/rust-cache@v2
         with:
-          key: ${{ matrix.target }}-build
+          key: ${{ matrix.target }}
+          shared-key: rust-${{ matrix.target }}
+          cache-on-failure: true
         env:
           PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
+
       - uses: pnpm/action-setup@v4
       - uses: actions/setup-node@v4
         with:
           node-version: 20
           cache: 'pnpm'
 
+      # Cache pnpm store
+      - name: Get pnpm store directory
+        shell: bash
+        run: echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - name: Cache pnpm store
+        uses: actions/cache@v4
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: pnpm-store-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-store-${{ runner.os }}-
+
+      # Cache Tauri CLI binary (avoid recompiling on every run)
+      - name: Cache Tauri CLI
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/cargo-tauri*
+            ~/.cargo/bin/tauri*
+          key: tauri-cli-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            tauri-cli-${{ runner.os }}-
+
       - run: pnpm install --frozen-lockfile
       - run: pnpm build
         env:
           PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
           TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
 
+      # Upload build artifacts for e2e-desktop to reuse (Linux/Windows only)
+      - name: Upload build artifacts
+        if: matrix.os != 'macos-latest'
+        uses: actions/upload-artifact@v4
+        with:
+          name: tauri-build-${{ matrix.os }}
+          path: |
+            target/release/bundle/
+            target/release/mcpmux*
+            target/release/*.exe
+          retention-days: 1
+          if-no-files-found: ignore
+
   # ─────────────────────────────────────────────────────────────
   # Test Results Report (separate checks per test type and OS)
   # Uses dorny/test-reporter for granular GitHub Check Runs
@@ -397,9 +457,10 @@ jobs:
   # ─────────────────────────────────────────────────────────────
   # E2E Tests (Desktop app with WebDriver - Linux/Windows only)
   # Runs when: main branch, [e2e] in commit, or /e2e-desktop comment on PR
+  # Depends on build to reuse artifacts (avoids rebuilding Tauri ~5-10 min)
   # ─────────────────────────────────────────────────────────────
   e2e-desktop:
-    needs: [e2e-trigger-check]
+    needs: [e2e-trigger-check, build]
     if: needs.e2e-trigger-check.outputs.run_e2e == 'true'
     uses: ./.github/workflows/e2e-desktop.yml
     with:

.github/workflows/e2e-desktop.yml

@@ -44,6 +44,8 @@ jobs:
       - uses: Swatinem/rust-cache@v2
         with:
           key: ${{ matrix.os }}-e2e-desktop
+          shared-key: rust-${{ matrix.os == 'ubuntu-latest' && 'x86_64-unknown-linux-gnu' || 'x86_64-pc-windows-msvc' }}
+          cache-on-failure: true
         env:
           PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 
@@ -53,6 +55,20 @@ jobs:
           node-version: 20
           cache: 'pnpm'
 
+      # Cache pnpm store for faster installs
+      - name: Get pnpm store directory
+        id: pnpm-cache
+        shell: bash
+        run: echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      - name: Cache pnpm store
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+          key: pnpm-store-${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            pnpm-store-${{ runner.os }}-
+
       - name: Cache tauri-driver
         uses: actions/cache@v4
         id: tauri-driver-cache
@@ -66,6 +82,17 @@ jobs:
         env:
           PKG_CONFIG_PATH: /usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig
 
+      # Cache Tauri CLI binary (avoid recompiling on every run)
+      - name: Cache Tauri CLI
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.cargo/bin/cargo-tauri*
+            ~/.cargo/bin/tauri*
+          key: tauri-cli-${{ runner.os }}-${{ hashFiles('**/Cargo.lock') }}
+          restore-keys: |
+            tauri-cli-${{ runner.os }}-
+
       - run: pnpm install --frozen-lockfile
 
       - name: Build app

apps/desktop/src/features/featuresets/FeatureSetPanel.tsx

@@ -327,6 +327,7 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
             </div>
           </div>
           <button
+            data-testid="featureset-panel-close"
             onClick={onClose}
             className="p-1.5 rounded-lg hover:bg-[rgb(var(--surface-hover))] transition-colors flex-shrink-0"
           >

apps/desktop/src/features/featuresets/FeatureSetsPage.tsx

@@ -334,6 +334,7 @@ export function FeatureSetsPage() {
       {/* Overlay backdrop when panel is open */}
       {selectedFeatureSet && (
         <div 
+          data-testid="featureset-panel-overlay"
           className="fixed inset-0 bg-black/20 backdrop-blur-[2px] z-40 animate-in fade-in duration-200"
           onClick={() => setSelectedFeatureSet(null)}
         />

tests/e2e/specs/featureset.wdio.ts

@@ -136,24 +136,25 @@ describe('FeatureSet - Server-All Auto Creation', () => {
   });
 
   it('TC-FS-004: Disable server and verify FeatureSet is hidden', async () => {
-    // Aggressively dismiss any open modal/panel - press Escape multiple times
-    await browser.keys('Escape');
-    await browser.pause(300);
-    await browser.keys('Escape');
-    await browser.pause(500);
-    
-    // Click outside any potential modal to dismiss it
-    const body = await $('body');
-    await body.click({ x: 10, y: 10 });
-    await browser.pause(500);
+    // Close the FeatureSet detail panel if open (from previous test)
+    // First try clicking the panel close button
+    const panelCloseBtn = await byTestId('featureset-panel-close');
+    if (await panelCloseBtn.isDisplayed().catch(() => false)) {
+      console.log('[TC-FS-004] Clicking panel close button');
+      await panelCloseBtn.click();
+      await browser.pause(500);
+    } else {
+      // Try clicking the overlay to close
+      const overlay = await byTestId('featureset-panel-overlay');
+      if (await overlay.isDisplayed().catch(() => false)) {
+        console.log('[TC-FS-004] Clicking panel overlay to close');
+        await overlay.click();
+        await browser.pause(500);
+      }
+    }
 
     const myServersButton = await byTestId('nav-my-servers');
-    // Try clicking even if not fully "clickable" - force the click
-    try {
-      await myServersButton.waitForClickable({ timeout: TIMEOUT.short });
-    } catch {
-      console.log('[TC-FS-004] Nav button not clickable, trying force click');
-    }
+    await myServersButton.waitForClickable({ timeout: TIMEOUT.medium });
     await myServersButton.click();
     await browser.pause(2000);
 
@@ -180,24 +181,15 @@ describe('FeatureSet - Server-All Auto Creation', () => {
   });
 
   it('Cleanup: Uninstall Echo Server', async () => {
-    // Aggressively dismiss any open modal/panel
-    await browser.keys('Escape');
-    await browser.pause(300);
-    await browser.keys('Escape');
-    await browser.pause(500);
-    
-    // Click outside any potential modal to dismiss it
-    const body = await $('body');
-    await body.click({ x: 10, y: 10 });
-    await browser.pause(500);
+    // Close any open panel first
+    const panelCloseBtn = await byTestId('featureset-panel-close');
+    if (await panelCloseBtn.isDisplayed().catch(() => false)) {
+      await panelCloseBtn.click();
+      await browser.pause(500);
+    }
 
     const discoverButton = await byTestId('nav-discover');
-    // Try clicking even if not fully "clickable"
-    try {
-      await discoverButton.waitForClickable({ timeout: TIMEOUT.short });
-    } catch {
-      console.log('[Cleanup] Nav button not clickable, trying force click');
-    }
+    await discoverButton.waitForClickable({ timeout: TIMEOUT.medium });
     await discoverButton.click();
     await browser.pause(2000);