claude-cac 1.5.4 → 1.5.6

package/cac

@@ -11,7 +11,7 @@ VERSIONS_DIR="$CAC_DIR/versions"
 # ── utils: colors, read/write, UUID, proxy parsing ───────────────────────
 
 # shellcheck disable=SC2034  # used in build-concatenated cac script
-CAC_VERSION="1.5.4"
+CAC_VERSION="1.5.6"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -58,6 +58,19 @@ _gen_uuid() {
 _new_uuid()    { _gen_uuid | tr '[:lower:]' '[:upper:]'; }
 _new_user_id() { python3 -c "import os; print(os.urandom(32).hex())" || _die "python3 required"; }
 _new_machine_id() { _gen_uuid | tr -d '-' | tr '[:upper:]' '[:lower:]'; }
+_new_hostname_suffix() { _gen_uuid | tr -d '-' | tr '[:lower:]' '[:upper:]' | cut -c1-5; }
+_detect_hostname_platform() {
+    local os; os=$(_detect_os)
+    if [[ "$os" == "linux" ]]; then
+        if [[ -n "${WSL_DISTRO_NAME:-}" ]] || [[ -n "${WSL_INTEROP:-}" ]] || \
+           grep -qi microsoft /proc/sys/kernel/osrelease 2>/dev/null || \
+           uname -r 2>/dev/null | grep -qi microsoft; then
+            echo "windows"
+            return
+        fi
+    fi
+    echo "$os"
+}
 _new_hostname() {
     local -a _first_names=(
         "James" "John" "Robert" "Michael" "William" "David" "Richard" "Joseph"
@@ -68,10 +81,25 @@ _new_hostname() {
         "Liam" "Noah" "Oliver" "Elijah" "Lucas" "Mason" "Ethan" "Aiden"
         "Alex" "Ryan" "Tyler" "Jordan" "Taylor" "Morgan" "Casey" "Riley"
     )
-    local -a _models=("MacBook-Pro" "MacBook-Air" "MacBook-Pro" "MacBook-Pro")
     local _name="${_first_names[$((RANDOM % ${#_first_names[@]}))]}"
-    local _model="${_models[$((RANDOM % ${#_models[@]}))]}"
-    echo "${_name}s-${_model}.local"
+    local _platform; _platform=$(_detect_hostname_platform)
+    case "$_platform" in
+        macos)
+            local -a _models=("MacBook-Pro" "MacBook-Air" "MacBook-Pro" "MacBook-Pro")
+            local _model="${_models[$((RANDOM % ${#_models[@]}))]}"
+            echo "${_name}s-${_model}.local"
+            ;;
+        windows)
+            local -a _prefixes=("DESKTOP" "LAPTOP")
+            local _prefix="${_prefixes[$((RANDOM % ${#_prefixes[@]}))]}"
+            echo "${_prefix}-$(_new_hostname_suffix)"
+            ;;
+        *)
+            local -a _devices=("desktop" "laptop" "workstation" "thinkpad")
+            local _device="${_devices[$((RANDOM % ${#_devices[@]}))]}"
+            echo "$(printf '%s' "$_name" | tr '[:upper:]' '[:lower:]')-${_device}"
+            ;;
+    esac
 }
 _new_mac() { printf '02:%02x:%02x:%02x:%02x:%02x' $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256)); }
 _new_git_remote() { echo "https://github.com/user-$(_gen_uuid | cut -d- -f1)/project-$(_gen_uuid | cut -d- -f2).git"; }
@@ -86,11 +114,30 @@ _get_real_cmd() {
 }
 
 # host:port:user:pass → http://user:pass@host:port
-# or pass a full URL directly (http://, https://, socks5://)
+# socks5://host:port:user:pass → socks5://user:pass@host:port
+# or pass a standard URL directly (http://, https://, socks5://)
 _parse_proxy() {
     local raw="$1"
-    # Already a full URL, return as-is
+    local proto rest
+
+    [[ -n "$raw" ]] || return 0
+
+    # Normalize protocol-prefixed legacy form:
+    #   socks5://host:port:user:pass -> socks5://user:pass@host:port
     if [[ "$raw" =~ ^(http|https|socks5):// ]]; then
+        proto="${raw%%://*}"
+        rest="${raw#*://}"
+        if [[ "$rest" != *"@"* ]] && [[ "$rest" == *:*:* ]]; then
+            local host port user pass
+            host=$(echo "$rest" | cut -d: -f1)
+            port=$(echo "$rest" | cut -d: -f2)
+            user=$(echo "$rest" | cut -d: -f3)
+            pass=$(echo "$rest" | cut -d: -f4-)
+            if [[ -n "$host" ]] && [[ -n "$port" ]] && [[ -n "$user" ]]; then
+                echo "${proto}://${user}:${pass}@${host}:${port}"
+                return
+            fi
+        fi
         echo "$raw"
         return
     fi
@@ -107,9 +154,24 @@ _parse_proxy() {
     fi
 }
 
+# curl-based health probes should use remote DNS for SOCKS5.
+# Otherwise local DNS pollution can resolve probe domains to sinkhole/test
+# addresses, causing false negatives even when the proxy itself is healthy.
+_curl_proxy_url() {
+    local normalized
+    normalized=$(_parse_proxy "$1")
+    if [[ "$normalized" =~ ^socks5:// ]]; then
+        echo "socks5h://${normalized#socks5://}"
+    else
+        echo "$normalized"
+    fi
+}
+
 # socks5://user:pass@host:port → host:port
 _proxy_host_port() {
-    echo "$1" | sed 's|.*@||' | sed 's|.*://||'
+    local normalized
+    normalized=$(_parse_proxy "$1")
+    echo "$normalized" | sed 's|.*@||' | sed 's|.*://||'
 }
 
 _proxy_reachable() {
@@ -263,10 +325,20 @@ _envs_using_version() {
 }
 
 # Elapsed time helper: call _timer_start, then _timer_elapsed
-_timer_start() { _TIMER_START=$(date +%s%N 2>/dev/null || date +%s); }
+_time_now() {
+    local now
+    now=$(date +%s%N 2>/dev/null || true)
+    if [[ "$now" =~ ^[0-9]{11,}$ ]]; then
+        echo "$now"
+    else
+        date +%s
+    fi
+}
+
+_timer_start() { _TIMER_START=$(_time_now); }
 _timer_elapsed() {
-    local now; now=$(date +%s%N 2>/dev/null || date +%s)
-    if [[ ${#now} -gt 10 ]]; then
+    local now; now=$(_time_now)
+    if [[ "$now" =~ ^[0-9]{11,}$ && "${_TIMER_START:-}" =~ ^[0-9]{11,}$ ]]; then
         # nanoseconds available
         local ms=$(( (now - _TIMER_START) / 1000000 ))
         if [[ $ms -ge 1000 ]]; then
@@ -298,19 +370,31 @@ _detect_rc_file() {
     local shell_name
     shell_name=$(basename "${SHELL:-/bin/bash}")
     case "$shell_name" in
+        fish)
+            echo "$HOME/.config/fish/config.fish"
+            return
+            ;;
         zsh)
-            [[ -f "$HOME/.zshrc" ]] && { echo "$HOME/.zshrc"; return; }
+            echo "$HOME/.zshrc"
+            return
             ;;
         bash)
             [[ -f "$HOME/.bashrc" ]] && { echo "$HOME/.bashrc"; return; }
             [[ -f "$HOME/.bash_profile" ]] && { echo "$HOME/.bash_profile"; return; }
+            echo "$HOME/.bashrc"
+            return
             ;;
     esac
     # Fallback: try common rc files
     [[ -f "$HOME/.bashrc" ]] && { echo "$HOME/.bashrc"; return; }
     [[ -f "$HOME/.zshrc" ]] && { echo "$HOME/.zshrc"; return; }
     [[ -f "$HOME/.bash_profile" ]] && { echo "$HOME/.bash_profile"; return; }
-    echo ""
+    [[ -f "$HOME/.config/fish/config.fish" ]] && { echo "$HOME/.config/fish/config.fish"; return; }
+    echo "$HOME/.bashrc"
+}
+
+_is_fish_rc() {
+    [[ "$1" == */.config/fish/config.fish ]]
 }
 
 _install_method() {
@@ -339,16 +423,36 @@ _write_path_to_rc() {
         return 0
     fi
 
+    mkdir -p "$(dirname "$rc_file")"
+    [[ -f "$rc_file" ]] || touch "$rc_file"
+
     if grep -q '# >>> cac >>>' "$rc_file" 2>/dev/null; then
         echo "  ✓ PATH already exists in $rc_file, skipping"
         return 0
     fi
 
     # Compat: remove old format if present
-    if grep -q '\.cac/bin' "$rc_file" 2>/dev/null; then
+    if ! _is_fish_rc "$rc_file" && grep -q '\.cac/bin' "$rc_file" 2>/dev/null; then
         _remove_path_from_rc "$rc_file"
     fi
 
+    if _is_fish_rc "$rc_file"; then
+        cat >> "$rc_file" << 'CACEOF'
+
+# >>> cac — Claude Code Cloak >>>
+fish_add_path --move --path "$HOME/.cac/bin" >/dev/null 2>&1
+function cac
+    command cac $argv
+    set -l _rc $status
+    fish_add_path --move --path "$HOME/.cac/bin" >/dev/null 2>&1
+    return $_rc
+end
+# <<< cac — Claude Code Cloak <<<
+CACEOF
+        echo "  ✓ PATH written to $rc_file"
+        return 0
+    fi
+
     cat >> "$rc_file" << 'CACEOF'
 
 # >>> cac — Claude Code Cloak >>>
@@ -1144,13 +1248,26 @@ fi
 PROXY=""
 if [[ -f "$_env_dir/proxy" ]]; then
     PROXY=$(tr -d '[:space:]' < "$_env_dir/proxy")
+    if [[ "$PROXY" =~ ^(http|https|socks5):// ]]; then
+        _proto="${PROXY%%://*}"
+        _rest="${PROXY#*://}"
+        if [[ "$_rest" != *"@"* ]] && [[ "$_rest" == *:*:* ]]; then
+            _phost=$(echo "$_rest" | cut -d: -f1)
+            _pport=$(echo "$_rest" | cut -d: -f2)
+            _puser=$(echo "$_rest" | cut -d: -f3)
+            _ppass=$(echo "$_rest" | cut -d: -f4-)
+            if [[ -n "$_phost" ]] && [[ -n "$_pport" ]] && [[ -n "$_puser" ]]; then
+                PROXY="${_proto}://${_puser}:${_ppass}@${_phost}:${_pport}"
+            fi
+        fi
+    fi
 fi
 
 if [[ -n "$PROXY" ]]; then
     # pre-flight: proxy connectivity (pure bash, no fork)
     _hp="${PROXY##*@}"; _hp="${_hp##*://}"
     _host="${_hp%%:*}"
-    _port="${_hp##*:}"
+    _port=$(echo "$_hp" | cut -d: -f2)
     if ! (echo >/dev/tcp/"$_host"/"$_port") 2>/dev/null; then
         echo "[cac] error: [$_name] proxy $_hp unreachable, refusing to start." >&2
         echo "[cac] hint: run 'cac check' to diagnose, or 'cac stop' to disable temporarily" >&2
@@ -1700,7 +1817,7 @@ _env_cmd_create() {
         esac
     done
 
-    [[ -n "$name" ]] || _die "usage: cac env create <name> [-p <proxy>] [-c <version>] [--telemetry <mode>] [--persona <preset>]"
+    [[ -n "$name" ]] || _die "usage: cac env create <name> [-p <proxy>] [-c <version>] [--clone [source]] [--no-link] [--telemetry <mode>] [--persona <preset>]"
     [[ "$name" =~ ^[a-zA-Z0-9_-]+$ ]] || _die "invalid name '$name' (use alphanumeric, dash, underscore)"
 
     local env_dir="$ENVS_DIR/$name"
@@ -1733,7 +1850,7 @@ _env_cmd_create() {
     if [[ -n "$proxy_url" ]]; then
         printf "  $(_dim "Detecting timezone ...") "
         local ip_info
-        ip_info=$(curl -s --proxy "$proxy_url" --connect-timeout 8 "http://ip-api.com/json/?fields=timezone,countryCode" 2>/dev/null || true)
+        ip_info=$(curl -s --proxy "$(_curl_proxy_url "$proxy_url")" --connect-timeout 8 "http://ip-api.com/json/?fields=timezone,countryCode" 2>/dev/null || true)
         if [[ -n "$ip_info" ]]; then
             local detected_tz country_code
             read -r detected_tz country_code < <(echo "$ip_info" | python3 -c "import sys,json; d=json.load(sys.stdin); print(d.get('timezone',''), d.get('countryCode',''))" 2>/dev/null || echo "")
@@ -1891,7 +2008,7 @@ _env_cmd_ls() {
         [[ -d "$env_dir" ]] || continue
         names+=("$(basename "$env_dir")")
         versions+=("$(_read "$env_dir/version" "system")")
-        local p; p=$(_read "$env_dir/proxy" "")
+        local p; p=$(_parse_proxy "$(_read "$env_dir/proxy" "")")
         if [[ -n "$p" ]] && [[ "$p" == *"://"*"@"* ]]; then
             p=$(echo "$p" | sed 's|://[^@]*@|://***@|')
         fi
@@ -2098,8 +2215,9 @@ cmd_env() {
             echo
             echo "  $(_bold "cac env") — environment management"
             echo
-            echo "    $(_green "create") <name> [-p proxy] [-c ver] [--telemetry mode] [--persona preset]"
+            echo "    $(_green "create") <name> [-p proxy] [-c ver] [--clone [source]] [--no-link] [--telemetry mode] [--persona preset]"
             echo "                             Create isolated environment (auto-activates)"
+            echo "                             --clone inherits commands/hooks/skills/plugins; --no-link copies instead of symlink"
             echo "    $(_green "set") [name] <key> <value>        Modify environment"
             echo "                             proxy, version, telemetry, or persona"
             echo "    $(_green "ls")              List all environments"
@@ -2126,7 +2244,7 @@ cmd_env() {
 _relay_start() {
     local name="${1:-$(_current_env)}"
     local env_dir="$ENVS_DIR/$name"
-    local proxy; proxy=$(_read "$env_dir/proxy")
+    local proxy; proxy=$(_parse_proxy "$(_read "$env_dir/proxy")")
     [[ -z "$proxy" ]] && return 1
 
     local relay_js="$CAC_DIR/relay.js"
@@ -2289,7 +2407,7 @@ cmd_relay() {
 
             # --route flag: add direct route
             if [[ "$flag" == "--route" ]]; then
-                local proxy; proxy=$(_read "$env_dir/proxy")
+                local proxy; proxy=$(_parse_proxy "$(_read "$env_dir/proxy")")
                 _relay_add_route "$proxy"
             fi
 
@@ -2359,7 +2477,7 @@ cmd_check() {
     fi
 
     local env_dir="$ENVS_DIR/$current"
-    local proxy; proxy=$(_read "$env_dir/proxy" "")
+    local proxy; proxy=$(_parse_proxy "$(_read "$env_dir/proxy" "")")
 
     # Resolve version
     local ver; ver=$(_read "$env_dir/version" "")
@@ -2545,7 +2663,7 @@ cmd_check() {
             for _ip_url in $_urls; do
                 _dots="${_dots}."
                 printf "\r    · exit IP    $(_dim "detecting${_dots}")"
-                proxy_ip=$(curl --proxy "$proxy" --connect-timeout 3 --max-time 6 "$_ip_url" 2>/dev/null || true)
+                proxy_ip=$(curl --proxy "$(_curl_proxy_url "$proxy")" --connect-timeout 3 --max-time 6 "$_ip_url" 2>/dev/null || true)
                 [[ "$proxy_ip" =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]] && break
                 proxy_ip=""
             done
@@ -2556,7 +2674,7 @@ cmd_check() {
                 local env_tz; env_tz=$(_read "$env_dir/tz" "")
                 if [[ -n "$env_tz" ]] && [[ -n "$proxy_ip" ]]; then
                     local ip_tz
-                    ip_tz=$(curl -s --proxy "$proxy" --connect-timeout 5 "http://ip-api.com/json/$proxy_ip?fields=timezone" 2>/dev/null | \
+                    ip_tz=$(curl -s --proxy "$(_curl_proxy_url "$proxy")" --connect-timeout 5 "http://ip-api.com/json/$proxy_ip?fields=timezone" 2>/dev/null | \
                         python3 -c "import sys,json; print(json.load(sys.stdin).get('timezone',''))" 2>/dev/null || true)
                     if [[ -n "$ip_tz" ]] && [[ "$ip_tz" != "$env_tz" ]]; then
                         echo "    $(_yellow "⚠") TZ        mismatch: env=$env_tz, IP=$ip_tz"
@@ -2564,7 +2682,8 @@ cmd_check() {
                     fi
                 fi
             else
-                printf "\r    $(_green "✓") exit IP    $(_dim "run again to detect exit IP")\033[K\n"
+                printf "\r    $(_red "✗") exit IP    $(_dim "unable to verify via proxy")\033[K\n"
+                problems+=("exit IP undetected via proxy")
             fi
 
             # TUN conflict detection
@@ -3498,7 +3617,7 @@ cmd_help() {
     echo
 
     echo "  $(_bold "Environment")"
-    echo "    $(_green "cac env create") <name> [-p proxy] [-c ver]"
+    echo "    $(_green "cac env create") <name> [-p proxy] [-c ver] [--clone [source]] [--no-link]"
     echo "    $(_green "cac env set") [name] <key> <value>   Modify environment"
     echo "    $(_green "cac env ls")                  List all environments"
     echo "    $(_green "cac env rm") <name>           Remove an environment"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-cac",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "Isolate, protect, and manage your Claude Code — versions, environments, identity, and proxy.",
   "bin": {
     "cac": "cac"