@dst-justin/relay 2.3.0 → 2.4.0

package/README.md

@@ -1,4 +1,4 @@
-# relay
+<p align="center"><img src="assets/banner.png" alt="relay" width="600"></p>
 
 A lightweight CLI tool for switching between multiple Claude Code accounts instantly.
 
@@ -226,6 +226,39 @@ Warmup requires the autoswitch daemon to be running (`relay autoswitch start`) t
 }
 ```
 
+## LiteLLM providers
+
+Beyond subscription accounts, relay can route Claude Code through a [LiteLLM](https://docs.litellm.ai/) proxy — useful for supplementing subscription usage with other model providers.
+
+```bash
+relay provider add mylitellm --base-url http://localhost:4000 --token sk-your-litellm-key [--model claude-sonnet-4-5] [--discover-models]
+relay provider list
+relay provider use mylitellm   # routes every future `claude` launch through it
+relay provider off             # stop routing, subscription account resumes
+relay provider remove mylitellm
+```
+
+`--discover-models` lets Claude Code's `/model` picker show every model configured in your LiteLLM proxy's `config.yaml`, switchable live mid-session.
+
+For a one-off session on a specific account or provider, without touching any global state:
+
+```bash
+relay run mylitellm -- -p "say hi"   # or any claude args
+relay run work                       # same as relay work, then claude
+```
+
+Minimal LiteLLM `config.yaml`:
+```yaml
+model_list:
+  - model_name: claude-sonnet-4-5
+    litellm_params:
+      model: openai/gpt-4o
+      api_key: os.environ/OPENAI_API_KEY
+
+general_settings:
+  master_key: sk-your-litellm-master-key
+```
+
 ## How It Works
 
 relay stores a snapshot of each account's OAuth credentials in `~/.claude-relay/credentials/`. Switching writes the target account's credentials back into the store that Claude Code reads from.
@@ -255,6 +288,18 @@ Sessions live in `~/.claude/projects/` and are shared across all accounts — af
 
 ## Changelog
 
+### v2.4.0 — 2026-07-25
+- Add LiteLLM provider support: `relay provider add/list/use/off/remove` routes Claude Code through a LiteLLM proxy instead of a subscription account, via `${CLAUDE_DIR}/settings.json`'s env block (never touches Keychain/credentials).
+- Add `relay run <name>` for a one-off session pinned to a specific account or provider, independent of any global switch.
+
+### v2.3.1 — 2026-07-12
+- Fix: autoswitch daemon now auto-redeploys and restarts after relay itself is updated — previously the daemon file was only regenerated by `relay autoswitch start`, so an already-running daemon would silently keep running stale code (missing new features and previously-fixed bugs) until manually restarted
+- Fix: `relay reorder` no longer drops accounts omitted from the typed order — they're now appended in their prior relative order instead of being silently removed from autoswitch rotation
+- Fix: autoswitch reorder wizard no longer discards a typed order; supports concatenated digit shorthand (e.g. `231`)
+- Add: standalone `relay reorder` command
+- Fix: lock/warmup auto-default configs, autoswitch daemon auto-default order, and `render_table` all respect the persisted account order file instead of falling back to alphabetical sort
+- Fix: account order file stays in sync on add/save/remove/rename
+
 ### v2.3.0 — 2026-07-10
 - Add scheduled warmup: `relay warmup add/remove/list/pause/resume` to pre-warm a 5hr session at set times
 - Daemon warmup engine (`check_warmup`/`do_warmup`) fires scheduled warmups; always pings (`claude -p ping`) on fire rather than skipping when the account looks "already active" — an idle-overnight account was silently missing its pre-warm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dst-justin/relay",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Multi-account switcher for Claude Code — instant credential swap across macOS, Linux, and Windows",
   "bin": {
     "relay": "./relay.js"

package/relay

@@ -14,8 +14,12 @@ META_STORE="${RELAY_DIR}/meta"
 CURRENT_FILE="${RELAY_DIR}/current"
 ORDER_FILE="${RELAY_DIR}/order"
 UPDATE_CACHE="${RELAY_DIR}/.update_cache"
+PROVIDERS_STORE="${RELAY_DIR}/providers"
+ACTIVE_PROVIDER_FILE="${RELAY_DIR}/active_provider"
+SETTINGS_ENV_SNAPSHOT="${RELAY_DIR}/settings_env_snapshot.json"
 CLAUDE_DIR="${HOME}/.claude"
 CLAUDE_JSON="${HOME}/.claude.json"
+CLAUDE_SETTINGS="${CLAUDE_DIR}/settings.json"
 REAL_CLAUDE=$(command -v claude 2>/dev/null || echo "")
 # macOS: /usr/bin/python3 uses the system TLS stack (correct certs);
 # /usr/local/bin/python3 (Homebrew/standalone) often lacks bundled certs → SSL failures
@@ -90,8 +94,8 @@ with open(lockfile, "a") as f:
   return "${status}"
 }
 
-mkdir -p "${CREDS_STORE}" "${META_STORE}" "${CLAUDE_DIR}"
-chmod 700 "${RELAY_DIR}" "${CREDS_STORE}" 2>/dev/null || true
+mkdir -p "${CREDS_STORE}" "${META_STORE}" "${PROVIDERS_STORE}" "${CLAUDE_DIR}"
+chmod 700 "${RELAY_DIR}" "${CREDS_STORE}" "${PROVIDERS_STORE}" 2>/dev/null || true
 
 [[ -z "${PY}" ]] && { err "python3 is required"; exit 1; }
 
@@ -100,6 +104,29 @@ account_creds()  { echo "${CREDS_STORE}/$1.json"; }
 account_meta()   { echo "${META_STORE}/$1"; }
 account_exists() { [[ -f "$(account_creds "$1")" ]]; }
 
+provider_file()   { echo "${PROVIDERS_STORE}/$1.json"; }
+provider_exists() { [[ -f "$(provider_file "$1")" ]]; }
+active_provider_name() { [[ -f "${ACTIVE_PROVIDER_FILE}" ]] && cat "${ACTIVE_PROVIDER_FILE}" || echo ""; }
+
+# list providers alphabetically, one per line (bash 3.2 compatible)
+list_provider_names() {
+  local f
+  for f in "${PROVIDERS_STORE}"/*.json; do
+    [[ -f "${f}" ]] || continue
+    basename "${f}" .json
+  done | sort
+}
+
+# read one string field from a provider's JSON file; "" if absent
+_provider_field() {
+  "${PY}" -c 'import json,sys; print(json.load(open(sys.argv[1])).get(sys.argv[2],"") or "")' "$(provider_file "$1")" "$2"
+}
+
+# "1" if the provider has discover_models truthy, else ""
+_provider_discover() {
+  "${PY}" -c 'import json,sys; print("1" if json.load(open(sys.argv[1])).get("discover_models") else "")' "$(provider_file "$1")"
+}
+
 # list accounts in canonical add-order, one per line (bash 3.2 compatible).
 # Self-healing: drops names whose credential file is gone, appends any
 # credential file not yet tracked (alphabetically), and rewrites ORDER_FILE.
@@ -141,6 +168,86 @@ list_account_names() {
   fi
 }
 
+# append name to ORDER_FILE if not already tracked (used by add/save)
+add_to_order() {
+  local name="$1"
+  touch "${ORDER_FILE}"
+  grep -Fxq "${name}" "${ORDER_FILE}" 2>/dev/null && return 0
+  echo "${name}" >> "${ORDER_FILE}"
+}
+
+# remove name's line from ORDER_FILE (used by remove)
+remove_from_order() {
+  local name="$1"
+  [[ -f "${ORDER_FILE}" ]] || return 0
+  local tmp="${ORDER_FILE}.tmp.$$"
+  grep -Fxv "${name}" "${ORDER_FILE}" > "${tmp}" 2>/dev/null || : > "${tmp}"
+  mv "${tmp}" "${ORDER_FILE}"
+}
+
+# rename a tracked entry in place, preserving its position (used by rename)
+rename_in_order() {
+  local old="$1" new="$2"
+  [[ -f "${ORDER_FILE}" ]] || return 0
+  local tmp="${ORDER_FILE}.tmp.$$"
+  awk -v old="${old}" -v new="${new}" '{ print ($0 == old) ? new : $0 }' "${ORDER_FILE}" > "${tmp}"
+  mv "${tmp}" "${ORDER_FILE}"
+}
+
+# interactive numbered reorder picker. Prints the account list + prompt to
+# stderr (so it's visible even when the caller captures stdout), reads one
+# line from stdin, resolves it to a comma-joined order, and echoes that
+# order to stdout for the caller to capture.
+prompt_reorder() {
+  local accounts=("$@")
+  echo "" >&2
+  printf "  ${D}When an account hits its threshold, relay switches to the next one in order.${R}\n\n" >&2
+  local i=1 acct
+  for acct in "${accounts[@]}"; do
+    printf "    ${D}%d${R}  %s\n" "${i}" "${acct}" >&2
+    i=$((i+1))
+  done
+  echo "" >&2
+  printf "  ${D}Type numbers in the order you want  (e.g. ${CY}2 1${D}, or ${CY}21${D} for <=9 accounts, or Enter to keep the order above):${R}\n" >&2
+  printf "  > " >&2
+  read -r order_input
+
+  local order_str; order_str=$("${PY}" - "${order_input}" "${accounts[@]}" <<'PYEOF'
+import sys, re
+raw = sys.argv[1].strip()
+accts = sys.argv[2:]
+if not raw:
+    result = accts
+elif raw.isdigit() and not re.search(r'[\s,]', raw) and len(accts) <= 9:
+    # concatenated shorthand, e.g. "312" -> [3, 1, 2], only unambiguous for <=9 accounts
+    result = []
+    for ch in raw:
+        idx = int(ch) - 1
+        if 0 <= idx < len(accts):
+            result.append(accts[idx])
+else:
+    tokens = re.split(r'[\s,]+', raw)
+    result = []
+    for t in tokens:
+        t = t.strip()
+        if t.isdigit():
+            idx = int(t) - 1
+            if 0 <= idx < len(accts):
+                result.append(accts[idx])
+        elif t:
+            result.append(t)
+print(','.join(result))
+PYEOF
+)
+
+  local chain; chain=$(echo "${order_str}" | "${PY}" -c "
+import sys; names=sys.stdin.read().strip().split(',')
+print(' -> '.join(names) + ' -> (cycle)')")
+  printf "  ${D}Order: ${CY}%s${R}\n" "${chain}" >&2
+
+  echo "${order_str}"
+}
+
 account_by_index() {
   local idx="$1" i=1 name
   while IFS= read -r name; do
@@ -186,6 +293,145 @@ require_claude() {
   exit 1
 }
 
+# Fully replace the 4 managed keys with exactly the given KEY=VALUE pairs.
+# Snapshots the pre-relay original values/absences the first time this is
+# called since the last full restore (SETTINGS_ENV_SNAPSHOT doesn't exist).
+# Assumes the caller already holds the credential lock.
+_settings_env_activate_locked() {
+  RELAY_SETTINGS_PATH="${CLAUDE_SETTINGS}" \
+  RELAY_SNAPSHOT_PATH="${SETTINGS_ENV_SNAPSHOT}" \
+  RELAY_ENV_PAIRS="$(printf '%s\n' "$@")" \
+  "${PY}" <<'EOF'
+import json, os, sys, tempfile
+
+MANAGED = ["ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN", "ANTHROPIC_MODEL", "CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY"]
+
+def load_json(p, default):
+    if not os.path.exists(p):
+        return default
+    raw = open(p).read().strip()
+    return json.loads(raw) if raw else default
+
+def atomic_write(p, data, mode=0o600):
+    d = os.path.dirname(p) or "."
+    fd, tmp = tempfile.mkstemp(dir=d, prefix=".relay-tmp-")
+    try:
+        with os.fdopen(fd, "w") as f:
+            json.dump(data, f, indent=2)
+            f.write("\n")
+        os.chmod(tmp, mode)
+        os.replace(tmp, p)
+    except Exception:
+        try:
+            os.unlink(tmp)
+        except OSError:
+            pass
+        raise
+
+path = os.environ["RELAY_SETTINGS_PATH"]
+snapshot_path = os.environ["RELAY_SNAPSHOT_PATH"]
+pairs = [p for p in os.environ.get("RELAY_ENV_PAIRS", "").split("\n") if p]
+
+try:
+    data = load_json(path, {})
+except json.JSONDecodeError as e:
+    print(f"settings.json is not valid JSON: {e}", file=sys.stderr)
+    sys.exit(1)
+if not isinstance(data, dict):
+    print("settings.json root is not a JSON object", file=sys.stderr)
+    sys.exit(1)
+
+env = data.get("env")
+if not isinstance(env, dict):
+    env = {}
+
+if not os.path.exists(snapshot_path):
+    snapshot = {k: env.get(k) for k in MANAGED}
+    atomic_write(snapshot_path, snapshot, 0o600)
+
+for k in MANAGED:
+    env.pop(k, None)
+for pair in pairs:
+    k, _, v = pair.partition("=")
+    env[k] = v
+data["env"] = env
+atomic_write(path, data, 0o600)
+EOF
+}
+_settings_env_activate() { with_credential_lock _settings_env_activate_locked "$@"; }
+
+# Restore the snapshotted values/absences for the 4 managed keys (or clear
+# them if no snapshot exists, as a defensive fallback), then delete the
+# snapshot. Assumes the caller already holds the credential lock.
+_settings_env_restore_locked() {
+  "${PY}" - "${CLAUDE_SETTINGS}" "${SETTINGS_ENV_SNAPSHOT}" <<'EOF'
+import json, os, sys, tempfile
+
+MANAGED = ["ANTHROPIC_BASE_URL", "ANTHROPIC_AUTH_TOKEN", "ANTHROPIC_MODEL", "CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY"]
+
+def load_json(p, default):
+    if not os.path.exists(p):
+        return default
+    raw = open(p).read().strip()
+    return json.loads(raw) if raw else default
+
+def atomic_write(p, data, mode=0o600):
+    d = os.path.dirname(p) or "."
+    fd, tmp = tempfile.mkstemp(dir=d, prefix=".relay-tmp-")
+    try:
+        with os.fdopen(fd, "w") as f:
+            json.dump(data, f, indent=2)
+            f.write("\n")
+        os.chmod(tmp, mode)
+        os.replace(tmp, p)
+    except Exception:
+        try:
+            os.unlink(tmp)
+        except OSError:
+            pass
+        raise
+
+path, snapshot_path = sys.argv[1], sys.argv[2]
+
+try:
+    data = load_json(path, {})
+except json.JSONDecodeError as e:
+    print(f"settings.json is not valid JSON: {e}", file=sys.stderr)
+    sys.exit(1)
+if not isinstance(data, dict):
+    print("settings.json root is not a JSON object", file=sys.stderr)
+    sys.exit(1)
+
+env = data.get("env")
+if not isinstance(env, dict):
+    env = {}
+
+changed = False
+if os.path.exists(snapshot_path):
+    snapshot = load_json(snapshot_path, {})
+    for k in MANAGED:
+        v = snapshot.get(k)
+        if v is None:
+            changed = env.pop(k, None) is not None or changed
+        else:
+            changed = env.get(k) != v or changed
+            env[k] = v
+else:
+    for k in MANAGED:
+        if k in env:
+            del env[k]
+            changed = True
+
+if changed:
+    data["env"] = env
+    atomic_write(path, data, 0o600)
+
+if os.path.exists(snapshot_path):
+    os.unlink(snapshot_path)
+EOF
+}
+_settings_env_restore() { with_credential_lock _settings_env_restore_locked; }
+
 # ══════════════════════════════════════════════════════════════════
 # Python core: parallel usage fetch + table rendering
 # args: <mode: quick|full> <creds_dir> <meta_dir> <current_name> [--no-usage]
@@ -228,7 +474,24 @@ def reset_in(iso):
     except Exception:
         return '—'
 
-names = sorted(os.path.basename(p)[:-5] for p in glob.glob(os.path.join(creds_dir, '*.json')))
+def read_order(creds_dir):
+    relay_dir = os.path.dirname(creds_dir)
+    order_file = os.path.join(relay_dir, 'order')
+    on_disk = set(f[:-5] for f in os.listdir(creds_dir) if f.endswith('.json')) if os.path.isdir(creds_dir) else set()
+    ordered = []
+    if os.path.exists(order_file):
+        for line in open(order_file):
+            n = line.strip()
+            if n in on_disk and n not in ordered:
+                ordered.append(n)
+    for n in sorted(on_disk):
+        if n not in ordered:
+            ordered.append(n)
+    with open(order_file, 'w') as f:
+        f.write('\n'.join(ordered) + ('\n' if ordered else ''))
+    return ordered
+
+names = read_order(creds_dir)
 if not names:
     print(f'  \033[33m⚠\033[0m No accounts yet. Run: {B}relay add <name>{R}')
     sys.exit(0)
@@ -424,6 +687,11 @@ _do_switch_locked() {
   local name="$1"
   local current; current=$(current_name)
 
+  if [[ -n "$(active_provider_name)" ]]; then
+    _settings_env_restore_locked
+    rm -f "${ACTIVE_PROVIDER_FILE}"
+  fi
+
   if [[ "${current}" == "${name}" ]]; then
     ok "Already on account '${B}${name}${R}'"
     return 0
@@ -463,8 +731,16 @@ _sync_current_creds() {
   [[ -n "${live}" ]] && printf '%s' "${live}" > "$(account_creds "${cur}")"
 }
 
+_provider_banner() {
+  local active; active=$(active_provider_name)
+  [[ -z "${active}" ]] && return 0
+  local base_url; base_url=$(_provider_field "${active}" base_url)
+  printf "\n  ${YL}⚡ litellm:${R} ${B}%s${R} ${D}(%s)${R}\n" "${active}" "${base_url}"
+}
+
 cmd_quick() {
   _check_update_bg
+  _provider_banner
   _sync_current_creds
   render_table quick "${CREDS_STORE}" "${META_STORE}" "$(current_name)" "$@"
   _show_update_notice
@@ -510,6 +786,7 @@ cmd_list() {
 }
 
 _cmd_status_once() {
+  _provider_banner
   _sync_current_creds
   local current; current=$(current_name)
   hdr "Current Status"
@@ -687,12 +964,203 @@ PYEOF
   fi
 }
 
+cmd_provider_add() {
+  local name="${1:-}"
+  [[ -z "${name}" ]] && { err "usage: relay provider add <name> --base-url <url> --token <token> [--model <model>] [--discover-models]"; exit 1; }
+  shift
+  case "${name}" in
+    *[!a-zA-Z0-9_-]*) err "name must contain only letters, numbers, underscores, or hyphens"; exit 1 ;;
+  esac
+  if account_exists "${name}"; then
+    err "'${name}' is already an account — pick a different provider name"
+    exit 1
+  fi
+  if provider_exists "${name}"; then
+    warn "Provider '${name}' already exists"
+    log "To change it: relay provider remove ${name} && relay provider add ${name} ..."
+    return 0
+  fi
+
+  local base_url="" token="" model="" discover=0
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --base-url) base_url="${2:-}"; shift 2 ;;
+      --token) token="${2:-}"; shift 2 ;;
+      --model) model="${2:-}"; shift 2 ;;
+      --discover-models) discover=1; shift ;;
+      *) err "unknown option: $1"; exit 1 ;;
+    esac
+  done
+
+  [[ -z "${base_url}" ]] && { err "--base-url is required"; exit 1; }
+  [[ -z "${token}" ]] && { err "--token is required"; exit 1; }
+  case "${base_url}" in
+    http://*|https://*) ;;
+    *) err "--base-url must start with http:// or https://"; exit 1 ;;
+  esac
+
+  RELAY_PROVIDER_PATH="$(provider_file "${name}")" \
+  RELAY_PROVIDER_BASE_URL="${base_url}" \
+  RELAY_PROVIDER_TOKEN="${token}" \
+  RELAY_PROVIDER_MODEL="${model}" \
+  RELAY_PROVIDER_DISCOVER="${discover}" \
+  "${PY}" -c '
+import json, os
+path = os.environ["RELAY_PROVIDER_PATH"]
+base_url = os.environ["RELAY_PROVIDER_BASE_URL"]
+token = os.environ["RELAY_PROVIDER_TOKEN"]
+model = os.environ.get("RELAY_PROVIDER_MODEL", "")
+discover = os.environ.get("RELAY_PROVIDER_DISCOVER", "")
+d = {"base_url": base_url, "auth_token": token}
+if model:
+    d["model"] = model
+if discover == "1":
+    d["discover_models"] = True
+with open(path, "w") as f:
+    json.dump(d, f)
+os.chmod(path, 0o600)
+'
+
+  ok "Provider '${B}${name}${R}' added  ${D}${base_url}${R}"
+}
+
+cmd_provider_list() {
+  hdr "LiteLLM providers"
+  local names; names=$(list_provider_names)
+  if [[ -z "${names}" ]]; then
+    warn "No providers configured — add one with: relay provider add <name> --base-url <url> --token <token>"
+    return 0
+  fi
+  local active; active=$(active_provider_name)
+  local name base_url model info
+  while IFS= read -r name; do
+    [[ -z "${name}" ]] && continue
+    base_url=$(_provider_field "${name}" base_url)
+    model=$(_provider_field "${name}" model)
+    info="${base_url}"
+    [[ -n "${model}" ]] && info="${info}  model=${model}"
+    if [[ "${name}" == "${active}" ]]; then
+      printf "  ${GR}${B}✓ %-16s${R} ${D}%s${R}\n" "${name}" "${info}"
+    else
+      printf "    %-16s ${D}%s${R}\n" "${name}" "${info}"
+    fi
+  done <<< "${names}"
+}
+
+cmd_provider_use() {
+  local name="${1:-}"
+  [[ -z "${name}" ]] && { err "usage: relay provider use <name>"; exit 1; }
+  provider_exists "${name}" || { err "Provider '${name}' not found"; exit 1; }
+
+  local base_url token model discover
+  base_url=$(_provider_field "${name}" base_url)
+  token=$(_provider_field "${name}" auth_token)
+  model=$(_provider_field "${name}" model)
+  discover=$(_provider_discover "${name}")
+
+  local pairs=("ANTHROPIC_BASE_URL=${base_url}" "ANTHROPIC_AUTH_TOKEN=${token}")
+  [[ -n "${model}" ]] && pairs+=("ANTHROPIC_MODEL=${model}")
+  [[ -n "${discover}" ]] && pairs+=("CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY=1")
+
+  _settings_env_activate "${pairs[@]}" || { err "Failed to update ${CLAUDE_SETTINGS}"; exit 1; }
+  printf '%s' "${name}" > "${ACTIVE_PROVIDER_FILE}"
+
+  printf "\n  ${GR}${B}⚡ provider active → %s${R}  ${D}%s${R}\n" "${name}" "${base_url}"
+  printf "  ${D}Active sessions pick up the switch on next message. New session: ${CY}claude -c${R}\n\n"
+}
+
+cmd_provider_off() {
+  local active; active=$(active_provider_name)
+  if [[ -z "${active}" ]]; then
+    warn "No provider is currently active"
+    return 0
+  fi
+  _settings_env_restore || { err "Failed to update ${CLAUDE_SETTINGS}"; exit 1; }
+  rm -f "${ACTIVE_PROVIDER_FILE}"
+  ok "Provider mode off — subscription account resumes"
+}
+
+cmd_provider_remove() {
+  local name="${1:-}"
+  [[ -z "${name}" ]] && { err "usage: relay provider remove <name>"; exit 1; }
+  provider_exists "${name}" || { err "Provider '${name}' not found"; exit 1; }
+  printf "\n  ${YL}Delete provider '${B}${name}${R}${YL}'? (y/N) ${R}"
+  read -r c
+  [[ "${c}" = "y" || "${c}" = "Y" ]] || { log "cancelled"; return 0; }
+  if [[ "$(active_provider_name)" == "${name}" ]]; then
+    cmd_provider_off
+  fi
+  rm -f "$(provider_file "${name}")"
+  ok "Deleted provider '${name}'"
+}
+
+cmd_run() {
+  local name="${1:-}"
+  [[ -z "${name}" ]] && { err "usage: relay run <name> [-- <claude args...>]"; exit 1; }
+  shift
+  [[ "${1:-}" == "--" ]] && shift
+
+  require_claude
+
+  if account_exists "${name}"; then
+    do_switch "${name}"
+    exec "${REAL_CLAUDE}" "$@"
+  elif provider_exists "${name}"; then
+    local base_url token model discover settings_file
+    base_url=$(_provider_field "${name}" base_url)
+    token=$(_provider_field "${name}" auth_token)
+    model=$(_provider_field "${name}" model)
+    discover=$(_provider_discover "${name}")
+
+    # Opportunistic cleanup: a prior `relay run <provider>` can't clean up
+    # after itself (exec replaces the process, so no trap ever fires) —
+    # sweep anything old enough that the session which created it has
+    # almost certainly ended, so these don't accumulate indefinitely.
+    find "${RELAY_DIR}" -maxdepth 1 -name '.run-settings.*' -mtime +1 -delete 2>/dev/null || true
+
+    # Written to a chmod-600 file under RELAY_DIR (mktemp's default file
+    # mode is already 0600) rather than passed inline via `claude`'s own
+    # argv — the exec'd claude process's cmdline would otherwise expose
+    # this provider's auth token to any local user via `ps`/`ps aux` for
+    # the entire session lifetime.
+    settings_file=$(mktemp "${RELAY_DIR}/.run-settings.XXXXXX")
+    RELAY_RUN_BASE_URL="${base_url}" \
+    RELAY_RUN_TOKEN="${token}" \
+    RELAY_RUN_MODEL="${model}" \
+    RELAY_RUN_DISCOVER="${discover}" \
+    RELAY_RUN_SETTINGS_FILE="${settings_file}" \
+    "${PY}" -c '
+import json, os
+base_url = os.environ["RELAY_RUN_BASE_URL"]
+token = os.environ["RELAY_RUN_TOKEN"]
+model = os.environ.get("RELAY_RUN_MODEL", "")
+discover = os.environ.get("RELAY_RUN_DISCOVER", "")
+env = {"ANTHROPIC_BASE_URL": base_url, "ANTHROPIC_AUTH_TOKEN": token}
+if model:
+    env["ANTHROPIC_MODEL"] = model
+if discover == "1":
+    env["CLAUDE_CODE_ENABLE_GATEWAY_MODEL_DISCOVERY"] = "1"
+with open(os.environ["RELAY_RUN_SETTINGS_FILE"], "w") as f:
+    json.dump({"env": env}, f)
+'
+
+    exec "${REAL_CLAUDE}" --settings "${settings_file}" "$@"
+  else
+    err "Unknown account or provider: ${name}"
+    exit 1
+  fi
+}
+
 cmd_add() {
   local name="${1:-}"
   [[ -z "${name}" ]] && { err "usage: relay add <name>"; exit 1; }
   case "${name}" in
     *[!a-zA-Z0-9_-]*) err "name must contain only letters, numbers, underscores, or hyphens"; exit 1 ;;
   esac
+  if provider_exists "${name}"; then
+    err "'${name}' is already a LiteLLM provider — pick a different account name"
+    exit 1
+  fi
   require_claude
   if account_exists "${name}"; then
     warn "Account '${name}' already exists"
@@ -731,6 +1199,7 @@ cmd_add() {
   printf '%s' "${kc_creds}" > "$(account_creds "${name}")"
   chmod 600 "$(account_creds "${name}")"
   save_meta_email "${name}"
+  add_to_order "${name}"
   echo "${name}" > "${CURRENT_FILE}"
   ok "Account '${B}${name}${R}' added  ${D}$(get_meta_email "${name}")${R}"
 }
@@ -753,6 +1222,7 @@ cmd_save() {
   [[ ${saved} -eq 0 ]] && { err "No credentials found — log in first with: claude /login"; exit 1; }
 
   save_meta_email "${name}"
+  add_to_order "${name}"
   echo "${name}" > "${CURRENT_FILE}"
   ok "Account '${B}${name}${R}' saved  ${D}$(get_meta_email "${name}")${R}"
 }
@@ -851,6 +1321,7 @@ cmd_remove() {
   read -r c
   [[ "${c}" = "y" || "${c}" = "Y" ]] || { log "cancelled"; return 0; }
   rm -f "$(account_creds "${name}")" "$(account_meta "${name}")"
+  remove_from_order "${name}"
   [[ "$(current_name)" == "${name}" ]] && rm -f "${CURRENT_FILE}"
   ok "Deleted '${name}' (sessions are unaffected)"
 }
@@ -933,6 +1404,7 @@ cmd_rename() {
 
   mv "$(account_creds "${old}")" "$(account_creds "${new}")"
   [[ -f "$(account_meta "${old}")" ]] && mv "$(account_meta "${old}")" "$(account_meta "${new}")"
+  rename_in_order "${old}" "${new}"
   [[ "$(current_name)" == "${old}" ]] && echo "${new}" > "${CURRENT_FILE}"
   ok "Renamed '${B}${old}${R}' → '${B}${new}${R}'"
 }
@@ -1239,6 +1711,22 @@ def load_raw_config():
         log_event('config_parse_error', error=str(e))
         return {}
 
+def _read_order(creds_dir):
+    order_file = os.path.join(os.path.dirname(creds_dir), 'order')
+    on_disk = set(f[:-5] for f in os.listdir(creds_dir) if f.endswith('.json')) if os.path.isdir(creds_dir) else set()
+    ordered = []
+    if os.path.exists(order_file):
+        for line in open(order_file):
+            n = line.strip()
+            if n in on_disk and n not in ordered:
+                ordered.append(n)
+    for n in sorted(on_disk):
+        if n not in ordered:
+            ordered.append(n)
+    with open(order_file, 'w') as f:
+        f.write('\n'.join(ordered) + ('\n' if ordered else ''))
+    return ordered
+
 def load_config():
     try:
         return json.load(open(CONFIG_FILE))
@@ -1246,7 +1734,7 @@ def load_config():
         # Auto-default: 2+ accounts → enable with 80% threshold, no explicit config needed
         if not os.path.isdir(CREDS_DIR):
             return None
-        accounts = sorted(f[:-5] for f in os.listdir(CREDS_DIR) if f.endswith('.json'))
+        accounts = _read_order(CREDS_DIR)
         if len(accounts) < 2:
             return None
         return {
@@ -1335,6 +1823,44 @@ if __name__ == '__main__':
     main()
 DAEMON_EOF
   chmod 755 "${AUTOSWITCH_DAEMON}"
+  _read_version > "${RELAY_DIR}/daemon_version"
+}
+
+# Restarts the already-installed daemon service in place (launchd/systemd/cron),
+# without touching plist/service file contents. Used after a silent redeploy.
+_restart_daemon_service() {
+  if [[ "$(uname)" == "Darwin" ]] && [[ -f "${AUTOSWITCH_PLIST}" ]]; then
+    launchctl unload "${AUTOSWITCH_PLIST}" 2>/dev/null || true
+    launchctl load "${AUTOSWITCH_PLIST}"
+  elif command -v systemctl >/dev/null 2>&1 && [[ -f "${AUTOSWITCH_SERVICE}" ]]; then
+    systemctl --user restart relay-autoswitch
+  else
+    # cron fallback: no long-lived unit to restart — kill the running instance so
+    # the next cron tick (daemon's own lock file) starts a fresh copy of the file
+    # we just wrote via _extract_daemon.
+    local pid; pid=$(cat "${RELAY_DIR}/autoswitch.lock" 2>/dev/null || echo "")
+    [[ -n "${pid}" ]] && kill "${pid}" 2>/dev/null || true
+  fi
+}
+
+# Runs on every invocation (cheap no-op unless autoswitch is actually running):
+# if relay itself was updated (npm/git/direct) since the daemon file on disk was
+# generated, silently regenerate it from the current script and restart it —
+# so daemon-side fixes (warmup engine, credential lock, etc.) don't require the
+# user to remember to run `relay autoswitch start` again after every update.
+_maybe_redeploy_daemon() {
+  [[ -f "${AUTOSWITCH_DAEMON}" ]] || return 0
+  local pid; pid=$(cat "${RELAY_DIR}/autoswitch.lock" 2>/dev/null || echo "")
+  [[ -n "${pid}" ]] && kill -0 "${pid}" 2>/dev/null || return 0
+
+  local deployed; deployed=$(cat "${RELAY_DIR}/daemon_version" 2>/dev/null || echo "")
+  local current; current=$(_read_version)
+  [[ "${current}" == "unknown" ]] && return 0
+  [[ "${deployed}" == "${current}" ]] && return 0
+
+  _extract_daemon
+  _restart_daemon_service
+  warn "relay updated to ${current} — autoswitch daemon redeployed and restarted"
 }
 
 cmd_autoswitch_config() {
@@ -1352,41 +1878,7 @@ cmd_autoswitch_config() {
   # ── Step 1: switch order ───────────────────────────────────────
   echo ""
   printf "  ${B}Step 1 / 3 — Switch order${R}\n"
-  printf "  ${D}When an account hits its threshold, relay switches to the next one in order.${R}\n\n"
-  local i=1
-  for acct in "${accounts[@]}"; do
-    printf "    ${D}%d${R}  %s\n" "${i}" "${acct}"
-    i=$((i+1))
-  done
-  echo ""
-  printf "  ${D}Type numbers in the order you want  (e.g. ${CY}2 1${D}  or just Enter to keep the order above):${R}\n"
-  printf "  > "; read -r order_input
-
-  # resolve numbers (space or comma) to names; empty = default order
-  local order_str; order_str=$(echo "${order_input}" | "${PY}" - "${accounts[@]}" <<'PYEOF'
-import sys, re
-raw = sys.stdin.read().strip()
-accts = sys.argv[1:]
-if not raw:
-    print(','.join(accts))
-else:
-    tokens = re.split(r'[\s,]+', raw)
-    result = []
-    for t in tokens:
-        t = t.strip()
-        if t.isdigit():
-            idx = int(t) - 1
-            if 0 <= idx < len(accts): result.append(accts[idx])
-        elif t:
-            result.append(t)
-    print(','.join(result))
-PYEOF
-)
-  # show resolved order as a visual chain
-  local chain; chain=$(echo "${order_str}" | "${PY}" -c "
-import sys; names=sys.stdin.read().strip().split(',')
-print(' → '.join(names) + ' → (cycle)')")
-  printf "  ${D}Order: ${CY}%s${R}\n" "${chain}"
+  local order_str; order_str=$(prompt_reorder "${accounts[@]}")
 
   # ── Step 2: thresholds ────────────────────────────────────────
   echo ""
@@ -1684,6 +2176,62 @@ cmd_autoswitch() {
   esac
 }
 
+cmd_reorder() {
+  hdr "reorder accounts"
+
+  local accounts=()
+  local name
+  while IFS= read -r name; do accounts+=("${name}"); done < <(list_account_names)
+
+  if [[ ${#accounts[@]} -eq 0 ]]; then
+    err "No accounts found. Run: relay add <name>"
+    exit 1
+  fi
+
+  local order_str; order_str=$(prompt_reorder "${accounts[@]}")
+
+  if [[ -z "${order_str}" ]]; then
+    err "No valid order given — nothing changed"
+    exit 1
+  fi
+
+  local order_arr=()
+  IFS=',' read -ra order_arr <<< "${order_str}"
+
+  local account ordered found
+  for account in ${accounts[@]+"${accounts[@]}"}; do
+    found=0
+    for ordered in ${order_arr[@]+"${order_arr[@]}"}; do
+      [[ "${ordered}" == "${account}" ]] && { found=1; break; }
+    done
+    [[ "${found}" -eq 0 ]] && order_arr+=("${account}")
+  done
+
+  order_str=""
+  for ordered in ${order_arr[@]+"${order_arr[@]}"}; do
+    if [[ -z "${order_str}" ]]; then
+      order_str="${ordered}"
+    else
+      order_str="${order_str},${ordered}"
+    fi
+  done
+
+  printf '%s\n' "${order_arr[@]}" > "${ORDER_FILE}"
+  ok "Order saved to ${ORDER_FILE}"
+
+  local cfg="${RELAY_DIR}/autoswitch.json"
+  if [[ -f "${cfg}" ]]; then
+    "${PY}" - "${cfg}" "${order_str}" <<'PYEOF'
+import json, sys
+cfg_path, order_str = sys.argv[1], sys.argv[2]
+cfg = json.load(open(cfg_path))
+cfg['order'] = order_str.split(',')
+json.dump(cfg, open(cfg_path, 'w'), indent=2)
+PYEOF
+    ok "Also updated order in ${cfg}"
+  fi
+}
+
 cmd_lock() {
   local name="${1:-}"
   local cfg="${RELAY_DIR}/autoswitch.json"
@@ -1717,7 +2265,19 @@ PYEOF
     "${PY}" - "${CREDS_STORE}" "${cfg}" <<'PYEOF'
 import json, sys, os
 creds_dir, cfg_path = sys.argv[1], sys.argv[2]
-accounts = sorted(f[:-5] for f in os.listdir(creds_dir) if f.endswith('.json'))
+order_file = os.path.join(os.path.dirname(creds_dir), 'order')
+on_disk = set(f[:-5] for f in os.listdir(creds_dir) if f.endswith('.json'))
+accounts = []
+if os.path.exists(order_file):
+    for line in open(order_file):
+        n = line.strip()
+        if n in on_disk and n not in accounts:
+            accounts.append(n)
+for n in sorted(on_disk):
+    if n not in accounts:
+        accounts.append(n)
+with open(order_file, 'w') as f:
+    f.write('\n'.join(accounts) + ('\n' if accounts else ''))
 config = {
     'order': accounts,
     'thresholds': {a: 80 for a in accounts},
@@ -1784,7 +2344,19 @@ _warmup_ensure_config() {
     "${PY}" - "${CREDS_STORE}" "${cfg}" <<'PYEOF'
 import json, sys, os
 creds_dir, cfg_path = sys.argv[1], sys.argv[2]
-accounts = sorted(f[:-5] for f in os.listdir(creds_dir) if f.endswith('.json')) if os.path.isdir(creds_dir) else []
+on_disk = set(f[:-5] for f in os.listdir(creds_dir) if f.endswith('.json')) if os.path.isdir(creds_dir) else set()
+order_file = os.path.join(os.path.dirname(creds_dir), 'order')
+accounts = []
+if os.path.exists(order_file):
+    for line in open(order_file):
+        n = line.strip()
+        if n in on_disk and n not in accounts:
+            accounts.append(n)
+for n in sorted(on_disk):
+    if n not in accounts:
+        accounts.append(n)
+with open(order_file, 'w') as f:
+    f.write('\n'.join(accounts) + ('\n' if accounts else ''))
 config = {
     'order': accounts,
     'thresholds': {a: 80 for a in accounts},
@@ -2164,6 +2736,8 @@ cmd_help() {
   printf "  %-32s %s\n" "  relay refresh-all"        "silent OAuth refresh for all accounts"
   printf "  %-32s %s\n" "  relay save <name>"        "save current login state"
   printf "  %-32s %s\n" "  relay rename <old> <new>" "rename an account"
+  printf "  %-32s %s\n" "  relay reorder"            "change account display/switch order"
+  printf "  %-32s %s\n" "  relay run <name>"         "one-off session on an account or provider"
   printf "  %-32s %s\n" "  relay list"               "full list with weekly usage"
   printf "  %-32s %s\n" "  relay list -f"            "live-refresh mode (Ctrl+C to exit)"
   printf "  %-32s %s\n" "  relay list --no-usage"    "list without querying API"
@@ -2179,6 +2753,13 @@ cmd_help() {
   printf "  %-32s %s\n" "  relay autoswitch start/stop" "manage background daemon"
   printf "  %-32s %s\n" "  relay autoswitch status"   "daemon state + thresholds"
   echo ""
+  printf "  ${B}LiteLLM providers${R}\n"
+  printf "  %-32s %s\n" "  relay provider add <name> --base-url <url> --token <token>" "add a provider"
+  printf "  %-32s %s\n" "  relay provider list"      "list configured providers"
+  printf "  %-32s %s\n" "  relay provider use <name>" "route all future sessions through this provider"
+  printf "  %-32s %s\n" "  relay provider off"       "stop routing through a provider, resume subscription"
+  printf "  %-32s %s\n" "  relay provider remove <name>" "delete a provider"
+  echo ""
   printf "  ${B}Warmup${R}\n"
   printf "  %-32s %s\n" "  relay warmup add <acct> <HH:MM>" "pre-warm an account's 5hr window daily"
   printf "  %-32s %s\n" "  relay warmup remove <acct> [HH:MM]" "remove a warmup schedule"
@@ -2194,6 +2775,8 @@ cmd_help() {
   _show_update_notice
 }
 
+_maybe_redeploy_daemon
+
 # ══════════════════════════════════════════════════════════════════
 # Dispatch — single entry point, no fall-through
 # ══════════════════════════════════════════════════════════════════
@@ -2222,6 +2805,19 @@ case "${CMD}" in
   status|st)        cmd_status ;;
   remove|rm|del)    cmd_remove "$@" ;;
   rename|mv)        cmd_rename "$@" ;;
+  reorder)          cmd_reorder "$@" ;;
+  provider|prov)
+    sub="${1:-}"
+    [[ -n "${1:-}" ]] && shift
+    case "${sub}" in
+      add)    cmd_provider_add "$@" ;;
+      list|ls) cmd_provider_list ;;
+      use)    cmd_provider_use "$@" ;;
+      off)    cmd_provider_off ;;
+      remove|rm) cmd_provider_remove "$@" ;;
+      *) err "usage: relay provider <add|list|use|off|remove> ..."; exit 1 ;;
+    esac ;;
+  run)              cmd_run "$@" ;;
   sessions|sess)    cmd_sessions ;;
   autoswitch|as)    cmd_autoswitch "$@" ;;
   lock)             cmd_lock "$@" ;;