From 6956705802af0f316b08fca843f9c196f6a85baa Mon Sep 17 00:00:00 2001
From: Gabriel Peal <gabriel@openai.com>
Date: Tue, 2 Sep 2025 15:22:04 -0700
Subject: [PATCH] WIP

---
 codex-rs/apply-patch/src/lib.rs | 67 +++++++++++++++++++++++++++++----
 1 file changed, 59 insertions(+), 8 deletions(-)

diff --git a/codex-rs/apply-patch/src/lib.rs b/codex-rs/apply-patch/src/lib.rs
index 84cb91201f..e898f18516 100644
--- a/codex-rs/apply-patch/src/lib.rs
+++ b/codex-rs/apply-patch/src/lib.rs
@@ -92,14 +92,12 @@ pub fn maybe_parse_apply_patch(argv: &[String]) -> MaybeApplyPatch {
             Ok(source) => MaybeApplyPatch::Body(source),
             Err(e) => MaybeApplyPatch::PatchParseError(e),
         },
-        [bash, flag, script]
-            if bash == "bash"
-                && flag == "-lc"
-                && APPLY_PATCH_COMMANDS
-                    .iter()
-                    .any(|cmd| script.trim_start().starts_with(cmd)) =>
-        {
-            match extract_heredoc_body_from_apply_patch_command(script) {
+        [bash, flag, script] if bash == "bash" && flag == "-lc" => {
+            let trimmed_script = script.trim_start();
+            let Some(apply_patch_command) = strip_to_apply_patch(trimmed_script) else {
+                return MaybeApplyPatch::NotApplyPatch;
+            };
+            match extract_heredoc_body_from_apply_patch_command(apply_patch_command) {
                 Ok(body) => match parse_patch(&body) {
                     Ok(source) => MaybeApplyPatch::Body(source),
                     Err(e) => MaybeApplyPatch::PatchParseError(e),
@@ -111,6 +109,32 @@ pub fn maybe_parse_apply_patch(argv: &[String]) -> MaybeApplyPatch {
     }
 }
 
+fn strip_to_apply_patch(script: &str) -> Option<&str> {
+    let trimmed = script.trim_start();
+    for cmd in APPLY_PATCH_COMMANDS {
+        if trimmed.starts_with(cmd) {
+            return Some(trimmed);
+        }
+    }
+
+    for cmd in APPLY_PATCH_COMMANDS {
+        for (idx, _) in trimmed.match_indices(cmd) {
+            if has_command_boundary(trimmed, idx) {
+                return Some(trimmed[idx..].trim_start());
+            }
+        }
+    }
+    None
+}
+
+fn has_command_boundary(full: &str, index: usize) -> bool {
+    let preceding = full[..index].chars().rev().find(|c| !c.is_whitespace());
+    match preceding {
+        None => true,
+        Some(c) => matches!(c, ';' | '&' | '|' | '(' | ')' | '\n'),
+    }
+}
+
 #[derive(Debug, PartialEq)]
 pub enum ApplyPatchFileChange {
     Add {
@@ -782,6 +806,33 @@ PATCH"#,
         }
     }
 
+    #[test]
+    fn test_heredoc_with_cd_prefix() {
+        let args = strs_to_strings(&[
+            "bash",
+            "-lc",
+            r#"cd /tmp && apply_patch <<'PATCH'
+*** Begin Patch
+*** Add File: foo
++hi
+*** End Patch
+PATCH"#,
+        ]);
+
+        match maybe_parse_apply_patch(&args) {
+            MaybeApplyPatch::Body(ApplyPatchArgs { hunks, patch: _ }) => {
+                assert_eq!(
+                    hunks,
+                    vec![Hunk::AddFile {
+                        path: PathBuf::from("foo"),
+                        contents: "hi\n".to_string()
+                    }]
+                );
+            }
+            result => panic!("expected MaybeApplyPatch::Body got {result:?}"),
+        }
+    }
+
     #[test]
     fn test_heredoc_applypatch() {
         let args = strs_to_strings(&[