Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

@@ -203,5 +203,5 @@
                 stop = e
                 break
         full = _reduced_context(reductions.pop(0), full, files, fetch, pr, config, deps, rules, diffs, result)
         prompt_section = full.section + hints
         extra_chars = (len(instructions) + len(pr_data.get("title") or "") + len(pr_data.get("body") or "")

@@ -453,6 +457,22 @@ def _plan_line_comments(gitea, pr, result, bot_login):
     return comments
 
 
+def _update_line_comment(gitea, pr, earlier, text, redactor, updated):

@@ -693,3 +713,3 @@
     """The result comment comes first: if anything fails later, no bot approval stands without its comment."""
     fresh = existing is None and result.verdict is not Verdict.ERROR
-    comments = _plan_line_comments(gitea, pr, result, bot_login) if fresh else []
+    comments = _plan_line_comments(gitea, pr, result, bot_login, redactor) if fresh else []

@@ -195,6 +204,20 @@ def line_comment(f, v):
     return body.replace("<!--", "&lt;!--")
 
 
+_UPDATE_NOTE = re.compile(r"\s*<sub>Updated by the review of `[0-9a-fA-F]+`\.</sub>\s*$")

@@ -0,0 +66,4 @@
+
+### Feature: only comments of the bot count as its line comments
+
+#### Scenario#33.04: a reply in the thread of a bot line comment is neither reused nor a hint

@@ -425,3 +425,2 @@
             for c in gitea.list_review_comments(pr.number, review["id"]) or ():
-                if not c.get("resolver") and (c.get("position") or 0) > 0:
-                    found.append({"path": c.get("path"), "line": c["position"], "url": c.get("html_url") or ""})
+                # A reply of a human is listed in the review that started the thread, but is no hint of the bot.

@@ -446,6 +450,8 @@ def _plan_line_comments(gitea, pr, result, bot_login):
                         and first - LINE_SLACK <= c["line"] <= last + LINE_SLACK), None)
         if earlier is not None:
             result.reused[i] = earlier["url"]
+            if not _update_line_comment(gitea, pr, earlier, report.line_comment(f, v), redactor, updated):

@@ -0,0 +92,4 @@
+
+### Feature: a GREEN review releases its review request
+
+#### Scenario#33.06: a scheduled merge withdraws the review request of an earlier round

@@ -506,3 +528,3 @@
             exit_code = 0 if cancelled else Verdict.YELLOW.exit_code
             return GateDecision(exit_code, "approved by werkrevisor" + note, held=True)
-        return GateDecision(0, "approved by werkrevisor" + _schedule_merge(config, pr, gitea, redactor, base_ref))
+        scheduled = _schedule_merge(config, pr, gitea, redactor, base_ref)

@@ -553,5 +553,5 @@
     if not config.gate.automerge:
         return ""
     try:
         # Without these rules Gitea would merge a YELLOW or ORANGE PR as soon as the checks pass, unapproved.
         branch = gitea.get_branch(base_ref) or {}

@@ -0,0 +115,4 @@
+  without a change of the text, ignoring that line, line endings and trailing blanks, it does not edit,
+  since Gitea may return a body normalized otherwise than posted.
+- A failed edit, or a second finding at the same comment, puts the full text into the result comment.
+- Only comments written by the bot count as its line comments:

@@ -104,0 +158,4 @@
+        self.assertEqual(result.count("still open in [an earlier line comment](https://x/77)"), 2)
+        self.assertEqual(result.count("Breaks X."), 1)
+
+    def test_a_reply_in_the_thread_of_a_bot_review_is_not_reused(self):

@@ -453,6 +461,22 @@ def _plan_line_comments(gitea, pr, result, bot_login):
     return comments
 
 
+def _update_line_comment(gitea, pr, earlier, text, redactor, updated):

@@ -473,3 +497,3 @@
         return False
     except GiteaError as e:
-        if not comments or e.status not in (400, 422):
+        # Gitea 1.27 answers a line beyond the end of the file with HTTP 500.

@@ -548,6 +576,20 @@ def _hold_merge(pr, gitea, redactor, count):
     return note, True
 
 
+def _withdraw_review_request(config, pr, gitea, redactor, pr_data):

@@ -446,6 +452,8 @@ def _plan_line_comments(gitea, pr, result, bot_login):
                         and first - LINE_SLACK <= c["line"] <= last + LINE_SLACK), None)
         if earlier is not None:
             result.reused[i] = earlier["url"]
+            if not _update_line_comment(gitea, pr, earlier, report.line_comment(f, v), redactor, updated):

@@ -427,1 +428,3 @@
-                    found.append({"path": c.get("path"), "line": c["position"], "url": c.get("html_url") or ""})
+                # A reply of a human is listed in the review that started the thread, but is no hint of the bot.
+                author = (c.get("user") or {}).get("login") or ""
+                if author == bot_login and not c.get("resolver") and (c.get("position") or 0) > 0:

@@ -506,3 +531,3 @@
             exit_code = 0 if cancelled else Verdict.YELLOW.exit_code
             return GateDecision(exit_code, "approved by werkrevisor" + note, held=True)
-        return GateDecision(0, "approved by werkrevisor" + _schedule_merge(config, pr, gitea, redactor, base_ref))
+        scheduled = _schedule_merge(config, pr, gitea, redactor, base_ref)

@@ -35,3 +35,3 @@
     def test_finding_without_a_usable_line_stays_in_the_result(self):
         for name, issues, start, refuse in (("no line", [APP], 0, False), ("other file", ["other.py"], 40, False),
-                                            ("refused by Gitea", [APP], 40, True)):
+                                            ("refused by Gitea", [APP], 40, True),

@@ -0,0 +11,4 @@
+The model words a finding differently in each round and often sharpens it after a fix;
+the new wording is lost, and the author answers a text that the latest review no longer holds.
+
+The reviews of this PR showed two more defects of 0.20.1: