From 15adf2677e442df7b5510744ca62cee5b4c839a6 Mon Sep 17 00:00:00 2001
From: Crispin-2713 <crispin-2713@commons.astra.invalid>
Date: Mon, 19 Oct 2026 01:57:41 -0400
Subject: [PATCH] ci(changelog): count an edited pending fragment as the
 change's entry, not only an added one

A change whose entry belongs in a fragment already pending, such as a
follow-up to the change that added it, amends that fragment in place, and
the check counted added fragments alone (--diff-filter=A), so such a change
needed the 'no-changelog' label though it carries an entry (#540's case).
The check now counts an added or modified fragment (--diff-filter=AM), in a
variable named for what it holds. CONTRIBUTING.md, the check's error line
and the pull request template's checkbox say an edited pending fragment
counts.

A deleted fragment still doesn't count, as 7fc6a140 meant, and neither does
one git reports as a rename. Nor does an edit of changelog.d/README.md,
which isn't a fragment.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .github/PULL_REQUEST_TEMPLATE.md | 5 +++--
 .github/workflows/changelog.yml  | 9 +++++----
 CONTRIBUTING.md                  | 6 +++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2f9efbfe3..0cace7138 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,8 +21,9 @@
 
 ---
 
-- [ ] Changelog fragment added — `changelog.d/<slug>.<breaking|added|changed|fixed>.md`
-      (see `changelog.d/README.md`) — or this change is internal-only /
+- [ ] Changelog fragment added or a pending one edited —
+      `changelog.d/<slug>.<breaking|added|changed|fixed>.md` (see
+      `changelog.d/README.md`) — or this change is internal-only /
       test-only / docs-only (apply the `no-changelog` label).
 
 <!-- AI-assisted contributions are welcome and normal here — see
diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index 0580c09ad..3660cf8a6 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -23,15 +23,16 @@ jobs:
           base="${{ github.event.pull_request.base.sha }}"
           head="${{ github.event.pull_request.head.sha }}"
           changed=$(git diff --name-only "$base...$head")
-          # Fragments must be *added* — a deleted or renamed fragment also
+          # Fragments must be added or edited: a change may land its entry by
+          # editing a pending fragment. A deleted or renamed fragment also
           # appears in --name-only and must not satisfy the check.
-          added=$(git diff --name-only --diff-filter=A "$base...$head")
+          added_or_edited=$(git diff --name-only --diff-filter=AM "$base...$head")
           echo "Changed files:"
           echo "$changed"
           if echo "$changed" | grep -q '^src/' \
-             && ! echo "$added" | grep -Eq '^changelog\.d/[^/]+\.(breaking|added|changed|fixed)\.md$' \
+             && ! echo "$added_or_edited" | grep -Eq '^changelog\.d/[^/]+\.(breaking|added|changed|fixed)\.md$' \
              && ! echo "$changed" | grep -qx 'CHANGELOG.md'; then
-            echo "::error::This PR touches src/ but carries no changelog entry. Add a fragment changelog.d/<slug>.<breaking|added|changed|fixed>.md (see CONTRIBUTING.md), or apply the 'no-changelog' label if the change is internal-only."
+            echo "::error::This PR touches src/ but carries no changelog entry. Add a fragment changelog.d/<slug>.<breaking|added|changed|fixed>.md or edit a pending one (see CONTRIBUTING.md), or apply the 'no-changelog' label if the change is internal-only."
             exit 1
           fi
           echo "OK"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 56f95e717..23b3dcb07 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -116,9 +116,9 @@ never do.
   silently stranding an entry.
 - **The fragment lands with the change** — same commit, or at least the same
   PR. This binds direct pushes to `main` just as much as PRs. On PRs, CI
-  enforces it softly: touching `src/` without adding a fragment (or editing
-  `CHANGELOG.md`) fails the `changelog` check unless the `no-changelog`
-  label is applied.
+  enforces it softly: touching `src/` fails the `changelog` check unless the
+  PR adds a fragment, edits a pending one or edits `CHANGELOG.md`, or carries
+  the `no-changelog` label.
 - **What needs an entry:** anything a module developer, host, or downstream
   consumer would notice — behavior, event/trace surfaces, tool namespacing,
   config schema, agent state machine, public exports, defaults. Internal