fix: routed_callee preserves AOR, broadcast_event carries call_id, session_hook_ctx merge

Author: shenjinti

src/addons/cc

@@ -2248,11 +2248,23 @@ impl SipSession {
                 }
             }
         }
+        let connected_callee = self
+            .meta
+            .routed_callee
+            .clone()
+            .or_else(|| self.meta.connected_callee.clone());
+        info!(
+            session_id = %self.context.session_id,
+            routed_callee = ?self.meta.routed_callee,
+            connected_callee = ?self.meta.connected_callee,
+            resolved = ?connected_callee,
+            "session_hook_ctx: connected_callee resolution"
+        );
         crate::proxy::proxy_call::session_hooks::CallSessionContext {
             session_id: self.context.session_id.clone(),
             caller: self.context.original_caller.clone(),
             callee: self.context.original_callee.clone(),
-            connected_callee: self.meta.connected_callee.clone(),
+            connected_callee,
             queue_name: self.meta.queue_name.clone(),
             direction: self.context.dialplan.direction.to_string(),
             started_at: Some(self.context.created_at.clone()),
@@ -3682,7 +3694,12 @@ impl SipSession {
                                 .caller
                                 .as_ref()
                                 .map(|uri| uri.to_string());
-                            self.meta.routed_callee = Some(callee_uri.to_string());
+                            // Store original target AOR, not resolved contact.
+                            let winner_aor = targets
+                                .get(winner_idx)
+                                .map(|t| t.aor.to_string())
+                                .unwrap_or_else(|| callee_uri.to_string());
+                            self.meta.routed_callee = Some(winner_aor);
 
                             // Cancel all remaining forks
                             fork_cancel.cancel();
@@ -4500,7 +4517,10 @@ impl SipSession {
             self.build_target_invite_option(target, None).await?;
 
         self.meta.routed_caller = Some(invite_option.caller.to_string());
-        self.meta.routed_callee = Some(invite_option.callee.to_string());
+        // Store the original target AOR (e.g. "sip:test001@localhost"), NOT
+        // the resolved contact URI (e.g. WebRTC contact "sip:abc123@...;transport=WS").
+        // This is used by session hooks to resolve agent identity.
+        self.meta.routed_callee = Some(target.aor.to_string());
 
         if let Some(home_proxy) = target.home_proxy.as_ref() {
             info!(

src/proxy/proxy_call/sip_session.rs

@@ -532,15 +532,15 @@ impl RwiGateway {
     }
 
     /// Send an event to every known session (broadcast).
-    /// Note: Broadcasting does not cache events as there's no specific call_id.
+    /// Call-scoped events (with `call_id`) carry it in the envelope so webhook
+    /// consumers can correlate. Truly global events (agent_state_changed, etc.)
+    /// have `call_id = None` and the envelope field is empty.
     pub fn broadcast_event(&self, event: &RwiEvent) {
-        // Forward to webhook handler (if configured).
-        // Use an empty call_id and zero sequence since broadcast events are not cached.
         if let Some(tx) = &self.webhook_tx {
             let entry = EventCacheEntry {
                 sequence: 0,
                 cached_at: chrono::Utc::now(),
-                call_id: String::new(),
+                call_id: event.call_id.clone().unwrap_or_default(),
                 event: event.clone(),
             };
             let _ = tx.send(entry);