claude-cac 1.4.0-beta.2 → 1.4.0-beta.4

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.0-beta.2"
+CAC_VERSION="1.4.0-beta.4"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -444,7 +444,7 @@ _write_blocked_hosts() {
     local hosts_file="$CAC_DIR/blocked_hosts"
     {
         echo "# cac — blocked telemetry domains"
-        echo "# Generated by cac setup, used via HOSTALIASES"
+        echo "# Generated by cac, used via HOSTALIASES"
         for domain in "${TELEMETRY_DOMAINS[@]}"; do
             printf '%s\tlocalhost\n' "$domain"
         done
@@ -653,44 +653,27 @@ if (mtlsCert && mtlsKey) {
 
 
 // ─── 3. fetch telemetry interception patch ──────────────────────────────────
-// Node.js native fetch (undici) bypasses dns.lookup, circumventing DNS blocking
-// Strategy: prefer node-fetch (uses http/https modules -> dns.lookup)
-//           otherwise wrap native fetch to block telemetry domains
+// Wrap native fetch to block telemetry domains by URL check
+// (do NOT replace with node-fetch — its Response.body lacks ReadableStream.cancel(),
+//  which breaks Bun-based Claude Code streaming)
 
 (function patchFetch() {
-    if (typeof globalThis === 'undefined') return;
+    if (typeof globalThis === 'undefined' || typeof globalThis.fetch !== 'function') return;
 
-    // prefer node-fetch (based on http/https modules, naturally goes through dns.lookup interception chain)
-    try {
-        var nodeFetch = require('node-fetch');
-        if (nodeFetch && typeof nodeFetch === 'function') {
-            globalThis.fetch = nodeFetch;
-            if (nodeFetch.Headers)  globalThis.Headers  = nodeFetch.Headers;
-            if (nodeFetch.Request)  globalThis.Request  = nodeFetch.Request;
-            if (nodeFetch.Response) globalThis.Response = nodeFetch.Response;
-            return;
-        }
-    } catch(e) {
-        // node-fetch not available
-    }
+    var _origFetch = globalThis.fetch;
+    globalThis.fetch = function cacFetch(input, init) {
+        var hostname;
+        try {
+            var urlStr = typeof input === 'string' ? input :
+                         (input && input.url) ? input.url : '';
+            if (urlStr) hostname = new URL(urlStr).hostname;
+        } catch(e) { /* ignore */ }
 
-    // fallback: wrap native fetch to ensure telemetry domains are blocked
-    if (typeof globalThis.fetch === 'function') {
-        var _origFetch = globalThis.fetch;
-        globalThis.fetch = function cacFetch(input, init) {
-            var hostname;
-            try {
-                var urlStr = typeof input === 'string' ? input :
-                             (input && input.url) ? input.url : '';
-                if (urlStr) hostname = new URL(urlStr).hostname;
-            } catch(e) { /* ignore */ }
-
-            if (hostname && isDomainBlocked(hostname)) {
-                return Promise.reject(makeBlockedError(hostname, 'fetch'));
-            }
-            return _origFetch(input, init);
-        };
-    }
+        if (hostname && isDomainBlocked(hostname)) {
+            return Promise.reject(makeBlockedError(hostname, 'fetch'));
+        }
+        return _origFetch(input, init);
+    };
 })();
 
 
@@ -1062,11 +1045,14 @@ _write_env_settings() {
 SETTINGS_EOF
 }
 
-# write CLAUDE.md to env .claude dir
+# write CAC Meta Prompt to env .claude/CLAUDE.md
+# Usage: _write_env_claude_md <config_dir> <env_name> [--append]
 _write_env_claude_md() {
     local config_dir="$1"
     local env_name="$2"
-    cat > "$config_dir/CLAUDE.md" << CLAUDEMD_EOF
+    local _meta
+    _meta=$(cat << CLAUDEMD_EOF
+
 # cac managed environment
 
 This Claude Code instance is managed by **cac** (Claude Code Cloak).
@@ -1080,6 +1066,12 @@ Useful commands:
 - \`cac env check\` — verify current environment health
 - \`cac <name>\` — switch to another environment
 CLAUDEMD_EOF
+    )
+    if [[ "${3:-}" == "--append" ]]; then
+        printf '\n%s\n' "$_meta" >> "$config_dir/CLAUDE.md"
+    else
+        printf '%s\n' "$_meta" > "$config_dir/CLAUDE.md"
+    fi
 }
 
 _write_wrapper() {
@@ -1096,7 +1088,7 @@ ENVS_DIR="$CAC_DIR/envs"
 if [[ -f "$CAC_DIR/stopped" ]]; then
     _real=$(tr -d '[:space:]' < "$CAC_DIR/real_claude" 2>/dev/null || true)
     [[ -x "$_real" ]] && exec "$_real" "$@"
-    echo "[cac] error: real claude not found, run 'cac setup'" >&2; exit 1
+    echo "[cac] error: real claude not found, reinstall with 'npm i -g claude-cac'" >&2; exit 1
 fi
 
 # read current environment
@@ -1285,7 +1277,7 @@ fi
 if [[ -z "$_real" ]] || [[ ! -x "$_real" ]]; then
     _real=$(tr -d '[:space:]' < "$CAC_DIR/real_claude")
 fi
-[[ -x "$_real" ]] || { echo "[cac] error: claude not found, run 'cac setup'" >&2; exit 1; }
+[[ -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_active=false
@@ -1463,9 +1455,9 @@ IFCONFIG_EOF
 }
 
 # ━━━ cmd_setup.sh ━━━
-# ── cmd: setup (auto-bootstrap, no manual step needed) ─────────
+# ── auto-bootstrap (silent, idempotent) ─────────────────────────
 
-# Silent, idempotent initialization — called automatically by any command
+# Called automatically by any command — no manual setup needed
 _ensure_initialized() {
     mkdir -p "$CAC_DIR" "$ENVS_DIR" "$VERSIONS_DIR"
 
@@ -1535,44 +1527,6 @@ _ensure_initialized() {
     _generate_ca_cert 2>/dev/null || true
 }
 
-# Explicit setup command — runs initialization with verbose output
-cmd_setup() {
-    echo "$(_bold "cac setup")"
-    echo
-
-    _ensure_initialized
-
-    # Find or install Claude Code
-    local real_claude; real_claude=$(_read "$CAC_DIR/real_claude" "")
-    if [[ -z "$real_claude" ]] || [[ ! -x "$real_claude" ]]; then
-        echo "  Claude Code not found"
-        printf "  Install latest version? [Y/n] "
-        read -r _ans
-        if [[ "$_ans" != "n" && "$_ans" != "N" ]]; then
-            _claude_cmd_install latest
-            local latest_ver; latest_ver=$(_read "$VERSIONS_DIR/.latest" "")
-            if [[ -n "$latest_ver" ]]; then
-                real_claude="$VERSIONS_DIR/$latest_ver/claude"
-                echo "$real_claude" > "$CAC_DIR/real_claude"
-            fi
-        fi
-    fi
-
-    if [[ -n "$real_claude" ]] && [[ -x "$real_claude" ]]; then
-        echo "  Claude Code: $(_cyan "$real_claude")"
-    fi
-    echo "  Wrapper: $(_cyan "$CAC_DIR/bin/claude")"
-    echo "  Shims: $(_cyan "$CAC_DIR/shim-bin/")"
-    echo
-
-    local rc_file; rc_file=$(_detect_rc_file)
-    if [[ -n "$rc_file" ]]; then
-        echo "  Run to activate: $(_green "source $rc_file")"
-    fi
-    echo
-    echo "  Create environment: $(_green "cac env create <name> [-p <proxy>]")"
-}
-
 # ━━━ cmd_env.sh ━━━
 # ── cmd: env (environment management, like "uv venv") ────────────
 
@@ -1714,6 +1668,7 @@ _env_cmd_create() {
                     ln -sf "$src_claude_dir/CLAUDE.md" "$env_dir/.claude/CLAUDE.md"
                 else
                     cp "$src_claude_dir/CLAUDE.md" "$env_dir/.claude/CLAUDE.md"
+                    _write_env_claude_md "$env_dir/.claude" "$name" --append
                 fi
             fi
             if [[ -f "$src_claude_dir/settings.json" ]]; then
@@ -1986,7 +1941,7 @@ _relay_start() {
     [[ -z "$proxy" ]] && return 1
 
     local relay_js="$CAC_DIR/relay.js"
-    [[ -f "$relay_js" ]] || { echo "error: relay.js not found, run 'cac setup'" >&2; return 1; }
+    [[ -f "$relay_js" ]] || { echo "error: relay.js not found, reinstall with 'npm i -g claude-cac'" >&2; return 1; }
 
     # find available port (17890-17999)
     local port=17890
@@ -3330,7 +3285,7 @@ case "$1" in
     help|--help|-h)     cmd_help            ;;
     # ── deprecated (shims with warnings) ──
     add)                echo "$(_yellow "warning:") 'cac add' → 'cac env create <name> -p <proxy>'" >&2; exit 1 ;;
-    setup)              echo "$(_yellow "warning:") 'cac setup' is no longer needed — cac auto-initializes" >&2 ;;
+    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 ;;
     resume|-c)          echo "$(_yellow "warning:") 'cac resume' removed — use 'cac env activate <name>'" >&2; exit 1 ;;

package/package.json

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