vwemirror/BT411
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

operator UI: a departed player no longer keeps their seat in the roster

Browse Source 
Operator report: "if a player disconnects from the console, it leaves their name
up in the roster ... it should turn their seat back to empty."  I had not noticed
or fixed this -- the earlier review raised adjacent roster issues (lights mapped
through the untrimmed tag list after a trim) but not this one.

CAUSE.  The GUI only ever WROTE walk-up names into the table.  On a disconnect
the relay pops seat_info, the write-back loop hit `if not info: continue`, and
the cell kept the departed callsign for the rest of the session -- while the
pilot light beside it correctly said "waiting".  So the table and the light
disagreed and a free seat looked occupied.

Two changes, because the relay's two seat-clearing signals are NOT symmetric:

  * SessionMonitor now pops seat_info when a pilot goes idle from EITHER signal.
    "PLAYER n LEFT" is only printed inside the beacon-close branch gated on
    `if seat not in self.by_host` (the relay's own comment: "never claimed:
    player left"), so a player who was fully REGISTERED and then dropped
    produced only `game[...] dropped` -- the common case, and the one that left
    the name up.  Keying "seat is empty" off LEFT alone could never have worked.
  * _refresh_pod_status stashes the operator's configured callsign/mech PER
    OCCUPANCY when a seat fills, and restores it when the seat empties.
    Per-occupancy rather than once at egg load, so an edit the operator makes
    while a seat is empty is respected instead of being overwritten by a stale
    snapshot.

It restores the CONFIGURED PILOT, not a literal blank, deliberately: that cell is
editable and is what gets written to the egg on Save, so a placeholder like
"-- empty --" would end up in the mission file.  The "unoccupied" signal is the
grey `waiting` light beside it.

NOT CHANGED, and explained instead: a vacated seat is held for its player for 90s
(seat_reclaim) so a crash or a reconnect returns them to the same seat and mech.
Assignment skips claimed/reserved/reclaim-held seats, so a brand-new joiner in
that window gets the next free seat, or ROSTER FULL if there wasn't one; after 90s
the seat is fair game.  The operator said they were happy with players keeping
their seat/address, so this stays -- it is now documented in both docs rather than
silently removed.

VERIFIED: scratchpad/test_operator_roster.py (new, 14 checks) drives the REAL Qt
widget offscreen and feeds it the REAL relay log lines: a walk-up name appears;
after REGISTERED then `dropped` the light returns to waiting AND the seat shows
the configured pilot again; the seat is reusable by a different player and clears
for them too; the `PLAYER n LEFT` path clears it as well; an operator edit made
while the seat was empty survives an occupancy; and a neighbouring row is never
touched by another seat's traffic.  Other suites still pass (rearm 19/19, net
17/17); checkctx CLEAN.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
arcattack
2026-07-26 08:43:18 -05:00
co-authored by Claude Opus 5
parent ab5828a866
commit 3a694485bf
4 changed files with 207 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/btoperator.py
+45 -8
View File
@@ -163,6 +163,14 @@ class SessionMonitor:
tag = self.host_tag(int(m.group(1)))
if tag and self.state.get(tag) != ST_IDLE:
self.state[tag] = ST_IDLE
# ALSO forget the walk-up identity. "PLAYER n LEFT" -- the
# other line that clears a seat -- is only printed by the
# relay when the player never CLAIMED its seat, so a
# registered player dropping mid-session produced only this
# `dropped` line. Without the pop, seat_info kept their
# callsign and the roster showed a departed pilot as still
# sitting there (operator report 2026-07-26).
self.seat_info.pop(tag, None)
changed = True
m = self.RE_RELAY_HELD.search(line)
if m:
@@ -303,6 +311,10 @@ class Operator(QMainWindow):
self.egg_path = DEFAULT_EGG
self.console_proc = None
self.remote_link = None
# row -> (configured callsign, configured mech), stashed while that seat
# is occupied by a walk-up player and restored when it empties, so a
# departed pilot's name does not sit in the roster (report 2026-07-26).
self._seat_defaults = {}
self.game_procs = []
self.monitor = None
self._build_ui()
@@ -1069,19 +1081,44 @@ class Operator(QMainWindow):
head = "mesh console driving pods"
self.pod_status.setText("<b>%s</b> &nbsp;&nbsp; %s"
% (head, " &nbsp; ".join(parts)))
# reflect walk-up callsign/mech requests in the roster table
# Reflect walk-up callsign/mech requests in the roster table -- AND put a
# seat back to its configured default when its player leaves.
#
# This used to only ever WRITE a name in: on a disconnect the relay pops
# seat_info, the loop hit `if not info: continue`, and the departed
# player's callsign sat in the roster for the rest of the session. The
# pilot light next to it correctly said "waiting", so the table and the
# light disagreed and the seat looked occupied when it was free
# (operator report 2026-07-26).
#
# Restoring the OPERATOR'S CONFIGURED value -- not a literal blank -- is
# deliberate: this cell is editable and is what gets written to the egg on
# Save, so stuffing a placeholder like "-- empty --" in here would put
# that placeholder into the mission file.
for r in range(self.table.rowCount()):
item = self.table.item(r, 0)
if item is None:
continue
info = self.monitor.seat_info.get(item.text().strip())
if not info:
continue
callsign, mech = info
if callsign and self.table.item(r, 1) is not None \
and self.table.item(r, 1).text() != callsign:
self.table.item(r, 1).setText(callsign)
tag = item.text().strip()
info = self.monitor.seat_info.get(tag)
cell = self.table.item(r, 1)
combo = self.table.cellWidget(r, 2)
if info:
# Occupied. On the FIRST refresh of this occupancy, stash what
# the operator had configured so we can put it back later. Doing
# it per-occupancy (rather than once at load) means an edit the
# operator makes while a seat is empty is respected.
if r not in self._seat_defaults:
self._seat_defaults[r] = (
cell.text() if cell is not None else None,
combo.currentText() if combo is not None else None)
callsign, mech = info
else:
# Empty: restore the configured pilot and forget the stash, so
# the next player to take this seat re-snapshots.
callsign, mech = self._seat_defaults.pop(r, (None, None))
if callsign and cell is not None and cell.text() != callsign:
cell.setText(callsign)
if mech and combo is not None and combo.currentText() != mech:
combo.setCurrentText(mech)
# A REMOTE operator has no console_proc -- its command channel is the