Address CLI PR review feedback

Author: ChristianPavilonis

.github/workflows/format.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
 
 permissions:
   contents: read
@@ -27,7 +26,7 @@ jobs:
           toolchain: ${{ steps.rust-version.outputs.rust-version }}
           target: wasm32-wasip1
           components: "clippy, rustfmt"
-          cache-shared-key: cargo-${{ runner.os }}
+          cache-shared-key: cargo-${{ runner.os }}-wasm
 
       - name: Run cargo fmt
         uses: actions-rust-lang/rustfmt@v1
@@ -52,7 +51,7 @@ jobs:
           toolchain: ${{ steps.rust-version-cli.outputs.rust-version }}
           target: wasm32-wasip1
           components: "clippy, rustfmt"
-          cache-shared-key: cargo-${{ runner.os }}
+          cache-shared-key: cargo-${{ runner.os }}-host
 
       - name: Retrieve Rust host target
         id: rust-host-target

.github/workflows/test.yml

@@ -7,7 +7,6 @@ on:
   push:
     branches: [main]
   pull_request:
-    branches: [main]
 
 jobs:
   test-rust:
@@ -35,7 +34,7 @@ jobs:
         with:
           toolchain: ${{ steps.rust-version.outputs.rust-version }}
           target: wasm32-wasip1
-          cache-shared-key: cargo-${{ runner.os }}
+          cache-shared-key: cargo-${{ runner.os }}-wasm
 
       - name: Cache Viceroy binary
         id: cache-viceroy
@@ -67,7 +66,7 @@ jobs:
         with:
           toolchain: ${{ steps.rust-version-cli.outputs.rust-version }}
           target: wasm32-wasip1
-          cache-shared-key: cargo-${{ runner.os }}
+          cache-shared-key: cargo-${{ runner.os }}-host
 
       - name: Retrieve Rust host target
         id: rust-host-target

Cargo.lock

@@ -53,6 +53,7 @@ build-print = "1.0.1"
 bytes = "1.11"
 chacha20poly1305 = "0.10"
 chrono = "0.4.44"
+chromiumoxide = "0.9.1"
 config = "0.15.19"
 cookie = "0.18.1"
 derive_more = { version = "2.0", features = ["display", "error"] }

Cargo.toml

@@ -12,7 +12,7 @@ harness = true
 [dev-dependencies]
 testcontainers = { version = "0.25", features = ["blocking"] }
 reqwest = { version = "0.12", features = ["blocking"] }
-scraper = "0.21"
+scraper = "0.24"
 log = "0.4.29"
 serde_json = "1.0.149"
 error-stack = "0.6"

crates/integration-tests/Cargo.lock

@@ -22,9 +22,9 @@ reqwest = { workspace = true }
 scraper = { workspace = true }
 serde = { workspace = true }
 futures = { workspace = true }
-tokio = { workspace = true, features = ["rt-multi-thread", "time"] }
+tokio = { workspace = true }
 which = { workspace = true }
-chromiumoxide = "0.9.1"
+chromiumoxide = { workspace = true }
 serde_json = { workspace = true }
 tempfile = { workspace = true }
 toml = { workspace = true }
@@ -34,4 +34,5 @@ keyring = { workspace = true }
 uuid = { workspace = true }
 
 [dev-dependencies]
+temp-env = { workspace = true }
 tempfile = { workspace = true }

crates/integration-tests/Cargo.toml

@@ -1,7 +1,6 @@
 mod analyzer;
 mod browser_collector;
 mod collector;
-mod http_collector;
 
 use std::collections::BTreeSet;
 use std::fs;
@@ -56,11 +55,6 @@ pub struct AuditOutputs {
     pub draft_config_toml: String,
 }
 
-#[cfg_attr(not(test), allow(dead_code))]
-pub fn analyze_html(target_url: &Url, html: &str) -> Result<AuditArtifact, Report<CliError>> {
-    analyzer::analyze_html(target_url, html)
-}
-
 pub fn perform_audit(target_url: &Url) -> Result<AuditOutputs, Report<CliError>> {
     let collected = browser_collector::collect_page_via_browser(target_url)?;
     build_audit_outputs(&collected)
@@ -228,7 +222,17 @@ mod tests {
             </html>
         "#;
 
-        let artifact = analyze_html(&url, html).expect("should analyze HTML");
+        let collected = collector::CollectedPage {
+            requested_url: url.to_string(),
+            final_url: url.to_string(),
+            page_title: None,
+            html: html.to_string(),
+            script_tags: Vec::new(),
+            network_requests: Vec::new(),
+            warnings: Vec::new(),
+        };
+
+        let artifact = analyze_collected_page(&collected).expect("should analyze HTML");
 
         assert_eq!(artifact.page_title.as_deref(), Some("Example Publisher"));
         assert_eq!(artifact.js_asset_count, 2, "should count script assets");