diff --git a/Cargo.lock b/Cargo.lock
index 0436e403b21..9c567a71b40 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5380,29 +5380,6 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-downcast"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dac026d43bcca6e7ce1c0956ba68f59edf6403e8e930a5d891be72c31a44340"
-dependencies = [
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "wasm-bindgen-downcast-macros",
-]
-
-[[package]]
-name = "wasm-bindgen-downcast-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5020cfa87c7cecefef118055d44e3c1fc122c7ec25701d528ee458a0b45f38f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "wasm-bindgen-futures"
 version = "0.4.37"
@@ -5570,7 +5547,6 @@ dependencies = [
  "thiserror",
  "tracing",
  "wasm-bindgen",
- "wasm-bindgen-downcast",
  "wasm-bindgen-test",
  "wasmer-compiler",
  "wasmer-compiler-cranelift",
diff --git a/Cargo.toml b/Cargo.toml
index 549203bfbf1..ce8c16815c3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -280,7 +280,7 @@ required-features = ["backend"]
 [[example]]
 name = "errors"
 path = "examples/errors.rs"
-required-features = ["sys"]
+required-features = ["backend"]
 
 [[example]]
 name = "imported-function-env"
diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
index 8fa8446bfb8..bf55f26c981 100644
--- a/lib/api/Cargo.toml
+++ b/lib/api/Cargo.toml
@@ -52,7 +52,6 @@ wasmer-compiler-llvm = { path = "../compiler-llvm", version = "=4.2.3", optional
 wasm-bindgen = { version = "0.2.74", optional = true }
 js-sys = { version = "0.3.51", optional = true }
 rusty_jsc = { version = "0.1.0", optional = true }
-# rusty_jsc = { path="../../../rusty_jsc", optional = true }
 wasmparser = { version = "0.83", default-features = false, optional = true }
 
 # - Mandatory dependencies for `sys` on Windows.
@@ -70,9 +69,7 @@ macro-wasmer-universal-test = { version = "4.2.3", path = "./macro-wasmer-univer
 # - Mandatory dependencies for `js`.
 wasmer-types = { path = "../types", version = "=4.2.3", default-features = false, features = ["std"] }
 wasm-bindgen = "0.2.74"
-wasm-bindgen-downcast = { version = "0.1.1" }
 js-sys = "0.3.51"
-#web-sys = { version = "0.3.51", features = [ "console" ] }
 wasmer-derive = { path = "../derive", version = "=4.2.3" }
 # - Optional dependencies for `js`.
 wasmparser = { version = "0.95", default-features = false, optional = true }
diff --git a/lib/api/src/externals/memory.rs b/lib/api/src/externals/memory.rs
index 2fbbd0a35fa..8f2e18fa21d 100644
--- a/lib/api/src/externals/memory.rs
+++ b/lib/api/src/externals/memory.rs
@@ -36,7 +36,7 @@ impl Memory {
     /// Creates a new host `Memory` from the provided [`MemoryType`].
     ///
     /// This function will construct the `Memory` using the store
-    /// [`BaseTunables`][crate::sys::BaseTunables].
+    /// `BaseTunables`.
     ///
     /// # Example
     ///
diff --git a/lib/api/src/externals/table.rs b/lib/api/src/externals/table.rs
index 3be94a342cf..49eb38924f8 100644
--- a/lib/api/src/externals/table.rs
+++ b/lib/api/src/externals/table.rs
@@ -30,8 +30,7 @@ impl Table {
     ///
     /// All the elements in the table will be set to the `init` value.
     ///
-    /// This function will construct the `Table` using the store
-    /// [`BaseTunables`][crate::sys::BaseTunables].
+    /// This function will construct the `Table` using the store `BaseTunables`.
     pub fn new(
         store: &mut impl AsStoreMut,
         ty: TableType,
diff --git a/lib/api/src/js/as_js.rs b/lib/api/src/js/as_js.rs
index 8aca92aa918..5068c8b1270 100644
--- a/lib/api/src/js/as_js.rs
+++ b/lib/api/src/js/as_js.rs
@@ -232,13 +232,10 @@ impl AsJs for Memory {
         memory_type: &Self::DefinitionType,
         value: &JsValue,
     ) -> Result<Self, JsError> {
-        if value.is_instance_of::<JsMemory>() {
+        if let Some(memory) = value.dyn_ref::<JsMemory>() {
             Ok(Memory::from_vm_extern(
                 store,
-                VMMemory::new(
-                    value.clone().unchecked_into::<JsMemory>(),
-                    memory_type.clone(),
-                ),
+                VMMemory::new(memory.clone(), memory_type.clone()),
             ))
         } else {
             Err(JsError::new(&format!(
diff --git a/lib/api/src/js/externals/memory.rs b/lib/api/src/js/externals/memory.rs
index 30c95ddcb6a..a6aed3deb54 100644
--- a/lib/api/src/js/externals/memory.rs
+++ b/lib/api/src/js/externals/memory.rs
@@ -88,8 +88,16 @@ impl Memory {
             js_sys::Reflect::set(&descriptor, &"shared".into(), &ty.shared.into()).unwrap();
         }
 
-        let js_memory = js_sys::WebAssembly::Memory::new(&descriptor)
-            .map_err(|_e| MemoryError::Generic("Error while creating the memory".to_owned()))?;
+        let js_memory = js_sys::WebAssembly::Memory::new(&descriptor).map_err(|e| {
+            let error_message = if let Some(s) = e.as_string() {
+                s
+            } else if let Some(obj) = e.dyn_ref::<js_sys::Object>() {
+                obj.to_string().into()
+            } else {
+                "Error while creating the memory".to_string()
+            };
+            MemoryError::Generic(error_message)
+        })?;
 
         Ok(js_memory)
     }
@@ -164,6 +172,18 @@ impl std::cmp::PartialEq for Memory {
     }
 }
 
+impl From<Memory> for crate::Memory {
+    fn from(value: Memory) -> Self {
+        crate::Memory(value)
+    }
+}
+
+impl From<crate::Memory> for Memory {
+    fn from(value: crate::Memory) -> Self {
+        value.0
+    }
+}
+
 /// Underlying buffer for a memory.
 #[derive(Copy, Clone, Debug)]
 pub(crate) struct MemoryBuffer<'a> {
diff --git a/lib/api/src/js/js_handle.rs b/lib/api/src/js/js_handle.rs
index 9a826a74823..043cc1eb289 100644
--- a/lib/api/src/js/js_handle.rs
+++ b/lib/api/src/js/js_handle.rs
@@ -1,5 +1,9 @@
-use std::ops::{Deref, DerefMut};
+use std::{
+    ops::{Deref, DerefMut},
+    sync::atomic::{AtomicU32, Ordering},
+};
 
+use js_sys::Symbol;
 use wasm_bindgen::JsValue;
 
 use self::integrity_check::IntegrityCheck;
@@ -101,14 +105,9 @@ mod integrity_check {
 
 #[cfg(debug_assertions)]
 mod integrity_check {
-    use std::{
-        fmt::Write as _,
-        panic::Location,
-        sync::atomic::{AtomicU32, Ordering},
-    };
+    use std::{fmt::Write as _, panic::Location};
 
-    use js_sys::{JsString, Symbol};
-    use wasm_bindgen::JsValue;
+    use js_sys::JsString;
 
     #[derive(Debug, Clone, PartialEq)]
     pub(crate) struct IntegrityCheck {
@@ -122,7 +121,7 @@ mod integrity_check {
         #[track_caller]
         pub(crate) fn new(type_name: &'static str) -> Self {
             IntegrityCheck {
-                original_thread: current_thread_id(),
+                original_thread: super::current_thread_id(),
                 created: Location::caller(),
                 type_name,
                 backtrace: record_backtrace(),
@@ -131,7 +130,7 @@ mod integrity_check {
 
         #[track_caller]
         pub(crate) fn check(&self) {
-            let current_thread = current_thread_id();
+            let current_thread = super::current_thread_id();
 
             if current_thread != self.original_thread {
                 let IntegrityCheck {
@@ -177,35 +176,6 @@ mod integrity_check {
         }
     }
 
-    /// Get a unique ID for the current "thread" (i.e. web worker or the main
-    /// thread).
-    ///
-    /// This works by creating a `$WASMER_THREAD_ID` symbol and setting it on
-    /// the global object.
-    fn current_thread_id() -> u32 {
-        static NEXT_ID: AtomicU32 = AtomicU32::new(0);
-
-        let global = js_sys::global();
-        let thread_id_symbol = Symbol::for_("$WASMER_THREAD_ID");
-
-        if let Some(v) = js_sys::Reflect::get(&global, &thread_id_symbol)
-            .ok()
-            .and_then(|v| v.as_f64())
-        {
-            // Note: we use a symbol so we know for sure that nobody else created
-            // this field.
-            return v as u32;
-        }
-
-        // Looks like we haven't set the thread ID yet.
-        let id = NEXT_ID.fetch_add(1, Ordering::Relaxed);
-
-        js_sys::Reflect::set(&global, &thread_id_symbol, &JsValue::from(id))
-            .expect("Setting a field on the global object should never fail");
-
-        id
-    }
-
     fn record_backtrace() -> Option<String> {
         let err = js_sys::Error::new("");
         let stack = JsString::from(wasm_bindgen::intern("stack"));
@@ -215,3 +185,37 @@ mod integrity_check {
             .and_then(|v| v.as_string())
     }
 }
+
+/// A browser polyfill for [`std::thread::ThreadId`] [`std::thread::current()`].
+///
+/// This works by creating a `$WASMER_THREAD_ID` symbol and setting it on
+/// the global object. As long as they use the same `SharedArrayBuffer` for
+/// their linear memory, each thread (i.e. web worker or the UI thread) is
+/// guaranteed to get a unique ID.
+///
+/// This is mainly intended for use in `wasmer-wasix` and `wasmer-js`, and may
+/// go away in the future.
+#[doc(hidden)]
+pub fn current_thread_id() -> u32 {
+    static NEXT_ID: AtomicU32 = AtomicU32::new(0);
+
+    let global = js_sys::global();
+    let thread_id_symbol = Symbol::for_("$WASMER_THREAD_ID");
+
+    if let Some(v) = js_sys::Reflect::get(&global, &thread_id_symbol)
+        .ok()
+        .and_then(|v| v.as_f64())
+    {
+        // Note: we use a symbol so we know for sure that nobody else created
+        // this field.
+        return v as u32;
+    }
+
+    // Looks like we haven't set the thread ID yet.
+    let id = NEXT_ID.fetch_add(1, Ordering::Relaxed);
+
+    js_sys::Reflect::set(&global, &thread_id_symbol, &JsValue::from(id))
+        .expect("Setting a field on the global object should never fail");
+
+    id
+}
diff --git a/lib/api/src/js/mod.rs b/lib/api/src/js/mod.rs
index 1ecc4b4c0fe..ef105260d73 100644
--- a/lib/api/src/js/mod.rs
+++ b/lib/api/src/js/mod.rs
@@ -40,5 +40,4 @@ pub(crate) mod typed_function;
 pub(crate) mod vm;
 mod wasm_bindgen_polyfill;
 
-pub use crate::js::as_js::AsJs;
-pub use crate::js::module::ModuleTypeHints;
+pub use self::{as_js::AsJs, js_handle::current_thread_id, module::ModuleTypeHints};
diff --git a/lib/api/src/js/module.rs b/lib/api/src/js/module.rs
index 2b5b2c1b0f5..4841fdb52e8 100644
--- a/lib/api/src/js/module.rs
+++ b/lib/api/src/js/module.rs
@@ -23,11 +23,11 @@ use wasmer_types::{
 ///
 /// This should be fixed once the JS-Types Wasm proposal is adopted
 /// by the browsers:
-/// https://github.com/WebAssembly/js-types/blob/master/proposals/js-types/Overview.md
+/// <https://github.com/WebAssembly/js-types/blob/master/proposals/js-types/Overview.md>
 ///
 /// Until that happens, we annotate the module with the expected
 /// types so we can built on top of them at runtime.
-#[derive(Clone, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct ModuleTypeHints {
     /// The type hints for the imported types
     pub imports: Vec<ExternType>,
@@ -474,3 +474,8 @@ impl From<WebAssembly::Module> for crate::module::Module {
         crate::module::Module(module.into())
     }
 }
+impl From<crate::module::Module> for WebAssembly::Module {
+    fn from(value: crate::module::Module) -> Self {
+        value.0.module.into_inner()
+    }
+}
diff --git a/lib/api/src/js/module_info_polyfill.rs b/lib/api/src/js/module_info_polyfill.rs
index 769e427f326..5ddf5746be3 100644
--- a/lib/api/src/js/module_info_polyfill.rs
+++ b/lib/api/src/js/module_info_polyfill.rs
@@ -3,8 +3,8 @@
 //!
 //! This shall not be needed once the JS type reflection API is available
 //! for the Wasm imports and exports.
-//!  
-//! https://github.com/WebAssembly/js-types/blob/master/proposals/js-types/Overview.md
+//!
+//! <https://github.com/WebAssembly/js-types/blob/master/proposals/js-types/Overview.md>
 use core::convert::TryFrom;
 use std::vec::Vec;
 use wasmer_types::entity::EntityRef;
diff --git a/lib/api/src/js/trap.rs b/lib/api/src/js/trap.rs
index 8a0ef2d940b..23a002e066f 100644
--- a/lib/api/src/js/trap.rs
+++ b/lib/api/src/js/trap.rs
@@ -1,26 +1,26 @@
-use crate::RuntimeError;
-use std::error::Error;
-use std::fmt;
+use std::{
+    error::Error,
+    fmt::{self, Display},
+};
 
+use js_sys::Reflect;
 use wasm_bindgen::{prelude::*, JsValue};
-use wasm_bindgen_downcast::DowncastJS;
+
+use crate::RuntimeError;
 
 #[derive(Debug)]
 enum InnerTrap {
     User(Box<dyn Error + Send + Sync>),
-    Js(JsValue),
+    Js(JsTrap),
 }
 
 /// A struct representing a Trap
-#[wasm_bindgen]
-#[derive(Debug, DowncastJS)]
+#[wasm_bindgen(skip_typescript)]
+#[derive(Debug)]
 pub struct Trap {
     inner: InnerTrap,
 }
 
-unsafe impl Send for Trap {}
-unsafe impl Sync for Trap {}
-
 impl Trap {
     pub fn user(error: Box<dyn Error + Send + Sync>) -> Self {
         Self {
@@ -55,6 +55,13 @@ impl Trap {
     }
 }
 
+#[wasm_bindgen]
+impl Trap {
+    /// A marker method to indicate that an object is an instance of the `Trap`
+    /// class.
+    pub fn __wbg_wasmer_trap() {}
+}
+
 impl std::error::Error for Trap {
     fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
         match &self.inner {
@@ -67,20 +74,106 @@ impl std::error::Error for Trap {
 impl fmt::Display for Trap {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match &self.inner {
-            InnerTrap::User(e) => write!(f, "user: {}", e),
-            InnerTrap::Js(value) => write!(f, "js: {:?}", value.as_string()),
+            InnerTrap::User(e) => write!(f, "user: {e}"),
+            InnerTrap::Js(value) => write!(f, "js: {value}"),
         }
     }
 }
 
 impl From<JsValue> for RuntimeError {
-    fn from(original: JsValue) -> Self {
-        // We try to downcast the error and see if it's
-        // an instance of RuntimeError instead, so we don't need
-        // to re-wrap it.
-        let trap = Trap::downcast_js(original).unwrap_or_else(|o| Trap {
-            inner: InnerTrap::Js(o),
-        });
-        trap.into()
+    fn from(value: JsValue) -> Self {
+        // We try to downcast the error and see if it's an instance of Trap
+        // instead, so we don't need to re-wrap it.
+        if let Some(obj) = value.dyn_ref() {
+            if let Some(trap) = downcast_from_ptr(obj) {
+                return trap.into();
+            }
+        }
+
+        RuntimeError::from(Trap {
+            inner: InnerTrap::Js(value.into()),
+        })
+    }
+}
+
+/// This whole mechanism works because the JavaScript wrapper class has a static
+/// `__wbg_wasmer_trap()` method which marks that it is a [`Trap`].
+///
+/// If that method exists, we assume the pointer is valid and safe to cast back
+/// to our type.
+fn downcast_from_ptr(value: &JsValue) -> Option<Trap> {
+    if !value.is_object() {
+        return None;
+    }
+
+    let prototype = &Reflect::get_prototype_of(value).ok()?;
+    let class = prototype.constructor();
+    let key = JsValue::from_str("__wbg_wasmer_trap");
+
+    let marker_func: Option<js_sys::Function> = Reflect::get(&class, &key)
+        .and_then(|v: JsValue| v.dyn_into())
+        .ok();
+
+    if marker_func.is_none() {
+        // We couldn't find the marker, so it's something else.
+        return None;
+    }
+
+    // Safety: The marker function exists, therefore it's safe to convert back
+    // to a Trap.
+    unsafe {
+        // Note: this assumes the wrapper class generated by #[wasm_bindgen] will
+        // always have a `__destroy_into_raw()` method which consumes the `Trap`
+        // wrapper and returns a pointer.
+        //
+        // This is valid as of wasm-bindgen version 0.2.87
+        let key = JsValue::from_str("__destroy_into_raw");
+        let ptr = Reflect::get(value, &key)
+            .ok()
+            .and_then(|v| v.dyn_into::<js_sys::Function>().ok())
+            .and_then(|destroy_into_raw| destroy_into_raw.call0(value).ok())
+            .and_then(|ret| ret.as_f64())?;
+
+        Some(<Trap as wasm_bindgen::convert::FromWasmAbi>::from_abi(
+            ptr as u32,
+        ))
+    }
+}
+
+/// A `Send+Sync` version of a JavaScript error.
+#[derive(Debug)]
+enum JsTrap {
+    /// An error message.
+    Message(String),
+    /// Unable to determine the underlying error.
+    Unknown,
+}
+
+impl From<JsValue> for JsTrap {
+    fn from(value: JsValue) -> Self {
+        // Let's try some easy special cases first
+        if let Some(error) = value.dyn_ref::<js_sys::Error>() {
+            return JsTrap::Message(error.message().into());
+        }
+
+        if let Some(s) = value.as_string() {
+            return JsTrap::Message(s);
+        }
+
+        // Otherwise, we'll try to stringify the error and hope for the best
+        if let Some(obj) = value.dyn_ref::<js_sys::Object>() {
+            return JsTrap::Message(obj.to_string().into());
+        }
+
+        JsTrap::Unknown
+    }
+}
+
+impl Display for JsTrap {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            JsTrap::Message(m) => write!(f, "{m}"),
+            JsTrap::Unknown => write!(f, "unknown"),
+        }
     }
 }
diff --git a/lib/virtual-fs/src/arc_file.rs b/lib/virtual-fs/src/arc_file.rs
index 04de81511d8..505360aa1d1 100644
--- a/lib/virtual-fs/src/arc_file.rs
+++ b/lib/virtual-fs/src/arc_file.rs
@@ -12,7 +12,7 @@ use std::{
 };
 use tokio::io::{AsyncRead, AsyncSeek, AsyncWrite};
 
-#[derive(Derivative, Clone)]
+#[derive(Derivative)]
 #[derivative(Debug)]
 pub struct ArcFile<T>
 where
@@ -153,6 +153,17 @@ where
     }
 }
 
+impl<T> Clone for ArcFile<T>
+where
+    T: VirtualFile + Send + Sync + 'static,
+{
+    fn clone(&self) -> Self {
+        ArcFile {
+            inner: self.inner.clone(),
+        }
+    }
+}
+
 impl<T> ClonableVirtualFile for ArcFile<T>
 where
     T: VirtualFile + Send + Sync + 'static,
diff --git a/lib/wasi-web/Cargo.lock b/lib/wasi-web/Cargo.lock
index 422518a8cbd..e41142c8b31 100644
--- a/lib/wasi-web/Cargo.lock
+++ b/lib/wasi-web/Cargo.lock
@@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
 dependencies = [
  "getrandom",
  "once_cell",
@@ -30,9 +30,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.5"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
  "memchr",
 ]
@@ -66,13 +66,13 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
 
 [[package]]
 name = "async-trait"
-version = "0.1.73"
+version = "0.1.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -113,9 +113,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
 [[package]]
 name = "bincode"
@@ -134,9 +134,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
 
 [[package]]
 name = "bitvec"
@@ -179,9 +179,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
 
 [[package]]
 name = "bytecheck"
@@ -207,9 +207,9 @@ dependencies = [
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
@@ -237,9 +237,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.30"
+version = "0.4.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
+checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
@@ -286,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
 dependencies = [
  "libc",
 ]
@@ -381,7 +381,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -403,7 +403,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
 dependencies = [
  "darling_core 0.20.3",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -413,17 +413,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
 dependencies = [
  "cfg-if",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.2",
  "lock_api",
  "once_cell",
- "parking_lot_core 0.9.8",
+ "parking_lot_core 0.9.9",
 ]
 
 [[package]]
 name = "deranged"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+]
 
 [[package]]
 name = "derivative"
@@ -526,22 +529,22 @@ dependencies = [
 
 [[package]]
 name = "enum-ordinalize"
-version = "3.1.13"
+version = "3.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4f76552f53cefc9a7f64987c3701b99d982f7690606fd67de1d09712fbf52f1"
+checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee"
 dependencies = [
  "num-bigint",
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "enumset"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e875f1719c16de097dee81ed675e2d9bb63096823ed3f0ca827b7dea3028bbbb"
+checksum = "226c0da7462c13fb57e5cc9e0dc8f0635e7d27f276a3a7fd30054647f669007d"
 dependencies = [
  "enumset_derive",
 ]
@@ -555,7 +558,7 @@ dependencies = [
  "darling 0.20.3",
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -566,25 +569,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.3"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
 dependencies = [
- "errno-dragonfly",
  "libc",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
 [[package]]
 name = "fastrand"
 version = "1.9.0"
@@ -596,9 +588,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
 
 [[package]]
 name = "filetime"
@@ -620,9 +612,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -705,7 +697,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -799,9 +791,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.0"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 
 [[package]]
 name = "heapless"
@@ -844,16 +836,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
+checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
  "wasm-bindgen",
- "windows",
+ "windows-core",
 ]
 
 [[package]]
@@ -900,12 +892,13 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.0.0"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.0",
+ "hashbrown 0.14.2",
+ "serde",
 ]
 
 [[package]]
@@ -958,9 +951,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
 
 [[package]]
 name = "linked-hash-map"
@@ -979,15 +972,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.7"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1010,9 +1003,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
 
 [[package]]
 name = "memmap2"
@@ -1089,9 +1082,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
  "autocfg",
 ]
@@ -1171,13 +1164,13 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
  "smallvec",
  "windows-targets",
 ]
@@ -1201,7 +1194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
 ]
 
 [[package]]
@@ -1221,7 +1214,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1236,6 +1229,12 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -1249,7 +1248,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
 dependencies = [
  "once_cell",
- "toml_edit",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
@@ -1278,9 +1277,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.66"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
  "unicode-ident",
 ]
@@ -1379,11 +1378,20 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "regex"
-version = "1.9.5"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1393,9 +1401,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.8"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1404,9 +1412,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "region"
@@ -1422,9 +1430,9 @@ dependencies = [
 
 [[package]]
 name = "rend"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"
+checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
 dependencies = [
  "bytecheck",
 ]
@@ -1481,11 +1489,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.13"
+version = "0.38.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -1533,18 +1541,18 @@ checksum = "4c309e515543e67811222dbc9e3dd7e1056279b782e1dacffe4242b718734fb6"
 
 [[package]]
 name = "semver"
-version = "1.0.18"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
 dependencies = [
  "serde_derive",
 ]
@@ -1572,20 +1580,20 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.190"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.106"
+version = "1.0.107"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2"
+checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
 dependencies = [
  "itoa",
  "ryu",
@@ -1594,9 +1602,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.3"
+version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
+checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80"
 dependencies = [
  "serde",
 ]
@@ -1615,11 +1623,11 @@ dependencies = [
 
 [[package]]
 name = "serde_yaml"
-version = "0.9.25"
+version = "0.9.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
+checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
  "itoa",
  "ryu",
  "serde",
@@ -1641,9 +1649,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.7"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1652,9 +1660,9 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
@@ -1686,9 +1694,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
+checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
 
 [[package]]
 name = "spin"
@@ -1724,9 +1732,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.32"
+version = "2.0.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1752,9 +1760,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.11"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
+checksum = "14c39fd04924ca3a864207c66fc2cd7d22d7c016007f9ce846cbb9326331930a"
 
 [[package]]
 name = "tempfile"
@@ -1763,7 +1771,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.0",
+ "fastrand 2.0.1",
  "redox_syscall 0.3.5",
  "rustix",
  "windows-sys 0.48.0",
@@ -1790,22 +1798,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1820,12 +1828,13 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
 dependencies = [
  "deranged",
  "itoa",
+ "powerfmt",
  "serde",
  "time-core",
  "time-macros",
@@ -1833,15 +1842,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572"
+checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
 dependencies = [
  "time-core",
 ]
@@ -1863,9 +1872,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1881,7 +1890,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
@@ -1915,30 +1924,33 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit 0.19.15",
 ]
 
 [[package]]
 name = "toml"
-version = "0.7.8"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "2ef75d881185fd2df4a040793927c153d863651108a93c7e17a9e591baa95cc6"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit",
+ "toml_edit 0.20.4",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
@@ -1949,7 +1961,20 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.0.0",
+ "indexmap 2.0.2",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380f9e8120405471f7c9ad1860a713ef5ece6a670c7eae39225e477340f32fc4"
+dependencies = [
+ "indexmap 2.0.2",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -1958,11 +1983,10 @@ dependencies = [
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "log",
  "pin-project-lite",
  "tracing-attributes",
@@ -1971,20 +1995,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -2002,12 +2026,12 @@ dependencies = [
 
 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2"
 dependencies = [
- "lazy_static",
  "log",
+ "once_cell",
  "tracing-core",
 ]
 
@@ -2038,9 +2062,9 @@ dependencies = [
 
 [[package]]
 name = "typenum"
-version = "1.16.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "unicase"
@@ -2059,9 +2083,9 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
@@ -2080,9 +2104,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
 
 [[package]]
 name = "unicode-xid"
@@ -2116,9 +2140,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "uuid"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
+checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
 
 [[package]]
 name = "valuable"
@@ -2172,7 +2196,7 @@ version = "0.6.1"
 dependencies = [
  "anyhow",
  "async-trait",
- "base64 0.21.4",
+ "base64 0.21.5",
  "bincode",
  "bytes",
  "derivative",
@@ -2292,9 +2316,9 @@ dependencies = [
 
 [[package]]
 name = "waker-fn"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
 
 [[package]]
 name = "walkdir"
@@ -2335,33 +2359,10 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-downcast"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dac026d43bcca6e7ce1c0956ba68f59edf6403e8e930a5d891be72c31a44340"
-dependencies = [
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "wasm-bindgen-downcast-macros",
-]
-
-[[package]]
-name = "wasm-bindgen-downcast-macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5020cfa87c7cecefef118055d44e3c1fc122c7ec25701d528ee458a0b45f38f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "wasm-bindgen-futures"
 version = "0.4.37"
@@ -2392,7 +2393,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.32",
+ "syn 2.0.38",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -2453,7 +2454,6 @@ dependencies = [
  "target-lexicon",
  "thiserror",
  "wasm-bindgen",
- "wasm-bindgen-downcast",
  "wasmer-compiler",
  "wasmer-derive",
  "wasmer-types",
@@ -2500,20 +2500,20 @@ dependencies = [
 
 [[package]]
 name = "wasmer-toml"
-version = "0.8.0"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2d9ad139e1b613770613cf5952e95185e28b108120ddee14d88b4a004c7c94f"
+checksum = "d21472954ee9443235ca32522b17fc8f0fe58e2174556266a0d9766db055cc52"
 dependencies = [
  "anyhow",
  "derive_builder",
- "indexmap 1.9.3",
+ "indexmap 2.0.2",
  "semver",
  "serde",
  "serde_cbor",
  "serde_json",
- "serde_yaml 0.9.25",
+ "serde_yaml 0.9.27",
  "thiserror",
- "toml 0.5.11",
+ "toml 0.8.4",
 ]
 
 [[package]]
@@ -2589,7 +2589,7 @@ dependencies = [
  "serde_derive",
  "serde_json",
  "serde_yaml 0.8.26",
- "sha2 0.10.7",
+ "sha2 0.10.8",
  "tempfile",
  "term_size",
  "termios",
@@ -2727,12 +2727,12 @@ dependencies = [
 
 [[package]]
 name = "webc"
-version = "5.5.1"
+version = "5.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b56acc943f6b80cc2842231f34f99a02cd406896a23f3c6dacd8130c24ab3d1"
+checksum = "c5fc974157e8532c5c31fa44c38046264227e580cd2a0d939543891d23f43779"
 dependencies = [
  "anyhow",
- "base64 0.21.4",
+ "base64 0.21.5",
  "byteorder",
  "bytes",
  "flate2",
@@ -2746,7 +2746,7 @@ dependencies = [
  "serde",
  "serde_cbor",
  "serde_json",
- "sha2 0.10.7",
+ "sha2 0.10.8",
  "shared-buffer",
  "tar",
  "tempfile",
@@ -2781,9 +2781,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.5"
+version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
 dependencies = [
  "winapi",
 ]
@@ -2795,10 +2795,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "windows"
-version = "0.48.0"
+name = "windows-core"
+version = "0.51.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
 dependencies = [
  "windows-targets",
 ]
@@ -2914,9 +2914,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "winnow"
-version = "0.5.15"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c"
 dependencies = [
  "memchr",
 ]
diff --git a/lib/wasix/Cargo.toml b/lib/wasix/Cargo.toml
index 39fc39ca115..189b55f9c11 100644
--- a/lib/wasix/Cargo.toml
+++ b/lib/wasix/Cargo.toml
@@ -27,7 +27,7 @@ wasmer-emscripten = { path = "../emscripten", version = "=4.2.3", optional = tru
 typetag = { version = "0.1", optional = true }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 bincode = { version = "1.3" }
-chrono = { version = "^0.4", default-features = false, features = [ "wasmbind", "std", "clock" ], optional = true }
+chrono = { version = "^0.4.31", default-features = false, features = [ "wasmbind", "std", "clock" ], optional = true }
 derivative = { version = "^2" }
 bytes = "1"
 webc = { workspace = true }
diff --git a/lib/wasix/src/bin_factory/binary_package.rs b/lib/wasix/src/bin_factory/binary_package.rs
index a3442eeeb6e..cc785a78d98 100644
--- a/lib/wasix/src/bin_factory/binary_package.rs
+++ b/lib/wasix/src/bin_factory/binary_package.rs
@@ -77,6 +77,7 @@ pub struct BinaryPackage {
 impl BinaryPackage {
     /// Load a [`webc::Container`] and all its dependencies into a
     /// [`BinaryPackage`].
+    #[tracing::instrument(level = "debug", skip_all)]
     pub async fn from_webc(
         container: &Container,
         rt: &(dyn Runtime + Send + Sync),
@@ -99,6 +100,7 @@ impl BinaryPackage {
     }
 
     /// Load a [`BinaryPackage`] and all its dependencies from a registry.
+    #[tracing::instrument(level = "debug", skip_all)]
     pub async fn from_registry(
         specifier: &PackageSpecifier,
         runtime: &(dyn Runtime + Send + Sync),
@@ -155,13 +157,16 @@ mod tests {
     use tempfile::TempDir;
     use virtual_fs::AsyncReadExt;
 
-    use crate::{runtime::task_manager::VirtualTaskManager, PluggableRuntime};
+    use crate::{
+        runtime::{package_loader::BuiltinPackageLoader, task_manager::VirtualTaskManager},
+        PluggableRuntime,
+    };
 
     use super::*;
 
     fn task_manager() -> Arc<dyn VirtualTaskManager + Send + Sync> {
         cfg_if::cfg_if! {
-            if #[cfg(feature = "sys-threads")] {
+            if #[cfg(feature = "sys-thread")] {
                 Arc::new(crate::runtime::task_manager::tokio::TokioTaskManager::new(tokio::runtime::Handle::current()))
             } else {
                 unimplemented!("Unable to get the task manager")
@@ -171,7 +176,7 @@ mod tests {
 
     #[tokio::test]
     #[cfg_attr(
-        not(feature = "sys-threads"),
+        not(feature = "sys-thread"),
         ignore = "The tokio task manager isn't available on this platform"
     )]
     async fn fs_table_can_map_directories_to_different_names() {
@@ -195,7 +200,10 @@ mod tests {
             .unwrap()
             .into();
         let tasks = task_manager();
-        let runtime = PluggableRuntime::new(tasks);
+        let mut runtime = PluggableRuntime::new(tasks);
+        runtime.set_package_loader(BuiltinPackageLoader::new_only_client(
+            runtime.http_client().unwrap().clone(),
+        ));
 
         let pkg = BinaryPackage::from_webc(&webc, &runtime).await.unwrap();
 
diff --git a/lib/wasix/src/bin_factory/exec.rs b/lib/wasix/src/bin_factory/exec.rs
index 044a8477d33..25da5f1ec2b 100644
--- a/lib/wasix/src/bin_factory/exec.rs
+++ b/lib/wasix/src/bin_factory/exec.rs
@@ -23,18 +23,19 @@ pub async fn spawn_exec(
     env: WasiEnv,
     runtime: &Arc<dyn Runtime + Send + Sync + 'static>,
 ) -> Result<TaskJoinHandle, SpawnError> {
-    let wasm = match binary.entrypoint_bytes() {
-        Some(wasm) => wasm,
-        None => {
-            tracing::error!(
-              command=name,
-              pkg.name=%binary.package_name,
-              pkg.version=%binary.version,
-              "Unable to spawn a command because its package has no entrypoint",
-            );
-            env.cleanup(Some(Errno::Noexec.into())).await;
-            return Err(SpawnError::CompileError);
-        }
+    let wasm = if let Some(cmd) = binary.get_command(name) {
+        cmd.atom.as_ref()
+    } else if let Some(wasm) = binary.entrypoint_bytes() {
+        wasm
+    } else {
+        tracing::error!(
+          command=name,
+          pkg.name=%binary.package_name,
+          pkg.version=%binary.version,
+          "Unable to spawn a command because its package has no entrypoint",
+        );
+        env.cleanup(Some(Errno::Noexec.into())).await;
+        return Err(SpawnError::CompileError);
     };
 
     let module = match runtime.load_module(wasm).await {
@@ -202,13 +203,8 @@ fn call_module(
 
         if let Err(err) = call_ret {
             match err.downcast::<WasiError>() {
-                Ok(WasiError::Exit(code)) => {
-                    if code.is_success() {
-                        Ok(Errno::Success)
-                    } else {
-                        Ok(Errno::Noexec)
-                    }
-                }
+                Ok(WasiError::Exit(code)) if code.is_success() => Ok(Errno::Success),
+                Ok(err @ WasiError::Exit(_)) => Err(err.into()),
                 Ok(WasiError::DeepSleep(deep)) => {
                     // Create the callback that will be invoked when the thread respawns after a deep sleep
                     let rewind = deep.rewind;
diff --git a/lib/wasix/src/fs/inode_guard.rs b/lib/wasix/src/fs/inode_guard.rs
index 113c21cd369..9d68f814f19 100644
--- a/lib/wasix/src/fs/inode_guard.rs
+++ b/lib/wasix/src/fs/inode_guard.rs
@@ -46,7 +46,7 @@ impl InodeValFilePollGuard {
         subscription: Subscription,
         guard: &Kind,
     ) -> Option<Self> {
-        let mode = match guard.deref() {
+        let mode = match guard {
             Kind::EventNotifications { inner, .. } => {
                 InodeValFilePollGuardMode::EventNotifications(inner.clone())
             }
diff --git a/lib/wasix/src/http/web_http_client.rs b/lib/wasix/src/http/web_http_client.rs
index 8d95bf4057e..3eaf942566b 100644
--- a/lib/wasix/src/http/web_http_client.rs
+++ b/lib/wasix/src/http/web_http_client.rs
@@ -1,5 +1,7 @@
+use std::sync::Arc;
+
 use anyhow::{Context, Error};
-use futures::future::BoxFuture;
+use futures::{channel::oneshot, future::BoxFuture};
 use http::header::{HeaderMap, HeaderValue, IntoHeaderName};
 use wasm_bindgen::{JsCast, JsValue};
 use wasm_bindgen_futures::JsFuture;
@@ -8,21 +10,32 @@ use web_sys::{RequestInit, RequestMode, Window, WorkerGlobalScope};
 use crate::{
     http::{HttpClient, HttpRequest, HttpRequestOptions, HttpResponse},
     utils::web::js_error,
+    VirtualTaskManager, WasiThreadError,
 };
 
-#[derive(Debug, Default, Clone, PartialEq)]
+#[derive(Debug, Default, Clone)]
 #[non_exhaustive]
 pub struct WebHttpClient {
     default_headers: HeaderMap,
+    tasks: Option<Arc<dyn VirtualTaskManager + Send + Sync>>,
 }
 
 impl WebHttpClient {
     pub fn new() -> Self {
         WebHttpClient {
             default_headers: HeaderMap::new(),
+            tasks: None,
         }
     }
 
+    pub fn with_task_manager(
+        &mut self,
+        tasks: Arc<dyn VirtualTaskManager + Send + Sync>,
+    ) -> &mut Self {
+        self.tasks = Some(tasks);
+        self
+    }
+
     pub fn with_default_header(
         &mut self,
         name: impl IntoHeaderName,
@@ -36,28 +49,84 @@ impl WebHttpClient {
         self.default_headers.extend(map);
         self
     }
+
+    /// Execute a `fetch()` request.
+    ///
+    /// # Hack
+    ///
+    /// This function is here to work around issues that are associated with the
+    /// promises we get when calling into JavaScript.
+    ///
+    /// Under most conditions it's perfectly fine to call
+    /// [`wasm_bindgen_futures::spawn_local()`] directly from the
+    /// [`WebHttpClient::request()`] method, however there is a pretty nasty
+    /// gotcha when it comes to syscalls.
+    ///
+    /// - The Wasmer VM doesn't support `async` host functions, so all
+    ///   syscalls must block
+    /// - Some syscalls need to run asynchronous operations
+    /// - To call async code from a sync function, we use
+    ///   [`crate::syscalls::__asyncify_light()`] which uses
+    ///   [`futures::executor::block_on()`] to poll the future on the current
+    ///   thread until it resolves
+    /// - In order for a [`wasm_bindgen_futures::spawn_local()`] future (i.e.
+    ///   `fetch()`) to run to completion, you need to return control to the
+    ///   JavaScript event loop
+    ///
+    /// This causes a nasty deadlock where the syscall won't return until the
+    /// `fetch()` promise resolves, but the `fetch()` promise can't resolve
+    /// until the syscall returns.
+    ///
+    /// We saw one example of this when a WASIX program uses the `wasmer run
+    /// ...` virtual command and the [`crate::Runtime`] needs to load a package
+    /// from the registry.
+    ///
+    /// The workaround is use a [`VirtualTaskManager`] to run `fetch()` on a
+    /// background thread and hope *that* thread doesn't get stuck in a
+    /// deadlock. Otherwise if no [`VirtualTaskManager`] was provided, we'll run
+    /// the `fetch()` request on the current event loop and hope for the best.
+    fn spawn_js(
+        &self,
+        request: HttpRequest,
+    ) -> Result<oneshot::Receiver<Result<HttpResponse, Error>>, WasiThreadError> {
+        let (sender, receiver) = oneshot::channel();
+
+        fn spawn_fetch(request: HttpRequest, sender: oneshot::Sender<Result<HttpResponse, Error>>) {
+            wasm_bindgen_futures::spawn_local(async move {
+                let result = fetch(request).await;
+                let _ = sender.send(result);
+            });
+        }
+
+        match self.tasks.as_deref() {
+            Some(tasks) => {
+                tasks.task_shared(Box::new(|| {
+                    Box::pin(async move {
+                        spawn_fetch(request, sender);
+                    })
+                }))?;
+            }
+            None => {
+                spawn_fetch(request, sender);
+            }
+        }
+
+        Ok(receiver)
+    }
 }
 
 impl HttpClient for WebHttpClient {
     fn request(&self, mut request: HttpRequest) -> BoxFuture<'_, Result<HttpResponse, Error>> {
-        let (sender, receiver) = futures::channel::oneshot::channel();
-
         for (name, value) in &self.default_headers {
             if !request.headers.contains_key(name) {
                 request.headers.insert(name, value.clone());
             }
         }
 
-        // Note: We can't spawn this on our normal thread-pool because
-        // JavaScript promises are !Send, so we run it on the browser's event
-        // loop directly.
-        wasm_bindgen_futures::spawn_local(async move {
-            let result = fetch(request).await;
-            let _ = sender.send(result);
-        });
+        let receiver = self.spawn_js(request);
 
         Box::pin(async move {
-            match receiver.await {
+            match receiver?.await {
                 Ok(result) => result,
                 Err(e) => Err(Error::new(e)),
             }
diff --git a/lib/wasix/src/os/console/mod.rs b/lib/wasix/src/os/console/mod.rs
index e8129f50cda..4bfc3f652f3 100644
--- a/lib/wasix/src/os/console/mod.rs
+++ b/lib/wasix/src/os/console/mod.rs
@@ -312,8 +312,15 @@ mod tests {
 
     /// Test that [`Console`] correctly runs a command with arguments and
     /// specified env vars, and that the TTY correctly handles stdout output.
+    ///
+    /// Note that this test currently aborts the process unconditionally due
+    /// to a misaligned pointer access in stack_checkpoint() triggering a panic
+    /// in a function that isn't allowed to unwind.
+    ///
+    /// See [#4284](https://github.com/wasmerio/wasmer/issues/4284) for more.
     #[test]
     #[cfg_attr(not(feature = "host-reqwest"), ignore = "Requires a HTTP client")]
+    #[ignore = "Unconditionally aborts (CC #4284)"]
     fn test_console_dash_tty_with_args_and_env() {
         let tokio_rt = tokio::runtime::Runtime::new().unwrap();
         let rt_handle = tokio_rt.handle().clone();
@@ -357,7 +364,7 @@ mod tests {
             })
             .unwrap();
 
-        assert_eq!(code.raw(), 0);
+        assert_eq!(code.raw(), 78);
 
         let mut out = String::new();
         stdout_rx.read_to_string(&mut out).unwrap();
@@ -368,8 +375,6 @@ mod tests {
     /// Regression test to ensure merging of multiple packages works correctly.
     #[test]
     fn test_console_python_merge() {
-        std::env::set_var("RUST_LOG", "wasmer_wasix=trace");
-        tracing_subscriber::fmt::init();
         let tokio_rt = tokio::runtime::Runtime::new().unwrap();
         let rt_handle = tokio_rt.handle().clone();
         let _guard = rt_handle.enter();
diff --git a/lib/wasix/src/runners/wasi.rs b/lib/wasix/src/runners/wasi.rs
index 6a46a125c11..b2c2292805b 100644
--- a/lib/wasix/src/runners/wasi.rs
+++ b/lib/wasix/src/runners/wasi.rs
@@ -3,6 +3,7 @@
 use std::sync::Arc;
 
 use anyhow::{Context, Error};
+use tracing::Instrument;
 use virtual_fs::{ArcBoxFile, TmpFileSystem, VirtualFile};
 use webc::metadata::{annotations::Wasi, Command};
 
@@ -10,7 +11,8 @@ use crate::{
     bin_factory::BinaryPackage,
     capabilities::Capabilities,
     runners::{wasi_common::CommonWasiOptions, MappedDirectory},
-    Runtime, WasiEnvBuilder,
+    runtime::task_manager::VirtualTaskManagerExt,
+    Runtime, WasiEnvBuilder, WasiRuntimeError,
 };
 
 #[derive(Debug, Default, Clone)]
@@ -176,6 +178,7 @@ impl WasiRunner {
         self
     }
 
+    #[tracing::instrument(level = "debug", skip_all)]
     pub(crate) fn prepare_webc_env(
         &self,
         program_name: &str,
@@ -228,25 +231,38 @@ impl crate::runners::Runner for WasiRunner {
             .annotation("wasi")?
             .unwrap_or_else(|| Wasi::new(command_name));
 
-        let module = runtime.load_module_sync(cmd.atom())?;
-        let mut store = runtime.new_store();
+        let store = runtime.new_store();
 
         let env = self
-            .prepare_webc_env(command_name, &wasi, pkg, runtime, None)
-            .context("Unable to prepare the WASI environment")?;
-
-        if self
-            .wasi
-            .capabilities
-            .threading
-            .enable_asynchronous_threading
-        {
-            env.run_with_store_async(module, store)?;
+            .prepare_webc_env(command_name, &wasi, pkg, Arc::clone(&runtime), None)
+            .context("Unable to prepare the WASI environment")?
+            .build()?;
+
+        let command_name = command_name.to_string();
+        let tasks = runtime.task_manager().clone();
+        let pkg = pkg.clone();
+
+        let exit_code = tasks.spawn_and_block_on(
+            async move {
+                let mut task_handle =
+                    crate::bin_factory::spawn_exec(pkg, &command_name, store, env, &runtime)
+                        .await
+                        .context("Spawn failed")?;
+
+                task_handle
+                    .wait_finished()
+                    .await
+                    .map_err(|err| Arc::into_inner(err).expect("Error shouldn't be shared"))
+                    .context("Unable to wait for the process to exit")
+            }
+            .in_current_span(),
+        )?;
+
+        if exit_code.raw() == 0 {
+            Ok(())
         } else {
-            env.run_with_store(module, &mut store)?;
+            Err(WasiRuntimeError::Wasi(crate::WasiError::Exit(exit_code)).into())
         }
-
-        Ok(())
     }
 }
 
diff --git a/lib/wasix/src/runtime/module_cache/types.rs b/lib/wasix/src/runtime/module_cache/types.rs
index 804f8992ca1..9d801007c12 100644
--- a/lib/wasix/src/runtime/module_cache/types.rs
+++ b/lib/wasix/src/runtime/module_cache/types.rs
@@ -122,7 +122,7 @@ impl CacheError {
 }
 
 /// The SHA-256 hash of a WebAssembly module.
-#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
 pub struct ModuleHash([u8; 32]);
 
 impl ModuleHash {
@@ -131,6 +131,13 @@ impl ModuleHash {
         ModuleHash(key)
     }
 
+    /// Parse a sha256 hash from a hex-encoded string.
+    pub fn parse_hex(hex_str: &str) -> Result<Self, hex::FromHexError> {
+        let mut hash = [0_u8; 32];
+        hex::decode_to_slice(hex_str, &mut hash)?;
+        Ok(Self(hash))
+    }
+
     /// Generate a new [`ModuleCache`] based on the SHA-256 hash of some bytes.
     pub fn sha256(wasm: impl AsRef<[u8]>) -> Self {
         let wasm = wasm.as_ref();
diff --git a/lib/wasix/src/runtime/task_manager/mod.rs b/lib/wasix/src/runtime/task_manager/mod.rs
index e9902d07aa8..2e6d024fe27 100644
--- a/lib/wasix/src/runtime/task_manager/mod.rs
+++ b/lib/wasix/src/runtime/task_manager/mod.rs
@@ -38,6 +38,7 @@ pub type WasmResumeTrigger = dyn FnOnce() -> Pin<Box<dyn Future<Output = Result<
     + Sync;
 
 /// The properties passed to the task
+#[derive(Debug)]
 pub struct TaskWasmRunProperties {
     pub ctx: WasiFunctionEnv,
     pub store: Store,
@@ -120,22 +121,37 @@ pub trait VirtualTaskManager: std::fmt::Debug + Send + Sync + 'static {
         match spawn_type {
             SpawnMemoryType::CreateMemoryOfType(mut ty) => {
                 ty.shared = true;
+
+                // Note: If memory is shared, maximum needs to be set in the
+                // browser otherwise creation will fail.
+                let _ = ty.maximum.get_or_insert(wasmer_types::Pages::max_value());
+
                 let mem = Memory::new(&mut store, ty).map_err(|err| {
-                    tracing::error!("could not create memory: {err}");
+                    tracing::error!(
+                        error = &err as &dyn std::error::Error,
+                        memory_type=?ty,
+                        "could not create memory",
+                    );
                     WasiThreadError::MemoryCreateFailed(err)
                 })?;
                 Ok(Some(mem))
             }
             SpawnMemoryType::ShareMemory(mem, old_store) => {
                 let mem = mem.share_in_store(&old_store, store).map_err(|err| {
-                    tracing::warn!("could not clone memory: {err}");
+                    tracing::warn!(
+                        error = &err as &dyn std::error::Error,
+                        "could not clone memory",
+                    );
                     WasiThreadError::MemoryCreateFailed(err)
                 })?;
                 Ok(Some(mem))
             }
             SpawnMemoryType::CopyMemory(mem, old_store) => {
                 let mem = mem.copy_to_store(&old_store, store).map_err(|err| {
-                    tracing::warn!("could not copy memory: {err}");
+                    tracing::warn!(
+                        error = &err as &dyn std::error::Error,
+                        "could not copy memory",
+                    );
                     WasiThreadError::MemoryCreateFailed(err)
                 })?;
                 Ok(Some(mem))
diff --git a/lib/wasix/src/state/env.rs b/lib/wasix/src/state/env.rs
index 1b6d3eed282..36a5302b347 100644
--- a/lib/wasix/src/state/env.rs
+++ b/lib/wasix/src/state/env.rs
@@ -9,7 +9,6 @@ use std::{
 use derivative::Derivative;
 use futures::future::BoxFuture;
 use rand::Rng;
-use tracing::{trace, warn};
 use virtual_fs::{FileSystem, FsError, StaticFile, VirtualFile};
 use virtual_net::DynVirtualNetworking;
 use wasmer::{
@@ -493,7 +492,11 @@ impl WasiEnv {
         let instance = match Instance::new(&mut store, &module, &import_object) {
             Ok(a) => a,
             Err(err) => {
-                tracing::error!("wasi[{}]::wasm instantiate error ({})", pid, err);
+                tracing::error!(
+                    %pid,
+                    error = &err as &dyn std::error::Error,
+                    "Instantiation failed",
+                );
                 func_env
                     .data(&store)
                     .blocking_cleanup(Some(Errno::Noexec.into()));
@@ -508,7 +511,11 @@ impl WasiEnv {
         if let Err(err) =
             func_env.initialize_with_memory(&mut store, instance.clone(), imported_memory, true)
         {
-            tracing::error!("wasi[{}]::wasi initialize error ({})", pid, err);
+            tracing::error!(
+                %pid,
+                error = &err as &dyn std::error::Error,
+                "Initialization failed",
+            );
             func_env
                 .data(&store)
                 .blocking_cleanup(Some(Errno::Noexec.into()));
@@ -579,7 +586,7 @@ impl WasiEnv {
                         let exit_code = env.thread.set_or_get_exit_code_for_signal(sig);
                         return Err(WasiError::Exit(exit_code));
                     } else {
-                        trace!("wasi[{}]::signal-ignored: {:?}", env.pid(), sig);
+                        tracing::trace!(pid=%env.pid(), ?sig, "Signal ignored");
                     }
                 }
                 return Ok(Ok(true));
@@ -660,25 +667,25 @@ impl WasiEnv {
 
             for signal in signals {
                 tracing::trace!(
-                    "wasi[{}]::processing-signal: {:?}",
-                    ctx.data().pid(),
-                    signal
+                    pid=%ctx.data().pid(),
+                    ?signal,
+                    "Processing signal",
                 );
                 if let Err(err) = handler.call(ctx, signal as i32) {
                     match err.downcast::<WasiError>() {
                         Ok(wasi_err) => {
-                            warn!(
-                                "wasi[{}]::signal handler wasi error - {}",
-                                ctx.data().pid(),
-                                wasi_err
+                            tracing::warn!(
+                                pid=%ctx.data().pid(),
+                                wasi_err=&wasi_err as &dyn std::error::Error,
+                                "signal handler wasi error",
                             );
                             return Err(wasi_err);
                         }
                         Err(runtime_err) => {
-                            warn!(
-                                "wasi[{}]::signal handler runtime error - {}",
-                                ctx.data().pid(),
-                                runtime_err
+                            tracing::warn!(
+                                pid=%ctx.data().pid(),
+                                runtime_err=&runtime_err as &dyn std::error::Error,
+                                "signal handler runtime error",
                             );
                             return Err(WasiError::Exit(Errno::Intr.into()));
                         }
@@ -696,13 +703,19 @@ impl WasiEnv {
         // Check for forced exit
         if let Some(forced_exit) = self.thread.try_join() {
             return Some(forced_exit.unwrap_or_else(|err| {
-                tracing::debug!("exit runtime error - {}", err);
+                tracing::debug!(
+                    error = &*err as &dyn std::error::Error,
+                    "exit runtime error",
+                );
                 Errno::Child.into()
             }));
         }
         if let Some(forced_exit) = self.process.try_join() {
             return Some(forced_exit.unwrap_or_else(|err| {
-                tracing::debug!("exit runtime error - {}", err);
+                tracing::debug!(
+                    error = &*err as &dyn std::error::Error,
+                    "exit runtime error",
+                );
                 Errno::Child.into()
             }));
         }
@@ -875,7 +888,7 @@ impl WasiEnv {
         // We first need to copy any files in the package over to the
         // main file system
         if let Err(e) = InlineWaker::block_on(root_fs.merge(&pkg.webc_fs)) {
-            warn!(
+            tracing::warn!(
                 error = &e as &dyn std::error::Error,
                 "Unable to merge the package's filesystem into the main one",
             );
@@ -1029,7 +1042,7 @@ impl WasiEnv {
 
         // If this is the main thread then also close all the files
         if self.thread.is_main() {
-            trace!("wasi[{}]:: cleaning up open file handles", self.pid());
+            tracing::trace!(pid=%self.pid(), "cleaning up open file handles");
 
             // Now send a signal that the thread is terminated
             self.process.signal_process(Signal::Sigquit);
diff --git a/lib/wasix/src/state/func_env.rs b/lib/wasix/src/state/func_env.rs
index 02cee353b42..7ae4258be2b 100644
--- a/lib/wasix/src/state/func_env.rs
+++ b/lib/wasix/src/state/func_env.rs
@@ -19,7 +19,7 @@ use crate::{
 const DEFAULT_STACK_SIZE: u64 = 1_048_576u64;
 const DEFAULT_STACK_BASE: u64 = DEFAULT_STACK_SIZE;
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct WasiFunctionEnv {
     pub env: FunctionEnv<WasiEnv>,
 }
diff --git a/lib/wasix/src/syscalls/wasi/fd_event.rs b/lib/wasix/src/syscalls/wasi/fd_event.rs
index 6bda70276a8..00e0bb8a754 100644
--- a/lib/wasix/src/syscalls/wasi/fd_event.rs
+++ b/lib/wasix/src/syscalls/wasi/fd_event.rs
@@ -18,12 +18,10 @@ pub fn fd_event<M: MemorySize>(
         inner: Arc::new(NotificationInner::new(initial_val, is_semaphore)),
     };
 
-    let inode = state.fs.create_inode_with_default_stat(
-        inodes.deref(),
-        kind,
-        false,
-        "event".to_string().into(),
-    );
+    let inode =
+        state
+            .fs
+            .create_inode_with_default_stat(inodes, kind, false, "event".to_string().into());
     let rights = Rights::FD_READ
         | Rights::FD_WRITE
         | Rights::POLL_FD_READWRITE
diff --git a/lib/wasix/src/syscalls/wasm.rs b/lib/wasix/src/syscalls/wasm.rs
index ce679c16869..dd731f0213c 100644
--- a/lib/wasix/src/syscalls/wasm.rs
+++ b/lib/wasix/src/syscalls/wasm.rs
@@ -26,6 +26,8 @@ pub fn platform_clock_time_get(
     clock_id: Snapshot0Clockid,
     precision: Timestamp,
 ) -> Result<i64, Errno> {
-    let new_time: DateTime<Local> = Local::now();
-    Ok(new_time.timestamp_nanos() as i64)
+    Local::now()
+        .timestamp_nanos_opt()
+        .map(|ts| ts as i64)
+        .ok_or(Errno::Overflow)
 }
diff --git a/lib/wasix/tests/runners.rs b/lib/wasix/tests/runners.rs
index 9c4712d19c0..e132869713e 100644
--- a/lib/wasix/tests/runners.rs
+++ b/lib/wasix/tests/runners.rs
@@ -23,51 +23,68 @@ use wasmer_wasix::{
 use webc::Container;
 
 mod wasi {
+    use virtual_fs::{AsyncReadExt, AsyncSeekExt};
     use wasmer_wasix::{bin_factory::BinaryPackage, runners::wasi::WasiRunner, WasiError};
 
     use super::*;
 
     #[tokio::test]
     async fn can_run_wat2wasm() {
-        let webc = download_cached("https://wasmer.io/wasmer/wabt").await;
+        let webc = download_cached("https://wasmer.io/wasmer/wabt@1.0.37").await;
         let container = Container::from_bytes(webc).unwrap();
         let command = &container.manifest().commands["wat2wasm"];
 
         assert!(WasiRunner::can_run_command(command).unwrap());
     }
 
-    #[tokio::test]
+    #[tokio::test(flavor = "multi_thread")]
     async fn wat2wasm() {
-        let webc = download_cached("https://wasmer.io/wasmer/wabt").await;
+        let webc = download_cached("https://wasmer.io/wasmer/wabt@1.0.37").await;
         let container = Container::from_bytes(webc).unwrap();
-        let rt = runtime();
+        let (rt, tasks) = runtime();
         let pkg = BinaryPackage::from_webc(&container, &rt).await.unwrap();
+        let mut stdout = virtual_fs::ArcFile::new(Box::new(virtual_fs::BufferFile::default()));
 
-        // Note: we don't have any way to intercept stdin or stdout, so blindly
-        // assume that everything is fine if it runs successfully.
+        let stdout_2 = stdout.clone();
         let handle = std::thread::spawn(move || {
+            let _guard = tasks.runtime_handle().enter();
             WasiRunner::new()
                 .with_args(["--version"])
+                .with_stdin(Box::new(virtual_fs::NullFile::default()))
+                .with_stdout(Box::new(stdout_2) as Box<_>)
+                .with_stderr(Box::new(virtual_fs::NullFile::default()))
                 .run_command("wat2wasm", &pkg, Arc::new(rt))
         });
 
-        handle.join().unwrap().expect("Runner failed");
+        handle
+            .join()
+            .unwrap()
+            .expect("The runner encountered an error");
+
+        stdout.rewind().await.unwrap();
+        let mut output = Vec::new();
+        stdout.read_to_end(&mut output).await.unwrap();
+        assert_eq!(String::from_utf8(output).unwrap(), "1.0.37 (git~v1.0.37)\n");
     }
 
-    #[tokio::test]
+    #[tokio::test(flavor = "multi_thread")]
     async fn python() {
-        let webc = download_cached("https://wasmer.io/python/python").await;
-        let rt = runtime();
+        let webc = download_cached("https://wasmer.io/python/python@0.1.0").await;
+        let (rt, tasks) = runtime();
         let container = Container::from_bytes(webc).unwrap();
         let pkg = BinaryPackage::from_webc(&container, &rt).await.unwrap();
 
         let handle = std::thread::spawn(move || {
+            let _guard = tasks.runtime_handle().enter();
             WasiRunner::new()
                 .with_args(["-c", "import sys; sys.exit(42)"])
+                .with_stdin(Box::new(virtual_fs::NullFile::default()))
+                .with_stdout(Box::new(virtual_fs::NullFile::default()))
+                .with_stderr(Box::new(virtual_fs::NullFile::default()))
                 .run_command("python", &pkg, Arc::new(rt))
         });
-        let err = handle.join().unwrap().unwrap_err();
 
+        let err = handle.join().unwrap().unwrap_err();
         let runtime_error = err.chain().find_map(|e| e.downcast_ref::<WasiError>());
         let exit_code = match runtime_error {
             Some(WasiError::Exit(code)) => *code,
@@ -91,7 +108,7 @@ mod wcgi {
 
     #[tokio::test]
     async fn can_run_staticserver() {
-        let webc = download_cached("https://wasmer.io/Michael-F-Bryan/staticserver").await;
+        let webc = download_cached("https://wasmer.io/Michael-F-Bryan/staticserver@1.0.3").await;
         let container = Container::from_bytes(webc).unwrap();
 
         let entrypoint = container.manifest().entrypoint.as_ref().unwrap();
@@ -100,8 +117,8 @@ mod wcgi {
 
     #[tokio::test]
     async fn staticserver() {
-        let webc = download_cached("https://wasmer.io/Michael-F-Bryan/staticserver").await;
-        let rt = runtime();
+        let webc = download_cached("https://wasmer.io/Michael-F-Bryan/staticserver@1.0.3").await;
+        let (rt, tasks) = runtime();
         let container = Container::from_bytes(webc).unwrap();
         let mut runner = WcgiRunner::new();
         let port = rand::thread_rng().gen_range(10000_u16..65535_u16);
@@ -114,6 +131,7 @@ mod wcgi {
 
         // The server blocks so we need to start it on a background thread.
         let join_handle = std::thread::spawn(move || {
+            let _guard = tasks.runtime_handle().enter();
             runner.run_command("serve", &pkg, Arc::new(rt)).unwrap();
         });
 
@@ -222,9 +240,10 @@ fn sanitze_name_for_path(name: &str) -> String {
     name.replace(":", "_")
 }
 
-fn runtime() -> impl Runtime + Send + Sync {
+fn runtime() -> (impl Runtime + Send + Sync, Arc<TokioTaskManager>) {
     let tasks = TokioTaskManager::new(Handle::current());
-    let mut rt = PluggableRuntime::new(Arc::new(tasks));
+    let tasks = Arc::new(tasks);
+    let mut rt = PluggableRuntime::new(Arc::clone(&tasks) as Arc<_>);
 
     let cache =
         SharedCache::default().with_fallback(FileSystemCache::new(tmp_dir().join("compiled")));
@@ -242,7 +261,7 @@ fn runtime() -> impl Runtime + Send + Sync {
         .set_package_loader(BuiltinPackageLoader::new(cache_dir))
         .set_http_client(wasmer_wasix::http::default_http_client().unwrap());
 
-    rt
+    (rt, tasks)
 }
 
 fn tmp_dir() -> PathBuf {
diff --git a/tests/integration/cli/tests/snapshots/snapshot__snapshot_bash_dash.snap b/tests/integration/cli/tests/snapshots/snapshot__snapshot_bash_dash.snap
index 7b884557966..d9d75a6f552 100644
--- a/tests/integration/cli/tests/snapshots/snapshot__snapshot_bash_dash.snap
+++ b/tests/integration/cli/tests/snapshots/snapshot__snapshot_bash_dash.snap
@@ -25,7 +25,7 @@ expression: snapshot
     "Success": {
       "stdout": "hi\n",
       "stderr": "test.wasm-5.1# # # test.wasm-5.1# exit\n",
-      "exit_code": 0
+      "exit_code": 78
     }
   }
 }