From 4dbdf5f487de32f3e465d04c7fb9c8d45fa8b770 Mon Sep 17 00:00:00 2001 From: Lily Shen <115414357+lilyshen0722@users.noreply.github.com> Date: Tue, 1 Sep 2026 14:23:42 -0700 Subject: [PATCH] docs(adr): renumber the ADR-018 identity stub to ADR-030 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit main has carried two files named ADR-018 since 2026-08-11 — ADR-018-agent-identity.md (Proposed stub, merged 08-04) and ADR-018-agent-attention-claims.md (Accepted 08-17). Disjoint filenames share no text to conflict on and docs/adr/ has no index, so no check could see it. The stub is the determined mover, not a judgement call: it declares zero D-numbered decisions, so every `ADR-018 D` citation in the repo already resolves to attention-claims and this rename breaks none of them. Exactly one reference names the stub's filename — ADR-028's evidence bullet — updated in place, keeping the finding and correcting its tense. 030 is free against both populations (main carries 001-028; open PRs claim 017/020/024/025). 029 is left for the Connections ADR. Unblocks a duplicate-number guard on the merged tree, which goes red on main today for exactly this pair. Co-Authored-By: Claude Opus 5 --- docs/adr/ADR-028-work-claims-and-decision-ledger.md | 6 ++++-- ...{ADR-018-agent-identity.md => ADR-030-agent-identity.md} | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) rename docs/adr/{ADR-018-agent-identity.md => ADR-030-agent-identity.md} (92%) diff --git a/docs/adr/ADR-028-work-claims-and-decision-ledger.md b/docs/adr/ADR-028-work-claims-and-decision-ledger.md index 96b602e64..8a93db0de 100644 --- a/docs/adr/ADR-028-work-claims-and-decision-ledger.md +++ b/docs/adr/ADR-028-work-claims-and-decision-ledger.md @@ -94,10 +94,12 @@ This fleet has produced the evidence unprompted, in the repo, this week: surface #1234 had had open since 2026-08-25. Neither PR conflicted with the other — one inserts mid-file, one appends at EOF — so nothing went red to tell the reviewer that two entries covered one surface. -- **`main` has carried two files named `ADR-018` for 22 days.** `ADR-018-agent-identity.md` (merged +- **`main` carried two files named `ADR-018` for 22 days.** `ADR-018-agent-identity.md` (merged 2026-08-04) and `ADR-018-agent-attention-claims.md` (merged 2026-08-11). Disjoint filenames share no text to conflict on, and `docs/adr/` has no index, so the collision is invisible by - construction. + construction. The stub is renumbered to ADR-030 in the same change that carries this sentence; the + finding stands, because nothing detected the collision for 22 days and a third instance (ADR-025) + arrived before it was resolved. - **A conflict resolution was silently discarded, twice in one hour.** #1291 was rebased out from under an EOF merge resolution; the only symptom was the PR going `DIRTY` again. Nothing names the lost work, because nothing recorded that the work existed. diff --git a/docs/adr/ADR-018-agent-identity.md b/docs/adr/ADR-030-agent-identity.md similarity index 92% rename from docs/adr/ADR-018-agent-identity.md rename to docs/adr/ADR-030-agent-identity.md index 686a290f2..f04d67597 100644 --- a/docs/adr/ADR-018-agent-identity.md +++ b/docs/adr/ADR-030-agent-identity.md @@ -1,7 +1,11 @@ -# ADR-018 — Agent identity +# ADR-030 — Agent identity **Status:** Proposed (stub — decision not yet made) **Date opened:** 2026-08-01 +**Renumbered:** 2026-09-01, from ADR-018. `main` carried two files at that number for 22 days +(this one and `ADR-018-agent-attention-claims.md`, Accepted 2026-08-17). This document declares no +D-numbered decisions, so every `ADR-018 D` citation in the repo already resolves to +attention-claims; moving this file breaks none of them. ## Why this is open