fix: validate activeSpaceId on load and scope connected count per space

Two bugs fixed:

1. appStore.setSpaces now validates that the persisted activeSpaceId
   still exists in the loaded spaces list. Previously it only checked
   for null/undefined, so a deleted space ID (e.g. from e2e tests)
   would persist and cause viewSpace to resolve to null, making the
   entire "My Servers" page and dashboard installed count show empty.

2. Gateway connected_backends count is now scoped to the viewing space.
   Added ServerManager.connected_count_for_space() and passed space_id
   through get_gateway_status command so Dashboard and ServersPage show
   the correct connected count for the space being viewed.

Author: Mohammod Al Amin Ashik

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

@@ -504,9 +504,10 @@ fn create_gateway_dependencies(
     builder.build().map_err(|e: String| e)
 }
 
-/// Get gateway status
+/// Get gateway status, optionally scoped to a specific space
 #[tauri::command]
 pub async fn get_gateway_status(
+    space_id: Option<String>,
     gateway_state: State<'_, Arc<RwLock<GatewayAppState>>>,
     server_manager_state: State<'_, Arc<RwLock<ServerManagerState>>>,
 ) -> Result<GatewayStatus, String> {
@@ -519,19 +520,24 @@ pub async fn get_gateway_status(
         0
     };
 
-    // Get connected count from ServerManager
+    // Get connected count from ServerManager, scoped to space if provided
     let connected_backends = {
         let sm_state = server_manager_state.read().await;
         if let Some(ref manager) = sm_state.manager {
-            manager.connected_count().await
+            if let Some(ref sid) = space_id {
+                let uuid = Uuid::parse_str(sid).map_err(|e| e.to_string())?;
+                manager.connected_count_for_space(&uuid).await
+            } else {
+                manager.connected_count().await
+            }
         } else {
             0
         }
     };
 
     info!(
-        "[Gateway] get_gateway_status: running={}, url={:?}, sessions={}, backends={}",
-        state.running, state.url, active_sessions, connected_backends
+        "[Gateway] get_gateway_status: running={}, url={:?}, sessions={}, backends={}, space={:?}",
+        state.running, state.url, active_sessions, connected_backends, space_id
     );
 
     Ok(GatewayStatus {

apps/desktop/src/App.tsx

@@ -230,7 +230,7 @@ function DashboardView() {
         import('@/lib/api/featureSets').then((m) =>
           viewSpace?.id ? m.listFeatureSetsBySpace(viewSpace.id) : m.listFeatureSets()
         ),
-        import('@/lib/api/gateway').then((m) => m.getGatewayStatus()),
+        import('@/lib/api/gateway').then((m) => m.getGatewayStatus(viewSpace?.id)),
         import('@/lib/api/registry').then((m) => m.listInstalledServers(viewSpace?.id)),
       ]);
       console.log('[Dashboard] Gateway status received:', gateway);

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

@@ -273,7 +273,7 @@ export function ServersPage() {
       // Use allSettled so we can show installed servers even if registry is offline
       const [installedResult, gatewayResult, definitionsResult] = await Promise.allSettled([
         import('@/lib/api/registry').then((m) => m.listInstalledServers(viewSpace?.id)),
-        import('@/lib/api/gateway').then((m) => m.getGatewayStatus()),
+        import('@/lib/api/gateway').then((m) => m.getGatewayStatus(viewSpace?.id)),
         import('@/lib/api/registry').then((m) => m.discoverServers()),
       ]);
 

apps/desktop/src/lib/api/gateway.ts

@@ -18,8 +18,8 @@ export type ExportFormat = 'cursor' | 'vscode' | 'claude';
 /**
  * Get gateway status.
  */
-export async function getGatewayStatus(): Promise<GatewayStatus> {
-  return invoke('get_gateway_status');
+export async function getGatewayStatus(spaceId?: string): Promise<GatewayStatus> {
+  return invoke('get_gateway_status', { spaceId });
 }
 
 /**

apps/desktop/src/stores/appStore.ts

@@ -24,8 +24,11 @@ export const useAppStore = create<AppStore>()(
       setSpaces: (spaces) =>
         set((state) => {
           state.spaces = spaces;
-          // Auto-select active space if none selected
-          if (!state.activeSpaceId && spaces.length > 0) {
+          // Validate persisted activeSpaceId still exists, reset to default if not
+          const activeExists = state.activeSpaceId
+            ? spaces.some((s) => s.id === state.activeSpaceId)
+            : false;
+          if (!activeExists && spaces.length > 0) {
             const defaultSpace = spaces.find((s) => s.is_default);
             state.activeSpaceId = defaultSpace?.id ?? spaces[0].id;
           }

crates/mcpmux-gateway/src/pool/server_manager.rs

@@ -280,6 +280,20 @@ impl ServerManager {
         count
     }
 
+    /// Count connected servers for a specific space
+    pub async fn connected_count_for_space(&self, space_id: &Uuid) -> usize {
+        let mut count = 0;
+        for entry in self.states.iter() {
+            if &entry.key().space_id == space_id {
+                let state = entry.value().read().await;
+                if state.status == ConnectionStatus::Connected {
+                    count += 1;
+                }
+            }
+        }
+        count
+    }
+
     /// Emit a domain event (unified event system)
     fn emit(&self, event: DomainEvent) {
         // Trace Refreshing events to find the source

tests/ts/stores/appStore.test.ts

@@ -55,6 +55,50 @@ describe('appStore', () => {
 
       expect(useAppStore.getState().viewSpaceId).toBe(useAppStore.getState().activeSpaceId);
     });
+
+    it('should reset activeSpaceId when persisted value points to deleted space', () => {
+      const spaces = [
+        createTestSpace({ name: 'Space A', is_default: false }),
+        createDefaultSpace({ name: 'Default Space' }),
+      ];
+      // Simulate a persisted activeSpaceId that no longer exists in the spaces list
+      useAppStore.setState({ activeSpaceId: 'deleted-space-id' });
+      useAppStore.getState().setSpaces(spaces);
+
+      // Should fallback to the default space
+      expect(useAppStore.getState().activeSpaceId).toBe(spaces[1].id);
+    });
+
+    it('should reset activeSpaceId to first space when no default exists', () => {
+      const spaces = [
+        createTestSpace({ name: 'Space A', is_default: false }),
+        createTestSpace({ name: 'Space B', is_default: false }),
+      ];
+      useAppStore.setState({ activeSpaceId: 'deleted-space-id' });
+      useAppStore.getState().setSpaces(spaces);
+
+      expect(useAppStore.getState().activeSpaceId).toBe(spaces[0].id);
+    });
+
+    it('should keep activeSpaceId when it still exists in spaces list', () => {
+      const spaces = createTestSpaces(3);
+      useAppStore.setState({ activeSpaceId: spaces[1].id });
+      useAppStore.getState().setSpaces(spaces);
+
+      expect(useAppStore.getState().activeSpaceId).toBe(spaces[1].id);
+    });
+
+    it('should reset both activeSpaceId and viewSpaceId when both point to deleted spaces', () => {
+      const spaces = [createDefaultSpace({ name: 'My Space' })];
+      useAppStore.setState({
+        activeSpaceId: 'deleted-active-id',
+        viewSpaceId: 'deleted-view-id',
+      });
+      useAppStore.getState().setSpaces(spaces);
+
+      expect(useAppStore.getState().activeSpaceId).toBe(spaces[0].id);
+      expect(useAppStore.getState().viewSpaceId).toBe(spaces[0].id);
+    });
   });
 
   describe('setActiveSpace', () => {