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

moai_adk/cli/commands/update.py

@@ -44,8 +44,10 @@ from __future__ import annotations
 
 import json
 import logging
+import os
 import shutil
 import subprocess
+import sys
 from datetime import datetime
 from pathlib import Path
 from typing import Any, Union, cast
@@ -65,8 +67,14 @@ from moai_adk.core.migration.custom_element_scanner import create_custom_element
 from moai_adk.core.migration.selective_restorer import create_selective_restorer
 from moai_adk.core.migration.user_selection_ui import create_user_selection_ui
 from moai_adk.core.template.processor import TemplateProcessor
-
-console = Console()
+from moai_adk.utils.common import reset_stdin
+
+# 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()
 logger = logging.getLogger(__name__)
 
 # Constants for tool detection
@@ -263,10 +271,10 @@ def _get_latest_version() -> str:
     Raises:
         RuntimeError: If PyPI API unavailable or parsing fails
     """
-    try:
-        import urllib.error
-        import urllib.request
+    import urllib.error
+    import urllib.request
 
+    try:
         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"))
@@ -983,9 +991,9 @@ def _restore_user_settings(project_path: Path, preserved: dict[str, Path | None]
     success = True
 
     # Restore settings.local.json
-    if preserved.get("settings.local.json"):
+    backup_path = preserved.get("settings.local.json")
+    if backup_path is not None:
         try:
-            backup_path = preserved["settings.local.json"]
             settings_local = claude_dir / "settings.local.json"
             settings_local.write_text(backup_path.read_text(encoding="utf-8"))
             console.print("   [cyan]✓ Restored user settings[/cyan]")
@@ -1445,18 +1453,13 @@ def _restore_selected_skills(skills: list[str], backup_path: Path, project_path:
 
 
 def _show_post_update_guidance(backup_path: Path) -> None:
-    """Show post-update guidance for running /moai:0-project update.
+    """Show post-update completion message.
 
     Args:
         backup_path: Backup directory path for reference
     """
     console.print("\n" + "[cyan]" + "=" * 60 + "[/cyan]")
     console.print("[green]✅ Update complete![/green]")
-    console.print("\n[yellow]📝 IMPORTANT - Next step:[/yellow]")
-    console.print("   Run [cyan]/moai:0-project update[/cyan] in Claude Code")
-    console.print("\n   This will:")
-    console.print("   • Merge your settings with new templates")
-    console.print("   • Validate configuration compatibility")
     console.print("\n[dim]💡 Personal instructions should go in CLAUDE.local.md[/dim]")
     console.print(f"[dim]📂 Backup location: {backup_path}[/dim]")
     console.print("[cyan]" + "=" * 60 + "[/cyan]\n")
@@ -1500,15 +1503,14 @@ def _sync_templates(project_path: Path, force: bool = False, yes: bool = False)
                 backup_path = backup.create_backup()
                 console.print(f"💾 Created backup: {backup_path.name}")
 
-                # Merge analysis using Claude Code headless mode
+                # Merge analysis using Pure Python semantic heuristics
                 try:
                     analyzer = MergeAnalyzer(project_path)
                     # Template source path from installed package
                     template_path = Path(__file__).parent.parent.parent / "templates"
 
-                    console.print("\n[cyan]🔍 Starting merge analysis (max 2 mins)...[/cyan]")
-                    console.print("[dim]   Analyzing intelligent merge with Claude Code.[/dim]")
-                    console.print("[dim]   Please wait...[/dim]\n")
+                    console.print("\n[cyan]🔍 Starting merge analysis...[/cyan]")
+                    console.print("[dim]   Analyzing templates with semantic heuristics.[/dim]\n")
                     analysis = analyzer.analyze_merge(backup_path, template_path)
 
                     # Ask user confirmation
@@ -1556,6 +1558,7 @@ def _sync_templates(project_path: Path, force: bool = False, yes: bool = False)
         if not validation_passed:
             if backup_path:
                 console.print(f"[yellow]🔄 Rolling back to backup: {backup_path.name}[/yellow]")
+                backup = TemplateBackup(project_path)
                 backup.restore_backup(backup_path)
             return False
 
@@ -1577,7 +1580,7 @@ def _sync_templates(project_path: Path, force: bool = False, yes: bool = False)
             if utils_dir.exists():
                 sys.path.insert(0, str(utils_dir))
                 try:
-                    from announcement_translator import auto_translate_and_update
+                    from announcement_translator import auto_translate_and_update  # type: ignore[import-not-found]
 
                     console.print("[cyan]Updating announcements...[/cyan]")
                     auto_translate_and_update(project_path)
@@ -1601,6 +1604,9 @@ def _sync_templates(project_path: Path, force: bool = False, yes: bool = False)
         # Clean up legacy presets directory
         _cleanup_legacy_presets(project_path)
 
+        # Clean up CLI redesign obsolete files (v0.41+)
+        _cleanup_cli_redesign_obsolete_files(project_path)
+
         # NEW: Show post-update guidance
         if backup_path:
             _show_post_update_guidance(backup_path)
@@ -1733,6 +1739,14 @@ def _build_template_context(
     # Detect OS for cross-platform Hook path configuration
     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"
+
     # Extract and resolve language configuration using centralized resolver
     try:
         from moai_adk.core.language_config_resolver import get_resolver
@@ -1830,6 +1844,7 @@ def _build_template_context(
         "CODEBASE_LANGUAGE": project_section.get("language", "generic"),
         "PROJECT_OWNER": project_section.get("author", "@user"),
         "AUTHOR": project_section.get("author", "@user"),
+        "STATUSLINE_COMMAND": statusline_command,
     }
 
 
@@ -1932,7 +1947,7 @@ def _validate_template_substitution(project_path: Path) -> None:
         console.print("[red]✗ Template substitution validation failed:[/red]")
         for issue in issues_found:
             console.print(f"   {issue}")
-        console.print("[yellow]💡 Run '/moai:0-project' to fix template variables[/yellow]")
+        console.print("[yellow]💡 Check .moai/config/ files for missing variable values[/yellow]")
     else:
         console.print("[green]✅ Template substitution validation passed[/green]")
 
@@ -1975,7 +1990,7 @@ def _validate_template_substitution_with_rollback(project_path: Path, backup_pat
         if backup_path:
             console.print("[yellow]🔄 Rolling back due to validation failure...[/yellow]")
         else:
-            console.print("[yellow]💡 Run '/moai:0-project' to fix template variables[/yellow]")
+            console.print("[yellow]💡 Check .moai/config/ files for missing variable values[/yellow]")
             console.print("[red]⚠️ No backup available - manual fix required[/red]")
 
         return False
@@ -2082,6 +2097,7 @@ def _execute_migration_if_needed(project_path: Path, yes: bool = False) -> bool:
 
         # Confirm with user (unless --yes)
         if not yes:
+            reset_stdin()  # Reset stdin before interactive prompt
             if not click.confirm("Do you want to proceed with migration?", default=True):
                 console.print("[yellow]⚠️  Migration skipped. Some features may not work correctly.[/yellow]")
                 console.print("[cyan]💡 Run 'moai-adk migrate' manually when ready[/cyan]")
@@ -2116,6 +2132,13 @@ def _execute_migration_if_needed(project_path: Path, yes: bool = False) -> bool:
 @click.option("--check", is_flag=True, help="Only check version (do not update)")
 @click.option("--templates-only", is_flag=True, help="Skip package upgrade, sync templates only")
 @click.option("--yes", is_flag=True, help="Auto-confirm all prompts (CI/CD mode)")
+@click.option(
+    "-c",
+    "--config",
+    "edit_config",
+    is_flag=True,
+    help="Edit project configuration (same as init wizard)",
+)
 @click.option(
     "--merge",
     "merge_strategy",
@@ -2134,6 +2157,7 @@ def update(
     check: bool,
     templates_only: bool,
     yes: bool,
+    edit_config: bool,
     merge_strategy: str | None,
 ) -> None:
     """Update command with 3-stage workflow + merge strategy selection (v0.26.0+).
@@ -2178,15 +2202,27 @@ def update(
         - Guide:  .moai/guides/merge-guide.md (manual merge only)
     """
     try:
-        project_path = Path(path).resolve()
+        # Use os.getcwd() for consistent path resolution in test environments
+        if path == ".":
+            project_path = Path(os.getcwd()).resolve()
+        else:
+            project_path = Path(path).resolve()
 
         # Verify the project is initialized
         if not (project_path / ".moai").exists():
             console.print("[yellow]⚠ Project not initialized[/yellow]")
             raise click.Abort()
 
+        # Handle --config / -c mode (edit configuration only, no template updates)
+        if edit_config:
+            _edit_configuration(project_path)
+            return
+
         # Get versions (needed for --check and normal workflow, but not for --templates-only alone)
         # Note: If --check is used, always fetch versions even if --templates-only is also present
+        # Initialize with defaults to satisfy type checker (will be set in the block below if needed)
+        current: str = __version__
+        latest: str = __version__
         if check or not templates_only:
             try:
                 # Try to use new spinner UI
@@ -2265,6 +2301,7 @@ def update(
 
             # Confirm upgrade (unless --yes)
             if not yes:
+                reset_stdin()  # Reset stdin before interactive prompt
                 if not click.confirm(f"Upgrade {current} → {latest}?", default=True):
                     console.print("Cancelled")
                     return
@@ -2394,6 +2431,14 @@ def update(
                 processor = TemplateProcessor(project_path)
                 backup_path = processor.create_backup()
                 console.print(f"   [green]✓ Backup: {backup_path.relative_to(project_path)}/[/green]")
+
+                # Clean up old backups (keep last 5)
+                from moai_adk.core.template.backup import TemplateBackup
+
+                template_backup = TemplateBackup(project_path)
+                deleted_count = template_backup.cleanup_old_backups(keep_count=5)
+                if deleted_count > 0:
+                    console.print(f"   [cyan]🧹 Cleaned up {deleted_count} old backup(s)[/cyan]")
             except Exception as e:
                 console.print(f"   [yellow]⚠ Backup failed: {e}[/yellow]")
                 console.print("   [yellow]⚠ Continuing without backup...[/yellow]")
@@ -2424,7 +2469,14 @@ def update(
         console.print("   [yellow]⚙️  Set optimized=false (optimization needed)[/yellow]")
 
         console.print("\n[green]✓ Update complete![/green]")
-        console.print("[cyan]ℹ️  Next step: Run /moai:0-project update to optimize template changes[/cyan]")
+
+        # 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
 
     except Exception as e:
         console.print(f"[red]✗ Update failed: {e}[/red]")
@@ -2465,7 +2517,10 @@ def _handle_custom_element_restoration(project_path: Path, backup_path: Path | N
             return
 
         # Create enhanced user selection UI
-        ui = create_user_selection_ui(project_path)
+        # IMPORTANT: Use backup_path, not project_path!
+        # At this point, custom elements in project have been deleted by copy_templates().
+        # The UI must scan the BACKUP to find elements available for restoration.
+        ui = create_user_selection_ui(backup_path)
 
         console.print(f"\n[cyan]🔍 Found {backup_element_count} custom elements in backup[/cyan]")
 
@@ -2548,6 +2603,69 @@ def _cleanup_legacy_presets(project_path: Path) -> None:
         logger.warning(f"Failed to remove legacy presets directory {presets_dir}: {e}")
 
 
+def _cleanup_cli_redesign_obsolete_files(project_path: Path, dry_run: bool = False) -> int:
+    """
+    Remove obsolete files from CLI redesign migration (v0.41+).
+
+    Cleans up:
+    - .moai/scripts/setup-glm.py (replaced by moai init CLI)
+    - .moai/config/questions/ (replaced by moai init CLI prompts)
+    - .moai/scripts/ (if empty after cleanup)
+
+    Args:
+        project_path: Project directory path
+        dry_run: If True, only simulate cleanup
+
+    Returns:
+        Number of items cleaned up
+    """
+    obsolete_items = [
+        ".moai/scripts/setup-glm.py",
+        ".moai/config/questions",
+    ]
+
+    cleaned_count = 0
+
+    for relative_path in obsolete_items:
+        full_path = project_path / relative_path
+
+        if not full_path.exists():
+            continue
+
+        try:
+            if dry_run:
+                console.print(f"   [dim]Would remove: {relative_path}[/dim]")
+                cleaned_count += 1
+            else:
+                if full_path.is_dir():
+                    shutil.rmtree(full_path)
+                    console.print(f"   [cyan]Removed obsolete directory: {relative_path}[/cyan]")
+                else:
+                    full_path.unlink()
+                    console.print(f"   [cyan]Removed obsolete file: {relative_path}[/cyan]")
+                logger.info(f"Cleaned up obsolete: {relative_path}")
+                cleaned_count += 1
+        except Exception as e:
+            logger.warning(f"Failed to clean up {relative_path}: {e}")
+
+    # Remove .moai/scripts/ if empty
+    scripts_dir = project_path / ".moai" / "scripts"
+    if scripts_dir.exists() and scripts_dir.is_dir():
+        try:
+            if not any(scripts_dir.iterdir()):
+                if dry_run:
+                    console.print("   [dim]Would remove: .moai/scripts (empty)[/dim]")
+                else:
+                    shutil.rmtree(scripts_dir)
+                    console.print("   [cyan]Removed empty .moai/scripts directory[/cyan]")
+                    logger.info("Removed empty .moai/scripts directory")
+                cleaned_count += 1
+        except Exception as e:
+            logger.warning(f"Failed to remove empty scripts directory: {e}")
+
+    return cleaned_count
+
+
 def _migrate_config_json_to_yaml(project_path: Path) -> bool:
     """Migrate legacy config.json to config.yaml format.
 
@@ -2675,3 +2793,158 @@ def _migrate_preset_files_to_yaml(config_dir: Path) -> None:
     if migrated_count > 0:
         console.print(f"   [cyan]🔄 Migrated {migrated_count} preset file(s) to YAML[/cyan]")
         logger.info(f"Migrated {migrated_count} preset files to YAML")
+
+
+def _load_current_settings(project_path: Path) -> dict[str, Any]:
+    """Load current settings from section YAML files.
+
+    Args:
+        project_path: Project directory path
+
+    Returns:
+        Dictionary with current settings from all section files
+    """
+    sections_dir = project_path / ".moai" / "config" / "sections"
+    settings: dict[str, Any] = {}
+
+    section_files = [
+        ("language", "language.yaml"),
+        ("project", "project.yaml"),
+        ("pricing", "pricing.yaml"),
+        ("git_strategy", "git-strategy.yaml"),
+        ("user", "user.yaml"),
+        ("llm", "llm.yaml"),
+    ]
+
+    for key, filename in section_files:
+        file_path = sections_dir / filename
+        if file_path.exists():
+            try:
+                data = yaml.safe_load(file_path.read_text(encoding="utf-8"))
+                if data:
+                    settings[key] = data
+            except yaml.YAMLError:
+                pass
+
+    return settings
+
+
+def _show_current_config(project_path: Path) -> None:
+    """Display current configuration summary in a panel.
+
+    Args:
+        project_path: Project directory path
+    """
+    from rich.panel import Panel
+
+    settings = _load_current_settings(project_path)
+
+    # Extract values with defaults
+    project_name = settings.get("project", {}).get("project", {}).get("name", project_path.name)
+    if isinstance(settings.get("project", {}).get("project"), dict):
+        project_name = settings["project"]["project"].get("name", project_path.name)
+    elif "project" in settings and "name" in settings.get("project", {}).get("project", {}):
+        project_name = settings["project"]["project"]["name"]
+    else:
+        # Try alternative structure
+        project_name = settings.get("project", {}).get("name", project_path.name)
+
+    user_name = settings.get("user", {}).get("user", {}).get("name", "")
+    if not user_name and isinstance(settings.get("user"), dict):
+        user_name = settings.get("user", {}).get("name", "")
+
+    conv_lang = settings.get("language", {}).get("language", {}).get("conversation_language", "en")
+    conv_lang_name = settings.get("language", {}).get("language", {}).get("conversation_language_name", "English")
+
+    # GLM-only simplified flow - service is always GLM
+    glm_pricing_plan = settings.get("pricing", {}).get("service", {}).get("glm_pricing_plan", "basic")
+
+    git_mode = settings.get("git_strategy", {}).get("git_strategy", {}).get("mode", "personal")
+
+    llm_mode = settings.get("llm", {}).get("llm", {}).get("mode", "claude-only")
+
+    # Build display content
+    lines = [
+        f"📁 Project: [cyan]{project_name}[/cyan]",
+    ]
+    if user_name:
+        lines.append(f"👤 User: [cyan]{user_name}[/cyan]")
+
+    lines.append("")
+    lines.append(f"🌐 Language: [green]{conv_lang}[/green] ({conv_lang_name})")
+    lines.append("🔧 Service: [green]GLM CodePlan[/green]" + (f" ({glm_pricing_plan})" if glm_pricing_plan else ""))
+    lines.append(f"🔀 Git: [green]{git_mode}[/green]")
+    lines.append(f"🤖 LLM Mode: [green]{llm_mode}[/green]")
+
+    content = "\n".join(lines)
+    console.print(Panel(content, title="[yellow]Current Configuration[/yellow]", border_style="cyan"))
+
+
+def _edit_configuration(project_path: Path) -> None:
+    """Interactive configuration editing using init prompts.
+
+    Args:
+        project_path: Project directory path
+    """
+    from moai_adk.cli.commands.init import _save_additional_config
+    from moai_adk.cli.prompts.init_prompts import prompt_project_setup
+
+    console.print("\n[cyan]⚙️  Configuration Edit Mode[/cyan]")
+    console.print("[dim]Edit your project settings (same as init wizard)[/dim]\n")
+
+    # Show current config
+    _show_current_config(project_path)
+    console.print()
+
+    # Load current settings to pre-fill
+    settings = _load_current_settings(project_path)
+
+    # Extract current locale for pre-fill
+    current_locale = settings.get("language", {}).get("language", {}).get("conversation_language", "en")
+    project_name = project_path.name
+
+    # Try to get project name from settings
+    project_data = settings.get("project", {})
+    if isinstance(project_data.get("project"), dict):
+        project_name = project_data["project"].get("name", project_path.name)
+    elif "name" in project_data:
+        project_name = project_data.get("name", project_path.name)
+
+    # Run interactive prompt
+    try:
+        answers = prompt_project_setup(
+            project_name=project_name,
+            is_current_dir=True,
+            project_path=project_path,
+            initial_locale=current_locale,
+        )
+    except KeyboardInterrupt:
+        console.print("\n[yellow]Configuration edit cancelled.[/yellow]")
+        return
+
+    if not answers:
+        console.print("[yellow]No changes made.[/yellow]")
+        return
+
+    # Save configuration to section files
+    # Note: API keys are not modified in config edit mode (pass None to preserve existing)
+    # GLM-only flow: service_type is always "glm", glm_pricing_plan defaults to "basic"
+    _save_additional_config(
+        project_path=project_path,
+        project_name=answers.get("project_name", project_name),
+        locale=answers.get("locale", current_locale),
+        user_name=answers.get("user_name", ""),
+        service_type="glm",  # Always GLM in simplified flow
+        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,  # Preserve existing key
+        git_mode=answers.get("git_mode", "personal"),
+        github_username=answers.get("github_username"),
+        git_commit_lang=answers.get("git_commit_lang", "en"),
+        code_comment_lang=answers.get("code_comment_lang", "en"),
+        doc_lang=answers.get("doc_lang", "en"),
+    )
+
+    console.print("\n[green]✓ Configuration updated successfully![/green]")
+    console.print("[dim]Changes saved to .moai/config/sections/[/dim]")