diff --git a/.github/ISSUE_TEMPLATE/1.bug_report.yml b/.github/ISSUE_TEMPLATE/1.bug_report.yml
index 145d4b4..d8dbfd4 100644
--- a/.github/ISSUE_TEMPLATE/1.bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/1.bug_report.yml
@@ -1,12 +1,14 @@
 name: Bug report
 description: Report a bug for Command Code.
+type: Bug
 labels: []
 body:
     - type: markdown
       attributes:
           value: |
-               Use this template to report bugs for Command Code. Feel free to [start a new thread in our discord forum](https://commandcode.ai/discord).
+              Use this template to report bugs for Command Code. Feel free to [start a new thread in our discord forum](https://commandcode.ai/discord).
     - type: textarea
+      id: summary
       attributes:
           label: Summary
           description: Briefly describe the issue and how it affects your workflow.
@@ -14,6 +16,7 @@ body:
       validations:
           required: true
     - type: textarea
+      id: expected-behavior
       attributes:
           label: Expected Behavior
           description: Describe the expected behavior you were expecting.
@@ -21,6 +24,7 @@ body:
       validations:
           required: true
     - type: textarea
+      id: actual-behavior
       attributes:
           label: Actual Behavior
           description: Describe the actual behavior that occurred.
@@ -28,6 +32,7 @@ body:
       validations:
           required: true
     - type: textarea
+      id: steps-to-reproduce
       attributes:
           label: Steps to reproduce the issue
           description: Describe the actual steps to reproduce the issue.
@@ -54,6 +59,7 @@ body:
               - macOS
               - Linux
               - Windows
+              - Other  
       validations:
           required: true
     - type: input
@@ -69,6 +75,19 @@ body:
           description: Which shell are you using?
           placeholder: zsh
     - type: textarea
+      id: session-file
+      attributes:
+          label: Session file (optional)
+          description: Run `/export jsonl` and drop the file here. Redact secrets first — it holds the whole session.
+          placeholder: Drag the .jsonl here...
+    - type: textarea
+      id: fix-prompt
+      attributes:
+          label: Fix prompt (optional)
+          description: How would you prompt a coding agent to fix this? Where it lives, what's correct, how to check.
+          placeholder: "Prompt to help Command Code fix and improve itself …"
+    - type: textarea
+      id: additional-context
       attributes:
           label: Additional context
           description: |
diff --git a/.github/ISSUE_TEMPLATE/2.feature_request.yml b/.github/ISSUE_TEMPLATE/2.feature_request.yml
index 6bffaed..da27c49 100644
--- a/.github/ISSUE_TEMPLATE/2.feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/2.feature_request.yml
@@ -1,5 +1,6 @@
 name: Feature Request
 description: Propose a new feature for Command Code.
+type: Feature
 labels: []
 body:
     - type: markdown