diff --git a/docs/evidence/pr42-pr43-serial-merge-closeout-2026-08-12.md b/docs/evidence/pr42-pr43-serial-merge-closeout-2026-08-12.md new file mode 100644 index 00000000..a5a797f5 --- /dev/null +++ b/docs/evidence/pr42-pr43-serial-merge-closeout-2026-08-12.md @@ -0,0 +1,92 @@ +# PR #42 + #43 serial-merge review item — GitHub-state verification and closeout + +Date: 2026-08-12 +Scope: the review item "[unreviewed-by-grok] Merge PR #42 and #43 in serial +order (or rebase the loser) — both are MERGEABLE/CLEAN but rew…" (review +queue; the packet quoting the item truncates after "rew", so the tail of +the item's wording is not reproduced here), re-verified against the GitHub +repository state on 2026-08-12. This receipt records a state verification +of the repository's pull requests. It is process evidence, not a live-site +measurement; the site-side verification of the AI-answer readiness fix +itself is the separate receipt `docs/evidence/ai-answer-readiness-2026-08-09.md` +(finding 4473a99a9bc9, PR #42), and the controlled entity-and-offer re-run +has its own receipts under `evidence-fixtures/ai-search/` (PR #43). + +## What the item claimed + +- PR #42 (`fix/ai-answer-readiness-preferred-sources`) and PR #43 + (`fix/ai-search-rerun-entity-offer`) were both open and + MERGEABLE/CLEAN, and needed to land in serial order — or the loser + needed a rebase before landing. + +## What the re-verification found (GitHub, 2026-08-12) + +### Both PRs are closed and merged, in serial order + +| Fact | PR #42 | PR #43 | +|---|---|---| +| State | `closed`, `merged: true` | `closed`, `merged: true` | +| Title | fix(public): declare preferred source pages for AI answers (dogfood 4473a99a9bc9) | evidence(ai-search): re-run controlled entity-and-offer questions after the llms/offer mirror went live | +| Merged at | 2026-08-09T12:51:00Z | 2026-08-12T02:54:14Z | +| Merged by | nish3451 | nish3451 | +| Merge type | squash | merge | +| Commit on main | `95d2248a` "…(#42)" | `ad9cee3` "Merge pull request #43 from nish3451/fix/ai-search-rerun-entity-offer" | +| Base at merge | `012374e` | `5864e39` (PR #141) | +| Head branch | `fix/ai-answer-readiness-preferred-sources` | `fix/ai-search-rerun-entity-offer` | + +Serial order holds: `git merge-base --is-ancestor 95d2248a ad9cee3` is +true — PR #42's squash landed on main on 2026-08-09, three days before +PR #43's merge on 2026-08-12, and #43's merge commit sits directly on top +of the #42-era main. No rebase was needed: PR #43's branch itself merged +current main before its merge (`62eec0a`, "docs(evidence): mark +verification code fence as sh (CodeRabbit MD040) and merge current main"), +so it arrived at the merge button clean and merged directly. + +### Main carries both PRs' entire content; nothing unmerged remains + +- PR #42: `git diff origin/main...fix/ai-answer-readiness-preferred-sources` + is exactly the six-file, +260-line change that squash `95d2248a` landed: + the preferred-source declarations in `public/llms.txt` and + `public/offer.md`, the check-site guard and agent-UI test additions in + `scripts/check-site.mjs` and `scripts/test-agent-ui.mjs`, the evidence + receipt `docs/evidence/ai-answer-readiness-2026-08-09.md`, and + `evidence-fixtures/ai-search/README.md`. The declarations are present + verbatim at the head of origin/main's `public/llms.txt` (q1–q8 preferred + source pages, "Answer Readiness" section). +- PR #43: the branch tip `ed62202` is the second parent of merge commit + `ad9cee3`, so `git diff origin/main...fix/ai-search-rerun-entity-offer` + is empty — the branch carries zero content beyond main. +- Current main head (`ad9cee3`) passes `npm run check` + ("TinyStudio.io checks passed") and the full `npm test` suite (92 tests, + 0 failures) on 2026-08-12. + +### Why the item was tagged unreviewed-by-grok + +Both PRs were reviewed only by greptile-apps, chatgpt-codex-connector, and +coderabbitai (comments, no blocking reviews) and were merged by nish3451. +No Grok review exists on either PR, so the review queue kept the item +unreviewed-by-grok. + +## What closes the item + +- There are no open PRs #42 or #43: both are `closed`/`merged` (2026-08-09 + and 2026-08-12 respectively). Merging them again is neither possible nor + needed. +- The serial-order requirement was satisfied exactly as the item asked: + #42 landed first (squash `95d2248a`, 2026-08-09), then #43 on top of it + (merge `ad9cee3`, 2026-08-12). The "or rebase the loser" alternative was + moot — #43 merged current main into its own branch before landing and + was CLEAN at merge. +- Main carries the full, exact content of both PRs; a fresh PR from either + head branch would carry an empty diff against main. +- No code change is needed or proposed. + +## Closeout + +This closes the review item "[unreviewed-by-grok] Merge PR #42 and #43 in +serial order (or rebase the loser)" against current GitHub state +(2026-08-12): both PRs are merged in serial order, both head branches carry +zero unmerged content, `npm run check` and the full `npm test` suite pass +on the current head, and no further action is needed beyond this receipt. +The branches `fix/ai-answer-readiness-preferred-sources` and +`fix/ai-search-rerun-entity-offer` can be considered retired.