Merge pull request #39 from zhujian0805/main

add skill support for Qwen code

Author: zhujian0805

code_assistant_manager/cli/app.py

@@ -40,13 +40,7 @@
     UninstallContext,
     uninstall,
 )
-from code_assistant_manager.config import ConfigManager
-from code_assistant_manager.menu.base import Colors
-from code_assistant_manager.tools import (
-    display_all_tool_endpoints,
-    display_tool_endpoints,
-    get_registered_tools,
-)
+# Lazy imports moved inside functions to improve startup time
 
 logger = logging.getLogger(__name__)
 
@@ -56,7 +50,13 @@
 # ============================================================================
 
 
-def _get_config_manager(ctx: Context) -> ConfigManager:
+
+def _get_config_manager(ctx: Context):
+    # Lazy import
+    from code_assistant_manager.config import ConfigManager
+    
+    # Return type hint for clarity
+    
     """Get or create ConfigManager from context."""
     try:
         config_path = None
@@ -80,6 +80,12 @@ def upgrade(
     """Upgrade CLI tools (alias: u). If not installed, will install.
     If installed, will try to upgrade."""
     from code_assistant_manager.cli.upgrade import handle_upgrade_command
+    from code_assistant_manager.config import ConfigManager
+    from code_assistant_manager.tools import (
+        display_all_tool_endpoints,
+        display_tool_endpoints,
+        get_registered_tools,
+    )
 
     logger.debug(f"Upgrade command called with target: {target}")
     config_path = ctx.obj.get("config_path")
@@ -125,6 +131,10 @@ def doctor(
     config: Optional[str] = CONFIG_FILE_OPTION,
 ):
     """Run diagnostic checks on the code-assistant-manager installation (alias: d)"""
+
+    # Lazy imports
+    from code_assistant_manager.config import ConfigManager
+    from code_assistant_manager.tools import display_all_tool_endpoints, display_tool_endpoints
     # Initialize context object
     ctx.ensure_object(dict)
     ctx.obj["config_path"] = config
@@ -173,6 +183,10 @@ def doctor(
 
 def launch_alias(ctx: Context, tool_name: str = TOOL_NAME_OPTION):
     """Alias for 'launch' command."""
+
+    # Lazy imports
+    from code_assistant_manager.config import ConfigManager
+    from code_assistant_manager.tools import get_registered_tools
     # Initialize context object
     ctx.ensure_object(dict)
     ctx.obj["config_path"] = None
@@ -420,6 +434,10 @@ def validate_config(
     verbose: bool = VALIDATE_VERBOSE_OPTION,
 ):
     """Validate the configuration file for syntax and semantic errors."""
+
+    # Lazy imports
+    from code_assistant_manager.config import ConfigManager
+    from code_assistant_manager.menu.base import Colors
     try:
         cm = ConfigManager(config)
         typer.echo(

code_assistant_manager/cli/commands.py

@@ -692,13 +692,13 @@ def _generate_zsh_completion() -> str:
                                 _values 'option' '--force[Skip confirmation]' '--help[Show help]'
                                 ;;
                             import)
-                                _values 'option' '--app[Application type]:app:(claude codex gemini copilot codebuddy)' '--level[Level]:level:(user project)' '--project-dir[Project directory]:directory:_files -/' '--description[Prompt description]' '--help[Show help]'
+                                _values 'option' '--app[Application type]:app:(claude codex gemini copilot qwen codebuddy)' '--level[Level]:level:(user project)' '--project-dir[Project directory]:directory:_files -/' '--description[Prompt description]' '--help[Show help]'
                                 ;;
                             install)
-                                _values 'option' '--app[Application type]:app:(claude codex gemini copilot codebuddy)' '--level[Level]:level:(user project)' '--project-dir[Project directory]:directory:_files -/' '--help[Show help]'
+                                _values 'option' '--app[Application type]:app:(claude codex gemini copilot qwen codebuddy)' '--level[Level]:level:(user project)' '--project-dir[Project directory]:directory:_files -/' '--help[Show help]'
                                 ;;
                             uninstall)
-                                _values 'option' '--app[Application type]:app:(claude codex gemini copilot codebuddy)' '--level[Level]:level:(user project)' '--project-dir[Project directory]:directory:_files -/' '--force[Skip confirmation]' '--help[Show help]'
+                                _values 'option' '--app[Application type]:app:(claude codex gemini copilot qwen codebuddy)' '--level[Level]:level:(user project)' '--project-dir[Project directory]:directory:_files -/' '--force[Skip confirmation]' '--help[Show help]'
                                 ;;
                             status)
                                 _values 'option' '--project-dir[Project directory]:directory:_files -/' '--help[Show help]'
@@ -753,7 +753,7 @@ def _generate_zsh_completion() -> str:
                                 _values 'option' '--owner[Repository owner]' '--repo[Repository name]' '--help[Show help]'
                                 ;;
                             install|uninstall|enable|disable|validate)
-                                _values 'option' '--app[Application type]:app:(claude codebuddy codex copilot)' '--help[Show help]'
+                                _values 'option' '--app[Application type]:app:(claude codebuddy codex copilot gemini qwen)' '--help[Show help]'
                                 ;;
                             browse|view|status)
                                 _values 'option' '--help[Show help]'

code_assistant_manager/cli/completion_commands.py

@@ -64,12 +64,16 @@ def _resolve_plugin_conflict(plugin_name: str, app_type: str) -> str:
     found_in_marketplaces = []
     unreachable_marketplaces = []
 
-    for marketplace_name, repo in configured_marketplaces.items():
+    for marketplace_key, repo in configured_marketplaces.items():
         # Handle both PluginRepo objects and installed marketplace dictionaries
         if hasattr(repo, 'repo_owner'):  # PluginRepo object
             repo_owner = repo.repo_owner
             repo_name = repo.repo_name
             repo_branch = repo.repo_branch or "main"
+            # Use the actual marketplace name from the repo object, not the dict key
+            # The dict key might be "owner/repo" format from remote configs,
+            # but repo.name contains the correct marketplace name from marketplace.json
+            marketplace_name = repo.name
         elif isinstance(repo, dict) and 'source' in repo:  # Installed marketplace dict
             # Skip installed marketplaces - we'll handle them separately
             continue
@@ -105,6 +109,28 @@ def _resolve_plugin_conflict(plugin_name: str, app_type: str) -> str:
                 "available": False
             })
 
+    # Deduplicate marketplaces based on (name, source) combination
+    # This handles cases where remote configs have duplicate entries with different keys
+    # pointing to the same repo
+    seen = set()
+    deduplicated_found = []
+    for entry in found_in_marketplaces:
+        key = (entry["marketplace"], entry["source"])
+        if key not in seen:
+            seen.add(key)
+            deduplicated_found.append(entry)
+    found_in_marketplaces = deduplicated_found
+    
+    # Also deduplicate unreachable marketplaces
+    seen = set()
+    deduplicated_unreachable = []
+    for entry in unreachable_marketplaces:
+        key = (entry["marketplace"], entry["source"])
+        if key not in seen:
+            seen.add(key)
+            deduplicated_unreachable.append(entry)
+    unreachable_marketplaces = deduplicated_unreachable
+
     # Handle results
     if not found_in_marketplaces:
         typer.echo(

code_assistant_manager/cli/plugins/plugin_install_commands.py

@@ -10,7 +10,6 @@
 
 from code_assistant_manager.menu.base import Colors
 from code_assistant_manager.plugins import (
-    BUILTIN_PLUGIN_REPOS,
     VALID_APP_TYPES,
     PluginManager,
     PluginRepo,

code_assistant_manager/cli/plugins/plugin_management_commands.py

@@ -19,7 +19,7 @@
 logger = logging.getLogger(__name__)
 
 skill_app = typer.Typer(
-    help="Manage skills for AI assistants (Claude, Codex, Copilot, Gemini, Droid, CodeBuddy)",
+    help="Manage skills for AI assistants (Claude, Codex, Copilot, Gemini, Droid, CodeBuddy, Qwen)",
     no_args_is_help=True,
 )
 
@@ -35,7 +35,13 @@ def list_skills(
         "claude",
         "--app",
         "-a",
-        help="App type(s) to check installed status (claude, codex, copilot, gemini, all)",
+        help="App type(s) to check installed status (claude, codex, copilot, gemini, qwen, all)",
+    ),
+    query: Optional[str] = typer.Option(
+        None,
+        "--query",
+        "-q",
+        help="Filter skills by repository name (e.g., 'BrownFineSecurity/iothackbot')",
     ),
 ):
     """List all skills."""
@@ -48,21 +54,47 @@ def list_skills(
 
     skills = manager.get_all()
 
+    # Filter skills by query if provided
+    if query and isinstance(query, str):
+        filtered_skills = {}
+        query_lower = query.lower()
+        for skill_key, skill in skills.items():
+            if skill.repo_owner and skill.repo_name:
+                repo_full_name = f"{skill.repo_owner}/{skill.repo_name}".lower()
+                if query_lower in repo_full_name:
+                    filtered_skills[skill_key] = skill
+        skills = filtered_skills
+
     if not skills:
-        typer.echo(
-            f"{Colors.YELLOW}No skills found. Run 'cam skill fetch' to discover skills from repositories.{Colors.RESET}"
-        )
+        if query and isinstance(query, str):
+            typer.echo(
+                f"{Colors.YELLOW}No skills found matching query '{query}'. Run 'cam skill fetch' to discover skills from repositories.{Colors.RESET}"
+            )
+        else:
+            typer.echo(
+                f"{Colors.YELLOW}No skills found. Run 'cam skill fetch' to discover skills from repositories.{Colors.RESET}"
+            )
         return
 
     context = ", ".join(target_apps)
-    typer.echo(f"\n{Colors.BOLD}Skills (for {context}):{Colors.RESET}\n")
+    if query and isinstance(query, str):
+        typer.echo(f"\n{Colors.BOLD}Skills matching '{query}' (for {context}):{Colors.RESET}\n")
+    else:
+        typer.echo(f"\n{Colors.BOLD}Skills (for {context}):{Colors.RESET}\n")
     for skill_key, skill in sorted(skills.items()):
         status = (
             f"{Colors.GREEN}✓{Colors.RESET}"
             if skill.installed
             else f"{Colors.RED}✗{Colors.RESET}"
         )
-        typer.echo(f"{status} {Colors.BOLD}{skill.name}{Colors.RESET} ({skill_key})")
+        # Create simplified install key: repo_owner/repo_name:directory
+        # This matches the simplified keys that are also stored in the skills dict
+        if skill.repo_owner and skill.repo_name:
+            install_key = f"{skill.repo_owner}/{skill.repo_name}:{skill.directory}"
+        else:
+            install_key = skill_key
+        
+        typer.echo(f"{status} {Colors.BOLD}{skill.name}{Colors.RESET} ({install_key})")
         if skill.description:
             typer.echo(f"  {Colors.CYAN}Description:{Colors.RESET} {skill.description}")
         typer.echo(f"  {Colors.CYAN}Directory:{Colors.RESET} {skill.directory}")
@@ -344,7 +376,7 @@ def install_skill(
         "claude",
         "--app",
         "-a",
-        help="App type(s) to install to (claude, codex, gemini, all)",
+        help="App type(s) to install to (claude, codex, gemini, qwen, all)",
     ),
 ):
     """Install a skill to one or more app skills directories."""
@@ -372,7 +404,7 @@ def uninstall_skill(
         "claude",
         "--app",
         "-a",
-        help="App type(s) to uninstall from (claude, codex, gemini, all)",
+        help="App type(s) to uninstall from (claude, codex, gemini, qwen, all)",
     ),
 ):
     """Uninstall a skill from one or more app skills directories."""
@@ -504,7 +536,7 @@ def skill_status(
         None,
         "--app",
         "-a",
-        help="App type(s) to show (claude, codex, gemini, all). Default shows all.",
+        help="App type(s) to show (claude, codex, gemini, qwen, all). Default shows all.",
     ),
 ):
     """Show skill installation status across apps (alias: installed)."""
@@ -517,7 +549,7 @@ def list_installed_skills(
         None,
         "--app",
         "-a",
-        help="App type(s) to show (claude, codex, gemini, all). Default shows all.",
+        help="App type(s) to show (claude, codex, gemini, qwen, all). Default shows all.",
     ),
 ):
     """Show installed skills for each app."""
@@ -574,7 +606,7 @@ def uninstall_all_skills(
         ...,
         "--app",
         "-a",
-        help="App type(s) to uninstall all skills from (claude, codex, gemini, all)",
+        help="App type(s) to uninstall all skills from (claude, codex, gemini, qwen, all)",
     ),
     force: bool = typer.Option(False, "--force", "-f", help="Skip confirmation"),
 ):

code_assistant_manager/cli/skills_commands.py

@@ -204,10 +204,10 @@ def _format_version(value) -> str:
                 percent = completed / total if total else 1.0
                 filled = int(percent * bar_len)
                 bar = "█" * filled + "-" * (bar_len - filled)
-                sys.stdout.write(
-                    f"Upgrading: [{bar}] {completed}/{total} tools processed"
+                # Use \r to ensure we start at the beginning of the line
+                typer.echo(
+                    f"Upgrading: [{bar}] {completed}/{total} tools processed", nl=False
                 )
-                sys.stdout.flush()
 
             # First, count the skipped tools as completed
             for _tool_name, action, _ in prepared_tools:
@@ -217,10 +217,11 @@ def _format_version(value) -> str:
                         percent = completed / total if total else 1.0
                         filled = int(percent * bar_len)
                         bar = "█" * filled + "-" * (bar_len - filled)
-                        sys.stdout.write(
-                            f"\rUpgrading: [{bar}] {completed}/{total} tools processed"
+                        # Clear line and update progress
+                        typer.echo(
+                            f"\033[2K\rUpgrading: [{bar}] {completed}/{total} tools processed",
+                            nl=False,
                         )
-                        sys.stdout.flush()
                         time.sleep(
                             0.05
                         )  # Small delay to make incremental progress visible
@@ -269,21 +270,20 @@ def _format_version(value) -> str:
                                 percent = completed / total if total else 1.0
                                 filled = int(percent * bar_len)
                                 bar = "█" * filled + "-" * (bar_len - filled)
-                                sys.stdout.write(
-                                    f"\rUpgrading: [{bar}] {completed}/{total} tools processed"
+                                typer.echo(
+                                    f"\033[2K\rUpgrading: [{bar}] {completed}/{total} tools processed",
+                                    nl=False,
                                 )
-                                sys.stdout.flush()
                             else:
                                 # Compact per-line update, keep only minimal text
                                 typer.echo(f"  [{completed}/{total}] tools processed")
 
             if is_tty:
-                # Finish the progress bar line
-                sys.stdout.write("\n")
-                sys.stdout.flush()
+                # Finish the progress bar line and ensure clean terminal state
+                typer.echo("")
 
             # Display results for ALL upgradeable tools, including ones skipped by pre-check
-            typer.echo(f"\n{Colors.GREEN}Upgrade results:{Colors.RESET}")
+            typer.echo(f"{Colors.GREEN}Upgrade results:{Colors.RESET}")
             for tool_name in upgradeable_tools.keys():
                 before_v = _format_version(pre_versions.get(tool_name, "unknown"))
 
@@ -453,32 +453,11 @@ def _perform_upgrade_task(tool_name, tool, install_cmd, quiet: bool = False):
         if not quiet:
             # typer.echo(f"{Colors.BLUE}Starting upgrade for {tool_name}...{Colors.RESET}")
             pass
-        # If quiet mode requested, ask tool to run quieter by passing a wrapper command
-        if quiet:
-            # Try to use script command for quiet execution, but fall back if it doesn't work
-            # Different Unix systems have different script command syntax
-            import subprocess
 
-            try:
-                # Test if script command supports -q -c syntax (macOS style)
-                subprocess.run(
-                    ["script", "-q", "-c", "echo test"],
-                    capture_output=True,
-                    text=True,
-                    timeout=1,
-                )
-                # If we get here, script -q -c works
-                wrapper_cmd = f"script -q -c {install_cmd!r} /dev/null"
-            except (
-                subprocess.TimeoutExpired,
-                subprocess.CalledProcessError,
-                FileNotFoundError,
-            ):
-                # script command doesn't support -q -c, or doesn't exist, fall back to redirection
-                wrapper_cmd = f"{install_cmd} >/dev/null 2>&1"
-            result = tool._perform_upgrade(desc, wrapper_cmd)
-        else:
-            result = tool._perform_upgrade(desc, install_cmd)
+        # Perform the upgrade
+        # Note: CommandRunner (used by _perform_upgrade) captures output, so it is inherently quiet.
+        # We do not need to wrap commands in 'script' or redirects which can corrupt terminal state.
+        result = tool._perform_upgrade(desc, install_cmd)
         return result
     except Exception as e:
         # Do not print exception stack traces to stderr; return structured failure

code_assistant_manager/cli/upgrade.py

@@ -133,7 +133,7 @@ def _fetch_from_single_repo(self, repo: RepoConfig) -> List[T]:
 
         try:
             # Clone/download repository
-            with git_repo.clone() as temp_dir:
+            with git_repo.clone() as (temp_dir, actual_branch):
                 # Determine scan directory
                 scan_dir = temp_dir
                 if repo.path: