diff --git a/docs/resources/llama-stack-spec.html b/docs/resources/llama-stack-spec.html
index e98de6491..377adf466 100644
--- a/docs/resources/llama-stack-spec.html
+++ b/docs/resources/llama-stack-spec.html
@@ -2737,6 +2737,40 @@
                 }
             }
         },
+        "/alpha/toolgroups/unregister": {
+            "post": {
+                "responses": {
+                    "200": {
+                        "description": "OK"
+                    }
+                },
+                "tags": [
+                    "ToolGroups"
+                ],
+                "summary": "Unregister a tool group",
+                "parameters": [
+                    {
+                        "name": "X-LlamaStack-ProviderData",
+                        "in": "header",
+                        "description": "JSON-encoded provider data which will be made available to the adapter servicing the API",
+                        "required": false,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/UnregisterToolGroupRequest"
+                            }
+                        }
+                    },
+                    "required": true
+                }
+            }
+        },
         "/alpha/version": {
             "get": {
                 "responses": {
@@ -3840,9 +3874,6 @@
                             ]
                         }
                     },
-                    "built_in_type": {
-                        "$ref": "#/components/schemas/BuiltinTool"
-                    },
                     "tool_prompt_format": {
                         "$ref": "#/components/schemas/ToolPromptFormat",
                         "default": "json"
@@ -5837,9 +5868,6 @@
                             "$ref": "#/components/schemas/ToolParameter"
                         }
                     },
-                    "built_in_type": {
-                        "$ref": "#/components/schemas/BuiltinTool"
-                    },
                     "metadata": {
                         "type": "object",
                         "additionalProperties": {
@@ -7933,6 +7961,18 @@
                     "model_id"
                 ]
             },
+            "UnregisterToolGroupRequest": {
+                "type": "object",
+                "properties": {
+                    "tool_group_id": {
+                        "type": "string"
+                    }
+                },
+                "additionalProperties": false,
+                "required": [
+                    "tool_group_id"
+                ]
+            },
             "VersionInfo": {
                 "type": "object",
                 "properties": {
@@ -8665,10 +8705,6 @@
         {
             "name": "ViolationLevel",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/ViolationLevel\" />"
-        },
-        {
-            "name": "WolframAlphaToolDefinition",
-            "description": "<SchemaDefinition schemaRef=\"#/components/schemas/WolframAlphaToolDefinition\" />"
         }
     ],
     "x-tagGroups": [
@@ -8862,8 +8898,7 @@
                 "VectorMemoryBank",
                 "VectorMemoryBankParams",
                 "VersionInfo",
-                "ViolationLevel",
-                "WolframAlphaToolDefinition"
+                "ViolationLevel"
             ]
         }
     ]
diff --git a/docs/resources/llama-stack-spec.yaml b/docs/resources/llama-stack-spec.yaml
index 924fc32a1..f64255341 100644
--- a/docs/resources/llama-stack-spec.yaml
+++ b/docs/resources/llama-stack-spec.yaml
@@ -2576,8 +2576,6 @@ components:
     Tool:
       additionalProperties: false
       properties:
-        built_in_type:
-          $ref: '#/components/schemas/BuiltinTool'
         description:
           type: string
         identifier:
@@ -2688,8 +2686,6 @@ components:
     ToolDef:
       additionalProperties: false
       properties:
-        built_in_type:
-          $ref: '#/components/schemas/BuiltinTool'
         description:
           type: string
         metadata:
@@ -4683,6 +4679,199 @@ paths:
           description: OK
       tags:
       - Telemetry
+  /alpha/tool-runtime/invoke:
+    post:
+      parameters:
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/InvokeToolRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ToolInvocationResult'
+          description: OK
+      summary: Run a tool with the given arguments
+      tags:
+      - ToolRuntime
+  /alpha/tool-runtime/list-tools:
+    post:
+      parameters:
+      - in: query
+        name: tool_group_id
+        required: false
+        schema:
+          type: string
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/ListRuntimeToolsRequest'
+        required: true
+      responses:
+        '200':
+          content:
+            application/jsonl:
+              schema:
+                $ref: '#/components/schemas/ToolDef'
+          description: OK
+      tags:
+      - ToolRuntime
+  /alpha/toolgroups/get:
+    get:
+      parameters:
+      - in: query
+        name: toolgroup_id
+        required: true
+        schema:
+          type: string
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ToolGroup'
+          description: OK
+      tags:
+      - ToolGroups
+  /alpha/toolgroups/list:
+    get:
+      parameters:
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      responses:
+        '200':
+          content:
+            application/jsonl:
+              schema:
+                $ref: '#/components/schemas/ToolGroup'
+          description: OK
+      summary: List tool groups with optional provider
+      tags:
+      - ToolGroups
+  /alpha/toolgroups/register:
+    post:
+      parameters:
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/RegisterToolGroupRequest'
+        required: true
+      responses:
+        '200':
+          description: OK
+      summary: Register a tool group
+      tags:
+      - ToolGroups
+  /alpha/toolgroups/unregister:
+    post:
+      parameters:
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/UnregisterToolGroupRequest'
+        required: true
+      responses:
+        '200':
+          description: OK
+      summary: Unregister a tool group
+      tags:
+      - ToolGroups
+  /alpha/tools/get:
+    get:
+      parameters:
+      - in: query
+        name: tool_name
+        required: true
+        schema:
+          type: string
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      responses:
+        '200':
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Tool'
+          description: OK
+      tags:
+      - ToolGroups
+  /alpha/tools/list:
+    get:
+      parameters:
+      - in: query
+        name: tool_group_id
+        required: false
+        schema:
+          type: string
+      - description: JSON-encoded provider data which will be made available to the
+          adapter servicing the API
+        in: header
+        name: X-LlamaStack-ProviderData
+        required: false
+        schema:
+          type: string
+      responses:
+        '200':
+          content:
+            application/jsonl:
+              schema:
+                $ref: '#/components/schemas/Tool'
+          description: OK
+      summary: List tools with optional tool group
+      tags:
+      - ToolGroups
   /alpha/version:
     get:
       parameters: