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

moai_adk/cli/commands/init.py

@@ -200,7 +200,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 +217,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"
 

moai_adk/cli/commands/update.py

@@ -65,6 +65,7 @@ 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
+from moai_adk.utils.common import reset_stdin
 
 console = Console()
 logger = logging.getLogger(__name__)
@@ -1500,15 +1501,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
@@ -1733,6 +1733,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 +1838,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,
     }
 
 
@@ -2082,6 +2091,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]")
@@ -2265,6 +2275,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
@@ -2465,7 +2476,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]")
 
@@ -2524,37 +2538,28 @@ def _handle_custom_element_restoration(project_path: Path, backup_path: Path | N
 
 
 def _cleanup_legacy_presets(project_path: Path) -> None:
-    """Remove legacy JSON preset files (not the entire directory).
+    """Remove legacy presets directory entirely.
 
-    This function cleans up obsolete .json preset files in .moai/config/presets/
-    that may exist from previous versions of MoAI-ADK. The directory itself
-    and .yaml files are preserved since they are part of the current template.
+    This function removes the entire .moai/config/presets/ directory as it is
+    no longer used. All preset settings are now consolidated in sections/git-strategy.yaml.
 
     Args:
         project_path: Project directory path (absolute)
     """
+    import shutil
+
     presets_dir = project_path / ".moai" / "config" / "presets"
 
     if not presets_dir.exists() or not presets_dir.is_dir():
         return
 
-    # Only remove legacy .json files, preserve .yaml files and the directory
-    json_files = list(presets_dir.glob("*.json"))
-    if not json_files:
-        return
-
-    removed_count = 0
-    for json_file in json_files:
-        try:
-            json_file.unlink()
-            removed_count += 1
-            logger.debug(f"Removed legacy preset file: {json_file}")
-        except Exception as e:
-            logger.warning(f"Failed to remove legacy preset {json_file}: {e}")
-
-    if removed_count > 0:
-        console.print(f"   [cyan]🧹 Cleaned up {removed_count} legacy JSON preset files[/cyan]")
-        logger.info(f"Removed {removed_count} legacy JSON preset files from {presets_dir}")
+    try:
+        # Remove entire presets directory (no longer needed)
+        shutil.rmtree(presets_dir)
+        console.print("   [cyan]🧹 Removed legacy presets directory (now in sections/git-strategy.yaml)[/cyan]")
+        logger.info(f"Removed legacy presets directory: {presets_dir}")
+    except Exception as e:
+        logger.warning(f"Failed to remove legacy presets directory {presets_dir}: {e}")
 
 
 def _migrate_config_json_to_yaml(project_path: Path) -> bool:

moai_adk/cli/worktree/cli.py

@@ -25,12 +25,15 @@ except ImportError:
 console = Console()
 
 
-def get_manager(repo_path: Path | None = None, worktree_root: Path | None = None) -> WorktreeManager:
+def get_manager(
+    repo_path: Path | None = None, worktree_root: Path | None = None, project_name: str | None = None
+) -> WorktreeManager:  # noqa: E501
     """Get or create a WorktreeManager instance.
 
     Args:
         repo_path: Path to Git repository. Defaults to current directory.
         worktree_root: Root directory for worktrees. Auto-detects optimal location.
+        project_name: Project name for namespace organization. Auto-detected from repo if not provided.
 
     Returns:
         WorktreeManager instance.
@@ -53,7 +56,11 @@ def get_manager(repo_path: Path | None = None, worktree_root: Path | None = None
     if worktree_root is None:
         worktree_root = _detect_worktree_root(repo_path)
 
-    return WorktreeManager(repo_path=repo_path, worktree_root=worktree_root)
+    # 3. Auto-detect project_name if not specified
+    if project_name is None:
+        project_name = repo_path.name
+
+    return WorktreeManager(repo_path=repo_path, worktree_root=worktree_root, project_name=project_name)
 
 
 def _detect_worktree_root(repo_path: Path) -> Path:
@@ -193,8 +200,7 @@ def new_worktree(
         console.print(f"  Status:     {info.status}")
         console.print()
         console.print("[yellow]Next steps:[/yellow]")
-        console.print(f"  moai-worktree switch {spec_id}   # Switch to this worktree")
-        console.print(f"  moai-worktree go {spec_id}       # Get cd command")
+        console.print(f"  moai-worktree go {spec_id}       # Go to this worktree")
 
     except WorktreeExistsError as e:
         console.print(f"[red]✗[/red] {e}")
@@ -260,15 +266,15 @@ def list_worktrees(format: str, repo: str | None, worktree_root: str | None) ->
         raise click.Abort()
 
 
-@worktree.command(name="switch")
+@worktree.command(name="go")
 @click.argument("spec_id")
 @click.option("--repo", type=click.Path(), default=None, help="Repository path")
 @click.option("--worktree-root", type=click.Path(), default=None, help="Worktree root directory")
-def switch_worktree(spec_id: str, repo: str | None, worktree_root: str | None) -> None:
-    """Switch to a worktree (opens new shell).
+def go_worktree(spec_id: str, repo: str | None, worktree_root: str | None) -> None:
+    """Go to a worktree (opens new shell).
 
     Args:
-        spec_id: SPEC ID to switch to
+        spec_id: SPEC ID to go to
         repo: Repository path (optional)
         worktree_root: Worktree root directory (optional)
     """
@@ -277,7 +283,7 @@ def switch_worktree(spec_id: str, repo: str | None, worktree_root: str | None) -
         wt_root = Path(worktree_root) if worktree_root else None
 
         manager = get_manager(repo_path, wt_root)
-        info = manager.registry.get(spec_id)
+        info = manager.registry.get(spec_id, project_name=manager.project_name)
 
         if not info:
             console.print(f"[red]✗[/red] Worktree not found: {spec_id}")
@@ -291,7 +297,7 @@ def switch_worktree(spec_id: str, repo: str | None, worktree_root: str | None) -
         subprocess.call([shell], cwd=str(info.path))
 
     except Exception as e:
-        console.print(f"[red]✗[/red] Error switching worktree: {e}")
+        console.print(f"[red]✗[/red] Error: {e}")
         raise click.Abort()
 
 
@@ -370,39 +376,6 @@ def status_worktrees(repo: str | None, worktree_root: str | None) -> None:
         raise click.Abort()
 
 
-@worktree.command(name="go")
-@click.argument("spec_id")
-@click.option("--repo", type=click.Path(), default=None, help="Repository path")
-@click.option("--worktree-root", type=click.Path(), default=None, help="Worktree root directory")
-def go_worktree(spec_id: str, repo: str | None, worktree_root: str | None) -> None:
-    """Print cd command for shell eval.
-
-    Usage: eval $(moai-worktree go SPEC-001)
-
-    Args:
-        spec_id: SPEC ID to navigate to
-        repo: Repository path (optional)
-        worktree_root: Worktree root directory (optional)
-    """
-    try:
-        repo_path = Path(repo) if repo else Path.cwd()
-        wt_root = Path(worktree_root) if worktree_root else None
-
-        manager = get_manager(repo_path, wt_root)
-        info = manager.registry.get(spec_id)
-
-        if not info:
-            console.print(f"[red]✗[/red] Worktree not found: {spec_id}")
-            raise click.Abort()
-
-        # Print cd command that can be eval'd
-        click.echo(f"cd {info.path}")
-
-    except Exception as e:
-        console.print(f"[red]✗[/red] Error: {e}")
-        raise click.Abort()
-
-
 @worktree.command(name="sync")
 @click.argument("spec_id", required=False)
 @click.option("--base", default="main", help="Base branch to sync from")
@@ -613,6 +586,44 @@ def clean_worktrees(merged_only: bool, interactive: bool, repo: str | None, work
         raise click.Abort()
 
 
+@worktree.command(name="recover")
+@click.option("--repo", type=click.Path(), default=None, help="Repository path")
+@click.option("--worktree-root", type=click.Path(), default=None, help="Worktree root directory")
+def recover_worktrees(repo: str | None, worktree_root: str | None) -> None:
+    """Recover worktree registry from existing directories.
+
+    Scans the worktree root directory for existing worktrees and
+    re-registers them in the registry file.
+
+    Args:
+        repo: Repository path (optional)
+        worktree_root: Worktree root directory (optional)
+    """
+    try:
+        repo_path = Path(repo) if repo else Path.cwd()
+        wt_root = Path(worktree_root) if worktree_root else None
+
+        manager = get_manager(repo_path, wt_root)
+
+        console.print(f"[cyan]Scanning {manager.worktree_root} for worktrees...[/cyan]")
+        recovered = manager.registry.recover_from_disk()
+
+        if recovered > 0:
+            console.print(f"[green]✓[/green] Recovered {recovered} worktree(s)")
+
+            # Show recovered worktrees
+            worktrees = manager.list()
+            for info in worktrees:
+                if info.status == "recovered":
+                    console.print(f"  - {info.spec_id} ({info.branch})")
+        else:
+            console.print("[yellow]No new worktrees found to recover[/yellow]")
+
+    except Exception as e:
+        console.print(f"[red]✗[/red] Error recovering worktrees: {e}")
+        raise click.Abort()
+
+
 @worktree.command(name="config")
 @click.argument("key", required=False)
 @click.argument("value", required=False)

moai_adk/cli/worktree/manager.py

@@ -18,23 +18,26 @@ from moai_adk.cli.worktree.registry import WorktreeRegistry
 
 
 class WorktreeManager:
-    """Manages Git worktrees for parallel SPEC development.
+    """Manages Git worktrees for parallel SPEC development with project namespace support.
 
     This class provides high-level operations for creating, removing,
     switching, and maintaining Git worktrees. It integrates with
     GitPython for Git operations and WorktreeRegistry for metadata
-    persistence.
+    persistence. Worktrees are organized by project name namespace to
+    support multiple projects: /worktrees/{project-name}/{SPEC-ID}
     """
 
-    def __init__(self, repo_path: Path, worktree_root: Path) -> None:
+    def __init__(self, repo_path: Path, worktree_root: Path, project_name: str | None = None) -> None:
         """Initialize the worktree manager.
 
         Args:
             repo_path: Path to the main Git repository.
             worktree_root: Root directory for all worktrees.
+            project_name: Project name for namespace organization. Defaults to repo directory name.
         """
         self.repo = Repo(repo_path)
         self.worktree_root = Path(worktree_root)
+        self.project_name = project_name or repo_path.name
         self.registry = WorktreeRegistry(self.worktree_root)
 
     def create(
@@ -62,7 +65,7 @@ class WorktreeManager:
             GitOperationError: If Git operation fails.
         """
         # Check if worktree already exists
-        existing = self.registry.get(spec_id)
+        existing = self.registry.get(spec_id, project_name=self.project_name)
         if existing and not force:
             raise WorktreeExistsError(spec_id, existing.path)
 
@@ -77,12 +80,12 @@ class WorktreeManager:
         if branch_name is None:
             branch_name = f"feature/{spec_id}"
 
-        # Create worktree path
-        worktree_path = self.worktree_root / spec_id
+        # Create worktree path with project_name namespace
+        worktree_path = self.worktree_root / self.project_name / spec_id
 
         try:
-            # Create parent directory if needed
-            self.worktree_root.mkdir(parents=True, exist_ok=True)
+            # Create parent directory if needed (including project_name namespace)
+            worktree_path.parent.mkdir(parents=True, exist_ok=True)
 
             # Fetch latest
             try:
@@ -128,7 +131,7 @@ class WorktreeManager:
             )
 
             # Register in registry
-            self.registry.register(info)
+            self.registry.register(info, project_name=self.project_name)
 
             return info
 
@@ -151,7 +154,7 @@ class WorktreeManager:
             UncommittedChangesError: If worktree has uncommitted changes (unless force=True).
             GitOperationError: If Git operation fails.
         """
-        info = self.registry.get(spec_id)
+        info = self.registry.get(spec_id, project_name=self.project_name)
         if not info:
             raise WorktreeNotFoundError(spec_id)
 
@@ -177,7 +180,7 @@ class WorktreeManager:
                     shutil.rmtree(info.path)
 
             # Unregister from registry
-            self.registry.unregister(spec_id)
+            self.registry.unregister(spec_id, project_name=self.project_name)
 
         except (WorktreeNotFoundError, UncommittedChangesError):
             raise
@@ -192,7 +195,7 @@ class WorktreeManager:
         Returns:
             List of WorktreeInfo instances.
         """
-        return self.registry.list_all()
+        return self.registry.list_all(project_name=self.project_name)
 
     def sync(
         self,
@@ -218,7 +221,7 @@ class WorktreeManager:
             MergeConflictError: If merge conflict occurs and auto_resolve is False.
             GitOperationError: If Git operation fails.
         """
-        info = self.registry.get(spec_id)
+        info = self.registry.get(spec_id, project_name=self.project_name)
         if not info:
             raise WorktreeNotFoundError(spec_id)
 
@@ -376,7 +379,7 @@ class WorktreeManager:
 
             # Update last accessed time
             info.last_accessed = datetime.now().isoformat() + "Z"
-            self.registry.register(info)
+            self.registry.register(info, project_name=self.project_name)
 
         except (WorktreeNotFoundError, MergeConflictError):
             raise