brainiac-fizzy 0.0.23 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49fb9f716295e5635310802446ef24b4ab0fc50a0de0e7ed51aa6d8a66229cb3
-  data.tar.gz: 877d8bb3380a19038ff7d5783b249e3ef5f8334074985b46bfeba2f82e174be1
+  metadata.gz: d280084c82934cffbe0868040f944eab1f244ccc10563db9b7bd8a338f86d175
+  data.tar.gz: 47343a66a5232ea0bdc3d5e0ad8244692e7b4a8ee22efc91656f0e06e6a00c8d
 SHA512:
-  metadata.gz: cea8aef292a4c13e70d551c666ef541aeb4c017077feff75dbfa47fee6c7cfad65c07050c1360735279120124442c178bae7d7a11cd7b36f71fc2fe597dd6469
-  data.tar.gz: f39a533e11ab58b15ac93a360026b660c67b612fa7f6e17b58ebf91ad280e17b4eed65ab3076da76406d8d8207e6d85c7fa54eae32554a354bf1c51081074325
+  metadata.gz: f6c5ddfde5c2eaf03ad0ce86bd996f6d28d1662be8e486015b16edf6c9a158d91638db521ea6f8d269b795d5f64c590e22cc0905c5fcfda7cb9a68c7494ddfd2
+  data.tar.gz: 3371c4fd11abbcdbee4ca7d5b520b1bba0180ad1c61e4172ca77cc95820cef496fc24380a71c97eb0bbe9ce4e5e48fa6934224ad605f393a5db8afb2b6b04f25

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

@@ -25,12 +25,17 @@ 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
 
 def move_card_to_column(card_number, column_name, project_config:, agent_name: nil, board_key: nil)
-  Brainiac::Plugins::Fizzy::Helpers.move_card_to_column(card_number, column_name, project_config: project_config, agent_name: agent_name, board_key: board_key)
+  Brainiac::Plugins::Fizzy::Helpers.move_card_to_column(card_number, column_name, project_config: project_config, agent_name: agent_name,
+                                                                                  board_key: board_key)
 end
 
 def append_fizzy_comment_footer(card_number, project_config:, agent_name: nil, since: nil)

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

@@ -113,7 +113,13 @@ end
 def setup_assigned_worktree(repo_path, branch, card_internal_id, card_number, project_key, agent_name, board_key: nil)
   debounced_repo_fetch(repo_path)
   worktree_path = File.join(File.dirname(repo_path), "#{File.basename(repo_path)}--#{branch}")
-  worktree_path = create_or_reuse_worktree(repo_path: repo_path, branch: branch, worktree_path: worktree_path)
+
+  # Allow plugins (e.g., brainiac-basecamp) to override the base branch for epic workflows.
+  base_ref = if defined?(resolve_base_branch)
+               resolve_base_branch(repo_path: repo_path, card_number: card_number, project_key: project_key)
+             end
+
+  worktree_path = create_or_reuse_worktree(repo_path: repo_path, branch: branch, base_ref: base_ref, worktree_path: worktree_path)
 
   source_data = { "card_internal_id" => card_internal_id, "card_number" => card_number }
   source_data["board_key"] = board_key if board_key
@@ -134,6 +140,15 @@ def dispatch_assigned_card(card_number:, card_internal_id:, title:, tags:, branc
     "CARD_NUMBER" => card_number, "CARD_TITLE" => title,
     "BRANCH" => branch, "COMMENT_CREATOR" => agent_name
   }
+
+  # Resolve custom PR target (for epic branch workflows)
+  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}`"
+                                           else
+                                             ""
+                                           end
   brain_ctx = build_brain_context(
     agent_name: agent_name, card_title: title,
     card_number: card_number, project_key: project_key, source: :fizzy
@@ -151,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/handlers/comments.rb

@@ -565,7 +565,9 @@ def dispatch_followup_comment(ctx, card_key:, card_number:, work_dir:)
 
   register_session(card_key, pid, log_file: log_file, supersede_key: card_key, agent_name: ctx.agent_name)
 
-  Thread.new { move_card_to_column(card_number, "right_now", project_config: ctx.project_config, agent_name: ctx.agent_name, board_key: ctx.board_key) }
+  Thread.new do
+    move_card_to_column(card_number, "right_now", project_config: ctx.project_config, agent_name: ctx.agent_name, board_key: ctx.board_key)
+  end
 
   { status: "follow_up", card: card_number, card_internal_id: ctx.card_internal_id,
     worktree: work_dir, project: ctx.project_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

@@ -51,7 +51,7 @@ module Brainiac
               # Retry once after a short delay to account for Fizzy API propagation.
               # The agent may have posted its comment just before exiting, and the API
               # might not return it immediately in a list call.
-              if !found_comment
+              unless found_comment
                 sleep 5
                 found_comment = Helpers.append_fizzy_comment_footer(card_number,
                                                                     project_config: ctx[:project_config],
@@ -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
@@ -375,7 +421,11 @@ module Brainiac
                                                        "--board", board_id, "--all", "--json",
                                                        chdir: Dir.home)
               unless status.success?
-                parsed = JSON.parse(stdout) rescue nil
+                parsed = begin
+                  JSON.parse(stdout)
+                rescue StandardError
+                  nil
+                end
                 if parsed&.dig("code") == "forbidden"
                   LOG.warn "[Fizzy] Webhook check failed for board '#{board_key}' (admin_token lacks permission)"
                 else
@@ -384,7 +434,7 @@ module Brainiac
                 next
               end
 
-              webhooks = (JSON.parse(stdout)["data"] || [])
+              webhooks = JSON.parse(stdout)["data"] || []
               webhooks.each do |webhook|
                 next unless webhook["name"]&.start_with?("brainiac")
                 next if webhook["active"]

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

@@ -59,6 +59,7 @@ module Brainiac
           You have been assigned Fizzy card #{{CARD_NUMBER}}: "{{CARD_TITLE}}".
           You are on branch "{{BRANCH}}" in a fresh worktree.
           Implement the task, commit, push, and open a PR (link back to Fizzy).
+          {{PR_TARGET_INSTRUCTION}}
 
           **Response destination: Post your response as a comment on Fizzy card #{{CARD_NUMBER}}.**
           Your comment MUST include a concise summary of what you did, a PR link, and the branch name.

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

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

data/lib/brainiac/plugins/fizzy.rb

@@ -178,7 +178,7 @@ module Brainiac
             config = DEPLOYMENTS_CONFIG["environments"] || {}
             halt 404, { error: "Unknown environment: #{env_key}" }.to_json unless config.key?(env_key)
             request.body.rewind
-            payload = begin
+            begin
               JSON.parse(request.body.read)
             rescue StandardError
               {}

metadata

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