claude-cac 1.4.3 → 1.4.4-beta.2

package/README.md

@@ -15,6 +15,7 @@
 [![npm version](https://img.shields.io/npm/v/claude-cac.svg)](https://www.npmjs.com/package/claude-cac)
 [![GitHub stars](https://img.shields.io/github/stars/nmhjklnm/cac?style=social)](https://github.com/nmhjklnm/cac)
 [![Docs](https://img.shields.io/badge/Docs-cac.nextmind.space-D97706.svg)](https://cac.nextmind.space/docs)
+[![Telegram](https://img.shields.io/badge/Telegram-Community-2CA5E0?logo=telegram)](https://t.me/claudecodecloak)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)
 [![Platform](https://img.shields.io/badge/Platform-macOS%20%7C%20Linux%20%7C%20Windows-lightgrey.svg)]()
 

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.4.3"
+CAC_VERSION="1.4.4-beta.2"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -52,12 +52,12 @@ _gen_uuid() {
     elif [[ -f /proc/sys/kernel/random/uuid ]]; then
         cat /proc/sys/kernel/random/uuid
     else
-        python3 -c "import uuid; print(uuid.uuid4())"
+        python3 -c "import uuid; print(uuid.uuid4())" || _die "python3 required for UUID generation (install python3 or uuidgen)"
     fi
 }
 _new_uuid()    { _gen_uuid | tr '[:lower:]' '[:upper:]'; }
 _new_sid()     { _gen_uuid | tr '[:upper:]' '[:lower:]'; }
-_new_user_id() { python3 -c "import os; print(os.urandom(32).hex())"; }
+_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() { echo "host-$(_gen_uuid | cut -d- -f1 | tr '[:upper:]' '[:lower:]')"; }
 _new_mac() { printf '02:%02x:%02x:%02x:%02x:%02x' $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256)) $((RANDOM%256)); }
@@ -921,9 +921,9 @@ _check_mtls() {
     if openssl verify -CAfile "$ca_cert" "$client_cert" >/dev/null 2>&1; then
         # check certificate expiry
         local expiry
-        expiry=$(openssl x509 -in "$client_cert" -noout -enddate 2>/dev/null | cut -d= -f2)
+        expiry=$(openssl x509 -in "$client_cert" -noout -enddate 2>/dev/null | cut -d= -f2 || true)
         local cn
-        cn=$(openssl x509 -in "$client_cert" -noout -subject 2>/dev/null | sed 's/.*CN *= *//')
+        cn=$(openssl x509 -in "$client_cert" -noout -subject 2>/dev/null | sed 's/.*CN *= *//' || true)
         echo "$(_green "✓") mTLS certificate valid (CN=$cn, expires: $expiry)"
         return 0
     else
@@ -1280,21 +1280,38 @@ fi
 [[ -x "$_real" ]] || { echo "[cac] error: claude not found, run 'cac claude install latest'" >&2; exit 1; }
 
 # ── Relay local forwarding (always enabled when proxy is set) ──
+# Relay lifecycle: ENVIRONMENT-level, not session-level.
+# - Started on demand by the first session that needs it
+# - Persists across sessions (no cleanup on exit)
+# - Restarted if proxy changes (relay.proxy mismatch)
+# - Stopped by: cac env activate (switch), cac self delete, or machine reboot
 _relay_active=false
 if [[ -n "$PROXY" ]] && [[ -f "$CAC_DIR/relay.js" ]]; then
     _relay_js="$CAC_DIR/relay.js"
     _relay_pid_file="$CAC_DIR/relay.pid"
     _relay_port_file="$CAC_DIR/relay.port"
+    _relay_proxy_file="$CAC_DIR/relay.proxy"
 
     # check if relay is already running
     _relay_running=false
     if [[ -f "$_relay_pid_file" ]]; then
         _rpid=$(tr -d '[:space:]' < "$_relay_pid_file")
-        kill -0 "$_rpid" 2>/dev/null && _relay_running=true
+        [[ -n "$_rpid" ]] && kill -0 "$_rpid" 2>/dev/null && _relay_running=true
+    fi
+
+    # kill stale relay if proxy changed (env switch without going through cac activate)
+    # skip if relay.proxy absent (first run after upgrade — assume match)
+    if [[ "$_relay_running" == "true" ]] && [[ -f "$_relay_proxy_file" ]]; then
+        _old_proxy=$(tr -d '[:space:]' < "$_relay_proxy_file")
+        if [[ "$_old_proxy" != "$PROXY" ]]; then
+            kill "$_rpid" 2>/dev/null || true
+            rm -f "$_relay_pid_file" "$_relay_port_file" "$_relay_proxy_file"
+            _relay_running=false
+        fi
     fi
 
     # start if not running
-    if [[ "$_relay_running" != "true" ]] && [[ -f "$_relay_js" ]]; then
+    if [[ "$_relay_running" != "true" ]]; then
         _rport=17890
         while (echo >/dev/tcp/127.0.0.1/$_rport) 2>/dev/null; do
             (( _rport++ ))
@@ -1306,6 +1323,7 @@ if [[ -n "$PROXY" ]] && [[ -f "$CAC_DIR/relay.js" ]]; then
             (echo >/dev/tcp/127.0.0.1/$_rport) 2>/dev/null && break
             sleep 0.1
         done
+        echo "$PROXY" > "$_relay_proxy_file"
         echo "$_rport" > "$_relay_port_file"
     fi
 
@@ -1319,40 +1337,6 @@ if [[ -n "$PROXY" ]] && [[ -f "$CAC_DIR/relay.js" ]]; then
     fi
 fi
 
-# cleanup function
-_cleanup_all() {
-    # stop watchdog
-    [[ -n "${_watchdog_pid:-}" ]] && kill "$_watchdog_pid" 2>/dev/null || true
-    # cleanup relay
-    if [[ "$_relay_active" == "true" ]] && [[ -f "$CAC_DIR/relay.pid" ]]; then
-        local _p; _p=$(cat "$CAC_DIR/relay.pid" 2>/dev/null) || true
-        [[ -n "$_p" ]] && kill "$_p" 2>/dev/null || true
-        rm -f "$CAC_DIR/relay.pid" "$CAC_DIR/relay.port"
-    fi
-}
-
-trap _cleanup_all EXIT INT TERM
-
-# ── Relay watchdog: auto-restart relay if it crashes ──
-if [[ "$_relay_active" == "true" ]]; then
-    (while true; do
-        sleep 10
-        [[ -f "$_relay_pid_file" ]] || break  # pid file gone = intentional shutdown
-        _wpid=$(tr -d '[:space:]' < "$_relay_pid_file" 2>/dev/null) || break
-        if ! kill -0 "$_wpid" 2>/dev/null; then
-            echo "[cac] relay crashed, restarting..." >&2
-            node "$_relay_js" "$_rport" "$PROXY" "$_relay_pid_file" </dev/null >>"$CAC_DIR/relay.log" 2>&1 &
-            disown
-            for _wi in {1..30}; do
-                (echo >/dev/tcp/127.0.0.1/$_rport) 2>/dev/null && break
-                sleep 0.1
-            done
-        fi
-    done) &
-    _watchdog_pid=$!
-    disown
-fi
-
 # ── Concurrent session check ──
 _max_sessions=10
 [[ -f "$CAC_DIR/max_sessions" ]] && _ms=$(tr -d '[:space:]' < "$CAC_DIR/max_sessions") && [[ -n "$_ms" ]] && _max_sessions="$_ms"
@@ -1370,7 +1354,6 @@ set +e
 "$_real" "$@"
 _ec=$?
 set -e
-_cleanup_all
 exit "$_ec"
 WRAPPER_EOF
     local _tmp="$CAC_DIR/bin/claude.tmp"
@@ -1497,7 +1480,7 @@ _ensure_initialized() {
     if [[ -n "$_cac_bin" ]] && [[ -L "$_cac_bin" ]]; then
         local _link; _link="$(readlink "$_cac_bin")"
         [[ "$_link" != /* ]] && _link="$(dirname "$_cac_bin")/$_link"
-        _self_dir="$(cd "$(dirname "$_link")" && pwd)"
+        _self_dir="$(cd "$(dirname "$_link")" 2>/dev/null && pwd)" || _self_dir=""
     fi
     # Fallback: directory of the running script
     if [[ -z "$_self_dir" ]] || [[ ! -f "$_self_dir/relay.js" ]]; then
@@ -1594,7 +1577,7 @@ _env_cmd_create() {
         if [[ ! "$proxy" =~ ^(http|https|socks5):// ]]; then
             printf "  $(_dim "Detecting proxy protocol ...") "
             if proxy_url=$(_auto_detect_proxy "$proxy"); then
-                echo "$(_cyan "$(echo "$proxy_url" | grep -oE '^[a-z]+')")"
+                echo "$(_cyan "$(echo "$proxy_url" | grep -oE '^[a-z]+' || echo "http")")"
             else
                 echo "$(_yellow "failed, defaulting to http")"
             fi
@@ -1900,7 +1883,7 @@ _env_cmd_set() {
                 if [[ ! "$value" =~ ^(http|https|socks5):// ]]; then
                     printf "  $(_dim "Detecting proxy protocol ...") "
                     if proxy_url=$(_auto_detect_proxy "$value"); then
-                        echo "$(_cyan "$(echo "$proxy_url" | grep -oE '^[a-z]+')")"
+                        echo "$(_cyan "$(echo "$proxy_url" | grep -oE '^[a-z]+' || echo "http")")"
                     else
                         echo "$(_yellow "failed, defaulting to http")"
                     fi
@@ -1997,6 +1980,7 @@ _relay_start() {
         return 1
     fi
 
+    echo "$proxy" > "$CAC_DIR/relay.proxy"
     echo "$port" > "$CAC_DIR/relay.port"
     return 0
 }
@@ -2006,7 +1990,7 @@ _relay_stop() {
     if [[ -f "$pid_file" ]]; then
         local pid; pid=$(tr -d '[:space:]' < "$pid_file")
         if [[ -n "$pid" ]] && kill -0 "$pid" 2>/dev/null; then
-            kill "$pid" 2>/dev/null
+            kill "$pid" 2>/dev/null || true
             # wait for process exit
             local _i
             for _i in {1..20}; do
@@ -2016,7 +2000,7 @@ _relay_stop() {
         fi
         rm -f "$pid_file"
     fi
-    rm -f "$CAC_DIR/relay.port"
+    rm -f "$CAC_DIR/relay.port" "$CAC_DIR/relay.proxy"
 
     # cleanup route
     _relay_remove_route 2>/dev/null || true
@@ -2305,7 +2289,7 @@ cmd_check() {
 
     # ── concurrent sessions ──
     local _claude_count
-    _claude_count=$(pgrep -x "claude" 2>/dev/null | wc -l | tr -d '[:space:]')
+    _claude_count=$(pgrep -x "claude" 2>/dev/null | wc -l | tr -d '[:space:]') || _claude_count=0
     local _max_sessions; _max_sessions=$(_cac_setting max_sessions 10)
     if [[ "$_claude_count" -gt "$_max_sessions" ]]; then
         echo "    $(_yellow "⚠") sessions  $_claude_count running (threshold: $_max_sessions)"
@@ -2397,7 +2381,7 @@ cmd_check() {
 
     # ── summary ──
     echo
-    if [[ ${#problems[@]} -eq 0 ]]; then
+    if [[ ${#problems[@]:-0} -eq 0 ]]; then
         echo "  $(_green "✓") all good"
     else
         for p in "${problems[@]}"; do
@@ -2786,7 +2770,8 @@ _dk_detect_network() {
     return 1
   fi
 
-  addr=$(ip -4 addr show "$iface" | awk '/inet /{print $2; exit}')
+  addr=$(ip -4 addr show "$iface" 2>/dev/null | awk '/inet /{print $2; exit}') || addr=""
+  [[ -z "$addr" ]] && { echo "error: cannot get address for $iface" >&2; return 1; }
   ip="${addr%/*}"
   prefix="${addr#*/}"
 

package/package.json

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

package/scripts/postinstall.js

@@ -42,6 +42,12 @@ if (home && fs.existsSync(wrapperPath)) {
     if (patched.indexOf(buggyPgrep) !== -1 && patched.indexOf(fixedPgrep) === -1) {
       patched = patched.replace(buggyPgrep, fixedPgrep);
     }
+    // Fix: session exit killed the shared relay, breaking all other sessions.
+    // Remove the trap so _cleanup_all never fires on exit.
+    var buggyTrap = 'trap _cleanup_all EXIT INT TERM';
+    if (patched.indexOf(buggyTrap) !== -1) {
+      patched = patched.replace(buggyTrap, '');
+    }
     if (patched !== wrapperContent) {
       fs.writeFileSync(wrapperPath, patched);
     }