agents-city 0.5.2 → 0.5.4

package/plugin/scripts/cities.py

@@ -314,10 +314,20 @@ def registra(datos, usuario=''):
         f.write(f'{usuario}\t{r}\n')
 
 
-def lista(usuario=''):
-    """Every city this user owns or has explicitly registered."""
+def lista(usuario='', tocando=True):
+    """Every city this user owns or has explicitly registered.
+
+    `tocando=False` for callers that must not change what they are looking at.
+    Listing normally HEALS: it migrates a v1 layout and gives every managed city
+    its metadata — which does `makedirs` before it decides there is nothing to
+    write. That is right when somebody is about to work in a city, and wrong
+    when the only reason to ask is to write a log line: the journal runs after
+    the handler, so on a request that archived a city, asking where to write
+    brought the folder back. A read that writes is not a read.
+    """
     usuario = _slug(usuario or usuario_actual(), 'me')
-    migra_legacy(usuario)
+    if tocando:
+        migra_legacy(usuario)
     candidatas = []
     propia = carpeta_usuario(usuario)
     try:
@@ -335,7 +345,8 @@ def lista(usuario=''):
         if owner_en_disco and _slug(owner_en_disco, 'me') != usuario:
             continue
         vistos.add(r)
-        meta = asegura_metadata(r, usuario) if gestionada(r, usuario) else {}
+        meta = (asegura_metadata(r, usuario)
+                if tocando and gestionada(r, usuario) else {})
         fuera.append({
             'ruta': r,
             'nombre': nombre(r),
@@ -358,6 +369,37 @@ def selecciona(usuario, datos):
     _atomico(_fichero_actual(usuario), datos + '\n')
 
 
+def actual_sin_tocar(usuario=''):
+    """Which city is selected, answered without changing anything.
+
+    `actual()` is a resolver that also repairs: it migrates a v1 layout, heals
+    the metadata of every managed city it lists, records a new selection, and
+    will CREATE `home` when there is none. Every one of those is right before
+    somebody works in a city. None of them is right when the question is only
+    "where does this log line go" — and answering that question is how a city
+    somebody had just archived came back from the dead.
+
+    Returns '' when there is no answer. A caller with nowhere to write must not
+    be handed a folder that was invented for it.
+    """
+    explicita = os.environ.get('AGENTS_CITY_DATA')
+    if explicita and os.path.isdir(os.path.expanduser(explicita)):
+        return _real(explicita)
+    usuario = _slug(usuario or usuario_actual(), 'me')
+    try:
+        elegida = open(_fichero_actual(usuario), encoding='utf-8').read().strip()
+    except OSError:
+        elegida = ''
+    if elegida and es_ciudad(elegida):
+        owner = _lee_clave(elegida, 'owner')
+        if not owner or _slug(owner, 'me') == usuario:
+            return _real(elegida)
+    ciudades = lista(usuario, tocando=False)
+    home = next((c for c in ciudades if c['slug'] == 'home'), None)
+    elegida = home or (ciudades[0] if ciudades else None)
+    return elegida['ruta'] if elegida else ''
+
+
 def actual(usuario='', crear=True, migrar=True):
     """The selected city. Explicit ``AGENTS_CITY_DATA`` always wins."""
     explicita = os.environ.get('AGENTS_CITY_DATA')

package/plugin/scripts/city-session.sh

@@ -95,11 +95,31 @@ ADDRESS="$(python3 "$(dirname "$0")/cities.py" address "$USUARIO" "$EQUIPO")"
 # second local city could address or replace the first one's seat by accident.
 SEAT_NAME="$SESSION"
 
+# ── What is already open ───────────────────────────────────────────────────
+#
+# This used to be "the session exists, attach to it, done". Which meant that
+# adding a house to a city that was already open did nothing you could see: the
+# card had four agents, tmux had three windows, and closing the terminal did not
+# help because detaching from a session is not ending it. The only way to meet
+# your new agent was to kill the whole city — every running agent in it — and
+# start again.
+#
+# So an existing session is reconciled instead of re-created: the windows that
+# are missing are opened, the ones already there are left completely alone.
+# Nothing is ever killed here. A window whose agent left the card is REPORTED,
+# not closed: it may be mid-task, and that decision is the owner's.
+SESION_YA=0
+VENTANAS_YA=""
 if tmux has-session -t "$SESSION" 2>/dev/null; then
-  echo "Session '$SESSION' is already up — attaching."
-  exec tmux attach -d -t "$SESSION"
+  SESION_YA=1
+  VENTANAS_YA="$(tmux list-windows -t "$SESSION" -F '#W' 2>/dev/null || true)"
 fi
 
+existe_ventana() {
+  [ -n "$VENTANAS_YA" ] || return 1
+  printf '%s\n' "$VENTANAS_YA" | grep -Fxq -- "$1"
+}
+
 # Claude's half of the deal, asked for rather than respelled.
 #
 # `arnes.json` declares what this product adds to somebody else's CLI, and
@@ -457,7 +477,13 @@ python3 "$(dirname "$0")/trust-repos.py" "$EQUIPO" ${RUTAS[@]+"${RUTAS[@]}"}
 # ── The seat window: this city's identity on its roads ─────────────────────
 "$RUNTIME" ensure >/dev/null
 comodidades
-tmux new-session -d -s "$SESSION" -n seat -c "$EQUIPO"
+if [ "$SESION_YA" -eq 0 ]; then
+  tmux new-session -d -s "$SESSION" -n seat -c "$EQUIPO"
+elif ! existe_ventana seat; then
+  # The session outlived its own chair — somebody closed that one window. The
+  # city is not a city without it.
+  tmux new-window -t "$SESSION" -n seat -c "$EQUIPO"
+fi
 
 # Where the cards live, told to the session rather than assumed.
 #
@@ -522,7 +548,11 @@ SEAT_OTRO="$(python3 "$LEER" "$FICHA" "runs.seat")"
 turno=0
 [ -n "$SEAT_OTRO" ] && [ "$(runtime_de "$SEAT_OTRO")" != claude ] && turno=-1
 # If the seat runs another engine, the first repo window is the first Claude.
-if [ "$RUN_CLAUDE" -eq 1 ]; then
+#
+# `! existe_ventana seat`: a chair that is already sitting is not started again.
+# Sending a second `claude` into a live pane would put one runtime on top of
+# another and lose whatever conversation was in it.
+if [ "$RUN_CLAUDE" -eq 1 ] && ! existe_ventana seat; then
   if [ -n "$SEAT_OTRO" ]; then
     SEAT_RUNTIME="$(runtime_de "$SEAT_OTRO")"
     if [ "$SEAT_RUNTIME" = claude ]; then
@@ -550,7 +580,11 @@ fi
 # that validates (declared repo only, never the default branch) and audits.
 # Each window gets its own token file, and its cage re-allows exactly that one.
 BROKER_URL=""
-if [ "${CITY_BROKER:-0}" = "1" ]; then
+if [ "${CITY_BROKER:-0}" = "1" ] && [ "$SESION_YA" -eq 1 ]; then
+  # A restart would invalidate the token files of every window already running.
+  BROKER_URL="$(python3 "$BROKERPY" url --data "$EQUIPO" 2>/dev/null || true)"
+fi
+if [ "${CITY_BROKER:-0}" = "1" ] && [ -z "$BROKER_URL" ]; then
   python3 "$BROKERPY" stop --data "$EQUIPO" >/dev/null 2>&1 || true
   nohup python3 "$BROKERPY" serve --data "$EQUIPO" >/dev/null 2>&1 &
   for _ in 1 2 3 4 5 6 7 8 9 10; do
@@ -569,9 +603,14 @@ fi
 # gateways. None receives assignments through tmux. An unknown CLI must be
 # prefixed with `terminal:` to opt into the visibly labelled compatibility path.
 i=0
+ABIERTAS=()
 for path in ${RUTAS[@]+"${RUTAS[@]}"}; do
   win="${NOMBRES[$i]}"
   i=$((i + 1))
+  # Already open: leave it exactly as it is. Whatever is running in there is
+  # somebody's work in progress.
+  if existe_ventana "$win"; then continue; fi
+  ABIERTAS+=("$win")
   # Professional specialty is separate from bus authority. Every repo actor is
   # still a member; only `seat` is chair. A malformed or legacy value resolves
   # to the explicit blank role in read-card.py.
@@ -642,7 +681,12 @@ for path in ${RUTAS[@]+"${RUTAS[@]}"}; do
   fi
 done
 
-if [ ${#faltan[@]-0} -gt 0 ]; then
+# `${#a[@]}`, not `${#a[@]-0}`. The second is accepted by the bash 3.2 macOS
+# ships and rejected as a bad substitution by bash 4.4 and up — so on every
+# Linux this message never printed, and nobody saw it because the error goes to
+# stderr and the script does not stop. Declared arrays make the default
+# unnecessary: `a=()` already answers 0 under `set -u`.
+if [ ${#faltan[@]} -gt 0 ]; then
   echo >&2
   echo "I could not find these repos on this machine (window skipped):" >&2
   printf '  %s\n' "${faltan[@]}" >&2
@@ -664,5 +708,34 @@ if [ "${#RUTAS[@]}" -eq 0 ]; then
   echo "If that is wrong and you do own folders:  ./bin/seat --repos" >&2
 fi
 
-tmux select-window -t "$SESSION:seat"
+# ── What changed, said out loud ────────────────────────────────────────────
+#
+# Reconciling in silence is how the old bug felt from the outside: you asked for
+# the city, something happened, and you were left to work out whether your new
+# agent was there. So it is stated — including the windows this deliberately did
+# NOT touch.
+DESTACADA="seat"
+if [ "$SESION_YA" -eq 1 ]; then
+  if [ ${#ABIERTAS[@]} -gt 0 ]; then
+    echo "Session '$SESSION' was already up. New windows opened: ${ABIERTAS[*]}" >&2
+    DESTACADA="${ABIERTAS[0]}"
+  else
+    echo "Session '$SESSION' is already up, with every agent on the card — attaching." >&2
+  fi
+  sobran=()
+  for w in $VENTANAS_YA; do
+    [ "$w" = seat ] && continue
+    esta=0
+    for n in ${NOMBRES[@]+"${NOMBRES[@]}"}; do [ "$n" = "$w" ] && esta=1 && break; done
+    [ "$esta" -eq 0 ] && sobran+=("$w")
+  done
+  if [ ${#sobran[@]} -gt 0 ]; then
+    echo >&2
+    echo "These windows are no longer on the card: ${sobran[*]}" >&2
+    echo "Nothing was closed — one of them may be mid-task. When you are sure:" >&2
+    for w in ${sobran[@]+"${sobran[@]}"}; do echo "  tmux kill-window -t $SESSION:$w" >&2; done
+  fi
+fi
+
+tmux select-window -t "$SESSION:$DESTACADA"
 exec tmux attach -d -t "$SESSION"

package/plugin/scripts/domains.py

@@ -161,6 +161,13 @@ Before acting for this city:
    asking it for evidence. Use a chaired committee when several matter.
    Repo agents do not talk directly to each other.
 
+The seat has no hands inside an agent's mounts. Its own ground is this folder,
+the roads and the record; the repos, worktrees and document folders belong to
+the agents that mounted them, and reaching into one is refused with the name of
+who to ask. Ask one agent when one domain matters, a committee when several do,
+and say you are waiting when you are waiting. `seat_reach: open` in `city.yml`
+is the owner's explicit choice to have a chair that reads for itself.
+
 Skills remain installed in the referenced repos. Agents City only recognises
 them; it never copies, installs or enables a repo skill from this folder.
 """

package/plugin/scripts/seat.py

@@ -350,19 +350,7 @@ def escribe_ficha(ruta, usuario, rol, agentes=None, objetivo=None, ciudad=""):
         "## Agents",
         "",
     ]
-    if agentes:
-        for a in agentes:
-            monta = f"{len(a['mounts'])} mount{'s' if len(a['mounts']) != 1 else ''}"
-            cuerpo.append(f"- `{a['nombre']}` — {a['clase']}, role {a['rol']}, {monta}.")
-        cuerpo += ["", "Change the roster with `./bin/seat --agents`."]
-    else:
-        cuerpo += [
-            "No agents yet, on purpose. This role holds a property of "
-            "everybody else's — so it has no houses, and what it is for "
-            "begins where there is more than one city to reach.",
-            "",
-            "If that is wrong: `./bin/seat --agents`.",
-        ]
+    cuerpo += card.bloque_agentes(agentes)
     cuerpo += ["", "## Current goals", ""]
 
     cuerpo += card.bloque_objetivo(objetivo)
@@ -1315,6 +1303,29 @@ def ajusta_seat_yolo(a, datos, nueva):
     return solo
 
 
+def ajusta_seat_reach(a, datos, nueva):
+    """The --seat-reach flag: whether the chair may work inside its agents' own
+    mounts. Returns True when the invocation was ONLY this adjustment.
+
+    Closed by default, and the reason is that the failure it prevents leaves no
+    trace: a seat that reads the repo and answers looks exactly like a seat that
+    asked, right up until the specialist you configured turns out never to have
+    been consulted about anything. Open is a real choice for whoever wants a
+    chair with its own hands — it is just not one this makes for them.
+    """
+    if not a.seat_reach:
+        return False
+    cities.pon_clave(datos, "seat_reach", a.seat_reach)
+    if a.seat_reach == "open":
+        print("  The chair may work inside its agents' mounts (city.yml seat_reach).")
+    else:
+        print("  The chair asks its agents rather than working their ground.")
+    solo = not hay_ajustes(a, nueva)
+    if solo:
+        print("  It applies to the next tool call the seat makes.\n")
+    return solo
+
+
 def configura(a, ficha, nueva, datos, usuario):
     """The seven questions, or the setting being re-asked. False means quit."""
     previo = open(ficha).read() if not nueva else ""
@@ -1586,6 +1597,13 @@ def argumentos():
         metavar="on|off",
         help="whether the chair itself runs without permission prompts (stored per city)",
     )
+    ap.add_argument(
+        "--seat-reach",
+        default="",
+        choices=["open", "closed"],
+        metavar="open|closed",
+        help="whether the chair may work inside its agents' mounts (stored per city)",
+    )
     ap.add_argument("--no-sync", action="store_true")
     ap.add_argument("--only", default="")
     ap.add_argument(
@@ -1652,6 +1670,8 @@ def main():
 
     if ajusta_seat_yolo(a, datos, nueva):
         return 0
+    if ajusta_seat_reach(a, datos, nueva):
+        return 0
 
     if hay_ajustes(a, nueva):
         if nueva:

package/plugin/skills/city/SKILL.md

@@ -76,6 +76,18 @@ committee envelope into a known runtime's tmux window. The terminal adapter is
 an explicit compatibility fallback only when the owner wrote
 `terminal:<command>` for an unknown CLI.
 
+**The seat has no hands inside an agent's mounts.** Not "should prefer not to":
+a tool call that lands on a repo, worktree or document folder some agent mounted
+is refused, and the refusal names the owner and the command that asks them. The
+chair's own ground is the city folder, the roads, the record and its own goal.
+
+That is a boundary, not a courtesy. A seat that reads the code and answers is
+indistinguishable from a seat that consulted its specialists, right up until you
+notice the specialists were never asked anything. Ask one agent when one domain
+matters; open a committee when more than one does; say you are waiting when you
+are waiting. An owner who wants a chair with its own hands sets `seat_reach:
+open` in `city.yml` — explicitly, and per city.
+
 Use a committee only when specialised repo evidence can change the decision:
 
 1. Open a precise brief: question, desired outcome, context, constraints,