Allow custom approval modes for lists of tools. (#36357)

* Allow custom approoval modes for lists of tools.

* Simplify MCPRequiredApproval

Author: nick863

specification/ai/Azure.AI.Agents/run_steps/models.tsp

@@ -312,13 +312,13 @@ model RunStepDeltaCodeInterpreterToolCall extends RunStepDeltaToolCall {
 /** Represents the function data in a streaming run step MCP call.* */
 @added(Versions.v2025_05_15_preview)
 model RunStepDeltaMcpToolCall extends RunStepDeltaToolCall {
-  /** The object type, which is always "mcp".* */
+  /** The object type, which is always "mcp". */
   type: "mcp";
 
-  /** The index of a response. * */
+  /** The index of a response. */
   index: int32;
 
-  /** The arguments for MCP call. * */
+  /** The arguments for MCP call. */
   arguments: string;
 }
 

specification/ai/Azure.AI.Agents/tools/tool_resources.tsp

@@ -155,7 +155,41 @@ model MCPToolResource {
 
   @doc("Does MCP server require approval")
   @encodedName("application/json", "require_approval")
-  requireApproval?: "never" | "always" | string;
+  requireApproval?: MCPRequiredApproval;
+}
+
+/** The Union of approval types. */
+#suppress "@azure-tools/typespec-autorest/union-unsupported" "This union is defined according to the Azure OpenAI API."
+@added(Versions.v2025_05_15_preview)
+union MCPRequiredApproval {
+  string,
+
+  /** The approval is not required for any of the tools. */
+  `never`: "never",
+
+  /** The approval is required for all tools. */
+  always: "always",
+
+  /** Customized MCP approval object, listing tools requiring and not requiring approvals */
+  MCPApprovalPerTool,
+}
+
+/** Customized MCP approval object, listing tools requiring and not requiring approvals */
+@added(Versions.v2025_05_15_preview)
+model MCPApprovalPerTool {
+  /** The list of tools, not requiring approval. */
+  `never`?: MCPToolList;
+
+  /** The list of tools, always requiring approval. */
+  always?: MCPToolList;
+}
+
+/** The object, containing list of tools for approvals. */
+@added(Versions.v2025_05_15_preview)
+model MCPToolList {
+  /** The list of tools for approval. */
+  @encodedName("application/json", "tool_names")
+  toolNames: string[];
 }
 
 /** Available query types for Azure AI Search tool. */

specification/ai/data-plane/Azure.AI.Agents/preview/2025-05-15-preview/azure-ai-agents.json

@@ -4582,6 +4582,21 @@
         ]
       }
     },
+    "MCPApprovalPerTool": {
+      "type": "object",
+      "description": "Customized MCP approval object, listing tools requiring and not requiring approvals",
+      "properties": {
+        "never": {
+          "$ref": "#/definitions/MCPToolList",
+          "description": "The list of tools, not requiring approval."
+        },
+        "always": {
+          "$ref": "#/definitions/MCPToolList",
+          "description": "The list of tools, always requiring approval."
+        }
+      }
+    },
+    "MCPRequiredApproval": {},
     "MCPToolDefinition": {
       "type": "object",
       "description": "The input definition information for a MCP tool which defines a MCP server endpoint",
@@ -4616,6 +4631,23 @@
       ],
       "x-ms-discriminator-value": "mcp"
     },
+    "MCPToolList": {
+      "type": "object",
+      "description": "The object, containing list of tools for approvals.",
+      "properties": {
+        "tool_names": {
+          "type": "array",
+          "description": "The list of tools for approval.",
+          "items": {
+            "type": "string"
+          },
+          "x-ms-client-name": "toolNames"
+        }
+      },
+      "required": [
+        "tool_names"
+      ]
+    },
     "MCPToolResource": {
       "type": "object",
       "description": "A set of resources that are used by the `mcp` tool.",
@@ -4633,15 +4665,8 @@
           }
         },
         "require_approval": {
-          "type": "string",
+          "$ref": "#/definitions/MCPRequiredApproval",
           "description": "Does MCP server require approval",
-          "enum": [
-            "never",
-            "always"
-          ],
-          "x-ms-enum": {
-            "modelAsString": true
-          },
           "x-ms-client-name": "requireApproval"
         }
       },
@@ -6591,11 +6616,11 @@
         "index": {
           "type": "integer",
           "format": "int32",
-          "description": "The index of a response. *"
+          "description": "The index of a response."
         },
         "arguments": {
           "type": "string",
-          "description": "The arguments for MCP call. *"
+          "description": "The arguments for MCP call."
         }
       },
       "required": [