Town: decePub's cells in the report, a Hollo pair, kinder waits

The report merges decePub's end-to-end cells (out/client.jsonl, the
latest result of each test) into the matrix under the observer
"decepub", and names its run without the workstation's paths. A second
spec, hollo-pair, seeds PrivaPub and Hollo alone (258 of 261 checks pass;
the three left found the emoji variation selector bug fixed in
PrivaPub), and Hollo accounts may join circles. The seeder waits up to
90 s for a follow request, two of a sender's retries after a refused
first delivery (Hollo answers its first concurrent deliveries 500 while
it creates its tables). town.sh drive prints its JSON unescaped.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01LsXgEaXee4GCU1hwYgPJXw

tools/pasture/town/report.py

@@ -12,7 +12,7 @@ import gen
 DIRS = ["in", "out", "via", "control", "local"]
 DIR_LABEL = {"in": "into PrivaPub", "out": "from PrivaPub", "via": "through PrivaPub", "control": "peer to peer",
 			 "local": "on its own server"}
-GROUPS = [("deliver", "Delivery"), ("confine", "Confinement"), ("see", "Seen by the audience"),
+GROUPS = [("client", "decePub"), ("deliver", "Delivery"), ("confine", "Confinement"), ("see", "Seen by the audience"),
 		  ("hide", "Hidden from outsiders"), ("count", "Counts"), ("thread", "Threads"), ("edit", "Edits"),
 		  ("delete", "Deletes"), ("graph", "Follows"), ("privacy", "Privacy")]
 STATUS_ORDER = ["fail", "xpass", "xfail", "pass"]
@@ -84,7 +84,7 @@ def render(result, scenarios, title):
 	cells = result["cells"]
 	totals = Counter(result["totals"])
 	observers = [p for p in gen.HOSTS if any(k.split("|")[2] == p for k in cells)] + \
-				(["*"] if any(k.split("|")[2] == "*" for k in cells) else [])
+				[o for o in ("*", "decepub") if any(k.split("|")[2] == o for k in cells)]
 	features = sorted({k.split("|")[0] for k in cells})
 	out = [f"<title>{html.escape(title)}</title>",
 		   '<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;600&family=IBM+Plex+Sans:wght@400;600&display=swap">',
@@ -93,7 +93,7 @@ def render(result, scenarios, title):
 			   f"<p>Every object the town's accounts made, checked on every server it should and should not have reached, "
 			   f"through each server's database and API. A cell's squares are the directions it was checked in: "
 			   f"into PrivaPub, from PrivaPub, through PrivaPub, peer to peer, and on the author's own server.</p>"
-			   f"<div class=\"meta\">{html.escape(result['run'])} · checked {html.escape(result['when'])}</div></header>")
+			   f"<div class=\"meta\">{html.escape(os.path.basename(result['run']))} · checked {html.escape(result['when'])}</div></header>")
 	out.append('<section class="totals" aria-label="Totals">' + "".join(
 		f'<div class="total"><i class="m s-{s}"></i><b>{totals.get(s, 0)}</b><span>{s}</span></div>' for s in STATUS_ORDER) + "</section>")
 	out.append('<div class="legend"><span><i class="s-pass"></i> pass</span><span><i class="s-fail"></i> fail</span>'
@@ -149,6 +149,22 @@ def main(args):
 	if os.path.exists(path):
 		with open(path) as f:
 			scenarios = [json.loads(line) for line in f if line.strip()]
+	# decePub's e2e cells (tests/e2e) join the servers' in the same matrix, under the observer "decepub"
+	client = os.path.join(seed.OUT, "client.jsonl")
+	if os.path.exists(client):
+		import check
+		with open(client) as f:
+			lines = [json.loads(line) for line in f if line.strip()]
+		latest = {}
+		for c in lines:
+			latest[(c["cell"], c.get("ref"))] = c  # the latest result of each test
+		checks = check.classify(list(latest.values()), check.load_gaps())
+		for cell, v in check.summarise(checks).items():
+			result["cells"][cell] = v
+		from collections import Counter
+		totals = Counter(result["totals"])
+		totals.update(Counter(c["status"] for c in checks))
+		result["totals"] = totals
 	page = render(result, scenarios, "PrivaPub Town Matrix")
 	target = os.path.join(run_dir, "report.html")
 	with open(target, "w") as f: