brainiac-github 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5ae816a199e6894108759603b7d806d34000a3da5c44637456cbeb270ed4e8c
-  data.tar.gz: 06c7c6bb1bf211992d40ba6cf7f50df203300319dea3d34bc4f3630990311edf
+  metadata.gz: 4cb6c5132e15d851261b150a636b895a0d8d8f6487b51a5049290a1ce2f12274
+  data.tar.gz: c6bf867e0bb5dbca4008e0971dc0568fb95755c2b296b7865e889e2d09645120
 SHA512:
-  metadata.gz: 7491a2210feb364892a300ea122f07694d08a82a8f46563e45a36e425346480779ebe82bbb6c1269dbc3ea8bb2805a6fe505b6fa8ee4d957177318c63daece08
-  data.tar.gz: b99ada00a52071cda049b98e4baa6f68358827dba5dced00bfb2cf1421e9ca2095d756d2364b1c176f54e68209b038ee9922502b6bd6ecb866bea126b200cd04
+  metadata.gz: ed2481547416f7bd7d0194aff3ec96da00811c6fe2a4ee8478b4f90c63820fde0318e7ea2427ba07646bd5755abcba3ac2a3c32af78170abb6eebb461f54a4dc
+  data.tar.gz: 3df84f31506b7fbeeaf7636f84b8d8602a9e6fee9d6d8a6a4b18b4f5b76a9de666df79e5c2dccb9c81d1f90727bc8ffd60cc8b784776ea8f55ef0385e3234791

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

@@ -14,6 +14,22 @@ module Brainiac
             repo_full_name = payload.dig("repository", "full_name")
 
             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+)-/)
+            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
+              Brainiac.emit(:pr_merged_to_branch,
+                            card_number: card_number_from_branch,
+                            branch: branch,
+                            base_branch: base,
+                            pr_url: pr_url,
+                            pr_title: pr_title,
+                            repo_full_name: repo_full_name)
+            end
+
             unless base == default_branch
               LOG.info "PR merged into #{base}, not #{default_branch} — ignoring"
               return [200, { status: "ignored", reason: "not merged into #{default_branch}" }.to_json]
@@ -111,8 +127,12 @@ module Brainiac
             review_state = review["state"]
             reviewer = review.dig("user", "login")
 
-            unless %w[changes_requested commented].include?(review_state)
-              return [200, { status: "ignored", reason: "review state: #{review_state}" }.to_json]
+            # 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)
@@ -134,6 +154,24 @@ module Brainiac
               card_info = {}
               card_number = nil
             end
+
+            # Always emit the hook so gate tracking works for approvals too
+            Brainiac.emit(:pr_review_received,
+                          card_number: card_number,
+                          reviewer: reviewer,
+                          review_state: review_state,
+                          pr_number: pr_number,
+                          repo_name: repo_name,
+                          project_config: project_config,
+                          repo_path: repo_path)
+
+            # Only dispatch the implementation agent for changes_requested or commented reviews
+            # Approvals don't need the agent to do anything (the gate hook handles the flow)
+            unless %w[changes_requested commented].include?(review_state)
+              LOG.info "PR review (#{review_state}) by #{reviewer} on PR ##{pr_number} — hook emitted, no agent dispatch"
+              return [200, { status: "processed", card: card_number, pr: pr_number, reviewer: reviewer, action: "hook_only" }.to_json]
+            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)
@@ -163,6 +201,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}"
@@ -288,6 +336,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.

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

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

metadata

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