claude-cac 1.4.2 → 1.4.4-beta.1

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.2"
+CAC_VERSION="1.4.4-beta.1"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -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"
@@ -1750,6 +1733,7 @@ MERGE_EOF
 }
 
 _env_cmd_ls() {
+    _require_setup
     if [[ ! -d "$ENVS_DIR" ]] || [[ -z "$(ls -A "$ENVS_DIR" 2>/dev/null)" ]]; then
         echo "$(_dim "  No environments yet.")"
         echo "  Run $(_green "cac env create <name>") to get started."
@@ -1996,6 +1980,7 @@ _relay_start() {
         return 1
     fi
 
+    echo "$proxy" > "$CAC_DIR/relay.proxy"
     echo "$port" > "$CAC_DIR/relay.port"
     return 0
 }
@@ -2015,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

package/package.json

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

package/scripts/postinstall.js

@@ -27,6 +27,50 @@ try {
   // Non-fatal — _ensure_initialized will catch it on first cac command
 }
 
+// Patch existing wrapper for known bugs — pure Node.js, no shell execution needed.
+// Users who upgrade via npm install keep their old ~/.cac/bin/claude until _ensure_initialized
+// runs (triggered by any cac command). This patch fixes critical bugs immediately.
+var wrapperPath = path.join(cacDir, 'bin', 'claude');
+if (home && fs.existsSync(wrapperPath)) {
+  try {
+    var wrapperContent = fs.readFileSync(wrapperPath, 'utf8');
+    var patched = wrapperContent;
+    // Fix: pgrep returns exit 1 when no claude process exists; under set -euo pipefail
+    // this aborts the wrapper before launching claude (claude appears to do nothing).
+    var buggyPgrep = '_claude_count=$(pgrep -x "claude" 2>/dev/null | wc -l | tr -d \'[:space:]\')';
+    var fixedPgrep = buggyPgrep + ' || _claude_count=0';
+    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);
+    }
+  } catch (e) {
+    // Non-fatal
+  }
+}
+
+// Trigger _ensure_initialized to fully regenerate wrapper to current version.
+// cac env ls now calls _require_setup (fixed in 1.4.3+).
+if (home) {
+  try {
+    var spawnSync = require('child_process').spawnSync;
+    spawnSync(cacBin, ['env', 'ls'], {
+      stdio: 'ignore',
+      timeout: 8000,
+      env: Object.assign({}, process.env, { HOME: home })
+    });
+  } catch (e) {
+    // Non-fatal
+  }
+}
+
 console.log([
   '',
   '  claude-cac installed successfully',