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

package/dist/index.js

@@ -109,7 +109,8 @@ var FindingIdRequired = t.type({ id: t.string });
 var FindingOptional = t.partial({
   side: SideCodec,
   recommendation: t.string,
-  patch: t.string
+  patch: t.string,
+  rebuttal: t.string
 });
 var EndGeStart = (shape) => t.refinement(shape, (f) => f.end_line >= f.start_line, "EndGeStart");
 var FindingShape = t.intersection([
@@ -135,7 +136,8 @@ var SystemicRequired = t.type({
 var SystemicOptional = t.partial({
   id: t.string,
   finding_ids: t.array(t.string),
-  paths: t.array(t.string)
+  paths: t.array(t.string),
+  rebuttal: t.string
 });
 var SystemicProblemShape = t.intersection([SystemicRequired, RuleUrlCodec, SystemicOptional]);
 var SystemicProblemCodec = strictExact("SystemicProblemStrict", SystemicProblemShape, [
@@ -245,6 +247,31 @@ var RECOVERABLE_OPTIONAL_FIELDS = /* @__PURE__ */ new Set([
   ...PIPELINE_STAMPED_FIELDS,
   "change_size"
 ]);
+var ID_SHAPE_RE = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
+var priorIdsFrom = (doc) => {
+  if (typeof doc !== "object" || doc === null || Array.isArray(doc)) return [];
+  const rec = doc;
+  const idsOf = (field, systemic) => (Array.isArray(rec[field]) ? rec[field] : []).flatMap((raw) => {
+    const item = typeof raw === "object" && raw !== null ? asRecord(raw) : null;
+    if (item === null) return [];
+    const title = typeof item["title"] === "string" ? item["title"] : "";
+    const resolved = resolveRuleId({
+      ...typeof item["id"] === "string" ? { id: item["id"] } : {},
+      ...typeof item["code"] === "string" ? { code: item["code"] } : {},
+      ...typeof item["path"] === "string" ? { path: item["path"] } : {},
+      title
+    });
+    const id = resolved ?? (systemic && title !== "" ? synthesizedSystemicId(title) : void 0);
+    return id !== void 0 ? [id] : [];
+  });
+  return [...idsOf("findings", false), ...idsOf("systemic_problems", true)];
+};
+var hasRebuttal = (item) => (item.rebuttal ?? "").trim() !== "";
+var withoutRebuttals = (doc) => ({
+  ...doc,
+  findings: doc.findings.map(({ rebuttal: _rebuttal, ...f }) => f),
+  ...doc.systemic_problems !== void 0 ? { systemic_problems: doc.systemic_problems.map(({ rebuttal: _rebuttal, ...s }) => s) } : {}
+});
 var synthesizedId = (parts, prefix) => `${prefix}${createHash("sha256").update(parts.join("\0")).digest("base64url").slice(0, 12)}`;
 var synthesizedFindingId = (path, title) => synthesizedId([path, title], "f-");
 var synthesizedSystemicId = (title) => synthesizedId([title], "s-");
@@ -270,12 +297,18 @@ var LegacyRuleCodec = t.partial({
   id: t.string,
   code_url: UriString
 });
-var FindingShapeV09 = t.intersection([FindingCoreRequired, LegacyRuleCodec, FindingOptional]);
+var FindingOptionalV09 = t.partial({
+  side: SideCodec,
+  recommendation: t.string,
+  patch: t.string
+});
+var FindingShapeV09 = t.intersection([FindingCoreRequired, LegacyRuleCodec, FindingOptionalV09]);
 var FindingCodecV09 = t.exact(EndGeStart(FindingShapeV09));
 var SystemicV09Optional = t.partial({
   finding_codes: t.array(t.string),
   finding_ids: t.array(t.string),
-  paths: t.array(t.string)
+  paths: t.array(t.string),
+  rebuttal: t.unknown
 });
 var SystemicV09Shape = t.intersection([SystemicRequired, LegacyRuleCodec, SystemicV09Optional]);
 var SystemicProblemCodecV09 = strictExact("SystemicV09Strict", SystemicV09Shape, [
@@ -343,7 +376,7 @@ var normalizeV09 = (doc) => {
     id: resolveRuleId({ id, code, path: f.path, title: f.title }) ?? synthesizedFindingId(f.path, f.title)
   }));
   const systemic_problems = doc.systemic_problems?.map(
-    ({ code, id, finding_codes, finding_ids, ...s }) => ({
+    ({ code, id, finding_codes, finding_ids, rebuttal: _rebuttal, ...s }) => ({
       ...s,
       id: resolveRuleId({ id, code, title: s.title }) ?? synthesizedSystemicId(s.title),
       ...finding_ids !== void 0 && finding_ids.length > 0 ? { finding_ids } : finding_codes !== void 0 ? { finding_ids: finding_codes } : {}
@@ -484,7 +517,7 @@ var TestSummaryCodec = t.intersection([
     failures: t.array(TestFailureCodec)
   })
 ]);
-var DEFAULT_SCHEMA_VERSION = "0.10.0";
+var DEFAULT_SCHEMA_VERSION = "0.11.0";
 var incompleteFindings = (summary) => ({
   schema_version: DEFAULT_SCHEMA_VERSION,
   summary,
@@ -494,7 +527,7 @@ var incompleteFindings = (summary) => ({
 var isIncompleteFindings = (findings) => findings.verdict === "error" && findings.findings.length === 0;
 
 // src/released.ts
-var RELEASED = "2026-10-02";
+var RELEASED = "2026-10-10";
 
 // src/cost.ts
 var defaultWarn = (message) => {
@@ -824,6 +857,8 @@ var isSeverityCounts = (u) => typeof u === "object" && u !== null && SEVERITIES.
 var MAX_IDS_PER_ROUND = 8;
 var hasId = (ids, code) => ids !== void 0 && Object.prototype.hasOwnProperty.call(ids, code);
 var escapeCodeBackticks = (code) => code.replace(/`/g, "-").replace(/\r?\n/g, " ");
+var encodeAutolinkParens = (url) => url.replace(/\(/g, "%28").replace(/\)/g, "%29");
+var linkSafeUrl = (url) => encodeAutolinkParens(escapeCodeBackticks(url));
 var normalizeIdCounts = (ids, priorCodes, preferredKeys, preValidated = false) => {
   const entries = Object.entries((preValidated ? ids : usableCountsMap(ids)) ?? {});
   if (entries.length === 0) return void 0;
@@ -1356,270 +1391,32 @@ var resolvePriorFindings = async (body, read) => {
   }
 };
 
-// src/comment-chain.ts
-function* ancestors(start, parentOf) {
-  const seen = /* @__PURE__ */ new Set();
-  let current = start;
-  while (current !== null && !seen.has(current)) {
-    yield current;
-    seen.add(current);
-    current = parentOf(current);
-  }
-}
-var numField = (rec, key2) => {
-  const v = rec[key2];
-  return typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : 0;
-};
-var messageUsage = (entry) => {
-  const rec = asRecord(entry);
-  if (rec === null || rec["type"] !== "assistant") return null;
-  const msg = asRecord(rec["message"]);
-  if (msg === null) return null;
-  const model = msg["model"];
-  const usage = asRecord(msg["usage"]);
-  if (typeof model !== "string" || usage === null) return null;
-  const id = msg["id"];
-  return {
-    id: typeof id === "string" ? id : null,
-    model: modelIdentity(model),
-    input: numField(usage, "input_tokens"),
-    output: numField(usage, "output_tokens"),
-    cacheRead: numField(usage, "cache_read_input_tokens"),
-    cacheWrite: numField(usage, "cache_creation_input_tokens")
-  };
-};
-var tsMsOf = (entry) => {
-  const rec = asRecord(entry);
-  const ts = rec?.["timestamp"];
-  if (typeof ts !== "string") return null;
-  const ms = Date.parse(ts);
-  return Number.isNaN(ms) ? null : ms;
-};
-var EMPTY_TOTALS = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
-var parseJsonl = (text) => text.split("\n").filter((line) => line.trim() !== "").flatMap((line) => {
-  try {
-    return [JSON.parse(line)];
-  } catch {
-    return [];
-  }
-});
-var sumTranscriptUsage = (entries) => {
-  const summed = entries.reduce(
-    (acc, entry) => {
-      const u = messageUsage(entry);
-      if (u === null) return acc;
-      if (u.id !== null && acc.seen.has(u.id)) return acc;
-      if (u.id !== null) acc.seen.add(u.id);
-      const prev = acc.totals.get(u.model) ?? EMPTY_TOTALS;
-      acc.totals.set(u.model, {
-        input: prev.input + u.input,
-        output: prev.output + u.output,
-        cacheRead: prev.cacheRead + u.cacheRead,
-        cacheWrite: prev.cacheWrite + u.cacheWrite
-      });
-      return { totals: acc.totals, turns: acc.turns + 1, seen: acc.seen };
-    },
-    { totals: /* @__PURE__ */ new Map(), turns: 0, seen: /* @__PURE__ */ new Set() }
-  );
-  const models = [...summed.totals].map(([model, t8]) => ({
-    model,
-    input_tokens: t8.input,
-    output_tokens: t8.output,
-    cache_read_tokens: t8.cacheRead,
-    cache_write_tokens: t8.cacheWrite
-  }));
-  const bounds = entries.reduce(
-    (acc, entry) => {
-      const ms = tsMsOf(entry);
-      if (ms === null) return acc;
-      return {
-        min: acc.min === null || ms < acc.min ? ms : acc.min,
-        max: acc.max === null || ms > acc.max ? ms : acc.max
-      };
-    },
-    { min: null, max: null }
-  );
-  return {
-    models,
-    turns: summed.turns,
-    durationMs: bounds.min !== null && bounds.max !== null ? bounds.max - bounds.min : 0,
-    firstTsMs: bounds.min,
-    lastTsMs: bounds.max
-  };
-};
-var subagentFiles = (mainPath) => {
-  const dir = join(dirname(mainPath), basename(mainPath, ".jsonl"), "subagents");
-  try {
-    return readdirSync(dir).filter((name) => name.endsWith(".jsonl")).map((name) => join(dir, name));
-  } catch {
-    return [];
-  }
-};
-var readTranscriptTree = (mainPath) => {
-  const mainText = readFileOrNull(mainPath);
-  const mainEntries = mainText === null ? [] : parseJsonl(mainText);
-  const inlineSidechains = mainEntries.some((e) => asRecord(e)?.["isSidechain"] === true);
-  const siblings = inlineSidechains ? [] : subagentFiles(mainPath);
-  const siblingReads = siblings.flatMap((path) => {
-    const text = readFileOrNull(path);
-    return text === null ? [] : [{ path, entries: parseJsonl(text) }];
-  });
-  return {
-    entries: [...mainEntries, ...siblingReads.flatMap((r) => r.entries)],
-    files: [...mainText === null ? [] : [mainPath], ...siblingReads.map((r) => r.path)],
-    missing: mainText === null
-  };
-};
-
 // src/answered.ts
-var THREAD_COMMENT_JQ = ".[] | {id, in_reply_to_id, user: {login: .user.login}, user_login: .user.login, user_type: .user.type, body, html_url, path, line, created_at, author_association}";
-var ThreadCommentCodec = t.type({
-  id: t.number,
-  in_reply_to_id: t.union([t.number, t.null]),
-  user_login: t.string,
-  user_type: t.union([t.string, t.null]),
-  body: t.union([t.string, t.null]),
-  html_url: t.string,
-  path: t.union([t.string, t.null]),
-  line: t.union([t.number, t.null]),
-  created_at: t.union([t.string, t.null])
-});
-var AnsweredEntryCodec = t.type({
-  code: t.string,
-  title: t.string,
-  description: t.string,
-  reasoning: t.string,
-  severity: t.union([
-    t.literal("critical"),
-    t.literal("major"),
-    t.literal("minor"),
-    t.literal("nit")
-  ]),
-  path: t.string,
-  patch: t.union([t.string, t.null]),
-  replied_at: t.union([t.string, t.null]),
-  reply_id: t.number,
-  thread_url: t.string,
-  reply_url: t.string,
-  reply_author: t.string,
-  reply_excerpt: t.string
-});
-var encodeAnsweredEntry = (e) => ({
-  code: e.code,
-  title: e.title,
-  description: e.description,
-  reasoning: e.reasoning,
-  severity: e.severity,
-  path: e.path,
-  patch: e.patch,
-  replied_at: e.repliedAt,
-  reply_id: e.replyId,
-  thread_url: e.threadUrl,
-  reply_url: e.replyUrl,
-  reply_author: e.replyAuthor,
-  reply_excerpt: e.replyExcerpt
+var answeredRegistryFrom = (closures, prior) => closures.flatMap((response) => {
+  const finding = prior?.findings.find((f) => resolveFindingId(f) === response.id);
+  return finding === void 0 ? [] : [
+    {
+      code: response.id,
+      title: finding.title,
+      description: finding.description,
+      reasoning: finding.reasoning,
+      severity: finding.severity,
+      path: finding.path,
+      patch: finding.patch ?? null,
+      answerUrl: response.source_url,
+      answerAuthor: response.author
+    }
+  ];
 });
-var decodeAnsweredEntry = (raw) => {
-  const decoded = AnsweredEntryCodec.decode(raw);
-  return decoded._tag === "Right" ? decoded.right : null;
-};
-var isHuman = (login, type8, botLogin) => login !== botLogin && type8 === "User";
-var EXCERPT_LIMIT = 400;
-var answeredRegistryFrom = (comments, botLogin) => {
-  const ordered = [...comments].sort(
-    (a, b) => (a.created_at ?? "").localeCompare(b.created_at ?? "") || (a.id > b.id ? 1 : a.id < b.id ? -1 : 0)
-  );
-  const byId = /* @__PURE__ */ new Map();
-  for (const c of ordered) byId.set(c.id, c);
-  const rootOf = (c) => {
-    const chain = [
-      ...ancestors(
-        c,
-        (n) => n.in_reply_to_id === null ? null : byId.get(n.in_reply_to_id) ?? null
-      )
-    ];
-    const root = chain[chain.length - 1];
-    return root !== void 0 && root.in_reply_to_id === null ? root : null;
-  };
-  const findingOf = (root) => {
-    const decoded = parseFindingsMarker(root.body ?? "");
-    const doc = typeof decoded === "object" && decoded !== null ? decoded.findings : void 0;
-    const first = Array.isArray(doc) ? doc[0] : void 0;
-    if (first === void 0) return null;
-    const title = first["title"];
-    const description = first["description"];
-    const reasoning = first["reasoning"];
-    const id = first["id"];
-    const legacyCode = first["code"];
-    const severity = first["severity"];
-    const path = first["path"];
-    const patch = first["patch"];
-    return typeof title === "string" && typeof description === "string" && typeof reasoning === "string" && typeof path === "string" && (severity === "critical" || severity === "major" || severity === "minor" || severity === "nit") ? {
-      // resolveRuleId: the ONE legacy-spelling precedence the upcast, this reader, and the
-      // below-floor nit reader share — a pre-id marker (or one written before the migration)
-      // carries `code`; a codeless one resolves to the same synthesized id the registry's
-      // legacy upcast derives, so the entry keys to the identical claim on the next round.
-      code: resolveRuleId({
-        id: typeof id === "string" ? id : void 0,
-        code: typeof legacyCode === "string" ? legacyCode : void 0,
-        path,
-        title
-      }) ?? synthesizedFindingId(path, title),
-      title,
-      description,
-      reasoning,
-      severity,
-      path,
-      patch: typeof patch === "string" ? patch : null
-    } : null;
-  };
-  const threads = /* @__PURE__ */ new Map();
-  for (const c of ordered) {
-    const root = rootOf(c);
-    if (root === null) continue;
-    const group = threads.get(root.id);
-    if (group === void 0) threads.set(root.id, [c]);
-    else group.push(c);
-  }
-  const entries = [];
-  for (const [rootId, group] of threads) {
-    const root = byId.get(rootId);
-    if (root === void 0 || root.user_login !== botLogin) continue;
-    const finding = findingOf(root);
-    if (finding === null) continue;
-    const humanReplies = group.filter(
-      (c) => c.id !== root.id && isHuman(c.user_login, c.user_type, botLogin)
-    );
-    const reply = humanReplies[humanReplies.length - 1];
-    if (reply === void 0) continue;
-    entries.push({
-      ...finding,
-      repliedAt: reply.created_at,
-      replyId: reply.id,
-      threadUrl: root.html_url,
-      replyUrl: reply.html_url,
-      replyAuthor: reply.user_login,
-      replyExcerpt: clipText(reply.body ?? "", EXCERPT_LIMIT)
-    });
-  }
-  const byKey = /* @__PURE__ */ new Map();
-  for (const entry of [...entries].sort(
-    (a, b) => (b.repliedAt ?? "").localeCompare(a.repliedAt ?? "") || b.replyId - a.replyId
-  )) {
-    const key2 = answeredNoteKey({ id: entry.code, title: entry.title });
-    if (!byKey.has(key2)) byKey.set(key2, entry);
-  }
-  return [...byKey.values()];
-};
 var isSynthesizedTitleMatch = (f, e) => isSynthesizedFindingId(e.code) && e.title === f.title;
 var matches = (resolvedId, f, e) => e.code === resolvedId || isSynthesizedTitleMatch(f, e);
+var couldMatch = (code, findings) => isSynthesizedFindingId(code) || findings.some((f) => resolveFindingId(f) === code);
 var VERBATIM_FIELDS = ["title", "description", "reasoning", "severity", "path", "patch"];
 var verbatimFieldEqual = (f, e, field) => field === "patch" ? (f.patch ?? null) === e.patch : f[field] === e[field];
-var isVerbatimReRaise = (f, e) => VERBATIM_FIELDS.every((field) => verbatimFieldEqual(f, e, field));
+var isVerbatimReRaise = (f, e) => !hasRebuttal(f) && VERBATIM_FIELDS.every((field) => verbatimFieldEqual(f, e, field));
 var isAnsweredDrop = (resolvedId, f, e) => matches(resolvedId, f, e) && isVerbatimReRaise(f, e) && f.severity !== "critical";
 var verbatimMatchCount = (f, e) => VERBATIM_FIELDS.reduce((count, field) => count + (verbatimFieldEqual(f, e, field) ? 1 : 0), 0);
 var answeredNoteKey = (f) => f.id !== "" ? f.id : `title:${f.title}`;
-var NO_TITLE_MATCH = { entry: void 0, score: -1 };
 var bestTitleMatch = (f, registry) => {
   let best;
   let bestScore = -1;
@@ -1632,9 +1429,10 @@ var bestTitleMatch = (f, registry) => {
       if (score === VERBATIM_FIELDS.length) break;
     }
   }
-  return { entry: best, score: bestScore };
+  return best;
 };
-var answeredNote = (e) => `Re-raised; prior answer at ${e.replyUrl} by ${e.replyAuthor} \u2014 cite the new evidence that invalidates it.`;
+var byAuthor = (e) => e.answerAuthor === null ? "" : ` by \`${escapeCodeBackticks(e.answerAuthor)}\``;
+var answeredNote = (e) => `Re-raised; prior answer at ${linkSafeUrl(e.answerUrl)}${byAuthor(e)} \u2014 cite the new evidence that invalidates it.`;
 var applyAnswered = (findings, registry) => {
   const kept = [];
   const noteEntries = [];
@@ -1644,15 +1442,15 @@ var applyAnswered = (findings, registry) => {
   for (const f of findings) {
     const resolvedId = resolveFindingId(f);
     const idMatch = registry.find((e) => e.code === resolvedId);
-    const { entry: titleMatch, score: titleScore } = idMatch === void 0 ? bestTitleMatch(f, registry) : NO_TITLE_MATCH;
+    const titleMatch = idMatch === void 0 ? bestTitleMatch(f, registry) : void 0;
     const entry = idMatch ?? titleMatch;
     if (entry === void 0) {
       kept.push(f);
       continue;
     }
-    const dropped = (idMatch !== void 0 ? isVerbatimReRaise(f, entry) : titleScore === VERBATIM_FIELDS.length) && f.severity !== "critical";
+    const dropped = isAnsweredDrop(resolvedId, f, entry);
     if (dropped) {
-      droppedByEntry.set(entry.replyId, entry);
+      droppedByEntry.set(entry.code, entry);
       droppedFindingIds.push(resolvedId);
       droppedCount += 1;
     } else {
@@ -1672,42 +1470,33 @@ var answeredReRaiseNote = (entries, count) => {
   if (entries.length === 0) return "";
   const label = (e) => e.code !== "" ? `\`${escapeCodeBackticks(e.code)}\`` : `\u201C${escapeCodeBackticks(e.title)}\u201D`;
   const lines = entries.map(
-    (e) => `> - ${label(e)} \u2014 [prior answer](${e.replyUrl}) by ${e.replyAuthor}`
+    (e) => `> - ${label(e)} \u2014 [prior answer](${linkSafeUrl(e.answerUrl)})${byAuthor(e)}`
   );
   return [
-    `> \u21A9\uFE0F **${String(count)} finding(s) re-raised without new evidence \u2014 treated as answered** (each has a human reply on its prior inline thread):`,
+    `> \u21A9\uFE0F **${String(count)} finding(s) re-raised without new evidence \u2014 treated as answered** (a maintainer refuted or dismissed each):`,
     ...lines
   ].join("\n");
 };
-var fetchThreadComments = async (ghApi, repo, prNumber) => {
-  try {
-    const rows = parseJsonl(
-      await ghApi([
-        // per_page rides the QUERY string — a `-f` field would flip `gh api` from GET to POST
-        // and 422 every answered-thread fetch.
-        `repos/${repo}/pulls/${String(prNumber)}/comments?per_page=100`,
-        "--paginate",
-        "--jq",
-        THREAD_COMMENT_JQ
-      ])
-    );
-    return rows.flatMap((row) => {
-      const decoded = ThreadCommentCodec.decode(row);
-      return decoded._tag === "Right" ? [decoded.right] : [];
-    });
-  } catch (err) {
-    process.stderr.write(
-      `Warning: could not fetch review threads to detect answered findings (${errMsg(err)}) \u2014 no answered-finding state for this post
-`
-    );
-    return null;
-  }
-};
+var DispositionCodec = t.keyof({ fixed: null, refuted: null, dismissed: null });
+var DISPOSITIONS = Object.keys(DispositionCodec.keys);
+var ResponseDispositionCodec = t.keyof({
+  fixed: null,
+  refuted: null,
+  dismissed: null,
+  unstated: null
+});
+var RESPONSE_FORM = `Review-Response: <id> ${DISPOSITIONS.join("|")} \u2014 <reason>`;
+var RESPONSE_TABLE_COLUMNS = ["id", "disposition", "reason"];
+`| ${RESPONSE_TABLE_COLUMNS.join(" | ")} |`;
+`| ${RESPONSE_TABLE_COLUMNS.map(() => "---").join(" | ")} |`;
+var listed = (words, conjunction) => {
+  const quoted = words.map((word) => `\`${word}\``);
+  return quoted.length < 2 ? quoted.join("") : `${quoted.slice(0, -1).join(", ")} ${conjunction} ${quoted.at(-1) ?? ""}`;
+};
+var RESPONSE_TEACHING = `To answer findings, post a PR conversation comment holding a rendered markdown table, not one inside a code block, whose columns are ${listed(RESPONSE_TABLE_COLUMNS, "and")}, one row per finding id, its disposition exactly one of ${listed(DISPOSITIONS, "or")}; or put \`${RESPONSE_FORM}\` lines in a commit message. Inline-thread replies are not read. A systemic problem's id, when shown, answers its whole class.`;
 
 // src/render.ts
 var escapePipes = (text) => text.replace(/\|/g, "\\|");
-var encodeAutolinkParens = (url) => url.replace(/\(/g, "%28").replace(/\)/g, "%29");
-var linkSafeUrl = (url) => encodeAutolinkParens(escapeCodeBackticks(url));
 var shedNote = (count, summaryAvailable, runUrl, findingsDocLinked, thisRunArtifact) => count === 0 ? "" : `<sub>**${String(count)} finding${count === 1 ? "" : "s"} left out of this comment**${summaryAvailable && runUrl !== void 0 ? ` \u2014 the [run summary](<${runUrl}>) carries the whole review` : findingsDocLinked && thisRunArtifact ? " \u2014 the machine findings document carries them" : ""}.</sub>`;
 var terminalNotice = (i) => [
   `## ${i.verdictBadge}`,
@@ -1824,6 +1613,7 @@ var sanitizeSuppressedNit = (f, discussion, discussionTruncated) => ({
 var carriedLines = (f) => [
   `description: ${clipText(f.description, BODY_CLIP_CHARS)}`,
   ...f.recommendation !== void 0 ? [`recommendation: ${clipText(f.recommendation, BODY_CLIP_CHARS)}`] : [],
+  ...hasRebuttal(f) ? [`rebuttal: ${clipText(f.rebuttal ?? "", BODY_CLIP_CHARS)}`] : [],
   `reasoning: ${clipText(f.reasoning, BODY_CLIP_CHARS)}`,
   ...f.patch !== void 0 ? ["patch:", clipText(f.patch, BODY_CLIP_CHARS)] : []
 ].flatMap((block) => commentSafe(block).split("\n")).map((line) => line.trimEnd());
@@ -1992,6 +1782,9 @@ var render = (input) => {
       input.findingsPointer ?? findingsMarkerPair(input.jsonUrl, input.findings.convergence)
     ),
     summaryAvailable: input.summaryAvailable ?? false,
+    responseForm: RESPONSE_FORM,
+    responseTeaching: RESPONSE_TEACHING,
+    teachesResponses: isConvergenceRound(route, incomplete),
     shedNote: shedNote(
       input.shedCount ?? 0,
       input.summaryAvailable ?? false,
@@ -2083,7 +1876,8 @@ var render = (input) => {
     },
     verdictBadge,
     severityEmoji,
-    formatConfidence
+    formatConfidence,
+    hasRebuttal
   });
 };
 var key = (path, line) => `${path}:${String(line)}`;
@@ -2146,9 +1940,11 @@ var renderCommentBody = (f, eta, template, modelsText, jsonUrl, pointer, sameRoo
   // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
   eta.renderString(template, {
     ...f,
+    idLabel: escapeCodeBackticks(f.id),
     patchProjection: projectPatch(f.patch, "diff-anchored"),
     severityEmoji,
     formatConfidence,
+    hasRebuttal,
     modelsText,
     jsonUrl: jsonUrl ?? null,
     findingsPointer: pointer,
@@ -2170,6 +1966,7 @@ var buildInlineComments = (findings, diff, context) => {
       title: clipText(f.title, BODY_CLIP_CHARS),
       description: clipText(f.description, BODY_CLIP_CHARS),
       ...f.recommendation != null ? { recommendation: clipText(f.recommendation, BODY_CLIP_CHARS) } : {},
+      ...hasRebuttal(f) ? { rebuttal: clipText(f.rebuttal ?? "", BODY_CLIP_CHARS) } : {},
       reasoning: clipText(f.reasoning, BODY_CLIP_CHARS),
       ...f.patch != null ? { patch: clipText(f.patch, BODY_CLIP_CHARS) } : {}
     } : f;
@@ -2204,7 +2001,7 @@ var buildInlineComments = (findings, diff, context) => {
 var renderStraysSection = (strays) => {
   if (strays.length === 0) return "";
   const items = strays.map(
-    (f) => `- **${f.severity}** \xB7 \`${f.path}:${String(f.start_line)}\` \u2014 ${f.title}`
+    (f) => `- **${f.severity}** \xB7 \`${f.path}:${String(f.start_line)}\` \u2014 ${f.title}${f.id === "" ? "" : ` \xB7 id \`${escapeCodeBackticks(f.id)}\``}`
   );
   return [
     "",
@@ -2215,6 +2012,110 @@ var renderStraysSection = (strays) => {
     ...items
   ].join("\n");
 };
+var numField = (rec, key2) => {
+  const v = rec[key2];
+  return typeof v === "number" && Number.isFinite(v) && v >= 0 ? v : 0;
+};
+var messageUsage = (entry) => {
+  const rec = asRecord(entry);
+  if (rec === null || rec["type"] !== "assistant") return null;
+  const msg = asRecord(rec["message"]);
+  if (msg === null) return null;
+  const model = msg["model"];
+  const usage = asRecord(msg["usage"]);
+  if (typeof model !== "string" || usage === null) return null;
+  const id = msg["id"];
+  return {
+    id: typeof id === "string" ? id : null,
+    model: modelIdentity(model),
+    input: numField(usage, "input_tokens"),
+    output: numField(usage, "output_tokens"),
+    cacheRead: numField(usage, "cache_read_input_tokens"),
+    cacheWrite: numField(usage, "cache_creation_input_tokens")
+  };
+};
+var tsMsOf = (entry) => {
+  const rec = asRecord(entry);
+  const ts = rec?.["timestamp"];
+  if (typeof ts !== "string") return null;
+  const ms = Date.parse(ts);
+  return Number.isNaN(ms) ? null : ms;
+};
+var EMPTY_TOTALS = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+var parseJsonl = (text) => text.split("\n").filter((line) => line.trim() !== "").flatMap((line) => {
+  try {
+    return [JSON.parse(line)];
+  } catch {
+    return [];
+  }
+});
+var sumTranscriptUsage = (entries) => {
+  const summed = entries.reduce(
+    (acc, entry) => {
+      const u = messageUsage(entry);
+      if (u === null) return acc;
+      if (u.id !== null && acc.seen.has(u.id)) return acc;
+      if (u.id !== null) acc.seen.add(u.id);
+      const prev = acc.totals.get(u.model) ?? EMPTY_TOTALS;
+      acc.totals.set(u.model, {
+        input: prev.input + u.input,
+        output: prev.output + u.output,
+        cacheRead: prev.cacheRead + u.cacheRead,
+        cacheWrite: prev.cacheWrite + u.cacheWrite
+      });
+      return { totals: acc.totals, turns: acc.turns + 1, seen: acc.seen };
+    },
+    { totals: /* @__PURE__ */ new Map(), turns: 0, seen: /* @__PURE__ */ new Set() }
+  );
+  const models = [...summed.totals].map(([model, t9]) => ({
+    model,
+    input_tokens: t9.input,
+    output_tokens: t9.output,
+    cache_read_tokens: t9.cacheRead,
+    cache_write_tokens: t9.cacheWrite
+  }));
+  const bounds = entries.reduce(
+    (acc, entry) => {
+      const ms = tsMsOf(entry);
+      if (ms === null) return acc;
+      return {
+        min: acc.min === null || ms < acc.min ? ms : acc.min,
+        max: acc.max === null || ms > acc.max ? ms : acc.max
+      };
+    },
+    { min: null, max: null }
+  );
+  return {
+    models,
+    turns: summed.turns,
+    durationMs: bounds.min !== null && bounds.max !== null ? bounds.max - bounds.min : 0,
+    firstTsMs: bounds.min,
+    lastTsMs: bounds.max
+  };
+};
+var subagentFiles = (mainPath) => {
+  const dir = join(dirname(mainPath), basename(mainPath, ".jsonl"), "subagents");
+  try {
+    return readdirSync(dir).filter((name) => name.endsWith(".jsonl")).map((name) => join(dir, name));
+  } catch {
+    return [];
+  }
+};
+var readTranscriptTree = (mainPath) => {
+  const mainText = readFileOrNull(mainPath);
+  const mainEntries = mainText === null ? [] : parseJsonl(mainText);
+  const inlineSidechains = mainEntries.some((e) => asRecord(e)?.["isSidechain"] === true);
+  const siblings = inlineSidechains ? [] : subagentFiles(mainPath);
+  const siblingReads = siblings.flatMap((path) => {
+    const text = readFileOrNull(path);
+    return text === null ? [] : [{ path, entries: parseJsonl(text) }];
+  });
+  return {
+    entries: [...mainEntries, ...siblingReads.flatMap((r) => r.entries)],
+    files: [...mainText === null ? [] : [mainPath], ...siblingReads.map((r) => r.path)],
+    missing: mainText === null
+  };
+};
 var addFormats = _addFormats;
 var validatorCache = /* @__PURE__ */ new Map();
 var compileSchema = (schemaPath) => {
@@ -2396,7 +2297,7 @@ var writesToDraft = (toolName, toolInput, draftPath) => {
   const targets = [draftPath, basename(draftPath), "$DRAFT", "${DRAFT}"];
   if (WRITE_TOOLS.has(toolName)) {
     const fp = rec?.["file_path"] ?? rec?.["notebook_path"];
-    if (typeof fp === "string" && targets.some((t8) => fp === t8 || basename(fp) === basename(t8)))
+    if (typeof fp === "string" && targets.some((t9) => fp === t9 || basename(fp) === basename(t9)))
       return true;
   }
   if (toolName === "Bash") {
@@ -2423,7 +2324,6 @@ var sidecarPath = (draftPath, postfix) => {
   return join(dirname(draftPath), `${basename(draftPath, ext)}${postfix}${ext}`);
 };
 var priorContextPath = (draftPath) => sidecarPath(draftPath, ".prior");
-var priorAnswersPath = (draftPath) => sidecarPath(draftPath, ".prior-answers");
 var priorSuppressedPath = (draftPath) => sidecarPath(draftPath, ".prior-suppressed");
 var lastValidPath = (draftPath) => sidecarPath(draftPath, ".last-valid");
 var costAxisDisengagedPath = (draftPath) => sidecarPath(draftPath, ".cost-axis-disengaged");
@@ -2502,9 +2402,9 @@ var parseWallMs = (raw) => {
 };
 var parseEpochSecMs = (raw) => {
   if (raw === void 0) return null;
-  const t8 = raw.trim();
-  if (!/^\d+$/.test(t8)) return null;
-  const n = Number.parseInt(t8, 10);
+  const t9 = raw.trim();
+  if (!/^\d+$/.test(t9)) return null;
+  const n = Number.parseInt(t9, 10);
   return Number.isFinite(n) && n > 0 ? n * 1e3 : null;
 };
 var anchoredElapsedMs = (src) => {
@@ -2625,10 +2525,12 @@ var findingsTable = [
   {
     minor: "0.4",
     defaultVersion: "0.4.0",
-    // The frozen tolerant-in legacy schema, NOT the live 0.10 file: every ajv-gated channel
+    // The frozen tolerant-in legacy schema, NOT the live file: every ajv-gated channel
     // (validate --schema-version, the extraction ladder) dispatches the RAW doc's declared minor
     // through schemaPathFor, so the ajv gate must accept exactly what the tolerant legacy codec
     // accepts — the live file (id required) would reject the legacy docs the upcast promises to read.
+    // One deliberate exception: the codec drops a draft-only `rebuttal` that the frozen file rejects.
+    // A pre-0.10 document never carried one, so only a hybrid doc the rescue exists for meets it.
     schemaFile: "v0.9/findings.schema.json",
     codec: legacyFindingsCodec,
     normalize: legacyFindingsNormalize,
@@ -2660,6 +2562,14 @@ var findingsTable = [
   },
   {
     minor: "0.10",
+    defaultVersion: "0.10.0",
+    schemaFile: "findings.schema.json",
+    codec: FindingsCodec,
+    normalize: identity,
+    latest: false
+  },
+  {
+    minor: "0.11",
     defaultVersion: DEFAULT_SCHEMA_VERSION,
     schemaFile: "findings.schema.json",
     codec: FindingsCodec,
@@ -2714,21 +2624,28 @@ var describeValidationError = (e) => {
 var formatErrors = (errors) => errors.map(describeValidationError);
 var declaredVersion = (raw) => typeof raw === "object" && raw !== null && "schema_version" in raw ? typeof raw.schema_version === "string" ? raw.schema_version : void 0 : void 0;
 var supportedVersions = (kind) => tableFor(kind).map((entry) => entry.minor);
-var defaultVersion = (kind) => {
-  const latest = tableFor(kind).find((entry) => entry.latest);
-  if (!latest) throw new Error(`Registry invariant violated \u2014 no latest entry for "${kind}"`);
-  return latest.defaultVersion;
-};
 var bundledSchemaPath = (relativePath) => resolve(import.meta.dirname, "..", "schema", relativePath);
-var schemaPathFor = (kind, version) => {
+var entryFor = (kind, version) => {
   const table = tableFor(kind);
   const entry = version === void 0 ? table.find((v) => v.latest) : table.find((v) => v.minor === majorMinor(version));
+  if (!entry && version === void 0) {
+    throw new Error(`Registry invariant violated \u2014 no latest entry for "${kind}"`);
+  }
   if (!entry) {
     throw new Error(
       `Unsupported ${kind} schema version "${version ?? ""}" \u2014 supported: ${supportedVersions(kind).join(", ")}`
     );
   }
-  return bundledSchemaPath(entry.schemaFile);
+  return entry;
+};
+var schemaPathFor = (kind, version) => bundledSchemaPath(entryFor(kind, version).schemaFile);
+var versionFor = (kind, version) => entryFor(kind, version).defaultVersion;
+var defaultVersion = (kind) => versionFor(kind);
+var livePinFor = (kind, version) => {
+  const table = tableFor(kind);
+  const latest = table.find((v) => v.latest);
+  const entry = version === void 0 ? latest : table.find((v) => v.minor === majorMinor(version));
+  return entry !== void 0 && entry.schemaFile === latest?.schemaFile ? entry.defaultVersion : void 0;
 };
 var resolveFindings = (raw) => {
   const version = declaredVersion(raw);
@@ -2762,7 +2679,7 @@ var resolveTolerantFindings = (doc) => {
 };
 
 // src/pr.ts
-var CANDIDATE_JQ = ".[] | {number: .number, state: .state, headRef: .head.ref, headSha: .head.sha}";
+var CANDIDATE_JQ = ".[] | {number: .number, state: .state, headRef: .head.ref, headSha: .head.sha, headRepo: (.head.repo.full_name // null)}";
 var parseCandidates = (stdout) => parseJsonl(stdout);
 var fetchDirectCandidates = async (repo, headSha, ghApi) => {
   try {
@@ -2791,7 +2708,7 @@ var resolvePr = (candidates, headBranch) => {
   const scoped = candidates.length > 1 && headBranch ? candidates.filter((c) => c.headRef === headBranch) : candidates;
   const chosen = scoped.find((c) => c.state === "open") ?? scoped[0] ?? candidates[0];
   if (chosen === void 0) return { kind: "none" };
-  return chosen.state === "open" ? { kind: "open", prNumber: chosen.number } : { kind: "not-open", prNumber: chosen.number, state: chosen.state };
+  return chosen.state === "open" ? { kind: "open", prNumber: chosen.number, headRepo: chosen.headRepo ?? null } : { kind: "not-open", prNumber: chosen.number, state: chosen.state };
 };
 var fetchDiff = async (repo, prNumber, ghApi) => ghApi([
   `repos/${repo}/pulls/${String(prNumber)}`,
@@ -2900,6 +2817,220 @@ var checkRun = async (input, ghApi = runGhApi) => {
   ];
   await ghApi(endpoint, JSON.stringify(body));
 };
+var RESPONSE_REASON_CLIP_CHARS = 300;
+var RESPONSES_PER_CHANNEL = 25;
+var ChannelCodec = t.keyof({ comment: null, commit: null });
+var MAINTAINER_ASSOCIATIONS = ["OWNER", "MEMBER", "COLLABORATOR"];
+var CLOSING_DISPOSITIONS = /* @__PURE__ */ new Set(["refuted", "dismissed"]);
+var ResponseShape = t.type({
+  id: t.string,
+  disposition: ResponseDispositionCodec,
+  reason: t.string,
+  channel: ChannelCodec,
+  source_url: t.string,
+  author: t.union([t.string, t.null]),
+  author_association: t.union([t.string, t.null]),
+  created_at: t.union([t.string, t.null])
+});
+var ResponseCodec = strictExact("Response", ResponseShape, [ResponseShape]);
+var UnmatchedResponseShape = t.type({
+  id: t.string,
+  channel: ChannelCodec,
+  source_url: t.string
+});
+var UnmatchedResponseCodec = strictExact("UnmatchedResponse", UnmatchedResponseShape, [
+  UnmatchedResponseShape
+]);
+var ResponsesFileShape = t.type({
+  responses: t.array(ResponseCodec),
+  unmatched: t.array(UnmatchedResponseCodec)
+});
+strictExact("ResponsesFile", ResponsesFileShape, [
+  ResponsesFileShape
+]);
+var RESPONSE_LINE_RE = /^ {0,3}review-response:\s*(\S+)\s+([A-Za-z]+)(?![A-Za-z]|\s*\|)[\s—–:-]*(.*)$/i;
+var FENCE_OPEN_RE = /^ {0,3}(`{3,}(?=[^`]*$)|~{3,})/;
+var LINE_BREAK_RE = /\r\n?|\n|\u2028|\u2029/;
+var unfencedLines = (text) => text.split(LINE_BREAK_RE).reduce(
+  (state, line) => {
+    const marker = FENCE_OPEN_RE.exec(line)?.[1];
+    if (state.fence === null) {
+      if (marker !== void 0) return { fence: marker, lines: state.lines };
+      state.lines.push(line);
+      return state;
+    }
+    const closes = marker !== void 0 && marker[0] === state.fence[0] && marker.length >= state.fence.length && line.trim() === marker;
+    return closes ? { fence: null, lines: state.lines } : state;
+  },
+  { fence: null, lines: [] }
+).lines;
+var WHOLE_LINE_CODE_SPAN_RE = /^ {0,3}`([^`]+)`\s*$/;
+var answerLines = (text) => unfencedLines(text).map((line) => WHOLE_LINE_CODE_SPAN_RE.exec(line)?.[1] ?? line);
+var unwrapId = (token) => token.replace(/^[`"']+|[`"'.,:;]+$/g, "");
+var lineAnswers = (lines) => lines.flatMap((line) => {
+  const match = RESPONSE_LINE_RE.exec(line);
+  const id = unwrapId(match?.[1] ?? "");
+  const disposition = match?.[2]?.toLowerCase();
+  return id !== "" && DispositionCodec.is(disposition) ? [
+    {
+      id,
+      disposition,
+      reason: clipText((match?.[3] ?? "").trim(), RESPONSE_REASON_CLIP_CHARS)
+    }
+  ] : [];
+});
+var ID_IN_CELL_RE = /`([^`]+)`/g;
+var ID_HEADERS = /* @__PURE__ */ new Set(["id", "ids", "finding", "findings"]);
+var DISPOSITION_HEADERS = /* @__PURE__ */ new Set(["disposition", "verdict", "resolution"]);
+var CELL_RE = /((?:\\[\s\S]?|[^\\|])*)(\||$)/g;
+var splitCells = (row) => {
+  const cells = [...row.matchAll(CELL_RE)];
+  return cells.slice(0, cells.findIndex((match) => match[2] !== "|") + 1).map((match) => match[1] ?? "");
+};
+var BLOCK_START_RE = /^ {0,3}([-+*]\s|\d+[.)]\s|#{1,6}(\s|$)|>)/;
+var tableRow = (line) => {
+  if (!/^ {0,3}\S/.test(line) || BLOCK_START_RE.test(line)) return null;
+  const split = splitCells(line.trim());
+  if (split.length < 2) return null;
+  const inner = split.slice(line.trim().startsWith("|") ? 1 : 0);
+  return (inner.length > 1 && inner[inner.length - 1]?.trim() === "" ? inner.slice(0, -1) : inner).map((cell) => cell.trim().replace(/\\\|/g, "|"));
+};
+var isDelimiter = (cells) => cells !== null && cells.every((cell) => /^:?-+:?$/.test(cell));
+var plainCell = (cell) => cell.replace(/[*_`]/g, "").trim().toLowerCase();
+var columnName = (cell) => plainCell(cell).split(/[\s/]+/)[0] ?? "";
+var idsInCell = (cell) => {
+  const ids = cell.replace(/\([^()]*\)/g, "");
+  const quoted = [...ids.matchAll(ID_IN_CELL_RE)].map((match) => unwrapId((match[1] ?? "").trim())).filter((id) => id !== "");
+  const bare = ids.split(",").map((piece) => unwrapId(piece.trim())).filter((id) => id !== "");
+  return quoted.length > 0 ? quoted : bare.every((id) => /^\S+$/.test(id)) ? bare : [];
+};
+var tableDisposition = (cell) => {
+  const firstWord = plainCell(cell).replace(/^[^a-z]+/, "").split(/[^a-z]/)[0] ?? "";
+  return DispositionCodec.is(firstWord) ? firstWord : "unstated";
+};
+var rowAnswers = (cells, columns) => {
+  const dispositionCell = cells[columns.disposition] ?? "";
+  const disposition = tableDisposition(dispositionCell);
+  const verdictOnly = DispositionCodec.is(plainCell(dispositionCell));
+  const reason = clipText(
+    cells.filter(
+      (cell, column) => cell !== "" && column !== columns.id && !(verdictOnly && column === columns.disposition)
+    ).join(" \u2014 "),
+    RESPONSE_REASON_CLIP_CHARS
+  );
+  return idsInCell(cells[columns.id] ?? "").map((id) => ({ id, disposition, reason }));
+};
+var namesAColumn = (name) => ID_HEADERS.has(name) || DISPOSITION_HEADERS.has(name);
+var tableAnswers = (lines) => {
+  const rows = lines.map(tableRow);
+  return rows.reduce(
+    (state, cells, index) => {
+      if (state.skipDelimiter) return { ...state, skipDelimiter: false };
+      if (cells === null) return { ...state, inTable: false, columns: null };
+      const opensTable = !isDelimiter(cells) && isDelimiter(rows[index + 1] ?? null) && (!state.inTable || cells.map(columnName).some(namesAColumn));
+      if (opensTable) {
+        const header = cells.map(columnName);
+        const id = header.findIndex((name) => ID_HEADERS.has(name));
+        const disposition = header.findIndex((name) => DISPOSITION_HEADERS.has(name));
+        return {
+          ...state,
+          inTable: true,
+          skipDelimiter: true,
+          columns: id < 0 || disposition < 0 ? null : { id, disposition }
+        };
+      }
+      if (state.inTable && state.columns !== null && !isDelimiter(cells)) {
+        state.answers.push(...rowAnswers(cells, state.columns));
+      }
+      return isDelimiter(rows[index + 1] ?? null) ? { ...state, skipDelimiter: true } : state;
+    },
+    { columns: null, inTable: false, skipDelimiter: false, answers: [] }
+  ).answers;
+};
+var parseResponses = (text) => {
+  const lines = answerLines(text);
+  const seen = /* @__PURE__ */ new Set();
+  return [...lineAnswers(lines), ...tableAnswers(lines)].filter((answer) => {
+    const key2 = JSON.stringify([answer.id, answer.disposition, answer.reason]);
+    if (seen.has(key2)) return false;
+    seen.add(key2);
+    return true;
+  });
+};
+var isHuman = (login, type8, botLogin) => login !== botLogin && type8 === "User";
+var newestFirst = (a, b) => {
+  const [left2, right2] = [a.created_at ?? "", b.created_at ?? ""];
+  return left2 < right2 ? 1 : left2 > right2 ? -1 : b.id - a.id;
+};
+var answersFrom = (input) => {
+  const comments = [...input.comments].filter((comment) => isHuman(comment.user.login, comment.user.type ?? null, input.botLogin)).sort(newestFirst).flatMap(
+    (comment) => parseResponses(comment.body ?? "").map((line) => ({
+      ...line,
+      channel: "comment",
+      source_url: `https://github.com/${input.repo}/pull/${String(input.prNumber)}#issuecomment-${String(comment.id)}`,
+      author: comment.user.login,
+      author_association: comment.author_association ?? null,
+      created_at: comment.created_at ?? null
+    }))
+  );
+  const commits = [...input.commits].reverse().flatMap(
+    (commit) => parseResponses(commit.message).map((line) => ({
+      ...line,
+      channel: "commit",
+      source_url: `https://github.com/${input.repo}/commit/${commit.sha}`,
+      author: commit.author,
+      author_association: null,
+      created_at: commit.date ?? null
+    }))
+  );
+  return { comments, commits };
+};
+var harvestResponses = (input) => {
+  const { comments: fromComments, commits: fromCommits } = answersFrom(input);
+  const matched = (response) => input.priorIds.has(response.id);
+  const echoed = (response) => !matched(response) && ID_SHAPE_RE.test(response.id);
+  const groups = [fromComments, fromCommits].flatMap((channel) => [
+    channel.filter(matched),
+    channel.filter(echoed)
+  ]);
+  const [comments, commentEchoes, commits, commitEchoes] = groups.map(
+    (group) => group.slice(0, RESPONSES_PER_CHANNEL)
+  );
+  return {
+    file: {
+      responses: [...comments ?? [], ...commits ?? []],
+      unmatched: [...commentEchoes ?? [], ...commitEchoes ?? []].map(
+        ({ id, channel, source_url }) => ({ id, channel, source_url })
+      )
+    },
+    dropped: groups.reduce(
+      (total, group) => total + Math.max(0, group.length - RESPONSES_PER_CHANNEL),
+      0
+    )
+  };
+};
+var isTrustedResponse = (response, headInBaseRepo) => {
+  switch (response.channel) {
+    case "comment":
+      return MAINTAINER_ASSOCIATIONS.includes(response.author_association ?? "");
+    case "commit":
+      return headInBaseRepo;
+  }
+};
+var answeredInstant = (response) => response.created_at === null ? Number.NaN : Date.parse(response.created_at);
+var closingResponses = (responses, isTrusted) => {
+  const byId = responses.filter((response) => response.disposition !== "unstated" && isTrusted(response)).reduce((groups, response) => {
+    const timed = { response, at: answeredInstant(response) };
+    groups.set(response.id, [...groups.get(response.id) ?? [], timed]);
+    return groups;
+  }, /* @__PURE__ */ new Map());
+  return [...byId.values()].flatMap((answers) => {
+    if (answers.some(({ at }) => Number.isNaN(at))) return [];
+    const latest = Math.max(...answers.map(({ at }) => at));
+    const newest = answers.filter(({ at }) => at === latest).map(({ response }) => response);
+    return newest.every((response) => CLOSING_DISPOSITIONS.has(response.disposition)) ? [...newest].sort((a, b) => a.source_url < b.source_url ? -1 : 1).slice(0, 1) : [];
+  });
+};
 
 // src/post.ts
 var STICKY_CHAR_LIMIT = 65536;
@@ -3095,7 +3226,8 @@ var postInlineReview = async (pr, comments, inDiff, ghApi) => {
     return { url, posted, inlinePosted, unposted };
   }
 };
-var ISSUE_COMMENTS_JQ = '.[] | {id, user: (.user.login // "(deleted)"), created_at, html_url, body: (.body // "")}';
+var ISSUE_COMMENTS_JQ = '.[] | {id, user: (.user.login // "(deleted)"), user_type: (.user.type // null), author_association: (.author_association // null), created_at, html_url, body: (.body // "")}';
+var nullableString = (value) => typeof value === "string" ? value : null;
 var parseIssueCommentRows = (raw) => {
   let malformed = 0;
   const rows = [];
@@ -3114,7 +3246,15 @@ var parseIssueCommentRows = (raw) => {
     const url = rec?.["html_url"];
     const body = rec?.["body"];
     if (typeof id === "number" && typeof author === "string" && typeof created === "string" && typeof url === "string" && typeof body === "string") {
-      rows.push({ id, author, created, url, body });
+      rows.push({
+        id,
+        author,
+        created,
+        url,
+        body,
+        authorType: nullableString(rec?.["user_type"]),
+        association: nullableString(rec?.["author_association"])
+      });
     } else {
       malformed += 1;
     }
@@ -3124,6 +3264,45 @@ var parseIssueCommentRows = (raw) => {
   );
   return { rows, malformed };
 };
+var COMMITS_JQ = ".[] | {sha, message: .commit.message, author: (.author.login // null), date: (.commit.author.date // null)}";
+var fetchCommitAnswersSource = async (repo, prNumber, ghApi) => {
+  try {
+    const raw = await ghApi([
+      `repos/${repo}/pulls/${String(prNumber)}/commits?per_page=100`,
+      "--paginate",
+      "--jq",
+      COMMITS_JQ
+    ]);
+    const lines = raw.split("\n").filter((line) => line.trim() !== "");
+    const commits = lines.flatMap((line) => {
+      const parsed = tryParseJson(line.trim());
+      const rec = parsed.ok ? asRecord(parsed.value) : null;
+      const sha = rec?.["sha"];
+      const message = rec?.["message"];
+      return typeof sha === "string" && typeof message === "string" ? [
+        {
+          sha,
+          message,
+          author: nullableString(rec?.["author"]),
+          date: nullableString(rec?.["date"])
+        }
+      ] : [];
+    });
+    if (commits.length < lines.length) {
+      process.stderr.write(
+        `Warning: ${String(lines.length - commits.length)} of the PR's commits did not decode \u2014 their answers close nothing
+`
+      );
+    }
+    return commits;
+  } catch (err) {
+    process.stderr.write(
+      `Warning: could not read the PR's commits (${errMsg(err)}) \u2014 no commit answer closes a finding this round
+`
+    );
+    return [];
+  }
+};
 var fetchIssueCommentRows = async (repo, prNumber, ghApi) => {
   const raw = await ghApi([
     // per_page rides the QUERY string — a `-f` field would flip `gh api` from GET to POST
@@ -3194,7 +3373,6 @@ var discussionRows = (rows, stickyId, botLogin) => {
     return c.id !== stickyId && c.author !== botLogin;
   });
 };
-var ID_SHAPE_RE = /^[A-Za-z0-9][A-Za-z0-9_-]*$/;
 var mentionsOutsideKnown = (reachable, currentIds) => {
   const known = new Set(currentIds);
   const escapedToRaw = escapedIdIndex(currentIds);
@@ -3279,24 +3457,6 @@ var buildStickyDiscussion = (reachable, currentIds, priorIds) => {
     orphanedTruncated: Object.fromEntries(orphanedTruncated)
   };
 };
-var priorIdsFrom = (doc) => {
-  if (typeof doc !== "object" || doc === null || Array.isArray(doc)) return [];
-  const rec = doc;
-  const idsOf = (field, systemic) => (Array.isArray(rec[field]) ? rec[field] : []).flatMap((raw) => {
-    const item = typeof raw === "object" && raw !== null ? asRecord(raw) : null;
-    if (item === null) return [];
-    const title = typeof item["title"] === "string" ? item["title"] : "";
-    const resolved = resolveRuleId({
-      ...typeof item["id"] === "string" ? { id: item["id"] } : {},
-      ...typeof item["code"] === "string" ? { code: item["code"] } : {},
-      ...typeof item["path"] === "string" ? { path: item["path"] } : {},
-      title
-    });
-    const id = resolved ?? (systemic && title !== "" ? synthesizedSystemicId(title) : void 0);
-    return id !== void 0 ? [id] : [];
-  });
-  return [...idsOf("findings", false), ...idsOf("systemic_problems", true)];
-};
 var appendBestEffort = (path, label, body) => {
   if (path === void 0 || path === "") return;
   try {
@@ -3391,8 +3551,8 @@ var priorBotCommentIds = (raw, botLogin) => {
   const nodes = conn?.nodes;
   if (!Array.isArray(nodes)) return { ids: [], truncated };
   const logins = [botLogin.replace(/\[bot\]$/, ""), botLogin];
-  const ids = nodes.flatMap((t8) => {
-    const cnodes = t8.comments?.nodes;
+  const ids = nodes.flatMap((t9) => {
+    const cnodes = t9.comments?.nodes;
     return Array.isArray(cnodes) ? cnodes.map((c) => priorBotCommentId(c, logins)).filter((id) => id !== null) : [];
   });
   return { ids, truncated };
@@ -3512,7 +3672,7 @@ var post = async (input, ghApi = runGhApi, readArtifact = ghArtifactReader) => {
   const logAnsweredDrops = () => {
     if (verbatimReRaised.length > 0) {
       process.stderr.write(
-        `${String(droppedCount)} verbatim re-raise(s) of answered findings were treated as answered \u2014 the preserved sticky shows each finding and its prior reply
+        `${String(droppedCount)} verbatim re-raise(s) of answered findings were treated as answered \u2014 the preserved sticky shows each finding
 `
       );
     }
@@ -3637,8 +3797,40 @@ ${dropNote}` : ""}`,
     process.exit(0);
   }
   const loadedFindings = findingsResult.findings;
-  const threadComments = await fetchThreadComments(ghApi, input.repo, prNumber);
-  const answeredRegistry = threadComments === null ? [] : answeredRegistryFrom(threadComments, input.botLogin);
+  const answerable = existingSticky !== null && !priorIsMechanic && loadedFindings.findings.length > 0;
+  const headInBaseRepo = answerable && resolution.headRepo !== null && resolution.headRepo.toLowerCase() === input.repo.toLowerCase();
+  const answers = answerable ? answersFrom({
+    repo: input.repo,
+    prNumber,
+    botLogin: input.botLogin,
+    comments: commentRows.map((row) => ({
+      id: row.id,
+      body: row.body,
+      user: { login: row.author, type: row.authorType },
+      created_at: row.created,
+      author_association: row.association
+    })),
+    commits: headInBaseRepo ? await fetchCommitAnswersSource(input.repo, prNumber, ghApi) : []
+  }) : { comments: [], commits: [] };
+  const closures = closingResponses(
+    [...answers.comments, ...answers.commits],
+    (response) => isTrustedResponse(response, headInBaseRepo)
+  ).filter((closure) => couldMatch(closure.id, loadedFindings.findings));
+  const priorForAnswers = closures.length > 0 && existingSticky !== null ? { value: await resolvePriorFindings(existingSticky.body, readArtifact) } : null;
+  const answeredPrior = priorForAnswers === null ? null : resolveTolerantFindings(priorForAnswers.value);
+  if (priorForAnswers !== null && answeredPrior === null) {
+    process.stderr.write(
+      `Warning: ${String(closures.length)} maintainer answer(s) close prior findings, but the prior review's findings did not resolve \u2014 no re-raise is treated as answered
+`
+    );
+  }
+  const answeredRegistry = answeredRegistryFrom(closures, answeredPrior);
+  if (answeredPrior !== null && answeredRegistry.length < closures.length) {
+    process.stderr.write(
+      `Warning: ${String(closures.length - answeredRegistry.length)} maintainer answer(s) name no finding the prior review reported \u2014 they close nothing this round
+`
+    );
+  }
   const answeredFilter = applyAnswered(loadedFindings.findings, answeredRegistry);
   const reRaisedNotes = answeredFilter.reRaisedNotes;
   const verbatimReRaised = answeredFilter.verbatimReRaised;
@@ -3666,7 +3858,7 @@ ${dropNote}` : ""}`,
   const roundHasNit = findings.findings.some((f) => f.severity === "nit");
   const nitWantsPrior = roundHasNit && existingSticky !== null && (isFullReviewSticky(existingSticky.body) || isFullReviewAncestry(existingSticky.body));
   const broadWantsPrior = existingSticky !== null && !priorIsMechanic && mentionsOutsideKnown(reachable, broadCurrentIds);
-  const resolvedPrior = existingSticky !== null && (nitWantsPrior || broadWantsPrior) ? await resolvePriorFindings(existingSticky.body, readArtifact) : null;
+  const resolvedPrior = priorForAnswers !== null ? priorForAnswers.value : existingSticky !== null && (nitWantsPrior || broadWantsPrior) ? await resolvePriorFindings(existingSticky.body, readArtifact) : null;
   const priorDocForNits = nitWantsPrior ? resolvedPrior : null;
   const priorSuppressedKeys = new Set(
     priorBelowFloorNits(priorDocForNits, input.nitVisibilityFloor).map(
@@ -4523,7 +4715,10 @@ var IssueCommentCodec = t.intersection([
   t.type({
     id: t.number,
     body: t.union([t.string, t.null]),
-    user: t.type({ login: t.string })
+    user: t.intersection([
+      t.type({ login: t.string }),
+      t.partial({ type: t.union([t.string, t.null]) })
+    ])
   }),
   t.partial({
     created_at: t.union([t.string, t.null]),
@@ -4577,13 +4772,16 @@ var fetchFullDiff = async (repo, defaultBranch, headSha, ghApi, gitRun) => {
   const base = (await gitRun(["rev-parse", "HEAD"])).trim();
   return gitRun(["diff", `${base}...${headSha}`]);
 };
-var CommitCodec = t.type({
-  sha: t.string,
-  message: t.string,
-  author: t.union([t.string, t.null]),
-  email: t.union([t.string, t.null])
-});
-var COMMIT_JQ = ".commits[] | {sha: .sha, message: .commit.message, author: .commit.author.name, email: .commit.author.email}";
+var CommitCodec = t.intersection([
+  t.type({
+    sha: t.string,
+    message: t.string,
+    author: t.union([t.string, t.null]),
+    email: t.union([t.string, t.null])
+  }),
+  t.partial({ date: t.union([t.string, t.null]), login: t.union([t.string, t.null]) })
+]);
+var COMMIT_JQ = ".commits[] | {sha: .sha, message: .commit.message, author: .commit.author.name, email: .commit.author.email, date: .commit.author.date, login: (.author.login // null)}";
 var fetchCompareCommits = async (repo, defaultBranch, headSha, ghApi) => {
   const rows = parseJsonl(
     await ghApi([
@@ -4604,8 +4802,8 @@ var fetchCompareCommits = async (repo, defaultBranch, headSha, ghApi) => {
   }
   return commits;
 };
-var COMMENT_JQ = ".[] | {id: .id, body: .body, user: {login: .user.login}, created_at: .created_at, author_association: .author_association}";
-var REVIEW_COMMENT_JQ = THREAD_COMMENT_JQ;
+var COMMENT_JQ = ".[] | {id: .id, body: .body, user: {login: .user.login, type: .user.type}, created_at: .created_at, author_association: .author_association}";
+var REVIEW_COMMENT_JQ = ".[] | {body: .body, user: {login: .user.login}, created_at: .created_at, author_association: .author_association, path: .path, line: .line}";
 var REVIEW_JQ = ".[] | {body: .body, user: {login: .user.login}, submitted_at: .submitted_at, author_association: .author_association, state: .state}";
 var ReviewCommentCodec = t.intersection([
   t.type({ body: t.union([t.string, t.null]), user: t.type({ login: t.string }) }),
@@ -4788,7 +4986,6 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit, readArtifact = ghA
   ]);
   const issueComments = decodeArrayOrNull(IssueCommentCodec, issueRows);
   const reviewComments = decodeArrayOrNull(ReviewCommentCodec, reviewCommentRows);
-  const threadComments = decodeArrayOrNull(ThreadCommentCodec, reviewCommentRows);
   const reviews = decodeArrayOrNull(ReviewCodec, reviewRows);
   const prior = issueComments === null ? null : priorReviewFrom(issueComments, input.botLogin);
   writeFileSync(
@@ -4802,11 +4999,26 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit, readArtifact = ghA
     join(input.outDir, "prior_findings.json"),
     priorFindings === null ? "null" : JSON.stringify(priorFindings)
   );
-  const answered = threadComments === null ? [] : answeredRegistryFrom(threadComments, input.botLogin);
-  writeFileSync(
-    join(input.outDir, "answered.json"),
-    JSON.stringify(answered.map(encodeAnsweredEntry))
-  );
+  const harvest = seedsFromPrior ? harvestResponses({
+    repo: input.repo,
+    prNumber,
+    botLogin: input.botLogin,
+    priorIds: new Set(priorIdsFrom(priorFindings)),
+    commits: commits.map((commit) => ({ ...commit, author: commit.login ?? null })),
+    comments: issueComments ?? []
+  }) : { file: { responses: [], unmatched: [] }, dropped: 0 };
+  writeFileSync(join(input.outDir, "responses.json"), JSON.stringify(harvest.file));
+  if (seedsFromPrior && priorFindings === null) {
+    process.stderr.write(
+      "Note: the prior review's findings did not resolve \u2014 every id-shaped answer is staged as unmatched\n"
+    );
+  }
+  if (harvest.dropped > 0) {
+    process.stderr.write(
+      `Note: ${String(harvest.dropped)} answer(s) beyond the newest ${String(RESPONSES_PER_CHANNEL)} per channel were not staged
+`
+    );
+  }
   writeFileSync(
     join(input.outDir, "pr_conversation.json"),
     JSON.stringify({
@@ -5170,7 +5382,7 @@ var parseScope = (raw) => {
       reason: 'scope contains a character (newline, carriage return, backtick, "<", ">", or "|") that would corrupt the review prompt \u2014 use plain language names/tags'
     };
   }
-  const languages = Array.from(new Set(trimmed.split(SCOPE_SEPARATOR_RE).filter((t8) => t8 !== "")));
+  const languages = Array.from(new Set(trimmed.split(SCOPE_SEPARATOR_RE).filter((t9) => t9 !== "")));
   return languages.length === 0 ? { kind: "absent" } : { kind: "ok", languages };
 };
 
@@ -5798,18 +6010,19 @@ var deadlineCmd = defineCommand({
   }
 });
 var derivedSchemaVersion = (kind, raw) => kind === "findings" ? declaredVersion(raw) : void 0;
+var liveSchemaPin = (kind, schemaPath, requestedVersion) => kind === "findings" && schemaPath === schemaPathFor(kind) ? livePinFor(kind, requestedVersion) : void 0;
 var printableSchema = (schemaPath, pinVersion) => {
   const schema = JSON.parse(readFileSync(schemaPath, "utf-8"));
   const enforcementSchema = Object.fromEntries(
     Object.entries(schema).filter(([key2]) => key2 !== "$schema")
   );
-  if (!pinVersion) return JSON.stringify(enforcementSchema, null, 2);
+  if (pinVersion === void 0) return JSON.stringify(enforcementSchema, null, 2);
   const properties = enforcementSchema["properties"];
   const schemaVersion = typeof properties === "object" && properties !== null ? properties["schema_version"] : void 0;
   if (typeof schemaVersion === "object" && schemaVersion !== null) {
     properties["schema_version"] = {
       ...schemaVersion,
-      pattern: anchoredSchemaVersionPattern(DEFAULT_SCHEMA_VERSION)
+      pattern: anchoredSchemaVersionPattern(pinVersion)
     };
   }
   return JSON.stringify(enforcementSchema, null, 2);
@@ -5845,7 +6058,8 @@ var validateCmd = defineCommand({
   run: async ({ args }) => {
     const kind = requireSchemaKind(args.kind || "findings");
     const documentRaw = readJSON(args.document);
-    const schemaPath = args.schema ? resolve(args.schema) : requireSchemaPath(kind, args["schema-version"] || derivedSchemaVersion(kind, documentRaw));
+    const requestedVersion = args["schema-version"] || derivedSchemaVersion(kind, documentRaw);
+    const schemaPath = args.schema ? resolve(args.schema) : requireSchemaPath(kind, requestedVersion);
     const { valid, errors } = validateAgainstSchema(documentRaw, schemaPath);
     if (valid) {
       process.stdout.write("\u2705 valid\n");
@@ -5857,7 +6071,7 @@ var validateCmd = defineCommand({
         process.stderr.write(
           `
 The ${kind} document must conform to this schema (the field descriptions are the authoritative spec \u2014 match the property names exactly):
-${printableSchema(schemaPath, kind === "findings" && schemaPath === schemaPathFor(kind))}
+${printableSchema(schemaPath, liveSchemaPin(kind, schemaPath, requestedVersion))}
 `
         );
       }
@@ -5881,10 +6095,6 @@ var seedDraftCmd = defineCommand({
       type: "string",
       description: "Path to the gather-staged prior findings document (prior_findings.json). gather resolves it \u2014 from the sticky's embedded blob, or by fetching the artifact the marker names \u2014 because gather holds the repo token and this step deliberately does not: it runs the jailed agent over untrusted PR code. Absent or null falls back to decoding an embedded blob out of --prior, which needs no token"
     },
-    "prior-answers": {
-      type: "string",
-      description: "Path to the gather-staged answered-findings registry (answered.json) \u2014 the prior inline findings whose threads a human reply answered (issue #151). Delivered out-of-band to the .prior-answers sidecar beside the prior context so the next-round agent sees the already-answered state; best-effort, never fails the seed"
-    },
     "nit-visibility-floor": {
       type: "string",
       description: "The nit visibility floor (issue #164), matched to the commenter's: the prior review's below-floor nits (confidence \xD7 likelihood below it) are re-derived from --prior and delivered to the .prior-suppressed sidecar as adjudicated context, so the next-round agent does not re-raise them as fresh nits; best-effort, never fails the seed. Empty \u21D2 the default"
@@ -5960,55 +6170,17 @@ var seedDraftCmd = defineCommand({
     const strippedPrior = parsedPrior === null ? null : stripSurfaceFields(
       isSurfaceStampedDoc(parsedPrior) ? parsedPrior : withoutScopeMetastasis(parsedPrior)
     );
-    const answeredRegistry = (() => {
-      if (!args["prior-answers"]) return null;
-      try {
-        const raw = JSON.parse(readFileSync(resolve(args["prior-answers"]), "utf-8"));
-        if (!Array.isArray(raw)) throw new Error("expected an array");
-        const decoded = raw.flatMap((row) => {
-          const entry = decodeAnsweredEntry(row);
-          return entry === null ? [] : [entry];
-        });
-        if (decoded.length < raw.length) {
-          process.stderr.write(
-            `Warning: ${String(raw.length - decoded.length)} of ${String(raw.length)} answered-registry row(s) failed to decode \u2014 the seed's answered state is incomplete
-`
-          );
-        }
-        return decoded;
-      } catch (err) {
-        process.stderr.write(
-          `Warning: could not read the answered-findings registry ${args["prior-answers"]} (${errMsg(err)}) \u2014 no prior-answers sidecar
-`
-        );
-        return null;
-      }
-    })();
     const priorFindings = (() => {
       if (strippedPrior === null || typeof strippedPrior !== "object" || Array.isArray(strippedPrior))
         return strippedPrior;
       const resolved = resolvedPriorValue(strippedPrior);
-      const doc = resolved === null ? strippedPrior : {
-        ...resolved,
-        findings: answeredRegistry !== null && answeredRegistry.length > 0 ? resolved.findings.filter((f) => {
-          const resolvedId = resolveFindingId(f);
-          return !answeredRegistry.some((e) => isAnsweredDrop(resolvedId, f, e));
-        }) : resolved.findings
-      };
+      const doc = resolved === null ? strippedPrior : resolved;
       const carried = doc["scope_metastasis"];
       if (ScopeMetastasisCodec.decode(carried)._tag === "Right") return doc;
       if (doc["verdict"] === "error") return doc;
       const computed = computeScopeMetastasis(priorTrajectory(parsedPrior, priorBody ?? ""));
       return computed === null ? doc : { ...doc, scope_metastasis: computed };
     })();
-    if (answeredRegistry !== null) {
-      writeFileSync(priorAnswersPath(outPath), `${JSON.stringify(answeredRegistry, null, 2)}
-`);
-      process.stderr.write(
-        `Seeded ${priorAnswersPath(outPath)} with ${String(answeredRegistry.length)} answered finding(s) as context
-`
-      );
-    }
     if (parsedPrior !== null && isFullReviewAncestry(priorBody ?? "")) {
       try {
         const belowFloor = priorBelowFloorNits(
@@ -6040,7 +6212,9 @@ var seedDraftCmd = defineCommand({
         ) : priorFindings;
         const accepts = (doc) => {
           const resolved = resolvedPriorValue(doc);
-          return resolved !== null && validateAgainstSchema(resolved, schemaPath).valid ? resolved : null;
+          if (resolved === null) return null;
+          const carried = withoutRebuttals(resolved);
+          return validateAgainstSchema(carried, schemaPath).valid ? carried : null;
         };
         const seedDoc = accepts(priorFindings) ?? (() => {
           const bare = accepts(barePrior);
@@ -6328,7 +6502,7 @@ var printSchemaCmd = defineCommand({
     const schemaKind = requireSchemaKind(args.name);
     const schemaPath = requireSchemaPath(schemaKind, args["schema-version"]);
     process.stdout.write(
-      `${printableSchema(schemaPath, schemaKind === "findings" && schemaPath === schemaPathFor(schemaKind))}
+      `${printableSchema(schemaPath, liveSchemaPin(schemaKind, schemaPath, args["schema-version"]))}
 `
     );
   }