brainiac-fizzy 0.0.38 → 0.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c61ec846d3ddf6b13adfdd9e28d6986b95104fa8f8d7a3542358dafd52f80378
-  data.tar.gz: 2438032f1be99280f4ef0807a481f204edff399c4c42a1ea82970beb905fb33e
+  metadata.gz: 60b4756af9b9f1335e112cc739d5c035f8c93ed535356398d763f917348ccf41
+  data.tar.gz: e4a275e05e713999788e05b004ce268ab0eccc09a8ddc964d55480d6c04e15ab
 SHA512:
-  metadata.gz: 2b13027d874d36db9e29698bbd21b6d959f640314fdd494ec68b67f177c5f999676ba6fec753a5e09cf8219c19c2701d75a235732888c728fcde1ae379c919fd
-  data.tar.gz: ddccb8370bc7c2f367fa42551660e2f4dcc50460fee1615d7da4044dfff0728cc1e739e51ac7bbd45f2daa4f5ea139a4fccb6f06b0820085d742641962cc4bc6
+  metadata.gz: 279fb38ec1cab40daf7d326c41235c6e2f8d57ef4c390263360ae9ae876e6d810bbde945fc1bd98f5a415e2c679b75eef07f17df560c2b0440441edc33e3a201
+  data.tar.gz: 7eb192d8fca880504c1e0a4d8621a4a30d3c18c91c202117eb6e2395df4278ad84da9f2fa2a5009d7bdc7ee8b396cda9f169e2688dceeea11fe7f7e22f939f1d

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 prefetch_followup_context(card_number, repo_path:, agent_name: nil)
+  Brainiac::Plugins::Fizzy::Helpers.prefetch_followup_context(card_number, repo_path: repo_path, agent_name: agent_name)
+end
+
 def tag_names(tags)
   Brainiac::Plugins::Fizzy::Helpers.tag_names(tags)
 end
@@ -164,8 +168,8 @@ DEFAULT_COLUMN_IDS = {
 # Render planning mode prompt — identical to render_prompt but inserts the planning
 # instructions between PROMPT_CORE and the channel rules. This was originally defined
 # in brainiac core's planning.rb but belongs here after the fizzy extraction.
-def render_planning_prompt(situation_template, vars = {}, brain_context: "", card_context: "", agent_name: AI_AGENT_NAME,
-                           channel: :fizzy, board_key: nil)
+def render_planning_prompt(situation_template, vars = {}, brain_context: "", card_context: "", comment_history: "",
+                           agent_name: AI_AGENT_NAME, channel: :fizzy, board_key: nil)
   plans_dir = Brainiac::Plugins::Fizzy::Planning::PLANS_DIR
   plan_file = File.join(plans_dir, "card-#{vars["CARD_ID"]}-plan.md")
 
@@ -178,6 +182,10 @@ def render_planning_prompt(situation_template, vars = {}, brain_context: "", car
   result += plugin_prompt || CHANNEL_PROMPTS.fetch(channel, "")
   result += situation_template
 
+  # Comment history (for follow-up scenarios): placed AFTER the triggering comment
+  # so the agent sees the current request first, then can reference history as needed
+  result += comment_history unless comment_history.empty?
+
   # Pre-post comment check (same as render_prompt — use plugin-registered lookup)
   plugin_pre_post = Brainiac.channel_pre_post_checks[channel]
   result += plugin_pre_post if plugin_pre_post

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

@@ -780,46 +780,58 @@ def build_followup_prompt(ctx, card_number, card_tags, work_dir)
   if planning_info
     build_planning_followup_prompt(ctx, card_number, planning_info[:card_id], work_dir)
   elsif work_dir != ctx.project_config["repo_path"]
+    # Use split context for follow-ups: card details at top, comment history AFTER triggering comment
+    followup_ctx = prefetch_followup_context(card_number, repo_path: work_dir, agent_name: ctx.agent_name)
     render_prompt(PROMPT_FOLLOWUP_WORKTREE,
                   ctx.comment_vars.merge("CARD_NUMBER" => card_number, "CARD_ID" => card_number),
                   brain_context: build_brain_context(
                     agent_name: ctx.agent_name, card_number: card_number,
                     project_key: ctx.project_key, comment_body: ctx.plain_text, source: :fizzy
                   ),
-                  card_context: prefetch_card_context(card_number, repo_path: work_dir, agent_name: ctx.agent_name),
+                  card_context: followup_ctx[:card_details],
+                  comment_history: followup_ctx[:comment_history],
                   agent_name: ctx.agent_name)
   else
+    # Use split context for follow-ups: card details at top, comment history AFTER triggering comment
+    followup_ctx = prefetch_followup_context(card_number, repo_path: ctx.project_config["repo_path"],
+                                                          agent_name: ctx.agent_name)
     render_prompt(PROMPT_FOLLOWUP_NO_WORKTREE,
                   ctx.comment_vars.merge("CARD_INTERNAL_ID" => ctx.card_internal_id, "CARD_ID" => ctx.card_internal_id),
                   brain_context: build_brain_context(
                     agent_name: ctx.agent_name, project_key: ctx.project_key,
                     comment_body: ctx.plain_text, source: :fizzy
                   ),
-                  card_context: prefetch_card_context(card_number, repo_path: ctx.project_config["repo_path"],
-                                                                   agent_name: ctx.agent_name),
+                  card_context: followup_ctx[:card_details],
+                  comment_history: followup_ctx[:comment_history],
                   agent_name: ctx.agent_name)
   end
 end
 
 def build_planning_followup_prompt(ctx, card_number, card_id, work_dir)
   if work_dir == ctx.project_config["repo_path"]
+    # Use split context for follow-ups: card details at top, comment history AFTER triggering comment
+    followup_ctx = prefetch_followup_context(card_number, repo_path: ctx.project_config["repo_path"],
+                                                          agent_name: ctx.agent_name)
     render_planning_prompt(PROMPT_FOLLOWUP_NO_WORKTREE,
                            ctx.comment_vars.merge("CARD_INTERNAL_ID" => ctx.card_internal_id, "CARD_ID" => card_id),
                            brain_context: build_brain_context(
                              agent_name: ctx.agent_name, project_key: ctx.project_key,
                              comment_body: ctx.plain_text, source: :fizzy
                            ),
-                           card_context: prefetch_card_context(card_number, repo_path: ctx.project_config["repo_path"],
-                                                                            agent_name: ctx.agent_name),
+                           card_context: followup_ctx[:card_details],
+                           comment_history: followup_ctx[:comment_history],
                            agent_name: ctx.agent_name)
   else
+    # Use split context for follow-ups: card details at top, comment history AFTER triggering comment
+    followup_ctx = prefetch_followup_context(card_number, repo_path: work_dir, agent_name: ctx.agent_name)
     render_planning_prompt(PROMPT_FOLLOWUP_WORKTREE,
                            ctx.comment_vars.merge("CARD_NUMBER" => card_number, "CARD_ID" => card_id),
                            brain_context: build_brain_context(
                              agent_name: ctx.agent_name, card_number: card_number,
                              project_key: ctx.project_key, comment_body: ctx.plain_text, source: :fizzy
                            ),
-                           card_context: prefetch_card_context(card_number, repo_path: work_dir, agent_name: ctx.agent_name),
+                           card_context: followup_ctx[:card_details],
+                           comment_history: followup_ctx[:comment_history],
                            agent_name: ctx.agent_name)
   end
 end

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

@@ -60,6 +60,35 @@ module Brainiac
             context
           end
 
+          # Split card context for follow-up scenarios:
+          # - Returns card_details (title + body) separately from comment_history
+          # - This allows placing the triggering comment BEFORE historical comments
+          #   so agents focus on the current request, not the full card history
+          # - Uses fewer comments (5 instead of 15) since the agent has memory
+          def prefetch_followup_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)
+            # Fewer comments for follow-ups — agent has memory from prior sessions
+            card_comments = fetch_card_comments(card_number, repo_path: repo_path, env: env, limit: 5)
+
+            details_context = card_details.empty? ? "" : "## Card Details\n#{card_details}\n\n"
+
+            # Format comment history as secondary reference (placed after triggering comment)
+            history_context = ""
+            unless card_comments.empty?
+              history_context = <<~HISTORY
+
+                ## Recent Comment History (for reference)
+                These are the last few comments on the card. Your PRIMARY focus is the triggering comment above,
+                but you can reference this history if needed for context.
+
+                #{card_comments}
+              HISTORY
+            end
+
+            { card_details: details_context, comment_history: history_context }
+          end
+
           # Normalize Fizzy tags from webhook hashes ({ "name" => "deploy" })
           # or API strings ("deploy") into a lowercase name list.
           def tag_names(tags)
@@ -105,12 +134,12 @@ module Brainiac
             ""
           end
 
-          def fetch_card_comments(card_number, repo_path:, env:)
+          def fetch_card_comments(card_number, repo_path:, env:, limit: 15)
             output = run_cmd("fizzy", "comment", "list", "--card", card_number.to_s, "--all", chdir: repo_path, env: env)
             comments = JSON.parse(output)["data"] || []
             return "" if comments.empty?
 
-            comments.last(15).map do |c|
+            comments.last(limit).map do |c|
               body = c.dig("body", "plain_text") || ""
               body = "#{body[0..500]}..." if body.length > 500
               "**#{c.dig("creator", "name")}** (#{c["id"]}):\n#{body}"

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

@@ -78,31 +78,40 @@ module Brainiac
         PROMPT
 
         FOLLOWUP_WORKTREE = <<~'PROMPT'
-          There's a new comment on Fizzy card #{{CARD_NUMBER}} that you've already started working on.
-          You are in the existing worktree for this card.
+          ## ⚠️ CURRENT REQUEST — This is what you need to address NOW
 
-          The comment from {{COMMENT_CREATOR}} (comment ID: {{COMMENT_ID}}):
+          **New comment from {{COMMENT_CREATOR}}** on Fizzy card #{{CARD_NUMBER}} (comment ID: {{COMMENT_ID}}):
           """
           {{COMMENT_BODY}}
           """
 
-          Focus your response on the comment above. If you've already addressed this in a previous session, reply confirming it's done.
-          Otherwise, make the requested changes, commit, and push.
+          **Your task:** This comment is your PRIMARY focus. What the user says HERE takes priority.
+          - If you were given a multi-step task and this comment clarifies/modifies one step, apply the clarification AND still complete the other steps
+          - If the user asks a new question, answer that question — don't summarize prior work
+          - If the user requests a specific change, make that change
+          - Check your memory file for context on what's already been discussed/decided
+
+          You are in the existing worktree for this card. If you've already addressed what's being asked in a previous session, reply confirming it's done.
 
           **Response destination: Post your response as a comment on Fizzy card #{{CARD_NUMBER}}.**
           Do NOT post comments on the GitHub PR — this conversation is happening on the card.
         PROMPT
 
         FOLLOWUP_NO_WORKTREE = <<~PROMPT
-          There's a new comment on a Fizzy card (internal_id: "{{CARD_INTERNAL_ID}}").
+          ## ⚠️ CURRENT REQUEST — This is what you need to address NOW
 
-          The comment from {{COMMENT_CREATOR}} (comment ID: {{COMMENT_ID}}):
+          **New comment from {{COMMENT_CREATOR}}** on Fizzy card (internal_id: "{{CARD_INTERNAL_ID}}") (comment ID: {{COMMENT_ID}}):
           """
           {{COMMENT_BODY}}
           """
 
-          Focus your response on the comment above. If you've already addressed this, reply confirming it's done.
-          Otherwise, respond accordingly.
+          **Your task:** This comment is your PRIMARY focus. What the user says HERE takes priority.
+          - If you were given a multi-step task and this comment clarifies/modifies one step, apply the clarification AND still complete the other steps
+          - If the user asks a new question, answer that question — don't summarize prior work
+          - If the user requests a specific change, make that change
+          - Check your memory file for context on what's already been discussed/decided
+
+          If you've already addressed what's being asked, reply confirming it's done.
         PROMPT
 
         MENTION = <<~PROMPT

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Fizzy
-      VERSION = "0.0.38"
+      VERSION = "0.0.39"
     end
   end
 end

metadata

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