chore: sync upstream aaif-goose/goose@main (2026-05-29 second sync)

crates/goose-sdk/src/custom_requests.rs

@@ -108,6 +108,37 @@ pub struct UpdateWorkingDirRequest {
     pub working_dir: String,
 }
 
+/// How a session system prompt update should be applied.
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, JsonSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum SessionSystemPromptMode {
+    /// Replace Goose's base system prompt with the provided text.
+    Set,
+    /// Append the provided text under Goose's "Additional Instructions" section.
+    #[default]
+    Append,
+}
+
+/// Set, append, or clear system prompt text for a session.
+///
+/// `mode: "set"` replaces Goose's base system prompt. `mode: "append"` adds an
+/// instruction under "Additional Instructions". Reusing a key replaces the
+/// previous value for that mode/key; sending empty text clears it.
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
+#[request(
+    method = "_goose/unstable/session/system-prompt/set",
+    response = EmptyResponse
+)]
+#[serde(rename_all = "camelCase")]
+pub struct SetSessionSystemPromptRequest {
+    pub session_id: String,
+    #[serde(default)]
+    pub mode: SessionSystemPromptMode,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub key: Option<String>,
+    pub text: String,
+}
+
 /// Delete a session.
 #[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
 #[request(method = "session/delete", response = EmptyResponse)]
@@ -1091,6 +1122,24 @@ pub struct ListProvidersResponse {
     pub entries: Vec<ProviderInventoryEntryDto>,
 }
 
+/// List the raw model identifiers returned by a provider's live supported-models API.
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
+#[request(
+    method = "_goose/unstable/providers/supported-models/list",
+    response = ProviderSupportedModelsListResponse
+)]
+#[serde(rename_all = "camelCase")]
+pub struct ProviderSupportedModelsListRequest {
+    pub provider_id: String,
+}
+
+#[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcResponse)]
+#[serde(rename_all = "camelCase")]
+pub struct ProviderSupportedModelsListResponse {
+    pub provider_id: String,
+    pub models: Vec<String>,
+}
+
 /// Trigger a background refresh of provider inventories.
 #[derive(Debug, Default, Clone, Serialize, Deserialize, JsonSchema, JsonRpcRequest)]
 #[request(

crates/goose/acp-meta.json

@@ -30,6 +30,11 @@
       "requestType": "UpdateWorkingDirRequest_unstable",
       "responseType": "EmptyResponse"
     },
+    {
+      "method": "_goose/unstable/session/system-prompt/set",
+      "requestType": "SetSessionSystemPromptRequest_unstable",
+      "responseType": "EmptyResponse"
+    },
     {
       "method": "session/delete",
       "requestType": "DeleteSessionRequest",
@@ -65,6 +70,11 @@
       "requestType": "ListProvidersRequest_unstable",
       "responseType": "ListProvidersResponse_unstable"
     },
+    {
+      "method": "_goose/unstable/providers/supported-models/list",
+      "requestType": "ProviderSupportedModelsListRequest_unstable",
+      "responseType": "ProviderSupportedModelsListResponse_unstable"
+    },
     {
       "method": "_goose/unstable/providers/catalog/list",
       "requestType": "ProviderCatalogListRequest_unstable",

crates/goose/acp-schema.json

@@ -167,6 +167,49 @@
       "x-side": "agent",
       "x-method": "_goose/unstable/session/working-dir/update"
     },
+    "SetSessionSystemPromptRequest_unstable": {
+      "type": "object",
+      "properties": {
+        "sessionId": {
+          "type": "string"
+        },
+        "mode": {
+          "$ref": "#/$defs/SessionSystemPromptMode",
+          "default": "append"
+        },
+        "key": {
+          "type": [
+            "string",
+            "null"
+          ]
+        },
+        "text": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "sessionId",
+        "text"
+      ],
+      "description": "Set, append, or clear system prompt text for a session.\n\n`mode: \"set\"` replaces Goose's base system prompt. `mode: \"append\"` adds an\ninstruction under \"Additional Instructions\". Reusing a key replaces the\nprevious value for that mode/key; sending empty text clears it.",
+      "x-side": "agent",
+      "x-method": "_goose/unstable/session/system-prompt/set"
+    },
+    "SessionSystemPromptMode": {
+      "oneOf": [
+        {
+          "type": "string",
+          "const": "set",
+          "description": "Replace Goose's base system prompt with the provided text."
+        },
+        {
+          "type": "string",
+          "const": "append",
+          "description": "Append the provided text under Goose's \"Additional Instructions\" section."
+        }
+      ],
+      "description": "How a session system prompt update should be applied."
+    },
     "DeleteSessionRequest": {
       "type": "object",
       "properties": {
@@ -525,6 +568,40 @@
       ],
       "description": "A single model in provider inventory."
     },
+    "ProviderSupportedModelsListRequest_unstable": {
+      "type": "object",
+      "properties": {
+        "providerId": {
+          "type": "string"
+        }
+      },
+      "required": [
+        "providerId"
+      ],
+      "description": "List the raw model identifiers returned by a provider's live supported-models API.",
+      "x-side": "agent",
+      "x-method": "_goose/unstable/providers/supported-models/list"
+    },
+    "ProviderSupportedModelsListResponse_unstable": {
+      "type": "object",
+      "properties": {
+        "providerId": {
+          "type": "string"
+        },
+        "models": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        }
+      },
+      "required": [
+        "providerId",
+        "models"
+      ],
+      "x-side": "agent",
+      "x-method": "_goose/unstable/providers/supported-models/list"
+    },
     "ProviderCatalogListRequest_unstable": {
       "type": "object",
       "properties": {
@@ -2640,6 +2717,15 @@
                   "description": "Params for _goose/unstable/session/working-dir/update",
                   "title": "UpdateWorkingDirRequest_unstable"
                 },
+                {
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/SetSessionSystemPromptRequest_unstable"
+                    }
+                  ],
+                  "description": "Params for _goose/unstable/session/system-prompt/set",
+                  "title": "SetSessionSystemPromptRequest_unstable"
+                },
                 {
                   "allOf": [
                     {
@@ -2703,6 +2789,15 @@
                   "description": "Params for _goose/unstable/providers/list",
                   "title": "ListProvidersRequest_unstable"
                 },
+                {
+                  "allOf": [
+                    {
+                      "$ref": "#/$defs/ProviderSupportedModelsListRequest_unstable"
+                    }
+                  ],
+                  "description": "Params for _goose/unstable/providers/supported-models/list",
+                  "title": "ProviderSupportedModelsListRequest_unstable"
+                },
                 {
                   "allOf": [
                     {
@@ -3167,6 +3262,14 @@
                       ],
                       "title": "ListProvidersResponse_unstable"
                     },
+                    {
+                      "allOf": [
+                        {
+                          "$ref": "#/$defs/ProviderSupportedModelsListResponse_unstable"
+                        }
+                      ],
+                      "title": "ProviderSupportedModelsListResponse_unstable"
+                    },
                     {
                       "allOf": [
                         {

crates/goose/src/acp/provider.rs

@@ -20,7 +20,7 @@ use std::future::Future;
 use std::path::PathBuf;
 use std::process::Stdio;
 use std::sync::{
-    atomic::{AtomicBool, Ordering},
+    atomic::{AtomicBool, AtomicU64, Ordering},
     Arc, Mutex,
 };
 use std::thread::JoinHandle;
@@ -144,6 +144,11 @@ pub struct AcpProvider {
         Arc<TokioMutex<HashMap<String, oneshot::Sender<PermissionConfirmation>>>>,
     pending_tool_updates: Arc<Mutex<HashMap<String, AccumulatedToolCall>>>,
     handoff_context_sent: AtomicBool,
+    /// Latest `size` reported by the ACP server in a `session/update` →
+    /// `usage_update` notification. 0 means no real update has arrived yet,
+    /// in which case `get_model_config()` falls back to the static model
+    /// configuration's context limit.
+    context_size: Arc<AtomicU64>,
 
     tx: Option<mpsc::Sender<ClientRequest>>,
     loop_thread: Option<JoinHandle<()>>,
@@ -222,10 +227,12 @@ impl AcpProvider {
         let goose_mode_shared = Arc::new(Mutex::new(goose_mode));
         let pending_tool_updates: Arc<Mutex<HashMap<String, AccumulatedToolCall>>> =
             Arc::new(Mutex::new(HashMap::new()));
+        let context_size = Arc::new(AtomicU64::new(0));
         let client_loop = AcpClientLoop::new(
             config,
             goose_mode_shared.clone(),
             pending_tool_updates.clone(),
+            context_size.clone(),
         );
         let loop_thread = spawn_client_loop(run(client_loop, rx, init_tx));
 
@@ -273,6 +280,7 @@ impl AcpProvider {
             pending_confirmations: Arc::new(TokioMutex::new(HashMap::new())),
             pending_tool_updates,
             handoff_context_sent: AtomicBool::new(false),
+            context_size,
             tx: Some(tx),
             loop_thread: Some(loop_thread),
         })
@@ -370,7 +378,12 @@ impl Provider for AcpProvider {
     }
 
     fn get_model_config(&self) -> ModelConfig {
-        self.model.clone()
+        let mut model = self.model.clone();
+        let size = self.context_size.load(Ordering::Relaxed);
+        if size > 0 {
+            model.context_limit = Some(size as usize);
+        }
+        model
     }
 
     async fn update_mode(&self, session_id: &str, mode: GooseMode) -> Result<(), ProviderError> {
@@ -629,19 +642,22 @@ struct AcpClientLoop {
     goose_mode: Arc<Mutex<GooseMode>>,
     prompt_response_tx: Arc<Mutex<Option<mpsc::Sender<AcpUpdate>>>>,
     pending_tool_updates: Arc<Mutex<HashMap<String, AccumulatedToolCall>>>,
+    context_size: Arc<AtomicU64>,
 }
 
 impl AcpClientLoop {
     fn new(
         config: AcpProviderConfig,
         goose_mode: Arc<Mutex<GooseMode>>,
         pending_tool_updates: Arc<Mutex<HashMap<String, AccumulatedToolCall>>>,
+        context_size: Arc<AtomicU64>,
     ) -> Self {
         Self {
             config,
             goose_mode,
             prompt_response_tx: Arc::new(Mutex::new(None)),
             pending_tool_updates,
+            context_size,
         }
     }
 
@@ -695,6 +711,7 @@ impl AcpClientLoop {
             goose_mode,
             prompt_response_tx,
             pending_tool_updates,
+            context_size,
         } = self;
         let notification_callback = config.notification_callback.clone();
         let reverse_modes = reverse_mode_mapping(&config.mode_mapping);
@@ -707,6 +724,7 @@ impl AcpClientLoop {
                     let reverse_modes = reverse_modes.clone();
                     let goose_mode = goose_mode.clone();
                     let pending_tool_updates = pending_tool_updates.clone();
+                    let context_size = context_size.clone();
                     async move |notification: SessionNotification, _cx| {
                         if let Some(ref cb) = notification_callback {
                             cb(notification.clone());
@@ -740,6 +758,9 @@ impl AcpClientLoop {
                                     }
                                 }
                             }
+                            SessionUpdate::UsageUpdate(usage) => {
+                                context_size.store(usage.size, Ordering::Relaxed);
+                            }
                             _ => {}
                         }
                         if let Some(tx) = prompt_response_tx
@@ -1529,6 +1550,7 @@ mod tests {
             pending_confirmations: Arc::new(TokioMutex::new(HashMap::new())),
             pending_tool_updates: Arc::new(Mutex::new(HashMap::new())),
             handoff_context_sent: AtomicBool::new(false),
+            context_size: Arc::new(AtomicU64::new(0)),
             tx,
             loop_thread: None,
         }
@@ -1633,6 +1655,18 @@ mod tests {
         assert!(!later_claim.include_context);
     }
 
+    #[test]
+    fn get_model_config_surfaces_captured_context_size() {
+        let provider = test_provider();
+        assert_eq!(
+            provider.get_model_config().context_limit(),
+            crate::model::DEFAULT_CONTEXT_LIMIT
+        );
+
+        provider.context_size.store(200_000, Ordering::Relaxed);
+        assert_eq!(provider.get_model_config().context_limit(), 200_000);
+    }
+
     #[tokio::test]
     async fn failed_first_prompt_send_rolls_back_handoff_context_claim() {
         let (tx, rx) = mpsc::channel(1);

crates/goose/src/acp/server/custom_dispatch.rs

@@ -59,6 +59,14 @@ impl GooseAcpAgent {
         self.on_update_working_dir(req).await
     }
 
+    #[custom_method(SetSessionSystemPromptRequest)]
+    async fn dispatch_set_session_system_prompt(
+        &self,
+        req: SetSessionSystemPromptRequest,
+    ) -> Result<EmptyResponse, agent_client_protocol::Error> {
+        self.on_set_session_system_prompt(req).await
+    }
+
     #[custom_method(DeleteSessionRequest)]
     async fn dispatch_delete_session(
         &self,
@@ -114,6 +122,14 @@ impl GooseAcpAgent {
         self.on_list_providers(req).await
     }
 
+    #[custom_method(ProviderSupportedModelsListRequest)]
+    async fn dispatch_list_provider_supported_models(
+        &self,
+        req: ProviderSupportedModelsListRequest,
+    ) -> Result<ProviderSupportedModelsListResponse, agent_client_protocol::Error> {
+        self.on_list_provider_supported_models(req).await
+    }
+
     #[custom_method(ProviderCatalogListRequest)]
     async fn dispatch_list_provider_catalog(
         &self,