fix(teams): correct channelData precedence in extract_teams_continuation

Upstream chat@4.31 builds the continuation via an object spread where the
later source wins when both are present. The port inverted this, doing
primary-first with channelData only as a None fallback. Match upstream:

- teamsChannelId wins over channel.id
- teamsTeamId wins over team.id
- channelData.tenant.id wins over conversation.tenantId

Flip the pinning test to assert the channelData-native source wins and
rename it to test_continuation_channeldata_wins_over_conversation.

Author: patrick-chinchill

src/chat_sdk/adapters/teams/webhook/continuation.py

@@ -41,27 +41,29 @@ def extract_teams_continuation(activity: TeamsActivity) -> TeamsContinuation:
 
     ``conversation_id`` / ``service_url`` default to ``""`` (upstream ``?? ""``)
     so the continuation always carries the two fields a reply needs; the rest
-    are populated only when present, applying the same channelData fallbacks
-    as upstream (``channel.id`` then ``teamsChannelId``; ``team.id`` then
-    ``teamsTeamId``; ``conversation.tenantId`` then ``tenant.id``).
+    are populated only when present. Upstream builds the result with an object
+    spread where the *later* source wins when both are present, so the
+    channelData-native fields take precedence: ``teamsChannelId`` over
+    ``channel.id``; ``teamsTeamId`` over ``team.id``; ``channelData.tenant.id``
+    over ``conversation.tenantId``.
     """
     channel_data = _record(activity.get("channelData")) or {}
     conversation = _record(activity.get("conversation")) or {}
     channel = _record(channel_data.get("channel")) or {}
     team = _record(channel_data.get("team")) or {}
     tenant = _record(channel_data.get("tenant")) or {}
 
-    channel_id = _opt_str(channel.get("id"))
+    channel_id = _opt_str(channel_data.get("teamsChannelId"))
     if channel_id is None:
-        channel_id = _opt_str(channel_data.get("teamsChannelId"))
+        channel_id = _opt_str(channel.get("id"))
 
-    team_id = _opt_str(team.get("id"))
+    team_id = _opt_str(channel_data.get("teamsTeamId"))
     if team_id is None:
-        team_id = _opt_str(channel_data.get("teamsTeamId"))
+        team_id = _opt_str(team.get("id"))
 
-    tenant_id = _opt_str(conversation.get("tenantId"))
+    tenant_id = _opt_str(tenant.get("id"))
     if tenant_id is None:
-        tenant_id = _opt_str(tenant.get("id"))
+        tenant_id = _opt_str(conversation.get("tenantId"))
 
     conversation_id = conversation.get("id")
     service_url = activity.get("serviceUrl")

tests/test_teams_webhook_primitive.py

@@ -242,24 +242,26 @@ def test_continuation_defaults_when_fields_absent(self):
         assert continuation.team_id is None
         assert continuation.tenant_id is None
 
-    def test_continuation_prefers_primary_over_fallback(self):
-        # ``channel.id`` wins over ``teamsChannelId``; ``team.id`` over
-        # ``teamsTeamId``; ``conversation.tenantId`` over ``tenant.id``.
+    def test_continuation_channeldata_wins_over_conversation(self):
+        # Upstream builds the continuation via an object spread where the later
+        # source wins: ``teamsChannelId`` beats ``channel.id``; ``teamsTeamId``
+        # beats ``team.id``; ``channelData.tenant.id`` beats
+        # ``conversation.tenantId``.
         continuation = extract_teams_continuation(
             {
                 "channelData": {
-                    "channel": {"id": "primary-channel"},
-                    "team": {"id": "primary-team"},
-                    "teamsChannelId": "fallback-channel",
-                    "teamsTeamId": "fallback-team",
-                    "tenant": {"id": "fallback-tenant"},
+                    "channel": {"id": "channel-id"},
+                    "team": {"id": "team-id"},
+                    "teamsChannelId": "teams-channel-id",
+                    "teamsTeamId": "teams-team-id",
+                    "tenant": {"id": "channeldata-tenant"},
                 },
-                "conversation": {"id": "c", "tenantId": "primary-tenant"},
+                "conversation": {"id": "c", "tenantId": "conversation-tenant"},
             }
         )
-        assert continuation.channel_id == "primary-channel"
-        assert continuation.team_id == "primary-team"
-        assert continuation.tenant_id == "primary-tenant"
+        assert continuation.channel_id == "teams-channel-id"
+        assert continuation.team_id == "teams-team-id"
+        assert continuation.tenant_id == "channeldata-tenant"
 
 
 # ---------------------------------------------------------------------------