brainiac-github 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb6c5132e15d851261b150a636b895a0d8d8f6487b51a5049290a1ce2f12274
-  data.tar.gz: c6bf867e0bb5dbca4008e0971dc0568fb95755c2b296b7865e889e2d09645120
+  metadata.gz: 6a7a75791c3df9f85c5e2d545bbaa83bc496a7d6f88c34f38a84d73a5bcced59
+  data.tar.gz: 896ba92478b7d36dbc9e99f71586c4c0fdb4e777a007e087412ccaf71b2cabdd
 SHA512:
-  metadata.gz: ed2481547416f7bd7d0194aff3ec96da00811c6fe2a4ee8478b4f90c63820fde0318e7ea2427ba07646bd5755abcba3ac2a3c32af78170abb6eebb461f54a4dc
-  data.tar.gz: 3df84f31506b7fbeeaf7636f84b8d8602a9e6fee9d6d8a6a4b18b4f5b76a9de666df79e5c2dccb9c81d1f90727bc8ffd60cc8b784776ea8f55ef0385e3234791
+  metadata.gz: eca03777383a673758eb035ea69ed5b604d6fe289486cd4cb5e943c93fb8e6c14a1057268ed68c5ee04adc5fc6744219734dd6756f70b60b00e4720269a28fd6
+  data.tar.gz: 17fafeac99cfe179febe43424dd4bf791e199d226f6dc92022f5ce9f7643b151cdbe65698ef956d9794c2651eaff012d0f66395cfb296cf3b13b9dbf1664e0f0

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.
@@ -172,6 +182,18 @@ module Brainiac
               return [200, { status: "processed", card: card_number, pr: pr_number, reviewer: reviewer, action: "hook_only" }.to_json]
             end
 
+            # If the work item's assigned agent is NOT local to this machine,
+            # skip dispatch — the other machine owns this PR's agent.
+            # This check is intentionally AFTER the hook emit so gate tracking
+            # works on both machines, but only one machine dispatches the agent.
+            if result
+              work_item_agent = card_info["agent"]
+              if work_item_agent && !local_agent_names.include?(work_item_agent)
+                LOG.info "[GitHub] PR ##{pr_number} assigned to remote agent #{work_item_agent} — skipping review dispatch"
+                return [200, { status: "ignored", reason: "work item owned by remote agent" }.to_json]
+              end
+            end
+
             card_key = "pr-review-#{repo_name.tr("/", "-")}-#{pr_number}"
 
             return [200, { status: "ignored", reason: "session already active" }.to_json] if session_active?(card_key)
@@ -236,12 +258,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)
@@ -251,12 +273,22 @@ module Brainiac
             # route to whoever is actually working it (e.g. GLaDOS opened the PR,
             # so GLaDOS should handle follow-up comments — not the project's default agent).
             # Explicit mentions still take priority (already resolved above).
+            #
+            # If the work item's assigned agent is NOT local to this machine,
+            # skip dispatch entirely — the other machine owns this PR's agent.
             if result && !mentioned
               _, card_info = result
               work_item_agent = card_info["agent"]
-              if work_item_agent && work_item_agent.downcase != agent_name.downcase && local_agent_names.include?(work_item_agent)
-                LOG.info "[GitHub] Work item agent override: #{work_item_agent} (project default: #{agent_name})"
-                agent_name = work_item_agent
+              if work_item_agent
+                if local_agent_names.include?(work_item_agent)
+                  if work_item_agent.downcase != agent_name.downcase
+                    LOG.info "[GitHub] Work item agent override: #{work_item_agent} (project default: #{agent_name})"
+                    agent_name = work_item_agent
+                  end
+                else
+                  LOG.info "[GitHub] PR ##{pr_number} assigned to remote agent #{work_item_agent} — skipping dispatch"
+                  return [200, { status: "ignored", reason: "work item owned by remote agent" }.to_json]
+                end
               end
             end
 
@@ -494,6 +526,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.6"
     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.6
 platform: ruby
 authors:
 - Andy Davis