Skip to content

fix(launchpad): renumber ADR-0015 -> ADR-0016 to resolve a merge collision - #195

Merged
tucktuck101 merged 1 commit into
launchpadfrom
fix/adr-0015-renumber-collision
Aug 18, 2026
Merged

tucktuck101 merged 1 commit into
launchpadfrom
fix/adr-0015-renumber-collision

Conversation

@serina-mcfall

@serina-mcfall serina-mcfall commented Aug 18, 2026 •

Copy link
Copy Markdown

Summary

Two PRs (#184 and #191) each computed "ADR-0015" as the next-free decision number and merged
minutes apart, leaving two files with that name in launchpad/decisions/. Renumbers the newer
one to ADR-0016 and fixes its two live GitHub references.

Related issue

Closes #197

Issue type

Bug


Agent provenance

Field Value
Harness / provider Claude Code
Model claude-sonnet-5
Session reference N/A - harness does not expose a session/run URL
Initiating human @serina-mcfall

Objective

Restore one-file-per-number in launchpad/decisions/ by renumbering the colliding file to the
next actually-free number.

Impacted components

launchpad/decisions/ADR-0015-project-intelligence-layer-prd-scope.md (renamed to ADR-0016-...)

Approach and rejected alternatives

Chosen: renumber ADR-0015-project-intelligence-layer-prd-scope.md to ADR-0016-..., since
launchpad/scripts/test-adr-0015-frontmatter.sh already hardcodes the path
ADR-0015-handbook-page-authoring-mode.md — that file's number can't move without also touching
a test that has nothing to do with this decision.

Rejected: renumbering ADR-0015-handbook-page-authoring-mode.md instead. Same net effect on the
duplicate, but would require editing an unrelated test file for a collision this PR didn't cause,
touching more than the minimum needed to fix it.

The two live GitHub references to the old filename (PRD #4's Ruling 10, and a decision comment on
issue #190) were corrected directly via gh issue edit / gh issue comment, not as part of this
diff — GitHub issue bodies aren't repo files a PR can touch.

Verification

Command run:

$ git mv launchpad/decisions/ADR-0015-project-intelligence-layer-prd-scope.md launchpad/decisions/ADR-0016-project-intelligence-layer-prd-scope.md
$ grep -n "ADR-0015" launchpad/decisions/ADR-0016-project-intelligence-layer-prd-scope.md
$ ls launchpad/decisions/ | sort -V

Raw output:

(grep for ADR-0015 in the renamed file: no output -- confirms no remaining self-reference)
ADR-0001-handbook-repository-location-and-publication-target.md
ADR-0002-handbook-source-repository-scope.md
ADR-0003-handbook-page-provenance-contract.md
ADR-0004-handbook-staleness-detection-mechanism.md
ADR-0005-launchpad-deployment-boundary.md
ADR-0006-secret-scanning-engine-and-allowlist-location.md
ADR-0007-dependency-update-path.md
ADR-0008-security-audit-privilege.md
ADR-0009-upstream-intel-phase-1-scope.md
ADR-0010-upstream-intel-handbook-staleness-link.md
ADR-0011-external-security-smoke-test-floor.md
ADR-0012-inference-provider-boundary.md
ADR-0013-config-management-ubuntu-baseline-runtime-shape.md
ADR-0014-host-firewall-implementation.md
ADR-0015-handbook-page-authoring-mode.md
ADR-0016-project-intelligence-layer-prd-scope.md
README.md
  • Tests or checks were run and the raw output is pasted above
  • The diff is confined to the scope of the linked issue
  • No secrets, keys, tokens or hostnames were added to tracked files

Not verified

Whether any reference to the old filename exists outside this repo (e.g. a cohort member's local
notes, a Discord message, or an external doc) — only this repo's tracked files and the two live
GitHub locations (PRD #4, issue #190) I knew to check were searched and corrected.

Security implications

N/A - a file rename and reference correction; no code, config, or trust boundary changes.

Escalations

none

…ision

PR #191 (this decision, then ADR-0015) and PR #184 (ADR-0015-handbook-
page-authoring-mode) were both authored against the same next-free
number and merged within minutes of each other, leaving two files
named ADR-0015 in launchpad/decisions/.

launchpad/scripts/test-adr-0015-frontmatter.sh already hardcodes
ADR-0015-handbook-page-authoring-mode.md, so that one keeps its number.
This renumbers the Project Intelligence Layer PRD-scope decision to
ADR-0016 instead -- the next actually-free number.

Signed-off-by: Serina Mcfall <serina.mcfall@gmail.com>

@benmitchell11 benmitchell11 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirms and correctly resolves the exact ADR-0015 collision (#184 vs #191, filed minutes apart) that was flagged independently at the start of an unrelated review session today. Renumbering the file with a hardcoded external test reference, rather than the one test-adr-0015-frontmatter.sh depends on, is the right call — minimizes the diff to what's actually needed to fix the collision. Verified via directory listing and a self-reference grep; the two live GitHub references (PRD #4, issue #190) were corrected out-of-band, appropriately, since a PR can't touch those.

@tucktuck101
tucktuck101 merged commit d4d08b7 into launchpad Aug 18, 2026
27 of 28 checks passed
@serina-mcfall
serina-mcfall deleted the fix/adr-0015-renumber-collision branch August 31, 2026 20:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

by:agent Filed or authored by an AI agent, not a human

Projects

None yet

Development

Successfully merging this pull request may close these issues.

bug: duplicate ADR-0015 filename from two PRs merging with the same next-free number

3 participants