refactor(firmware): centralize configuration and diagnostics

firmware/libs/kaptan-config-mavlink/src/protocol.rs

@@ -1,7 +1,8 @@
 //! Stable typed outcomes for the Kaptan configuration microservice.
 
 use kaptan_config::{ConfigState, ConfigViolation, FieldId};
-use kaptan_log::{EventHub, KaptanError, LogFlags, PublishOutcome};
+use kaptan_log::KaptanError;
+
 /// Operation reported in an authoritative result record.
 #[derive(Clone, Copy, Debug, Eq, PartialEq)]
 pub enum Operation {
@@ -17,8 +18,6 @@ pub enum Operation {
     Commit,
     /// Transaction abort.
     Abort,
-    /// CBOR snapshot import into the isolated transaction.
-    Import,
 }
 
 /// Stable result classification.
@@ -38,11 +37,7 @@ pub enum ResultKind {
 pub enum ProtocolError {
     /// The request target did not match this component.
     BadTarget,
-    /// Authorization was absent or insufficient.
-    AuthorizationDenied,
-    /// The optimistic durable generation did not match.
-    GenerationConflict,
-    /// The single transaction slot is occupied.
+    /// The configuration lease or single transaction slot is occupied.
     SessionBusy,
     /// The session is unknown, expired, or belongs to a different principal.
     InvalidSession,
@@ -54,22 +49,14 @@ pub enum ProtocolError {
     BadState,
     /// The field is not present in this schema.
     UnknownField(FieldId),
+    /// A query requested an empty or out-of-range descriptor span.
+    InvalidQuery,
     /// The typed setter does not match the field descriptor.
     TypeMismatch(FieldId),
     /// A local or complete validation issue.
     Violation(ConfigViolation),
     /// Persistence failed after a complete validation pass.
     StorageFailure,
-    /// A CBOR snapshot could not be decoded into this schema.
-    CborMalformed,
-    /// A CBOR snapshot exceeded the fixed import budget.
-    CborTooLarge,
-    /// The complete CBOR snapshot did not match the supplied CRC-32C.
-    BlobCrc,
-    /// The uploaded CBOR blob was prepared for a different schema.
-    SchemaMismatch,
-    /// This deployment does not expose bounded CBOR transaction import.
-    ImportUnavailable,
     /// The adapter reached an impossible internal state.
     Internal,
 }
@@ -81,12 +68,8 @@ pub struct ConfigReply {
     pub request_id: u32,
     /// The current session, or zero when none exists.
     pub session_id: u32,
-    /// Server-assigned import transfer identity, or zero when not importing.
-    pub transfer_id: u32,
     /// The transaction revision, or zero when no transaction exists.
     pub revision: u32,
-    /// Latest committed generation, or zero for the factory profile.
-    pub generation: u64,
     /// Completed operation.
     pub operation: Operation,
     /// High-level result.
@@ -130,66 +113,4 @@ impl ConfigReply {
             _ => 0,
         }
     }
-
-    /// Enqueues a critical diagnostic companion for a rejected structured
-    /// result. The `KAPTAN_CONFIG_RESULT` remains the correlated,
-    /// field/rule-precise authority; this sends only the derive-generated
-    /// high-level `ProtocolError` display identity through `KAPTAN_ERROR`.
-    ///
-    /// The helper deliberately carries no request/session/generation fields
-    /// into the error channel. A composition owner may call it after it has
-    /// emitted or retained the authoritative result.
-    pub fn publish_rejection<const CRITICAL: usize, const BEST_EFFORT: usize>(
-        self,
-        hub: &mut EventHub<CRITICAL, BEST_EFFORT>,
-    ) -> Option<PublishOutcome> {
-        if self.result != ResultKind::Rejected {
-            return None;
-        }
-        self.error
-            .as_ref()
-            .map(|error| hub.publish_error(LogFlags::NONE, error))
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use kaptan_log::{EventHub, LogFilter, PublishOutcome, RecordChannel};
-
-    use super::{ConfigReply, Operation, ProtocolError, ResultKind};
-    use kaptan_config::ConfigState;
-
-    #[test]
-    fn rejected_result_enqueues_only_its_high_level_error_identity() {
-        let reply = ConfigReply {
-            request_id: 42,
-            session_id: 7,
-            transfer_id: 0,
-            revision: 3,
-            generation: 9,
-            operation: Operation::Set,
-            result: ResultKind::Rejected,
-            error: Some(ProtocolError::BadState),
-            state: ConfigState::Editing,
-        };
-        let mut hub = EventHub::<1, 1>::new(LogFilter::default());
-        assert_eq!(
-            reply.publish_rejection(&mut hub),
-            Some(PublishOutcome::Queued)
-        );
-        let record = hub.peek().expect("rejection is retained");
-        assert_eq!(record.channel(), RecordChannel::Error);
-        assert_eq!(
-            record.error_path().unwrap().as_str(),
-            "kaptan_config_mavlink::protocol::ProtocolError::BadState"
-        );
-        assert!(record.additional_information().unwrap().is_empty());
-
-        let accepted = ConfigReply {
-            result: ResultKind::Accepted,
-            error: None,
-            ..reply
-        };
-        assert_eq!(accepted.publish_rejection(&mut hub), None);
-    }
 }