Merge remote-tracking branch 'origin/fix/mcp-discovery-races' into fix/mcp-discovery-races

Author: j15z

apps/sim/lib/mcp/service.test.ts

@@ -517,6 +517,23 @@ describe('McpService.discoverTools per-server caching', () => {
     )
   })
 
+  it('acquires a fresh mutation on each discovery retry so a retried result still publishes', async () => {
+    const serverKey = `workspace:${WORKSPACE_ID}:server:mcp-a`
+    mockGetWorkspaceServersRows.mockResolvedValue([dbRow('mcp-a', 'A')])
+    mockCacheAdapter.beginMutation.mockClear()
+    mockListTools
+      .mockRejectedValueOnce(new Error('Request timed out'))
+      .mockResolvedValueOnce([tool('a1', 'mcp-a')])
+
+    const tools = await mcpService.discoverServerTools(USER_ID, 'mcp-a', WORKSPACE_ID, true)
+
+    expect(tools).toEqual([tool('a1', 'mcp-a')])
+    expect(cacheStore.get(serverKey)?.tools).toEqual([tool('a1', 'mcp-a')])
+    // One begin per attempt: the retry publishes under a current ownership id
+    // instead of a stale pre-loop id that a concurrent clearCache could supersede.
+    expect(mockCacheAdapter.beginMutation).toHaveBeenCalledTimes(2)
+  })
+
   it('keeps an older ordered publisher from superseding a retry-acquired mutation', async () => {
     const serverKey = `workspace:${WORKSPACE_ID}:server:mcp-a`
     mockGetWorkspaceServersRows.mockResolvedValue([dbRow('mcp-a', 'A')])

apps/sim/lib/mcp/service.ts

@@ -1070,8 +1070,11 @@ class McpService {
     }
 
     for (let attempt = 0; attempt < maxRetries; attempt++) {
-      const mutation = await this.beginServerCacheMutation(workspaceId, serverId)
       let config: McpServerConfig | null = null
+      // Begin a fresh mutation per attempt. A retry that succeeds after a
+      // concurrent clearCache must publish under a current ownership id — a
+      // stale pre-loop id would lose the CAS and drop otherwise-valid tools.
+      const mutation = await this.beginServerCacheMutation(workspaceId, serverId)
       try {
         logger.info(
           `[${requestId}] Discovering tools from server ${serverId} for user ${userId}${attempt > 0 ? ` (attempt ${attempt + 1})` : ''}`