brainiac-fizzy 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49fb9f716295e5635310802446ef24b4ab0fc50a0de0e7ed51aa6d8a66229cb3
-  data.tar.gz: 877d8bb3380a19038ff7d5783b249e3ef5f8334074985b46bfeba2f82e174be1
+  metadata.gz: 5458df6821434350e3814c4002b36bf7c24449fec0375304004d96f34381c413
+  data.tar.gz: 6fe4ea5f51574cca99f6e90cada9480d6ff7a2c69008837f1e98259e1249abeb
 SHA512:
-  metadata.gz: cea8aef292a4c13e70d551c666ef541aeb4c017077feff75dbfa47fee6c7cfad65c07050c1360735279120124442c178bae7d7a11cd7b36f71fc2fe597dd6469
-  data.tar.gz: f39a533e11ab58b15ac93a360026b660c67b612fa7f6e17b58ebf91ad280e17b4eed65ab3076da76406d8d8207e6d85c7fa54eae32554a354bf1c51081074325
+  metadata.gz: 6c9657c7470c20a0d288917a92d15d10823dd4ec3d113c7acf48f1b1263291106947ff0e8ecdbc675c49db1f928affc1050e9405820d11cd00e21aae329e4747
+  data.tar.gz: 0c03004274a798059eaa5f46025fba1e69e4b084ee99acf4a3185802a0eb6af58fed9ee23a87b7de74635c3080426a9a2aa226ae48646d9247b4afcdb8d3bec2

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

@@ -30,7 +30,8 @@ def fetch_intent_context(card_number, repo_path:, agent_name: nil)
 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,17 @@ 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 = if defined?(resolve_pr_target)
+                resolve_pr_target(repo_path: project_config["repo_path"], card_number: card_number, project_key: project_key)
+              end
+  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

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/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],
@@ -375,7 +375,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 +388,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.24"
     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.24
 platform: ruby
 authors:
 - Andy Davis