@wangxt0223/codex-switcher 0.6.0 → 0.6.2

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 0.6.2 - 2026-04-12
+
+- Added usage-API proxy auto-detection (manual proxy > env proxy > macOS system proxy).
+- Added `proxy` source display: `(manual)`, `(auto:env)`, `(auto:system)`, or `off`.
+- Kept proxy scope limited to usage API calls used by `list`/`proxy test`.
+- Added smoke-test coverage for env-proxy auto-detection and isolated proxy behavior.
+
+## 0.6.1 - 2026-04-12
+
+- Fixed symlink invocation path resolution for `codex-sw` / `codex-switcher`, so global npm installs can always find bundled scripts.
+- Fixed `list` row field reuse bug that could leak previous row values into later rows.
+- Improved usage API request compatibility by adding `ChatGPT-Account-Id` and browser-like headers, while keeping local sessions fallback.
+- Added smoke-test coverage for symlink launch path behavior.
+
 ## 0.6.0 - 2026-04-12
 
 - Refactored core model from profile-based switching to `env + account` with built-in `default=~/.codex`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wangxt0223/codex-switcher",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Env + account switcher for Codex CLI and Codex App with shared env data and per-account auth.",
   "license": "MIT",
   "author": "wangxt",
@@ -43,5 +43,8 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "@wangxt0223/codex-switcher": "^0.6.0"
   }
 }

package/plugins/codex-switcher/README.en.md

@@ -34,6 +34,8 @@ codex-switcher account use <account> [--env <env>] [--target cli|app|both] [--sy
 codex-switcher account logout [account] [--env <env>] [--target cli|app|both]
 codex-switcher account current [cli|app]
 
+codex-switcher proxy [<host:port>|off|test]
+
 codex-switcher list
 codex-switcher status
 codex-switcher current [cli|app]
@@ -77,6 +79,8 @@ Usage data strategy:
 - API first (`chatgpt.com/backend-api/wham/usage`)
 - Auto fallback to local `sessions/*.jsonl` on API failure
 - `LAST ACTIVITY` appends source marker `(api)` or `(local)`
+- You can configure a dedicated proxy for this usage API via `codex-switcher proxy 127.0.0.1:7899` (only affects `list`)
+- If no manual proxy is configured, env/system proxy settings are auto-detected for usage API requests
 
 ## Compatibility Commands
 

package/plugins/codex-switcher/README.md

@@ -34,6 +34,8 @@ codex-switcher account use <account> [--env <env>] [--target cli|app|both] [--sy
 codex-switcher account logout [account] [--env <env>] [--target cli|app|both]
 codex-switcher account current [cli|app]
 
+codex-switcher proxy [<host:port>|off|test]
+
 codex-switcher list
 codex-switcher status
 codex-switcher current [cli|app]
@@ -77,6 +79,8 @@ codex-switcher account use corp --env project-a
 - 默认优先 API（`chatgpt.com/backend-api/wham/usage`）
 - API 失败自动回退本地 `sessions/*.jsonl`
 - `LAST ACTIVITY` 列会追加 `(api)` 或 `(local)` 标记来源
+- 可通过 `codex-switcher proxy 127.0.0.1:7899` 为该用量 API 单独配置代理（仅影响 `list`）
+- 未手动设置时会自动检测环境变量/系统代理并用于用量 API 请求
 
 ## 兼容命令
 

package/plugins/codex-switcher/scripts/codex-sw

@@ -1,5 +1,17 @@
 #!/usr/bin/env bash
 set -euo pipefail
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+resolve_script_dir() {
+  local src="${BASH_SOURCE[0]}"
+  local dir
+  while [[ -h "$src" ]]; do
+    dir="$(cd -P "$(dirname "$src")" && pwd)"
+    src="$(readlink "$src")"
+    [[ "$src" == /* ]] || src="$dir/$src"
+  done
+  cd -P "$(dirname "$src")" && pwd
+}
+
+SCRIPT_DIR="$(resolve_script_dir)"
 export CODEX_SWITCHER_INVOKED_AS="codex-sw"
 exec "$SCRIPT_DIR/codex-switcher" "$@"

package/plugins/codex-switcher/scripts/codex-switcher

@@ -1,6 +1,19 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+resolve_script_dir() {
+  local src="${BASH_SOURCE[0]}"
+  local dir
+  while [[ -h "$src" ]]; do
+    dir="$(cd -P "$(dirname "$src")" && pwd)"
+    src="$(readlink "$src")"
+    [[ "$src" == /* ]] || src="$dir/$src"
+  done
+  cd -P "$(dirname "$src")" && pwd
+}
+
+SCRIPT_DIR="$(resolve_script_dir)"
+
 STATE_DIR="${CODEX_SWITCHER_STATE_DIR:-$HOME/.codex-switcher}"
 ENVS_DIR="${CODEX_SWITCHER_ENVS_DIR:-$HOME/.codex-envs}"
 ACCOUNTS_DIR="${CODEX_SWITCHER_ACCOUNTS_DIR:-$STATE_DIR/env-accounts}"
@@ -15,6 +28,9 @@ LOCK_DIR="$STATE_DIR/.lock"
 LOCK_WAIT_SECONDS="${CODEX_SWITCHER_LOCK_WAIT_SECONDS:-10}"
 
 SCRIPT_NAME="${CODEX_SWITCHER_INVOKED_AS:-$(basename "$0")}"
+USAGE_API_ENDPOINT="https://chatgpt.com/backend-api/wham/usage"
+USAGE_PROXY_FILE="$STATE_DIR/usage_proxy"
+DISABLE_SYSTEM_PROXY_DETECT="${CODEX_SWITCHER_DISABLE_SYSTEM_PROXY_DETECT:-false}"
 
 usage() {
   cat <<'USAGE'
@@ -34,6 +50,8 @@ Usage:
   codex-sw account logout [account] [--env <env>] [--target cli|app|both]
   codex-sw account current [cli|app]
 
+  codex-sw proxy [<host:port>|off|test]
+
   codex-sw list
   codex-sw status
   codex-sw current [cli|app]
@@ -66,6 +84,8 @@ Compatibility:
 Notes:
   - Built-in env "default" always maps to ~/.codex (or CODEX_SWITCHER_DEFAULT_HOME).
   - Same-env account switch only swaps auth.json and does not sync shared data.
+  - `proxy` only affects usage API calls used by `list`.
+  - If manual proxy is not set, usage API proxy is auto-detected from env/system proxy settings.
   - `list` prints: EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / LAST ACTIVITY (+ env/account context).
   - Usage metrics are API-first and automatically fallback to local sessions; source is shown as (api|local).
 USAGE
@@ -85,9 +105,8 @@ now_utc() {
 }
 
 switcher_version() {
-  local script_dir package_json version
-  script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-  package_json="$(cd "$script_dir/../../.." && pwd)/package.json"
+  local package_json version
+  package_json="$(cd "$SCRIPT_DIR/../../.." && pwd)/package.json"
 
   if [[ -f "$package_json" ]]; then
     version="$(sed -nE 's/^[[:space:]]*"version"[[:space:]]*:[[:space:]]*"([^"]+)".*/\1/p' "$package_json" | head -n 1)"
@@ -185,6 +204,116 @@ current_account_file() {
   echo "$STATE_DIR/current_${target}_account"
 }
 
+normalize_usage_proxy_value() {
+  local raw="${1:-}"
+  local value
+  value="$(echo "$raw" | tr -d '\r' | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
+  [[ -n "$value" ]] || return 1
+  [[ "$value" != *[[:space:]]* ]] || return 1
+  case "$value" in
+    http://*|https://*|socks5://*)
+      echo "$value"
+      ;;
+    *)
+      echo "http://$value"
+      ;;
+  esac
+}
+
+read_usage_proxy() {
+  local value
+  [[ -f "$USAGE_PROXY_FILE" ]] || return 1
+  value="$(head -n 1 "$USAGE_PROXY_FILE" 2>/dev/null || true)"
+  normalize_usage_proxy_value "$value"
+}
+
+detect_usage_proxy_from_env() {
+  local key raw normalized
+  for key in CODEX_SWITCHER_USAGE_PROXY HTTPS_PROXY https_proxy HTTP_PROXY http_proxy ALL_PROXY all_proxy; do
+    raw="${!key:-}"
+    [[ -n "$raw" ]] || continue
+    normalized="$(normalize_usage_proxy_value "$raw" || true)"
+    [[ -n "$normalized" ]] || continue
+    echo "$normalized"
+    return 0
+  done
+  return 1
+}
+
+detect_usage_proxy_from_system_macos() {
+  [[ "$DISABLE_SYSTEM_PROXY_DETECT" != "true" ]] || return 1
+  [[ "$(uname -s 2>/dev/null || true)" == "Darwin" ]] || return 1
+  command -v scutil >/dev/null 2>&1 || return 1
+
+  local dump host port enabled normalized
+  dump="$(scutil --proxy 2>/dev/null || true)"
+  [[ -n "$dump" ]] || return 1
+
+  host="$(echo "$dump" | sed -nE 's/^[[:space:]]*HTTPSProxy[[:space:]]*:[[:space:]]*(.+)$/\1/p' | head -n 1)"
+  port="$(echo "$dump" | sed -nE 's/^[[:space:]]*HTTPSPort[[:space:]]*:[[:space:]]*([0-9]+)$/\1/p' | head -n 1)"
+  enabled="$(echo "$dump" | sed -nE 's/^[[:space:]]*HTTPSEnable[[:space:]]*:[[:space:]]*([01])$/\1/p' | head -n 1)"
+  if [[ "$enabled" == "1" && -n "$host" && -n "$port" ]]; then
+    normalized="$(normalize_usage_proxy_value "http://$host:$port" || true)"
+    [[ -n "$normalized" ]] && echo "$normalized" && return 0
+  fi
+
+  host="$(echo "$dump" | sed -nE 's/^[[:space:]]*HTTPProxy[[:space:]]*:[[:space:]]*(.+)$/\1/p' | head -n 1)"
+  port="$(echo "$dump" | sed -nE 's/^[[:space:]]*HTTPPort[[:space:]]*:[[:space:]]*([0-9]+)$/\1/p' | head -n 1)"
+  enabled="$(echo "$dump" | sed -nE 's/^[[:space:]]*HTTPEnable[[:space:]]*:[[:space:]]*([01])$/\1/p' | head -n 1)"
+  if [[ "$enabled" == "1" && -n "$host" && -n "$port" ]]; then
+    normalized="$(normalize_usage_proxy_value "http://$host:$port" || true)"
+    [[ -n "$normalized" ]] && echo "$normalized" && return 0
+  fi
+
+  host="$(echo "$dump" | sed -nE 's/^[[:space:]]*SOCKSProxy[[:space:]]*:[[:space:]]*(.+)$/\1/p' | head -n 1)"
+  port="$(echo "$dump" | sed -nE 's/^[[:space:]]*SOCKSPort[[:space:]]*:[[:space:]]*([0-9]+)$/\1/p' | head -n 1)"
+  enabled="$(echo "$dump" | sed -nE 's/^[[:space:]]*SOCKSEnable[[:space:]]*:[[:space:]]*([01])$/\1/p' | head -n 1)"
+  if [[ "$enabled" == "1" && -n "$host" && -n "$port" ]]; then
+    normalized="$(normalize_usage_proxy_value "socks5://$host:$port" || true)"
+    [[ -n "$normalized" ]] && echo "$normalized" && return 0
+  fi
+
+  return 1
+}
+
+resolve_usage_proxy_with_source() {
+  local value
+
+  value="$(read_usage_proxy || true)"
+  if [[ -n "$value" ]]; then
+    printf 'manual\t%s\n' "$value"
+    return 0
+  fi
+
+  value="$(detect_usage_proxy_from_env || true)"
+  if [[ -n "$value" ]]; then
+    printf 'auto-env\t%s\n' "$value"
+    return 0
+  fi
+
+  value="$(detect_usage_proxy_from_system_macos || true)"
+  if [[ -n "$value" ]]; then
+    printf 'auto-system\t%s\n' "$value"
+    return 0
+  fi
+
+  return 1
+}
+
+set_usage_proxy() {
+  local value="$1"
+  local file tmp
+  file="$USAGE_PROXY_FILE"
+  tmp="${file}.tmp"
+  printf '%s\n' "$value" > "$tmp"
+  chmod 600 "$tmp" 2>/dev/null || true
+  mv "$tmp" "$file"
+}
+
+clear_usage_proxy() {
+  rm -f -- "$USAGE_PROXY_FILE"
+}
+
 set_current_env() {
   local target="$1"
   local env="$2"
@@ -567,19 +696,22 @@ app_stop_managed() {
 }
 
 metrics_script_path() {
-  local script_dir
-  script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-  echo "$script_dir/profile-metrics.py"
+  echo "$SCRIPT_DIR/profile-metrics.py"
 }
 
 collect_profile_metrics_tsv() {
   local account="$1"
   local auth_file="$2"
   local data_path="$3"
+  local usage_proxy="${4:-}"
   local script_path
   script_path="$(metrics_script_path)"
   [[ -f "$script_path" ]] || return 1
-  python3 "$script_path" --account-name "$account" --auth-file "$auth_file" --data-path "$data_path" 2>/dev/null
+  if [[ -n "$usage_proxy" ]]; then
+    python3 "$script_path" --account-name "$account" --auth-file "$auth_file" --data-path "$data_path" --usage-proxy "$usage_proxy" 2>/dev/null
+  else
+    python3 "$script_path" --account-name "$account" --auth-file "$auth_file" --data-path "$data_path" 2>/dev/null
+  fi
 }
 
 cmd_env_list() {
@@ -914,15 +1046,104 @@ cmd_account_current() {
   esac
 }
 
+cmd_proxy_show() {
+  local info source value
+  info="$(resolve_usage_proxy_with_source || true)"
+  if [[ -z "$info" ]]; then
+    echo "usage_api_proxy: off"
+    return 0
+  fi
+  IFS=$'\t' read -r source value <<< "$info"
+  case "$source" in
+    manual)
+      echo "usage_api_proxy: $value (manual)"
+      ;;
+    auto-env)
+      echo "usage_api_proxy: $value (auto:env)"
+      ;;
+    auto-system)
+      echo "usage_api_proxy: $value (auto:system)"
+      ;;
+    *)
+      echo "usage_api_proxy: $value"
+      ;;
+  esac
+}
+
+cmd_proxy_set() {
+  local raw="$1"
+  local normalized
+  normalized="$(normalize_usage_proxy_value "$raw")" || err "invalid proxy '$raw' (expected host:port or scheme://host:port)"
+  set_usage_proxy "$normalized"
+  log_event INFO "usage_proxy_set value=$normalized"
+  echo "Set usage API proxy: $normalized"
+}
+
+cmd_proxy_off() {
+  clear_usage_proxy
+  log_event INFO "usage_proxy_off"
+  echo "Manual usage API proxy disabled"
+}
+
+cmd_proxy_test() {
+  local proxy env_name account auth_file token body_file http_code body_preview info source
+  info="$(resolve_usage_proxy_with_source || true)"
+  [[ -n "$info" ]] || err "usage API proxy is off and no auto proxy detected. run: $SCRIPT_NAME proxy <host:port>"
+  IFS=$'\t' read -r source proxy <<< "$info"
+
+  env_name="$(read_current_env cli || true)"
+  account="$(read_current_account cli || true)"
+  auth_file="$(account_auth_path "$env_name" "$account")"
+  [[ -f "$auth_file" ]] || auth_file="$(env_home_path "$env_name")/auth.json"
+  [[ -f "$auth_file" ]] || err "auth.json not found for current CLI env/account: $env_name/$account"
+
+  token="$(python3 - "$auth_file" <<'PY'
+import json, sys
+path = sys.argv[1]
+try:
+    with open(path, "r", encoding="utf-8") as f:
+        data = json.load(f)
+    token = ((data.get("tokens") or {}).get("access_token") or "").strip()
+    print(token)
+except Exception:
+    print("")
+PY
+)"
+  [[ -n "$token" ]] || err "access_token missing in $auth_file"
+
+  body_file="$(mktemp /tmp/codex-sw-proxy-test.XXXXXX)"
+  http_code="$(HTTPS_PROXY="$proxy" HTTP_PROXY="$proxy" curl -sS -o "$body_file" -w '%{http_code}' \
+    -H "Authorization: Bearer $token" \
+    -H "Accept: application/json" \
+    -H "User-Agent: Mozilla/5.0" \
+    "$USAGE_API_ENDPOINT" || true)"
+  body_preview="$(head -c 160 "$body_file" 2>/dev/null || true)"
+  rm -f -- "$body_file"
+
+  if [[ "$http_code" == "200" ]]; then
+    echo "usage_api_proxy_test: ok (http=200, source=$source, proxy=$proxy, env/account=$env_name/$account)"
+    return 0
+  fi
+
+  echo "usage_api_proxy_test: failed (http=${http_code:-000}, source=$source, proxy=$proxy, env/account=$env_name/$account)" >&2
+  [[ -n "$body_preview" ]] && echo "response_preview: $body_preview" >&2
+  return 1
+}
+
 cmd_list() {
   local cli_env app_env cli_account app_account
   local env account marks auth_file home metrics
   local email plan usage_5h usage_weekly last_activity source
+  local usage_proxy="" usage_info="" usage_proxy_source=""
 
   cli_env="$(read_current_env cli || true)"
   app_env="$(read_current_env app || true)"
   cli_account="$(read_current_account cli || true)"
   app_account="$(read_current_account app || true)"
+  usage_info="$(resolve_usage_proxy_with_source || true)"
+  if [[ -n "$usage_info" ]]; then
+    IFS=$'\t' read -r usage_proxy_source usage_proxy <<< "$usage_info"
+  fi
 
   printf '%-12s %-30s %-44s %-10s %-16s %-18s %s\n' "ENV" "ACCOUNT" "EMAIL" "PLAN" "5H USAGE" "WEEKLY USAGE" "LAST ACTIVITY"
   while IFS= read -r env; do
@@ -931,13 +1152,19 @@ cmd_list() {
     local found=0
     while IFS= read -r account; do
       found=1
+      email=""
+      plan=""
+      usage_5h=""
+      usage_weekly=""
+      last_activity=""
+      source=""
       marks=""
       [[ "$env" == "$cli_env" && "$account" == "$cli_account" ]] && marks="${marks} [cli-current]"
       [[ "$env" == "$app_env" && "$account" == "$app_account" ]] && marks="${marks} [app-current]"
       auth_file="$(account_auth_path "$env" "$account")"
       [[ -f "$auth_file" ]] || auth_file="$home/auth.json"
 
-      metrics="$(collect_profile_metrics_tsv "$account" "$auth_file" "$home" || true)"
+      metrics="$(collect_profile_metrics_tsv "$account" "$auth_file" "$home" "$usage_proxy" || true)"
       if [[ -n "$metrics" ]]; then
         IFS=$'\t' read -r email plan usage_5h usage_weekly last_activity source <<< "$metrics"
       fi
@@ -954,7 +1181,13 @@ cmd_list() {
     done < <(list_accounts_for_env "$env")
 
     if [[ "$found" -eq 0 ]]; then
-      metrics="$(collect_profile_metrics_tsv "-" "$home/auth.json" "$home" || true)"
+      email=""
+      plan=""
+      usage_5h=""
+      usage_weekly=""
+      last_activity=""
+      source=""
+      metrics="$(collect_profile_metrics_tsv "-" "$home/auth.json" "$home" "$usage_proxy" || true)"
       if [[ -n "$metrics" ]]; then
         IFS=$'\t' read -r email plan usage_5h usage_weekly last_activity source <<< "$metrics"
       fi
@@ -1242,7 +1475,7 @@ cmd_init() {
       ;;
   esac
 
-  script_abs="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/$(basename "${BASH_SOURCE[0]}")"
+  script_abs="$SCRIPT_DIR/codex-switcher"
   target_link="$HOME/.local/bin/codex-sw"
   block_start="# >>> codex-sw init >>>"
   block_end="# <<< codex-sw init <<<"
@@ -1700,6 +1933,23 @@ main() {
           ;;
       esac
       ;;
+    proxy)
+      [[ "$#" -le 1 ]] || err "usage: $SCRIPT_NAME proxy [<host:port>|off|test]"
+      case "${1:-}" in
+        "")
+          cmd_proxy_show
+          ;;
+        off)
+          with_lock cmd_proxy_off
+          ;;
+        test)
+          cmd_proxy_test
+          ;;
+        *)
+          with_lock cmd_proxy_set "$1"
+          ;;
+      esac
+      ;;
     add)
       [[ "$#" -eq 1 ]] || err "usage: $SCRIPT_NAME add <account>"
       with_lock cmd_add "$1"

package/plugins/codex-switcher/scripts/profile-metrics.py

@@ -11,6 +11,10 @@ from typing import Any, Dict, Optional
 
 
 USAGE_ENDPOINT = "https://chatgpt.com/backend-api/wham/usage"
+DEFAULT_USER_AGENT = (
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) "
+    "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/135.0.0.0 Safari/537.36"
+)
 DASH = "-"
 KNOWN_PLANS = {"free", "plus", "pro", "team", "business", "enterprise", "edu"}
 
@@ -20,6 +24,7 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument("--account-name", required=True)
     parser.add_argument("--auth-file", required=True)
     parser.add_argument("--data-path", required=True)
+    parser.add_argument("--usage-proxy", default="")
     parser.add_argument("--timeout-seconds", type=int, default=4)
     return parser.parse_args()
 
@@ -165,7 +170,7 @@ def extract_windows_from_usage_blob(blob: Dict[str, Any]) -> Dict[int, Dict[str,
     return windows
 
 
-def request_usage(access_token: str, timeout_seconds: int) -> Optional[Dict[str, Any]]:
+def request_usage(access_token: str, account_id: str, usage_proxy: str, timeout_seconds: int) -> Optional[Dict[str, Any]]:
     if not access_token:
         return None
     cmd = [
@@ -177,15 +182,27 @@ def request_usage(access_token: str, timeout_seconds: int) -> Optional[Dict[str,
         str(max(2, timeout_seconds + 2)),
         "-H",
         f"Authorization: Bearer {access_token}",
-        USAGE_ENDPOINT,
+        "-H",
+        "Accept: application/json",
+        "-H",
+        f"User-Agent: {DEFAULT_USER_AGENT}",
     ]
+    if account_id:
+        cmd.extend(["-H", f"ChatGPT-Account-Id: {account_id}"])
+    cmd.append(USAGE_ENDPOINT)
     try:
+        env = os.environ.copy()
+        proxy = (usage_proxy or "").strip()
+        if proxy:
+            env["HTTPS_PROXY"] = proxy
+            env["HTTP_PROXY"] = proxy
         result = subprocess.run(
             cmd,
             check=False,
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
             text=True,
+            env=env,
         )
     except Exception:
         return None
@@ -276,8 +293,8 @@ def collect_local_metrics(data_path: str) -> Dict[str, Any]:
     return {"source": "local"}
 
 
-def collect_api_metrics(access_token: str, timeout_seconds: int) -> Optional[Dict[str, Any]]:
-    payload = request_usage(access_token, timeout_seconds)
+def collect_api_metrics(access_token: str, account_id: str, usage_proxy: str, timeout_seconds: int) -> Optional[Dict[str, Any]]:
+    payload = request_usage(access_token, account_id, usage_proxy, timeout_seconds)
     if not payload:
         return None
 
@@ -318,6 +335,9 @@ def main() -> int:
     access_token = tokens.get("access_token")
     if not isinstance(access_token, str):
         access_token = ""
+    account_id = tokens.get("account_id")
+    if not isinstance(account_id, str):
+        account_id = ""
     id_token = tokens.get("id_token")
     if not isinstance(id_token, str):
         id_token = ""
@@ -331,7 +351,7 @@ def main() -> int:
     if plan_from_claims == "unknown":
         plan_from_claims = normalize_plan(auth_data.get("chatgpt_plan_type") or auth_data.get("plan_type"))
 
-    api_metrics = collect_api_metrics(access_token, args.timeout_seconds)
+    api_metrics = collect_api_metrics(access_token, account_id, args.usage_proxy, args.timeout_seconds)
     metrics = api_metrics if api_metrics is not None else collect_local_metrics(args.data_path)
 
     windows = metrics.get("windows")

package/plugins/codex-switcher/scripts/test-switcher.sh

@@ -3,6 +3,7 @@ set -euo pipefail
 
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 SW="$ROOT/scripts/codex-sw"
+SW_LINK=""
 
 bash -n "$SW"
 
@@ -12,6 +13,8 @@ ENVS="$TMPBASE/envs"
 DEFAULT_HOME="$TMPBASE/default-home"
 BIN="$TMPBASE/bin"
 mkdir -p "$BIN" "$DEFAULT_HOME"
+SW_LINK="$BIN/codex-sw-link"
+ln -s "$SW" "$SW_LINK"
 
 cleanup() {
   pkill -f "$BIN/fake-codex-app" >/dev/null 2>&1 || true
@@ -63,6 +66,7 @@ cat > "$BIN/curl" <<'CURL'
 #!/usr/bin/env bash
 set -euo pipefail
 mode="${CODEX_SWITCHER_TEST_CURL_MODE:-success}"
+echo "proxy=${HTTPS_PROXY:-}" >> "${CODEX_SWITCHER_TEST_CURL_LOG:?}"
 if [[ "$mode" == "success" ]]; then
   cat <<'JSON'
 {"rate_limit":{"plan_type":"plus","primary_window":{"used_percent":40,"limit_window_seconds":18000,"reset_at":"2099-01-01T06:30:00Z"},"secondary_window":{"used_percent":20,"limit_window_seconds":604800,"reset_at":"2099-01-03T08:00:00Z"}},"last_activity_at":"2099-01-01T04:30:00Z"}
@@ -81,16 +85,26 @@ export CODEX_SWITCHER_ACCOUNTS_DIR="$STATE/env-accounts"
 export CODEX_SWITCHER_APP_BIN="$BIN/fake-codex-app"
 export CODEX_SWITCHER_LOCK_WAIT_SECONDS=2
 export CODEX_SWITCHER_DEFAULT_HOME="$DEFAULT_HOME"
+export CODEX_SWITCHER_DISABLE_SYSTEM_PROXY_DETECT=true
 export CODEX_SWITCHER_TEST_NPM_LOG="$TMPBASE/npm-args.log"
 export CODEX_SWITCHER_TEST_CODEX_LOG="$TMPBASE/codex-args.log"
+export CODEX_SWITCHER_TEST_CURL_LOG="$TMPBASE/curl-args.log"
 export CODEX_SWITCHER_TEST_CURL_MODE="success"
+unset HTTPS_PROXY https_proxy HTTP_PROXY http_proxy ALL_PROXY all_proxy
 : > "$CODEX_SWITCHER_TEST_CODEX_LOG"
+: > "$CODEX_SWITCHER_TEST_CURL_LOG"
 
 echo '{"memo":"persist"}' > "$DEFAULT_HOME/shared.json"
 
 check_out="$("$SW" check)"
 echo "$check_out" | grep -Eq '^version: [0-9]+\.[0-9]+\.[0-9]+$'
 echo "$check_out" | grep -q "check: ok"
+link_check_out="$("$SW_LINK" check)"
+echo "$link_check_out" | grep -Eq '^version: [0-9]+\.[0-9]+\.[0-9]+$'
+echo "$link_check_out" | grep -q "check: ok"
+[[ "$("$SW" proxy)" == "usage_api_proxy: off" ]]
+"$SW" proxy 127.0.0.1:7899
+[[ "$("$SW" proxy)" == "usage_api_proxy: http://127.0.0.1:7899 (manual)" ]]
 init_out="$("$SW" init --dry-run)"
 echo "$init_out" | grep -q "\[dry-run\]"
 "$SW" upgrade
@@ -170,16 +184,33 @@ grep -q "(personal)personal@example.com" /tmp/codex_sw_list_api
 grep -q "(api)" /tmp/codex_sw_list_api
 grep -q "60% (" /tmp/codex_sw_list_api
 grep -q "80% (" /tmp/codex_sw_list_api
+grep -q "proxy=http://127.0.0.1:7899" "$CODEX_SWITCHER_TEST_CURL_LOG"
+
+"$SW_LINK" list >/tmp/codex_sw_list_symlink
+grep -q "(personal)personal@example.com" /tmp/codex_sw_list_symlink
+grep -q "(api)" /tmp/codex_sw_list_symlink
 
 mkdir -p "$ENVS/project/home/sessions/2026/04/12"
 cat > "$ENVS/project/home/sessions/2026/04/12/rollout-test.jsonl" <<'JSONL'
 {"timestamp":"2026-04-12T09:00:00Z","type":"event_msg","payload":{"type":"token_count","rate_limits":{"plan_type":"business","primary":{"used_percent":25,"window_minutes":300,"resets_at":1776004200},"secondary":{"used_percent":70,"window_minutes":10080,"resets_at":1776519000}}}}
 JSONL
 export CODEX_SWITCHER_TEST_CURL_MODE="fail"
+"$SW" proxy off
+[[ "$("$SW" proxy)" == "usage_api_proxy: off" ]]
+: > "$CODEX_SWITCHER_TEST_CURL_LOG"
 "$SW" list >/tmp/codex_sw_list_local
 grep -q "(local)" /tmp/codex_sw_list_local
 grep -q "75% (" /tmp/codex_sw_list_local
 grep -q "30% (" /tmp/codex_sw_list_local
+grep -q "^proxy=$" "$CODEX_SWITCHER_TEST_CURL_LOG"
+
+export CODEX_SWITCHER_TEST_CURL_MODE="success"
+export HTTPS_PROXY="http://10.10.10.10:18080"
+[[ "$("$SW" proxy)" == "usage_api_proxy: http://10.10.10.10:18080 (auto:env)" ]]
+: > "$CODEX_SWITCHER_TEST_CURL_LOG"
+"$SW" list >/tmp/codex_sw_list_auto_env
+grep -q "proxy=http://10.10.10.10:18080" "$CODEX_SWITCHER_TEST_CURL_LOG"
+unset HTTPS_PROXY
 
 "$SW" app status >/tmp/codex_sw_app_status_1
 [[ "$?" -eq 0 ]]