huskies: merge 726_story_notify_chat_transports_when_oauth_account_swaps_or_all_accounts_are_exhausted

server/src/chat/transport/matrix/bot/run.rs

@@ -25,6 +25,7 @@ pub async fn run_bot(
     services: Arc<Services>,
     watcher_rx: tokio::sync::broadcast::Receiver<crate::io::watcher::WatcherEvent>,
     watcher_rx_auto: tokio::sync::broadcast::Receiver<crate::io::watcher::WatcherEvent>,
+    watcher_tx: tokio::sync::broadcast::Sender<crate::io::watcher::WatcherEvent>,
     shutdown_rx: watch::Receiver<Option<crate::rebuild::ShutdownReason>>,
     gateway_active_project: Option<Arc<RwLock<String>>>,
     gateway_projects: Vec<String>,
@@ -227,9 +228,12 @@ pub async fn run_bot(
     let announce_bot_name = services.bot_name.clone();
 
     // Auto-schedule timers when an agent hits a hard rate limit.
+    // Also emits OAuthAccountSwapped / OAuthAccountsExhausted events back into
+    // the watcher channel so the notification listener can forward them to chat.
     crate::service::timer::spawn_rate_limit_auto_scheduler(
         Arc::clone(&timer_store),
         watcher_rx_auto,
+        watcher_tx,
     );
 
     // Subscribe to the status broadcaster if the matrix_status_consumer toggle is

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

@@ -103,6 +103,7 @@ pub fn spawn_bot(
             services,
             watcher_rx,
             watcher_rx_auto,
+            watcher_tx,
             shutdown_rx,
             gateway_active_project,
             gateway_projects,