brainiac-basecamp 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14642b9582bda42dff7932fe0b518957bdeb638431de432df6beae906c3206e5
-  data.tar.gz: 2fac38d27c6c89445d49af1b8e3148bcfa25d8d6632de11984fca1dbd772dcf2
+  metadata.gz: e8e71f8f043a52cb54d83e974031b0bb83339f02452e701bf381e4e87b32274d
+  data.tar.gz: ac57b522a30cdb3cdf42c0aca069c52bb1ce27b2b93fdbdf4b63a2c9f57088b9
 SHA512:
-  metadata.gz: f1c4b21c180b3a8306770e922c8c4c8bdb65976a1a62f9dbe02541cb4049d635ac4745f469275ad13bd1168811148cb772965e0b64e4d5b0fdac9b0eb4b7c200
-  data.tar.gz: 7a063d983c097531096ff5d8f954050842f0b775f136f6ec1694111ab0bd9561f061b859e33a9497a7b69b8ed7e3a1aa0725d7c70895556e83789920fedc1f72
+  metadata.gz: 955cfcffe81b1856b0ee90e8c2124b48d13b3de28db1e258054069442b8a67096deeb95cda1b5ce0e21b20cd2b78e3bd7c73fd107c5753c3de82ef0ead916d01
+  data.tar.gz: 7b6e92a54b136065013d178d3422bc7583958f83b161184c9905b2d950898907ee1eebdffa6d2cf07bc7394836b98aef52acd8bb50583231b2b6b8f2f9ca3247

data/lib/brainiac/plugins/basecamp/hooks.rb

@@ -16,7 +16,7 @@ module Brainiac
       #   :resolve_base_branch — returns epic branch as worktree base
       #   :resolve_pr_target — returns epic branch as PR target
       module Hooks
-        class << self
+        class << self # rubocop:disable Metrics/ClassLength
           def register_all!
             register_agent_completed
             register_pr_merged
@@ -380,14 +380,39 @@ module Brainiac
               next unless epic["review_gate"] == "epic_branch" && ReviewGate.enabled?
 
               task = epic["tasks"].find { |t| t["fizzy_card"] == card_number.to_i }
-              # Re-trigger gates if task is in_flight (agent working/pushed fixes)
-              # No need to check for prior reviews — if task is in_flight with a PR, gates should review
-              next unless task && task["status"] == "in_flight" && task["pr_number"]
+              next unless task && task["status"] == "in_flight"
+
+              # Ensure pr_number is set — it may be missing if initial gate dispatch
+              # failed to persist it or if state was lost during serialization.
+              unless task["pr_number"]
+                pr_number = ctx.dig(:pull_request, "number") || ctx[:pr_number]
+                if pr_number
+                  task["pr_number"] = pr_number.to_i
+                  LOG.info "[Basecamp:Hooks] Backfilled pr_number=#{pr_number} for card ##{card_number}" if defined?(LOG)
+                else
+                  # Try to find it from the branch
+                  project_key = task["project"] || Config.brainiac_project_for(epic["basecamp_project_id"])
+                  projects_file = File.join(ENV.fetch("BRAINIAC_DIR", File.join(Dir.home, ".brainiac")), "projects.json")
+                  projects = File.exist?(projects_file) ? JSON.parse(File.read(projects_file)) : {}
+                  repo_path = projects.dig(project_key, "repo_path")
+                  if repo_path
+                    branch = ctx[:branch] || "fizzy-#{card_number}-*"
+                    found_pr = find_pr_number(repo_path: repo_path, branch: branch)
+                    if found_pr
+                      task["pr_number"] = found_pr
+                      LOG.info "[Basecamp:Hooks] Resolved pr_number=#{found_pr} for card ##{card_number} via branch lookup" if defined?(LOG)
+                    end
+                  end
+                end
+              end
+
+              next unless task["pr_number"]
 
               LOG.info "[Basecamp:Hooks] PR updated for card ##{card_number} — re-triggering review gates" if defined?(LOG)
 
               # Reset approvals and re-dispatch gates
               ReviewGate.reset_approvals(task)
+              task["changes_requested_by"] = []
               task["status"] = "in_review"
               epic["updated_at"] = Time.now.iso8601
               save_epic_state(epic)
@@ -821,6 +846,21 @@ module Brainiac
               return
             end
 
+            # Ensure pr_number is set — look it up if missing.
+            # This is critical for the pr_synchronized hook to re-trigger gates after fixes.
+            unless pr_number
+              found_pr = find_pr_number(repo_path: repo_path, branch: "fizzy-#{card_number}-*")
+              if found_pr
+                pr_number = found_pr
+                task["pr_number"] = pr_number
+                task["pr_repo"] = project_config["github_repo"]
+                save_epic_state(epic)
+                LOG.info "[Basecamp:Hooks] Backfilled pr_number=#{pr_number} for card ##{card_number} during direct dispatch" if defined?(LOG)
+              elsif defined?(LOG)
+                LOG.warn "[Basecamp:Hooks] Could not find PR for card ##{card_number} — gates won't re-trigger after fixes"
+              end
+            end
+
             # Find the worktree for this card
             work_items_file = File.join(ENV.fetch("BRAINIAC_DIR", File.join(Dir.home, ".brainiac")), "work_items.json")
             worktree_path = repo_path  # Default to main repo

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Basecamp
-      VERSION = "0.0.14"
+      VERSION = "0.0.15"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-basecamp
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Andy Davis