claude-mpm 5.4.3__py3-none-any.whl → 5.4.14__py3-none-any.whl

claude_mpm/cli/commands/configure.py

@@ -400,8 +400,9 @@ class ConfigureCommand(BaseCommand):
                 # Set deployment status on each agent for display
                 deployed_ids = get_deployed_agent_ids()
                 for agent in agents:
-                    # Extract leaf name for comparison
-                    agent_leaf_name = agent.name.split("/")[-1]
+                    # Use agent_id (technical ID) for comparison, not display name
+                    agent_id = getattr(agent, "agent_id", agent.name)
+                    agent_leaf_name = agent_id.split("/")[-1]
                     agent.is_deployed = agent_leaf_name in deployed_ids
 
                 # Filter BASE_AGENT from display (1M-502 Phase 1)
@@ -1218,7 +1219,9 @@ class ConfigureCommand(BaseCommand):
                 source_label = "Local"
 
             # FIX 2: Check actual deployment status from .claude/agents/ directory
-            is_installed = agent.name in deployed_ids
+            # Use agent_id (technical ID like "python-engineer") not display name
+            agent_id = getattr(agent, "agent_id", agent.name)
+            is_installed = agent_id in deployed_ids
             if is_installed:
                 status = "[green]Installed[/green]"
             else:
@@ -1248,8 +1251,8 @@ class ConfigureCommand(BaseCommand):
                     recommended_count += 1
                     break
 
-            # FIX 1: Removed asterisk - using Status column instead
-            agent_id_display = agent.name
+            # FIX 1: Show agent_id (technical ID) in first column, not display name
+            agent_id_display = getattr(agent, "agent_id", agent.name)
 
             # Get display name and format it properly
             # Raw display_name from YAML may contain underscores (e.g., "agentic_coder_optimizer")
@@ -1281,7 +1284,10 @@ class ConfigureCommand(BaseCommand):
                 self.console.print("\n[dim]* = recommended for this project[/dim]")
 
         # Show installed vs available count (use deployed_ids for accuracy)
-        installed_count = sum(1 for a in agents if a.name in deployed_ids)
+        # Use agent_id (technical ID) for comparison, not display name
+        installed_count = sum(
+            1 for a in agents if getattr(a, "agent_id", a.name) in deployed_ids
+        )
         available_count = len(agents) - installed_count
         self.console.print(
             f"\n[green]✓ {installed_count} installed[/green] | "
@@ -1326,7 +1332,7 @@ class ConfigureCommand(BaseCommand):
         all_agents = filter_base_agents(
             [
                 {
-                    "agent_id": a.name,
+                    "agent_id": getattr(a, "agent_id", a.name),
                     "name": a.name,
                     "description": a.description,
                     "deployed": getattr(a, "is_deployed", False),
@@ -1352,11 +1358,14 @@ class ConfigureCommand(BaseCommand):
             recommended_agent_ids = set()
 
         # Build mapping: leaf name -> full path for deployed agents
+        # Use agent_id (technical ID) for comparison, not display name
         deployed_full_paths = set()
         for agent in agents:
-            agent_leaf_name = agent.name.split("/")[-1]
+            agent_id = getattr(agent, "agent_id", agent.name)
+            agent_leaf_name = agent_id.split("/")[-1]
             if agent_leaf_name in deployed_ids:
-                deployed_full_paths.add(agent.name)
+                # Store agent_id for selection tracking (not display name)
+                deployed_full_paths.add(agent_id)
 
         # Track current selection state (starts with deployed, updated in loop)
         current_selection = deployed_full_paths.copy()
@@ -1366,7 +1375,9 @@ class ConfigureCommand(BaseCommand):
         collections = defaultdict(list)
 
         for agent in agents:
-            if agent.name in {a["agent_id"] for a in all_agents}:
+            # Use agent_id (technical ID) for comparison, not display name
+            agent_id = getattr(agent, "agent_id", agent.name)
+            if agent_id in {a["agent_id"] for a in all_agents}:
                 # Determine collection ID
                 source_type = getattr(agent, "source_type", "local")
                 if source_type == "remote":
@@ -1391,7 +1402,7 @@ class ConfigureCommand(BaseCommand):
                     collection_id = "Local Agents"
 
                 collections[collection_id].append(agent)
-                agent_map[agent.name] = agent
+                agent_map[agent_id] = agent
 
         # Monkey-patch questionary symbols for better visibility
         questionary.prompts.common.INDICATOR_SELECTED = "[✓]"
@@ -1406,10 +1417,11 @@ class ConfigureCommand(BaseCommand):
                 agents_in_collection = collections[collection_id]
 
                 # Count selected/total agents in collection
+                # Use agent_id for selection tracking, not display name
                 selected_count = sum(
                     1
                     for agent in agents_in_collection
-                    if agent.name in current_selection
+                    if getattr(agent, "agent_id", agent.name) in current_selection
                 )
                 total_count = len(agents_in_collection)
 
@@ -1498,20 +1510,25 @@ class ConfigureCommand(BaseCommand):
 
                     # Add individual agents
                     for agent in agents_in_category:
-                        agent_leaf_name = agent.name.split("/")[-1]
-                        display_name = getattr(agent, "display_name", agent_leaf_name)
+                        # Use agent_id (technical ID) for all tracking/selection
+                        agent_id = getattr(agent, "agent_id", agent.name)
+                        agent_leaf_name = agent_id.split("/")[-1]
+                        raw_display_name = getattr(
+                            agent, "display_name", agent_leaf_name
+                        )
+                        display_name = self._format_display_name(raw_display_name)
 
                         # Check if agent is deployed (exists in .claude/agents/)
 
                         # Format choice text (no asterisk needed)
                         choice_text = f"    {display_name}"
 
-                        is_selected = agent.name in current_selection
+                        is_selected = agent_id in current_selection
 
                         choices.append(
                             Choice(
                                 title=choice_text,
-                                value=agent.name,
+                                value=agent_id,  # Use agent_id for value
                                 checked=is_selected,
                             )
                         )
@@ -1565,38 +1582,42 @@ class ConfigureCommand(BaseCommand):
                         )
                         # Add all agents from this collection to current_selection
                         for agent in collections[collection_id]:
-                            current_selection.add(agent.name)
+                            agent_id = getattr(agent, "agent_id", agent.name)
+                            current_selection.add(agent_id)
                     elif control.startswith("__DESELECT_ALL_"):
                         collection_id = control.replace("__DESELECT_ALL_", "").replace(
                             "__", ""
                         )
                         # Remove all agents from this collection
                         for agent in collections[collection_id]:
-                            current_selection.discard(agent.name)
+                            agent_id = getattr(agent, "agent_id", agent.name)
+                            current_selection.discard(agent_id)
                     elif control.startswith("__SELECT_REC_"):
                         collection_id = control.replace("__SELECT_REC_", "").replace(
                             "__", ""
                         )
                         # Add all recommended agents from this collection
                         for agent in collections[collection_id]:
+                            agent_id = getattr(agent, "agent_id", agent.name)
                             if any(
-                                agent.name == rec_id
-                                or agent.name.split("/")[-1] == rec_id.split("/")[-1]
+                                agent_id == rec_id
+                                or agent_id.split("/")[-1] == rec_id.split("/")[-1]
                                 for rec_id in recommended_agent_ids
                             ):
-                                current_selection.add(agent.name)
+                                current_selection.add(agent_id)
                     elif control.startswith("__DESELECT_REC_"):
                         collection_id = control.replace("__DESELECT_REC_", "").replace(
                             "__", ""
                         )
                         # Remove all recommended agents from this collection
                         for agent in collections[collection_id]:
+                            agent_id = getattr(agent, "agent_id", agent.name)
                             if any(
-                                agent.name == rec_id
-                                or agent.name.split("/")[-1] == rec_id.split("/")[-1]
+                                agent_id == rec_id
+                                or agent_id.split("/")[-1] == rec_id.split("/")[-1]
                                 for rec_id in recommended_agent_ids
                             ):
-                                current_selection.discard(agent.name)
+                                current_selection.discard(agent_id)
 
                 # Loop back to re-display with updated selections
                 continue
@@ -1734,7 +1755,7 @@ class ConfigureCommand(BaseCommand):
         all_agents = filter_base_agents(
             [
                 {
-                    "agent_id": a.name,
+                    "agent_id": getattr(a, "agent_id", a.name),
                     "name": a.name,
                     "description": a.description,
                     "deployed": getattr(a, "is_deployed", False),
@@ -1753,12 +1774,14 @@ class ConfigureCommand(BaseCommand):
             return
 
         # Build mapping: leaf name -> full path for deployed agents
-        # This allows comparing deployed_ids (leaf names) with agent.name (full paths)
+        # This allows comparing deployed_ids (leaf names) with agent.agent_id (full paths)
         deployed_full_paths = set()
         for agent in agents:
-            agent_leaf_name = agent.name.split("/")[-1]
+            # FIX: Use agent_id (technical ID) instead of display name
+            agent_id = getattr(agent, "agent_id", agent.name)
+            agent_leaf_name = agent_id.split("/")[-1]
             if agent_leaf_name in deployed_ids:
-                deployed_full_paths.add(agent.name)
+                deployed_full_paths.add(agent_id)
 
         # Track current selection state (starts with deployed full paths, updated after each iteration)
         current_selection = deployed_full_paths.copy()
@@ -1770,7 +1793,9 @@ class ConfigureCommand(BaseCommand):
             collections = defaultdict(list)
 
             for agent in agents:
-                if agent.name in {a["agent_id"] for a in all_agents}:
+                # FIX: Use agent_id (technical ID) for comparison
+                agent_id = getattr(agent, "agent_id", agent.name)
+                if agent_id in {a["agent_id"] for a in all_agents}:
                     # Determine collection ID
                     source_type = getattr(agent, "source_type", "local")
                     if source_type == "remote":
@@ -1789,7 +1814,7 @@ class ConfigureCommand(BaseCommand):
                         collection_id = "local"
 
                     collections[collection_id].append(agent)
-                    agent_map[agent.name] = agent
+                    agent_map[agent_id] = agent  # FIX: Use agent_id as key
 
             # STEP 1: Collection-level selection
             self.console.print("\n[bold cyan]Select Agent Collections[/bold cyan]")
@@ -1809,15 +1834,18 @@ class ConfigureCommand(BaseCommand):
 
                 # Check if ANY agent in this collection is currently deployed
                 # This reflects actual deployment state, not just selection
+                # FIX: Use agent_id for comparison with current_selection
                 any_deployed = any(
-                    agent.name in current_selection for agent in agents_in_collection
+                    getattr(agent, "agent_id", agent.name) in current_selection
+                    for agent in agents_in_collection
                 )
 
                 # Count deployed agents for display
+                # FIX: Use agent_id for comparison with current_selection
                 deployed_count = sum(
                     1
                     for agent in agents_in_collection
-                    if agent.name in current_selection
+                    if getattr(agent, "agent_id", agent.name) in current_selection
                 )
 
                 collection_choices.append(
@@ -1911,17 +1939,23 @@ class ConfigureCommand(BaseCommand):
                     )
 
                     # Add individual agents from this collection
-                    for agent in sorted(agents_in_collection, key=lambda a: a.name):
-                        display_name = getattr(agent, "display_name", agent.name)
-                        is_selected = agent.name in deployed_full_paths
-
-                        choice_text = f"{agent.name}"
-                        if display_name and display_name != agent.name:
+                    # FIX: Use agent_id for sorting, comparison, and values
+                    for agent in sorted(
+                        agents_in_collection,
+                        key=lambda a: getattr(a, "agent_id", a.name),
+                    ):
+                        agent_id = getattr(agent, "agent_id", agent.name)
+                        raw_display_name = getattr(agent, "display_name", agent.name)
+                        display_name = self._format_display_name(raw_display_name)
+                        is_selected = agent_id in deployed_full_paths
+
+                        choice_text = f"{agent_id}"
+                        if display_name and display_name != agent_id:
                             choice_text += f" - {display_name}"
 
                         agent_choices.append(
                             Choice(
-                                title=choice_text, value=agent.name, checked=is_selected
+                                title=choice_text, value=agent_id, checked=is_selected
                             )
                         )
 
@@ -1971,7 +2005,8 @@ class ConfigureCommand(BaseCommand):
                 final_selections = set()
                 for collection_id in selected_collections:
                     for agent in collections[collection_id]:
-                        final_selections.add(agent.name)
+                        # FIX: Use agent_id for selection tracking
+                        final_selections.add(getattr(agent, "agent_id", agent.name))
 
                 # Update current_selection
                 # This replaces the previous selection entirely with the new collection selections
@@ -2484,7 +2519,8 @@ class ConfigureCommand(BaseCommand):
 
         self.console.print(f"\n[bold]Installed agents ({len(installed)}):[/bold]")
         for idx, agent in enumerate(installed, 1):
-            display_name = getattr(agent, "display_name", agent.name)
+            raw_display_name = getattr(agent, "display_name", agent.name)
+            display_name = self._format_display_name(raw_display_name)
             self.console.print(f"  {idx}. {agent.name} - {display_name}")
 
         selection = Prompt.ask("\nEnter agent number to remove (or 'c' to cancel)")
@@ -2547,7 +2583,8 @@ class ConfigureCommand(BaseCommand):
 
         self.console.print(f"\n[bold]Available agents ({len(agents)}):[/bold]")
         for idx, agent in enumerate(agents, 1):
-            display_name = getattr(agent, "display_name", agent.name)
+            raw_display_name = getattr(agent, "display_name", agent.name)
+            display_name = self._format_display_name(raw_display_name)
             self.console.print(f"  {idx}. {agent.name} - {display_name}")
 
         selection = Prompt.ask("\nEnter agent number to view (or 'c' to cancel)")
@@ -2564,7 +2601,12 @@ class ConfigureCommand(BaseCommand):
 
                 # Basic info
                 self.console.print(f"[bold]ID:[/bold] {agent.name}")
-                display_name = getattr(agent, "display_name", "N/A")
+                raw_display_name = getattr(agent, "display_name", "N/A")
+                display_name = (
+                    self._format_display_name(raw_display_name)
+                    if raw_display_name != "N/A"
+                    else "N/A"
+                )
                 self.console.print(f"[bold]Name:[/bold] {display_name}")
                 self.console.print(f"[bold]Description:[/bold] {agent.description}")
 

claude_mpm/cli/commands/configure_agent_display.py

@@ -85,7 +85,9 @@ class AgentDisplay:
 
         for idx, agent in enumerate(agents, 1):
             # Check if agent is deployed to .claude/agents/
-            agent_leaf_name = agent.name.split("/")[-1]
+            # Use agent_id (technical ID) for comparison, not display name
+            agent_id = getattr(agent, "agent_id", agent.name)
+            agent_leaf_name = agent_id.split("/")[-1]
             is_deployed = agent_leaf_name in deployed_ids
 
             # Show "Installed" for deployed agents, "Available" otherwise

claude_mpm/cli/commands/mpm_init/core.py

@@ -157,9 +157,8 @@ class MPMInitCommand:
                 if pre_check_result.get("status") == OperationResult.ERROR:
                     return pre_check_result
 
-            # Update .gitignore to exclude claude-mpm configuration directories
-            if not review_only and not dry_run:
-                self._update_gitignore()
+            # Note: .gitignore recommendations are now shown in 'mpm config' command
+            # instead of automatic updates during initialization
 
             # Build the delegation prompt
             if update_mode:
@@ -401,48 +400,6 @@ class MPMInitCommand:
             "warnings": warnings,
         }
 
-    def _update_gitignore(self) -> None:
-        """Update .gitignore to exclude claude-mpm configuration directories.
-
-        Ensures that claude-mpm configuration directories are added to .gitignore
-        to prevent them from being committed to version control.
-
-        This is a non-destructive operation that:
-        - Creates .gitignore if it doesn't exist
-        - Appends missing entries only (never duplicates)
-        - Preserves all existing content
-
-        Standard entries added:
-        - .claude-mpm/: Main configuration directory
-        - .claude/agents/: Agent runtime files
-        """
-        from claude_mpm.utils.gitignore import ensure_claude_mpm_gitignore
-
-        try:
-            result = ensure_claude_mpm_gitignore(str(self.project_path))
-
-            if result.get("status") == "success":
-                if result.get("added"):
-                    self.console.print(
-                        f"[green]✓[/green] Updated .gitignore: {', '.join(result['added'])}"
-                    )
-                    logger.info(f"Added to .gitignore: {result['added']}")
-                elif result.get("existing"):
-                    logger.debug(f".gitignore already contains: {result['existing']}")
-            else:
-                # Non-critical error - log but don't fail initialization
-                logger.warning(
-                    f"Could not update .gitignore: {result.get('error', 'Unknown error')}"
-                )
-                self.console.print(
-                    f"[yellow]⚠️  Could not update .gitignore: {result.get('error')}[/yellow]"
-                )
-
-        except Exception as e:
-            # Non-critical error - log but don't fail initialization
-            logger.warning(f"Error updating .gitignore: {e}")
-            self.console.print(f"[yellow]⚠️  Could not update .gitignore: {e}[/yellow]")
-
     def _build_initialization_prompt(
         self,
         project_type: Optional[str] = None,

claude_mpm/cli/commands/skills.py

@@ -537,7 +537,7 @@ class SkillsManagementCommand(BaseCommand):
             toolchain = getattr(args, "toolchain", None)
             categories = getattr(args, "categories", None)
             force = getattr(args, "force", False)
-            all_skills = getattr(args, "all", False)
+            all_skills = getattr(args, "all_skills", False)
 
             if collection:
                 console.print(
@@ -554,17 +554,36 @@ class SkillsManagementCommand(BaseCommand):
                     "[yellow]No toolchain specified. Use --toolchain to filter by language,[/yellow]"
                 )
                 console.print(
-                    "[yellow]or --all to deploy all available skills.[/yellow]\n"
+                    "[yellow]or --all-skills to deploy all available skills (not just agent-referenced).[/yellow]\n"
                 )
 
+            # Selective deployment is enabled by default (deploy only agent-referenced skills)
+            # Use --all-skills to disable selective mode
             result = self.skills_deployer.deploy_skills(
                 collection=collection,
                 toolchain=toolchain,
                 categories=categories,
                 force=force,
+                selective=not all_skills,  # Disable selective mode if --all-skills is set
             )
 
             # Display results
+            # Show selective mode summary
+            if result.get("selective_mode"):
+                total_available = result.get("total_available", 0)
+                deployed_count = result["deployed_count"]
+                console.print(
+                    f"[cyan]📌 Selective deployment: {deployed_count} agent-referenced skills "
+                    f"(out of {total_available} available)[/cyan]"
+                )
+                console.print(
+                    "[dim]Use --all-skills to deploy all available skills[/dim]\n"
+                )
+            else:
+                console.print(
+                    "[cyan]📦 Deploying all available skills (selective mode disabled)[/cyan]\n"
+                )
+
             if result["deployed_count"] > 0:
                 console.print(
                     f"[green]✓ Deployed {result['deployed_count']} skill(s):[/green]"

claude_mpm/cli/executor.py

@@ -24,6 +24,7 @@ from .commands import (
     show_info,
 )
 from .commands.analyze_code import manage_analyze_code
+from .commands.config import manage_config
 from .commands.dashboard import manage_dashboard
 from .commands.skills import manage_skills
 from .commands.upgrade import upgrade
@@ -236,9 +237,8 @@ def execute_command(command: str, args) -> int:
         CLICommands.MEMORY.value: manage_memory,
         CLICommands.MONITOR.value: manage_monitor,
         CLICommands.DASHBOARD.value: manage_dashboard,
-        # Configuration management commands (synonymous)
-        # Both 'config' and 'configure' launch the interactive configuration TUI
-        CLICommands.CONFIG.value: manage_configure,  # Alias to configure
+        # Configuration management commands
+        CLICommands.CONFIG.value: manage_config,  # Unified config with subcommands
         CLICommands.CONFIGURE.value: manage_configure,  # Interactive configuration TUI
         CLICommands.AGGREGATE.value: aggregate_command,
         CLICommands.ANALYZE_CODE.value: manage_analyze_code,