mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-21 16:18:55 +00:00
* feat(attribution): conflict-free contributor mappings via contributors/emails/ directory
The AUTHOR_MAP dict in scripts/release.py was a merge-conflict magnet:
every concurrent salvage PR appended entries to the same lines of the
same file, so parallel PRs re-conflicted on every merge to main.
New system: one file per email under contributors/emails/ — filename is
the commit-author email, first non-comment line is the GitHub login.
File additions never conflict, so any number of PRs can add mappings
concurrently.
- scripts/release.py: AUTHOR_MAP is now LEGACY_AUTHOR_MAP (frozen)
merged with the directory at import time (directory wins). All
existing consumers (resolve_author, contributor_audit.py) unchanged.
- scripts/add_contributor.py: idempotent CLI to add a mapping; refuses
conflicting reassignments (incl. against the legacy map), validates
email/login shapes.
- contributor-check.yml: attribution gate now accepts a mapping file OR
a legacy entry; failure message prints the exact add_contributor
command. Also auto-resolves bare <login>@users.noreply.github.com
emails is intentionally NOT added (kept id+login form only, matching
previous behavior).
- contributor_audit.py: guidance now points at add_contributor.py.
- tests/scripts/test_contributor_map.py: 12 tests covering loader,
merge precedence, CLI idempotency/conflict/validation, subprocess E2E.
* feat(ci): one-shot per-file flake retry in the parallel test runner
A failing test FILE is re-run once in a fresh subprocess. Pass-on-retry
counts as green but is loudly reported in a '⚠ FLAKY' summary section
(with both attempts' output preserved) so the flake gets fixed instead
of eating a full-run rerun. Deterministic failures fail both attempts —
regressions cannot be laundered green.
- --file-retries N / HERMES_TEST_FILE_RETRIES (default 1, 0 disables)
- E2E verified: simulated first-run-fail flake goes green with banner;
deterministic failure still exits 1; retries=0 restores old behavior.
This converts the dominant CI failure mode (one timing-sensitive test
flaking a 4600-test shard, requiring a manual 10-minute rerun and an
agent triage loop) into a self-healing retry that costs one file's
runtime.
* test(approval): loosen wall-clock perf bounds 0.15s -> 2.0s
These guard against catastrophic regex backtracking (seconds-to-minutes
class), but 0.15s is within scheduler-stall noise on loaded shared CI
runners — test_max_accepted_separator_free_input_is_fast failed a CI
shard this week on runner load alone. 2.0s still catches the regression
class with zero flake surface.
* fix(ci): job timeouts everywhere + retries on all network installs
Reliability pass over every workflow:
- timeout-minutes on all 21 jobs that lacked one (a hung job previously
burned the 6-hour default runner budget)
- ./.github/actions/retry wrapped around every network-fetching install
that lacked it: pip installs (deploy-site, skills-index), npm ci
(deploy-site website, upload_to_pypi web + ui-tui), uv sync (docker
test deps). Deterministic build steps (npm run build) deliberately
NOT retried — split into separate steps so a real build failure fails
fast instead of retrying 3x.
* docs(agents): document the file-retry flake policy
* fix(ci): curl retries on deploy hook + skills-index probe
* fix(ci): kill the remaining transient-failure classes in workflows + Dockerfile
From the workflow reliability audit:
- tests.yml: duration-cache restore had NO restore-keys while saves use
run_id-suffixed keys — the cache never matched once, so LPT slicing
always ran blind and unbalanced slices pushed heavy files toward the
per-file timeout. One-line restore-keys fixes slice balancing.
- Label gates (lint ci-reviewed, supply-chain mcp-catalog-reviewed):
'gh pr view || true' turned an API blip into 'label absent' → false
BLOCKING failure. Now 3x retry, and API failure is reported as an API
failure instead of a missing label.
- detect-changes action: compare API retried before failing open (was
silently running all lanes on any blip).
- uv-lockfile-check: 'uv lock --check' resolves against PyPI — retried
so registry blips don't read as 'lockfile stale'.
- docker.yml merge job: imagetools create retried (Docker Hub eventual
consistency on just-pushed digests).
- Dockerfile: apt-get Acquire::Retries=3; s6-overlay ADDs converted to
curl --retry 3 (ADD cannot retry; checksums still enforced); npm
--fetch-retries=5; playwright chromium fetch retried 3x.
- Advisory artifact uploads (per-slice durations, ci-timings report)
get continue-on-error so an artifact-service blip can't fail a green
test slice.
* fix(tests): kill the two root-cause flakes — leaking pre-warm timer + env-dependent provider list
- test_tui_gateway_server.py: session.create / non-eager session.resume
arm a 50ms threading.Timer (_schedule_agent_build) that outlives its
test and fires into the NEXT test's _make_agent mock, racily
corrupting captured state (the recurring session_resume shard
failures). Replaced the per-test whack-a-mole stub with a module-wide
autouse fixture; the 3 worker-lifecycle tests that genuinely need the
deferred build opt back in via @pytest.mark.real_agent_prewarm (new
marker in pyproject).
- test_api_key_providers.py: PROVIDER_ENV_VARS is now derived from the
live PROVIDER_REGISTRY instead of a hand-list that had drifted
(missing HF_TOKEN / DEEPINFRA_API_KEY) — resolve_provider('auto')
tests failed on any machine with HF_TOKEN exported. E2E-verified with
HF_TOKEN/DEEPINFRA_API_KEY set: 42/42 pass.
* test: de-flake 30 timing-sensitive test files for loaded CI runners
Root-cause fixes from the flake audit (session-DB mining + repo sweep):
Event-based sync instead of sleep-sync:
- title_generator: mock sets threading.Event, wait(10) replaces
sleep(0.3) hoping the daemon thread got scheduled
- docker zombie_reaping / profile_gateway: poll-for-state helpers
replace fixed 1-3s sleeps (s6 transitions + SIGCHLD reaping are async)
- process_registry tree test: select()-bounded readline replaces an
unbounded blocking read (parent wedge now fails THIS test with a clear
message instead of an opaque rc=124 file kill); SIGTERM grace 1s->2s
(the 1s partition window mid-interpreter-startup is how a child PID
escaped the live-system guard in CI)
Timeout raises (loaded 8-way-sliced runners see ~5s scheduling floors;
all of these complete in ms-to-1s when healthy so the raises cost
nothing on green runs):
- subprocess/thread waits <= 2s raised to 10-15s across mcp_tool,
mcp_circuit_breaker, mcp_reconnect_retry_reset, mcp_parked_self_probe,
mcp_cancelled_error_propagation, registry, clarify_gateway, interrupt,
voice_cli_integration, docker_environment, session_store_lock_io,
planned_stop_watcher, cli_interrupt_subagent, thread_scoped_output
(joins now also assert not is_alive() so stragglers fail loudly)
- wall-clock discrimination ceilings loosened where the guarded hang is
10x larger: local_background_child_hang 4s->10s, interrupt_cleanup
setup 5s->20s + pgid-exit 30s->60s, mcp_stability grandchild spinup
5s->15s, protocol/gil-starvation fast-handler 0.5s->2s,
iso_certify_seam 1.5s->5s, wait_for_mcp_discovery 0.1s->1s
- narrow assertion windows widened: honcho first-turn wait 0.4..0.65 ->
0.25..2.0 (property is bounded-not-hung, not an exact wall-clock);
compression fork-lock TTL 1s->3s (12 refresh chances per lease);
compression-lock expiry margins symmetric (ttl 0.05->0.5, sleep 1.0)
- telegram hung-DNS bound 1.0->1.4 (fake hang is 1.5s — must stay under)
* fix(tests): repair indentation from de-flake batch edit
* fix(tests): harden env isolation and replace remaining sleep-sync races
The full 42k-test run and complete npm check surfaced three more classes:
- Environment isolation: local ~/.honcho defaultHost and SSH_* variables
leaked into Python/TUI tests. Pin the default Honcho host in the
hermetic fixture, isolate the one fallback test from ~/.honcho, and
blank SSH_* around terminalSetup tests. This flipped 20 false failures
back to deterministic behavior on developer machines.
- Background-thread sleep-sync: Honcho async writer tests patched
time.sleep globally, then busy-polled with that same mocked sleep. Under
full-suite load the poller could starve the writer. Each test now waits
on an Event emitted by the exact flush/retry transition; 30/30 passed
under 15-way contention.
- Desktop streaming: the test slept 80ms and assumed a 500ms timer could
not fire before its assertion. A loaded runner descheduled the test for
>500ms and both chunks arrived. Producer controls now gate second-chunk
and completion transitions explicitly.
Also make file-retry observability complete: a self-healed flaky file now
prints BOTH attempts' full output in the FLAKY summary. Two behavioral
runner tests prove pass-on-retry is green+loud+traceback-preserving, while
a deterministic failure remains red.
* refactor(ci): use gh bot pat, better retries
refactor(ci): use retry action for PR label fetch
the retry action now captures stdout as a step output, so it can serve
double duty: retry + output capture for commands like 'gh pr view' whose
result must be consumed by later steps.
Retry action gains:
- 'stdout' output (heredoc-delimited to preserve newlines)
- tee to temp file so stdout still streams to the job log
- step id 'retry' for output reference
Both lint.yml and supply-chain-audit.yml now use the retry action
directly with 'command: gh pr view ...' and read
steps.<id>.outputs.stdout.
ci: use AUTOFIX_BOT_PAT for all gh CLI / GitHub API auth
Replace secrets.GITHUB_TOKEN and github.token with
secrets.AUTOFIX_BOT_PAT across all workflows and composite actions
that use the gh CLI or GitHub API. The PAT has consistent permissions
across fork PRs (where GITHUB_TOKEN is read-only), avoids API rate
limit sharing with the default token, and is already used by
js-autofix.yml for the same reasons.
19 sites swapped across 9 files:
- lint.yml (3): label fetch, comment post/edit, comment update
- supply-chain-audit.yml (5): scan, critical comment, unbounded dep
comment, label fetch, mcp-catalog comment
- lockfile-diff.yml (1): PR comment post/update
- skills-index-freshness.yml (1): issue creation on degraded probe
- skills-index.yml (2): index build, trigger deploy workflow
- upload_to_pypi.yml (2): release view poll, release upload
- ci.yml (1): timings report
- deploy-site.yml (2): skills index crawl
- detect-changes/action.yml (1): compare API call
---------
Co-authored-by: ethernet <arilotter@gmail.com>
481 lines
17 KiB
Python
481 lines
17 KiB
Python
#!/usr/bin/env python3
|
|
"""Contributor Audit Script
|
|
|
|
Cross-references git authors, Co-authored-by trailers, and salvaged PR
|
|
descriptions to find any contributors missing from the release notes.
|
|
|
|
Usage:
|
|
# Basic audit since a tag
|
|
python scripts/contributor_audit.py --since-tag v2026.4.8
|
|
|
|
# Audit with a custom endpoint
|
|
python scripts/contributor_audit.py --since-tag v2026.4.8 --until v2026.4.13
|
|
|
|
# Compare against a release notes file
|
|
python scripts/contributor_audit.py --since-tag v2026.4.8 --release-file RELEASE_v0.9.0.md
|
|
"""
|
|
|
|
import argparse
|
|
import json
|
|
import re
|
|
import subprocess
|
|
import sys
|
|
from collections import defaultdict
|
|
from pathlib import Path
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Import AUTHOR_MAP and resolve_author from the sibling release.py module
|
|
# ---------------------------------------------------------------------------
|
|
SCRIPT_DIR = Path(__file__).resolve().parent
|
|
sys.path.insert(0, str(SCRIPT_DIR))
|
|
|
|
from release import resolve_author # noqa: E402
|
|
|
|
REPO_ROOT = SCRIPT_DIR.parent
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# AI assistants, bots, and machine accounts to exclude from contributor lists
|
|
# ---------------------------------------------------------------------------
|
|
IGNORED_PATTERNS = [
|
|
re.compile(r"^Claude", re.IGNORECASE),
|
|
re.compile(r"^Copilot$", re.IGNORECASE),
|
|
re.compile(r"^Cursor(\s+Agent)?$", re.IGNORECASE),
|
|
re.compile(r"^Codex$", re.IGNORECASE),
|
|
re.compile(r"^OpenAI Codex$", re.IGNORECASE),
|
|
re.compile(r"^CommandCode", re.IGNORECASE),
|
|
re.compile(r"^github-advanced-security(\[bot\])?$", re.IGNORECASE),
|
|
re.compile(r"^GitHub\s*Actions?$", re.IGNORECASE),
|
|
re.compile(r"^github-actions(\[bot\])?$", re.IGNORECASE),
|
|
re.compile(r"^dependabot", re.IGNORECASE),
|
|
re.compile(r"^renovate", re.IGNORECASE),
|
|
re.compile(r"^Hermes\s+(Agent|Audit)$", re.IGNORECASE),
|
|
re.compile(r"^Ubuntu$", re.IGNORECASE),
|
|
]
|
|
|
|
IGNORED_EMAILS = {
|
|
"noreply@anthropic.com",
|
|
"noreply@github.com",
|
|
"noreply@nousresearch.com",
|
|
"cursoragent@cursor.com",
|
|
"hermes@nousresearch.com",
|
|
"hermes-audit@example.com",
|
|
"hermes@habibilabs.dev",
|
|
"omx@oh-my-codex.dev",
|
|
"codex@openai.com",
|
|
"noreply@commandcode.ai",
|
|
}
|
|
|
|
|
|
def is_ignored(handle: str, email: str = "") -> bool:
|
|
"""Return True if this contributor is a bot/AI/machine account."""
|
|
if email in IGNORED_EMAILS:
|
|
return True
|
|
for pattern in IGNORED_PATTERNS:
|
|
if pattern.search(handle):
|
|
return True
|
|
return False
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Helpers
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def git(*args, cwd=None):
|
|
"""Run a git command and return stdout."""
|
|
result = subprocess.run(
|
|
["git"] + list(args),
|
|
capture_output=True,
|
|
text=True,
|
|
cwd=cwd or str(REPO_ROOT),
|
|
)
|
|
if result.returncode != 0:
|
|
print(f" [warn] git {' '.join(args)} failed: {result.stderr.strip()}", file=sys.stderr)
|
|
return ""
|
|
return result.stdout.strip()
|
|
|
|
|
|
def gh_pr_list():
|
|
"""Fetch merged PRs from GitHub using the gh CLI.
|
|
|
|
Returns a list of dicts with keys: number, title, body, author.
|
|
Returns an empty list if gh is not available or the call fails.
|
|
"""
|
|
try:
|
|
result = subprocess.run(
|
|
[
|
|
"gh", "pr", "list",
|
|
"--repo", "NousResearch/hermes-agent",
|
|
"--state", "merged",
|
|
"--json", "number,title,body,author,mergedAt",
|
|
"--limit", "300",
|
|
],
|
|
capture_output=True,
|
|
text=True,
|
|
timeout=60,
|
|
)
|
|
if result.returncode != 0:
|
|
print(f" [warn] gh pr list failed: {result.stderr.strip()}", file=sys.stderr)
|
|
return []
|
|
return json.loads(result.stdout)
|
|
except FileNotFoundError:
|
|
print(" [warn] 'gh' CLI not found — skipping salvaged PR scan.", file=sys.stderr)
|
|
return []
|
|
except subprocess.TimeoutExpired:
|
|
print(" [warn] gh pr list timed out — skipping salvaged PR scan.", file=sys.stderr)
|
|
return []
|
|
except json.JSONDecodeError:
|
|
print(" [warn] gh pr list returned invalid JSON — skipping salvaged PR scan.", file=sys.stderr)
|
|
return []
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Contributor collection
|
|
# ---------------------------------------------------------------------------
|
|
|
|
# Patterns that indicate salvaged/cherry-picked/co-authored work in PR bodies
|
|
SALVAGE_PATTERNS = [
|
|
# "Salvaged from @username" or "Salvaged from #123"
|
|
re.compile(r"[Ss]alvaged\s+from\s+@(\w[\w-]*)"),
|
|
re.compile(r"[Ss]alvaged\s+from\s+#(\d+)"),
|
|
# "Cherry-picked from @username"
|
|
re.compile(r"[Cc]herry[- ]?picked\s+from\s+@(\w[\w-]*)"),
|
|
# "Based on work by @username"
|
|
re.compile(r"[Bb]ased\s+on\s+work\s+by\s+@(\w[\w-]*)"),
|
|
# "Original PR by @username"
|
|
re.compile(r"[Oo]riginal\s+PR\s+by\s+@(\w[\w-]*)"),
|
|
# "Co-authored with @username"
|
|
re.compile(r"[Cc]o[- ]?authored\s+with\s+@(\w[\w-]*)"),
|
|
]
|
|
|
|
# Pattern for Co-authored-by trailers in commit messages
|
|
CO_AUTHORED_RE = re.compile(
|
|
r"Co-authored-by:\s*(.+?)\s*<([^>]+)>",
|
|
re.IGNORECASE,
|
|
)
|
|
|
|
|
|
def collect_commit_authors(since_tag, until="HEAD"):
|
|
"""Collect contributors from git commit authors.
|
|
|
|
Returns:
|
|
contributors: dict mapping github_handle -> set of source labels
|
|
unknown_emails: dict mapping email -> git name (for emails not in AUTHOR_MAP)
|
|
"""
|
|
range_spec = f"{since_tag}..{until}"
|
|
log = git(
|
|
"log", range_spec,
|
|
"--format=%H|%an|%ae|%s",
|
|
"--no-merges",
|
|
)
|
|
|
|
contributors = defaultdict(set)
|
|
unknown_emails = {}
|
|
|
|
if not log:
|
|
return contributors, unknown_emails
|
|
|
|
for line in log.split("\n"):
|
|
if not line.strip():
|
|
continue
|
|
parts = line.split("|", 3)
|
|
if len(parts) != 4:
|
|
continue
|
|
_sha, name, email, _subject = parts
|
|
|
|
handle = resolve_author(name, email)
|
|
# resolve_author returns "@handle" or plain name
|
|
if handle.startswith("@"):
|
|
contributors[handle.lstrip("@")].add("commit")
|
|
else:
|
|
# Could not resolve — record as unknown
|
|
contributors[handle].add("commit")
|
|
unknown_emails[email] = name
|
|
|
|
return contributors, unknown_emails
|
|
|
|
|
|
def collect_co_authors(since_tag, until="HEAD"):
|
|
"""Collect contributors from Co-authored-by trailers in commit messages.
|
|
|
|
Returns:
|
|
contributors: dict mapping github_handle -> set of source labels
|
|
unknown_emails: dict mapping email -> git name
|
|
"""
|
|
range_spec = f"{since_tag}..{until}"
|
|
# Get full commit messages to scan for trailers
|
|
log = git(
|
|
"log", range_spec,
|
|
"--format=__COMMIT__%H%n%b",
|
|
"--no-merges",
|
|
)
|
|
|
|
contributors = defaultdict(set)
|
|
unknown_emails = {}
|
|
|
|
if not log:
|
|
return contributors, unknown_emails
|
|
|
|
for line in log.split("\n"):
|
|
match = CO_AUTHORED_RE.search(line)
|
|
if match:
|
|
name = match.group(1).strip()
|
|
email = match.group(2).strip()
|
|
handle = resolve_author(name, email)
|
|
if handle.startswith("@"):
|
|
contributors[handle.lstrip("@")].add("co-author")
|
|
else:
|
|
contributors[handle].add("co-author")
|
|
unknown_emails[email] = name
|
|
|
|
return contributors, unknown_emails
|
|
|
|
|
|
def collect_salvaged_contributors(since_tag, until="HEAD"):
|
|
"""Scan merged PR bodies for salvage/cherry-pick/co-author attribution.
|
|
|
|
Uses the gh CLI to fetch PRs, then filters to the date range defined
|
|
by since_tag..until and scans bodies for salvage patterns.
|
|
|
|
Returns:
|
|
contributors: dict mapping github_handle -> set of source labels
|
|
pr_refs: dict mapping github_handle -> list of PR numbers where found
|
|
"""
|
|
contributors = defaultdict(set)
|
|
pr_refs = defaultdict(list)
|
|
|
|
# Determine the date range from git tags/refs
|
|
since_date = git("log", "-1", "--format=%aI", since_tag)
|
|
if until == "HEAD":
|
|
until_date = git("log", "-1", "--format=%aI", "HEAD")
|
|
else:
|
|
until_date = git("log", "-1", "--format=%aI", until)
|
|
|
|
if not since_date:
|
|
print(f" [warn] Could not resolve date for {since_tag}", file=sys.stderr)
|
|
return contributors, pr_refs
|
|
|
|
prs = gh_pr_list()
|
|
if not prs:
|
|
return contributors, pr_refs
|
|
|
|
for pr in prs:
|
|
# Filter by merge date if available
|
|
merged_at = pr.get("mergedAt", "")
|
|
if merged_at and since_date:
|
|
if merged_at < since_date:
|
|
continue
|
|
if until_date and merged_at > until_date:
|
|
continue
|
|
|
|
body = pr.get("body") or ""
|
|
pr_number = pr.get("number", "?")
|
|
|
|
# Also credit the PR author
|
|
pr_author = pr.get("author", {})
|
|
pr_author_login = pr_author.get("login", "") if isinstance(pr_author, dict) else ""
|
|
|
|
for pattern in SALVAGE_PATTERNS:
|
|
for match in pattern.finditer(body):
|
|
value = match.group(1)
|
|
# If it's a number, it's a PR reference — skip for now
|
|
# (would need another API call to resolve PR author)
|
|
if value.isdigit():
|
|
continue
|
|
contributors[value].add("salvage")
|
|
pr_refs[value].append(pr_number)
|
|
|
|
return contributors, pr_refs
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Release file comparison
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def check_release_file(release_file, all_contributors):
|
|
"""Check which contributors are mentioned in the release file.
|
|
|
|
Returns:
|
|
mentioned: set of handles found in the file
|
|
missing: set of handles NOT found in the file
|
|
"""
|
|
try:
|
|
content = Path(release_file).read_text(encoding="utf-8")
|
|
except FileNotFoundError:
|
|
print(f" [error] Release file not found: {release_file}", file=sys.stderr)
|
|
return set(), set(all_contributors)
|
|
|
|
mentioned = set()
|
|
missing = set()
|
|
content_lower = content.lower()
|
|
|
|
for handle in all_contributors:
|
|
# Check for @handle or just handle (case-insensitive)
|
|
if f"@{handle.lower()}" in content_lower or handle.lower() in content_lower:
|
|
mentioned.add(handle)
|
|
else:
|
|
missing.add(handle)
|
|
|
|
return mentioned, missing
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Main
|
|
# ---------------------------------------------------------------------------
|
|
|
|
def main():
|
|
parser = argparse.ArgumentParser(
|
|
description="Audit contributors across git history, co-author trailers, and salvaged PRs.",
|
|
)
|
|
parser.add_argument(
|
|
"--since-tag",
|
|
required=True,
|
|
help="Git tag to start from (e.g., v2026.4.8)",
|
|
)
|
|
parser.add_argument(
|
|
"--until",
|
|
default="HEAD",
|
|
help="Git ref to end at (default: HEAD)",
|
|
)
|
|
parser.add_argument(
|
|
"--release-file",
|
|
default=None,
|
|
help="Path to a release notes file to check for missing contributors",
|
|
)
|
|
parser.add_argument(
|
|
"--strict",
|
|
action="store_true",
|
|
help="Exit with code 1 if new unmapped emails are found (for CI)",
|
|
)
|
|
parser.add_argument(
|
|
"--diff-base",
|
|
default=None,
|
|
help="Git ref to diff against (only flag emails from commits after this ref)",
|
|
)
|
|
args = parser.parse_args()
|
|
|
|
print(f"=== Contributor Audit: {args.since_tag}..{args.until} ===")
|
|
print()
|
|
|
|
# ---- 1. Git commit authors ----
|
|
print("[1/3] Scanning git commit authors...")
|
|
commit_contribs, commit_unknowns = collect_commit_authors(args.since_tag, args.until)
|
|
print(f" Found {len(commit_contribs)} contributor(s) from commits.")
|
|
|
|
# ---- 2. Co-authored-by trailers ----
|
|
print("[2/3] Scanning Co-authored-by trailers...")
|
|
coauthor_contribs, coauthor_unknowns = collect_co_authors(args.since_tag, args.until)
|
|
print(f" Found {len(coauthor_contribs)} contributor(s) from co-author trailers.")
|
|
|
|
# ---- 3. Salvaged PRs ----
|
|
print("[3/3] Scanning salvaged/cherry-picked PR descriptions...")
|
|
salvage_contribs, salvage_pr_refs = collect_salvaged_contributors(args.since_tag, args.until)
|
|
print(f" Found {len(salvage_contribs)} contributor(s) from salvaged PRs.")
|
|
|
|
# ---- Merge all contributors ----
|
|
all_contributors = defaultdict(set)
|
|
for handle, sources in commit_contribs.items():
|
|
all_contributors[handle].update(sources)
|
|
for handle, sources in coauthor_contribs.items():
|
|
all_contributors[handle].update(sources)
|
|
for handle, sources in salvage_contribs.items():
|
|
all_contributors[handle].update(sources)
|
|
|
|
# Merge unknown emails
|
|
all_unknowns = {}
|
|
all_unknowns.update(commit_unknowns)
|
|
all_unknowns.update(coauthor_unknowns)
|
|
|
|
# Filter out AI assistants, bots, and machine accounts
|
|
ignored = {h for h in all_contributors if is_ignored(h)}
|
|
for h in ignored:
|
|
del all_contributors[h]
|
|
# Also filter unknowns by email
|
|
all_unknowns = {e: n for e, n in all_unknowns.items() if not is_ignored(n, e)}
|
|
|
|
# ---- Output ----
|
|
print()
|
|
print(f"=== All Contributors ({len(all_contributors)}) ===")
|
|
print()
|
|
|
|
# Sort by handle, case-insensitive
|
|
for handle in sorted(all_contributors.keys(), key=str.lower):
|
|
sources = sorted(all_contributors[handle])
|
|
source_str = ", ".join(sources)
|
|
extra = ""
|
|
if handle in salvage_pr_refs:
|
|
pr_nums = salvage_pr_refs[handle]
|
|
extra = f" (PRs: {', '.join(f'#{n}' for n in pr_nums)})"
|
|
print(f" @{handle} [{source_str}]{extra}")
|
|
|
|
# ---- Unknown emails ----
|
|
if all_unknowns:
|
|
print()
|
|
print(f"=== Unknown Emails ({len(all_unknowns)}) ===")
|
|
print("These emails have no mapping and should be added via:")
|
|
print()
|
|
for email, name in sorted(all_unknowns.items()):
|
|
print(f" python3 scripts/add_contributor.py {email} <github-username> # {name}")
|
|
|
|
# ---- Strict mode: fail CI if new unmapped emails are introduced ----
|
|
if args.strict and all_unknowns:
|
|
# In strict mode, check if ANY unknown emails come from commits in this
|
|
# PR's diff range (new unmapped emails that weren't there before).
|
|
# This is the CI gate: existing unknowns are grandfathered, but new
|
|
# commits must have their author email in AUTHOR_MAP.
|
|
new_unknowns = {}
|
|
if args.diff_base:
|
|
# Only flag emails from commits after diff_base
|
|
new_commits_output = git(
|
|
"log", f"{args.diff_base}..HEAD",
|
|
"--format=%ae", "--no-merges",
|
|
)
|
|
new_emails = set(new_commits_output.splitlines()) if new_commits_output else set()
|
|
for email, name in all_unknowns.items():
|
|
if email in new_emails:
|
|
new_unknowns[email] = name
|
|
else:
|
|
new_unknowns = all_unknowns
|
|
|
|
if new_unknowns:
|
|
print()
|
|
print(f"=== STRICT MODE FAILURE: {len(new_unknowns)} new unmapped email(s) ===")
|
|
print("Add mapping files before merging (do NOT edit AUTHOR_MAP):")
|
|
print()
|
|
for email, name in sorted(new_unknowns.items()):
|
|
print(f" python3 scripts/add_contributor.py {email} <github-username> # {name}")
|
|
print()
|
|
print("To find the GitHub username:")
|
|
print(" gh api 'search/users?q=EMAIL+in:email' --jq '.items[0].login'")
|
|
strict_failed = True
|
|
else:
|
|
strict_failed = False
|
|
else:
|
|
strict_failed = False
|
|
|
|
# ---- Release file comparison ----
|
|
if args.release_file:
|
|
print()
|
|
print(f"=== Release File Check: {args.release_file} ===")
|
|
print()
|
|
mentioned, missing = check_release_file(args.release_file, all_contributors.keys())
|
|
print(f" Mentioned in release notes: {len(mentioned)}")
|
|
print(f" Missing from release notes: {len(missing)}")
|
|
if missing:
|
|
print()
|
|
print(" Contributors NOT mentioned in the release file:")
|
|
for handle in sorted(missing, key=str.lower):
|
|
sources = sorted(all_contributors[handle])
|
|
print(f" @{handle} [{', '.join(sources)}]")
|
|
else:
|
|
print()
|
|
print(" All contributors are mentioned in the release file!")
|
|
|
|
print()
|
|
print("Done.")
|
|
|
|
if strict_failed:
|
|
sys.exit(1)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|