@next-friday/create-app 9.3.0 → 9.4.0

package/README.md

@@ -32,7 +32,7 @@ Every stack is built from [`templates/base`](templates/base), which holds the sh
 - **Git hooks:** Husky runs gitleaks, `pnpm rules:check`, and lint-staged before each commit, commitlint on each message, and `pnpm check` before each push. After the first commit, commits to `main` are blocked, and local merges into `main` always are; pushes to `main` are blocked once it exists on the remote.
 - **CI:** GitHub Actions run the static checks, tests with patch coverage, the build, end-to-end tests for Next.js and Payload, a container build and vulnerability scan, Semgrep, OSV-Scanner, CodeQL, dependency review, OpenSSF Scorecard, gitleaks, TruffleHog, zizmor, and pull request title validation. Dependabot keeps dependencies current.
 - **Deployment:** a `Dockerfile` that runs as the `node` user, and a Railway workflow that promotes one commit through `dev`, `uat`, and `prod`.
-- **Agent rules:** `CLAUDE.md` imports `AGENTS.md`. Shared rules live in `.agents/rules`, with hooks that enforce them in Claude Code and Cursor, and a Cursor Bugbot configuration.
+- **Agent rules:** `CLAUDE.md` imports `AGENTS.md`. Shared rules live in `.agents/rules`, with hooks that enforce them in Claude Code and Cursor.
 
 ## Requirements
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@next-friday/create-app",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "description": "Create a Next Friday project from a template.",
   "keywords": [
     "create",

package/templates/base/SETUP.md

@@ -81,10 +81,9 @@ Replace `security@example.com` in `SECURITY.md` with the contact the security po
 
 **Who:** a Cursor team admin.
 
-- **Bugbot:** enable the repository at [Bugbot](https://cursor.com/automations/from-cursor/bugbot). Bugbot reviews pull requests by the files `.cursor/BUGBOT.md` links, including `.agents/review.md`.
 - **Sandbox:** set the team's sandbox policy ([Cursor sandbox](https://cursor.com/docs/reference/sandbox)), which repository and user settings cannot weaken.
 
-**Check:** the test pull request gets a Bugbot review.
+**Check:** the team's settings in Cursor show the sandbox policy.
 
 ## 6. Team decisions
 

package/templates/base/plugins/sdlc/claude-code/skills/sdlc-mode/SKILL.md

@@ -14,7 +14,7 @@ Do these steps in order.
    | :---------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------- |
    | A question, or a request to explain something without changing anything                                                 | Follow [`playbooks/question.md`](playbooks/question.md).                                                                       |
    | A spec for an intent, or a path to an `intent.md`                                                                       | Follow [`playbooks/design.md`](playbooks/design.md).                                                                           |
-   | A build for a spec, a path to a `spec.md`, or a plan the engineer accepted                                              | Follow [`playbooks/build.md`](playbooks/build.md).                                                                             |
+   | A build for a spec, a path to a `spec.md`, or a plan the engineer merged                                                | Follow [`playbooks/build.md`](playbooks/build.md).                                                                             |
    | A review or check of a pull request or a branch, a failing check on a pull request, or a pull request to drive to green | Follow [`playbooks/review.md`](playbooks/review.md).                                                                           |
    | A deploy, a promotion to an environment, or a release to production                                                     | Follow [`playbooks/deploy.md`](playbooks/deploy.md).                                                                           |
    | A finding sent by a job, a monitor, or a trigger, or one the message says no person can answer questions about          | Follow [`playbooks/maintain.md`](playbooks/maintain.md).                                                                       |

package/templates/base/plugins/sdlc/claude-code/skills/sdlc-mode/playbooks/build.md

@@ -5,11 +5,11 @@ This playbook turns a merged spec into a plan the engineer accepts, and then int
 1. Find the change: the `intent/<change>/` folder whose `spec.md` or `plan.md` the request names. Its `spec.md` must be on the default branch beside its `intent.md`. In each case below, say only that, in two or three lines, and stop: write no file.
    - The request names no change, or the folder has no `spec.md` on any branch: list each `intent/*/` on the default branch that has a `spec.md` and no `plan.md`, or say that there is none.
    - The spec exists only on another branch: say that the spec is not merged yet, and name that branch.
-   - `intent/<change>/plan.md` is already on the default branch: say that the plan is merged, name the file, and say that the change is built only when each requirement of `spec.md` is checked against the tree.
+   - `intent/<change>/plan.md` is on the default branch and `spec.md` says `Status: done.`: say that the change is built, and name both files.
 
    When the request is a bug fix with no spec, none of these cases applies: follow `playbooks/fix.md` instead.
 
-2. When `intent/<change>/plan.md` exists on a branch that is not merged, check out that branch. When the request says the plan is accepted, go to step 6. Otherwise show that plan and go to step 5.
+2. When `intent/<change>/plan.md` is on the default branch, the engineer accepted it by merging its pull request: go to step 6. When it exists only on a branch that is not merged, check out that branch, show that plan, and go to step 5.
 3. Read `intent.md`, `spec.md`, the four policies, found as `playbooks/design.md` step 2 says, and the code the change touches. Start from the accepted spec, in the agent tool's plan mode when it has one, and give the plan the change's `intent.md` and `spec.md`. Then interview the engineer until they have said four things: the files the change touches, the order of the work, the tests that prove it, and each option they rule out.
    - **When all four are already said, in the request or in the files, go to step 4 in the same turn.**
    - **When one is missing, ask and stop.** Write no plan in that turn. Ask in rounds, as step 3 of `playbooks/plan.md` does: numbered questions, each with a recommended answer or "No recommendation". Wait for the answers, and build the next round on them.
@@ -21,8 +21,8 @@ This playbook turns a merged spec into a plan the engineer accepts, and then int
 
    Show the whole plan and name the file only as `intent/<change>/plan.md`. In plan mode you cannot write the file. Show the plan as the plan.
 
-5. **Gate: the engineer accepts the plan.** Ask whether an engineer could build from it, and for their GitHub handle when you cannot read it. Revise until they say yes. Change no code and commit nothing before that yes. In plan mode, approving the plan is that yes. When the spec classes the change as higher risk, say that a tech lead or an architect accepts the plan with the engineer.
-6. Create the branch as `playbooks/open-pr.md` says, unless step 2 checked one out. Set the plan's `Accepted by:` line, under its title, to the handle of the engineer who said yes in step 5 or whom the request names, and commit `intent/<change>/plan.md` before any other change. In that commit, set the spec's status line to `Status: accepted.`, because its pull request is merged.
+5. **Gate: the engineer accepts the plan.** Commit `intent/<change>/plan.md` on a new branch, with the `Accepted by:` line as the template has it. In that commit, set the spec's status line to `Status: accepted.`, because its pull request is merged. Push the branch and open a pull request that changes no file outside `intent/`, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests. Revise the plan as the engineer asks; each revision is a commit on that branch. The engineer merges that pull request to accept the plan, or closes it to reject it. You never merge it, and you change no file outside `intent/` before it is merged. In plan mode, the engineer's approval lets you write the file and open this pull request; it is not the acceptance. When the spec classes the change as higher risk, say that a tech lead or an architect approves that pull request before it is merged. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+6. When the plan's pull request is merged, create a new branch as `playbooks/open-pr.md` says. In its first commit, set the plan's `Accepted by:` line, under its title, to the account that merged that pull request, read from the host. When that pull request has an approving review from a second person, add `Also accepted by: @<handle>.` on the next line. When you cannot read the host, write the handle the engineer gives. Never write a handle the host or the engineer did not give.
 7. Implement the plan in its order. After each step, run the check that proves it and fix what fails. For a bug fix, follow `playbooks/fix.md` steps 7 and 8: commit the failing test on a `fix/` branch, and the gate then blocks test edits. When the work departs from the plan, change `plan.md` in the same commit. When the change meets the last requirement of `spec.md`, set `Status: done.` in `intent.md` and `spec.md`.
 8. Run every check the project's agent instructions name and keep the output. Every check must pass: fix the code, and never skip, delete, or weaken a test. Then run the `verifier` subagent and fix what it reports. Start it on the model that `.agents/sdlc-models.md` names after `verify:`, at the effort on that line when the session can set one; when you cannot start a subagent, do what `../../../agents/verifier.md`, relative to this playbook, says yourself. For UI work, when the session has a browser tool, also close the loop with a visual check: start the app, give the browser tool the page and the mock the spec or the request names, screenshot, compare, and adjust, and repeat until it matches; two or three rounds is normal. When a check cannot run in this session, say which one and why, and never report it as passed.
 9. Go on in the same turn, without asking: follow `playbooks/open-pr.md`, and then `playbooks/review.md`. Pushing the branch and opening the pull request are part of this task.

package/templates/base/plugins/sdlc/claude-code/skills/sdlc-mode/playbooks/design.md

@@ -8,14 +8,14 @@ This playbook turns a merged intent into the requirements and design spec.
    - `spec.md` already exists: say so and name the file.
 2. Read the four policies, every time, before you write: for each of `brand`, `security`, `compliance`, and `ux`, read the project's `.agents/skills/<area>-policy/SKILL.md` when it exists, and the plugin's default at `../../<area>-policy/SKILL.md`, relative to this playbook, otherwise. Then read the code and the docs the change touches.
 3. Write `intent/<change>/spec.md` from the template below. Use exactly the template's headings.
-   - **Request:** under the status line, quote the words of the request that started this spec.
+   - **Request:** under the status line, quote the words of the request that started this spec. End the line with `Skills at <hash>.`, the short hash of the last commit that changed the plugin's files in this repository: `git log -1 --format=%h -- plugins/sdlc`. When the plugin is not in this repository, write `Skills at unknown.`
    - **Requirements:** numbered. Each one states a result a test or a reader can check.
    - **Design:** how the change fits the existing code: the files that change, and what each one does afterwards.
    - **Policies:** one line for each of the four policies. State which rules of that policy the change must meet, each as a requirement number, or write "Does not apply" and why.
-   - **Areas of concern:** a policy rule the change cannot meet, two policies that contradict, or a decision the files do not settle. Give each one a number and the policy it comes from. Write "None" only when there are none.
+   - **Areas of concern:** a policy rule the change cannot meet, two policies that contradict, or a decision the files do not settle. Give each one a number and the policy it comes from. Under each, on a line of its own, write `Decision: <the decision you propose>.` Write "None" only when there are none.
    - **Open questions:** each open question from `intent.md`, answered with its evidence or carried forward. Write "None" only when the intent has none.
 4. Commit `spec.md` on a new branch. In the same commit, set the intent's status line to `Status: accepted.`, because its pull request is merged. Push the branch, and open a pull request ready for review, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests. When you cannot open a pull request from this session, say so and give the pushed branch's name.
-5. **Gate: the product owner reviews the spec.** The product owner resolves each area of concern with its policy owner, then merges the pull request to accept the spec, or closes it to reject it. For a change the spec classes as higher risk, the product owner consults a tech lead before accepting. You do none of these. The spec stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the plan's commit sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+5. **Gate: the product owner reviews the spec.** The product owner corrects the `Decision:` line under each area of concern, with its policy owner, then merges the pull request to accept the spec and those decisions as written, or closes it to reject it. Change a `Decision:` line when they tell you its text. For a change the spec classes as higher risk, the product owner consults a tech lead before accepting. You do none of these. The spec stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the plan's commit sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
 
 **Next:** `playbooks/build.md`; an engineer with an agent; when the product owner has merged the spec's pull request and the engineer sends `/sdlc:sdlc-mode build` with the spec's path.
 

package/templates/base/plugins/sdlc/claude-code/skills/sdlc-mode/playbooks/fix.md

@@ -13,8 +13,8 @@ This playbook takes a defect in behaviour that already exists to a pull request.
 
    Show the whole plan and name the file only as `intent/<short-description>/plan.md`. In plan mode you cannot write the file. Show the plan as the plan.
 
-5. **Gate: the engineer accepts the plan.** Ask whether an engineer could fix the defect from it, and for their GitHub handle when you cannot read it. Revise until they say yes. Change no code and commit nothing before that yes. In plan mode, approving the plan is that yes.
-6. Create the branch `fix/<short-description>` as `playbooks/open-pr.md` says. Set the plan's `Accepted by:` line, under its title, to the handle of the engineer who said yes in step 5, and commit `intent/<short-description>/plan.md` as the first commit.
+5. **Gate: the engineer accepts the plan.** Commit `intent/<short-description>/plan.md` on a new branch, with the `Accepted by:` line as the template has it, push it, and open a pull request that changes no file outside `intent/`, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests. Revise the plan as the engineer asks; each revision is a commit on that branch. The engineer merges that pull request to accept the plan, or closes it to reject it. You never merge it, and you change no file outside `intent/` before it is merged. In plan mode, the engineer's approval lets you write the file and open this pull request; it is not the acceptance. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+6. When the plan's pull request is merged, create the branch `fix/<short-description>` as `playbooks/open-pr.md` says. In its first commit, set the plan's `Accepted by:` line, under its title, to the account that merged that pull request, read from the host. When you cannot read the host, write the handle the engineer gives. Never write a handle the host or the engineer did not give.
 7. Reproduce the defect as a test. Run it and check that it fails for the reason the cause gives. Commit the failing test before any fix.
 8. Make the test pass without editing it.
 9. Run every check the project's agent instructions name. Keep the output. When one fails, fix the code, and never skip, delete, or weaken a test. When a check cannot run in this session, say which one and why, and never report it as passed.

package/templates/base/plugins/sdlc/claude-code/skills/sdlc-mode/playbooks/plan.md

@@ -3,14 +3,14 @@
 This playbook writes the intent. The build plan, `intent/<change>/plan.md`, comes later and is not written here.
 
 1. Let the originator describe the problem in their own words: what they cannot do today, who is affected, what better looks like, and what is out of scope.
-2. Read the code, the docs, and the existing `intent/` folders. Find the rest yourself: the author, for one, is `git config user.name`.
+2. Read the code, the docs, and the existing `intent/` folders. Find the rest yourself. The author is the originator's handle on the host: read it from the host when the session shows whose account it runs as, and ask for it otherwise. Never take it from `git config user.name`, which names the machine's user.
 3. Interview until the originator has said four things: the problem, the outcome, the constraints, and what is out of scope. The outcome is what the user would see.
    - **When all four are already said, go to step 4 in the same turn.**
    - **When one is missing, ask and stop.** Write no draft in that turn. Ask in rounds. Each round holds only questions that do not depend on another question in the same round. Number the questions. Each asks one thing and carries a concrete answer you recommend, worded so "yes" accepts it. A recommended answer is a fact or a choice, such as "Recommended: only the checkout page", never an instruction to the person. When you have no answer to recommend, write "No recommendation" and ask plainly. Wait for the answers, and build the next round on them.
 4. Write `intent/<change>/intent.md` from the template below, where `<change>` is a short kebab-case name. Use exactly the template's five headings. What is out of scope goes under **Proposed outcome**. Anything else that is unknown, unverified, or not yet decided goes under **Open questions**. Write "None" only when nothing is, and never list what the originator already answered. Show the whole draft, and name the file only as `intent/<change>/intent.md`. In plan mode you cannot write the file. Show the draft as the plan, and write the file once it is approved.
 5. **Gate: the originator corrects the draft.** Ask whether it matches what they meant, and revise until they say yes. Commit nothing, push nothing, and open no pull request before that yes. In plan mode, the originator approving the plan is that yes.
 6. Commit `intent.md` on a new branch, push it, and open a pull request ready for review, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests.
-7. **Gate: the product owner accepts or rejects the intent.** The product owner merges the pull request to accept the intent, or closes it to reject it. You do neither. The file stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the spec's pull request sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+7. **Gate: the product owner accepts or rejects the intent.** The product owner merges the pull request to accept the intent, or closes it to reject it. You do neither. When the originator is not the person who merges, the originator is the pull request's author or approves it; say so when neither holds. The file stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the spec's pull request sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
 
 **Next:** `playbooks/design.md`; an agent; when the product owner has merged the intent's pull request and a person or a job asks for the spec.
 
@@ -19,7 +19,7 @@ This playbook writes the intent. The build plan, `intent/<change>/plan.md`, come
 ```markdown
 # Intent: <title>
 
-Author: <name> (<team>). Status: draft.
+Author: @<handle> (<team>). Status: draft.
 
 ## Problem
 

package/templates/base/plugins/sdlc/cursor/skills/sdlc-mode/SKILL.md

@@ -14,7 +14,7 @@ Do these steps in order.
    | :---------------------------------------------------------------------------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------- |
    | A question, or a request to explain something without changing anything                                                 | Follow [`playbooks/question.md`](playbooks/question.md).                                                                       |
    | A spec for an intent, or a path to an `intent.md`                                                                       | Follow [`playbooks/design.md`](playbooks/design.md).                                                                           |
-   | A build for a spec, a path to a `spec.md`, or a plan the engineer accepted                                              | Follow [`playbooks/build.md`](playbooks/build.md).                                                                             |
+   | A build for a spec, a path to a `spec.md`, or a plan the engineer merged                                                | Follow [`playbooks/build.md`](playbooks/build.md).                                                                             |
    | A review or check of a pull request or a branch, a failing check on a pull request, or a pull request to drive to green | Follow [`playbooks/review.md`](playbooks/review.md).                                                                           |
    | A deploy, a promotion to an environment, or a release to production                                                     | Follow [`playbooks/deploy.md`](playbooks/deploy.md).                                                                           |
    | A finding sent by a job, a monitor, or a trigger, or one the message says no person can answer questions about          | Follow [`playbooks/maintain.md`](playbooks/maintain.md).                                                                       |

package/templates/base/plugins/sdlc/cursor/skills/sdlc-mode/playbooks/build.md

@@ -5,11 +5,11 @@ This playbook turns a merged spec into a plan the engineer accepts, and then int
 1. Find the change: the `intent/<change>/` folder whose `spec.md` or `plan.md` the request names. Its `spec.md` must be on the default branch beside its `intent.md`. In each case below, say only that, in two or three lines, and stop: write no file.
    - The request names no change, or the folder has no `spec.md` on any branch: list each `intent/*/` on the default branch that has a `spec.md` and no `plan.md`, or say that there is none.
    - The spec exists only on another branch: say that the spec is not merged yet, and name that branch.
-   - `intent/<change>/plan.md` is already on the default branch: say that the plan is merged, name the file, and say that the change is built only when each requirement of `spec.md` is checked against the tree.
+   - `intent/<change>/plan.md` is on the default branch and `spec.md` says `Status: done.`: say that the change is built, and name both files.
 
    When the request is a bug fix with no spec, none of these cases applies: follow `playbooks/fix.md` instead.
 
-2. When `intent/<change>/plan.md` exists on a branch that is not merged, check out that branch. When the request says the plan is accepted, go to step 6. Otherwise show that plan and go to step 5.
+2. When `intent/<change>/plan.md` is on the default branch, the engineer accepted it by merging its pull request: go to step 6. When it exists only on a branch that is not merged, check out that branch, show that plan, and go to step 5.
 3. Read `intent.md`, `spec.md`, the four policies, found as `playbooks/design.md` step 2 says, and the code the change touches. Start from the accepted spec, in the agent tool's plan mode when it has one, and give the plan the change's `intent.md` and `spec.md`. Then interview the engineer until they have said four things: the files the change touches, the order of the work, the tests that prove it, and each option they rule out.
    - **When all four are already said, in the request or in the files, go to step 4 in the same turn.**
    - **When one is missing, ask and stop.** Write no plan in that turn. Ask in rounds, as step 3 of `playbooks/plan.md` does: numbered questions, each with a recommended answer or "No recommendation". Wait for the answers, and build the next round on them.
@@ -21,8 +21,8 @@ This playbook turns a merged spec into a plan the engineer accepts, and then int
 
    Show the whole plan and name the file only as `intent/<change>/plan.md`. In plan mode you cannot write the file. Show the plan as the plan.
 
-5. **Gate: the engineer accepts the plan.** Ask whether an engineer could build from it, and for their GitHub handle when you cannot read it. Revise until they say yes. Change no code and commit nothing before that yes. In plan mode, approving the plan is that yes. When the spec classes the change as higher risk, say that a tech lead or an architect accepts the plan with the engineer.
-6. Create the branch as `playbooks/open-pr.md` says, unless step 2 checked one out. Set the plan's `Accepted by:` line, under its title, to the handle of the engineer who said yes in step 5 or whom the request names, and commit `intent/<change>/plan.md` before any other change. In that commit, set the spec's status line to `Status: accepted.`, because its pull request is merged.
+5. **Gate: the engineer accepts the plan.** Commit `intent/<change>/plan.md` on a new branch, with the `Accepted by:` line as the template has it. In that commit, set the spec's status line to `Status: accepted.`, because its pull request is merged. Push the branch and open a pull request that changes no file outside `intent/`, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests. Revise the plan as the engineer asks; each revision is a commit on that branch. The engineer merges that pull request to accept the plan, or closes it to reject it. You never merge it, and you change no file outside `intent/` before it is merged. In plan mode, the engineer's approval lets you write the file and open this pull request; it is not the acceptance. When the spec classes the change as higher risk, say that a tech lead or an architect approves that pull request before it is merged. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+6. When the plan's pull request is merged, create a new branch as `playbooks/open-pr.md` says. In its first commit, set the plan's `Accepted by:` line, under its title, to the account that merged that pull request, read from the host. When that pull request has an approving review from a second person, add `Also accepted by: @<handle>.` on the next line. When you cannot read the host, write the handle the engineer gives. Never write a handle the host or the engineer did not give.
 7. Implement the plan in its order. After each step, run the check that proves it and fix what fails. For a bug fix, follow `playbooks/fix.md` steps 7 and 8: commit the failing test on a `fix/` branch, and the gate then blocks test edits. When the work departs from the plan, change `plan.md` in the same commit. When the change meets the last requirement of `spec.md`, set `Status: done.` in `intent.md` and `spec.md`.
 8. Run every check the project's agent instructions name and keep the output. Every check must pass: fix the code, and never skip, delete, or weaken a test. Then run the `verifier` subagent and fix what it reports. Start it on the model that `.agents/sdlc-models.md` names after `verify:`, at the effort on that line when the session can set one; when you cannot start a subagent, do what `../../../agents/verifier.md`, relative to this playbook, says yourself. For UI work, when the session has a browser tool, also close the loop with a visual check: start the app, give the browser tool the page and the mock the spec or the request names, screenshot, compare, and adjust, and repeat until it matches; two or three rounds is normal. When a check cannot run in this session, say which one and why, and never report it as passed.
 9. Go on in the same turn, without asking: follow `playbooks/open-pr.md`, and then `playbooks/review.md`. Pushing the branch and opening the pull request are part of this task.

package/templates/base/plugins/sdlc/cursor/skills/sdlc-mode/playbooks/design.md

@@ -8,14 +8,14 @@ This playbook turns a merged intent into the requirements and design spec.
    - `spec.md` already exists: say so and name the file.
 2. Read the four policies, every time, before you write: for each of `brand`, `security`, `compliance`, and `ux`, read the project's `.agents/skills/<area>-policy/SKILL.md` when it exists, and the plugin's default at `../../<area>-policy/SKILL.md`, relative to this playbook, otherwise. Then read the code and the docs the change touches.
 3. Write `intent/<change>/spec.md` from the template below. Use exactly the template's headings.
-   - **Request:** under the status line, quote the words of the request that started this spec.
+   - **Request:** under the status line, quote the words of the request that started this spec. End the line with `Skills at <hash>.`, the short hash of the last commit that changed the plugin's files in this repository: `git log -1 --format=%h -- plugins/sdlc`. When the plugin is not in this repository, write `Skills at unknown.`
    - **Requirements:** numbered. Each one states a result a test or a reader can check.
    - **Design:** how the change fits the existing code: the files that change, and what each one does afterwards.
    - **Policies:** one line for each of the four policies. State which rules of that policy the change must meet, each as a requirement number, or write "Does not apply" and why.
-   - **Areas of concern:** a policy rule the change cannot meet, two policies that contradict, or a decision the files do not settle. Give each one a number and the policy it comes from. Write "None" only when there are none.
+   - **Areas of concern:** a policy rule the change cannot meet, two policies that contradict, or a decision the files do not settle. Give each one a number and the policy it comes from. Under each, on a line of its own, write `Decision: <the decision you propose>.` Write "None" only when there are none.
    - **Open questions:** each open question from `intent.md`, answered with its evidence or carried forward. Write "None" only when the intent has none.
 4. Commit `spec.md` on a new branch. In the same commit, set the intent's status line to `Status: accepted.`, because its pull request is merged. Push the branch, and open a pull request ready for review, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests. When you cannot open a pull request from this session, say so and give the pushed branch's name.
-5. **Gate: the product owner reviews the spec.** The product owner resolves each area of concern with its policy owner, then merges the pull request to accept the spec, or closes it to reject it. For a change the spec classes as higher risk, the product owner consults a tech lead before accepting. You do none of these. The spec stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the plan's commit sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+5. **Gate: the product owner reviews the spec.** The product owner corrects the `Decision:` line under each area of concern, with its policy owner, then merges the pull request to accept the spec and those decisions as written, or closes it to reject it. Change a `Decision:` line when they tell you its text. For a change the spec classes as higher risk, the product owner consults a tech lead before accepting. You do none of these. The spec stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the plan's commit sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
 
 **Next:** `playbooks/build.md`; an engineer with an agent; when the product owner has merged the spec's pull request and the engineer sends `/sdlc:sdlc-mode build` with the spec's path.
 

package/templates/base/plugins/sdlc/cursor/skills/sdlc-mode/playbooks/fix.md

@@ -13,8 +13,8 @@ This playbook takes a defect in behaviour that already exists to a pull request.
 
    Show the whole plan and name the file only as `intent/<short-description>/plan.md`. In plan mode you cannot write the file. Show the plan as the plan.
 
-5. **Gate: the engineer accepts the plan.** Ask whether an engineer could fix the defect from it, and for their GitHub handle when you cannot read it. Revise until they say yes. Change no code and commit nothing before that yes. In plan mode, approving the plan is that yes.
-6. Create the branch `fix/<short-description>` as `playbooks/open-pr.md` says. Set the plan's `Accepted by:` line, under its title, to the handle of the engineer who said yes in step 5, and commit `intent/<short-description>/plan.md` as the first commit.
+5. **Gate: the engineer accepts the plan.** Commit `intent/<short-description>/plan.md` on a new branch, with the `Accepted by:` line as the template has it, push it, and open a pull request that changes no file outside `intent/`, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests. Revise the plan as the engineer asks; each revision is a commit on that branch. The engineer merges that pull request to accept the plan, or closes it to reject it. You never merge it, and you change no file outside `intent/` before it is merged. In plan mode, the engineer's approval lets you write the file and open this pull request; it is not the acceptance. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+6. When the plan's pull request is merged, create the branch `fix/<short-description>` as `playbooks/open-pr.md` says. In its first commit, set the plan's `Accepted by:` line, under its title, to the account that merged that pull request, read from the host. When you cannot read the host, write the handle the engineer gives. Never write a handle the host or the engineer did not give.
 7. Reproduce the defect as a test. Run it and check that it fails for the reason the cause gives. Commit the failing test before any fix.
 8. Make the test pass without editing it.
 9. Run every check the project's agent instructions name. Keep the output. When one fails, fix the code, and never skip, delete, or weaken a test. When a check cannot run in this session, say which one and why, and never report it as passed.

package/templates/base/plugins/sdlc/cursor/skills/sdlc-mode/playbooks/plan.md

@@ -3,14 +3,14 @@
 This playbook writes the intent. The build plan, `intent/<change>/plan.md`, comes later and is not written here.
 
 1. Let the originator describe the problem in their own words: what they cannot do today, who is affected, what better looks like, and what is out of scope.
-2. Read the code, the docs, and the existing `intent/` folders. Find the rest yourself: the author, for one, is `git config user.name`.
+2. Read the code, the docs, and the existing `intent/` folders. Find the rest yourself. The author is the originator's handle on the host: read it from the host when the session shows whose account it runs as, and ask for it otherwise. Never take it from `git config user.name`, which names the machine's user.
 3. Interview until the originator has said four things: the problem, the outcome, the constraints, and what is out of scope. The outcome is what the user would see.
    - **When all four are already said, go to step 4 in the same turn.**
    - **When one is missing, ask and stop.** Write no draft in that turn. Ask in rounds. Each round holds only questions that do not depend on another question in the same round. Number the questions. Each asks one thing and carries a concrete answer you recommend, worded so "yes" accepts it. A recommended answer is a fact or a choice, such as "Recommended: only the checkout page", never an instruction to the person. When you have no answer to recommend, write "No recommendation" and ask plainly. Wait for the answers, and build the next round on them.
 4. Write `intent/<change>/intent.md` from the template below, where `<change>` is a short kebab-case name. Use exactly the template's five headings. What is out of scope goes under **Proposed outcome**. Anything else that is unknown, unverified, or not yet decided goes under **Open questions**. Write "None" only when nothing is, and never list what the originator already answered. Show the whole draft, and name the file only as `intent/<change>/intent.md`. In plan mode you cannot write the file. Show the draft as the plan, and write the file once it is approved.
 5. **Gate: the originator corrects the draft.** Ask whether it matches what they meant, and revise until they say yes. Commit nothing, push nothing, and open no pull request before that yes. In plan mode, the originator approving the plan is that yes.
 6. Commit `intent.md` on a new branch, push it, and open a pull request ready for review, as the opening paragraph of `playbooks/open-pr.md` says for branches and pull requests.
-7. **Gate: the product owner accepts or rejects the intent.** The product owner merges the pull request to accept the intent, or closes it to reject it. You do neither. The file stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the spec's pull request sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
+7. **Gate: the product owner accepts or rejects the intent.** The product owner merges the pull request to accept the intent, or closes it to reject it. You do neither. When the originator is not the person who merges, the originator is the pull request's author or approves it; say so when neither holds. The file stays `Status: draft.`: never write `Status: accepted.` in this pull request, because the spec's pull request sets it. Report the pull request's URL, keep it green as `playbooks/review.md` says, and wait.
 
 **Next:** `playbooks/design.md`; an agent; when the product owner has merged the intent's pull request and a person or a job asks for the spec.
 
@@ -19,7 +19,7 @@ This playbook writes the intent. The build plan, `intent/<change>/plan.md`, come
 ```markdown
 # Intent: <title>
 
-Author: <name> (<team>). Status: draft.
+Author: @<handle> (<team>). Status: draft.
 
 ## Problem
 

package/templates/base/scripts/check-plan.ts

@@ -3,30 +3,15 @@ import {existsSync, mkdtempSync, readdirSync, readFileSync, rmSync, writeFileSyn
 import path from "node:path";
 import {tmpdir} from "node:os";
 
-type BranchChanges = {
-  changedPaths: string[];
-  headCommit: string;
-  mergeBase: string;
-};
-
-type SelfTestCase = {
-  expectedMessagePart?: string;
-  name: string;
-  problems: string[];
-};
-
 const defaultBranch = "origin/main";
 const intentDirectory = "intent";
-const planFileName = "plan.md";
-const specFileName = "spec.md";
-const intentFileName = "intent.md";
-const proofHeading = "## Proof";
-const requirementsHeading = "## Requirements";
-const acceptancePlaceholder = "@<engineer>";
 const statusLineLimit = 5;
 const acceptedByPrefix = "Accepted by: ";
-const acceptedByPattern = /^Accepted by: @[\dA-Za-z][\dA-Za-z-]*\.$/;
-const requiredHeadings = ["## Files that change", "## Order of work", "## Risks", proofHeading];
+
+type PlanMerge = {
+  approvers: string[];
+  mergedBy: string;
+};
 
 /**
  * Run git in the current directory.
@@ -40,52 +25,6 @@ function runGit(gitArguments: string[]): string {
   }).trim();
 }
 
-/**
- * Find what this branch changed since it left the default branch.
- * @returns The merge base, HEAD, and the changed paths, or undefined when the default branch is not available.
- */
-function findBranchChanges(): BranchChanges | undefined {
-  try {
-    const mergeBase = runGit(["merge-base", "HEAD", defaultBranch]);
-
-    return {
-      mergeBase,
-      headCommit: runGit(["rev-parse", "HEAD"]),
-      changedPaths: runGit(["diff", "--name-only", `${mergeBase}...HEAD`])
-        .split("\n")
-        .filter(changedPath => changedPath !== ""),
-    };
-  } catch {
-    return undefined;
-  }
-}
-
-/**
- * Tell whether a plan must name its accepting engineer: the branch changes a file outside `intent/`.
- * @param branchChanges What the branch changed, or undefined when no merge base was found.
- * @returns False when there is no merge base or HEAD is the default branch tip.
- */
-function requiresAcceptance(branchChanges: BranchChanges | undefined): boolean {
-  return (
-    branchChanges !== undefined &&
-    branchChanges.mergeBase !== branchChanges.headCommit &&
-    branchChanges.changedPaths.some(changedPath => !changedPath.startsWith(`${intentDirectory}/`))
-  );
-}
-
-/**
- * Say why the acceptance rule cannot run.
- * @param branchChanges What the branch changed, or undefined when no merge base was found.
- * @returns A problem when the default branch is not available, otherwise undefined.
- */
-function describeMissingDefaultBranch(
-  branchChanges: BranchChanges | undefined,
-): string | undefined {
-  return branchChanges === undefined
-    ? `${defaultBranch} cannot be found, so the "${acceptedByPrefix}" rule cannot be applied; run "git fetch origin main" to apply it`
-    : undefined;
-}
-
 /**
  * Blank every line of a fenced code block, keeping line numbers.
  * @param lines Document lines.
@@ -148,6 +87,217 @@ function readSection(maskedLines: string[], heading: string): string[] | undefin
   return bounds === undefined ? undefined : maskedLines.slice(...bounds);
 }
 
+const concernsHeading = "## Areas of concern";
+const decisionPrefix = "Decision: ";
+const decisionPattern = /^ *Decision: \S/mu;
+const alsoAcceptedByPrefix = "Also accepted by: ";
+const hostTokenVariable = "GH_TOKEN";
+const hostRepositoryPath = "repos/{owner}/{repo}";
+const authorPrefix = "Author: ";
+const authorPattern = /^Author: @[\dA-Za-z][\dA-Za-z-]*[ .]/;
+const alsoAcceptedByPattern = /^Also accepted by: @([\dA-Za-z][\dA-Za-z-]*)\.$/;
+
+type BranchChanges = {
+  changedPaths: string[];
+  headCommit: string;
+  mergeBase: string;
+};
+
+type SelfTestCase = {
+  expectedMessagePart?: string;
+  name: string;
+  problems: string[];
+};
+
+/**
+ * Find a plan that this branch adds together with a change outside `intent/`.
+ * @param isMerged Whether the default branch already holds the plan.
+ * @param isAcceptanceRequired Whether the branch changes a file outside `intent/`.
+ * @returns At most one message.
+ */
+function findUnmergedPlanProblems(isMerged: boolean, isAcceptanceRequired: boolean): string[] {
+  return isMerged || !isAcceptanceRequired
+    ? []
+    : [
+        `the plan is not on ${defaultBranch} and this branch changes a file outside ${intentDirectory}/; an engineer accepts a plan by merging the pull request that holds only it, so open that pull request and build on a new branch after it is merged`,
+      ];
+}
+
+/**
+ * Compare the plan's accepting handles with the host's record of its pull request.
+ * @param maskedLines Plan lines with fenced code blocks emptied.
+ * @param planMerge Who merged the pull request that last changed the plan, and who approved it.
+ * @returns One message per handle the host does not confirm.
+ */
+function findHostAcceptanceProblems(maskedLines: string[], planMerge: PlanMerge): string[] {
+  const acceptedLine = maskedLines.slice(1).find(line => line.trim() !== "") ?? "";
+  const accepter = acceptedLine.trimEnd().slice(acceptedByPrefix.length + 1, -1);
+  const secondAccepter = readSecondAccepter(maskedLines)?.toLowerCase();
+  const merger = planMerge.mergedBy.toLowerCase();
+  const approvers = planMerge.approvers.map(approver => approver.toLowerCase());
+
+  const mergerProblems =
+    accepter.toLowerCase() === merger
+      ? []
+      : [
+          `the "${acceptedByPrefix}" line names @${accepter}, and the host shows that @${planMerge.mergedBy} merged the plan's pull request; write the account that merged it`,
+        ];
+
+  const isSecondConfirmed =
+    secondAccepter === undefined ||
+    (secondAccepter !== merger && approvers.includes(secondAccepter));
+
+  return isSecondConfirmed
+    ? mergerProblems
+    : [
+        ...mergerProblems,
+        `the "${alsoAcceptedByPrefix}" line names a second person, and the host shows no approving review from that account on the plan's pull request; write "${alsoAcceptedByPrefix}@<handle>." with the account that approved it`,
+      ];
+}
+
+/**
+ * Find each numbered area of concern in a spec that carries no decision.
+ * @param specText Spec content.
+ * @returns At most one message, which names the numbers.
+ */
+function findDecisionProblems(specText: string): string[] {
+  const undecidedNumbers = (
+    readSection(maskFencedBlocks(splitLines(specText)), concernsHeading) ?? []
+  )
+    .join("\n")
+    .split(/^(?=\d+\. )/mu)
+    .filter(concern => /^\d+\. /u.test(concern) && !decisionPattern.test(concern))
+    .map(concern => /^\d+/u.exec(concern)?.[0]);
+
+  return undecidedNumbers.length === 0
+    ? []
+    : [
+        `area of concern ${undecidedNumbers.join(", ")} has no "${decisionPrefix}<the decision>." line under it; write the proposed decision there, and the product owner corrects it before merging the spec`,
+      ];
+}
+
+/**
+ * Find an intent whose author is not a handle on the host.
+ * @param intentText Intent content.
+ * @returns At most one message.
+ */
+function findAuthorProblems(intentText: string): string[] {
+  const authorLine = splitLines(intentText).find(line => line.startsWith(authorPrefix));
+
+  return authorLine !== undefined && authorPattern.test(authorLine)
+    ? []
+    : [
+        `the "${authorPrefix}" line holds no handle; write "${authorPrefix}@<handle> (<team>)." with the originator's account on the host`,
+      ];
+}
+
+/**
+ * Ask the host who merged the pull request that last changed a plan on the default branch, and who approved it.
+ * @param mergeBase The commit this branch left the default branch at.
+ * @param planPath Path of the plan.
+ * @returns The merging account and the approving accounts, or undefined when the host cannot be read.
+ */
+function readPlanMerge(mergeBase: string, planPath: string): PlanMerge | undefined {
+  if (process.env[hostTokenVariable] === undefined || process.env[hostTokenVariable] === "") {
+    return undefined;
+  }
+
+  try {
+    const commit = runGit(["log", "-1", "--format=%H", mergeBase, "--", planPath]);
+    const pullRequest = runHost(`${hostRepositoryPath}/commits/${commit}/pulls`, ".[0].number");
+    const pullRequestPath = `${hostRepositoryPath}/pulls/${pullRequest}`;
+    const mergedBy = runHost(pullRequestPath, ".merged_by.login");
+    const approvedFilter = '.[] | select(.state == "APPROVED") | .user.login';
+    const approvers = runHost(`${pullRequestPath}/reviews`, approvedFilter);
+
+    return {
+      mergedBy,
+      approvers: approvers.split("\n").filter(approver => approver !== ""),
+    };
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Call the host's API through its command-line tool.
+ * @param apiPath Path after `gh api`.
+ * @param filter The jq filter applied to the answer.
+ * @returns Trimmed standard output.
+ */
+function runHost(apiPath: string, filter: string): string {
+  return execFileSync("gh", ["api", apiPath, "--jq", filter], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+  }).trim();
+}
+
+/**
+ * Read the handle on the plan's `Also accepted by:` line.
+ * @param maskedLines Plan lines with fenced code blocks emptied.
+ * @returns The handle, an empty string when the line is malformed, or undefined when there is no such line.
+ */
+function readSecondAccepter(maskedLines: string[]): string | undefined {
+  const line = maskedLines.find(planLine => planLine.startsWith(alsoAcceptedByPrefix));
+
+  return line === undefined ? undefined : (alsoAcceptedByPattern.exec(line.trimEnd())?.[1] ?? "");
+}
+
+const planFileName = "plan.md";
+const specFileName = "spec.md";
+const intentFileName = "intent.md";
+const proofHeading = "## Proof";
+const requirementsHeading = "## Requirements";
+const acceptancePlaceholder = "@<engineer>";
+const acceptedByPattern = /^Accepted by: @[\dA-Za-z][\dA-Za-z-]*\.$/;
+const requiredHeadings = ["## Files that change", "## Order of work", "## Risks", proofHeading];
+
+/**
+ * Find what this branch changed since it left the default branch.
+ * @returns The merge base, HEAD, and the changed paths, or undefined when the default branch is not available.
+ */
+function findBranchChanges(): BranchChanges | undefined {
+  try {
+    const mergeBase = runGit(["merge-base", "HEAD", defaultBranch]);
+
+    return {
+      mergeBase,
+      headCommit: runGit(["rev-parse", "HEAD"]),
+      changedPaths: runGit(["diff", "--name-only", `${mergeBase}...HEAD`])
+        .split("\n")
+        .filter(changedPath => changedPath !== ""),
+    };
+  } catch {
+    return undefined;
+  }
+}
+
+/**
+ * Tell whether a plan must name its accepting engineer: the branch changes a file outside `intent/`.
+ * @param branchChanges What the branch changed, or undefined when no merge base was found.
+ * @returns False when there is no merge base or HEAD is the default branch tip.
+ */
+function requiresAcceptance(branchChanges: BranchChanges | undefined): boolean {
+  return (
+    branchChanges !== undefined &&
+    branchChanges.mergeBase !== branchChanges.headCommit &&
+    branchChanges.changedPaths.some(changedPath => !changedPath.startsWith(`${intentDirectory}/`))
+  );
+}
+
+/**
+ * Say why the acceptance rule cannot run.
+ * @param branchChanges What the branch changed, or undefined when no merge base was found.
+ * @returns A problem when the default branch is not available, otherwise undefined.
+ */
+function describeMissingDefaultBranch(
+  branchChanges: BranchChanges | undefined,
+): string | undefined {
+  return branchChanges === undefined
+    ? `${defaultBranch} cannot be found, so the "${acceptedByPrefix}" rule cannot be applied; run "git fetch origin main" to apply it`
+    : undefined;
+}
+
 /**
  * Quote each heading and join them for a message.
  * @param headings Heading texts.
@@ -520,6 +670,26 @@ function createChangeFolder(fileNames: string[]): string {
 const fixPlanFolder = createChangeFolder([planFileName]);
 const intentOnlyFolder = createChangeFolder([intentFileName, planFileName]);
 const specOnlyFolder = createChangeFolder([specFileName, planFileName]);
+const onePlanLines = splitLines(buildPlan({}));
+
+const twoPlanLines = splitLines(
+  buildPlan({
+    accepted: `${engineerLine}\n${alsoAcceptedByPrefix}@lead.`,
+  }),
+);
+
+/**
+ * Build the host's record of a plan's pull request, for a self-test.
+ * @param mergedByLogin The account that merged it.
+ * @param approvers The accounts that approved it.
+ * @returns The record.
+ */
+function hostRecord(mergedByLogin: string, approvers: string[]): PlanMerge {
+  return {
+    approvers,
+    mergedBy: mergedByLogin,
+  };
+}
 
 const selfTestCases: SelfTestCase[] = [
   {
@@ -843,6 +1013,80 @@ const selfTestCases: SelfTestCase[] = [
       false,
     ),
   },
+  {
+    name: "a plan added together with code",
+    expectedMessagePart: `is not on ${defaultBranch}`,
+    problems: findUnmergedPlanProblems(false, true),
+  },
+  {
+    name: "a plan added alone",
+    problems: findUnmergedPlanProblems(false, false),
+  },
+  {
+    name: "a plan that is on the default branch, built with code",
+    problems: findUnmergedPlanProblems(true, true),
+  },
+  {
+    name: "the accepting handle is the account that merged, in another letter case",
+    problems: findHostAcceptanceProblems(onePlanLines, hostRecord("Engineer", [])),
+  },
+  {
+    name: "the accepting handle is not the account that merged",
+    expectedMessagePart: "@someone-else merged",
+    problems: findHostAcceptanceProblems(onePlanLines, hostRecord("someone-else", [])),
+  },
+  {
+    name: "the second accepter approved the plan's pull request",
+    problems: findHostAcceptanceProblems(twoPlanLines, hostRecord("engineer", ["lead"])),
+  },
+  {
+    name: "the second accepter gave no approving review",
+    expectedMessagePart: "no approving review",
+    problems: findHostAcceptanceProblems(twoPlanLines, hostRecord("engineer", [])),
+  },
+  {
+    name: "the second accepter is the account that merged",
+    expectedMessagePart: "no approving review",
+    problems: findHostAcceptanceProblems(
+      splitLines(
+        buildPlan({
+          accepted: `${engineerLine}\n${alsoAcceptedByPrefix}@engineer.`,
+        }),
+      ),
+      hostRecord("engineer", ["engineer"]),
+    ),
+  },
+  {
+    name: "every area of concern has a decision",
+    problems: findDecisionProblems(
+      `${concernsHeading}\n\n1. A.\n   ${decisionPrefix}yes.\n2. B.\n   ${decisionPrefix}no.\n\n## Open questions\n`,
+    ),
+  },
+  {
+    name: "a spec with no area of concern",
+    problems: findDecisionProblems(`${concernsHeading}\n\nNone\n\n## Open questions\n`),
+  },
+  {
+    name: "an area of concern has no decision",
+    expectedMessagePart: "area of concern 2 has no",
+    problems: findDecisionProblems(
+      `${concernsHeading}\n\n1. A.\n   ${decisionPrefix}yes.\n2. B.\n\n## Open questions\n`,
+    ),
+  },
+  {
+    name: "a decision line with no text is not a decision",
+    expectedMessagePart: "area of concern 1 has no",
+    problems: findDecisionProblems(`${concernsHeading}\n\n1. A.\n   ${decisionPrefix}\n`),
+  },
+  {
+    name: "an intent whose author is a handle",
+    problems: findAuthorProblems("# Intent: A\n\nAuthor: @originator (Team). Status: draft.\n"),
+  },
+  {
+    name: "an intent whose author is a name",
+    expectedMessagePart: "holds no handle",
+    problems: findAuthorProblems("# Intent: A\n\nAuthor: A Person (Team). Status: draft.\n"),
+  },
 ];
 
 /**
@@ -945,17 +1189,27 @@ function findPlanLines(planPaths: string[]): string[] {
         `${planPath}: the file does not exist; pass the path of an existing ${planFileName}`,
     );
 
-  const checkedLines = planPaths
+  const changedPlanPaths = planPaths
     .filter(planPath => existsSync(planPath))
     .filter(
       planPath =>
         branchChanges === undefined ||
         readDefaultBranchFile(branchChanges.mergeBase, planPath) !==
           readFileSync(planPath, "utf8").trim(),
-    )
-    .flatMap(planPath => findPlanFileLines(planPath, isAcceptanceRequired));
+    );
+
+  const checkedLines = changedPlanPaths.flatMap(planPath =>
+    findPlanFileLines(planPath, isAcceptanceRequired),
+  );
+
+  const acceptanceLines =
+    branchChanges === undefined
+      ? []
+      : changedPlanPaths.flatMap(planPath =>
+          findPlanAcceptanceLines(planPath, branchChanges.mergeBase, isAcceptanceRequired),
+        );
 
-  return [...missingBranchLines, ...missingLines, ...checkedLines];
+  return [...missingBranchLines, ...missingLines, ...checkedLines, ...acceptanceLines];
 }
 
 /**
@@ -972,6 +1226,78 @@ function readDefaultBranchFile(mergeBase: string, filePath: string): string | un
   }
 }
 
+/**
+ * Check that a plan this branch builds was accepted by a merge, and by whom.
+ * @param planPath Path of the plan.
+ * @param mergeBase The commit this branch left the default branch at.
+ * @param isAcceptanceRequired Whether the branch changes a file outside `intent/`.
+ * @returns One line per problem.
+ */
+function findPlanAcceptanceLines(
+  planPath: string,
+  mergeBase: string,
+  isAcceptanceRequired: boolean,
+): string[] {
+  const isOnDefaultBranch = readDefaultBranchFile(mergeBase, planPath) !== undefined;
+  const unmergedProblems = findUnmergedPlanProblems(isOnDefaultBranch, isAcceptanceRequired);
+
+  if (!isAcceptanceRequired || unmergedProblems.length > 0) {
+    return unmergedProblems.map(message => `${planPath}: ${message}`);
+  }
+
+  const planMerge = readPlanMerge(mergeBase, planPath);
+
+  if (planMerge === undefined) {
+    process.stdout.write(
+      `${planPath}: the "${acceptedByPrefix}" handle was not checked against the host; set ${hostTokenVariable} and install gh to check who merged the plan's pull request\n`,
+    );
+
+    return [];
+  }
+
+  const planLines = splitLines(readFileSync(planPath, "utf8"));
+
+  return findHostAcceptanceProblems(maskFencedBlocks(planLines), planMerge).map(
+    message => `${planPath}: ${message}`,
+  );
+}
+
+/**
+ * Report each spec this branch adds or changes that leaves an area of concern undecided, and each intent it adds whose author is not a handle.
+ * @param changeFolders The `intent/<change>` folders.
+ * @returns One line per problem.
+ */
+function findRecordLines(changeFolders: string[]): string[] {
+  const branchChanges = changeFolders.length > 0 ? findBranchChanges() : undefined;
+
+  if (branchChanges === undefined) {
+    return [];
+  }
+
+  return changeFolders.flatMap(folder => {
+    const specPath = path.join(folder, specFileName);
+    const intentPath = path.join(folder, intentFileName);
+    const specText = readSpec(specPath);
+
+    const specProblems =
+      specText === undefined ||
+      readDefaultBranchFile(branchChanges.mergeBase, specPath) === specText.trim()
+        ? []
+        : findDecisionProblems(specText);
+
+    const authorProblems =
+      existsSync(intentPath) &&
+      readDefaultBranchFile(branchChanges.mergeBase, intentPath) === undefined
+        ? findAuthorProblems(readFileSync(intentPath, "utf8"))
+        : [];
+
+    return [
+      ...specProblems.map(message => `${specPath}: ${message}`),
+      ...authorProblems.map(message => `${intentPath}: ${message}`),
+    ];
+  });
+}
+
 /**
  * Report each intent and spec that this branch marks accepted before its pull request merged.
  * @param changeFolders The `intent/<change>` folders.
@@ -1034,6 +1360,7 @@ if (selfTestFailures.length > 0) {
     ...findPlanLines(planPaths),
     ...findMissingPlanLines(changeFolders),
     ...findAcceptedStatusLines(changeFolders),
+    ...findRecordLines(changeFolders),
   ];
 
   if (problemLines.length > 0) {

package/templates/base/.cursor/BUGBOT.md

@@ -1,23 +0,0 @@
-# Review rules
-
-Review pull requests against the project's agent guide and rules:
-
-- [Review instructions](../.agents/review.md)
-- [Agent guide](../AGENTS.md)
-- [Agent-Owned Work](../.agents/rules/agent-owned-work.md)
-- [Owned Checks](../.agents/rules/automation-owned-checks.md)
-- [Required Comments](../.agents/rules/code-comments.md)
-- [Codebase Hygiene](../.agents/rules/codebase-hygiene.md)
-- [Constitution Changes](../.agents/rules/constitution-changes.md)
-- [Current State](../.agents/rules/current-state-authority.md)
-- [Demand-Driven Configuration](../.agents/rules/demand-driven-configuration.md)
-- [Dependencies](../.agents/rules/dependency-security.md)
-- [Descriptive Naming](../.agents/rules/descriptive-naming.md)
-- [Test Admission](../.agents/rules/deterministic-testing.md)
-- [Diagnostics](../.agents/rules/diagnostics-and-error-handling.md)
-- [Evidence](../.agents/rules/evidence-before-claims.md)
-- [Findings](../.agents/rules/no-suppression.md)
-- [Platform and Library First](../.agents/rules/platform-and-library-first.md)
-- [Sibling Style](../.agents/rules/single-author-style.md)
-- [Logging](../.agents/rules/structured-logging.md)
-- [TypeScript-First](../.agents/rules/typescript-first.md)