claude-cac 1.5.0-beta.1 → 1.5.0

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-beta.1"
+CAC_VERSION="1.5.0"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -63,7 +63,7 @@ _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)); }
 _new_git_remote() { echo "https://github.com/user-$(_gen_uuid | cut -d- -f1)/project-$(_gen_uuid | cut -d- -f2).git"; }
 _new_git_email() { echo "user-$(_gen_uuid | cut -d- -f1 | tr '[:upper:]' '[:lower:]')@users.noreply.github.com"; }
-_new_device_token() { python3 -c "import os; print(os.urandom(32).hex())" || _die "python3 required"; }
+_new_device_token() { _new_user_id; }
 
 # Get real command path (bypass shim)
 _get_real_cmd() {
@@ -1232,12 +1232,10 @@ if [[ -n "$PROXY" ]]; then
 fi
 
 # ── git identity spoofing ──
-# Prevent git email leakage (Claude runs `git config --get user.email` on startup)
+# Intercept `git config --get user.email` at process level (telemetry read only)
+# Do NOT set GIT_AUTHOR_EMAIL/GIT_COMMITTER_EMAIL — those would affect real git commits
 if [[ -f "$_env_dir/git_email" ]]; then
-    _git_email=$(tr -d '[:space:]' < "$_env_dir/git_email")
-    export GIT_AUTHOR_EMAIL="$_git_email"
-    export GIT_COMMITTER_EMAIL="$_git_email"
-    export CAC_GIT_EMAIL="$_git_email"
+    export CAC_GIT_EMAIL=$(tr -d '[:space:]' < "$_env_dir/git_email")
 fi
 
 # ── repository fingerprint (rh) spoofing ──
@@ -1255,31 +1253,29 @@ fi
 # ── persona (Docker/server environment spoofing) ──
 if [[ -f "$_env_dir/persona" ]]; then
     _persona=$(tr -d '[:space:]' < "$_env_dir/persona")
+    export TERM="xterm-256color"
     case "$_persona" in
         macos-vscode)
             export TERM_PROGRAM="vscode"
             export VSCODE_GIT_ASKPASS_MAIN="/Applications/Visual Studio Code.app/Contents/Resources/app/extensions/git/dist/askpass-main.js"
             export __CFBundleIdentifier="com.microsoft.VSCode"
-            export TERM="xterm-256color"
             ;;
         macos-cursor)
             export TERM_PROGRAM="vscode"
-            export CURSOR_TRACE_ID="cursor-$(head -c 8 /dev/urandom 2>/dev/null | od -An -tx1 | tr -d ' \n')"
+            [[ -f "$_env_dir/cursor_trace_id" ]] || printf 'cursor-%s' "$(od -An -tx1 -N8 /dev/urandom | tr -d ' \n')" > "$_env_dir/cursor_trace_id"
+            export CURSOR_TRACE_ID=$(tr -d '[:space:]' < "$_env_dir/cursor_trace_id")
             export __CFBundleIdentifier="com.todesktop.230313mzl4w4u92"
-            export TERM="xterm-256color"
             ;;
         macos-iterm)
             export TERM_PROGRAM="iTerm.app"
             export __CFBundleIdentifier="com.googlecode.iterm2"
-            export TERM="xterm-256color"
-            export ITERM_SESSION_ID="w0t0p0:$(head -c 16 /dev/urandom 2>/dev/null | od -An -tx1 | tr -d ' \n')"
+            [[ -f "$_env_dir/iterm_session_id" ]] || printf 'w0t0p0:%s' "$(od -An -tx1 -N16 /dev/urandom | tr -d ' \n')" > "$_env_dir/iterm_session_id"
+            export ITERM_SESSION_ID=$(tr -d '[:space:]' < "$_env_dir/iterm_session_id")
             ;;
         linux-desktop)
             export TERM_PROGRAM="vscode"
-            export TERM="xterm-256color"
             ;;
     esac
-    # Hide Docker signals when persona is active
     export CAC_HIDE_DOCKER=1
 fi
 
@@ -2351,22 +2347,74 @@ cmd_check() {
         fi
     fi
 
-    # ── fingerprint hook runtime verification ──
+    # ── identity spoofing (consolidated) ──
+    local os; os=$(_detect_os)
+    local _id_ok=0 _id_total=0 _id_issues=()
+
+    # fingerprint hook
+    local _fp_ok=false
     if [[ -f "$CAC_DIR/fingerprint-hook.js" ]] && [[ -f "$env_dir/hostname" ]]; then
         local expected_hn; expected_hn=$(_read "$env_dir/hostname")
         local actual_hn
         actual_hn=$(NODE_OPTIONS="--require $CAC_DIR/fingerprint-hook.js" CAC_HOSTNAME="$expected_hn" \
             node -e "process.stdout.write(require('os').hostname())" 2>/dev/null || true)
+        (( _id_total++ )) || true
         if [[ "$actual_hn" == "$expected_hn" ]]; then
-            echo "    $(_green "✓") fingerprint spoofed ($(_dim "$expected_hn"))"
+            _fp_ok=true; (( _id_ok++ )) || true
         else
-            echo "    $(_red "✗") fingerprint NOT spoofed (got: $actual_hn)"
-            problems+=("fingerprint hook not working")
+            _id_issues+=("fingerprint hook not working")
+        fi
+    fi
+    # git email
+    (( _id_total++ )) || true
+    if [[ -f "$env_dir/git_email" ]]; then
+        (( _id_ok++ )) || true
+    else
+        _id_issues+=("git email not spoofed")
+    fi
+    # repo hash
+    (( _id_total++ )) || true
+    if [[ -f "$env_dir/fake_git_remote" ]]; then
+        (( _id_ok++ )) || true
+    else
+        _id_issues+=("repo hash not spoofed")
+    fi
+    # user_id consistency
+    local _uid_ok=true
+    local _env_uid; _env_uid=$(_read "$env_dir/user_id" "")
+    if [[ -n "$_env_uid" ]]; then
+        local _config_dir="${CLAUDE_CONFIG_DIR:-$ENVS_DIR/$current/.claude}"
+        local _cj="$_config_dir/.claude.json"
+        [[ -f "$_cj" ]] || _cj="$HOME/.claude.json"
+        if [[ -f "$_cj" ]]; then
+            local _actual_uid
+            _actual_uid=$(python3 -c "import json,sys; print(json.load(open(sys.argv[1])).get('userID',''))" "$_cj" 2>/dev/null || true)
+            (( _id_total++ )) || true
+            if [[ -n "$_actual_uid" ]] && [[ "$_actual_uid" != "$_env_uid" ]]; then
+                _uid_ok=false
+                _id_issues+=("user_id mismatch")
+            else
+                (( _id_ok++ )) || true
+            fi
         fi
     fi
+    # billing header
+    (( _id_total++ )) || true
+    [[ "$wrapper_content" == *"CLAUDE_CODE_ATTRIBUTION_HEADER"* ]] && { (( _id_ok++ )) || true; } || _id_issues+=("billing header exposed")
+
+    # display consolidated identity line
+    local _id_extra=""
+    [[ -f "$env_dir/persona" ]] && _id_extra=" + $(_read "$env_dir/persona")"
+    if [[ "$_id_ok" -eq "$_id_total" ]]; then
+        echo "    $(_green "✓") identity   ${_id_ok}/${_id_total} spoofed${_id_extra}"
+    else
+        echo "    $(_red "✗") identity   ${_id_ok}/${_id_total} spoofed${_id_extra}"
+        for _ii in "${_id_issues[@]}"; do
+            problems+=("$_ii")
+        done
+    fi
 
     # ── IPv6 leak detection ──
-    local os; os=$(_detect_os)
     local ipv6_leak=false
     if [[ "$os" == "macos" ]]; then
         local ipv6_addrs
@@ -2378,80 +2426,28 @@ cmd_check() {
         [[ "$ipv6_addrs" -gt 0 ]] && ipv6_leak=true
     fi
     if [[ "$ipv6_leak" == "true" ]]; then
-        echo "    $(_yellow "⚠") IPv6      global address detected (potential leak)"
+        echo "    $(_yellow "⚠") IPv6       global address detected (potential leak)"
     else
-        echo "    $(_green "✓") IPv6      no global address"
+        echo "    $(_green "✓") IPv6       no global address"
     fi
 
-    # ── residual telemetry files ──
+    # ── warnings (only shown when relevant) ──
     if [[ -d "$HOME/.claude/telemetry" ]]; then
         local tel_files
         tel_files=$(find "$HOME/.claude/telemetry" -type f 2>/dev/null | wc -l | tr -d ' ')
         if [[ "$tel_files" -gt 0 ]]; then
-            echo "    $(_yellow "⚠") residual  $tel_files telemetry files in ~/.claude/telemetry/"
-            echo "              $(_dim "hint: rm -rf ~/.claude/telemetry/")"
+            echo "    $(_yellow "⚠") residual   $tel_files telemetry files in ~/.claude/telemetry/"
         fi
     fi
-
-    # ── concurrent sessions ──
     local _claude_count
     _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)"
-    fi
-
-    # ── metadata.user_id consistency ──
-    local _env_uid; _env_uid=$(_read "$env_dir/user_id" "")
-    if [[ -n "$_env_uid" ]]; then
-        local _config_dir="${CLAUDE_CONFIG_DIR:-$ENVS_DIR/$current/.claude}"
-        local _cj="$_config_dir/.claude.json"
-        [[ -f "$_cj" ]] || _cj="$HOME/.claude.json"
-        if [[ -f "$_cj" ]]; then
-            local _actual_uid
-            _actual_uid=$(python3 -c "import json,sys; print(json.load(open(sys.argv[1])).get('userID',''))" "$_cj" 2>/dev/null || true)
-            if [[ -n "$_actual_uid" ]] && [[ "$_actual_uid" != "$_env_uid" ]]; then
-                echo "    $(_yellow "⚠") user_id   mismatch — Claude may have overwritten it"
-                echo "              $(_dim "env: ${_env_uid:0:16}... json: ${_actual_uid:0:16}...")"
-                problems+=("user_id mismatch between env file and .claude.json")
-            else
-                echo "    $(_green "✓") user_id   consistent"
-            fi
-        fi
-    fi
-
-    # ── git email spoofing ──
-    if [[ -f "$env_dir/git_email" ]]; then
-        echo "    $(_green "✓") git email  spoofed ($(_dim "$(_read "$env_dir/git_email")"))"
-    else
-        echo "    $(_yellow "⚠") git email  not spoofed (real email exposed)"
-    fi
-
-    # ── repository fingerprint (rh) ──
-    if [[ -f "$env_dir/fake_git_remote" ]]; then
-        echo "    $(_green "✓") repo hash  spoofed"
-    else
-        echo "    $(_yellow "⚠") repo hash  not spoofed (rh links activity across accounts)"
+        echo "    $(_yellow "⚠") sessions   $_claude_count running (threshold: $_max_sessions)"
     fi
-
-    # ── billing header ──
-    if [[ "$wrapper_content" == *"CLAUDE_CODE_ATTRIBUTION_HEADER"* ]]; then
-        echo "    $(_green "✓") billing    header disabled"
-    fi
-
-    # ── Keychain residual (macOS) ──
     if [[ "$os" == "macos" ]]; then
-        local _kc_found=false
-        security find-generic-password -s "claude-code-credentials" >/dev/null 2>&1 && _kc_found=true
-        if [[ "$_kc_found" == "true" ]]; then
-            echo "    $(_yellow "⚠") keychain   Trusted Device Token found in macOS Keychain"
-            echo "              $(_dim "hint: security delete-generic-password -s 'claude-code-credentials'")"
-        fi
-    fi
-
-    # ── persona ──
-    if [[ -f "$env_dir/persona" ]]; then
-        echo "    $(_green "✓") persona    $(_dim "$(_read "$env_dir/persona")")"
+        security find-generic-password -s "claude-code-credentials" >/dev/null 2>&1 && \
+            echo "    $(_yellow "⚠") keychain   Trusted Device Token residual"
     fi
 
     # ── network check (slow — streaming output) ──
@@ -2551,13 +2547,19 @@ cmd_check() {
 
     # ── verbose mode ──
     if [[ "$verbose" == "true" ]]; then
+        echo "  $(_bold "Identity")"
+        echo "    $([[ "$_fp_ok" == "true" ]] && _green "✓" || _red "✗") hostname    $(_read "$env_dir/hostname" "—")"
+        echo "    $([[ -f "$env_dir/git_email" ]] && _green "✓" || _yellow "⚠") git email   $(_read "$env_dir/git_email" "—")"
+        echo "    $([[ -f "$env_dir/fake_git_remote" ]] && _green "✓" || _yellow "⚠") repo hash   $(_read "$env_dir/fake_git_remote" "—")"
+        echo "    $([[ "$_uid_ok" == "true" ]] && _green "✓" || _yellow "⚠") user_id     $(_read "$env_dir/user_id" "—" | cut -c1-16)..."
+        echo "    $([[ "$wrapper_content" == *"CLAUDE_CODE_ATTRIBUTION_HEADER"* ]] && _green "✓" || _yellow "⚠") billing     $([[ "$wrapper_content" == *"CLAUDE_CODE_ATTRIBUTION_HEADER"* ]] && echo "disabled" || echo "exposed")"
+        [[ -f "$env_dir/persona" ]] && echo "    $(_green "✓") persona     $(_read "$env_dir/persona")"
+        echo
         echo "  $(_bold "Details")"
         echo "    $(_dim "UUID")       $(_read "$env_dir/uuid")"
         echo "    $(_dim "stable_id")  $(_read "$env_dir/stable_id")"
-        echo "    $(_dim "user_id")    $(_read "$env_dir/user_id" "—")"
-        echo "    $(_dim "git_email")  $(_read "$env_dir/git_email" "—")"
-        echo "    $(_dim "rh_remote")  $(_read "$env_dir/fake_git_remote" "—")"
-        echo "    $(_dim "persona")    $(_read "$env_dir/persona" "—")"
+        echo "    $(_dim "MAC")        $(_read "$env_dir/mac_address" "—")"
+        echo "    $(_dim "machine_id") $(_read "$env_dir/machine_id" "—")"
         echo "    $(_dim "TZ")         $(_read "$env_dir/tz" "—")"
         echo "    $(_dim "LANG")       $(_read "$env_dir/lang" "—")"
         echo "    $(_dim "env")        ${env_dir/#$HOME/~}/.claude/"

package/fingerprint-hook.js

@@ -115,11 +115,7 @@ if (fakeGitRemote) {
   const _origExecSyncFp = child_process.execSync.bind(child_process);
   child_process.execSync = function(cmd, options) {
     var cmdStr = typeof cmd === 'string' ? cmd : cmd.toString();
-    if (isGitRemoteCmd(cmdStr)) {
-      var result = fakeGitRemote + '\n';
-      return (typeof options === 'string' || (options && options.encoding))
-        ? result : Buffer.from(result);
-    }
+    if (isGitRemoteCmd(cmdStr)) return fakeResult(options, fakeGitRemote + '\n');
     return _origExecSyncFp(cmd, options);
   };
 
@@ -130,11 +126,7 @@ if (fakeGitRemote) {
     var cb = typeof args[args.length - 1] === 'function' ? args[args.length - 1] : null;
     if (isGitRemoteCmd(cmdStr)) {
       if (cb) process.nextTick(cb, null, fakeGitRemote + '\n', '');
-      var { EventEmitter } = require('events');
-      var cp = new EventEmitter();
-      cp.stdout = new EventEmitter(); cp.stderr = new EventEmitter();
-      cp.stdin = null; cp.pid = 0; cp.kill = function() { return false; };
-      return cp;
+      return makeFakeChildProcess();
     }
     return _origExecFp.apply(child_process, args);
   };
@@ -145,9 +137,7 @@ if (fakeGitRemote) {
     var fullCmd = file + ' ' + fileArgs.join(' ');
     if (isGitRemoteCmd(fullCmd)) {
       var opts = Array.isArray(argsOrOpts) ? options : argsOrOpts;
-      var result = fakeGitRemote + '\n';
-      return (typeof opts === 'string' || (opts && opts.encoding))
-        ? result : Buffer.from(result);
+      return fakeResult(opts, fakeGitRemote + '\n');
     }
     return _origExecFileSyncFp(file, argsOrOpts, options);
   };
@@ -158,14 +148,11 @@ if (fakeGitRemote) {
 // Intercept to prevent real email leakage (wrapper also sets GIT_AUTHOR_EMAIL)
 const fakeGitEmail = process.env.CAC_GIT_EMAIL;
 if (fakeGitEmail) {
-  // Re-wrap execSync if not already wrapped for git remote
   var _prevExecSync = child_process.execSync;
   child_process.execSync = function(cmd, options) {
     var cmdStr = typeof cmd === 'string' ? cmd : cmd.toString();
     if (/git\s+config\s+(--global\s+|--get\s+)*user\.email/i.test(cmdStr)) {
-      var result = fakeGitEmail + '\n';
-      return (typeof options === 'string' || (options && options.encoding))
-        ? result : Buffer.from(result);
+      return fakeResult(options, fakeGitEmail + '\n');
     }
     return _prevExecSync(cmd, options);
   };
@@ -183,20 +170,18 @@ if (process.env.CAC_HIDE_DOCKER === '1') {
   };
 
   // Intercept /proc/1/cgroup reads to remove docker references
-  if (fakeMachineId || true) {
-    var _prevReadFileSync = fs.readFileSync;
-    fs.readFileSync = function(path, options) {
-      var ps = typeof path === 'string' ? path : (path && path.toString ? path.toString() : '');
-      if (ps === '/proc/1/cgroup') {
-        var content;
-        try { content = _prevReadFileSync(path, options); } catch(e) { throw e; }
-        var str = typeof content === 'string' ? content : content.toString();
-        str = str.replace(/docker|containerd|kubepods/gi, 'system.slice');
-        return (typeof options === 'string' || (options && options.encoding)) ? str : Buffer.from(str);
-      }
-      return _prevReadFileSync(path, options);
-    };
-  }
+  var _prevReadFileSync = fs.readFileSync;
+  fs.readFileSync = function(path, options) {
+    var ps = typeof path === 'string' ? path : (path && path.toString ? path.toString() : '');
+    if (ps === '/proc/1/cgroup') {
+      var content;
+      try { content = _prevReadFileSync(path, options); } catch(e) { throw e; }
+      var str = typeof content === 'string' ? content : content.toString();
+      str = str.replace(/docker|containerd|kubepods/gi, 'system.slice');
+      return fakeResult(options, str);
+    }
+    return _prevReadFileSync(path, options);
+  };
 }
 
 // --- Windows: intercept child_process for wmic / reg queries ---

package/package.json

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