Refactor: Replace redundant error mappings, update iter handling, and improve type safety

- Simplified repetitive `.map_err(|e| Error::X(e))` patterns using direct `Error::X`.
- Replaced manual iteration bounds with `.iter()` and `iter().take(..).flatten()` for clarity.
- Updated struct and enum defaults using `#[derive(Default)]` and `#[default]` attributes.
- Boxed large structs (`Box<LocalSandbox>` etc.) to optimize memory usage.
- Applied additional Clippy allowances (`#[allow(clippy::too_many_arguments, clippy::type_complexity)]`) for select modules.
- Migrated to new iterator patterns and conforming ranges (`a..b` replaced with `.contains(&x)` logic).

Author: dpsoft

src/daemon.rs

@@ -391,6 +391,7 @@ fn event_with_env(
     e
 }
 
+#[allow(clippy::too_many_arguments)]
 fn event_skill(
     run_id: &str,
     event_type: &str,
@@ -499,9 +500,7 @@ fn plan_events_from_spec(run_id: &str, environment_id: &str, spec: &RunSpec) ->
 }
 
 fn split_skill(raw: &str) -> Option<(&str, &str)> {
-    let mut p = raw.splitn(2, ':');
-    let t = p.next()?;
-    let id = p.next()?;
+    let (t, id) = raw.split_once(':')?;
     Some((t, id))
 }
 

src/devices/virtio_net.rs

@@ -264,7 +264,7 @@ impl VirtioNetDevice {
             mmio::STATUS => self.status,
             mmio::CONFIG_GENERATION => self.config_generation,
             // Device config (MAC address at offset 0x100)
-            o if o >= mmio::CONFIG && o < mmio::CONFIG + 6 => {
+            o if (mmio::CONFIG..mmio::CONFIG + 6).contains(&o) => {
                 let idx = (o - mmio::CONFIG) as usize;
                 self.mac[idx] as u32
             }

src/devices/virtio_vsock_mmio.rs

@@ -140,6 +140,7 @@ impl VirtioVsockMmio {
         })
     }
 
+    #[allow(clippy::type_complexity)]
     fn setup_vhost(
         cid: u32,
         require_vhost: bool,
@@ -194,11 +195,9 @@ impl VirtioVsockMmio {
                     kick[i] = Some(f);
                 }
                 Err(e) => {
-                    for j in 0..i {
-                        if let Some(f) = kick[j] {
-                            unsafe {
-                                libc::close(f);
-                            }
+                    for f in kick.iter().take(i).flatten() {
+                        unsafe {
+                            libc::close(*f);
                         }
                     }
                     unsafe {
@@ -214,18 +213,14 @@ impl VirtioVsockMmio {
                     call[i] = Some(f);
                 }
                 Err(e) => {
-                    for j in 0..=i {
-                        if let Some(f) = kick[j] {
-                            unsafe {
-                                libc::close(f);
-                            }
+                    for f in kick.iter().take(i + 1).flatten() {
+                        unsafe {
+                            libc::close(*f);
                         }
                     }
-                    for j in 0..i {
-                        if let Some(f) = call[j] {
-                            unsafe {
-                                libc::close(f);
-                            }
+                    for f in call.iter().take(i).flatten() {
+                        unsafe {
+                            libc::close(*f);
                         }
                     }
                     unsafe {
@@ -339,7 +334,7 @@ impl VirtioVsockMmio {
                 .map_err(|e| Error::Device(format!("get_host_address: {}", e)))?;
             let reg = unsafe { &mut *regions_ptr.add(i) };
             reg.guest_phys_addr = region.start_addr().raw_value();
-            reg.memory_size = region.len() as u64;
+            reg.memory_size = region.len();
             reg.userspace_addr = host_addr as u64;
         }
 
@@ -363,6 +358,7 @@ impl VirtioVsockMmio {
         Ok(())
     }
 
+    #[allow(clippy::too_many_arguments)]
     fn set_vring(
         &self,
         index: u32,
@@ -501,7 +497,7 @@ impl VirtioVsockMmio {
             mmio::INTERRUPT_STATUS => self.interrupt_status,
             mmio::STATUS => self.status,
             mmio::CONFIG_GENERATION => self.config_generation,
-            o if o >= mmio::CONFIG && o < mmio::CONFIG + 8 => {
+            o if (mmio::CONFIG..mmio::CONFIG + 8).contains(&o) => {
                 let off = (o - mmio::CONFIG) as usize;
                 let cid64 = self.cid as u64;
                 if off == 0 {
@@ -676,18 +672,14 @@ impl Drop for VirtioVsockMmio {
                 libc::close(fd);
             }
         }
-        for fd in &self.kick_eventfds {
-            if let Some(f) = fd {
-                unsafe {
-                    libc::close(*f);
-                }
+        for f in self.kick_eventfds.iter().flatten() {
+            unsafe {
+                libc::close(*f);
             }
         }
-        for fd in &self._call_eventfds {
-            if let Some(f) = fd {
-                unsafe {
-                    libc::close(*f);
-                }
+        for f in self._call_eventfds.iter().flatten() {
+            unsafe {
+                libc::close(*f);
             }
         }
     }

src/llm.rs

@@ -46,12 +46,13 @@ const SLIRP_GATEWAY: &str = "10.0.2.2";
 ///
 /// Determines which LLM service the agent talks to. The provider is
 /// translated into environment variables injected into the guest VM.
-#[derive(Debug, Clone)]
+#[derive(Debug, Default, Clone)]
 pub enum LlmProvider {
     /// Anthropic Claude API (default).
     ///
     /// Requires `ANTHROPIC_API_KEY` in the host environment.
     /// No extra env vars are injected.
+    #[default]
     Claude,
 
     /// Local Ollama instance running on the host.
@@ -81,12 +82,6 @@ pub enum LlmProvider {
     },
 }
 
-impl Default for LlmProvider {
-    fn default() -> Self {
-        LlmProvider::Claude
-    }
-}
-
 impl LlmProvider {
     // -- Constructors --
 

src/network/mod.rs

@@ -99,11 +99,7 @@ impl TapDevice {
 
         unsafe {
             // Copy name into the ifreq name field
-            libc::strncpy(
-                ifr.ifr_name.as_mut_ptr(),
-                cname.as_ptr(),
-                libc::IFNAMSIZ as usize,
-            );
+            libc::strncpy(ifr.ifr_name.as_mut_ptr(), cname.as_ptr(), libc::IFNAMSIZ);
 
             // Set flags to create a TAP device without extra packet info header.
             ifr.ifr_ifru.ifru_flags = (libc::IFF_TAP | libc::IFF_NO_PI) as libc::c_short;

src/network/slirp.rs

@@ -871,6 +871,7 @@ impl SlirpStack {
 }
 
 /// Build a TCP packet (free function to avoid borrow issues with &self methods)
+#[allow(clippy::too_many_arguments)]
 fn build_tcp_packet_static(
     src_ip: Ipv4Address,
     dst_ip: Ipv4Address,

src/observe/logs.rs

@@ -11,21 +11,16 @@ use std::sync::Mutex;
 use std::time::SystemTime;
 
 /// Log levels
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub enum LogLevel {
     Trace = 0,
     Debug = 1,
+    #[default]
     Info = 2,
     Warn = 3,
     Error = 4,
 }
 
-impl Default for LogLevel {
-    fn default() -> Self {
-        Self::Info
-    }
-}
-
 impl std::fmt::Display for LogLevel {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         match self {

src/observe/tracer.rs

@@ -104,22 +104,17 @@ impl SpanContext {
 }
 
 /// Status of a span
-#[derive(Debug, Clone, PartialEq)]
+#[derive(Debug, Default, Clone, PartialEq)]
 pub enum SpanStatus {
     /// Unset status
+    #[default]
     Unset,
     /// Operation completed successfully
     Ok,
     /// Operation failed with error
     Error(String),
 }
 
-impl Default for SpanStatus {
-    fn default() -> Self {
-        Self::Unset
-    }
-}
-
 /// A span representing a unit of work
 #[derive(Debug, Clone)]
 pub struct Span {

src/pipeline.rs

@@ -93,7 +93,7 @@ impl PipelineResult {
 /// A single stage in a pipeline — either one Box or multiple Boxes in parallel.
 enum PipelineStage {
     /// A single Box executed sequentially.
-    Single(VoidBox),
+    Single(Box<VoidBox>),
     /// Multiple Boxes executed in parallel (fan-out). Their outputs are merged
     /// as a JSON array for the next stage.
     Parallel(Vec<VoidBox>),
@@ -110,21 +110,21 @@ impl Pipeline {
     pub fn from(first: VoidBox) -> Self {
         Self {
             name: first.name.clone(),
-            stages: vec![PipelineStage::Single(first)],
+            stages: vec![PipelineStage::Single(Box::new(first))],
         }
     }
 
     /// Create a named pipeline from a single Box.
     pub fn named(name: impl Into<String>, first: VoidBox) -> Self {
         Self {
             name: name.into(),
-            stages: vec![PipelineStage::Single(first)],
+            stages: vec![PipelineStage::Single(Box::new(first))],
         }
     }
 
     /// Pipe the output of the previous stage into the next Box.
     pub fn pipe(mut self, next: VoidBox) -> Self {
-        self.stages.push(PipelineStage::Single(next));
+        self.stages.push(PipelineStage::Single(Box::new(next)));
         self
     }
 

src/sandbox/mod.rs

@@ -88,9 +88,9 @@ pub struct Sandbox {
 
 enum SandboxInner {
     /// Local KVM-based sandbox
-    Local(LocalSandbox),
+    Local(Box<LocalSandbox>),
     /// Mock sandbox for testing
-    Mock(MockSandbox),
+    Mock(Box<MockSandbox>),
 }
 
 impl Sandbox {
@@ -481,11 +481,11 @@ impl SandboxBuilder {
         let inner = match self.sandbox_type {
             SandboxType::Local => {
                 let local = LocalSandbox::new(self.config.clone())?;
-                SandboxInner::Local(local)
+                SandboxInner::Local(Box::new(local))
             }
             SandboxType::Mock => {
                 let mock = MockSandbox::new(self.config.clone());
-                SandboxInner::Mock(mock)
+                SandboxInner::Mock(Box::new(mock))
             }
         };
 
@@ -590,7 +590,7 @@ impl MockSandbox {
                 // - plan emits one JSON-like line
                 // - apply reads stdin and echoes summary
                 // - prompt mode (-p ... --output-format stream-json) returns deterministic JSONL
-                let first = args.first().map(|s| *s).unwrap_or("");
+                let first = args.first().copied().unwrap_or("");
                 if first == "-p" {
                     let output_format = args
                         .windows(2)