From 57e16818091e2d05342e1f204b7330d2d76ed3ff Mon Sep 17 00:00:00 2001
From: Ben Brandt <benjamin.j.brandt@gmail.com>
Date: Wed, 4 Feb 2026 14:12:49 +0100
Subject: [PATCH] acp: Cleanup unneeded cx from config state methods (#48353)

Release Notes:

- N/A
---
 crates/agent_servers/src/acp.rs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/crates/agent_servers/src/acp.rs b/crates/agent_servers/src/acp.rs
index 6eea5078b1d54b47b188477a6a6ff56461ad6f34..971467cc23ee0b4d629827da559a6082644cc0e5 100644
--- a/crates/agent_servers/src/acp.rs
+++ b/crates/agent_servers/src/acp.rs
@@ -381,9 +381,7 @@ impl AgentConnection for AcpConnection {
                 .await
                 .map_err(map_acp_error)?;
 
-            let (modes, models, config_options) = cx.update(|cx| {
-                config_state(cx, response.modes, response.models, response.config_options)
-            });
+            let (modes, models, config_options) = config_state(response.modes, response.models, response.config_options);
 
             if let Some(default_mode) = self.default_mode.clone() {
                 if let Some(modes) = modes.as_ref() {
@@ -638,7 +636,7 @@ impl AgentConnection for AcpConnection {
             },
         );
 
-        cx.spawn(async move |cx| {
+        cx.spawn(async move |_| {
             let response = match self
                 .connection
                 .load_session(
@@ -654,9 +652,8 @@ impl AgentConnection for AcpConnection {
                 }
             };
 
-            let (modes, models, config_options) = cx.update(|cx| {
-                config_state(cx, response.modes, response.models, response.config_options)
-            });
+            let (modes, models, config_options) =
+                config_state(response.modes, response.models, response.config_options);
             if let Some(session) = self.sessions.borrow_mut().get_mut(&session.session_id) {
                 session.session_modes = modes;
                 session.models = models;
@@ -712,7 +709,7 @@ impl AgentConnection for AcpConnection {
             },
         );
 
-        cx.spawn(async move |cx| {
+        cx.spawn(async move |_| {
             let response = match self
                 .connection
                 .resume_session(
@@ -728,9 +725,8 @@ impl AgentConnection for AcpConnection {
                 }
             };
 
-            let (modes, models, config_options) = cx.update(|cx| {
-                config_state(cx, response.modes, response.models, response.config_options)
-            });
+            let (modes, models, config_options) =
+                config_state(response.modes, response.models, response.config_options);
             if let Some(session) = self.sessions.borrow_mut().get_mut(&session.session_id) {
                 session.session_modes = modes;
                 session.models = models;
@@ -963,7 +959,6 @@ fn mcp_servers_for_project(project: &Entity<Project>, cx: &App) -> Vec<acp::McpS
 }
 
 fn config_state(
-    _cx: &App,
     modes: Option<acp::SessionModeState>,
     models: Option<acp::SessionModelState>,
     config_options: Option<Vec<acp::SessionConfigOption>>,