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

moai_adk/cli/commands/init.py

@@ -19,7 +19,7 @@ Project initialization command (interactive/non-interactive):
    - Run `Skill("moai-foundation-langs")` to validate detected language stack
 
 2. **Before first SPEC creation**:
-   - Use `Skill("moai-alfred-language-detection")` to confirm language selection
+   - Use `Skill("moai-core-language-detection")` to confirm language selection
 
 3. **Project reinitialization** (`--force`):
    - Skills automatically adapt to new project structure
@@ -31,14 +31,17 @@ from pathlib import Path
 from typing import Sequence
 
 import click
+import yaml
 from rich.console import Console
 from rich.progress import BarColumn, Progress, SpinnerColumn, TaskID, TextColumn
 
 from moai_adk import __version__
 from moai_adk.cli.prompts import prompt_project_setup
-from moai_adk.core.mcp.setup import MCPSetupManager
 from moai_adk.core.project.initializer import ProjectInitializer
-from moai_adk.statusline.version_reader import VersionConfig, VersionReader
+from moai_adk.statusline.version_reader import (
+    VersionConfig,
+    VersionReader,
+)
 from moai_adk.utils.banner import print_banner, print_welcome_message
 
 console = Console()
@@ -96,17 +99,6 @@ def create_progress_callback(progress: Progress, task_ids: Sequence[TaskID]):
     default=None,
     help="Programming language (auto-detect if not specified)",
 )
-@click.option(
-    "--with-mcp",
-    multiple=True,
-    type=click.Choice(["context7", "figma", "playwright", "sequential-thinking"]),
-    help="Install MCP servers automatically (can be used multiple times)",
-)
-@click.option(
-    "--mcp-auto",
-    is_flag=True,
-    help="Auto-install all recommended MCP servers",
-)
 @click.option(
     "--force",
     is_flag=True,
@@ -118,8 +110,6 @@ def init(
     mode: str,
     locale: str,
     language: str | None,
-    with_mcp: tuple,
-    mcp_auto: bool,
     force: bool,
 ) -> None:
     """Initialize a new MoAI-ADK project
@@ -163,38 +153,17 @@ def init(
         # 3. Interactive vs Non-Interactive
         if non_interactive:
             # Non-Interactive Mode
-            console.print(
-                f"\n[cyan]🚀 Initializing project at {project_path}...[/cyan]\n"
-            )
+            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"
-            # Language detection happens in /alfred:0-project, so default to None here
+            # 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:
                 language = None
-
-            # Handle MCP options in non-interactive mode
-            if mcp_auto:
-                mcp_servers = ["context7", "playwright", "sequential-thinking"]
-                console.print(
-                    "[cyan]🔧 MCP servers:[/cyan] Auto-installing all recommended servers"
-                )
-            elif with_mcp:
-                mcp_servers = list(with_mcp)
-                console.print(f"[cyan]🔧 MCP servers:[/cyan] {', '.join(mcp_servers)}")
-            else:
-                mcp_servers = []
         else:
             # Interactive Mode
             print_welcome_message()
 
-            # Check for MCP CLI options in interactive mode (warn user)
-            if mcp_auto or with_mcp:
-                console.print(
-                    "[yellow]⚠️  MCP options ignored in interactive mode[/yellow]"
-                )
-                console.print("   Please use the interactive prompts instead.\n")
-
             # Interactive prompt
             answers = prompt_project_setup(
                 project_name=None if is_current_dir else path,
@@ -208,7 +177,6 @@ def init(
             locale = answers["locale"]
             language = answers["language"]
             project_name = answers["project_name"]
-            mcp_servers = answers.get("mcp_servers", [])
             custom_language = answers.get("custom_language")
 
             console.print("\n[cyan]🚀 Starting installation...[/cyan]\n")
@@ -222,9 +190,7 @@ def init(
         if initializer.is_initialized():
             # Always reinitialize without confirmation (force mode by default)
             if non_interactive:
-                console.print(
-                    "\n[green]🔄 Reinitializing project (force mode)...[/green]\n"
-                )
+                console.print("\n[green]🔄 Reinitializing project (force mode)...[/green]\n")
             else:
                 # Interactive mode: Simple notification
                 console.print("\n[cyan]🔄 Reinitializing project...[/cyan]")
@@ -248,11 +214,20 @@ def init(
                     except Exception:
                         pass  # Ignore removal failures
 
-            config_path = project_path / ".moai" / "config" / "config.json"
+            # Support both YAML (v0.32.5+) and JSON (legacy) config files
+            config_yaml_path = project_path / ".moai" / "config" / "config.yaml"
+            config_json_path = project_path / ".moai" / "config" / "config.json"
+
+            config_path = config_yaml_path if config_yaml_path.exists() else config_json_path
+            is_yaml = config_path.suffix in (".yaml", ".yml")
+
             if config_path.exists():
                 try:
                     with open(config_path, "r", encoding="utf-8") as f:
-                        config_data = json.load(f)
+                        if is_yaml:
+                            config_data = yaml.safe_load(f) or {}
+                        else:
+                            config_data = json.load(f)
 
                     # Update version and optimization flags
                     if "moai" not in config_data:
@@ -277,9 +252,14 @@ def init(
                     config_data["project"]["optimized"] = False
 
                     with open(config_path, "w", encoding="utf-8") as f:
-                        json.dump(config_data, f, indent=2, ensure_ascii=False)
+                        if is_yaml:
+                            yaml.safe_dump(
+                                config_data, f, default_flow_style=False, allow_unicode=True, sort_keys=False
+                            )
+                        else:
+                            json.dump(config_data, f, indent=2, ensure_ascii=False)
                 except Exception:
-                    # Ignore read/write failures; config.json is regenerated during initialization
+                    # Ignore read/write failures; config is regenerated during initialization
                     pass
 
         with Progress(
@@ -313,103 +293,56 @@ def init(
         # 6. Output results
         if result.success:
             separator = "[dim]" + ("─" * 60) + "[/dim]"
-            console.print(
-                "\n[green bold]✅ Initialization Completed Successfully![/green bold]"
-            )
+            console.print("\n[green bold]✅ Initialization Completed Successfully![/green bold]")
             console.print(separator)
             console.print("\n[cyan]📊 Summary:[/cyan]")
             console.print(f"  [dim]📁 Location:[/dim]  {result.project_path}")
             # Show language more clearly - "generic" means auto-detect
-            language_display = (
-                "Auto-detect (use /alfred:0-project)"
-                if result.language == "generic"
-                else result.language
-            )
+            language_display = "Auto-detect (use /moai:0-project)" if result.language == "generic" else result.language
             console.print(f"  [dim]🌐 Language:[/dim]  {language_display}")
-            console.print(f"  [dim]🔧 Mode:[/dim]      {result.mode}")
+            # Show Git Strategy (default: manual = local-only, no auto-branch)
+            console.print("  [dim]🔀 Git:[/dim]       manual (github-flow, branch: manual)")
             console.print(f"  [dim]🌍 Locale:[/dim]    {result.locale}")
-            console.print(
-                f"  [dim]📄 Files:[/dim]     {len(result.created_files)} created"
-            )
+            console.print(f"  [dim]📄 Files:[/dim]     {len(result.created_files)} created")
             console.print(f"  [dim]⏱️  Duration:[/dim]  {result.duration}ms")
 
-            # Show MCP setup info
-            if mcp_servers:
-                console.print(f"  [dim]🔧 MCP Servers:[/dim] {', '.join(mcp_servers)}")
-
-            # MCP Setup (if servers selected)
-            if mcp_servers:
-                console.print("\n[cyan]🔧 Setting up MCP servers...[/cyan]")
-                mcp_manager = MCPSetupManager(project_path)
-                mcp_success = mcp_manager.setup_mcp_servers(mcp_servers)
-                if not mcp_success:
-                    console.print(
-                        "[yellow]⚠️  MCP setup completed with warnings[/yellow]"
-                    )
-
             # Show backup info if reinitialized
             if is_reinit:
                 backup_dir = project_path / ".moai-backups"
                 if backup_dir.exists():
-                    latest_backup = max(
-                        backup_dir.iterdir(), key=lambda p: p.stat().st_mtime
-                    )
+                    latest_backup = max(backup_dir.iterdir(), key=lambda p: p.stat().st_mtime)
                     console.print(f"  [dim]💾 Backup:[/dim]    {latest_backup.name}/")
 
             console.print(f"\n{separator}")
 
             # Show config merge notice if reinitialized
             if is_reinit:
-                console.print("\n[yellow]⚠️  Configuration Notice:[/yellow]")
-                console.print(
-                    "  All template files have been [bold]force overwritten[/bold]"
-                )
-                console.print(
-                    "  Previous files are backed up in [cyan].moai-backups/backup/[/cyan]"
-                )
-                console.print("\n  [cyan]To merge your previous config:[/cyan]")
-                console.print(
-                    "  Run [bold]/alfred:0-project[/bold] command in Claude Code"
-                )
-                console.print(
-                    "  It will merge backup config when [dim]optimized=false[/dim]\n"
-                )
+                console.print("\n[yellow]⚠️  Configuration Status: optimized=false (merge required)[/yellow]")
+                console.print()
+                console.print("[cyan]What Happened:[/cyan]")
+                console.print("  ✅ Template files updated to latest version")
+                console.print("  💾 Your previous settings backed up in: [cyan].moai-backups/backup/[/cyan]")
+                console.print("  ⏳ Configuration merge required")
+                console.print()
+                console.print("[cyan]What is optimized=false?[/cyan]")
+                console.print("  • Template version changed (you get new features)")
+                console.print("  • Your previous settings are safe (backed up)")
+                console.print("  • Next: Run /moai:0-project to merge")
+                console.print()
+                console.print("[cyan]What Happens Next:[/cyan]")
+                console.print("  1. Run [bold]/moai:0-project[/bold] in Claude Code")
+                console.print("  2. System intelligently merges old settings + new template")
+                console.print("  3. After successful merge → optimized becomes true")
+                console.print("  4. You're ready to continue developing\n")
 
             console.print("\n[cyan]🚀 Next Steps:[/cyan]")
             if not is_current_dir:
-                console.print(
-                    f"  [blue]1.[/blue] Run [bold]cd {project_name}[/bold] to enter the project"
-                )
-                console.print(
-                    "  [blue]2.[/blue] Run [bold]/alfred:0-project[/bold] in Claude Code for full setup"
-                )
-                console.print(
-                    "     (Configure: mode, language, report generation, etc.)"
-                )
+                console.print(f"  [blue]1.[/blue] Run [bold]cd {project_name}[/bold] to enter the project")
+                console.print("  [blue]2.[/blue] Run [bold]/moai:0-project[/bold] in Claude Code for full setup")
+                console.print("     (Configure: mode, language, report generation, etc.)")
             else:
-                console.print(
-                    "  [blue]1.[/blue] Run [bold]/alfred:0-project[/bold] in Claude Code for full setup"
-                )
-                console.print(
-                    "     (Configure: mode, language, report generation, etc.)"
-                )
-
-            # Figma token setup guidance
-            if mcp_servers and "figma" in mcp_servers:
-                console.print("\n[yellow]🔐 Figma Access Token Setup:[/yellow]")
-                console.print(
-                    "  [dim]Figma MCP requires an access token to function:[/dim]"
-                )
-                console.print(
-                    "  1. Visit: https://www.figma.com/developers/api#access-tokens"
-                )
-                console.print("  2. Create a new access token")
-                console.print(
-                    "  3. Run [bold]/alfred:0-project[/bold] and follow the Figma setup prompts"
-                )
-                console.print(
-                    "  4. The token will be securely stored in your environment\n"
-                )
+                console.print("  [blue]1.[/blue] Run [bold]/moai:0-project[/bold] in Claude Code for full setup")
+                console.print("     (Configure: mode, language, report generation, etc.)")
 
             if not is_current_dir:
                 console.print("  [blue]3.[/blue] Start developing with MoAI-ADK!\n")
@@ -429,9 +362,7 @@ def init(
         raise click.Abort()
     except FileExistsError as e:
         console.print("\n[yellow]⚠ Project already initialized[/yellow]")
-        console.print(
-            "[dim]  Use 'python -m moai_adk status' to check configuration[/dim]\n"
-        )
+        console.print("[dim]  Use 'python -m moai_adk status' to check configuration[/dim]\n")
         raise click.Abort() from e
     except Exception as e:
         console.print(f"\n[red]✗ Initialization failed: {e}[/red]\n")

moai_adk/cli/commands/language.py

@@ -94,9 +94,7 @@ def render_template(template_path, variables_file, output, language):
         template_path_obj = Path(template_path)
         output_path_obj = Path(output) if output else None
 
-        rendered = template_engine.render_file(
-            template_path_obj, variables, output_path_obj
-        )
+        rendered = template_engine.render_file(template_path_obj, variables, output_path_obj)
 
         if not output:
             console.print("[bold]Rendered Template:[/bold]")
@@ -121,9 +119,7 @@ def translate_descriptions(base_description, target_languages, output):
             languages = ["en", "ko", "ja", "es", "fr", "de"]
 
         claude_integration = ClaudeCLIIntegration()
-        descriptions = claude_integration.generate_multilingual_descriptions(
-            {"base": base_description}, languages
-        )
+        descriptions = claude_integration.generate_multilingual_descriptions({"base": base_description}, languages)
 
         if output:
             with open(output, "w", encoding="utf-8") as f:
@@ -139,13 +135,9 @@ def translate_descriptions(base_description, target_languages, output):
 
 @language.command()
 @click.argument("prompt_template")
-@click.option(
-    "--variables", "-v", type=click.Path(exists=True), help="Variables JSON file"
-)
+@click.option("--variables", "-v", type=click.Path(exists=True), help="Variables JSON file")
 @click.option("--language", "-l", help="Target language code")
-@click.option(
-    "--output-format", default="json", help="Output format (text, json, stream-json)"
-)
+@click.option("--output-format", default="json", help="Output format (text, json, stream-json)")
 @click.option("--dry-run", is_flag=True, help="Show command without executing")
 def execute(prompt_template, variables, language, output_format, dry_run):
     """Execute Claude CLI with template variables and language support."""
@@ -166,9 +158,7 @@ def execute(prompt_template, variables, language, output_format, dry_run):
 
         if dry_run:
             console.print("[bold]Dry Run - Command that would be executed:[/bold]")
-            console.print(
-                f"claude --print --output-format {output_format} '{processed_prompt}'"
-            )
+            console.print(f"claude --print --output-format {output_format} '{processed_prompt}'")
             console.print("[bold]Variables used:[/bold]")
             console.print(json.dumps(template_vars, indent=2, ensure_ascii=False))
             return
@@ -202,9 +192,7 @@ def execute(prompt_template, variables, language, output_format, dry_run):
 
 @language.command()
 @click.argument("config_file", type=click.Path(exists=True))
-@click.option(
-    "--validate-languages", is_flag=True, help="Validate language codes in config"
-)
+@click.option("--validate-languages", is_flag=True, help="Validate language codes in config")
 def validate_config(config_file, validate_languages):
     """Validate language configuration in MoAI-ADK config file."""
     try:
@@ -227,30 +215,23 @@ def validate_config(config_file, validate_languages):
                 conv_lang = lang_config.get("conversation_language")
                 if conv_lang:
                     if conv_lang in get_all_supported_codes():
-                        console.print(
-                            f"[green]✓ conversation_language '{conv_lang}' is supported[/green]"
-                        )
+                        console.print(f"[green]✓ conversation_language '{conv_lang}' is supported[/green]")
                     else:
-                        console.print(
-                            f"[red]✗ conversation_language '{conv_lang}' is not supported[/red]"
-                        )
+                        console.print(f"[red]✗ conversation_language '{conv_lang}' is not supported[/red]")
                 else:
-                    console.print(
-                        "[yellow]⚠ No conversation_language specified[/yellow]"
-                    )
+                    console.print("[yellow]⚠ No conversation_language specified[/yellow]")
 
                 # Check conversation_language_name
                 conv_lang_name = lang_config.get("conversation_language_name")
                 if conv_lang_name and conv_lang:
                     expected_name = get_native_name(conv_lang)
                     if conv_lang_name == expected_name:
-                        console.print(
-                            "[green]✓ conversation_language_name matches[/green]"
-                        )
+                        console.print("[green]✓ conversation_language_name matches[/green]")
                     else:
-                        console.print(
-                            f"[yellow]⚠ conversation_language_name '{conv_lang_name}' doesn't match expected '{expected_name}'[/yellow]"
+                        warning_msg = (
+                            f"⚠ conversation_language_name '{conv_lang_name}' doesn't match expected '{expected_name}'"
                         )
+                        console.print(f"[yellow]{warning_msg}[/yellow]")
 
         if validate_languages:
             # Scan entire config for language codes
@@ -261,9 +242,7 @@ def validate_config(config_file, validate_languages):
                     found_codes.append(code)
 
             if found_codes:
-                console.print(
-                    f"[blue]Found language codes in config: {', '.join(found_codes)}[/blue]"
-                )
+                console.print(f"[blue]Found language codes in config: {', '.join(found_codes)}[/blue]")
 
     except Exception as e:
         console.print(f"[red]Error validating config: {e}[/red]")

moai_adk/cli/commands/status.py

@@ -1,7 +1,7 @@
 """MoAI-ADK status command
 
 Project status display:
-- Read project information from config.json
+- Read project information from config.yaml
 - Show the number of SPEC documents
 - Summarize the Git status
 
@@ -30,10 +30,10 @@ Project status display:
    - When SPEC count grows, verify with `Skill("moai-foundation-trust")`
 """
 
-import json
 from pathlib import Path
 
 import click
+import yaml
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
@@ -52,23 +52,19 @@ def status() -> None:
     - Git branch and status
     """
     try:
-        # Read config.json
-        config_path = Path.cwd() / ".moai" / "config" / "config.json"
+        # Read config.yaml
+        config_path = Path.cwd() / ".moai" / "config" / "config.yaml"
         if not config_path.exists():
-            console.print("[yellow]⚠ No .moai/config/config.json found[/yellow]")
-            console.print(
-                "[dim]Run [cyan]python -m moai_adk init .[/cyan] to initialize the project[/dim]"
-            )
+            console.print("[yellow]⚠ No .moai/config/config.yaml found[/yellow]")
+            console.print("[dim]Run [cyan]python -m moai_adk init .[/cyan] to initialize the project[/dim]")
             raise click.Abort()
 
         with open(config_path) as f:
-            config = json.load(f)
+            config = yaml.safe_load(f) or {}
 
         # Count SPEC documents
         specs_dir = Path.cwd() / ".moai" / "specs"
-        spec_count = (
-            len(list(specs_dir.glob("SPEC-*/spec.md"))) if specs_dir.exists() else 0
-        )
+        spec_count = len(list(specs_dir.glob("SPEC-*/spec.md"))) if specs_dir.exists() else 0
 
         # Build the status table
         table = Table(show_header=False, box=None, padding=(0, 2))
@@ -78,9 +74,7 @@ def status() -> None:
         # Read from project section (with legacy fallback)
         project = config.get("project", {})
         table.add_row("Mode", project.get("mode") or config.get("mode", "unknown"))
-        table.add_row(
-            "Locale", project.get("locale") or config.get("locale", "unknown")
-        )
+        table.add_row("Locale", project.get("locale") or config.get("locale", "unknown"))
         table.add_row("SPECs", str(spec_count))
 
         # Optionally include Git information