claude-multiacc 1.0.13 → 1.0.14

package/install.sh

@@ -4,41 +4,107 @@
 # its install dir, or its update machinery.
 #
 #   ./install.sh [--server user@host]     install or update (data untouched)
+#   ./install.sh --no-server              install with NO sync target (local-only pool:
+#                                         a panel/runner daemon distributes accounts)
+#   ./install.sh --instance NAME          label this install's agents (default: derived
+#                                         from the pool root when it is not the default)
 #   ./install.sh --uninstall              remove addon (keeps ~/.claude-accounts)
 #   ./install.sh --uninstall --purge-data remove addon + all account data
+#
+# INSTANCE-SCOPED POOLS: export CLAUDE_ACCOUNTS_ROOT / CODEX_ACCOUNTS_ROOT before
+# running this and the whole install serves that pool — its LaunchAgents/cron entries
+# get their own labels and carry the roots in their environment, so several app-robot
+# instances on one machine never touch each other's accounts or agents.
 set -u
 
 REPO_DIR="$(cd "$(dirname "$0")" && pwd -P)"
 # shellcheck source=lib/common.sh
 . "$REPO_DIR/lib/common.sh"
 # common.sh is sourced in claude mode (ACC_ROOT = the claude pool); the codex pool
-# root is needed here too for uninstall/purge messaging.
-CODEX_ACC_ROOT="${CODEX_ACCOUNTS_DIR:-$HOME/.codex-accounts}"
-
-MARK_BEGIN="# >>> claude-multiacc >>>"
-MARK_END="# <<< claude-multiacc <<<"
-CRON_TAG="# claude-multiacc"
-PLIST_LIMITS="$HOME/Library/LaunchAgents/com.claude-multiacc.limits.plist"
-PLIST_HEALTH="$HOME/Library/LaunchAgents/com.claude-multiacc.health.plist"
-PLIST_UPDATE="$HOME/Library/LaunchAgents/com.claude-multiacc.update.plist"
-PLIST_CODEX_LIMITS="$HOME/Library/LaunchAgents/com.claude-multiacc.codex-limits.plist"
-PLIST_CODEX_HEALTH="$HOME/Library/LaunchAgents/com.claude-multiacc.codex-health.plist"
-PROFILED="/etc/profile.d/claude-multiacc.sh"
+# root is needed here too for the codex agents and uninstall/purge messaging.
+CODEX_ACC_ROOT="${CODEX_ACCOUNTS_ROOT:-${CODEX_ACCOUNTS_DIR:-$HOME/.codex-accounts}}"
 
 UNINSTALL=0
 PURGE=0
 SERVER_OVERRIDE=""
 NO_SCHEDULE=0
+INSTANCE_OVERRIDE=""
 while [ $# -gt 0 ]; do
   case "$1" in
     --uninstall) UNINSTALL=1; shift ;;
     --purge-data) PURGE=1; shift ;;
     --server) SERVER_OVERRIDE="${2:?--server requires a value}"; shift 2 ;;
+    --no-server) SERVER_OVERRIDE="none"; shift ;;
+    --instance) INSTANCE_OVERRIDE="${2:?--instance requires a name}"; shift 2 ;;
     --no-schedule) NO_SCHEDULE=1; shift ;;
     *) echo "unknown flag: $1" >&2; exit 1 ;;
   esac
 done
 
+# ---- instance scoping -----------------------------------------------------------
+# An install whose pool roots are the defaults keeps the historical labels and rc
+# blocks byte-for-byte. Anything else is an INSTANCE: its agents get a suffix (two
+# instances would otherwise overwrite each other's plists) and the shell rc block is
+# left alone, because one interactive PATH cannot point at two pools at once.
+default_pool_roots() {
+  [ "$ACC_ROOT" = "$HOME/.claude-accounts" ] && [ "$CODEX_ACC_ROOT" = "$HOME/.codex-accounts" ]
+}
+short_hash() { # stable 8-char digest of $1, on macOS and Linux alike
+  if command -v shasum >/dev/null 2>&1; then printf '%s' "$1" | shasum | cut -c1-8
+  elif command -v sha1sum >/dev/null 2>&1; then printf '%s' "$1" | sha1sum | cut -c1-8
+  else printf '%s' "$1" | cksum | tr -d ' ' | cut -c1-8; fi
+}
+if [ -n "$INSTANCE_OVERRIDE" ]; then
+  case "$INSTANCE_OVERRIDE" in
+    *[!A-Za-z0-9-]*) echo "--instance must be letters, digits and dashes: $INSTANCE_OVERRIDE" >&2; exit 1 ;;
+  esac
+  INSTANCE="$INSTANCE_OVERRIDE"
+elif default_pool_roots; then
+  INSTANCE=""
+else
+  INSTANCE="i$(short_hash "$ACC_ROOT")"
+fi
+# The roots are interpolated into plists and crontab lines; a quote or newline in one
+# would break out of that context, so such a root is refused up front.
+case "$ACC_ROOT$CODEX_ACC_ROOT" in
+  *["'\"<>&"]*|*"
+"*) echo "pool root contains a character that cannot be scheduled safely: $ACC_ROOT / $CODEX_ACC_ROOT" >&2; exit 1 ;;
+esac
+
+LABEL="com.claude-multiacc${INSTANCE:+.$INSTANCE}"
+MARK_BEGIN="# >>> claude-multiacc >>>"
+MARK_END="# <<< claude-multiacc <<<"
+CRON_TAG="# claude-multiacc${INSTANCE:+ $INSTANCE}"
+PLIST_LIMITS="$HOME/Library/LaunchAgents/$LABEL.limits.plist"
+PLIST_HEALTH="$HOME/Library/LaunchAgents/$LABEL.health.plist"
+PLIST_UPDATE="$HOME/Library/LaunchAgents/$LABEL.update.plist"
+PLIST_CODEX_LIMITS="$HOME/Library/LaunchAgents/$LABEL.codex-limits.plist"
+PLIST_CODEX_HEALTH="$HOME/Library/LaunchAgents/$LABEL.codex-health.plist"
+PROFILED="/etc/profile.d/claude-multiacc.sh"
+
+# Pool roots (and any sync override) for a scheduled agent, so it refreshes THIS
+# instance's pool. Empty for a default install — nothing changes there.
+plist_env_block() {
+  [ -n "$INSTANCE" ] || return 0
+  printf '  <key>EnvironmentVariables</key><dict>\n'
+  printf '    <key>CLAUDE_ACCOUNTS_ROOT</key><string>%s</string>\n' "$ACC_ROOT"
+  printf '    <key>CODEX_ACCOUNTS_ROOT</key><string>%s</string>\n' "$CODEX_ACC_ROOT"
+  printf '  </dict>\n'
+}
+cron_env_prefix() {
+  [ -n "$INSTANCE" ] || return 0
+  printf "CLAUDE_ACCOUNTS_ROOT='%s' CODEX_ACCOUNTS_ROOT='%s' " "$ACC_ROOT" "$CODEX_ACC_ROOT"
+}
+
+is_pool_root() { # true when $1 is safe to delete as an account pool
+  case "$1" in
+    ''|/|"$HOME") return 1 ;;
+    */.claude-accounts|*/.codex-accounts) return 0 ;;
+    /*) [ -f "$1/accounts.json" ] ;;
+    *) return 1 ;;
+  esac
+}
+
 strip_block() { # remove our marked block from a file (portable, no sed -i)
   local f="$1"
   [ -f "$f" ] || return 0
@@ -78,13 +144,13 @@ mac_schedule_install() {
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
-  <key>Label</key><string>com.claude-multiacc.limits</string>
+  <key>Label</key><string>$LABEL.limits</string>
   <key>ProgramArguments</key><array>
     <string>$REPO_DIR/bin/claude-accounts</string>
     <string>limits</string>
     <string>--quiet</string>
   </array>
-  <key>StartInterval</key><integer>60</integer>
+$(plist_env_block)  <key>StartInterval</key><integer>300</integer>
   <key>RunAtLoad</key><true/>
   <key>StandardOutPath</key><string>/dev/null</string>
   <key>StandardErrorPath</key><string>/dev/null</string>
@@ -94,12 +160,12 @@ EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
-  <key>Label</key><string>com.claude-multiacc.health</string>
+  <key>Label</key><string>$LABEL.health</string>
   <key>ProgramArguments</key><array>
     <string>$REPO_DIR/bin/claude-accounts</string>
     <string>health</string>
   </array>
-  <key>StartCalendarInterval</key><dict>
+$(plist_env_block)  <key>StartCalendarInterval</key><dict>
     <key>Weekday</key><integer>1</integer>
     <key>Hour</key><integer>9</integer>
     <key>Minute</key><integer>17</integer>
@@ -113,13 +179,13 @@ EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
-  <key>Label</key><string>com.claude-multiacc.update</string>
+  <key>Label</key><string>$LABEL.update</string>
   <key>ProgramArguments</key><array>
     <string>$REPO_DIR/bin/claude-accounts</string>
     <string>self-update</string>
     <string>--quiet</string>
   </array>
-  <key>StartCalendarInterval</key><dict>
+$(plist_env_block)  <key>StartCalendarInterval</key><dict>
     <key>Hour</key><integer>4</integer>
     <key>Minute</key><integer>7</integer>
   </dict>
@@ -133,13 +199,13 @@ EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
-  <key>Label</key><string>com.claude-multiacc.codex-limits</string>
+  <key>Label</key><string>$LABEL.codex-limits</string>
   <key>ProgramArguments</key><array>
     <string>$REPO_DIR/bin/codex-accounts</string>
     <string>limits</string>
     <string>--quiet</string>
   </array>
-  <key>StartInterval</key><integer>60</integer>
+$(plist_env_block)  <key>StartInterval</key><integer>300</integer>
   <key>RunAtLoad</key><true/>
   <key>StandardOutPath</key><string>/dev/null</string>
   <key>StandardErrorPath</key><string>/dev/null</string>
@@ -149,12 +215,12 @@ EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0"><dict>
-  <key>Label</key><string>com.claude-multiacc.codex-health</string>
+  <key>Label</key><string>$LABEL.codex-health</string>
   <key>ProgramArguments</key><array>
     <string>$REPO_DIR/bin/codex-accounts</string>
     <string>health</string>
   </array>
-  <key>StartCalendarInterval</key><dict>
+$(plist_env_block)  <key>StartCalendarInterval</key><dict>
     <key>Weekday</key><integer>1</integer>
     <key>Hour</key><integer>9</integer>
     <key>Minute</key><integer>37</integer>
@@ -173,7 +239,7 @@ EOF
   launchctl load -w "$PLIST_CODEX_LIMITS" 2>/dev/null || true
   launchctl load -w "$PLIST_CODEX_HEALTH" 2>/dev/null || true
   [ "${CLAUDE_MULTIACC_AUTOUPDATE:-1}" = "1" ] && launchctl load -w "$PLIST_UPDATE" 2>/dev/null || true
-  echo "  launchd: limits refresh every 60s (claude + codex) + weekly health checks + daily auto-update"
+  echo "  launchd: limits refresh every 5m (claude + codex) + weekly health checks + daily auto-update"
 }
 
 mac_schedule_remove() {
@@ -185,60 +251,80 @@ mac_schedule_remove() {
   rm -f "$PLIST_LIMITS" "$PLIST_HEALTH" "$PLIST_UPDATE" "$PLIST_CODEX_LIMITS" "$PLIST_CODEX_HEALTH"
 }
 
+# Only THIS instance's lines are dropped: the tag is matched anchored to end of line,
+# so a default install ("# claude-multiacc") never removes an instance's lines
+# ("# claude-multiacc iXXXXXXXX") or the other way round.
+cron_strip_ours() { grep -v -E "$CRON_TAG\$" || true; }
+
 linux_schedule_install() {
-  local tmp
+  local tmp env
   tmp="$(mktemp)"
-  { crontab -l 2>/dev/null | grep -v "$CRON_TAG" || true; } > "$tmp"
+  env="$(cron_env_prefix)"
+  { crontab -l 2>/dev/null | cron_strip_ours; } > "$tmp"
   {
-    echo "* * * * * $REPO_DIR/bin/claude-accounts limits --quiet >/dev/null 2>&1 $CRON_TAG"
-    echo "* * * * * $REPO_DIR/bin/codex-accounts limits --quiet >/dev/null 2>&1 $CRON_TAG"
-    echo "17 9 * * 1 $REPO_DIR/bin/claude-accounts health >/dev/null 2>&1 $CRON_TAG"
-    echo "37 9 * * 1 $REPO_DIR/bin/codex-accounts health >/dev/null 2>&1 $CRON_TAG"
+    echo "*/5 * * * * $env$REPO_DIR/bin/claude-accounts limits --quiet >/dev/null 2>&1 $CRON_TAG"
+    echo "*/5 * * * * $env$REPO_DIR/bin/codex-accounts limits --quiet >/dev/null 2>&1 $CRON_TAG"
+    echo "17 9 * * 1 $env$REPO_DIR/bin/claude-accounts health >/dev/null 2>&1 $CRON_TAG"
+    echo "37 9 * * 1 $env$REPO_DIR/bin/codex-accounts health >/dev/null 2>&1 $CRON_TAG"
     [ "${CLAUDE_MULTIACC_AUTOUPDATE:-1}" = "1" ] && \
-      echo "7 4 * * * $REPO_DIR/bin/claude-accounts self-update --quiet >/dev/null 2>&1 $CRON_TAG"
+      echo "7 4 * * * $env$REPO_DIR/bin/claude-accounts self-update --quiet >/dev/null 2>&1 $CRON_TAG"
   } >> "$tmp"
   crontab "$tmp"
   rm -f "$tmp"
-  echo "  cron: limits refresh every 60s (claude + codex) + weekly health checks + daily auto-update"
+  echo "  cron: limits refresh every 5m (claude + codex) + weekly health checks + daily auto-update"
 }
 
 linux_schedule_remove() {
   local tmp
   tmp="$(mktemp)"
-  { crontab -l 2>/dev/null | grep -v "$CRON_TAG" || true; } > "$tmp"
+  { crontab -l 2>/dev/null | cron_strip_ours; } > "$tmp"
   crontab "$tmp"
   rm -f "$tmp"
 }
 
 do_uninstall() {
   echo "claude-multiacc: uninstalling (restoring stock behavior)"
-  strip_block "$HOME/.zshenv"
-  strip_block "$HOME/.zprofile"
-  strip_block "$HOME/.zshrc"
-  strip_block "$HOME/.bashrc"
-  strip_block "$HOME/.bash_profile"
-  strip_block "$HOME/.profile"
+  # An instance install never wrote a shell rc block, a /etc/profile.d file or the
+  # /usr/local/bin shims — those belong to the DEFAULT install and are shared with it.
+  # Removing them here would disable the operator's shim while only one instance was
+  # being uninstalled, so an instance removes exactly its own agents.
+  if [ -n "$INSTANCE" ]; then
+    echo "  instance $INSTANCE: removing its agents only (PATH block and shims belong to the default install)"
+  else
+    strip_block "$HOME/.zshenv"
+    strip_block "$HOME/.zprofile"
+    strip_block "$HOME/.zshrc"
+    strip_block "$HOME/.bashrc"
+    strip_block "$HOME/.bash_profile"
+    strip_block "$HOME/.profile"
+  fi
   if [ "$(machine_kind)" = "mac" ]; then
     mac_schedule_remove
   else
     linux_schedule_remove
-    [ -f "$PROFILED" ] && rm -f "$PROFILED"
-    if [ -L /usr/local/bin/claude ] && [ "$(canon_path /usr/local/bin/claude)" = "$(canon_path "$REPO_DIR/bin/claude")" ]; then
-      rm -f /usr/local/bin/claude
-      echo "  removed /usr/local/bin/claude shim symlink"
-    fi
-    if [ -L /usr/local/bin/codex ] && [ "$(canon_path /usr/local/bin/codex)" = "$(canon_path "$REPO_DIR/bin/codex")" ]; then
-      rm -f /usr/local/bin/codex
-      echo "  removed /usr/local/bin/codex shim symlink"
+    if [ -z "$INSTANCE" ]; then
+      [ -f "$PROFILED" ] && rm -f "$PROFILED"
+      if [ -L /usr/local/bin/claude ] && [ "$(canon_path /usr/local/bin/claude)" = "$(canon_path "$REPO_DIR/bin/claude")" ]; then
+        rm -f /usr/local/bin/claude
+        echo "  removed /usr/local/bin/claude shim symlink"
+      fi
+      if [ -L /usr/local/bin/codex ] && [ "$(canon_path /usr/local/bin/codex)" = "$(canon_path "$REPO_DIR/bin/codex")" ]; then
+        rm -f /usr/local/bin/codex
+        echo "  removed /usr/local/bin/codex shim symlink"
+      fi
     fi
   fi
   local root
   for root in "$ACC_ROOT" "$CODEX_ACC_ROOT"; do
     if [ "$PURGE" = "1" ]; then
-      case "$root" in
-        */.claude-accounts|*/.codex-accounts) rm -rf "$root"; echo "  purged $root" ;;
-        *) echo "  refusing to purge unusual accounts root: $root" >&2 ;;
-      esac
+      # Either the conventional location, or a directory that is provably a pool (it
+      # holds a manifest) — an instance root lives anywhere, so the manifest is what
+      # makes `rm -rf` safe. Anything else is left alone.
+      if is_pool_root "$root"; then
+        rm -rf "$root"; echo "  purged $root"
+      else
+        echo "  refusing to purge unusual accounts root: $root" >&2
+      fi
     fi
   done
   if [ "$PURGE" != "1" ]; then
@@ -251,6 +337,9 @@ do_install() {
   local kind
   kind="$(machine_kind)"
   echo "claude-multiacc: installing (mode: $kind, repo: $REPO_DIR)"
+  if [ -n "$INSTANCE" ]; then
+    echo "  instance: $INSTANCE (agents labelled $LABEL.*, pools $ACC_ROOT + $CODEX_ACC_ROOT)"
+  fi
 
   [ -x "$REPO_DIR/bin/claude" ] || chmod +x "$REPO_DIR/bin/claude" 2>/dev/null || true
   [ -x "$REPO_DIR/bin/claude-accounts" ] || chmod +x "$REPO_DIR/bin/claude-accounts" 2>/dev/null || true
@@ -289,7 +378,11 @@ with open(sys.argv[1] + '.tmp', 'w') as f:
 os.replace(sys.argv[1] + '.tmp', sys.argv[1])
 PYEOF
   fi
-  echo "  account pool: $ACC_ROOT (manifest ready)"
+  if sync_target_is_local "$(sync_target)"; then
+    echo "  account pool: $ACC_ROOT (manifest ready; sync target: none — local-only)"
+  else
+    echo "  account pool: $ACC_ROOT (manifest ready; sync target: $(sync_target))"
+  fi
   # The codex pool gets its own skeleton + manifest (same schema, separate root).
   if ! "$REPO_DIR/bin/codex-accounts" init-pool "${SERVER_OVERRIDE:-}" >/dev/null 2>&1; then
     echo "  WARNING: codex pool init failed (codex-accounts init-pool)" >&2
@@ -297,31 +390,44 @@ PYEOF
     echo "  codex account pool: $CODEX_ACC_ROOT (manifest ready)"
   fi
 
+  # An INSTANCE install never rewrites the shell rc blocks: one interactive PATH
+  # cannot serve two pools, and clobbering the default install's block would point
+  # the operator's shell at an instance pool. Its agents (below) carry the roots
+  # instead, and the runner daemon invokes the shims by absolute path.
+  if [ -n "$INSTANCE" ]; then
+    echo "  PATH block: skipped (instance install) — for a shell against this pool:"
+    echo "    export CLAUDE_ACCOUNTS_ROOT='$ACC_ROOT' CODEX_ACCOUNTS_ROOT='$CODEX_ACC_ROOT'"
+    echo "    export PATH=\"$REPO_DIR/bin:\$PATH\""
+  fi
   if [ "$kind" = "mac" ]; then
     # .zshenv covers non-interactive zsh; the .zshrc block must be LAST so it wins
     # over ~/.local/bin re-prepends done earlier in .zshrc/.zprofile.
     # zsh reads: .zshenv always; .zprofile for login; .zshrc for interactive.
     # The block must end each file that later re-prepends ~/.local/bin.
-    touch "$HOME/.zshenv"
-    append_block "$HOME/.zshenv"
-    touch "$HOME/.zprofile"
-    append_block "$HOME/.zprofile"
-    touch "$HOME/.zshrc"
-    append_block "$HOME/.zshrc"
-    [ -f "$HOME/.bash_profile" ] && append_block "$HOME/.bash_profile"
-    [ -f "$HOME/.bashrc" ] && append_block "$HOME/.bashrc"
-    echo "  PATH block: end of ~/.zshenv, ~/.zprofile, ~/.zshrc (+ bash rc files if present)"
+    if [ -z "$INSTANCE" ]; then
+      touch "$HOME/.zshenv"
+      append_block "$HOME/.zshenv"
+      touch "$HOME/.zprofile"
+      append_block "$HOME/.zprofile"
+      touch "$HOME/.zshrc"
+      append_block "$HOME/.zshrc"
+      [ -f "$HOME/.bash_profile" ] && append_block "$HOME/.bash_profile"
+      [ -f "$HOME/.bashrc" ] && append_block "$HOME/.bashrc"
+      echo "  PATH block: end of ~/.zshenv, ~/.zprofile, ~/.zshrc (+ bash rc files if present)"
+    fi
     [ "$NO_SCHEDULE" = "1" ] || mac_schedule_install
   else
-    touch "$HOME/.bashrc"
-    append_block "$HOME/.bashrc"
-    if [ -w /etc/profile.d ] 2>/dev/null || [ "$(id -u)" = "0" ]; then
-      {
-        printf '%s\n' "$MARK_BEGIN"
-        path_block_body
-        printf '%s\n' "$MARK_END"
-      } > "$PROFILED"
-      echo "  PATH block: ~/.bashrc + $PROFILED"
+    if [ -z "$INSTANCE" ]; then
+      touch "$HOME/.bashrc"
+      append_block "$HOME/.bashrc"
+      if [ -w /etc/profile.d ] 2>/dev/null || [ "$(id -u)" = "0" ]; then
+        {
+          printf '%s\n' "$MARK_BEGIN"
+          path_block_body
+          printf '%s\n' "$MARK_END"
+        } > "$PROFILED"
+        echo "  PATH block: ~/.bashrc + $PROFILED"
+      fi
     fi
     if [ "$(id -u)" = "0" ]; then
       if [ -e /usr/local/bin/claude ] && [ ! -L /usr/local/bin/claude ]; then