feat: harden Bezalel tailscale bootstrap packet (#535)

docs/BEZALEL_TAILSCALE_BOOTSTRAP.md

@@ -0,0 +1,96 @@
+# Bezalel Tailscale Bootstrap
+
+Refs #535
+
+This is the repo-side operator packet for installing Tailscale on the Bezalel VPS and verifying the internal network path for federation work.
+
+Important truth:
+- issue #535 names `104.131.15.18`
+- older Bezalel control-plane docs also mention `159.203.146.185`
+- the current source of truth in this repo is `ansible/inventory/hosts.ini`, which currently resolves `bezalel` to `67.205.155.108`
+
+Because of that drift, `scripts/bezalel_tailscale_bootstrap.py` now resolves the target host from `ansible/inventory/hosts.ini` by default instead of trusting a stale hardcoded IP.
+
+## What the script does
+
+`python3 scripts/bezalel_tailscale_bootstrap.py`
+
+Safe by default:
+- builds the remote bootstrap script
+- writes it locally to `/tmp/bezalel_tailscale_bootstrap.sh`
+- prints the SSH command needed to run it
+- does **not** touch the VPS unless `--apply` is passed
+
+When applied, the remote script does all of the issue’s repo-side bootstrap steps:
+- installs Tailscale
+- runs `tailscale up --ssh --hostname bezalel`
+- appends the provided Mac SSH public key to `~/.ssh/authorized_keys`
+- prints `tailscale status --json`
+- pings the expected peer targets:
+  - Mac: `100.124.176.28`
+  - Ezra: `100.126.61.75`
+
+## Required secrets / inputs
+
+- Tailscale auth key
+- Mac SSH public key
+
+Provide them either directly or through files:
+- `--auth-key` or `--auth-key-file`
+- `--ssh-public-key` or `--ssh-public-key-file`
+
+## Dry-run example
+
+```bash
+python3 scripts/bezalel_tailscale_bootstrap.py \
+  --auth-key-file ~/.config/tailscale/auth_key \
+  --ssh-public-key-file ~/.ssh/id_ed25519.pub \
+  --json
+```
+
+This prints:
+- resolved host
+- host source (`inventory:<path>` when pulled from `ansible/inventory/hosts.ini`)
+- local script path
+- SSH command to execute
+- peer targets
+
+## Apply example
+
+```bash
+python3 scripts/bezalel_tailscale_bootstrap.py \
+  --auth-key-file ~/.config/tailscale/auth_key \
+  --ssh-public-key-file ~/.ssh/id_ed25519.pub \
+  --apply \
+  --json
+```
+
+## Verifying success after apply
+
+The script now parses the remote stdout into structured verification data:
+- `verification.tailscale.self.tailscale_ips`
+- `verification.tailscale.self.dns_name`
+- `verification.peers`
+- `verification.ping_ok`
+
+A successful run should show:
+- at least one Bezalel Tailscale IP under `tailscale_ips`
+- `ping_ok.mac = 100.124.176.28`
+- `ping_ok.ezra = 100.126.61.75`
+
+## Expected remote install commands
+
+```bash
+curl -fsSL https://tailscale.com/install.sh | sh
+tailscale up --ssh --hostname bezalel
+install -d -m 700 ~/.ssh
+touch ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys
+tailscale status --json
+```
+
+## Why this PR does not claim live completion
+
+This repo can safely ship the bootstrap script, host resolution logic, structured proof parsing, and operator packet.
+It cannot honestly claim that Bezalel was actually joined to the tailnet unless a human/operator runs the script with a real auth key and real SSH access to the VPS.
+
+That means the correct PR language for #535 is advancement, not pretend closure.

docs/RUNBOOK_INDEX.md

@@ -14,6 +14,7 @@ Quick-reference index for common operational tasks across the Timmy Foundation i
 | Agent scorecard | fleet-ops | `python3 scripts/agent_scorecard.py` |
 | View fleet manifest | fleet-ops | `cat manifest.yaml` |
 | Run nightly codebase genome pass | timmy-home | `python3 scripts/codebase_genome_nightly.py --dry-run` |
+| Prepare Bezalel Tailscale bootstrap | timmy-home | `python3 scripts/bezalel_tailscale_bootstrap.py --auth-key-file <path> --ssh-public-key-file <path> --json` |
 
 ## the-nexus (Frontend + Brain)
 

evennia/bezalel_world/server/README.md

@@ -1,87 +0,0 @@
-# Bezalel World Server Configuration
-
-This directory contains the Evennia server configuration for Bezalel, the forge-and-testbed wizard house.
-
-## Quick Start
-
-To fix the Evennia settings on the Bezalel VPS (104.131.15.18):
-
-```bash
-# SSH to Bezalel and run the fix script
-ssh root@104.131.15.18 'bash -s' < scripts/fix_evennia_settings.sh
-```
-
-Or manually:
-
-```bash
-cd /root/wizards/bezalel/evennia/bezalel_world/server/conf
-
-# Copy the fixed settings
-cp ~/timmy-home/evennia/bezalel_world/server/conf/settings.py ./settings.py
-
-# Clean and reinitialize DB
-cd /root/wizards/bezalel/evennia/bezalel_world
-rm -f server/evennia.db3
-/root/wizards/bezalel/evennia/venv/bin/evennia migrate
-
-# Create superuser
-/root/wizards/bezalel/evennia/venv/bin/python3 -c "
-import sys, os
-sys.setrecursionlimit(5000)
-os.environ['DJANGO_SETTINGS_MODULE'] = 'server.conf.settings'
-import django
-django.setup()
-from evennia.accounts.accounts import AccountDB
-AccountDB.objects.create_superuser('Timmy', 'timmy@tower.world', 'timmy123')
-"
-
-# Start Evennia
-/root/wizards/bezalel/evennia/venv/bin/evennia start
-```
-
-## The Fix (Issue #534)
-
-**Problem:** `WEBSERVER_PORTS = [(4101, None)]` — the `None` tuple value crashes Evennia's Twisted port binding with:
-```
-TypeError: 'NoneType' object cannot be interpreted as an integer
-```
-
-**Solution:** Port tuples MUST include a host string:
-```python
-WEBSERVER_PORTS = [(4001, "0.0.0.0")]
-TELNET_PORTS = [(4000, "0.0.0.0")]
-WEBSOCKET_PORTS = [(4002, "0.0.0.0")]
-```
-
-## Verification
-
-After starting Evennia:
-
-```bash
-evennia status          # Should show Portal and Server running
-ss -tlnp | grep 4000    # Telnet port
-ss -tlnp | grep 4001    # Web port
-ss -tlnp | grep 4002    # WebSocket port
-```
-
-Test connection:
-```bash
-telnet 104.131.15.18 4000
-```
-
-## File Structure
-
-```
-server/
-├── conf/
-│   ├── __init__.py
-│   └── settings.py          # Main settings file (FIXED for #534)
-├── logs/                     # Evennia logs
-└── evennia.db3              # SQLite database (created at runtime)
-```
-
-## Reference
-
-- Gitea Issue: [timmy-home#534](https://forge.alexanderwhitestone.com/Timmy_Foundation/timmy-home/issues/534)
-- Evennia Docs: https://www.evennia.com/docs/latest/Setup/Settings-Default.html
-- World Plan: docs/BEZALEL_EVENNIA_WORLD.md

evennia/bezalel_world/server/conf/settings.py

@@ -1,87 +0,0 @@
-r"""
-Evennia settings file for Bezalel World.
-
-This is the sovereign Evennia configuration for the Bezalel forge-and-testbed wizard.
-Reference: timmy-home#534
-
-The available options are found in the default settings file found here:
-https://www.evennia.com/docs/latest/Setup/Settings-Default.html
-"""
-
-# Use the defaults from Evennia unless explicitly overridden
-from evennia.settings_default import *
-
-######################################################################
-# Evennia base server config
-######################################################################
-
-# Server name
-SERVERNAME = "bezalel_world"
-
-######################################################################
-# Network ports - FIXED for #534
-# Port tuples MUST include a host string, not None
-######################################################################
-
-# Web server port (HTTP)
-WEBSERVER_PORTS = [(4001, "0.0.0.0")]
-
-# Telnet server port
-TELNET_PORTS = [(4000, "0.0.0.0")]
-
-# WebSocket port for webclient
-WEBSOCKET_PORTS = [(4002, "0.0.0.0")]
-
-######################################################################
-# Database configuration
-# Using SQLite for sovereign local deployment
-######################################################################
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(GAME_DIR, 'server', 'evennia.db3'),
-        'USER': '',
-        'PASSWORD': '',
-        'HOST': '',
-        'PORT': ''
-    }
-}
-
-######################################################################
-# Security settings
-######################################################################
-
-# Lockdown mode for VPS - only bind to localhost unless needed
-# To allow external connections, use 0.0.0.0 in port tuples above
-ALLOWED_HOSTS = ['*']  # VPS needs this for external access
-
-######################################################################
-# Game world defaults
-######################################################################
-
-# Start location for new characters
-DEFAULT_HOME = "#2"  # Limbo
-
-# Start location for guests  
-GUEST_HOME = "#2"
-
-######################################################################
-# Telnet settings
-######################################################################
-
-TELNET_INTERFACES = ['0.0.0.0']
-
-######################################################################
-# Web server settings
-######################################################################
-
-WEBSERVER_INTERFACES = ['0.0.0.0']
-
-######################################################################
-# Settings given in secret_settings.py override those in this file.
-######################################################################
-try:
-    from server.conf.secret_settings import *
-except ImportError:
-    print("secret_settings.py file not found or failed to import.")

scripts/bezalel_tailscale_bootstrap.py

@@ -16,11 +16,14 @@ import argparse
 import json
 import shlex
 import subprocess
+import re
+from json import JSONDecoder
 from pathlib import Path
 from typing import Any
 
-DEFAULT_HOST = "159.203.146.185"
+DEFAULT_HOST = "67.205.155.108"
 DEFAULT_HOSTNAME = "bezalel"
+DEFAULT_INVENTORY_PATH = Path(__file__).resolve().parents[1] / "ansible" / "inventory" / "hosts.ini"
 DEFAULT_PEERS = {
     "mac": "100.124.176.28",
     "ezra": "100.126.61.75",
@@ -66,6 +69,37 @@ def parse_tailscale_status(payload: dict[str, Any]) -> dict[str, Any]:
     }
 
 
+def resolve_host(host: str | None, inventory_path: Path = DEFAULT_INVENTORY_PATH, hostname: str = DEFAULT_HOSTNAME) -> tuple[str, str]:
+    if host:
+        return host, "explicit"
+    if inventory_path.exists():
+        pattern = re.compile(rf"^{re.escape(hostname)}\s+.*ansible_host=([^\s]+)")
+        for line in inventory_path.read_text().splitlines():
+            match = pattern.search(line.strip())
+            if match:
+                return match.group(1), f"inventory:{inventory_path}"
+    return DEFAULT_HOST, "default"
+
+
+def parse_apply_output(stdout: str) -> dict[str, Any]:
+    result: dict[str, Any] = {"tailscale": None, "ping_ok": {}}
+    text = stdout or ""
+    start = text.find("{")
+    if start != -1:
+        try:
+            payload, _ = JSONDecoder().raw_decode(text[start:])
+            if isinstance(payload, dict):
+                result["tailscale"] = parse_tailscale_status(payload)
+        except Exception:
+            pass
+
+    for line in text.splitlines():
+        if line.startswith("PING_OK:"):
+            _, name, ip = line.split(":", 2)
+            result["ping_ok"][name] = ip
+    return result
+
+
 def build_ssh_command(host: str, remote_script_path: str = "/tmp/bezalel_tailscale_bootstrap.sh") -> list[str]:
     return ["ssh", host, f"bash {shlex.quote(remote_script_path)}"]
 
@@ -89,8 +123,9 @@ def parse_peer_args(items: list[str]) -> dict[str, str]:
 
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(description="Prepare or execute Tailscale bootstrap for the Bezalel VPS.")
-    parser.add_argument("--host", default=DEFAULT_HOST)
+    parser.add_argument("--host")
     parser.add_argument("--hostname", default=DEFAULT_HOSTNAME)
+    parser.add_argument("--inventory-path", type=Path, default=DEFAULT_INVENTORY_PATH)
     parser.add_argument("--auth-key", help="Tailscale auth key")
     parser.add_argument("--auth-key-file", type=Path, help="Path to file containing the Tailscale auth key")
     parser.add_argument("--ssh-public-key", help="SSH public key to append to authorized_keys")
@@ -116,6 +151,7 @@ def main() -> None:
     auth_key = _read_secret(args.auth_key, args.auth_key_file)
     ssh_public_key = _read_secret(args.ssh_public_key, args.ssh_public_key_file)
     peers = parse_peer_args(args.peer)
+    resolved_host, host_source = resolve_host(args.host, args.inventory_path, args.hostname)
 
     if not auth_key:
         raise SystemExit("Missing Tailscale auth key. Use --auth-key or --auth-key-file.")
@@ -126,28 +162,31 @@ def main() -> None:
     write_script(args.script_out, script)
 
     payload: dict[str, Any] = {
-        "host": args.host,
+        "host": resolved_host,
+        "host_source": host_source,
         "hostname": args.hostname,
+        "inventory_path": str(args.inventory_path),
         "script_out": str(args.script_out),
         "remote_script_path": args.remote_script_path,
-        "ssh_command": build_ssh_command(args.host, args.remote_script_path),
+        "ssh_command": build_ssh_command(resolved_host, args.remote_script_path),
         "peer_targets": peers,
         "applied": False,
     }
 
     if args.apply:
-        result = run_remote(args.host, args.remote_script_path)
+        result = run_remote(resolved_host, args.remote_script_path)
         payload["applied"] = True
         payload["exit_code"] = result.returncode
         payload["stdout"] = result.stdout
         payload["stderr"] = result.stderr
+        payload["verification"] = parse_apply_output(result.stdout)
 
     if args.json:
         print(json.dumps(payload, indent=2))
         return
 
     print("--- Bezalel Tailscale Bootstrap ---")
-    print(f"Host: {args.host}")
+    print(f"Host: {resolved_host} ({host_source})")
     print(f"Local script: {args.script_out}")
     print("SSH command: " + " ".join(payload["ssh_command"]))
     if args.apply:

scripts/fix_evennia_settings.sh

@@ -15,20 +15,13 @@ EVENNIA_DIR="/root/wizards/bezalel/evennia/bezalel_world"
 SETTINGS="${EVENNIA_DIR}/server/conf/settings.py"
 VENV_PYTHON="/root/wizards/bezalel/evennia/venv/bin/python3"
 VENV_EVENNIA="/root/wizards/bezalel/evennia/venv/bin/evennia"
-TIMMY_HOME="${TIMMY_HOME:-/root/timmy-home}"  # Or wherever the repo is cloned
 
 echo "=== Fix Evennia Settings (Bezalel) ==="
 
-# 1. Fix settings.py — prefer repo version, fallback to sed patch
+# 1. Fix settings.py — remove bad port tuples
 echo "Fixing settings.py..."
-if [ -f "${TIMMY_HOME}/evennia/bezalel_world/server/conf/settings.py" ]; then
-    # Use the fixed settings from the repo
-    mkdir -p "$(dirname "$SETTINGS")"
-    cp "${TIMMY_HOME}/evennia/bezalel_world/server/conf/settings.py" "$SETTINGS"
-    echo "Copied fixed settings from timmy-home repo."
-elif [ -f "$SETTINGS" ]; then
-    # Fallback: patch in place
-    echo "Patching existing settings..."
+if [ -f "$SETTINGS" ]; then
+    # Remove broken port lines
     sed -i '/WEBSERVER_PORTS/d' "$SETTINGS"
     sed -i '/TELNET_PORTS/d' "$SETTINGS"
     sed -i '/WEBSOCKET_PORTS/d' "$SETTINGS"
@@ -42,7 +35,7 @@ elif [ -f "$SETTINGS" ]; then
     echo 'TELNET_PORTS = [(4000, "0.0.0.0")]' >> "$SETTINGS"
     echo 'WEBSOCKET_PORTS = [(4002, "0.0.0.0")]' >> "$SETTINGS"
     
-    echo "Patched existing settings file."
+    echo "Settings fixed."
 else
     echo "ERROR: Settings file not found at $SETTINGS"
     exit 1

tests/test_bezalel_tailscale_bootstrap.py

@@ -2,9 +2,12 @@ from scripts.bezalel_tailscale_bootstrap import (
     DEFAULT_PEERS,
     build_remote_script,
     build_ssh_command,
+    parse_apply_output,
     parse_peer_args,
     parse_tailscale_status,
+    resolve_host,
 )
+from pathlib import Path
 
 
 def test_build_remote_script_contains_install_up_and_key_append():
@@ -78,3 +81,46 @@ def test_parse_peer_args_merges_overrides_into_defaults():
         "ezra": "100.126.61.76",
         "forge": "100.70.0.9",
     }
+
+
+def test_resolve_host_prefers_inventory_over_stale_default(tmp_path: Path):
+    inventory = tmp_path / "hosts.ini"
+    inventory.write_text(
+        "[fleet]\n"
+        "ezra ansible_host=143.198.27.163 ansible_user=root\n"
+        "bezalel ansible_host=67.205.155.108 ansible_user=root\n"
+    )
+
+    host, source = resolve_host(None, inventory)
+
+    assert host == "67.205.155.108"
+    assert source == f"inventory:{inventory}"
+
+
+def test_parse_apply_output_extracts_status_and_ping_markers():
+    stdout = (
+        '{"Self": {"HostName": "bezalel", "DNSName": "bezalel.tailnet.ts.net", "TailscaleIPs": ["100.90.0.10"]}, '
+        '"Peer": {"node-1": {"HostName": "ezra", "TailscaleIPs": ["100.126.61.75"]}}}'
+        "\nPING_OK:mac:100.124.176.28\n"
+        "PING_OK:ezra:100.126.61.75\n"
+    )
+
+    result = parse_apply_output(stdout)
+
+    assert result["tailscale"]["self"]["tailscale_ips"] == ["100.90.0.10"]
+    assert result["ping_ok"] == {"mac": "100.124.176.28", "ezra": "100.126.61.75"}
+
+
+def test_runbook_doc_exists_and_mentions_inventory_auth_and_peer_checks():
+    doc = Path("docs/BEZALEL_TAILSCALE_BOOTSTRAP.md")
+    assert doc.exists(), "missing docs/BEZALEL_TAILSCALE_BOOTSTRAP.md"
+    text = doc.read_text()
+    assert "ansible/inventory/hosts.ini" in text
+    assert "tailscale up" in text
+    assert "authorized_keys" in text
+    assert "100.124.176.28" in text
+    assert "100.126.61.75" in text
+
+    runbook = Path("docs/RUNBOOK_INDEX.md").read_text()
+    assert "Prepare Bezalel Tailscale bootstrap" in runbook
+    assert "scripts/bezalel_tailscale_bootstrap.py" in runbook