fix(web): fire analytics event when a workspace MCP connector is removed (#1257)

Author: msukkari

packages/web/src/ee/features/chat/mcp/actions.test.ts

@@ -17,7 +17,7 @@ const mocks = vi.hoisted(() => ({
     captureEvent: vi.fn(),
     unsafePrisma: {
         mcpServer: {
-            deleteMany: vi.fn(),
+            delete: vi.fn(),
             findFirst: vi.fn(),
         },
         userMcpServer: {
@@ -334,20 +334,55 @@ describe('createStaticOAuthMcpServer', () => {
 });
 
 describe('deleteMcpServer', () => {
-    test('owners delete through the narrowly scoped unsafe client', async () => {
+    test('owners delete through the narrowly scoped unsafe client and track the removal', async () => {
         setAuthContext(OrgRole.OWNER);
-        mocks.unsafePrisma.mcpServer.deleteMany.mockResolvedValue({ count: 1 });
+        mocks.unsafePrisma.mcpServer.findFirst.mockResolvedValue({
+            id: 'server-1',
+            serverUrl: 'https://mcp.linear.app/mcp',
+            clientInfoSource: McpServerClientInfoSource.DYNAMIC,
+        });
+        mocks.unsafePrisma.mcpServer.delete.mockResolvedValue({ id: 'server-1' });
 
         await expect(deleteMcpServer('server-1')).resolves.toEqual({ success: true });
-        expect(mocks.unsafePrisma.mcpServer.deleteMany).toHaveBeenCalledWith({
+        expect(mocks.unsafePrisma.mcpServer.findFirst).toHaveBeenCalledWith({
             where: {
                 id: 'server-1',
                 orgId: 1,
             },
+            select: {
+                id: true,
+                serverUrl: true,
+                clientInfoSource: true,
+            },
+        });
+        expect(mocks.unsafePrisma.mcpServer.delete).toHaveBeenCalledWith({
+            where: {
+                id: 'server-1',
+            },
+        });
+        expect(mocks.captureEvent).toHaveBeenCalledWith('ask_mcp_connector_removed', {
+            source: 'sourcebot-web-client',
+            entryPoint: 'workspace_settings',
+            serverId: 'server-1',
+            serverUrl: 'https://mcp.linear.app/mcp',
+            authMode: 'dynamic',
         });
         expect(mocks.hasEntitlement).not.toHaveBeenCalled();
     });
 
+    test('returns not found and tracks nothing when the connector does not exist', async () => {
+        setAuthContext(OrgRole.OWNER);
+        mocks.unsafePrisma.mcpServer.findFirst.mockResolvedValue(null);
+
+        const result = await deleteMcpServer('server-1');
+
+        expect(result).toMatchObject({
+            errorCode: ErrorCode.MCP_SERVER_NOT_FOUND,
+        });
+        expect(mocks.unsafePrisma.mcpServer.delete).not.toHaveBeenCalled();
+        expect(mocks.captureEvent).not.toHaveBeenCalled();
+    });
+
     test('members cannot delete org MCP servers', async () => {
         setAuthContext(OrgRole.MEMBER);
 
@@ -356,21 +391,26 @@ describe('deleteMcpServer', () => {
         expect(result).toMatchObject({
             errorCode: ErrorCode.INSUFFICIENT_PERMISSIONS,
         });
-        expect(mocks.unsafePrisma.mcpServer.deleteMany).not.toHaveBeenCalled();
+        expect(mocks.unsafePrisma.mcpServer.findFirst).not.toHaveBeenCalled();
+        expect(mocks.unsafePrisma.mcpServer.delete).not.toHaveBeenCalled();
     });
 
     test('owners can delete org MCP servers when Ask Agent is unavailable', async () => {
         setAuthContext(OrgRole.OWNER);
         mocks.hasEntitlement.mockResolvedValue(false);
-        mocks.unsafePrisma.mcpServer.deleteMany.mockResolvedValue({ count: 1 });
+        mocks.unsafePrisma.mcpServer.findFirst.mockResolvedValue({
+            id: 'server-1',
+            serverUrl: 'https://mcp.linear.app/mcp',
+            clientInfoSource: McpServerClientInfoSource.DYNAMIC,
+        });
+        mocks.unsafePrisma.mcpServer.delete.mockResolvedValue({ id: 'server-1' });
 
         await expect(deleteMcpServer('server-1')).resolves.toEqual({ success: true });
 
         expect(mocks.hasEntitlement).not.toHaveBeenCalled();
-        expect(mocks.unsafePrisma.mcpServer.deleteMany).toHaveBeenCalledWith({
+        expect(mocks.unsafePrisma.mcpServer.delete).toHaveBeenCalledWith({
             where: {
                 id: 'server-1',
-                orgId: 1,
             },
         });
     });

packages/web/src/ee/features/chat/mcp/actions.ts

@@ -291,21 +291,40 @@ export const createMcpServer = async (name: string, serverUrl: string) => sew(()
 export const deleteMcpServer = async (serverId: string) => sew(() =>
     withAuth(async ({ org, role }) =>
         withMinimumOrgRole(role, OrgRole.OWNER, async () => {
-            const result = await __unsafePrisma.mcpServer.deleteMany({
+            const server = await __unsafePrisma.mcpServer.findFirst({
                 where: {
                     id: serverId,
                     orgId: org.id,
                 },
+                select: {
+                    id: true,
+                    serverUrl: true,
+                    clientInfoSource: true,
+                },
             });
 
-            if (result.count === 0) {
+            if (!server) {
                 return {
                     statusCode: StatusCodes.NOT_FOUND,
                     errorCode: ErrorCode.MCP_SERVER_NOT_FOUND,
                     message: 'Connector not found',
                 } satisfies ServiceError;
             }
 
+            await __unsafePrisma.mcpServer.delete({
+                where: {
+                    id: server.id,
+                },
+            });
+
+            void captureEvent('ask_mcp_connector_removed', {
+                source: 'sourcebot-web-client',
+                entryPoint: 'workspace_settings',
+                serverId: server.id,
+                serverUrl: server.serverUrl,
+                authMode: getMcpAuthMode(server.clientInfoSource),
+            });
+
             return { success: true };
         })));
 

packages/web/src/lib/posthogEvents.ts

@@ -234,6 +234,13 @@ export type PosthogEventMap = {
         serverUrl: string,
         authMode: McpConnectorAuthMode,
     },
+    ask_mcp_connector_removed: {
+        source: SourcebotWebClientSource,
+        entryPoint: 'workspace_settings',
+        serverId: string,
+        serverUrl: string,
+        authMode: McpConnectorAuthMode,
+    },
     ask_mcp_connector_connection_started: {
         source: SourcebotWebClientSource,
         entryPoint: McpConnectorEntryPoint,