moai-adk 0.34.0__py3-none-any.whl → 1.1.0__py3-none-any.whl

moai_adk/core/error_recovery_system.py

@@ -855,7 +855,11 @@ class ErrorRecoverySystem:
             return False
 
     def _restore_config_backup(self, error_report: ErrorReport, parameters: Dict[str, Any]) -> bool:
-        """Restore configuration from backup"""
+        """Restore configuration from backup.
+
+        Supports both YAML and JSON configuration formats with backward
+        compatibility for legacy JSON-only backups.
+        """
         try:
             logger.info("Restoring configuration from backup...")
 
@@ -864,16 +868,30 @@ class ErrorRecoverySystem:
                 logger.warning("No configuration backup directory found")
                 return False
 
-            # Find most recent backup
-            backup_files = list(backup_dir.glob("config_*.json"))
+            # Find most recent backup - check both YAML and JSON formats
+            yaml_backups = list(backup_dir.glob("config_*.yaml"))
+            json_backups = list(backup_dir.glob("config_*.json"))
+            backup_files = yaml_backups + json_backups
+
             if not backup_files:
                 logger.warning("No configuration backups found")
                 return False
 
             latest_backup = max(backup_files, key=lambda f: f.stat().st_mtime)
+            is_yaml_backup = latest_backup.suffix in (".yaml", ".yml")
+
+            # Determine target config file based on backup format
+            if is_yaml_backup:
+                config_file = self.project_root / ".moai" / "config" / "config.yaml"
+            else:
+                # Legacy JSON backup - check if project uses YAML now
+                yaml_config = self.project_root / ".moai" / "config" / "config.yaml"
+                if yaml_config.exists():
+                    config_file = yaml_config
+                else:
+                    config_file = self.project_root / ".moai" / "config" / "config.json"
 
             # Restore configuration
-            config_file = self.project_root / ".moai" / "config" / "config.json"
             import shutil
 
             shutil.copy2(latest_backup, config_file)

moai_adk/core/git/conflict_detector.py

@@ -42,7 +42,14 @@ class GitConflictDetector:
         "CLAUDE.md",
         ".gitignore",
         ".claude/settings.json",
-        ".moai/config/config.json",
+        ".moai/config/config.json",  # Legacy monolithic config
+        ".moai/config/config.yaml",  # Legacy monolithic config
+        ".moai/config/sections/language.yaml",  # Section-based config
+        ".moai/config/sections/user.yaml",
+        ".moai/config/sections/project.yaml",
+        ".moai/config/sections/system.yaml",
+        ".moai/config/sections/git-strategy.yaml",
+        ".moai/config/sections/quality.yaml",
     }
 
     # Config file patterns that are generally safe
@@ -53,6 +60,8 @@ class GitConflictDetector:
         ".prettierrc",
         "settings.json",
         "config.json",
+        "config.yaml",
+        ".yaml",  # YAML files (includes section files)
         ".md",  # Markdown files
     }
 

moai_adk/core/git/event_detector.py

@@ -13,11 +13,14 @@ class EventDetector:
     CRITICAL_FILES = {
         "CLAUDE.md",
         "config.json",
-        ".moai/config/config.json",
+        "config.yaml",
+        ".moai/config/config.json",  # Legacy monolithic config
+        ".moai/config/config.yaml",  # Legacy monolithic config
     }
 
     CRITICAL_DIRS = {
         ".moai/memory",
+        ".moai/config/sections",  # Section-based config directory
     }
 
     def is_risky_deletion(self, deleted_files: list[str]) -> bool:
@@ -52,7 +55,13 @@ class EventDetector:
         """
         Determine whether the file is critical.
 
-        SPEC requirement: modifying CLAUDE.md, config.json, or .moai/memory/*.md is risky.
+        SPEC requirement: modifying CLAUDE.md, config files, or .moai/memory/*.md is risky.
+
+        Critical files include:
+        - CLAUDE.md
+        - Legacy: config.json, config.yaml, .moai/config/config.{json,yaml}
+        - New: .moai/config/sections/*.yaml
+        - Memory: .moai/memory/*.md
 
         Args:
             file_path: File path to inspect.
@@ -67,11 +76,13 @@ class EventDetector:
         # Convert to string for further checks
         path_str = str(file_path)
 
-        # Detect .moai/config/config.json paths
-        if ".moai/config/config.json" in path_str or ".moai\\config.json" in path_str:
+        # Detect .moai/config/config.{json,yaml} paths (legacy monolithic)
+        if ".moai/config/config.json" in path_str or ".moai\\config\\config.json" in path_str:
+            return True
+        if ".moai/config/config.yaml" in path_str or ".moai\\config\\config.yaml" in path_str:
             return True
 
-        # Detect files inside the .moai/memory/ directory
+        # Detect files inside critical directories (.moai/memory, .moai/config/sections)
         for critical_dir in self.CRITICAL_DIRS:
             if critical_dir in path_str or critical_dir.replace("/", "\\") in path_str:
                 return True

moai_adk/core/integration/engine.py

@@ -43,7 +43,7 @@ class TestEngine:
         return f"test_{self._test_counter:04d}"
 
     def execute_test(
-        self, test_func: Callable, test_name: str = None, components: List[str] = None
+        self, test_func: Callable, test_name: Optional[str] = None, components: Optional[List[str]] = None
     ) -> IntegrationTestResult:
         """
         Execute a single integration test.
@@ -88,7 +88,7 @@ class TestEngine:
         return result
 
     async def execute_test_async(
-        self, test_func: Callable, test_name: str = None, components: List[str] = None
+        self, test_func: Callable, test_name: Optional[str] = None, components: Optional[List[str]] = None
     ) -> IntegrationTestResult:
         """
         Execute a single integration test asynchronously.

moai_adk/core/integration/integration_tester.py

@@ -66,7 +66,7 @@ class IntegrationTester:
         return self.analyzer.get_execution_stats(self.test_results)
 
     def run_test(
-        self, test_func: Callable, test_name: str = None, components: List[str] = None
+        self, test_func: Callable, test_name: Optional[str] = None, components: Optional[List[str]] = None
     ) -> IntegrationTestResult:
         """
         Run a single integration test.
@@ -84,7 +84,7 @@ class IntegrationTester:
         return result
 
     async def run_test_async(
-        self, test_func: Callable, test_name: str = None, components: List[str] = None
+        self, test_func: Callable, test_name: Optional[str] = None, components: Optional[List[str]] = None
     ) -> IntegrationTestResult:
         """
         Run a single integration test asynchronously.
@@ -117,7 +117,7 @@ class IntegrationTester:
             """Placeholder test function"""
             return True
 
-        for test_case_name in test_suite.test_cases:
+        for test_case_name in test_suite.test_cases or []:
             # This is a simplified implementation
             # In practice, you would map test case names to actual test functions
             result = self.run_test(
@@ -185,7 +185,7 @@ class IntegrationTester:
         """
         return TestEnvironment(temp_dir)
 
-    def export_results(self, format: str = "dict") -> Union[Dict, str]:
+    def export_results(self, format: str = "dict") -> Union[List[Dict[str, Any]], Dict[str, Any]]:
         """
         Export test results in specified format.
 
@@ -193,7 +193,7 @@ class IntegrationTester:
             format: Export format ("dict", "json", "summary")
 
         Returns:
-            Exported results
+            Exported results (list of dicts for "dict" format, summary dict for "summary")
         """
         if format == "dict":
             return [vars(result) for result in self.test_results]  # type: ignore[return-value]

moai_adk/core/language_config_resolver.py

@@ -3,11 +3,17 @@ MoAI-ADK Language Configuration Resolver
 
 Centralized system for resolving language configuration from multiple sources:
 1. Environment variables (highest priority)
-2. Configuration file (.moai/config/config.json)
-3. Default values (fallback)
+2. Section files (.moai/config/sections/language.yaml, user.yaml)
+3. Legacy config file (.moai/config/config.yaml or config.json)
+4. Default values (fallback)
+
+Configuration Architecture:
+- New projects: Use modular section files for better organization
+- Legacy projects: Continue using config.json or config.yaml
+- Section files take priority over monolithic config if both exist
 
 This module provides a unified interface for all language-related configuration
-needs across the MoAI-ADK system.
+needs across the MoAI-ADK system with backward compatibility.
 """
 
 import json