diff --git a/Cargo.lock b/Cargo.lock
index 044b62cf2ea..702be9001b3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -973,7 +973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -1003,6 +1003,12 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "exn"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad13781b9dd97d4489a74e38bb913254d2877840b0b8dece279193761f1d50f"
+
 [[package]]
 name = "expectrl"
 version = "0.7.1"
@@ -1324,6 +1330,7 @@ dependencies = [
  "anyhow",
  "async-std",
  "document-features",
+ "exn",
  "gix",
  "gix-actor",
  "gix-archive",
@@ -1396,6 +1403,7 @@ version = "0.37.1"
 dependencies = [
  "bstr",
  "document-features",
+ "exn",
  "gix-date",
  "gix-hash",
  "gix-testtools",
@@ -1590,6 +1598,7 @@ version = "0.12.1"
 dependencies = [
  "bstr",
  "document-features",
+ "exn",
  "gix-hash",
  "gix-testtools",
  "itoa",
@@ -1597,7 +1606,6 @@ dependencies = [
  "pretty_assertions",
  "serde",
  "smallvec",
- "thiserror 2.0.17",
 ]
 
 [[package]]
@@ -2218,6 +2226,7 @@ dependencies = [
  "bitflags 2.10.0",
  "bstr",
  "document-features",
+ "exn",
  "gix-commitgraph",
  "gix-date",
  "gix-hash",
@@ -2851,7 +2860,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.5.10",
+ "socket2 0.6.1",
  "tokio",
  "tower-service",
  "tracing",
@@ -3065,7 +3074,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi",
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3126,7 +3135,7 @@ dependencies = [
  "portable-atomic",
  "portable-atomic-util",
  "serde_core",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3491,7 +3500,7 @@ version = "0.50.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -3830,7 +3839,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.5.10",
+ "socket2 0.6.1",
  "thiserror 2.0.17",
  "tokio",
  "tracing",
@@ -3868,9 +3877,9 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2 0.6.1",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -4106,7 +4115,7 @@ dependencies = [
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4197,7 +4206,7 @@ dependencies = [
  "security-framework 3.5.1",
  "security-framework-sys",
  "webpki-root-certs 1.0.4",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -4687,7 +4696,7 @@ dependencies = [
  "getrandom 0.3.4",
  "once_cell",
  "rustix",
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -5340,7 +5349,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
diff --git a/gix-actor/Cargo.toml b/gix-actor/Cargo.toml
index 677525558b2..2d3870ee9ba 100644
--- a/gix-actor/Cargo.toml
+++ b/gix-actor/Cargo.toml
@@ -22,6 +22,7 @@ serde = ["dep:serde", "bstr/serde", "gix-date/serde"]
 gix-date = { version = "^0.12.1", path = "../gix-date" }
 gix-utils = { version = "^0.3.1", path = "../gix-utils" }
 
+exn = "0.2.1"
 thiserror = "2.0.17"
 bstr = { version = "1.12.0", default-features = false, features = [
     "std",
diff --git a/gix-actor/src/signature/mod.rs b/gix-actor/src/signature/mod.rs
index 6641b10de57..40adb4e4629 100644
--- a/gix-actor/src/signature/mod.rs
+++ b/gix-actor/src/signature/mod.rs
@@ -15,7 +15,7 @@ mod _ref {
         }
 
         /// Try to parse the timestamp and create an owned instance from this shared one.
-        pub fn to_owned(&self) -> Result<Signature, gix_date::parse::Error> {
+        pub fn to_owned(&self) -> Result<Signature, gix_date::parse::ParseError> {
             Ok(Signature {
                 name: self.name.to_owned(),
                 email: self.email.to_owned(),
@@ -58,7 +58,7 @@ mod _ref {
 
         /// Parse the `time` field for access to the passed time since unix epoch, and the time offset.
         /// The format is expected to be [raw](gix_date::parse_header()).
-        pub fn time(&self) -> Result<gix_date::Time, gix_date::parse::Error> {
+        pub fn time(&self) -> Result<gix_date::Time, gix_date::parse::ParseError> {
             self.time.parse()
         }
     }
diff --git a/gix-date/Cargo.toml b/gix-date/Cargo.toml
index 45c1ef1b9f0..e703c86b145 100644
--- a/gix-date/Cargo.toml
+++ b/gix-date/Cargo.toml
@@ -23,7 +23,7 @@ bstr = { version = "1.12.0", default-features = false, features = ["std"] }
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 itoa = "1.0.17"
 jiff = "0.2.17"
-thiserror = "2.0.17"
+exn = "0.2.1"
 # TODO: used for quick and easy `TimeBacking: std::io::Write` implementation, but could make that `Copy`
 #       and remove this dep with custom impl
 smallvec = { version = "1.15.1", features = ["write"] }
diff --git a/gix-date/src/parse/function.rs b/gix-date/src/parse/function.rs
index 00b000be4d2..6fa5b946a07 100644
--- a/gix-date/src/parse/function.rs
+++ b/gix-date/src/parse/function.rs
@@ -71,7 +71,7 @@ use crate::{
 /// If `now` is October 27, 2023 at 10:00:00 UTC:
 ///     *   `2 minutes ago` (October 27, 2023 at 09:58:00 UTC)
 ///     *   `3 hours ago` (October 27, 2023 at 07:00:00 UTC)
-pub fn parse(input: &str, now: Option<SystemTime>) -> Result<Time, Error> {
+pub fn parse(input: &str, now: Option<SystemTime>) -> exn::Result<Time, Error> {
     Ok(if let Ok(val) = Date::strptime(SHORT.0, input) {
         let val = val
             .to_zoned(TimeZone::UTC)
@@ -97,7 +97,7 @@ pub fn parse(input: &str, now: Option<SystemTime>) -> Result<Time, Error> {
         // Format::Raw
         val
     } else {
-        return Err(Error::InvalidDateString { input: input.into() });
+        exn::bail!(Error::InvalidDateString { input: input.into() })
     })
 }
 
@@ -168,7 +168,7 @@ pub fn parse_header(input: &str) -> Option<Time> {
 /// whose weekdays are inconsistent with the date. While the day-of-week
 /// still must be parsed, it is otherwise ignored. This seems to be
 /// consistent with how `git` behaves.
-fn strptime_relaxed(fmt: &str, input: &str) -> Result<Zoned, jiff::Error> {
+fn strptime_relaxed(fmt: &str, input: &str) -> std::result::Result<Zoned, jiff::Error> {
     let mut tm = jiff::fmt::strtime::parse(fmt, input)?;
     tm.set_weekday(None);
     tm.to_zoned()
@@ -176,7 +176,7 @@ fn strptime_relaxed(fmt: &str, input: &str) -> Result<Zoned, jiff::Error> {
 
 /// This is just like strptime_relaxed, except for RFC 2822 parsing.
 /// Namely, it permits the weekday to be inconsistent with the date.
-fn rfc2822_relaxed(input: &str) -> Result<Zoned, jiff::Error> {
+fn rfc2822_relaxed(input: &str) -> std::result::Result<Zoned, jiff::Error> {
     static P: rfc2822::DateTimeParser = rfc2822::DateTimeParser::new().relaxed_weekday(true);
     P.parse_zoned(input)
 }
diff --git a/gix-date/src/parse/mod.rs b/gix-date/src/parse/mod.rs
index 33b8a9a8610..33406638511 100644
--- a/gix-date/src/parse/mod.rs
+++ b/gix-date/src/parse/mod.rs
@@ -4,19 +4,73 @@ use smallvec::SmallVec;
 
 use crate::Time;
 
-#[derive(thiserror::Error, Debug, Clone)]
+/// Errors that can occur when parsing dates.
+#[derive(Debug, Clone)]
 #[allow(missing_docs)]
 pub enum Error {
-    #[error("Could not convert a duration into a date")]
     RelativeTimeConversion,
-    #[error("Date string can not be parsed")]
     InvalidDateString { input: String },
-    #[error("The heat-death of the universe happens before this date")]
-    InvalidDate(#[from] std::num::TryFromIntError),
-    #[error("Current time is missing but required to handle relative dates.")]
+    InvalidDate(std::num::TryFromIntError),
     MissingCurrentTime,
 }
 
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Error::RelativeTimeConversion => write!(f, "Could not convert a duration into a date"),
+            Error::InvalidDateString { input } => write!(f, "Date string can not be parsed: {input}"),
+            Error::InvalidDate(err) => write!(f, "The heat-death of the universe happens before this date: {err}"),
+            Error::MissingCurrentTime => write!(f, "Current time is missing but required to handle relative dates."),
+        }
+    }
+}
+
+impl std::error::Error for Error {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        match self {
+            Error::InvalidDate(err) => Some(err),
+            _ => None,
+        }
+    }
+}
+
+/// A wrapper around `exn::Exn<Error>` that implements `std::error::Error`.
+///
+/// This type is returned by functions that integrate with external APIs requiring `std::error::Error`,
+/// while internally using exn for context-aware error tracking.
+#[derive(Debug)]
+pub struct ParseError(exn::Exn<Error>);
+
+impl ParseError {
+    /// Create a ParseError from an exn error.
+    pub fn from_exn(exn: exn::Exn<Error>) -> Self {
+        Self(exn)
+    }
+
+    /// Get a reference to the underlying error.
+    pub fn as_error(&self) -> &Error {
+        self.0.as_error()
+    }
+}
+
+impl std::fmt::Display for ParseError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        std::fmt::Display::fmt(&self.0, f)
+    }
+}
+
+impl std::error::Error for ParseError {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        Some(self.0.as_error())
+    }
+}
+
+impl From<exn::Exn<Error>> for ParseError {
+    fn from(exn: exn::Exn<Error>) -> Self {
+        Self(exn)
+    }
+}
+
 /// A container for just enough bytes to hold the largest-possible [`time`](Time) instance.
 /// It's used in conjunction with
 #[derive(Default, Clone)]
@@ -55,10 +109,12 @@ impl Time {
 }
 
 impl FromStr for Time {
-    type Err = Error;
+    type Err = ParseError;
 
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        crate::parse_header(s).ok_or_else(|| Error::InvalidDateString { input: s.into() })
+    fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
+        crate::parse_header(s)
+            .ok_or_else(|| Error::InvalidDateString { input: s.into() })
+            .map_err(|e| ParseError::from_exn(exn::Exn::from(e)))
     }
 }
 
diff --git a/gix-date/tests/time/parse/mod.rs b/gix-date/tests/time/parse/mod.rs
index f8a5f858c15..86bc3833225 100644
--- a/gix-date/tests/time/parse/mod.rs
+++ b/gix-date/tests/time/parse/mod.rs
@@ -65,7 +65,7 @@ fn git_rfc2822() {
 #[test]
 fn raw() -> gix_testtools::Result {
     assert_eq!(
-        gix_date::parse("1660874655 +0800", None)?,
+        gix_date::parse("1660874655 +0800", None).map_err(gix_date::parse::ParseError::from)?,
         Time {
             seconds: 1660874655,
             offset: 28800,
@@ -73,7 +73,7 @@ fn raw() -> gix_testtools::Result {
     );
 
     assert_eq!(
-        gix_date::parse("1112911993 +0100", None)?,
+        gix_date::parse("1112911993 +0100", None).map_err(gix_date::parse::ParseError::from)?,
         Time {
             seconds: 1112911993,
             offset: 3600,
@@ -81,7 +81,7 @@ fn raw() -> gix_testtools::Result {
     );
 
     assert_eq!(
-        gix_date::parse("1313584730 +051500", None)?,
+        gix_date::parse("1313584730 +051500", None).map_err(gix_date::parse::ParseError::from)?,
         Time {
             seconds: 1313584730,
             offset: 18900,
@@ -90,7 +90,7 @@ fn raw() -> gix_testtools::Result {
     );
 
     assert_eq!(
-        gix_date::parse("1313584730 -0230", None)?,
+        gix_date::parse("1313584730 -0230", None).map_err(gix_date::parse::ParseError::from)?,
         Time {
             seconds: 1313584730,
             offset: -150 * 60,
@@ -177,8 +177,9 @@ fn git_default() {
 
 #[test]
 fn invalid_dates_can_be_produced_without_current_time() {
+    let err = gix_date::parse("foobar", None).unwrap_err();
     assert!(matches!(
-        gix_date::parse("foobar", None).unwrap_err(),
+        err.as_error(),
         gix_date::parse::Error::InvalidDateString { input } if input == "foobar"
     ));
 }
diff --git a/gix-date/tests/time/parse/relative.rs b/gix-date/tests/time/parse/relative.rs
index c0206907c52..126416c4d0d 100644
--- a/gix-date/tests/time/parse/relative.rs
+++ b/gix-date/tests/time/parse/relative.rs
@@ -10,8 +10,9 @@ fn large_offsets() {
 
 #[test]
 fn large_offsets_do_not_panic() {
+    let result = gix_date::parse("9999999999 weeks ago", Some(std::time::UNIX_EPOCH));
     assert!(matches!(
-        gix_date::parse("9999999999 weeks ago", Some(std::time::UNIX_EPOCH)),
+        result.as_ref().map_err(|e| e.as_error()),
         Err(gix_date::parse::Error::RelativeTimeConversion)
     ));
 }
diff --git a/gix-revision/Cargo.toml b/gix-revision/Cargo.toml
index 9836b2295c0..860857b8365 100644
--- a/gix-revision/Cargo.toml
+++ b/gix-revision/Cargo.toml
@@ -37,6 +37,7 @@ gix-trace = { version = "^0.1.17", path = "../gix-trace", optional = true }
 
 bstr = { version = "1.12.0", default-features = false, features = ["std"] }
 bitflags = { version = "2", optional = true }
+exn = "0.2.1"
 thiserror = "2.0.17"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
 document-features = { version = "0.2.1", optional = true }
diff --git a/gix-revision/src/spec/parse/function.rs b/gix-revision/src/spec/parse/function.rs
index 9941c993499..42a71fbbd63 100644
--- a/gix-revision/src/spec/parse/function.rs
+++ b/gix-revision/src/spec/parse/function.rs
@@ -439,7 +439,7 @@ where
                                 .and_then(|date| {
                                     gix_date::parse(date, None).map_err(|err| Error::Time {
                                         input: nav.into(),
-                                        source: err.into(),
+                                        source: Some(err.as_error().clone()),
                                     })
                                 })?;
                             delegate::ReflogLookup::Date(time)
@@ -466,7 +466,7 @@ where
                     .and_then(|date| {
                         gix_date::parse(date, Some(SystemTime::now())).map_err(|err| Error::Time {
                             input: nav.into(),
-                            source: err.into(),
+                            source: Some(err.as_error().clone()),
                         })
                     })?;
                 delegate
diff --git a/gix-revision/src/spec/parse/mod.rs b/gix-revision/src/spec/parse/mod.rs
index 5a64012c666..272f4f1e782 100644
--- a/gix-revision/src/spec/parse/mod.rs
+++ b/gix-revision/src/spec/parse/mod.rs
@@ -19,6 +19,7 @@ pub enum Error {
     #[error("Could not parse time {:?} for revlog lookup.", .input)]
     Time {
         input: BString,
+        #[source]
         source: Option<gix_date::parse::Error>,
     },
     #[error("Sibling branches like 'upstream' or 'push' require a branch name with remote configuration, got {:?}", .name)]
diff --git a/gix/Cargo.toml b/gix/Cargo.toml
index 50dd2926394..401fab9d3f0 100644
--- a/gix/Cargo.toml
+++ b/gix/Cargo.toml
@@ -377,6 +377,7 @@ gix-transport = { version = "^0.52.1", path = "../gix-transport", optional = tru
 # Just to get the progress-tree feature
 prodash = { version = "30.0.1", optional = true, features = ["progress-tree"] }
 signal-hook = { version = "0.4.1", default-features = false, optional = true }
+exn = "0.2.1"
 thiserror = "2.0.17"
 serde = { version = "1.0.114", optional = true, default-features = false, features = [
     "derive",
diff --git a/gix/src/config/mod.rs b/gix/src/config/mod.rs
index ffcd31edf7b..7f7b26fcff0 100644
--- a/gix/src/config/mod.rs
+++ b/gix/src/config/mod.rs
@@ -451,7 +451,7 @@ pub mod remote {
 ///
 pub mod time {
     /// The error produced when failing to parse time from configuration.
-    pub type Error = super::key::Error<gix_date::parse::Error, 't', 'i'>;
+    pub type Error = super::key::Error<gix_date::parse::ParseError, 't', 'i'>;
 }
 
 ///
diff --git a/gix/src/config/tree/keys.rs b/gix/src/config/tree/keys.rs
index c2df5a3842e..7d1af8405aa 100644
--- a/gix/src/config/tree/keys.rs
+++ b/gix/src/config/tree/keys.rs
@@ -430,16 +430,15 @@ mod time {
             &self,
             value: Cow<'_, BStr>,
             now: Option<std::time::SystemTime>,
-        ) -> Result<gix_date::Time, gix_date::parse::Error> {
-            gix_date::parse(
-                value
-                    .as_ref()
-                    .to_str()
-                    .map_err(|_| gix_date::parse::Error::InvalidDateString {
-                        input: value.to_string(),
-                    })?,
-                now,
-            )
+        ) -> Result<gix_date::Time, gix_date::parse::ParseError> {
+            let str_value = value
+                .as_ref()
+                .to_str()
+                .map_err(|_| gix_date::parse::Error::InvalidDateString {
+                    input: value.to_string(),
+                })
+                .map_err(|e| gix_date::parse::ParseError::from_exn(exn::Exn::from(e)))?;
+            gix_date::parse(str_value, now).map_err(gix_date::parse::ParseError::from)
         }
     }
 }
@@ -530,7 +529,8 @@ pub mod validate {
 
     impl Validate for Time {
         fn validate(&self, value: &BStr) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
-            gix_date::parse(value.to_str()?, std::time::SystemTime::now().into())?;
+            gix_date::parse(value.to_str()?, std::time::SystemTime::now().into())
+                .map_err(gix_date::parse::ParseError::from)?;
             Ok(())
         }
     }
diff --git a/gix/src/object/commit.rs b/gix/src/object/commit.rs
index a872f02f972..8843c4d4d47 100644
--- a/gix/src/object/commit.rs
+++ b/gix/src/object/commit.rs
@@ -11,7 +11,7 @@ mod error {
         #[error("The commit could not be decoded fully or partially")]
         Decode(#[from] gix_object::decode::Error),
         #[error("The commit date could not be parsed")]
-        ParseDate(#[from] gix_date::parse::Error),
+        ParseDate(#[from] gix_date::parse::ParseError),
         #[error("Expected object of type {}, but got {}", .expected, .actual)]
         ObjectKind {
             expected: gix_object::Kind,
diff --git a/gix/src/tag.rs b/gix/src/tag.rs
index a69819b510f..45d8dd37362 100644
--- a/gix/src/tag.rs
+++ b/gix/src/tag.rs
@@ -13,7 +13,7 @@ mod error {
         #[error(transparent)]
         ReferenceEdit(#[from] crate::reference::edit::Error),
         #[error(transparent)]
-        DateParseError(#[from] gix_date::parse::Error),
+        DateParseError(#[from] gix_date::parse::ParseError),
     }
 }
 pub use error::Error;
diff --git a/src/shared.rs b/src/shared.rs
index b38f9248aa4..dcd772198b4 100644
--- a/src/shared.rs
+++ b/src/shared.rs
@@ -391,7 +391,10 @@ mod clap {
 
         fn parse_ref(&self, cmd: &Command, arg: Option<&Arg>, value: &OsStr) -> Result<Self::Value, Error> {
             StringValueParser::new()
-                .try_map(|arg| gix::date::parse(&arg, Some(std::time::SystemTime::now())))
+                .try_map(|arg| {
+                    gix::date::parse(&arg, Some(std::time::SystemTime::now()))
+                        .map_err(gix::date::parse::ParseError::from)
+                })
                 .parse_ref(cmd, arg, value)
         }
     }