chore: exclude builtin agents in filters by default (#3162)

Author: brojd

platform/backend/src/models/agent.test.ts

@@ -1856,15 +1856,29 @@ describe("AgentModel", () => {
         },
       });
 
-      // Admin can see built-in agents
+      // Admin without scope filter excludes built-in agents by default
       const adminResults = await AgentModel.findAllPaginated(
         { limit: 20, offset: 0 },
         { sortBy: "createdAt", sortDirection: "desc" },
         { agentType: "agent" },
         admin.id,
         true,
       );
-      expect(adminResults.data).toHaveLength(2);
+      expect(adminResults.data).toHaveLength(1);
+      expect(adminResults.data[0].name).toBe("Regular Agent");
+
+      // Admin with scope=built_in sees only built-in agents
+      const builtInResults = await AgentModel.findAllPaginated(
+        { limit: 20, offset: 0 },
+        { sortBy: "createdAt", sortDirection: "desc" },
+        { agentType: "agent", scope: "built_in" },
+        admin.id,
+        true,
+      );
+      expect(builtInResults.data).toHaveLength(1);
+      expect(builtInResults.data[0].name).toBe(
+        BUILT_IN_AGENT_NAMES.POLICY_CONFIG,
+      );
 
       // Non-admin cannot see built-in agents
       const nonAdminResults = await AgentModel.findAllPaginated(

platform/backend/src/models/agent.ts

@@ -471,6 +471,10 @@ class AgentModel {
     } else if (filters?.scope === "org") {
       whereConditions.push(eq(schema.agentsTable.scope, "org"));
       whereConditions.push(eq(schema.agentsTable.builtIn, false));
+    } else {
+      // No scope filter: exclude built-in agents by default.
+      // Built-in agents are only shown when explicitly filtered via scope=built_in.
+      whereConditions.push(eq(schema.agentsTable.builtIn, false));
     }
 
     // Hide built-in agents from non-admin users

platform/e2e-tests/tests/api/built-in-agents.spec.ts

@@ -15,7 +15,7 @@ async function getBuiltInAgent(
   const response = await makeApiRequest({
     request,
     method: "get",
-    urlSuffix: "/api/agents?agentTypes=agent&limit=100",
+    urlSuffix: "/api/agents?agentTypes=agent&scope=built_in&limit=100",
   });
   const result = await response.json();
   const agents = result.data ?? result;
@@ -159,10 +159,25 @@ test.describe("Built-In Agents API", () => {
     expect(builtIn).toBeTruthy();
   });
 
-  test("built-in agent included in /api/agents (agents management page)", async ({
+  test("built-in agent excluded from /api/agents by default, included with scope=built_in", async ({
     request,
     makeApiRequest,
   }) => {
+    // Without scope filter, built-in agents should be excluded
+    const defaultResponse = await makeApiRequest({
+      request,
+      method: "get",
+      urlSuffix: "/api/agents?agentTypes=agent&limit=100",
+    });
+    const defaultResult = await defaultResponse.json();
+    const defaultAgents = defaultResult.data ?? defaultResult;
+    const excluded = defaultAgents.find(
+      (a: { builtInAgentConfig?: { name: string } }) =>
+        a.builtInAgentConfig?.name === BUILT_IN_AGENT_IDS.POLICY_CONFIG,
+    );
+    expect(excluded).toBeUndefined();
+
+    // With scope=built_in, built-in agents should be included
     const builtIn = await getBuiltInAgent(request, makeApiRequest);
     expect(builtIn).toBeTruthy();
     expect(builtIn.builtInAgentConfig?.name).toBe(

platform/frontend/src/app/mcp/registry/_parts/mcp-exec-terminal.tsx

@@ -1,11 +1,10 @@
 "use client";
 
-import {
-  E2eTestId,
-  type McpExecClosedMessage,
-  type McpExecErrorMessage,
-  type McpExecOutputMessage,
-  type McpExecStartedMessage,
+import type {
+  McpExecClosedMessage,
+  McpExecErrorMessage,
+  McpExecOutputMessage,
+  McpExecStartedMessage,
 } from "@shared";
 import { Copy } from "lucide-react";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -224,10 +223,7 @@ export function McpExecTerminal({ serverId, isActive }: McpExecTerminalProps) {
   }, [command]);
 
   return (
-    <div
-      className="flex flex-col gap-4 flex-1 min-h-0"
-      data-testid={E2eTestId.McpDebugTerminal}
-    >
+    <div className="flex flex-col gap-4 flex-1 min-h-0">
       <div className="flex flex-col gap-2 flex-1 min-h-0">
         <h3 className="text-sm font-semibold flex-shrink-0">
           Interactive Shell

platform/frontend/src/app/mcp/registry/_parts/mcp-logs-dialog.tsx

@@ -396,12 +396,7 @@ export function McpLogsDialog({
                 <Tooltip>
                   <TooltipTrigger asChild>
                     <span>
-                      <TabsTrigger
-                        value="debug"
-                        disabled
-                        data-testid={E2eTestId.McpDebugTab}
-                        className="px-6"
-                      >
+                      <TabsTrigger value="debug" disabled className="px-6">
                         Shell
                       </TabsTrigger>
                     </span>
@@ -411,11 +406,7 @@ export function McpLogsDialog({
                   </TooltipContent>
                 </Tooltip>
               ) : (
-                <TabsTrigger
-                  value="debug"
-                  data-testid={E2eTestId.McpDebugTab}
-                  className="px-6"
-                >
+                <TabsTrigger value="debug" className="px-6">
                   Shell
                 </TabsTrigger>
               )}

platform/frontend/src/components/agent-scope-filter.tsx

@@ -145,7 +145,6 @@ export function AgentScopeFilter({
         </SelectTrigger>
         <SelectContent position="popper" side="bottom" align="start">
           <SelectItem value="all">All types</SelectItem>
-          <SelectSeparator />
           <SelectItem value="personal">Personal</SelectItem>
           <SelectItem value="team">Team</SelectItem>
           <SelectItem value="org">Organization</SelectItem>

platform/shared/consts.ts

@@ -87,9 +87,7 @@ export const E2eTestId = {
   McpLogsError: "mcp-logs-error",
   McpLogsViewButton: "mcp-logs-view-button",
   McpLogsEditConfigButton: "mcp-logs-edit-config-button",
-  McpDebugTab: "mcp-debug-tab",
   McpLogsTab: "mcp-logs-tab",
-  McpDebugTerminal: "mcp-debug-terminal",
 } as const;
 export type E2eTestId = (typeof E2eTestId)[keyof typeof E2eTestId];