@@ -4,35 +4,71 @@ labels: ["bug"]
 body:
   - type: markdown
     attributes:
-      value: Thanks for taking the time to file a bug! Please fill out the sections below.
+      value: |
+        **A screenshot or recording is required.** We get more reports than we can
+        reproduce blind, and the ones with a picture get fixed first because they
+        are the ones we can actually see. If you can only give us one thing, give
+        us the recording.
   - type: textarea
     id: what-happened
     attributes:
       label: What happened?
-      description: A clear description of the bug, plus what you expected instead.
+      description: What you saw, and what you expected instead.
     validations:
       required: true
   - type: textarea
     id: repro
     attributes:
       label: Steps to reproduce
+      description: Numbered steps, starting from a fresh launch. If we can't follow them, we can't fix it.
       placeholder: |
-        1. Run `npm run dev`
+        1. Launch the app
         2. Add an agent with command `...`
         3. See error
     validations:
       required: true
+  - type: textarea
+    id: evidence
+    attributes:
+      label: Screenshot or screen recording
+      description: |
+        **Required.** Drag the file straight into this box and GitHub will upload it.
+        A recording beats a still for anything that moves, hangs, or flickers.
+        If the bug is invisible on screen, show us the terminal or the log instead —
+        but show us something.
+      placeholder: Drag an image or video here.
+    validations:
+      required: true
   - type: textarea
     id: logs
     attributes:
-      label: Logs / screenshots
-      description: Console output, stack traces, or a screenshot/clip if it's visual.
+      label: Logs / stack trace
+      description: Console output or a stack trace, if you have one. Paste as text, not a screenshot of text.
       render: shell
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating system
+      options:
+        - macOS (Apple Silicon)
+        - macOS (Intel)
+        - Windows
+        - Linux
+    validations:
+      required: true
   - type: input
-    id: macos
+    id: os-version
     attributes:
-      label: macOS version
-      placeholder: e.g. 15.0
+      label: OS version
+      placeholder: e.g. macOS 15.0, Windows 11 23H2, Ubuntu 24.04
+    validations:
+      required: true
+  - type: input
+    id: app-version
+    attributes:
+      label: Munder Difflin version
+      description: Settings → the version is on the hero card. Or `Munder Difflin → About`.
+      placeholder: e.g. 0.4.5
     validations:
       required: true
   - type: input
@@ -43,16 +79,20 @@ body:
     validations:
       required: true
   - type: input
-    id: claude
+    id: agent-cli
     attributes:
-      label: Claude Code version (if relevant)
-      placeholder: claude --version
+      label: Agent CLI and version (if relevant)
+      placeholder: e.g. claude --version, codex --version
   - type: checkboxes
     id: checks
     attributes:
       label: Pre-flight
       options:
-        - label: I re-ran `npm install` so `node-pty` is rebuilt for the current Electron ABI.
+        - label: I attached a screenshot or recording above.
+          required: true
+        - label: I'm on the latest release, or I've said above why I can't be.
+          required: true
+        - label: I re-ran `npm install` so `node-pty` is rebuilt for the current Electron ABI (source installs only).
           required: true
         - label: I searched existing issues and this isn't a duplicate.
           required: true
@@ -2,24 +2,45 @@ name: Feature request
 description: Suggest an idea or improvement.
 labels: ["enhancement"]
 body:
+  - type: markdown
+    attributes:
+      value: |
+        **A picture is required here too.** Not a mockup of your idea necessarily —
+        a shot of the screen as it is today, with the gap in it. It is the fastest
+        way to make a proposal concrete, and it stops good ideas dying as prose.
+        Ideas still forming are better in
+        [Discussions](https://github.com/chaitanyagiri/munder-difflin/discussions).
   - type: textarea
     id: problem
     attributes:
       label: Problem / motivation
-      description: What are you trying to do, and what's getting in the way?
+      description: What are you trying to do, and what's getting in the way? Describe the situation you hit, not the feature you want.
     validations:
       required: true
   - type: textarea
     id: proposal
     attributes:
       label: Proposed solution
-      description: What would you like to see happen?
+      description: What should happen instead?
+    validations:
+      required: true
+  - type: textarea
+    id: evidence
+    attributes:
+      label: Screenshot, mockup or recording
+      description: |
+        **Required.** Drag the file straight into this box.
+        Any of these work: the screen today with the gap circled, a sketch of what
+        you mean, a recording of the workaround you're doing instead, or the same
+        thing done well in another app.
+      placeholder: Drag an image or video here.
     validations:
       required: true
   - type: textarea
     id: alternatives
     attributes:
       label: Alternatives considered
+      description: What you tried, or why the obvious approach doesn't work.
   - type: dropdown
     id: area
     attributes:
@@ -30,7 +51,17 @@ body:
         - The hive (memory, routing, GOD agent)
         - Files / git
         - Onboarding / config
+        - Updates / releases
         - Design system
         - Other
     validations:
       required: true
+  - type: checkboxes
+    id: checks
+    attributes:
+      label: Pre-flight
+      options:
+        - label: I attached a screenshot, mockup or recording above.
+          required: true
+        - label: I searched existing issues and discussions, and this isn't a duplicate.
+          required: true
@@ -1,8 +1,15 @@
-<!-- Thanks for contributing to Munder Difflin! -->
+<!-- Thanks for contributing to Munder Difflin.
+
+     Read this line before you go further: a PR without a BEFORE and an AFTER
+     is not reviewable and will not be merged. The `PR evidence` check runs the
+     moment you open this and will tell you if it is missing. Keep the `Before`
+     and `After` headings below exactly as they are — the check reads them. -->
 
 ## What & why
 
-<!-- What does this change do, and why? Link any related issue: Closes #123 -->
+<!-- What changed, and why it needed to. Two or three sentences beats a
+     bullet list of file names — we can read the diff, we cannot read your
+     reasoning. If this fixes an issue, link it: Closes #123 -->
 
 ## Type of change
 
@@ -12,21 +19,52 @@
 - [ ] Docs
 - [ ] Build / CI
 
-## Screenshots / clips
+## Evidence
+
+<!-- REQUIRED. Drag images or a screen recording directly under each heading —
+     GitHub uploads them inline. Both headings must have something under them.
+
+     No visible UI? You still owe evidence. Record the failing behaviour and
+     then the same steps passing: a terminal capture, a log diff, a test that
+     goes from red to green. "It has no UI" is not an exemption.
+
+     Truly nothing observable, like a CI tweak or a typo? Say so in
+     "What & why" and ask a maintainer for the `no-visual-change` label. -->
+
+### Before
+
+<!-- The problem, as it exists on main right now. -->
+
+### After
+
+<!-- The same view or the same steps, with your change applied.
+     Same window size, same theme, same data — a reviewer should be able to
+     flip between the two and see only what you changed. -->
+
+## How I tested it
+
+<!-- The actual steps you ran, on which OS. Not "tested locally". -->
 
-<!-- REQUIRED for any visual change: a screenshot or short clip (before/after). -->
+- OS:
+- Steps:
 
 ## Discord (optional)
 
-<!-- If you'd like the `employee of the month` role in our Discord when this merges,
-     put your handle below. Join first so we can find you: https://discord.gg/SEDzP5ZPk5 -->
+<!-- For the `employee of the month` role in our Discord when this merges.
+     Join first so we can find you: https://discord.gg/SEDzP5ZPk5 -->
 
-Discord: 
+Discord:
 
 ## Checklist
 
-- [ ] `npm run typecheck` passes (the de-facto CI gate).
+- [ ] **Before and after evidence is attached above**, under both headings.
+- [ ] `npm run typecheck` passes.
+- [ ] `npm run test:focused` passes.
 - [ ] `npm run build` succeeds.
-- [ ] Any new UI derives from `DESIGN.md` / `tokens.ts` — no ad-hoc colors, spacing, or fonts.
-- [ ] If I added art, it's my own or compatibly licensed, and listed in `ATTRIBUTION.md`.
-- [ ] PR is focused on a single change.
+- [ ] This PR is **one change**. Unrelated fixes belong in their own PR.
+- [ ] I read the diff myself before opening this, and there is no debug output,
+      commented-out code, or unrelated formatting churn in it.
+- [ ] Any new UI derives from `DESIGN.md` / `tokens.ts` — no ad-hoc colors,
+      spacing, or fonts.
+- [ ] If I added art, it's my own or compatibly licensed, and listed in
+      `ATTRIBUTION.md`.