build-cran-binaries/local/proposal-tracking-lib.R
pat-s f1dd661213
All checks were successful
ci/crow/manual/weekly-patch-proposals Pipeline was successful
ci/crow/cron/process-updates/15 Pipeline was successful
ci/crow/cron/process-updates/11 Pipeline was successful
ci/crow/cron/process-updates/16 Pipeline was successful
ci/crow/cron/process-updates/18 Pipeline was successful
fix(local): route multi-signature packages to human triage in the proposer (#119)
## Problem

A live `propose-patches.R --open-issue` run aborted with:

```
Patch registry validation FAILED:
  - ambiguous duplicate entries: hmmTMB|ubuntu-2604|*, imt|ubuntu-2604|*, refundBayes|ubuntu-2604|*
Error: Candidate registry failed validation; not writing or proposing.
```

Root cause: a package whose failing builds match **more than one** auto-proposable signature (e.g. some logs hit `tbb-stddef-removed`, others `rcppparallel-bundled-tbb`) landed in two separate signature groups, so the proposer emitted two candidate entries with the same `package|platforms|versions` key. The validator's ambiguous-duplicate check then failed the whole candidate set, aborting the run — so even the unambiguous candidates (e.g. `vacalibration`) never got proposed.

## Fix

Add a pure, tested `dedupe_candidates()` that:

- keeps a package's candidate only when it maps to a **single** signature (collapsing an accidental repeat under the same signature), and
- routes a package that maps to **multiple** signatures (conflicting fix tiers -- makevars vs source patch) to **human triage** instead of guessing between them.

The proposer prints the skipped ambiguous packages and proceeds with the clean candidates, so one ambiguous package no longer blocks the rest. This matches the issue #115 guardrail: don't auto-pick when the fix is ambiguous.

## Verification

- New unit tests in `test-proposal-tracking-lib.R` cover the single-signature, multi-signature (conflict), duplicate-under-one-signature, and empty cases.
- Reproduced the original failure end-to-end with a stubbed DB (`hmmTMB` ambiguous + `vacalibration` clean): `hmmTMB` is now listed under "Ambiguous -> human triage", `vacalibration` is proposed, and the candidate registry validates (`Patch registry OK`).
- Full suite: 78 tests pass; all pre-commit hooks pass.

Reviewed-on: #119
2026-07-14 17:11:54 +00:00

134 lines
4.8 KiB
R

# Pure, IO-free helpers for the proposal feedback loop (issue #115, step 4):
# a small ledger of what the classifier proposed, plus metrics derived from the
# live triage report and the registry (signature hit rate, proposed-vs-merged,
# retirement candidates).
#
# Kept free of DB/HTTP/clock so it can be sourced by the proposer, the tracker
# entrypoint, and the unit tests. Timestamps are passed in by callers.
# Split proposal candidates into the ones safe to emit and the ambiguous ones.
# A candidate is a list with at least `package` and `signature`. A package that
# maps to more than one distinct auto-proposable signature is genuinely
# ambiguous (two conflicting fix tiers, e.g. makevars vs source patch): emitting
# both would create colliding registry entries, so those are routed to human
# triage instead of guessed at. Returns list(keep = ..., ambiguous = ...), where
# `ambiguous` is a named list of package -> the distinct signatures seen.
dedupe_candidates <- function(candidates) {
if (length(candidates) == 0L) {
return(list(keep = list(), ambiguous = list()))
}
pkgs <- vapply(candidates, function(c) as.character(c$package), character(1L))
by_pkg <- split(candidates, pkgs)
keep <- list()
ambiguous <- list()
for (pkg in names(by_pkg)) {
cs <- by_pkg[[pkg]]
sigs <- unique(vapply(
cs,
function(c) as.character(c$signature),
character(1L)
))
if (length(sigs) == 1L) {
keep[[length(keep) + 1L]] <- cs[[1L]] # one signature -> take the first
} else {
ambiguous[[pkg]] <- sigs
}
}
list(keep = keep, ambiguous = ambiguous)
}
# Stable identity of a ledger record: one proposal per (package, signature).
ledger_key <- function(record) {
paste0(
if (is.null(record$package)) "?" else record$package,
"|",
if (is.null(record$signature)) "?" else record$signature
)
}
# Merge freshly-generated proposals into an existing ledger without clobbering
# history: a record whose (package, signature) already exists is left as-is
# (its status/PR/issue are preserved); genuinely new proposals are appended.
# Returns the combined list. Pure: callers stamp `proposed_at` before passing.
merge_ledger <- function(existing, new_records) {
if (is.null(existing)) {
existing <- list()
}
seen <- vapply(existing, ledger_key, character(1L))
out <- existing
for (rec in new_records) {
if (!(ledger_key(rec) %in% seen)) {
out[[length(out) + 1L]] <- rec
seen <- c(seen, ledger_key(rec))
}
}
out
}
# Per-signature hit rate from a triage report (list of group records from
# build_triage_report) crossed with the set of already-registered packages.
# For each *matched* signature: how many failing builds/packages it explains,
# and how many of those packages are already addressed by a registry entry.
signature_hit_rate <- function(report, registered_pkgs = character(0L)) {
matched <- Filter(function(g) isTRUE(g$matched), report)
by_sig <- split(
matched,
vapply(matched, function(g) g$signature, character(1L))
)
lapply(names(by_sig), function(sig) {
grps <- by_sig[[sig]]
pkgs <- unique(unlist(lapply(grps, function(g) g$packages)))
addressed <- intersect(pkgs, registered_pkgs)
list(
signature = sig,
builds = sum(vapply(grps, function(g) g$build_count, integer(1L))),
packages = length(pkgs),
addressed = length(addressed),
open = length(setdiff(pkgs, registered_pkgs)),
auto_proposable = any(vapply(
grps,
function(g) isTRUE(g$auto_proposable),
logical(1L)
))
)
})
}
# Proposed-vs-merged: a ledger record counts as "merged" once its package
# appears in the registry. Returns per-record status plus a rollup.
proposed_vs_merged <- function(ledger, registered_pkgs = character(0L)) {
if (is.null(ledger)) {
ledger <- list()
}
rows <- lapply(ledger, function(rec) {
merged <- !is.null(rec$package) && rec$package %in% registered_pkgs
list(
package = rec$package,
signature = rec$signature,
status = if (merged) "merged" else (rec$status %||% "proposed"),
merged = merged
)
})
list(
records = rows,
total = length(rows),
merged = sum(vapply(rows, function(r) isTRUE(r$merged), logical(1L)))
)
}
# Registry entries whose package no longer appears in any current failure are
# retirement candidates: the upstream cause was likely fixed, so the entry can
# be reviewed for removal. `failing_pkgs` is the set of currently-failing
# package names (from the live report).
retirement_candidates <- function(registry_entries, failing_pkgs) {
if (is.null(registry_entries)) {
registry_entries <- list()
}
keep <- Filter(
function(e) !is.null(e$package) && !(e$package %in% failing_pkgs),
registry_entries
)
vapply(keep, function(e) as.character(e$package), character(1L))
}
`%||%` <- function(a, b) if (is.null(a)) b else a