brainiac-github 0.2.5 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4646b834b308b619a34c5b94da48aeb88b80caa3fb5efd107ac40a5dc56da2a0
-  data.tar.gz: af0c3f9c0b47e366928760c64168a74eb3651f87c193156cbced75336626bac0
+  metadata.gz: 61c06c4b2537e0c675234514c9381b0797f96669401f108a5215f5f42a70b142
+  data.tar.gz: a7e2bfd0b3bd4ec8258131e31bd251a9d816a5cedd84742c8141449d161445ae
 SHA512:
-  metadata.gz: 945f7fad37cd33a37d755b6517faa8638c4a351d74f11edb60bf8299d04933837f38b34e1fa39afaea34af2b2d57c89f5b88d641fb6e6001436622928143d445
-  data.tar.gz: 5c2e27ab69d9af292ddbd3c7ac299629f1b97c005b85275bdaaa31d24b010903a75b4973d6d91cf99ab5ea580c53c67c77e341724f46c633a2628d2a78ad6c67
+  metadata.gz: e01941e3c2e97832df1683b438cd1632cee50f9d9afaa91538c53bf55e4e438992f7567b17066e555fab22603ce3c56a8831af9332c8d57bb0117354951ff7c3
+  data.tar.gz: 9b51d89a994a1a9b4d072375f9a39011ddba50adbce000c11e598ce820900e2d052c577614f730c20a589036e821508d32ed58ecb31940b48095686efaa7ca25

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

@@ -182,6 +182,26 @@ 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
+            else
+              # No work item found — check if the PR's branch exists as a local worktree.
+              # This handles PRs opened manually (not through a card) where the worktree
+              # exists on only one machine. The machine that has the worktree should handle it.
+              unless branch_exists_locally?(repo_path, branch)
+                LOG.info "[GitHub] PR ##{pr_number} branch '#{branch}' not found locally — skipping review dispatch"
+                return [200, { status: "ignored", reason: "branch not on this machine" }.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)
@@ -261,12 +281,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
 
@@ -374,6 +404,32 @@ module Brainiac
             local_agent_names.include?(agent_from_bot)
           end
 
+          # Check if a branch exists as a local worktree or local branch.
+          # Used to determine if this machine should handle a PR when there's no work item.
+          #
+          # @param repo_path [String] Path to the main repo
+          # @param branch [String] Branch name to check
+          # @return [Boolean] True if the branch exists locally
+          def branch_exists_locally?(repo_path, branch)
+            return false unless repo_path && File.directory?(repo_path)
+
+            # Check if branch exists in any local worktree
+            output, status = Open3.capture2("git", "worktree", "list", "--porcelain", chdir: repo_path)
+            return false unless status.success?
+
+            output.each_line do |line|
+              if line.start_with?("branch refs/heads/")
+                wt_branch = line.sub("branch refs/heads/", "").strip
+                return true if wt_branch == branch
+              end
+            end
+
+            # Also check if it's a local branch (not in a separate worktree)
+            _, status = Open3.capture2("git", "rev-parse", "--verify", "refs/heads/#{branch}",
+                                       chdir: repo_path, err: File::NULL)
+            status.success?
+          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.

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

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

metadata

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