feat: added owned extensions and did some refactoring.

Signed-off-by: Teryl Taylor <terylt@ibm.com>

Author: terylt

crates/cpex-core/examples/cmf_capabilities_demo.rs

@@ -17,7 +17,7 @@ use cpex_core::cmf::{ContentPart, CmfHook, Message, MessagePayload, Role, ToolCa
 use cpex_core::context::PluginContext;
 use cpex_core::error::{PluginError, PluginViolation};
 use cpex_core::extensions::{
-    Guarded, HttpExtension, RequestExtension, SecurityExtension,
+    HttpExtension, RequestExtension, SecurityExtension,
 };
 use cpex_core::factory::{PluginFactory, PluginInstance};
 use cpex_core::hooks::adapter::TypedHandlerAdapter;
@@ -126,7 +126,7 @@ impl HookHandler<CmfHook> for HeaderInjector {
     ) -> PluginResult<MessagePayload> {
         // Can see HTTP (has read_headers)
         if let Some(ref http) = extensions.http {
-            println!("  [header-injector] HTTP headers visible: {:?}", http.read().request_headers);
+            println!("  [header-injector] HTTP headers visible: {:?}", http.request_headers);
         }
 
         // Can NOT see security subject (no read_subject)
@@ -202,7 +202,7 @@ impl HookHandler<CmfHook> for AuditLogger {
         }
 
         if let Some(ref http) = extensions.http {
-            if let Some(req_id) = http.read().get_header("X-Request-ID") {
+            if let Some(req_id) = http.get_header("X-Request-ID") {
                 print!("request_id='{}' ", req_id);
             }
         }
@@ -330,8 +330,8 @@ async fn main() {
             request_id: Some("req-abc-123".into()),
             ..Default::default()
         })),
-        security: Some(security),
-        http: Some(Guarded::new(http)),
+        security: Some(Arc::new(security)),
+        http: Some(Arc::new(http)),
         meta: Some(Arc::new(MetaExtension {
             entity_type: Some("tool".into()),
             entity_name: Some("get_compensation".into()),
@@ -362,7 +362,7 @@ async fn main() {
                 println!("  Labels after pre-invoke: {:?}", labels);
             }
             if let Some(ref http) = modified_ext.http {
-                println!("  Headers after pre-invoke: {:?}", http.read().request_headers);
+                println!("  Headers after pre-invoke: {:?}", http.request_headers);
             }
         }
     } else {
@@ -405,7 +405,7 @@ async fn main() {
         let mut security = SecurityExtension::default();
         security.add_label("PII");
         Extensions {
-            security: Some(security),
+            security: Some(Arc::new(security)),
             meta: Some(Arc::new(MetaExtension {
                 entity_type: Some("tool".into()),
                 entity_name: Some("get_compensation".into()),

crates/cpex-core/src/cmf/view.rs

@@ -328,7 +328,7 @@ impl<'a> MessageView<'a> {
     pub fn get_header(&self, name: &str) -> Option<&str> {
         self.extensions
             .and_then(|e| e.http.as_ref())
-            .and_then(|h| h.read().get_header(name))
+            .and_then(|h| h.get_header(name))
     }
 
     // -- Serialization --
@@ -438,8 +438,7 @@ impl<'a> MessageView<'a> {
 
                 // Request headers (strip sensitive)
                 if let Some(ref http) = ext.http {
-                    let http_ref = http.read();
-                    let safe: std::collections::HashMap<&String, &String> = http_ref
+                    let safe: std::collections::HashMap<&String, &String> = http
                         .request_headers
                         .iter()
                         .filter(|(k, _)| {
@@ -701,7 +700,8 @@ mod tests {
 
     #[test]
     fn test_view_with_extensions() {
-        use crate::extensions::{SecurityExtension, Guarded, HttpExtension};
+        use std::sync::Arc;
+        use crate::extensions::{SecurityExtension, HttpExtension};
 
         let mut security = SecurityExtension::default();
         security.add_label("PII");
@@ -710,8 +710,8 @@ mod tests {
         http.set_header("Authorization", "Bearer tok");
 
         let ext = Extensions {
-            security: Some(security),
-            http: Some(Guarded::new(http)),
+            security: Some(Arc::new(security)),
+            http: Some(Arc::new(http)),
             ..Default::default()
         };
 
@@ -768,7 +768,7 @@ mod tests {
     fn test_to_dict_with_extensions() {
         use std::sync::Arc;
         use crate::extensions::{
-            SecurityExtension, Guarded, HttpExtension, RequestExtension, AgentExtension,
+            SecurityExtension, HttpExtension, RequestExtension, AgentExtension,
         };
 
         let mut security = SecurityExtension::default();
@@ -785,8 +785,8 @@ mod tests {
         http.set_header("X-Request-ID", "req-123");
 
         let ext = Extensions {
-            security: Some(security),
-            http: Some(Guarded::new(http)),
+            security: Some(Arc::new(security)),
+            http: Some(Arc::new(http)),
             request: Some(Arc::new(RequestExtension {
                 environment: Some("production".into()),
                 ..Default::default()

crates/cpex-core/src/executor.rs

@@ -427,17 +427,17 @@ impl Executor {
                             if let Some(mp) = erased.modified_payload {
                                 *payload = mp;
                             }
-                            if let Some(me) = erased.modified_extensions {
+                            if let Some(owned) = erased.modified_extensions {
                                 // Validate tier constraints before accepting
-                                if !extensions.validate_immutable(&me) {
+                                if !extensions.validate_immutable(&owned) {
                                     warn!(
                                         "{} plugin '{}' violated immutable tier — \
                                          modified an immutable extension slot. \
                                          Extension changes rejected.",
                                         phase_label, plugin_name
                                     );
                                 } else if let Some(ref orig_sec) = extensions.security {
-                                    if let Some(ref new_sec) = me.security {
+                                    if let Some(ref new_sec) = owned.security {
                                         if !new_sec.labels.is_superset(&orig_sec.labels) {
                                             warn!(
                                                 "{} plugin '{}' violated monotonic tier — \
@@ -446,13 +446,13 @@ impl Executor {
                                                 phase_label, plugin_name
                                             );
                                         } else {
-                                            *extensions = me;
+                                            extensions.merge_owned(owned);
                                         }
                                     } else {
-                                        *extensions = me;
+                                        extensions.merge_owned(owned);
                                     }
                                 } else {
-                                    *extensions = me;
+                                    extensions.merge_owned(owned);
                                 }
                             }
                         }
@@ -809,7 +809,7 @@ impl Default for Executor {
 pub struct ErasedResultFields {
     pub continue_processing: bool,
     pub modified_payload: Option<Box<dyn PluginPayload>>,
-    pub modified_extensions: Option<Extensions>,
+    pub modified_extensions: Option<crate::hooks::payload::OwnedExtensions>,
     pub violation: Option<crate::error::PluginViolation>,
 }
 
@@ -894,10 +894,11 @@ mod tests {
         let mut security = crate::extensions::SecurityExtension::default();
         security.add_label("PII");
         let ext = Extensions {
-            security: Some(security),
+            security: Some(Arc::new(security)),
             ..Default::default()
         };
-        let result: PluginResult<TestPayload> = PluginResult::modify_extensions(ext);
+        let owned = ext.cow_copy();
+        let result: PluginResult<TestPayload> = PluginResult::modify_extensions(owned);
         let erased = erase_result(result);
         let fields = extract_erased(erased).unwrap();
         assert!(fields.continue_processing);