fix: preserve extra review rules on resume

Author: gersmann

cli/review/review_prompt.py

@@ -76,22 +76,24 @@ def compose_prompt(
         "</git_review_instructions>\n"
     ).format(review_comments_rel=review_comments_rel)
 
-    extra = config.additional_prompt
-    extra_instructions = (
-        "<additional_instructions>\n" + extra + "\n</additional_instructions>\n" if extra else ""
-    )
-
     return (
         f"{context}"
         f"{context_artifacts}"
         f"{changed_summary}"
         f"{review_instructions}"
         f"{line_rules}"
-        f"{extra_instructions}"
+        f"{render_additional_review_instructions(config)}"
         "<response_format>Respond now with the JSON schema output only.</response_format>"
     )
 
 
+def render_additional_review_instructions(config: ReviewConfig) -> str:
+    extra = config.additional_prompt
+    if not extra:
+        return ""
+    return "<additional_instructions>\n" + extra + "\n</additional_instructions>\n"
+
+
 def _build_changed_summary(changed_files: Sequence[ChangedFileProtocol]) -> str:
     changed_list = [f"- {file.filename} ({file.status})" for file in changed_files if file.filename]
     if not changed_list:

cli/workflows/review_workflow.py

@@ -45,7 +45,11 @@
     parse_reviewed_head_sha,
     render_review_summary_metadata,
 )
-from ..review.review_prompt import compose_prompt, load_guidelines
+from ..review.review_prompt import (
+    compose_prompt,
+    load_guidelines,
+    render_additional_review_instructions,
+)
 
 SUMMARY_TIP = (
     'Tip: comment with "/codex address comments" to attempt automated fixes for unresolved '
@@ -555,6 +559,7 @@ def process_review(self, pr_number: int) -> ReviewWorkflowResult:
         prompt_sections = [base_instructions]
         if resume_block:
             prompt_sections.append(resume_block)
+            prompt_sections.append(render_additional_review_instructions(self.config))
         else:
             prompt_sections.append(raw_prompt)
         prompt = "\n\n".join(section for section in prompt_sections if section)

tests/test_review_workflow.py

@@ -270,8 +270,10 @@ def test_process_review_posts_summary_and_passes_dedupe_context(
             }
         )
     )
+    config = _make_config(tmp_path)
+    config.additional_prompt = "Review only security and correctness issues."
     workflow = ReviewWorkflow(
-        _make_config(tmp_path),
+        config,
         github_client=cast(Any, github_client),
         codex_client=cast(Any, codex_client),
     )
@@ -514,8 +516,10 @@ def test_process_review_ignores_stale_prior_codex_thread(tmp_path: Path) -> None
             }
         )
     )
+    config = _make_config(tmp_path)
+    config.additional_prompt = "Review only security and correctness issues."
     workflow = ReviewWorkflow(
-        _make_config(tmp_path),
+        config,
         github_client=cast(Any, github_client),
         codex_client=cast(Any, codex_client),
     )
@@ -645,8 +649,10 @@ def test_process_review_matches_github_bot_logins_across_issue_and_thread_apis(
             }
         )
     )
+    config = _make_config(tmp_path)
+    config.additional_prompt = "Review only security and correctness issues."
     workflow = ReviewWorkflow(
-        _make_config(tmp_path),
+        config,
         github_client=cast(Any, github_client),
         codex_client=cast(Any, codex_client),
     )
@@ -854,8 +860,10 @@ def test_process_review_resumes_prior_thread_with_inline_incremental_diff(
             }
         )
     )
+    config = _make_config(tmp_path)
+    config.additional_prompt = "Review only security and correctness issues."
     workflow = ReviewWorkflow(
-        _make_config(tmp_path),
+        config,
         github_client=cast(Any, github_client),
         codex_client=cast(Any, codex_client),
     )
@@ -902,6 +910,7 @@ def test_process_review_resumes_prior_thread_with_inline_incremental_diff(
     assert "<current_head_sha>head-sha</current_head_sha>" in codex_client.calls[0]["prompt"]
     assert "<incremental_diff>" in codex_client.calls[0]["prompt"]
     assert "+value = 2" in codex_client.calls[0]["prompt"]
+    assert "Review only security and correctness issues." in codex_client.calls[0]["prompt"]
     assert "FULL PR PROMPT" not in codex_client.calls[0]["prompt"]