diff --git a/cmd/gadfly/consensus.go b/cmd/gadfly/consensus.go
index ddb44d0..be04092 100644
--- a/cmd/gadfly/consensus.go
+++ b/cmd/gadfly/consensus.go
@@ -38,6 +38,7 @@ type modelFindings struct {
Model string `json:"model"`
Provider string `json:"provider"`
Verdict string `json:"verdict"` // worst lens verdict, as a label
+ Errored bool `json:"errored"` // the model produced no usable review (every lens failed, or the run crashed)
Markdown string `json:"markdown"` // full rendered per-model review (findings block already stripped)
Findings []outFinding `json:"findings"`
}
@@ -86,6 +87,7 @@ func writeFindingsOut(results []specialistResult) {
Model: strings.TrimSpace(os.Getenv("GADFLY_MODEL")),
Provider: modelProvider(),
Verdict: worstVerdict(results).label(),
+ Errored: allErrored(results),
Markdown: renderConsolidated(results),
}
for _, r := range results {
@@ -106,11 +108,32 @@ func writeFindingsOut(results []specialistResult) {
fmt.Fprintln(os.Stderr, "gadfly: marshal findings out:", err)
return
}
+ // Defensive: make sure the parent dir exists (entrypoint creates it, but a
+ // missing dir would otherwise silently drop this model from the consensus).
+ if dir := filepath.Dir(path); dir != "" {
+ _ = os.MkdirAll(dir, 0o755)
+ }
if err := os.WriteFile(path, data, 0o644); err != nil {
fmt.Fprintln(os.Stderr, "gadfly: write findings out:", err)
}
}
+// allErrored reports whether every lens of a review failed (so the model
+// produced no usable findings). Such a model is recorded but excluded from the
+// consensus agreement denominator โ counting it would dilute every ratio with a
+// model that never actually reviewed.
+func allErrored(results []specialistResult) bool {
+ if len(results) == 0 {
+ return true
+ }
+ for _, r := range results {
+ if !r.errored {
+ return false
+ }
+ }
+ return true
+}
+
// runConsolidate is the consolidation entry point (GADFLY_CONSOLIDATE_DIR set):
// read every per-model artifact in the directory, render the consensus comment
// to stdout. Errors are fatal to THIS process only โ entrypoint.sh treats a
@@ -155,26 +178,45 @@ func runConsolidate() error {
}
// cluster is a group of findings (across models) judged to be the same issue:
-// same file, lines within lineTolerance of each other.
+// same file, lines within lineTolerance of the cluster's current span. The span
+// [line,maxLine] slides as members join, so a chain of nearby findings merges
+// instead of splitting once it drifts past the first line.
type cluster struct {
file string
line int // representative (smallest) line
+ maxLine int // largest line in the cluster โ the span's upper edge
severity string
title string
- detail string
models map[string]bool
lenses map[string]bool
}
-// lineTolerance: findings in the same file within this many lines of each other
-// are treated as the same issue (models often cite a line or two apart).
+// findingRef is one model's finding (carrying which model reported it), used
+// while grouping findings into clusters.
+type findingRef struct {
+ f outFinding
+ model string
+}
+
+// lineTolerance: a finding in the same file within this many lines of a
+// cluster's current span is treated as the same issue (models often cite a line
+// or two apart).
const lineTolerance = 3
// renderConsensus builds the single consolidated comment body from every model's
// findings. It does NOT emit the marker or advisory footer โ entrypoint.sh wraps
// it (mirroring run.sh's per-model framing).
func renderConsensus(models []modelFindings) string {
- total := len(models)
+ // effective = models that actually produced a review. Errored models are
+ // shown (folded, below) but excluded from the agreement denominator so a
+ // failed model doesn't dilute every ratio.
+ effective := 0
+ for _, m := range models {
+ if !m.Errored {
+ effective++
+ }
+ }
+ errored := len(models) - effective
clusters := clusterFindings(models)
worst := verdictClean
@@ -184,11 +226,16 @@ func renderConsensus(models []modelFindings) string {
}
}
- // Partition: "headline" findings (multi-model agreement, OR a high/critical
- // even from one model) vs folded "single-model" lower-severity noise.
+ // Partition in one pass: "headline" findings (multi-model agreement, OR a
+ // lone CRITICAL) vs folded "single-model" lower-confidence findings. Also
+ // count multi-model agreements for the summary line.
var headline, folded []cluster
+ agreed := 0
for _, c := range clusters {
- if len(c.models) >= 2 || sevRank(c.severity) >= sevRank("high") {
+ if len(c.models) >= 2 {
+ agreed++
+ }
+ if len(c.models) >= 2 || sevRank(c.severity) >= sevRank("critical") {
headline = append(headline, c)
} else {
folded = append(folded, c)
@@ -196,13 +243,11 @@ func renderConsensus(models []modelFindings) string {
}
var b strings.Builder
- fmt.Fprintf(&b, "## ๐ชฐ Gadfly review โ consensus across %d model%s\n\n", total, plural(total))
- agreed := 0
- for _, c := range clusters {
- if len(c.models) >= 2 {
- agreed++
- }
+ fmt.Fprintf(&b, "## ๐ชฐ Gadfly review โ consensus across %d model%s", effective, plural(effective))
+ if errored > 0 {
+ fmt.Fprintf(&b, " (%d failed)", errored)
}
+ b.WriteString("\n\n")
fmt.Fprintf(&b, "**Verdict: %s** ยท %d finding%s (%d with multi-model agreement)\n",
worst.label(), len(clusters), plural(len(clusters)), agreed)
@@ -210,12 +255,14 @@ func renderConsensus(models []modelFindings) string {
b.WriteString("\n| | Finding | Where | Models | Lens |\n|--|--|--|--|--|\n")
for _, c := range headline {
fmt.Fprintf(&b, "| %s | %s | `%s` | %d/%d | %s |\n",
- sevIcon(c.severity), mdCell(c.title), location(c.file, c.line),
- len(c.models), total, mdCell(lensList(c.lenses)))
+ sevIcon(c.severity), mdCell(c.title), mdCell(location(c.file, c.line)),
+ len(c.models), effective, mdCell(lensList(c.lenses)))
}
- } else {
+ } else if len(clusters) == 0 {
b.WriteString("\nNo material issues found by consensus.\n")
}
+ // else: only single-model findings โ they're shown folded below, so don't
+ // claim "no material issues" (there are some, just none with consensus).
if len(folded) > 0 {
fmt.Fprintf(&b, "\n%d single-model finding%s (lower confidence)
\n\n",
@@ -223,7 +270,7 @@ func renderConsensus(models []modelFindings) string {
b.WriteString("| | Finding | Where | Model | Lens |\n|--|--|--|--|--|\n")
for _, c := range folded {
fmt.Fprintf(&b, "| %s | %s | `%s` | %s | %s |\n",
- sevIcon(c.severity), mdCell(c.title), location(c.file, c.line),
+ sevIcon(c.severity), mdCell(c.title), mdCell(location(c.file, c.line)),
mdCell(oneModel(c.models)), mdCell(lensList(c.lenses)))
}
b.WriteString("\n%s (%s) โ %s
\n\n%s\n\n