diff --git a/docs/resources/llama-stack-spec.html b/docs/resources/llama-stack-spec.html
index d1d2c266d..60480557b 100644
--- a/docs/resources/llama-stack-spec.html
+++ b/docs/resources/llama-stack-spec.html
@@ -3910,38 +3910,6 @@
                     "session_id"
                 ]
             },
-            "Attachment": {
-                "type": "object",
-                "properties": {
-                    "content": {
-                        "oneOf": [
-                            {
-                                "type": "string"
-                            },
-                            {
-                                "$ref": "#/components/schemas/InterleavedContentItem"
-                            },
-                            {
-                                "type": "array",
-                                "items": {
-                                    "$ref": "#/components/schemas/InterleavedContentItem"
-                                }
-                            },
-                            {
-                                "$ref": "#/components/schemas/URL"
-                            }
-                        ]
-                    },
-                    "mime_type": {
-                        "type": "string"
-                    }
-                },
-                "additionalProperties": false,
-                "required": [
-                    "content",
-                    "mime_type"
-                ]
-            },
             "CreateAgentTurnRequest": {
                 "type": "object",
                 "properties": {
@@ -3964,12 +3932,6 @@
                             ]
                         }
                     },
-                    "attachments": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/components/schemas/Attachment"
-                        }
-                    },
                     "stream": {
                         "type": "boolean"
                     }
@@ -4027,6 +3989,9 @@
                             "memory_retrieval"
                         ]
                     },
+                    "step_id": {
+                        "type": "string"
+                    },
                     "step_details": {
                         "oneOf": [
                             {
@@ -4048,6 +4013,7 @@
                 "required": [
                     "event_type",
                     "step_type",
+                    "step_id",
                     "step_details"
                 ]
             },
@@ -4454,7 +4420,36 @@
                     "output_attachments": {
                         "type": "array",
                         "items": {
-                            "$ref": "#/components/schemas/Attachment"
+                            "type": "object",
+                            "properties": {
+                                "content": {
+                                    "oneOf": [
+                                        {
+                                            "type": "string"
+                                        },
+                                        {
+                                            "$ref": "#/components/schemas/InterleavedContentItem"
+                                        },
+                                        {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/InterleavedContentItem"
+                                            }
+                                        },
+                                        {
+                                            "$ref": "#/components/schemas/URL"
+                                        }
+                                    ]
+                                },
+                                "mime_type": {
+                                    "type": "string"
+                                }
+                            },
+                            "additionalProperties": false,
+                            "required": [
+                                "content",
+                                "mime_type"
+                            ]
                         }
                     },
                     "started_at": {
@@ -7992,10 +7987,6 @@
             "name": "AppendRowsRequest",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/AppendRowsRequest\" />"
         },
-        {
-            "name": "Attachment",
-            "description": "<SchemaDefinition schemaRef=\"#/components/schemas/Attachment\" />"
-        },
         {
             "name": "BasicScoringFnParams",
             "description": "<SchemaDefinition schemaRef=\"#/components/schemas/BasicScoringFnParams\" />"
@@ -8710,7 +8701,6 @@
                 "AggregationFunctionType",
                 "AppEvalTaskConfig",
                 "AppendRowsRequest",
-                "Attachment",
                 "BasicScoringFnParams",
                 "BatchChatCompletionRequest",
                 "BatchChatCompletionResponse",
diff --git a/docs/resources/llama-stack-spec.yaml b/docs/resources/llama-stack-spec.yaml
index 4f7a9c91c..5137526c0 100644
--- a/docs/resources/llama-stack-spec.yaml
+++ b/docs/resources/llama-stack-spec.yaml
@@ -115,6 +115,8 @@ components:
           - $ref: '#/components/schemas/ToolExecutionStep'
           - $ref: '#/components/schemas/ShieldCallStep'
           - $ref: '#/components/schemas/MemoryRetrievalStep'
+        step_id:
+          type: string
         step_type:
           enum:
           - inference
@@ -125,6 +127,7 @@ components:
       required:
       - event_type
       - step_type
+      - step_id
       - step_details
       type: object
     AgentTurnResponseStepProgressPayload:
@@ -271,23 +274,6 @@ components:
       - dataset_id
       - rows
       type: object
-    Attachment:
-      additionalProperties: false
-      properties:
-        content:
-          oneOf:
-          - type: string
-          - $ref: '#/components/schemas/InterleavedContentItem'
-          - items:
-              $ref: '#/components/schemas/InterleavedContentItem'
-            type: array
-          - $ref: '#/components/schemas/URL'
-        mime_type:
-          type: string
-      required:
-      - content
-      - mime_type
-      type: object
     BasicScoringFnParams:
       additionalProperties: false
       properties:
@@ -615,10 +601,6 @@ components:
       properties:
         agent_id:
           type: string
-        attachments:
-          items:
-            $ref: '#/components/schemas/Attachment'
-          type: array
         messages:
           items:
             oneOf:
@@ -2980,7 +2962,22 @@ components:
           type: array
         output_attachments:
           items:
-            $ref: '#/components/schemas/Attachment'
+            additionalProperties: false
+            properties:
+              content:
+                oneOf:
+                - type: string
+                - $ref: '#/components/schemas/InterleavedContentItem'
+                - items:
+                    $ref: '#/components/schemas/InterleavedContentItem'
+                  type: array
+                - $ref: '#/components/schemas/URL'
+              mime_type:
+                type: string
+            required:
+            - content
+            - mime_type
+            type: object
           type: array
         output_message:
           $ref: '#/components/schemas/CompletionMessage'
@@ -4765,8 +4762,6 @@ tags:
 - description: <SchemaDefinition schemaRef="#/components/schemas/AppendRowsRequest"
     />
   name: AppendRowsRequest
-- description: <SchemaDefinition schemaRef="#/components/schemas/Attachment" />
-  name: Attachment
 - description: <SchemaDefinition schemaRef="#/components/schemas/BasicScoringFnParams"
     />
   name: BasicScoringFnParams
@@ -5271,7 +5266,6 @@ x-tagGroups:
   - AggregationFunctionType
   - AppEvalTaskConfig
   - AppendRowsRequest
-  - Attachment
   - BasicScoringFnParams
   - BatchChatCompletionRequest
   - BatchChatCompletionResponse