brainiac-basecamp 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eb44286a14e4c833e7ee753cf3ced44e6579eea0d37ff0c1289db149cc1c97c
-  data.tar.gz: b24e2ed8efe6a611f3d3790dfd38a906cd753c8c766743ab50302f365430d8db
+  metadata.gz: 8adcfd4dedeee9ee8fee1e9439e80f7f3917d81ece1c5420a3777619df8d7ab5
+  data.tar.gz: d88eb5a5e18d8bea39522ccfa6c8fbac13b2b50f87a28a29c6c1b8958e4f3eea
 SHA512:
-  metadata.gz: 106c01e99ca88a0ee5d2801cb632b17fdcace3bd3ea9fe17278cae2cbfa3560f1669c164bf6a12472fc4451bdc81833889aaad2c273b936df77ead50f1736450
-  data.tar.gz: f766419152f38af5404a7640ac87c19540814480e67a1e12ee14621595075d0fc7fc204ed33475022a090c74fbfa97ab8b5a3929c9eedfe3458b2f46345a7fa0
+  metadata.gz: 311711ad321fe576e24aeb51d82d9dffc4b9d2b6199b8f6b6242b7405583f224d1686d4b91cc395d3e16985dd73834324cbe539fe216f2eb22962a4f34d05d2d
+  data.tar.gz: 7ccb5d585757a9b87b5dfa88512e44528048c153d4d5e159c4e62baa9c78f904dec5333899abdbaeec46b0a8da0ac6bfbd1cd39ca2530030f1d6e05e3a1d096c

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

@@ -156,10 +156,75 @@ module Brainiac
             # If project is set, look up directly
             return epic_branches[project_key] if project_key && epic_branches[project_key]
 
-            # Fallback: if there's only one epic branch, use it (single-project epic)
-            return epic_branches.values.first if epic_branches.size == 1
+            # Fallback: if there's only one epic branch AND the task has no specific project set,
+            # use it (assumed single-project epic).
+            # Do NOT fallback if the task has a specific project that isn't in epic_branches —
+            # that means the branch wasn't created for this repo and we should return nil
+            # (letting the default branch be used) rather than returning a branch from a different repo.
+            return epic_branches.values.first if epic_branches.size == 1 && !project_key
+
+            # Multi-project epic but no matching branch for this task's project — return nil
+            nil
+          end
+
+          # Lazily ensure an epic branch exists for a card's project.
+          # Called when epic_branch_for_card returns nil but the card IS in an active epic.
+          # Creates the branch in the task's repo and registers it in epic state.
+          #
+          # @param card_number [Integer, String] Fizzy card number
+          # @return [String, nil] Epic branch name or nil
+          def ensure_epic_branch_for_card(card_number)
+            epic = Orchestrator.find_epic_for_card(card_number.to_i)
+            return nil unless epic
+            return nil unless epic["review_gate"] == "epic_branch"
+
+            task = epic["tasks"]&.find { |t| t["fizzy_card"] == card_number.to_i }
+            return nil unless task
+
+            project_key = task["project"]
+            return nil unless project_key
 
-            # Multi-project epic but no project on task — can't determine which branch
+            # Already have a branch for this project
+            epic_branches = epic["epic_branches"] || {}
+            return epic_branches[project_key] if epic_branches[project_key]
+
+            # Resolve repo path for this project
+            projects_file = File.join(BRAINIAC_DIR, "projects.json")
+            return nil unless File.exist?(projects_file)
+
+            all_projects = JSON.parse(File.read(projects_file))
+            repo_path = all_projects.dig(project_key, "repo_path")
+            return nil unless repo_path
+
+            # Create the branch
+            slug = branch_slug(epic["title"])
+            branch_name = "epic/#{slug}"
+            default_branch = detect_default_branch(repo_path)
+
+            run_git("fetch", "origin", chdir: repo_path)
+
+            # Check if branch already exists remotely
+            remote_exists = system("git", "ls-remote", "--exit-code", "--heads", "origin", branch_name,
+                                   chdir: repo_path, out: File::NULL, err: File::NULL)
+
+            if remote_exists
+              run_git("fetch", "origin", "#{branch_name}:#{branch_name}", chdir: repo_path)
+              LOG.info "[Basecamp:EpicBranch] Lazy-created: reusing existing '#{branch_name}' in #{project_key}" if defined?(LOG)
+            else
+              run_git("branch", branch_name, "origin/#{default_branch}", chdir: repo_path)
+              run_git("push", "-u", "origin", branch_name, chdir: repo_path)
+              LOG.info "[Basecamp:EpicBranch] Lazy-created: new '#{branch_name}' in #{project_key}" if defined?(LOG)
+            end
+
+            # Register in epic state
+            epic["epic_branches"] ||= {}
+            epic["epic_branches"][project_key] = branch_name
+            epic["updated_at"] = Time.now.iso8601
+            Orchestrator.send(:save_epic, epic)
+
+            branch_name
+          rescue StandardError => e
+            LOG.error "[Basecamp:EpicBranch] Lazy branch creation failed for #{project_key}: #{e.message}" if defined?(LOG)
             nil
           end
 

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

@@ -482,12 +482,17 @@ module Brainiac
           end
 
           # Return the epic branch as the worktree base for cards in an active epic.
+          # If the epic branch doesn't exist for this task's project yet, create it lazily.
           def register_resolve_base_branch
             Brainiac.on(:resolve_base_branch) do |ctx|
               card_number = ctx[:card_number]
               next unless card_number
 
               branch = EpicBranch.epic_branch_for_card(card_number)
+
+              # Lazy creation: if no branch exists for this task's project, create one now
+              branch ||= EpicBranch.ensure_epic_branch_for_card(card_number)
+
               next unless branch
 
               "origin/#{branch}"
@@ -495,12 +500,15 @@ module Brainiac
           end
 
           # Return the epic branch as the PR target for cards in an active epic.
+          # Same lazy-creation logic as resolve_base_branch.
           def register_resolve_pr_target
             Brainiac.on(:resolve_pr_target) do |ctx|
               card_number = ctx[:card_number]
               next unless card_number
 
-              EpicBranch.epic_branch_for_card(card_number)
+              branch = EpicBranch.epic_branch_for_card(card_number)
+              branch ||= EpicBranch.ensure_epic_branch_for_card(card_number)
+              branch
             end
           end
 

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Basecamp
-      VERSION = "0.0.12"
+      VERSION = "0.0.13"
     end
   end
 end

metadata

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