fix: preserve metaclasses and __registry_key__ in rebuild_with_none_defaults

Author: trissim

src/objectstate/lazy_factory.py

@@ -99,7 +99,10 @@ def rebuild_with_none_defaults(
     namespace = {}
     for key, value in cls.__dict__.items():
         if key.startswith('__') and key.endswith('__'):
-            continue  # Skip dunders (make_dataclass will generate them)
+            # Skip most dunders (make_dataclass will generate them)
+            # BUT preserve __registry_key__ for AutoRegisterMeta
+            if key != '__registry_key__':
+                continue
         if key == '__dataclass_fields__':
             continue  # Will be regenerated
         namespace[key] = value
@@ -114,6 +117,9 @@ def rebuild_with_none_defaults(
         for b in cls.__mro__[1:]
     )
 
+    # Get the original metaclass to preserve it
+    orig_metaclass = type(cls)
+
     # Create new class
     new_cls = make_dataclass(
         new_name or cls.__name__,
@@ -128,6 +134,18 @@ def rebuild_with_none_defaults(
     if new_name is None:
         new_cls.__qualname__ = cls.__qualname__
 
+    # Preserve original metaclass if it's not just type
+    # This is critical for AutoRegisterMeta and other custom metaclasses
+    if orig_metaclass is not type:
+        # Re-create the class with the original metaclass
+        # We need to do this because make_dataclass doesn't accept metaclass parameter
+        # But we must NOT re-apply @dataclass since make_dataclass already did that
+        new_cls = orig_metaclass(
+            new_cls.__name__,
+            new_cls.__bases__,
+            dict(new_cls.__dict__),
+        )
+
     return new_cls
 
 

src/objectstate/object_state.py

@@ -2876,14 +2876,16 @@ def _extract_all_parameters_flat(self, obj: Any, prefix: str = '', exclude_param
             exclude_params: List of top-level parameter names to exclude
         """
         exclude_params = exclude_params or []
-        
+
         obj_type = type(obj)
         is_function = obj_type.__name__ == 'function'
 
         # Delegate signature default extraction to python_introspect (it must derive
         # defaults from the type/signature and avoid instance attribute reads).
         param_info = self._analyze_parameters(obj, exclude_params if not prefix else [])
 
+        logger.debug(f"🔧 _extract_all_parameters_flat: obj_type={obj_type.__name__}, prefix={prefix!r}, param_info keys={list(param_info.keys())}")
+
         for param_name, info in param_info.items():
             # Skip excluded parameters (only at top level)
             if not prefix and param_name in exclude_params: