brainiac-github 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43962acb8ab8344a4e420e841550114d53082045252252ad340944dad73d267f
-  data.tar.gz: eb8769a6f13771b1d057133fe8c72c3f3482602528ad0494475eb14022ea0d33
+  metadata.gz: 4646b834b308b619a34c5b94da48aeb88b80caa3fb5efd107ac40a5dc56da2a0
+  data.tar.gz: af0c3f9c0b47e366928760c64168a74eb3651f87c193156cbced75336626bac0
 SHA512:
-  metadata.gz: bf3b0e3b90397dfd8232b2bd1fefab1f228dbb2b206d4f9b2766cbd064b6b2c9f4007bd651a7f3ab4ae91bd8934d674e814c931ef4549cf38eaa70b58d74b182
-  data.tar.gz: b22dae8eacf0a45f9032eaadf63a33e945a17d4647ced3195254eb48d17962c2cf459a52214948d29407066c5217a09f21c093876cdd4dbde5e177e1296cabd2
+  metadata.gz: 945f7fad37cd33a37d755b6517faa8638c4a351d74f11edb60bf8299d04933837f38b34e1fa39afaea34af2b2d57c89f5b88d641fb6e6001436622928143d445
+  data.tar.gz: 5c2e27ab69d9af292ddbd3c7ac299629f1b97c005b85275bdaaa31d24b010903a75b4973d6d91cf99ab5ea580c53c67c77e341724f46c633a2628d2a78ad6c67

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

@@ -16,7 +16,8 @@ module Brainiac
             default_branch = payload.dig("repository", "default_branch") || "main"
 
             # Extract card number from branch name (e.g., "fizzy-1182-add-goodbye-method" → 1182)
-            card_number_from_branch = branch&.match(/^fizzy-(\d+)-/)&.[](1)&.to_i
+            card_number_from_branch = branch&.match(/^fizzy-(\d+)-/)
+            card_number_from_branch = card_number_from_branch[1].to_i if card_number_from_branch
 
             # Emit a hook for ALL merges (including epic branches) so consumers can decide
             if card_number_from_branch
@@ -125,6 +126,24 @@ 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.
+            unless pr_owned_locally?(pr)
+              pr_author = pr.dig("user", "login")
+              LOG.info "[GitHub] PR ##{pr_number} owned by remote agent (#{pr_author}) — skipping dispatch"
+              return [200, { status: "ignored", reason: "PR owned by remote agent" }.to_json]
+            end
 
             project_result = identify_project_by_repo(repo_name)
             return [200, { status: "ignored", reason: "no matching project" }.to_json] unless project_result
@@ -192,6 +211,16 @@ module Brainiac
               return [200, { status: "ignored", reason: "not a PR comment" }.to_json]
             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.
+            pr_author = issue.dig("user", "login")
+            pr_author_type = issue.dig("user", "type")
+            unless pr_author_owned_locally?(pr_author, pr_author_type)
+              pr_number = issue["number"]
+              LOG.info "[GitHub] PR ##{pr_number} owned by remote agent (#{pr_author}) — skipping dispatch"
+              return [200, { status: "ignored", reason: "PR owned by remote agent" }.to_json]
+            end
+
             project_result = identify_project_by_repo(repo_name)
             unless project_result
               LOG.info "No project found for GitHub repo #{repo_name}"
@@ -217,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)
@@ -317,6 +346,52 @@ module Brainiac
             nil
           end
 
+          # Determine if this machine should handle a PR based on who opened it.
+          # If the PR was opened by a bot that maps to a known agent, only the
+          # machine where that agent is local should dispatch. Human-opened PRs
+          # are always considered local (handled by normal routing logic).
+          #
+          # This prevents both machines from dispatching when they share the same
+          # GitHub webhook — e.g. Adam's Kaylee opens a PR, only Adam's machine handles it.
+          def pr_owned_locally?(pull_request)
+            pr_author = pull_request.dig("user", "login")
+            pr_author_type = pull_request.dig("user", "type")
+            pr_author_owned_locally?(pr_author, pr_author_type)
+          end
+
+          # Check PR ownership given the author login and account type.
+          # Used by both pull_request_review (has full PR object) and issue_comment
+          # (has issue.user which is the PR author on PR-linked issues).
+          def pr_author_owned_locally?(pr_author, pr_author_type)
+            # Human-opened PRs are always handled (normal routing applies)
+            return true unless pr_author_type == "Bot"
+
+            # Extract agent name from bot login (e.g. "kaylee-brainiac[bot]" → "Kaylee")
+            agent_from_bot = agent_name_from_bot_login(pr_author)
+            return true unless agent_from_bot
+
+            # If the bot's agent is local to this machine, we own it
+            local_agent_names.include?(agent_from_bot)
+          end
+
+          # Extract a Brainiac agent display name from a GitHub bot login.
+          # Bot logins follow the pattern "<name>-brainiac[bot]" or "<name>-brainiac".
+          # Returns the matched agent display name, or nil if not a known agent bot.
+          def agent_name_from_bot_login(bot_login)
+            return nil unless bot_login
+
+            # Normalize: remove [bot] suffix, lowercase
+            normalized = bot_login.to_s.downcase.delete_suffix("[bot]").strip
+
+            # Match against known agents — bot logins are "<agent>-brainiac"
+            all_agent_names.each do |name|
+              return name if normalized == "#{name.downcase}-brainiac"
+              return name if normalized == name.downcase
+            end
+
+            nil
+          end
+
           # Generate a GH_TOKEN env var for the agent process so `gh` CLI
           # authenticates as the app bot instead of the user's personal account.
           # Falls back to the shared "brainiac" app if the agent's own app isn't configured.
@@ -429,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.3"
+      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.3
+  version: 0.2.5
 platform: ruby
 authors:
 - Andy Davis