brainiac-github 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 675324c048d76415c0f4cd440ff81ed8eea72aa2806451882ea2bbe24e26303a
-  data.tar.gz: 5d30ef4b03cfdf213331c70b17ad0d275a07e3b8e7f1b869cde62665852cf0c5
+  metadata.gz: 49d9d73cefe9f24ff840f683ea53a4ff2276cbd89495037765dcc65fb3370fae
+  data.tar.gz: 9de4f939b32f3f7c6f802d64e5a5280cc2de108fc771212b865bb17b8a12d21e
 SHA512:
-  metadata.gz: bef506b5391c0344d6b7f3cb25edc9c0cb4843b708fc3ddf7f2ec3fa37426855ed54d201872f41901e9e2773928ddf34527f25dbd7075b8575f7f3ed5b6538ec
-  data.tar.gz: 6e5f83d6f1598ce872505ae9eb1bad25296868846f1e93cdfea77aa9012fe956e479577b0adaa90d43a4525f6961da9ec5d3fbb3fb0fe1673a1aa16b2b78cee6
+  metadata.gz: f3b54d02be22dbc9072aa3170a7073ef912b40f9555b5fdfde9a0cea3c4212fcf84c5e797026cdf094b1ef4e220804784a30361e64377e00470a785e6481d2e6
+  data.tar.gz: 6cc367893d43b6276e141902e21b17e48c416a84c76e989bc0d34620223ee47b52fd02ec01650684e3adde7410d39ac42e9de8eeece11a895c43aea2e7d1b414

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

@@ -4,6 +4,17 @@ module Brainiac
   module Plugins
     module Github
       module Handler
+        # Marker that starts every crash-notification comment (see register_crash_handler!).
+        CRASH_COMMENT_PREFIX = "💥"
+
+        # Circuit breaker: max comment dispatches per (repo, PR, agent) within the window.
+        # Stops any comment -> dispatch -> crash -> comment feedback loop, regardless of
+        # who posted the comment or what it says.
+        COMMENT_DISPATCH_LIMIT = 4
+        COMMENT_DISPATCH_WINDOW = 120 # seconds
+        COMMENT_DISPATCH_LOCK = Mutex.new
+        COMMENT_DISPATCH_TIMES = Hash.new { |h, k| h[k] = [] }
+
         class << self
           def handle_pr_merged(payload)
             pr = payload["pull_request"]
@@ -254,20 +265,8 @@ module Brainiac
             comment_user_type = comment.dig("user", "type")
             repo_name = payload.dig("repository", "full_name")
 
-            unless issue["pull_request"]
-              LOG.info "Issue comment on non-PR issue ##{issue["number"]}, ignoring"
-              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
+            rejection = issue_comment_rejection(issue, comment_body)
+            return rejection if rejection
 
             project_result = identify_project_by_repo(repo_name)
             unless project_result
@@ -301,6 +300,12 @@ module Brainiac
             bot_ignore_reason = bot_comment_ignore_reason(comment_user, comment_user_type, agent_name, pr_number)
             return bot_ignore_reason if bot_ignore_reason
 
+            if comment_dispatch_throttled?(repo_name, pr_number, agent_name)
+              LOG.warn "[GitHub] PR ##{pr_number}: >#{COMMENT_DISPATCH_LIMIT} dispatches for #{agent_name} in " \
+                       "#{COMMENT_DISPATCH_WINDOW}s — possible loop, ignoring comment"
+              return [200, { status: "ignored", reason: "dispatch rate limit" }.to_json]
+            end
+
             branch = fetch_pr_branch(repo_name, pr_number, agent_name, project_config)
             result = find_work_item_by_branch(branch)
 
@@ -421,6 +426,42 @@ module Brainiac
             pr_author_owned_locally?(pr_author, pr_author_type)
           end
 
+          # Early-exit guards for issue_comment events. Returns a Rack-style response
+          # array when the comment should be ignored, or nil to continue dispatch.
+          def issue_comment_rejection(issue, comment_body)
+            unless issue["pull_request"]
+              LOG.info "Issue comment on non-PR issue ##{issue["number"]}, ignoring"
+              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)
+              LOG.info "[GitHub] PR ##{issue["number"]} owned by remote agent (#{pr_author}) — skipping dispatch"
+              return [200, { status: "ignored", reason: "PR owned by remote agent" }.to_json]
+            end
+
+            # Crash notifications are posted via `gh` as the human's account when the app
+            # client isn't configured, so the bot-login checks below can't catch them.
+            # Without this guard each crash comment re-dispatches the agent, which crashes
+            # again, forever.
+            if crash_notification_comment?(comment_body)
+              LOG.info "[GitHub] Ignoring crash notification comment on PR ##{issue["number"]}"
+              return [200, { status: "ignored", reason: "crash notification" }.to_json]
+            end
+
+            nil
+          end
+
+          # True when a comment is a crash notification posted by the crash handler.
+          # These are posted via `gh` as the human account when no app client is
+          # configured, so the bot-login checks can't catch them — match on the prefix.
+          def crash_notification_comment?(comment_body)
+            comment_body.to_s.lstrip.start_with?(CRASH_COMMENT_PREFIX)
+          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).
@@ -631,6 +672,20 @@ module Brainiac
           # 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)
+          # Records a dispatch attempt; true when the (repo, PR, agent) is over the limit.
+          def comment_dispatch_throttled?(repo_name, pr_number, agent_name)
+            key = [repo_name, pr_number, agent_name.to_s.downcase]
+            now = Time.now.to_f
+            COMMENT_DISPATCH_LOCK.synchronize do
+              times = COMMENT_DISPATCH_TIMES[key]
+              times.reject! { |t| now - t > COMMENT_DISPATCH_WINDOW }
+              return true if times.size >= COMMENT_DISPATCH_LIMIT
+
+              times << now
+              false
+            end
+          end
+
           def bot_comment_ignore_reason(comment_user, comment_user_type, agent_name, pr_number)
             return nil unless comment_user_type == "Bot"
 

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Github
-      VERSION = "0.3.3"
+      VERSION = "0.3.4"
     end
   end
 end

data/lib/brainiac/plugins/github.rb

@@ -67,7 +67,8 @@ module Brainiac
             agent_key = ctx[:agent_key]
             snippet = ctx[:snippet]
             snippet_block = snippet ? "\n```\n#{snippet[-1500..]}\n```" : ""
-            comment_body = "💥 **#{agent_display} crashed** (exit code #{ctx[:exit_status]})\n\nLog: `#{ctx[:log_file]}`#{snippet_block}"
+            comment_body = "#{Handler::CRASH_COMMENT_PREFIX} **#{agent_display} crashed** " \
+                           "(exit code #{ctx[:exit_status]})\n\nLog: `#{ctx[:log_file]}`#{snippet_block}"
 
             begin
               if AppClient.configured?(agent_key)

metadata

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