diff --git a/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.json b/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.json
index 354a77aad3ec..511f0c5db9b9 100644
--- a/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.json
+++ b/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.json
@@ -17434,6 +17434,24 @@
           }
         }
       },
+      "AgentEndpointProtocol": {
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "activity",
+              "responses",
+              "a2a",
+              "mcp",
+              "invocations",
+              "invocations_ws"
+            ]
+          }
+        ]
+      },
       "AgentEvaluatorGenerationJobSource": {
         "type": "object",
         "required": [
@@ -54487,20 +54505,27 @@
         "description": "An abstract representation of a tool stored in a toolbox."
       },
       "ToolboxToolType": {
-        "type": "string",
-        "enum": [
-          "code_interpreter",
-          "file_search",
-          "web_search",
-          "mcp",
-          "azure_ai_search",
-          "openapi",
-          "a2a_preview",
-          "browser_automation_preview",
-          "reminder_preview",
-          "work_iq_preview",
-          "fabric_iq_preview",
-          "toolbox_search_preview"
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "code_interpreter",
+              "file_search",
+              "web_search",
+              "mcp",
+              "azure_ai_search",
+              "openapi",
+              "a2a_preview",
+              "browser_automation_preview",
+              "reminder_preview",
+              "work_iq_preview",
+              "fabric_iq_preview",
+              "toolbox_search_preview"
+            ]
+          }
         ],
         "description": "Supported tool types for tools stored in a toolbox."
       },
diff --git a/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.yaml b/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.yaml
index 413df1bcfa0e..d3575dc75392 100644
--- a/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.yaml
+++ b/specification/ai-foundry/data-plane/Foundry/openapi3/v1/microsoft-foundry-openapi3.yaml
@@ -11476,6 +11476,17 @@ components:
           items:
             $ref: '#/components/schemas/AgentEndpointAuthorizationScheme'
           description: The authorization schemes supported by the agent endpoint
+    AgentEndpointProtocol:
+      anyOf:
+        - type: string
+        - type: string
+          enum:
+            - activity
+            - responses
+            - a2a
+            - mcp
+            - invocations
+            - invocations_ws
     AgentEvaluatorGenerationJobSource:
       type: object
       required:
@@ -37305,20 +37316,22 @@ components:
           toolbox_search_preview: '#/components/schemas/ToolboxSearchPreviewToolboxTool'
       description: An abstract representation of a tool stored in a toolbox.
     ToolboxToolType:
-      type: string
-      enum:
-        - code_interpreter
-        - file_search
-        - web_search
-        - mcp
-        - azure_ai_search
-        - openapi
-        - a2a_preview
-        - browser_automation_preview
-        - reminder_preview
-        - work_iq_preview
-        - fabric_iq_preview
-        - toolbox_search_preview
+      anyOf:
+        - type: string
+        - type: string
+          enum:
+            - code_interpreter
+            - file_search
+            - web_search
+            - mcp
+            - azure_ai_search
+            - openapi
+            - a2a_preview
+            - browser_automation_preview
+            - reminder_preview
+            - work_iq_preview
+            - fabric_iq_preview
+            - toolbox_search_preview
       description: Supported tool types for tools stored in a toolbox.
     ToolboxVersionObject:
       type: object
diff --git a/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.json b/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.json
index ae309bdb82c2..b746adbe742d 100644
--- a/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.json
+++ b/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.json
@@ -59304,20 +59304,27 @@
         "description": "An abstract representation of a tool stored in a toolbox."
       },
       "ToolboxToolType": {
-        "type": "string",
-        "enum": [
-          "code_interpreter",
-          "file_search",
-          "web_search",
-          "mcp",
-          "azure_ai_search",
-          "openapi",
-          "a2a_preview",
-          "browser_automation_preview",
-          "reminder_preview",
-          "work_iq_preview",
-          "fabric_iq_preview",
-          "toolbox_search_preview"
+        "anyOf": [
+          {
+            "type": "string"
+          },
+          {
+            "type": "string",
+            "enum": [
+              "code_interpreter",
+              "file_search",
+              "web_search",
+              "mcp",
+              "azure_ai_search",
+              "openapi",
+              "a2a_preview",
+              "browser_automation_preview",
+              "reminder_preview",
+              "work_iq_preview",
+              "fabric_iq_preview",
+              "toolbox_search_preview"
+            ]
+          }
         ],
         "description": "Supported tool types for tools stored in a toolbox."
       },
diff --git a/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.yaml b/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.yaml
index e11f9d307ba4..66e48b75310b 100644
--- a/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.yaml
+++ b/specification/ai-foundry/data-plane/Foundry/openapi3/virtual-public-preview/microsoft-foundry-openapi3.yaml
@@ -40554,20 +40554,22 @@ components:
           toolbox_search_preview: '#/components/schemas/ToolboxSearchPreviewToolboxTool'
       description: An abstract representation of a tool stored in a toolbox.
     ToolboxToolType:
-      type: string
-      enum:
-        - code_interpreter
-        - file_search
-        - web_search
-        - mcp
-        - azure_ai_search
-        - openapi
-        - a2a_preview
-        - browser_automation_preview
-        - reminder_preview
-        - work_iq_preview
-        - fabric_iq_preview
-        - toolbox_search_preview
+      anyOf:
+        - type: string
+        - type: string
+          enum:
+            - code_interpreter
+            - file_search
+            - web_search
+            - mcp
+            - azure_ai_search
+            - openapi
+            - a2a_preview
+            - browser_automation_preview
+            - reminder_preview
+            - work_iq_preview
+            - fabric_iq_preview
+            - toolbox_search_preview
       description: Supported tool types for tools stored in a toolbox.
     ToolboxVersionObject:
       type: object
diff --git a/specification/ai-foundry/data-plane/Foundry/src/toolboxes/models.tsp b/specification/ai-foundry/data-plane/Foundry/src/toolboxes/models.tsp
index abb08470d12d..5139c45aaa38 100644
--- a/specification/ai-foundry/data-plane/Foundry/src/toolboxes/models.tsp
+++ b/specification/ai-foundry/data-plane/Foundry/src/toolboxes/models.tsp
@@ -67,35 +67,23 @@ alias ToolFields<Source> = {
   ...OmitProperties<Source, "name" | "description" | "type">;
 };
 
-alias ToolboxCodeInterpreterToolType = "code_interpreter";
-alias ToolboxFileSearchToolType = "file_search";
-alias ToolboxWebSearchToolType = "web_search";
-alias ToolboxMCPToolType = "mcp";
-alias ToolboxAzureAISearchToolType = "azure_ai_search";
-alias ToolboxOpenApiToolType = "openapi";
-alias ToolboxA2APreviewToolType = "a2a_preview";
-alias ToolboxBrowserAutomationPreviewToolType = "browser_automation_preview";
-alias ToolboxReminderPreviewToolType = "reminder_preview";
-alias ToolboxWorkIQPreviewToolType = "work_iq_preview";
-alias ToolboxFabricIQPreviewToolType = "fabric_iq_preview";
-alias ToolboxSearchPreviewToolType = "toolbox_search_preview";
-
 /**
  * Supported tool types for tools stored in a toolbox.
  */
 union ToolboxToolType {
-  code_interpreter: ToolboxCodeInterpreterToolType,
-  file_search: ToolboxFileSearchToolType,
-  web_search: ToolboxWebSearchToolType,
-  mcp: ToolboxMCPToolType,
-  azure_ai_search: ToolboxAzureAISearchToolType,
-  openapi: ToolboxOpenApiToolType,
-  a2a_preview: ToolboxA2APreviewToolType,
-  browser_automation_preview: ToolboxBrowserAutomationPreviewToolType,
-  reminder_preview: ToolboxReminderPreviewToolType,
-  work_iq_preview: ToolboxWorkIQPreviewToolType,
-  fabric_iq_preview: ToolboxFabricIQPreviewToolType,
-  toolbox_search_preview: ToolboxSearchPreviewToolType,
+  string,
+  code_interpreter: "code_interpreter",
+  file_search: "file_search",
+  web_search: "web_search",
+  mcp: "mcp",
+  azure_ai_search: "azure_ai_search",
+  openapi: "openapi",
+  a2a_preview: "a2a_preview",
+  browser_automation_preview: "browser_automation_preview",
+  reminder_preview: "reminder_preview",
+  work_iq_preview: "work_iq_preview",
+  fabric_iq_preview: "fabric_iq_preview",
+  toolbox_search_preview: "toolbox_search_preview",
 }
 
 /**
@@ -116,8 +104,7 @@ model ToolboxTool {
  * A code interpreter tool stored in a toolbox.
  */
 model CodeInterpreterToolboxTool extends ToolboxTool {
-  type: ToolboxCodeInterpreterToolType;
-
+  type: ToolboxToolType.code_interpreter;
   ...ToolFields<OpenAI.CodeInterpreterTool>;
 }
 
@@ -125,20 +112,15 @@ model CodeInterpreterToolboxTool extends ToolboxTool {
  * A file search tool stored in a toolbox.
  */
 model FileSearchToolboxTool extends ToolboxTool {
-  type: ToolboxFileSearchToolType;
-
-  ...WithFieldsOptional<
-    ToolFields<OpenAI.FileSearchTool>,
-    "vector_store_ids"
-  >;
+  type: ToolboxToolType.file_search;
+  ...WithFieldsOptional<ToolFields<OpenAI.FileSearchTool>, "vector_store_ids">;
 }
 
 /**
  * A web search tool stored in a toolbox.
  */
 model WebSearchToolboxTool extends ToolboxTool {
-  type: ToolboxWebSearchToolType;
-
+  type: ToolboxToolType.web_search;
   ...ToolFields<OpenAI.WebSearchTool>;
 }
 
@@ -146,8 +128,7 @@ model WebSearchToolboxTool extends ToolboxTool {
  * An MCP tool stored in a toolbox.
  */
 model MCPToolboxTool extends ToolboxTool {
-  type: ToolboxMCPToolType;
-
+  type: ToolboxToolType.mcp;
   ...ToolFields<OpenAI.MCPTool>;
 }
 
@@ -155,8 +136,7 @@ model MCPToolboxTool extends ToolboxTool {
  * An Azure AI Search tool stored in a toolbox.
  */
 model AzureAISearchToolboxTool extends ToolboxTool {
-  type: ToolboxAzureAISearchToolType;
-
+  type: ToolboxToolType.azure_ai_search;
   ...ToolFields<AzureAISearchTool>;
 }
 
@@ -164,8 +144,7 @@ model AzureAISearchToolboxTool extends ToolboxTool {
  * An OpenAPI tool stored in a toolbox.
  */
 model OpenApiToolboxTool extends ToolboxTool {
-  type: ToolboxOpenApiToolType;
-
+  type: ToolboxToolType.openapi;
   ...ToolFields<OpenApiTool>;
 }
 
@@ -173,8 +152,7 @@ model OpenApiToolboxTool extends ToolboxTool {
  * An A2A tool stored in a toolbox.
  */
 model A2APreviewToolboxTool extends ToolboxTool {
-  type: ToolboxA2APreviewToolType;
-
+  type: ToolboxToolType.a2a_preview;
   ...ToolFields<A2APreviewTool>;
 }
 
@@ -182,8 +160,7 @@ model A2APreviewToolboxTool extends ToolboxTool {
  * A browser automation tool stored in a toolbox.
  */
 model BrowserAutomationPreviewToolboxTool extends ToolboxTool {
-  type: ToolboxBrowserAutomationPreviewToolType;
-
+  type: ToolboxToolType.browser_automation_preview;
   ...ToolFields<BrowserAutomationPreviewTool>;
 }
 
@@ -191,15 +168,14 @@ model BrowserAutomationPreviewToolboxTool extends ToolboxTool {
  * A reminder tool stored in a toolbox.
  */
 model ReminderPreviewToolboxTool extends ToolboxTool {
-  type: ToolboxReminderPreviewToolType;
+  type: ToolboxToolType.reminder_preview;
 }
 
 /**
  * A WorkIQ tool stored in a toolbox.
  */
 model WorkIQPreviewToolboxTool extends ToolboxTool {
-  type: ToolboxWorkIQPreviewToolType;
-
+  type: ToolboxToolType.work_iq_preview;
   ...ToolFields<WorkIQPreviewTool>;
 }
 
@@ -207,8 +183,7 @@ model WorkIQPreviewToolboxTool extends ToolboxTool {
  * A FabricIQ tool stored in a toolbox.
  */
 model FabricIQPreviewToolboxTool extends ToolboxTool {
-  type: ToolboxFabricIQPreviewToolType;
-
+  type: ToolboxToolType.fabric_iq_preview;
   ...ToolFields<FabricIQPreviewTool>;
 }
 
@@ -219,7 +194,7 @@ model ToolboxSearchPreviewToolboxTool extends ToolboxTool {
   /**
    * The type of the tool. Always `toolbox_search_preview`.
    */
-  type: ToolboxSearchPreviewToolType;
+  type: ToolboxToolType.toolbox_search_preview;
 }
 @doc("Policy configuration for a toolbox, including content safety and other governance settings.")
 model ToolboxPolicies {