agent-skill-manager 0.1.3__py3-none-any.whl → 0.2.0__py3-none-any.whl

skill_manager/cli.py

@@ -13,8 +13,10 @@ Commands:
     update        - Update skills from GitHub
     update --all  - Update all skills from GitHub
     list          - List installed skills and versions
+    discover      - Discover skills in a GitHub repository
 """
 
+import argparse
 import shutil
 import sys
 from pathlib import Path
@@ -28,14 +30,21 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 from rich.table import Table
 
 from . import __version__
-from .agents import AGENTS, detect_existing_agents, get_agent_name, get_agent_path
+from .agents import AGENTS, detect_existing_agents, get_agent_name, get_agent_path, supports_global_deployment
 from .deployment import (
     deploy_multiple_skills,
     deploy_skill_to_agents,
+    is_symlink_supported,
     update_all_skills,
     update_skill,
 )
-from .github import download_skill_from_github, parse_github_url
+from .github import (
+    discover_skills_in_repo,
+    download_multiple_skills,
+    download_skill_from_github,
+    get_system_temp_dir,
+    parse_github_url,
+)
 from .metadata import (
     list_updatable_skills,
     read_skill_metadata,
@@ -58,6 +67,85 @@ from .validation import (
 console = Console()
 
 
+def create_parser() -> argparse.ArgumentParser:
+    """Create the argument parser with all subcommands."""
+    parser = argparse.ArgumentParser(
+        prog="sm",
+        description="CLI tool for managing AI agent skills",
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+    )
+    parser.add_argument("-v", "--version", action="version", version=f"%(prog)s {__version__}")
+
+    subparsers = parser.add_subparsers(dest="command", help="Available commands")
+
+    # Install command
+    install_parser = subparsers.add_parser("install", help="Download and deploy skills from GitHub")
+    install_parser.add_argument("url", nargs="?", help="GitHub URL of the skill or repository")
+    install_parser.add_argument(
+        "-a", "--agent", action="append", dest="agents", help="Target agent(s) (can be specified multiple times)"
+    )
+    install_parser.add_argument(
+        "-t", "--type", choices=["global", "project"], default="global", help="Deployment type (default: global)"
+    )
+    install_parser.add_argument("-d", "--dest", type=Path, help="Destination directory for downloaded skills")
+    install_parser.add_argument("--symlink", action="store_true", help="Use symlinks instead of copying")
+    install_parser.add_argument("--discover", action="store_true", help="Discover and install all skills in a repository")
+    install_parser.add_argument("--no-deploy", action="store_true", help="Download only, do not deploy")
+    install_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
+
+    # Download command
+    download_parser = subparsers.add_parser("download", help="Download skills from GitHub")
+    download_parser.add_argument("url", nargs="?", help="GitHub URL of the skill or repository")
+    download_parser.add_argument("-d", "--dest", type=Path, help="Destination directory")
+    download_parser.add_argument("--discover", action="store_true", help="Discover all skills in a repository")
+    download_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
+
+    # Deploy command
+    deploy_parser = subparsers.add_parser("deploy", help="Deploy local skills to agents")
+    deploy_parser.add_argument("skills", nargs="*", help="Skill names or paths to deploy")
+    deploy_parser.add_argument("-a", "--agent", action="append", dest="agents", help="Target agent(s)")
+    deploy_parser.add_argument("-t", "--type", choices=["global", "project"], default="global", help="Deployment type")
+    deploy_parser.add_argument("--symlink", action="store_true", help="Use symlinks instead of copying")
+    deploy_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
+
+    # Discover command
+    discover_parser = subparsers.add_parser("discover", help="Discover skills in a GitHub repository")
+    discover_parser.add_argument("url", nargs="?", help="GitHub URL to scan")
+
+    # Uninstall command
+    uninstall_parser = subparsers.add_parser("uninstall", help="Remove skills from agents")
+    uninstall_parser.add_argument("skills", nargs="*", help="Skill names to uninstall")
+    uninstall_parser.add_argument("-a", "--agent", action="append", dest="agents", help="Target agent(s)")
+    uninstall_parser.add_argument("-t", "--type", choices=["global", "project"], default="global", help="Deployment type")
+    uninstall_parser.add_argument("--hard", action="store_true", help="Permanently delete (no trash)")
+    uninstall_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
+
+    # Restore command
+    restore_parser = subparsers.add_parser("restore", help="Restore deleted skills from trash")
+    restore_parser.add_argument("skills", nargs="*", help="Skill names to restore")
+    restore_parser.add_argument("-a", "--agent", action="append", dest="agents", help="Target agent(s)")
+    restore_parser.add_argument("-t", "--type", choices=["global", "project"], default="global", help="Deployment type")
+    restore_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
+
+    # Update command
+    update_parser = subparsers.add_parser("update", help="Update skills from GitHub")
+    update_parser.add_argument("skills", nargs="*", help="Skill names to update")
+    update_parser.add_argument("-a", "--agent", action="append", dest="agents", help="Target agent(s)")
+    update_parser.add_argument("-t", "--type", choices=["global", "project"], default="global", help="Deployment type")
+    update_parser.add_argument("--all", action="store_true", help="Update all skills")
+    update_parser.add_argument("-y", "--yes", action="store_true", help="Skip confirmation prompts")
+
+    # List command
+    list_parser = subparsers.add_parser("list", help="List installed skills")
+    list_parser.add_argument("-a", "--agent", action="append", dest="agents", help="Target agent(s)")
+    list_parser.add_argument("-t", "--type", choices=["global", "project"], default="global", help="Deployment type")
+
+    # Agents command (list available agents)
+    subparsers.add_parser("agents", help="List all supported agents")
+
+    return parser
+
+
 def select_agents(existing_agents: dict[str, Path]) -> list[str]:
     """
     Interactive prompt to select agents for deployment.
@@ -182,8 +270,7 @@ def cmd_download() -> int:
     """
     console.print(
         Panel.fit(
-            "[bold cyan]Download Skill[/bold cyan]\n"
-            "Download a skill from GitHub",
+            "[bold cyan]Download Skill[/bold cyan]\nDownload a skill from GitHub",
             border_style="cyan",
         )
     )
@@ -256,9 +343,7 @@ def cmd_download() -> int:
 
         # Validate
         if not validate_skill(skill_dir):
-            console.print(
-                f"[yellow]Warning: {skill_dir} does not contain SKILL.md, may not be a valid skill[/yellow]"
-            )
+            console.print(f"[yellow]Warning: {skill_dir} does not contain SKILL.md, may not be a valid skill[/yellow]")
 
         console.print(f"[green]✓[/green] Skill downloaded to: {skill_dir}\n")
         return 0
@@ -277,8 +362,7 @@ def cmd_deploy() -> int:
     """
     console.print(
         Panel.fit(
-            "[bold cyan]Deploy Skills[/bold cyan]\n"
-            "Deploy local skills to AI agents",
+            "[bold cyan]Deploy Skills[/bold cyan]\nDeploy local skills to AI agents",
             border_style="cyan",
         )
     )
@@ -309,9 +393,7 @@ def cmd_deploy() -> int:
     # Detect agents
     existing_agents = detect_existing_agents()
     if existing_agents:
-        console.print(
-            f"[green]✓[/green] Detected {len(existing_agents)} installed agents\n"
-        )
+        console.print(f"[green]✓[/green] Detected {len(existing_agents)} installed agents\n")
 
     # Select deployment type
     deployment_type = select_deployment_type()
@@ -417,8 +499,7 @@ def cmd_install() -> int:
     """
     console.print(
         Panel.fit(
-            "[bold cyan]Install Skill[/bold cyan]\n"
-            "Download and deploy a skill from GitHub",
+            "[bold cyan]Install Skill[/bold cyan]\nDownload and deploy a skill from GitHub",
             border_style="cyan",
         )
     )
@@ -491,9 +572,7 @@ def cmd_install() -> int:
 
         # Validate
         if not validate_skill(skill_dir):
-            console.print(
-                f"[yellow]Warning: {skill_dir} does not contain SKILL.md, may not be a valid skill[/yellow]"
-            )
+            console.print(f"[yellow]Warning: {skill_dir} does not contain SKILL.md, may not be a valid skill[/yellow]")
 
         console.print(f"[green]✓[/green] Skill downloaded to: {skill_dir}\n")
 
@@ -516,9 +595,7 @@ def cmd_install() -> int:
     # Detect agents
     existing_agents = detect_existing_agents()
     if existing_agents:
-        console.print(
-            f"[green]✓[/green] Detected {len(existing_agents)} installed agents\n"
-        )
+        console.print(f"[green]✓[/green] Detected {len(existing_agents)} installed agents\n")
 
     # Select deployment type
     deployment_type = select_deployment_type()
@@ -574,8 +651,7 @@ def cmd_uninstall() -> int:
     """
     console.print(
         Panel.fit(
-            "[bold cyan]Uninstall Skills[/bold cyan]\n"
-            "Remove skills from AI agents",
+            "[bold cyan]Uninstall Skills[/bold cyan]\nRemove skills from AI agents",
             border_style="cyan",
         )
     )
@@ -725,8 +801,7 @@ def cmd_restore() -> int:
     """
     console.print(
         Panel.fit(
-            "[bold cyan]Restore Skills[/bold cyan]\n"
-            "Restore deleted skills from trash",
+            "[bold cyan]Restore Skills[/bold cyan]\nRestore deleted skills from trash",
             border_style="cyan",
         )
     )
@@ -836,8 +911,7 @@ def cmd_restore() -> int:
     if fail_count == 0:
         console.print(
             Panel.fit(
-                f"[bold green]✓ Restoration successful![/bold green]\n\n"
-                f"Restored {success_count} skills",
+                f"[bold green]✓ Restoration successful![/bold green]\n\nRestored {success_count} skills",
                 border_style="green",
             )
         )
@@ -916,7 +990,6 @@ def cmd_update() -> int:
             for skill_info in all_updatable[agent_id]:
                 skill_name = skill_info["skill_name"]
                 metadata = skill_info["metadata"]
-                github_url = metadata.get("github_url", "")
                 updated_at = metadata.get("updated_at", "unknown")
                 choices.append(
                     Choice(
@@ -946,7 +1019,10 @@ def cmd_update() -> int:
     console.print()
 
     # Show summary
-    total_count = sum(len(skills) if isinstance(skills, list) else len(all_updatable[agent_id]) for agent_id, skills in skills_to_update.items())
+    total_count = sum(
+        len(skills) if isinstance(skills, list) else len(all_updatable[agent_id])
+        for agent_id, skills in skills_to_update.items()
+    )
     console.print(f"[yellow]Will update {total_count} skills:[/yellow]")
     for agent_id in sorted(skills_to_update.keys()):
         agent_name = get_agent_name(agent_id)
@@ -1006,8 +1082,7 @@ def cmd_update() -> int:
     if total_failed == 0:
         console.print(
             Panel.fit(
-                f"[bold green]✓ Update successful![/bold green]\n\n"
-                f"Updated {total_success} skills",
+                f"[bold green]✓ Update successful![/bold green]\n\nUpdated {total_success} skills",
                 border_style="green",
             )
         )
@@ -1032,8 +1107,7 @@ def cmd_list() -> int:
     """
     console.print(
         Panel.fit(
-            "[bold cyan]List Installed Skills[/bold cyan]\n"
-            "Show all installed skills with version information",
+            "[bold cyan]List Installed Skills[/bold cyan]\nShow all installed skills with version information",
             border_style="cyan",
         )
     )
@@ -1076,18 +1150,21 @@ def cmd_list() -> int:
                     if skill_md.exists():
                         mtime = skill_md.stat().st_mtime
                         from datetime import datetime
+
                         version_info = datetime.fromtimestamp(mtime).strftime("%Y-%m-%d %H:%M:%S")
                     else:
                         version_info = "unknown"
                     source = "Local"
                     github_url = ""
 
-                all_skills_data[agent_id].append({
-                    "name": skill_name,
-                    "version": version_info,
-                    "source": source,
-                    "url": github_url,
-                })
+                all_skills_data[agent_id].append(
+                    {
+                        "name": skill_name,
+                        "version": version_info,
+                        "source": source,
+                        "url": github_url,
+                    }
+                )
 
     if not all_skills_data:
         console.print("[yellow]No skills found in selected agents.[/yellow]")
@@ -1122,6 +1199,416 @@ def cmd_list() -> int:
     return 0
 
 
+def cmd_discover(args: argparse.Namespace) -> int:
+    """
+    Discover command - Discover skills in a GitHub repository.
+
+    Args:
+        args: Parsed command line arguments
+
+    Returns:
+        Exit code (0 for success, non-zero for failure)
+    """
+    console.print(
+        Panel.fit(
+            "[bold cyan]Discover Skills[/bold cyan]\nScan a GitHub repository for skills",
+            border_style="cyan",
+        )
+    )
+
+    # Get URL
+    url = args.url
+    if not url:
+        url = inquirer.text(
+            message="Enter GitHub URL to scan:",
+            validate=lambda x: len(x) > 0,
+            invalid_message="URL cannot be empty",
+        ).execute()
+
+    console.print()
+
+    # Parse URL to show info
+    try:
+        owner, repo, branch, path = parse_github_url(url)
+        console.print(f"[dim]Repository: {owner}/{repo}[/dim]")
+        console.print(f"[dim]Branch: {branch}[/dim]")
+        console.print(f"[dim]Path: {path or '(root)'}[/dim]\n")
+    except ValueError as e:
+        console.print(f"[red]Error: {e}[/red]")
+        return 1
+
+    # Discover skills
+    try:
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+        ) as progress:
+            task = progress.add_task("Scanning repository for skills...", total=None)
+            skills = discover_skills_in_repo(url)
+            progress.update(task, completed=True)
+
+        if not skills:
+            console.print("[yellow]No skills found in the repository.[/yellow]")
+            return 0
+
+        # Display found skills
+        table = Table(title=f"Found {len(skills)} Skills", show_header=True, header_style="bold cyan")
+        table.add_column("Name", style="green", no_wrap=True)
+        table.add_column("Path", style="yellow")
+        table.add_column("URL", style="dim", overflow="fold")
+
+        for skill in sorted(skills, key=lambda x: x["name"]):
+            table.add_row(
+                skill["name"],
+                skill["path"],
+                skill["url"][:60] + "..." if len(skill["url"]) > 60 else skill["url"],
+            )
+
+        console.print(table)
+        console.print()
+
+        console.print("[dim]Use 'sm install <url> --discover' to install all found skills[/dim]")
+        return 0
+
+    except Exception as e:
+        console.print(f"[red]Discovery failed: {e}[/red]")
+        return 1
+
+
+def cmd_agents() -> int:
+    """
+    Agents command - List all supported agents.
+
+    Returns:
+        Exit code (0 for success)
+    """
+    console.print(
+        Panel.fit(
+            "[bold cyan]Supported Agents[/bold cyan]\nAll AI agents supported by skill-manager",
+            border_style="cyan",
+        )
+    )
+
+    table = Table(show_header=True, header_style="bold cyan")
+    table.add_column("Agent ID", style="green", no_wrap=True)
+    table.add_column("Name", style="yellow")
+    table.add_column("Project Path", style="dim")
+    table.add_column("Global Path", style="dim")
+
+    for agent_id in sorted(AGENTS.keys()):
+        info = AGENTS[agent_id]
+        global_path = info.get("global") or "N/A (project-only)"
+        table.add_row(
+            agent_id,
+            info["name"],
+            info["project"],
+            global_path,
+        )
+
+    console.print(table)
+    console.print(f"\n[dim]Total: {len(AGENTS)} agents supported[/dim]")
+    return 0
+
+
+def cmd_install_cli(args: argparse.Namespace) -> int:
+    """
+    Install command with CLI arguments - Download and deploy skills.
+
+    Args:
+        args: Parsed command line arguments
+
+    Returns:
+        Exit code (0 for success, non-zero for failure)
+    """
+    # If no URL provided, fall back to interactive mode
+    if not args.url:
+        return cmd_install()
+
+    console.print(
+        Panel.fit(
+            "[bold cyan]Install Skill[/bold cyan]\nDownload and deploy a skill from GitHub",
+            border_style="cyan",
+        )
+    )
+
+    url = args.url
+    deployment_type = args.type
+    use_symlink = args.symlink
+    skip_deploy = args.no_deploy
+    # auto_confirm = args.yes  # Reserved for future use
+
+    # Parse URL to show info
+    try:
+        owner, repo, branch, path = parse_github_url(url)
+        console.print(f"[dim]Repository: {owner}/{repo}[/dim]")
+        console.print(f"[dim]Branch: {branch}[/dim]")
+        console.print(f"[dim]Path: {path or '(root)'}[/dim]\n")
+    except ValueError as e:
+        console.print(f"[red]Error: {e}[/red]")
+        return 1
+
+    # Determine destination directory
+    if args.dest:
+        dest_dir = args.dest
+    else:
+        dest_dir = get_system_temp_dir()
+
+    dest_dir.mkdir(parents=True, exist_ok=True)
+    console.print(f"[dim]Download location: {dest_dir}[/dim]\n")
+
+    # Check symlink support
+    if use_symlink and not is_symlink_supported():
+        console.print("[yellow]Warning: Symlinks not supported on this system, will copy instead[/yellow]")
+        use_symlink = False
+
+    # Discover skills if requested
+    if args.discover:
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+        ) as progress:
+            task = progress.add_task("Discovering skills...", total=None)
+            skills_info = discover_skills_in_repo(url)
+            progress.update(task, completed=True)
+
+        if not skills_info:
+            console.print("[yellow]No skills found in the repository.[/yellow]")
+            return 0
+
+        console.print(f"[green]✓[/green] Found {len(skills_info)} skills\n")
+
+        # Download all skills
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+        ) as progress:
+            task = progress.add_task("Downloading skills...", total=None)
+            downloaded = download_multiple_skills(skills_info, dest_dir)
+            progress.update(task, completed=True)
+
+        console.print(f"[green]✓[/green] Downloaded {len(downloaded)} skills\n")
+
+        # Save metadata for each
+        for skill_dir, metadata in downloaded:
+            save_skill_metadata(
+                skill_dir,
+                metadata["url"],
+                metadata["owner"],
+                metadata["repo"],
+                metadata["branch"],
+                metadata["path"],
+            )
+    else:
+        # Download single skill
+        try:
+            with Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                console=console,
+            ) as progress:
+                task = progress.add_task("Downloading skill...", total=None)
+                skill_dir, metadata = download_skill_from_github(url, dest_dir)
+                progress.update(task, completed=True)
+
+            save_skill_metadata(
+                skill_dir,
+                url,
+                metadata["owner"],
+                metadata["repo"],
+                metadata["branch"],
+                metadata["path"],
+            )
+
+            if not validate_skill(skill_dir):
+                console.print(f"[yellow]Warning: {skill_dir} does not contain SKILL.md, may not be a valid skill[/yellow]")
+
+            console.print(f"[green]✓[/green] Skill downloaded to: {skill_dir}\n")
+            downloaded = [(skill_dir, metadata)]
+
+        except Exception as e:
+            console.print(f"[red]Download failed: {e}[/red]")
+            return 1
+
+    if skip_deploy:
+        console.print("[dim]Skipping deployment (--no-deploy)[/dim]")
+        return 0
+
+    # Determine agents
+    if args.agents:
+        selected_agents = args.agents
+        # Validate agents
+        for agent_id in selected_agents:
+            if agent_id not in AGENTS:
+                console.print(f"[red]Unknown agent: {agent_id}[/red]")
+                console.print(f"[dim]Available agents: {', '.join(sorted(AGENTS.keys()))}[/dim]")
+                return 1
+            if deployment_type == "global" and not supports_global_deployment(agent_id):
+                console.print(f"[red]Agent '{agent_id}' does not support global deployment[/red]")
+                return 1
+    else:
+        # Interactive selection
+        existing_agents = detect_existing_agents()
+        if existing_agents:
+            console.print(f"[green]✓[/green] Detected {len(existing_agents)} installed agents\n")
+        selected_agents = select_agents(existing_agents)
+        if not selected_agents:
+            console.print("[yellow]No agents selected.[/yellow]")
+            return 0
+
+    console.print()
+
+    # Deploy
+    project_root = get_project_root() if deployment_type == "project" else None
+    total_success = 0
+    total_fail = 0
+
+    for skill_dir, _ in downloaded:
+        success_count, fail_count = deploy_skill_to_agents(
+            skill_dir, selected_agents, deployment_type, project_root, use_symlink
+        )
+        total_success += success_count
+        total_fail += fail_count
+
+    # Show results
+    console.print()
+    if total_fail == 0:
+        link_type = "symlinked" if use_symlink else "deployed"
+        console.print(
+            Panel.fit(
+                f"[bold green]✓ Installation successful![/bold green]\n\nSkills {link_type} to {total_success} agent(s)",
+                border_style="green",
+            )
+        )
+    else:
+        console.print(
+            Panel.fit(
+                f"[bold yellow]⚠ Installation completed with errors[/bold yellow]\n\n"
+                f"Success: {total_success} | Failed: {total_fail}",
+                border_style="yellow",
+            )
+        )
+
+    return 0 if total_fail == 0 else 1
+
+
+def cmd_download_cli(args: argparse.Namespace) -> int:
+    """
+    Download command with CLI arguments.
+
+    Args:
+        args: Parsed command line arguments
+
+    Returns:
+        Exit code (0 for success, non-zero for failure)
+    """
+    # If no URL provided, fall back to interactive mode
+    if not args.url:
+        return cmd_download()
+
+    console.print(
+        Panel.fit(
+            "[bold cyan]Download Skill[/bold cyan]\nDownload a skill from GitHub",
+            border_style="cyan",
+        )
+    )
+
+    url = args.url
+
+    # Parse URL to show info
+    try:
+        owner, repo, branch, path = parse_github_url(url)
+        console.print(f"[dim]Repository: {owner}/{repo}[/dim]")
+        console.print(f"[dim]Branch: {branch}[/dim]")
+        console.print(f"[dim]Path: {path or '(root)'}[/dim]\n")
+    except ValueError as e:
+        console.print(f"[red]Error: {e}[/red]")
+        return 1
+
+    # Determine destination directory
+    if args.dest:
+        dest_dir = args.dest
+    else:
+        dest_dir = get_system_temp_dir()
+
+    dest_dir.mkdir(parents=True, exist_ok=True)
+    console.print(f"[dim]Download location: {dest_dir}[/dim]\n")
+
+    # Discover skills if requested
+    if args.discover:
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+        ) as progress:
+            task = progress.add_task("Discovering skills...", total=None)
+            skills_info = discover_skills_in_repo(url)
+            progress.update(task, completed=True)
+
+        if not skills_info:
+            console.print("[yellow]No skills found in the repository.[/yellow]")
+            return 0
+
+        console.print(f"[green]✓[/green] Found {len(skills_info)} skills\n")
+
+        # Download all skills
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            console=console,
+        ) as progress:
+            task = progress.add_task("Downloading skills...", total=None)
+            downloaded = download_multiple_skills(skills_info, dest_dir)
+            progress.update(task, completed=True)
+
+        console.print(f"[green]✓[/green] Downloaded {len(downloaded)} skills to {dest_dir}\n")
+
+        # Save metadata for each
+        for skill_dir, metadata in downloaded:
+            save_skill_metadata(
+                skill_dir,
+                metadata["url"],
+                metadata["owner"],
+                metadata["repo"],
+                metadata["branch"],
+                metadata["path"],
+            )
+
+        return 0
+    else:
+        # Download single skill
+        try:
+            with Progress(
+                SpinnerColumn(),
+                TextColumn("[progress.description]{task.description}"),
+                console=console,
+            ) as progress:
+                task = progress.add_task("Downloading skill...", total=None)
+                skill_dir, metadata = download_skill_from_github(url, dest_dir)
+                progress.update(task, completed=True)
+
+            save_skill_metadata(
+                skill_dir,
+                url,
+                metadata["owner"],
+                metadata["repo"],
+                metadata["branch"],
+                metadata["path"],
+            )
+
+            if not validate_skill(skill_dir):
+                console.print(f"[yellow]Warning: {skill_dir} does not contain SKILL.md, may not be a valid skill[/yellow]")
+
+            console.print(f"[green]✓[/green] Skill downloaded to: {skill_dir}\n")
+            return 0
+
+        except Exception as e:
+            console.print(f"[red]Download failed: {e}[/red]")
+            return 1
+
+
 def main() -> int:
     """
     Main CLI entry point.
@@ -1129,51 +1616,59 @@ def main() -> int:
     Returns:
         Exit code
     """
-    # Handle version flag
-    if len(sys.argv) > 1 and sys.argv[1] in ("--version", "-v", "version"):
-        console.print(f"[cyan]agent-skill-manager[/cyan] version [bold]{__version__}[/bold]")
-        return 0
+    parser = create_parser()
 
+    # Handle no arguments
     if len(sys.argv) < 2:
         console.print(
             Panel.fit(
                 f"[bold cyan]Skill Manager[/bold cyan] [dim]v{__version__}[/dim]\n\n"
                 "Usage:\n"
-                "  sm download      - Download a skill from GitHub\n"
-                "  sm deploy        - Deploy local skills to agents\n"
-                "  sm install       - Download and deploy in one step\n"
-                "  sm uninstall     - Remove skills from agents (safe delete)\n"
-                "  sm restore       - Restore deleted skills from trash\n"
-                "  sm update        - Update skills from GitHub\n"
-                "  sm update --all  - Update all skills from GitHub\n"
-                "  sm list          - List installed skills and versions\n"
-                "  sm --version     - Show version information\n\n"
-                "[dim]Note: You can also use 'skill-manager' instead of 'sm'[/dim]",
+                "  sm install [url]   - Download and deploy skills\n"
+                "  sm download [url]  - Download a skill from GitHub\n"
+                "  sm deploy          - Deploy local skills to agents\n"
+                "  sm discover [url]  - Discover skills in a repository\n"
+                "  sm uninstall       - Remove skills from agents\n"
+                "  sm restore         - Restore deleted skills from trash\n"
+                "  sm update [--all]  - Update skills from GitHub\n"
+                "  sm list            - List installed skills\n"
+                "  sm agents          - List all supported agents\n"
+                "  sm --version       - Show version information\n\n"
+                "[bold]CLI Options:[/bold]\n"
+                "  -a, --agent AGENT  - Target agent(s)\n"
+                "  -t, --type TYPE    - Deployment type (global/project)\n"
+                "  --symlink          - Use symlinks instead of copying\n"
+                "  --discover         - Discover all skills in repository\n"
+                "  -y, --yes          - Skip confirmation prompts\n\n"
+                "[dim]Example: sm install https://github.com/cloudflare/skills --discover -a windsurf --symlink[/dim]",
                 border_style="cyan",
             )
         )
         return 1
 
-    command = sys.argv[1]
+    args = parser.parse_args()
 
     try:
-        if command == "download":
-            return cmd_download()
-        elif command == "deploy":
+        if args.command == "download":
+            return cmd_download_cli(args)
+        elif args.command == "deploy":
             return cmd_deploy()
-        elif command == "install":
-            return cmd_install()
-        elif command == "uninstall":
+        elif args.command == "install":
+            return cmd_install_cli(args)
+        elif args.command == "discover":
+            return cmd_discover(args)
+        elif args.command == "uninstall":
             return cmd_uninstall()
-        elif command == "restore":
+        elif args.command == "restore":
             return cmd_restore()
-        elif command == "update":
+        elif args.command == "update":
             return cmd_update()
-        elif command == "list":
+        elif args.command == "list":
             return cmd_list()
+        elif args.command == "agents":
+            return cmd_agents()
         else:
-            console.print(f"[red]Unknown command: {command}[/red]")
-            console.print("Available commands: download, deploy, install, uninstall, restore, update, list, --version")
+            parser.print_help()
             return 1
     except KeyboardInterrupt:
         console.print("\n[yellow]Cancelled[/yellow]")