fix: resolve rebase artifacts (fingerprint, conflict marker, missing field)

- Update public RPC schema fingerprint for the upstream+OtelExportData closure
- Add capabilities field to provider_readiness_tests SupervisorHello literal
- Remove stale conflict marker in supervisor lib.rs module list

Signed-off-by: Roland Huß <rhuss@redhat.com>

Author: rhuss

crates/openshell-server/src/grpc/provider_readiness_tests.rs

@@ -70,6 +70,7 @@ fn hello() -> SupervisorHello {
     SupervisorHello {
         sandbox_id: Uuid::new_v4().to_string(),
         instance_id: Uuid::new_v4().to_string(),
+        capabilities: Vec::new(),
         supports_provider_readiness: true,
     }
 }

crates/openshell-server/src/storage_proto.rs

@@ -118,7 +118,7 @@ mod tests {
     const STORAGE_V1_SCHEMA_SHA256: &str =
         "d68401809d8cea445c35233ef32412bbd041cb2ac5acaf368a0d0bf74d2ddf17";
     const PUBLIC_RPC_SCHEMA_SHA256: &str =
-        "PLACEHOLDER_RECOMPUTE_AFTER_REBASE";
+        "e66e97e0a010bd129de3f18eed83d1b01acf72209530c300e288c7f4fab77f1e";
     const DURABLE_SCHEMA_SHA256: &str =
         "654649c8f65f44ac2ba04290f49c56de2f488271f99bc0fd4c6d025039c05128";
     const PUBLIC_DURABLE_OVERLAP_SHA256: &str =

crates/openshell-supervisor/src/lib.rs

@@ -19,11 +19,8 @@ mod activity_aggregator;
 mod denial_aggregator;
 mod endpoint_status;
 mod mechanistic_mapper;
-<<<<<<< HEAD
-mod provider_readiness;
-=======
 mod otlp_relay;
->>>>>>> e9eff28c0 (feat(supervisor): wire the OTLP relay into the proxy and gateway session)
+mod provider_readiness;
 
 use miette::{IntoDiagnostic, Result, WrapErr};
 use std::future::Future;