Skip to content

docs(ledger): record the post-merge verification of PR #2521 - #2565

Merged
BigSimmo merged 2 commits into
mainfrom
claude/caring-contacts-vocabulary-tmnc89
Sep 2, 2026
Merged

docs(ledger): record the post-merge verification of PR #2521#2565
BigSimmo merged 2 commits into
mainfrom
claude/caring-contacts-vocabulary-tmnc89

Conversation

@BigSimmo

@BigSimmo BigSimmo commented Sep 2, 2026

Copy link
Copy Markdown
Owner

Summary

Why this record exists at all. This repository squash-merges and auto-merges claude/* branches on green, which has twice orphaned a late commit and once needed a fix-forward. prlanded closes that hole by comparing content rather than ancestry, since git branch --merged is meaningless after a squash rewrites history. The two-dot diff between the squash commit 969cc7f88 and the branch tip 21f4ef3da was empty, so all fifteen commits landed and nothing was lost to the race.

The inbox requests are deliberately not applied here. #2521 carried around twenty queued ledger requests. npm run issues:reconcile refused to run them:

refusing to reconcile: detected unmerged branch(es) on origin carrying pending inbox reconciliations:
  - claude/issues-reconcile-2526 (b5a059f588c8)

That is PR #2559, and the guard is the one filed as #EH9VA6 — concurrent reconciliations corrupt the reconciliation journal. Overriding it with --allow-concurrent would have been the wrong answer to a correct refusal. #2559 has since rebased onto 969cc7f88 and absorbed all of those requests itself, so #Z5P2BW, #0HYHTH and #AGRAKQ are archived there, and the two follow-ups #2521 filed (#686WHW, #1NMMZS) are added there. Verified by reading its diff against the squash, not assumed. Applying them a second time here would have been a duplicate write to the same rows — exactly the failure #686WHW was filed to describe.

Verification

  • npm run verify:pr-local

Run instead, as the gates that cover a single appended ledger record:

  • npm run check:branch-review-ledger880 live table records + 1206 archived + 580 immutable (880 under the 2026-07-29 machine-readable contract), immutable review writes, six cells each, no conflict markers, mojibake, heading records, or duplicates
  • npm run check:ledger-write-disciplineLedger write discipline passed for 59b3490e37d4..HEAD
  • npm run docs:check-linksdocs link check passed: 4802 repo path references resolve
  • npm run check:outstanding-issues[snapshot] in step with data/outstanding-issues-snapshot.json (70 open, 0 pending)
  • npx prettier --check on the new file — All matched files use Prettier code style!

Verification not run: verify:cheap, verify:ui, verify:release, lint, typecheck, build, tests. The diff is one new append-only Markdown record under docs/branch-review-records/. No source, test, schema, workflow or configuration file is touched, so no executable behaviour has a changed failure path. Nothing provider-backed was run.

The two cancel request … did not take effect lines from docs:check-links are pre-existing on main and are warnings, not failures; the command exits 0.

Risk and rollout

  • Risk: none to behaviour. The change is one new immutable record file.
  • Rollback: revert the commit; the record disappears and no other state is involved.
  • Provider or production effects: None.
  • RAG impact: none — no retrieval, ranking, selection, fixture or answer surface is touched.

Notes

Recorded here rather than on #2521 because that pull request had already merged, and the record is by definition post-merge evidence.

The remote branch had been deleted by the auto-merge, so this push recreates it from the current main rather than continuing the merged history. --force-with-lease was rejected for that reason (stale info against a ref that no longer exists), and a plain push was the correct move; no history was rewritten.

🤖 Generated with Claude Code

https://claude.ai/code/session_01CQg8otWecCGsBJcLvkR7pm


Generated by Claude Code


Note

Low Risk
Append-only documentation under docs/branch-review-records with no executable or production behavior.

Overview
Adds one append-only branch review ledger row at docs/branch-review-records/23e5e883….record.md documenting that PR #2521 (claude/caring-contacts-vocabulary-tmnc89) squash-merged cleanly.

The record marks status prlanded with evidence that the two-dot diff between squash 969cc7f88 and branch tip 21f4ef3da was empty (no orphaned commits after squash+auto-merge). It also notes that ~20 queued inbox reconciliations from that branch were not replayed here—PR #2559 absorbed them after rebasing onto the squash—and lists related issue IDs and CI/review outcomes.

No application code, tests, config, or workflows change; this is immutable documentation only.

Reviewed by Cursor Bugbot for commit d7b17e2. Configure here.

The prlanded review record this branch owed after its squash merge. The
two-dot content diff between the squash commit 969cc7f and the branch
tip 21f4ef3 was empty, so all fifteen commits landed and nothing was
orphaned by the squash + auto-merge race that this record exists to catch.

The ~20 inbox requests the branch carried are not applied here. PR #2559
rebased onto the squash and absorbed them, so #Z5P2BW, #0HYHTH and
#AGRAKQ are archived there rather than twice; running a second
reconciliation would have needed --allow-concurrent, which the guard for
#EH9VA6 forbids.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01CQg8otWecCGsBJcLvkR7pm
@coderabbitai

coderabbitai Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

Important

  • 🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Team

Run ID: 549d059f-6f2f-4ab9-99f4-0a75f7488257


Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@supabase

supabase Bot commented Sep 2, 2026

Copy link
Copy Markdown

This pull request has been ignored for the connected project sjrfecxgysukkwxsowpy because there are no changes detected in supabase directory. You can change this behaviour in Project Integrations Settings ↗︎.


Preview Branches by Supabase.
Learn more about Supabase Branching ↗︎.

@BigSimmo
BigSimmo marked this pull request as ready for review September 2, 2026 15:40
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Sep 2, 2026

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review Completed 2026-09-02T15:45:08.189647Z 4c92c7e Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@BigSimmo
BigSimmo enabled auto-merge (squash) September 2, 2026 15:40
@cursor

cursor Bot commented Sep 2, 2026

Copy link
Copy Markdown
Contributor

Bugbot couldn't run - usage limit reached

Bugbot is counted against Cursor usage for this user or team, and this run hit a usage or spend limit.

A user or team admin can review and increase usage limits in the Cursor dashboard.

(requestId: serverGenReqId_45159f08-f91f-420e-a80c-e725355e3820)

@BigSimmo
BigSimmo merged commit 062a0c5 into main Sep 2, 2026
28 of 32 checks passed
@BigSimmo
BigSimmo deleted the claude/caring-contacts-vocabulary-tmnc89 branch September 2, 2026 15:42

@chatgpt-codex-connector chatgpt-codex-connector Bot 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.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4c92c7e002

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@@ -0,0 +1 @@
| 2026-09-02 | claude/caring-contacts-vocabulary-tmnc89 | 969cc7f8889181758c93eb725e8eab7be6dc5e1e | prlanded | Merged and verified. Two-dot content diff between the squash commit and the branch tip 21f4ef3da was empty, so all fifteen commits landed and nothing was orphaned by the squash+auto-merge race. The ~20 queued inbox requests it carried are applied by PR #2559, which rebased onto this squash and absorbed them; #Z5P2BW, #0HYHTH and #AGRAKQ are archived there, and the two follow-ups this branch filed (#686WHW, #1NMMZS) are added. | prlanded content diff empty; full CI green on 21f4ef3da (PR required, Build, Unit coverage, Production UI 1/2/3 + critical, Caring Contacts database, Safety and config checks, Lighthouse, Static PR checks, PR policy, PR mergeability, Semgrep, Gitleaks, GitGuardian); one review thread, resolved |

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P2 Badge Mark the reconciliation as pending until PR #2559 lands

If this immutable record is consulted before PR #2559 merges, it incorrectly reports that its issue changes “are applied” and that the named rows are archived or added. At this commit's parent, #Z5P2BW and #AGRAKQ remain open and #686WHW/#1NMMZS are absent, so the record is treating another PR's proposed diff as landed state; this can cause operators to skip the reconciliation that actually updates the canonical ledger. Describe these changes as queued in PR #2559 and record them as applied only after that PR lands.

AGENTS.md reference: AGENTS.md:L343-L343

Useful? React with 👍 / 👎.

BigSimmo pushed a commit that referenced this pull request Sep 2, 2026
PRs #2565 and #2566 each added a branch-review record, so merging main in
left the generated index two records short. Regenerated with
scripts/generate-branch-review-index.mjs.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Cq952TVk67XZzJnjiKt5pU
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants