ci(issues): a PR from a <kind>/<n> branch must close #<n> and nothing else

Author: V3RON

.github/workflows/issue-state.yml

@@ -5,7 +5,8 @@ name: Issue state
 # - task:draft becomes task:ready when approved, specified, and unblocked;
 # - a reporter's reply moves bug:needs-info back to bug:triage;
 # - a feature whose last sub-issue closed gets a completion-conditions note;
-# - bug:needs-info with no activity for two weeks closes as not planned.
+# - bug:needs-info with no activity for two weeks closes as not planned;
+# - a PR from a <kind>/<n> branch must close issue <n> and no other.
 # Actions taken with the workflow token do not trigger this workflow again,
 # so every job removes the label it replaces itself.
 
@@ -14,14 +15,16 @@ on:
     types: [labeled, edited, closed]
   issue_comment:
     types: [created]
+  pull_request:
+    types: [opened, edited, synchronize]
   schedule:
     - cron: "17 6 * * *"
   workflow_dispatch:
 
 permissions: {}
 
 concurrency:
-  group: issue-state-${{ github.event.issue.number || 'schedule' }}
+  group: issue-state-${{ github.event.issue.number || github.event.pull_request.number || 'schedule' }}
   cancel-in-progress: false
 
 env:
@@ -195,3 +198,30 @@ jobs:
               });
               core.info(`#${issue.number}: closed as not planned (stale bug:needs-info)`);
             }
+
+  branch-matches-issue:
+    name: Branch name closes its issue
+    if: github.event_name == 'pull_request'
+    runs-on: ubuntu-24.04
+    timeout-minutes: 5
+    steps:
+      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
+        with:
+          script: |
+            const pr = context.payload.pull_request;
+            const m = pr.head.ref.match(/^(bug|feature|task)\/(\d+)$/);
+            if (!m) {
+              core.info(`${pr.head.ref} is not a <kind>/<n> branch; nothing to check`);
+              return;
+            }
+            const expected = Number(m[2]);
+            const closes = [...(pr.body ?? "").matchAll(/\b(?:close|closes|closed|fix|fixes|fixed|resolve|resolves|resolved)\s+#(\d+)/gi)]
+              .map((x) => Number(x[1]));
+            if (!closes.includes(expected)) {
+              core.setFailed(`Branch ${pr.head.ref} must close #${expected}: add "Closes #${expected}" to the PR body.`);
+              return;
+            }
+            const others = closes.filter((n) => n !== expected);
+            if (others.length) {
+              core.setFailed(`Branch ${pr.head.ref} closes #${expected} but also ${others.map((n) => `#${n}`).join(", ")}; one branch closes one issue.`);
+            }

docs/DELIVERY.md

@@ -109,7 +109,8 @@ that are mechanical: adding a state label removes the previous one, so every
 transition is a single add; `task:draft` becomes `task:ready` when approved,
 specified and unblocked; a reporter's reply moves `bug:needs-info` back to
 `bug:triage`; a silent `bug:needs-info` closes after two weeks; a feature
-whose last sub-issue closed gets the completion-conditions note. The repo's
+whose last sub-issue closed gets the completion-conditions note; a PR from a
+`<kind>/<n>` branch must close `#<n>` and nothing else. The repo's
 skills — `spec-session`, `triage-bug`, `deliver` — handle the transitions an
 agent makes as part of its own procedure.
 

docs/agent-rules/delivery.md

@@ -170,6 +170,8 @@ rules mechanically, so nobody has to remember them:
   comment does not reopen it automatically, the maintainer does.
 - When the last sub-issue of a `feature:planned` issue closes, the workflow
   comments that completion conditions are due.
+- A pull request from a `<kind>/<n>` branch fails its check unless its body
+  closes `#<n>` and closes nothing else.
 
 The judgment calls stay manual by design: `bug:new` → `bug:triage`,
 `bug:triage` → `bug:ready`, `feature:spec` → `feature:ready`, and the