storkit: merge 394_story_whatsapp_and_slack_permission_prompt_forwarding

server/src/main.rs

@@ -254,6 +254,8 @@ async fn main() -> Result<(), std::io::Error> {
     // handler (via AppContext) and the Matrix bot.
     let perm_rx = Arc::new(tokio::sync::Mutex::new(perm_rx));
     let perm_rx_for_bot = Arc::clone(&perm_rx);
+    let perm_rx_for_whatsapp = Arc::clone(&perm_rx);
+    let perm_rx_for_slack = Arc::clone(&perm_rx);
 
     // Capture project root, agents Arc, and reconciliation sender before ctx
     // is consumed by build_routes.
@@ -307,6 +309,11 @@ async fn main() -> Result<(), std::io::Error> {
                 history_size: cfg.history_size,
                 window_tracker: Arc::new(chat::transport::whatsapp::MessagingWindowTracker::new()),
                 allowed_phones: cfg.whatsapp_allowed_phones.clone(),
+                perm_rx: perm_rx_for_whatsapp,
+                pending_perm_replies: Arc::new(tokio::sync::Mutex::new(
+                    std::collections::HashMap::new(),
+                )),
+                permission_timeout_secs: cfg.permission_timeout_secs,
             })
         });
 
@@ -338,6 +345,11 @@ async fn main() -> Result<(), std::io::Error> {
                 history: std::sync::Arc::new(tokio::sync::Mutex::new(history)),
                 history_size: cfg.history_size,
                 channel_ids,
+                perm_rx: perm_rx_for_slack,
+                pending_perm_replies: Arc::new(tokio::sync::Mutex::new(
+                    std::collections::HashMap::new(),
+                )),
+                permission_timeout_secs: cfg.permission_timeout_secs,
             })
         });