render mcp apps inline in goose2

crates/goose-cli/src/cli.rs

@@ -36,6 +36,15 @@ use std::io::Read;
 use std::path::PathBuf;
 use tracing::warn;
 
+fn generate_serve_secret_key() -> String {
+    use rand::distributions::{Alphanumeric, DistString};
+
+    format!(
+        "goose-acp-{}",
+        Alphanumeric.sample_string(&mut rand::thread_rng(), 32)
+    )
+}
+
 #[derive(Parser)]
 #[command(name = "goose", author, version, display_name = "", about, long_about = None)]
 pub struct Cli {
@@ -1086,13 +1095,19 @@ async fn handle_serve_command(host: String, port: u16, builtins: Vec<String>) ->
         config_dir: Paths::config_dir(),
         goose_platform: GoosePlatform::GooseCli,
     }));
-    let router = create_router(server);
+    let secret_key =
+        std::env::var("GOOSE_SERVER__SECRET_KEY").unwrap_or_else(|_| generate_serve_secret_key());
+    let router = create_router(server, secret_key);
 
     let addr: SocketAddr = format!("{}:{}", host, port).parse()?;
     info!("Starting ACP server on {}", addr);
 
     let listener = tokio::net::TcpListener::bind(addr).await?;
-    axum::serve(listener, router).await?;
+    axum::serve(
+        listener,
+        router.into_make_service_with_connect_info::<SocketAddr>(),
+    )
+    .await?;
 
     Ok(())
 }

crates/goose-sdk/src/custom_requests.rs

@@ -74,6 +74,31 @@ pub struct ReadResourceResponse {
     pub result: serde_json::Value,
 }
 
+/// Call a tool from an extension.
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
+#[request(method = "_goose/tool/call", response = GooseToolCallResponse)]
+#[serde(rename_all = "camelCase")]
+pub struct GooseToolCallRequest {
+    pub session_id: String,
+    pub name: String,
+    #[serde(default)]
+    pub arguments: serde_json::Value,
+}
+
+/// Tool call response.
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcResponse)]
+#[serde(rename_all = "camelCase")]
+pub struct GooseToolCallResponse {
+    #[serde(default)]
+    pub content: Vec<serde_json::Value>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub structured_content: Option<serde_json::Value>,
+    pub is_error: bool,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(rename = "_meta")]
+    pub meta: Option<serde_json::Value>,
+}
+
 /// Update the working directory for a session.
 #[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
 #[request(method = "_goose/working_dir/update", response = EmptyResponse)]

crates/goose/acp-meta.json

@@ -15,6 +15,11 @@
       "requestType": "GetToolsRequest",
       "responseType": "GetToolsResponse"
     },
+    {
+      "method": "_goose/tool/call",
+      "requestType": "GooseToolCallRequest",
+      "responseType": "GooseToolCallResponse"
+    },
     {
       "method": "_goose/resource/read",
       "requestType": "ReadResourceRequest",

crates/goose/acp-schema.json

@@ -73,6 +73,48 @@
       "x-side": "agent",
       "x-method": "_goose/tools"
     },
+    "GooseToolCallRequest": {
+      "type": "object",
+      "properties": {
+        "sessionId": {
+          "type": "string"
+        },
+        "name": {
+          "type": "string"
+        },
+        "arguments": {
+          "default": null
+        }
+      },
+      "required": [
+        "sessionId",
+        "name"
+      ],
+      "description": "Call a tool from an extension.",
+      "x-side": "agent",
+      "x-method": "_goose/tool/call"
+    },
+    "GooseToolCallResponse": {
+      "type": "object",
+      "properties": {
+        "content": {
+          "type": "array",
+          "items": {},
+          "default": []
+        },
+        "structuredContent": {},
+        "isError": {
+          "type": "boolean"
+        },
+        "_meta": {}
+      },
+      "required": [
+        "isError"
+      ],
+      "description": "Tool call response.",
+      "x-side": "agent",
+      "x-method": "_goose/tool/call"
+    },
     "ReadResourceRequest": {
       "type": "object",
       "properties": {
@@ -1601,6 +1643,15 @@
                   "description": "Params for _goose/tools",
                   "title": "GetToolsRequest"
                 },
+                {
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/GooseToolCallRequest"
+                    }
+                  ],
+                  "description": "Params for _goose/tool/call",
+                  "title": "GooseToolCallRequest"
+                },
                 {
                   "allOf": [
                     {
@@ -2007,6 +2058,14 @@
                       ],
                       "title": "GetToolsResponse"
                     },
+                    {
+                      "allOf": [
+                        {
+                          "$ref": "#/$defs/GooseToolCallResponse"
+                        }
+                      ],
+                      "title": "GooseToolCallResponse"
+                    },
                     {
                       "allOf": [
                         {