diff --git a/.github/ISSUE_TEMPLATE/00_edit_predictions_bug_report.yml b/.github/ISSUE_TEMPLATE/00_edit_predictions_bug_report.yml
new file mode 100644
index 0000000000..a9edd07689
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/00_edit_predictions_bug_report.yml
@@ -0,0 +1,51 @@
+name: Edit Predictions
+description: There is a bug related to Edit Predictions in Zed
+type: "Bug"
+labels: ["ai", "inline completion", "zeta"]
+title: "Edit Predictions: "
+body:
+ - type: textarea
+ attributes:
+ label: Summary
+ description: Describe the bug with a one line summary, and provide detailed reproduction steps
+ value: |
+
+
+
+ Steps to trigger the problem:
+ 1.
+ 2.
+ 3.
+
+ Actual Behavior:
+
+ Expected Behavior:
+
+ validations:
+ required: true
+ - type: textarea
+ id: environment
+ attributes:
+ label: Zed Version and System Specs
+ description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
+ placeholder: |
+ Output of "zed: Copy System Specs Into Clipboard"
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
+ description: |
+ macOS: `~/Library/Logs/Zed/Zed.log`
+ Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
+ If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
+ value: |
+ Zed.log
+
+
+ ```
+
+ ```
+
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/0_agent_beta_bug_report.yml b/.github/ISSUE_TEMPLATE/01_git_bug_report.yml
similarity index 90%
rename from .github/ISSUE_TEMPLATE/0_agent_beta_bug_report.yml
rename to .github/ISSUE_TEMPLATE/01_git_bug_report.yml
index acd809770a..90943a792f 100644
--- a/.github/ISSUE_TEMPLATE/0_agent_beta_bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/01_git_bug_report.yml
@@ -1,8 +1,8 @@
-name: Agent Beta
-description: There is a bug related to new Agent Panel in Zed
+name: Git
+description: There is a bug related to Git features in Zed
type: "Bug"
-labels: [agent, ai]
-title: "Agent Beta: "
+labels: ["git"]
+title: "Git: "
body:
- type: textarea
attributes:
diff --git a/.github/ISSUE_TEMPLATE/02_agent_bug_report.yml b/.github/ISSUE_TEMPLATE/02_agent_bug_report.yml
new file mode 100644
index 0000000000..e74b7595a3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/02_agent_bug_report.yml
@@ -0,0 +1,51 @@
+name: Agent Panel
+description: There is a bug related to the Agent Panel in Zed
+type: "Bug"
+labels: ["agent", "ai"]
+title: "Agent Panel: "
+body:
+ - type: textarea
+ attributes:
+ label: Summary
+ description: Describe the bug with a one line summary, and provide detailed reproduction steps
+ value: |
+
+
+
+ Steps to trigger the problem:
+ 1.
+ 2.
+ 3.
+
+ Actual Behavior:
+
+ Expected Behavior:
+
+ validations:
+ required: true
+ - type: textarea
+ id: environment
+ attributes:
+ label: Zed Version and System Specs
+ description: 'Open Zed, and in the command palette select "zed: Copy System Specs Into Clipboard"'
+ placeholder: |
+ Output of "zed: Copy System Specs Into Clipboard"
+ validations:
+ required: true
+ - type: textarea
+ attributes:
+ label: If applicable, attach your `~/Library/Logs/Zed/Zed.log` file to this issue.
+ description: |
+ macOS: `~/Library/Logs/Zed/Zed.log`
+ Linux: `~/.local/share/zed/logs/Zed.log` or $XDG_DATA_HOME
+ If you only need the most recent lines, you can run the `zed: open log` command palette action to see the last 1000.
+ value: |
+ Zed.log
+
+
+ ```
+
+ ```
+
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/1_bug_report.yml b/.github/ISSUE_TEMPLATE/10_bug_report.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/1_bug_report.yml
rename to .github/ISSUE_TEMPLATE/10_bug_report.yml
diff --git a/.github/ISSUE_TEMPLATE/2_crash_report.yml b/.github/ISSUE_TEMPLATE/11_crash_report.yml
similarity index 100%
rename from .github/ISSUE_TEMPLATE/2_crash_report.yml
rename to .github/ISSUE_TEMPLATE/11_crash_report.yml