huskies: merge 855

server/src/agents/pool/start/spawn.rs

@@ -13,6 +13,7 @@ use tokio::sync::broadcast;
 
 use crate::agent_log::AgentLogWriter;
 use crate::config::ProjectConfig;
+use crate::http::context::AppContext;
 use crate::io::watcher::WatcherEvent;
 use crate::slog_error;
 
@@ -51,6 +52,7 @@ pub(super) async fn run_agent_spawn(
     // happened while it was idle (story 736).  `None` when there were no
     // buffered events.
     buffered_events_block: Option<String>,
+    app_ctx: Option<Arc<AppContext>>,
 ) {
     // Re-bind to the legacy `_clone` / `_owned` names so the body below remains
     // a verbatim copy of the original closure (story 157).
@@ -240,7 +242,7 @@ pub(super) async fn run_agent_spawn(
                 prompt: effective_prompt,
                 cwd: wt_path_str,
                 inactivity_timeout_secs,
-                mcp_port: port_for_task,
+                app_ctx: app_ctx.clone(),
                 session_id_to_resume: session_id_to_resume_owned.clone(),
                 fresh_prompt: fresh_prompt.clone(),
             };
@@ -258,7 +260,7 @@ pub(super) async fn run_agent_spawn(
                 prompt: effective_prompt,
                 cwd: wt_path_str,
                 inactivity_timeout_secs,
-                mcp_port: port_for_task,
+                app_ctx: app_ctx.clone(),
                 session_id_to_resume: session_id_to_resume_owned.clone(),
                 fresh_prompt: fresh_prompt.clone(),
             };
@@ -276,7 +278,7 @@ pub(super) async fn run_agent_spawn(
                 prompt: effective_prompt,
                 cwd: wt_path_str,
                 inactivity_timeout_secs,
-                mcp_port: port_for_task,
+                app_ctx: app_ctx.clone(),
                 session_id_to_resume: session_id_to_resume_owned,
                 fresh_prompt,
             };