brainiac-fizzy 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d848363b737703f7d3da85256a02550c97f4f45afad53daae7d0d29c035ce167
-  data.tar.gz: df5257f73e63964e4cbb7d33974e1057484dc497639c393069738c25111363b0
+  metadata.gz: 5dfaa99b356a363fb94b38d0cf20ea4fba925c1c6d0fb13221ccc64840afca5d
+  data.tar.gz: 40aa72b55cdf6b2a84b1cdf9a710d566b91944fee0b8100918de3624ecb1876d
 SHA512:
-  metadata.gz: 5e5bcd9d72ed693d4e2e4b0ce096df51238a29782a912650e1a39df9ecba62f439c5b79b6ba6b7814cd4e18ffe310d0cbe4f147f383baca3afd25ea303679362
-  data.tar.gz: 4bfcef1e519b2fb9738e25d2081cbbc24ba420fc9fac889d6ddbc4e4681665d914d250f150afc85263fa3761534f4617ea21311a3983907ec1bf376a6883004b
+  metadata.gz: da41d82eb50619c9d06687721a79aaa3c0822f74b86d6af0a7056c38a468869dbd3dc6ff7f9ba16ac2479932997278f94aa2712483a0495da1dabe00c2b5662f
+  data.tar.gz: 5c25257f66640dd2eae653874ae6a983129ec23215e9e396045433934fb2ff923c540f88d875e00bfab7996add7d3307aab303581df6d611c059e82480204792

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

@@ -63,15 +63,22 @@ module Brainiac
           end
 
           def board_key_for_project(project_config)
+            # Priority 1: explicit fizzy_board in project config (board key name from fizzy.json)
+            board_key = project_config["fizzy_board"]
+            return board_key if board_key && @boards.key?(board_key)
+
+            # Priority 2: .fizzy.yaml in the repo directory
             fizzy_yaml = File.join(project_config["repo_path"], ".fizzy.yaml")
-            return nil unless File.exist?(fizzy_yaml)
+            if File.exist?(fizzy_yaml)
+              require "yaml"
+              data = YAML.safe_load_file(fizzy_yaml)
+              board_id = data["board"]
+              return board_key_for_id(board_id)
+            end
 
-            require "yaml"
-            data = YAML.safe_load_file(fizzy_yaml)
-            board_id = data["board"]
-            board_key_for_id(board_id)
+            nil
           rescue StandardError => e
-            LOG.warn "[Fizzy] Could not read .fizzy.yaml: #{e.message}" if defined?(LOG)
+            LOG.warn "[Fizzy] Could not resolve board for project: #{e.message}" if defined?(LOG)
             nil
           end
 

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

@@ -67,28 +67,34 @@ end
 
 def react_to_assignment(card_number, repo_path, agent_name)
   Thread.new do
-    # Delete existing reactions from this agent before re-reacting
-    result = run_cmd("fizzy", "reaction", "list", "--card", card_number.to_s,
-                     "--jq", "[.data[] | {id, reacter_id: .reacter.id}]",
-                     chdir: repo_path, env: fizzy_env_for(agent_name))
-    reactions = JSON.parse(result)
-
-    identity = run_cmd("fizzy", "identity", "show", "--jq", ".data.accounts[0].user.id",
-                       chdir: repo_path, env: fizzy_env_for(agent_name))
-    current_user_id = identity.strip.tr('"', "")
-
-    reactions.each do |reaction|
-      if reaction["reacter_id"] == current_user_id
-        run_cmd("fizzy", "reaction", "delete", reaction["id"], "--card", card_number.to_s,
-                chdir: repo_path, env: fizzy_env_for(agent_name))
+    env = fizzy_env_for(agent_name)
+
+    # Best-effort cleanup of existing reactions from this agent
+    begin
+      result = run_cmd("fizzy", "reaction", "list", "--card", card_number.to_s,
+                       chdir: repo_path, env: env)
+      reactions = JSON.parse(result)["data"] || []
+
+      identity_output = run_cmd("fizzy", "identity", "show", chdir: repo_path, env: env)
+      current_user_id = JSON.parse(identity_output).dig("data", "accounts", 0, "user", "id")
+
+      if current_user_id
+        reactions.each do |reaction|
+          if reaction.dig("reacter", "id") == current_user_id
+            run_cmd("fizzy", "reaction", "delete", reaction["id"], "--card", card_number.to_s,
+                    chdir: repo_path, env: env)
+          end
+        end
       end
+    rescue StandardError => e
+      LOG.warn "Could not clean up existing reactions on card ##{card_number}: #{e.message}"
     end
 
-    # Add fresh reaction
+    # Always attempt to add the reaction even if cleanup failed
     run_cmd("fizzy", "reaction", "create", "--card", card_number.to_s,
-            "--content", "👍", chdir: repo_path, env: fizzy_env_for(agent_name))
+            "--content", "👀", chdir: repo_path, env: env)
   rescue StandardError => e
-    LOG.warn "Could not add reaction to card: #{e.message}"
+    LOG.warn "Could not add reaction to card ##{card_number}: #{e.message}"
   end
 end
 

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

@@ -370,7 +370,10 @@ def dispatch_cross_agent_review(ctx, card_key:, card_number:, card_assigned_agen
                             model: ctx.model, effort: ctx.effort, agent_name: ctx.agent_name,
                             card_number: card_number, comment_id: ctx.comment_id,
                             source: :fizzy, source_context: { card_number: card_number },
-                            cli_provider: ctx.cli_provider_override)
+                            cli_provider: ctx.cli_provider_override,
+                            message: ctx.plain_text, channel: "Fizzy comment")
+  return [200, { status: "intent_skip", agent: ctx.agent_name, card: card_number }.to_json] unless pid
+
   register_session(card_key, pid, log_file: log_file, supersede_key: card_key, agent_name: ctx.agent_name)
 
   [200, { status: "cross_agent_review", agent: ctx.agent_name, card_agent: card_assigned_agent,
@@ -475,7 +478,10 @@ def dispatch_new_mention(ctx, card_key:, card_number:, card_title:, branch:, wor
                             model: ctx.model, effort: ctx.effort, agent_name: ctx.agent_name,
                             card_number: card_number, comment_id: ctx.comment_id,
                             source: :fizzy, cli_provider: ctx.cli_provider_override,
-                            source_context: { card_number: card_number })
+                            source_context: { card_number: card_number },
+                            message: ctx.plain_text, channel: "Fizzy comment")
+  return [200, { status: "intent_skip", agent: ctx.agent_name, card: card_number }.to_json] unless pid
+
   register_session(card_key, pid, log_file: log_file, supersede_key: card_key, agent_name: ctx.agent_name)
 
   [200, { status: "responded", card_internal_id: ctx.card_internal_id, card_number: card_number,
@@ -488,10 +494,10 @@ def dispatch_followup_comment(ctx, card_key:, card_number:, work_dir:)
   effort = detect_effort(ctx.project_config, tags: card_tags, text: ctx.plain_text)
 
   is_worktree = work_dir != ctx.project_config["repo_path"]
-  resolved = resolve_project_cli_config(ctx.project_config,
-                                        cli_provider_override: ctx.cli_provider_override,
-                                        agent_name: ctx.agent_name)
-  should_resume = is_worktree && resolved["resume_flag"]
+  should_resume = is_worktree && resume_viable?(
+    project_config: ctx.project_config, cli_provider: ctx.cli_provider_override,
+    agent_name: ctx.agent_name, chdir: work_dir
+  )
 
   prompt = if should_resume
              LOG.info "[Resume] Using lean prompt for follow-up on card #{card_number || ctx.card_internal_id}"
@@ -508,11 +514,14 @@ def dispatch_followup_comment(ctx, card_key:, card_number:, work_dir:)
                             log_name: "followup-#{card_number || ctx.card_internal_id}",
                             model: ctx.model, effort: effort, agent_name: ctx.agent_name,
                             card_number: card_number, comment_id: ctx.comment_id,
-                            source: :fizzy, cli_provider: ctx.cli_provider_override, resume: is_worktree,
+                            source: :fizzy, cli_provider: ctx.cli_provider_override, resume: should_resume,
                             source_context: {
                               card_number: card_number, card_internal_id: ctx.card_internal_id,
                               deploy_intent: ctx.deploy_intent
-                            })
+                            },
+                            message: ctx.plain_text, channel: "Fizzy comment")
+  return [200, { status: "intent_skip", agent: ctx.agent_name, card: card_number }.to_json] unless pid
+
   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) }

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

@@ -71,7 +71,10 @@ module Brainiac
           """
 
           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, push, and update the PR.
+          Otherwise, make the requested changes, commit, and push.
+
+          **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

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Fizzy
-      VERSION = "0.0.3"
+      VERSION = "0.0.6"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-fizzy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - Andy Davis
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement