Skip to content

docs: record branch and worktree reconciliation - #1520

Merged
BigSimmo merged 11 commits into
mainfrom
codex/branch-worktree-cleanup-20260731
Jul 31, 2026
Merged

docs: record branch and worktree reconciliation#1520
BigSimmo merged 11 commits into
mainfrom
codex/branch-worktree-cleanup-20260731

Conversation

@BigSimmo

@BigSimmoBigSimmo commented Jul 31, 2026

Copy link
Copy Markdown
Owner

Summary

  • record the methodical branch/worktree reconciliation and exact-head dispositions in the append-only review ledger
  • preserve useful or ambiguous work; delete only clean, closed, merged, patch-contained, or superseded refs after recovery archival
  • leave dirty, process-owned, recently moving, queue-owned, and protected RAG work untouched
  • consolidate the cleanup evidence into this single documentation-only PR

RAG impact: no retrieval behaviour change — reconciliation ledger only; protected retrieval source and behavior are unchanged.

Verification

  • npm run check:branch-review-ledger — 443 live records + 1206 archived; no duplicates, malformed rows, conflict markers, or mojibake
  • exact row-set proof — all 297 current-main rows retained verbatim, plus 146 unique cleanup records, zero duplicates
  • npm run docs:check-index — all 49 roots/modules/routes and schema tables indexed
  • npm run docs:check-links — 1413 repository references resolve
  • npm run docs:check-scripts — 412 npm-run references resolve
  • git diff --check — pass

Recovery and scope

  • nineteen verified recovery bundles were created before destructive cleanup; the latest is Database-branch-cleanup-20260731-batch19.bundle (SHA-256 9E08DFF1FE6B50503C1BE8D2FC81057A146C96A2723632A53A650C87BE151B37)
  • exact deleted tips are also retained under refs/archive/branch-worktree-cleanup-20260731/**
  • no production data, Supabase, Railway, OpenAI, deployment, or non-GitHub provider workflow was touched

Risk

Documentation-only. The primary checkout and all active/dirty/process-owned worktrees remain preserved. This PR is intentionally draft and queued after active work.

Summary by CodeRabbit

  • Documentation
    • Expanded the branch cleanup ledger with additional records covering merged, superseded, ancestor, inactive-worktree, and safely removable branches.
    • Documented cleanup decisions, supporting merge and ancestry evidence, worktree status, and verified SHA-256 checksums to improve maintenance tracking and reviewability.

@coderabbitai

coderabbitaiBot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro

Run ID: 2af4819b-b493-4192-a5c9-b40a005d76a4

📥 Commits

Reviewing files that changed from the base of the PR and between b2122c7 and ccf4392.

📒 Files selected for processing (1)
  • docs/branch-review-ledger.md

📝 Walkthrough

Walkthrough

The pull request appends branch-cleanup and reconciliation records to docs/branch-review-ledger.md. The records document branch dispositions, ancestry and merge evidence, worktree status, cleanup bundles, and SHA-256 checksums.

Changes

Branch review ledger

Layer / File(s)Summary
Append branch cleanup records
docs/branch-review-ledger.md
Adds records for merged, inactive, ancestor, superseded, and safely deletable branches. The records include cleanup evidence, worktree status, bundle verification, and SHA-256 checksums.

Estimated code review effort: 1 (Trivial) | ~3 minutes

Possibly related PRs

Suggested reviewers:cursoragent, claude, copilot

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check nameStatusExplanation
Title check✅ PassedThe title clearly identifies the documentation change for branch and worktree reconciliation.
Description check✅ PassedThe description covers the change scope, verification results, recovery evidence, risk, and unchanged external systems.
Docstring Coverage✅ PassedNo functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check✅ PassedCheck skipped because no linked issues were found for this pull request.
Out of Scope Changes check✅ PassedCheck skipped because no linked issues were found for this pull request.

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

@BigSimmoBigSimmo added the skip-branch-sync Opt out of hosted pr-branch-sync / update-branch on this PR label Jul 31, 2026
@BigSimmo
BigSimmo marked this pull request as ready for review July 31, 2026 02:06
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.
To continue using code reviews, add credits to your account and enable them for code reviews in your settings.

@BigSimmo

Copy link
Copy Markdown
OwnerAuthor

@cursoragent fix merge conflict

@cursor

cursorBot commented Jul 31, 2026

Copy link
Copy Markdown
Contributor

Merge conflict on #1520 is fixed.

  • Merged origin/main into codex/branch-worktree-cleanup-20260731 (auto-merged docs/branch-review-ledger.md + docs/outstanding-issues.md)
  • Pushed merge commit 6e699846
  • Reopened the PR after it had been closed mid-request

Status:MERGEABLE (no longer CONFLICTING/DIRTY). Checks are running again.

Open in WebOpen in Cursor

@BigSimmo

Copy link
Copy Markdown
OwnerAuthor

Temporarily closing during the ordered merge sweep to keep one active PR and avoid branch/worktree ledger churn. Unique content will be reviewed in sequence.

Resolve PR #1520 mergeability by bringing the docs-only reconciliation branch current with main.
Co-authored-by: BigSimmo <BigSimmo@users.noreply.github.com>
@BigSimmoBigSimmo reopened this Jul 31, 2026
@BigSimmo
BigSimmo enabled auto-merge (squash) July 31, 2026 02:09
@BigSimmo

Copy link
Copy Markdown
OwnerAuthor

Re-freezing during the ordered sweep because the head advanced concurrently before the reviewed repair could be published. The new delta is being inspected and will be integrated if valid.

auto-merge was automatically disabled July 31, 2026 02:10

Pull request was closed

@BigSimmoBigSimmo reopened this Jul 31, 2026
@supabase

supabaseBot commented Jul 31, 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 enabled auto-merge (squash) July 31, 2026 02:12
@BigSimmo
BigSimmo merged commit 798761c into mainJul 31, 2026
26 checks passed
@BigSimmo
BigSimmo deleted the codex/branch-worktree-cleanup-20260731 branch July 31, 2026 02:15
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip-branch-syncOpt out of hosted pr-branch-sync / update-branch on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@BigSimmo@cursoragent