chore(scanner): resolve conflicts with main

crates/scanner/src/runtime_config.rs

@@ -893,7 +893,6 @@ mod tests {
         SCANNER_CACHE_SAVE_TIMEOUT, SCANNER_CYCLE, SCANNER_CYCLE_MAX_DIRECTORIES, SCANNER_CYCLE_MAX_DURATION,
         SCANNER_CYCLE_MAX_OBJECTS, SCANNER_DELAY, SCANNER_IDLE_MODE, SCANNER_SPEED, SCANNER_SUB_SYS, ScannerSpeed,
     };
-    use serial_test::serial;
     use std::collections::HashMap;
     use std::time::Duration;
     use temp_env::{with_var, with_var_unset};
@@ -941,7 +940,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_uses_persisted_values_when_env_is_unset() {
         let config = server_config_with_scanner(&[
             (SCANNER_SPEED, "slow"),
@@ -969,7 +967,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_unset_budget_uses_safe_default_but_explicit_zero_is_unbounded() {
         let config = server_config_with_scanner(&[]);
         with_var_unset(ENV_SCANNER_CYCLE_MAX_DURATION_SECS, || {
@@ -987,7 +984,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn cycle_budget_invalid_or_overflow_config_is_rejected() {
         with_var(ENV_SCANNER_CYCLE_MAX_DURATION_SECS, Some("invalid"), || {
             let error = lookup_scanner_runtime_config(None).expect_err("invalid duration env must be rejected");
@@ -1006,7 +1002,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_normalizes_persisted_default_speed() {
         let config = server_config_with_scanner(&[(SCANNER_SPEED, "default")]);
 
@@ -1022,7 +1017,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_prefers_env_over_persisted_config() {
         let config = server_config_with_scanner(&[(SCANNER_SPEED, "slowest"), (SCANNER_CYCLE, "600")]);
 
@@ -1039,7 +1033,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_prefers_heal_bitrot_cycle_over_scanner_compat_config() {
         let config = server_config_with_scanner_and_heal(&[(SCANNER_BITROT_CYCLE, "3600")], &[(HEAL_BITROT_CYCLE, "off")]);
 
@@ -1052,7 +1045,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_marks_scanner_bitrot_cycle_as_compat_source() {
         let config = server_config_with_scanner(&[(SCANNER_BITROT_CYCLE, "3600")]);
 
@@ -1069,7 +1061,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_normalizes_persisted_default_bitrot_cycles() {
         let default_cycle = DEFAULT_HEAL_BITROT_CYCLE_SECS.to_string();
         for config in [
@@ -1094,7 +1085,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_validation_rejects_invalid_persisted_speed_with_env_override() {
         let config = server_config_with_scanner(&[(SCANNER_SPEED, "warp")]);
 
@@ -1128,7 +1118,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_uses_derived_delay_for_excessive_env_override() {
         let config = server_config_with_scanner(&[(SCANNER_SPEED, "slow")]);
 
@@ -1149,7 +1138,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_status_reports_value_sources() {
         let config = server_config_with_scanner(&[(SCANNER_CYCLE_MAX_OBJECTS, "100"), (SCANNER_CACHE_SAVE_TIMEOUT, "5")]);
 
@@ -1170,7 +1158,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn applied_runtime_config_is_the_authoritative_scheduler_state() {
         let config = server_config_with_scanner(&[(SCANNER_CYCLE, "321")]);
 
@@ -1187,7 +1174,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_status_reports_persisted_pacing_overrides() {
         let config = server_config_with_scanner(&[("delay", "3.5"), ("max_wait", "7")]);
 
@@ -1209,7 +1195,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_status_prefers_env_pacing_overrides() {
         let config = server_config_with_scanner(&[("delay", "3.5"), ("max_wait", "7")]);
 
@@ -1231,7 +1216,6 @@ mod tests {
     }
 
     #[test]
-    #[serial]
     fn scanner_runtime_config_status_preserves_subsecond_max_wait() {
         let config = server_config_with_scanner(&[(SCANNER_SPEED, "fast")]);