npm - ai-global - Versions diffs - 1.0.0 → 1.2.0 - Mend

ai-global 1.0.0 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/README.md CHANGED Viewed

@@ -1,4 +1,4 @@
-# AI Config
+# AI Global
 [中文文档](README_CN.md)
@@ -6,49 +6,55 @@ Unified configuration manager for AI coding assistants. Edit one file, sync to a
 ## Supported Tools
-| Tool | Instructions | Skills | Agents | Rules | Commands | Prompts |
-|------|:------:|:------:|:------:|:-----:|:--------:|:-------:|
-| Claude Code | ✓ | ✓ | | | ✓ | |
-| Cursor | ✓ | ✓ | | | | ✓ |
-| GitHub Copilot | ✓ | | | | | |
-| Factory Droid | ✓ | | | | | |
-| Gemini CLI | ✓ | ✓ | | | ✓ | |
-| Windsurf | ✓ | ✓ | ✓ | ✓ | | |
-| Kiro | ✓ | | ✓ | | | |
-| Qodo | ✓ | | ✓ | | | |
-| Antigravity | ✓ | ✓ | | | ✓ | |
-| Continue | ✓ | | | ✓ | | ✓ |
-| Cline | ✓ | | | ✓ | | ✓ |
-| Roo Code | ✓ | | | ✓ | | |
-| Sourcegraph Cody | ✓ | | | | ✓ | |
-| CodeGPT | ✓ | | | | | ✓ |
-| GPT Engineer | ✓ | | | | | ✓ |
-| Smol Developer | ✓ | | | | | ✓ |
-| Amp | ✓ | | | | | |
-| Trae | ✓ | | | | | |
-| OpenCode | ✓ | | | | | |
-| OpenAI Codex | ✓ | | | | | |
-| Aider | ✓ | | | | | |
-| Codeium | ✓ | | | | | |
-| TabNine | ✓ | | | | | |
-| Zed | ✓ | | | | | |
-| Aide | ✓ | | | | | |
-| PearAI | ✓ | | | | | |
-| Supermaven | ✓ | | | | | |
-| CodeStory | ✓ | | | | | |
-| Double | ✓ | | | | | |
-| Blackbox AI | ✓ | | | | | |
-| Amazon Q | ✓ | | | | | |
-| Copilot Workspace | ✓ | | | | | |
-| Goose AI | ✓ | | | | | |
-| Mentat | ✓ | | | | | |
-| Melty | ✓ | | | | | |
-| Void | ✓ | | | | | |
-| Qoder | ✓ | | | | | |
+| Tool              | Instructions | Skills | Agents | Rules | Commands | Prompts |
+| ----------------- | :----------: | :----: | :----: | :---: | :------: | :-----: |
+| Claude Code       |      ✓       |   ✓    |        |       |    ✓     |         |
+| Cursor            |      ✓       |   ✓    |        |       |          |    ✓    |
+| GitHub Copilot    |      ✓       |        |        |       |          |         |
+| Factory Droid     |      ✓       |        |        |       |          |         |
+| Gemini CLI        |      ✓       |   ✓    |        |       |    ✓     |         |
+| Windsurf          |      ✓       |   ✓    |   ✓    |   ✓   |          |         |
+| Kiro              |      ✓       |        |   ✓    |       |          |         |
+| Qodo              |      ✓       |        |   ✓    |       |          |         |
+| Antigravity       |      ✓       |   ✓    |        |       |    ✓     |         |
+| Continue          |      ✓       |        |        |   ✓   |          |    ✓    |
+| Cline             |      ✓       |        |        |   ✓   |          |    ✓    |
+| Roo Code          |      ✓       |        |        |   ✓   |          |         |
+| Sourcegraph Cody  |      ✓       |        |        |       |    ✓     |         |
+| CodeGPT           |      ✓       |        |        |       |          |    ✓    |
+| GPT Engineer      |      ✓       |        |        |       |          |    ✓    |
+| Smol Developer    |      ✓       |        |        |       |          |    ✓    |
+| Amp               |      ✓       |        |        |       |          |         |
+| Trae              |      ✓       |        |        |       |          |         |
+| OpenCode          |      ✓       |        |        |       |          |         |
+| OpenAI Codex      |      ✓       |        |        |       |          |         |
+| Aider             |      ✓       |        |        |       |          |         |
+| Codeium           |      ✓       |        |        |       |          |         |
+| TabNine           |      ✓       |        |        |       |          |         |
+| Zed               |      ✓       |        |        |       |          |         |
+| Aide              |      ✓       |        |        |       |          |         |
+| PearAI            |      ✓       |        |        |       |          |         |
+| Supermaven        |      ✓       |        |        |       |          |         |
+| CodeStory         |      ✓       |        |        |       |          |         |
+| Double            |      ✓       |        |        |       |          |         |
+| Blackbox AI       |      ✓       |        |        |       |          |         |
+| Amazon Q          |      ✓       |        |        |       |          |         |
+| Copilot Workspace |      ✓       |        |        |       |          |         |
+| Goose AI          |      ✓       |        |        |       |          |         |
+| Mentat            |      ✓       |        |        |       |          |         |
+| Melty             |      ✓       |        |        |       |          |         |
+| Void              |      ✓       |        |        |       |          |         |
+| Qoder             |      ✓       |        |        |       |          |         |
 ## Installation
-### npm / pnpm / yarn / bun
+### curl
+```bash
+curl -fsSL https://raw.githubusercontent.com/nanxiaobei/ai-global/main/install.sh | bash
+```
+### npm
 ```bash
 npm install -g ai-global
@@ -60,12 +66,6 @@ yarn global add ai-global
 bun add -g ai-global
 ```
-### curl
-```bash
-curl -fsSL https://raw.githubusercontent.com/nanxiaobei/ai-global/main/install.sh | bash
-```
 ## Usage
 ### First run
@@ -75,6 +75,7 @@ ai-global
 ```
 This will:
 1. Scan your system for installed AI tools
 2. Backup original configs to `~/.ai-global/backups/`
 3. Merge instructions/skills/agents/rules/commands/prompts from all tools
@@ -83,30 +84,30 @@ This will:
 ### Edit instructions
 ```
-~/.ai-global/instructions.md
+~/.ai-global/global.md
 ```
 Changes take effect immediately - all tools read the same file via symlinks.
 ### Commands
-| Command | Description |
-|---------|-------------|
-| `ai-global` | Scan, merge and update symlinks (default) |
-| `ai-global status` | Show symlink status |
-| `ai-global list` | List supported tools |
-| `ai-global backups` | List available backups |
-| `ai-global restore <tool>` | Restore a tool's original config |
-| `ai-global restore all` | Restore all tools |
-| `ai-global skill <source>` | Add a skill (file or GitHub repo) |
-| `ai-global agent <source>` | Add an agent |
-| `ai-global rule <source>` | Add a rule |
-| `ai-global command <source>` | Add a command |
-| `ai-global prompt <source>` | Add a prompt |
-| `ai-global upgrade` | Upgrade to latest version |
-| `ai-global uninstall` | Completely remove ai-global |
-| `ai-global version` | Show version |
-| `ai-global help` | Show help |
+| Command                      | Description                               |
+| ---------------------------- | ----------------------------------------- |
+| `ai-global`                  | Scan, merge and update symlinks (default) |
+| `ai-global status`           | Show symlink status                       |
+| `ai-global list`             | List supported tools                      |
+| `ai-global backups`          | List available backups                    |
+| `ai-global unlink <tool>`    | Unlink a tool's original config           |
+| `ai-global unlink all`       | Unlink all tools                          |
+| `ai-global skill <source>`   | Add a skill (file or GitHub repo)         |
+| `ai-global agent <source>`   | Add an agent                              |
+| `ai-global rule <source>`    | Add a rule                                |
+| `ai-global command <source>` | Add a command                             |
+| `ai-global prompt <source>`  | Add a prompt                              |
+| `ai-global upgrade`          | Upgrade to latest version                 |
+| `ai-global uninstall`        | Completely remove ai-global               |
+| `ai-global version`          | Show version                              |
+| `ai-global help`             | Show help                                 |
 ### Add skill/agent/rule/command/prompt
@@ -130,7 +131,7 @@ ai-global skill user/repo/skills/react.md
 ```
 ~/.ai-global/
-├── instructions.md  <- Shared instructions (edit this)
+├── global.md        <- Shared instructions (edit this)
 ├── skills/          <- Shared skills (merged from all tools)
 ├── agents/          <- Shared agents
 ├── rules/           <- Shared rules
@@ -141,12 +142,12 @@ ai-global skill user/repo/skills/react.md
 Each AI tool's config directory contains symlinks:
 ~/.claude/
-├── CLAUDE.md -> ~/.ai-global/instructions.md  (symlink)
+├── CLAUDE.md -> ~/.ai-global/global.md        (symlink)
 ├── skills/   -> ~/.ai-global/skills/          (symlink)
 └── commands/ -> ~/.ai-global/commands/        (symlink)
 ~/.cursor/
-├── rules/global.md -> ~/.ai-global/instructions.md (symlink)
+├── rules/global.md -> ~/.ai-global/global.md       (symlink)
 ├── skills/         -> ~/.ai-global/skills/         (symlink)
 └── prompts/        -> ~/.ai-global/prompts/        (symlink)
@@ -170,7 +171,8 @@ ai-global uninstall
 ```
 This will:
-1. Restore all tools to original configuration
+1. Unlink all tools to original configuration
 2. Remove `~/.ai-global` directory
 3. Remove `ai-global` command
@@ -181,7 +183,7 @@ ai-global uninstall
 npm uninstall -g ai-global
 ```
-## Example instructions.md
+## Example global.md
 ```markdown
 # AI Assistant Instructions

package/ai-global CHANGED Viewed

@@ -6,9 +6,8 @@
 set -e
 CONFIG_DIR="$HOME/.ai-global"
-KNOWN_TOOLS_FILE="$CONFIG_DIR/.known-tools"
 BACKUP_DIR="$CONFIG_DIR/backups"
-INSTRUCTIONS_MD="$CONFIG_DIR/instructions.md"
+GLOBAL_MD="$CONFIG_DIR/global.md"
 SKILLS_DIR="$CONFIG_DIR/skills"
 AGENTS_DIR="$CONFIG_DIR/agents"
 RULES_DIR="$CONFIG_DIR/rules"
@@ -39,8 +38,67 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 BLUE='\033[0;34m'
 CYAN='\033[0;36m'
+MAGENTA='\033[0;35m'
+BRIGHT_RED='\033[1;31m'
+BRIGHT_GREEN='\033[1;32m'
+BRIGHT_YELLOW='\033[1;33m'
+BRIGHT_BLUE='\033[1;34m'
+BRIGHT_MAGENTA='\033[1;35m'
+BRIGHT_CYAN='\033[1;36m'
 NC='\033[0m'
+# Tool color palette (using xterm-256 colors for more variety)
+# We pick a spread of colors from the 256-color palette (avoiding too dark/grayscale)
+TOOL_COLORS=(
+    "\033[38;5;39m"  "\033[38;5;214m" "\033[38;5;118m" "\033[38;5;171m" "\033[38;5;208m"
+    "\033[38;5;45m"  "\033[38;5;190m" "\033[38;5;161m" "\033[38;5;111m" "\033[38;5;220m"
+    "\033[38;5;75m"  "\033[38;5;202m" "\033[38;5;112m" "\033[38;5;141m" "\033[38;5;210m"
+    "\033[38;5;47m"  "\033[38;5;226m" "\033[38;5;201m" "\033[38;5;81m"  "\033[38;5;215m"
+    "\033[38;5;51m"  "\033[38;5;184m" "\033[38;5;197m" "\033[38;5;105m" "\033[38;5;209m"
+    "\033[38;5;121m" "\033[38;5;227m" "\033[38;5;165m" "\033[38;5;33m"  "\033[38;5;216m"
+    "\033[38;5;159m" "\033[38;5;178m" "\033[38;5;162m" "\033[38;5;117m" "\033[38;5;221m"
+    "\033[38;5;78m"  "\033[38;5;203m" "\033[38;5;113m" "\033[38;5;142m" "\033[38;5;211m"
+    "\033[38;5;159m" "\033[38;5;178m" "\033[38;5;162m" "\033[38;5;117m" "\033[38;5;221m"
+    "\033[38;5;78m"  "\033[38;5;203m" "\033[38;5;113m" "\033[38;5;142m" "\033[38;5;211m"
+)
+beautify_path() {
+    local path="$1"
+    if [[ "$path" == "$HOME"* ]]; then
+        local beautified="~${path#$HOME}"
+        echo "${beautified//\/\///}"
+    else
+        echo "$path"
+    fi
+}
+get_tool_color() {
+    local name="$1"
+    local sum=0
+    local len=${#name}
+    for (( i=0; i<len; i++ )); do
+        sum=$((sum + $(printf '%d' "'${name:i:1}")))
+    done
+    echo -e "${TOOL_COLORS[$((sum % ${#TOOL_COLORS[@]}))]}"
+}
+# Extract name from frontmatter (name: "...")
+extract_meta_name() {
+    local file="$1"
+    local default_name="$2"
+    if [[ ! -f "$file" ]]; then
+        echo "$default_name"
+        return
+    fi
+    # Match name: "value" or name: value
+    local extracted=$(grep -m 1 "^name:" "$file" | sed -E 's/^name:[[:space:]]*["'\'']?([^"'\'']+)["'\'']?/\1/' | xargs 2>/dev/null || true)
+    if [[ -n "$extracted" ]]; then
+        echo "$extracted"
+    else
+        echo "$default_name"
+    fi
+}
 log_info() { echo -e "${BLUE}[INFO]${NC} $1"; }
 log_ok() { echo -e "${GREEN}[OK]${NC} $1"; }
 log_warn() { echo -e "${YELLOW}[WARN]${NC} $1"; }
@@ -81,11 +139,11 @@ declare -a KNOWN_PATTERNS=(
     ".blackbox|Blackbox AI|config.json|.|.|.|.|."
     ".amazonq|Amazon Q|instructions.md|.|.|.|.|."
     ".copilot-workspace|Copilot Workspace|instructions.md|.|.|.|.|."
-    ".codex|OpenAI Codex|instructions.md|.|.|.|.|."
-    ".goose|Goose AI|instructions.md|.|.|.|.|."
-    ".mentat|Mentat|instructions.md|.|.|.|.|."
-    ".gpt-engineer|GPT Engineer|instructions.md|.|.|.|.|prompts"
-    ".smol|Smol Developer|instructions.md|.|.|.|.|prompts"
+    ".codex|OpenAI Codex|instructions.md|skills|agents|rules|.|."
+    ".goose|Goose AI|instructions.md|skills|agents|rules|.|."
+    ".mentat|Mentat|instructions.md|skills|agents|rules|.|."
+    ".gpt-engineer|GPT Engineer|instructions.md|skills|agents|rules|.|prompts"
+    ".smol|Smol Developer|instructions.md|skills|agents|rules|.|prompts"
     ".config/opencode|OpenCode Config|instructions.md|.|.|.|.|."
 )
@@ -118,6 +176,7 @@ merge_items() {
     local source_dir="$1"
     local target_dir="$2"
     local type="$3"
+    local tool_name="$4"
     [[ ! -d "$source_dir" ]] && return
     [[ -L "$source_dir" ]] && return
@@ -140,7 +199,18 @@ merge_items() {
     done
     if [[ $merged_count -gt 0 ]]; then
-        log_ok "Merged $merged_count $type from $source_dir"
+        local tool_color=$(get_tool_color "$tool_name")
+        log_ok "Merged $merged_count $type from ${tool_color}${tool_name}${NC}"
+    fi
+}
+# Count items in directory (dirs and files)
+count_items() {
+    local dir="$1"
+    if [[ -d "$dir" ]]; then
+        ls -1 "$dir" 2>/dev/null | wc -l | tr -d ' '
+    else
+        echo "0"
     fi
 }
@@ -154,118 +224,126 @@ create_symlink() {
     local target_dir=$(dirname "$target")
     mkdir -p "$target_dir"
+    # If target exists and is a real file/dir, it should have been backed up by backup_item already.
+    # We remove it to make room for the symlink, avoiding in-place backups.
     if [[ -e "$target" ]] && [[ ! -L "$target" ]]; then
-        local backup="${target}.backup.$(date +%Y%m%d%H%M%S)"
-        mv "$target" "$backup"
-        log_warn "Backed up: $target"
+        rm -rf "$target"
     fi
     [[ -L "$target" ]] && rm "$target"
     ln -s "$source" "$target"
 }
-# Count files in directory
-count_files() {
-    local dir="$1"
-    if [[ -d "$dir" ]]; then
-        find "$dir" -maxdepth 1 -type f 2>/dev/null | wc -l | tr -d ' '
-    else
-        echo "0"
-    fi
-}
 # Show symlink status
 show_status() {
     log_info "Symlink status:"
     echo ""
-    if [[ ! -f "$KNOWN_TOOLS_FILE" ]]; then
-        log_info "No tools configured. Run 'ai-global' first."
-        return
+    local total_links=0
+    # Instructions
+    local instr_output=""
+    for pattern in "${KNOWN_PATTERNS[@]}"; do
+        local p_dir p_name p_instr p_skills p_agents p_rules p_cmds p_prompts
+        IFS='|' read -r p_dir p_name p_instr p_skills p_agents p_rules p_cmds p_prompts <<< "$pattern"
+        if [[ "$p_instr" != "." ]] && [[ "$p_instr" != *.json ]] && [[ "$p_instr" != *.yml ]]; then
+            local target="$HOME/$p_dir/$p_instr"
+            if [[ -L "$target" ]]; then
+                local link_target=$(readlink "$target" 2>/dev/null || true)
+                if [[ "$link_target" == *".ai-global"* ]]; then
+                    local tool_color=$(get_tool_color "$p_name")
+                    instr_output+="  ${tool_color}✓ $(beautify_path "$target")${NC}\n"
+                    ((total_links++))
+                fi
+            fi
+        fi
+    done
+    if [[ -n "$instr_output" ]]; then
+        echo -e "${BLUE}[global.md]${NC}"
+        echo -e -n "$instr_output"
     fi
-    echo -e "${BLUE}[instructions]${NC}"
-    while IFS= read -r dir_name; do
-        [[ -z "$dir_name" ]] && continue
+    for type_name in skills agents rules commands prompts; do
+        local type_output=""
         for pattern in "${KNOWN_PATTERNS[@]}"; do
-            IFS='|' read -r known_dir tool_name instr_file skills agents rules commands prompts <<< "$pattern"
-            if [[ "$dir_name" == "$known_dir" ]]; then
-                if [[ "$instr_file" != "." ]] && [[ "$instr_file" != *.json ]] && [[ "$instr_file" != *.yml ]]; then
-                    local target="$HOME/$dir_name/$instr_file"
-                    if [[ -L "$target" ]]; then
-                        echo -e "  ${GREEN}✓${NC} $target"
-                    elif [[ -e "$target" ]]; then
-                        echo -e "  ${YELLOW}!${NC} $target (not a symlink)"
-                    else
-                        echo -e "  ${RED}✗${NC} $target (missing)"
+            local p_dir p_name p_instr p_skills p_agents p_rules p_cmds p_prompts
+            IFS='|' read -r p_dir p_name p_instr p_skills p_agents p_rules p_cmds p_prompts <<< "$pattern"
+            local type_dir=""
+            case "$type_name" in
+                skills)   type_dir="$p_skills" ;;
+                agents)   type_dir="$p_agents" ;;
+                rules)    type_dir="$p_rules" ;;
+                commands) type_dir="$p_cmds" ;;
+                prompts)  type_dir="$p_prompts" ;;
+            esac
+            if [[ "$type_dir" != "." ]]; then
+                local target="$HOME/$p_dir/$type_dir"
+                if [[ -L "$target" ]]; then
+                    local link_target=$(readlink "$target" 2>/dev/null || true)
+                    if [[ "$link_target" == *".ai-global"* ]]; then
+                        local tool_color=$(get_tool_color "$p_name")
+                        type_output+="  ${tool_color}✓ $(beautify_path "$target")${NC}\n"
+                        ((total_links++))
                     fi
                 fi
-                break
             fi
         done
-    done < "$KNOWN_TOOLS_FILE"
-    for type_name in skills agents rules commands prompts; do
-        echo -e "\n${BLUE}[$type_name]${NC}"
-        while IFS= read -r dir_name; do
-            [[ -z "$dir_name" ]] && continue
-            for pattern in "${KNOWN_PATTERNS[@]}"; do
-                IFS='|' read -r known_dir tool_name instr_file skills agents rules commands prompts <<< "$pattern"
-                if [[ "$dir_name" == "$known_dir" ]]; then
-                    local type_dir=""
-                    case "$type_name" in
-                        skills) type_dir="$skills" ;;
-                        agents) type_dir="$agents" ;;
-                        rules) type_dir="$rules" ;;
-                        commands) type_dir="$commands" ;;
-                        prompts) type_dir="$prompts" ;;
-                    esac
-                    if [[ "$type_dir" != "." ]]; then
-                        local target="$HOME/$dir_name/$type_dir"
-                        if [[ -L "$target" ]]; then
-                            echo -e "  ${GREEN}✓${NC} $target"
-                        elif [[ -e "$target" ]]; then
-                            echo -e "  ${YELLOW}!${NC} $target (not a symlink)"
-                        else
-                            echo -e "  ${RED}✗${NC} $target (missing)"
-                        fi
-                    fi
-                    break
-                fi
-            done
-        done < "$KNOWN_TOOLS_FILE"
+        if [[ -n "$type_output" ]]; then
+            echo -e "\n${BLUE}[$type_name]${NC}"
+            echo -e -n "$type_output"
+        fi
     done
+    if [[ $total_links -eq 0 ]]; then
+        echo "  No active symlinks found."
+    fi
     echo ""
-    log_info "Shared: skills=$(count_files "$SKILLS_DIR"), agents=$(count_files "$AGENTS_DIR"), rules=$(count_files "$RULES_DIR"), commands=$(count_files "$COMMANDS_DIR"), prompts=$(count_files "$PROMPTS_DIR")"
+    log_info "Shared items: skills=$(count_items "$SKILLS_DIR"), agents=$(count_items "$AGENTS_DIR"), rules=$(count_items "$RULES_DIR"), commands=$(count_items "$COMMANDS_DIR"), prompts=$(count_items "$PROMPTS_DIR")"
 }
 # List supported tools
 list_supported() {
     log_info "Supported AI tools:"
     echo ""
-    printf "  ${BLUE}%-22s${NC} %-20s %-6s %-6s %-6s %-6s %-6s %s\n" "Directory" "Tool" "Skills" "Agents" "Rules" "Cmds" "Prompts" "Status"
-    echo "  ----------------------------------------------------------------------------------------------------------------"
+    printf "  ${BLUE}%-22s %-20s %-10s %-10s %-10s %-10s %-10s %s${NC}\n" "Directory" "Tool" "Skills" "Agents" "Rules" "Cmds" "Prompts" "Status"
+    echo "  --------------------------------------------------------------------------------------------------------------------------------"
     for pattern in "${KNOWN_PATTERNS[@]}"; do
-        IFS='|' read -r dir_name tool_name instr_file skills agents rules commands prompts <<< "$pattern"
-        local full_path="$HOME/$dir_name"
+        local p_dir p_name p_instr p_skills p_agents p_rules p_cmds p_prompts
+        IFS='|' read -r p_dir p_name p_instr p_skills p_agents p_rules p_cmds p_prompts <<< "$pattern"
+        local full_path="$HOME/$p_dir"
-        local s="." a="." r="." c="." p="."
-        [[ "$skills" != "." ]] && s="✓"
-        [[ "$agents" != "." ]] && a="✓"
-        [[ "$rules" != "." ]] && r="✓"
-        [[ "$commands" != "." ]] && c="✓"
-        [[ "$prompts" != "." ]] && p="✓"
+        local s_str="." a_str="." r_str="." c_str="." p_str="."
+        if [[ -d "$full_path" ]]; then
+            [[ "$p_skills" != "." && -d "$full_path/$p_skills" ]] && s_str="✓"
+            [[ "$p_agents" != "." && -d "$full_path/$p_agents" ]] && a_str="✓"
+            [[ "$p_rules" != "." && -d "$full_path/$p_rules" ]] && r_str="✓"
+            [[ "$p_cmds" != "." && -d "$full_path/$p_cmds" ]] && c_str="✓"
+            # Prompts can be a file or dir
+            [[ "$p_prompts" != "." && -e "$full_path/$p_prompts" ]] && p_str="✓"
+        fi
         local status=""
+        local tool_color=""
         if [[ -d "$full_path" ]]; then
             status="${GREEN}Installed${NC}"
+            tool_color=$(get_tool_color "$p_name")
         else
             status="${YELLOW}Not found${NC}"
+            tool_color="${NC}"
         fi
-        printf "  %-22s %-20s %-6s %-6s %-6s %-6s %-6s %b\n" "$dir_name" "$tool_name" "$s" "$a" "$r" "$c" "$p" "$status"
+        # Use manual padding because printf handles multibyte characters (✓) by byte count in Bash 3.2.
+        # Each category block matches the header's "%-10s " (11 characters total).
+        # We use indicator + 10 spaces = 11 characters.
+        printf "  %b%-22s %-20s%b %s          %s          %s          %s          %s          %b\n" \
+            "$tool_color" "$p_dir" "$p_name" "$NC" "$s_str" "$a_str" "$r_str" "$c_str" "$p_str" "$status"
     done
     echo ""
 }
@@ -275,22 +353,25 @@ list_backups() {
     log_info "Available backups:"
     echo ""
-    if [[ ! -d "$BACKUP_DIR" ]] || [[ -z "$(ls -A "$BACKUP_DIR" 2>/dev/null)" ]]; then
+    # Use ls -A to catch hidden files/dirs (starting with .)
+    local backups_list=$(ls -A "$BACKUP_DIR" 2>/dev/null || true)
+    if [[ -z "$backups_list" ]]; then
         echo "  No backups found"
         echo ""
         return
     fi
-    printf "  ${BLUE}%-25s${NC} %-12s %s\n" "Tool" "Type" "Backup File"
-    echo "  ----------------------------------------------------------------"
+    printf "  ${BLUE}%-25s %-12s %s${NC}\n" "Tool" "Type" "Backup File"
+    echo "  --------------------------------------------------------------------"
-    for backup in "$BACKUP_DIR"/*; do
-        [[ ! -e "$backup" ]] && continue
-        local filename=$(basename "$backup")
+    while read -r filename; do
+        [[ -z "$filename" ]] && continue
         local tool_name=""
         local type=""
-        if [[ "$filename" =~ ^(.+)\.([^.]+)\.([0-9]+)$ ]]; then
+        # Improved regex to handle various path characters
+        if [[ "$filename" =~ ^(.+)\.([^\.]+)\.([0-9]+)$ ]]; then
             tool_name="${BASH_REMATCH[1]}"
             type="${BASH_REMATCH[2]}"
         else
@@ -298,8 +379,9 @@ list_backups() {
             type="unknown"
         fi
-        printf "  %-25s %-12s %s\n" "$tool_name" "$type" "$filename"
-    done
+        local tool_color=$(get_tool_color "${tool_name//_/ }")
+        printf "  %s%-25s %-12s %s%b\n" "$tool_color" "$tool_name" "$type" "$filename" "$NC"
+    done <<< "$backups_list"
     echo ""
 }
@@ -329,15 +411,15 @@ collect_instructions() {
     done
     if [[ $found_count -gt 0 ]]; then
-        echo -e "$merged_content" > "$INSTRUCTIONS_MD"
+        echo -e "$merged_content" > "$GLOBAL_MD"
         log_ok "Merged instructions from $found_count tool(s)"
     else
-        cat > "$INSTRUCTIONS_MD" << 'EOF'
+        cat > "$GLOBAL_MD" << 'EOF'
 # AI Assistant Instructions
 <!-- Add your instructions here. They will sync to all AI tools. -->
 EOF
-        log_ok "Created: $INSTRUCTIONS_MD"
+        log_ok "Created: $GLOBAL_MD"
     fi
 }
@@ -348,11 +430,7 @@ update_tools() {
     mkdir -p "$SKILLS_DIR" "$AGENTS_DIR" "$RULES_DIR" "$COMMANDS_DIR" "$PROMPTS_DIR" "$BACKUP_DIR"
-    if [[ ! -f "$INSTRUCTIONS_MD" ]]; then
-        collect_instructions
-    fi
-    > "$KNOWN_TOOLS_FILE"
+    collect_instructions
     local tool_count=0
@@ -361,7 +439,8 @@ update_tools() {
         local full_path="$HOME/$dir_name"
         if [[ -d "$full_path" ]]; then
-            log_ok "Found: $tool_name"
+            local color=$(get_tool_color "$tool_name")
+            echo -e "${GREEN}[OK]${NC} ${color}Found: $tool_name${NC}"
             ((tool_count++))
             if [[ "$instr_file" != "." ]] && [[ "$instr_file" != *.json ]] && [[ "$instr_file" != *.yml ]]; then
@@ -389,11 +468,9 @@ update_tools() {
                         commands) target_dir="$COMMANDS_DIR" ;;
                         prompts) target_dir="$PROMPTS_DIR" ;;
                     esac
-                    merge_items "$path" "$target_dir" "$type_name"
+                    merge_items "$path" "$target_dir" "$type_name" "$tool_name"
                 fi
             done
-            echo "$dir_name" >> "$KNOWN_TOOLS_FILE"
         fi
     done
@@ -405,47 +482,43 @@ update_tools() {
     echo ""
     log_info "Creating symlinks..."
-    while IFS= read -r dir_name; do
-        [[ -z "$dir_name" ]] && continue
+    for pattern in "${KNOWN_PATTERNS[@]}"; do
+        IFS='|' read -r dir_name tool_name instr_file skills agents rules commands prompts <<< "$pattern"
+        local full_path="$HOME/$dir_name"
-        for pattern in "${KNOWN_PATTERNS[@]}"; do
-            IFS='|' read -r known_dir tool_name instr_file skills agents rules commands prompts <<< "$pattern"
+        if [[ -d "$full_path" ]]; then
+            local tool_color=$(get_tool_color "$tool_name")
+            if [[ "$instr_file" != "." ]] && [[ "$instr_file" != *.json ]] && [[ "$instr_file" != *.yml ]]; then
+                local target="$HOME/$dir_name/$instr_file"
+                create_symlink "$GLOBAL_MD" "$target"
+                printf "  ${tool_color}✓ %-40s -> %s${NC}\n" "$(beautify_path "$target")" "$(beautify_path "$GLOBAL_MD")"
+            fi
-            if [[ "$dir_name" == "$known_dir" ]]; then
-                if [[ "$instr_file" != "." ]] && [[ "$instr_file" != *.json ]] && [[ "$instr_file" != *.yml ]]; then
-                    local target="$HOME/$dir_name/$instr_file"
-                    create_symlink "$INSTRUCTIONS_MD" "$target"
-                    log_ok "$target -> instructions.md"
+            for type_name in skills agents rules commands prompts; do
+                local type_dir=""
+                local source_dir=""
+                case "$type_name" in
+                    skills) type_dir="$skills"; source_dir="$SKILLS_DIR" ;;
+                    agents) type_dir="$agents"; source_dir="$AGENTS_DIR" ;;
+                    rules) type_dir="$rules"; source_dir="$RULES_DIR" ;;
+                    commands) type_dir="$commands"; source_dir="$COMMANDS_DIR" ;;
+                    prompts) type_dir="$prompts"; source_dir="$PROMPTS_DIR" ;;
+                esac
+                if [[ "$type_dir" != "." ]]; then
+                    local target="$HOME/$dir_name/$type_dir"
+                    create_symlink "$source_dir" "$target"
+                    printf "  ${tool_color}✓ %-40s -> %s${NC}\n" "$(beautify_path "$target")" "$(beautify_path "$source_dir")/"
                 fi
-                for type_name in skills agents rules commands prompts; do
-                    local type_dir=""
-                    local source_dir=""
-                    case "$type_name" in
-                        skills) type_dir="$skills"; source_dir="$SKILLS_DIR" ;;
-                        agents) type_dir="$agents"; source_dir="$AGENTS_DIR" ;;
-                        rules) type_dir="$rules"; source_dir="$RULES_DIR" ;;
-                        commands) type_dir="$commands"; source_dir="$COMMANDS_DIR" ;;
-                        prompts) type_dir="$prompts"; source_dir="$PROMPTS_DIR" ;;
-                    esac
-                    if [[ "$type_dir" != "." ]]; then
-                        local target="$HOME/$dir_name/$type_dir"
-                        create_symlink "$source_dir" "$target"
-                        log_ok "$target -> $type_name/"
-                    fi
-                done
-                break
-            fi
-        done
-    done < "$KNOWN_TOOLS_FILE"
+            done
+        fi
+    done
     echo ""
-    log_info "Done! Shared: skills=$(count_files "$SKILLS_DIR"), agents=$(count_files "$AGENTS_DIR"), rules=$(count_files "$RULES_DIR"), commands=$(count_files "$COMMANDS_DIR"), prompts=$(count_files "$PROMPTS_DIR")"
+    log_info "Done! Shared: skills=$(count_items "$SKILLS_DIR"), agents=$(count_items "$AGENTS_DIR"), rules=$(count_items "$RULES_DIR"), commands=$(count_items "$COMMANDS_DIR"), prompts=$(count_items "$PROMPTS_DIR")"
 }
-# Restore a single tool
-restore_single_tool() {
+# Unlink a single tool
+unlink_single_tool() {
     local tool_name="$1"
     local dir_name="$2"
     local instr_file="$3"
@@ -454,19 +527,26 @@ restore_single_tool() {
     local rules="$6"
     local commands="$7"
     local prompts="$8"
+    local silent="${9:-false}"
-    log_ok "Restoring: $tool_name"
     local backup_name=$(echo "$dir_name" | tr '/' '_')
+    local worked=false
+    # Check for instructions link
     if [[ "$instr_file" != "." ]]; then
         local target="$HOME/$dir_name/$instr_file"
         if [[ -L "$target" ]]; then
-            rm "$target"
-            local backup_file=$(ls -t "$BACKUP_DIR"/${backup_name}.instructions.* 2>/dev/null | head -1)
-            [[ -f "$backup_file" ]] && cp "$backup_file" "$target"
+            local link_target=$(readlink "$target" 2>/dev/null || true)
+            if [[ "$link_target" == *".ai-global"* ]]; then
+                rm "$target"
+                local backup_file=$(ls -t "$BACKUP_DIR"/${backup_name}.instructions.* 2>/dev/null | head -1)
+                [[ -f "$backup_file" ]] && cp "$backup_file" "$target"
+                worked=true
+            fi
         fi
     fi
+    # Check for components links
     for type_name in skills agents rules commands prompts; do
         local type_dir=""
         case "$type_name" in
@@ -479,63 +559,85 @@ restore_single_tool() {
         if [[ "$type_dir" != "." ]]; then
             local target="$HOME/$dir_name/$type_dir"
             if [[ -L "$target" ]]; then
-                rm "$target"
-                local backup_file=$(ls -td "$BACKUP_DIR"/${backup_name}.${type_name}.* 2>/dev/null | head -1)
-                if [[ -d "$backup_file" ]]; then
-                    cp -r "$backup_file" "$target"
-                else
-                    mkdir -p "$target"
+                local link_target=$(readlink "$target" 2>/dev/null || true)
+                if [[ "$link_target" == *".ai-global"* ]]; then
+                    rm "$target"
+                    local backup_file=$(ls -td "$BACKUP_DIR"/${backup_name}.${type_name}.* 2>/dev/null | head -1)
+                    if [[ -d "$backup_file" ]]; then
+                        cp -r "$backup_file" "$target"
+                    fi
+                    worked=true
                 fi
             fi
         fi
     done
-}
-# Restore all tools
-restore_all_tools() {
-    log_info "Restoring all tools..."
-    echo ""
+    # Check for backups persistence
+    local has_backups=false
+    if [[ -n "$(ls "$BACKUP_DIR"/${backup_name}.* 2>/dev/null)" ]]; then
+        has_backups=true
+        rm -rf "$BACKUP_DIR"/${backup_name}.* 2>/dev/null || true
+    fi
-    if [[ ! -f "$KNOWN_TOOLS_FILE" ]]; then
-        log_info "No tools to restore"
-        return
+    if [[ "$worked" == true ]] || [[ "$has_backups" == true ]]; then
+        if [[ "$silent" != "true" ]]; then
+            local color=$(get_tool_color "$tool_name")
+            echo -e "${GREEN}[OK]${NC} ${color}Unlinked: $tool_name${NC}"
+        fi
+        return 0
     fi
-    local restored_count=0
+    return 1
+}
-    while IFS= read -r dir_name; do
-        [[ -z "$dir_name" ]] && continue
+# Unlink all tools
+unlink_all_tools() {
+    log_info "Unlinking tools..."
+    echo ""
-        for pattern in "${KNOWN_PATTERNS[@]}"; do
-            IFS='|' read -r known_dir tool_name instr_file skills agents rules commands prompts <<< "$pattern"
+    local unlinked_count=0
+    # Scan all known patterns to find and remove any symlinks
+    for pattern in "${KNOWN_PATTERNS[@]}"; do
+        IFS='|' read -r dir_name tool_name instr_file skills agents rules commands prompts <<< "$pattern"
+        if unlink_single_tool "$tool_name" "$dir_name" "$instr_file" "$skills" "$agents" "$rules" "$commands" "$prompts"; then
+            ((unlinked_count++))
+        fi
+    done
-            if [[ "$dir_name" == "$known_dir" ]]; then
-                restore_single_tool "$tool_name" "$dir_name" "$instr_file" "$skills" "$agents" "$rules" "$commands" "$prompts"
-                ((restored_count++))
-                break
-            fi
-        done
-    done < "$KNOWN_TOOLS_FILE"
+    # Final sweep for any remaining symlinks pointing to .ai-global
+    find "$HOME" -maxdepth 3 -type l 2>/dev/null | while read -r link; do
+        local target=$(readlink "$link" 2>/dev/null || true)
+        if [[ "$target" == *".ai-global"* ]]; then
+            rm "$link"
+            log_ok "Removed unknown symlink: $(beautify_path "$link")"
+            ((unlinked_count++))
+        fi
+    done
-    rm -f "$KNOWN_TOOLS_FILE"
+    # Clear all backups as requested
+    rm -rf "$BACKUP_DIR"/* 2>/dev/null || true
     echo ""
-    log_info "Restored $restored_count tool(s). Run 'ai-global' to re-link."
+    if [[ $unlinked_count -gt 0 ]]; then
+        log_info "Unlinked $unlinked_count item(s) and cleared backups. Shared data preserved."
+    else
+        log_info "No active symlinks found. Backups cleared."
+    fi
 }
-# Restore a specific tool
-restore_tool() {
+# Unlink a specific tool
+unlink_tool() {
     local tool_query="$1"
     if [[ -z "$tool_query" ]]; then
-        log_error "Usage: ai-global restore <tool> or ai-global restore all"
+        log_error "Usage: ai-global unlink <tool> or ai-global unlink all"
         echo ""
         list_backups
         return 1
     fi
     if [[ "$tool_query" == "all" ]]; then
-        restore_all_tools
+        unlink_all_tools
         return
     fi
@@ -547,15 +649,9 @@ restore_tool() {
         local query_lower=$(echo "$tool_query" | tr '[:upper:]' '[:lower:]')
         if [[ "$tool_lower" == *"$query_lower"* ]] || [[ "$dir_name" == *"$query_lower"* ]]; then
-            log_info "Restoring $tool_name..."
-            restore_single_tool "$tool_name" "$dir_name" "$instr_file" "$skills" "$agents" "$rules" "$commands" "$prompts"
-            if [[ -f "$KNOWN_TOOLS_FILE" ]]; then
-                grep -v "^$dir_name$" "$KNOWN_TOOLS_FILE" > "$KNOWN_TOOLS_FILE.tmp" 2>/dev/null || true
-                mv "$KNOWN_TOOLS_FILE.tmp" "$KNOWN_TOOLS_FILE"
+            if ! unlink_single_tool "$tool_name" "$dir_name" "$instr_file" "$skills" "$agents" "$rules" "$commands" "$prompts"; then
+                log_info "$tool_name is not currently linked."
             fi
-            log_info "$tool_name restored"
             found=true
             break
         fi
@@ -643,53 +739,74 @@ download_from_github() {
             [[ -n "$path" ]] && source_dir="$tmp_dir/$repo/$path"
             if [[ -d "$source_dir" ]]; then
-                # Auto-detect type subdirectory (e.g., skills/, agents/, rules/)
-                if [[ -z "$path" ]]; then
-                    local type_dirs=""
+                local count=0
+                local meta_file=""
+                case "$type" in
+                    skill) meta_file="SKILL.md" ;;
+                    agent) meta_file="AGENT.md" ;;
+                esac
+                # 1. Check if root contains metadata file
+                if [[ -n "$meta_file" ]] && [[ -f "$source_dir/$meta_file" ]]; then
+                    local name=$(extract_meta_name "$source_dir/$meta_file" "$(basename "$source_dir")")
+                    local target_path="$target_dir/$name"
+                    mkdir -p "$target_path"
+                    cp -R "$source_dir"/* "$target_path/"
+                    count=1
+                fi
+                # 2. Check type subdirectories (skills/, agents/)
+                if [[ $count -eq 0 ]] && [[ -z "$path" ]]; then
+                    local search_dirs=""
                     case "$type" in
-                        skill)   type_dirs="skills skill" ;;
-                        agent)   type_dirs="agents agent" ;;
-                        rule)    type_dirs="rules rule" ;;
-                        command) type_dirs="commands command" ;;
-                        prompt)  type_dirs="prompts prompt" ;;
+                        skill) search_dirs="skills skill" ;;
+                        agent) search_dirs="agents agent" ;;
+                        rule)  search_dirs="rules rule" ;;
                     esac
-                    # Prefer type subdirectory, fallback to root
-                    for dir in $type_dirs; do
+                    for dir in $search_dirs; do
                         if [[ -d "$source_dir/$dir" ]]; then
-                            source_dir="$source_dir/$dir"
-                            log_info "Found $dir/ directory"
-                            break
+                            # Look for subdirectories containing SKILL.md/AGENT.md
+                            if [[ -n "$meta_file" ]]; then
+                                for d in "$source_dir/$dir"/*; do
+                                    [[ ! -d "$d" ]] && continue
+                                    if [[ -f "$d/$meta_file" ]]; then
+                                        local name=$(extract_meta_name "$d/$meta_file" "$(basename "$d")")
+                                        mkdir -p "$target_dir/$name"
+                                        cp -R "$d"/* "$target_dir/$name/"
+                                        ((count++))
+                                    fi
+                                done
+                            fi
+                            # If we found items or if it's "rules" (no metadata file needed usually), we are done with this dir
+                            if [[ $count -gt 0 ]] || [[ "$type" == "rule" ]]; then
+                                source_dir="$source_dir/$dir"
+                                break
+                            fi
                         fi
                     done
                 fi
-                local count=0
-                # Special case: many skill repos are structured as:
-                # skills/<skill-name>/SKILL.md
-                if [[ "$type" == "skill" ]] && [[ "$(basename "$source_dir")" == "skills" ]]; then
-                    for d in "$source_dir"/*; do
-                        [[ ! -d "$d" ]] && continue
-                        local skill_md="$d/SKILL.md"
-                        [[ ! -f "$skill_md" ]] && continue
-                        local skill_name=$(basename "$d")
-                        # Copy the entire skill directory so assets/examples are preserved
-                        local target_skill_dir="$target_dir/$skill_name"
-                        mkdir -p "$target_skill_dir"
-                        cp -R "$d/" "$target_skill_dir/"
-                        ((count++))
-                    done
+                # 3. Check src/ directory if still nothing (for skills)
+                if [[ $count -eq 0 ]] && [[ "$type" == "skill" ]] && [[ -d "$source_dir/src" ]]; then
+                    if [[ -f "$source_dir/src/$meta_file" ]]; then
+                        local name=$(extract_meta_name "$source_dir/src/$meta_file" "$(basename "$source_dir")")
+                        mkdir -p "$target_dir/$name"
+                        cp -R "$source_dir/src"/* "$target_dir/$name/"
+                        count=1
+                    fi
                 fi
-                # Fallback: copy top-level .md files from the selected source directory
-                if [[ $count -eq 0 ]]; then
+                # Fallback check (rules only): copy individual .md files
+                if [[ $count -eq 0 ]] && [[ "$type" == "rule" ]]; then
                     for file in "$source_dir"/*.md; do
                         [[ ! -f "$file" ]] && continue
                         local filename=$(basename "$file")
+                        if [[ "$filename" == "README.md" ]]; then
+                            local other_mds=$(ls "$source_dir"/*.md 2>/dev/null | grep -v "README.md" | wc -l)
+                            [[ $other_mds -gt 0 ]] && continue
+                        fi
                         cp "$file" "$target_dir/$filename"
                         ((count++))
                     done
@@ -701,7 +818,7 @@ download_from_github() {
                     # Show actual searched path
                     local searched_path="${source_dir#$tmp_dir/$repo}"
                     searched_path="${searched_path#/}"
-                    log_warn "No skills found in $owner/$repo${searched_path:+/$searched_path}"
+                    log_warn "No $type found organized in $owner/$repo${searched_path:+/$searched_path}"
                 fi
             else
                 log_error "Path not found: $path"
@@ -769,7 +886,7 @@ add_item() {
 # Uninstall
 uninstall() {
     log_warn "This will:"
-    echo "  1. Restore all tools to original configuration"
+    echo "  1. Unlink all tools to original configuration"
     echo "  2. Remove ~/.ai-global directory"
     echo "  3. Remove ai-global from PATH"
     echo ""
@@ -781,9 +898,7 @@ uninstall() {
         return
     fi
-    if [[ -f "$KNOWN_TOOLS_FILE" ]]; then
-        restore_all_tools
-    fi
+    unlink_all_tools
     [[ -L /usr/local/bin/ai-global ]] && rm -f /usr/local/bin/ai-global
     [[ -L "$HOME/.local/bin/ai-global" ]] && rm -f "$HOME/.local/bin/ai-global"
@@ -817,10 +932,16 @@ upgrade() {
     log_info "Upgrading: $VERSION -> $remote_version"
+    local current_script="$0"
+    # If running via symlink, update the target
+    if [[ -L "$current_script" ]]; then
+        current_script=$(readlink "$current_script")
+    fi
     local tmp_file=$(mktemp)
     if curl -fsSL "https://raw.githubusercontent.com/nanxiaobei/ai-global/main/ai-global" -o "$tmp_file" 2>/dev/null; then
         chmod +x "$tmp_file"
-        mv "$tmp_file" "$CONFIG_DIR/ai-global"
+        mv "$tmp_file" "$current_script"
         log_ok "Upgraded to v$remote_version"
     else
         rm -f "$tmp_file"
@@ -831,47 +952,32 @@ upgrade() {
 # Show help
 show_help() {
-    cat << EOF
-AI-Global: Unified AI Tools Configuration Manager v$VERSION
-Usage: ai-global [command]
-Commands:
-  (default)            Scan, merge and update symlinks
-  status               Show symlink status
-  list                 List all supported AI tools
-  backups              List available backups
-  restore <tool>       Restore a tool's original config
-  restore all          Restore all tools
-  skill <source>       Add a skill (file, GitHub repo, or new)
-  agent <source>       Add an agent
-  rule <source>        Add a rule
-  command <source>     Add a command
-  prompt <source>      Add a prompt
-  upgrade              Upgrade ai-global to latest version
-  uninstall            Completely remove ai-global
-  version              Show version
-  help                 Show this help
-Shared directories:
-  ~/.ai-global/instructions.md   Instructions for all tools
-  ~/.ai-global/skills/           Reusable skills
-  ~/.ai-global/agents/           Custom agents
-  ~/.ai-global/rules/            Code rules
-  ~/.ai-global/commands/         Slash commands
-  ~/.ai-global/prompts/          Prompt templates
-Examples:
-  ai-global                      # Scan, merge and update symlinks
-  ai-global skill react.md       # Add a local skill file
-  ai-global skill user/repo      # Add skills from GitHub repo (auto-detects skills/ dir)
-  ai-global agent coder.md       # Add an agent
-  ai-global restore claude       # Restore Claude's config
-Note: When adding from GitHub, it auto-detects type subdirectories
-       (e.g., skills/, agents/, rules/) if they exist.
-EOF
+    echo -e "${BLUE}AI-Global: Unified AI Tools Configuration Manager${NC} v$VERSION"
+    echo ""
+    echo -e "${BLUE}USAGE:${NC}"
+    echo -e "  ai-global [command]"
+    echo ""
+    echo -e "${BLUE}CORE COMMANDS:${NC}"
+    echo -e "  ${GREEN}(default)${NC}           Scan, merge and update symlinks"
+    echo -e "  ${GREEN}status${NC}              Show symlink status"
+    echo -e "  ${GREEN}list${NC}                List all supported AI tools"
+    echo -e "  ${GREEN}backups${NC}             List available backups"
+    echo -e "  ${GREEN}unlink <tool>${NC}       Unlink a tool's original config"
+    echo -e "  ${GREEN}unlink all${NC}          Unlink all tools"
+    echo ""
+    echo -e "${BLUE}RESOURCE MANAGEMENT:${NC}"
+    echo -e "  ${GREEN}skill <source>${NC}      Add a skill (file, GitHub repo, or new)"
+    echo -e "  ${GREEN}agent <source>${NC}      Add an agent"
+    echo -e "  ${GREEN}rule <source>${NC}       Add a rule"
+    echo -e "  ${GREEN}command <source>${NC}    Add a command"
+    echo -e "  ${GREEN}prompt <source>${NC}     Add a prompt"
+    echo ""
+    echo -e "${BLUE}SYSTEM COMMANDS:${NC}"
+    echo -e "  ${GREEN}upgrade${NC}             Upgrade ai-global to latest version"
+    echo -e "  ${GREEN}uninstall${NC}           Completely remove ai-global"
+    echo -e "  ${GREEN}version${NC}             Show version"
+    echo -e "  ${GREEN}help${NC}                Show this help"
+    echo ""
 }
 # Main
@@ -883,26 +989,27 @@ main() {
         exit 0
     fi
-    if [[ ! -f "$KNOWN_TOOLS_FILE" ]]; then
-        case "$cmd" in
-            help|--help|-h) show_help; exit 0 ;;
-            list) list_supported; exit 0 ;;
-            version|-v|--version) show_version; exit 0 ;;
-            skill|agent|rule|command|prompt|restore|status|backups)
-                log_info "No tools configured yet. Running initial scan..."
+    case "$cmd" in
+        help|--help|-h) show_help; exit 0 ;;
+        list) list_supported; exit 0 ;;
+        version|-v|--version) show_version; exit 0 ;;
+        skill|agent|rule|command|prompt|unlink|status|backups|upgrade|uninstall)
+            if [[ ! -d "$CONFIG_DIR" ]]; then
+                log_info "No configuration found. Running initial scan..."
                 update_tools
-                [[ "$cmd" == "skill" || "$cmd" == "agent" || "$cmd" == "rule" || "$cmd" == "command" || "$cmd" == "prompt" ]] || exit 0
-                ;;
-            *) cmd="update" ;;
-        esac
-    fi
+                [[ "$cmd" == "skill" || "$cmd" == "agent" || "$cmd" == "rule" || "$cmd" == "command" || "$cmd" == "prompt" || "$cmd" == "status" ]] || exit 0
+            fi
+            ;;
+        version|-v|--version|help|--help|-h) ;;
+        *) cmd="update" ;;
+    esac
     case "$cmd" in
         update)       update_tools ;;
         status)       show_status ;;
         list)         list_supported ;;
         backups)      list_backups ;;
-        restore)      restore_tool "$2" ;;
+        unlink)       unlink_tool "$2" ;;
         skill)        add_item "skill" "$2" ;;
         agent)        add_item "agent" "$2" ;;
         rule)         add_item "rule" "$2" ;;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "ai-global",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Unified configuration manager for AI coding assistants",
   "bin": {
     "ai-global": "ai-global"