@dst-justin/relay 2.3.0 → 2.3.1

package/README.md

@@ -255,6 +255,14 @@ Sessions live in `~/.claude/projects/` and are shared across all accounts — af
 
 ## Changelog
 
+### 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.3.1",
   "description": "Multi-account switcher for Claude Code — instant credential swap across macOS, Linux, and Windows",
   "bin": {
     "relay": "./relay.js"

package/relay

@@ -141,6 +141,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
@@ -228,7 +308,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)
@@ -731,6 +828,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 +851,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 +950,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 +1033,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 +1340,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 +1363,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 +1452,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 +1507,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 +1805,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 +1894,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 +1973,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 +2365,7 @@ 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 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"
@@ -2194,6 +2396,8 @@ cmd_help() {
   _show_update_notice
 }
 
+_maybe_redeploy_daemon
+
 # ══════════════════════════════════════════════════════════════════
 # Dispatch — single entry point, no fall-through
 # ══════════════════════════════════════════════════════════════════
@@ -2222,6 +2426,7 @@ case "${CMD}" in
   status|st)        cmd_status ;;
   remove|rm|del)    cmd_remove "$@" ;;
   rename|mv)        cmd_rename "$@" ;;
+  reorder)          cmd_reorder "$@" ;;
   sessions|sess)    cmd_sessions ;;
   autoswitch|as)    cmd_autoswitch "$@" ;;
   lock)             cmd_lock "$@" ;;