claude-cac 1.1.8 → 1.2.0

package/cac

@@ -10,7 +10,7 @@ VERSIONS_DIR="$CAC_DIR/versions"
 # ━━━ utils.sh ━━━
 # ── utils: 颜色、读写、UUID、proxy 解析 ───────────────────────
 
-CAC_VERSION="1.1.8"
+CAC_VERSION="1.2.0"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -1727,6 +1727,14 @@ cmd_check() {
     local problems=()
     local summary_parts=()
 
+    # ── wrapper 检查 ──
+    local claude_path; claude_path="$(command -v claude 2>/dev/null || true)"
+    if [[ -z "$claude_path" ]] || [[ "$(readlink -f "$claude_path" 2>/dev/null || echo "$claude_path")" != *"/.cac/bin/claude"* ]]; then
+        if [[ "$claude_path" != *"/.cac/bin/claude" ]]; then
+            problems+=("claude 未指向 wrapper — 运行 source ~/.zshrc 或重开终端")
+        fi
+    fi
+
     # ── 网络检查 ──
     local proxy_ip=""
     if [[ -n "$proxy" ]]; then
@@ -1741,8 +1749,8 @@ cmd_check() {
             fi
         fi
 
-        # 冲突检测
-        local conflict_resolved=true
+        # 冲突检测（仅代理连通时才有意义）
+        if [[ -n "$proxy_ip" ]]; then
         local os; os=$(_detect_os)
         local has_conflict=false
         local tun_procs="clash|mihomo|sing-box|surge|shadowrocket|v2ray|xray|hysteria|tuic|nekoray"
@@ -1778,13 +1786,14 @@ cmd_check() {
             fi
 
             if [[ "$relay_ok" == "true" ]]; then
-                summary_parts+=("relay 自动绕过")
+                summary_parts+=("TUN 冲突已绕过")
             else
                 local proxy_hp; proxy_hp=$(_proxy_host_port "$proxy")
                 local proxy_host="${proxy_hp%%:*}"
                 problems+=("代理冲突：需在代理软件中为 $proxy_host 添加 DIRECT 规则")
             fi
         fi
+        fi
     else
         summary_parts+=("API Key 模式")
     fi
@@ -1805,7 +1814,7 @@ cmd_check() {
     done
 
     if [[ "$env_ok" -eq "$env_total" ]]; then
-        summary_parts+=("防护 ${env_ok}/${env_total}")
+        summary_parts+=("遥测屏蔽 ${env_ok}/${env_total}")
     else
         problems+=("遥测屏蔽 ${env_ok}/${env_total}")
     fi
@@ -1819,9 +1828,6 @@ cmd_check() {
         for p in "${problems[@]}"; do
             echo "  $(_red "✗") $p"
         done
-        if [[ ${#summary_parts[@]} -gt 0 ]]; then
-            echo "  $(IFS=' | '; echo "${summary_parts[*]}")"
-        fi
     fi
 
     # ── 详细模式 ──

package/package.json

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