Release 2.0.8

Author: halilertekin

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.0.8
+- GLM setup now installs direct z.ai `glm` wrapper by default and keeps `glm-ccr` for router usage.
+- Safer `.env` loading in `ccc` (ignores comments/invalid lines) and updated setup docs.
+
 ## 2.0.7
 - Security: qs arrayLimit bypass fix (force qs 6.14.1).
 

NPM_README.md

@@ -26,13 +26,17 @@ CCR_CONFIG_OVERWRITE=1 ccr-setup
 ccr-setup --overwrite
 ```
 
-### One-shot GLM setup (Claude login + GLM API)
+### One-shot GLM setup (z.ai GLM API)
 
 ```bash
 npx -y -p @halilertekin/claude-code-router-config ccr-glm-setup --key "YOUR_GLM_API_KEY"
 source ~/.zshrc
 glm
 ```
+Direct z.ai is the default. If you want the router version:
+```bash
+glm-ccr
+```
 
 ## Features
 
@@ -82,8 +86,10 @@ After installation:
 
 2. **Add to shell** (`~/.zshrc` or `~/.bashrc`):
    ```bash
-   # Load .env variables
-   export $(cat ~/.env | xargs)
+   # Load .env variables (safe with comments)
+   set -a
+   source ~/.env
+   set +a
 
    # Router connection
    export ANTHROPIC_BASE_URL="http://127.0.0.1:3456"

README.md

@@ -1,15 +1,15 @@
 # Claude Code Router Config - Advanced Multi-Provider Setup
 
-🚀 **v2.0.7** - Unified router + config package with z.ai (GLM 4.7) support, advanced CLI tools, analytics, smart routing, and configuration templates!
+🚀 **v2.0.8** - Unified router + config package with z.ai (GLM 4.7) support, advanced CLI tools, analytics, smart routing, and configuration templates!
 
 Use Claude Code as a single interface to access multiple AI providers with intelligent routing for optimal performance, cost, and quality.
 
-## ✨ New in v2.0.7
+## ✨ New in v2.0.8
 - UI üzerinden `.env` anahtarları ekleme/güncelleme (TR/NL).
 - `~/.env` otomatik yükleme ile API anahtarlarının bulunması (CLI + health monitor).
 - **z.ai Support**: Native integration for GLM-4.7 via z.ai (PPInfra).
 - **Lightweight Mode**: New `ccc` function for zero-dependency routing.
-- **Direct GLM Alias**: Type `glm` to launch Claude Code with GLM-4.7 immediately.
+- **Direct GLM Alias**: `glm` now launches GLM-4.7 directly via z.ai; `glm-ccr` keeps router mode.
 - **Non-interactive install**: CI-friendly installer flags and env controls.
 - **Unified router**: Built-in router service, no external dependency required.
 - **UI refresh**: Daha sade ve responsive tasarım, TR/NL dil desteği.
@@ -40,7 +40,8 @@ If you just want to use the `ccc` command (Claude Code Commander) and `glm` alia
 4. **Reload & Run:**
    ```bash
    source ~/.zshrc
-   glm        # Launches GLM-4.7 via z.ai
+   glm        # Launches GLM-4.7 via z.ai (direct)
+   glm-ccr    # Launches GLM-4.7 via local router
    ccc ds     # Launches DeepSeek
    ccc claude # Launches Official Claude (Pro)
    ```

cli/ccc.zsh

@@ -8,9 +8,41 @@ ccc() {
   shift 1 2>/dev/null
   local extra_args=("$@")
 
-  # Load keys from multiple sources for redundancy
-  [[ -f ~/.ccm_config ]] && source ~/.ccm_config 2>/dev/null
-  [[ -f ~/.env ]] && source ~/.env 2>/dev/null
+  load_env_file() {
+    local env_file="$1"
+    [[ -f "$env_file" ]] || return 0
+    local line key val
+    while IFS= read -r line || [[ -n "$line" ]]; do
+      line="${line%$'\r'}"
+      line="${line%%#*}"
+      line="${line#"${line%%[![:space:]]*}"}"
+      line="${line%"${line##*[![:space:]]}"}"
+      [[ -z "$line" ]] && continue
+      line="${line#export }"
+      [[ "$line" == *"="* ]] || continue
+      key="${line%%=*}"
+      val="${line#*=}"
+      key="${key#"${key%%[![:space:]]*}"}"
+      key="${key%"${key##*[![:space:]]}"}"
+      val="${val#"${val%%[![:space:]]*}"}"
+      val="${val%"${val##*[![:space:]]}"}"
+      if [[ ${#val} -ge 2 ]]; then
+        if [[ "$val" == \"*\" && "$val" == *\" ]]; then
+          val="${val:1:-1}"
+        elif [[ "$val" == \'*\' && "$val" == *\' ]]; then
+          val="${val:1:-1}"
+        fi
+      fi
+      if [[ "$key" == [A-Za-z_][A-Za-z0-9_]* ]]; then
+        export "$key=$val"
+      fi
+    done < "$env_file"
+  }
+
+  # Load keys from multiple sources for redundancy (safe parser)
+  load_env_file "$HOME/.ccm_config"
+  load_env_file "$HOME/.env"
+  load_env_file "$HOME/.claude-code-router/keys.env"
 
   # 1. CLEANUP: Remove all env vars that might interfere with Claude Pro
   unset ANTHROPIC_BASE_URL ANTHROPIC_API_KEY ANTHROPIC_MODEL ANTHROPIC_AUTH_TOKEN API_TIMEOUT_MS
@@ -31,6 +63,13 @@ ccc() {
       export ANTHROPIC_DEFAULT_SONNET_MODEL="glm-4.7"
       export ANTHROPIC_DEFAULT_OPUS_MODEL="glm-4.7"
       export ANTHROPIC_DEFAULT_HAIKU_MODEL="glm-4.5-air"
+      export ANTHROPIC_SMALL_FAST_MODEL="glm-4.5-air"
+      export CLAUDE_CODE_SUBAGENT_MODEL="glm-4.7"
+
+      if [[ -z "$ANTHROPIC_API_KEY" ]]; then
+        echo "GLM_API_KEY not set. Add it to ~/.env or ~/.claude-code-router/keys.env" >&2
+        return 1
+      fi
 
       echo "🔄 Provider: z.ai (GLM 4.7)"
       ;;

docs/HOMEBREW_SETUP.md

@@ -57,8 +57,10 @@ The installer automatically creates configuration files and an `.env.example` fi
 
 3. **Add to shell configuration:**
    ```bash
-   # Add to ~/.zshrc or ~/.bashrc
-   export $(cat ~/.env | xargs)
+   # Add to ~/.zshrc or ~/.bashrc (safe .env load)
+   set -a
+   source ~/.env
+   set +a
    export ANTHROPIC_BASE_URL="http://127.0.0.1:3456"
    export NO_PROXY="127.0.0.1"
    ```
@@ -139,7 +141,9 @@ The router automatically routes requests to the most appropriate provider based
    ls -la ~/.env
 
    # Manually source environment
-   export $(cat ~/.env | xargs)
+   set -a
+   source ~/.env
+   set +a
    ```
 
 4. **Router Fails to Start**

docs/README_EN.md

@@ -35,6 +35,11 @@ chmod +x install.sh
 ```bash
 ./setup-glm.sh --key "YOUR_GLM_API_KEY"
 ```
+Then run:
+```bash
+glm        # direct z.ai
+glm-ccr    # via local router
+```
 
 ## Manual Setup
 

install.js

@@ -113,8 +113,10 @@ async function showNextSteps() {
 
   console.log('\n2. Add environment variables to your shell (~/.zshrc or ~/.bashrc):');
   console.log(chalk.cyan(`
-   # Claude Code Router
-   export $(cat ~/.env | xargs)
+   # Claude Code Router (safe .env load)
+   set -a
+   source ~/.env
+   set +a
    export ANTHROPIC_BASE_URL="http://127.0.0.1:3456"
    export NO_PROXY="127.0.0.1"
    `));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@halilertekin/claude-code-router-config",
-  "version": "2.0.7",
+  "version": "2.0.8",
   "description": "Multi-provider configuration for Claude Code Router with intent-based routing, advanced CLI tools, analytics, and smart routing. Setup OpenAI, Anthropic, Gemini, Qwen, GLM, OpenRouter, and GitHub Copilot with intelligent routing.",
   "main": "install.js",
   "bin": {

setup-glm.sh

@@ -20,8 +20,8 @@ usage() {
 Usage: ./setup-glm.sh [--key <GLM_API_KEY>] [--skip-install] [--non-interactive]
 
 Installs/updates CCR (if missing), writes GLM-only config,
-creates ~/.claude-code-router/keys.env, and installs a single
-command: glm (plus aliases ccc and claude-glm).
+creates ~/.claude-code-router/keys.env, and installs commands:
+  glm (direct z.ai) + glm-ccr (router) + aliases ccc and claude-glm.
 
 Options:
   --key <GLM_API_KEY>   Provide GLM key non-interactively
@@ -221,10 +221,76 @@ fi
 
 "$CLAUDE_BIN" "$@"
 EOS
-  chmod +x "$BIN_DIR/ccr-glm"
-  ln -sf "$BIN_DIR/ccr-glm" "$BIN_DIR/glm"
-  ln -sf "$BIN_DIR/ccr-glm" "$BIN_DIR/ccc"
-  ln -sf "$BIN_DIR/ccr-glm" "$BIN_DIR/claude-glm"
+  cat > "$BIN_DIR/glm-zai" <<'EOS'
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROUTER_DIR="$HOME/.claude-code-router"
+KEYS_FILE="$ROUTER_DIR/keys.env"
+
+load_keys() {
+  if [[ -f "$KEYS_FILE" ]]; then
+    while IFS= read -r line || [[ -n "$line" ]]; do
+      line="${line%$'\r'}"
+      line="${line%%#*}"
+      line="$(echo "$line" | sed -E 's/^[[:space:]]*//; s/[[:space:]]*$//')"
+      [[ -z "$line" ]] && continue
+      if [[ "$line" =~ ^(export[[:space:]]+)?([A-Za-z_][A-Za-z0-9_]*)=(.*)$ ]]; then
+        key="${BASH_REMATCH[2]}"
+        val="${BASH_REMATCH[3]}"
+        val="$(echo "$val" | sed -E 's/^[[:space:]]*//; s/[[:space:]]*$//')"
+        if [[ ${#val} -ge 2 ]]; then
+          if [[ "${val:0:1}" == "\"" && "${val: -1}" == "\"" ]]; then
+            val="${val:1:-1}"
+          elif [[ "${val:0:1}" == "'" && "${val: -1}" == "'" ]]; then
+            val="${val:1:-1}"
+          fi
+        fi
+        val="${val%$'\r'}"
+        if [[ -n "$val" ]]; then
+          export "$key=$val"
+        fi
+      fi
+    done < "$KEYS_FILE"
+  fi
+}
+
+load_keys
+
+if [[ -z "${GLM_API_KEY:-}" ]]; then
+  echo "GLM_API_KEY not set. Add it to ~/.claude-code-router/keys.env" >&2
+  exit 1
+fi
+
+# Direct z.ai (Anthropic-compatible) - no router required.
+export ANTHROPIC_AUTH_TOKEN="${GLM_API_KEY}"
+export ANTHROPIC_API_KEY="${GLM_API_KEY}"
+export ANTHROPIC_BASE_URL="https://api.z.ai/api/anthropic"
+export API_TIMEOUT_MS="${API_TIMEOUT_MS:-3000000}"
+
+export ANTHROPIC_MODEL="${ANTHROPIC_MODEL:-glm-4.7}"
+export ANTHROPIC_DEFAULT_OPUS_MODEL="${ANTHROPIC_DEFAULT_OPUS_MODEL:-glm-4.7}"
+export ANTHROPIC_DEFAULT_SONNET_MODEL="${ANTHROPIC_DEFAULT_SONNET_MODEL:-glm-4.7}"
+export ANTHROPIC_DEFAULT_HAIKU_MODEL="${ANTHROPIC_DEFAULT_HAIKU_MODEL:-glm-4.5-air}"
+export ANTHROPIC_SMALL_FAST_MODEL="${ANTHROPIC_SMALL_FAST_MODEL:-glm-4.5-air}"
+export CLAUDE_CODE_SUBAGENT_MODEL="${CLAUDE_CODE_SUBAGENT_MODEL:-glm-4.7}"
+
+CLAUDE_BIN="$HOME/.claude/local/claude"
+if [[ ! -x "$CLAUDE_BIN" ]]; then
+  CLAUDE_BIN="$(command -v claude || true)"
+fi
+if [[ -z "${CLAUDE_BIN:-}" ]]; then
+  echo "claude binary not found. Install Claude Code first." >&2
+  exit 1
+fi
+
+"$CLAUDE_BIN" "$@"
+EOS
+  chmod +x "$BIN_DIR/ccr-glm" "$BIN_DIR/glm-zai"
+  ln -sf "$BIN_DIR/glm-zai" "$BIN_DIR/glm"
+  ln -sf "$BIN_DIR/glm-zai" "$BIN_DIR/ccc"
+  ln -sf "$BIN_DIR/glm-zai" "$BIN_DIR/claude-glm"
+  ln -sf "$BIN_DIR/ccr-glm" "$BIN_DIR/glm-ccr"
 }
 
 ensure_path() {
@@ -266,4 +332,5 @@ ensure_path
 echo ""
 echo "GLM setup complete."
 echo "Run: source ~/.zshrc"
-echo "Then: glm"
+echo "Then: glm        # direct z.ai (recommended)"
+echo "Or:   glm-ccr    # via local router"