brainiac-fizzy 0.0.26 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b9d6e5b3e6e6ea9306dc6fd9ce800dffc01e46f99b05f2861e0acf096793fe5
-  data.tar.gz: ec15a0b6f7a498de7662b8bd662fb519ae45f8a14d66e5912cf6dd540cc3726b
+  metadata.gz: e5d55859eafd2aeccf63a2083999340a1ce4a77c01b81a8297adf136b0e553b3
+  data.tar.gz: b1dbff19165dec2cf391f4c258ae2a207457cdc53088ee44062ffda050530a48
 SHA512:
-  metadata.gz: 51284c7c4cca09f1bde28d3589fc7c17b29314e898f4de8bd7345fa1fd930baf6501ef47e42a241b40f17baede635780676154e7c6f456a70ea6f1d9902da59b
-  data.tar.gz: 868fc4f7e922d67138125385c486f87bc221766ddadf45e640ad880ee57914f04a772bdd3b688087c505a66cfa59f7643e1134f5731eb0ef67f3e42b6f80a700
+  metadata.gz: 9438b9143636ab612da09a19be5b672ada809095317ea7ce72d9045acbebe6601d5485ba4bfd234b85edcdb54a6d676edd330a74b4241cc85c0605d590fe523d
+  data.tar.gz: 93fbe26b2a546b1b72e1025f7af334ac6539efe0c4144338bd6d2929b336e2ed21752cc8a1d4ef2949d380cc72635e945e0dad819afe043570c483ddc889d2d7

data/lib/brainiac/plugins/fizzy/handlers/deployments.rb

@@ -274,3 +274,112 @@ def resolve_deployment_url(env_config, card_tags)
   end
   env_config["url"]
 end
+
+# Resolve the live ephemeral deployment URL for a given card number.
+# Returns { env:, url: } for the environment currently occupied by this card,
+# or nil if the card isn't deployed anywhere (or deployments aren't configured).
+#
+# Resolution order (live state is the source of truth):
+#   1. A tracked dev environment (dev01/dev02...) occupied by this card, from
+#      deployment_state.json.
+#   2. The card's ephemeral Belt environment (fizzy-<card>), from
+#      ephemeral_envs.json, with the public URL derived from its terraform.tfvars.
+def deployment_url_for_card(card_number)
+  return nil unless card_number
+
+  tracked_deployment_for_card(card_number) || ephemeral_deployment_for_card(card_number)
+rescue StandardError => e
+  LOG.warn "[Fizzy:Deploy] Could not resolve deployment URL for card ##{card_number}: #{e.message}" if defined?(LOG)
+  nil
+end
+
+# A tracked dev environment (dev01/dev02...) currently occupied by this card.
+def tracked_deployment_for_card(card_number)
+  return nil unless defined?(DEPLOYMENTS_CONFIG)
+
+  config = DEPLOYMENTS_CONFIG["environments"] || {}
+  state = load_deployment_state
+
+  env_key, info = state.find do |key, v|
+    v.is_a?(Hash) && v["card_number"].to_s == card_number.to_s && v["status"] == "occupied" && config.key?(key)
+  end
+  return nil unless env_key
+
+  url = resolve_deployment_url(config[env_key], info["card_tags"])
+  return nil unless url
+
+  { env: env_key, url: url }
+end
+
+EPHEMERAL_ENVS_FILE = File.join(BRAINIAC_DIR, "ephemeral_envs.json")
+
+# The active ephemeral Belt environment (fizzy-<card>) for this card, if any.
+# The public URL is derived from the env's terraform.tfvars in its worktree,
+# following the Belt frontend_urls convention.
+def ephemeral_deployment_for_card(card_number)
+  info = active_ephemeral_env_info(card_number)
+  return nil unless info
+
+  worktree = info["worktree"]
+  env_name = "fizzy-#{card_number}"
+  return nil unless worktree
+
+  tfvars = File.join(worktree, "infrastructure", env_name, "terraform.tfvars")
+  return nil unless File.exist?(tfvars)
+
+  url = ephemeral_url_from_tfvars(tfvars)
+  return nil unless url
+
+  { env: env_name, url: url }
+end
+
+# Look up the active ephemeral env metadata for a card from ephemeral_envs.json.
+def active_ephemeral_env_info(card_number)
+  return nil unless File.exist?(EPHEMERAL_ENVS_FILE)
+
+  state = JSON.parse(File.read(EPHEMERAL_ENVS_FILE))
+  info = state["fizzy-#{card_number}"]
+  return nil unless info.is_a?(Hash) && info["status"] == "active"
+
+  info
+rescue JSON::ParserError
+  nil
+end
+
+# Derive the public URL from a Belt 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 ephemeral_url_from_tfvars(tfvars_path)
+  vars = parse_tfvars(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_tfvars(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

data/lib/brainiac/plugins/fizzy/handlers/summarize.rb

@@ -72,9 +72,14 @@ module Brainiac
             env = Helpers.fizzy_env_for(agent_name)
 
             pr_url = Helpers.send(:detect_pr_url, branch, project_config)
+            deployment = respond_to?(:deployment_url_for_card, true) ? deployment_url_for_card(card_number) : nil
             body = "<p>✅ Work completed on this card.</p>"
-            body += "<p><a href=\"#{pr_url}\">View PR</a></p>" if pr_url
             body += "<p><strong>Branch:</strong> <code>#{branch}</code></p>"
+            body += "<p><strong>PR:</strong> <a href=\"#{pr_url}\">#{pr_url}</a></p>" if pr_url
+            if deployment
+              body += "<p><strong>Deployment (#{deployment[:env]}):</strong> " \
+                      "<a href=\"#{deployment[:url]}\">#{deployment[:url]}</a></p>"
+            end
 
             run_cmd("fizzy", "comment", "create", "--card", card_number.to_s, "--body", body,
                     chdir: repo_path, env: env)

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

@@ -171,20 +171,13 @@ module Brainiac
             last_agent_comment = agent_comments.last
             return false unless last_agent_comment
 
-            # Append footer if applicable
+            # Backup: ensure the comment surfaces branch, PR link, and live deployment link.
+            # Whatever the agent already included is left alone; we only append what's missing.
             body = last_agent_comment.dig("body", "html") || ""
-            unless body.include?("<em>Branch:")
-              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>"
-
-                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)
-              end
+            updated_body = ensure_reference_footer(body, card_number, project_config)
+            if updated_body != body
+              run_cmd("fizzy", "comment", "update", last_agent_comment["id"], "--card", card_number.to_s,
+                      "--body", updated_body, chdir: repo_path, env: env)
             end
 
             true
@@ -193,6 +186,42 @@ module Brainiac
             false
           end
 
+          # Build the reference footer (Branch / PR / Deployment) and append any pieces
+          # that the agent's comment body doesn't already contain. Returns the (possibly
+          # unchanged) body. Detection is deliberately lenient — if the branch name, PR
+          # URL, or deployment URL already appears anywhere in the body, it's not re-added.
+          def ensure_reference_footer(body, card_number, project_config)
+            branch = detect_branch_from_comment(body, card_number)
+            return body unless branch
+
+            pr_url = detect_pr_url(branch, project_config)
+            deployment = detect_deployment(card_number)
+
+            footer_lines = []
+            footer_lines << "<strong>Branch:</strong> <code>#{branch}</code>" unless body.include?(branch)
+            if pr_url && !body.include?(pr_url) && !body.include?("github.com/#{project_config["github_repo"]}/pull")
+              footer_lines << "<strong>PR:</strong> <a href=\"#{pr_url}\">#{pr_url}</a>"
+            end
+            if deployment && !body.include?(deployment[:url])
+              footer_lines << "<strong>Deployment (#{deployment[:env]}):</strong> " \
+                              "<a href=\"#{deployment[:url]}\">#{deployment[:url]}</a>"
+            end
+
+            return body if footer_lines.empty?
+
+            "#{body}<p><em>#{footer_lines.join(" &middot; ")}</em></p>"
+          end
+
+          # Resolve the live deployment for a card as { env:, url: }, or nil.
+          # Reads live deployment state (tracked dev envs from deployment_state.json,
+          # and the card's ephemeral Belt env from ephemeral_envs.json) — the actual
+          # source of truth for which environment a card currently occupies.
+          def detect_deployment(card_number)
+            return nil unless respond_to?(:deployment_url_for_card, true)
+
+            deployment_url_for_card(card_number)
+          end
+
           def ensure_fizzy_yaml!(chdir, project_config)
             fizzy_yaml_dest = File.join(chdir, ".fizzy.yaml")
             return if File.exist?(fizzy_yaml_dest)
@@ -331,8 +360,24 @@ 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
         end
       end
     end

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

@@ -62,10 +62,19 @@ module Brainiac
           {{PR_TARGET_INSTRUCTION}}
 
           **Response destination: Post your response as a comment on Fizzy card #{{CARD_NUMBER}}.**
-          Your comment MUST include a concise summary of what you did, a PR link, and the branch name.
+          Your comment MUST include a concise summary of what you did.
 
-          **MANDATORY: Always include the branch name in your comment.** Use this format:
-          `<p><strong>Branch:</strong> <code>{{BRANCH}}</code></p>`
+          **MANDATORY: Always end your comment with a References block containing all three of the following:**
+          - The branch name
+          - A link to the PR
+          - A link to the live deployed ephemeral environment (if this card was deployed — check the card's [deploy] tag / deployment; if not deployed, state "Not deployed")
+
+          Use this exact HTML format:
+          ```
+          <p><strong>Branch:</strong> <code>{{BRANCH}}</code></p>
+          <p><strong>PR:</strong> <a href="PR_URL_HERE">PR_URL_HERE</a></p>
+          <p><strong>Deployment:</strong> <a href="DEPLOY_URL_HERE">DEPLOY_URL_HERE</a></p>
+          ```
         PROMPT
 
         FOLLOWUP_WORKTREE = <<~'PROMPT'
@@ -123,11 +132,19 @@ module Brainiac
           Read your memory file for this card and write a brief summary comment.
 
           **Response destination: Post your response as a comment on Fizzy card #{{CARD_NUMBER}}.**
-          Include what you did, any PR link, and the branch name.
-          Keep it concise — this is a summary, not a full report.
+          Include what you did. Keep it concise — this is a summary, not a full report.
 
-          **MANDATORY: Always include the branch name in your comment.** Use this format:
-          `<p><strong>Branch:</strong> <code>{{BRANCH}}</code></p>`
+          **MANDATORY: Always end your comment with all three of the following:**
+          - The branch name
+          - A link to the PR
+          - A link to the live deployed ephemeral environment (or "Not deployed" if the card wasn't deployed)
+
+          Use this exact HTML format:
+          ```
+          <p><strong>Branch:</strong> <code>{{BRANCH}}</code></p>
+          <p><strong>PR:</strong> <a href="PR_URL_HERE">PR_URL_HERE</a></p>
+          <p><strong>Deployment:</strong> <a href="DEPLOY_URL_HERE">DEPLOY_URL_HERE</a></p>
+          ```
         PROMPT
 
         UAT_TESTING = <<~'PROMPT'

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brainiac-fizzy
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.28
 platform: ruby
 authors:
 - Andy Davis