From 7d5d9f041b3c7817abf7874b386b1f68ec6872b4 Mon Sep 17 00:00:00 2001
From: jif-oai <jif@openai.com>
Date: Fri, 27 Mar 2026 14:50:01 +0100
Subject: [PATCH] Use codex-utils-template for review prompts (#16001)

---
 codex-rs/core/src/review_prompts.rs | 118 +++++++++++++++++++++++++---
 1 file changed, 105 insertions(+), 13 deletions(-)

diff --git a/codex-rs/core/src/review_prompts.rs b/codex-rs/core/src/review_prompts.rs
index a5bf8e5f9..988ceff82 100644
--- a/codex-rs/core/src/review_prompts.rs
+++ b/codex-rs/core/src/review_prompts.rs
@@ -1,7 +1,9 @@
 use codex_git_utils::merge_base_with_head;
 use codex_protocol::protocol::ReviewRequest;
 use codex_protocol::protocol::ReviewTarget;
+use codex_utils_template::Template;
 use std::path::Path;
+use std::sync::LazyLock;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct ResolvedReviewRequest {
@@ -12,12 +14,27 @@ pub struct ResolvedReviewRequest {
 
 const UNCOMMITTED_PROMPT: &str = "Review the current code changes (staged, unstaged, and untracked files) and provide prioritized findings.";
 
-const BASE_BRANCH_PROMPT_BACKUP: &str = "Review the code changes against the base branch '{branch}'. Start by finding the merge diff between the current branch and {branch}'s upstream e.g. (`git merge-base HEAD \"$(git rev-parse --abbrev-ref \"{branch}@{upstream}\")\"`), then run `git diff` against that SHA to see what changes we would merge into the {branch} branch. Provide prioritized, actionable findings.";
-const BASE_BRANCH_PROMPT: &str = "Review the code changes against the base branch '{baseBranch}'. The merge base commit for this comparison is {mergeBaseSha}. Run `git diff {mergeBaseSha}` to inspect the changes relative to {baseBranch}. Provide prioritized, actionable findings.";
+const BASE_BRANCH_PROMPT_BACKUP: &str = "Review the code changes against the base branch '{{branch}}'. Start by finding the merge diff between the current branch and {{branch}}'s upstream e.g. (`git merge-base HEAD \"$(git rev-parse --abbrev-ref \"{{branch}}@{upstream}\")\"`), then run `git diff` against that SHA to see what changes we would merge into the {{branch}} branch. Provide prioritized, actionable findings.";
+const BASE_BRANCH_PROMPT: &str = "Review the code changes against the base branch '{{base_branch}}'. The merge base commit for this comparison is {{merge_base_sha}}. Run `git diff {{merge_base_sha}}` to inspect the changes relative to {{base_branch}}. Provide prioritized, actionable findings.";
+static BASE_BRANCH_PROMPT_BACKUP_TEMPLATE: LazyLock<Template> = LazyLock::new(|| {
+    Template::parse(BASE_BRANCH_PROMPT_BACKUP)
+        .unwrap_or_else(|err| panic!("base branch backup review prompt must parse: {err}"))
+});
+static BASE_BRANCH_PROMPT_TEMPLATE: LazyLock<Template> = LazyLock::new(|| {
+    Template::parse(BASE_BRANCH_PROMPT)
+        .unwrap_or_else(|err| panic!("base branch review prompt must parse: {err}"))
+});
 
-const COMMIT_PROMPT_WITH_TITLE: &str = "Review the code changes introduced by commit {sha} (\"{title}\"). Provide prioritized, actionable findings.";
-const COMMIT_PROMPT: &str =
-    "Review the code changes introduced by commit {sha}. Provide prioritized, actionable findings.";
+const COMMIT_PROMPT_WITH_TITLE: &str = "Review the code changes introduced by commit {{sha}} (\"{{title}}\"). Provide prioritized, actionable findings.";
+const COMMIT_PROMPT: &str = "Review the code changes introduced by commit {{sha}}. Provide prioritized, actionable findings.";
+static COMMIT_PROMPT_WITH_TITLE_TEMPLATE: LazyLock<Template> = LazyLock::new(|| {
+    Template::parse(COMMIT_PROMPT_WITH_TITLE)
+        .unwrap_or_else(|err| panic!("commit review prompt with title must parse: {err}"))
+});
+static COMMIT_PROMPT_TEMPLATE: LazyLock<Template> = LazyLock::new(|| {
+    Template::parse(COMMIT_PROMPT)
+        .unwrap_or_else(|err| panic!("commit review prompt must parse: {err}"))
+});
 
 pub fn resolve_review_request(
     request: ReviewRequest,
@@ -41,20 +58,31 @@ pub fn review_prompt(target: &ReviewTarget, cwd: &Path) -> anyhow::Result<String
         ReviewTarget::UncommittedChanges => Ok(UNCOMMITTED_PROMPT.to_string()),
         ReviewTarget::BaseBranch { branch } => {
             if let Some(commit) = merge_base_with_head(cwd, branch)? {
-                Ok(BASE_BRANCH_PROMPT
-                    .replace("{baseBranch}", branch)
-                    .replace("{mergeBaseSha}", &commit))
+                Ok(render_review_prompt(
+                    &BASE_BRANCH_PROMPT_TEMPLATE,
+                    [
+                        ("base_branch", branch.as_str()),
+                        ("merge_base_sha", commit.as_str()),
+                    ],
+                ))
             } else {
-                Ok(BASE_BRANCH_PROMPT_BACKUP.replace("{branch}", branch))
+                Ok(render_review_prompt(
+                    &BASE_BRANCH_PROMPT_BACKUP_TEMPLATE,
+                    [("branch", branch.as_str())],
+                ))
             }
         }
         ReviewTarget::Commit { sha, title } => {
             if let Some(title) = title {
-                Ok(COMMIT_PROMPT_WITH_TITLE
-                    .replace("{sha}", sha)
-                    .replace("{title}", title))
+                Ok(render_review_prompt(
+                    &COMMIT_PROMPT_WITH_TITLE_TEMPLATE,
+                    [("sha", sha.as_str()), ("title", title.as_str())],
+                ))
             } else {
-                Ok(COMMIT_PROMPT.replace("{sha}", sha))
+                Ok(render_review_prompt(
+                    &COMMIT_PROMPT_TEMPLATE,
+                    [("sha", sha.as_str())],
+                ))
             }
         }
         ReviewTarget::Custom { instructions } => {
@@ -67,6 +95,15 @@ pub fn review_prompt(target: &ReviewTarget, cwd: &Path) -> anyhow::Result<String
     }
 }
 
+fn render_review_prompt<'a, const N: usize>(
+    template: &Template,
+    variables: [(&'a str, &'a str); N],
+) -> String {
+    template
+        .render(variables)
+        .unwrap_or_else(|err| panic!("review prompt template must render: {err}"))
+}
+
 pub fn user_facing_hint(target: &ReviewTarget) -> String {
     match target {
         ReviewTarget::UncommittedChanges => "current changes".to_string(),
@@ -91,3 +128,58 @@ impl From<ResolvedReviewRequest> for ReviewRequest {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn review_prompt_template_renders_base_branch_backup_variant() {
+        assert_eq!(
+            render_review_prompt(&BASE_BRANCH_PROMPT_BACKUP_TEMPLATE, [("branch", "main")]),
+            "Review the code changes against the base branch 'main'. Start by finding the merge diff between the current branch and main's upstream e.g. (`git merge-base HEAD \"$(git rev-parse --abbrev-ref \"main@{upstream}\")\"`), then run `git diff` against that SHA to see what changes we would merge into the main branch. Provide prioritized, actionable findings."
+        );
+    }
+
+    #[test]
+    fn review_prompt_template_renders_base_branch_variant() {
+        assert_eq!(
+            render_review_prompt(
+                &BASE_BRANCH_PROMPT_TEMPLATE,
+                [("base_branch", "main"), ("merge_base_sha", "abc123")]
+            ),
+            "Review the code changes against the base branch 'main'. The merge base commit for this comparison is abc123. Run `git diff abc123` to inspect the changes relative to main. Provide prioritized, actionable findings."
+        );
+    }
+
+    #[test]
+    fn review_prompt_template_renders_commit_variant() {
+        assert_eq!(
+            review_prompt(
+                &ReviewTarget::Commit {
+                    sha: "deadbeef".to_string(),
+                    title: None,
+                },
+                Path::new("."),
+            )
+            .expect("commit prompt should render"),
+            "Review the code changes introduced by commit deadbeef. Provide prioritized, actionable findings."
+        );
+    }
+
+    #[test]
+    fn review_prompt_template_renders_commit_variant_with_title() {
+        assert_eq!(
+            review_prompt(
+                &ReviewTarget::Commit {
+                    sha: "deadbeef".to_string(),
+                    title: Some("Fix bug".to_string()),
+                },
+                Path::new("."),
+            )
+            .expect("commit prompt should render"),
+            "Review the code changes introduced by commit deadbeef (\"Fix bug\"). Provide prioritized, actionable findings."
+        );
+    }
+}