mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-24 16:54:43 +00:00
b9f82ed39f
Replace the static comment-pending + comment-results two-job pattern
with a live-updating comment system that polls the GitHub Actions API
every 15s, re-assembles the review comment from whatever results are
available, and upserts it via the <!-- hermes-ci-review-bot --> marker.
The comment updates in real time as each job finishes — no waiting for
the full pipeline.
Every CI job that wants to appear in the review comment emits a
review_status output — a JSON array of objects, each with a source
and a results array:
[
{
"source": "review-label-gate",
"results": [
{"kind": "action_required", "title": "...", "summary": "...",
"how_to_fix": "..."},
{"kind": "info", "title": "...", "summary": "..."}
]
},
{
"source": "ci timing",
"results": [
{"kind": "warning", "title": "CI timings", "summary": "...",
"detail": "...", "link": "..."}
]
}
]
One job can emit multiple results of different kinds. The source field
is used to exclude the corresponding job from the synthesized error
list (case-insensitive, hyphen-normalized matching against GitHub
Actions job display names).
| job | source | kind (on failure) | section |
|----------------------------|--------------------------|---------------------------|----------------------|
| review-labels | review label gate | action_required / info | Action required |
| lockfile-diff | lockfile-diff | action_required | Action required |
| ci-timings | ci timing | warning / info | Warnings |
| supply-chain scan | supply chain | error / (none) | Job failures |
| supply-chain dep-bounds | supply chain | action_required / (none) | Action required |
| osv-scanner | osv scan | warning / (none) | Warnings |
| uv-lockfile-check | uv.lock check | action_required / (none) | Action required |
| history-check | unrelated histories | action_required | Action required |
| contributor-check | contributor attribution | action_required | Action required |
Jobs that find nothing emit [] (empty array) — no noise info items.
A single comment-live job polls the GitHub Actions API every 15s,
classifies jobs into (completed, pending), assembles the comment, and
upserts it. Merges review_status outputs from all needs jobs via
toJSON(needs.*.outputs.review_status), and downloads the ci-timings
artifact when it becomes available. Shows commit SHA + message below
the header.
The assembler has ZERO job-specific knowledge. It just:
1. collect_from_statuses() — flattens all nested status objects into ReviewItems
2. collect_failed_jobs() — synthesizes errors for failed jobs with no declared status
3. _attach_job_urls() — fills in per-job log links for ALL items
4. render_comment() — groups by severity, renders with group headers
Each item shows links inline next to the title: View report (job-emitted
URL) and View job (auto-attached logs link). Each info item is its own
collapsible <details> block.
# ૮ >ﻌ< ა ci review
running on abc1234 — commit message first line
## ❌ Job failures
### {title} · [View job](url)
{summary}
## ⚠️ Action required
### {title} · [View job](url)
{summary}
**How to fix:**
{how_to_fix}
## ⚠️ Warnings
### {title} · [View report](url) · [View job](url)
{summary}
{detail}
<details><summary>{title}</summary>
{content}
</details>
Still running 3 jobs: ci-timings, docker
- test_assemble_review_comment.py (48 tests): collect_from_statuses,
collect_failed_jobs with exclude_sources, _attach_job_urls,
render_comment (group headers, inline links, commit info, per-item
details, pending footer), assemble integration
- test_live_comment.py (16 tests): classify_jobs pure function
- test_timings_report.py (10 tests): generate_review_status nested format
- test_lockfile_diff.py (6 tests)
- test_classify_changes.py (32 tests, pre-existing)
68 lines
3.3 KiB
YAML
68 lines
3.3 KiB
YAML
name: History Check
|
|
|
|
# Rejects PRs whose branch has no common ancestor with main.
|
|
#
|
|
# In May 2026 PR #25045 was merged from a branch that had been disconnected
|
|
# from main's history (likely an accidental `git checkout --orphan` or
|
|
# `.git/` re-init). GitHub's merge UI does not refuse merges of unrelated
|
|
# histories, so the PR landed cleanly with the intended one-file change —
|
|
# but its parent-less root commit (413990c94) got grafted into main as a
|
|
# second root, and ~1500 files' worth of `git blame` history collapsed
|
|
# onto that single commit.
|
|
#
|
|
# This check catches the failure mode by requiring `git merge-base` between
|
|
# the PR head and main to be non-empty.
|
|
|
|
on:
|
|
workflow_call:
|
|
outputs:
|
|
review_status:
|
|
description: "JSON array of review_status objects for the synthesizer."
|
|
value: ${{ jobs.check-common-ancestor.outputs.review_status }}
|
|
|
|
permissions:
|
|
contents: read
|
|
|
|
jobs:
|
|
check-common-ancestor:
|
|
runs-on: ubuntu-latest
|
|
timeout-minutes: 10
|
|
outputs:
|
|
review_status: ${{ steps.merge-base-check.outputs.review_status }}
|
|
steps:
|
|
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
|
|
with:
|
|
fetch-depth: 0 # full history both sides for merge-base
|
|
|
|
- id: merge-base-check
|
|
name: Reject PRs with no common ancestor on main
|
|
run: |
|
|
# `git merge-base` exits non-zero AND prints nothing when the two
|
|
# commits share no ancestor. We check both conditions explicitly
|
|
# so the failure message is clear regardless of which signal fires
|
|
# first.
|
|
if ! BASE=$(git merge-base origin/main HEAD 2>/dev/null) || [ -z "$BASE" ]; then
|
|
STATUS='[{"source":"unrelated histories","results":[{"kind":"action_required","title":"Unrelated histories","summary":"This PR has no common ancestor with main.","detail":"","how_to_fix":"Rebase your changes onto current main:\n```\ngit fetch origin main\ngit checkout -b fix-branch origin/main\n# re-apply your changes (cherry-pick, copy files, etc.)\ngit push -f origin fix-branch\n```\n"}]}]'
|
|
echo "review_status=${STATUS}" >> "$GITHUB_OUTPUT"
|
|
echo ""
|
|
echo "::error::This PR has no common ancestor with main."
|
|
echo ""
|
|
echo "Your branch's history is disconnected from main. Common causes:"
|
|
echo " - the branch was created with 'git checkout --orphan'"
|
|
echo " - '.git/' was re-initialized at some point during the work"
|
|
echo " - the branch was force-pushed from an unrelated repository"
|
|
echo ""
|
|
echo "Merging an unrelated-history PR grafts a parent-less root commit"
|
|
echo "into main and collapses git blame for every file in that snapshot."
|
|
echo "Reference: PR #25045 caused this and re-rooted blame on ~1500"
|
|
echo "files to a single orphan commit."
|
|
echo ""
|
|
echo "To fix, rebase your changes onto current main:"
|
|
echo " git fetch origin main"
|
|
echo " git checkout -b fix-branch origin/main"
|
|
echo " # re-apply your changes (cherry-pick, copy files, etc.)"
|
|
echo " git push -f origin fix-branch"
|
|
exit 1
|
|
fi
|
|
echo "::notice::Common ancestor with main: $BASE"
|
|
echo "review_status=[]" >> "$GITHUB_OUTPUT"
|