5a2ed83f

test: the restored wall creates its local lines and refuses its remote one

a73x 2026-08-25 19:32

Commit message

test: the restored wall creates its local lines and refuses its remote one

One daemon serving both a socket and QUIC, a wall file naming three
sessions it does not have, and a probe before the wall runs so the leg
cannot pass vacuously. After a no-argv `mux wall`, the two --sock lines
exist at the tile's rect and the quic:// one does not exist at all.

test/e2e.sh

@@ @@ -380,6 +380,22 @@ SOCK60="${TMPDIR:-/tmp}/muxd-e2e-lpheal-$$.sock" @@
+SOCK61="${TMPDIR:-/tmp}/muxd-e2e-lpdegrade-$$.sock"
+SOCK62="${TMPDIR:-/tmp}/muxd-e2e-promptA-$$.sock"
+SOCK63="${TMPDIR:-/tmp}/muxd-e2e-promptB-$$.sock"
+# The hydrated-create leg. One daemon, and it serves QUIC as well as its
+# socket: the leg's whole point is the LOCAL/remote split, so both halves
+# have to be the same run of the same daemon or the comparison is between
+# two rigs rather than between two kinds of line. Short socket name on
+# purpose — the assertion reads a label bar back off a 70-column render.
+SOCK64="${TMPDIR:-/tmp}/muxd-e2e-hyd-$$.sock"
+# Base 6000, below the 5000-spaced band the other QUIC ports share: every
+# base from 11000 up is already taken, and a DUPLICATED base passes only
+# for as long as the other leg's daemon happens to be dead by the time
+# this one binds. A collision reads as this daemon's failure, not the
+# suite's, which is why the base has to be the leg's own.
+HYPORT=$(( 6000 + ($$ % 4000) ))
+HYKEY="${TMPDIR:-/tmp}/mux-e2e-hydkey-$$"
+HYSTATE="${TMPDIR:-/tmp}/mux-e2e-hyd-state-$$"
+HYWALL="$HYSTATE/mux/wall"
+D65PID=""
+D54PID=""
+D55PID=""
+D56PID=""
@@ @@ -1335,6 +1351,7 @@ cleanup() { @@
+    [ -n "${D62PID:-}" ] && kill "$D62PID" 2>/dev/null || true
+    [ -n "${D63PID:-}" ] && kill "$D63PID" 2>/dev/null || true
+    [ -n "${D64PID:-}" ] && kill "$D64PID" 2>/dev/null || true
+    [ -n "${D65PID:-}" ] && kill "$D65PID" 2>/dev/null || true
+    # The ssh-agents the forwarding legs start. Not mux processes and so not
+    # the leak sweep's business, but they are daemons this file forked: left
+    # alive they outlive the suite holding a private key, which is the one
@@ @@ -1387,6 +1404,7 @@ cleanup() { @@
+    [ -S "$SOCK59" ] && "$MUXD" stop --sock "$SOCK59" 2>/dev/null || true
+    [ -S "$SOCK60" ] && "$MUXD" stop --sock "$SOCK60" 2>/dev/null || true
+    [ -S "$SOCK61" ] && "$MUXD" stop --sock "$SOCK61" 2>/dev/null || true
+    [ -S "$SOCK64" ] && "$MUXD" stop --sock "$SOCK64" 2>/dev/null || true
+    # ---- the leak sweep (hygiene kit, 6a) ----
+    # Here rather than at the bottom of the file, which `set -e` reaches only
@@ @@ -1403,7 +1421,7 @@ cleanup() { @@
+        "$D32PID" "$D33PID" "$D34PID" "$D35PID" "$D36PID" "$D37PID" \
+        "$D38PID" "$D39PID" "$D40PID" "$D41PID" "$D42PID" "$D43PID" "$D54PID" \
+        "$D55PID" "$D56PID" "$D57PID" "$D58PID" "$D59PID" \
+        "$D60PID" "$D61PID" "$D62PID" "$D63PID" "$D64PID" "$D65PID"
+    _leak=0
+    leak_sweep "$_rc" || _leak=1
@@ @@ -1499,7 +1517,11 @@ cleanup() { @@
+        "$OUT.lpdfa" "$OUT.lpdstop" "$SOCK61" \
+        "$OUT.pra.d" "$OUT.prb.d" "$OUT.pra" "$OUT.pra.err" "$OUT.prcap" "$OUT.prcap.err" \
+        "$OUT.prgrid" \
+        "$OUT.prpc" "$OUT.prfb" "$OUT.prastop" "$OUT.prbstop" "$SOCK62" "$SOCK63" \
+        "$OUT.hyd.d" "$OUT.hydcap" "$OUT.hydcap.err" "$OUT.hydpc" "$OUT.hydgrid" \
+        "$OUT.hydsta" "$OUT.hydstb" "$OUT.hydghost" "$OUT.hydpre" "$OUT.hydfa" \
+        "$OUT.hydstop" "$OUT.hydfcap" "$OUT.hydfcap.err" "$OUT.hydfpc" \
+        "$OUT.hydfold" "$OUT.hydfgrid" "$SOCK64" "$HYKEY"
+    # ...and the non-tty capture that leg's session feeds.
+    rm -f "$OUT.nogate"
+    # ...and its other half: the paste capture and the file nvim wrote, which
@@ @@ -8510,8 +8532,167 @@ D64PID="" @@
+rm -rf "$PRSTATE"
+ok "Ctrl-\\ : adds a tile by spelling: born on another daemon, recorded, refusals narrated, Esc eats the line"
+# ---- a saved local line comes back as a fresh session -------------------
+#
+# The wall file is attach history, and the daemon that held those sessions
+# dies on every reboot. Joining only meant the wall came back as a grid of
+# [refused] tiles nobody could do anything with but forget them by hand.
+# A restored line naming the LOCAL socket now attaches-or-creates.
+#
+# The remote half is the same wall, the same run and the same daemon,
+# reached the other way: a `quic://` line for a session that does not
+# exist stays [refused] and creates nothing. Recreating a shell on your
+# own box is cheap and expected; spawning one on another host out of a
+# saved file is not, and the split is the whole ruling.
+#
+# Daemon truth, not paint, answers "was it created": `muxa status` on a
+# name the daemon does not have exits non-zero, which is the same probe
+# the leg runs BEFORE the wall so it cannot pass vacuously. The render
+# oracle answers the other question — what the human was looking at —
+# because a bar left saying [refused] is invisible to a grep of the
+# emitted bytes.
+#
+# Both roads a restored line can take are here, because they are two call
+# sites of the one rule: the no-argv `mux wall` below runs the startup tile
+# loop, and the `Ctrl-\ w` half at the end of this leg runs `hydrate()`.
+head -c 32 /dev/urandom > "$HYKEY"
+chmod 600 "$HYKEY"
+"$MUXD" run --sock "$SOCK64" --shell /bin/sh \
+    --quic "127.0.0.1:$HYPORT" --key "$HYKEY" --quic-idle-ms 15000 > "$OUT.hyd.d" 2>&1 &
+D65PID=$!
+wait_sock "$SOCK64" "$OUT.hyd.d" "hydrate-create daemon never bound"
+# The wall file names three sessions this daemon does not have. Written by
+# hand rather than earned by an attach, because an attach that earned the
+# line would also have created the session — and then there would be
+# nothing for the restore to create.
+mkdir -p "$HYSTATE/mux"
+printf -- '--sock %s#hya\n--sock %s#hyb\nquic://127.0.0.1:%s#hyghost\n' \
+    "$SOCK64" "$SOCK64" "$HYPORT" > "$HYWALL"
+# Vacuity guard: none of the three exists yet. A leg whose daemon already
+# had them would pass without the restore creating anything.
+for _hy in hya hyb hyghost; do
+    timeout 20 "$MUXA" status --sock "$SOCK64" --session "$_hy" > "$OUT.hydpre" 2>&1 && {
+        echo "e2e FAIL: hydrate-create: session $_hy existed before the wall ran:"
+        cat "$OUT.hydpre"; exit 1; }
+done
+# 70x36: under the aspect rule (70 < 2*36) the cut is stacked, so each of
+# the three tiles gets the full width and its label bar survives the
+# render intact — the socket path is in that label.
+set +e
+XDG_STATE_HOME="$HYSTATE" timeout 90 "$PTYCLIENT" --cols 70 --rows 36 \
+    --out "$OUT.hydcap" --err "$OUT.hydcap.err" -- \
+    "$MUX" wall --key "$HYKEY" > "$OUT.hydpc" 2>&1 <<'EOF'
+expect [up] 25000
+settle 1000 25000
+send printf 'hyd-%s\n' marker\n
+expect hyd-marker 15000
+settle 600 15000
+send \x1cd
+waitexit 10000
+EOF
+RC=$?
+set -e
+[ "$RC" -eq 0 ] || {
+    echo "e2e FAIL: hydrate-create: ptyclient exited $RC:"
+    cat "$OUT.hydpc" "$OUT.hydcap.err"; exit 1; }
+# The local lines created their sessions, at the width of the stripe that
+# created them. The width does not discriminate create from join on its own
+# (a join's resize doorbell lands at 70 too, and the daemon refuses a create
+# under min_session_cols) — the muxa exit code above is what says created.
+# It is here to catch a session that came up at some OTHER client's size.
+timeout 20 "$MUXA" status --sock "$SOCK64" --session hya > "$OUT.hydsta" 2>&1 || {
+    echo "e2e FAIL: hydrate-create: the saved line for hya did not create it:"
+    cat "$OUT.hydsta"; exit 1; }
+grep -q '"cols":70' "$OUT.hydsta" || {
+    echo "e2e FAIL: hydrate-create: hya exists but not at the tile's width:"
+    cat "$OUT.hydsta"; exit 1; }
+timeout 20 "$MUXA" status --sock "$SOCK64" --session hyb > "$OUT.hydstb" 2>&1 || {
+    echo "e2e FAIL: hydrate-create: the saved line for hyb did not create it:"
+    cat "$OUT.hydstb"; exit 1; }
+# ...and the created session runs a real shell: the marker typed into the
+# focused tile (tile 0, the first wall line) is the shell's own work.
+timeout 20 "$MUXA" capture --sock "$SOCK64" --session hya > "$OUT.hydfa" 2>&1
+grep -q "hyd-marker" "$OUT.hydfa" || {
+    echo "e2e FAIL: hydrate-create: the marker never reached the created session:"
+    cat "$OUT.hydfa"; exit 1; }
+# The remote line created NOTHING. Same daemon, same run, same file — only
+# the spelling differs.
+timeout 20 "$MUXA" status --sock "$SOCK64" --session hyghost > "$OUT.hydghost" 2>&1 && {
+    echo "e2e FAIL: hydrate-create: a quic:// wall line created a session:"
+    cat "$OUT.hydghost"; exit 1; }
+# What the human saw: two tiles up, the remote one still refused.
+"$RENDER" --cols 70 --rows 36 < "$OUT.hydcap" > "$OUT.hydgrid" || {
+    echo "e2e FAIL: hydrate-create: render oracle failed"
+    cat "$OUT.hydgrid"; exit 1; }
+grep -q -- "#hya \[up\]" "$OUT.hydgrid" || {
+    echo "e2e FAIL: hydrate-create: the hya tile never said [up]:"
+    cat "$OUT.hydgrid"; exit 1; }
+grep -q -- "#hyb \[up\]" "$OUT.hydgrid" || {
+    echo "e2e FAIL: hydrate-create: the hyb tile never said [up]:"
+    cat "$OUT.hydgrid"; exit 1; }
+grep -q -- "#hyghost \[refused\]" "$OUT.hydgrid" || {
+    echo "e2e FAIL: hydrate-create: the remote tile did not say [refused]:"
+    cat "$OUT.hydgrid"; exit 1; }
+# The OTHER road a restored line takes: `Ctrl-\ w`. A no-argv `mux wall`
+# runs the startup tile loop; the fold runs `hydrate()`, a different call
+# site of the same rule, and the ruling covers both. Same daemon, same
+# state home, one more ptyclient — a `mux TARGET` is the entry tile, and
+# the fold brings the rest of the file in around it.
+#
+# The file is rewritten to name a session this daemon does not have. The
+# entry attach then records its OWN line into the same file (attach
+# history), which the fold dedupes by spelling — so what the fold has left
+# to add is exactly the absent one, and creating it is the whole claim.
+printf -- '--sock %s#hyfold\n' "$SOCK64" > "$HYWALL"
+timeout 20 "$MUXA" status --sock "$SOCK64" --session hyfold > "$OUT.hydpre" 2>&1 && {
+    echo "e2e FAIL: hydrate-create: session hyfold existed before the fold ran:"
+    cat "$OUT.hydpre"; exit 1; }
+set +e
+XDG_STATE_HOME="$HYSTATE" timeout 90 "$PTYCLIENT" --cols 70 --rows 36 \
+    --out "$OUT.hydfcap" --err "$OUT.hydfcap.err" -- \
+    "$MUX" --sock "$SOCK64" --session hya > "$OUT.hydfpc" 2>&1 <<'EOF'
+settle 1000 25000
+send printf 'hydf-%s\n' pre\n
+expect hydf-pre 20000
+settle 600 20000
+send \x1cw
+settle 1500 25000
+send \x1cd
+waitexit 10000
+EOF
+RC=$?
+set -e
+[ "$RC" -eq 0 ] || {
+    echo "e2e FAIL: hydrate-create: fold ptyclient exited $RC:"
+    cat "$OUT.hydfpc" "$OUT.hydfcap.err"; exit 1; }
+# Daemon truth again: the fold-born tile created the session its line named.
+timeout 20 "$MUXA" status --sock "$SOCK64" --session hyfold > "$OUT.hydfold" 2>&1 || {
+    echo "e2e FAIL: hydrate-create: the folded line for hyfold did not create it:"
+    cat "$OUT.hydfold"; exit 1; }
+# ...and it is a tile on the screen, not merely a session on the daemon.
+"$RENDER" --cols 70 --rows 36 < "$OUT.hydfcap" > "$OUT.hydfgrid" || {
+    echo "e2e FAIL: hydrate-create: fold render oracle failed"
+    cat "$OUT.hydfgrid"; exit 1; }
+grep -q -- "#hyfold \[up\]" "$OUT.hydfgrid" || {
+    echo "e2e FAIL: hydrate-create: the fold-born tile never said [up]:"
+    cat "$OUT.hydfgrid"; exit 1; }
+assert_stopped "$SOCK64" "$D65PID" "hydrate-create" "$OUT.hydstop"
+D65PID=""
+rm -rf "$HYSTATE"
+ok "a saved local line comes back as a fresh session, by wall and by fold; a remote one joins only"
+[ "$OK_COUNT" = "74" ] || {
+    echo "e2e FAIL: $OK_COUNT scenario checkpoints ran, the pin says 74 —"
+    echo "          a scenario was added (update the pin) or silently lost"
+    exit 1