docs(merge): recommend pm merge reconcile (2026.7.22) over raw history-repair#8
Conversation
…ory-repair Fleet fan-out from canary unbraind/pm-beads#42. Update the Multi-agent merge safety section's closing recommendation from `pm history-repair --all` to the purpose-built, audited `pm merge reconcile` workflow (GH-623): preview with `--dry-run`, apply with `--message`, confirm with `pm history --verify` + `pm validate`. Links the authoritative upstream docs/MERGE_SAFETY.md; keeps `pm history-repair --all` noted as a lower-level primitive. Tracker: pm-github-wpit. CHANGELOG regenerated (changelog:check green). Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
|
Caution The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased. |
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
|
Warning Review limit reached
Next review available in: 31 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Organization UI Review profile: ASSERTIVE Plan: Pro Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (5)
✨ 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 |
|
@coderabbitai full review @greptileai review /gemini review Identical docs-only fan-out from the merged canary unbraind/pm-beads#42 — migrates the Multi-agent merge safety section's closing recommendation to the verified 2026.7.22 |
|
Caution The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased. |
🧩 Analysis chain🏁 Script executed: #!/bin/bash
set -euo pipefail
echo '=== PR changed files ==='
git diff --name-status HEAD^ HEAD
echo '=== PR diff ==='
git diff --check HEAD^ HEAD
git diff --unified=80 HEAD^ HEAD -- README.md CHANGELOG.md 2>/dev/null || git diff --unified=80 HEAD^ HEAD
echo '=== Relevant command/link references on this branch ==='
rg -n -C 5 --glob 'README*' --glob 'CHANGELOG*' \
'pm merge reconcile|pm history-repair|MERGE_SAFETY|pm history --verify|pm validate' .Length of output: 12285 🏁 Script executed: #!/bin/bash
set -euo pipefail
url='https://github.com/unbraind/pm-cli/blob/main/docs/MERGE_SAFETY.md'
raw='https://raw.githubusercontent.com/unbraind/pm-cli/main/docs/MERGE_SAFETY.md'
echo '=== Linked GitHub page status ==='
curl --fail --silent --show-error --location --output /dev/null --write-out '%{http_code} %{url_effective}\n' "$url"
echo '=== Upstream merge-safety guidance relevant to documented commands ==='
curl --fail --silent --show-error --location "$raw" |
rg -n -C 5 'merge reconcile|history-repair|dry-run|history --verify|pm validate'Length of output: 5777 🏁 Script executed: #!/bin/bash
set -euo pipefail
repo='unbraind/pm-cli'
ref='main'
echo '=== Upstream guide: complete post-merge and divergence sections ==='
gh api "repos/$repo/contents/docs/MERGE_SAFETY.md?ref=$ref" --jq '.content' |
base64 --decode |
sed -n '50,92p'
echo '=== Upstream tracked files relevant to command definitions ==='
gh api "repos/$repo/git/trees/$ref?recursive=1" --paginate --jq -r \
'.tree[] | select(.type == "blob") | .path' |
rg -i '(^|/)(history|merge|reconcile).*\.(ts|js|mjs|md)$|(^|/)(cli|commands)/.*\.(ts|js|mjs)$' |
head -120Length of output: 4292 🏁 Script executed: #!/bin/bash
set -euo pipefail
repo='unbraind/pm-cli'
ref='main'
echo '=== Search upstream documentation/source for exact command usage ==='
for query in \
'"pm history <item-id> --verify"' \
'"history --verify"' \
'"merge reconcile --dry-run"' \
'"no data loss"' \
'"discarded event authors"'
do
echo "--- $query ---"
gh api -H 'Accept: application/vnd.github+json' \
"/search/code?q=$(printf '%s' "$query repo:$repo" | sed 's/ /%20/g')" \
--jq '.items[]? | "\(.path):\(.html_url)"' || true
doneLength of output: 6176 🏁 Script executed: #!/bin/bash
set -euo pipefail
repo='unbraind/pm-cli'
ref='main'
gh api "repos/$repo/contents/docs/COMMANDS.md?ref=$ref" --jq '.content' |
base64 --decode > /tmp/pm-cli-commands.md
echo '=== History command reference ==='
rg -n -i -C 12 '(^#{1,4} .*history|--verify|strict-exit)' /tmp/pm-cli-commands.md | head -240
echo '=== Merge reconcile command reference ==='
rg -n -i -C 12 '(^#{1,4} .*merge reconcile|merge reconcile)' /tmp/pm-cli-commands.md | head -180Length of output: 6697
✅ Action performedFull review finished. Your included review limit is currently reached under our Fair Usage Limits Policy. This review may still proceed through usage-based billing if eligible. Your next included review will be available in 43 minutes. |
…-cli to 2026.7.22 Greptile P2: pm history --verify checks one stream but a merge can affect several — lead the post-reconcile check with whole-tracker pm validate and note that pm merge reconcile lists each affected stream; pm history --verify <id> is a per-item spot check. Greptile P1: the pinned @unbrained/pm-cli devDep resolved to 2026.7.21 (lacks pm merge reconcile) — bump floor to ^2026.7.22 and refresh the lockfile so the documented command exists in the repo's own toolchain. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
|
@coderabbitai full review @greptileai review /gemini review Updated to address the Greptile review: bumped |
|
Caution The consumer version of Gemini Code Assist on GitHub has been sunset. All code review activity has officially ceased. |
|
✅ Action performedFull review finished. Your included review limit is currently reached under our Fair Usage Limits Policy. This review may still proceed through usage-based billing if eligible. Your next included review will be available in 31 minutes. |
|
Final review sweep before merge: Greptile's findings from this fan-out were addressed fleet-wide (bumped |
Rate Limit Exceeded
|
1 participant
What & why
Fleet fan-out from canary unbraind/pm-beads#42. The Multi-agent merge safety section closed with
pm history-repair --all; pm-cli 2026.7.22 shipped GH-623pm merge reconcile— an audited post-merge reconciliation (preview--dry-run→ apply--message→ confirmpm history --verify+pm validate) that re-greens the hash chain with zero data loss. This section now recommends that workflow and links the authoritative upstreamdocs/MERGE_SAFETY.md;pm history-repair --allstays noted as a lower-level primitive.Verified end-to-end on the canary (2-branch concurrent edit: 0 conflicts, both authors' content preserved,
verify+validategreen). Docs-only (README + regenerated CHANGELOG).Tracker
pm-github-wpit— closed; evidence in item notes.Summary by cubic
Recommend
pm merge reconcile(pm-cli ≥ 2026.7.22) overpm history-repair --allin Multi‑agent merge safety and link the upstream guide. Clarifies preview → apply → validate/verify scope and bumps@unbrained/pm-clito^2026.7.22.pm-cli≥ 2026.7.22..agents/pm/:pm merge reconcile --dry-run→pm merge reconcile --message "post-merge reconcile"→pm validate(whole tracker;reconcilelists affected streams) → optionalpm history --verify <id>spot check. The olderpm history-repair --allremains available.Written for commit 838ff80. Summary will update on new commits.