commit 1c21d1bd4bc1b9a0ac683ab4124577dea251f885
parent f972c1a11d9afaab4dfaece81a68f2ccdd9332a8
Author: triesap <tyson@radroots.org>
Date: Sun, 9 Aug 2026 17:22:40 +0000
merge: reconcile mobile runtime and Blossom fixes
- Preserve the standalone authority and catalog hardening history.
- Integrate bounded public Blossom server error evidence.
- Integrate Tokio-context execution for exported mobile futures.
- Retain the exact merged lockfile and verified package boundaries.
Diffstat:
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/crates/tera_core/src/runtime/builder.rs b/core/crates/tera_core/src/runtime/builder.rs
@@ -185,12 +185,13 @@ mod tests {
.sdk_blossom_evidence()
.expect("Blossom evidence")
.expect("configured evidence");
- assert_eq!(evidence.schema_version, 1);
+ assert_eq!(evidence.schema_version, 2);
assert_eq!(evidence.state, "configured_unobserved");
assert_eq!(evidence.last_successful_state, "configured_unobserved");
assert_eq!(evidence.transport_security, "development_cleartext");
assert!(evidence.observed_at_unix_ms.is_none());
assert!(evidence.error_code.is_none());
+ assert!(evidence.server_error_code.is_none());
assert!(
runtime
.configure_blossom(
diff --git a/core/crates/tera_core/src/runtime/sdk.rs b/core/crates/tera_core/src/runtime/sdk.rs
@@ -61,6 +61,7 @@ pub struct SdkBlossomEvidenceRecord {
pub observed_at_unix_ms: Option<u64>,
pub http_status: Option<u16>,
pub error_code: Option<String>,
+ pub server_error_code: Option<String>,
pub error_phase: Option<String>,
pub retryable: bool,
pub possible_orphan: bool,
@@ -294,6 +295,7 @@ fn sdk_blossom_evidence_record(
observed_at_unix_ms: value.observed_at_unix_ms(),
http_status: value.http_status(),
error_code: value.error_code().map(str::to_owned),
+ server_error_code: value.server_error_code().map(str::to_owned),
error_phase: value
.error_phase()
.map(blossom_phase_label)