@jphutchins/code-review 0.1.0-alpha.65 → 0.1.0-alpha.66

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jphutchins/code-review",
-  "version": "0.1.0-alpha.65",
+  "version": "0.1.0-alpha.66",
   "description": "Deterministic commenter for agentic PR review — gather, render, inline, post, adapt, extract, cost, validate, print-schema",
   "type": "module",
   "license": "MIT",

package/templates/comment.eta

@@ -47,22 +47,80 @@
 <% } -%>
 
 <%~ it.findings.summary %>
-<% const c = it.severityCounts %><% const findingsTotal = c.critical + c.major + c.minor + c.nit %>
-<% if (it.teachesResponses && (findingsTotal > 0 || it.systemic.length > 0)) { -%>
+<% const c = it.severityCounts %><% const findingsTotal = c.critical + c.major + c.minor + c.nit -%>
+<% if (it.strays.length > 0 || (!it.incomplete && (findingsTotal > 0 || it.systemic.length > 0 || it.contested.length > 0))) { -%>
 
-<sub><%~ it.responseTeaching %></sub>
+## <% if (it.strays.length === 0) { %>Findings<% } else if (it.inlineDisposition && (it.inlineDisposition.kind === 'disabled' || it.inlineDisposition.kind === 'whole-document')) { %>Findings<% } else if (it.inlineDisposition && it.inlineDisposition.kind === 'no-envelope') { %>Findings (no inline review — result envelope lost)<% } else { %><%= (it.unanchoredCount && it.unanchoredCount > 0) ? 'Findings' : 'Findings outside the diff' %><% } %>
+<% if (it.strays.length > 0) { %>
+<% if (it.inlineDisposition && it.inlineDisposition.kind === 'no-envelope') { %>
+<% if (it.shedCount === 0) { %>
+_Every finding is listed below — the inline review could not be built because the result envelope was missing._
+<% } -%>
+<% } else if (it.inlineDisposition && it.inlineDisposition.kind === 'whole-document') { %>
+_Every finding from this run<% if (it.inlineDisposition.inlineCount > 0) { %>, including the <%= it.inlineDisposition.inlineCount %> posted as inline comment<%= it.inlineDisposition.inlineCount === 1 ? '' : 's' %> on the diff<% } %><% if (it.inlineDisposition.rejectedCount > 0) { %>; <%= it.inlineDisposition.rejectedCount %> could not be anchored (GitHub rejected the position)<% } %>._
+<% } else if (it.unanchoredCount && it.unanchoredCount > 0) { %>
+_<%= it.unanchoredCount %> finding<%= it.unanchoredCount === 1 ? '' : 's' %> below couldn't be posted as inline comment<%= it.unanchoredCount === 1 ? '' : 's' %> (GitHub rejected the position)<% if (it.strays.length > it.unanchoredCount) { %>; the rest are outside the diff<% } %>._
+<% } %>
+<% } %>
+<% if (it.teachesResponses && (findingsTotal > 0 || it.systemic.length > 0 || it.contested.length > 0)) { -%>
+
+<details><summary>How to answer these findings</summary>
+
+<%~ it.responseTeaching %>
+</details>
+<% } -%>
+<% if (!it.incomplete && it.contested.length > 0) { -%>
+
+### ⚖️ Contested
+
+_The reviewer rebutted a maintainer's answer, and a maintainer answered again. Each stays in the score at a fixed weight, whether or not it is raised again, until a maintainer rules._
+<% if (it.teachesResponses) { -%>
+
+<%~ it.rulingTeaching %>
+<% } -%>
+
+<% it.contested.forEach(function(k) { -%>
+#### <%= it.severityEmoji(k.severity) %> (<%= k.severity %>) <%= k.title %>
+<sub><% if (k.reRaise && k.reRaise.location) { %>`<%~ k.reRaise.location %>` · <% } %>id `<%~ k.id %>` · [the maintainer's latest answer](<%~ k.answerUrl %>)</sub>
+<% if (k.reRaise) { -%>
+
+<%~ k.reRaise.description %>
+<% if (k.reRaise.rebuttal) { -%>
+
+**Rebuttal:** <%~ k.reRaise.rebuttal %>
+<% } -%>
+
+> <details><summary>Reasoning</summary>
+>
+<% k.reRaise.reasoning.split("\n").forEach(function(rl) { -%>
+> <%= rl %>
+<% }) -%>
+>
+> </details>
 <% } -%>
+<% if (k.discussionHtml) { -%>
 
+<details><summary>💬 Discussion</summary>
+
+<%~ k.discussionHtml %>
+</details>
+<% } -%>
+<% }) -%>
+<% } -%>
 <% if (!it.incomplete && it.systemic.length > 0) { -%>
 
-## 🔗 Systemic problems
+### 🔗 Systemic problems
 
 <% it.systemic.forEach(function(s) { -%>
-### <%= it.severityEmoji(s.severity) %> (<%= s.severity %>) <%= s.title %>
+#### <%= it.severityEmoji(s.severity) %> (<%= s.severity %>) <%= s.title %>
 <sub>confidence <%= it.formatConfidence(s.confidence) %><% if (s.id) { %> · id <% if (s.code_url) { %>[`<%~ s.id %>`](<%~ s.code_url %>)<% } else { %>`<%~ s.id %>`<% } %><% } %></sub>
 <% const meta = [] %><% if (s.paths && s.paths.length > 0) { meta.push('Affects: ' + s.paths.map(function(p) { return '`' + p + '`' }).join(', ')) } %><% if (s.finding_ids && s.finding_ids.length > 0) { meta.push('Ties together: ' + s.finding_ids.map(function(c) { return '`' + c + '`' }).join(', ')) } %><% if (meta.length > 0) { %>_<%~ meta.join(' · ') %>_<% } %>
 
 <%~ s.description %>
+<% if (s.answeredNote) { -%>
+
+> ↩️ <%~ s.answeredNote %>
+<% } -%>
 <% if (it.hasRebuttal(s)) { -%>
 
 **Rebuttal:** <%~ s.rebuttal %>
@@ -84,6 +142,7 @@
 > </details>
 <% }) -%>
 <% } -%>
+<% } -%>
 
 ---
 
@@ -99,7 +158,10 @@
 <% if (findingsTotal > 0) { %>
 <% const parts = [] %><% if (c.critical) { parts.push(it.severityEmoji('critical') + ' ' + c.critical) } %><% if (c.major) { parts.push(it.severityEmoji('major') + ' ' + c.major) } %><% if (c.minor) { parts.push(it.severityEmoji('minor') + ' ' + c.minor) } %><% if (c.nit) { parts.push(it.severityEmoji('nit') + ' ' + c.nit) } %>
 **Findings:** <%~ parts.join(' · ') %>
-<% } else if (!it.incomplete && it.systemic.length === 0 && !it.answeredReRaiseNote) { %>
+<% } else if (!it.incomplete && (it.systemic.length > 0 || it.contested.length > 0)) { %>
+<% const held = [] %><% if (it.contested.length > 0) { held.push(it.contested.length + ' contested item' + (it.contested.length === 1 ? '' : 's')) } %><% if (it.systemic.length > 0) { held.push(it.systemic.length + ' systemic problem' + (it.systemic.length === 1 ? '' : 's')) } %>
+_No findings beyond the <%= held.join(' and ') %> above._
+<% } else if (!it.incomplete && !it.answeredReRaiseNote) { %>
 <% if (it.unverifiedNoLogs) { %>_No findings — but no failing-job logs were staged, so this pass could not read the CI failure. "No findings" is not evidence of none._<% } else { %>_No findings — clean review._<% } %>
 <% } %>
 
@@ -118,16 +180,6 @@
 <% } %>
 
 <% if (it.strays.length > 0) { %>
-## <% if (it.inlineDisposition && (it.inlineDisposition.kind === 'disabled' || it.inlineDisposition.kind === 'whole-document')) { %>Findings<% } else if (it.inlineDisposition && it.inlineDisposition.kind === 'no-envelope') { %>Findings (no inline review — result envelope lost)<% } else { %><%= (it.unanchoredCount && it.unanchoredCount > 0) ? 'Findings' : 'Findings outside the diff' %><% } %>
-<% if (it.inlineDisposition && it.inlineDisposition.kind === 'no-envelope') { %>
-<% if (it.shedCount === 0) { %>
-_Every finding is listed below — the inline review could not be built because the result envelope was missing._
-<% } -%>
-<% } else if (it.inlineDisposition && it.inlineDisposition.kind === 'whole-document') { %>
-_Every finding from this run<% if (it.inlineDisposition.inlineCount > 0) { %>, including the <%= it.inlineDisposition.inlineCount %> posted as inline comment<%= it.inlineDisposition.inlineCount === 1 ? '' : 's' %> on the diff<% } %><% if (it.inlineDisposition.rejectedCount > 0) { %>; <%= it.inlineDisposition.rejectedCount %> could not be anchored (GitHub rejected the position)<% } %>._
-<% } else if (it.unanchoredCount && it.unanchoredCount > 0) { %>
-_<%= it.unanchoredCount %> finding<%= it.unanchoredCount === 1 ? '' : 's' %> below couldn't be posted as inline comment<%= it.unanchoredCount === 1 ? '' : 's' %> (GitHub rejected the position)<% if (it.strays.length > it.unanchoredCount) { %>; the rest are outside the diff<% } %>._
-<% } %>
 
 <% it.strays.forEach(function(f) { -%>
 ### <%= it.severityEmoji(f.severity) %> (<%= f.severity %>) `<%= f.path %>:<%= f.rangeLabel %><% if (f.side) { %> (<%= f.side %>)<% } %>` — <%= f.title %>