docs(branch-hygiene): rescue §9 SPARK work — naming convention, PR check, restore safety, ROADMAP CHIT columns - #1407
Conversation
Connects the existing CHIT trail system (agent.graphiti.signed.v1) to branch lifecycle management, closing 8 anti-patterns identified in branch strategy audit (91 branches trimmed in single session). - Add stale-branch-sweep.yml (daily orphan detection via CHIT trail state) - Add branch naming convention to SITREP (feat/fix/infra/docs/refactor) - Add §9 branch hygiene to signoff checklist - Add PR + ORPHANED state to claim register - Add branch cleanup field to ACK template - Add PR check to SITREP health check - Add restore validation section to SITREP Fixes #2-#8 from reviews/BRANCH_STRATEGY_ANTI_PATTERNS.md Fix #1 (GitHub auto-delete) applied separately via API.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yaml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (3)
📝 WalkthroughWalkthroughThis pull request updates three agent documentation files in the AGNOTE4482 series. Changes include appending branch cleanup confirmation lines to ACK sections, restructuring the Agent Claim Register table with explicit PR and CHIT Trail columns, and adding documentation for branch naming conventions, orientation checks, and restore safety procedures. Changes
Possibly related PRs
Poem
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes 🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 inconclusive)
✅ Passed checks (4 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ba70637627
ℹ️ 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".
| | Infra (KiloCode claw config rebase + 18 CR fixes) | 4090-claude | 2026-03-28 | SHIPPED (merged 2026-03-30) | #1151 | — | feature/kilo-claw-config | | ||
| | Infra (Provider cascade: 7 CR + 3 Kilo fixes) | 4090-claude | 2026-03-28 | SHIPPED (merged 2026-03-29) | #1155 | — | feat/4090-coding-workstation-stack | | ||
|
|
||
| > **ORPHANED status**: A claim transitions to ORPHANED when CLAIMED >7 days with no PR and no CHIT trail activity on `branch.{branch_name}.trail.v1`. ORPHANED entries trigger branch deletion via `stale-branch-sweep.yml`. |
There was a problem hiding this comment.
Correct ORPHANED criteria to match sweep behavior
This new rule says a claim becomes ORPHANED when CLAIMED >7 days, but .github/workflows/stale-branch-sweep.yml actually deletes based on branch last commit date (LAST_COMMIT_DATE < CUTOFF) plus no open PR/CHIT activity (lines 64-83). That mismatch can cause teams to believe a recently re-claimed branch is safe when it can still be swept if its last commit is old, so the documentation should describe commit-age-based orphaning instead of claim-age-based orphaning.
Useful? React with 👍 / 👎.
…date Appends session ACK block to AGNOTE4482.md covering 2026-04-27→05-02: - PRs #1402 (NATS push model), #1404 (geometry bus), #1405 (cred redact), #1406 (agent_id fix), #1407 (§9 SPARK rescue) — all merged - GitHub issues #1410 (W6-P1/z890), #1411 (W6-P2/5090), #1412 (W6-P5/opus) created with full TAC-grounded handoff + signoff checklist references Updates ROADMAP Active Claim Register: W6-P3 NATS row added (SHIPPED), W6-P1/P2/P5 rows updated with issue numbers and ANNOUNCED status. Village Rule: one scope, one commit, one PR. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…date (#1417) * docs(agnote): W6 convergence wave ACK + TAC lane announce register update Appends session ACK block to AGNOTE4482.md covering 2026-04-27→05-02: - PRs #1402 (NATS push model), #1404 (geometry bus), #1405 (cred redact), #1406 (agent_id fix), #1407 (§9 SPARK rescue) — all merged - GitHub issues #1410 (W6-P1/z890), #1411 (W6-P2/5090), #1412 (W6-P5/opus) created with full TAC-grounded handoff + signoff checklist references Updates ROADMAP Active Claim Register: W6-P3 NATS row added (SHIPPED), W6-P1/P2/P5 rows updated with issue numbers and ANNOUNCED status. Village Rule: one scope, one commit, one PR. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * docs(vision): Cinco de Mayo launch vision + KiloCode W6-P2 handoff brief Extends AGNOTE4482 launch vision with: - CLI-as-score / CGP-as-mood / proof-of-resonance architectural framing - Character persona system (Dr. Bean, Mr. Clean, PowerPuff Girls) as FlOO$ W6-P5 suit archetypes powered by MiniMax - Three-Body split: 4090-claude analysis → KiloCode GLM implementation - Node deployment plan: Jetson edge + 5090 MiniMax+KiloCode runtime Adds .kilo/command/w6-bpm-nats.md — executable KiloCode brief for bpm_encoder NATS publish (W6-P2): exact file, line refs, code blocks, test file template, verify commands. GLM-5.1 blueprint-first pickup. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
Summary
Rescues SPARK-authored work from orphan branches
fix/branch-lifecycle-chit-wiring(no PR, 4 days old) and partiallyfix/agnote4482-section9-recovery(PR #1382 CLOSED, 4 days old).The
stale-branch-sweep.ymlCI workflow from these branches already landed on main via9b6eee7af. This PR delivers the companion documentation that was left stranded.What's Included
AGNOTE4482_SITREP.md
feat/,fix/,infra/,docs/,refactor/) with workstream ID guidance and forbidden prefixesgit diff HEAD -- <file>before restoring from backupAGNOTE4482_ROADMAP_W1-W5.md
PRandCHIT Trailcolumns — makes branch→PR→trail linkage visible per §9 hygiene requirementsAGNOTE4482.md
What Was NOT Rescued
fix/agnote4482-section9-recoveryAGNOTE4482.md hunk (193-line delta from a backup restore) had 2 merge conflicts with current main and was a file-level restore that replaced content already superseded on main. Skipped intentionally — the §9 + §6.4 changes from that branch are already on main via thebranch-lifecyclecherry-pick.Orphan branch disposition
After merge:
fix/branch-lifecycle-chit-wiring→ safe to delete (all content rescued here)fix/agnote4482-section9-recovery→ safe to delete (§9/§6.4 already on main; conflicted AGNOTE hunk is stale)Village Rule
One scope: stranded SPARK docs rescue. No new features.
🤖 Generated with Claude Code
Summary by CodeRabbit