moai-adk 0.25.4__py3-none-any.whl → 0.41.0__py3-none-any.whl

moai_adk/core/project/phase_executor.py

@@ -109,24 +109,12 @@ class PhaseExecutor:
 
             # Enhanced version context with multiple format options
             version_context["MOAI_VERSION"] = moai_version
-            version_context["MOAI_VERSION_SHORT"] = self._format_short_version(
-                moai_version
-            )
-            version_context["MOAI_VERSION_DISPLAY"] = self._format_display_version(
-                moai_version
-            )
-            version_context["MOAI_VERSION_TRIMMED"] = self._format_trimmed_version(
-                moai_version, max_length=10
-            )
-            version_context["MOAI_VERSION_SEMVER"] = self._format_semver_version(
-                moai_version
-            )
-            version_context["MOAI_VERSION_VALID"] = (
-                "true" if moai_version != "unknown" else "false"
-            )
-            version_context["MOAI_VERSION_SOURCE"] = self._get_version_source(
-                version_reader
-            )
+            version_context["MOAI_VERSION_SHORT"] = self._format_short_version(moai_version)
+            version_context["MOAI_VERSION_DISPLAY"] = self._format_display_version(moai_version)
+            version_context["MOAI_VERSION_TRIMMED"] = self._format_trimmed_version(moai_version, max_length=10)
+            version_context["MOAI_VERSION_SEMVER"] = self._format_semver_version(moai_version)
+            version_context["MOAI_VERSION_VALID"] = "true" if moai_version != "unknown" else "false"
+            version_context["MOAI_VERSION_SOURCE"] = self._get_version_source(version_reader)
 
             # Add performance metrics for debugging
             cache_age = version_reader.get_cache_age_seconds()
@@ -140,18 +128,10 @@ class PhaseExecutor:
             # Use fallback version with comprehensive fallback formatting
             fallback_version = __version__
             version_context["MOAI_VERSION"] = fallback_version
-            version_context["MOAI_VERSION_SHORT"] = self._format_short_version(
-                fallback_version
-            )
-            version_context["MOAI_VERSION_DISPLAY"] = self._format_display_version(
-                fallback_version
-            )
-            version_context["MOAI_VERSION_TRIMMED"] = self._format_trimmed_version(
-                fallback_version, max_length=10
-            )
-            version_context["MOAI_VERSION_SEMVER"] = self._format_semver_version(
-                fallback_version
-            )
+            version_context["MOAI_VERSION_SHORT"] = self._format_short_version(fallback_version)
+            version_context["MOAI_VERSION_DISPLAY"] = self._format_display_version(fallback_version)
+            version_context["MOAI_VERSION_TRIMMED"] = self._format_trimmed_version(fallback_version, max_length=10)
+            version_context["MOAI_VERSION_SEMVER"] = self._format_semver_version(fallback_version)
             version_context["MOAI_VERSION_VALID"] = "true"
             version_context["MOAI_VERSION_SOURCE"] = "fallback_package"
             version_context["MOAI_VERSION_CACHE_AGE"] = "unavailable"
@@ -292,9 +272,7 @@ class PhaseExecutor:
             progress_callback: Optional progress callback.
         """
         self.current_phase = 2
-        self._report_progress(
-            "Phase 2: Creating directory structure...", progress_callback
-        )
+        self._report_progress("Phase 2: Creating directory structure...", progress_callback)
 
         for directory in self.REQUIRED_DIRECTORIES:
             dir_path = project_path / directory
@@ -316,6 +294,8 @@ class PhaseExecutor:
         Returns:
             List of created files or directories.
         """
+        import stat
+
         self.current_phase = 3
         self._report_progress("Phase 3: Installing resources...", progress_callback)
 
@@ -324,16 +304,24 @@ class PhaseExecutor:
 
         # Set template variable context (if provided)
         if config:
-            language_config: dict[str, Any] = config.get("language", {})
-            if not isinstance(language_config, dict):
-                language_config = {}
+            # Get language settings from 'language_settings' key (dict)
+            # Falls back to 'language' key for backwards compatibility
+            language_config: dict[str, Any] = config.get("language_settings") or {}
+            if not language_config or not isinstance(language_config, dict):
+                # Backwards compatibility: try 'language' key as dict
+                legacy_lang = config.get("language", {})
+                language_config = legacy_lang if isinstance(legacy_lang, dict) else {}
 
             # Detect OS for cross-platform Hook path configuration
-            hook_project_dir = (
-                "%CLAUDE_PROJECT_DIR%"
-                if platform.system() == "Windows"
-                else "$CLAUDE_PROJECT_DIR"
-            )
+            hook_project_dir = "%CLAUDE_PROJECT_DIR%" if platform.system() == "Windows" else "$CLAUDE_PROJECT_DIR"
+
+            # Detect OS for cross-platform statusline command
+            # Windows: Use python -m for better PATH compatibility
+            # Unix: Use moai-adk directly (assumes installed via uv tool)
+            if platform.system() == "Windows":
+                statusline_command = "python -m moai_adk statusline"
+            else:
+                statusline_command = "moai-adk statusline"
 
             # Get enhanced version context with fallback strategies
             version_context = self._get_enhanced_version_context()
@@ -347,20 +335,33 @@ class PhaseExecutor:
                 "PROJECT_VERSION": config.get("version", "0.1.0"),
                 "PROJECT_OWNER": config.get("author", "@user"),
                 "AUTHOR": config.get("author", "@user"),
-                "CONVERSATION_LANGUAGE": language_config.get(
-                    "conversation_language", "en"
-                ),
-                "CONVERSATION_LANGUAGE_NAME": language_config.get(
-                    "conversation_language_name", "English"
-                ),
+                "CONVERSATION_LANGUAGE": language_config.get("conversation_language", "en"),
+                "CONVERSATION_LANGUAGE_NAME": language_config.get("conversation_language_name", "English"),
                 "CODEBASE_LANGUAGE": config.get("language", "generic"),
                 "PROJECT_DIR": hook_project_dir,
+                "STATUSLINE_COMMAND": statusline_command,
             }
             processor.set_context(context)
 
-        processor.copy_templates(
-            backup=False, silent=True
-        )  # Avoid progress bar conflicts
+        processor.copy_templates(backup=False, silent=True)  # Avoid progress bar conflicts
+
+        # Post-process: Set executable permission on shell scripts
+        # This is necessary because git may not preserve file permissions during clone/checkout
+        scripts_dir = project_path / ".moai" / "scripts"
+        logger = logging.getLogger(__name__)
+        if scripts_dir.exists():
+            logger.debug(f"Processing shell scripts in {scripts_dir}")
+            for script_file in scripts_dir.glob("*.sh"):
+                try:
+                    # Add execute permission for user, group, and others
+                    current_mode = script_file.stat().st_mode
+                    new_mode = current_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
+                    script_file.chmod(new_mode)
+                    logger.debug(f"Set executable permission on {script_file}: {oct(current_mode)} -> {oct(new_mode)}")
+                except Exception as e:
+                    logger.warning(f"Failed to set executable permission on {script_file}: {e}")
+        else:
+            logger.debug(f"Scripts directory not found: {scripts_dir}")
 
         # Return a simplified list of generated assets
         return [
@@ -377,64 +378,87 @@ class PhaseExecutor:
         config: dict[str, str | bool | dict[Any, Any]],
         progress_callback: ProgressCallback | None = None,
     ) -> list[str]:
-        """Phase 4: generate configuration.
+        """Phase 4: Update section YAML configuration files.
+
+        Note: As of v0.37.0, we use modular section YAML files instead of a single config.json.
+        Section files are located in .moai/config/sections/ and loaded by CLAUDE.md.
 
         Args:
             project_path: Project path.
-            config: Configuration dictionary.
+            config: Configuration dictionary with project, language, etc.
             progress_callback: Optional progress callback.
 
         Returns:
-            List of created files.
+            List of updated section files.
         """
         self.current_phase = 4
-        self._report_progress(
-            "Phase 4: Generating configurations...", progress_callback
-        )
+        self._report_progress("Phase 4: Updating section configurations...", progress_callback)
 
         logger = logging.getLogger(__name__)
+        sections_dir = project_path / ".moai" / "config" / "sections"
+        updated_files: list[str] = []
+
+        # Update project.yaml with dynamic values
+        project_yaml = sections_dir / "project.yaml"
+        if project_yaml.exists():
+            self._update_section_yaml(
+                project_yaml,
+                {
+                    "project.name": config.get("project", {}).get("name", project_path.name),
+                    "project.initialized": "true",
+                    "project.created_at": datetime.now().isoformat() + "Z",
+                },
+            )
+            updated_files.append(str(project_yaml))
+            logger.debug(f"Updated {project_yaml}")
 
-        # Read existing config to preserve user settings (Issue #165)
-        config_path = project_path / ".moai" / "config" / "config.json"
-        existing_config: dict[str, Any] = {}
-        if config_path.exists():
+        # Update system.yaml with version
+        system_yaml = sections_dir / "system.yaml"
+        if system_yaml.exists():
             try:
-                with open(config_path, "r", encoding="utf-8") as f:
-                    existing_config = json.load(f)
-                logger.debug(f"Successfully read existing config from {config_path}")
-            except (json.JSONDecodeError, OSError) as e:
-                logger.warning(f"Failed to read existing config: {e}. Starting fresh.")
-                existing_config = {}
-
-        # Enhanced config merging with comprehensive version preservation
-        merged_config = self._merge_configuration_preserving_versions(
-            config, existing_config
-        )
-
-        # Enhanced version handling using VersionReader for consistency
-        try:
-            version_reader = self._get_version_reader()
-            current_config_version = version_reader.get_version()
-
-            # Ensure version consistency across the merged config
-            self._ensure_version_consistency(
-                merged_config, current_config_version, existing_config
+                version_reader = self._get_version_reader()
+                current_version = version_reader.get_version()
+            except Exception:
+                current_version = __version__
+
+            self._update_section_yaml(
+                system_yaml,
+                {"moai.version": current_version},
             )
+            updated_files.append(str(system_yaml))
+            logger.debug(f"Updated {system_yaml}")
 
-            logger.debug(
-                f"Version consistency check completed. Current version: {current_config_version}"
-            )
-        except Exception as e:
-            logger.warning(
-                f"Version consistency check failed: {e}. Using fallback version."
-            )
-            merged_config["moai"]["version"] = __version__
+        logger.info(f"Updated {len(updated_files)} section configuration files")
+        return updated_files
+
+    def _update_section_yaml(self, yaml_path: Path, updates: dict[str, str]) -> None:
+        """
+        Update specific values in a YAML section file.
 
-        # Write final config with enhanced formatting
-        self._write_configuration_file(config_path, merged_config)
-        logger.info(f"Configuration file written to {config_path}")
+        Args:
+            yaml_path: Path to the YAML file
+            updates: Dictionary of dotted paths to new values (e.g., {"project.name": "MyProject"})
+        """
+        import yaml
+
+        try:
+            with open(yaml_path, "r", encoding="utf-8") as f:
+                content = yaml.safe_load(f) or {}
+
+            for dotted_key, value in updates.items():
+                keys = dotted_key.split(".")
+                current = content
+                for key in keys[:-1]:
+                    if key not in current:
+                        current[key] = {}
+                    current = current[key]
+                current[keys[-1]] = value
 
-        return [str(config_path)]
+            with open(yaml_path, "w", encoding="utf-8") as f:
+                yaml.dump(content, f, default_flow_style=False, allow_unicode=True, sort_keys=False)
+
+        except Exception as e:
+            logging.getLogger(__name__).warning(f"Failed to update {yaml_path}: {e}")
 
     def _merge_configuration_preserving_versions(
         self, new_config: dict[str, Any], existing_config: dict[str, Any]
@@ -467,9 +491,7 @@ class PhaseExecutor:
         for section_name, strategy in config_sections.items():
             if section_name in existing_config:
                 logger.debug(f"Merging section: {section_name}")
-                self._merge_config_section(
-                    merged_config, existing_config, section_name, strategy
-                )
+                self._merge_config_section(merged_config, existing_config, section_name, strategy)
 
         return merged_config
 
@@ -553,12 +575,8 @@ class PhaseExecutor:
         elif "version" in config_moai:
             # Version already in new config, validate it
             config_version = config_moai["version"]
-            if config_version == "unknown" or not self._is_valid_version_format(
-                config_version
-            ):
-                logger.debug(
-                    f"Invalid config version {config_version}, updating to current: {current_version}"
-                )
+            if config_version == "unknown" or not self._is_valid_version_format(config_version):
+                logger.debug(f"Invalid config version {config_version}, updating to current: {current_version}")
                 config_moai["version"] = current_version
         else:
             # No version found, use current version
@@ -580,9 +598,7 @@ class PhaseExecutor:
         pattern = r"^v?(\d+\.\d+\.\d+(-[a-zA-Z0-9]+)?)$"
         return bool(re.match(pattern, version))
 
-    def _write_configuration_file(
-        self, config_path: Path, config: dict[str, Any]
-    ) -> None:
+    def _write_configuration_file(self, config_path: Path, config: dict[str, Any]) -> None:
         """
         Write configuration file with enhanced formatting and error handling.
 
@@ -621,9 +637,7 @@ class PhaseExecutor:
             progress_callback: Optional progress callback.
         """
         self.current_phase = 5
-        self._report_progress(
-            "Phase 5: Validation and finalization...", progress_callback
-        )
+        self._report_progress("Phase 5: Validation and finalization...", progress_callback)
 
         # Validate installation results
         # Comprehensive installation validation
@@ -631,9 +645,8 @@ class PhaseExecutor:
         # - 0-project.md, 1-plan.md, 2-run.md, 3-sync.md
         self.validator.validate_installation(project_path)
 
-        # Initialize Git for team mode
-        if mode == "team":
-            self._initialize_git(project_path)
+        # Initialize Git for all modes (team, personal, solo)
+        self._initialize_git(project_path)
 
     def _create_backup(self, project_path: Path) -> None:
         """Create a single backup (v0.4.2).
@@ -698,11 +711,17 @@ class PhaseExecutor:
                 dst_item.mkdir(parents=True, exist_ok=True)
 
     def _initialize_git(self, project_path: Path) -> None:
-        """Initialize a Git repository.
+        """Initialize a Git repository if not already initialized.
 
         Args:
             project_path: Project path.
         """
+        # Check if .git directory already exists
+        git_dir = project_path / ".git"
+        if git_dir.exists() and git_dir.is_dir():
+            # Git already initialized, skip
+            return
+
         try:
             subprocess.run(
                 ["git", "init"],

moai_adk/core/project/validator.py

@@ -33,7 +33,7 @@ class ProjectValidator:
 
     # Required files
     REQUIRED_FILES = [
-        ".moai/config/config.json",
+        ".moai/config/config.yaml",
         "CLAUDE.md",
     ]
 
@@ -59,9 +59,7 @@ class ProjectValidator:
         import sys
 
         if sys.version_info < (3, 10):
-            raise ValidationError(
-                f"Python 3.10+ required (current: {sys.version_info.major}.{sys.version_info.minor})"
-            )
+            raise ValidationError(f"Python 3.10+ required (current: {sys.version_info.major}.{sys.version_info.minor})")
 
     def validate_project_path(self, project_path: Path) -> None:
         """Verify the project path.
@@ -78,9 +76,7 @@ class ProjectValidator:
 
         # Parent directory must exist
         if not project_path.parent.exists():
-            raise ValidationError(
-                f"Parent directory does not exist: {project_path.parent}"
-            )
+            raise ValidationError(f"Parent directory does not exist: {project_path.parent}")
 
         # Prevent initialization inside the MoAI-ADK package
         if self._is_inside_moai_package(project_path):
@@ -108,18 +104,16 @@ class ProjectValidator:
             if not file_path.exists():
                 raise ValidationError(f"Required file not found: {file}")
 
-        alfred_dir = project_path / ".claude" / "commands" / "alfred"
+        moai_commands_dir = project_path / ".claude" / "commands" / "moai"
         missing_commands = []
         for cmd in self.REQUIRED_ALFRED_COMMANDS:
-            cmd_path = alfred_dir / cmd
+            cmd_path = moai_commands_dir / cmd
             if not cmd_path.exists():
                 missing_commands.append(cmd)
 
         if missing_commands:
             missing_list = ", ".join(missing_commands)
-            raise ValidationError(
-                f"Required Alfred command files not found: {missing_list}"
-            )
+            raise ValidationError(f"Required Alfred command files not found: {missing_list}")
 
     def _is_inside_moai_package(self, project_path: Path) -> bool:
         """Determine whether the path is inside the MoAI-ADK package.

moai_adk/core/quality/trust_checker.py

@@ -43,9 +43,7 @@ class TrustChecker:
     # T: Test First - Coverage Validation
     # ========================================
 
-    def validate_coverage(
-        self, project_path: Path, coverage_data: dict[str, Any]
-    ) -> ValidationResult:
+    def validate_coverage(self, project_path: Path, coverage_data: dict[str, Any]) -> ValidationResult:
         """
         Validate test coverage (≥85%)
 
@@ -119,9 +117,7 @@ class TrustChecker:
                 loc = len(lines)
 
                 if loc > MAX_FILE_LINES_OF_CODE:
-                    violations.append(
-                        f"{py_file.name}: {loc} LOC (Limit: {MAX_FILE_LINES_OF_CODE})"
-                    )
+                    violations.append(f"{py_file.name}: {loc} LOC (Limit: {MAX_FILE_LINES_OF_CODE})")
             except (UnicodeDecodeError, PermissionError):
                 # Security: handle file access errors
                 continue
@@ -129,9 +125,7 @@ class TrustChecker:
         if not violations:
             return ValidationResult(passed=True, message="All files within 300 LOC")
 
-        details = "Files exceeding 300 LOC:\n" + "\n".join(
-            f"  - {v}" for v in violations
-        )
+        details = "Files exceeding 300 LOC:\n" + "\n".join(f"  - {v}" for v in violations)
         details += "\n\nRecommended: Refactor large files into smaller modules."
 
         return ValidationResult(
@@ -181,9 +175,7 @@ class TrustChecker:
         if not violations:
             return ValidationResult(passed=True, message="All functions within 50 LOC")
 
-        details = "Functions exceeding 50 LOC:\n" + "\n".join(
-            f"  - {v}" for v in violations
-        )
+        details = "Functions exceeding 50 LOC:\n" + "\n".join(f"  - {v}" for v in violations)
         details += "\n\nRecommended: Extract complex functions into smaller ones."
 
         return ValidationResult(
@@ -222,13 +214,9 @@ class TrustChecker:
                 continue
 
         if not violations:
-            return ValidationResult(
-                passed=True, message="All functions within 5 parameters"
-            )
+            return ValidationResult(passed=True, message="All functions within 5 parameters")
 
-        details = "Functions exceeding 5 parameters:\n" + "\n".join(
-            f"  - {v}" for v in violations
-        )
+        details = "Functions exceeding 5 parameters:\n" + "\n".join(f"  - {v}" for v in violations)
         details += "\n\nRecommended: Use data classes or parameter objects."
 
         return ValidationResult(
@@ -267,13 +255,9 @@ class TrustChecker:
                 continue
 
         if not violations:
-            return ValidationResult(
-                passed=True, message="All functions within complexity 10"
-            )
+            return ValidationResult(passed=True, message="All functions within complexity 10")
 
-        details = "Functions exceeding complexity 10:\n" + "\n".join(
-            f"  - {v}" for v in violations
-        )
+        details = "Functions exceeding complexity 10:\n" + "\n".join(f"  - {v}" for v in violations)
         details += "\n\nRecommended: Simplify complex logic using guard clauses."
 
         return ValidationResult(
@@ -295,9 +279,7 @@ class TrustChecker:
         complexity = 1
         for child in ast.walk(node):
             # Add 1 for each branching statement
-            if isinstance(
-                child, (ast.If, ast.While, ast.For, ast.ExceptHandler, ast.With)
-            ):
+            if isinstance(child, (ast.If, ast.While, ast.For, ast.ExceptHandler, ast.With)):
                 complexity += 1
             # Add 1 for each and/or operator
             elif isinstance(child, ast.BoolOp):
@@ -360,17 +342,37 @@ class TrustChecker:
         Returns:
             dict[str, str]: Selected tool dictionary
         """
-        config_path = project_path / ".moai" / "config" / "config.json"
-        if not config_path.exists():
-            return {
-                "test_framework": "pytest",
-                "coverage_tool": "coverage.py",
-                "linter": "ruff",
-                "type_checker": "mypy",
-            }
+        import yaml
 
-        config = json.loads(config_path.read_text())
-        language = config.get("project", {}).get("language", "python")
+        language = "python"  # Default
+
+        # Try section YAML file first (new format)
+        project_section_path = project_path / ".moai" / "config" / "sections" / "project.yaml"
+        if project_section_path.exists():
+            try:
+                with open(project_section_path, encoding="utf-8") as f:
+                    project_config = yaml.safe_load(f) or {}
+                language = project_config.get("project", {}).get("language", "python")
+            except (yaml.YAMLError, OSError):
+                pass  # Use default
+        else:
+            # Fall back to main config file (YAML or JSON)
+            yaml_config_path = project_path / ".moai" / "config" / "config.yaml"
+            json_config_path = project_path / ".moai" / "config" / "config.json"
+
+            if yaml_config_path.exists():
+                try:
+                    with open(yaml_config_path, encoding="utf-8") as f:
+                        config = yaml.safe_load(f) or {}
+                    language = config.get("project", {}).get("language", "python")
+                except (yaml.YAMLError, OSError):
+                    pass  # Use default
+            elif json_config_path.exists():
+                try:
+                    config = json.loads(json_config_path.read_text())
+                    language = config.get("project", {}).get("language", "python")
+                except (json.JSONDecodeError, OSError):
+                    pass  # Use default
 
         if language == "python":
             return {