Merge remote-tracking branch 'origin/chore/nearby-voice-chat/audio-stream-deduplication' into chore/nearby-voice-chat/audio-stream-deduplication

Author: popuz

.github/workflows/claude-pr-review.yml

@@ -8,6 +8,10 @@ on:
   pull_request:
     types: [opened, synchronize, ready_for_review]
 
+concurrency:
+  group: claude-review-${{ github.event.pull_request.number || github.event.issue.number || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   auto-review:
     if: |
@@ -44,11 +48,12 @@ jobs:
                 f.filename === 'CODEOWNERS'
               );
               if (touchesSensitive) {
-                core.notice('Auto-review disabled: PR modifies .github/prompts, .github/workflows, or CODEOWNERS. Human review required.');
+                core.notice('Sensitive paths modified (.github/prompts, .github/workflows, or CODEOWNERS): Claude will review but not auto-approve. Human DEV review required; QA can still be waived if Claude reports QA_REQUIRED: NO.');
               }
             }
 
-            core.setOutput('is-auto-review', (isAutoReview && !touchesSensitive).toString());
+            core.setOutput('is-auto-review', isAutoReview.toString());
+            core.setOutput('touches-sensitive', touchesSensitive.toString());
 
       - name: Set status to pending
         if: steps.check-type.outputs.is-auto-review == 'true'
@@ -121,17 +126,16 @@ jobs:
         with:
           script: |
             const prNumber = ${{ github.event.pull_request.number }};
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const touchesSensitive = '${{ steps.check-type.outputs.touches-sensitive }}' === 'true';
 
             const comments = await github.rest.issues.listComments({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: prNumber,
-              per_page: 100
+              owner, repo, issue_number: prNumber, per_page: 100
             });
 
-            const claudeComment = comments.data
-              .reverse()
-              .find(c => c.user?.login === 'claude[bot]');
+            const claudeComments = comments.data.filter(c => c.user?.login === 'claude[bot]');
+            const claudeComment = claudeComments[claudeComments.length - 1];
 
             const output = claudeComment?.body ?? '';
             console.log('Claude comment preview:', output.slice(0, 300));
@@ -143,36 +147,77 @@ jobs:
             const hasReviewResult = output.includes('REVIEW_RESULT:');
             const passed = !failed && !errored;
 
-            if (passed && isSimple) {
-              const approvalBody = qaRequired
-                ? 'Auto-approved by Claude — simple fix/chore with no blocking issues. QA approval is still required.'
-                : 'Auto-approved by Claude — simple fix/chore with no blocking issues. No QA needed (non-runtime changes only).';
-
-              await github.rest.pulls.createReview({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                pull_number: prNumber,
-                event: 'APPROVE',
-                body: approvalBody
-              });
-
-              const labels = ['claude-approved'];
-              if (!qaRequired) {
-                labels.push('no QA needed');
+            const reviews = await github.rest.pulls.listReviews({
+              owner, repo, pull_number: prNumber, per_page: 100
+            });
+            const ourApprovals = reviews.data.filter(r =>
+              r.user?.login === 'github-actions[bot]' && r.state === 'APPROVED'
+            );
+            const prLabels = (context.payload.pull_request.labels || []).map(l => l.name);
+            const COMPLEX_MARKER = '🔍 Claude reviewed this PR and found no blocking issues';
+            const SENSITIVE_MARKER = '🔒 Claude reviewed this PR — sensitive paths modified';
+
+            const canAutoApprove = hasReviewResult && passed && isSimple && !touchesSensitive;
+            const canWaiveQa = hasReviewResult && passed && isSimple && !qaRequired;
+
+            if (canAutoApprove) {
+              if (ourApprovals.length === 0) {
+                const approvalBody = qaRequired
+                  ? 'Auto-approved by Claude — simple fix/chore with no blocking issues. QA approval is still required.'
+                  : 'Auto-approved by Claude — simple fix/chore with no blocking issues. No QA needed (non-runtime changes only).';
+                await github.rest.pulls.createReview({
+                  owner, repo, pull_number: prNumber, event: 'APPROVE', body: approvalBody
+                });
               }
               await github.rest.issues.addLabels({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                labels
-              });
-            } else if (passed && !isSimple) {
-              await github.rest.issues.createComment({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: prNumber,
-                body: '🔍 Claude reviewed this PR and found no blocking issues, but assessed it as **complex** — human DEV review is still required before merging.'
+                owner, repo, issue_number: prNumber, labels: ['claude-approved']
               });
+            } else if (hasReviewResult) {
+              for (const r of ourApprovals) {
+                await github.rest.pulls.dismissReview({
+                  owner, repo, pull_number: prNumber, review_id: r.id,
+                  message: 'Dismissed: latest Claude review no longer auto-approves this PR.'
+                }).catch(e => console.log(`dismissReview: ${e.message}`));
+              }
+              if (prLabels.includes('claude-approved')) {
+                await github.rest.issues.removeLabel({
+                  owner, repo, issue_number: prNumber, name: 'claude-approved'
+                }).catch(e => console.log(`removeLabel claude-approved: ${e.message}`));
+              }
+              if (touchesSensitive && passed && isSimple && !comments.data.some(c =>
+                  c.user?.login === 'github-actions[bot]' && c.body?.startsWith(SENSITIVE_MARKER))) {
+                const qaNote = qaRequired
+                  ? 'QA approval is still required.'
+                  : 'No QA needed (Claude reported `QA_REQUIRED: NO`).';
+                await github.rest.issues.createComment({
+                  owner, repo, issue_number: prNumber,
+                  body: `${SENSITIVE_MARKER} (\`.github/prompts\`, \`.github/workflows\`, or \`CODEOWNERS\`). Claude will not auto-approve these PRs — human DEV review is required. ${qaNote}`
+                });
+              } else if (!touchesSensitive && passed && !isSimple && !comments.data.some(c =>
+                  c.user?.login === 'github-actions[bot]' && c.body?.startsWith(COMPLEX_MARKER))) {
+                await github.rest.issues.createComment({
+                  owner, repo, issue_number: prNumber,
+                  body: COMPLEX_MARKER + ', but assessed it as **complex** — human DEV review is still required before merging.'
+                });
+              }
+            }
+
+            if (canWaiveQa) {
+              if (!prLabels.includes('no QA needed')) {
+                await github.rest.issues.addLabels({
+                  owner, repo, issue_number: prNumber, labels: ['no QA needed']
+                });
+              }
+            } else if (hasReviewResult && prLabels.includes('no QA needed')) {
+              await github.rest.issues.removeLabel({
+                owner, repo, issue_number: prNumber, name: 'no QA needed'
+              }).catch(e => console.log(`removeLabel no QA needed: ${e.message}`));
+            }
+
+            for (const c of claudeComments.slice(0, -1)) {
+              await github.rest.issues.deleteComment({
+                owner, repo, comment_id: c.id
+              }).catch(e => console.log(`deleteComment ${c.id}: ${e.message}`));
             }
 
             let description;
@@ -184,6 +229,10 @@ jobs:
               description = 'Claude review encountered an error';
             } else if (failed) {
               description = 'Claude found issues that must be resolved';
+            } else if (touchesSensitive && isSimple) {
+              description = canWaiveQa
+                ? 'No blocking issues — sensitive paths, DEV review required (no QA needed)'
+                : 'No blocking issues — sensitive paths, DEV review required';
             } else if (isSimple) {
               description = 'No blocking issues found — PR auto-approved';
             } else {
@@ -373,9 +422,8 @@ jobs:
               per_page: 100
             });
 
-            const claudeComment = comments.data
-              .reverse()
-              .find(c => c.user?.login === 'claude[bot]');
+            const claudeComments = comments.data.filter(c => c.user?.login === 'claude[bot]');
+            const claudeComment = claudeComments[claudeComments.length - 1];
 
             const output = claudeComment?.body ?? '';
             console.log('Claude comment preview:', output.slice(0, 200));
@@ -384,6 +432,14 @@ jobs:
             const errored = '${{ steps.claude.outcome }}' === 'failure';
             const hasReviewResult = output.includes('REVIEW_RESULT:');
 
+            for (const c of claudeComments.slice(0, -1)) {
+              await github.rest.issues.deleteComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: c.id
+              }).catch(e => console.log(`deleteComment ${c.id}: ${e.message}`));
+            }
+
             let description;
             if (errored && !output) {
               description = 'Claude review failed — credit balance too low or API error';

Explorer/Assets/DCL/Communities/CommunityDataService/CommunityDataService.cs

@@ -13,6 +13,7 @@
 using DCL.Web3.Identities;
 using Decentraland.SocialService.V2;
 using MVC;
+using UnityEngine.Pool;
 using Utility;
 
 namespace DCL.Communities
@@ -34,6 +35,9 @@ public interface ICommunityDataService
 
         void Clear();
         event Action<CommunityMetadataUpdatedEvent> CommunityMetadataUpdated;
+        event Action<string> CommunityJoined;
+        event Action<string> CommunityRemoved;
+        IReadOnlyCollection<string> JoinedCommunityIds { get; }
     }
 
     public class CommunityDataService : ICommunityDataService, IDisposable
@@ -44,11 +48,16 @@ public class CommunityDataService : ICommunityDataService, IDisposable
         private readonly CommunitiesDataProvider.CommunitiesDataProvider communitiesDataProvider;
         private readonly IWeb3IdentityCache web3IdentityCache;
         private readonly Dictionary<ChatChannel.ChannelId, GetUserCommunitiesData.CommunityData> communities = new();
+        private readonly HashSet<string> joinedCommunityIds = new();
 
         private CancellationTokenSource userAllowedToUseCommunityBusCts;
         private CancellationTokenSource communitiesServiceCts = new();
         private CancellationTokenSource showCommunityDeepLinkNotificationCts;
         public event Action<CommunityMetadataUpdatedEvent>? CommunityMetadataUpdated;
+        public event Action<string>? CommunityJoined;
+        public event Action<string>? CommunityRemoved;
+
+        public IReadOnlyCollection<string> JoinedCommunityIds => joinedCommunityIds;
 
         public CommunityDataService(
             IChatHistory chatHistory,
@@ -139,6 +148,9 @@ private void OnCommunitiesEventBusUserDisconnectedToCommunity(CommunityMemberCon
                 var channelId = ChatChannel.NewCommunityChannelId(userConnectivity.CommunityId);
                 chatHistory.RemoveChannel(channelId);
                 communities.Remove(channelId);
+
+                if (joinedCommunityIds.Remove(userConnectivity.CommunityId))
+                    CommunityRemoved?.Invoke(userConnectivity.CommunityId);
             }
         }
 
@@ -151,6 +163,9 @@ private void CommunityLeft(string communityId, bool success)
             communities.Remove(channelId);
 
             chatHistory.RemoveChannel(channelId);
+
+            if (joinedCommunityIds.Remove(communityId))
+                CommunityRemoved?.Invoke(communityId);
         }
 
         private async UniTask AddCommunityConversationAsync(string communityId, bool setAsCurrentChannel = false)
@@ -181,6 +196,9 @@ await communitiesDataProvider.GetCommunityAsync(communityId, communitiesServiceC
                     response.data.membersCount,
                     response.data.voiceChatStatus));
 
+                if (joinedCommunityIds.Add(response.data.id))
+                    CommunityJoined?.Invoke(response.data.id);
+
                 chatHistory.AddOrGetChannel(ChatChannel.NewCommunityChannelId(response.data.id), ChatChannel.ChatChannelType.COMMUNITY);
 
                 // if (setAsCurrentChannel)
@@ -205,29 +223,57 @@ private void CommunityCreated(CreateOrUpdateCommunityResponse.CommunityData newC
                 1,
                 new GetCommunityResponse.VoiceChatStatus());
 
+            if (joinedCommunityIds.Add(newCommunity.id))
+                CommunityJoined?.Invoke(newCommunity.id);
+
             chatHistory.AddOrGetChannel(channelId, ChatChannel.ChatChannelType.COMMUNITY);
         }
 
         private void CommunityDeleted(string communityId)
         {
             var channelId = ChatChannel.NewCommunityChannelId(communityId);
             chatHistory.RemoveChannel(channelId);
+
+            if (joinedCommunityIds.Remove(communityId))
+                CommunityRemoved?.Invoke(communityId);
         }
 
         public void SetCommunities(IEnumerable<GetUserCommunitiesData.CommunityData> newCommunities)
         {
+            using PooledObject<HashSet<string>> _ = HashSetPool<string>.Get(out HashSet<string> previouslyJoined);
+            previouslyJoined.UnionWith(joinedCommunityIds);
+
             communities.Clear();
+            joinedCommunityIds.Clear();
+
             foreach (var community in newCommunities)
             {
                 communities[ChatChannel.NewCommunityChannelId(community.id)] = community;
+                joinedCommunityIds.Add(community.id);
             }
+
+            foreach (string id in previouslyJoined)
+                if (!joinedCommunityIds.Contains(id))
+                    CommunityRemoved?.Invoke(id);
+
+            foreach (string id in joinedCommunityIds)
+                if (!previouslyJoined.Contains(id))
+                    CommunityJoined?.Invoke(id);
         }
 
         public void Clear()
         {
+            string[] previouslyJoined = joinedCommunityIds.Count == 0 ? Array.Empty<string>() : new string[joinedCommunityIds.Count];
+            if (previouslyJoined.Length > 0)
+                joinedCommunityIds.CopyTo(previouslyJoined);
+
             communities.Clear();
+            joinedCommunityIds.Clear();
             communitiesServiceCts.SafeCancelAndDispose();
             communitiesServiceCts = new CancellationTokenSource();
+
+            foreach (string id in previouslyJoined)
+                CommunityRemoved?.Invoke(id);
         }
 
         public bool TryGetCommunity(ChatChannel.ChannelId channelId, out GetUserCommunitiesData.CommunityData communityData)