huskies: merge 626_refactor_introduce_services_bundle_and_migrate_appcontext_matrix_transport

server/src/chat/transport/matrix/mod.rs

@@ -30,13 +30,12 @@ pub mod transport_impl;
 pub use bot::{ConversationEntry, ConversationRole, RoomConversation};
 pub use config::BotConfig;
 
-use crate::agents::AgentPool;
-use crate::http::context::PermissionForward;
 use crate::io::watcher::WatcherEvent;
 use crate::rebuild::ShutdownReason;
+use crate::services::Services;
 use std::path::Path;
 use std::sync::Arc;
-use tokio::sync::{Mutex as TokioMutex, RwLock, broadcast, mpsc, watch};
+use tokio::sync::{RwLock, broadcast, watch};
 
 /// Attempt to start the Matrix bot.
 ///
@@ -48,9 +47,9 @@ use tokio::sync::{Mutex as TokioMutex, RwLock, broadcast, mpsc, watch};
 /// posts stage-transition messages to all configured rooms whenever a work
 /// item moves between pipeline stages.
 ///
-/// `perm_rx` is the permission-request receiver shared with the MCP
-/// `prompt_permission` tool. The bot locks it during active chat sessions
-/// to surface permission prompts to the Matrix room and relay user decisions.
+/// `services` is the shared services bundle containing the agent pool,
+/// permission plumbing, and bot identity. The bot accesses these via
+/// `Arc<Services>` rather than holding its own copies.
 ///
 /// `shutdown_rx` is a watch channel that delivers a `ShutdownReason` when the
 /// server is about to stop (SIGINT/SIGTERM or rebuild).  The bot uses this to
@@ -65,8 +64,7 @@ use tokio::sync::{Mutex as TokioMutex, RwLock, broadcast, mpsc, watch};
 pub fn spawn_bot(
     project_root: &Path,
     watcher_tx: broadcast::Sender<WatcherEvent>,
-    perm_rx: Arc<TokioMutex<mpsc::UnboundedReceiver<PermissionForward>>>,
-    agents: Arc<AgentPool>,
+    services: Arc<Services>,
     shutdown_rx: watch::Receiver<Option<ShutdownReason>>,
     gateway_active_project: Option<Arc<RwLock<String>>>,
     gateway_projects: Vec<String>,
@@ -95,17 +93,14 @@ pub fn spawn_bot(
         config.effective_room_ids()
     );
 
-    let root = project_root.to_path_buf();
     let watcher_rx = watcher_tx.subscribe();
     let watcher_rx_auto = watcher_tx.subscribe();
     let handle = tokio::spawn(async move {
         if let Err(e) = bot::run_bot(
             config,
-            root,
+            services,
             watcher_rx,
             watcher_rx_auto,
-            perm_rx,
-            agents,
             shutdown_rx,
             gateway_active_project,
             gateway_projects,