Merge branch 'development' into fix/profile-preservation-bug

Resolved merge conflict by combining development's architectural improvements
with the profile preservation fix.

Changes:
- Accept development's multi-file settings merging (subagents.get_paths)
- Accept development's try_parse() for safer JSON parsing
- Add profile preservation fix (original_profile save/restore)
- Fix extends memory_subdir preservation pattern to profile as well

Author: Krashnicov

python/extensions/agent_init/_15_load_profile_settings.py

@@ -1,58 +1,53 @@
 from initialize import initialize_agent
-from python.helpers import dirty_json, files
+from python.helpers import dirty_json, files, subagents, projects
 from python.helpers.extension import Extension
 
 
 class LoadProfileSettings(Extension):
- 
+    
     async def execute(self, **kwargs) -> None:
 
         if not self.agent or not self.agent.config.profile:
             return
 
-        settings_path = files.get_abs_path("agents", self.agent.config.profile, "settings.json")
-        if files.exists(settings_path):
-            try:
-                override_settings_str = files.read_file(settings_path)
-                override_settings = dirty_json.parse(override_settings_str)
-
-                if isinstance(override_settings, dict):
-                    # Preserve the original memory_subdir unless it's explicitly overridden
-                    current_memory_subdir = self.agent.config.memory_subdir
-                    # FIX: Also preserve the original profile
-                    original_profile = self.agent.config.profile
-
-                    new_config = initialize_agent(override_settings=override_settings)
-
-                    if (
-                        "agent_memory_subdir" not in override_settings
-                        and current_memory_subdir != "default"
-                    ):
-                        new_config.memory_subdir = current_memory_subdir
-
-                    # FIX: Restore the original profile
-                    new_config.profile = original_profile
-
-                    self.agent.config = new_config
-
+        config_files = subagents.get_paths(self.agent, "settings.json", include_default=False)
+
+        settings_override = {}
+        for settings_path in config_files:
+            if files.exists(settings_path):
+                try:
+                    override_settings_str = files.read_file(settings_path)
+                    override_settings = dirty_json.try_parse(override_settings_str)
+                    if isinstance(override_settings, dict):
+                        settings_override.update(override_settings)
+                    else:
+                        raise Exception(
+                            f"Subordinate settings in {settings_path} must be a JSON object."
+                        )
+                except Exception as e:
                     self.agent.context.log.log(
-                        type="info",
+                        type="error",
                         content=(
-                            "Loaded custom settings for agent "
-                            f"{self.agent.number} with profile '{self.agent.config.profile}'."
+                            f"Error loading subordinate settings from {settings_path} for "
+                            f"profile '{self.agent.config.profile}': {e}"
                         ),
                     )
-                else:
-                    raise Exception(
-                        f"Subordinate settings in {settings_path} "
-                        "must be a JSON object."
-                    )
 
-            except Exception as e:
-                self.agent.context.log.log(
-                    type="error",
-                    content=(
-                        "Error loading subordinate settings for "
-                        f"profile '{self.agent.config.profile}': {e}"
-                    ),
-                )
+        if settings_override:
+            # Preserve the original memory_subdir unless it's explicitly overridden
+            current_memory_subdir = self.agent.config.memory_subdir
+            # FIX: Also preserve the original profile
+            original_profile = self.agent.config.profile
+            
+            new_config = initialize_agent(override_settings=settings_override)
+            
+            if (
+                "agent_memory_subdir" not in settings_override
+                and current_memory_subdir != "default"
+            ):
+                new_config.memory_subdir = current_memory_subdir
+            
+            # FIX: Restore the original profile
+            new_config.profile = original_profile
+            
+            self.agent.config = new_config