claude-mpm 5.0.2__py3-none-any.whl → 5.1.9__py3-none-any.whl

claude_mpm/cli/interactive/agent_wizard.py

@@ -6,18 +6,33 @@ local agents with user-friendly prompts, intelligent defaults, and validation.
 
 import json
 import re
+import shutil
 import sys
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
+import questionary
+from questionary import Style
+
 from claude_mpm.core.logging_config import get_logger
 from claude_mpm.services.agents.local_template_manager import (
     LocalAgentTemplate,
     LocalAgentTemplateManager,
 )
+from claude_mpm.utils.agent_filters import apply_all_filters
 
 logger = get_logger(__name__)
 
+# Questionary style matching Rich cyan theme (consistent with configure.py)
+QUESTIONARY_STYLE = Style(
+    [
+        ("selected", "fg:cyan bold"),
+        ("pointer", "fg:cyan bold"),
+        ("highlighted", "fg:cyan"),
+        ("question", "fg:cyan bold"),
+    ]
+)
+
 
 class AgentWizard:
     """
@@ -47,6 +62,50 @@ class AgentWizard:
             self.source_manager = None
             self.discovery_enabled = False
 
+    @staticmethod
+    def _calculate_column_widths(
+        terminal_width: int, columns: Dict[str, int]
+    ) -> Dict[str, int]:
+        """Calculate dynamic column widths based on terminal size.
+
+        Args:
+            terminal_width: Current terminal width in characters
+            columns: Dict mapping column names to minimum widths
+
+        Returns:
+            Dict mapping column names to calculated widths
+
+        Design:
+            - Ensures minimum widths are respected
+            - Distributes extra space proportionally
+            - Handles narrow terminals gracefully (minimum 80 chars)
+        """
+        # Ensure minimum terminal width
+        min_terminal_width = 80
+        terminal_width = max(terminal_width, min_terminal_width)
+
+        # Calculate total minimum width needed
+        total_min_width = sum(columns.values())
+
+        # Account for spacing between columns
+        overhead = len(columns) + 1
+        available_width = terminal_width - overhead
+
+        # If we have extra space, distribute proportionally
+        if available_width > total_min_width:
+            extra_space = available_width - total_min_width
+            total_weight = sum(columns.values())
+
+            result = {}
+            for col_name, min_width in columns.items():
+                # Distribute extra space based on minimum width proportion
+                proportion = min_width / total_weight
+                extra = int(extra_space * proportion)
+                result[col_name] = min_width + extra
+            return result
+        # Terminal too narrow, use minimum widths
+        return columns.copy()
+
     def run_interactive_create(self) -> Tuple[bool, str]:
         """Run interactive agent creation wizard.
 
@@ -206,7 +265,10 @@ class AgentWizard:
                 if deployed_file.exists() or deployed_file_alt.exists():
                     agent_data["deployed"] = True
 
-        return list(agents.values())
+        # Filter BASE_AGENT from all agent lists (1M-502 Phase 1)
+        # BASE_AGENT is a build tool, not a deployable agent
+        agent_list = list(agents.values())
+        return apply_all_filters(agent_list, filter_base=True, filter_deployed=False)
 
     def run_interactive_manage(self) -> Tuple[bool, str]:
         """Run interactive agent management menu.
@@ -242,50 +304,94 @@ class AgentWizard:
                     print("❌ Invalid choice. Please try again.")
                     continue
 
-                # Show existing agents in a table
+                # Show existing agents in a table with dynamic widths
                 print(f"\n📋 Found {len(all_agents)} agent(s):\n")
+
+                # Calculate dynamic column widths based on terminal size
+                terminal_width = shutil.get_terminal_size().columns
+                min_widths = {
+                    "#": 4,
+                    "Agent ID": 30,
+                    "Name": 20,
+                    "Source": 15,
+                    "Status": 10,
+                }
+                widths = self._calculate_column_widths(terminal_width, min_widths)
+
+                # Print header with dynamic widths
                 print(
-                    f"{'#':<4} {'Agent ID':<40} {'Name':<25} {'Source':<20} {'Status':<10}"
+                    f"{'#':<{widths['#']}} "
+                    f"{'Agent ID':<{widths['Agent ID']}} "
+                    f"{'Name':<{widths['Name']}} "
+                    f"{'Source':<{widths['Source']}} "
+                    f"{'Status':<{widths['Status']}}"
                 )
-                print("-" * 105)
+                separator_width = sum(widths.values()) + len(widths) - 1
+                print("-" * separator_width)
 
                 for i, agent in enumerate(all_agents, 1):
                     agent_id = agent["agent_id"]
-                    name = (
-                        agent["name"][:24] if len(agent["name"]) > 24 else agent["name"]
-                    )
+                    # Truncate to fit dynamic width
+                    if len(agent_id) > widths["Agent ID"]:
+                        agent_id = agent_id[: widths["Agent ID"] - 1] + "…"
+
+                    name = agent["name"]
+                    if len(name) > widths["Name"]:
+                        name = name[: widths["Name"] - 1] + "…"
+
                     source_label = (
-                        f"[{agent['source_type']}] {agent['source_identifier']}"[:19]
+                        f"[{agent['source_type']}] {agent['source_identifier']}"
                     )
+                    if len(source_label) > widths["Source"]:
+                        source_label = source_label[: widths["Source"] - 1] + "…"
+
                     status = "✓ Deployed" if agent["deployed"] else "Available"
 
                     print(
-                        f"{i:<4} {agent_id:<40} {name:<25} {source_label:<20} {status:<10}"
+                        f"{i:<{widths['#']}} "
+                        f"{agent_id:<{widths['Agent ID']}} "
+                        f"{name:<{widths['Name']}} "
+                        f"{source_label:<{widths['Source']}} "
+                        f"{status:<{widths['Status']}}"
                     )
 
-                # Enhanced menu options
-                print(f"\n{len(all_agents) + 1}. Deploy agent")
-                print(f"{len(all_agents) + 2}. Create new agent")
-                print(f"{len(all_agents) + 3}. Delete agent(s)")
-                print(f"{len(all_agents) + 4}. Import agents")
-                print(f"{len(all_agents) + 5}. Export all agents")
+                # Build menu choices with arrow-key navigation
+                menu_choices = []
+
+                # Add agent viewing options (1-N)
+                for i, agent in enumerate(all_agents, 1):
+                    menu_choices.append(f"{i}. View agent: {agent['agent_id']}")
+
+                # Add action options
+                menu_choices.append(f"{len(all_agents) + 1}. Deploy agent")
+                menu_choices.append(f"{len(all_agents) + 2}. Create new agent")
+                menu_choices.append(f"{len(all_agents) + 3}. Delete agent(s)")
+                menu_choices.append(f"{len(all_agents) + 4}. Import agents")
+                menu_choices.append(f"{len(all_agents) + 5}. Export all agents")
+
                 if self.discovery_enabled:
-                    print(f"{len(all_agents) + 6}. Browse & filter agents")
-                    print(f"{len(all_agents) + 7}. Deploy preset")
-                    print(f"{len(all_agents) + 8}. Manage agent sources")
-                    print(f"{len(all_agents) + 9}. Exit")
-                    max_choice = len(all_agents) + 9
+                    menu_choices.append(
+                        f"{len(all_agents) + 6}. Browse & filter agents"
+                    )
+                    menu_choices.append(f"{len(all_agents) + 7}. Deploy preset")
+                    menu_choices.append(f"{len(all_agents) + 8}. Manage agent sources")
+                    menu_choices.append(f"{len(all_agents) + 9}. Exit")
+                    exit_num = len(all_agents) + 9
                 else:
-                    print(f"{len(all_agents) + 6}. Exit")
-                    max_choice = len(all_agents) + 6
+                    menu_choices.append(f"{len(all_agents) + 6}. Exit")
+                    exit_num = len(all_agents) + 6
 
-                choice = input(f"\nSelect option [1-{max_choice}]: ").strip()
+                choice = questionary.select(
+                    "Agent Management Menu:",
+                    choices=menu_choices,
+                    style=QUESTIONARY_STYLE,
+                ).ask()
 
-                try:
-                    choice_num = int(choice)
-                except ValueError:
-                    print("❌ Invalid choice. Please enter a number.")
-                    continue
+                if not choice:  # User pressed Esc
+                    return True, "Management menu exited"
+
+                # Parse choice number from "N. Description" format
+                choice_num = int(choice.split(".")[0])
 
                 if 1 <= choice_num <= len(all_agents):
                     # View agent details
@@ -324,9 +430,7 @@ class AgentWizard:
                 elif choice_num == len(all_agents) + 8 and self.discovery_enabled:
                     self._manage_sources_interactive()
                     continue
-                elif (choice_num == len(all_agents) + 9 and self.discovery_enabled) or (
-                    choice_num == len(all_agents) + 6 and not self.discovery_enabled
-                ):
+                elif choice_num == exit_num:
                     return True, "Management menu exited"
                 else:
                     print("❌ Invalid choice. Please try again.")
@@ -1073,8 +1177,11 @@ class AgentWizard:
         Args:
             available_agents: List of all available agents
         """
-        # Filter to non-deployed agents
-        deployable = [a for a in available_agents if not a["deployed"]]
+        # Filter to non-deployed agents using improved detection (1M-502 Phase 1)
+        # This checks both .claude-mpm/agents/ and .claude/agents/
+        deployable = apply_all_filters(
+            available_agents, filter_base=True, filter_deployed=True
+        )
 
         if not deployable:
             print("\n✅ All agents are already deployed!")
@@ -1086,110 +1193,100 @@ class AgentWizard:
         print("=" * 60)
         print(f"\n{len(deployable)} agent(s) available to deploy:\n")
 
-        for i, agent in enumerate(deployable, 1):
-            print(f"  {i}. {agent['agent_id']}")
-            print(
-                f"     {agent['description'][:60]}{'...' if len(agent['description']) > 60 else ''}"
-            )
-
-        choice = input("\nEnter agent number (or 'c' to cancel): ").strip()
-        if choice.lower() == "c":
-            return
-
-        try:
-            idx = int(choice) - 1
-            if idx < 0 or idx >= len(deployable):
-                print("❌ Invalid selection")
-                input("\nPress Enter to continue...")
-                return
-
-            agent = deployable[idx]
+        # Build agent selection choices with arrow-key navigation
+        agent_choices = [
+            f"{i}. {agent['agent_id']} - {agent['description'][:60]}{'...' if len(agent['description']) > 60 else ''}"
+            for i, agent in enumerate(deployable, 1)
+        ]
 
-            # Deploy agent using deployment service
-            print(f"\n🚀 Deploying {agent['agent_id']}...")
+        choice = questionary.select(
+            "Select agent to deploy:", choices=agent_choices, style=QUESTIONARY_STYLE
+        ).ask()
 
-            try:
-                # Use SingleAgentDeployer for deployment
-                from claude_mpm.services.agents.deployment.agent_template_builder import (
-                    AgentTemplateBuilder,
-                )
-                from claude_mpm.services.agents.deployment.agent_version_manager import (
-                    AgentVersionManager,
-                )
-                from claude_mpm.services.agents.deployment.deployment_results_manager import (
-                    DeploymentResultsManager,
-                )
-                from claude_mpm.services.agents.deployment.single_agent_deployer import (
-                    SingleAgentDeployer,
-                )
+        if not choice:  # User pressed Esc
+            return
 
-                # Initialize deployment services
-                template_builder = AgentTemplateBuilder()
-                version_manager = AgentVersionManager()
-                results_manager = DeploymentResultsManager(self.logger)
-                deployer = SingleAgentDeployer(
-                    template_builder=template_builder,
-                    version_manager=version_manager,
-                    results_manager=results_manager,
-                    logger=self.logger,
-                )
+        # Parse agent index from "N. agent_id - description" format
+        idx = int(choice.split(".")[0]) - 1
+        agent = deployable[idx]
 
-                # Prepare deployment parameters
-                template_path = Path(agent["path"])
-                target_dir = Path.cwd() / ".claude" / "agents"
+        # Deploy agent using deployment service
+        print(f"\n🚀 Deploying {agent['agent_id']}...")
 
-                # Find base_agent.json in multiple possible locations
-                base_agent_candidates = [
-                    Path.home()
-                    / ".claude-mpm"
-                    / "agents"
-                    / "templates"
-                    / "base_agent.json",
-                    Path.home() / ".claude-mpm" / "cache" / "base_agent.json",
-                    Path(__file__).parent.parent.parent
-                    / "agents"
-                    / "templates"
-                    / "base_agent.json",
-                ]
-                base_agent_path = None
-                for candidate in base_agent_candidates:
-                    if candidate.exists():
-                        base_agent_path = candidate
-                        break
-
-                if not base_agent_path:
-                    base_agent_path = base_agent_candidates[
-                        0
-                    ]  # Use default even if not exists
+        try:
+            # Use SingleAgentDeployer for deployment
+            from claude_mpm.services.agents.deployment.agent_template_builder import (
+                AgentTemplateBuilder,
+            )
+            from claude_mpm.services.agents.deployment.agent_version_manager import (
+                AgentVersionManager,
+            )
+            from claude_mpm.services.agents.deployment.deployment_results_manager import (
+                DeploymentResultsManager,
+            )
+            from claude_mpm.services.agents.deployment.single_agent_deployer import (
+                SingleAgentDeployer,
+            )
 
-                # Deploy the agent
-                success = deployer.deploy_agent(
-                    agent_name=agent["agent_id"],
-                    templates_dir=template_path.parent,
-                    target_dir=target_dir,
-                    base_agent_path=base_agent_path,
-                    force_rebuild=True,
-                    working_directory=Path.cwd(),
-                )
+            # Initialize deployment services
+            template_builder = AgentTemplateBuilder()
+            version_manager = AgentVersionManager()
+            results_manager = DeploymentResultsManager(self.logger)
+            deployer = SingleAgentDeployer(
+                template_builder=template_builder,
+                version_manager=version_manager,
+                results_manager=results_manager,
+                logger=self.logger,
+            )
 
-                if success:
-                    print(f"\n✅ Successfully deployed {agent['agent_id']}")
-                else:
-                    print(f"\n❌ Failed to deploy {agent['agent_id']}")
+            # Prepare deployment parameters
+            template_path = Path(agent["path"])
+            target_dir = Path.cwd() / ".claude" / "agents"
+
+            # Find base_agent.json in multiple possible locations
+            base_agent_candidates = [
+                Path.home()
+                / ".claude-mpm"
+                / "agents"
+                / "templates"
+                / "base_agent.json",
+                Path.home() / ".claude-mpm" / "cache" / "base_agent.json",
+                Path(__file__).parent.parent.parent
+                / "agents"
+                / "templates"
+                / "base_agent.json",
+            ]
+            base_agent_path = None
+            for candidate in base_agent_candidates:
+                if candidate.exists():
+                    base_agent_path = candidate
+                    break
 
-            except Exception as e:
-                self.logger.error(f"Deployment failed: {e}", exc_info=True)
-                print(f"\n❌ Deployment error: {e}")
+            if not base_agent_path:
+                base_agent_path = base_agent_candidates[
+                    0
+                ]  # Use default even if not exists
+
+            # Deploy the agent
+            success = deployer.deploy_agent(
+                agent_name=agent["agent_id"],
+                templates_dir=template_path.parent,
+                target_dir=target_dir,
+                base_agent_path=base_agent_path,
+                force_rebuild=True,
+                working_directory=Path.cwd(),
+            )
 
-            input("\nPress Enter to continue...")
+            if success:
+                print(f"\n✅ Successfully deployed {agent['agent_id']}")
+            else:
+                print(f"\n❌ Failed to deploy {agent['agent_id']}")
 
-        except ValueError:
-            print("❌ Invalid selection")
-            input("\nPress Enter to continue...")
         except Exception as e:
-            self.logger.error(f"Deployment error: {e}", exc_info=True)
-            print(f"\n❌ Error: {e}")
-            input("\nPress Enter to continue...")
+            self.logger.error(f"Deployment failed: {e}", exc_info=True)
+            print(f"\n❌ Deployment error: {e}")
+
+        input("\nPress Enter to continue...")
 
     def _browse_agents_interactive(self):
         """Interactive agent browsing with filters."""
@@ -1203,24 +1300,37 @@ class AgentWizard:
             print("🔍 Browse & Filter Agents")
             print("=" * 60)
 
-            # Show filter menu
+            # Show filter menu with arrow-key navigation
             print("\n[bold]Filter by:[/bold]")
-            print("  [1] Category (engineer/backend, qa, ops, etc.)")
-            print("  [2] Language (python, typescript, rust, etc.)")
-            print("  [3] Framework (react, nextjs, flask, etc.)")
-            print("  [4] Show all agents")
-            print("  [b] Back to main menu")
 
-            choice = input("\nSelect filter option: ").strip()
+            filter_choices = [
+                "1. Category (engineer/backend, qa, ops, etc.)",
+                "2. Language (python, typescript, rust, etc.)",
+                "3. Framework (react, nextjs, flask, etc.)",
+                "4. Show all agents",
+                "← Back to main menu",
+            ]
+
+            choice = questionary.select(
+                "Browse & Filter Agents:",
+                choices=filter_choices,
+                style=QUESTIONARY_STYLE,
+            ).ask()
+
+            if not choice or "Back" in choice:
+                break
 
-            if choice == "b":
+            # Parse choice number if it starts with a digit
+            if choice[0].isdigit():
+                choice_num = choice.split(".")[0]
+            else:
                 break
 
             filtered_agents = []
             filter_description = ""
 
-            if choice == "1":
-                # Category filtering
+            if choice_num == "1":
+                # Category filtering with arrow-key navigation
                 categories = [
                     "engineer/backend",
                     "engineer/frontend",
@@ -1229,26 +1339,26 @@ class AgentWizard:
                     "documentation",
                     "universal",
                 ]
-                print("\n[bold]Available categories:[/bold]")
-                for idx, cat in enumerate(categories, 1):
-                    print(f"  {idx}. {cat}")
 
-                cat_choice = input("\nSelect category number: ").strip()
-                try:
-                    category = categories[int(cat_choice) - 1]
-                    all_agents = self._merge_agent_sources()
-                    filtered_agents = [
-                        a
-                        for a in all_agents
-                        if a.get("category", "").startswith(category)
-                    ]
-                    filter_description = f"Category: {category}"
-                except (ValueError, IndexError):
-                    print("❌ Invalid selection")
-                    input("\nPress Enter to continue...")
+                cat_choices = [f"{idx}. {cat}" for idx, cat in enumerate(categories, 1)]
+
+                cat_choice = questionary.select(
+                    "Select category:", choices=cat_choices, style=QUESTIONARY_STYLE
+                ).ask()
+
+                if not cat_choice:  # User pressed Esc
                     continue
 
-            elif choice == "2":
+                # Parse category from "N. category" format
+                cat_idx = int(cat_choice.split(".")[0]) - 1
+                category = categories[cat_idx]
+                all_agents = self._merge_agent_sources()
+                filtered_agents = [
+                    a for a in all_agents if a.get("category", "").startswith(category)
+                ]
+                filter_description = f"Category: {category}"
+
+            elif choice_num == "2":
                 # Language filtering (using AUTO-DEPLOY-INDEX if available)
                 language = input(
                     "\nEnter language (python, typescript, rust, go, etc.): "
@@ -1294,7 +1404,7 @@ class AgentWizard:
                     input("\nPress Enter to continue...")
                     continue
 
-            elif choice == "3":
+            elif choice_num == "3":
                 # Framework filtering
                 framework = input(
                     "\nEnter framework (react, nextjs, flask, django, etc.): "
@@ -1337,7 +1447,7 @@ class AgentWizard:
                     input("\nPress Enter to continue...")
                     continue
 
-            elif choice == "4":
+            elif choice_num == "4":
                 # Show all agents
                 filtered_agents = self._merge_agent_sources()
                 filter_description = "All agents"
@@ -1407,26 +1517,28 @@ class AgentWizard:
             input("\nPress Enter to continue...")
             return
 
-        agent_num = input(
-            f"\nEnter agent number to deploy (1-{len(agents)}) or 'c' to cancel: "
-        ).strip()
-        if agent_num.lower() == "c":
-            return
+        # Build agent selection choices
+        agent_choices = [
+            f"{i}. {agent['agent_id']}" for i, agent in enumerate(agents, 1)
+        ]
 
-        try:
-            idx = int(agent_num) - 1
-            if idx < 0 or idx >= len(agents):
-                print("❌ Invalid agent number")
-                input("\nPress Enter to continue...")
-                return
+        agent_choice = questionary.select(
+            "Select agent to deploy:", choices=agent_choices, style=QUESTIONARY_STYLE
+        ).ask()
 
-            agent = agents[idx]
+        if not agent_choice:  # User pressed Esc
+            return
 
-            if agent.get("deployed"):
-                print(f"\n[yellow]{agent['agent_id']} is already deployed[/yellow]")
-            else:
-                print(f"\n🚀 Deploying {agent['agent_id']}...")
+        # Parse agent index from "N. agent_id" format
+        idx = int(agent_choice.split(".")[0]) - 1
+        agent = agents[idx]
 
+        if agent.get("deployed"):
+            print(f"\n[yellow]{agent['agent_id']} is already deployed[/yellow]")
+        else:
+            print(f"\n🚀 Deploying {agent['agent_id']}...")
+
+            try:
                 from claude_mpm.services.agents.deployment.agent_template_builder import (
                     AgentTemplateBuilder,
                 )
@@ -1494,14 +1606,11 @@ class AgentWizard:
                 else:
                     print(f"[red]✗ Failed to deploy {agent['agent_id']}[/red]")
 
-            input("\nPress Enter to continue...")
-        except ValueError:
-            print("❌ Invalid agent number")
-            input("\nPress Enter to continue...")
-        except Exception as e:
-            self.logger.error(f"Deployment error: {e}", exc_info=True)
-            print(f"❌ Deployment error: {e}")
-            input("\nPress Enter to continue...")
+            except Exception as e:
+                self.logger.error(f"Deployment error: {e}", exc_info=True)
+                print(f"❌ Deployment error: {e}")
+
+        input("\nPress Enter to continue...")
 
     def _view_from_filtered_list(self, agents: List[Dict[str, Any]]):
         """View details of an agent from filtered list.
@@ -1514,24 +1623,22 @@ class AgentWizard:
             input("\nPress Enter to continue...")
             return
 
-        agent_num = input(
-            f"\nEnter agent number to view (1-{len(agents)}) or 'c' to cancel: "
-        ).strip()
-        if agent_num.lower() == "c":
-            return
+        # Build agent selection choices
+        agent_choices = [
+            f"{i}. {agent['agent_id']}" for i, agent in enumerate(agents, 1)
+        ]
 
-        try:
-            idx = int(agent_num) - 1
-            if idx < 0 or idx >= len(agents):
-                print("❌ Invalid agent number")
-                input("\nPress Enter to continue...")
-                return
+        agent_choice = questionary.select(
+            "Select agent to view:", choices=agent_choices, style=QUESTIONARY_STYLE
+        ).ask()
 
-            agent = agents[idx]
-            self._show_agent_details(agent)
-        except ValueError:
-            print("❌ Invalid agent number")
-            input("\nPress Enter to continue...")
+        if not agent_choice:  # User pressed Esc
+            return
+
+        # Parse agent index from "N. agent_id" format
+        idx = int(agent_choice.split(".")[0]) - 1
+        agent = agents[idx]
+        self._show_agent_details(agent)
 
     def _deploy_preset_interactive(self):
         """Interactive preset deployment with preview and confirmation."""