Merge branch 'codex/hosted-review-phase-4' into codex/hosted-review-phase-5

Signed-off-by: Timothy Wayne Gregg <Timothy.Gregg@complete.tech>

Author: CompleteDotTech

.github/workflows/rust-ci.yml

@@ -0,0 +1,64 @@
+name: Rust CI
+
+on:
+  pull_request:
+    paths:
+      - 'src-rust/**'
+      - '.github/workflows/rust-ci.yml'
+  workflow_dispatch:
+
+concurrency:
+  group: rust-ci-${{ github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  rust:
+    name: Format, lint, and test
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          persist-credentials: false
+
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          components: rustfmt, clippy
+
+      - name: Install system dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libasound2-dev pkg-config
+
+      - name: Cache cargo registry and build output
+        uses: actions/cache@v5
+        with:
+          path: |
+            ~/.cargo/registry
+            ~/.cargo/git
+            src-rust/target
+          key: rust-ci-cargo-${{ runner.os }}-${{ hashFiles('src-rust/Cargo.lock') }}
+          restore-keys: rust-ci-cargo-${{ runner.os }}-
+
+      - name: Check formatting
+        working-directory: src-rust
+        run: cargo fmt --all -- --check
+
+      - name: Check workspace
+        working-directory: src-rust
+        run: cargo check --workspace --locked
+
+      - name: Run Clippy
+        working-directory: src-rust
+        run: cargo clippy --workspace --all-targets --locked -- -D warnings
+
+      - name: Run tests
+        working-directory: src-rust
+        run: cargo test --workspace --locked --quiet

src-rust/crates/core/src/claudemd.rs

@@ -676,8 +676,10 @@ mod tests {
             .unwrap_or_else(|err| err.into_inner());
         let original_test_home = std::env::var("COVEN_CODE_TEST_HOME").ok();
         let original_home = std::env::var("HOME").ok();
+        let original_userprofile = std::env::var("USERPROFILE").ok();
         std::env::set_var("COVEN_CODE_TEST_HOME", home.path());
         std::env::set_var("HOME", home.path());
+        std::env::set_var("USERPROFILE", home.path());
 
         let files =
             load_all_memory_files_with_options(project.path(), &MemoryLoadOptions::hosted_review());
@@ -690,6 +692,10 @@ mod tests {
             Some(value) => std::env::set_var("HOME", value),
             None => std::env::remove_var("HOME"),
         }
+        match original_userprofile {
+            Some(value) => std::env::set_var("USERPROFILE", value),
+            None => std::env::remove_var("USERPROFILE"),
+        }
 
         assert!(files.iter().all(|file| file.scope != MemoryScope::User));
         assert!(files.iter().any(|file| {
@@ -861,8 +867,10 @@ mod tests {
             .unwrap_or_else(|err| err.into_inner());
         let original_test_home = std::env::var("COVEN_CODE_TEST_HOME").ok();
         let original_home = std::env::var("HOME").ok();
+        let original_userprofile = std::env::var("USERPROFILE").ok();
         std::env::set_var("COVEN_CODE_TEST_HOME", home.path());
         std::env::set_var("HOME", home.path());
+        std::env::set_var("USERPROFILE", home.path());
 
         let files = load_all_memory_files_with_options(project.path(), &MemoryLoadOptions::local());
 
@@ -874,6 +882,10 @@ mod tests {
             Some(value) => std::env::set_var("HOME", value),
             None => std::env::remove_var("HOME"),
         }
+        match original_userprofile {
+            Some(value) => std::env::set_var("USERPROFILE", value),
+            None => std::env::remove_var("USERPROFILE"),
+        }
 
         assert!(files
             .iter()

src-rust/crates/tui/src/app.rs

@@ -7420,22 +7420,22 @@ role = "Research"
 
     #[test]
     fn windows_system_root_prefers_absolute_system_root() {
-        let root = windows_system_root_from_env(
-            Some(std::ffi::OsString::from(r"C:\Windows")),
-            Some(std::ffi::OsString::from(r"D:\WinDir")),
-        );
+        let system_root = std::env::temp_dir().join("windows-root").into_os_string();
+        let windir = std::env::temp_dir().join("windir").into_os_string();
+        let root = windows_system_root_from_env(Some(system_root.clone()), Some(windir));
 
-        assert_eq!(root, std::ffi::OsString::from(r"C:\Windows"));
+        assert_eq!(root, system_root);
     }
 
     #[test]
     fn windows_system_root_falls_back_to_absolute_windir() {
+        let windir = std::env::temp_dir().join("windir").into_os_string();
         let root = windows_system_root_from_env(
             Some(std::ffi::OsString::from("relative-system-root")),
-            Some(std::ffi::OsString::from(r"D:\WinDir")),
+            Some(windir.clone()),
         );
 
-        assert_eq!(root, std::ffi::OsString::from(r"D:\WinDir"));
+        assert_eq!(root, windir);
     }
 
     #[test]

src-rust/crates/tui/src/image_paste.rs

@@ -306,10 +306,11 @@ fn try_save_linux_image(path: &PathBuf) -> bool {
             .args(["-selection", "clipboard", "-t", "image/png", "-o"])
             .output()
         {
-            if out.status.success() && !out.stdout.is_empty() {
-                if std::fs::write(path, &out.stdout).is_ok() {
-                    return true;
-                }
+            if out.status.success()
+                && !out.stdout.is_empty()
+                && std::fs::write(path, &out.stdout).is_ok()
+            {
+                return true;
             }
         }
     }
@@ -320,10 +321,11 @@ fn try_save_linux_image(path: &PathBuf) -> bool {
             .args(["--type", "image/png"])
             .output()
         {
-            if out.status.success() && !out.stdout.is_empty() {
-                if std::fs::write(path, &out.stdout).is_ok() {
-                    return true;
-                }
+            if out.status.success()
+                && !out.stdout.is_empty()
+                && std::fs::write(path, &out.stdout).is_ok()
+            {
+                return true;
             }
         }
     }
@@ -427,14 +429,13 @@ fn write_text_windows_w(text: &str) -> bool {
     use std::io::Write;
     use std::process::Stdio;
     // PowerShell Set-Clipboard reads from stdin via pipe
-    let script = "[Console]::InputEncoding = [System.Text.Encoding]::UTF8; $input | Set-Clipboard"
-        .to_string();
+    let script = "[Console]::InputEncoding = [System.Text.Encoding]::UTF8; $input | Set-Clipboard";
     let powershell = match trusted_windows_powershell() {
         Some(path) => path,
         None => return false,
     };
     let mut child = match Command::new(powershell)
-        .args(["-NoProfile", "-Command", &script])
+        .args(["-NoProfile", "-Command", script])
         .stdin(Stdio::piped())
         .spawn()
     {