fix(mcp-gateway): derive the member delete affordance from the session user

getGatewayServerRemovalAction looked the caller up in server.connections, but that roster is admin-only (empty for members), so a member who registered a custom server never saw "delete for you" — and any member got it on a creator-less custom server via undefined === undefined. Pass the session user's id in (from useCurrentUser) and require a non-null creator; cover the real member-facing shape (connections: []) in the core tests plus a UI regression test for the member delete affordance.

Generated-By: PostHog Code
Task-Id: 2880070b-9691-450f-b566-b76d60089914

Author: cvolzer3

packages/core/src/mcp-gateway/gatewayServers.test.ts

@@ -328,41 +328,47 @@ describe("getGatewayServerRemovalAction", () => {
     hedgehog_config: null,
   });
 
+  // Members never receive `connections` (it is admin-only), so every
+  // non-admin case keeps the default empty roster — the real API shape.
   it.each([
     [
       "deletes a personally added custom server",
       server({
         created_by: gatewayUser(1),
         your_connection: connection(),
-        connections: [
-          {
-            installation_id: "inst-1",
-            user: gatewayUser(1),
-            last_used_at: null,
-            pending_oauth: false,
-            needs_reauth: false,
-          },
-        ],
       }),
       false,
+      1,
       "delete_for_you",
     ],
     [
       "disconnects from a custom server added by someone else",
       server({
         created_by: gatewayUser(2),
         your_connection: connection(),
-        connections: [
-          {
-            installation_id: "inst-1",
-            user: gatewayUser(1),
-            last_used_at: null,
-            pending_oauth: false,
-            needs_reauth: false,
-          },
-        ],
       }),
       false,
+      1,
+      "disconnect",
+    ],
+    [
+      "disconnects from a custom server with no recorded creator",
+      server({
+        created_by: null,
+        your_connection: connection(),
+      }),
+      false,
+      1,
+      "disconnect",
+    ],
+    [
+      "disconnects when the current user is unknown",
+      server({
+        created_by: gatewayUser(1),
+        your_connection: connection(),
+      }),
+      false,
+      null,
       "disconnect",
     ],
     [
@@ -371,39 +377,36 @@ describe("getGatewayServerRemovalAction", () => {
         template_id: "template-1",
         created_by: gatewayUser(1),
         your_connection: connection(),
-        connections: [
-          {
-            installation_id: "inst-1",
-            user: gatewayUser(1),
-            last_used_at: null,
-            pending_oauth: false,
-            needs_reauth: false,
-          },
-        ],
       }),
       false,
+      1,
       "disconnect",
     ],
     [
       "deletes a custom server for everyone when requested by an admin",
       server({}),
       true,
+      1,
       "delete_for_everyone",
     ],
     [
       "does not delete a catalog server for an admin without a connection",
       server({ template_id: "template-1" }),
       true,
+      1,
       null,
     ],
     [
       "returns no action without a personal connection",
       server({}),
       false,
+      1,
       null,
     ],
-  ] as const)("%s", (_label, srv, isAdmin, expected) => {
-    expect(getGatewayServerRemovalAction(srv, isAdmin)).toBe(expected);
+  ] as const)("%s", (_label, srv, isAdmin, currentUserId, expected) => {
+    expect(getGatewayServerRemovalAction(srv, isAdmin, currentUserId)).toBe(
+      expected,
+    );
   });
 });
 

packages/core/src/mcp-gateway/gatewayServers.ts

@@ -165,27 +165,27 @@ export type GatewayServerRemovalAction =
 
 /**
  * Admins remove custom servers from the team gateway. For members, a custom
- * server registered by the owner of the current personal installation is
- * theirs to delete; catalog servers and custom servers registered by somebody
- * else remain team entries, so removing the caller's installation is
- * presented as disconnecting instead.
+ * server they registered themselves is theirs to delete; catalog servers and
+ * custom servers registered by somebody else remain team entries, so removing
+ * the caller's installation is presented as disconnecting instead.
+ *
+ * The caller's identity must come in from the session user —
+ * `server.connections` is admin-only (empty for members), so it cannot
+ * identify a member caller.
  */
 export function getGatewayServerRemovalAction(
   server: McpGatewayServer,
   isAdmin: boolean,
+  currentUserId: number | null,
 ): GatewayServerRemovalAction | null {
   if (isAdmin && server.template_id === null) return "delete_for_everyone";
 
-  const yourConnection = server.your_connection;
-  if (!yourConnection) return null;
+  if (!server.your_connection) return null;
 
-  const yourConnectionSummary = server.connections.find(
-    (connection) =>
-      connection.installation_id === yourConnection.installation_id,
-  );
   const personallyAddedCustomServer =
     server.template_id === null &&
-    server.created_by?.id === yourConnectionSummary?.user.id;
+    server.created_by !== null &&
+    server.created_by.id === currentUserId;
 
   return personallyAddedCustomServer ? "delete_for_you" : "disconnect";
 }

packages/ui/src/features/mcp-gateway/components/parts/GatewayServerDetail.test.tsx

@@ -7,6 +7,15 @@ import { beforeEach, describe, expect, it, vi } from "vitest";
 const mocks = vi.hoisted(() => ({
   gateway: {} as Record<string, unknown>,
   setMemberAccess: vi.fn(),
+  currentUser: null as { id: number } | null,
+}));
+
+vi.mock("@posthog/ui/features/auth/authClient", () => ({
+  useOptionalAuthenticatedClient: () => null,
+}));
+
+vi.mock("@posthog/ui/features/auth/useCurrentUser", () => ({
+  useCurrentUser: () => ({ data: mocks.currentUser }),
 }));
 
 vi.mock(
@@ -90,6 +99,7 @@ const server = {
 describe("GatewayServerDetail", () => {
   beforeEach(() => {
     vi.clearAllMocks();
+    mocks.currentUser = null;
     mocks.gateway = {
       servers: [server],
       serversLoading: false,
@@ -134,4 +144,47 @@ describe("GatewayServerDetail", () => {
       successMessage: "Ada can now use Linear",
     });
   });
+
+  // Members receive `connections: []` (the roster is admin-only), so the
+  // delete affordance must derive from the session user, not the roster.
+  it("offers a member delete on their own custom server", () => {
+    mocks.currentUser = { id: 7 };
+    const yourServer = {
+      ...server,
+      connections: [],
+      revoked_user_ids: [],
+      created_by: {
+        id: 7,
+        uuid: "user-7",
+        email: "ada@example.com",
+        hedgehog_config: null,
+      },
+      your_connection: {
+        installation_id: "installation-1",
+        is_enabled: true,
+        pending_oauth: false,
+        needs_reauth: false,
+        last_used_at: null,
+      },
+    } as McpGatewayServer;
+    mocks.gateway = { ...mocks.gateway, servers: [yourServer] };
+
+    render(
+      <Theme>
+        <GatewayServerDetail
+          serverId={yourServer.id}
+          isAdmin={false}
+          canManageAgentAccess={false}
+          onNavigate={vi.fn()}
+        />
+      </Theme>,
+    );
+
+    expect(
+      screen.getByRole("button", { name: "Delete server" }),
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByRole("button", { name: /Disconnect/ }),
+    ).not.toBeInTheDocument();
+  });
 });

packages/ui/src/features/mcp-gateway/components/parts/GatewayServerDetail.tsx

@@ -24,6 +24,8 @@ import {
   getGatewayServerRemovalAction,
 } from "@posthog/core/mcp-gateway/gatewayServers";
 import { usableInstallationId } from "@posthog/core/mcp-gateway/gatewayToolDiscovery";
+import { useOptionalAuthenticatedClient } from "@posthog/ui/features/auth/authClient";
+import { useCurrentUser } from "@posthog/ui/features/auth/useCurrentUser";
 import {
   gatewayUserName,
   RobotAvatar,
@@ -117,6 +119,10 @@ export function GatewayServerDetail({
   });
   const members = useGatewayMembers({ enabled: isAdmin });
   const serviceAccounts = useServiceAccounts();
+  // `server.connections` is admin-only (empty for members), so identifying
+  // the caller as a custom server's creator needs the session user instead.
+  const apiClient = useOptionalAuthenticatedClient();
+  const { data: currentUser } = useCurrentUser({ client: apiClient });
 
   const scopes = useMemo<GatewayPolicyScope[]>(() => {
     if (!server) return [];
@@ -167,7 +173,11 @@ export function GatewayServerDetail({
   const template = server.template_id
     ? gateway.templatesById.get(server.template_id)
     : undefined;
-  const serverRemovalAction = getGatewayServerRemovalAction(server, isAdmin);
+  const serverRemovalAction = getGatewayServerRemovalAction(
+    server,
+    isAdmin,
+    currentUser?.id ?? null,
+  );
   const deletesForEveryone = serverRemovalAction === "delete_for_everyone";
   const deleteInstallationId =
     serverRemovalAction === "delete_for_you"