claude-cac 1.5.0 → 1.5.1-beta.2

package/README.md

@@ -110,10 +110,10 @@ cac ls                                  # = cac env ls
 | `cac claude ls` | 列出已安装版本 |
 | `cac claude pin <ver>` | 当前环境绑定版本 |
 | **环境管理** | |
-| `cac env create <name> [-p proxy] [-c ver] [--clone]` | 创建环境（自动激活，`--clone` 继承配置） |
+| `cac env create <name> [-p proxy] [-c ver] [--clone] [--telemetry mode] [--persona preset]` | 创建环境（自动激活，`--telemetry transparent/stealth/paranoid` 控制遥测，`--persona macos-vscode/...` 用于容器） |
 | `cac env ls` | 列出环境 |
 | `cac env rm <name>` | 删除环境 |
-| `cac env set [name] <key> <value>` | 修改环境（proxy / version） |
+| `cac env set [name] <key> <value>` | 修改环境（proxy / version / telemetry / persona） |
 | `cac env check [-d]` | 验证当前环境（`-d` 显示详情） |
 | `cac <name>` | 激活环境 |
 | **自管理** | |
@@ -293,10 +293,10 @@ Each environment is fully isolated:
 | `cac claude ls` | List installed versions |
 | `cac claude pin <ver>` | Pin current env to version |
 | **Environment management** | |
-| `cac env create <name> [-p proxy] [-c ver] [--clone]` | Create environment (auto-activates, `--clone` inherits config) |
+| `cac env create <name> [-p proxy] [-c ver] [--clone] [--telemetry mode] [--persona preset]` | Create environment (auto-activates, `--telemetry transparent/stealth/paranoid` for telemetry control, `--persona macos-vscode/...` for containers) |
 | `cac env ls` | List environments |
 | `cac env rm <name>` | Remove environment |
-| `cac env set [name] <key> <value>` | Modify environment (proxy / version) |
+| `cac env set [name] <key> <value>` | Modify environment (proxy / version / telemetry / persona) |
 | `cac env check [-d]` | Verify current environment (`-d` for details) |
 | `cac <name>` | Activate environment |
 | **Self-management** | |

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.0"
+CAC_VERSION="1.5.1-beta.2"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -1389,6 +1389,45 @@ if [[ -n "$PROXY" ]] && [[ -f "$CAC_DIR/relay.js" ]]; then
         echo "$_rport" > "$_relay_port_file"
     fi
 
+    # env-level watchdog singleton: auto-restarts relay if it crashes
+    # - one watchdog per environment, shared across all sessions
+    # - exits automatically when relay is intentionally stopped (relay.proxy removed)
+    _relay_watchdog_file="$CAC_DIR/relay.watchdog.pid"
+    _wd_running=false
+    if [[ -f "$_relay_watchdog_file" ]]; then
+        _wpid=$(tr -d '[:space:]' < "$_relay_watchdog_file")
+        [[ -n "$_wpid" ]] && kill -0 "$_wpid" 2>/dev/null && _wd_running=true
+    fi
+    if [[ "$_wd_running" != "true" ]]; then
+        (
+            trap 'rm -f "$CAC_DIR/relay.watchdog.pid"' EXIT
+            set +e
+            while true; do
+                sleep 5
+                # relay.proxy removed by _relay_stop — intentional stop, exit watchdog
+                [[ -f "$CAC_DIR/relay.proxy" ]] || exit 0
+                # relay alive and port reachable — nothing to do
+                if [[ -f "$CAC_DIR/relay.pid" ]]; then
+                    _rpid=$(tr -d '[:space:]' < "$CAC_DIR/relay.pid")
+                    if kill -0 "$_rpid" 2>/dev/null; then
+                        _rport=$(tr -d '[:space:]' < "$CAC_DIR/relay.port" 2>/dev/null || true)
+                        (echo >/dev/tcp/127.0.0.1/"$_rport") 2>/dev/null && continue
+                        # process alive but port unresponsive — kill and restart
+                        kill "$_rpid" 2>/dev/null || true
+                    fi
+                fi
+                # relay dead — restart on same port with same proxy
+                _rport=$(tr -d '[:space:]' < "$CAC_DIR/relay.port" 2>/dev/null || true)
+                _rproxy=$(tr -d '[:space:]' < "$CAC_DIR/relay.proxy" 2>/dev/null || true)
+                [[ -n "$_rport" ]] && [[ -n "$_rproxy" ]] || exit 0
+                node "$CAC_DIR/relay.js" "$_rport" "$_rproxy" "$CAC_DIR/relay.pid" </dev/null >>"$CAC_DIR/relay.log" 2>&1 &
+            done
+        ) &
+        _new_wpid=$!
+        echo "$_new_wpid" > "$_relay_watchdog_file"
+        disown "$_new_wpid"
+    fi
+
     # override proxy to point to local relay
     if [[ -f "$_relay_port_file" ]]; then
         _rport=$(tr -d '[:space:]' < "$_relay_port_file")
@@ -1628,7 +1667,7 @@ _env_cmd_create() {
         esac
     done
 
-    [[ -n "$name" ]] || _die "usage: cac env create <name> [-p <proxy>] [-c <version>]"
+    [[ -n "$name" ]] || _die "usage: cac env create <name> [-p <proxy>] [-c <version>] [--telemetry <mode>] [--persona <preset>]"
     [[ "$name" =~ ^[a-zA-Z0-9_-]+$ ]] || _die "invalid name '$name' (use alphanumeric, dash, underscore)"
 
     local env_dir="$ENVS_DIR/$name"
@@ -1920,7 +1959,9 @@ _env_cmd_set() {
         echo "    $(_green "set") [name] proxy --remove                  Remove proxy"
         echo "    $(_green "set") [name] version <ver|latest>            Change Claude version"
         echo "    $(_green "set") [name] telemetry <stealth|paranoid|transparent>"
+        echo "                                                          Telemetry blocking: stealth (1p_events only), paranoid (max), transparent (none)"
         echo "    $(_green "set") [name] persona <macos-vscode|macos-cursor|macos-iterm|linux-desktop|--remove>"
+        echo "                                                          Terminal preset: inject desktop env vars, hide Docker signals (for containers)"
         echo
         echo "  $(_dim "If name is omitted, uses the current active environment.")"
         echo
@@ -2008,6 +2049,13 @@ _env_cmd_set() {
     esac
 }
 
+_env_cmd_stop() {
+    _relay_stop 2>/dev/null || true
+    touch "$CAC_DIR/stopped"
+    echo "  $(_green "✓") cac paused — claude will run without any cac injection"
+    echo "  $(_dim "resume with:") $(_green "cac <name>")"
+}
+
 cmd_env() {
     case "${1:-help}" in
         create)       _env_cmd_create "${@:2}" ;;
@@ -2015,20 +2063,22 @@ cmd_env() {
         ls|list)      _env_cmd_ls ;;
         rm|remove)    _env_cmd_rm "${@:2}" ;;
         activate)     _env_cmd_activate "${@:2}" ;;
+        stop)         _env_cmd_stop ;;
         check)        cmd_check "${@:2}" ;;
         deactivate)   echo "$(_yellow "warning:") deactivate has been removed — switch with 'cac <name>' or uninstall with 'cac self delete'" >&2 ;;
         help|-h|--help)
             echo
             echo "  $(_bold "cac env") — environment management"
             echo
-            echo "    $(_green "create") <name> [-p proxy] [-c ver] [--clone [source]] [--no-link] [--telemetry mode] [--persona preset]"
-            echo "    $(_green "set") [name] proxy <url>           Set proxy"
-            echo "    $(_green "set") [name] proxy --remove        Remove proxy"
-            echo "    $(_green "set") [name] version <ver|latest>  Change Claude version"
+            echo "    $(_green "create") <name> [-p proxy] [-c ver] [--telemetry mode] [--persona preset]"
+            echo "                             Create isolated environment (auto-activates)"
+            echo "    $(_green "set") [name] <key> <value>        Modify environment"
+            echo "                             proxy, version, telemetry, or persona"
             echo "    $(_green "ls")              List all environments"
             echo "    $(_green "rm") <name>       Remove an environment"
             echo "    $(_green "check")           Verify current environment"
-            echo "    $(_green "cac") <name>      Switch environment"
+            echo "    $(_green "stop")            Pause cac (claude runs natively, no injection)"
+            echo "    $(_green "cac") <name>      Switch environment (also resumes if stopped)"
             echo
             ;;
         *)
@@ -2102,6 +2152,15 @@ _relay_stop() {
     fi
     rm -f "$CAC_DIR/relay.port" "$CAC_DIR/relay.proxy"
 
+    # stop watchdog (relay.proxy already removed above, watchdog will self-exit within 5s;
+    # kill it immediately for clean teardown)
+    local wd_file="$CAC_DIR/relay.watchdog.pid"
+    if [[ -f "$wd_file" ]]; then
+        local wd_pid; wd_pid=$(tr -d '[:space:]' < "$wd_file")
+        [[ -n "$wd_pid" ]] && kill "$wd_pid" 2>/dev/null || true
+        rm -f "$wd_file"
+    fi
+
     # cleanup route
     _relay_remove_route 2>/dev/null || true
 }
@@ -3464,7 +3523,7 @@ case "$1" in
     add)                echo "$(_yellow "warning:") 'cac add' → 'cac env create <name> -p <proxy>'" >&2; exit 1 ;;
     setup)              echo "$(_yellow "removed:") 'cac setup' no longer exists — cac auto-initializes on first use" >&2 ;;
     check)              echo "$(_yellow "warning:") 'cac check' → 'cac env check'" >&2; cmd_check ;;
-    stop)               echo "$(_yellow "warning:") 'cac stop' has been removed — switch with 'cac <name>'" >&2 ;;
+    stop)               _env_cmd_stop ;;
     resume|-c)          echo "$(_yellow "warning:") 'cac resume' removed — use 'cac env activate <name>'" >&2; exit 1 ;;
     relay)              echo "$(_yellow "warning:") relay is now automatic (TUN auto-detected)" >&2 ;;
     delete|uninstall)   echo "$(_yellow "warning:") 'cac delete' → 'cac self delete'" >&2; cmd_delete ;;

package/package.json

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