brainiac-basecamp 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3b4d7d9e99a700f2a533b48110071025bde9eb69b55633acffd4125f88c5540
-  data.tar.gz: 63635c64597b65ed6e0a69e90511010d6975c418249c7a181d9a0349bded7dcc
+  metadata.gz: d4d21875fecdd7aa33718a8db5fa446800e8a85924490b6716a455b211d79483
+  data.tar.gz: 9601289488c260e891a6df6da2b63be3e9965c9c8235d11c4366622d27a24d0b
 SHA512:
-  metadata.gz: 37d7d00ab786c8f99318d7098b8a700d8428d0c3db1da4ceaa1040aa924b627b0b886a928cb7f6f1661e35f578403ae4b8911b87a5c48c6bc67a9c0ed5f61c02
-  data.tar.gz: a798eb76376698539c16c54ecdfea9d597893e0f0630c035e9e473401e45b43c0357e4cb6ef8717df704c98543f2bace4754b5f2db6dc97677a46ee8782b2ff9
+  metadata.gz: f24339950cce469195888d59fbc7ddecb0b75f9a7f8279df58cc2bb681637916525341ce8b9fc86c2f38bb9e8b1718a27c9f164d14afa4acff9376f4394da3eb
+  data.tar.gz: 39d9128c65180e56fe30e59d6b384dbc9ce2b7648f8586498b88e7e44b4c516fcea6d06b279bc1956373f84f1a8602aa1fb697699a40b98e699b2c6ef2f97c59

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

@@ -214,16 +214,12 @@ module Brainiac
                   # All gates have reviewed — dispatch implementation agent to address ALL feedback
                   LOG.info "[Basecamp:Hooks] All gates responded for card ##{card_number} — dispatching fixes" if defined?(LOG)
                   task["status"] = "in_flight"
+                  task["dispatched_at"] = Time.now.iso8601
                   task.delete("changes_debounce_started")
                   save_epic_state(epic)
 
-                  # Re-assign card to implementation agent to trigger dispatch
-                  impl_agent = epic["agent"]
-                  fizzy_user_id = Orchestrator.send(:resolve_fizzy_user_id, impl_agent)
-                  if fizzy_user_id
-                    LOG.info "[Basecamp:Hooks] Re-assigning card ##{card_number} to #{impl_agent} for fixes" if defined?(LOG)
-                    safe_assign_card(card_number, fizzy_user_id)
-                  end
+                  # Spawn agent directly — safe_assign_card won't work if already assigned
+                  dispatch_impl_directly(epic, task)
                 else
                   # Wait for remaining gates to respond
                   responded = (task["gate_approvals"]&.size || 0) + (task["changes_requested_by"]&.size || 0)
@@ -246,11 +242,11 @@ module Brainiac
                       if task_reloaded && task_reloaded["status"] == "in_review" && task_reloaded["changes_requested_by"]&.any?
                         LOG.info "[Basecamp:Hooks] Debounce timeout for card ##{card_number} — forcing dispatch" if defined?(LOG)
                         task_reloaded["status"] = "in_flight"
+                        task_reloaded["dispatched_at"] = Time.now.iso8601
                         task_reloaded.delete("changes_debounce_started")
                         save_epic_state(epic_reloaded)
-                        # Re-assign card to trigger dispatch
-                        fizzy_user_id = Orchestrator.send(:resolve_fizzy_user_id, epic_reloaded["agent"])
-                        safe_assign_card(card_number, fizzy_user_id) if fizzy_user_id
+                        # Spawn agent directly — safe_assign_card won't work if already assigned
+                        dispatch_impl_directly(epic_reloaded, task_reloaded)
                       end
                     rescue StandardError => e
                       LOG.error "[Basecamp:Hooks] Debounce dispatch failed: #{e.message}" if defined?(LOG)
@@ -728,14 +724,123 @@ module Brainiac
             end
           end
 
-          def mark_in_review(epic, card_number)
-            task = epic["tasks"].find { |t| t["fizzy_card"] == card_number.to_i }
-            return unless task
+          # Dispatch the implementation agent directly (spawns via run_agent) to address
+          # changes_requested feedback. Used by resume and health-check when the agent is
+          # no longer running but the Fizzy card is still assigned (so safe_assign_card
+          # would bail out with "already assigned, skipping").
+          #
+          # @param epic [Hash] Epic state
+          # @param task [Hash] Task within the epic
+          # @return [void]
+          def dispatch_impl_directly(epic, task)
+            card_number = task["fizzy_card"]
+            agent_name = epic["agent"]
+            pr_number = task["pr_number"]
+            project_key = task["project"]
+            card_key = "changes-requested-#{card_number}"
+
+            # Guard: don't spawn a duplicate if a session is already running for this task
+            session_alive = if defined?(session_active?)
+                             session_active?(card_key)
+                           elsif Object.respond_to?(:session_active?, true)
+                             Object.send(:session_active?, card_key)
+                           else
+                             false
+                           end
+
+            if session_alive
+              LOG.info "[Basecamp:Hooks] Session already active for #{card_key} — skipping dispatch" if defined?(LOG)
+              return
+            end
 
-            task["status"] = "in_review"
-            task["review_started_at"] = Time.now.iso8601
-            epic["updated_at"] = Time.now.iso8601
-            save_epic_state(epic)
+            LOG.info "[Basecamp:Hooks] Direct-dispatching #{agent_name} for changes_requested on card ##{card_number}" if defined?(LOG)
+
+            # Get project config
+            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]
+
+            unless project_config
+              LOG.error "[Basecamp:Hooks] No project config for '#{project_key}' — cannot direct-dispatch" if defined?(LOG)
+              return
+            end
+
+            repo_path = project_config["repo_path"]
+            unless repo_path
+              LOG.error "[Basecamp:Hooks] No repo_path for project '#{project_key}' — cannot direct-dispatch" if defined?(LOG)
+              return
+            end
+
+            # Find the worktree for this card
+            work_items_file = File.join(ENV.fetch("BRAINIAC_DIR", File.join(Dir.home, ".brainiac")), "work_items.json")
+            worktree_path = repo_path  # Default to main repo
+            if File.exist?(work_items_file)
+              work_items = JSON.parse(File.read(work_items_file))
+              work_item = work_items.values.find { |wi| wi.dig("sources", "fizzy", "card_number") == card_number }
+              worktree_path = work_item["worktree"] if work_item&.dig("worktree")
+            end
+
+            # Build prompt
+            changers = (task["changes_requested_by"] || []).join(", ")
+            prompt = <<~PROMPT
+              ## Changes Requested — Fizzy Card ##{card_number}
+
+              Review gates have requested changes on your PR#{pr_number ? " ##{pr_number}" : ""}.
+              Reviewers who requested changes: #{changers}
+
+              Your job:
+              1. Read the review feedback: #{pr_number ? "`gh pr view #{pr_number} --comments`" : "check the Fizzy card comments"}
+              2. Address all requested changes
+              3. Commit and push your fixes
+
+              After pushing, update the Fizzy card with a brief status comment noting what you fixed.
+            PROMPT
+
+            # Resolve GitHub App token so agent's `gh` commands run as their bot identity
+            github_repo = project_config&.dig("github_repo")
+            agent_env = github_repo ? ReviewGate.send(:resolve_agent_github_env, agent_name, github_repo) : {}
+
+            # Spawn the agent directly
+            pid = nil
+            log_file = nil
+
+            begin
+              pid, log_file = method(:run_agent).call(
+                prompt,
+                project_config: project_config,
+                chdir: worktree_path,
+                log_name: "changes-requested-#{card_number}",
+                agent_name: agent_name,
+                source: :basecamp,
+                card_number: card_number,
+                env: agent_env
+              )
+            rescue NameError
+              if Object.respond_to?(:run_agent, true)
+                pid, log_file = Object.send(:run_agent,
+                  prompt,
+                  project_config: project_config,
+                  chdir: worktree_path,
+                  log_name: "changes-requested-#{card_number}",
+                  agent_name: agent_name,
+                  source: :basecamp,
+                  card_number: card_number,
+                  env: agent_env)
+              else
+                LOG.warn "[Basecamp:Hooks] run_agent not available — direct impl dispatch skipped" if defined?(LOG)
+                return
+              end
+            end
+
+            # Register session for waybar visibility
+            if pid
+              if defined?(register_session)
+                register_session(card_key, pid, log_file: log_file, agent_name: agent_name)
+              elsif Object.respond_to?(:register_session, true)
+                Object.send(:register_session, card_key, pid, log_file: log_file, agent_name: agent_name)
+              end
+              LOG.info "[Basecamp:Hooks] Spawned #{agent_name} (pid #{pid}) for changes_requested on card ##{card_number}" if defined?(LOG)
+            end
           end
 
           def auto_merge_and_advance(epic, card_number, ctx)

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Basecamp
-      VERSION = "0.0.9"
+      VERSION = "0.0.11"
     end
   end
 end

data/lib/brainiac/plugins/basecamp.rb

@@ -129,25 +129,21 @@ module Brainiac
                   impl_agent = epic["agent"]
                   LOG.info "[Basecamp:HealthCheck] Task ##{card_number} in_flight for #{elapsed.round}s — re-dispatching #{impl_agent}" if defined?(LOG)
 
-                  # Re-dispatch by re-assigning the card (triggers webhook)
+                  # Spawn the agent directly — safe_assign_card won't work if already assigned
                   task["dispatched_at"] = Time.now.iso8601
-                  fizzy_user_id = Orchestrator.send(:resolve_fizzy_user_id, impl_agent)
-                  if fizzy_user_id
-                    Hooks.send(:safe_assign_card, card_number, fizzy_user_id)
-                    healed_any = true
-                  end
+                  Hooks.send(:dispatch_impl_directly, epic, task)
+                  healed_any = true
                 end
               elsif task["changes_requested_by"]&.any?
                 # No dispatched_at recorded but changes were requested — legacy state.
                 # Always re-dispatch in this case.
                 impl_agent = epic["agent"]
                 LOG.info "[Basecamp:HealthCheck] Task ##{card_number} in_flight with changes_requested but no dispatched_at — re-dispatching #{impl_agent}" if defined?(LOG)
+
+                # Spawn the agent directly — safe_assign_card won't work if already assigned
                 task["dispatched_at"] = Time.now.iso8601
-                fizzy_user_id = Orchestrator.send(:resolve_fizzy_user_id, impl_agent)
-                if fizzy_user_id
-                  Hooks.send(:safe_assign_card, card_number, fizzy_user_id)
-                  healed_any = true
-                end
+                Hooks.send(:dispatch_impl_directly, epic, task)
+                healed_any = true
               end
 
             when "in_review"
@@ -329,13 +325,11 @@ module Brainiac
 
             # Transition to in_flight so the agent gets the right context
             task["status"] = "in_flight"
+            task["dispatched_at"] = Time.now.iso8601
             Hooks.send(:save_epic_state, epic)
 
-            # Re-assign card to trigger a fresh dispatch via the Fizzy webhook
-            fizzy_user_id = Orchestrator.send(:resolve_fizzy_user_id, impl_agent)
-            if fizzy_user_id
-              Hooks.send(:safe_assign_card, card_number, fizzy_user_id)
-            end
+            # Spawn the agent directly — safe_assign_card won't work if already assigned
+            Hooks.send(:dispatch_impl_directly, epic, task)
           else
             # No changes requested yet — check if gates need (re-)dispatching
             approvals = task["gate_approvals"]&.size || 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-basecamp
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Andy Davis