@wangxt0223/codex-switcher 0.6.1 → 0.6.3

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## 0.6.3 - 2026-04-12
+
+- Changed `list` email rendering to show plain email only (removed `(account)` prefix).
+- Reworked root Chinese/English README command reference into full command tables based on current capabilities.
+- Updated smoke-test assertions for the new email column format.
+
+## 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.

package/README.en.md

@@ -63,7 +63,49 @@ codex-switcher account use corp --env project-a
 
 ## Command reference
 
-See plugin guide:
+Commands below use `codex-sw` (all are equivalent under `codex-switcher`):
+
+| Category | Command | Description |
+| --- | --- | --- |
+| Env | `codex-sw env list` | List all envs with CLI/App current markers |
+| Env | `codex-sw env create <env> [--empty\|--from-default\|--from-env <src>]` | Create env from empty/default/another env |
+| Env | `codex-sw env use <env> [--target cli\|app\|both]` | Switch env pointer for CLI/App |
+| Env | `codex-sw env remove <env> [--force]` | Remove env |
+| Env | `codex-sw env current [cli\|app]` | Show current env pointer |
+| Env | `codex-sw env path [env]` | Print exportable `CODEX_HOME` path |
+| Account | `codex-sw account list [--env <env>]` | List accounts in env with current markers |
+| Account | `codex-sw account add <account> [--env <env>]` | Add account slot |
+| Account | `codex-sw account remove <account> [--env <env>] [--force]` | Remove account slot |
+| Account | `codex-sw account login <account> [--env <env>] [--target cli\|app\|both] [--sync\|--no-sync]` | Login account and persist auth |
+| Account | `codex-sw account use <account> [--env <env>] [--target cli\|app\|both] [--sync\|--no-sync]` | Switch to account |
+| Account | `codex-sw account logout [account] [--env <env>] [--target cli\|app\|both]` | Logout account |
+| Account | `codex-sw account current [cli\|app]` | Show current env/account pointer |
+| Usage proxy | `codex-sw proxy [<host:port>\|off\|test]` | Configure/test usage API proxy (only affects `list`) |
+| Query/Run | `codex-sw list` | Show `ENV/ACCOUNT/EMAIL/PLAN/5H/WEEKLY/LAST ACTIVITY` |
+| Query/Run | `codex-sw status` | Show login status for current CLI/App pointers |
+| Query/Run | `codex-sw current [cli\|app]` | Show current env/account |
+| Query/Run | `codex-sw exec -- <codex args...>` | Run `codex` under current CLI env/account |
+| Compat | `codex-sw login [account] [--sync\|--no-sync]` | Compatibility alias for CLI login |
+| Compat | `codex-sw logout [account]` | Compatibility alias for CLI logout |
+| Compat | `codex-sw use <account> [--sync\|--no-sync] [--launch\|--no-launch] [-- <codex args...>]` | Compatibility alias for CLI switch |
+| Compat | `codex-sw switch <account> [--sync\|--no-sync] [--launch\|--no-launch] [-- <codex args...>]` | Same as `use` |
+| Compat | `codex-sw add <account>` | Compatibility alias for `account add` |
+| Compat | `codex-sw remove <account> [--force]` | Compatibility alias for `account remove` |
+| Compat | `codex-sw import-default <env> [--with-auth] [--force]` | Import default env data into target env |
+| App | `codex-sw app open [account] [-- <app args...>]` | Open Codex App under account |
+| App | `codex-sw app use <account> [-- <app args...>]` | Switch App account (alias of open) |
+| App | `codex-sw app logout [account]` | Logout App account |
+| App | `codex-sw app status` | Show managed App process status |
+| App | `codex-sw app stop` | Stop managed App process |
+| App | `codex-sw app current` | Show current App env/account |
+| Maintenance | `codex-sw init [--shell zsh\|bash] [--dry-run]` | Initialize PATH bootstrap |
+| Maintenance | `codex-sw upgrade [--dry-run]` | Upgrade from npm |
+| Maintenance | `codex-sw recover [--dry-run]` | Recover corrupted pointers |
+| Maintenance | `codex-sw check` | Basic health checks |
+| Maintenance | `codex-sw doctor [--fix]` | Deep diagnostics and optional auto-fix |
+| Maintenance | `codex-sw --help` | Show full help |
+
+Plugin-level docs:
 - Chinese: `plugins/codex-switcher/README.md`
 - English: `plugins/codex-switcher/README.en.md`
 

package/README.md

@@ -60,7 +60,49 @@ codex-switcher account use corp --env project-a
 
 ## 命令参考
 
-完整命令说明请查看插件文档：
+以下以 `codex-sw` 为例（`codex-switcher` 为等价兼容命令）：
+
+| 分类 | 命令 | 说明 |
+| --- | --- | --- |
+| Env 管理 | `codex-sw env list` | 列出所有 env，并标记 CLI/App 当前 env |
+| Env 管理 | `codex-sw env create <env> [--empty\|--from-default\|--from-env <src>]` | 创建 env（空目录或从已有 env 同步数据） |
+| Env 管理 | `codex-sw env use <env> [--target cli\|app\|both]` | 切换 CLI/App 使用的 env |
+| Env 管理 | `codex-sw env remove <env> [--force]` | 删除 env（必要时强制） |
+| Env 管理 | `codex-sw env current [cli\|app]` | 查看当前 env 指针 |
+| Env 管理 | `codex-sw env path [env]` | 输出 env 对应 `CODEX_HOME` 导出语句 |
+| 账号管理 | `codex-sw account list [--env <env>]` | 列出 env 下账号并标记当前账号 |
+| 账号管理 | `codex-sw account add <account> [--env <env>]` | 创建账号槽位（不登录） |
+| 账号管理 | `codex-sw account remove <account> [--env <env>] [--force]` | 删除账号槽位 |
+| 账号管理 | `codex-sw account login <account> [--env <env>] [--target cli\|app\|both] [--sync\|--no-sync]` | 在目标 env 登录并保存账号 `auth.json` |
+| 账号管理 | `codex-sw account use <account> [--env <env>] [--target cli\|app\|both] [--sync\|--no-sync]` | 切换到目标账号 |
+| 账号管理 | `codex-sw account logout [account] [--env <env>] [--target cli\|app\|both]` | 注销账号（删除对应 auth） |
+| 账号管理 | `codex-sw account current [cli\|app]` | 查看当前 env/account 指针 |
+| 用量代理 | `codex-sw proxy [<host:port>\|off\|test]` | 设置/关闭/测试“用量 API”代理（仅影响 `list`） |
+| 查询执行 | `codex-sw list` | 展示 `ENV/ACCOUNT/EMAIL/PLAN/5H/WEEKLY/LAST ACTIVITY` |
+| 查询执行 | `codex-sw status` | 检查 CLI/App 当前登录状态 |
+| 查询执行 | `codex-sw current [cli\|app]` | 查看当前 env/account |
+| 查询执行 | `codex-sw exec -- <codex args...>` | 在当前 CLI env/account 下执行 `codex` |
+| 兼容命令 | `codex-sw login [account] [--sync\|--no-sync]` | 登录当前 CLI 账号（兼容入口） |
+| 兼容命令 | `codex-sw logout [account]` | 注销当前 CLI 账号（兼容入口） |
+| 兼容命令 | `codex-sw use <account> [--sync\|--no-sync] [--launch\|--no-launch] [-- <codex args...>]` | 切换 CLI 账号（兼容入口） |
+| 兼容命令 | `codex-sw switch <account> [--sync\|--no-sync] [--launch\|--no-launch] [-- <codex args...>]` | `use` 的等价命令 |
+| 兼容命令 | `codex-sw add <account>` | `account add` 的兼容入口 |
+| 兼容命令 | `codex-sw remove <account> [--force]` | `account remove` 的兼容入口 |
+| 兼容命令 | `codex-sw import-default <env> [--with-auth] [--force]` | 从默认 env 导入数据到指定 env |
+| App 管理 | `codex-sw app open [account] [-- <app args...>]` | 以指定账号打开 Codex App |
+| App 管理 | `codex-sw app use <account> [-- <app args...>]` | 切换 App 到指定账号（内部等价于 open） |
+| App 管理 | `codex-sw app logout [account]` | 注销 App 当前账号 |
+| App 管理 | `codex-sw app status` | 查看 App 管理进程状态 |
+| App 管理 | `codex-sw app stop` | 停止由工具托管启动的 App 进程 |
+| App 管理 | `codex-sw app current` | 查看 App 当前 env/account |
+| 维护命令 | `codex-sw init [--shell zsh\|bash] [--dry-run]` | 初始化 PATH 快捷命令 |
+| 维护命令 | `codex-sw upgrade [--dry-run]` | 升级到最新 npm 版本 |
+| 维护命令 | `codex-sw recover [--dry-run]` | 自动恢复损坏指针 |
+| 维护命令 | `codex-sw check` | 基础健康检查 |
+| 维护命令 | `codex-sw doctor [--fix]` | 深度检查并可选自动修复 |
+| 维护命令 | `codex-sw --help` | 查看完整帮助 |
+
+插件侧详细说明：
 
 - 中文：`plugins/codex-switcher/README.md`
 - English：`plugins/codex-switcher/README.en.md`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wangxt0223/codex-switcher",
-  "version": "0.6.1",
+  "version": "0.6.3",
   "description": "Env + account switcher for Codex CLI and Codex App with shared env data and per-account auth.",
   "license": "MIT",
   "author": "wangxt",

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-switcher

@@ -28,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'
@@ -47,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]
@@ -79,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
@@ -197,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"
@@ -586,10 +703,15 @@ 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() {
@@ -924,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
@@ -953,7 +1164,7 @@ cmd_list() {
       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
@@ -976,7 +1187,7 @@ cmd_list() {
       usage_weekly=""
       last_activity=""
       source=""
-      metrics="$(collect_profile_metrics_tsv "-" "$home/auth.json" "$home" || true)"
+      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
@@ -1722,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

@@ -24,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()
 
@@ -169,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, account_id: 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 = [
@@ -190,12 +191,18 @@ def request_usage(access_token: str, account_id: str, timeout_seconds: int) -> O
         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
@@ -286,8 +293,8 @@ def collect_local_metrics(data_path: str) -> Dict[str, Any]:
     return {"source": "local"}
 
 
-def collect_api_metrics(access_token: str, account_id: str, timeout_seconds: int) -> Optional[Dict[str, Any]]:
-    payload = request_usage(access_token, account_id, 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
 
@@ -344,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, account_id, 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")
@@ -371,9 +378,9 @@ def main() -> int:
     last_activity = format_relative(last_activity_epoch, now_epoch)
 
     if email:
-        display_email = f"({args.account_name}){email}"
+        display_email = email
     else:
-        display_email = f"({args.account_name})-"
+        display_email = "-"
 
     out_fields = [
         display_email,

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

@@ -66,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"}
@@ -84,10 +85,14 @@ 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"
 
@@ -97,6 +102,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
@@ -172,13 +180,14 @@ grep -q "PLAN" /tmp/codex_sw_list_api
 grep -q "5H USAGE" /tmp/codex_sw_list_api
 grep -q "WEEKLY USAGE" /tmp/codex_sw_list_api
 grep -q "LAST ACTIVITY" /tmp/codex_sw_list_api
-grep -q "(personal)personal@example.com" /tmp/codex_sw_list_api
+grep -q "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 "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"
@@ -186,10 +195,22 @@ 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 ]]