moai-adk 0.3.13__py3-none-any.whl → 0.4.1__py3-none-any.whl

moai_adk/__init__.py

@@ -4,5 +4,5 @@
 SPEC-First TDD Framework with Alfred SuperAgent
 """
 
-__version__ = "0.3.13"
+__version__ = "0.4.0"
 __all__ = ["__version__"]

moai_adk/__main__.py

@@ -1,4 +1,4 @@
-# @CODE:CLI-001 | SPEC: SPEC-CLI-001.md | TEST: tests/unit/test_cli_commands.py
+# @CODE:CLI-001 | SPEC: SPEC-CLI-001/spec.md | TEST: tests/unit/test_cli_commands.py
 """MoAI-ADK CLI Entry Point
 
 Implements the CLI entry point:

moai_adk/cli/commands/__init__.py

@@ -1,4 +1,4 @@
-# @CODE:CLI-001 | SPEC: SPEC-CLI-001.md | TEST: tests/unit/test_cli_commands.py
+# @CODE:CLI-001 | SPEC: SPEC-CLI-001/spec.md | TEST: tests/unit/test_cli_commands.py
 """CLI command module
 
 Core commands:

moai_adk/cli/commands/doctor.py

@@ -1,5 +1,5 @@
-# @CODE:CLI-001 | SPEC: SPEC-CLI-001.md | TEST: tests/unit/test_doctor.py
-# @CODE:CLAUDE-COMMANDS-001:CLI | SPEC: SPEC-CLAUDE-COMMANDS-001.md | TEST: tests/unit/test_slash_commands.py
+# @CODE:CLI-001 | SPEC: SPEC-CLI-001/spec.md | TEST: tests/unit/test_doctor.py
+# @CODE:CLAUDE-COMMANDS-001:CLI | SPEC: SPEC-CLAUDE-COMMANDS-001/spec.md | TEST: tests/unit/test_slash_commands.py
 """MoAI-ADK doctor command
 
 System diagnostics command:

moai_adk/cli/commands/init.py

@@ -66,9 +66,9 @@ def create_progress_callback(progress: Progress, task_ids: Sequence[TaskID]):
 )
 @click.option(
     "--locale",
-    type=click.Choice(["ko", "en", "ja", "zh"]),
-    default="ko",
-    help="Preferred language",
+    type=click.Choice(["ko", "en"]),
+    default=None,
+    help="Preferred language (default: en)",
 )
 @click.option(
     "--language",
@@ -95,13 +95,13 @@ def init(
         path: Project directory path (default: current directory)
         non_interactive: Skip prompts and use defaults
         mode: Project mode (personal/team)
-        locale: Preferred language (ko/en/ja/zh)
+        locale: Preferred language (ko/en). When omitted, defaults to en.
         language: Programming language
         force: Force reinitialize without confirmation
     """
     try:
         # 1. Print banner
-        print_banner()
+        print_banner(__version__)
 
         # 2. Check current directory mode
         is_current_dir = path == "."
@@ -114,6 +114,7 @@ def init(
                 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"
         else:
             # Interactive Mode
             print_welcome_message()
@@ -123,6 +124,7 @@ def init(
                 project_name=None if is_current_dir else path,
                 is_current_dir=is_current_dir,
                 project_path=project_path,
+                initial_locale=locale,
             )
 
             # Override with prompt answers
@@ -133,6 +135,9 @@ def init(
 
             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)
 

moai_adk/cli/commands/status.py

@@ -1,4 +1,4 @@
-# @CODE:CLI-001 | SPEC: SPEC-CLI-001.md | TEST: tests/unit/test_cli_commands.py
+# @CODE:CLI-001 | SPEC: SPEC-CLI-001/spec.md | TEST: tests/unit/test_cli_commands.py
 """MoAI-ADK status command
 
 Project status display:

moai_adk/cli/commands/update.py

@@ -1,6 +1,10 @@
 """Update command"""
+from __future__ import annotations
+
 import json
+from datetime import datetime
 from pathlib import Path
+from typing import Any, cast
 
 import click
 from packaging import version
@@ -25,12 +29,186 @@ def get_latest_version() -> str | None:
         url = "https://pypi.org/pypi/moai-adk/json"
         with urllib.request.urlopen(url, timeout=5) as response:  # nosec B310 - URL is hardcoded HTTPS to PyPI API, no user input
             data = json.loads(response.read().decode("utf-8"))
-            return data["info"]["version"]
+            version_str: str = cast(str, data["info"]["version"])
+            return version_str
     except (urllib.error.URLError, json.JSONDecodeError, KeyError, TimeoutError):
         # Return None if PyPI check fails
         return None
 
 
+def set_optimized_false(project_path: Path) -> None:
+    """Set config.json's optimized field to false.
+
+    Args:
+        project_path: Project path (absolute).
+    """
+    config_path = project_path / ".moai" / "config.json"
+    if not config_path.exists():
+        return
+
+    try:
+        config_data = json.loads(config_path.read_text(encoding="utf-8"))
+        config_data.setdefault("project", {})["optimized"] = False
+        config_path.write_text(
+            json.dumps(config_data, indent=2, ensure_ascii=False) + "\n",
+            encoding="utf-8"
+        )
+    except (json.JSONDecodeError, KeyError):
+        # Ignore errors if config.json is invalid
+        pass
+
+
+def _load_existing_config(project_path: Path) -> dict[str, Any]:
+    """Load existing config.json if available."""
+    config_path = project_path / ".moai" / "config.json"
+    if config_path.exists():
+        try:
+            return json.loads(config_path.read_text(encoding="utf-8"))
+        except json.JSONDecodeError:
+            console.print("[yellow]⚠ Existing config.json could not be parsed. Proceeding with defaults.[/yellow]")
+    return {}
+
+
+def _is_placeholder(value: Any) -> bool:
+    """Check if a string value is an unsubstituted template placeholder."""
+    return isinstance(value, str) and value.strip().startswith("{{") and value.strip().endswith("}}")
+
+
+def _coalesce(*values: Any, default: str = "") -> str:
+    """Return the first non-empty, non-placeholder string value."""
+    for value in values:
+        if isinstance(value, str):
+            if not value.strip():
+                continue
+            if _is_placeholder(value):
+                continue
+            return value
+    for value in values:
+        if value is not None and not isinstance(value, str):
+            return str(value)
+    return default
+
+
+def _extract_project_section(config: dict[str, Any]) -> dict[str, Any]:
+    """Return the nested project section if present."""
+    project_section = config.get("project")
+    if isinstance(project_section, dict):
+        return project_section
+    return {}
+
+
+def _build_template_context(
+    project_path: Path,
+    existing_config: dict[str, Any],
+    version_for_config: str,
+) -> dict[str, str]:
+    """Build substitution context for template files."""
+    project_section = _extract_project_section(existing_config)
+
+    project_name = _coalesce(
+        project_section.get("name"),
+        existing_config.get("projectName"),
+        project_path.name,
+    )
+    project_mode = _coalesce(
+        project_section.get("mode"),
+        existing_config.get("mode"),
+        default="personal",
+    )
+    project_description = _coalesce(
+        project_section.get("description"),
+        existing_config.get("projectDescription"),
+        existing_config.get("description"),
+    )
+    project_version = _coalesce(
+        project_section.get("version"),
+        existing_config.get("projectVersion"),
+        existing_config.get("version"),
+        default="0.1.0",
+    )
+    created_at = _coalesce(
+        project_section.get("created_at"),
+        existing_config.get("created_at"),
+        default=datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+    )
+
+    return {
+        "MOAI_VERSION": version_for_config,
+        "PROJECT_NAME": project_name,
+        "PROJECT_MODE": project_mode,
+        "PROJECT_DESCRIPTION": project_description,
+        "PROJECT_VERSION": project_version,
+        "CREATION_TIMESTAMP": created_at,
+    }
+
+
+def _preserve_project_metadata(
+    project_path: Path,
+    context: dict[str, str],
+    existing_config: dict[str, Any],
+    version_for_config: str,
+) -> None:
+    """Restore project-specific metadata in the new config.json."""
+    config_path = project_path / ".moai" / "config.json"
+    if not config_path.exists():
+        return
+
+    try:
+        config_data = json.loads(config_path.read_text(encoding="utf-8"))
+    except json.JSONDecodeError:
+        console.print("[red]✗ Failed to parse config.json after template copy[/red]")
+        return
+
+    project_data = config_data.setdefault("project", {})
+    project_data["name"] = context["PROJECT_NAME"]
+    project_data["mode"] = context["PROJECT_MODE"]
+    project_data["description"] = context["PROJECT_DESCRIPTION"]
+    project_data["created_at"] = context["CREATION_TIMESTAMP"]
+    project_data["moai_adk_version"] = version_for_config
+
+    if "optimized" not in project_data and isinstance(existing_config, dict):
+        existing_project = _extract_project_section(existing_config)
+        if isinstance(existing_project, dict) and "optimized" in existing_project:
+            project_data["optimized"] = bool(existing_project["optimized"])
+
+    # Preserve locale and language preferences when possible
+    existing_project = _extract_project_section(existing_config)
+    locale = _coalesce(existing_project.get("locale"), existing_config.get("locale"))
+    if locale:
+        project_data["locale"] = locale
+
+    language = _coalesce(existing_project.get("language"), existing_config.get("language"))
+    if language:
+        project_data["language"] = language
+
+    config_data.setdefault("moai", {})
+    config_data["moai"]["version"] = version_for_config
+
+    config_path.write_text(
+        json.dumps(config_data, indent=2, ensure_ascii=False) + "\n",
+        encoding="utf-8"
+    )
+
+
+def _apply_context_to_file(processor: TemplateProcessor, target_path: Path) -> None:
+    """Apply the processor context to an existing file (post-merge pass)."""
+    if not processor.context or not target_path.exists():
+        return
+
+    try:
+        content = target_path.read_text(encoding="utf-8")
+    except UnicodeDecodeError:
+        return
+
+    substituted, warnings = processor._substitute_variables(content)  # pylint: disable=protected-access
+    if warnings:
+        console.print("[yellow]⚠ Template warnings:[/yellow]")
+        for warning in warnings:
+            console.print(f"   {warning}")
+
+    target_path.write_text(substituted, encoding="utf-8")
+
+
 @click.command()
 @click.option(
     "--path",
@@ -70,10 +248,13 @@ def update(path: str, force: bool, check: bool) -> None:
             console.print("[yellow]⚠ Project not initialized[/yellow]")
             raise click.Abort()
 
+        existing_config = _load_existing_config(project_path)
+
         # Phase 1: check versions
         console.print("[cyan]🔍 Checking versions...[/cyan]")
         current_version = __version__
         latest_version = get_latest_version()
+        version_for_config = current_version
 
         # Handle PyPI fetch failure
         if latest_version is None:
@@ -98,14 +279,18 @@ def update(path: str, force: bool, check: bool) -> None:
                 console.print("[green]✓ Already up to date[/green]")
             return
 
-        # Check if update is needed (version + optimized status) - skip with --force
+        # Check if update is needed (version only) - skip with --force
         if not force and latest_version is not None:
             current_ver = version.parse(current_version)
             latest_ver = version.parse(latest_version)
 
-            # Don't update if current version is newer or equal
-            if current_ver >= latest_ver:
-                # Check optimized status in config.json
+            # Don't update if current version is newer
+            if current_ver > latest_ver:
+                console.print("[green]✓ Development version (newer than PyPI)[/green]")
+                return
+            # If versions are equal, check if we need to proceed
+            elif current_ver == latest_ver:
+                # Check if optimized=false (need to update templates)
                 config_path = project_path / ".moai" / "config.json"
                 if config_path.exists():
                     try:
@@ -116,9 +301,8 @@ def update(path: str, force: bool, check: bool) -> None:
                             # Already up to date and optimized - exit silently
                             return
                         else:
-                            console.print("[yellow]⚠ Optimization needed[/yellow]")
-                            console.print("[dim]Use /alfred:0-project update for template optimization[/dim]")
-                            return
+                            # Proceed with template update (optimized=false)
+                            console.print("[yellow]⚠ Template optimization needed[/yellow]")
                     except (json.JSONDecodeError, KeyError):
                         # If config.json is invalid, proceed with update
                         pass
@@ -138,6 +322,11 @@ def update(path: str, force: bool, check: bool) -> None:
         # Phase 3: update templates
         console.print("\n[cyan]📄 Updating templates...[/cyan]")
         processor = TemplateProcessor(project_path)
+
+        context = _build_template_context(project_path, existing_config, version_for_config)
+        if context:
+            processor.set_context(context)
+
         processor.copy_templates(backup=False, silent=True)  # Backup already handled
 
         console.print("   [green]✅ .claude/ update complete[/green]")
@@ -145,7 +334,20 @@ def update(path: str, force: bool, check: bool) -> None:
         console.print("   [green]🔄 CLAUDE.md merge complete[/green]")
         console.print("   [green]🔄 config.json merge complete[/green]")
 
+        _preserve_project_metadata(project_path, context, existing_config, version_for_config)
+        _apply_context_to_file(processor, project_path / "CLAUDE.md")
+
+        # Phase 4: set optimized=false
+        set_optimized_false(project_path)
+        console.print("   [yellow]⚙️  Set optimized=false (optimization needed)[/yellow]")
+
         console.print("\n[green]✓ Update complete![/green]")
+        if latest_version and version.parse(current_version) < version.parse(latest_version):
+            console.print(
+                "[yellow]⚠ Python package still on older version. "
+                "Run 'pip install --upgrade moai-adk' to upgrade the CLI package.[/yellow]"
+            )
+        console.print("\n[cyan]ℹ️  Next step: Run /alfred:0-project update to optimize template changes[/cyan]")
 
     except Exception as e:
         console.print(f"[red]✗ Update failed: {e}[/red]")

moai_adk/cli/prompts/init_prompts.py

@@ -1,4 +1,4 @@
-# @CODE:CLI-PROMPTS-001 | SPEC: SPEC-CLI-001.md
+# @CODE:CLI-PROMPTS-001 | SPEC: SPEC-CLI-001/spec.md
 """Project initialization prompts
 
 Collect interactive project settings
@@ -18,7 +18,7 @@ class ProjectSetupAnswers(TypedDict):
 
     project_name: str
     mode: str  # personal | team
-    locale: str  # ko | en | ja | zh
+    locale: str  # ko | en
     language: str | None
     author: str
 
@@ -27,6 +27,7 @@ def prompt_project_setup(
     project_name: str | None = None,
     is_current_dir: bool = False,
     project_path: Path | None = None,
+    initial_locale: str | None = None,
 ) -> ProjectSetupAnswers:
     """Project setup prompt
 
@@ -34,6 +35,7 @@ def prompt_project_setup(
         project_name: Project name (asks when None)
         is_current_dir: Whether the current directory is being used
         project_path: Project path (used to derive the name)
+        initial_locale: Preferred locale provided via CLI (optional)
 
     Returns:
         Project setup answers
@@ -88,23 +90,17 @@ def prompt_project_setup(
         if result is None:
             raise KeyboardInterrupt
         answers["mode"] = result
+        answers["locale"] = initial_locale or "en"
+        if initial_locale:
+            console.print(
+                f"[cyan]🌐 Preferred Language:[/cyan] {answers['locale']} (CLI 옵션으로 지정됨)"
+            )
+        else:
+            console.print(
+                "[cyan]🌐 Preferred Language:[/cyan] en (기본값, /alfred:0-project에서 변경 가능)"
+            )
 
-        # 3. Locale
-        result = questionary.select(
-            "🌐 Preferred Language:",
-            choices=[
-                questionary.Choice("Korean", value="ko"),
-                questionary.Choice("English", value="en"),
-                questionary.Choice("Japanese", value="ja"),
-                questionary.Choice("Chinese", value="zh"),
-            ],
-            default="ko",
-        ).ask()
-        if result is None:
-            raise KeyboardInterrupt
-        answers["locale"] = result
-
-        # 4. Programming language (auto-detect or manual)
+        # 3. Programming language (auto-detect or manual)
         result = questionary.confirm(
             "🔍 Auto-detect programming language?",
             default=True,
@@ -144,7 +140,7 @@ def prompt_project_setup(
                 raise KeyboardInterrupt
             answers["language"] = result
 
-        # 5. Author information (optional)
+        # 4. Author information (optional)
         result = questionary.confirm(
             "👤 Add author information? (optional)",
             default=False,

moai_adk/core/__init__.py

@@ -1,2 +1,2 @@
-# @CODE:PY314-001 | SPEC: SPEC-PY314-001.md | TEST: tests/unit/test_foundation.py
+# @CODE:PY314-001 | SPEC: SPEC-PY314-001/spec.md | TEST: tests/unit/test_foundation.py
 """Core module: primary business logic"""

moai_adk/core/diagnostics/slash_commands.py

@@ -11,7 +11,7 @@ Functions:
 
 from pathlib import Path
 
-import yaml
+import yaml  # type: ignore[import-untyped]
 
 
 def validate_command_file(file_path: Path) -> dict:

moai_adk/core/git/branch.py

@@ -1,4 +1,4 @@
-# @CODE:CORE-GIT-001 | SPEC: SPEC-CORE-GIT-001.md | TEST: tests/unit/test_git.py
+# @CODE:CORE-GIT-001 | SPEC: SPEC-CORE-GIT-001/spec.md | TEST: tests/unit/test_git.py
 """
 Branch naming utilities.
 

moai_adk/core/git/manager.py

@@ -1,4 +1,4 @@
-# @CODE:CORE-GIT-001 | SPEC: SPEC-CORE-GIT-001.md | TEST: tests/unit/test_git.py
+# @CODE:CORE-GIT-001 | SPEC: SPEC-CORE-GIT-001/spec.md | TEST: tests/unit/test_git.py
 """
 Git repository management built on GitPython.
 

moai_adk/core/project/backup_utils.py

@@ -15,6 +15,7 @@ BACKUP_TARGETS = [
     ".moai/project/",
     ".moai/memory/",
     ".claude/",
+    ".github/",
     "CLAUDE.md",
 ]
 

moai_adk/core/project/phase_executor.py

@@ -53,6 +53,7 @@ class PhaseExecutor:
         ".moai/memory/",
         ".claude/",
         ".claude/logs/",
+        ".github/",
     ]
 
     def __init__(self, validator: ProjectValidator) -> None:
@@ -158,6 +159,7 @@ class PhaseExecutor:
         return [
             ".claude/",
             ".moai/",
+            ".github/",
             "CLAUDE.md",
             ".gitignore",
         ]
@@ -219,7 +221,7 @@ class PhaseExecutor:
         # @CODE:INIT-004:VERIFY-001 | Validate installation results
         # @CODE:INIT-004:VALIDATION-CHECK | Comprehensive installation validation
         # Verifies all required files including 4 Alfred command files:
-        # - 0-project.md, 1-spec.md, 2-build.md, 3-sync.md
+        # - 0-project.md, 1-plan.md, 2-run.md, 3-sync.md
         self.validator.validate_installation(project_path)
 
         # Initialize Git for team mode

moai_adk/core/project/validator.py

@@ -37,6 +37,7 @@ class ProjectValidator:
         ".moai/specs/",
         ".moai/memory/",
         ".claude/",
+        ".github/",
     ]
 
     # Required files
@@ -48,8 +49,8 @@ class ProjectValidator:
     # Required Alfred command files (SPEC-INIT-004)
     REQUIRED_ALFRED_COMMANDS = [
         "0-project.md",
-        "1-spec.md",
-        "2-build.md",
+        "1-plan.md",
+        "2-run.md",
         "3-sync.md",
     ]
 

moai_adk/core/quality/__init__.py

@@ -1,4 +1,4 @@
-# @CODE:TRUST-001 | SPEC: SPEC-TRUST-001.md | TEST: tests/unit/core/quality/
+# @CODE:TRUST-001 | SPEC: SPEC-TRUST-001/spec.md | TEST: tests/unit/core/quality/
 """TRUST 원칙 자동 검증 시스템"""
 
 from moai_adk.core.quality.trust_checker import TrustChecker

moai_adk/core/quality/trust_checker.py

@@ -1,4 +1,4 @@
-# @CODE:TRUST-001 | SPEC: SPEC-TRUST-001.md | TEST: tests/unit/core/quality/test_trust_checker.py
+# @CODE:TRUST-001 | SPEC: SPEC-TRUST-001/spec.md | TEST: tests/unit/core/quality/test_trust_checker.py
 """
 TRUST 원칙 통합 검증 시스템
 

moai_adk/core/quality/validators/__init__.py

@@ -1,4 +1,4 @@
-# @CODE:TRUST-001 | SPEC: SPEC-TRUST-001.md
+# @CODE:TRUST-001 | SPEC: SPEC-TRUST-001/spec.md
 """TRUST 검증기 패키지"""
 
 from moai_adk.core.quality.validators.base_validator import ValidationResult

moai_adk/core/quality/validators/base_validator.py

@@ -1,4 +1,4 @@
-# @CODE:TRUST-001:VALIDATOR | SPEC: SPEC-TRUST-001.md
+# @CODE:TRUST-001:VALIDATOR | SPEC: SPEC-TRUST-001/spec.md
 """Base validator class and validation result"""
 
 from dataclasses import dataclass

moai_adk/core/template/__init__.py

@@ -1,4 +1,4 @@
-# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003.md | Chain: TEMPLATE-001
+# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003/spec.md | Chain: TEMPLATE-001
 """Template management module."""
 
 from moai_adk.core.template.backup import TemplateBackup

moai_adk/core/template/backup.py

@@ -1,4 +1,4 @@
-# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003.md | Chain: TEMPLATE-001
+# @CODE:TEMPLATE-001 | SPEC: SPEC-INIT-003/spec.md | Chain: TEMPLATE-001
 """Template backup manager (SPEC-INIT-003 v0.3.0).
 
 Creates and manages backups to protect user data during template updates.
@@ -28,6 +28,15 @@ class TemplateBackup:
         """
         self.target_path = target_path.resolve()
 
+    @property
+    def backup_dir(self) -> Path:
+        """Get the backup directory path.
+
+        Returns:
+            Path to .moai-backups directory.
+        """
+        return self.target_path / ".moai-backups"
+
     def has_existing_files(self) -> bool:
         """Check whether backup-worthy files already exist.
 
@@ -36,7 +45,7 @@ class TemplateBackup:
         """
         return any(
             (self.target_path / item).exists()
-            for item in [".moai", ".claude", "CLAUDE.md"]
+            for item in [".moai", ".claude", ".github", "CLAUDE.md"]
         )
 
     def create_backup(self) -> Path:
@@ -50,7 +59,7 @@ class TemplateBackup:
         backup_path.mkdir(parents=True, exist_ok=True)
 
         # Copy backup targets
-        for item in [".moai", ".claude", "CLAUDE.md"]:
+        for item in [".moai", ".claude", ".github", "CLAUDE.md"]:
             src = self.target_path / item
             if not src.exists():
                 continue

moai_adk/core/template/config.py

@@ -93,3 +93,27 @@ class ConfigManager:
                 result[key] = value
 
         return result
+
+    @staticmethod
+    def set_optimized(config_path: Path, value: bool) -> None:
+        """Set the optimized field in config.json.
+
+        Args:
+            config_path: Path to config.json.
+            value: Value to set (True or False).
+        """
+        if not config_path.exists():
+            return
+
+        try:
+            with open(config_path, encoding="utf-8") as f:
+                config = json.load(f)
+
+            config.setdefault("project", {})["optimized"] = value
+
+            with open(config_path, "w", encoding="utf-8") as f:
+                json.dump(config, f, ensure_ascii=False, indent=2)
+                f.write("\n")  # Add trailing newline
+        except (json.JSONDecodeError, KeyError, OSError):
+            # Ignore errors if config.json is invalid or inaccessible
+            pass

moai_adk/core/template/languages.py

@@ -1,4 +1,4 @@
-# @CODE:CORE-PROJECT-001 | SPEC: SPEC-CORE-PROJECT-001.md | TEST: tests/unit/test_language_mapping.py
+# @CODE:CORE-PROJECT-001 | SPEC: SPEC-CORE-PROJECT-001/spec.md | TEST: tests/unit/test_language_mapping.py
 """Template mapping by language.
 
 Defines template paths for 20 programming languages.