Tool reply meta

crates/goose-bench/src/eval_suites/core/developer_image/image.rs

@@ -68,7 +68,7 @@ impl Evaluation for DeveloperImage {
                     if let MessageContent::ToolResponse(tool_resp) = content {
                         if let Ok(result) = &tool_resp.tool_result {
                             // Check each item in the result list
-                            for item in result {
+                            for item in &result.content {
                                 if let Some(image) = item.as_image() {
                                     // Image content already contains mime_type and data
                                     if image.mime_type.starts_with("image/")

crates/goose-cli/src/commands/acp.rs

@@ -11,7 +11,7 @@ use goose::mcp_utils::ToolResult;
 use goose::providers::create;
 use goose::session::session_manager::SessionType;
 use goose::session::SessionManager;
-use rmcp::model::{Content, RawContent, ResourceContents, Role};
+use rmcp::model::{CallToolResult, RawContent, ResourceContents, Role};
 use std::collections::{HashMap, HashSet};
 use std::fs;
 use std::sync::Arc;
@@ -74,8 +74,8 @@ fn extract_tool_locations(
                 .and_then(|c| c.as_str());
 
             // Extract line numbers from the response content
-            if let Ok(content_items) = &tool_response.tool_result {
-                for content in content_items {
+            if let Ok(result) = &tool_response.tool_result {
+                for content in &result.content {
                     if let RawContent::Text(text_content) = &content.raw {
                         let text = &text_content.text;
 
@@ -491,9 +491,10 @@ impl GooseAcpAgent {
 }
 
 /// Build tool call content from tool result
-fn build_tool_call_content(tool_result: &ToolResult<Vec<Content>>) -> Vec<ToolCallContent> {
+fn build_tool_call_content(tool_result: &ToolResult<CallToolResult>) -> Vec<ToolCallContent> {
     match tool_result {
-        Ok(content_items) => content_items
+        Ok(result) => result
+            .content
             .iter()
             .filter_map(|content| match &content.raw {
                 RawContent::Text(val) => Some(ToolCallContent::Content {

crates/goose-cli/src/session/export.rs

@@ -221,12 +221,12 @@ pub fn tool_response_to_markdown(resp: &ToolResponse, export_all_content: bool)
     md.push_str("#### Tool Response:\n");
 
     match &resp.tool_result {
-        Ok(contents) => {
-            if contents.is_empty() {
+        Ok(result) => {
+            if result.content.is_empty() {
                 md.push_str("*No textual output from tool.*\n");
             }
 
-            for content in contents {
+            for content in &result.content {
                 if !export_all_content {
                     if let Some(audience) = content.audience() {
                         if !audience.contains(&Role::Assistant) {
@@ -581,7 +581,12 @@ mod tests {
         };
         let tool_response = ToolResponse {
             id: "test-id".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let result = tool_response_to_markdown(&tool_response, true);
@@ -601,7 +606,12 @@ mod tests {
         };
         let tool_response = ToolResponse {
             id: "test-id".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let result = tool_response_to_markdown(&tool_response, true);
@@ -707,7 +717,12 @@ if __name__ == "__main__":
         };
         let tool_response = ToolResponse {
             id: "shell-cat".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let request_result = tool_request_to_markdown(&tool_request, true);
@@ -748,7 +763,12 @@ if __name__ == "__main__":
         };
         let tool_response = ToolResponse {
             id: "git-status".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let request_result = tool_request_to_markdown(&tool_request, true);
@@ -797,7 +817,12 @@ warning: unused variable `x`
         };
         let tool_response = ToolResponse {
             id: "cargo-build".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let response_result = tool_response_to_markdown(&tool_response, true);
@@ -844,7 +869,12 @@ warning: unused variable `x`
         };
         let tool_response = ToolResponse {
             id: "curl-api".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let response_result = tool_response_to_markdown(&tool_response, true);
@@ -880,7 +910,12 @@ warning: unused variable `x`
         };
         let tool_response = ToolResponse {
             id: "editor-write".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let request_result = tool_request_to_markdown(&tool_request, true);
@@ -937,7 +972,12 @@ def process_data(data: List[Dict]) -> List[Dict]:
         };
         let tool_response = ToolResponse {
             id: "editor-view".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let response_result = tool_response_to_markdown(&tool_response, true);
@@ -974,7 +1014,12 @@ Command failed with exit code 2"#;
         };
         let tool_response = ToolResponse {
             id: "shell-error".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let response_result = tool_response_to_markdown(&tool_response, true);
@@ -1014,7 +1059,12 @@ Command failed with exit code 2"#;
         };
         let tool_response = ToolResponse {
             id: "script-exec".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let request_result = tool_request_to_markdown(&tool_request, true);
@@ -1061,7 +1111,12 @@ drwx------   3 user  staff    96 Dec  6 16:20 com.apple.launchd.abc
         };
         let tool_response = ToolResponse {
             id: "multi-cmd".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let request_result = tool_request_to_markdown(&_tool_request, true);
@@ -1104,7 +1159,12 @@ src/middleware.rs:12:async fn auth_middleware(req: Request, next: Next) -> Resul
         };
         let tool_response = ToolResponse {
             id: "grep-search".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let request_result = tool_request_to_markdown(&tool_request, true);
@@ -1144,7 +1204,12 @@ src/middleware.rs:12:async fn auth_middleware(req: Request, next: Next) -> Resul
         };
         let tool_response = ToolResponse {
             id: "json-test".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let response_result = tool_response_to_markdown(&tool_response, true);
@@ -1185,7 +1250,12 @@ found 0 vulnerabilities"#;
         };
         let tool_response = ToolResponse {
             id: "npm-install".to_string(),
-            tool_result: Ok(vec![Content::text(text_content.raw.text)]),
+            tool_result: Ok(rmcp::model::CallToolResult {
+                content: vec![Content::text(text_content.raw.text)],
+                structured_content: None,
+                is_error: Some(false),
+                meta: None,
+            }),
         };
 
         let request_result = tool_request_to_markdown(&tool_request, true);

crates/goose-cli/src/session/output.rs

@@ -285,8 +285,8 @@ fn render_tool_response(resp: &ToolResponse, theme: Theme, debug: bool) {
     let config = Config::global();
 
     match &resp.tool_result {
-        Ok(contents) => {
-            for content in contents {
+        Ok(result) => {
+            for content in &result.content {
                 if let Some(audience) = content.audience() {
                     if !audience.contains(&rmcp::model::Role::User) {
                         continue;

crates/goose-server/src/openapi.rs

@@ -354,6 +354,8 @@ derive_utoipa!(Icon as IconSchema);
         super::routes::agent::start_agent,
         super::routes::agent::resume_agent,
         super::routes::agent::get_tools,
+        super::routes::agent::read_resource,
+        super::routes::agent::call_tool,
         super::routes::agent::update_from_session,
         super::routes::agent::agent_add_extension,
         super::routes::agent::agent_remove_extension,
@@ -514,6 +516,10 @@ derive_utoipa!(Icon as IconSchema);
         goose::agents::types::SuccessCheck,
         super::routes::agent::UpdateProviderRequest,
         super::routes::agent::GetToolsQuery,
+        super::routes::agent::ReadResourceRequest,
+        super::routes::agent::ReadResourceResponse,
+        super::routes::agent::CallToolRequest,
+        super::routes::agent::CallToolResponse,
         super::routes::agent::UpdateRouterToolSelectorRequest,
         super::routes::agent::StartAgentRequest,
         super::routes::agent::ResumeAgentRequest,