From fa1eb32632e1298e23e1508e4eb7b7f4b53c941b Mon Sep 17 00:00:00 2001 From: Tri Lam Date: Thu, 14 May 2026 02:03:56 -0700 Subject: [PATCH] [m1.6] followups: close squash-merge-trailer item with observation PR-13 (commit a57883f) merged via GitHub's squash-merge. Observed: the per-commit Assisted-by trailers on the 43 source commits did NOT survive as trailers on the squash commit. The squash body includes the PR description with every source SHA, so the audit trail is intact; the trailer-level disclosure AGENTS.md describes is not. Two governance paths, neither chosen here: - update AGENTS.md to treat the PR-description SHA list as canonical squash-merge disclosure - switch AI-assisted PRs to merge-commit / rebase-merge so per-commit trailers survive Flagging for governance review; not a code fix. Signed-off-by: tree Assisted-by: Anthropic:claude-opus-4-7 [Claude Code] Signed-off-by: Tri Lam --- docs/FOLLOWUPS.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/docs/FOLLOWUPS.md b/docs/FOLLOWUPS.md index c7daac62..f7e771ad 100644 --- a/docs/FOLLOWUPS.md +++ b/docs/FOLLOWUPS.md @@ -72,10 +72,17 @@ Highest-leverage opportunistic items, in order: ### Release / governance -- [ ] **Verify squash-merge preserves `Assisted-by:` disclosure.** - AGENTS.md requires every commit authored with AI help to carry - an `Assisted-by:` trailer. *Trigger:* when M1.6's PR-13 - actually merges — observe what the squash commit looks like. +- [x] **Verify squash-merge preserves `Assisted-by:` disclosure.** + *Observed on PR-13 squash commit `a57883f`:* the per-commit + `Assisted-by:` trailers are NOT preserved as trailers on the + squash commit. The audit trail survives via the PR description + (which lists every source SHA) embedded in the squash body, but + the trailer-level disclosure AGENTS.md describes is gone. Two + follow-up paths, neither chosen here: (a) update AGENTS.md to + treat the PR-description SHA list as the canonical squash-merge + disclosure, or (b) switch AI-assisted PRs to merge-commit / + rebase-merge so per-commit trailers survive. **Policy decision + tracked but unchosen — flag for governance review.** ### Documentation @@ -111,3 +118,6 @@ Highest-leverage opportunistic items, in order: - [x] **One-paragraph doc.go in `internal/pipelinebuilder`** — landed in PR #13 (see `internal/pipelinebuilder/doc.go`). +- [x] **Verify squash-merge preserves `Assisted-by:` disclosure** — + observed on PR-13's `a57883f`; finding moved to "Release / + governance" above with the policy-decision flag.