chore(skills): sync .claude/.codex mirrors with the canonical skill

[thejustinwalsh]

Summary

The "Keeping the branch mergeable into main" section is committed in the source-of-truth skills (packages/skills/ + packages/cli/src/bootstrap-assets/skills/), but the installed .claude/ and .codex/ mirrors that middle's own dispatched agents read were never regenerated — so on main those agents load an implementing-github-issues skill missing that guidance. (Plausibly why headless branches kept diverging: the skill telling agents to keep branches mergeable wasn't in the copy they actually load.)

This commits the two installed-mirror copies, which are byte-identical to packages/skills/implementing-github-issues/SKILL.md.

Why it drifted

scripts/sync-skills.ts only keeps bootstrap-assets/skills/ in sync with packages/skills/ — it does not touch the .claude//.codex/ installed mirrors, and nothing else caught the drift. (Worth a follow-up: extend the sync/check to the installed mirrors too.)

Verification

• diff .claude/skills/implementing-github-issues/SKILL.md packages/skills/implementing-github-issues/SKILL.md → identical (same for the .codex copy).
• No code changes; docs-asset sync only.

Summary by CodeRabbit

• Documentation
  • Enhanced workflow documentation for GitHub issue implementation with stronger emphasis on branch mergeability requirements
  • Added detailed guidance for keeping pull request branches clean and mergeable into main
  • Expanded pre-ready checklist with explicit mergeability verification steps
  • Clarified conflict resolution strategies and branch synchronization best practices

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 1a0c8098-fe25-480d-86b4-767eac25b865

📥 Commits

Reviewing files that changed from the base of the PR and between 8faf3df and f4b162b.

📒 Files selected for processing (2)

• .claude/skills/implementing-github-issues/SKILL.md
• .codex/skills/implementing-github-issues/SKILL.md

---

📝 Walkthrough

Walkthrough

Two parallel skill documentation files receive identical updates that strengthen GitHub-issue implementation by requiring PRs to remain cleanly mergeable into main before marking ready. Changes include a top-level hard rule, a pre-ready gh pr view mergeability check, a new section on branch-sync procedures using git rerere and rebase strategy, and enhanced red-flag guidance for conflict resolution and headless dispatch.

Changes

Enforce cleanly-mergeable-into-main workflow

Layer / File(s)	Summary
Core mergeability requirement and pre-ready verification .claude/skills/implementing-github-issues/SKILL.md, .codex/skills/implementing-github-issues/SKILL.md	Top-level hard rule added (lines 27–28): PR must be cleanly mergeable into main before marking ready, with instruction to resolve divergence during the run. Pre-ready workflow step inserted (lines 490–494 in both files): gh pr view check for mergeable/mergeStateStatus blocks PR readiness on conflicts.
Branch mergeability maintenance and quick reference .claude/skills/implementing-github-issues/SKILL.md, .codex/skills/implementing-github-issues/SKILL.md	New "Keeping the branch mergeable into main" section (lines 570–608 in .claude/, 570–599 in .codex/): covers enabling git rerere, default rebase sync onto origin/main, single merge-commit escape hatch for deep interleaving, new-work-as-base resolution heuristic, mandatory re-verification after resolving, and PR-description strategy note. Quick reference table extended (lines 600–608 in .codex/) with gh pr view --json mergeable,mergeStateStatus command.
Red flags and headless dispatch reinforcement .claude/skills/implementing-github-issues/SKILL.md, .codex/skills/implementing-github-issues/SKILL.md	Red flags section updated (lines 635–636): two new stop conditions prohibiting reviewer-based conflict resolution and prescribing git rerere or single git merge origin/main for repeated re-conflicts. Headless dispatch section reinforced (lines 737–740): explicit warning that no human babysits rebase/mergeability and that rerere + sync + re-verify workflow must complete before gh pr ready.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related PRs

• thejustinwalsh/middle#100: Both PRs update the "implementing-github-issues" skill documentation to enforce the same cleanly-mergeable-into-main requirement and add the same gh pr view --json mergeable,mergeStateStatus/rebase-vs-merge + git rerere workflow guidance.
• thejustinwalsh/middle#87: Both PRs update the implementing-github-issues skill's "before marking PR ready" workflow in SKILL.md, with #87 adding an internal review loop and the main PR adding mergeability/gh pr view checks as additional readiness gates.

Suggested labels

ready-for-review

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title clearly summarizes the main change: syncing mirror files in .claude/ and .codex/ directories with the canonical skill, which matches the PR's core objective of resolving version drift in installed skill mirrors.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}