claude-multiacc 2.0.59 → 2.0.61

package/README.md

@@ -568,7 +568,25 @@ claude-accounts mcp apply                        # re-apply now (repair drift)
   outcome into the registry and every other account (`learn`). This includes a command run
   from **inside** a pooled session (an agent's Bash tool, `npx appinspire-mcp install` run by
   an agent): the session's config dir is a pool account, so the same mirror applies. A
-  config dir outside the pool is plain passthrough.
+  config dir outside the pool is plain passthrough. Global options in front of `mcp` are
+  looked past the way the real parser does (`alias claude='claude
+  --dangerously-skip-permissions'` puts one before every typed `claude mcp add`; until
+  2026-10-22 that kept motionsites in 2 of 11 accounts). Mirroring is limited to the server
+  named by the command, including its project approvals: a concurrent runner update to
+  another server cannot become a synced override or tombstone. An unrecognized command
+  option leaves the native command intact and warns that its change was not mirrored.
+  Claude's desktop bulk import mirrors changes except names and retirements belonging to
+  another machine-local overlay owner; an explicit named command can still override one.
+- **Adoption**: whatever reached an account by another route — the real binary run
+  directly, a hand edit, another tool's installer — is adopted by the next reconcile: a
+  server (user scope or a project entry) or a project's `.mcp.json` approval that no section
+  names, live or retired, joins the registry (a replica: its overlay) and so every account.
+  Several definitions of one name: the one most accounts hold wins, then the newest config
+  file. Every limits pass reconciles all accounts this way, so an idle account catches up too.
+  Never adopted: anything the pool itself once wrote into that account (`<acct>/.mcp-managed.json`
+  — so a stray synced entry dropped without a tombstone, or a vanished overlay owner's
+  server, stays out of the synced registry), tombstoned names, and nothing at all with
+  `CLAUDE_MULTIACC_MCP_ADOPT=0` / `CODEX_MULTIACC_MCP_ADOPT=0`.
 - **Runner-managed servers**: on app-robot fleet Macs the runner publishes `appinspire-mcp` into
   each Mac's machine-local overlay with that Mac's own paths. Never `mcp add` it to the synced
   registry (directly, through a mirrored `claude|codex mcp add`, or via `appinspire-mcp install`):

package/bin/claude

@@ -167,15 +167,83 @@ mcp_oauth_ensure() { # $1 acct dir — silent, never changes the exit status
 # account against a snapshot taken just before). The real CLI's own parser and writer do
 # the work; the shim only copies the outcome. Exits with the real binary's status; a
 # mirror failure is one hint line. Returns 1 when this run is not such a command.
+# The index of the first positional argument as the real CLI's parser (commander) finds
+# it: global options may come first, in any number. The operator's `alias claude='claude
+# --dangerously-skip-permissions'` puts one in front of every `claude mcp add` typed at a
+# prompt, and the scoped-limit fallback prepends `--model X`; the mirror once looked at $1
+# alone, so on 2026-10-22 motionsites (and playwright, inspo) sat in the one account a
+# typed add ran under. A value option skips its value; an optional-value one the next
+# word unless it is an option; a variadic one every word up to the next option. `--`, or
+# a positional after `--` counts (commander's own rule). No positional: status 1. Options
+# of claude 2.1.308 (`claude --help`; hidden ones left out on purpose): an unknown one
+# counts as a flag — at worst its value is taken for the positional, which is then no
+# `mcp`, the run is not mirrored, and the registry's adoption picks the server up instead.
+CLI_VALUE_OPTS=" --agent --agents --append-system-prompt --append-system-prompt-file \
+--autocompact --debug-file --effort --environment --fallback-model --input-format \
+--json-schema --max-budget-usd --model -n --name --output-format --permission-mode \
+--permission-prompts --permission-prompt-tool --plugin-dir --plugin-url \
+--remote-control-session-name-prefix --session-id --setting-sources --settings \
+--system-prompt --system-prompt-file --system-prompt-snapshot "
+CLI_OPTIONAL_OPTS=" -d --debug --cloud --from-pr --prompt-suggestions --remote-control --rc \
+--remote -r --resume --teleport -w --worktree "
+CLI_VARIADIC_OPTS=" --add-dir --allowedTools --allowed-tools --betas --disallowedTools \
+--disallowed-tools --file --mcp-config --tools "
+cli_positional_at() { # argv -> prints the index of its first positional argument
+  local i=1 a nx
+  while [ "$i" -le "$#" ]; do
+    a="${!i}"
+    case "$a" in
+      --) i=$((i + 1)); [ "$i" -le "$#" ] || return 1; printf '%s\n' "$i"; return 0 ;;
+      --*=*) i=$((i + 1)); continue ;;
+      -?*) ;;
+      *) printf '%s\n' "$i"; return 0 ;;
+    esac
+    i=$((i + 1))
+    case "$CLI_VALUE_OPTS" in *" $a "*) i=$((i + 1)); continue ;; esac
+    case "$CLI_OPTIONAL_OPTS" in
+      *" $a "*) nx="${!i:-}"; case "$nx" in ''|-*) ;; *) i=$((i + 1)) ;; esac; continue ;;
+    esac
+    case "$CLI_VARIADIC_OPTS" in
+      *" $a "*)
+        while [ "$i" -le "$#" ]; do
+          nx="${!i}"; case "$nx" in -*) break ;; esac; i=$((i + 1))
+        done ;;
+    esac
+  done
+  return 1
+}
+
+# Whether argv is `claude [global options] mcp add|add-json|add-from-claude-desktop|remove …`.
+# The exact word -p/--print (or --bg/--background) anywhere before a `--` puts the client in
+# print/background mode, which never runs the subcommand.
+mcp_mutation_argv() {
+  local i j a
+  for a in "$@"; do
+    case "$a" in --) break ;; -p|--print|--bg|--background) return 1 ;; esac
+  done
+  i="$(cli_positional_at "$@")" || return 1
+  [ "${!i}" = "mcp" ] || return 1
+  j=$((i + 1))
+  case "${!j:-}" in add|add-json|add-from-claude-desktop|remove) MCP_MUTATION_AT="$j"; return 0 ;; esac
+  return 1
+}
+
 mcp_mirror_run() { # $1 acct dir, then the user's argv — exits when it handled the run
-  local d="$1" snap="" rc verb="${2:-}" sub="${3:-}"
+  local d="$1" snap="" rc parse_rc name="" mirror_args=()
   shift
-  # The scoped-limit fallback may have prepended `--model X` (a global option the real
-  # CLI accepts in front of any subcommand): look past it.
-  if [ "$verb" = "--model" ]; then verb="${3:-}"; sub="${4:-}"; fi
-  [ "$verb" = "mcp" ] || return 1
-  case "$sub" in add|add-json|remove) ;; *) return 1 ;; esac
+  mcp_mutation_argv "$@" || return 1
   [ "${CLAUDE_MULTIACC_MCP:-1}" != "0" ] && [ -f "$MCP_PY" ] || return 1
+  if [ "${!MCP_MUTATION_AT}" != add-from-claude-desktop ]; then
+    if name="$(. "$SELF_DIR/../lib/mcp_mirror.sh" && mcp_mutation_name claude "${@:$MCP_MUTATION_AT}")"; then
+      mirror_args=("--name=$name")
+    else
+      parse_rc=$?
+      "$REAL" "$@"; rc=$?
+      [ "$rc" -ne 0 ] || [ "$parse_rc" = 2 ] \
+        || printf 'claude-multiacc: could not identify the MCP target; change not mirrored\n' >&2
+      exit "$rc"
+    fi
+  fi
   mcp_ensure "$d"
   snap="$(mktemp "${TMPDIR:-/tmp}/claude-mcp-snap.XXXXXX" 2>/dev/null)" || snap=""
   if [ -n "$snap" ] && ! "$MCP_PYBIN" "$MCP_PY" --root "$ACC_ROOT" --provider claude snapshot \
@@ -186,7 +254,7 @@ mcp_mirror_run() { # $1 acct dir, then the user's argv — exits when it handled
   rc=$?
   if [ "$rc" -eq 0 ] && [ -n "$snap" ]; then
     "$MCP_PYBIN" "$MCP_PY" --root "$ACC_ROOT" --provider claude learn --account-dir "$d" \
-      --before "$snap" --project "$(pwd -P 2>/dev/null || pwd)" </dev/null \
+      --before "$snap" --project "$(pwd -P 2>/dev/null || pwd)" ${mirror_args[@]+"${mirror_args[@]}"} </dev/null \
       || printf 'claude-multiacc: could not mirror the MCP change to the other accounts — run: claude-accounts mcp apply\n' >&2
   elif [ "$rc" -eq 0 ]; then
     printf 'claude-multiacc: could not mirror the MCP change to the other accounts — run: claude-accounts mcp apply\n' >&2
@@ -207,9 +275,8 @@ mcp_nested_mirror() {
   [ "${CLAUDE_MULTIACC_DISABLE:-0}" = "1" ] && return 1
   [ "${CLAUDE_MULTIACC_MCP:-1}" = "0" ] && return 1
   [ -n "${CLAUDE_CONFIG_DIR:-}" ] || return 1
-  local verb="${1:-}" cfg="${CLAUDE_CONFIG_DIR%/}" d=""
-  if [ "$verb" = "--model" ]; then verb="${3:-}"; fi
-  [ "$verb" = "mcp" ] || return 1
+  local cfg="${CLAUDE_CONFIG_DIR%/}" d=""
+  mcp_mutation_argv "$@" || return 1
   # A DIRECT child of the pool root, by its given spelling or its physical one (an
   # adopted account is a symlink whose target is the operator's ~/.claude).
   case "$cfg" in
@@ -2522,7 +2589,7 @@ export CLAUDE_SHIM_ACTIVE=1
 
 # A `claude mcp add|add-json|remove` is run as a child under the picked account and
 # mirrored to every other one (exits inside); anything else falls through to exec.
-if [ "${1:-}" = "mcp" ] || { [ "${1:-}" = "--model" ] && [ "${3:-}" = "mcp" ]; }; then
+if mcp_mutation_argv "$@"; then
   export CLAUDE_CONFIG_DIR="$pick"
   tok="$PICK_TOKEN"
   [ -n "$tok" ] && export CLAUDE_CODE_OAUTH_TOKEN="$tok"

package/bin/claude-accounts

@@ -2963,6 +2963,9 @@ PYEOF
   # lock while a consumer reads its output.
   limits_lock_release
   trap - EXIT
+  # Every account's MCP servers, adopting what one holds that the registry does not know
+  # (lib/common.sh) — before the push below, which carries the registry to the peers.
+  mcp_registry_pass
   # Whoever just refreshed is the only machine that CAN — pass it on before the
   # report, so a blind peer stops picking drained accounts within one cycle.
   limits_distribute

package/bin/codex

@@ -119,12 +119,70 @@ mcp_ensure() { # $1 acct dir — silent, never changes the exit status
 # snapshot taken just before). The real CLI's own parser and writer do the work; the shim
 # only copies the outcome. Exits with the real binary's status; a mirror failure is one
 # hint line. Returns 1 when this run is not such a command.
+# The index of the first positional argument as the real CLI's parser (clap) finds it:
+# global options may come first, in any number. The operator's `alias codex='codex
+# --dangerously-bypass-approvals-and-sandbox'` puts one in front of every `codex mcp add`
+# typed at a prompt, and the mirror once looked at $1 alone (bin/claude met the same on
+# 2026-10-22). A value option skips its value (attached `-mX`/`--model=X` is one word); a
+# variadic one every word up to the next option. `--`, or no positional: status 1.
+# Options of codex-cli 0.163 (`codex --help`); an unknown one counts as a flag.
+CLI_VALUE_OPTS=" -c --config --enable --disable --remote --remote-auth-token-env -m --model \
+--local-provider -p --profile -s --sandbox -C --cd --add-dir -a --ask-for-approval "
+CLI_VARIADIC_OPTS=" -i --image "
+cli_positional_at() { # argv -> prints the index of its first positional argument
+  local i=1 a nx
+  while [ "$i" -le "$#" ]; do
+    a="${!i}"
+    case "$a" in
+      --) return 1 ;;
+      --*=*) i=$((i + 1)); continue ;;
+      -?*) ;;
+      *) printf '%s\n' "$i"; return 0 ;;
+    esac
+    i=$((i + 1))
+    case "$CLI_VALUE_OPTS" in *" $a "*) i=$((i + 1)); continue ;; esac
+    case "$CLI_VARIADIC_OPTS" in
+      *" $a "*)
+        while [ "$i" -le "$#" ]; do
+          nx="${!i}"; case "$nx" in -*) break ;; esac; i=$((i + 1))
+        done ;;
+    esac
+  done
+  return 1
+}
+
+# Whether argv is `codex [global options] mcp add|remove …`.
+mcp_mutation_argv() {
+  local i j
+  i="$(cli_positional_at "$@")" || return 1
+  [ "${!i}" = "mcp" ] || return 1
+  j=$((i + 1))
+  # `mcp` takes options of its own before its subcommand: -c/--config, --enable, --disable
+  while :; do
+    case "${!j:-}" in
+      -c|--config|--enable|--disable) j=$((j + 2)) ;;
+      --*=*|-c?*) j=$((j + 1)) ;;
+      *) break ;;
+    esac
+  done
+  case "${!j:-}" in add|remove) MCP_MUTATION_AT="$j"; return 0 ;; esac
+  return 1
+}
+
 mcp_mirror_run() { # $1 acct dir, then the user's argv — exits when it handled the run
-  local d="$1" snap="" rc
+  local d="$1" snap="" rc parse_rc name=""
   shift
-  [ "${1:-}" = "mcp" ] || return 1
-  case "${2:-}" in add|remove) ;; *) return 1 ;; esac
+  mcp_mutation_argv "$@" || return 1
   [ "${CODEX_MULTIACC_MCP:-1}" != "0" ] && [ -f "$MCP_PY" ] || return 1
+  if name="$(. "$SELF_DIR/../lib/mcp_mirror.sh" && mcp_mutation_name codex "${@:$MCP_MUTATION_AT}")"; then
+    :
+  else
+    parse_rc=$?
+    "$REAL" "$@"; rc=$?
+    [ "$rc" -ne 0 ] || [ "$parse_rc" = 2 ] \
+      || printf 'codex-multiacc: could not identify the MCP target; change not mirrored\n' >&2
+    exit "$rc"
+  fi
   mcp_ensure "$d"
   snap="$(mktemp "${TMPDIR:-/tmp}/codex-mcp-snap.XXXXXX" 2>/dev/null)" || snap=""
   if [ -n "$snap" ] && ! "$MCP_PYBIN" "$MCP_PY" --root "$ACC_ROOT" --provider codex snapshot \
@@ -135,7 +193,7 @@ mcp_mirror_run() { # $1 acct dir, then the user's argv — exits when it handled
   rc=$?
   if [ "$rc" -eq 0 ] && [ -n "$snap" ]; then
     "$MCP_PYBIN" "$MCP_PY" --root "$ACC_ROOT" --provider codex learn --account-dir "$d" \
-      --before "$snap" </dev/null \
+      --before "$snap" "--name=$name" </dev/null \
       || printf 'codex-multiacc: could not mirror the MCP change to the other accounts — run: codex-accounts mcp apply\n' >&2
   elif [ "$rc" -eq 0 ]; then
     printf 'codex-multiacc: could not mirror the MCP change to the other accounts — run: codex-accounts mcp apply\n' >&2
@@ -156,8 +214,8 @@ mcp_nested_mirror() {
   [ "${CODEX_MULTIACC_DISABLE:-0}" = "1" ] && return 1
   [ "${CODEX_MULTIACC_MCP:-1}" = "0" ] && return 1
   [ -n "${CODEX_HOME:-}" ] || return 1
-  local verb="${1:-}" cfg="${CODEX_HOME%/}" d=""
-  [ "$verb" = "mcp" ] || return 1
+  local cfg="${CODEX_HOME%/}" d=""
+  mcp_mutation_argv "$@" || return 1
   # A DIRECT child of the pool root, by its given spelling or its physical one (an
   # adopted account is a symlink whose target is the operator's ~/.claude).
   case "$cfg" in
@@ -1526,7 +1584,7 @@ export CODEX_SHIM_ACTIVE=1
 
 # A `codex mcp add|remove` is run as a child under the picked account and mirrored to
 # every other one (exits inside); anything else falls through to exec.
-if [ "${1:-}" = "mcp" ]; then
+if mcp_mutation_argv "$@"; then
   share_state_index "$pick"
   export CODEX_HOME="$pick"
   mcp_mirror_run "$pick" "$@" || true

package/bin/codex-accounts

@@ -1846,6 +1846,8 @@ PYEOF
   # lock while a consumer reads its output.
   codex_limits_lock_release
   trap - EXIT
+  # Every account's MCP servers, adopting what one holds that the registry does not know.
+  mcp_registry_pass
   # This pool's model catalog, once its copy is an hour old (lib/common.sh).
   model_catalog_backstop
   # The refresher fails open per account; a NON-zero status means the pass itself

package/lib/common.sh

@@ -771,6 +771,21 @@ seed_mcp_registry() { # $1 = acct dir
   return 0
 }
 
+# Once per scheduled limits pass: reconcile EVERY account, which first adopts what any
+# one of them holds that the registry does not know (lib/mcp_registry.py adopt) — the
+# backstop for a server added where the shims' mirror never saw it, reaching accounts no
+# session launched on since. Unlike the shims' pre-exec apply it also runs before this
+# pool has a registry at all. Inline, quiet, fail-open: a pass never dies on it.
+mcp_registry_pass() {
+  local off
+  if [ "$MULTIACC_PROVIDER" = "codex" ]; then off="${CODEX_MULTIACC_MCP:-1}"; else off="${CLAUDE_MULTIACC_MCP:-1}"; fi
+  [ "$off" = "0" ] && return 0
+  [ -f "$LIB_DIR/mcp_registry.py" ] || return 0
+  "$PYBIN" "$LIB_DIR/mcp_registry.py" --root "$ACC_ROOT" --provider "$MULTIACC_PROVIDER" apply \
+    --all --fail-open --quiet >/dev/null 2>&1 </dev/null || true
+  return 0
+}
+
 seed_account_dir() { # $1 = acct dir
   local d="$1"
   mkdir -p "$d"

package/lib/mcp_mirror.py

@@ -0,0 +1,49 @@
+"""Keep stock MCP mutations scoped to the server the command actually named."""
+
+import copy
+
+
+def _external_names(overlay, target_owner):
+    """Bulk imports cannot promote another local owner's machine-specific entries."""
+    user, everywhere, projects = set(), set(), {}
+    for owner, section in overlay.get("owners", {}).items():
+        if owner == target_owner:
+            continue
+        everywhere.update(section.get("retired") or [])
+        user.update(section.get("mcpServers") or {})
+        user.update(section.get("retiredUser") or [])
+        for path, entry in (section.get("projects") or {}).items():
+            names = projects.setdefault(path, set())
+            names.update(entry.get("mcpServers") or {})
+            names.update(entry.get("retired") or [])
+            names.update(entry.get("enabledMcpjsonServers") or [])
+    return user | everywhere, everywhere, projects
+
+
+def _filtered_snapshot(snapshot, keep_user, keep_project):
+    result = copy.deepcopy(snapshot)
+    result["user"] = {name: block for name, block in (result.get("user") or {}).items()
+                      if keep_user(name)}
+    for path, entry in (result.get("projects") or {}).items():
+        entry["mcpServers"] = {name: block for name, block in (entry.get("mcpServers") or {}).items()
+                               if keep_project(path, name)}
+        for key in ("enabledMcpjsonServers", "disabledMcpjsonServers"):
+            entry[key] = [name for name in (entry.get(key) or []) if keep_project(path, name)]
+    return result
+
+
+def scoped_snapshots(before, after, name, overlay, target_owner=None):
+    """Named commands mirror only their target, including project approvals.
+
+    Without a name (desktop bulk import), externally owned names are excluded even
+    if a delayed reconcile writes an older generation than the current overlay.
+    """
+    if name is not None:
+        keep_user = lambda candidate: candidate == name
+        keep_project = lambda _path, candidate: candidate == name
+    else:
+        user, everywhere, projects = _external_names(overlay, target_owner)
+        keep_user = lambda candidate: candidate not in user
+        keep_project = lambda path, candidate: candidate not in everywhere | projects.get(path, set())
+    return (_filtered_snapshot(before, keep_user, keep_project),
+            _filtered_snapshot(after, keep_user, keep_project))

package/lib/mcp_mirror.sh

@@ -0,0 +1,47 @@
+# Target of a stock MCP mutation. Global CLI options are already skipped by the shim.
+# Unknown options fail closed: the native command still runs, but is not mirrored.
+# Status 2 is a help request before the target; pass it through without a warning.
+mcp_mutation_name() { # provider, verb, then the verb's argv -> server name
+  local provider="$1" verb="$2" values="" variadic="" flags=" " a opt attached
+  shift 2
+  case "$provider:$verb" in
+    claude:add)
+      values=" -s --scope -t --transport --callback-port --client-id "
+      variadic=" -e --env -H --header "; flags="$flags--client-secret " ;;
+    claude:add-json) values=" -s --scope "; flags="$flags--client-secret " ;;
+    claude:remove) values=" -s --scope " ;;
+    codex:add)
+      values=" -c --config --env --enable --disable --url --bearer-token-env-var \
+--oauth-client-id --oauth-client-secret --oauth-client-registration --oauth-resource " ;;
+    codex:remove) values=" -c --config --enable --disable " ;;
+    *) return 1 ;;
+  esac
+  while [ "$#" -gt 0 ]; do
+    a="$1"; shift
+    case "$a" in
+      --) [ "$#" -gt 0 ] || return 1; printf '%s\n' "$1"; return 0 ;;
+      -h|--help) return 2 ;;
+      -?*) ;;
+      *) printf '%s\n' "$a"; return 0 ;;
+    esac
+    opt="$a"; attached=0
+    case "$a" in
+      --*=*) opt="${a%%=*}"; attached=1 ;;
+      --*) ;;
+      -?*) opt="${a:0:2}"; [ "${#a}" -le 2 ] || attached=1 ;;
+    esac
+    case "$values" in
+      *" $opt "*)
+        if [ "$attached" = 0 ]; then [ "$#" -gt 0 ] || return 1; shift; fi
+        continue ;;
+    esac
+    case "$variadic" in
+      *" $opt "*)
+        while [ "$#" -gt 0 ]; do case "$1" in -*) break ;; esac; shift; done
+        continue ;;
+    esac
+    case "$flags" in *" $opt "*) [ "$attached" = 0 ] || return 1; continue ;; esac
+    return 1
+  done
+  return 1
+}