brainiac-fizzy 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b9d6e5b3e6e6ea9306dc6fd9ce800dffc01e46f99b05f2861e0acf096793fe5
-  data.tar.gz: ec15a0b6f7a498de7662b8bd662fb519ae45f8a14d66e5912cf6dd540cc3726b
+  metadata.gz: dabc51c154f2caad4353e83a1c837a961bf1df27139ede86181929c8fa28290d
+  data.tar.gz: 6edde302d45dfe3628606cd005ca0ea6e3964d004bc6fe0c4c93be2d1590800d
 SHA512:
-  metadata.gz: 51284c7c4cca09f1bde28d3589fc7c17b29314e898f4de8bd7345fa1fd930baf6501ef47e42a241b40f17baede635780676154e7c6f456a70ea6f1d9902da59b
-  data.tar.gz: 868fc4f7e922d67138125385c486f87bc221766ddadf45e640ad880ee57914f04a772bdd3b688087c505a66cfa59f7643e1134f5731eb0ef67f3e42b6f80a700
+  metadata.gz: ac4ce9b1192051ce0d748d13c1ecdc834935bc503513fb101486460cfc478046749475d5eaa7cfff32252ba34e2be65efad10f3a9aecd6d8b1bdf2aa0c10cd33
+  data.tar.gz: 24afb9c9f9af9f481be0df59afeb94546e49546033d40190cee639fb17989b90dc5011f1c7d911daea9d21be1d7c3707e4180cb4be719220aad029a91c4268d1

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

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Brainiac
+  module Plugins
+    module Fizzy
+      # Derives the public URL of an ephemeral Belt environment from its
+      # terraform.tfvars. Kept separate from Helpers so the pure URL/HCL logic
+      # stays small and independently testable.
+      module EnvUrl
+        module_function
+
+        # URL of the ephemeral Belt environment for a card, if one is active.
+        # The env name is `fizzy-<card_number>`; the public URL is derived from the
+        # env's terraform.tfvars, matching the frontend_urls convention in the Belt
+        # infra module:
+        #   parent set -> https://<env>.<parent>.<domain>
+        #   prod       -> https://<domain>
+        #   otherwise  -> https://<env>.<domain>
+        def for_card(card_number)
+          return nil unless defined?(BeltConfig)
+
+          env_name = BeltConfig.ephemeral_env_for_card(card_number)
+          return nil unless BeltConfig.ephemeral_env?(env_name)
+
+          info = BeltConfig.respond_to?(:ephemeral_env_info) ? BeltConfig.ephemeral_env_info(env_name) : nil
+          worktree = info && info["worktree"]
+          return nil unless worktree
+
+          tfvars = File.join(worktree, "infrastructure", env_name.to_s, "terraform.tfvars")
+          return nil unless File.exist?(tfvars)
+
+          from_tfvars(tfvars)
+        rescue StandardError => e
+          LOG.warn "[Fizzy] Could not detect env URL for card ##{card_number}: #{e.message}" if defined?(LOG)
+          nil
+        end
+
+        def from_tfvars(tfvars_path)
+          vars = parse(File.read(tfvars_path))
+          domain = vars["domain"].to_s
+          return nil if domain.empty?
+
+          environment = vars["environment"].to_s
+          parent = vars["parent_environment"].to_s
+
+          host =
+            if !parent.empty?
+              "#{environment}.#{parent}.#{domain}"
+            elsif environment == "prod"
+              domain
+            else
+              "#{environment}.#{domain}"
+            end
+
+          "https://#{host}"
+        end
+
+        # Minimal HCL parser for `key = "value"` lines in terraform.tfvars.
+        def parse(contents)
+          vars = {}
+          contents.each_line do |line|
+            stripped = line.strip
+            next if stripped.empty? || stripped.start_with?("#")
+
+            match = stripped.match(/\A(\w+)\s*=\s*"([^"]*)"/)
+            vars[match[1]] = match[2] if match
+          end
+          vars
+        end
+      end
+    end
+  end
+end

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

@@ -173,14 +173,10 @@ module Brainiac
 
             # Append footer if applicable
             body = last_agent_comment.dig("body", "html") || ""
-            unless body.include?("<em>Branch:")
+            unless footer_already_present?(body)
               branch = detect_branch_from_comment(body, card_number)
               if branch
-                pr_url = detect_pr_url(branch, project_config)
-                footer = "<p><em>Branch: <code>#{branch}</code>"
-                footer += " | <a href=\"#{pr_url}\">PR</a>" if pr_url
-                footer += "</em></p>"
-
+                footer = build_comment_footer(branch, card_number, project_config)
                 updated_body = body + footer
                 run_cmd("fizzy", "comment", "update", last_agent_comment["id"], "--card", card_number.to_s,
                         "--body", updated_body, chdir: repo_path, env: env)
@@ -331,8 +327,51 @@ module Brainiac
             repo = project_config["github_repo"]
             return nil unless repo
 
+            # Prefer the existing open PR for this branch. `pull/new/<branch>` only
+            # opens the "create PR" page, which is wrong once a PR already exists.
+            existing = existing_pr_url(branch, repo, project_config["repo_path"])
+            return existing if existing
+
             "https://github.com/#{repo}/pull/new/#{branch}"
           end
+
+          # Look up the URL of an already-open PR for `branch` via the gh CLI.
+          # Returns nil if gh fails or no PR exists (caller falls back to new-PR link).
+          def existing_pr_url(branch, repo, repo_path)
+            output = run_cmd("gh", "pr", "view", branch, "--repo", repo, "--json", "url",
+                             "--jq", ".url", chdir: repo_path)
+            url = output.to_s.strip
+            url.empty? ? nil : url
+          rescue StandardError
+            nil
+          end
+
+          # True if the comment body already carries a "Branch:" footer/label, in
+          # either the footer format (`<em>Branch:`) or the agent-authored format
+          # (`<strong>Branch:</strong>`). Prevents appending a duplicate footer.
+          def footer_already_present?(body)
+            body.include?("<em>Branch:") ||
+              body.match?(%r{<strong>\s*Branch:\s*</strong>}i) ||
+              body.match?(/(^|>)\s*Branch:\s*</)
+          end
+
+          # Build the "<em>Branch: <code>...</code> | PR | Env</em>" footer.
+          # Includes the ephemeral env link when the card has an active env.
+          def build_comment_footer(branch, card_number, project_config)
+            pr_url = detect_pr_url(branch, project_config)
+            env_url = detect_env_url(card_number)
+
+            footer = "<p><em>Branch: <code>#{branch}</code>"
+            footer += " | <a href=\"#{pr_url}\">PR</a>" if pr_url
+            footer += " | <a href=\"#{env_url}\">Env</a>" if env_url
+            footer += "</em></p>"
+            footer
+          end
+
+          # URL of the ephemeral Belt environment for this card, if one is active.
+          def detect_env_url(card_number)
+            EnvUrl.for_card(card_number)
+          end
         end
       end
     end

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

@@ -3,7 +3,7 @@
 module Brainiac
   module Plugins
     module Fizzy
-      VERSION = "0.0.26"
+      VERSION = "0.0.27"
     end
   end
 end

data/lib/brainiac/plugins/fizzy.rb

@@ -3,6 +3,7 @@
 require_relative "fizzy/version"
 require_relative "fizzy/metadata"
 require_relative "fizzy/config"
+require_relative "fizzy/env_url"
 require_relative "fizzy/helpers"
 require_relative "fizzy/prompts"
 require_relative "fizzy/planning"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-fizzy
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Andy Davis
@@ -92,6 +92,7 @@ files:
 - lib/brainiac/plugins/fizzy/cli.rb
 - lib/brainiac/plugins/fizzy/config.rb
 - lib/brainiac/plugins/fizzy/delegators.rb
+- lib/brainiac/plugins/fizzy/env_url.rb
 - lib/brainiac/plugins/fizzy/handlers/assignment.rb
 - lib/brainiac/plugins/fizzy/handlers/card_index.rb
 - lib/brainiac/plugins/fizzy/handlers/comments.rb