claude-cac 1.1.0 → 1.1.2

package/README.md

@@ -8,6 +8,7 @@
 
 **[中文](#中文) | [English](#english) | [:book: Docs](https://cac.nextmind.space/docs)**
 
+[![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)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](LICENSE)

package/cac

@@ -10,7 +10,7 @@ VERSIONS_DIR="$CAC_DIR/versions"
 # ━━━ utils.sh ━━━
 # ── utils: 颜色、读写、UUID、proxy 解析 ───────────────────────
 
-CAC_VERSION="1.0.0"
+CAC_VERSION="1.1.2"
 
 _read()   { [[ -f "$1" ]] && tr -d '[:space:]' < "$1" || echo "${2:-}"; }
 _die()    { printf '%b\n' "$(_red "error:") $*" >&2; exit 1; }
@@ -1750,22 +1750,45 @@ _check_proxy_conflict() {
 
     # ── 输出结果 ──
     if [[ ${#conflicts[@]} -eq 0 ]]; then
-        echo "$(_green "✓") 未检测到本地代理软件冲突"
+        echo "$(_green "✓") 未检测到代理冲突"
         return 0
     fi
 
-    echo "$(_yellow "⚠ 检测到可能的代理冲突")："
+    echo "$(_yellow "检测到本地代理软件")："
     for msg in "${conflicts[@]}"; do
-        echo "    $(_yellow "•") $msg"
+        echo "    $(_dim "•") $msg"
     done
-    echo
-    echo "    $(_bold "解决方法")：在本地代理软件中为 cac 代理服务器 IP 添加 DIRECT 规则"
-    echo "    代理服务器：$(_bold "$proxy_host")"
-    echo
-    if [[ "$os" == "macos" ]]; then
-        echo "    Clash 示例（添加到规则列表最前面）："
-        echo "      - IP-CIDR,${proxy_host}/32,DIRECT"
+
+    # 验证 relay 能否实际绕过
+    if _relay_is_running 2>/dev/null; then
+        local rport; rport=$(_read "$CAC_DIR/relay.port" "")
+        local relay_ip
+        relay_ip=$(curl -s --proxy "http://127.0.0.1:$rport" --connect-timeout 8 https://api.ipify.org 2>/dev/null || true)
+        if [[ -n "$relay_ip" ]]; then
+            echo "    $(_green "→") relay 已启动并连通 (出口: $(_cyan "$relay_ip"))，冲突已自动绕过"
+            return 0
+        fi
     fi
+
+    # relay 未运行，尝试启动测试
+    if [[ -f "$CAC_DIR/relay.js" ]]; then
+        local _test_env; _test_env=$(_current_env)
+        if _relay_start "$_test_env" 2>/dev/null; then
+            local rport; rport=$(_read "$CAC_DIR/relay.port" "")
+            local relay_ip
+            relay_ip=$(curl -s --proxy "http://127.0.0.1:$rport" --connect-timeout 8 https://api.ipify.org 2>/dev/null || true)
+            _relay_stop 2>/dev/null || true
+            if [[ -n "$relay_ip" ]]; then
+                echo "    $(_green "→") relay 测试连通 (出口: $(_cyan "$relay_ip"))，claude 启动时会自动绕过"
+                return 0
+            fi
+        fi
+    fi
+
+    # relay 也不行，给手动方案
+    echo "    $(_yellow "→") relay 无法绕过此冲突，需手动处理："
+    echo "    在本地代理软件中为代理服务器 IP 添加 DIRECT 规则"
+    echo "    代理服务器：$(_bold "$proxy_host")"
     return 1
 }
 
@@ -1831,26 +1854,11 @@ cmd_check() {
     if _relay_is_running; then
         local rpid; rpid=$(_read "$CAC_DIR/relay.pid")
         local rport; rport=$(_read "$CAC_DIR/relay.port" "未知")
-        printf "  Relay 进程 ... %s (PID=%s, 端口=%s)\n" "$(_green "运行中")" "$rpid" "$rport"
+        echo "  Relay     ... $(_green "运行中") (PID=$rpid, 端口=$rport)"
     elif [[ -n "$proxy" ]]; then
-        # 有代理时临时启动 relay 做连通性测试
-        printf "  Relay 测试 ... "
-        if _relay_start "$current" 2>/dev/null; then
-            local rport; rport=$(_read "$CAC_DIR/relay.port" "")
-            local relay_ip
-            relay_ip=$(curl -s --proxy "http://127.0.0.1:$rport" --connect-timeout 8 https://api.ipify.org 2>/dev/null || true)
-            if [[ -n "$relay_ip" ]]; then
-                printf "%s (端口=%s, 出口=%s)\n" "$(_green "✓ 连通")" "$rport" "$(_cyan "$relay_ip")"
-            else
-                printf "%s (端口=%s, 代理不通)\n" "$(_yellow "⚠ 启动成功但无法连通")" "$rport"
-            fi
-            _relay_stop 2>/dev/null || true
-        else
-            printf "%s\n" "$(_red "✗ 启动失败")"
-        fi
-        echo "  $(_dim "（relay 将在 claude 启动时自动启用）")"
+        echo "  Relay     ... $(_dim "未运行（claude 启动时按需自动启用）")"
     else
-        echo "  Relay     ... $(_dim "（无代理，不需要 relay）")"
+        echo "  Relay     ... $(_dim "（无代理，不需要）")"
     fi
 
     echo

package/package.json

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