diff --git a/platform/backend/src/archestra-mcp-server.ts b/platform/backend/src/archestra-mcp-server.ts
index 88975f2aeb..418cc10396 100644
--- a/platform/backend/src/archestra-mcp-server.ts
+++ b/platform/backend/src/archestra-mcp-server.ts
@@ -2897,6 +2897,7 @@ export function getArchestraMcpTools(): Tool[] {
               "Search by name (partial match). Only returns your personal agents.",
           },
         },
+        anyOf: [{ required: ["id"] }, { required: ["name"] }],
       },
       annotations: {},
       _meta: {},
@@ -2919,6 +2920,7 @@ export function getArchestraMcpTools(): Tool[] {
               "Search by name (partial match). Only returns your personal proxies.",
           },
         },
+        anyOf: [{ required: ["id"] }, { required: ["name"] }],
       },
       annotations: {},
       _meta: {},
@@ -2941,6 +2943,7 @@ export function getArchestraMcpTools(): Tool[] {
               "Search by name (partial match). Only returns your personal gateways.",
           },
         },
+        anyOf: [{ required: ["id"] }, { required: ["name"] }],
       },
       annotations: {},
       _meta: {},