Only show short name if multiple instances of the name exist

Author: Your Name

cecli/commands/switch_agent.py

@@ -87,11 +87,19 @@ def get_completions(cls, io, coder, args) -> List[str]:
 
             # Add sub-agent names, excluding the currently active one
             if agent_service and agent_service.sub_agents:
+                # First pass: count name occurrences
+                name_counts = {}
+                for uuid, sub_agent_info in agent_service.sub_agents.items():
+                    name_counts[sub_agent_info.name] = name_counts.get(sub_agent_info.name, 0) + 1
+
+                # Second pass: only show UUID prefix when name appears multiple times
                 for uuid, sub_agent_info in agent_service.sub_agents.items():
                     if uuid != foreground_uuid:
                         name = sub_agent_info.name
-                        # Always include UUID prefix for sub-agents
-                        names.append(f"{name} ({uuid[:3]})")
+                        if name_counts[name] > 1:
+                            names.append(f"{name} ({uuid[:3]})")
+                        else:
+                            names.append(name)
 
             current_arg = args.strip().lower()
             if current_arg:

cecli/tui/widgets/input_container.py

@@ -110,6 +110,9 @@ def _format_sub_agent_pills(sub_agents: list, show_squares: bool = False) -> str
             A string like ``"◍ primary ◆ reviewer (a6b)"``.
         """
         parts = []
+        name_counts = {}
+        for sa in sub_agents:
+            name_counts[sa["name"]] = name_counts.get(sa["name"], 0) + 1
 
         for sa in sub_agents:
             active = sa.get("active", False)
@@ -124,7 +127,7 @@ def _format_sub_agent_pills(sub_agents: list, show_squares: bool = False) -> str
 
             name = sa["name"]
             display_name = name
-            if name != "primary":
+            if name != "primary" and name_counts[name] > 1:
                 display_name = f"{name} ({sa['uuid'][:3]})"
 
             parts.append(f"{icon} {display_name}")