diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 000000000..3603338d5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,88 @@
+name: Bug report
+description: Something in Corbits Code does not work the way it should
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before filing, please search existing issues — including closed ones.
+
+        Never paste API keys, tokens, or the contents of `~/.corbits/settings.json`.
+        Redact anything that looks like a credential before you submit.
+
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened
+      description: What Corbits Code actually did. Keep the reproduction steps for the next box.
+      placeholder: |
+        I ran `corbits exec "..."` and the session stopped after the first tool call.
+    validations:
+      required: true
+
+  - type: textarea
+    id: expected
+    attributes:
+      label: What you expected instead
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduce
+    attributes:
+      label: Steps to reproduce
+      description: The shortest sequence that shows the problem. A fixture repo or a minimal project beats a description.
+      placeholder: |
+        1. ...
+        2. ...
+        3. ...
+    validations:
+      required: true
+
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Output of `corbits --version`.
+    validations:
+      required: true
+
+  - type: input
+    id: platform
+    attributes:
+      label: OS and architecture
+      placeholder: macOS 15.2 arm64
+    validations:
+      required: true
+
+  - type: input
+    id: install-method
+    attributes:
+      label: How you installed it
+      placeholder: Homebrew, or built from source at <commit>
+
+  - type: input
+    id: provider-model
+    attributes:
+      label: Provider and model
+      description: Fill this in if the bug involves inference at all — a wrong answer, a hang, a protocol error, token or cost accounting. Leave it blank otherwise.
+      placeholder: opencode-go, muse-spark-1.3-contributor
+
+  - type: textarea
+    id: output
+    attributes:
+      label: Relevant output
+      description: The error and the lines around it — not a whole session transcript. This is rendered as a code block, so no backticks needed.
+      render: text
+
+  - type: dropdown
+    id: clean-config
+    attributes:
+      label: Does it reproduce on a clean config?
+      description: A fresh profile, without your plugins, skills, MCP servers, or hooks. This is the single most useful thing you can tell us.
+      options:
+        - "Yes — reproduces on a clean config"
+        - "No — only with my config"
+        - "Not tried"
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..f36313563
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,15 @@
+# Blank issues stay enabled deliberately: GitHub Discussions is not turned on for
+# this repository, so disabling them would leave anyone with a question — rather
+# than a bug or a feature request — with nowhere to go but the wrong template.
+# Turn this off if Discussions is ever enabled.
+blank_issues_enabled: true
+contact_links:
+  - name: Security vulnerability
+    url: https://github.com/corbitsdev/corbits-code/security/advisories/new
+    about: Do not report security issues publicly. Use private vulnerability reporting.
+  - name: Documentation
+    url: https://github.com/corbitsdev/corbits-code/tree/main/docs
+    about: Architecture, implementation, TUI behavior, plugins, MCP, hooks, and telemetry.
+  - name: Contributing
+    url: https://github.com/corbitsdev/corbits-code/blob/main/CONTRIBUTING.md
+    about: Commit, pull request, and issue-linking conventions. Read before opening a pull request.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..5b2b07ad5
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,23 @@
+---
+name: Feature request
+about: Suggest a capability Corbits Code does not have
+labels: ["enhancement"]
+---
+
+## The problem
+
+What are you trying to do, and what stops you? Describe the problem before the
+solution — the best fix is often not the one either of us thought of first.
+
+## What you do today instead
+
+The workaround, however ugly. This tells us how much the problem costs you.
+
+## What you have already ruled out
+
+Approaches you considered and rejected, and why. Saves us proposing them back
+to you.
+
+## Anything else
+
+Prior art in other tools, links, sketches.