brainiac-github 0.2.9 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac4e54b24a8bb52bf92a37bfe86acb8d6e16f76c646811dfdb586be8921e4ad3
-  data.tar.gz: 0c31ee9574f36510100bb08094b884aa3eb81917b89c149ae8fb814fbc6aa7de
+  metadata.gz: fa974a43197bb85272bc7a2b53c44b2dc763203d6f5ef7c1286059b50aa2cd97
+  data.tar.gz: 15a725f96507c8cf78dc37e73e1e91505b03ba1c5ee21b7f4c5a8c583f353503
 SHA512:
-  metadata.gz: 26615c5fd5c52574cd4a9739fa8d2179eb834ed91d805f7f02e7881cee59f3cc2952fce2751b7441ef97fe013e9db1809a026bb987ef7e5108c47b9e738d0185
-  data.tar.gz: c43852a07188be9a2ae9f8158eb15b91a3c4083dfdc0abab4a0514b1a3b7a755520f4bbde5e8be59919c1a71fc0aa1883c8334c673a7783334f8cd14766eeb19
+  metadata.gz: c9f0b4c4c6c453a6c146a9ca5e3fa8aea3657a2aa79345a44e0803121cda492f1ff598256d05de2d4e649058fdfe128249499533c8dc9410c5880194795b1d56
+  data.tar.gz: 2a1c93fb97fe48873c4dbffb654d4b4c305929404c70336704c509a06ff0408a33bbb674dcd66bb98356caf6e1ec223b81022445c5b3901da5775342c95df777

data/lib/brainiac/plugins/github/handler.rb

@@ -32,6 +32,12 @@ module Brainiac
 
             unless base == default_branch
               LOG.info "PR merged into #{base}, not #{default_branch} — ignoring"
+
+              # Trigger #2: a child PR merging *into* an epic branch redeploys the
+              # epic's ephemeral env (if one is tracked for that branch).
+              epic_redeployed = maybe_redeploy_epic_ephemeral_env(base_branch: base)
+              return [200, { status: "processed", action: "epic_redeploy", base: base }.to_json] if epic_redeployed
+
               return [200, { status: "ignored", reason: "not merged into #{default_branch}" }.to_json]
             end
 
@@ -95,9 +101,18 @@ module Brainiac
           def handle_pr_synchronized(payload)
             pr = payload["pull_request"]
             branch = pr.dig("head", "ref")
+            base_branch = pr.dig("base", "ref")
+
+            # Trigger #1: a push to an epic PR's head branch redeploys the epic env.
+            # Epic envs have no card, so resolve this before the card lookup bails.
+            epic_redeployed = maybe_redeploy_epic_ephemeral_env(branch: branch)
 
             result = find_work_item_by_branch(branch)
-            return [200, { status: "ignored", reason: "no matching card" }.to_json] unless result
+            unless result
+              return [200, { status: "processed", action: "epic_sync", branch: branch, epic_redeployed: true }.to_json] if epic_redeployed
+
+              return [200, { status: "ignored", reason: "no matching card" }.to_json]
+            end
 
             _internal_id, card_info = result
             card_number = extract_card_number(card_info)
@@ -105,11 +120,23 @@ module Brainiac
 
             return [200, { status: "ignored", reason: "no worktree" }.to_json] unless worktree && File.directory?(worktree)
 
+            # Pull latest changes into worktree
+            system("git", "pull", "--ff-only", chdir: worktree)
+
+            # Try to redeploy to ephemeral Belt environment if one exists
+            ephemeral_redeployed = maybe_redeploy_ephemeral_belt_env(
+              card_info: card_info, card_number: card_number, worktree: worktree,
+              base_branch: base_branch
+            )
+
+            # Also emit the hook for other plugins (e.g., brainiac-fizzy persistent env redeploy)
             results = Brainiac.emit(:pr_synchronized, card_number: card_number, card_info: card_info,
                                                       worktree: worktree, pull_request: pr, branch: branch)
 
-            if results.any?
-              [200, { status: "processed", action: "pr_sync", card: card_number }.to_json]
+            if ephemeral_redeployed || epic_redeployed || results.any?
+              [200,
+               { status: "processed", action: "pr_sync", card: card_number, ephemeral_redeployed: ephemeral_redeployed,
+                 epic_redeployed: epic_redeployed }.to_json]
             else
               [200, { status: "ignored", reason: "no deployment plugin" }.to_json]
             end
@@ -648,6 +675,12 @@ module Brainiac
 
           def process_merged_pr(card_info, card_number, branch, pull_request, pr_url, pr_title, project_key, project_config, repo_path)
             mark_work_item_merged(card_number)
+
+            # Destroy ephemeral Belt environment BEFORE worktree cleanup (infrastructure lives in worktree)
+            maybe_destroy_ephemeral_belt_env(
+              card_info: card_info, card_number: card_number, project_key: project_key
+            )
+
             cleanup_work_item_worktrees(card_number, repo_path: repo_path,
                                                      primary_worktree: card_info["worktree"], primary_branch: branch)
 
@@ -864,6 +897,118 @@ module Brainiac
 
             [200, { status: "processed", action: "prod_deploy", closed_cards: closed_cards.map { |c| c[:number] }, project: project_key }.to_json]
           end
+
+          # Destroy ephemeral Belt environment on PR merge.
+          # Must be called BEFORE worktree cleanup since infrastructure lives in the worktree.
+          def maybe_destroy_ephemeral_belt_env(card_info:, card_number:, project_key:)
+            unless defined?(BeltConfig) && defined?(BeltEnvironment)
+              LOG.debug "[EphemeralEnv] Belt utilities not available — skipping env destruction"
+              return
+            end
+
+            env_name = BeltConfig.ephemeral_env_for_card(card_number)
+            worktree = card_info&.dig("worktree")
+
+            unless ephemeral_env_present?(worktree: worktree, env_name: env_name)
+              LOG.debug "[EphemeralEnv] No ephemeral env '#{env_name}' found for card ##{card_number}"
+              return
+            end
+
+            unless worktree && File.directory?(worktree)
+              LOG.warn "[EphemeralEnv] Cannot destroy '#{env_name}' — worktree not found"
+              return
+            end
+
+            LOG.info "[EphemeralEnv] Destroying ephemeral environment '#{env_name}' for card ##{card_number}"
+            BeltEnvironment.destroy_environment(worktree: worktree, env_name: env_name)
+          rescue StandardError => e
+            LOG.error "[EphemeralEnv] Error destroying ephemeral env: #{e.message}"
+          end
+
+          # Redeploy to ephemeral Belt environment on PR sync (new commits pushed).
+          # Only redeploys if an ephemeral env already exists for this card.
+          def maybe_redeploy_ephemeral_belt_env(card_info:, card_number:, worktree:, base_branch: nil)
+            return false unless defined?(BeltConfig) && defined?(BeltEnvironment)
+            return false unless belt_app_worktree?(worktree)
+
+            env_name = BeltConfig.ephemeral_env_for_card(card_number)
+
+            unless ephemeral_env_present?(worktree: worktree, env_name: env_name)
+              LOG.debug "[EphemeralEnv] No ephemeral env '#{env_name}' for card ##{card_number} — skipping redeploy"
+              return false
+            end
+
+            LOG.info "[EphemeralEnv] Redeploying to ephemeral environment '#{env_name}' (PR sync)"
+
+            frontend_only = BeltEnvironment.frontend_only_changes?(worktree: worktree, base_branch: base_branch)
+            BeltEnvironment.deploy(worktree: worktree, env_name: env_name, frontend_only: frontend_only)
+            true
+          rescue StandardError => e
+            LOG.error "[EphemeralEnv] Error redeploying ephemeral env: #{e.message}"
+            false
+          end
+
+          # Redeploy an epic's ephemeral Belt environment.
+          #
+          # Epic envs aren't keyed by card number — they're tracked in
+          # ephemeral_envs.json with `epic_branch` / `epic_pr` fields. This
+          # resolves the env by matching the head branch (PR sync / push) or the
+          # PR url (child merge into the epic branch), then redeploys its worktree.
+          #
+          # @param branch [String, nil] Head branch of the synced PR
+          # @param base_branch [String, nil] Base branch (for merge-triggered redeploys)
+          # @return [Boolean] true if a redeploy was attempted
+          def maybe_redeploy_epic_ephemeral_env(branch: nil, base_branch: nil)
+            return false unless defined?(BeltConfig) && defined?(BeltEnvironment)
+
+            # Trigger #1: a push/synchronize on the epic PR branch itself.
+            # Trigger #2: a child PR merging *into* the epic branch (base match).
+            match = BeltConfig.epic_env_for_branch(branch) ||
+                    BeltConfig.epic_env_for_branch(base_branch)
+            return false unless match
+
+            env_name, entry = match
+            worktree = entry["worktree"]
+
+            unless worktree && File.directory?(worktree)
+              LOG.warn "[EphemeralEnv] Epic env '#{env_name}' worktree missing: #{worktree.inspect} — skipping redeploy"
+              return false
+            end
+            return false unless belt_app_worktree?(worktree)
+
+            unless ephemeral_env_present?(worktree: worktree, env_name: env_name)
+              LOG.debug "[EphemeralEnv] Epic env '#{env_name}' not configured in worktree — skipping redeploy"
+              return false
+            end
+
+            # Pull latest into the epic worktree so the deploy reflects the new commits.
+            system("git", "pull", "--ff-only", chdir: worktree)
+
+            LOG.info "[EphemeralEnv] Redeploying epic environment '#{env_name}' (branch: #{branch || base_branch})"
+
+            # No reliable per-push base for an epic worktree, so let the diff base
+            # fall back to origin/HEAD → origin/main → origin/master.
+            frontend_only = BeltEnvironment.frontend_only_changes?(worktree: worktree)
+            BeltEnvironment.deploy(worktree: worktree, env_name: env_name, frontend_only: frontend_only)
+            true
+          rescue StandardError => e
+            LOG.error "[EphemeralEnv] Error redeploying epic env: #{e.message}"
+            false
+          end
+
+          def belt_app_worktree?(worktree)
+            BeltEnvironment.respond_to?(:belt_app?) && BeltEnvironment.belt_app?(worktree)
+          end
+
+          # Worktree infrastructure/<env>/ is the source of truth; tracking JSON is a fallback.
+          def ephemeral_env_present?(worktree:, env_name:)
+            if BeltEnvironment.respond_to?(:environment_configured?) &&
+               BeltEnvironment.environment_configured?(worktree: worktree, env_name: env_name)
+              return true
+            end
+
+            BeltConfig.ephemeral_env?(env_name)
+          end
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Github
-      VERSION = "0.2.9"
+      VERSION = "0.3.1"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-github
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.1
 platform: ruby
 authors:
 - Andy Davis