From dd0fc93180f04feb5bd2e6ef08607f8e4deb9a4f Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Sun, 20 Sep 2026 11:00:04 +0300
Subject: [PATCH 1/7] chore(deps): update submodule pointers for vendor and
 wiki

Updated the pinned commits for the tinyinference, tinytools, and wiki submodules to incorporate upstream changes.

Auto-committed-on: dragonfly
Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 vendor/tinyinference | 2 +-
 vendor/tinytools     | 2 +-
 wiki                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vendor/tinyinference b/vendor/tinyinference
index 2c3ff818..aeaecda2 160000
--- a/vendor/tinyinference
+++ b/vendor/tinyinference
@@ -1 +1 @@
-Subproject commit 2c3ff818f55f0644970eeaeee51b60cb9fa10100
+Subproject commit aeaecda26677161713b3a993872813e2a3594c21
diff --git a/vendor/tinytools b/vendor/tinytools
index e347becd..9ae1d44d 160000
--- a/vendor/tinytools
+++ b/vendor/tinytools
@@ -1 +1 @@
-Subproject commit e347becd7b83bd9a07e65b69b4294c485fc86e26
+Subproject commit 9ae1d44de00863bfff5e3549063d14d57db15c21
diff --git a/wiki b/wiki
index 6c8cf71e..5b8f5927 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 6c8cf71e1312d350439dc243ac6e09273ec90d25
+Subproject commit 5b8f5927caa2ba0730985e686bf5ef5550e53e6d

From b518ea77fb36957573d8c04723252345a4a93aeb Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Sun, 20 Sep 2026 11:23:56 +0300
Subject: [PATCH 2/7] fix: support updated upstream submodule APIs

Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 .../src/orchestration/test.rs                 |  2 +-
 crates/tinyagents-graph/src/todos/test.rs     |  4 ++-
 .../src/agent_loop/model_call.rs              |  1 +
 .../tinyagents-harness/src/agent_loop/test.rs | 12 ++++++++
 .../src/agent_loop/tools.rs                   | 30 +++++++++++++++++++
 .../tinyagents-harness/src/context/stats.rs   |  3 ++
 crates/tinyagents-harness/src/context/test.rs |  9 ++++++
 crates/tinyagents-harness/src/error.rs        |  1 +
 .../src/middleware/library/observe.rs         | 20 +++++++++++++
 .../tinyagents-harness/src/middleware/test.rs |  4 +++
 .../src/providers/claude_agent_sdk/mod.rs     |  3 +-
 .../src/providers/claude_code/mod.rs          | 15 +++++++++-
 .../src/providers/claude_code/mod_tests.rs    | 18 +++++++++++
 .../tinyagents-harness/src/steering/test.rs   |  4 +++
 .../src/summarization/render.rs               |  5 ++++
 .../src/summarization/test.rs                 | 10 +++++++
 .../src/summarization/types.rs                |  3 ++
 .../src/token_estimation.rs                   |  1 +
 .../examples/agent_loop_tools.rs              |  4 +++
 .../examples/basic_graph.rs                   |  1 +
 .../examples/local_model_probe.rs             |  2 ++
 .../tests/context_and_schema_compaction.rs    |  6 ++++
 .../tests/dependency_boundary.rs              |  2 +-
 .../tests/e2e_agent_graph.rs                  |  4 +++
 .../tests/e2e_budget.rs                       |  8 +++++
 .../tests/e2e_control_and_steer.rs            |  4 +--
 .../tests/e2e_fuzz_graph_agents.rs            |  4 +++
 .../tests/e2e_graph_task_dispatch.rs          |  4 +++
 .../tests/e2e_graph_todos.rs                  |  4 +++
 .../tests/e2e_harness_mock_capabilities.rs    |  4 +++
 .../tests/e2e_harness_provider_contracts.rs   |  6 ++++
 .../tests/e2e_middleware.rs                   |  4 +++
 .../tests/e2e_middleware_parser_contracts.rs  |  1 +
 .../tests/e2e_observability.rs                |  4 +++
 .../tests/e2e_prompt_cache_kv.rs              |  2 ++
 .../tests/e2e_reasoning_and_selection.rs      |  2 ++
 .../tests/e2e_subagents.rs                    |  4 +++
 .../tests/e2e_unknown_tool_policy.rs          |  4 +++
 .../tests/feature_harness_agent_loop.rs       |  4 +++
 .../tests/feature_harness_structured.rs       |  6 ++++
 .../tests/feature_infra_resilience.rs         |  4 +++
 .../tests/harness_agent_loop.rs               |  4 +++
 .../tests/tool_deferral.rs                    |  4 +++
 .../tests/wave2_cache_retry_after.rs          |  2 ++
 44 files changed, 236 insertions(+), 7 deletions(-)

diff --git a/crates/tinyagents-graph/src/orchestration/test.rs b/crates/tinyagents-graph/src/orchestration/test.rs
index 164824bf..7921ec15 100644
--- a/crates/tinyagents-graph/src/orchestration/test.rs
+++ b/crates/tinyagents-graph/src/orchestration/test.rs
@@ -40,7 +40,7 @@ fn raw(result: &ToolResult) -> &serde_json::Value {
         .iter()
         .find_map(|content| match content {
             ToolContent::Json { data } => Some(data),
-            ToolContent::Text { .. } => None,
+            ToolContent::Text { .. } | ToolContent::Image { .. } | ToolContent::File { .. } => None,
         })
         .expect("orchestration tool returns a JSON payload")
 }
diff --git a/crates/tinyagents-graph/src/todos/test.rs b/crates/tinyagents-graph/src/todos/test.rs
index 6056a508..b4c5b6d0 100644
--- a/crates/tinyagents-graph/src/todos/test.rs
+++ b/crates/tinyagents-graph/src/todos/test.rs
@@ -526,7 +526,9 @@ mod tool_tests {
             .iter()
             .find_map(|block| match block {
                 ToolContent::Json { data } => Some(data),
-                ToolContent::Text { .. } => None,
+                ToolContent::Text { .. } | ToolContent::Image { .. } | ToolContent::File { .. } => {
+                    None
+                }
             })
             .expect("successful todo result has a JSON payload")
     }
diff --git a/crates/tinyagents-harness/src/agent_loop/model_call.rs b/crates/tinyagents-harness/src/agent_loop/model_call.rs
index 0070d30a..e8923839 100644
--- a/crates/tinyagents-harness/src/agent_loop/model_call.rs
+++ b/crates/tinyagents-harness/src/agent_loop/model_call.rs
@@ -395,6 +395,7 @@ impl<State: Send + Sync, Ctx: Send + Sync> AgentHarness<State, Ctx> {
                     call_id: call.id.clone(),
                     content: serde_json::to_string(&call.arguments).unwrap_or_default(),
                     tool_name: Some(call.name.clone()),
+                    content_index: None,
                 }),
             });
         }
diff --git a/crates/tinyagents-harness/src/agent_loop/test.rs b/crates/tinyagents-harness/src/agent_loop/test.rs
index 32dbc104..e8a55fcc 100644
--- a/crates/tinyagents-harness/src/agent_loop/test.rs
+++ b/crates/tinyagents-harness/src/agent_loop/test.rs
@@ -306,6 +306,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -333,6 +335,8 @@ fn invalid_tool_call_response(id: &str, name: &str, raw: &str) -> ModelResponse
             content: Vec::new(),
             tool_calls: vec![ToolCall::invalid(id, name, raw, reason)],
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -353,6 +357,8 @@ fn text_response(text: &str, input: u64, output: u64) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(input, output)),
+
+            origin: None,
         },
         usage: Some(Usage::new(input, output)),
         finish_reason: Some("stop".to_string()),
@@ -377,6 +383,8 @@ fn truncated_empty_response(reasoning_tokens: u64) -> ModelResponse {
             content: Vec::new(),
             tool_calls: Vec::new(),
             usage: Some(Usage::new(4, reasoning_tokens)),
+
+            origin: None,
         },
         usage: Some(Usage::new(4, reasoning_tokens)),
         finish_reason: Some("length".to_string()),
@@ -2919,6 +2927,7 @@ async fn streaming_middleware_can_suppress_a_standalone_tool_delta() {
                 call_id: "blocked-call".to_string(),
                 content: "{}".to_string(),
                 tool_name: Some("blocked".to_string()),
+                content_index: None,
             }),
             ModelStreamItem::Completed(terminal),
         ])),
@@ -2964,6 +2973,7 @@ async fn streaming_tool_delta_transform_controls_terminal_dispatch() {
                 call_id: "raw-call".to_string(),
                 content: r#"{"raw":true}"#.to_string(),
                 tool_name: Some("blocked".to_string()),
+                content_index: None,
             }),
             ModelStreamItem::Completed(terminal),
         ])),
@@ -4088,6 +4098,8 @@ fn multi_tool_call_response(calls: Vec<(&str, &str)>) -> ModelResponse {
             content: Vec::new(),
             tool_calls,
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
diff --git a/crates/tinyagents-harness/src/agent_loop/tools.rs b/crates/tinyagents-harness/src/agent_loop/tools.rs
index 984e5084..804ece4b 100644
--- a/crates/tinyagents-harness/src/agent_loop/tools.rs
+++ b/crates/tinyagents-harness/src/agent_loop/tools.rs
@@ -1229,6 +1229,35 @@ fn tool_message_from_result(
             .map(|block| match block {
                 tinytools::ToolContent::Text { text } => ContentBlock::Text(text.clone()),
                 tinytools::ToolContent::Json { data } => ContentBlock::Json(data.clone()),
+                tinytools::ToolContent::Image { media_type, data } => {
+                    let url = match data {
+                        tinytools::ImageData::Base64(data) => {
+                            format!("data:{media_type};base64,{data}")
+                        }
+                        tinytools::ImageData::Url(url) => url.clone(),
+                    };
+                    ContentBlock::Image(tinyinference_llm::message::ImageRef {
+                        url,
+                        mime_type: Some(media_type.clone()),
+                    })
+                }
+                tinytools::ToolContent::File {
+                    media_type, data, ..
+                } => {
+                    use tinyinference_llm::message::MediaRef;
+                    let media = match data {
+                        tinytools::FileData::Base64(data) => MediaRef::Base64 {
+                            data: data.clone(),
+                            media_type: media_type.clone(),
+                        },
+                        tinytools::FileData::Url(url) => MediaRef::url(url.clone()),
+                        tinytools::FileData::Path(path) => MediaRef::Path {
+                            path: path.clone(),
+                            media_type: Some(media_type.clone()),
+                        },
+                    };
+                    ContentBlock::Document(media)
+                }
             })
             .collect()
     };
@@ -1428,6 +1457,7 @@ mod canonical_result_tests {
             ],
             is_error: true,
             markdown_formatted: Some("## compact failure".to_string()),
+            ..ToolResult::default()
         }
     }
 
diff --git a/crates/tinyagents-harness/src/context/stats.rs b/crates/tinyagents-harness/src/context/stats.rs
index 67bcce0e..511fe662 100644
--- a/crates/tinyagents-harness/src/context/stats.rs
+++ b/crates/tinyagents-harness/src/context/stats.rs
@@ -51,6 +51,7 @@ pub fn context_statistics(messages: &[Message]) -> ContextStatistics {
                 }
                 &message.content
             }
+            Message::Custom(_) => continue,
         };
         for block in content {
             match block {
@@ -61,6 +62,7 @@ pub fn context_statistics(messages: &[Message]) -> ContextStatistics {
                     stats.text_chars += value.to_string().chars().count();
                 }
                 ContentBlock::Image(_) => stats.images += 1,
+                ContentBlock::Audio(_) | ContentBlock::Video(_) | ContentBlock::Document(_) => {}
                 ContentBlock::RedactedThinking { .. } => {}
             }
         }
@@ -82,6 +84,7 @@ pub fn estimate_context_tokens(messages: &[Message], tokenize: impl Fn(&str) ->
                 Message::User(message) => &message.content,
                 Message::Assistant(message) => &message.content,
                 Message::Tool(message) => &message.content,
+                Message::Custom(_) => return 0,
             };
             let mut visible = content
                 .iter()
diff --git a/crates/tinyagents-harness/src/context/test.rs b/crates/tinyagents-harness/src/context/test.rs
index e4dfea70..6c5be274 100644
--- a/crates/tinyagents-harness/src/context/test.rs
+++ b/crates/tinyagents-harness/src/context/test.rs
@@ -373,6 +373,8 @@ fn context_statistics_preserve_tool_request_result_pairing_and_image_counts() {
             content: vec![ContentBlock::Text("call it".into())],
             tool_calls: vec![ToolCall::new("call-1", "lookup", serde_json::json!({}))],
             usage: None,
+
+            origin: None,
         }),
         Message::Tool(tinyinference_llm::message::ToolMessage {
             tool_call_id: "call-1".into(),
@@ -435,6 +437,9 @@ fn token_estimation_includes_structured_blocks_for_every_role() {
     let messages = vec![
         Message::System(SystemMessage {
             content: vec![ContentBlock::ProviderExtension(json.clone())],
+            sections: Default::default(),
+            tools_added: Vec::new(),
+            tools_removed: Vec::new(),
         }),
         Message::User(UserMessage {
             content: vec![ContentBlock::Json(json.clone())],
@@ -444,6 +449,8 @@ fn token_estimation_includes_structured_blocks_for_every_role() {
             content: vec![ContentBlock::ProviderExtension(json.clone())],
             tool_calls: vec![],
             usage: None,
+
+            origin: None,
         }),
         Message::Tool(ToolMessage {
             tool_call_id: "call".into(),
@@ -472,6 +479,8 @@ fn token_estimation_includes_assistant_tool_names_and_arguments() {
             serde_json::json!({"query": "one two three"}),
         )],
         usage: None,
+
+        origin: None,
     })];
 
     let rendered = std::cell::RefCell::new(String::new());
diff --git a/crates/tinyagents-harness/src/error.rs b/crates/tinyagents-harness/src/error.rs
index d8288464..ddc6b9f9 100644
--- a/crates/tinyagents-harness/src/error.rs
+++ b/crates/tinyagents-harness/src/error.rs
@@ -257,6 +257,7 @@ impl From<tinyinference_llm::Error> for TinyAgentsError {
             tinyinference_llm::Error::Validation(message) => Self::Validation(message),
             tinyinference_llm::Error::Serialization(error) => Self::Serialization(error),
             tinyinference_llm::Error::Catalog(message) => Self::Model(message),
+            tinyinference_llm::Error::Unsupported(message) => Self::Model(message),
         }
     }
 }
diff --git a/crates/tinyagents-harness/src/middleware/library/observe.rs b/crates/tinyagents-harness/src/middleware/library/observe.rs
index 52ed83ab..2192cf24 100644
--- a/crates/tinyagents-harness/src/middleware/library/observe.rs
+++ b/crates/tinyagents-harness/src/middleware/library/observe.rs
@@ -265,6 +265,26 @@ impl<State: Send + Sync, Ctx: Send + Sync> Middleware<State, Ctx> for RedactionM
                     }
                 }
                 ToolContent::Json { data } => hits += self.redact_value(data),
+                ToolContent::Image { data, .. } => match data {
+                    tinytools::ImageData::Base64(value) | tinytools::ImageData::Url(value) => {
+                        let (redacted, count) = self.redact(value);
+                        if count > 0 {
+                            *value = redacted;
+                            hits += count;
+                        }
+                    }
+                },
+                ToolContent::File { data, .. } => match data {
+                    tinytools::FileData::Base64(value)
+                    | tinytools::FileData::Url(value)
+                    | tinytools::FileData::Path(value) => {
+                        let (redacted, count) = self.redact(value);
+                        if count > 0 {
+                            *value = redacted;
+                            hits += count;
+                        }
+                    }
+                },
             }
         }
         if let Some(markdown) = &mut result.markdown_formatted {
diff --git a/crates/tinyagents-harness/src/middleware/test.rs b/crates/tinyagents-harness/src/middleware/test.rs
index ad48575c..625a2925 100644
--- a/crates/tinyagents-harness/src/middleware/test.rs
+++ b/crates/tinyagents-harness/src/middleware/test.rs
@@ -34,6 +34,8 @@ fn response_with_usage(usage: Usage) -> ModelResponse {
             content: vec![ContentBlock::Text("ok".to_string())],
             tool_calls: Vec::new(),
             usage: None,
+
+            origin: None,
         },
         usage: Some(usage),
         finish_reason: None,
@@ -1073,6 +1075,8 @@ fn response_text(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: None,
+
+            origin: None,
         },
         usage: None,
         finish_reason: None,
diff --git a/crates/tinyagents-harness/src/providers/claude_agent_sdk/mod.rs b/crates/tinyagents-harness/src/providers/claude_agent_sdk/mod.rs
index 914eaf3e..23e1d4ef 100644
--- a/crates/tinyagents-harness/src/providers/claude_agent_sdk/mod.rs
+++ b/crates/tinyagents-harness/src/providers/claude_agent_sdk/mod.rs
@@ -107,7 +107,7 @@ fn build_invocation(
 fn render_transcript(messages: &[Message]) -> String {
     let non_system: Vec<&Message> = messages
         .iter()
-        .filter(|message| !matches!(message, Message::System(_)))
+        .filter(|message| !matches!(message, Message::System(_) | Message::Custom(_)))
         .collect();
     if non_system.len() == 1 {
         return non_system[0].text();
@@ -121,6 +121,7 @@ fn render_transcript(messages: &[Message]) -> String {
                 Message::Assistant(_) => "ASSISTANT",
                 Message::Tool(_) => "TOOL",
                 Message::System(_) => unreachable!("system messages were filtered"),
+                Message::Custom(_) => unreachable!("custom messages were filtered"),
             };
             format!("[{role}]\n{}\n[/{role}]", message.text())
         })
diff --git a/crates/tinyagents-harness/src/providers/claude_code/mod.rs b/crates/tinyagents-harness/src/providers/claude_code/mod.rs
index 82e4a992..8095576f 100644
--- a/crates/tinyagents-harness/src/providers/claude_code/mod.rs
+++ b/crates/tinyagents-harness/src/providers/claude_code/mod.rs
@@ -323,7 +323,13 @@ fn thread_key_from_request(request: &ModelRequest) -> String {
 /// first, then any structured [`ResponseFormat`] is appended as a trailing
 /// system instruction (see [`response_format_instruction`]).
 fn request_messages(request: &ModelRequest) -> Vec<ChatMessage> {
-    let mut messages = coalesce_tool_results(&request.messages);
+    let provider_messages: Vec<_> = request
+        .messages
+        .iter()
+        .filter(|message| !matches!(message, Message::Custom(_)))
+        .cloned()
+        .collect();
+    let mut messages = coalesce_tool_results(&provider_messages);
     if !request.tools.is_empty() {
         messages = with_tool_instructions(&messages, &request.tools, &request.tool_choice);
     }
@@ -338,12 +344,14 @@ fn request_messages(request: &ModelRequest) -> Vec<ChatMessage> {
                 Message::User(_) => "user",
                 Message::Assistant(_) => "assistant",
                 Message::Tool(_) => "tool",
+                Message::Custom(_) => unreachable!("custom messages were filtered"),
             };
             let content = match message {
                 Message::System(value) => render_content(&value.content),
                 Message::User(value) => render_content(&value.content),
                 Message::Assistant(value) => render_content(&value.content),
                 Message::Tool(value) => render_content(&value.content),
+                Message::Custom(_) => unreachable!("custom messages were filtered"),
             };
             ChatMessage::new(role, content)
         })
@@ -387,6 +395,9 @@ fn render_content(content: &[ContentBlock]) -> String {
             }
             ContentBlock::Thinking { text, .. } => Some(text.clone()),
             ContentBlock::RedactedThinking { .. } => None,
+            ContentBlock::Audio(_) => Some("[audio content]".to_string()),
+            ContentBlock::Video(_) => Some("[video content]".to_string()),
+            ContentBlock::Document(_) => Some("[document content]".to_string()),
         })
         .collect::<Vec<_>>()
         // Content-block boundaries carry no implicit whitespace. Inserting a
@@ -416,6 +427,8 @@ fn model_response(response: ChatResponse) -> ModelResponse {
             content: response.text.into_iter().map(ContentBlock::Text).collect(),
             tool_calls: Vec::new(),
             usage,
+
+            origin: None,
         },
         usage,
         finish_reason: Some("stop".into()),
diff --git a/crates/tinyagents-harness/src/providers/claude_code/mod_tests.rs b/crates/tinyagents-harness/src/providers/claude_code/mod_tests.rs
index fe74a06d..472a0068 100644
--- a/crates/tinyagents-harness/src/providers/claude_code/mod_tests.rs
+++ b/crates/tinyagents-harness/src/providers/claude_code/mod_tests.rs
@@ -236,3 +236,21 @@ fn request_rendering_keeps_private_image_marker_text_literal() {
     assert_eq!(content[0]["text"], "literal ");
     assert_eq!(content[1]["text"], "[OH_IMAGE:data:image/png;base64,QUJD]");
 }
+
+#[test]
+fn request_messages_filter_host_custom_records() {
+    let request = ModelRequest::new(vec![
+        Message::user("hello"),
+        Message::Custom(tinyinference_llm::message::CustomMessage {
+            kind: "compaction".into(),
+            payload: serde_json::json!({"summary": "host-only"}),
+            display: Some("host-only".into()),
+        }),
+    ]);
+
+    let messages = request_messages(&request);
+
+    assert_eq!(messages.len(), 1);
+    assert_eq!(messages[0].role, "user");
+    assert_eq!(messages[0].content, "hello");
+}
diff --git a/crates/tinyagents-harness/src/steering/test.rs b/crates/tinyagents-harness/src/steering/test.rs
index 72f1d7ac..d5a51850 100644
--- a/crates/tinyagents-harness/src/steering/test.rs
+++ b/crates/tinyagents-harness/src/steering/test.rs
@@ -39,6 +39,8 @@ fn text_response(text: &str) -> ModelResponse {
             )],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(1, 1)),
+
+            origin: None,
         },
         usage: Some(Usage::new(1, 1)),
         finish_reason: Some("stop".to_string()),
@@ -87,6 +89,8 @@ impl ChatModel<()> for RecordingModel {
                     content: Vec::new(),
                     tool_calls: vec![ToolCall::new("c1", "noop", json!({}))],
                     usage: Some(Usage::new(1, 1)),
+
+                    origin: None,
                 },
                 usage: Some(Usage::new(1, 1)),
                 finish_reason: Some("tool_calls".to_string()),
diff --git a/crates/tinyagents-harness/src/summarization/render.rs b/crates/tinyagents-harness/src/summarization/render.rs
index 579dbf7f..454fedaf 100644
--- a/crates/tinyagents-harness/src/summarization/render.rs
+++ b/crates/tinyagents-harness/src/summarization/render.rs
@@ -41,6 +41,7 @@ fn role_label(message: &Message) -> &'static str {
         Message::User(_) => "user",
         Message::Assistant(_) => "assistant",
         Message::Tool(_) => "tool",
+        Message::Custom(_) => "custom",
     }
 }
 
@@ -76,6 +77,9 @@ fn render_content(content: &[ContentBlock]) -> Vec<String> {
                 "<image mime=\"{}\" />",
                 image.mime_type.as_deref().unwrap_or("unknown")
             )),
+            ContentBlock::Audio(_) => Some("<audio />".to_string()),
+            ContentBlock::Video(_) => Some("<video />".to_string()),
+            ContentBlock::Document(_) => Some("<document />".to_string()),
             ContentBlock::Thinking { text, .. } if text.trim().is_empty() => None,
             ContentBlock::Thinking { text, .. } => {
                 Some(format!("<reasoning>{}</reasoning>", elide(text)))
@@ -102,6 +106,7 @@ pub fn render_message_for_summary(message: &Message) -> String {
         Message::User(m) => render_content(&m.content),
         Message::Assistant(m) => render_content(&m.content),
         Message::Tool(m) => render_content(&m.content),
+        Message::Custom(m) => m.display.clone().into_iter().collect(),
     };
 
     match message {
diff --git a/crates/tinyagents-harness/src/summarization/test.rs b/crates/tinyagents-harness/src/summarization/test.rs
index 2894c65b..7a2f14e1 100644
--- a/crates/tinyagents-harness/src/summarization/test.rs
+++ b/crates/tinyagents-harness/src/summarization/test.rs
@@ -423,6 +423,8 @@ mod pairing {
                 .map(|id| ToolCall::new(*id, "lookup", json!({"q": "rust"})))
                 .collect(),
             usage: None,
+
+            origin: None,
         })
     }
 
@@ -605,6 +607,8 @@ mod pairing {
                 json!({"query": "x".repeat(2000)}),
             )],
             usage: None,
+
+            origin: None,
         });
         assert!(
             heavy.estimated_char_weight() > 2000,
@@ -640,6 +644,8 @@ mod pairing {
             content: vec![ContentBlock::thinking("z".repeat(120))],
             tool_calls: Vec::new(),
             usage: None,
+
+            origin: None,
         });
         assert_eq!(msg.estimated_char_weight(), 120);
     }
@@ -665,6 +671,8 @@ mod rendering {
                 content: Vec::new(),
                 tool_calls: vec![ToolCall::new("c1", "get_weather", json!({"city": "Paris"}))],
                 usage: None,
+
+                origin: None,
             }),
             Message::tool("c1", r#"{"temp_c":21}"#),
         ];
@@ -688,6 +696,8 @@ mod rendering {
             ],
             tool_calls: Vec::new(),
             usage: None,
+
+            origin: None,
         });
         let rendered = render_message_for_summary(&msg);
         assert!(rendered.contains("weighing options"), "{rendered}");
diff --git a/crates/tinyagents-harness/src/summarization/types.rs b/crates/tinyagents-harness/src/summarization/types.rs
index 0ee4aefe..549d748d 100644
--- a/crates/tinyagents-harness/src/summarization/types.rs
+++ b/crates/tinyagents-harness/src/summarization/types.rs
@@ -74,6 +74,8 @@ pub enum MessageRole {
     Assistant,
     /// [`Message::Tool`].
     Tool,
+    /// Host-defined out-of-band record.
+    Custom,
 }
 
 impl MessageRole {
@@ -84,6 +86,7 @@ impl MessageRole {
             Message::User(_) => MessageRole::User,
             Message::Assistant(_) => MessageRole::Assistant,
             Message::Tool(_) => MessageRole::Tool,
+            Message::Custom(_) => MessageRole::Custom,
         }
     }
 }
diff --git a/crates/tinyagents-harness/src/token_estimation.rs b/crates/tinyagents-harness/src/token_estimation.rs
index 4173ec89..a107e360 100644
--- a/crates/tinyagents-harness/src/token_estimation.rs
+++ b/crates/tinyagents-harness/src/token_estimation.rs
@@ -140,6 +140,7 @@ pub fn message_role_label(message: &Message) -> &'static str {
         Message::User(_) => "user",
         Message::Assistant(_) => "assistant",
         Message::Tool(_) => "tool",
+        Message::Custom(_) => "custom",
     }
 }
 
diff --git a/crates/tinyagents-integration-tests/examples/agent_loop_tools.rs b/crates/tinyagents-integration-tests/examples/agent_loop_tools.rs
index 6d54f2ab..05c2376f 100644
--- a/crates/tinyagents-integration-tests/examples/agent_loop_tools.rs
+++ b/crates/tinyagents-integration-tests/examples/agent_loop_tools.rs
@@ -64,6 +64,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(12, 4)),
+
+            origin: None,
         },
         usage: Some(Usage::new(12, 4)),
         finish_reason: Some("tool_calls".to_string()),
@@ -84,6 +86,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(20, 8)),
+
+            origin: None,
         },
         usage: Some(Usage::new(20, 8)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/examples/basic_graph.rs b/crates/tinyagents-integration-tests/examples/basic_graph.rs
index 055729e7..396e8de0 100644
--- a/crates/tinyagents-integration-tests/examples/basic_graph.rs
+++ b/crates/tinyagents-integration-tests/examples/basic_graph.rs
@@ -75,6 +75,7 @@ async fn main() -> Result<()> {
             Message::User(_) => "user",
             Message::Assistant(_) => "assistant",
             Message::Tool(_) => "tool",
+            Message::Custom(_) => "custom",
         };
         println!("{role}: {}", message.text());
     }
diff --git a/crates/tinyagents-integration-tests/examples/local_model_probe.rs b/crates/tinyagents-integration-tests/examples/local_model_probe.rs
index ad404928..4a0d7464 100644
--- a/crates/tinyagents-integration-tests/examples/local_model_probe.rs
+++ b/crates/tinyagents-integration-tests/examples/local_model_probe.rs
@@ -150,6 +150,8 @@ async fn tool_roundtrip(model: &OpenAiModel) -> Outcome {
         content: resp.message.content.clone(),
         tool_calls: resp.message.tool_calls.clone(),
         usage: None,
+
+        origin: None,
     });
     let mut req2 = base_request(vec![
         user,
diff --git a/crates/tinyagents-integration-tests/tests/context_and_schema_compaction.rs b/crates/tinyagents-integration-tests/tests/context_and_schema_compaction.rs
index 43a854fb..3dfd1a7b 100644
--- a/crates/tinyagents-integration-tests/tests/context_and_schema_compaction.rs
+++ b/crates/tinyagents-integration-tests/tests/context_and_schema_compaction.rs
@@ -61,6 +61,8 @@ fn assistant_calling(id: &str) -> Message {
             serde_json::json!({"city": "Paris"}),
         )],
         usage: None,
+
+        origin: None,
     })
 }
 
@@ -136,6 +138,8 @@ fn max_tokens_never_orphans_a_tool_result() {
             serde_json::json!({"city": "Paris"}),
         )],
         usage: None,
+
+        origin: None,
     });
     let messages = vec![
         Message::user("x".repeat(40)),
@@ -164,6 +168,8 @@ fn a_tool_only_assistant_turn_trips_the_compaction_gate() {
             serde_json::json!({"query": "q".repeat(2_000)}),
         )],
         usage: None,
+
+        origin: None,
     });
     assert_eq!(heavy.text(), "", "precondition: no visible text");
 
diff --git a/crates/tinyagents-integration-tests/tests/dependency_boundary.rs b/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
index 8d264908..c2d6bfae 100644
--- a/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
+++ b/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
@@ -151,7 +151,7 @@ const KNOWN_GENERIC_CLAUDE_CODE_CHAT_MESSAGE_DEBT: &[(&str, usize)] = &[
     ),
     (
         "crates/tinyagents-harness/src/providers/claude_code/mod.rs",
-        348,
+        356,
     ),
     (
         "crates/tinyagents-harness/src/providers/claude_code/mod_tests.rs",
diff --git a/crates/tinyagents-integration-tests/tests/e2e_agent_graph.rs b/crates/tinyagents-integration-tests/tests/e2e_agent_graph.rs
index 20e8a9f3..63809c2a 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_agent_graph.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_agent_graph.rs
@@ -47,6 +47,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(6, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(6, 2)),
         finish_reason: Some("tool_calls".to_string()),
@@ -67,6 +69,8 @@ fn text_response(text: &str, input: u64, output: u64) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(input, output)),
+
+            origin: None,
         },
         usage: Some(Usage::new(input, output)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_budget.rs b/crates/tinyagents-integration-tests/tests/e2e_budget.rs
index 2c199e14..7f9f5045 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_budget.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_budget.rs
@@ -51,6 +51,8 @@ fn tool_call_response(id: &str, name: &str, input: u64, output: u64) -> ModelRes
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, json!({}))],
             usage: Some(Usage::new(input, output)),
+
+            origin: None,
         },
         usage: Some(Usage::new(input, output)),
         finish_reason: Some("tool_calls".into()),
@@ -71,6 +73,8 @@ fn text_response(text: &str, input: u64, output: u64) -> ModelResponse {
             content: vec![ContentBlock::Text(text.into())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(input, output)),
+
+            origin: None,
         },
         usage: Some(Usage::new(input, output)),
         finish_reason: Some("stop".into()),
@@ -287,6 +291,8 @@ async fn cost_pricing_records_and_enforces_money_budget() {
             content: vec![ContentBlock::Text("priced".into())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(4, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(4, 2)),
         finish_reason: Some("stop".into()),
@@ -517,6 +523,8 @@ async fn cached_input_budget_blocks_next_call() {
                 cache_read_tokens: 12,
                 ..Usage::new(2, 1)
             }),
+
+            origin: None,
         },
         usage: Some(Usage {
             cache_read_tokens: 12,
diff --git a/crates/tinyagents-integration-tests/tests/e2e_control_and_steer.rs b/crates/tinyagents-integration-tests/tests/e2e_control_and_steer.rs
index f9e8a924..a0bec167 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_control_and_steer.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_control_and_steer.rs
@@ -261,7 +261,7 @@ async fn steer_accepted(
         .into_iter()
         .find_map(|block| match block {
             ToolContent::Json { data } => data.get("accepted").and_then(|value| value.as_bool()),
-            ToolContent::Text { .. } => None,
+            ToolContent::Text { .. } | ToolContent::Image { .. } | ToolContent::File { .. } => None,
         })
         .unwrap_or_else(|| panic!("steer result missing `accepted` boolean"))
 }
@@ -418,7 +418,7 @@ async fn list_records(tool: &OrchestrationTool, args: serde_json::Value) -> Vec<
         .into_iter()
         .find_map(|block| match block {
             ToolContent::Json { data } => data.as_array().cloned(),
-            ToolContent::Text { .. } => None,
+            ToolContent::Text { .. } | ToolContent::Image { .. } | ToolContent::File { .. } => None,
         })
         .expect("orchestrate_list returns a JSON array of records")
 }
diff --git a/crates/tinyagents-integration-tests/tests/e2e_fuzz_graph_agents.rs b/crates/tinyagents-integration-tests/tests/e2e_fuzz_graph_agents.rs
index 25dcc0e6..f6011a27 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_fuzz_graph_agents.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_fuzz_graph_agents.rs
@@ -257,6 +257,8 @@ fn tool_call_response(calls: Vec<ToolCall>) -> ModelResponse {
             content: Vec::new(),
             tool_calls: calls,
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -276,6 +278,8 @@ fn text_response(text: impl Into<String>) -> ModelResponse {
             content: vec![ContentBlock::Text(text.into())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(5, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(5, 2)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_graph_task_dispatch.rs b/crates/tinyagents-integration-tests/tests/e2e_graph_task_dispatch.rs
index 51a03279..bb7932e7 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_graph_task_dispatch.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_graph_task_dispatch.rs
@@ -37,6 +37,8 @@ fn tool_call_response(id: &str, arguments: serde_json::Value) -> ModelResponse {
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, "todo", arguments)],
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -56,6 +58,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(4, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(4, 2)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_graph_todos.rs b/crates/tinyagents-integration-tests/tests/e2e_graph_todos.rs
index 754acbb7..e1cd6c92 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_graph_todos.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_graph_todos.rs
@@ -26,6 +26,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -45,6 +47,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(4, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(4, 2)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_harness_mock_capabilities.rs b/crates/tinyagents-integration-tests/tests/e2e_harness_mock_capabilities.rs
index f21d9f03..be92c687 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_harness_mock_capabilities.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_harness_mock_capabilities.rs
@@ -28,6 +28,8 @@ fn tool_turn(calls: Vec<ToolCall>) -> ModelResponse {
             content: Vec::new(),
             tool_calls: calls,
             usage: Some(Usage::new(8, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(8, 3)),
         finish_reason: Some("tool_calls".into()),
@@ -47,6 +49,8 @@ fn text_turn(text: impl Into<String>) -> ModelResponse {
             content: vec![ContentBlock::Text(text.into())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(5, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(5, 2)),
         finish_reason: Some("stop".into()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_harness_provider_contracts.rs b/crates/tinyagents-integration-tests/tests/e2e_harness_provider_contracts.rs
index afe37d60..dd76ba24 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_harness_provider_contracts.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_harness_provider_contracts.rs
@@ -239,11 +239,13 @@ async fn model_request_response_registry_and_stream_contracts_are_stable() {
         call_id: "call-1".into(),
         content: r#"{"a":"#.into(),
         tool_name: None,
+        content_index: None,
     }));
     accumulator.push(&ModelStreamItem::ToolCallDelta(ToolDelta {
         call_id: "call-1".into(),
         content: r#""b"}"#.into(),
         tool_name: None,
+        content_index: None,
     }));
     accumulator.push(&ModelStreamItem::UsageDelta(Usage::new(4, 5)));
     accumulator.push(&ModelStreamItem::MessageDelta(MessageDelta {
@@ -279,6 +281,8 @@ async fn model_request_response_registry_and_stream_contracts_are_stable() {
                 retryable: true,
                 retry_after_ms: None,
                 raw: Some(json!({ "error": "nope" })),
+                partial_message: None,
+                stop_reason: None,
             },
         )])));
     let err = collect_model_stream(failed_stream).await.unwrap_err();
@@ -325,6 +329,7 @@ fn model_profiles_stream_chunks_usage_and_cost_are_additive() {
                 call_id: "tool-1".into(),
                 content: "partial".into(),
                 tool_name: None,
+                content_index: None,
             }),
         }),
         StreamChunk::Debug("trace".into()),
@@ -450,6 +455,7 @@ fn structured_output_supports_provider_schema_and_tool_fallbacks() {
                 invalid: None,
             }],
             usage: None,
+            origin: None,
         },
         usage: None,
         finish_reason: Some("tool_calls".into()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_middleware.rs b/crates/tinyagents-integration-tests/tests/e2e_middleware.rs
index ef2deb62..51b5aa24 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_middleware.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_middleware.rs
@@ -138,6 +138,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -158,6 +160,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(4, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(4, 2)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_middleware_parser_contracts.rs b/crates/tinyagents-integration-tests/tests/e2e_middleware_parser_contracts.rs
index 9acdba22..a66c685f 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_middleware_parser_contracts.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_middleware_parser_contracts.rs
@@ -189,6 +189,7 @@ async fn middleware_stack_runs_lifecycle_hooks_and_builtin_guards() {
         call_id: "tool-1".into(),
         content: "progress".into(),
         tool_name: None,
+        content_index: None,
     };
     stack
         .run_on_tool_delta(&mut ctx, &(), &mut tool_delta)
diff --git a/crates/tinyagents-integration-tests/tests/e2e_observability.rs b/crates/tinyagents-integration-tests/tests/e2e_observability.rs
index cc7419bb..06ed127a 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_observability.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_observability.rs
@@ -47,6 +47,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -66,6 +68,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(4, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(4, 2)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_prompt_cache_kv.rs b/crates/tinyagents-integration-tests/tests/e2e_prompt_cache_kv.rs
index 953b62df..bb7edfb7 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_prompt_cache_kv.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_prompt_cache_kv.rs
@@ -92,6 +92,8 @@ impl ChatModel<()> for KvCacheMockServer {
                         json!({ "query": format!("part-{call}") }),
                     )],
                     usage: Some(Usage::new(100, 10)),
+
+                    origin: None,
                 },
                 usage: Some(Usage::new(100, 10)),
                 finish_reason: Some("tool_calls".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_reasoning_and_selection.rs b/crates/tinyagents-integration-tests/tests/e2e_reasoning_and_selection.rs
index 36efec95..3ffe70fb 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_reasoning_and_selection.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_reasoning_and_selection.rs
@@ -41,6 +41,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.into())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(3, 1)),
+
+            origin: None,
         },
         usage: Some(Usage::new(3, 1)),
         finish_reason: Some("stop".into()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_subagents.rs b/crates/tinyagents-integration-tests/tests/e2e_subagents.rs
index fe83ae19..6b29c695 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_subagents.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_subagents.rs
@@ -44,6 +44,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(9, 4)),
+
+            origin: None,
         },
         usage: Some(Usage::new(9, 4)),
         finish_reason: Some("tool_calls".to_string()),
@@ -64,6 +66,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(5, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(5, 3)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/e2e_unknown_tool_policy.rs b/crates/tinyagents-integration-tests/tests/e2e_unknown_tool_policy.rs
index 0a0e79b4..8c6a66c5 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_unknown_tool_policy.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_unknown_tool_policy.rs
@@ -33,6 +33,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(6, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(6, 2)),
         finish_reason: Some("tool_calls".into()),
@@ -52,6 +54,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.into())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(3, 1)),
+
+            origin: None,
         },
         usage: Some(Usage::new(3, 1)),
         finish_reason: Some("stop".into()),
diff --git a/crates/tinyagents-integration-tests/tests/feature_harness_agent_loop.rs b/crates/tinyagents-integration-tests/tests/feature_harness_agent_loop.rs
index 6e27c96d..d576021b 100644
--- a/crates/tinyagents-integration-tests/tests/feature_harness_agent_loop.rs
+++ b/crates/tinyagents-integration-tests/tests/feature_harness_agent_loop.rs
@@ -40,6 +40,8 @@ fn multi_tool_call_response(calls: Vec<ToolCall>) -> ModelResponse {
             content: Vec::new(),
             tool_calls: calls,
             usage: Some(Usage::new(8, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(8, 3)),
         finish_reason: Some("tool_calls".into()),
@@ -63,6 +65,8 @@ fn text_response(text: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(text.into())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(4, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(4, 2)),
         finish_reason: Some("stop".into()),
diff --git a/crates/tinyagents-integration-tests/tests/feature_harness_structured.rs b/crates/tinyagents-integration-tests/tests/feature_harness_structured.rs
index 8ea10bd0..269a5789 100644
--- a/crates/tinyagents-integration-tests/tests/feature_harness_structured.rs
+++ b/crates/tinyagents-integration-tests/tests/feature_harness_structured.rs
@@ -56,6 +56,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(6, 2)),
+
+            origin: None,
         },
         usage: Some(Usage::new(6, 2)),
         finish_reason: Some("tool_calls".into()),
@@ -187,6 +189,8 @@ async fn tool_call_strategy_reads_named_tool_arguments() {
                 ToolCall::new("c1", "answer", json!({ "value": "tooled", "score": 7 })),
             ],
             usage: None,
+
+            origin: None,
         },
         usage: None,
         finish_reason: Some("tool_calls".into()),
@@ -364,6 +368,8 @@ async fn provider_schema_reads_text_content_blocks() {
             content: vec![ContentBlock::Text(r#"{"value":"blocky","score":5}"#.into())],
             tool_calls: Vec::new(),
             usage: None,
+
+            origin: None,
         },
         usage: None,
         finish_reason: Some("stop".into()),
diff --git a/crates/tinyagents-integration-tests/tests/feature_infra_resilience.rs b/crates/tinyagents-integration-tests/tests/feature_infra_resilience.rs
index d9c90365..2aed58ef 100644
--- a/crates/tinyagents-integration-tests/tests/feature_infra_resilience.rs
+++ b/crates/tinyagents-integration-tests/tests/feature_infra_resilience.rs
@@ -122,6 +122,8 @@ fn provider_error_retryability_follows_its_flag() {
         retryable: true,
         retry_after_ms: None,
         raw: None,
+        partial_message: None,
+        stop_reason: None,
     };
     assert!(is_retryable(&TinyAgentsError::Provider(Box::new(
         retryable.clone()
@@ -196,6 +198,8 @@ fn classify_provider_error_and_reason_labels_are_stable() {
         retryable: true,
         retry_after_ms: None,
         raw: None,
+        partial_message: None,
+        stop_reason: None,
     };
     let class = classify_provider_error(&err);
     assert_eq!(class, ProviderFailureClass::UpstreamUnhealthy);
diff --git a/crates/tinyagents-integration-tests/tests/harness_agent_loop.rs b/crates/tinyagents-integration-tests/tests/harness_agent_loop.rs
index 58ebcecc..ee33a05d 100644
--- a/crates/tinyagents-integration-tests/tests/harness_agent_loop.rs
+++ b/crates/tinyagents-integration-tests/tests/harness_agent_loop.rs
@@ -65,6 +65,8 @@ fn tool_call_response(id: &str, name: &str, arguments: serde_json::Value) -> Mod
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(7, 3)),
+
+            origin: None,
         },
         usage: Some(Usage::new(7, 3)),
         finish_reason: Some("tool_calls".to_string()),
@@ -84,6 +86,8 @@ fn text_response(text: &str, input: u64, output: u64) -> ModelResponse {
             content: vec![ContentBlock::Text(text.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(input, output)),
+
+            origin: None,
         },
         usage: Some(Usage::new(input, output)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/tool_deferral.rs b/crates/tinyagents-integration-tests/tests/tool_deferral.rs
index 7005fa39..9ab5c4a9 100644
--- a/crates/tinyagents-integration-tests/tests/tool_deferral.rs
+++ b/crates/tinyagents-integration-tests/tests/tool_deferral.rs
@@ -121,6 +121,8 @@ fn tool_call(id: &str, name: &str, arguments: Value) -> ModelResponse {
             content: Vec::new(),
             tool_calls: vec![ToolCall::new(id, name, arguments)],
             usage: Some(Usage::new(1, 1)),
+
+            origin: None,
         },
         usage: Some(Usage::new(1, 1)),
         finish_reason: Some("tool_calls".to_string()),
@@ -140,6 +142,8 @@ fn text(body: &str) -> ModelResponse {
             content: vec![ContentBlock::Text(body.to_string())],
             tool_calls: Vec::new(),
             usage: Some(Usage::new(1, 1)),
+
+            origin: None,
         },
         usage: Some(Usage::new(1, 1)),
         finish_reason: Some("stop".to_string()),
diff --git a/crates/tinyagents-integration-tests/tests/wave2_cache_retry_after.rs b/crates/tinyagents-integration-tests/tests/wave2_cache_retry_after.rs
index 21a7c414..f71837fc 100644
--- a/crates/tinyagents-integration-tests/tests/wave2_cache_retry_after.rs
+++ b/crates/tinyagents-integration-tests/tests/wave2_cache_retry_after.rs
@@ -23,6 +23,8 @@ fn provider_error(message: &str, retry_after_ms: Option<u64>) -> TinyAgentsError
         retryable: true,
         retry_after_ms,
         raw: None,
+        partial_message: None,
+        stop_reason: None,
     }))
 }
 

From 86d9dbf6228fe79af1fc37b72cb7b6b726dc5079 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Sun, 20 Sep 2026 12:28:52 +0300
Subject: [PATCH 3/7] fix: reconcile upstream updates and CI regressions

Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 .../src/agent_loop/dialect.rs                 |  7 +++++-
 .../src/agent_loop/run_loop.rs                |  7 ++++--
 .../tinyagents-harness/src/agent_loop/test.rs |  1 +
 crates/tinyagents-harness/src/stream/frame.rs |  9 ++++++++
 .../src/stream/frame/test.rs                  | 23 +++++++++++++++++++
 .../src/summarization/render.rs               |  3 ---
 .../tests/dependency_boundary.rs              |  2 +-
 .../e2e_registry_observability_contracts.rs   |  2 +-
 .../tests/e2e_tool_dialects.rs                |  9 ++++++--
 .../tests/hosted_subagents.rs                 | 11 +++++----
 10 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/crates/tinyagents-harness/src/agent_loop/dialect.rs b/crates/tinyagents-harness/src/agent_loop/dialect.rs
index 89d5d613..01c9d720 100644
--- a/crates/tinyagents-harness/src/agent_loop/dialect.rs
+++ b/crates/tinyagents-harness/src/agent_loop/dialect.rs
@@ -35,8 +35,13 @@ pub(super) enum RunDialect {
 
 impl RunDialect {
     /// Resolves the policy against the tools this run offers.
-    pub(super) fn resolve(dispatcher: ToolDispatcher, tools: &[ToolSchema]) -> Self {
+    pub(super) fn resolve(
+        dispatcher: ToolDispatcher,
+        tools: &[ToolSchema],
+        native_tool_calling: Option<bool>,
+    ) -> Self {
         match dispatcher {
+            ToolDispatcher::Auto if native_tool_calling == Some(false) => Self::Xml,
             ToolDispatcher::Auto | ToolDispatcher::Native => Self::Native,
             ToolDispatcher::Xml => Self::Xml,
             ToolDispatcher::Pformat => Self::PFormat(Arc::new(tinytools_agent::build_registry(
diff --git a/crates/tinyagents-harness/src/agent_loop/run_loop.rs b/crates/tinyagents-harness/src/agent_loop/run_loop.rs
index 330baa13..7179c450 100644
--- a/crates/tinyagents-harness/src/agent_loop/run_loop.rs
+++ b/crates/tinyagents-harness/src/agent_loop/run_loop.rs
@@ -917,8 +917,11 @@ impl<State: Send + Sync, Ctx: Send + Sync> AgentHarness<State, Ctx> {
             // side-effecting call.
             let tools_available_this_turn =
                 offered_tool_count > 0 && request.tool_choice != ToolChoice::None;
-            let dialect =
-                super::dialect::RunDialect::resolve(self.policy.tool_dialect, &request.tools);
+            let dialect = super::dialect::RunDialect::resolve(
+                self.policy.tool_dialect,
+                &request.tools,
+                binding.model.profile().map(|profile| profile.tool_calling),
+            );
             let forced_text_dialect = dialect.is_text();
             let recovery = if tools_available_this_turn {
                 super::dialect::TextRecovery {
diff --git a/crates/tinyagents-harness/src/agent_loop/test.rs b/crates/tinyagents-harness/src/agent_loop/test.rs
index 4bc591b0..0d371834 100644
--- a/crates/tinyagents-harness/src/agent_loop/test.rs
+++ b/crates/tinyagents-harness/src/agent_loop/test.rs
@@ -5726,6 +5726,7 @@ async fn resolved_profile_schema_transform_is_applied_to_tool_schemas() {
 
     let model = Arc::new(
         ScriptedModel::replies(vec!["done"]).with_profile(ModelProfile {
+            tool_calling: true,
             schema_transform: Some(SchemaTransform::StripDefs),
             ..ModelProfile::default()
         }),
diff --git a/crates/tinyagents-harness/src/stream/frame.rs b/crates/tinyagents-harness/src/stream/frame.rs
index 08b75646..5d25aa5c 100644
--- a/crates/tinyagents-harness/src/stream/frame.rs
+++ b/crates/tinyagents-harness/src/stream/frame.rs
@@ -240,6 +240,9 @@ pub fn encode_frames(items: &[ModelStreamItem]) -> Vec<AssistantFrame> {
 enum OpenBlock {
     Text(String),
     Thinking(String),
+    ProviderExtension {
+        block_type: String,
+    },
     ToolCall {
         id: Option<String>,
         name: Option<String>,
@@ -317,6 +320,9 @@ pub fn reduce_frames(frames: &[AssistantFrame]) -> PartialAssistantMessage {
                 let block = match kind {
                     BlockKind::Text => OpenBlock::Text(String::new()),
                     BlockKind::Thinking => OpenBlock::Thinking(String::new()),
+                    BlockKind::ProviderExtension { block_type } => OpenBlock::ProviderExtension {
+                        block_type: block_type.clone(),
+                    },
                     BlockKind::ToolCall { id, name } => OpenBlock::ToolCall {
                         id: Some(id.clone()),
                         name: Some(name.clone()),
@@ -410,6 +416,9 @@ pub fn reduce_frames(frames: &[AssistantFrame]) -> PartialAssistantMessage {
         .map(|(index, block)| {
             let text = match block {
                 OpenBlock::Text(text) | OpenBlock::Thinking(text) => text,
+                OpenBlock::ProviderExtension { block_type } => {
+                    format!("provider extension: {block_type}")
+                }
                 OpenBlock::ToolCall { json_so_far, .. } => json_so_far,
             };
             (index, text)
diff --git a/crates/tinyagents-harness/src/stream/frame/test.rs b/crates/tinyagents-harness/src/stream/frame/test.rs
index e17a6631..6f185929 100644
--- a/crates/tinyagents-harness/src/stream/frame/test.rs
+++ b/crates/tinyagents-harness/src/stream/frame/test.rs
@@ -283,3 +283,26 @@ fn provider_failed_frame_carries_partial_message_and_stop_reason() {
         vec![ContentBlock::Text("partial".into())]
     );
 }
+
+#[test]
+fn provider_extension_frames_retain_the_completed_content_block() {
+    let extension = json!({"type": "future_block", "opaque": true});
+    let partial = reduce_frames(&[
+        AssistantFrame::BlockStart {
+            index: 0,
+            kind: BlockKind::ProviderExtension {
+                block_type: "future_block".into(),
+            },
+        },
+        AssistantFrame::BlockEnd {
+            index: 0,
+            block: ContentBlock::ProviderExtension(extension.clone()),
+        },
+    ]);
+
+    assert_eq!(
+        partial.content,
+        vec![ContentBlock::ProviderExtension(extension)]
+    );
+    assert!(partial.open_blocks.is_empty());
+}
diff --git a/crates/tinyagents-harness/src/summarization/render.rs b/crates/tinyagents-harness/src/summarization/render.rs
index 26232045..0aea24e4 100644
--- a/crates/tinyagents-harness/src/summarization/render.rs
+++ b/crates/tinyagents-harness/src/summarization/render.rs
@@ -89,9 +89,6 @@ fn render_content(content: &[ContentBlock]) -> Vec<String> {
                 "<provider_extension>{}</provider_extension>",
                 elide(&value.to_string())
             )),
-            ContentBlock::Audio(_) => Some("<audio />".to_string()),
-            ContentBlock::Video(_) => Some("<video />".to_string()),
-            ContentBlock::Document(_) => Some("<document />".to_string()),
         })
         .collect()
 }
diff --git a/crates/tinyagents-integration-tests/tests/dependency_boundary.rs b/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
index 72f51849..41346579 100644
--- a/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
+++ b/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
@@ -151,7 +151,7 @@ const KNOWN_GENERIC_CLAUDE_CODE_CHAT_MESSAGE_DEBT: &[(&str, usize)] = &[
     ),
     (
         "crates/tinyagents-harness/src/providers/claude_code/mod.rs",
-        362,
+        368,
     ),
     (
         "crates/tinyagents-harness/src/providers/claude_code/mod_tests.rs",
diff --git a/crates/tinyagents-integration-tests/tests/e2e_registry_observability_contracts.rs b/crates/tinyagents-integration-tests/tests/e2e_registry_observability_contracts.rs
index 5cdc8a4a..b04c03f0 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_registry_observability_contracts.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_registry_observability_contracts.rs
@@ -118,7 +118,7 @@ fn component_metadata_and_event_kinds_are_stable_serializable_contracts() {
     let id = ComponentId::new("researcher");
     assert_eq!(id.as_str(), "researcher");
     assert_eq!(id.to_string(), "researcher");
-    assert_eq!(ComponentKind::ALL.len(), 11);
+    assert_eq!(ComponentKind::ALL.len(), 12);
     assert_eq!(ComponentKind::Agent.as_str(), "agent");
     assert_eq!(ComponentKind::TaskStore.as_str(), "task_store");
     assert_eq!(ComponentKind::Tool.to_string(), "tool");
diff --git a/crates/tinyagents-integration-tests/tests/e2e_tool_dialects.rs b/crates/tinyagents-integration-tests/tests/e2e_tool_dialects.rs
index 6e68b169..aa7a31ad 100644
--- a/crates/tinyagents-integration-tests/tests/e2e_tool_dialects.rs
+++ b/crates/tinyagents-integration-tests/tests/e2e_tool_dialects.rs
@@ -16,7 +16,7 @@ use tinyagents_harness::config::ToolDispatcher;
 use tinyagents_harness::context::RunContext;
 use tinyagents_harness::events::{AgentEvent, RecordingListener};
 use tinyagents_harness::middleware::Middleware;
-use tinyagents_harness::runtime::{AgentHarness, RunPolicy};
+use tinyagents_harness::runtime::{AgentHarness, EndStrategy, RunPolicy};
 use tinyagents_harness::testkit::{FakeTool, ScriptedModel, StreamingMock};
 use tinyinference_llm::message::{Message, MessageDelta};
 use tinyinference_llm::model::{
@@ -118,7 +118,11 @@ async fn a_native_model_narrating_a_call_in_any_grammar_dispatches_it() {
         "<tool_call>{\"name\":\"functions.lookup\",\"arguments\":{\"q\":\"x\"}}</tool_call>",
     ] {
         let listener = Arc::new(RecordingListener::new());
-        let harness = harness_with(Arc::new(narrating_model(text)), &listener);
+        let mut harness = harness_with(Arc::new(narrating_model(text)), &listener);
+        harness.with_policy(RunPolicy {
+            text_dialect_recovery: tinyagents_harness::runtime::TextDialectRecovery::On,
+            ..RunPolicy::default()
+        });
         let run = harness
             .invoke_default(&(), vec![Message::user("go")])
             .await
@@ -960,6 +964,7 @@ async fn dropped_call_nudge_budget_resets_after_a_mixed_structured_and_tool_turn
         }))
         .with_policy(RunPolicy {
             dropped_tool_call_nudges: 1,
+            end_strategy: EndStrategy::Exhaustive,
             default_response_format: Some(ResponseFormat::auto(
                 "answer",
                 json!({"type": "object"}),
diff --git a/crates/tinyagents-orchestration/tests/hosted_subagents.rs b/crates/tinyagents-orchestration/tests/hosted_subagents.rs
index 7e45bbb2..81a2fb43 100644
--- a/crates/tinyagents-orchestration/tests/hosted_subagents.rs
+++ b/crates/tinyagents-orchestration/tests/hosted_subagents.rs
@@ -89,13 +89,15 @@ async fn authorized_child_reuses_the_parent_host_bundle() {
         ModelResponse::assistant("parent answer"),
     ]));
     let worker_model = Arc::new(ScriptedModel::replies(vec!["child answer"]));
-    let parent = AgentDefinition::new("parent", "Parent", "delegates").with_subagents(["worker"]);
+    let parent = AgentDefinition::new("parent", "Parent", "delegates")
+        .with_subagents(["worker"])
+        .with_tools(["worker"]);
     let entry = AgentHarness::new();
     let (runtime, jobs) = runtime_with_worker(AgentHarness::new());
     let run = entry
         .invoke_agent(
             AgentInvocation::new(
-                host(parent, parent_model, worker_model),
+                host(parent, parent_model.clone(), worker_model),
                 AgentTurnRequest::new(
                     "parent",
                     vec![tinyinference_llm::message::Message::user("delegate")],
@@ -137,7 +139,8 @@ async fn parent_denial_cannot_fall_back_to_the_child_harness() {
         .invoke_agent(
             AgentInvocation::new(
                 host(
-                    AgentDefinition::new("parent", "Parent", "does not delegate"),
+                    AgentDefinition::new("parent", "Parent", "does not delegate")
+                        .with_tools(["worker"]),
                     parent_model,
                     Arc::new(ScriptedModel::replies(vec!["host worker"])),
                 ),
@@ -155,7 +158,7 @@ async fn parent_denial_cannot_fall_back_to_the_child_harness() {
 
     assert_eq!(
         error.to_string(),
-        "model error: hosted agent invocation failed"
+        "hosted agent invocation failed at the model provider"
     );
     assert!(
         local_child_model.requests().is_empty(),

From 7596a417ea49bf4723a16757a1aa488c11683481 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Sun, 20 Sep 2026 12:48:28 +0300
Subject: [PATCH 4/7] test: cover media rendering and trim coverage artifacts

Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 .github/workflows/ci.yml                       |  3 +++
 .../src/summarization/test.rs                  | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e655f2aa..9690bb90 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,6 +66,9 @@ jobs:
         uses: taiki-e/install-action@cargo-llvm-cov
 
       - name: Verify line coverage
+        env:
+          CARGO_PROFILE_DEV_DEBUG: 0
+          CARGO_PROFILE_TEST_DEBUG: 0
         run: >-
           cargo llvm-cov --all-features --workspace
           --ignore-filename-regex '(^|/)(tests?|examples)/|/test(_.*)?\.rs$'
diff --git a/crates/tinyagents-harness/src/summarization/test.rs b/crates/tinyagents-harness/src/summarization/test.rs
index 54513502..3eff91e7 100644
--- a/crates/tinyagents-harness/src/summarization/test.rs
+++ b/crates/tinyagents-harness/src/summarization/test.rs
@@ -699,6 +699,24 @@ mod rendering {
         assert!(rendered.contains("\"k\""), "{rendered}");
     }
 
+    #[test]
+    fn media_blocks_are_rendered_as_placeholders() {
+        use tinyinference_llm::message::{ContentBlock, MediaRef, UserMessage};
+
+        let msg = Message::User(UserMessage {
+            content: vec![
+                ContentBlock::Audio(MediaRef::url("https://example.com/a.wav")),
+                ContentBlock::Video(MediaRef::base64("AAAA", "video/mp4")),
+                ContentBlock::Document(MediaRef::path("/tmp/doc.pdf")),
+            ],
+        });
+        let rendered = render_message_for_summary(&msg);
+
+        assert!(rendered.contains("<audio />"), "{rendered}");
+        assert!(rendered.contains("<video />"), "{rendered}");
+        assert!(rendered.contains("<document />"), "{rendered}");
+    }
+
     #[test]
     fn oversized_payloads_are_elided_not_reproduced() {
         let msg = Message::tool("c1", "y".repeat(9_000));

From 3839b105032ff818aae069440ccf2e8981f8debe Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Sun, 20 Sep 2026 13:06:10 +0300
Subject: [PATCH 5/7] ci: free build artifacts before coverage

Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9690bb90..9519b5bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -62,6 +62,9 @@ jobs:
           cargo test --workspace --no-default-features --features tools
           cargo test --workspace --no-default-features --features multimodal
 
+      - name: Free build artifacts before coverage
+        run: cargo clean
+
       - name: Coverage gate
         uses: taiki-e/install-action@cargo-llvm-cov
 

From 070d84d238bff305d83a0914856e122c58a577a7 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Sun, 20 Sep 2026 13:21:19 +0300
Subject: [PATCH 6/7] test: cover dialect fallback and custom summaries

Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 .../src/agent_loop/dialect.rs                 |  3 +++
 .../src/agent_loop/dialect/test.rs            | 17 ++++++++++++++
 .../src/providers/claude_code/mod.rs          |  6 +++++
 .../src/summarization/test.rs                 | 22 +++++++++++++++++++
 4 files changed, 48 insertions(+)
 create mode 100644 crates/tinyagents-harness/src/agent_loop/dialect/test.rs

diff --git a/crates/tinyagents-harness/src/agent_loop/dialect.rs b/crates/tinyagents-harness/src/agent_loop/dialect.rs
index 01c9d720..6b3f3f2d 100644
--- a/crates/tinyagents-harness/src/agent_loop/dialect.rs
+++ b/crates/tinyagents-harness/src/agent_loop/dialect.rs
@@ -22,6 +22,9 @@ use tinytools_agent::{PFormatRegistry, StreamScrubber};
 use crate::config::ToolDispatcher;
 use crate::ids::CallId;
 
+#[cfg(test)]
+mod test;
+
 /// The dialect a run speaks, resolved once from policy.
 #[derive(Debug, Clone)]
 pub(super) enum RunDialect {
diff --git a/crates/tinyagents-harness/src/agent_loop/dialect/test.rs b/crates/tinyagents-harness/src/agent_loop/dialect/test.rs
new file mode 100644
index 00000000..f229cec9
--- /dev/null
+++ b/crates/tinyagents-harness/src/agent_loop/dialect/test.rs
@@ -0,0 +1,17 @@
+//! Focused tests for model-aware tool dialect selection.
+
+use super::RunDialect;
+use crate::config::ToolDispatcher;
+use tinyinference_llm::model::ModelProfile;
+
+#[test]
+fn auto_uses_xml_when_the_model_disables_native_tool_calling() {
+    let profile = ModelProfile {
+        tool_calling: false,
+        ..ModelProfile::default()
+    };
+
+    let dialect = RunDialect::resolve(ToolDispatcher::Auto, &[], Some(profile.tool_calling));
+
+    assert!(matches!(dialect, RunDialect::Xml));
+}
diff --git a/crates/tinyagents-harness/src/providers/claude_code/mod.rs b/crates/tinyagents-harness/src/providers/claude_code/mod.rs
index 15929e48..880b9137 100644
--- a/crates/tinyagents-harness/src/providers/claude_code/mod.rs
+++ b/crates/tinyagents-harness/src/providers/claude_code/mod.rs
@@ -331,6 +331,12 @@ fn thread_key_from_request(request: &ModelRequest) -> String {
 /// provider sends downstream: prompt-tool coalescing/instructions applied
 /// first, then any structured [`ResponseFormat`] is appended as a trailing
 /// system instruction (see [`response_format_instruction`]).
+///
+/// `Message::Custom` remains in the host transcript as out-of-band metadata;
+/// it is intentionally omitted from the provider prompt. Hosts that want such
+/// information available to the model must add it as an explicit system or
+/// user message. Its optional `display` text is for transcript presentation,
+/// not an implicit prompt channel.
 fn request_messages(request: &ModelRequest) -> Vec<ChatMessage> {
     let provider_messages: Vec<_> = request
         .messages
diff --git a/crates/tinyagents-harness/src/summarization/test.rs b/crates/tinyagents-harness/src/summarization/test.rs
index 3eff91e7..b34a300a 100644
--- a/crates/tinyagents-harness/src/summarization/test.rs
+++ b/crates/tinyagents-harness/src/summarization/test.rs
@@ -717,6 +717,28 @@ mod rendering {
         assert!(rendered.contains("<document />"), "{rendered}");
     }
 
+    #[test]
+    fn custom_messages_render_the_display_or_an_empty_value() {
+        use tinyinference_llm::message::CustomMessage;
+
+        let displayed = Message::Custom(CustomMessage {
+            kind: "compaction".into(),
+            payload: json!({"summary": "host-only"}),
+            display: Some("Compacted 40 turns".into()),
+        });
+        let hidden = Message::Custom(CustomMessage {
+            kind: "label".into(),
+            payload: json!({"name": "checkpoint"}),
+            display: None,
+        });
+
+        assert_eq!(
+            render_message_for_summary(&displayed),
+            "custom: Compacted 40 turns"
+        );
+        assert_eq!(render_message_for_summary(&hidden), "custom: ");
+    }
+
     #[test]
     fn oversized_payloads_are_elided_not_reproduced() {
         let msg = Message::tool("c1", "y".repeat(9_000));

From 7fd0d95c32c2250be0be1494a0492324dee15d94 Mon Sep 17 00:00:00 2001
From: Steven Enamakel <enamakel@tinyhumans.ai>
Date: Sun, 20 Sep 2026 14:01:32 +0300
Subject: [PATCH 7/7] test: update Claude Code reference baseline

Co-authored-by: Medulla <medulla@tinyhumans.ai>
---
 .../tinyagents-integration-tests/tests/dependency_boundary.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/tinyagents-integration-tests/tests/dependency_boundary.rs b/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
index 41346579..2f659532 100644
--- a/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
+++ b/crates/tinyagents-integration-tests/tests/dependency_boundary.rs
@@ -147,11 +147,11 @@ const KNOWN_GENERIC_CLAUDE_CODE_CHAT_MESSAGE_DEBT: &[(&str, usize)] = &[
     ),
     (
         "crates/tinyagents-harness/src/providers/claude_code/mod.rs",
-        334,
+        340,
     ),
     (
         "crates/tinyagents-harness/src/providers/claude_code/mod.rs",
-        368,
+        374,
     ),
     (
         "crates/tinyagents-harness/src/providers/claude_code/mod_tests.rs",