From 893ea91414e293dc3a14dd357cf3f18e84d2e36e Mon Sep 17 00:00:00 2001
From: Ebony Louis <ebony774@gmail.com>
Date: Tue, 4 Nov 2025 13:20:39 -0500
Subject: [PATCH] add diagnostic button info

---
 .github/DISCUSSION_TEMPLATE/qa.yml   | 26 +++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/bug_report.md | 31 ++++++++++++++++++++--------
 2 files changed, 48 insertions(+), 9 deletions(-)
 create mode 100644 .github/DISCUSSION_TEMPLATE/qa.yml

diff --git a/.github/DISCUSSION_TEMPLATE/qa.yml b/.github/DISCUSSION_TEMPLATE/qa.yml
new file mode 100644
index 000000000000..9bbd676aff86
--- /dev/null
+++ b/.github/DISCUSSION_TEMPLATE/qa.yml
@@ -0,0 +1,26 @@
+title: "❓ Question: [Brief summary]"
+labels:
+  - help
+body:
+  - type: markdown
+    attributes:
+      value: |
+        💡 Before posting, please attach your **diagnostics zip** — it helps the Goose team debug faster and saves everyone time.  
+        [How to capture and share diagnostics](https://block.github.io/goose/docs/troubleshooting/diagnostics-and-reporting/)
+  - type: textarea
+    id: problem
+    attributes:
+      label: What happened?
+      description: Describe the issue in detail and attach your diagnostics zip if possible.
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: Tell us how to reproduce the issue — commands, steps, or context.
+  - type: textarea
+    id: version
+    attributes:
+      label: Goose version and environment
+      description: Include your Goose version and operating system if known.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 689e3ef1702a..e2d4d93e0ef8 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -2,17 +2,22 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: ''
+labels: bug
 assignees: ''
-
 ---
 
 **Describe the bug**
 
-Note: Please check the common issues on https://block.github.io/goose/docs/troubleshooting before filing a report
+💡 Before filing, please check common issues:  
+https://block.github.io/goose/docs/troubleshooting  
+
+📦 To help us debug faster, attach your **diagnostics zip** if possible.  
+👉 How to capture it: https://block.github.io/goose/docs/troubleshooting/diagnostics-and-reporting/
 
 A clear and concise description of what the bug is.
 
+---
+
 **To Reproduce**
 Steps to reproduce the behavior:
 1. Go to '...'
@@ -20,18 +25,26 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
+---
+
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
+---
+
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Please provide following information:**
- - **OS & Arch:** [e.g. Ubuntu 22.04 x86]
- - **Interface:** [UI/CLI]
- - **Version:** [e.g. v1.0.2]
- - **Extensions enabled:** [e.g. Computer Controller, Figma]
- - **Provider & Model:** [e.g. Google - gemini-1.5-pro]
+---
+
+**Please provide the following information**
+- **OS & Arch:** [e.g. Ubuntu 22.04 x86]
+- **Interface:** [UI / CLI]
+- **Version:** [e.g. v1.0.2]
+- **Extensions enabled:** [e.g. Computer Controller, Figma]
+- **Provider & Model:** [e.g. Google – gemini-1.5-pro]
+
+---
 
 **Additional context**
 Add any other context about the problem here.