@wangxt0223/codex-switcher 0.6.0 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 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.1",
   "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/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}"
@@ -85,9 +98,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)"
@@ -567,9 +579,7 @@ 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() {
@@ -931,6 +941,12 @@ 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]"
@@ -954,6 +970,12 @@ cmd_list() {
     done < <(list_accounts_for_env "$env")
 
     if [[ "$found" -eq 0 ]]; then
+      email=""
+      plan=""
+      usage_5h=""
+      usage_weekly=""
+      last_activity=""
+      source=""
       metrics="$(collect_profile_metrics_tsv "-" "$home/auth.json" "$home" || true)"
       if [[ -n "$metrics" ]]; then
         IFS=$'\t' read -r email plan usage_5h usage_weekly last_activity source <<< "$metrics"
@@ -1242,7 +1264,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 <<<"

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"}
 
@@ -165,7 +169,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, timeout_seconds: int) -> Optional[Dict[str, Any]]:
     if not access_token:
         return None
     cmd = [
@@ -177,8 +181,14 @@ 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:
         result = subprocess.run(
             cmd,
@@ -276,8 +286,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, timeout_seconds: int) -> Optional[Dict[str, Any]]:
+    payload = request_usage(access_token, account_id, timeout_seconds)
     if not payload:
         return None
 
@@ -318,6 +328,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 +344,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.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
@@ -91,6 +94,9 @@ 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"
 init_out="$("$SW" init --dry-run)"
 echo "$init_out" | grep -q "\[dry-run\]"
 "$SW" upgrade
@@ -171,6 +177,10 @@ grep -q "(api)" /tmp/codex_sw_list_api
 grep -q "60% (" /tmp/codex_sw_list_api
 grep -q "80% (" /tmp/codex_sw_list_api
 
+"$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}}}}