Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/adr/ADR-028-work-claims-and-decision-ledger.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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<n>` citation in the repo already resolves to
attention-claims; moving this file breaks none of them.

## Why this is open

Expand Down
Loading