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

moai_adk/astgrep/rules.py

@@ -0,0 +1,179 @@
+# AST-grep rule management
+"""Rule loading and management for AST-grep analyzer.
+
+This module provides classes for defining AST-grep rules and loading
+them from YAML configuration files.
+"""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+from typing import Any
+
+import yaml
+
+
+@dataclass
+class Rule:
+    """AST-grep rule definition.
+
+    Represents a single AST-grep rule that can be used for pattern
+    matching and code analysis.
+
+    Attributes:
+        id: Unique identifier for the rule.
+        language: Programming language this rule applies to.
+        severity: Severity level (error, warning, info, hint).
+        message: Human-readable description of the rule.
+        pattern: AST-grep pattern to match.
+        fix: Optional fix pattern for automatic correction.
+    """
+
+    id: str
+    language: str
+    severity: str  # error, warning, info, hint
+    message: str
+    pattern: str
+    fix: str | None = None
+
+
+class RuleLoader:
+    """Loader for AST-grep rules from various sources.
+
+    Supports loading rules from individual YAML files, directories
+    containing multiple rule files, and built-in rule sets.
+    """
+
+    def __init__(self) -> None:
+        """Initialize the RuleLoader."""
+        self._rules: list[Rule] = []
+
+    def load_from_file(self, config_path: str) -> list[Rule]:
+        """Load rules from a YAML configuration file.
+
+        Supports both single-document and multi-document YAML files
+        (documents separated by ---).
+
+        Args:
+            config_path: Path to the YAML configuration file.
+
+        Returns:
+            List of Rule objects loaded from the file.
+
+        Raises:
+            FileNotFoundError: If the file does not exist.
+            ValueError: If the YAML content is invalid.
+        """
+        path = Path(config_path)
+        if not path.exists():
+            raise FileNotFoundError(f"Rule file not found: {config_path}")
+
+        try:
+            content = path.read_text()
+            documents = list(yaml.safe_load_all(content))
+        except yaml.YAMLError as e:
+            raise ValueError(f"Invalid YAML in {config_path}: {e}") from e
+
+        rules: list[Rule] = []
+        for doc in documents:
+            if doc is None:
+                continue
+            rule = self._parse_rule_document(doc)
+            if rule:
+                rules.append(rule)
+
+        self._rules.extend(rules)
+        return rules
+
+    def _parse_rule_document(self, doc: dict[str, Any]) -> Rule | None:
+        """Parse a single rule document from YAML.
+
+        Args:
+            doc: Dictionary representing a rule document.
+
+        Returns:
+            Rule object or None if parsing fails.
+        """
+        if not isinstance(doc, dict):
+            return None
+
+        rule_id = doc.get("id")
+        language = doc.get("language")
+        severity = doc.get("severity", "warning")
+        message = doc.get("message", "")
+
+        # Extract pattern from rule.pattern or direct pattern field
+        pattern = None
+        if "rule" in doc and isinstance(doc["rule"], dict):
+            pattern = doc["rule"].get("pattern")
+        elif "pattern" in doc:
+            pattern = doc["pattern"]
+
+        # Extract fix if present
+        fix = doc.get("fix")
+
+        if not rule_id or not language or not pattern:
+            return None
+
+        return Rule(
+            id=rule_id,
+            language=language,
+            severity=severity,
+            message=message,
+            pattern=pattern,
+            fix=fix,
+        )
+
+    def load_builtin_rules(self) -> list[Rule]:
+        """Load built-in rules.
+
+        Returns the default set of rules bundled with the analyzer.
+        Currently returns an empty list; built-in rules can be added
+        in future versions.
+
+        Returns:
+            List of built-in Rule objects.
+        """
+        # Built-in rules can be defined here or loaded from bundled files
+        builtin_rules: list[Rule] = []
+        self._rules.extend(builtin_rules)
+        return builtin_rules
+
+    def get_rules_for_language(self, language: str) -> list[Rule]:
+        """Get all rules for a specific programming language.
+
+        Args:
+            language: The programming language to filter by.
+
+        Returns:
+            List of Rule objects for the specified language.
+        """
+        return [rule for rule in self._rules if rule.language == language]
+
+    def load_from_directory(self, directory_path: str) -> list[Rule]:
+        """Load rules from all YAML files in a directory.
+
+        Scans the directory for .yml and .yaml files and loads rules
+        from each one.
+
+        Args:
+            directory_path: Path to the directory containing rule files.
+
+        Returns:
+            List of all Rule objects loaded from the directory.
+
+        Raises:
+            FileNotFoundError: If the directory does not exist.
+        """
+        path = Path(directory_path)
+        if not path.exists():
+            raise FileNotFoundError(f"Directory not found: {directory_path}")
+
+        rules: list[Rule] = []
+        for yaml_file in path.glob("*.yml"):
+            rules.extend(self.load_from_file(str(yaml_file)))
+        for yaml_file in path.glob("*.yaml"):
+            rules.extend(self.load_from_file(str(yaml_file)))
+
+        return rules

moai_adk/cli/commands/analyze.py

@@ -5,6 +5,8 @@ Analyze command for MoAI-ADK
 Analyze Claude Code sessions and generate improvement suggestions.
 """
 
+import os
+import sys
 from pathlib import Path
 from typing import Optional
 
@@ -14,7 +16,12 @@ from rich.table import Table
 
 from moai_adk.core.analysis.session_analyzer import SessionAnalyzer
 
-console = Console()
+# Force UTF-8 encoding for Windows compatibility
+# Windows PowerShell/Console uses 'charmap' by default, which can't encode emojis
+if sys.platform == "win32":
+    console = Console(force_terminal=True, legacy_windows=False)
+else:
+    console = Console()
 
 
 @click.command()
@@ -47,7 +54,9 @@ def analyze(
         moai-adk analyze session --output /path/to/report.md
     """
     if project_path is None:
-        project_path = Path.cwd()
+        project_path = Path(os.getcwd())
+    elif isinstance(project_path, str):
+        project_path = Path(project_path)
 
     # Validate project path
     if not (project_path / ".moai").exists():

moai_adk/cli/commands/doctor.py

@@ -33,6 +33,7 @@ System diagnostics command:
 """
 
 import json
+import sys
 from pathlib import Path
 
 import click
@@ -43,7 +44,12 @@ from rich.table import Table
 from moai_adk.core.project.checker import SystemChecker, check_environment
 from moai_adk.core.project.detector import detect_project_language
 
-console = Console()
+# Force UTF-8 encoding for Windows compatibility
+# Windows PowerShell/Console uses 'charmap' by default, which can't encode emojis
+if sys.platform == "win32":
+    console = Console(force_terminal=True, legacy_windows=False)
+else:
+    console = Console()
 
 
 @click.command()

moai_adk/cli/commands/init.py

@@ -27,6 +27,8 @@ Project initialization command (interactive/non-interactive):
 """
 
 import json
+import os
+import sys
 from pathlib import Path
 from typing import Sequence
 
@@ -44,7 +46,12 @@ from moai_adk.statusline.version_reader import (
 )
 from moai_adk.utils.banner import print_banner, print_welcome_message
 
-console = Console()
+# Force UTF-8 encoding for Windows compatibility
+# Windows PowerShell/Console uses 'charmap' by default, which can't encode emojis
+if sys.platform == "win32":
+    console = Console(force_terminal=True, legacy_windows=False)
+else:
+    console = Console()
 
 
 def create_progress_callback(progress: Progress, task_ids: Sequence[TaskID]):
@@ -151,11 +158,28 @@ def init(
         custom_language = None
 
         # 3. Interactive vs Non-Interactive
+        # Default values for new settings (GLM-only simplified flow)
+        user_name = ""
+        service_type = "glm"  # Always GLM
+        pricing_plan = None  # Not used in GLM-only flow
+        glm_pricing_plan = "basic"  # Default GLM pricing plan
+        anthropic_api_key = None  # Not used in GLM-only flow
+        glm_api_key = None
+        git_mode = "manual"
+        github_username = None
+        git_commit_lang = "en"
+        code_comment_lang = "en"
+        doc_lang = "en"
+        tag_enabled = True  # NEW - SPEC-TAG-002
+        tag_mode = "warn"  # NEW - SPEC-TAG-002
+
         if non_interactive:
             # Non-Interactive Mode
             console.print(f"\n[cyan]🚀 Initializing project at {project_path}...[/cyan]\n")
             project_name = project_path.name if is_current_dir else path
             locale = locale or "en"
+            # Read GLM API key from environment variable in non-interactive mode
+            glm_api_key = os.getenv("MOAI_GLM_API_KEY") or os.getenv("GLM_API_KEY")
             # Language detection happens in /moai:0-project, so default to None here
             # This will become "generic" internally, but Summary will show more helpful message
             if not language:
@@ -164,7 +188,7 @@ def init(
             # Interactive Mode
             print_welcome_message()
 
-            # Interactive prompt
+            # Interactive prompt with simplified GLM-only flow
             answers = prompt_project_setup(
                 project_name=None if is_current_dir else path,
                 is_current_dir=is_current_dir,
@@ -172,18 +196,33 @@ def init(
                 initial_locale=locale,
             )
 
-            # Override with prompt answers
-            mode = answers["mode"]
+            # Extract answers (GLM-only flow)
             locale = answers["locale"]
-            language = answers["language"]
+            user_name = answers["user_name"]
             project_name = answers["project_name"]
-            custom_language = answers.get("custom_language")
+            glm_api_key = answers["glm_api_key"]
+            git_mode = answers["git_mode"]
+            github_username = answers["github_username"]
+            git_commit_lang = answers["git_commit_lang"]
+            code_comment_lang = answers["code_comment_lang"]
+            doc_lang = answers["doc_lang"]
+            tag_enabled = answers["tag_enabled"]  # NEW - SPEC-TAG-002
+            tag_mode = answers["tag_mode"]  # NEW - SPEC-TAG-002
+
+            # GLM-only defaults (not prompted in simplified flow)
+            service_type = "glm"
+            glm_pricing_plan = "basic"
+            pricing_plan = None
+            anthropic_api_key = None
+
+            # Map git_mode to mode for backward compatibility
+            mode = "personal" if git_mode in ("personal", "team") else "personal"
+
+            # Language detection happens in /moai:0-project
+            language = None
 
             console.print("\n[cyan]🚀 Starting installation...[/cyan]\n")
 
-            if locale is None:
-                locale = answers["locale"]
-
         # 4. Check for reinitialization (SPEC-INIT-003 v0.3.0) - DEFAULT TO FORCE MODE
         initializer = ProjectInitializer(project_path)
 
@@ -200,7 +239,9 @@ def init(
         # Always allow reinit (force mode by default)
         is_reinit = initializer.is_initialized()
 
-        # Reinit mode: set config.json optimized to false (v0.3.1+)
+        # Reinit mode: update configuration files (v0.3.1+)
+        # As of v0.37.0, we use section YAML files (.moai/config/sections/)
+        # but still support legacy config.yaml and config.json for backward compatibility
         if is_reinit:
             # Migration: Remove old hook files (Issue #163)
             old_hook_files = [
@@ -215,6 +256,7 @@ def init(
                         pass  # Ignore removal failures
 
             # Support both YAML (v0.32.5+) and JSON (legacy) config files
+            # New projects use section files; legacy projects may still have config.yaml/json
             config_yaml_path = project_path / ".moai" / "config" / "config.yaml"
             config_json_path = project_path / ".moai" / "config" / "config.json"
 
@@ -254,7 +296,11 @@ def init(
                     with open(config_path, "w", encoding="utf-8") as f:
                         if is_yaml:
                             yaml.safe_dump(
-                                config_data, f, default_flow_style=False, allow_unicode=True, sort_keys=False
+                                config_data,
+                                f,
+                                default_flow_style=False,
+                                allow_unicode=True,
+                                sort_keys=False,
                             )
                         else:
                             json.dump(config_data, f, indent=2, ensure_ascii=False)
@@ -288,8 +334,36 @@ def init(
                 backup_enabled=True,
                 progress_callback=callback,
                 reinit=True,  # Always allow reinit (force mode by default)
+                tag_enabled=tag_enabled,  # NEW - SPEC-TAG-002
+                tag_mode=tag_mode,  # NEW - SPEC-TAG-002
             )
 
+        # 5.5. Save additional configuration (both interactive and non-interactive)
+        if result.success:
+            # In non-interactive mode, only save API keys if provided via environment
+            if non_interactive:
+                # Only save GLM key if provided via environment variable
+                if glm_api_key:
+                    _save_glm_key(glm_api_key)
+            else:
+                # Interactive mode: save all additional config
+                _save_additional_config(
+                    project_path=project_path,
+                    project_name=project_name,
+                    locale=locale,
+                    user_name=user_name,
+                    service_type=service_type,
+                    pricing_plan=pricing_plan,
+                    glm_pricing_plan=glm_pricing_plan,
+                    anthropic_api_key=anthropic_api_key,
+                    glm_api_key=glm_api_key,
+                    git_mode=git_mode,
+                    github_username=github_username,
+                    git_commit_lang=git_commit_lang,
+                    code_comment_lang=code_comment_lang,
+                    doc_lang=doc_lang,
+                )
+
         # 6. Output results
         if result.success:
             separator = "[dim]" + ("─" * 60) + "[/dim]"
@@ -348,6 +422,14 @@ def init(
                 console.print("  [blue]3.[/blue] Start developing with MoAI-ADK!\n")
             else:
                 console.print("  [blue]2.[/blue] Start developing with MoAI-ADK!\n")
+
+            # Prompt for MoAI Rank hook installation if eligible
+            try:
+                from moai_adk.rank.hook import prompt_hook_installation
+
+                prompt_hook_installation(console=console)
+            except ImportError:
+                pass  # rank module not available
         else:
             console.print("\n[red bold]❌ Initialization Failed![/red bold]")
             if result.errors:
@@ -370,3 +452,231 @@ def init(
     finally:
         # Explicitly flush output buffer
         console.file.flush()
+
+
+def _save_glm_key(glm_api_key: str) -> None:
+    """Save GLM API key to .env.glm file.
+
+    Args:
+        glm_api_key: The GLM API key to save
+    """
+    import os
+
+    from moai_adk.core.credentials import (
+        get_env_glm_path,
+        remove_glm_key_from_shell_config,
+        save_glm_key_to_env,
+    )
+
+    save_glm_key_to_env(glm_api_key)
+    console.print(f"[green]✓[/green] GLM API key saved to [cyan]{get_env_glm_path()}[/cyan]")
+
+    # Automatically remove GLM_API_KEY from shell config if present
+    if os.environ.get("GLM_API_KEY"):
+        results = remove_glm_key_from_shell_config()
+        modified = [name for name, mod in results.items() if mod]
+        if modified:
+            files_str = ", ~/.".join(modified)
+            console.print(f"[green]✓[/green] Removed GLM_API_KEY from: [cyan]~/.{files_str}[/cyan]")
+            console.print("[dim]Backup: .moai-backup | Run 'source ~/.zshrc' to apply[/dim]")
+
+
+def _save_additional_config(
+    project_path: Path,
+    project_name: str,
+    locale: str,
+    user_name: str,
+    service_type: str,
+    pricing_plan: str | None,
+    glm_pricing_plan: str | None,
+    anthropic_api_key: str | None,
+    glm_api_key: str | None,
+    git_mode: str,
+    github_username: str | None,
+    git_commit_lang: str,
+    code_comment_lang: str,
+    doc_lang: str,
+) -> None:
+    """Save additional configuration from interactive mode.
+
+    Args:
+        project_path: Project directory path
+        project_name: Project name
+        locale: Conversation language (ko, en, ja, zh)
+        user_name: User name for personalization (can be empty)
+        service_type: Service type (claude_subscription, claude_api, glm, hybrid)
+        pricing_plan: Claude pricing plan (pro, max5, max20)
+        glm_pricing_plan: GLM pricing plan (basic, glm_pro, enterprise)
+        anthropic_api_key: Anthropic API key (if provided)
+        glm_api_key: GLM API key (if provided)
+        git_mode: Git mode (manual, personal, team)
+        github_username: GitHub username (if provided)
+        git_commit_lang: Commit message language
+        code_comment_lang: Code comment language
+        doc_lang: Documentation language
+    """
+    sections_dir = project_path / ".moai" / "config" / "sections"
+    # Ensure sections directory exists
+    sections_dir.mkdir(parents=True, exist_ok=True)
+
+    # 1. Save API keys to global locations
+    # Anthropic key → ~/.moai/credentials.yaml
+    # GLM key → ~/.moai/.env.glm (new dotenv format)
+    if anthropic_api_key:
+        from moai_adk.core.credentials import save_credentials
+
+        save_credentials(
+            anthropic_api_key=anthropic_api_key,
+            merge=True,  # Preserve existing keys
+        )
+
+    if glm_api_key:
+        import os
+
+        from moai_adk.core.credentials import (
+            get_env_glm_path,
+            remove_glm_key_from_shell_config,
+            save_glm_key_to_env,
+        )
+
+        save_glm_key_to_env(glm_api_key)
+        console.print(f"[green]✓[/green] GLM API key saved to [cyan]{get_env_glm_path()}[/cyan]")
+
+        # Automatically remove GLM_API_KEY from shell config if present
+        if os.environ.get("GLM_API_KEY"):
+            results = remove_glm_key_from_shell_config()
+            modified = [name for name, mod in results.items() if mod]
+            if modified:
+                files_str = ", ~/.".join(modified)
+                console.print(f"[green]✓[/green] Removed GLM_API_KEY from: [cyan]~/.{files_str}[/cyan]")
+                console.print("[dim]Backup: .moai-backup | Run 'source ~/.zshrc' to apply[/dim]")
+
+    # 2. Save service/pricing to pricing.yaml
+    pricing_path = sections_dir / "pricing.yaml"
+    if pricing_path.exists():
+        try:
+            pricing_data = yaml.safe_load(pricing_path.read_text()) or {}
+        except Exception:
+            pricing_data = {}
+    else:
+        pricing_data = {}
+
+    if "service" not in pricing_data:
+        pricing_data["service"] = {}
+
+    pricing_data["service"]["type"] = service_type
+    if pricing_plan:
+        pricing_data["service"]["claude_pricing_plan"] = pricing_plan
+    if glm_pricing_plan:
+        pricing_data["service"]["glm_pricing_plan"] = glm_pricing_plan
+
+    with open(pricing_path, "w", encoding="utf-8") as f:
+        yaml.safe_dump(
+            pricing_data,
+            f,
+            default_flow_style=False,
+            allow_unicode=True,
+            sort_keys=False,
+        )
+
+    # 3. Update language.yaml with output language settings
+    language_path = sections_dir / "language.yaml"
+    if language_path.exists():
+        try:
+            lang_data = yaml.safe_load(language_path.read_text()) or {}
+        except Exception:
+            lang_data = {}
+    else:
+        lang_data = {}
+
+    if "language" not in lang_data:
+        lang_data["language"] = {}
+
+    # Conversation language mapping
+    locale_names = {
+        "ko": "Korean (한국어)",
+        "en": "English",
+        "ja": "Japanese (日本語)",
+        "zh": "Chinese (中文)",
+    }
+
+    lang_data["language"]["conversation_language"] = locale
+    lang_data["language"]["conversation_language_name"] = locale_names.get(locale, "English")
+    lang_data["language"]["git_commit_messages"] = git_commit_lang
+    lang_data["language"]["code_comments"] = code_comment_lang
+    lang_data["language"]["documentation"] = doc_lang
+
+    with open(language_path, "w", encoding="utf-8") as f:
+        yaml.safe_dump(lang_data, f, default_flow_style=False, allow_unicode=True, sort_keys=False)
+
+    # 4. Update git-strategy.yaml with git mode
+    git_path = sections_dir / "git-strategy.yaml"
+    if git_path.exists():
+        try:
+            git_data = yaml.safe_load(git_path.read_text()) or {}
+        except Exception:
+            git_data = {}
+    else:
+        git_data = {}
+
+    if "git_strategy" not in git_data:
+        git_data["git_strategy"] = {}
+
+    git_data["git_strategy"]["mode"] = git_mode
+
+    with open(git_path, "w", encoding="utf-8") as f:
+        yaml.safe_dump(git_data, f, default_flow_style=False, allow_unicode=True, sort_keys=False)
+
+    # 5. Update project.yaml with project name and GitHub username
+    project_yaml_path = sections_dir / "project.yaml"
+    if project_yaml_path.exists():
+        try:
+            project_data = yaml.safe_load(project_yaml_path.read_text()) or {}
+        except Exception:
+            project_data = {}
+    else:
+        project_data = {}
+
+    # Save project name
+    if "project" not in project_data:
+        project_data["project"] = {}
+    project_data["project"]["name"] = project_name
+
+    # Save GitHub username if provided
+    if github_username:
+        if "github" not in project_data:
+            project_data["github"] = {}
+        project_data["github"]["profile_name"] = github_username
+
+    with open(project_yaml_path, "w", encoding="utf-8") as f:
+        yaml.safe_dump(
+            project_data,
+            f,
+            default_flow_style=False,
+            allow_unicode=True,
+            sort_keys=False,
+        )
+
+    # 6. Update user.yaml with user name
+    user_yaml_path = sections_dir / "user.yaml"
+    if user_yaml_path.exists():
+        try:
+            user_data = yaml.safe_load(user_yaml_path.read_text()) or {}
+        except Exception:
+            user_data = {}
+    else:
+        user_data = {}
+
+    if "user" not in user_data:
+        user_data["user"] = {}
+
+    user_data["user"]["name"] = user_name
+
+    with open(user_yaml_path, "w", encoding="utf-8") as f:
+        yaml.safe_dump(
+            user_data,
+            f,
+            default_flow_style=False,
+            allow_unicode=True,
+            sort_keys=False,
+        )

moai_adk/cli/commands/language.py

@@ -5,6 +5,7 @@ and multilingual content generation.
 """
 
 import json
+import sys
 from pathlib import Path
 
 import click
@@ -20,7 +21,12 @@ from ...core.language_config import (
 )
 from ...core.template_engine import TemplateEngine
 
-console = Console()
+# Force UTF-8 encoding for Windows compatibility
+# Windows PowerShell/Console uses 'charmap' by default, which can't encode emojis
+if sys.platform == "win32":
+    console = Console(force_terminal=True, legacy_windows=False)
+else:
+    console = Console()
 
 
 @click.group()