@dst-justin/relay 2.1.0 → 2.1.2

package/README.md

@@ -218,3 +218,19 @@ Sessions live in `~/.claude/projects/` and are shared across all accounts — af
 | `relay.ps1` | Full PowerShell implementation |
 | `relay.cmd` | Thin CMD wrapper — delegates to `relay.ps1` |
 
+
+---
+
+## Changelog
+
+### v2.1.1 — 2026-06-24
+- Display current version and latest version at the end of `list`, `status`, `relay` (menu), `sessions`, and `help` commands
+- Background version check (24h cache) — non-blocking, never slows down output
+- `relay update` now detects original install method: uses `npm install -g` for npm installs, `git pull` for git clones, and direct GitHub download for bare script copies
+- `npm install -g` post-install script automatically patches `~/.bashrc`, `~/.zshrc`, `~/.profile`, and fish `config.fish` if the npm bin dir is missing from PATH
+
+### v2.1.0 — 2026-06-24
+- Upgraded GitHub Actions workflow to `actions/checkout@v6` and `actions/setup-node@v6` (Node 24 runtime, removes Node 20 deprecation warning)
+
+### v2.0.2 — 2026-06-23
+- Skip `npm install` during `relay update` when already on the latest version or when version check fails

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dst-justin/relay",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "Multi-account switcher for Claude Code — instant credential swap across macOS, Linux, and Windows",
   "bin": {
     "relay": "./relay.js"
@@ -10,10 +10,11 @@
     "relay.js",
     "relay.ps1",
     "relay.cmd",
+    "postinstall.js",
     "README.md"
   ],
   "scripts": {
-    "postinstall": "node -e \"if(process.platform!=='win32'){try{require('fs').chmodSync(require('path').join(__dirname,'relay'),'755')}catch(_){}}\""
+    "postinstall": "node -e \"if(process.platform!=='win32'){try{require('fs').chmodSync(require('path').join(__dirname,'relay'),'755')}catch(_){}}\" && node postinstall.js"
   },
   "engines": {
     "node": ">=16"

package/postinstall.js

@@ -0,0 +1,84 @@
+#!/usr/bin/env node
+// Runs after `npm install -g @dst-justin/relay`.
+// If the npm global bin dir is not in PATH, appends it to shell config files.
+'use strict';
+
+const { execSync } = require('child_process');
+const { existsSync, readFileSync, appendFileSync, mkdirSync, writeFileSync } = require('fs');
+const { join } = require('path');
+const os = require('os');
+
+// ── Windows ───────────────────────────────────────────────────────────────────
+// npm on Windows already manages PATH via the installer; nothing to do here.
+if (process.platform === 'win32') {
+  // Verify relay.js can reach relay.ps1 (sanity check)
+  if (!existsSync(join(__dirname, 'relay.ps1'))) {
+    console.warn('  relay: warning — relay.ps1 not found, Windows support may be broken');
+  }
+  process.exit(0);
+}
+
+// ── Get npm global bin dir ────────────────────────────────────────────────────
+// npm sets npm_config_prefix during install; fall back to `npm prefix -g`
+let prefix = process.env.npm_config_prefix;
+if (!prefix) {
+  try {
+    prefix = execSync('npm prefix -g', { encoding: 'utf8', stdio: ['pipe','pipe','pipe'] }).trim();
+  } catch (_) {
+    process.exit(0); // can't determine, give up silently
+  }
+}
+const binDir = join(prefix, 'bin');
+
+// Already in PATH — nothing to do
+const pathDirs = (process.env.PATH || '').split(':');
+if (pathDirs.includes(binDir)) process.exit(0);
+
+const home = os.homedir();
+
+// ── POSIX shells: bash / zsh / sh ────────────────────────────────────────────
+const exportLine = `export PATH="${binDir}:$PATH"`;
+const marker = '# added by relay';
+const block = `\n${exportLine}  ${marker}\n`;
+
+const rcFiles = ['.bashrc', '.zshrc', '.profile'].map(f => join(home, f));
+let patched = false;
+
+for (const rc of rcFiles) {
+  if (!existsSync(rc)) continue;
+  try {
+    if (readFileSync(rc, 'utf8').includes(marker)) continue; // idempotent
+    appendFileSync(rc, block);
+    console.log(`  relay: added ${binDir} to PATH in ~/${require('path').basename(rc)}`);
+    patched = true;
+  } catch (_) {}
+}
+
+// If no shell rc found, create ~/.bashrc as a last resort
+if (!patched) {
+  const bashrc = join(home, '.bashrc');
+  try {
+    appendFileSync(bashrc, block);
+    console.log(`  relay: created ~/.bashrc with PATH entry for ${binDir}`);
+    patched = true;
+  } catch (_) {}
+}
+
+// ── Fish shell ────────────────────────────────────────────────────────────────
+const fishConfig = join(home, '.config', 'fish', 'config.fish');
+const fishMarker = '# added by relay';
+const fishLine = `\nset -gx PATH "${binDir}" $PATH  ${fishMarker}\n`;
+
+if (existsSync(fishConfig)) {
+  try {
+    if (!readFileSync(fishConfig, 'utf8').includes(fishMarker)) {
+      appendFileSync(fishConfig, fishLine);
+      console.log(`  relay: added ${binDir} to PATH in ~/.config/fish/config.fish`);
+      patched = true;
+    }
+  } catch (_) {}
+}
+
+if (patched) {
+  console.log(`  relay: restart your shell (or 'source ~/.bashrc' / 'source ~/.zshrc') then try: relay list`);
+}

package/relay

@@ -12,6 +12,7 @@ RELAY_DIR="${HOME}/.claude-relay"
 CREDS_STORE="${RELAY_DIR}/credentials"
 META_STORE="${RELAY_DIR}/meta"
 CURRENT_FILE="${RELAY_DIR}/current"
+UPDATE_CACHE="${RELAY_DIR}/.update_cache"
 CLAUDE_DIR="${HOME}/.claude"
 CLAUDE_JSON="${HOME}/.claude.json"
 REAL_CLAUDE=$(command -v claude 2>/dev/null || echo "")
@@ -371,14 +372,21 @@ _sync_current_creds() {
   [[ -n "${live}" ]] && printf '%s' "${live}" > "$(account_creds "${cur}")"
 }
 
-cmd_quick() { _sync_current_creds; render_table quick "${CREDS_STORE}" "${META_STORE}" "$(current_name)" "$@"; }
+cmd_quick() {
+  _check_update_bg
+  _sync_current_creds
+  render_table quick "${CREDS_STORE}" "${META_STORE}" "$(current_name)" "$@"
+  _show_update_notice
+}
 
 cmd_list() {
+  _check_update_bg
   hdr "Account List"
   _sync_current_creds
   render_table full "${CREDS_STORE}" "${META_STORE}" "$(current_name)" "$@"
   echo ""
   ok "Inside Claude Code: ${CY}!relay <index>${R} to switch"
+  _show_update_notice
 }
 
 cmd_status() {
@@ -450,6 +458,8 @@ EOF
   [[ -d "${CLAUDE_DIR}/projects" ]] && \
     n=$(find "${CLAUDE_DIR}/projects" -name "*.jsonl" 2>/dev/null | wc -l | tr -d ' ')
   printf "\n  ${B}Sessions:${R} %s (shared across all accounts in ~/.claude/projects/)\n" "${n}"
+  _check_update_bg
+  _show_update_notice
 }
 
 cmd_add() {
@@ -599,6 +609,8 @@ print()
 print(f'  {total} session(s)' if total else '  No sessions found')
 EOF
   log "${CY}claude -c${R} resume last  ${D}|${R}  ${CY}claude -r${R} pick one  ${D}|${R}  ${CY}claude --resume <id>${R}"
+  _check_update_bg
+  _show_update_notice
 }
 
 cmd_install() {
@@ -896,47 +908,74 @@ cmd_autoswitch_config() {
     exit 1
   fi
 
+  # ── Step 1: switch order ───────────────────────────────────────
   echo ""
-  printf "  Accounts found: ${CY}%s${R}\n\n" "$(IFS=', '; echo "${accounts[*]}")"
-
-  printf "  ${B}Switch order${R} (comma-separated, only listed accounts join autoswitch):\n"
+  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
-  local order_str; order_str=$(echo "${order_input}" | "${PY}" -c "
-import sys,re
-raw=sys.stdin.read().strip()
-names=[x.strip() for x in raw.split(',') if x.strip()]
-print(','.join(names))")
 
+  # 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}"
+
+  # ── Step 2: thresholds ────────────────────────────────────────
   echo ""
-  printf "  ${B}Thresholds${R} (press enter to skip account — it won't join autoswitch):\n"
+  printf "  ${B}Step 2 / 3 — Thresholds${R}\n"
+  printf "  ${D}Autoswitch triggers when an account's 5-hr usage exceeds this %%.${R}\n"
+  printf "  ${D}Enter a number (e.g. 70), or press Enter for default 80%%.${R}\n\n"
+
   local thresholds_json="{"
   local order_json="["
-  local first_order=1
-  local first_thresh=1
+  local first=1
   IFS=',' read -ra order_arr <<< "${order_str}"
   for acct in "${order_arr[@]}"; do
-    printf "  %s threshold %% [default 80]: " "${acct}"
+    printf "  ${CY}%s${R} threshold [80%%]: " "${acct}"
     read -r val
-    if [[ -z "${val}" ]]; then
-      continue
-    fi
-    [[ ${first_order} -eq 0 ]] && order_json+=","
+    [[ -z "${val}" ]] && val="80"
+    [[ ${first} -eq 0 ]] && { order_json+=","; thresholds_json+=","; }
     order_json+="\"${acct}\""
-    first_order=0
-    [[ ${first_thresh} -eq 0 ]] && thresholds_json+=","
     thresholds_json+="\"${acct}\":${val}"
-    first_thresh=0
+    first=0
   done
   order_json+="]"
   thresholds_json+="}"
 
+  # ── Step 3: poll interval ─────────────────────────────────────
   echo ""
-  printf "  ${B}Poll interval${R} — low usage (minutes) [default 10]: "
-  read -r low_min; low_min="${low_min:-10}"
-  printf "  ${B}Poll interval${R} — high usage (minutes) [default 2]: "
-  read -r high_min; high_min="${high_min:-2}"
-  printf "  ${B}High usage starts at${R} %% [default 50]: "
-  read -r high_thr; high_thr="${high_thr:-50}"
+  printf "  ${B}Step 3 / 3 — Check interval${R}\n"
+  printf "  ${D}How often the daemon checks usage. Switches to faster polling near the threshold.${R}\n\n"
+  printf "  Normal check every N minutes [10]: "; read -r low_min; low_min="${low_min:-10}"
+  printf "  Fast check every N minutes   [2]:  "; read -r high_min; high_min="${high_min:-2}"
+  printf "  Switch to fast polling at    [50%%]: "; read -r high_thr; high_thr="${high_thr:-50}"
 
   local cfg_file="${RELAY_DIR}/autoswitch.json"
   printf '{"order":%s,"thresholds":%s,"poll":{"low_minutes":%s,"high_minutes":%s,"high_threshold":%s}}' \
@@ -945,7 +984,19 @@ print(','.join(names))")
     > "${cfg_file}"
 
   echo ""
-  ok "Saved to ${cfg_file}"
+  ok "Config saved to ${cfg_file}"
+  echo ""
+  "${PY}" -c "
+import json, sys
+cfg = json.load(open(sys.argv[1]))
+R='\033[0m'; B='\033[1m'; D='\033[2m'; CY='\033[36m'
+for i, name in enumerate(cfg['order'], 1):
+    thr = cfg['thresholds'].get(name, '?')
+    print(f'    {D}{i}.{R} {name:<14} → switch at {CY}{thr}%{R}')
+p = cfg['poll']
+print(f\"\n    {D}polling: {p[\"low_minutes\"]}min normal / {p[\"high_minutes\"]}min fast (fast above {p[\"high_threshold\"]}%){R}\")
+" "${cfg_file}"
+  echo ""
   log "Run ${CY}relay autoswitch start${R} to activate"
 }
 
@@ -1190,6 +1241,68 @@ cmd_version() {
   printf "relay %s\n" "$(_read_version)"
 }
 
+# ── Update notification helpers ───────────────────────────────────────────────
+# Cache format: "<epoch>:<version>"  TTL = 24h
+_check_update_bg() {
+  (
+    local ttl=86400
+    if [[ -f "${UPDATE_CACHE}" ]]; then
+      local cached; cached=$(cat "${UPDATE_CACHE}" 2>/dev/null)
+      local ts="${cached%%:*}"
+      local now; now=$(date +%s)
+      [[ $(( now - ts )) -lt ${ttl} ]] && exit 0
+    fi
+    local ver
+    ver=$("${PY}" - 2>/dev/null <<'PYEOF'
+import urllib.request, json, sys
+def fetch(url, h={}):
+    r = urllib.request.Request(url, headers=h)
+    with urllib.request.urlopen(r, timeout=6) as resp:
+        return json.loads(resp.read())
+try:
+    d = fetch('https://api.github.com/repos/darkstar1227/relay/releases/latest',
+              {'User-Agent': 'relay-update'})
+    print(d['tag_name'].lstrip('v')); sys.exit(0)
+except Exception: pass
+try:
+    d = fetch('https://registry.npmjs.org/@dst-justin%2frelay/latest')
+    print(d['version'])
+except Exception: sys.exit(1)
+PYEOF
+)
+    [[ -n "${ver}" ]] && printf '%s:%s' "$(date +%s)" "${ver}" > "${UPDATE_CACHE}"
+  ) >/dev/null 2>&1 &
+  disown 2>/dev/null || true
+}
+
+_show_update_notice() {
+  local current; current=$(_read_version)
+  local latest=""
+  if [[ -f "${UPDATE_CACHE}" ]]; then
+    local cached; cached=$(cat "${UPDATE_CACHE}" 2>/dev/null)
+    latest="${cached#*:}"
+  fi
+  if [[ -n "${latest}" && "${latest}" != "${current}" ]]; then
+    printf "\n  ${D}relay version: ${B}${current}${R}${D} → ${CY}${B}${latest}${R}${D} available — run ${CY}relay update${R}${D} to install${R}\n"
+  else
+    local ver_display="${latest:-${current}}"
+    printf "\n  ${D}relay version: ${B}${ver_display}${R}${D} (up to date)${R}\n"
+  fi
+}
+
+# Detect how relay was originally installed:
+#   npm    — package.json present in script dir (npm unpacks the full package)
+#   git    — .git dir present in script dir
+#   direct — bare script copy (no package.json, no .git)
+_detect_install_method() {
+  local d; d=$(_script_dir)
+  # .git check first: git clone has both .git AND package.json; npm publish strips .git
+  if [[ -d "${d}/.git" ]];      then echo "git"
+  elif [[ -f "${d}/package.json" ]]; then echo "npm"
+  else                                  echo "direct"
+  fi
+}
+
 cmd_update() {
   hdr "Update relay"
 
@@ -1229,18 +1342,43 @@ PYEOF
   fi
 
   local relay_dir; relay_dir=$(_script_dir)
-  local npm_cmd; npm_cmd=$(command -v npm 2>/dev/null)
-  if [[ -n "${npm_cmd}" ]]; then
-    log "Installing via npm..."
-    npm install -g @dst-justin/relay@latest
-    ok "Updated to $(_read_version)"
-  elif [[ -d "${relay_dir}/.git" ]]; then
-    log "npm not found — updating via git..."
-    git -C "${relay_dir}" pull
-  else
-    err "Cannot update: npm not found and no .git directory"
-    log "Install via npm: ${CY}npm install -g @dst-justin/relay@latest${R}"
-  fi
+  local method; method=$(_detect_install_method)
+
+  case "${method}" in
+    npm)
+      local npm_cmd; npm_cmd=$(command -v npm 2>/dev/null)
+      if [[ -n "${npm_cmd}" ]]; then
+        log "Updating via npm (original install method)..."
+        npm install -g @dst-justin/relay@latest
+        ok "Updated to $(_read_version)"
+      else
+        err "npm not found — reinstall npm and retry"
+        log "Or update manually: ${CY}npm install -g @dst-justin/relay@latest${R}"
+      fi ;;
+    git)
+      log "Updating via git pull (original install method)..."
+      git -C "${relay_dir}" pull ;;
+    direct)
+      log "Updating via direct download (original install method)..."
+      local script_path; script_path=$(readlink -f "$0" 2>/dev/null || echo "$0")
+      "${PY}" - "${script_path}" "${latest}" <<'PYEOF'
+import urllib.request, sys, os, stat
+script_path, version = sys.argv[1], sys.argv[2]
+url = f'https://raw.githubusercontent.com/darkstar1227/relay/v{version}/relay'
+try:
+    with urllib.request.urlopen(url, timeout=15) as r:
+        content = r.read()
+    tmp = script_path + '.tmp'
+    with open(tmp, 'wb') as f: f.write(content)
+    os.chmod(tmp, stat.S_IRWXU | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH)
+    os.replace(tmp, script_path)
+except Exception as e:
+    print(f'  download failed: {e}', file=sys.stderr); sys.exit(1)
+PYEOF
+      ok "Updated ${script_path} to ${latest}" ;;
+  esac
+  # Invalidate update cache so next display shows fresh state
+  rm -f "${UPDATE_CACHE}" 2>/dev/null || true
 }
 
 cmd_uninstall() {
@@ -1297,6 +1435,8 @@ cmd_help() {
   echo ""
   printf "  ${D}switches the OAuth credential (macOS Keychain / Linux ~/.claude/.credentials.json); sessions are shared${R}\n"
   printf "  ${D}after switching: claude -c to resume, claude --resume <id> for a specific session${R}\n\n"
+  _check_update_bg
+  _show_update_notice
 }
 
 # ══════════════════════════════════════════════════════════════════