@kaitranntt/ccs 4.1.3 → 4.1.5

package/lib/ccs.ps1

@@ -12,7 +12,7 @@ param(
 $ErrorActionPreference = "Stop"
 
 # Version (updated by scripts/bump-version.sh)
-$CcsVersion = "4.1.3"
+$CcsVersion = "4.1.5"
 $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 $ConfigFile = if ($env:CCS_CONFIG) { $env:CCS_CONFIG } else { "$env:USERPROFILE\.ccs\config.json" }
 $ProfilesJson = "$env:USERPROFILE\.ccs\profiles.json"
@@ -212,70 +212,105 @@ function Show-Help {
 
     Write-ColorLine "CCS (Claude Code Switch) - Instant profile switching for Claude CLI" "White"
     Write-Host ""
+
     Write-ColorLine "Usage:" "Cyan"
     Write-ColorLine "  ccs [profile] [claude-args...]" "Yellow"
-    Write-ColorLine "  ccs auth <command> [options]" "Yellow"
     Write-ColorLine "  ccs [flags]" "Yellow"
     Write-Host ""
+
     Write-ColorLine "Description:" "Cyan"
-    Write-Host "  Switch between multiple Claude accounts (work, personal, team) and"
-    Write-Host "  alternative models (GLM, Kimi) instantly. Concurrent sessions with"
-    Write-Host "  auto-recovery. Zero downtime."
+    Write-Host "  Switch between multiple Claude accounts and alternative models"
+    Write-Host "  (GLM, Kimi) instantly. Run different Claude CLI sessions concurrently"
+    Write-Host "  with auto-recovery. Zero downtime."
     Write-Host ""
+
     Write-ColorLine "Model Switching:" "Cyan"
     Write-ColorLine "  ccs                         Use default Claude account" "Yellow"
     Write-ColorLine "  ccs glm                     Switch to GLM 4.6 model" "Yellow"
     Write-ColorLine "  ccs glmt                    Switch to GLM with thinking mode" "Yellow"
+    Write-ColorLine "  ccs glmt --verbose          Enable debug logging" "Yellow"
     Write-ColorLine "  ccs kimi                    Switch to Kimi for Coding" "Yellow"
     Write-ColorLine "  ccs glm 'debug this code'   Use GLM and run command" "Yellow"
     Write-Host ""
-    Write-ColorLine "Examples:" "Cyan"
-    Write-Host "  Quick start:"
-    Write-ColorLine "    `$ ccs" "Yellow" -NoNewline
-    Write-Host "                        # Use default account"
-    Write-ColorLine "    `$ ccs glm `"implement API`"" "Yellow" -NoNewline
-    Write-Host "    # Cost-optimized model"
-    Write-Host ""
-    Write-Host "  Profile usage:"
-    Write-ColorLine "    `$ ccs work `"debug code`"" "Yellow" -NoNewline
-    Write-Host "      # Switch to work profile"
-    Write-ColorLine "    `$ ccs personal" "Yellow" -NoNewline
-    Write-Host "                # Open personal account"
-    Write-Host ""
+
     Write-ColorLine "Account Management:" "Cyan"
-    Write-ColorLine "  ccs auth --help             Manage multiple Claude accounts" "Yellow"
-    Write-ColorLine "  ccs work                    Switch to work account" "Yellow"
-    Write-ColorLine "  ccs personal                Switch to personal account" "Yellow"
+    Write-ColorLine "  ccs auth --help             Run multiple Claude accounts concurrently" "Yellow"
+    Write-Host ""
+
+    Write-ColorLine "Delegation (inside Claude Code CLI):" "Cyan"
+    Write-ColorLine "  /ccs:glm `"task`"             Delegate to GLM-4.6 for simple tasks" "Yellow"
+    Write-ColorLine "  /ccs:kimi `"task`"            Delegate to Kimi for long context" "Yellow"
+    Write-Host "  Save tokens by delegating simple tasks to cost-optimized models"
     Write-Host ""
+
     Write-ColorLine "Diagnostics:" "Cyan"
     Write-ColorLine "  ccs doctor                  Run health check and diagnostics" "Yellow"
+    Write-ColorLine "  ccs sync                    Sync delegation commands and skills" "Yellow"
     Write-Host ""
+
     Write-ColorLine "Flags:" "Cyan"
     Write-ColorLine "  -h, --help                  Show this help message" "Yellow"
     Write-ColorLine "  -v, --version               Show version and installation info" "Yellow"
-    Write-ColorLine "  --shell-completion          Install shell auto-completion" "Yellow"
+    Write-ColorLine "  -sc, --shell-completion     Install shell auto-completion" "Yellow"
     Write-Host ""
+
     Write-ColorLine "Configuration:" "Cyan"
-    Write-Host "  Config:    ~/.ccs/config.json"
-    Write-Host "  Profiles:  ~/.ccs/profiles.json"
-    Write-Host "  Instances: ~/.ccs/instances/"
-    Write-Host "  Settings:  ~/.ccs/*.settings.json"
+    Write-Host "  Config File: ~/.ccs/config.json"
+    Write-Host "  Profiles:    ~/.ccs/profiles.json"
+    Write-Host "  Instances:   ~/.ccs/instances/"
+    Write-Host "  Settings:    ~/.ccs/*.settings.json"
+    Write-Host "  Environment: CCS_CONFIG (override config path)"
     Write-Host ""
+
     Write-ColorLine "Shared Data:" "Cyan"
-    Write-Host "  Commands:  ~/.ccs/shared/commands/"
-    Write-Host "  Skills:    ~/.ccs/shared/skills/"
+    Write-Host "  Commands:    ~/.ccs/shared/commands/"
+    Write-Host "  Skills:      ~/.ccs/shared/skills/"
+    Write-Host "  Agents:      ~/.ccs/shared/agents/"
     Write-Host "  Note: Commands, skills, and agents are symlinked across all profiles"
     Write-Host ""
+
+    Write-ColorLine "Examples:" "Cyan"
+    Write-ColorLine "  `$ ccs                        # Use default account" "Yellow"
+    Write-ColorLine "  `$ ccs glm `"implement API`"    # Cost-optimized model" "Yellow"
+    Write-Host ""
+    Write-ColorLine "  For more: https://github.com/kaitranntt/ccs/blob/main/README.md" "Cyan"
+    Write-Host ""
+
+    Write-ColorLine "Uninstall:" "Yellow"
+    Write-Host "  npm:          npm uninstall -g @kaitranntt/ccs"
+    Write-Host "  macOS/Linux:  curl -fsSL ccs.kaitran.ca/uninstall | bash"
+    Write-Host "  Windows:      irm ccs.kaitran.ca/uninstall | iex"
+    Write-Host ""
+
     Write-ColorLine "Documentation:" "Cyan"
     Write-Host "  GitHub:  https://github.com/kaitranntt/ccs"
     Write-Host "  Docs:    https://github.com/kaitranntt/ccs/blob/main/README.md"
+    Write-Host "  Issues:  https://github.com/kaitranntt/ccs/issues"
     Write-Host ""
+
     Write-ColorLine "License: MIT" "Cyan"
 }
 
 function Show-Version {
     $UseColors = $env:FORCE_COLOR -or ([Console]::IsOutputRedirected -eq $false -and -not $env:NO_COLOR)
 
+    # Helper for aligned output
+    function Write-TableLine {
+        param(
+            [string]$Label,
+            [string]$Value,
+            [string]$Color = "Cyan"
+        )
+        if ($UseColors) {
+            $PaddedLabel = $Label.PadRight(17)
+            Write-Host "  $PaddedLabel " -ForegroundColor $Color -NoNewline
+            Write-Host $Value
+        } else {
+            $PaddedLabel = $Label.PadRight(17)
+            Write-Host "  $PaddedLabel $Value"
+        }
+    }
+
     # Title
     if ($UseColors) {
         Write-Host "CCS (Claude Code Switch) v$CcsVersion" -ForegroundColor White
@@ -284,38 +319,91 @@ function Show-Version {
     }
     Write-Host ""
 
-    # Installation
+    # Installation section with table-like formatting
     if ($UseColors) { Write-Host "Installation:" -ForegroundColor Cyan }
     else { Write-Host "Installation:" }
 
-    # Location
+    # Location - prioritize script location over command location
+    $ScriptLocation = $MyInvocation.MyCommand.Path
     $InstallLocation = (Get-Command ccs -ErrorAction SilentlyContinue).Source
-    if ($InstallLocation) {
-        if ($UseColors) {
-            Write-Host "  Location: " -ForegroundColor Cyan -NoNewline
-            Write-Host $InstallLocation
-        } else {
-            Write-Host "  Location: $InstallLocation"
-        }
+
+    # Show script location if running from source
+    if ($ScriptLocation -and (Test-Path $ScriptLocation)) {
+        Write-TableLine "Location:" $ScriptLocation
+    } elseif ($InstallLocation) {
+        Write-TableLine "Location:" $InstallLocation
     } else {
-        if ($UseColors) {
-            Write-Host "  Location: " -ForegroundColor Cyan -NoNewline
-            Write-Host "(not found - run from current directory)" -ForegroundColor Gray
-        } else {
-            Write-Host "  Location: (not found - run from current directory)"
+        Write-TableLine "Location:" "(not found - run from current directory)"
+    }
+
+    # .ccs/ directory location
+    Write-TableLine "CCS Directory:" "$env:USERPROFILE\.ccs\"
+
+    # Config path
+    Write-TableLine "Config:" $ConfigFile
+
+    # Profiles.json location
+    Write-TableLine "Profiles:" $ProfilesJson
+
+    # Delegation status - check multiple indicators
+    $DelegationConfigured = $false
+    $ReadyProfiles = @()
+
+    # Check for delegation-sessions.json (primary indicator)
+    $DelegationSessions = "$env:USERPROFILE\.ccs\delegation-sessions.json"
+    if (Test-Path $DelegationSessions) {
+        $DelegationConfigured = $true
+    }
+
+    # Check for profiles with valid API keys (secondary indicator)
+    foreach ($profile in @("glm", "kimi")) {
+        $SettingsFile = "$env:USERPROFILE\.ccs\$profile.settings.json"
+        if (Test-Path $SettingsFile) {
+            try {
+                $Settings = Get-Content $SettingsFile -Raw | ConvertFrom-Json
+                $ApiKey = $Settings.env.ANTHROPIC_AUTH_TOKEN
+                if ($ApiKey -and $ApiKey -notmatch "YOUR_.*_API_KEY_HERE" -and $ApiKey -notmatch "sk-test.*") {
+                    $ReadyProfiles += $profile
+                    $DelegationConfigured = $true
+                }
+            } catch { }
         }
     }
 
-    # Config
-    if ($UseColors) {
-        Write-Host "  Config: " -ForegroundColor Cyan -NoNewline
-        Write-Host $ConfigFile
+    if ($DelegationConfigured) {
+        Write-TableLine "Delegation:" "Enabled"
     } else {
-        Write-Host "  Config: $ConfigFile"
+        Write-TableLine "Delegation:" "Not configured"
     }
 
     Write-Host ""
 
+    # Ready Profiles section - make it more prominent
+    if ($ReadyProfiles.Count -gt 0) {
+        if ($UseColors) { Write-Host "Delegation Ready:" -ForegroundColor Cyan }
+        else { Write-Host "Delegation Ready:" }
+
+        $ReadyProfilesStr = $ReadyProfiles -join ", "
+        if ($UseColors) {
+            Write-Host "  ✓ " -ForegroundColor Yellow -NoNewline
+            Write-Host "$ReadyProfilesStr profiles are ready for delegation"
+        } else {
+            Write-Host "  ! $ReadyProfilesStr profiles are ready for delegation"
+        }
+        Write-Host ""
+    } elseif ($DelegationConfigured) {
+        if ($UseColors) { Write-Host "Delegation Ready:" -ForegroundColor Cyan }
+        else { Write-Host "Delegation Ready:" }
+
+        if ($UseColors) {
+            Write-Host "  ! " -ForegroundColor Yellow -NoNewline
+            Write-Host "Delegation configured but no valid API keys found"
+        } else {
+            Write-Host "  ! Delegation configured but no valid API keys found"
+        }
+        Write-Host ""
+    }
+
     # Documentation
     if ($UseColors) {
         Write-Host "Documentation: https://github.com/kaitranntt/ccs" -ForegroundColor Cyan
@@ -849,11 +937,105 @@ function Get-ProfileType {
     }
 }
 
+# --- Sync Command ---
+
+function Sync-Run {
+    $CcsClaudeDir = "$env:USERPROFILE\.ccs\.claude"
+    $UserClaudeDir = "$env:USERPROFILE\.claude"
+
+    Write-Host "Syncing delegation commands and skills to ~/.claude/..." -ForegroundColor Cyan
+    Write-Host ""
+
+    # Check if source directory exists
+    if (-not (Test-Path $CcsClaudeDir)) {
+        Write-Host "[X] CCS .claude/ directory not found at $CcsClaudeDir" -ForegroundColor Red
+        Write-Host "Reinstall CCS: npm install -g @kaitranntt/ccs --force"
+        exit 1
+    }
+
+    # Create ~/.claude/ if missing
+    if (-not (Test-Path $UserClaudeDir)) {
+        Write-Host "[i] Creating ~/.claude/ directory" -ForegroundColor Cyan
+        New-Item -ItemType Directory -Path $UserClaudeDir -Force | Out-Null
+    }
+
+    # Items to symlink
+    $Items = @(
+        @{ Source = "commands\ccs"; Target = "commands\ccs"; Type = "Directory" }
+        @{ Source = "skills\ccs-delegation"; Target = "skills\ccs-delegation"; Type = "Directory" }
+        @{ Source = "agents\ccs-delegator.md"; Target = "agents\ccs-delegator.md"; Type = "File" }
+    )
+
+    $Installed = 0
+    $Skipped = 0
+
+    foreach ($Item in $Items) {
+        $SourcePath = Join-Path $CcsClaudeDir $Item.Source
+        $TargetPath = Join-Path $UserClaudeDir $Item.Target
+        $TargetDir = Split-Path -Parent $TargetPath
+
+        # Check source exists
+        if (-not (Test-Path $SourcePath)) {
+            Write-Host "[!] Source not found: $($Item.Source), skipping" -ForegroundColor Yellow
+            continue
+        }
+
+        # Create parent directory if needed
+        if (-not (Test-Path $TargetDir)) {
+            New-Item -ItemType Directory -Path $TargetDir -Force | Out-Null
+        }
+
+        # Check if already correct symlink
+        if (Test-Path $TargetPath) {
+            $ItemInfo = Get-Item $TargetPath -Force
+            if ($ItemInfo.LinkType -eq "SymbolicLink") {
+                $LinkTarget = $ItemInfo.Target
+                if ($LinkTarget -eq $SourcePath) {
+                    $Skipped++
+                    continue
+                }
+            }
+
+            # Backup existing file/directory
+            $Timestamp = Get-Date -Format "yyyy-MM-dd"
+            $BackupPath = "$TargetPath.backup-$Timestamp"
+            $Counter = 1
+
+            while (Test-Path $BackupPath) {
+                $BackupPath = "$TargetPath.backup-$Timestamp-$Counter"
+                $Counter++
+            }
+
+            Move-Item -Path $TargetPath -Destination $BackupPath -Force
+            Write-Host "[i] Backed up existing to $(Split-Path -Leaf $BackupPath)" -ForegroundColor Cyan
+        }
+
+        # Create symlink
+        try {
+            $SymlinkType = if ($Item.Type -eq "Directory") { "Junction" } else { "SymbolicLink" }
+            New-Item -ItemType $SymlinkType -Path $TargetPath -Target $SourcePath -Force -ErrorAction Stop | Out-Null
+            Write-Host "[OK] Installed $($Item.Target)" -ForegroundColor Green
+            $Installed++
+        } catch {
+            Write-Host "[X] Failed to install $($Item.Target): $($_.Exception.Message)" -ForegroundColor Red
+            if ($_.Exception.Message -match "privilege") {
+                Write-Host "[i] Run PowerShell as Administrator or enable Developer Mode" -ForegroundColor Yellow
+            }
+        }
+    }
+
+    Write-Host ""
+    Write-Host "✓ Update complete" -ForegroundColor Green
+    Write-Host "  Installed: $Installed"
+    Write-Host "  Already up-to-date: $Skipped"
+    Write-Host ""
+}
+
 # --- Auth Commands (Phase 3) ---
 
 function Show-AuthHelp {
     Write-Host ""
-    Write-Host "CCS Account Management" -ForegroundColor White
+    Write-Host "CCS Concurrent Account Management" -ForegroundColor White
     Write-Host ""
     Write-Host "Usage:" -ForegroundColor Cyan
     Write-Host "  ccs auth <command> [options]" -ForegroundColor Yellow
@@ -1318,7 +1500,7 @@ if ($Help) {
 }
 
 # Special case: shell completion installer
-if ($RemainingArgs.Count -gt 0 -and $RemainingArgs[0] -eq "--shell-completion") {
+if ($RemainingArgs.Count -gt 0 -and ($RemainingArgs[0] -eq "--shell-completion" -or $RemainingArgs[0] -eq "-sc")) {
     $CompletionArgs = if ($RemainingArgs.Count -gt 1) { $RemainingArgs[1..($RemainingArgs.Count-1)] } else { @() }
     $Result = Install-ShellCompletion $CompletionArgs
     exit $Result
@@ -1331,6 +1513,12 @@ if ($RemainingArgs.Count -gt 0 -and $RemainingArgs[0] -eq "auth") {
     exit $LASTEXITCODE
 }
 
+# Special case: sync command
+if ($RemainingArgs.Count -gt 0 -and ($RemainingArgs[0] -eq "sync" -or $RemainingArgs[0] -eq "--sync")) {
+    Sync-Run
+    exit 0
+}
+
 # Run auto-recovery before main logic
 if (-not (Invoke-AutoRecovery)) {
     Write-ErrorMsg "Auto-recovery failed. Check permissions."

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaitranntt/ccs",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6",
   "keywords": [
     "cli",

package/scripts/completion/ccs.bash

@@ -18,8 +18,8 @@ _ccs_completion() {
 
   # Top-level completion (first argument)
   if [[ ${COMP_CWORD} -eq 1 ]]; then
-    local commands="auth doctor"
-    local flags="--help --version -h -v"
+    local commands="auth doctor sync"
+    local flags="--help --version --shell-completion -h -v -sc"
     local profiles=""
 
     # Add profiles from config.json (settings-based profiles)
@@ -74,6 +74,12 @@ _ccs_completion() {
     return 0
   fi
 
+  # Flags for shell-completion command
+  if [[ ${prev} == "--shell-completion" ]]; then
+    COMPREPLY=( $(compgen -W "--bash --zsh --fish --powershell" -- ${cur}) )
+    return 0
+  fi
+
   return 0
 }
 

package/scripts/completion/ccs.fish

@@ -9,22 +9,41 @@
 #   Fish will automatically load completions from this directory.
 #   No need to source or reload - completions are loaded on demand.
 
-# Helper function to get profiles
-function __fish_ccs_get_profiles
+# Helper function to get settings profiles
+function __fish_ccs_get_settings_profiles
     set -l config_path ~/.ccs/config.json
-    set -l profiles_path ~/.ccs/profiles.json
 
     # Get settings-based profiles from config.json
     if test -f $config_path
         jq -r '.profiles | keys[]' $config_path 2>/dev/null
     end
+end
 
-    # Get account-based profiles from profiles.json
-    if test -f $profiles_path
-        jq -r '.profiles | keys[]' $profiles_path 2>/dev/null
+# Helper function to get custom/unknown settings profiles
+# (profiles not in the hardcoded known list)
+function __fish_ccs_get_custom_settings_profiles
+    set -l config_path ~/.ccs/config.json
+    set -l known_profiles default glm glmt kimi
+
+    # Get all settings profiles
+    if test -f $config_path
+        set -l all_profiles (jq -r '.profiles | keys[]' $config_path 2>/dev/null)
+
+        # Filter out known profiles
+        for profile in $all_profiles
+            if not contains $profile $known_profiles
+                echo $profile
+            end
+        end
     end
 end
 
+# Helper function to get profiles with all types
+function __fish_ccs_get_profiles
+    __fish_ccs_get_settings_profiles
+    __fish_ccs_get_account_profiles
+end
+
 # Helper function to get account profiles only
 function __fish_ccs_get_account_profiles
     set -l profiles_path ~/.ccs/profiles.json
@@ -51,13 +70,30 @@ complete -c ccs -f
 # Top-level flags
 complete -c ccs -s h -l help -d 'Show help message'
 complete -c ccs -s v -l version -d 'Show version information'
-
-# Top-level commands
-complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor' -a 'auth' -d 'Manage multiple Claude accounts'
-complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor' -a 'doctor' -d 'Run health check and diagnostics'
-
-# Top-level profile completion (all profiles)
-complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor' -a '(__fish_ccs_get_profiles)' -d 'Switch to profile'
+complete -c ccs -s sc -l shell-completion -d 'Install shell completion'
+
+# Top-level commands (blue color for commands)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a 'auth' -d (set_color blue)'Manage multiple Claude accounts'(set_color normal)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a 'doctor' -d (set_color blue)'Run health check and diagnostics'(set_color normal)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a 'sync' -d (set_color blue)'Sync delegation commands and skills'(set_color normal)
+
+# Top-level known settings profiles (green color for model profiles)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a 'default' -d (set_color green)'Default Claude Sonnet 4.5'(set_color normal)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a 'glm' -d (set_color green)'GLM-4.6 (cost-optimized)'(set_color normal)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a 'glmt' -d (set_color green)'GLM-4.6 with thinking mode'(set_color normal)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a 'kimi' -d (set_color green)'Kimi for Coding (long-context)'(set_color normal)
+
+# Top-level custom settings profiles (dynamic, with generic description in green)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a '(__fish_ccs_get_custom_settings_profiles)' -d (set_color green)'Settings-based profile'(set_color normal)
+
+# Top-level account profiles (dynamic, yellow color for account profiles)
+complete -c ccs -n 'not __fish_seen_subcommand_from auth doctor sync' -a '(__fish_ccs_get_account_profiles)' -d (set_color yellow)'Account profile'(set_color normal)
+
+# shell-completion subflags
+complete -c ccs -n '__fish_seen_argument -l shell-completion; or __fish_seen_argument -s sc' -l bash -d 'Install for bash'
+complete -c ccs -n '__fish_seen_argument -l shell-completion; or __fish_seen_argument -s sc' -l zsh -d 'Install for zsh'
+complete -c ccs -n '__fish_seen_argument -l shell-completion; or __fish_seen_argument -s sc' -l fish -d 'Install for fish'
+complete -c ccs -n '__fish_seen_argument -l shell-completion; or __fish_seen_argument -s sc' -l powershell -d 'Install for PowerShell'
 
 # auth subcommands
 complete -c ccs -n '__fish_ccs_using_auth; and not __fish_seen_subcommand_from create list show remove default' -a 'create' -d 'Create new profile and login'

package/scripts/completion/ccs.ps1

@@ -12,8 +12,9 @@
 Register-ArgumentCompleter -CommandName ccs -ScriptBlock {
     param($commandName, $wordToComplete, $commandAst, $fakeBoundParameters)
 
-    $commands = @('auth', 'doctor', '--help', '--version', '-h', '-v')
+    $commands = @('auth', 'doctor', 'sync', '--help', '--version', '--shell-completion', '-h', '-v', '-sc')
     $authCommands = @('create', 'list', 'show', 'remove', 'default', '--help', '-h')
+    $shellCompletionFlags = @('--bash', '--zsh', '--fish', '--powershell')
     $listFlags = @('--verbose', '--json')
     $removeFlags = @('--yes', '-y')
     $showFlags = @('--json')
@@ -67,6 +68,21 @@ Register-ArgumentCompleter -CommandName ccs -ScriptBlock {
         return
     }
 
+    # shell-completion flag completion
+    if ($words[1] -eq '--shell-completion' -or $words[1] -eq '-sc') {
+        if ($position -eq 3) {
+            $shellCompletionFlags | Where-Object { $_ -like "$wordToComplete*" } | ForEach-Object {
+                [System.Management.Automation.CompletionResult]::new(
+                    $_,
+                    $_,
+                    'ParameterValue',
+                    $_
+                )
+            }
+        }
+        return
+    }
+
     # auth subcommand completion
     if ($words[1] -eq 'auth') {
         if ($position -eq 3) {

package/scripts/completion/ccs.zsh

@@ -12,41 +12,76 @@
 #   Or install system-wide:
 #     sudo cp scripts/completion/ccs.zsh /usr/local/share/zsh/site-functions/_ccs
 
+# Set up completion styles for better formatting and colors
+# Color codes: 0;34=blue, 0;32=green, 0;33=yellow, 2;37=dim white
+# Pattern format: =(#b)(group1)(group2)==color_for_group1=color_for_group2
+# The leading '=' means no color for whole match, then each '=' assigns to each group
+zstyle ':completion:*:*:ccs:*:commands' list-colors '=(#b)(auth|doctor|sync)([[:space:]]#--[[:space:]]#*)==0\;34=2\;37'
+zstyle ':completion:*:*:ccs:*:model-profiles' list-colors '=(#b)(default|glm|glmt|kimi|[^[:space:]]##)([[:space:]]#--[[:space:]]#*)==0\;32=2\;37'
+zstyle ':completion:*:*:ccs:*:account-profiles' list-colors '=(#b)([^[:space:]]##)([[:space:]]#--[[:space:]]#*)==0\;33=2\;37'
+zstyle ':completion:*:*:ccs:*' group-name ''
+zstyle ':completion:*:*:ccs:*:descriptions' format $'\n%B%F{yellow}── %d ──%f%b'
+zstyle ':completion:*:*:ccs:*' list-separator '  --  '
+zstyle ':completion:*:*:ccs:*' list-rows-first true
+zstyle ':completion:*:*:ccs:*' menu select
+
 _ccs() {
-  local -a commands profiles settings_profiles account_profiles
+  local -a commands settings_profiles_described account_profiles_described
   local curcontext="$curcontext" state line
   typeset -A opt_args
 
-  # Define top-level commands
+  # Define top-level commands (padded for alignment)
   commands=(
     'auth:Manage multiple Claude accounts'
     'doctor:Run health check and diagnostics'
+    'sync:Sync delegation commands and skills'
+  )
+
+  # Define known settings profiles with descriptions (consistent padding)
+  local -A profile_descriptions
+  profile_descriptions=(
+    'default' 'Default Claude Sonnet 4.5'
+    'glm'     'GLM-4.6 (cost-optimized)'
+    'glmt'    'GLM-4.6 with thinking mode'
+    'kimi'    'Kimi for Coding (long-context)'
   )
 
   # Load settings-based profiles from config.json
   if [[ -f ~/.ccs/config.json ]]; then
-    settings_profiles=(${(f)"$(jq -r '.profiles | keys[]' ~/.ccs/config.json 2>/dev/null)"})
+    local -a raw_settings_profiles
+    raw_settings_profiles=(${(f)"$(jq -r '.profiles | keys[]' ~/.ccs/config.json 2>/dev/null)"})
+
+    # Add descriptions to settings profiles
+    for profile in $raw_settings_profiles; do
+      local desc="${profile_descriptions[$profile]:-Settings-based profile}"
+      settings_profiles_described+=("${profile}:${desc}")
+    done
   fi
 
   # Load account-based profiles from profiles.json
   if [[ -f ~/.ccs/profiles.json ]]; then
-    account_profiles=(${(f)"$(jq -r '.profiles | keys[]' ~/.ccs/profiles.json 2>/dev/null)"})
-  fi
+    local -a raw_account_profiles
+    raw_account_profiles=(${(f)"$(jq -r '.profiles | keys[]' ~/.ccs/profiles.json 2>/dev/null)"})
 
-  # Combine all profiles
-  profiles=($settings_profiles $account_profiles)
+    # Add descriptions to account profiles
+    for profile in $raw_account_profiles; do
+      account_profiles_described+=("${profile}:Account-based profile")
+    done
+  fi
 
   _arguments -C \
     '(- *)'{-h,--help}'[Show help message]' \
     '(- *)'{-v,--version}'[Show version information]' \
+    '(- *)'{-sc,--shell-completion}'[Install shell completion]' \
     '1: :->command' \
     '*:: :->args'
 
   case $state in
     command)
-      local -a all_options
-      all_options=($commands $profiles)
-      _describe -t commands 'ccs commands' all_options
+      # Describe commands and profiles with proper tagging for colors
+      _describe -t commands 'commands' commands
+      _describe -t model-profiles 'model profiles' settings_profiles_described
+      _describe -t account-profiles 'account profiles' account_profiles_described
       ;;
 
     args)
@@ -58,6 +93,13 @@ _ccs() {
           _arguments \
             '(- *)'{-h,--help}'[Show help for doctor command]'
           ;;
+        --shell-completion)
+          _arguments \
+            '--bash[Install for bash]' \
+            '--zsh[Install for zsh]' \
+            '--fish[Install for fish]' \
+            '--powershell[Install for PowerShell]'
+          ;;
         *)
           # For profile names, complete with Claude CLI arguments
           _message 'Claude CLI arguments'