Merge branch 'main' into feat/new-exec-merge-1.3

Author: jonathanpwang

crates/cli/tests/app_e2e.rs

@@ -1,6 +1,13 @@
-use std::{env, fs::OpenOptions, io::Write, path::Path, process::Command, sync::OnceLock};
+use std::{
+    env,
+    fs::{self, read_to_string},
+    path::Path,
+    process::Command,
+    sync::OnceLock,
+};
 
 use eyre::Result;
+use itertools::Itertools;
 use tempfile::tempdir;
 
 fn install_cli() {
@@ -134,6 +141,7 @@ fn test_cli_init_build() -> Result<()> {
     let manifest_path = temp_path.join("Cargo.toml");
     install_cli();
 
+    // Cargo will not respect patches if run within a workspace
     run_cmd(
         "cargo",
         &[
@@ -145,7 +153,7 @@ fn test_cli_init_build() -> Result<()> {
         ],
     )?;
     if matches!(env::var("USE_LOCAL_OPENVM"), Ok(x) if x == "1") {
-        append_patch_to_cargo_toml(&manifest_path)?;
+        replace_with_local_openvm(&manifest_path)?;
     }
 
     run_cmd(
@@ -185,25 +193,30 @@ fn run_cmd(program: &str, args: &[&str]) -> Result<()> {
     Ok(())
 }
 
-fn append_patch_to_cargo_toml(file_path: impl AsRef<Path>) -> Result<()> {
+fn replace_with_local_openvm(file_path: impl AsRef<Path>) -> Result<()> {
     const MANIFEST_DIR: &str = env!("CARGO_MANIFEST_DIR");
     let openvm_path = Path::new(MANIFEST_DIR)
         .parent()
         .unwrap()
         .join("toolchain")
         .join("openvm");
-    let mut file = OpenOptions::new()
-        .create(false)
-        .append(true)
-        .open(file_path)?;
-
-    // Add a newline first to ensure proper formatting
-    writeln!(file)?;
-    writeln!(
-        file,
-        r#"[patch."https://github.com/openvm-org/openvm.git"]"#
-    )?;
-    writeln!(file, r#"openvm = {{ path = "{}" }}"#, openvm_path.display())?;
+    let content = read_to_string(&file_path)?;
+    let lines = content.lines().collect::<Vec<_>>();
+    let new_content = lines
+        .iter()
+        .map(|line| {
+            if line.starts_with("openvm = { git = \"https://github.com/openvm-org/openvm.git\"") {
+                format!(
+                    r#"openvm = {{ path = "{}", features = ["std"] }}"#,
+                    openvm_path.display()
+                )
+            } else {
+                line.to_string()
+            }
+        })
+        .join("\n");
+
+    fs::write(file_path, new_content)?;
 
     Ok(())
 }