brainiac-basecamp 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c8050e48cf49fc743e8e1cf01db98abcb279fa7b8a2c70b99ee77cf2f331378
-  data.tar.gz: 0eb5638888a2369c61b1b0cc3bfed7c4729df1dc1ed2e14e56af69ca36280644
+  metadata.gz: 9baa0382677cf44d0ef67156c66420348c00b74e7532f6b410dab9d8e61f7e90
+  data.tar.gz: 353777dfdc0f84ba57e89b8e36249867e9fec29f46ebfe4af0ac090704e14dff
 SHA512:
-  metadata.gz: 8aca50da9477027ff6800582dea934506a76897256eb4c91d8f2a9cfd8f27b3c786784a98410f487eb9c77d83924a74ee9ea9e753fe8d21c2f57c885afd7de30
-  data.tar.gz: c64f4de4ff526fa7c0a18149309b61a917b04f373ea02bc31855b752b9ce0ad820df9b040b90fe71d4fdcd2d5f7221e2ef5d3f297b6a90747cbe738b632f667f
+  metadata.gz: 8f2eee7436544bcfc8278bbb22add64237c6dc4bf4256930566741ce60f683364ec24e9d2784d6765ca418bada76e6f5be8cbbc625b2384f64d1b4d5b1f6d65b
+  data.tar.gz: a72b44713badc00c8f3bbfc4c433afbf832550e11675d9bb8e384131209c4f1a1d1d810be885fe620bf68762cf1632cf855c209c617ad3b5a57df044895f6150

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

@@ -790,12 +790,12 @@ module Brainiac
             return unless project_config && project_config["repo_path"]
 
             agent_name = Orchestrator.send(:resolve_agent_for_project, project_key) || epic["agent"]
-            prompt = <<~PROMPT
-              ## Changes Requested — Fizzy Card ##{card_number}
-
-              Review feedback needs attention on PR ##{task['pr_number']}. Read the review,
-              make the requested fixes, commit and push them, then update the Fizzy card.
-            PROMPT
+            # Only build a "changes requested" prompt when there is a real PR to
+            # act on. A stale in_flight card recovered by the orchestrator has no
+            # PR number yet — handing an agent "...fixes on PR #" with a blank
+            # number is nonsense and the session dies asking for clarification.
+            # In that case dispatch a clean "start implementation" prompt instead.
+            prompt = build_impl_prompt(card_number: card_number, pr_number: task["pr_number"])
             github_repo = project_config["github_repo"]
             agent_env = github_repo ? ReviewGate.send(:resolve_agent_github_env, agent_name, github_repo) : {}
             pid, log_file = method(:run_agent).call(
@@ -824,6 +824,36 @@ module Brainiac
             LOG.error "[Basecamp:Hooks] Direct implementation dispatch failed: #{e.message}" if defined?(LOG)
           end
 
+          # Build the implementation prompt for a direct dispatch.
+          #
+          # When +pr_number+ is present the card already has an open PR, so the
+          # agent is asked to address review feedback. When it is absent (a stale
+          # in_flight card the orchestrator recovered, or a first dispatch) the
+          # agent is asked to start the implementation from scratch — never with a
+          # blank "PR #" that a real PR would have filled in.
+          #
+          # @param card_number [Integer, String] Fizzy card number
+          # @param pr_number [Integer, String, nil] PR number, if one exists
+          # @return [String] the prompt text
+          def build_impl_prompt(card_number:, pr_number:)
+            if pr_number.to_s.strip.empty?
+              <<~PROMPT
+                ## Implement — Fizzy Card ##{card_number}
+
+                Pick up Fizzy card ##{card_number} and implement it. Read the card for
+                requirements, do the work in a branch, commit and push, open a PR, then
+                update the Fizzy card. There is no existing PR for this card yet.
+              PROMPT
+            else
+              <<~PROMPT
+                ## Changes Requested — Fizzy Card ##{card_number}
+
+                Review feedback needs attention on PR ##{pr_number}. Read the review,
+                make the requested fixes, commit and push them, then update the Fizzy card.
+              PROMPT
+            end
+          end
+
           # Find a PR number by branch name pattern.
           def find_pr_number(repo_path:, branch:)
             # Try exact match first

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

@@ -593,6 +593,25 @@ module Brainiac
             nil
           end
 
+          # Whether a card's completion is backed by real evidence of shipped work.
+          #
+          # A card genuinely completes when it has an associated PR that merged (or,
+          # at minimum, a tracked PR number). Without any PR evidence the completion
+          # is almost certainly spurious — a stale ledger flag left behind by a
+          # basecamp re-sync that dropped merged cards — and we should not treat it
+          # as a real completion that warrants an epic-review checkpoint.
+          #
+          # @param epic [Hash] epic state
+          # @param card_number [Integer, String] the card claimed complete
+          # @return [Boolean]
+          def card_completion_verified?(epic, card_number)
+            task = epic["tasks"].find { |t| t["fizzy_card"] == card_number.to_i }
+            return false unless task
+
+            # A tracked PR number is our recorded evidence that work shipped.
+            !task["pr_number"].to_s.strip.empty?
+          end
+
           # Dispatch an agent to review the epic state after a task completes.
           # This ensures the remaining plan still makes sense given implementation decisions.
           # The callback is called after the review completes.
@@ -606,6 +625,22 @@ module Brainiac
               return
             end
 
+            # Only post a "just completed" checkpoint when the card actually shipped
+            # work. A ledger flagged `complete` with no PR (and no merge) means the
+            # completion was spurious — usually the basecamp re-sync dropping merged
+            # cards and leaving a stale flag. Posting "Card #N just completed" in that
+            # case is a false claim that spawns a pointless epic-review reflex.
+            # Still run the callback so the resolver can advance (it correctly does
+            # nothing for cards that remain blocked).
+            unless card_completion_verified?(epic, completed_card_number)
+              if defined?(LOG)
+                LOG.warn "[Basecamp:Orchestrator] Skipping epic review after card " \
+                         "##{completed_card_number} — no PR/merge evidence of completion"
+              end
+              callback&.call
+              return
+            end
+
             LOG.info "[Basecamp:Orchestrator] Dispatching epic review after card ##{completed_card_number}" if defined?(LOG)
 
             # Ensure epic memory exists (in case this epic started before the feature)

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Basecamp
-      VERSION = "0.0.24"
+      VERSION = "0.0.25"
     end
   end
 end

metadata

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