feat(settings): list organization MCP servers in the Agent Profile editors (OHE-3863)

frontend/__tests__/components/features/settings/agent-profiles/agent-profile-form-state.test.ts

@@ -0,0 +1,64 @@
+import { describe, expect, it } from "vitest";
+import {
+  AgentProfileFormDeps,
+  buildAgentProfileSaveInput,
+  newAgentProfileFormState,
+} from "#/components/features/settings/agent-profiles/agent-profile-form-state";
+
+const deps: AgentProfileFormDeps = {
+  acpProviders: [],
+  defaultLlmProfileRef: "Default",
+  schema: null,
+};
+
+describe("buildAgentProfileSaveInput MCP server references", () => {
+  it("sends no MCP servers for an org profile while org MCP listings are off", () => {
+    const orgDeps = { ...deps, profileScope: "org" as const };
+    const state = {
+      ...newAgentProfileFormState(orgDeps),
+      mcpMode: "custom" as const,
+      mcpSelected: ["datadog-shared"],
+    };
+
+    const input = buildAgentProfileSaveInput(state, orgDeps);
+
+    expect(input.mcp_server_refs).toEqual([]);
+  });
+
+  it("sends the chosen organization-managed servers for an org profile when on", () => {
+    const orgDeps = {
+      ...deps,
+      profileScope: "org" as const,
+      orgMcpServersEnabled: true,
+    };
+    const state = {
+      ...newAgentProfileFormState(orgDeps),
+      mcpMode: "custom" as const,
+      mcpSelected: ["datadog-shared"],
+    };
+
+    const input = buildAgentProfileSaveInput(state, orgDeps);
+
+    expect(input.mcp_server_refs).toEqual(["datadog-shared"]);
+    // Nothing chosen stays an explicit "none", never "all".
+    expect(
+      buildAgentProfileSaveInput({ ...state, mcpSelected: [] }, orgDeps)
+        .mcp_server_refs,
+    ).toEqual([]);
+  });
+
+  it("keeps the personal semantics: null for all servers, the list when chosen", () => {
+    const personalDeps = { ...deps, orgMcpServersEnabled: true };
+    const standard = newAgentProfileFormState(personalDeps);
+
+    expect(
+      buildAgentProfileSaveInput(standard, personalDeps).mcp_server_refs,
+    ).toBeNull();
+    expect(
+      buildAgentProfileSaveInput(
+        { ...standard, mcpMode: "custom", mcpSelected: ["a", "bifrost"] },
+        personalDeps,
+      ).mcp_server_refs,
+    ).toEqual(["a", "bifrost"]);
+  });
+});

frontend/__tests__/components/features/settings/agent-profiles/agent-profile-form.test.tsx

@@ -0,0 +1,182 @@
+import { fireEvent, render, screen } from "@testing-library/react";
+import { describe, expect, it, vi } from "vitest";
+import { AgentProfileForm } from "#/components/features/settings/agent-profiles/agent-profile-form";
+import {
+  AgentProfileFormDeps,
+  AgentProfileFormState,
+  newAgentProfileFormState,
+} from "#/components/features/settings/agent-profiles/agent-profile-form-state";
+import type { ProfileScopeItem } from "#/components/features/settings/agent-profiles/profile-scope-list";
+import type { AcpCredentialForm } from "#/hooks/use-acp-credential-form";
+
+vi.mock("react-i18next", () => ({
+  useTranslation: () => ({
+    t: (key: string, options?: Record<string, unknown>) =>
+      options?.names ? `${key}:${options.names}` : key,
+  }),
+}));
+
+const deps: AgentProfileFormDeps = {
+  acpProviders: [],
+  defaultLlmProfileRef: "Default",
+  schema: null,
+};
+
+const credentialForm: AcpCredentialForm = {
+  fields: [],
+  values: {},
+  setValue: () => {},
+  secretExists: () => false,
+  hasValueFor: () => false,
+  conflicts: [],
+  isDirty: false,
+  save: async () => true,
+  reset: () => {},
+  isSaving: false,
+};
+
+const ORG_MCP_ITEMS: ProfileScopeItem[] = [
+  {
+    name: "datadog-shared",
+    description: "https://dd.example/mcp",
+    scope: "organization",
+  },
+];
+
+function renderForm({
+  state,
+  scope,
+  mcpServers,
+  orgMcpServersEnabled,
+  onChange = vi.fn(),
+}: {
+  state: AgentProfileFormState;
+  scope: "personal" | "org";
+  mcpServers: ProfileScopeItem[];
+  orgMcpServersEnabled?: boolean;
+  onChange?: (patch: Partial<AgentProfileFormState>) => void;
+}) {
+  render(
+    <AgentProfileForm
+      state={state}
+      onChange={onChange}
+      isDisabled={false}
+      isAcpEnabled={false}
+      acpProviders={[]}
+      llmProfiles={[]}
+      schema={null}
+      tools={[]}
+      mcpServers={mcpServers}
+      secrets={[]}
+      skills={[]}
+      credentialForm={credentialForm}
+      profileScope={scope}
+      orgMcpServersEnabled={orgMcpServersEnabled}
+    />,
+  );
+  return onChange;
+}
+
+describe("AgentProfileForm MCP servers", () => {
+  it("still leaves the MCP section out of an org profile while the flag is off", () => {
+    renderForm({
+      state: newAgentProfileFormState({ ...deps, profileScope: "org" }),
+      scope: "org",
+      mcpServers: ORG_MCP_ITEMS,
+    });
+
+    expect(
+      screen.queryByTestId("agent-profile-mcp-list"),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByTestId("agent-profile-mcp-mode"),
+    ).not.toBeInTheDocument();
+    expect(
+      screen.queryByTestId("agent-profile-mcp-hint"),
+    ).not.toBeInTheDocument();
+  });
+
+  it("lets an org profile toggle the organization-managed servers, with no 'all' mode", () => {
+    const onChange = renderForm({
+      state: {
+        ...newAgentProfileFormState({ ...deps, profileScope: "org" }),
+        mcpMode: "custom",
+        mcpSelected: [],
+      },
+      scope: "org",
+      mcpServers: ORG_MCP_ITEMS,
+      orgMcpServersEnabled: true,
+    });
+
+    expect(
+      screen.queryByTestId("agent-profile-mcp-mode"),
+    ).not.toBeInTheDocument();
+    expect(screen.getByTestId("agent-profile-mcp-hint")).toHaveTextContent(
+      "SETTINGS$AGENT_PROFILE_ORG_MCP_HINT",
+    );
+    const toggle = screen.getByTestId("agent-profile-mcp-datadog-shared");
+    expect(toggle).not.toBeChecked();
+    expect(toggle).not.toBeDisabled();
+
+    fireEvent.click(toggle);
+
+    expect(onChange).toHaveBeenCalledWith({ mcpSelected: ["datadog-shared"] });
+  });
+
+  it("tells an org admin when there is nothing to pick yet", () => {
+    renderForm({
+      state: {
+        ...newAgentProfileFormState({ ...deps, profileScope: "org" }),
+        mcpMode: "custom",
+      },
+      scope: "org",
+      mcpServers: [],
+      orgMcpServersEnabled: true,
+    });
+
+    expect(screen.getByTestId("agent-profile-mcp-none")).toHaveTextContent(
+      "SETTINGS$AGENT_PROFILE_ORG_MCP_NONE",
+    );
+  });
+
+  it("flags an org profile's reference to a listing that no longer exists", () => {
+    renderForm({
+      state: {
+        ...newAgentProfileFormState({ ...deps, profileScope: "org" }),
+        mcpMode: "custom",
+        mcpSelected: ["gone"],
+      },
+      scope: "org",
+      mcpServers: ORG_MCP_ITEMS,
+      orgMcpServersEnabled: true,
+    });
+
+    expect(screen.getByTestId("agent-profile-mcp-dangling")).toHaveTextContent(
+      "SETTINGS$AGENT_PROFILE_MCP_DANGLING:gone",
+    );
+  });
+
+  it("badges the organization's listings in a personal profile's picker", () => {
+    renderForm({
+      state: {
+        ...newAgentProfileFormState(deps),
+        mcpMode: "custom",
+        mcpSelected: ["mine"],
+      },
+      scope: "personal",
+      mcpServers: [{ name: "mine", description: null }, ...ORG_MCP_ITEMS],
+      orgMcpServersEnabled: true,
+    });
+
+    expect(screen.getByTestId("agent-profile-mcp-mode")).toBeInTheDocument();
+    expect(
+      screen.getByTestId("agent-profile-mcp-datadog-shared-org-badge"),
+    ).toBeInTheDocument();
+    expect(
+      screen.queryByTestId("agent-profile-mcp-mine-org-badge"),
+    ).not.toBeInTheDocument();
+    expect(screen.getByTestId("agent-profile-mcp-hint")).toHaveTextContent(
+      "SETTINGS$AGENT_PROFILE_MCP_CHOOSE_HINT",
+    );
+  });
+});

frontend/src/components/features/settings/agent-profiles/agent-profile-form-state.ts

@@ -97,6 +97,12 @@ export interface AgentProfileFormDeps {
    * its secrets explicitly (OHE-3088). Defaults to ``personal``.
    */
   profileScope?: AgentProfileScope;
+  /**
+   * ``feature_flags.enable_org_mcp_servers`` (OHE-3091): an org profile may
+   * then name the organization-managed MCP server listings it uses. Off, an
+   * org save keeps sending ``mcp_server_refs: []``.
+   */
+  orgMcpServersEnabled?: boolean;
 }
 
 export function newAgentProfileFormState(
@@ -261,9 +267,16 @@ export function buildAgentProfileSaveInput(
   stored?: AgentProfile | null,
 ): AgentProfileSaveInput {
   const isOrg = deps.profileScope === "org";
-  const mcpServerRefs = isOrg
-    ? []
-    : scopeRefs(state.mcpMode, state.mcpSelected);
+  // An org profile names the organization-managed servers it uses, or none;
+  // never "all", which would mean every launching member's own servers.
+  let mcpServerRefs: string[] | null;
+  if (!isOrg) {
+    mcpServerRefs = scopeRefs(state.mcpMode, state.mcpSelected);
+  } else if (deps.orgMcpServersEnabled) {
+    mcpServerRefs = state.mcpSelected;
+  } else {
+    mcpServerRefs = [];
+  }
   const secretRefs = isOrg
     ? state.secretsSelected
     : scopeRefs(state.secretsMode, state.secretsSelected);