brainiac-github 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a7a75791c3df9f85c5e2d545bbaa83bc496a7d6f88c34f38a84d73a5bcced59
-  data.tar.gz: 896ba92478b7d36dbc9e99f71586c4c0fdb4e777a007e087412ccaf71b2cabdd
+  metadata.gz: db8e2a2ac41b7a6fe786239a6a909aac61975a70273068c243b301eeb2407f93
+  data.tar.gz: 8427ed0cbf86df7198149a11cbf64309471dea9ce9293ad9a49db57f2d14a03d
 SHA512:
-  metadata.gz: eca03777383a673758eb035ea69ed5b604d6fe289486cd4cb5e943c93fb8e6c14a1057268ed68c5ee04adc5fc6744219734dd6756f70b60b00e4720269a28fd6
-  data.tar.gz: 17fafeac99cfe179febe43424dd4bf791e199d226f6dc92022f5ce9f7643b151cdbe65698ef956d9794c2651eaff012d0f66395cfb296cf3b13b9dbf1664e0f0
+  metadata.gz: e385a16a159af98f746a0c7ada60c04802de2549d8ace8a37ee8830ad8886d9bf5fa5ba89a34d38ba69b21c4b6aa82b0a1d24114a950e19bd10b5f7a45f9877d
+  data.tar.gz: 43cc967f3aafd227715a82e2a366e289452e0136e29415a52d244b0e796b9355f72983b1b32a056c86707a820dad269f9c2cfa9324d96945580c6574f6554685

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

@@ -192,6 +192,14 @@ module Brainiac
                 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}"
@@ -277,18 +285,22 @@ module Brainiac
             # 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
-                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
+              override_result = resolve_comment_agent_override(result, agent_name, pr_number)
+              return override_result if override_result.is_a?(Array)
+
+              agent_name = override_result if override_result
+            end
+
+            # Fallback for human-opened PRs with no assigned agent: if there's no work item,
+            # or the work item has no agent field, both machines would dispatch because each
+            # has its own local project default agent. Use branch_exists_locally? as a
+            # tiebreaker — only the machine that has the branch as a local worktree/branch
+            # should handle the comment. Explicit mentions bypass this check.
+            unless mentioned || work_item_has_agent?(result)
+              repo_path = project_config["repo_path"]
+              unless branch_exists_locally?(repo_path, branch)
+                LOG.info "[GitHub] PR ##{pr_number} branch '#{branch}' not found locally — skipping comment dispatch"
+                return [200, { status: "ignored", reason: "branch not on this machine" }.to_json]
               end
             end
 
@@ -396,6 +408,64 @@ module Brainiac
             local_agent_names.include?(agent_from_bot)
           end
 
+          # Check if a work item result has an assigned agent.
+          # Returns true if the result exists and has a non-empty agent field.
+          def work_item_has_agent?(result)
+            return false unless result
+
+            agent = result[1]["agent"]
+            agent && !agent.empty?
+          end
+
+          # Resolve agent override from a work item for PR comment dispatch.
+          # Returns:
+          #   - A Rack response array if dispatch should be skipped (remote agent owns it)
+          #   - An agent name string if the work item agent should override the default
+          #   - nil if no override needed
+          def resolve_comment_agent_override(result, current_agent, pr_number)
+            _, card_info = result
+            work_item_agent = card_info["agent"]
+            return nil unless work_item_agent
+
+            unless local_agent_names.include?(work_item_agent)
+              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
+
+            if work_item_agent.downcase != current_agent.downcase
+              LOG.info "[GitHub] Work item agent override: #{work_item_agent} (project default: #{current_agent})"
+              return work_item_agent
+            end
+
+            nil
+          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.6"
+      VERSION = "0.2.8"
     end
   end
 end

metadata

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