Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

crates/vm/src/stdlib/os.rs (1)

1414-1468: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Extract the shared rename/replace path handling.

rename and replace now duplicate conversion, dir-fd extraction, and OSError construction; only the function name and host operation differ.

♻️ Proposed refactor

+    fn rename_or_replace<'fd>(
+        function: &'static str,
+        args: RenameArgs<'fd>,
+        vm: &VirtualMachine,
+        op: impl FnOnce(
+            &OsPath,
+            Option<crt_fd::Borrowed<'fd>>,
+            &OsPath,
+            Option<crt_fd::Borrowed<'fd>>,
+        ) -> io::Result<()>,
+    ) -> PyResult<()> {
+        let src = PathConverter::new()
+            .function(function)
+            .argument("src")
+            .try_path(args.src, vm)?;
+        let dst = PathConverter::new()
+            .function(function)
+            .argument("dst")
+            .try_path(args.dst, vm)?;
+
+        #[cfg(any(unix, target_os = "wasi"))]
+        let src_dir_fd = args.src_dir_fd.get_opt();
+        #[cfg(not(any(unix, target_os = "wasi")))]
+        let src_dir_fd = None;
+
+        #[cfg(any(unix, target_os = "wasi"))]
+        let dst_dir_fd = args.dst_dir_fd.get_opt();
+        #[cfg(not(any(unix, target_os = "wasi")))]
+        let dst_dir_fd = None;
+
+        op(&src, src_dir_fd, &dst, dst_dir_fd).map_err(|err| {
+            let builder = err.to_os_error_builder(vm);
+            let builder = builder.filename(src.filename(vm));
+            let builder = builder.filename2(dst.filename(vm));
+            builder.build(vm).upcast()
+        })
+    }
+
     #[pyfunction]
     fn rename(args: RenameArgs<'_>, vm: &VirtualMachine) -> PyResult<()> {
-        let src = PathConverter::new()
-            .function("rename")
-            .argument("src")
-            .try_path(args.src, vm)?;
-        let dst = PathConverter::new()
-            .function("rename")
-            .argument("dst")
-            .try_path(args.dst, vm)?;
-
-        #[cfg(any(unix, target_os = "wasi"))]
-        let src_dir_fd = args.src_dir_fd.get_opt();
-        #[cfg(not(any(unix, target_os = "wasi")))]
-        let src_dir_fd = None;
-
-        #[cfg(any(unix, target_os = "wasi"))]
-        let dst_dir_fd = args.dst_dir_fd.get_opt();
-        #[cfg(not(any(unix, target_os = "wasi")))]
-        let dst_dir_fd = None;
-
-        crate::host_env::posix::rename(&src, src_dir_fd, &dst, dst_dir_fd).map_err(|err| {
-            let builder = err.to_os_error_builder(vm);
-            let builder = builder.filename(src.filename(vm));
-            let builder = builder.filename2(dst.filename(vm));
-            builder.build(vm).upcast()
-        })
+        rename_or_replace("rename", args, vm, crate::host_env::posix::rename)
     }
 
     #[pyfunction]
     fn replace(args: RenameArgs<'_>, vm: &VirtualMachine) -> PyResult<()> {
-        let src = PathConverter::new()
-            .function("replace")
-            .argument("src")
-            .try_path(args.src, vm)?;
-        let dst = PathConverter::new()
-            .function("replace")
-            .argument("dst")
-            .try_path(args.dst, vm)?;
-
-        #[cfg(any(unix, target_os = "wasi"))]
-        let src_dir_fd = args.src_dir_fd.get_opt();
-        #[cfg(not(any(unix, target_os = "wasi")))]
-        let src_dir_fd = None;
-
-        #[cfg(any(unix, target_os = "wasi"))]
-        let dst_dir_fd = args.dst_dir_fd.get_opt();
-        #[cfg(not(any(unix, target_os = "wasi")))]
-        let dst_dir_fd = None;
-
-        crate::host_env::posix::replace(&src, src_dir_fd, &dst, dst_dir_fd).map_err(|err| {
-            let builder = err.to_os_error_builder(vm);
-            let builder = builder.filename(src.filename(vm));
-            let builder = builder.filename2(dst.filename(vm));
-            builder.build(vm).upcast()
-        })
+        rename_or_replace("replace", args, vm, crate::host_env::posix::replace)
     }

As per coding guidelines, “When branches differ only in a value but share common logic, extract the differing value first, then call the common logic once to avoid duplicate code.”

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@crates/vm/src/stdlib/os.rs` around lines 1414 - 1468, The rename and replace
stdlib functions duplicate the same path conversion, dir-fd extraction, and
OSError mapping logic in os.rs; extract the shared flow into a helper used by
both `rename` and `replace`, with only the operation-specific parts differing.
Keep `PathConverter`, `RenameArgs`, and the `crate::host_env::posix::{rename,
replace}` calls as the unique inputs, and centralize the error builder setup so
filename handling and `to_os_error_builder` are not repeated.

Source: Coding guidelines

crates/host_env/src/posix_unix_like.rs (1)

12-19: 📐 Maintainability & Code Quality | 🔵 Trivial | 💤 Low value

Consider using impl AsRef<Path> for consistency with rename/replace.

make_dir takes path: &impl AsRef<Path> while rename and replace use impl AsRef<Path>. Both forms accept the downstream &PathBuf argument, but impl AsRef<Path> is strictly more general and would make the file's API style uniform.

♻️ Proposed refactor

 pub fn make_dir(
     dir_fd: Option<crt_fd::Borrowed<'_>>,
-    path: &impl AsRef<Path>,
+    path: impl AsRef<Path>,
     mode: fs::RawMode,
 ) -> io::Result<()> {
     let dir_fd = dir_fd.as_ref().map_or(fs::CWD, AsFd::as_fd);
     fs::mkdirat(dir_fd, path.as_ref(), mode.into()).map_err(Into::into)
 }

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@crates/host_env/src/posix_unix_like.rs` around lines 12 - 19, Update make_dir
in posix_unix_like.rs to take path as impl AsRef<Path> rather than &impl
AsRef<Path>, matching the API style used by rename and replace. Keep the
existing mkdirat call and path.as_ref() usage the same, and adjust any local
call sites only if needed so the signature remains consistent and more general.