brainiac-basecamp 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c082cb39df24b56239de1b12de0772b25088854641d633afa7352a035e63b721
-  data.tar.gz: 2139e2c80a63636e2f3e427b9b784a4237d5f5abf2e52e8018407081d3b6ad23
+  metadata.gz: e7d5fd8ee1c180d8083b77c3324d138678276d8bbc471dfa48c51d43ae0cca06
+  data.tar.gz: ec08e6a76392e28d5ef6b6a88adac7712bb60887eca9643d02227f556c7d472a
 SHA512:
-  metadata.gz: 16b4848a37f1d4a0b0e0a93940540cace70f020dd11c4cbad84410310f442cb6377a1bf7a8de0204326bf36c894a345aee88278908fffc5c2cd38ba0456b81d9
-  data.tar.gz: 2f2caa6a328819e0c27eb5f3b1da73b26e411b5a38f40d1bea2078ad4c3c9dfa1f381d25f83838675941a2cc06b599f50df99f75aec30bc024f891741d892d35
+  metadata.gz: c82d88fd5a6cc8cf77330773b7eff552a3bfb7db291627ab0aef5dc3e8e178cee829389a0f72abd1938e4610c04878f3688e0963091a5361f6ae9dcea9f63b4c
+  data.tar.gz: 7ecb2081edefc0da28093bb5eb2b3cd26da316926349093bf51a36c7308073b5387279d3723a0a814c05f3a79dd7a4b17df07c7f479cc132f0fbeb75d5b64f88

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

@@ -522,7 +522,7 @@ module Brainiac
           def resolve_project_from_fizzy_card(card_number)
             return nil unless card_number
 
-            # Query the Fizzy card for its tags
+            # Query the Fizzy card for its tags and board
             stdout, _, status = Open3.capture3("fizzy", "card", "show", card_number.to_s, "--json")
             return nil unless status.success?
 
@@ -531,20 +531,43 @@ module Brainiac
             card = card_data.is_a?(Hash) && card_data["data"] ? card_data["data"] : card_data
             tags = card["tags"] || []
 
-            # Extract tag names (tags can be strings or hashes with "name" key)
-            tag_names = tags.map { |t| t.is_a?(Hash) ? t["name"] : t.to_s }.map(&:downcase)
-            return nil if tag_names.empty?
-
-            # Load projects and match tags
+            # Load projects for matching
             projects_file = File.join(BRAINIAC_DIR, "projects.json")
             return nil unless File.exist?(projects_file)
 
             all_projects = JSON.parse(File.read(projects_file))
 
-            # Find the first project whose fizzy_tags intersect with the card's tags
-            all_projects.each do |key, config|
-              project_tags = (config["tags"] || config["fizzy_tags"] || []).map(&:downcase)
-              return key if tag_names.intersect?(project_tags)
+            # Priority 1: Match by card tags (same as fizzy handler)
+            tag_names = tags.map { |t| t.is_a?(Hash) ? t["name"] : t.to_s }.map(&:downcase)
+            unless tag_names.empty?
+              all_projects.each do |key, config|
+                project_tags = (config["tags"] || config["fizzy_tags"] || []).map(&:downcase)
+                return key if tag_names.intersect?(project_tags)
+              end
+            end
+
+            # Priority 2: Match by card's board → board_key → project with fizzy_board
+            # This mirrors the fizzy handler's fallback logic to prevent project mismatch
+            board_id = card.dig("board", "id")
+            if board_id
+              board_key = resolve_board_key_for_id(board_id)
+              if board_key
+                # Check for board's default_project in fizzy config
+                fizzy_config_file = File.join(BRAINIAC_DIR, "fizzy.json")
+                if File.exist?(fizzy_config_file)
+                  fizzy_config = JSON.parse(File.read(fizzy_config_file))
+                  board_config = fizzy_config.dig("boards", board_key)
+                  if board_config && board_config["default_project"]
+                    project_key = board_config["default_project"]
+                    return project_key if all_projects.key?(project_key)
+                  end
+                end
+
+                # Fall back to any project whose fizzy_board matches this board_key
+                all_projects.each do |key, config|
+                  return key if config["fizzy_board"] == board_key
+                end
+              end
             end
 
             nil
@@ -553,6 +576,23 @@ module Brainiac
             nil
           end
 
+          # Resolve a fizzy board_key from a board_id by checking fizzy.json boards config.
+          def resolve_board_key_for_id(board_id)
+            fizzy_config_file = File.join(BRAINIAC_DIR, "fizzy.json")
+            return nil unless File.exist?(fizzy_config_file)
+
+            fizzy_config = JSON.parse(File.read(fizzy_config_file))
+            boards = fizzy_config["boards"] || {}
+
+            boards.each do |key, config|
+              return key if config["board_id"] == board_id
+            end
+
+            nil
+          rescue StandardError
+            nil
+          end
+
           # Dispatch an agent to review the epic state after a task completes.
           # This ensures the remaining plan still makes sense given implementation decisions.
           # The callback is called after the review completes.

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Basecamp
-      VERSION = "0.0.18"
+      VERSION = "0.0.19"
     end
   end
 end

metadata

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