feat: reuse previous mcp tool listings where possible

Signed-off-by: Gordon Sim <[email protected]>

Author: grs

docs/static/deprecated-llama-stack-spec.html

@@ -6595,6 +6595,122 @@ components:
       title: OpenAIResponseInputMessageContentText
       description: >-
         Text content for input messages in OpenAI response format.
+    OpenAIResponseInputToolFileSearch:
+      type: object
+      properties:
+        type:
+          type: string
+          const: file_search
+          default: file_search
+          description: >-
+            Tool type identifier, always "file_search"
+        vector_store_ids:
+          type: array
+          items:
+            type: string
+          description: >-
+            List of vector store identifiers to search within
+        filters:
+          type: object
+          additionalProperties:
+            oneOf:
+              - type: 'null'
+              - type: boolean
+              - type: number
+              - type: string
+              - type: array
+              - type: object
+          description: >-
+            (Optional) Additional filters to apply to the search
+        max_num_results:
+          type: integer
+          default: 10
+          description: >-
+            (Optional) Maximum number of search results to return (1-50)
+        ranking_options:
+          type: object
+          properties:
+            ranker:
+              type: string
+              description: >-
+                (Optional) Name of the ranking algorithm to use
+            score_threshold:
+              type: number
+              default: 0.0
+              description: >-
+                (Optional) Minimum relevance score threshold for results
+          additionalProperties: false
+          description: >-
+            (Optional) Options for ranking and scoring search results
+      additionalProperties: false
+      required:
+        - type
+        - vector_store_ids
+      title: OpenAIResponseInputToolFileSearch
+      description: >-
+        File search tool configuration for OpenAI response inputs.
+    OpenAIResponseInputToolFunction:
+      type: object
+      properties:
+        type:
+          type: string
+          const: function
+          default: function
+          description: Tool type identifier, always "function"
+        name:
+          type: string
+          description: Name of the function that can be called
+        description:
+          type: string
+          description: >-
+            (Optional) Description of what the function does
+        parameters:
+          type: object
+          additionalProperties:
+            oneOf:
+              - type: 'null'
+              - type: boolean
+              - type: number
+              - type: string
+              - type: array
+              - type: object
+          description: >-
+            (Optional) JSON schema defining the function's parameters
+        strict:
+          type: boolean
+          description: >-
+            (Optional) Whether to enforce strict parameter validation
+      additionalProperties: false
+      required:
+        - type
+        - name
+      title: OpenAIResponseInputToolFunction
+      description: >-
+        Function tool configuration for OpenAI response inputs.
+    OpenAIResponseInputToolWebSearch:
+      type: object
+      properties:
+        type:
+          oneOf:
+            - type: string
+              const: web_search
+            - type: string
+              const: web_search_preview
+            - type: string
+              const: web_search_preview_2025_03_11
+          default: web_search
+          description: Web search tool type variant to use
+        search_context_size:
+          type: string
+          default: medium
+          description: >-
+            (Optional) Size of search context, must be "low", "medium", or "high"
+      additionalProperties: false
+      required:
+        - type
+      title: OpenAIResponseInputToolWebSearch
+      description: >-
+        Web search tool configuration for OpenAI response inputs.
     OpenAIResponseMCPApprovalRequest:
       type: object
       properties:
@@ -6736,6 +6852,12 @@ components:
           type: number
           description: >-
             (Optional) Nucleus sampling parameter used for generation
+        tools:
+          type: array
+          items:
+            $ref: '#/components/schemas/OpenAIResponseTool'
+          description: >-
+            (Optional) An array of tools the model may call while generating a response.
         truncation:
           type: string
           description: >-
@@ -7088,123 +7210,81 @@ components:
       title: OpenAIResponseText
       description: >-
         Text response configuration for OpenAI responses.
-    ResponseShieldSpec:
-      type: object
-      properties:
-        type:
-          type: string
-          description: The type/identifier of the shield.
-      additionalProperties: false
-      required:
-        - type
-      title: ResponseShieldSpec
-      description: >-
-        Specification for a shield to apply during response generation.
-    OpenAIResponseInputTool:
+    OpenAIResponseTool:
       oneOf:
         - $ref: '#/components/schemas/OpenAIResponseInputToolWebSearch'
         - $ref: '#/components/schemas/OpenAIResponseInputToolFileSearch'
         - $ref: '#/components/schemas/OpenAIResponseInputToolFunction'
-        - $ref: '#/components/schemas/OpenAIResponseInputToolMCP'
+        - $ref: '#/components/schemas/OpenAIResponseToolMCP'
       discriminator:
         propertyName: type
         mapping:
           web_search: '#/components/schemas/OpenAIResponseInputToolWebSearch'
           file_search: '#/components/schemas/OpenAIResponseInputToolFileSearch'
           function: '#/components/schemas/OpenAIResponseInputToolFunction'
-          mcp: '#/components/schemas/OpenAIResponseInputToolMCP'
-    OpenAIResponseInputToolFileSearch:
+          mcp: '#/components/schemas/OpenAIResponseToolMCP'
+    OpenAIResponseToolMCP:
       type: object
       properties:
         type:
           type: string
-          const: file_search
-          default: file_search
-          description: >-
-            Tool type identifier, always "file_search"
-        vector_store_ids:
-          type: array
-          items:
-            type: string
-          description: >-
-            List of vector store identifiers to search within
-        filters:
-          type: object
-          additionalProperties:
-            oneOf:
-              - type: 'null'
-              - type: boolean
-              - type: number
-              - type: string
-              - type: array
-              - type: object
-          description: >-
-            (Optional) Additional filters to apply to the search
-        max_num_results:
-          type: integer
-          default: 10
-          description: >-
-            (Optional) Maximum number of search results to return (1-50)
-        ranking_options:
-          type: object
-          properties:
-            ranker:
-              type: string
-              description: >-
-                (Optional) Name of the ranking algorithm to use
-            score_threshold:
-              type: number
-              default: 0.0
+          const: mcp
+          default: mcp
+          description: Tool type identifier, always "mcp"
+        server_label:
+          type: string
+          description: Label to identify this MCP server
+        allowed_tools:
+          oneOf:
+            - type: array
+              items:
+                type: string
+            - type: object
+              properties:
+                tool_names:
+                  type: array
+                  items:
+                    type: string
+                  description: >-
+                    (Optional) List of specific tool names that are allowed
+              additionalProperties: false
+              title: AllowedToolsFilter
               description: >-
-                (Optional) Minimum relevance score threshold for results
-          additionalProperties: false
+                Filter configuration for restricting which MCP tools can be used.
           description: >-
-            (Optional) Options for ranking and scoring search results
+            (Optional) Restriction on which tools can be used from this server
       additionalProperties: false
       required:
         - type
-        - vector_store_ids
-      title: OpenAIResponseInputToolFileSearch
+        - server_label
+      title: OpenAIResponseToolMCP
       description: >-
-        File search tool configuration for OpenAI response inputs.
-    OpenAIResponseInputToolFunction:
+        Model Context Protocol (MCP) tool configuration for OpenAI response object.
+    ResponseShieldSpec:
       type: object
       properties:
         type:
           type: string
-          const: function
-          default: function
-          description: Tool type identifier, always "function"
-        name:
-          type: string
-          description: Name of the function that can be called
-        description:
-          type: string
-          description: >-
-            (Optional) Description of what the function does
-        parameters:
-          type: object
-          additionalProperties:
-            oneOf:
-              - type: 'null'
-              - type: boolean
-              - type: number
-              - type: string
-              - type: array
-              - type: object
-          description: >-
-            (Optional) JSON schema defining the function's parameters
-        strict:
-          type: boolean
-          description: >-
-            (Optional) Whether to enforce strict parameter validation
+          description: The type/identifier of the shield.
       additionalProperties: false
       required:
         - type
-        - name
-      title: OpenAIResponseInputToolFunction
+      title: ResponseShieldSpec
       description: >-
-        Function tool configuration for OpenAI response inputs.
+        Specification for a shield to apply during response generation.
+    OpenAIResponseInputTool:
+      oneOf:
+        - $ref: '#/components/schemas/OpenAIResponseInputToolWebSearch'
+        - $ref: '#/components/schemas/OpenAIResponseInputToolFileSearch'
+        - $ref: '#/components/schemas/OpenAIResponseInputToolFunction'
+        - $ref: '#/components/schemas/OpenAIResponseInputToolMCP'
+      discriminator:
+        propertyName: type
+        mapping:
+          web_search: '#/components/schemas/OpenAIResponseInputToolWebSearch'
+          file_search: '#/components/schemas/OpenAIResponseInputToolFileSearch'
+          function: '#/components/schemas/OpenAIResponseInputToolFunction'
+          mcp: '#/components/schemas/OpenAIResponseInputToolMCP'
     OpenAIResponseInputToolMCP:
       type: object
       properties:
@@ -7286,30 +7366,6 @@ components:
       title: OpenAIResponseInputToolMCP
       description: >-
         Model Context Protocol (MCP) tool configuration for OpenAI response inputs.
-    OpenAIResponseInputToolWebSearch:
-      type: object
-      properties:
-        type:
-          oneOf:
-            - type: string
-              const: web_search
-            - type: string
-              const: web_search_preview
-            - type: string
-              const: web_search_preview_2025_03_11
-          default: web_search
-          description: Web search tool type variant to use
-        search_context_size:
-          type: string
-          default: medium
-          description: >-
-            (Optional) Size of search context, must be "low", "medium", or "high"
-      additionalProperties: false
-      required:
-        - type
-      title: OpenAIResponseInputToolWebSearch
-      description: >-
-        Web search tool configuration for OpenAI response inputs.
     CreateOpenaiResponseRequest:
       type: object
       properties:
@@ -7410,6 +7466,12 @@ components:
           type: number
           description: >-
             (Optional) Nucleus sampling parameter used for generation
+        tools:
+          type: array
+          items:
+            $ref: '#/components/schemas/OpenAIResponseTool'
+          description: >-
+            (Optional) An array of tools the model may call while generating a response.
         truncation:
           type: string
           description: >-