brainiac-fizzy 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5458df6821434350e3814c4002b36bf7c24449fec0375304004d96f34381c413
-  data.tar.gz: 6fe4ea5f51574cca99f6e90cada9480d6ff7a2c69008837f1e98259e1249abeb
+  metadata.gz: d280084c82934cffbe0868040f944eab1f244ccc10563db9b7bd8a338f86d175
+  data.tar.gz: 47343a66a5232ea0bdc3d5e0ad8244692e7b4a8ee22efc91656f0e06e6a00c8d
 SHA512:
-  metadata.gz: 6c9657c7470c20a0d288917a92d15d10823dd4ec3d113c7acf48f1b1263291106947ff0e8ecdbc675c49db1f928affc1050e9405820d11cd00e21aae329e4747
-  data.tar.gz: 0c03004274a798059eaa5f46025fba1e69e4b084ee99acf4a3185802a0eb6af58fed9ee23a87b7de74635c3080426a9a2aa226ae48646d9247b4afcdb8d3bec2
+  metadata.gz: f6c5ddfde5c2eaf03ad0ce86bd996f6d28d1662be8e486015b16edf6c9a158d91638db521ea6f8d269b795d5f64c590e22cc0905c5fcfda7cb9a68c7494ddfd2
+  data.tar.gz: 3371c4fd11abbcdbee4ca7d5b520b1bba0180ad1c61e4172ca77cc95820cef496fc24380a71c97eb0bbe9ce4e5e48fa6934224ad605f393a5db8afb2b6b04f25

data/lib/brainiac/plugins/fizzy/delegators.rb

@@ -25,6 +25,10 @@ def prefetch_card_context(card_number, repo_path:, agent_name: nil)
   Brainiac::Plugins::Fizzy::Helpers.prefetch_card_context(card_number, repo_path: repo_path, agent_name: agent_name)
 end
 
+def resolve_github_agent_env(agent_name, github_repo)
+  Brainiac::Plugins::Fizzy::Helpers.resolve_github_agent_env(agent_name, github_repo)
+end
+
 def fetch_intent_context(card_number, repo_path:, agent_name: nil)
   Brainiac::Plugins::Fizzy::Helpers.fetch_intent_context(card_number, repo_path: repo_path, agent_name: agent_name)
 end

data/lib/brainiac/plugins/fizzy/handlers/assignment.rb

@@ -142,9 +142,7 @@ def dispatch_assigned_card(card_number:, card_internal_id:, title:, tags:, branc
   }
 
   # Resolve custom PR target (for epic branch workflows)
-  pr_target = if defined?(resolve_pr_target)
-                resolve_pr_target(repo_path: project_config["repo_path"], card_number: card_number, project_key: project_key)
-              end
+  pr_target = resolve_pr_target(repo_path: project_config["repo_path"], card_number: card_number, project_key: project_key)
   template_vars["PR_TARGET_INSTRUCTION"] = if pr_target
                                              "**IMPORTANT: Open the PR targeting the `#{pr_target}` branch " \
                                                "(not main).** Use: `gh pr create --base #{pr_target}`"
@@ -168,12 +166,17 @@ def dispatch_assigned_card(card_number:, card_internal_id:, title:, tags:, branc
            end
 
   card_key = "card-#{card_number}"
+
+  # Inject GitHub App token so agent's gh commands run as their bot identity
+  github_repo = project_config["github_repo"]
+  agent_github_env = resolve_github_agent_env(agent_name, github_repo)
+
   pid, log_file = run_agent(prompt,
                             project_config: project_config, chdir: worktree_path,
                             log_name: "assigned-#{card_number}", model: model, effort: effort,
                             agent_name: agent_name, card_number: card_number, source: :fizzy,
                             source_context: { card_number: card_number, board_key: board_key, dispatched_at: Time.now },
-                            cli_provider: cli_provider_override)
+                            cli_provider: cli_provider_override, env: agent_github_env)
   register_session(card_key, pid, log_file: log_file, supersede_key: card_key, agent_name: agent_name)
 
   Thread.new { move_card_to_column(card_number, "right_now", project_config: project_config, agent_name: agent_name, board_key: board_key) }

data/lib/brainiac/plugins/fizzy/helpers.rb

@@ -33,6 +33,22 @@ module Brainiac
             fizzy_env_for(AI_AGENT_NAME)
           end
 
+          # Resolve GitHub App token for an agent so gh CLI runs as their bot identity.
+          # Uses brainiac-github's AppClient if available.
+          def resolve_github_agent_env(agent_name, github_repo)
+            return {} unless github_repo
+
+            if defined?(Brainiac::Plugins::Github::AppClient)
+              repo_owner = github_repo.split("/").first
+              token = Brainiac::Plugins::Github::AppClient.installation_token_for(agent_name, repo_owner: repo_owner)
+              return { "GH_TOKEN" => token } if token
+            end
+            {}
+          rescue StandardError => e
+            LOG.warn "[Fizzy] Could not resolve GitHub token for #{agent_name}: #{e.message}" if defined?(LOG)
+            {}
+          end
+
           def prefetch_card_context(card_number, repo_path:, agent_name: nil)
             env = fizzy_env_for(agent_name || AI_AGENT_NAME)
             card_details = fetch_card_details(card_number, repo_path: repo_path, env: env)

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

@@ -167,17 +167,63 @@ module Brainiac
             rescue StandardError => e
               LOG.error "[Fizzy] Error in pr_merged hook: #{e.message}" if defined?(LOG)
             end
+
+            # Also listen for epic branch merges (from brainiac-basecamp)
+            # Move card to UAT when merged to any tracked branch
+            Brainiac.on(:pr_merged_to_branch) do |ctx|
+              card_number = ctx[:card_number]
+              next unless card_number
+
+              # Find the work item to get card info
+              branch = ctx[:branch]
+              work_item = find_work_item_by_branch(branch) if respond_to?(:find_work_item_by_branch, true)
+              work_item ||= Object.respond_to?(:find_work_item_by_branch, true) ? Object.send(:find_work_item_by_branch, branch) : nil
+
+              next unless work_item
+
+              _internal_id, card_info = work_item
+              card_agent = card_info["agent"]
+              board_key = card_info.dig("sources", "fizzy", "board_key")
+
+              # Load project config
+              project_key = card_info.dig("sources", "fizzy", "project") || card_info["project"]
+              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)) : {}
+              project_config = projects[project_key] || {}
+              repo_path = project_config["repo_path"]
+
+              next unless repo_path
+
+              # Move card to UAT (same as main merge)
+              LOG.info "[Fizzy] PR merged to #{ctx[:base_branch]} for card ##{card_number} — moving to UAT" if defined?(LOG)
+              Helpers.move_card_to_column(card_number, "uat",
+                                          project_config: project_config,
+                                          agent_name: card_agent,
+                                          board_key: board_key)
+              record_self_move(card_number)
+            rescue StandardError => e
+              LOG.error "[Fizzy] Error in pr_merged_to_branch hook: #{e.message}" if defined?(LOG)
+            end
           end
 
           # PR review received — post status comment on card
+          # Only for changes_requested reviews that need action, not for approvals or gate reviews
           def register_pr_review_received
             Brainiac.on(:pr_review_received) do |ctx|
               card_number = ctx[:card_number]
               next unless card_number
 
+              # Only post status for changes_requested — approvals don't need a Fizzy comment
+              review_state = ctx[:review_state]
+              next unless review_state == "changes_requested"
+
+              # Skip if this is a gate agent review (handled by brainiac-basecamp)
+              reviewer = ctx[:reviewer]
+              next if reviewer&.match?(/-(brainiac|bot)\b/i)
+
               Thread.new do
                 env = Helpers.fizzy_env_for(ctx[:agent_name])
-                status_comment = "<p>🔄 Code review received from @#{ctx[:reviewer]}. Updates in progress...</p>"
+                status_comment = "<p>🔄 Code review received from @#{reviewer}. Updates in progress...</p>"
                 run_cmd("fizzy", "comment", "create", "--card", card_number.to_s, "--body", status_comment,
                         chdir: ctx[:repo_path], env: env)
               rescue StandardError => e

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Fizzy
-      VERSION = "0.0.24"
+      VERSION = "0.0.25"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-fizzy
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Andy Davis