claude-all-config 3.8.2 → 3.8.3

package/claude-all

@@ -6,11 +6,29 @@
 
 # Auto-load secrets from ~/.claude/.env if present so MCP servers can pick up
 # CONTEXT7_API_KEY, EXA_API_KEY, Z_AI_API_KEY, MINIMAX_API_KEY, TELEGRAM_*, etc.
-if [ -f "$HOME/.claude/.env" ]; then
-    set -a
-    # shellcheck disable=SC1091
-    . "$HOME/.claude/.env" 2>/dev/null || true
-    set +a
+# Check multiple possible locations (Termux proot may use different HOME paths)
+for _env_dir in "$HOME/.claude" "$HOME/.kiro" "$PREFIX/../../home/.claude" "/data/data/com.termux/files/home/.claude"; do
+    if [ -f "$_env_dir/.env" ]; then
+        set -a
+        # shellcheck disable=SC1091
+        . "$_env_dir/.env" 2>/dev/null || true
+        set +a
+        break
+    fi
+done
+unset _env_dir
+
+# CRITICAL: Ensure ANTHROPIC_API_KEY is always set so Claude Code never asks
+# for OAuth login. Each provider case will override with the real key+base_url.
+# Without this, Claude Code shows "Not logged in · Please run /login" on
+# headless servers/Termux that can't open a browser for OAuth.
+if [[ -z "$ANTHROPIC_API_KEY" ]]; then
+    if [[ -n "$Z_AI_API_KEY" ]]; then
+        export ANTHROPIC_API_KEY="$Z_AI_API_KEY"
+        export ANTHROPIC_BASE_URL="https://api.z.ai/api/anthropic"
+    else
+        export ANTHROPIC_API_KEY="sk-placeholder-overridden-by-provider"
+    fi
 fi
 
 # Skip-permissions flag selection.
@@ -824,15 +842,20 @@ setup_xai() {
 }
 
 setup_glm() {
-    API_KEY=$(load_api_key "glm" "GLM")
-    if [[ $? -eq 0 ]]; then
-        check_dependencies
-        MODEL=$(select_glm_model)
-        echo -e "${BLUE}Configuring for ZhipuAI / GLM...${NC}"
-        export GLM_API_KEY="$API_KEY"
-        export MODEL_NAME="$MODEL"
-        exec claude $SKIP_PERMS_FLAG --model "$MODEL" "$@"
+    # Auto-use Z_AI_API_KEY from .env if available
+    if [[ -n "$Z_AI_API_KEY" ]]; then
+        API_KEY="$Z_AI_API_KEY"
+    else
+        API_KEY=$(load_api_key "glm" "GLM")
+        [[ $? -ne 0 ]] && return 1
     fi
+    check_dependencies
+    MODEL=$(select_glm_model)
+    echo -e "${BLUE}Configuring for ZhipuAI / GLM...${NC}"
+    export ANTHROPIC_BASE_URL="https://api.z.ai/api/anthropic"
+    export ANTHROPIC_API_KEY="$API_KEY"
+    export CLAUDE_MODEL="$MODEL"
+    exec claude $SKIP_PERMS_FLAG --model "$MODEL" "$@"
 }
 
 setup_groq() {
@@ -1898,17 +1921,21 @@ case $choice in
         exec claude $SKIP_PERMS_FLAG --model "$MODEL_NAME" "$@"
         ;;
     7)
-        # ZhipuAI / GLM
+        # ZhipuAI / GLM (via Z.AI proxy)
         echo -e "${BLUE}Configuring for ZhipuAI (GLM)...${NC}"
 
-        # Get API key with persistent storage
+        # Auto-use Z_AI_API_KEY if available (from .env), fallback to saved key
+        if [[ -z "$ANTHROPIC_AUTH_TOKEN" && -n "$Z_AI_API_KEY" ]]; then
+            ANTHROPIC_AUTH_TOKEN="$Z_AI_API_KEY"
+        fi
+
         if [[ -z "$ANTHROPIC_AUTH_TOKEN" ]]; then
             load_api_key_to_var "$HOME/.glm_api_key" "ANTHROPIC_AUTH_TOKEN"
         fi
 
         if [[ -z "$ANTHROPIC_AUTH_TOKEN" ]]; then
-            echo "Get Key: https://open.bigmodel.cn/usercenter/apikeys"
-            read -p "Enter GLM API Key: " ANTHROPIC_AUTH_TOKEN
+            echo "Get Key: https://z.ai/dashboard or https://open.bigmodel.cn/usercenter/apikeys"
+            read -p "Enter Z.AI / GLM API Key: " ANTHROPIC_AUTH_TOKEN
             save_api_key "$ANTHROPIC_AUTH_TOKEN" "$HOME/.glm_api_key" "GLM"
         else
             if [[ ! -f "$HOME/.glm_api_key" ]]; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-all-config",
-  "version": "3.8.2",
+  "version": "3.8.3",
   "description": "🦾 MONSTER ENGINEER v2 - Ultimate AI CLI with 63 Skills, 12 Superpowers, 14 Agents. Multi-Agent Orchestration, Cost-Aware, Security Scorecard, Parallel-First.",
   "main": "index.js",
   "bin": {