brainiac-github 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb6c5132e15d851261b150a636b895a0d8d8f6487b51a5049290a1ce2f12274
-  data.tar.gz: c6bf867e0bb5dbca4008e0971dc0568fb95755c2b296b7865e889e2d09645120
+  metadata.gz: 4646b834b308b619a34c5b94da48aeb88b80caa3fb5efd107ac40a5dc56da2a0
+  data.tar.gz: af0c3f9c0b47e366928760c64168a74eb3651f87c193156cbced75336626bac0
 SHA512:
-  metadata.gz: ed2481547416f7bd7d0194aff3ec96da00811c6fe2a4ee8478b4f90c63820fde0318e7ea2427ba07646bd5755abcba3ac2a3c32af78170abb6eebb461f54a4dc
-  data.tar.gz: 3df84f31506b7fbeeaf7636f84b8d8602a9e6fee9d6d8a6a4b18b4f5b76a9de666df79e5c2dccb9c81d1f90727bc8ffd60cc8b784776ea8f55ef0385e3234791
+  metadata.gz: 945f7fad37cd33a37d755b6517faa8638c4a351d74f11edb60bf8299d04933837f38b34e1fa39afaea34af2b2d57c89f5b88d641fb6e6001436622928143d445
+  data.tar.gz: 5c2e27ab69d9af292ddbd3c7ac299629f1b97c005b85275bdaaa31d24b010903a75b4973d6d91cf99ab5ea580c53c67c77e341724f46c633a2628d2a78ad6c67

data/lib/brainiac/plugins/github/handler.rb

@@ -126,6 +126,16 @@ module Brainiac
             repo_name = payload.dig("repository", "full_name")
             review_state = review["state"]
             reviewer = review.dig("user", "login")
+            reviewer_type = review.dig("user", "type")
+
+            # If the review was submitted by a remote agent bot, ignore — the other machine handles it.
+            if reviewer_type == "Bot"
+              reviewing_agent = agent_name_from_bot_login(reviewer)
+              if reviewing_agent && !local_agent_names.include?(reviewing_agent)
+                LOG.info "[GitHub] Ignoring review from remote agent bot #{reviewer} (agent: #{reviewing_agent}) on PR ##{pr_number}"
+                return [200, { status: "ignored", reason: "remote agent bot review" }.to_json]
+              end
+            end
 
             # If the PR was opened by a remote agent bot (not local to this machine),
             # skip dispatch — the other machine that owns the agent will handle it.
@@ -236,12 +246,12 @@ module Brainiac
               agent_name = mentioned
             end
 
-            # Ignore comments from this project's own bot to prevent self-triggering.
-            # Cross-agent bot comments (e.g. GLaDOS commenting on Galen's PR) are still processed.
-            if comment_user_type == "Bot" && own_bot_comment?(comment_user, agent_name)
-              LOG.info "Ignoring self-triggered bot comment from #{comment_user} (agent: #{agent_name})"
-              return [200, { status: "ignored", reason: "self-triggered bot comment" }.to_json]
-            end
+            # Ignore comments from agent bots that shouldn't trigger dispatch on this machine:
+            # 1. Self-triggered: bot matches the dispatching agent (prevents loops)
+            # 2. Remote agent: bot matches a known agent that isn't local (other machine handles it)
+            # Cross-agent LOCAL bot comments (e.g. GLaDOS commenting on Galen's PR) are still processed.
+            bot_ignore_reason = bot_comment_ignore_reason(comment_user, comment_user_type, agent_name, pr_number)
+            return bot_ignore_reason if bot_ignore_reason
 
             branch = fetch_pr_branch(repo_name, pr_number, agent_name, project_config)
             result = find_work_item_by_branch(branch)
@@ -494,6 +504,30 @@ module Brainiac
             nil
           end
 
+          # Determine if a bot comment should be ignored by this machine.
+          # Returns a Rack response array if the comment should be ignored, or nil if it should be processed.
+          #
+          # Ignores:
+          # 1. Self-triggered: bot matches the dispatching agent (prevents loops)
+          # 2. Remote agent: bot matches a known agent that isn't local (other machine handles it)
+          # Allows: cross-agent LOCAL bot comments (e.g. GLaDOS commenting on Galen's PR)
+          def bot_comment_ignore_reason(comment_user, comment_user_type, agent_name, pr_number)
+            return nil unless comment_user_type == "Bot"
+
+            if own_bot_comment?(comment_user, agent_name)
+              LOG.info "Ignoring self-triggered bot comment from #{comment_user} (agent: #{agent_name})"
+              return [200, { status: "ignored", reason: "self-triggered bot comment" }.to_json]
+            end
+
+            commenting_agent = agent_name_from_bot_login(comment_user)
+            if commenting_agent && !local_agent_names.include?(commenting_agent)
+              LOG.info "[GitHub] Ignoring comment from remote agent bot #{comment_user} (agent: #{commenting_agent}) on PR ##{pr_number}"
+              return [200, { status: "ignored", reason: "remote agent bot comment" }.to_json]
+            end
+
+            nil
+          end
+
           # Check if a bot comment is from the same agent that would handle this PR.
           # e.g. "galen-brainiac[bot]" is a self-trigger for agent "Galen",
           # but "glados-brainiac[bot]" is a cross-agent request and should be processed.

data/lib/brainiac/plugins/github/version.rb

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Github
-      VERSION = "0.2.4"
+      VERSION = "0.2.5"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-github
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Andy Davis