@jphutchins/code-review 0.1.0-alpha.55 → 0.1.0-alpha.57

package/dist/index.js

@@ -801,11 +801,17 @@ var parseReviewedRoute = (body) => ROUTE_RE.exec(body)?.[1] || null;
 var isFullReviewSticky = (body) => {
   const route = parseReviewedRoute(body);
   if (route === "full review") return true;
-  if (route === "mechanic") return false;
+  if (route === "mechanic" || parseMechanicAncestor(body)) return false;
   return priorTrajectory(parseFindingsMarker(body), body).length > 0;
 };
+var MECHANIC_ANCESTOR_MARKER = "<!-- review-mechanic-ancestor -->";
+var parseMechanicAncestor = (body) => new RegExp(`(^|
+)${MECHANIC_ANCESTOR_MARKER}(
+|$)`).test(body);
 var COMPLETED_ANCESTOR_MARKER = "<!-- review-complete-ancestor -->";
-var parseCompletedAncestor = (body) => body.includes(COMPLETED_ANCESTOR_MARKER);
+var parseCompletedAncestor = (body) => new RegExp(`(^|
+)${COMPLETED_ANCESTOR_MARKER}(
+|$)`).test(body);
 var REVIEW_COMPLETE_MARKER = "<!-- review-complete -->";
 var parseReviewComplete = (body) => body.includes(REVIEW_COMPLETE_MARKER);
 var parseFindingsMarker = (body) => {
@@ -957,6 +963,12 @@ var CRITICAL_FLOOR_MARGIN = 0.01;
 var MINOR_FLOOR = 0.1;
 var DEFAULT_CONVERGENCE_THRESHOLD = 1;
 var convergenceFloor = (severity, threshold) => severity === "critical" ? threshold + CRITICAL_FLOOR_MARGIN : severity === "major" ? 0.5 : severity === "minor" ? MINOR_FLOOR : 0;
+var mechanicConvergence = (prior, threshold) => prior === null ? null : {
+  score: convergenceFloor("critical", threshold),
+  threshold,
+  converged: false,
+  rounds: prior.rounds
+};
 var round2 = (n) => Math.round((n + Number.EPSILON) * 100) / 100;
 var contribution = (severity, confidence, likelihood, threshold) => {
   const floor = convergenceFloor(severity, threshold);
@@ -1134,17 +1146,36 @@ var stripSurfaceFields = (doc) => {
   );
   return { ...rest, schema_version: DEFAULT_SCHEMA_VERSION };
 };
+var carriedFindingsMarker = (body) => /<!-- code-review:findings-json[^>]*-->/.exec(body)?.[0] ?? null;
+var carriedMarkerPointer = (carried, convergence) => [
+  `${AGENTS_STOP_DIRECTIVE}
+${carried}`,
+  ...convergence !== void 0 ? [convergenceMarker(convergence)] : []
+].join("\n");
+var completedAncestryMarker = (body) => parseReviewComplete(body) || parseCompletedAncestor(body) ? COMPLETED_ANCESTOR_MARKER : void 0;
+var carriedProvenanceMarkers = (body) => [
+  // The placeholder keeps the REAL route marker: the seed chain requires it outright to stay
+  // route-aware across the prose swap.
+  ROUTE_RE.exec(body)?.[0],
+  parseMechanicAncestor(body) ? MECHANIC_ANCESTOR_MARKER : void 0,
+  completedAncestryMarker(body)
+].filter((m) => m !== void 0).join("\n\n");
+var isFullReviewAncestry = (body) => parseReviewedRoute(body) === "full review" || parseReviewedRoute(body) === null && parseCompletedAncestor(body) && !parseMechanicAncestor(body);
+var carriedAncestryMarkers = (body) => [
+  // A notice body carries no route marker, so the second hop reads the ancestor marker itself:
+  // mechanic ancestry survives notice-over-notice, not just notice-over-sticky.
+  parseReviewedRoute(body) === "mechanic" || parseMechanicAncestor(body) ? MECHANIC_ANCESTOR_MARKER : void 0,
+  completedAncestryMarker(body)
+].filter((m) => m !== void 0).join("\n\n");
 var carryForwardMarkers = (body) => {
-  const findings = /<!-- code-review:findings-json[^>]*-->/.exec(body)?.[0];
+  const findings = carriedFindingsMarker(body);
   const reviewedSha = /<!-- reviewed-sha: [0-9a-fA-F]{40} -->/.exec(body)?.[0];
-  const reviewedRoute = ROUTE_RE.exec(body)?.[0];
   const convergence = CONVERGENCE_RE.exec(body)?.[0];
   const rounds = ROUNDS_RE.exec(body)?.[0];
   const signal = SIGNAL_RE.exec(body)?.[0];
-  const completedAncestor = parseReviewComplete(body) || parseCompletedAncestor(body) ? COMPLETED_ANCESTOR_MARKER : void 0;
   const findingsBlock = findings ? `${AGENTS_STOP_DIRECTIVE}
 ${findings}` : void 0;
-  return [findingsBlock, reviewedSha, reviewedRoute, completedAncestor, convergence, rounds, signal].filter((m) => m !== void 0).join("\n\n");
+  return [findingsBlock, reviewedSha, carriedProvenanceMarkers(body), convergence, rounds, signal].filter((m) => m !== void 0 && m !== "").join("\n\n");
 };
 var escapeFence = (text) => text.replace(/```/g, "`` ` ``");
 var projectPatch = (patch, surface) => {
@@ -1159,6 +1190,17 @@ var reviewBodyPointer = (headSha, stickyUrl, runUrl, runHasSummary) => {
   const run2 = runUrl ? ` See the [workflow run](${runUrl}) for ${runHasSummary ? "this round's review in full, its job log," : "the job log"} and the findings artifact.` : "";
   return `\u{1F916} Automated code review for \`${sha7}\` \u2014 see ${summary} for the verdict, walkthrough, and cost.${run2}`;
 };
+
+// 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;
@@ -1325,15 +1367,14 @@ var answeredRegistryFrom = (comments, botLogin) => {
   const byId = /* @__PURE__ */ new Map();
   for (const c of ordered) byId.set(c.id, c);
   const rootOf = (c) => {
-    let current = c;
-    const seen = /* @__PURE__ */ new Set();
-    while (current.in_reply_to_id !== null && !seen.has(current.id)) {
-      seen.add(current.id);
-      const parent = byId.get(current.in_reply_to_id);
-      if (parent === void 0) return null;
-      current = parent;
-    }
-    return current.in_reply_to_id === null ? current : null;
+    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 ?? "");
@@ -1454,9 +1495,9 @@ var fetchThreadComments = async (ghApi, repo, prNumber) => {
   try {
     const rows = parseJsonl(
       await ghApi([
-        `repos/${repo}/pulls/${String(prNumber)}/comments`,
-        "-f",
-        "per_page=100",
+        // 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
@@ -1498,7 +1539,44 @@ var permalinkFor = (base, f, anchor) => {
 };
 var CARRIED_TOTAL_CHARS = 4e4;
 var SUPPRESSED_NIT_BLOCK_OVERHEAD = 280;
-var sanitizeFinding = (f, answeredNotes, permalinkBase, unanchored) => {
+var DISCUSSION_TOTAL_CHARS = 8e3;
+var DISCUSSION_BLOCK_OVERHEAD = 120;
+var orphanedEntryHtml = (token, links, truncated) => `- **\`${token}\`**: ${links.map((d) => `[${escapeHtml(d.author)} \xB7 ${d.when}](${linkSafeUrl(d.url)})`).join(" ")}${truncated !== void 0 ? ` _(showing the ${String(PER_FINDING_LINKS)} newest of ${String(truncated)})_` : ""}`;
+var PER_FINDING_LINKS = 6;
+var DROPPED_IDS_SHOWN = 6;
+var budgetBySize = (items, cap, sizeOf, onDrop) => {
+  const kept = [];
+  const droppedItems = [];
+  let used = 0;
+  for (const item of items) {
+    const size = sizeOf(item);
+    if (used + size > cap) {
+      droppedItems.push(item);
+      const replaced = onDrop(item);
+      if (replaced !== null) kept.push(replaced);
+      continue;
+    }
+    kept.push(item);
+    used += size;
+  }
+  return { kept, droppedItems, used };
+};
+var escapeHtml = (text) => text.replace(
+  /[&<>"']/g,
+  (c) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[c] ?? c
+);
+var discussionAsideHtml = (links, truncated, prefix) => [
+  ...links.map((d) => `${prefix}- [${escapeHtml(d.author)} \xB7 ${d.when}](${linkSafeUrl(d.url)})`),
+  ...truncated !== void 0 ? [
+    // A blank line closes the list: the note stands apart as its own paragraph instead of
+    // reading as a continuation of the newest bullet.
+    prefix,
+    `${prefix}_(showing the ${String(PER_FINDING_LINKS)} newest of ${String(
+      truncated
+    )} replies \u2014 the rest live on the comment thread.)_`
+  ] : []
+].join("\n");
+var sanitizeFinding = (f, answeredNotes, discussionByFinding, permalinkBase, unanchored, discussionTruncated) => {
   const key2 = answeredNoteKey(f);
   const anchored = permalinkBase !== void 0 && !(unanchored?.has(f) ?? false);
   const permalink = permalinkBase === void 0 ? void 0 : permalinkFor(permalinkBase, f, anchored);
@@ -1514,11 +1592,13 @@ var sanitizeFinding = (f, answeredNotes, permalinkBase, unanchored) => {
     rangeLabel: lineRange(f.start_line, f.end_line, "\u2013"),
     ...permalink !== void 0 ? { permalink, permalinkAnchored: anchored } : {},
     patchProjection: projectPatch(f.patch, "comment-body"),
-    answeredNote: answeredNotes !== void 0 && Object.prototype.hasOwnProperty.call(answeredNotes, key2) ? answeredNotes[key2] ?? "" : ""
+    answeredNote: answeredNotes !== void 0 && Object.prototype.hasOwnProperty.call(answeredNotes, key2) ? answeredNotes[key2] ?? "" : "",
+    discussion: discussionByFinding !== void 0 && Object.prototype.hasOwnProperty.call(discussionByFinding, f.id) ? discussionByFinding[f.id] ?? [] : [],
+    ...discussionTruncated !== void 0 && Object.prototype.hasOwnProperty.call(discussionTruncated, f.id) ? { discussionTruncated: discussionTruncated[f.id] } : {}
   };
 };
 var commentSafe = (text) => text.replace(/--+(?=>)/g, (dashes) => `${dashes}\u200B`);
-var sanitizeSuppressedNit = (f) => ({
+var sanitizeSuppressedNit = (f, discussion, discussionTruncated) => ({
   title: escapeCodeBackticks(f.title),
   id: escapeCodeBackticks(f.id),
   ...f.code_url !== void 0 ? { codeUrl: linkSafeUrl(f.code_url) } : {},
@@ -1530,7 +1610,10 @@ var sanitizeSuppressedNit = (f) => ({
   confidence: formatConfidence(f.confidence),
   likelihood: formatConfidence(f.likelihood),
   m: formatConfidence(f.confidence * f.likelihood),
-  carried: carriedLines(f)
+  carried: carriedLines(f),
+  discussion,
+  ...discussionTruncated !== void 0 ? { discussionTruncated } : {},
+  discussionHtml: discussion.length > 0 ? discussionAsideHtml(discussion, discussionTruncated, ">   ") : ""
 });
 var carriedLines = (f) => [
   `description: ${clipText(f.description, BODY_CLIP_CHARS)}`,
@@ -1538,9 +1621,12 @@ var carriedLines = (f) => [
   `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());
-var sanitizeSystemic = (s) => ({
+var sanitizeSystemic = (s, discussion, discussionTruncated) => ({
   ...s,
   title: escapePipes(s.title),
+  discussion,
+  ...discussionTruncated !== void 0 ? { discussionTruncated } : {},
+  discussionHtml: discussion.length > 0 ? discussionAsideHtml(discussion, discussionTruncated, "") : "",
   ...s.id !== void 0 ? { id: escapeCodeBackticks(s.id) } : {},
   ...s.code_url !== void 0 ? { code_url: linkSafeUrl(s.code_url) } : {},
   ...s.paths !== void 0 ? { paths: s.paths.map(escapeCodeBackticks) } : {},
@@ -1575,16 +1661,98 @@ var render = (input) => {
   const sameRootNotes = input.sameRootNotes ?? computeSameRootNotes(trajectory.slice(0, -1), input.findings.findings);
   const isFullReviewRound = (input.convergenceRound ?? (isConvergenceRound(route, incomplete) && trajectory.length > 0)) && isReviewVerdict(input.findings.verdict);
   const advisoryAllowed = isFullReviewRound;
-  const suppressedBudget = (input.suppressedNits ?? []).map(sanitizeSuppressedNit).reduce(
-    (acc, n) => {
-      const size = n.carried.reduce((sum, line) => sum + line.length + 3, 0) + SUPPRESSED_NIT_BLOCK_OVERHEAD + n.title.length + n.path.length * 2 + // The id renders with its two wrapper backticks; the code_url adds the [](...) link form.
-      n.id.length * 2 + 2 + (n.codeUrl !== void 0 ? n.codeUrl.length + 4 : 0) + String(n.startLine).length * 2 + String(n.endLine).length + (n.side !== void 0 ? n.side.length + 2 : 0);
-      return acc.used + size > CARRIED_TOTAL_CHARS ? { list: acc.list, used: acc.used, dropped: acc.dropped + 1 } : { list: [...acc.list, n], used: acc.used + size, dropped: acc.dropped };
-    },
-    { list: [], used: 0, dropped: 0 }
+  const discussionLinksFor = (id) => input.discussionByFinding !== void 0 && Object.prototype.hasOwnProperty.call(input.discussionByFinding, id) ? input.discussionByFinding[id] ?? [] : [];
+  const discussionTruncatedFor = (id) => input.discussionTruncated !== void 0 && Object.prototype.hasOwnProperty.call(input.discussionTruncated, id) ? input.discussionTruncated[id] : void 0;
+  const suppressedBudget = budgetBySize(
+    (input.suppressedNits ?? []).map(
+      (f) => sanitizeSuppressedNit(f, discussionLinksFor(f.id), discussionTruncatedFor(f.id))
+    ),
+    CARRIED_TOTAL_CHARS,
+    (n) => (
+      // The fixed overhead covers the summary line's structure; the reviewer-controlled variable
+      // parts are budgeted at their true RENDERED size — the title, the path TWICE (summary +
+      // location line), the code/code_url the summary line renders, each carried line's `> `
+      // blockquote prefix (length + 3: prefix + newline), the location line's line numbers and
+      // side label, and the discussion slot's link list.
+      n.carried.reduce((sum, line) => sum + line.length + 3, 0) + SUPPRESSED_NIT_BLOCK_OVERHEAD + n.title.length + n.path.length * 2 + // The id renders with its two wrapper backticks; the code_url adds the [](...) link form.
+      // The id renders ONCE: a backtick span inside parens, or the []() link form.
+      n.id.length + (n.codeUrl !== void 0 ? n.codeUrl.length + 8 : 4) + String(n.startLine).length * 2 + String(n.endLine).length + (n.side !== void 0 ? n.side.length + 2 : 0) + // The composed slot's EXACT rendered size — its `>   ` blockquote prefixes included.
+      n.discussionHtml.length
+    ),
+    () => null
   );
   const permalinkBase = input.repo !== void 0 && input.repo !== "" && input.reviewedSha !== void 0 && input.reviewedSha !== "" ? `https://github.com/${input.repo}/blob/${input.reviewedSha}/` : void 0;
   const unanchored = new Set(input.unanchoredStrays ?? []);
+  const strayViews = (input.strays ?? []).map((f) => {
+    const view = sanitizeFinding(
+      f,
+      input.answeredNotes,
+      input.discussionByFinding,
+      permalinkBase,
+      unanchored,
+      input.discussionTruncated
+    );
+    return {
+      ...view,
+      discussionHtml: view.discussion.length > 0 ? discussionAsideHtml(view.discussion, view.discussionTruncated, "") : ""
+    };
+  });
+  const orphanedPreBudget = /* @__PURE__ */ new Map();
+  for (const [token, links] of Object.entries(input.orphanedDiscussion ?? {})) {
+    const key2 = escapeCodeBackticks(token);
+    const truncatedFor = input.orphanedTruncated !== void 0 && Object.prototype.hasOwnProperty.call(input.orphanedTruncated, token) ? input.orphanedTruncated[token] : void 0;
+    const existing = orphanedPreBudget.get(key2);
+    const htmlFor = (entryLinks, entryTruncated) => orphanedEntryHtml(key2, entryLinks, entryTruncated);
+    if (existing === void 0) {
+      orphanedPreBudget.set(key2, {
+        links,
+        ...truncatedFor !== void 0 ? { truncated: truncatedFor } : {},
+        html: htmlFor(links, truncatedFor)
+      });
+    } else {
+      const mergedTotal = (existing.truncated ?? existing.links.length) + (truncatedFor ?? links.length);
+      const merged = [...existing.links, ...links].sort(
+        (a, b) => (b.at ?? b.when).localeCompare(a.at ?? a.when)
+      );
+      const mergedLinks = merged.slice(0, PER_FINDING_LINKS);
+      const mergedTruncated = mergedTotal > PER_FINDING_LINKS ? mergedTotal : void 0;
+      orphanedPreBudget.set(key2, {
+        links: mergedLinks,
+        ...mergedTruncated !== void 0 ? { truncated: mergedTruncated } : {},
+        html: htmlFor(mergedLinks, mergedTruncated)
+      });
+    }
+  }
+  const orphanedBudget = budgetBySize(
+    [...orphanedPreBudget.entries()],
+    DISCUSSION_TOTAL_CHARS,
+    ([, entry]) => entry.html.length,
+    () => null
+  );
+  const discussionBudget = budgetBySize(
+    strayViews,
+    DISCUSSION_TOTAL_CHARS - orphanedBudget.used,
+    (view) => view.discussion.length > 0 ? DISCUSSION_BLOCK_OVERHEAD + view.discussionHtml.length : 0,
+    (view) => ({ ...view, discussion: [], discussionHtml: "" })
+  );
+  const systemicBudget = budgetBySize(
+    (input.findings.systemic_problems ?? []).map(
+      (s) => sanitizeSystemic(
+        s,
+        s.id !== void 0 ? discussionLinksFor(s.id) : [],
+        s.id !== void 0 ? discussionTruncatedFor(s.id) : void 0
+      )
+    ),
+    DISCUSSION_TOTAL_CHARS - orphanedBudget.used - discussionBudget.used,
+    (s) => s.discussion.length > 0 ? DISCUSSION_BLOCK_OVERHEAD + s.discussionHtml.length : 0,
+    (s) => ({ ...s, discussion: [], discussionHtml: "" })
+  );
+  const orphanedRender = {
+    lines: orphanedBudget.kept.map(([, entry]) => entry.html),
+    // The "(showing N of M)" total counts DISTINCT DISPLAYED entries — the pre-budget fold above
+    // already merged twins, and the budget's own drops are named in the dropped-threads marker.
+    total: input.orphanedTotal !== void 0 ? input.orphanedTotal - (Object.keys(input.orphanedDiscussion ?? {}).length - orphanedPreBudget.size) : orphanedPreBudget.size - orphanedBudget.droppedItems.length
+  };
   return eta.renderString(input.template, {
     findings: input.findings,
     envelope: input.envelope,
@@ -1605,13 +1773,20 @@ var render = (input) => {
     postedAt: input.postedAt ?? "",
     severityCounts,
     convergenceSummary: !isFullReviewRound ? "" : convergence ? convergenceBadge(convergence) : convergenceSummary(input.findings, input.convergenceThreshold),
-    strays: (input.strays ?? []).map(
-      (f) => sanitizeFinding(f, input.answeredNotes, permalinkBase, unanchored)
-    ),
-    suppressedNits: suppressedBudget.list,
-    carriedDroppedNits: suppressedBudget.dropped,
+    strays: discussionBudget.kept,
+    orphanedLines: orphanedRender.lines,
+    orphanedUnresolvable: input.orphanedUnresolvable === true,
+    discussionDropped: discussionBudget.droppedItems.length + systemicBudget.droppedItems.length + orphanedBudget.droppedItems.length,
+    discussionDroppedIds: discussionBudget.droppedItems.map((v) => clipText(escapeCodeBackticks(v.idKey), 64)).slice(0, DROPPED_IDS_SHOWN),
+    discussionDroppedSystemicIds: systemicBudget.droppedItems.flatMap((s) => s.id !== void 0 ? [clipText(s.id, 64)] : []).slice(0, DROPPED_IDS_SHOWN),
+    discussionDroppedOrphanedIds: orphanedBudget.droppedItems.map(([token]) => clipText(token, 64)).slice(0, DROPPED_IDS_SHOWN),
+    discussionDroppedExtra: Math.max(0, discussionBudget.droppedItems.length - DROPPED_IDS_SHOWN) + Math.max(0, systemicBudget.droppedItems.length - DROPPED_IDS_SHOWN) + Math.max(0, orphanedBudget.droppedItems.length - DROPPED_IDS_SHOWN),
+    discussionCap: PER_FINDING_LINKS,
+    orphanedTotal: orphanedRender.total,
+    suppressedNits: suppressedBudget.kept,
+    carriedDroppedNits: suppressedBudget.droppedItems.length,
     nitVisibilityFloor: input.nitVisibilityFloor ?? DEFAULT_NIT_VISIBILITY_FLOOR,
-    systemic: (input.findings.systemic_problems ?? []).map(sanitizeSystemic),
+    systemic: systemicBudget.kept,
     unanchoredCount: input.unanchoredCount ?? 0,
     inlineDisposition: input.inlineDisposition ?? null,
     unverifiedNoLogs: input.unverifiedNoLogs === true,
@@ -1726,8 +1901,7 @@ var renderCommentBody = (f, eta, template, modelsText, jsonUrl, pointer, sameRoo
 );
 var buildInlineComments = (findings, diff, context) => {
   const { inlineTemplate, models = [], jsonUrl, findings: fullFindings } = context;
-  const index = indexDiff(diff);
-  const { inDiff, strays } = partitionFindings(findings, index);
+  const { inDiff, strays } = context.partition ?? partitionFindings(findings, indexDiff(diff));
   const eta = new Eta({ autoTrim: false });
   const modelsText = formatModels(models);
   const noteFor = (notes, key2) => notes !== void 0 && Object.prototype.hasOwnProperty.call(notes, key2) ? notes[key2] ?? "" : "";
@@ -2803,24 +2977,58 @@ var postInlineReview = async (pr, comments, inDiff, ghApi) => {
     return { url, inlinePosted, unposted };
   }
 };
-var findBotComment = async (repo, prNumber, botLogin, marker, ghApi) => {
-  const stdout = await ghApi(
-    [
-      `repos/${repo}/issues/${String(prNumber)}/comments`,
-      "--paginate",
-      "--jq",
-      ".[] | select(.user.login == env.CODE_REVIEW_BOT_LOGIN and (.body | startswith(env.CODE_REVIEW_MARKER))) | {id: .id, body: .body}"
-    ],
-    void 0,
-    { CODE_REVIEW_BOT_LOGIN: botLogin, CODE_REVIEW_MARKER: marker }
+var ISSUE_COMMENTS_JQ = '.[] | {id, user: (.user.login // "(deleted)"), created_at, html_url, body: (.body // "")}';
+var parseIssueCommentRows = (raw) => {
+  let malformed = 0;
+  const rows = [];
+  for (const line of raw.split("\n")) {
+    const trimmed = line.trim();
+    if (trimmed === "") continue;
+    const parsed = tryParseJson(trimmed);
+    if (!parsed.ok) {
+      malformed += 1;
+      continue;
+    }
+    const rec = asRecord(parsed.value);
+    const id = rec?.["id"];
+    const author = rec?.["user"];
+    const created = rec?.["created_at"];
+    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 });
+    } else {
+      malformed += 1;
+    }
+  }
+  rows.sort(
+    (a, b) => a.created.localeCompare(b.created) || (a.id > b.id ? 1 : a.id < b.id ? -1 : 0)
   );
-  const lines = stdout.trim().split("\n").filter(Boolean);
-  if (lines.length === 0) return null;
-  const last = lines[lines.length - 1] ?? null;
-  if (last === null) return null;
-  const parsed = JSON.parse(last);
-  return { id: parsed.id, body: parsed.body };
+  return { rows, malformed };
+};
+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
+    // (create-comment) and 422 every sticky lookup.
+    `repos/${repo}/issues/${String(prNumber)}/comments?per_page=100`,
+    "--paginate",
+    "--jq",
+    ISSUE_COMMENTS_JQ
+  ]);
+  const { rows, malformed } = parseIssueCommentRows(raw);
+  if (malformed > 0) {
+    throw new Error(
+      `${String(malformed)} issue-comment row(s) failed to decode \u2014 refusing to treat a corrupted history as an absent sticky`
+    );
+  }
+  return rows;
+};
+var selectBotComment = (rows, botLogin, marker) => {
+  const bot = rows.filter((r) => r.author === botLogin && r.body.startsWith(marker));
+  const last = bot[bot.length - 1];
+  return last === void 0 ? null : { id: last.id, body: last.body };
 };
+var findBotComment = async (repo, prNumber, botLogin, marker, ghApi) => selectBotComment(await fetchIssueCommentRows(repo, prNumber, ghApi), botLogin, marker);
 var parseCommentRef = (raw) => {
   const parsed = tryParseJson(raw);
   const rec = parsed.ok ? asRecord(parsed.value) : null;
@@ -2843,6 +3051,134 @@ var postComment = async (repo, prNumber, body, ghApi) => {
   );
   return parseCommentRef(stdout);
 };
+var ID_TOKEN_RE = /`([^`\n]+)`/g;
+var ORPHAN_TOKEN_CAP = 8;
+var escapedIdIndex = (ids) => {
+  const owners = /* @__PURE__ */ new Map();
+  for (const id of ids) {
+    const escaped = escapeCodeBackticks(id);
+    if (escaped === id) continue;
+    const list = owners.get(escaped);
+    if (list === void 0) owners.set(escaped, [id]);
+    else if (!list.includes(id)) list.push(id);
+  }
+  return new Map(
+    [...owners.entries()].flatMap(
+      ([escaped, raws]) => raws.length === 1 && raws[0] !== void 0 ? [[escaped, raws[0]]] : []
+    )
+  );
+};
+var discussionRows = (rows, stickyId, botLogin) => {
+  const seen = /* @__PURE__ */ new Set();
+  return rows.filter((c) => {
+    if (seen.has(c.id)) return false;
+    seen.add(c.id);
+    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);
+  for (const c of reachable) {
+    for (const m of c.body.matchAll(ID_TOKEN_RE)) {
+      const token = m[1];
+      if (token === void 0) continue;
+      const raw = known.has(token) ? token : escapedToRaw.get(token);
+      if ((raw === void 0 || !known.has(raw)) && ID_SHAPE_RE.test(token)) return true;
+    }
+  }
+  return false;
+};
+var buildStickyDiscussion = (reachable, currentIds, priorIds) => {
+  const known = new Set(currentIds);
+  const departed = new Set(priorIds);
+  const escapedToRaw = escapedIdIndex([...currentIds, ...priorIds]);
+  const byFinding = Object.fromEntries(
+    currentIds.map((id) => [id, []])
+  );
+  const orphaned = /* @__PURE__ */ new Map();
+  const latestAt = /* @__PURE__ */ new Map();
+  for (const c of reachable) {
+    const link = { author: c.author, when: c.created.slice(0, 10), url: c.url, at: c.created };
+    const pushed = /* @__PURE__ */ new Set();
+    for (const m of c.body.matchAll(ID_TOKEN_RE)) {
+      const token = m[1];
+      if (token === void 0 || pushed.has(token)) continue;
+      pushed.add(token);
+      const rawKnown = known.has(token);
+      const alias = rawKnown ? void 0 : escapedToRaw.get(token);
+      const aliasIsKnown = alias !== void 0 && known.has(alias);
+      const rawDeparted = departed.has(token);
+      if (rawKnown) {
+        byFinding[token]?.push(link);
+      } else if (aliasIsKnown) {
+        if (!rawDeparted) byFinding[alias]?.push(link);
+      } else if (rawDeparted) {
+        const key2 = token;
+        const links = orphaned.get(key2);
+        if (links === void 0) orphaned.set(key2, [link]);
+        else links.push(link);
+        const latest = latestAt.get(key2);
+        if (latest === void 0 || c.created.localeCompare(latest) > 0)
+          latestAt.set(key2, c.created);
+      } else if (alias !== void 0 && departed.has(alias)) {
+        const key2 = alias;
+        const links = orphaned.get(key2);
+        if (links === void 0) orphaned.set(key2, [link]);
+        else links.push(link);
+        const latest = latestAt.get(key2);
+        if (latest === void 0 || c.created.localeCompare(latest) > 0)
+          latestAt.set(key2, c.created);
+      }
+    }
+  }
+  const truncated = /* @__PURE__ */ new Map();
+  for (const [id, links] of Object.entries(byFinding)) {
+    links.reverse();
+    if (links.length > PER_FINDING_LINKS) {
+      truncated.set(id, links.length);
+      links.splice(PER_FINDING_LINKS);
+    }
+  }
+  const orphanedTruncated = /* @__PURE__ */ new Map();
+  for (const [token, links] of orphaned) {
+    links.reverse();
+    if (links.length > PER_FINDING_LINKS) {
+      orphanedTruncated.set(token, links.length);
+      links.splice(PER_FINDING_LINKS);
+    }
+  }
+  const orphanedTotal = orphaned.size;
+  const byLatestReply = [...orphaned.entries()].sort(
+    (a, b) => (latestAt.get(b[0]) ?? "").localeCompare(latestAt.get(a[0]) ?? "")
+  );
+  return {
+    byFinding,
+    orphaned: Object.fromEntries(byLatestReply.slice(0, ORPHAN_TOKEN_CAP)),
+    orphanedTotal,
+    truncated: Object.fromEntries(truncated),
+    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 appendRunSummary = (summaryPath, body) => {
   if (summaryPath === void 0 || summaryPath === "") return;
   const rendered = body();
@@ -2999,13 +3335,14 @@ var post = async (input, ghApi = runGhApi, readArtifact = ghArtifactReader) => {
     process.exit(0);
   }
   const prNumber = resolution.prNumber;
-  const [diff, existingSticky] = await Promise.all([
+  const [diff, commentRows] = await Promise.all([
     fetchDiff(input.repo, prNumber, ghApi),
-    findBotComment(input.repo, prNumber, input.botLogin, DEFAULT_MARKER, ghApi)
+    fetchIssueCommentRows(input.repo, prNumber, ghApi)
   ]);
+  const existingSticky = selectBotComment(commentRows, input.botLogin, DEFAULT_MARKER);
   const existingComplete = existingSticky !== null && parseReviewComplete(existingSticky.body);
   const wouldBuryCompleted = (incomplete) => incomplete && existingComplete;
-  const priorIsFullReview = (body) => isFullReviewSticky(body) || parseReviewedRoute(body) === null && (parseReviewComplete(body) || parseCompletedAncestor(body));
+  const priorIsFullReview = (body) => isFullReviewSticky(body) || parseReviewedRoute(body) === null && (parseReviewComplete(body) || parseCompletedAncestor(body) && !parseMechanicAncestor(body));
   const emptyMechanicWouldBury = (route, incomplete) => route === "mechanic" && !incomplete && findings.findings.length === 0 && existingSticky !== null && priorIsFullReview(existingSticky.body);
   const priorDoc = existingSticky !== null ? parseFindingsMarker(existingSticky.body) : null;
   const priorBody = existingSticky?.body ?? "";
@@ -3016,12 +3353,12 @@ var post = async (input, ghApi = runGhApi, readArtifact = ghArtifactReader) => {
     ...doc,
     convergence: conv ?? void 0
   });
-  const carriedFindingsLink = !input.jsonUrl && existingSticky !== null ? findingsArtifactUrl(existingSticky.body) : null;
   let warnedNoJsonUrl = false;
   const findingsBlob = (doc) => {
     if (input.jsonUrl) return findingsMarkerPair(input.jsonUrl, doc.convergence);
-    if (carriedFindingsLink !== null) {
-      return findingsMarkerPair(carriedFindingsLink, doc.convergence);
+    const carriedLink = existingSticky !== null ? findingsArtifactUrl(existingSticky.body) : null;
+    if (carriedLink !== null) {
+      return findingsMarkerPair(carriedLink, doc.convergence);
     }
     if (!warnedNoJsonUrl) {
       warnedNoJsonUrl = true;
@@ -3056,7 +3393,7 @@ var post = async (input, ghApi = runGhApi, readArtifact = ghArtifactReader) => {
       noticeBody(
         `${DEFAULT_MARKER}
 
-\u26A0\uFE0F **CI-fix pass completed with no findings** for \`${input.headSha.slice(0, 7)}\`${input.unverifiedNoLogs === true ? ' \u2014 **but no failing-job logs were available**, so it had only the diff to work from and "no findings" is not evidence of none' : ""} \u2014 the completed full review of \`${priorSha ? priorSha.slice(0, 7) : "an earlier commit"}\` is preserved below.${dropNote ? `
+\u26A0\uFE0F **CI-fix pass completed with no findings** for \`${input.headSha.slice(0, 7)}\`${input.unverifiedNoLogs === true ? ' \u2014 **but no failing-job logs were available**, so it worked from the diff and any local reproduction of the checks, and "no findings" is not evidence of none' : ""} \u2014 the completed full review of \`${priorSha ? priorSha.slice(0, 7) : "an earlier commit"}\` is preserved below.${dropNote ? `
 
 ${dropNote}` : ""}`,
         sticky.body
@@ -3072,8 +3409,41 @@ ${dropNote}` : ""}`,
   }
   const template = readFileSync(input.templatePath, "utf-8");
   const inlineRequested = input.inline === true;
-  const renderNotice = (message) => {
-    const findings2 = stampConvergence(incompleteFindings(`### \u26A0\uFE0F ${message}`), priorConv);
+  const envelope = loadEnvelope(input.envelopePath);
+  const reachable = existingSticky !== null ? discussionRows(commentRows, existingSticky.id, input.botLogin) : [];
+  const priorIsMechanic = existingSticky !== null && (parseReviewedRoute(existingSticky.body) === "mechanic" || parseMechanicAncestor(existingSticky.body));
+  const noticeDiscussion = async () => {
+    if (existingSticky === null) {
+      return {
+        orphanedDiscussion: {},
+        orphanedTotal: 0,
+        orphanedTruncated: {},
+        orphanedUnresolvable: false
+      };
+    }
+    const wantsPrior = !priorIsMechanic && mentionsOutsideKnown(reachable, []);
+    const resolved = wantsPrior ? await resolvePriorFindings(existingSticky.body, readArtifact) : null;
+    const built = buildStickyDiscussion(reachable, [], priorIdsFrom(resolved));
+    const hadMarker = carriedFindingsMarker(existingSticky.body) !== null;
+    return {
+      orphanedDiscussion: built.orphaned,
+      orphanedTotal: built.orphanedTotal,
+      orphanedTruncated: built.orphanedTruncated,
+      orphanedUnresolvable: wantsPrior && hadMarker && resolved === null
+    };
+  };
+  const renderNotice = (message, discussion) => {
+    const noticeConvergence = (input.route ?? envelope?.route) === "mechanic" ? mechanicConvergence(
+      priorConv,
+      input.convergenceThreshold ?? DEFAULT_CONVERGENCE_THRESHOLD
+    ) : priorConv;
+    const findings2 = stampConvergence(incompleteFindings(`### \u26A0\uFE0F ${message}`), noticeConvergence);
+    const noticeFindingsPointer = (doc) => {
+      const carried = existingSticky !== null ? carriedFindingsMarker(existingSticky.body) : null;
+      if (carried === null) return findingsBlob(doc);
+      const provenance = existingSticky !== null ? carriedAncestryMarkers(existingSticky.body) : "";
+      return [carriedMarkerPointer(carried, doc.convergence), provenance].filter((p) => p !== "").join("\n\n");
+    };
     return formatMarkdown(
       render({
         findings: findings2,
@@ -3090,18 +3460,23 @@ ${dropNote}` : ""}`,
         convergenceRound: false,
         runUrl: input.runUrl,
         jsonUrl: input.jsonUrl,
-        findingsPointer: findingsBlob(findings2),
-        postedAt: input.postedAt
+        findingsPointer: noticeFindingsPointer(findings2),
+        postedAt: input.postedAt,
+        orphanedDiscussion: discussion.orphanedDiscussion,
+        orphanedTotal: discussion.orphanedTotal,
+        orphanedTruncated: discussion.orphanedTruncated,
+        orphanedUnresolvable: discussion.orphanedUnresolvable
       })
     );
   };
   if (isEmptyDiff(diff)) {
     if (wouldBuryCompleted(true)) leaveInPlace();
+    const discussion = await noticeDiscussion();
     await upsertSticky(
       input.repo,
       prNumber,
       existingSticky,
-      renderNotice("The diff for this PR is empty \u2014 nothing to review."),
+      renderNotice("The diff for this PR is empty \u2014 nothing to review.", discussion),
       ghApi
     );
     process.exit(0);
@@ -3109,11 +3484,12 @@ ${dropNote}` : ""}`,
   const findingsResult = loadFindings(input.findingsPath);
   if (findingsResult.kind !== "ok") {
     if (wouldBuryCompleted(true)) leaveInPlace();
+    const discussion = await noticeDiscussion();
     await upsertSticky(
       input.repo,
       prNumber,
       existingSticky,
-      renderNotice(noticeMessageFor(findingsResult)),
+      renderNotice(noticeMessageFor(findingsResult), discussion),
       ghApi
     );
     process.exit(0);
@@ -3141,8 +3517,15 @@ ${dropNote}` : ""}`,
     findings: [...answeredFilter.findings],
     ...systemic.length > 0 ? { systemic_problems: systemic } : {}
   };
+  const broadCurrentIds = [
+    ...findings.findings.map((f) => f.id).filter((id) => id !== ""),
+    ...(findings.systemic_problems ?? []).map((s) => s.id).filter((id) => id !== void 0 && id !== "")
+  ];
   const roundHasNit = findings.findings.some((f) => f.severity === "nit");
-  const priorDocForNits = roundHasNit && existingSticky !== null && isFullReviewSticky(existingSticky.body) ? await resolvePriorFindings(existingSticky.body, readArtifact) : null;
+  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 priorDocForNits = nitWantsPrior ? resolvedPrior : null;
   const priorSuppressedKeys = new Set(
     priorBelowFloorNits(priorDocForNits, input.nitVisibilityFloor).map(
       (n) => answeredNoteKey({ id: n.id ?? "", title: n.title })
@@ -3155,7 +3538,22 @@ ${dropNote}` : ""}`,
   const suppressedNits = findings.findings.filter(isSuppressedNit);
   const visibleFindings = findings.findings.filter((f) => !isSuppressedNit(f));
   const answeredDropNote = answeredReRaiseNote(verbatimReRaised, droppedCount) + (verbatimReRaised.length > 0 && findings.findings.length === 0 ? "\n> _The stop signal reflects the kept findings \u2014 this round carries none._" : "");
-  const envelope = loadEnvelope(input.envelopePath);
+  const inlinePartition = input.inline === true && envelope !== null ? partitionFindings(visibleFindings, indexDiff(diff)) : null;
+  const straysForDiscussion = inlinePartition?.strays ?? visibleFindings;
+  const currentIds = [
+    ...straysForDiscussion.map((f) => f.id).filter((id) => id !== ""),
+    ...suppressedNits.map((f) => f.id).filter((id) => id !== ""),
+    ...(findings.systemic_problems ?? []).map((s) => s.id).filter((id) => id !== void 0 && id !== "")
+  ];
+  const orphanResolveFailed = existingSticky !== null && broadWantsPrior && carriedFindingsMarker(existingSticky.body) !== null && resolvedPrior === null;
+  const broadLive = new Set(broadCurrentIds);
+  const departedIds = priorIdsFrom(resolvedPrior).filter((id) => !broadLive.has(id));
+  const stickyDiscussion = existingSticky !== null ? buildStickyDiscussion(reachable, currentIds, departedIds) : { byFinding: {}, orphaned: {}, orphanedTotal: 0, truncated: {}, orphanedTruncated: {} };
+  const discussionByFinding = stickyDiscussion.byFinding;
+  const orphanedDiscussion = stickyDiscussion.orphaned;
+  const orphanedTotal = stickyDiscussion.orphanedTotal;
+  const discussionTruncated = stickyDiscussion.truncated;
+  const orphanedTruncated = stickyDiscussion.orphanedTruncated;
   const testReport = input.testReportPath ? loadTestReport(input.testReportPath) : void 0;
   const clocDiff = input.clocDiffPath ? loadClocDiff(input.clocDiffPath) : void 0;
   const effectiveRoute = input.route ?? envelope?.route;
@@ -3167,7 +3565,13 @@ ${dropNote}` : ""}`,
     }
     if (emptyMechanicWouldBury(effectiveRoute, envelopelessIncomplete) && existingSticky !== null)
       await emptyMechanicLeaveOrNote(existingSticky);
-    const stampedFindings2 = stampConvergence(findings, priorConv);
+    const stampedFindings2 = stampConvergence(
+      findings,
+      effectiveRoute === "mechanic" ? mechanicConvergence(
+        priorConv,
+        input.convergenceThreshold ?? DEFAULT_CONVERGENCE_THRESHOLD
+      ) : priorConv
+    );
     const body = formatMarkdown(
       render({
         findings: stampedFindings2,
@@ -3202,7 +3606,13 @@ ${dropNote}` : ""}`,
         unverifiedNoLogs: input.unverifiedNoLogs,
         jsonUrl: input.jsonUrl,
         findingsPointer: findingsBlob(stampedFindings2),
-        postedAt: input.postedAt
+        postedAt: input.postedAt,
+        discussionByFinding,
+        orphanedDiscussion,
+        orphanedTotal,
+        discussionTruncated,
+        orphanedTruncated,
+        orphanedUnresolvable: orphanResolveFailed
       })
     );
     await upsertSticky(input.repo, prNumber, existingSticky, body, ghApi);
@@ -3232,6 +3642,7 @@ ${dropNote}` : ""}`,
     strays,
     inDiff
   } = inlineRequested ? buildInlineComments(visibleFindings, diff, {
+    ...inlinePartition !== null ? { partition: inlinePartition } : {},
     inlineTemplate,
     models: envelope.models.map((m) => m.model),
     findings,
@@ -3258,6 +3669,11 @@ ${dropNote}` : ""}`,
     roundNumber,
     currentCodes,
     input.headSha.slice(0, 12)
+  ) : effectiveRoute === "mechanic" ? (
+    // A mechanic pass means CI failed — whatever the carried prior says, its own stamp must
+    // never read "converged". The threshold-relative critical floor keeps the carried triple
+    // consistent at every threshold; null (no marker) when no prior round exists (issue #224).
+    mechanicConvergence(priorConv, input.convergenceThreshold ?? DEFAULT_CONVERGENCE_THRESHOLD)
   ) : priorConv;
   const stampedFindings = stampConvergence(findings, convergence);
   const currentRoundCount = isRound ? roundNumber : priorRoundCount;
@@ -3279,6 +3695,12 @@ ${dropNote}` : ""}`,
     sameRootNotes,
     answeredNotes: reRaisedNotes,
     answeredReRaiseNote: answeredDropNote,
+    discussionByFinding,
+    orphanedDiscussion,
+    orphanedTotal,
+    discussionTruncated,
+    orphanedTruncated,
+    orphanedUnresolvable: orphanResolveFailed,
     roundCount: currentRoundCount,
     convergenceThreshold: input.convergenceThreshold,
     nitVisibilityFloor: input.nitVisibilityFloor,
@@ -3298,12 +3720,13 @@ ${dropNote}` : ""}`,
 
 > **Note:** ${String(longFiles.length)} suggestion(s) exceeded GitHub's ~10-line inline suggestion limit and were omitted from the inline comments; the affected findings remain in the review.
 ` : "";
-  const renderBody = (inlineDisposition, reviewUrl2, straysOverride, unanchoredCount2, unanchoredStrays) => formatMarkdown(
+  const renderBody = (inlineDisposition, reviewUrl2, straysOverride, unanchoredCount2, unanchoredStrays, discussionOverride) => formatMarkdown(
     render({
       ...commonRenderInput,
       ...straysOverride ? { strays: straysOverride } : {},
       ...unanchoredCount2 !== void 0 ? { unanchoredCount: unanchoredCount2 } : {},
       ...unanchoredStrays !== void 0 && unanchoredStrays.length > 0 ? { unanchoredStrays } : {},
+      ...discussionOverride ?? {},
       inlineDisposition,
       reviewUrl: reviewUrl2
     }) + longFilesNote
@@ -3354,13 +3777,32 @@ ${dropNote}` : ""}`,
   await minimizeComments(prNumber, priorInlineComments, ghApi);
   const unanchoredCount = unposted.length;
   const finalStrays = unanchoredCount > 0 ? [...unposted, ...strays] : strays;
+  const finalDiscussion = unanchoredCount > 0 ? buildStickyDiscussion(
+    reachable,
+    [...currentIds, ...unposted.map((f) => f.id).filter((id) => id !== "")],
+    departedIds
+  ) : null;
+  const finalDiscussionOverride = finalDiscussion !== null ? {
+    discussionByFinding: finalDiscussion.byFinding,
+    orphanedDiscussion: finalDiscussion.orphaned,
+    orphanedTotal: finalDiscussion.orphanedTotal,
+    discussionTruncated: finalDiscussion.truncated,
+    orphanedTruncated: finalDiscussion.orphanedTruncated
+  } : void 0;
   if (stickyRef !== null && (inlinePosted > 0 || unanchoredCount > 0)) {
     const finalDisposition = inlinePosted > 0 ? { kind: "posted", count: inlinePosted, sha: input.headSha } : { kind: "inline-unavailable" };
     try {
       await patchComment(
         input.repo,
         stickyRef.id,
-        renderBody(finalDisposition, reviewUrl, finalStrays, unanchoredCount, unposted),
+        renderBody(
+          finalDisposition,
+          reviewUrl,
+          finalStrays,
+          unanchoredCount,
+          unposted,
+          finalDiscussionOverride
+        ),
         ghApi
       );
       process.stderr.write(
@@ -3385,7 +3827,10 @@ ${dropNote}` : ""}`,
       // document deliberately carries every finding, so the GitHub-rejected ones must keep their
       // path-only links here too (issue #231 r2). Unconditional: renderBody's own gate treats an
       // empty array exactly like absence, so the ternary was a duplicated decision (issue #231 r3).
-      unposted
+      unposted,
+      // The summary is the sticky's long-lived twin — a rejected finding's rebuilt discussion
+      // trail renders here exactly as on the final patch.
+      finalDiscussionOverride
     )
   );
 };
@@ -3789,8 +4234,14 @@ var IssueCommentCodec = t.intersection([
     author_association: t.union([t.string, t.null])
   })
 ]);
-var JobCodec = t.type({ id: t.number, conclusion: t.union([t.string, t.null]) });
-var JOBS_JQ = ".jobs[] | {id: .id, conclusion: .conclusion}";
+var JobCodec = t.type({
+  id: t.number,
+  // A null name (an API edge) degrades to a nameless entry rather than aborting the whole gather —
+  // the identity the reproduction steer needs is best-effort, never load-bearing.
+  name: t.union([t.string, t.null]),
+  conclusion: t.union([t.string, t.null])
+});
+var JOBS_JQ = ".jobs[] | {id: .id, name: .name, conclusion: .conclusion}";
 var fetchPrMeta = async (repo, prNumber, ghApi) => {
   const stdout = await ghApi([
     `repos/${repo}/pulls/${String(prNumber)}`,
@@ -3951,6 +4402,13 @@ var downloadFailingJobLogs = async (repo, runId, outDir, ghApi) => {
   for (const job of selected) {
     try {
       const log = await ghApi([`repos/${repo}/actions/jobs/${String(job.id)}/logs`]);
+      if (log.trim() === "no log available" || log.trim() === "") {
+        process.stderr.write(
+          `Warning: job ${String(job.id)} has no log available (placeholder body) \u2014 not staged
+`
+        );
+        continue;
+      }
       writeFileSync(join(outDir, `job_${String(job.id)}.log`), log);
       staged += 1;
     } catch (err) {
@@ -3960,6 +4418,15 @@ var downloadFailingJobLogs = async (repo, runId, outDir, ghApi) => {
       );
     }
   }
+  writeFileSync(
+    join(outDir, "failed_jobs.json"),
+    `${JSON.stringify(
+      failing.map((j) => ({ name: j.name, conclusion: j.conclusion })),
+      null,
+      2
+    )}
+`
+  );
   if (failing.length > selected.length) {
     process.stderr.write(
       `::warning::${annotationSafe(`${String(failing.length)} failing job(s) in run ${runId}; staged ${String(staged)} of the first ${String(selected.length)} log(s) \u2014 the review does not see the rest`)}
@@ -3967,8 +4434,11 @@ var downloadFailingJobLogs = async (repo, runId, outDir, ghApi) => {
     );
   }
   if (staged === 0) {
+    const reported = failing.length > 0 ? `${String(failing.length)} failing job(s) reported` : "no job concluded 'failure' (timeouts or cancellations)";
     process.stderr.write(
-      `::warning::${annotationSafe(`No failing-job logs could be staged for run ${runId} (${String(failing.length)} failing job(s) reported) \u2014 the review has only the diff to work from`)}
+      `::warning::${annotationSafe(
+        `No failing-job logs could be staged for run ${runId} (${reported}) \u2014 the review must reproduce the failures itself${failing.length > 0 ? " (the failing jobs are listed in failed_jobs.json)" : ""}`
+      )}
 `
     );
   }
@@ -4029,7 +4499,7 @@ var gather = async (input, ghApi = runGhApi, gitRun = runGit, readArtifact = ghA
     join(input.outDir, "prior_review.json"),
     prior === null ? "null" : JSON.stringify(prior)
   );
-  const seedsFromPrior = input.conclusion === "success" && prior !== null && prior.body !== null && parseReviewedRoute(prior.body) === "full review";
+  const seedsFromPrior = input.conclusion === "success" && prior !== null && prior.body !== null && isFullReviewAncestry(prior.body);
   const resolvedPrior = seedsFromPrior ? await resolvePriorFindings(prior.body, readArtifact) : null;
   const priorFindings = resolvedPrior !== null && typeof resolvedPrior === "object" ? resolvedPrior : null;
   writeFileSync(
@@ -5220,7 +5690,7 @@ var seedDraftCmd = defineCommand({
 `
       );
     }
-    if (parsedPrior !== null && parseReviewedRoute(priorBody ?? "") === "full review") {
+    if (parsedPrior !== null && isFullReviewAncestry(priorBody ?? "")) {
       try {
         const belowFloor = priorBelowFloorNits(
           parsedPrior,
@@ -5264,7 +5734,7 @@ var seedDraftCmd = defineCommand({
         })();
         if (seedDoc === null) return false;
         if (isIncompleteFindings(seedDoc)) return false;
-        if (parseReviewedRoute(priorBody ?? "") !== "full review") return false;
+        if (!isFullReviewAncestry(priorBody ?? "")) return false;
         writeFileSync(outPath, SEED_SENTINEL);
         writeFileSync(priorContextPath(outPath), `${JSON.stringify(seedDoc, null, 2)}
 `);
@@ -5636,7 +6106,7 @@ var stopGateCmd = defineCommand({
 var gatherCmd = defineCommand({
   meta: {
     name: "gather",
-    description: "Resolve the PR from the CI head SHA and gather review inputs (diff with git-diff fallback, PR context, prior bot review, untrusted PR conversation to triage, failing-job logs) as files for the review agent"
+    description: "Resolve the PR from the CI head SHA and gather review inputs (diff with git-diff fallback, PR context, prior bot review, untrusted PR conversation to triage, failing-job logs and the failing jobs' identities in failed_jobs.json) as files for the review agent"
   },
   args: {
     repo: { type: "string", description: "Repository (owner/name)", required: true },