fix(gateway): drop resolution cache on disconnect; unstick TS tests

FeatureService.mark_unavailable wrote the repo flip but left resolve_feature_sets
serving the pre-disconnect tool list. Invalidate the space cache there (and on
delete_for_server) so clients stop seeing tools from a dead server.

TS suite was failing on stale workspaceBindings mocks missing isIdBinding, persist
writes against a missing localStorage, and a wizard payload that now includes
label. importOriginal those mocks, install a memory store in setup, and match the
create args.

Signed-off-by: crimsonsunset <jsangio1@gmail.com>

Author: crimsonsunset

crates/mcpmux-gateway/src/pool/features/facade.rs

@@ -69,11 +69,17 @@ impl FeatureService {
     }
 
     pub async fn mark_unavailable(&self, space_id: &str, server_id: &str) -> Result<()> {
-        self.discovery.mark_unavailable(space_id, server_id).await
+        self.discovery.mark_unavailable(space_id, server_id).await?;
+        self.resolution.invalidate_space(space_id).await;
+        Ok(())
     }
 
     pub async fn delete_for_server(&self, space_id: &str, server_id: &str) -> Result<()> {
-        self.discovery.delete_for_server(space_id, server_id).await
+        self.discovery
+            .delete_for_server(space_id, server_id)
+            .await?;
+        self.resolution.invalidate_space(space_id).await;
+        Ok(())
     }
 
     // Delegate to FeatureResolutionService

crates/mcpmux-gateway/src/pool/features/resolution.rs

@@ -101,7 +101,10 @@ impl FeatureResolutionService {
         });
     }
 
-    async fn invalidate_space(&self, space_id: &str) {
+    /// Drop cached resolutions for one space. Called from the event listener
+    /// and from `FeatureService::mark_unavailable` so a disconnect does not
+    /// keep serving a pre-disconnect tool list.
+    pub async fn invalidate_space(&self, space_id: &str) {
         self.cache
             .write()
             .await

tests/rust/tests/integration/mcp_flows.rs

@@ -694,8 +694,10 @@ async fn test_server_disconnect_marks_features_unavailable() {
         .unwrap();
     assert_eq!(tools_before.len(), 2);
 
-    // Simulate server disconnect
-    ctx.feature_repo
+    // Simulate server disconnect through FeatureService so the resolution
+    // cache drops with the availability flip (repo-only writes leave the
+    // cache serving the pre-disconnect tool list).
+    ctx.service
         .mark_unavailable(&ctx.space_id, "server")
         .await
         .unwrap();

tests/ts/components/App.test.tsx

@@ -137,9 +137,13 @@ vi.mock('@/lib/api/featureSets', () => ({
 vi.mock('@/lib/api/registry', () => ({
   listInstalledServers: vi.fn().mockResolvedValue([]),
 }));
-vi.mock('@/lib/api/workspaceBindings', () => ({
-  listWorkspaceBindings: vi.fn().mockResolvedValue([]),
-}));
+vi.mock('@/lib/api/workspaceBindings', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/lib/api/workspaceBindings')>();
+  return {
+    ...actual,
+    listWorkspaceBindings: vi.fn().mockResolvedValue([]),
+  };
+});
 vi.mock('@/lib/api/serverManager', () => ({
   getServerStatuses: vi.fn().mockResolvedValue({}),
 }));

tests/ts/components/DashboardPageStats.test.tsx

@@ -33,7 +33,10 @@ vi.mock('@/lib/api/featureSets', () => ({
 }));
 vi.mock('@/lib/api/gateway', () => ({ getGatewayStatus: mockGatewayStatus }));
 vi.mock('@/lib/api/registry', () => ({ listInstalledServers: mockListInstalled }));
-vi.mock('@/lib/api/workspaceBindings', () => ({ listWorkspaceBindings: mockListBindings }));
+vi.mock('@/lib/api/workspaceBindings', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/lib/api/workspaceBindings')>();
+  return { ...actual, listWorkspaceBindings: mockListBindings };
+});
 vi.mock('@/lib/api/serverManager', () => ({ getServerStatuses: mockServerStatuses }));
 vi.mock('@/stores', () => ({
   useViewSpace: () => ({ id: 'space-1', name: 'My Space' }),

tests/ts/components/WorkspaceBindingPrompt.test.tsx

@@ -12,24 +12,28 @@ const { workspaceHandlers } = vi.hoisted(() => ({
   workspaceHandlers: new Map<string, (payload: unknown) => void>(),
 }));
 
-vi.mock('@/lib/api/workspaceBindings', () => ({
-  createWorkspaceBinding: vi.fn(),
-  updateWorkspaceBinding: vi.fn().mockResolvedValue(undefined),
-  listWorkspaceBindings: vi.fn().mockResolvedValue([]),
-  validateWorkspaceRoot: vi.fn().mockResolvedValue('/home/u/proj'),
-  getWorkspaceEffectiveFeatures: vi.fn().mockResolvedValue({
-    workspace_root: '/home/u/proj',
-    source: 'unbound',
-    binding_id: null,
-    space_id: 's1',
-    space_name: 'Default',
-    feature_sets: [{ id: 'fs1', name: 'Starter', feature_set_type: 'starter' }],
-    tools: [],
-    prompts: [],
-    resources: [],
-    server_totals: {},
-  }),
-}));
+vi.mock('@/lib/api/workspaceBindings', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/lib/api/workspaceBindings')>();
+  return {
+    ...actual,
+    createWorkspaceBinding: vi.fn(),
+    updateWorkspaceBinding: vi.fn().mockResolvedValue(undefined),
+    listWorkspaceBindings: vi.fn().mockResolvedValue([]),
+    validateWorkspaceRoot: vi.fn().mockResolvedValue('/home/u/proj'),
+    getWorkspaceEffectiveFeatures: vi.fn().mockResolvedValue({
+      workspace_root: '/home/u/proj',
+      source: 'unbound',
+      binding_id: null,
+      space_id: 's1',
+      space_name: 'Default',
+      feature_sets: [{ id: 'fs1', name: 'Starter', feature_set_type: 'starter' }],
+      tools: [],
+      prompts: [],
+      resources: [],
+      server_totals: {},
+    }),
+  };
+});
 
 vi.mock('@/lib/api/spaces', () => ({
   listSpaces: vi.fn().mockResolvedValue([{ id: 's1', name: 'Default', is_default: true }]),

tests/ts/components/WorkspaceSetupWizard.test.tsx

@@ -18,7 +18,10 @@ const { validateMock } = vi.hoisted(() => ({
 // `@tauri-apps/plugin-dialog` is mocked globally in setup.ts (open: vi.fn()).
 // We reconfigure that shared mock per-test via vi.importMock (a static import
 // of this mocked-only package isn't Vite-resolvable from the test).
-vi.mock('@/lib/api/workspaceBindings', () => ({ validateWorkspaceRoot: validateMock }));
+vi.mock('@/lib/api/workspaceBindings', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/lib/api/workspaceBindings')>();
+  return { ...actual, validateWorkspaceRoot: validateMock };
+});
 vi.mock('@/lib/api/featureSets', () => ({
   isStarterFeatureSet: (fs: { feature_set_type: string }) =>
     fs.feature_set_type === 'starter' || fs.feature_set_type === 'default',
@@ -82,6 +85,7 @@ describe('WorkspaceSetupWizard', () => {
       space_id: 's1',
       feature_set_ids: ['fs_starter'],
       binding_type: 'path',
+      label: null,
     });
     // The parent navigates to the new mapping's inspector (effective features);
     // the wizard itself does not close.

tests/ts/components/WorkspacesClearUnmapped.test.tsx

@@ -25,16 +25,20 @@ const {
   clearUnmappedReportedRootsMock: vi.fn(),
 }));
 
-vi.mock('@/lib/api/workspaceBindings', () => ({
-  listWorkspaceBindings: listWorkspaceBindingsMock,
-  listReportedWorkspaceRoots: listReportedWorkspaceRootsMock,
-  clearUnmappedReportedRoots: clearUnmappedReportedRootsMock,
-  createWorkspaceBinding: vi.fn(),
-  updateWorkspaceBinding: vi.fn(),
-  deleteWorkspaceBinding: vi.fn(),
-  getWorkspaceEffectiveFeatures: vi.fn(),
-  validateWorkspaceRoot: vi.fn(),
-}));
+vi.mock('@/lib/api/workspaceBindings', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/lib/api/workspaceBindings')>();
+  return {
+    ...actual,
+    listWorkspaceBindings: listWorkspaceBindingsMock,
+    listReportedWorkspaceRoots: listReportedWorkspaceRootsMock,
+    clearUnmappedReportedRoots: clearUnmappedReportedRootsMock,
+    createWorkspaceBinding: vi.fn(),
+    updateWorkspaceBinding: vi.fn(),
+    deleteWorkspaceBinding: vi.fn(),
+    getWorkspaceEffectiveFeatures: vi.fn(),
+    validateWorkspaceRoot: vi.fn(),
+  };
+});
 
 vi.mock('@/lib/api/featureSets', () => ({
   listFeatureSets: vi.fn().mockResolvedValue([]),

tests/ts/components/WorkspacesMappedFilter.test.tsx

@@ -19,16 +19,20 @@ const { listWorkspaceBindingsMock, listReportedWorkspaceRootsMock } = vi.hoisted
   listReportedWorkspaceRootsMock: vi.fn(),
 }));
 
-vi.mock('@/lib/api/workspaceBindings', () => ({
-  listWorkspaceBindings: listWorkspaceBindingsMock,
-  listReportedWorkspaceRoots: listReportedWorkspaceRootsMock,
-  clearUnmappedReportedRoots: vi.fn(),
-  createWorkspaceBinding: vi.fn(),
-  updateWorkspaceBinding: vi.fn(),
-  deleteWorkspaceBinding: vi.fn(),
-  getWorkspaceEffectiveFeatures: vi.fn(),
-  validateWorkspaceRoot: vi.fn(),
-}));
+vi.mock('@/lib/api/workspaceBindings', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@/lib/api/workspaceBindings')>();
+  return {
+    ...actual,
+    listWorkspaceBindings: listWorkspaceBindingsMock,
+    listReportedWorkspaceRoots: listReportedWorkspaceRootsMock,
+    clearUnmappedReportedRoots: vi.fn(),
+    createWorkspaceBinding: vi.fn(),
+    updateWorkspaceBinding: vi.fn(),
+    deleteWorkspaceBinding: vi.fn(),
+    getWorkspaceEffectiveFeatures: vi.fn(),
+    validateWorkspaceRoot: vi.fn(),
+  };
+});
 
 vi.mock('@/lib/api/featureSets', () => ({
   listFeatureSets: vi

tests/ts/setup.ts

@@ -1,6 +1,43 @@
 import '@testing-library/jest-dom';
 import { vi } from 'vitest';
 
+/**
+ * Zustand persist writes `viewSpaceId` / theme via `localStorage.setItem`.
+ * jsdom usually provides it, but some workers expose `undefined` and every
+ * store mutation then throws. Install a memory backend when the real one is
+ * missing so appStore tests and persist-backed UI clicks stay runnable.
+ */
+function ensureLocalStorage(): void {
+  const existing = (globalThis as { localStorage?: Storage }).localStorage;
+  if (existing && typeof existing.setItem === 'function') {
+    return;
+  }
+  const store = new Map<string, string>();
+  const memory: Storage = {
+    get length() {
+      return store.size;
+    },
+    clear: () => {
+      store.clear();
+    },
+    getItem: (key: string) => store.get(key) ?? null,
+    key: (index: number) => [...store.keys()][index] ?? null,
+    removeItem: (key: string) => {
+      store.delete(key);
+    },
+    setItem: (key: string, value: string) => {
+      store.set(key, String(value));
+    },
+  };
+  Object.defineProperty(globalThis, 'localStorage', {
+    configurable: true,
+    writable: true,
+    value: memory,
+  });
+}
+
+ensureLocalStorage();
+
 // Mock Tauri core API
 vi.mock('@tauri-apps/api/core', () => ({
   invoke: vi.fn(),