fix inference

Merges worktree-feat+us-016 into master. Combined both sets of _NodeEntry
fields: hf_repo/num_layers (HEAD) and relay_addr/cert_fingerprint/peer_id
(US-017). Kept HEAD's auto-shard tracker query and shard_label formatting.

US-016: mining-style startup CLI with live ASCII dashboard, hardware
detection, auto-shard range detection from model layer count, tracker
network-assign integration for gap-filling.

US-017: P2P gossip protocol, NAT-traversal relay node, TLS peer
authentication via cert fingerprint.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

conftest.py

@@ -11,6 +11,7 @@ _packages = [
     "packages/sdk",
     "packages/contracts",
     "packages/p2p",
+    "packages/relay",
     "packages/validator",
 ]
 

packages/node/meshnet_node/startup.py

@@ -204,7 +204,7 @@ def run_startup(
             tracker_url=tracker_url,
         )
         actual_port = node.start()
-        total_layers = getattr(node.backend, "total_layers", None)
+        total_layers = getattr(getattr(node, "backend", None), "total_layers", None)
         if isinstance(total_layers, int) and total_layers > 0:
             layer_count = shard_end - shard_start + 1
             shard_label = f"layers {shard_start}–{shard_end}; {layer_count} of {total_layers}"
@@ -213,7 +213,7 @@ def run_startup(
         public_host = advertise_host or (socket.getfqdn() if host == "0.0.0.0" else host)
         endpoint = f"http://{public_host}:{actual_port}"
         # Register with tracker so other nodes can auto-join this model.
-        total_layers = getattr(node.backend, "total_layers", None)
+        total_layers = getattr(getattr(node, "backend", None), "total_layers", None)
         reg_payload = {
             "endpoint": endpoint,
             "model": model_id.split("/")[-1],
@@ -227,12 +227,15 @@ def run_startup(
             "score": 1.0,
             "tracker_mode": (shard_start == 0),
         }
+        tracker_node_id: str | None = None
         try:
             reg_resp = _post_json(f"{tracker_url}/v1/nodes/register", reg_payload)
-            node_id = reg_resp.get("node_id", "?")
+            tracker_node_id = str(reg_resp.get("node_id") or "?")
-            print(f"  Registered with tracker — node ID: {node_id}", flush=True)
+            setattr(node, "tracker_node_id", tracker_node_id)
-            _start_heartbeat(tracker_url, node_id, reg_payload)
+            print(f"  Registered with tracker — node ID: {tracker_node_id}", flush=True)
+            _start_heartbeat(tracker_url, tracker_node_id, reg_payload)
         except Exception as exc:
+            setattr(node, "tracker_node_id", None)
             print(f"  Warning: tracker registration failed: {exc}", flush=True)
 
         print(
@@ -243,6 +246,7 @@ def run_startup(
             f"  Shard:        {shard_label}\n"
             f"  Quantization: {quantization}\n"
             f"  Endpoint:     {endpoint}\n"
+            f"  Node ID:      {tracker_node_id or 'unregistered'}\n"
             f"  Hardware:     {device.upper()}\n"
             f"{'=' * 32}",
             flush=True,
@@ -298,12 +302,15 @@ def run_startup(
             "score": 1.0,
             "tracker_mode": (assigned_shard_start == 0),
         }
+        tracker_node_id = None
         try:
             reg_resp = _post_json(f"{tracker_url}/v1/nodes/register", auto_reg_payload)
-            node_id = reg_resp.get("node_id", "?")
+            tracker_node_id = str(reg_resp.get("node_id") or "?")
-            print(f"  Registered with tracker — node ID: {node_id}", flush=True)
+            setattr(node, "tracker_node_id", tracker_node_id)
-            _start_heartbeat(tracker_url, node_id, auto_reg_payload)
+            print(f"  Registered with tracker — node ID: {tracker_node_id}", flush=True)
+            _start_heartbeat(tracker_url, tracker_node_id, auto_reg_payload)
         except Exception as exc:
+            setattr(node, "tracker_node_id", None)
             print(f"  Warning: tracker registration failed: {exc}", flush=True)
         shard_count = assigned_shard_end - assigned_shard_start + 1
         print(
@@ -315,6 +322,7 @@ def run_startup(
             f"({shard_count} of {assigned_num_layers})\n"
             f"  Quantization: {quantization}\n"
             f"  Endpoint:     {endpoint}\n"
+            f"  Node ID:      {tracker_node_id or 'unregistered'}\n"
             f"  Hardware:     {device.upper()}\n"
             f"{'=' * 32}",
             flush=True,
@@ -385,7 +393,8 @@ def run_startup(
                 "score": 1.0,
             },
         )
-        node_id: str = reg_resp["node_id"]
+        node_id = str(reg_resp["node_id"])
+        setattr(node, "tracker_node_id", node_id)
     except Exception:
         node.stop()
         raise

packages/node/meshnet_node/torch_server.py

@@ -246,6 +246,11 @@ class _TorchHandler(http.server.BaseHTTPRequestHandler):
         # but correct. Each step: head encodes current sequence → forwards through route
         # → tail returns the next token string → append → repeat.
         remaining_route = self._get_remaining_route(model_name)
+        print(
+            f"  [node] chat route model={model_name!r} max_tokens={max_tokens} "
+            f"downstream={remaining_route}",
+            flush=True,
+        )
         if not remaining_route:
             self._send_openai_response(
                 "error: no downstream route — check tracker connectivity",
@@ -294,20 +299,32 @@ class _TorchHandler(http.server.BaseHTTPRequestHandler):
         self._send_openai_response(result_text, model_name, stream, messages)
 
     def _get_remaining_route(self, model: str) -> list[str]:
+        # Fast path: tracker pre-resolved the downstream route and injected it as a header.
+        injected = self.headers.get("X-Meshnet-Route")
+        if injected:
+            try:
+                route = json.loads(injected)
+                if isinstance(route, list):
+                    resolved = [str(ep) for ep in route]
+                    print(f"  [node] using injected downstream route: {resolved}", flush=True)
+                    return resolved
+            except (json.JSONDecodeError, TypeError):
+                pass
+
+        # Slow path: query the tracker (direct node-to-node calls, or tracker didn't inject).
         server: _TorchHTTPServer = self.server  # type: ignore[assignment]
         if server.tracker_url is None:
             return []
-        # Use the backend's actual hf_repo, not the client-provided model name (which may be
-        # a lowercased or abbreviated alias that doesn't match what the tracker registered).
         route_model = getattr(server.backend, "model_id", None) or model
         try:
             url = f"{server.tracker_url}/v1/route?model={urllib.parse.quote(route_model)}"
             with urllib.request.urlopen(url, timeout=5.0) as r:
                 route_resp = json.loads(r.read())
             route = route_resp.get("route", [])
-            # Skip our own endpoint from the route (match by port so host aliases don't matter).
             own_port = server.server_address[1]
-            return [ep for ep in route if not ep.rstrip("/").endswith(f":{own_port}")]
+            resolved = [ep for ep in route if not ep.rstrip("/").endswith(f":{own_port}")]
+            print(f"  [node] tracker downstream route: {resolved}", flush=True)
+            return resolved
         except Exception as exc:
             print(f"  [node] WARNING: route lookup failed for {route_model!r}: {exc}", flush=True)
             return []
@@ -338,6 +355,7 @@ class _TorchHandler(http.server.BaseHTTPRequestHandler):
         current_pos = pos_ids
 
         for hop_index, node_url in enumerate(route):
+            print(f"  [node] pipeline hop {hop_index}: {node_url}", flush=True)
             headers: dict[str, str] = {
                 "Content-Type": "application/octet-stream",
                 "X-Meshnet-Wire": _WIRE_VERSION,
@@ -363,12 +381,15 @@ class _TorchHandler(http.server.BaseHTTPRequestHandler):
                     resp_body = r.read()
                     resp_headers = {k.lower(): v for k, v in r.headers.items()}
             except Exception as exc:
+                print(f"  [node] pipeline hop {hop_index} failed at {node_url}: {exc}", flush=True)
                 return f"pipeline error at {node_url}: {exc}"
             content_type = resp_headers.get("content-type", "")
             if "application/json" in content_type:
                 try:
                     data = json.loads(resp_body)
-                    return str(data.get("text", ""))
+                    text = str(data.get("text", ""))
+                    print(f"  [node] pipeline hop {hop_index} returned text={text!r}", flush=True)
+                    return text
                 except json.JSONDecodeError:
                     return resp_body.decode("utf-8", errors="replace")
             # Binary activation — update and forward to next node

packages/node/pyproject.toml

@@ -13,6 +13,7 @@ dependencies = [
     "huggingface-hub>=0.20",
     "accelerate>=0.28",
     "bitsandbytes>=0.43",
+    "rich>=13",
     "safetensors>=0.4",
     "torch>=2.1",
     "transformers>=4.39",

packages/p2p/meshnet_p2p/gossip.py

@@ -0,0 +1,162 @@
+"""WebSocket gossip client — connects to relay, publish/subscribe to topics."""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import logging
+import threading
+import time
+import uuid
+from collections import defaultdict
+from typing import Callable
+
+log = logging.getLogger(__name__)
+
+# Message envelope topics
+TOPIC_NODE_JOIN = "node-join"
+TOPIC_NODE_LEAVE = "node-leave"
+TOPIC_COVERAGE_UPDATE = "coverage-update"
+TOPIC_HEARTBEAT = "heartbeat"
+TOPIC_PEER_LIST = "peer-list"
+TOPIC_RELAY_ANNOUNCE = "relay-announce"
+
+_MSG_TTL = 3  # max re-broadcast hops
+
+
+def _make_envelope(topic: str, payload: dict, from_peer: str, ttl: int = _MSG_TTL) -> dict:
+    return {
+        "topic": topic,
+        "version": 1,
+        "from_peer": from_peer,
+        "timestamp": time.strftime("%Y-%m-%dT%H:%M:%SZ", time.gmtime()),
+        "msg_id": str(uuid.uuid4()),
+        "ttl": ttl,
+        "payload": payload,
+    }
+
+
+class GossipClient:
+    """Thread-safe WebSocket gossip client.
+
+    Usage::
+
+        client = GossipClient(relay_url="ws://relay:8765", peer_id="abc123")
+        client.subscribe("node-join", lambda env: print(env["payload"]))
+        client.start()
+        client.publish("node-join", {"addr": "http://192.168.1.42:8001", ...})
+        ...
+        client.stop()
+    """
+
+    def __init__(self, relay_url: str, peer_id: str, reconnect_interval: float = 3.0):
+        self.relay_url = relay_url
+        self.peer_id = peer_id
+        self.reconnect_interval = reconnect_interval
+
+        self._handlers: dict[str, list[Callable]] = defaultdict(list)
+        self._seen: set[str] = set()
+        self._loop: asyncio.AbstractEventLoop | None = None
+        self._thread: threading.Thread | None = None
+        self._ws = None
+        self._running = False
+        self._connected = threading.Event()
+        self._stop_event: asyncio.Event | None = None
+
+    def subscribe(self, topic: str, handler: Callable) -> None:
+        """Register a sync callback for messages on topic."""
+        self._handlers[topic].append(handler)
+
+    def publish(self, topic: str, payload: dict) -> None:
+        """Send a gossip message to all peers via the relay. Thread-safe."""
+        envelope = _make_envelope(topic, payload, self.peer_id)
+        if self._loop and self._running:
+            asyncio.run_coroutine_threadsafe(self._send(envelope), self._loop)
+
+    def start(self) -> None:
+        """Start the gossip client in a background thread."""
+        self._running = True
+        self._loop = asyncio.new_event_loop()
+        self._thread = threading.Thread(target=self._run_loop, daemon=True, name="gossip")
+        self._thread.start()
+
+    def wait_connected(self, timeout: float = 5.0) -> bool:
+        """Block until connected to relay or timeout. Returns True if connected."""
+        return self._connected.wait(timeout)
+
+    def stop(self) -> None:
+        """Stop the gossip client and clean up."""
+        self._running = False
+        if self._loop and self._stop_event is not None:
+            self._loop.call_soon_threadsafe(self._stop_event.set)
+        if self._thread:
+            self._thread.join(timeout=3.0)
+
+    # ------------------------------------------------------------------
+    # Internal asyncio methods (run inside the background event loop)
+    # ------------------------------------------------------------------
+
+    def _run_loop(self) -> None:
+        asyncio.set_event_loop(self._loop)
+        self._stop_event = asyncio.Event()
+        try:
+            self._loop.run_until_complete(self._connect_loop())
+        except Exception:
+            log.debug("Gossip loop exited", exc_info=True)
+
+    async def _connect_loop(self) -> None:
+        import websockets  # type: ignore[import]
+
+        while self._running and not (self._stop_event and self._stop_event.is_set()):
+            try:
+                async with websockets.connect(
+                    self.relay_url,
+                    ping_interval=20,
+                    ping_timeout=10,
+                    open_timeout=5,
+                ) as ws:
+                    self._ws = ws
+                    self._connected.set()
+                    log.debug("Gossip connected to %s", self.relay_url)
+                    # Send peer registration
+                    await ws.send(json.dumps(
+                        _make_envelope(
+                            "peer-register",
+                            {"peer_id": self.peer_id},
+                            self.peer_id,
+                        )
+                    ))
+                    await self._receive_loop(ws)
+            except Exception as exc:
+                self._connected.clear()
+                if self._running:
+                    log.debug("Gossip disconnected (%s); reconnecting in %ss", exc, self.reconnect_interval)
+                    await asyncio.sleep(self.reconnect_interval)
+
+    async def _receive_loop(self, ws) -> None:
+        async for raw in ws:
+            try:
+                envelope = json.loads(raw)
+            except (json.JSONDecodeError, TypeError):
+                continue
+            msg_id = envelope.get("msg_id", "")
+            if msg_id in self._seen:
+                continue
+            self._seen.add(msg_id)
+            if len(self._seen) > 10_000:
+                # Trim seen set to avoid unbounded growth
+                self._seen = set(list(self._seen)[-5_000:])
+
+            topic = envelope.get("topic", "")
+            for handler in self._handlers.get(topic, []):
+                try:
+                    handler(envelope)
+                except Exception:
+                    log.debug("Gossip handler error for topic %s", topic, exc_info=True)
+
+    async def _send(self, envelope: dict) -> None:
+        if self._ws is not None:
+            try:
+                await self._ws.send(json.dumps(envelope))
+            except Exception as exc:
+                log.debug("Gossip send failed: %s", exc)

packages/p2p/meshnet_p2p/identity.py

@@ -0,0 +1,64 @@
+"""Peer identity — stable peer_id and RSA keypair, persisted to disk."""
+
+from __future__ import annotations
+
+import hashlib
+import json
+import os
+import stat
+from pathlib import Path
+
+_DEFAULT_IDENTITY_PATH = Path.home() / ".config" / "meshnet" / "identity.json"
+
+
+def _generate_keypair() -> tuple[bytes, bytes]:
+    """Return (private_key_pem, public_key_pem) for a new RSA-2048 keypair."""
+    from cryptography.hazmat.primitives.asymmetric import rsa
+    from cryptography.hazmat.primitives import serialization
+
+    key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
+    priv_pem = key.private_bytes(
+        serialization.Encoding.PEM,
+        serialization.PrivateFormat.PKCS8,
+        serialization.NoEncryption(),
+    )
+    pub_pem = key.public_key().public_bytes(
+        serialization.Encoding.PEM,
+        serialization.PublicFormat.SubjectPublicKeyInfo,
+    )
+    return priv_pem, pub_pem
+
+
+def _peer_id_from_pubkey(pub_pem: bytes) -> str:
+    return hashlib.sha256(pub_pem).hexdigest()[:16]
+
+
+def load_or_create_identity(path: Path | None = None) -> dict:
+    """Return identity dict with peer_id, private_key_pem, public_key_pem.
+
+    Creates and persists a new identity if none exists at path.
+    """
+    p = path or _DEFAULT_IDENTITY_PATH
+    if p.exists():
+        try:
+            data = json.loads(p.read_text())
+            if "peer_id" in data and "public_key_pem" in data:
+                return data
+        except (json.JSONDecodeError, OSError):
+            pass
+
+    priv_pem, pub_pem = _generate_keypair()
+    identity = {
+        "peer_id": _peer_id_from_pubkey(pub_pem),
+        "private_key_pem": priv_pem.decode(),
+        "public_key_pem": pub_pem.decode(),
+    }
+
+    p.parent.mkdir(parents=True, exist_ok=True)
+    p.write_text(json.dumps(identity, indent=2))
+    try:
+        os.chmod(p, stat.S_IRUSR | stat.S_IWUSR)
+    except OSError:
+        pass
+
+    return identity

packages/p2p/meshnet_p2p/mdns.py

@@ -0,0 +1,136 @@
+"""mDNS peer discovery using zeroconf (optional dependency).
+
+Falls back gracefully if zeroconf is not installed.
+"""
+
+from __future__ import annotations
+
+import logging
+import socket
+import threading
+from typing import Callable
+
+log = logging.getLogger(__name__)
+
+MDNS_SERVICE_TYPE = "_meshnet._tcp.local."
+
+try:
+    from zeroconf import ServiceInfo, ServiceBrowser, Zeroconf  # type: ignore[import]
+
+    _HAS_ZEROCONF = True
+except ImportError:
+    _HAS_ZEROCONF = False
+
+
+def _local_ip() -> str:
+    try:
+        s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        s.connect(("8.8.8.8", 80))
+        ip = s.getsockname()[0]
+        s.close()
+        return ip
+    except OSError:
+        return "127.0.0.1"
+
+
+class MdnsDiscovery:
+    """Announce this node on mDNS and discover peers on the same LAN.
+
+    If `zeroconf` is not installed, all methods are no-ops.
+
+    Usage::
+
+        disc = MdnsDiscovery(
+            peer_id="abc123",
+            port=8001,
+            on_peer_found=lambda peer_id, addr: print("found", peer_id, addr),
+        )
+        disc.start()
+        ...
+        disc.stop()
+    """
+
+    def __init__(
+        self,
+        peer_id: str,
+        port: int,
+        on_peer_found: Callable[[str, str], None] | None = None,
+        on_peer_lost: Callable[[str], None] | None = None,
+    ):
+        self.peer_id = peer_id
+        self.port = port
+        self.on_peer_found = on_peer_found
+        self.on_peer_lost = on_peer_lost
+        self._zc: "Zeroconf | None" = None  # type: ignore[name-defined]
+        self._info: "ServiceInfo | None" = None  # type: ignore[name-defined]
+        self._browser = None
+
+    def is_available(self) -> bool:
+        return _HAS_ZEROCONF
+
+    def start(self) -> None:
+        if not _HAS_ZEROCONF:
+            log.info("zeroconf not installed — mDNS discovery disabled")
+            return
+        try:
+            self._zc = Zeroconf()
+            local_ip = _local_ip()
+            self._info = ServiceInfo(
+                MDNS_SERVICE_TYPE,
+                f"{self.peer_id}.{MDNS_SERVICE_TYPE}",
+                addresses=[socket.inet_aton(local_ip)],
+                port=self.port,
+                properties={"peer_id": self.peer_id, "version": "1"},
+            )
+            self._zc.register_service(self._info)
+            if self.on_peer_found or self.on_peer_lost:
+                self._browser = ServiceBrowser(
+                    self._zc, MDNS_SERVICE_TYPE, listener=_Listener(self)
+                )
+            log.info("mDNS announced: %s on %s:%d", self.peer_id, local_ip, self.port)
+        except Exception as exc:
+            log.warning("mDNS start failed: %s", exc)
+
+    def stop(self) -> None:
+        if not _HAS_ZEROCONF or self._zc is None:
+            return
+        try:
+            if self._info:
+                self._zc.unregister_service(self._info)
+            self._zc.close()
+        except Exception as exc:
+            log.debug("mDNS stop error: %s", exc)
+        self._zc = None
+
+
+class _Listener:
+    """Internal zeroconf service listener."""
+
+    def __init__(self, disc: MdnsDiscovery):
+        self._disc = disc
+
+    def add_service(self, zc, type_, name):
+        try:
+            info = zc.get_service_info(type_, name)
+            if info is None:
+                return
+            remote_peer_id = (info.properties or {}).get(b"peer_id", b"").decode()
+            if remote_peer_id == self._disc.peer_id:
+                return  # ignore self
+            addr = f"http://{socket.inet_ntoa(info.addresses[0])}:{info.port}"
+            if self._disc.on_peer_found:
+                self._disc.on_peer_found(remote_peer_id, addr)
+        except Exception as exc:
+            log.debug("mDNS add_service error: %s", exc)
+
+    def remove_service(self, zc, type_, name):
+        try:
+            # name is like "peer_id._meshnet._tcp.local."
+            peer_id = name.split(".")[0]
+            if self._disc.on_peer_lost:
+                self._disc.on_peer_lost(peer_id)
+        except Exception as exc:
+            log.debug("mDNS remove_service error: %s", exc)
+
+    def update_service(self, zc, type_, name):
+        pass

packages/p2p/meshnet_p2p/tls.py

@@ -0,0 +1,114 @@
+"""TLS certificate generation and fingerprint helpers for node-to-node comms."""
+
+from __future__ import annotations
+
+import datetime
+import hashlib
+import ipaddress
+import json
+import os
+import socket
+import ssl
+import stat
+from pathlib import Path
+
+_CERT_PATH = Path.home() / ".config" / "meshnet" / "node_cert.pem"
+_KEY_PATH = Path.home() / ".config" / "meshnet" / "node_key.pem"
+
+
+def generate_self_signed_cert(
+    cert_path: Path | None = None,
+    key_path: Path | None = None,
+    common_name: str | None = None,
+) -> tuple[Path, Path]:
+    """Generate a self-signed RSA-2048 cert valid for 10 years.
+
+    Returns (cert_path, key_path). Skips generation if both files already exist.
+    """
+    from cryptography import x509
+    from cryptography.hazmat.primitives import hashes, serialization
+    from cryptography.hazmat.primitives.asymmetric import rsa
+    from cryptography.x509.oid import NameOID
+
+    cert_p = cert_path or _CERT_PATH
+    key_p = key_path or _KEY_PATH
+
+    if cert_p.exists() and key_p.exists():
+        return cert_p, key_p
+
+    cert_p.parent.mkdir(parents=True, exist_ok=True)
+
+    key = rsa.generate_private_key(public_exponent=65537, key_size=2048)
+    cn = common_name or socket.getfqdn()
+
+    subject = issuer = x509.Name([
+        x509.NameAttribute(NameOID.COMMON_NAME, cn),
+        x509.NameAttribute(NameOID.ORGANIZATION_NAME, "meshnet-node"),
+    ])
+
+    san_list: list = [x509.DNSName(cn)]
+    try:
+        san_list.append(x509.IPAddress(ipaddress.IPv4Address(socket.gethostbyname(cn))))
+    except (socket.gaierror, ValueError):
+        pass
+    san_list.append(x509.IPAddress(ipaddress.IPv4Address("127.0.0.1")))
+
+    cert = (
+        x509.CertificateBuilder()
+        .subject_name(subject)
+        .issuer_name(issuer)
+        .public_key(key.public_key())
+        .serial_number(x509.random_serial_number())
+        .not_valid_before(datetime.datetime.now(datetime.timezone.utc))
+        .not_valid_after(datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=365 * 10))
+        .add_extension(x509.SubjectAlternativeName(san_list), critical=False)
+        .sign(key, hashes.SHA256())
+    )
+
+    key_pem = key.private_bytes(
+        serialization.Encoding.PEM,
+        serialization.PrivateFormat.TraditionalOpenSSL,
+        serialization.NoEncryption(),
+    )
+    cert_pem = cert.public_bytes(serialization.Encoding.PEM)
+
+    key_p.write_bytes(key_pem)
+    cert_p.write_bytes(cert_pem)
+    try:
+        os.chmod(key_p, stat.S_IRUSR | stat.S_IWUSR)
+    except OSError:
+        pass
+
+    return cert_p, key_p
+
+
+def cert_fingerprint(cert_path: Path | None = None) -> str:
+    """Return sha256 fingerprint of the cert as 'sha256:<hex>'."""
+    from cryptography import x509
+    from cryptography.hazmat.primitives import hashes
+
+    p = cert_path or _CERT_PATH
+    cert = x509.load_pem_x509_certificate(p.read_bytes())
+    fp = cert.fingerprint(hashes.SHA256()).hex()
+    return f"sha256:{fp}"
+
+
+def make_server_ssl_context(
+    cert_path: Path | None = None,
+    key_path: Path | None = None,
+) -> ssl.SSLContext:
+    """Return an ssl.SSLContext for a server using our self-signed cert."""
+    cert_p = cert_path or _CERT_PATH
+    key_p = key_path or _KEY_PATH
+    ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+    ctx.load_cert_chain(certfile=str(cert_p), keyfile=str(key_p))
+    return ctx
+
+
+def make_client_ssl_context(verify: bool = False) -> ssl.SSLContext:
+    """Return a client SSLContext. verify=False for self-signed TOFU connections."""
+    ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
+    if not verify:
+        ctx.check_hostname = False
+        ctx.verify_mode = ssl.CERT_NONE
+    return ctx

packages/p2p/pyproject.toml

@@ -8,6 +8,14 @@ version = "0.1.0"
 description = "Distributed Inference Network gossip and shard swarm"
 requires-python = ">=3.10"
 
+dependencies = [
+    "cryptography>=41",
+    "websockets>=13",
+]
+
+[project.optional-dependencies]
+mdns = ["zeroconf>=0.131"]
+
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["meshnet_p2p*"]

packages/p2p/relay_bootstrap.json

@@ -0,0 +1,10 @@
+{
+  "relays": [
+    {
+      "url": "ws://localhost:8765",
+      "cert_fingerprint": null,
+      "operator": "localhost-dev",
+      "note": "Local development relay — replace with team relay URL before production"
+    }
+  ]
+}

packages/relay/meshnet_relay/__init__.py

@@ -0,0 +1,3 @@
+"""meshnet-relay — NAT-traversal relay and gossip hub."""
+
+__version__ = "0.1.0"

packages/relay/meshnet_relay/cli.py

@@ -0,0 +1,60 @@
+"""meshnet-relay CLI entry point."""
+
+from __future__ import annotations
+
+import argparse
+import logging
+import sys
+import time
+from pathlib import Path
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(
+        prog="meshnet-relay",
+        description="Meshnet NAT-traversal relay and gossip hub",
+    )
+    parser.add_argument("--host", default="0.0.0.0", help="Interface to bind")
+    parser.add_argument("--port", type=int, default=8765, help="WebSocket port")
+    parser.add_argument("--cert", metavar="PATH", help="TLS certificate (PEM)")
+    parser.add_argument("--key", metavar="PATH", help="TLS private key (PEM)")
+    parser.add_argument("--max-peers", type=int, default=500, help="Max concurrent peers")
+    parser.add_argument("--log-level", default="INFO", choices=["DEBUG", "INFO", "WARNING", "ERROR"])
+
+    args = parser.parse_args()
+    logging.basicConfig(
+        level=getattr(logging, args.log_level),
+        format="%(asctime)s  %(levelname)-8s  %(name)s  %(message)s",
+    )
+
+    from .server import RelayServer
+
+    ssl_cert = Path(args.cert) if args.cert else None
+    ssl_key = Path(args.key) if args.key else None
+
+    server = RelayServer(
+        host=args.host,
+        port=args.port,
+        ssl_cert=ssl_cert,
+        ssl_key=ssl_key,
+        max_peers=args.max_peers,
+    )
+    port = server.start()
+    scheme = "wss" if ssl_cert else "ws"
+    print(f"meshnet-relay listening on {scheme}://{args.host}:{port}", flush=True)
+    print("  /ws             gossip PubSub", flush=True)
+    print("  /relay/<id>     circuit relay to peer", flush=True)
+    print("  /health         health check", flush=True)
+    print("  /v1/peers       peer list", flush=True)
+    print("Press Ctrl-C to stop.", flush=True)
+
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        print("\nStopping relay…", flush=True)
+        server.stop()
+
+
+if __name__ == "__main__":
+    main()

packages/relay/meshnet_relay/peer_registry.py

@@ -0,0 +1,60 @@
+"""In-memory registry of connected gossip peers."""
+
+from __future__ import annotations
+
+import threading
+import time
+from dataclasses import dataclass, field
+from typing import Any
+
+
+@dataclass
+class PeerEntry:
+    peer_id: str
+    addr: str
+    ws: Any  # websockets.WebSocketServerProtocol
+    connected_at: float = field(default_factory=time.monotonic)
+    last_seen: float = field(default_factory=time.monotonic)
+
+
+class PeerRegistry:
+    def __init__(self):
+        self._peers: dict[str, PeerEntry] = {}
+        self._lock = threading.Lock()
+
+    def register(self, peer_id: str, addr: str, ws) -> None:
+        with self._lock:
+            self._peers[peer_id] = PeerEntry(peer_id=peer_id, addr=addr, ws=ws)
+
+    def unregister(self, peer_id: str) -> None:
+        with self._lock:
+            self._peers.pop(peer_id, None)
+
+    def touch(self, peer_id: str) -> None:
+        with self._lock:
+            if peer_id in self._peers:
+                self._peers[peer_id].last_seen = time.monotonic()
+
+    def get(self, peer_id: str) -> PeerEntry | None:
+        with self._lock:
+            return self._peers.get(peer_id)
+
+    def all_except(self, peer_id: str) -> list[PeerEntry]:
+        with self._lock:
+            return [e for pid, e in self._peers.items() if pid != peer_id]
+
+    def list_peers(self) -> list[dict]:
+        with self._lock:
+            return [
+                {
+                    "peer_id": e.peer_id,
+                    "addr": e.addr,
+                    "connected_at": e.connected_at,
+                    "last_seen": e.last_seen,
+                }
+                for e in self._peers.values()
+            ]
+
+    def __len__(self) -> int:
+        with self._lock:
+            return len(self._peers)

packages/relay/meshnet_relay/server.py

@@ -0,0 +1,224 @@
+"""Relay server — WebSocket gossip hub + circuit relay proxy.
+
+HTTP API (served via asyncio-based handler on same port):
+  GET /health              → {"status": "ok", "peers": N}
+  GET /v1/peers            → [{peer_id, addr, last_seen}]
+  POST /v1/gossip          → accept a gossip envelope, fan out to connected peers
+
+WebSocket endpoints:
+  ws[s]://host:port/ws              → gossip PubSub connection
+  ws[s]://host:port/relay/{peer_id} → circuit relay to that peer
+"""
+
+from __future__ import annotations
+
+import asyncio
+import json
+import logging
+import threading
+from pathlib import Path
+
+from .peer_registry import PeerRegistry
+
+log = logging.getLogger(__name__)
+
+
+class RelayServer:
+    """Async WebSocket relay server that runs in a background thread.
+
+    Usage::
+
+        server = RelayServer(host="0.0.0.0", port=8765)
+        port = server.start()   # returns actual port
+        ...
+        server.stop()
+    """
+
+    def __init__(
+        self,
+        host: str = "0.0.0.0",
+        port: int = 8765,
+        ssl_cert: Path | None = None,
+        ssl_key: Path | None = None,
+        max_peers: int = 500,
+    ):
+        self.host = host
+        self.port = port
+        self.ssl_cert = ssl_cert
+        self.ssl_key = ssl_key
+        self.max_peers = max_peers
+
+        self._registry = PeerRegistry()
+        self._loop: asyncio.AbstractEventLoop | None = None
+        self._thread: threading.Thread | None = None
+        self._server = None
+        self._actual_port: int = port
+        self._ready = threading.Event()
+        self._running = False
+        self._stop_event: asyncio.Event | None = None
+
+    @property
+    def registry(self) -> PeerRegistry:
+        return self._registry
+
+    def start(self) -> int:
+        """Start server in background thread. Returns actual bound port."""
+        self._running = True
+        self._loop = asyncio.new_event_loop()
+        self._thread = threading.Thread(target=self._run, daemon=True, name="relay")
+        self._thread.start()
+        self._ready.wait(timeout=5)
+        return self._actual_port
+
+    def stop(self) -> None:
+        self._running = False
+        if self._loop and self._stop_event is not None:
+            self._loop.call_soon_threadsafe(self._stop_event.set)
+        if self._thread:
+            self._thread.join(timeout=3.0)
+
+    def _run(self) -> None:
+        asyncio.set_event_loop(self._loop)
+        self._loop.run_until_complete(self._serve())
+
+    async def _serve(self) -> None:
+        import websockets  # type: ignore[import]
+        import websockets.server  # type: ignore[import]
+
+        ssl_ctx = None
+        if self.ssl_cert and self.ssl_key:
+            import ssl
+            ssl_ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_SERVER)
+            ssl_ctx.load_cert_chain(str(self.ssl_cert), str(self.ssl_key))
+
+        server = await websockets.serve(
+            self._handle_connection,
+            self.host,
+            self.port,
+            ssl=ssl_ctx,
+        )
+        # Record actual port after bind
+        for sock in server.sockets or []:
+            self._actual_port = sock.getsockname()[1]
+            break
+
+        self._stop_event = asyncio.Event()
+        self._server = server
+        self._ready.set()
+        log.info("Relay listening on %s:%d", self.host, self._actual_port)
+
+        await self._stop_event.wait()
+        server.close()
+        await server.wait_closed()
+
+    async def _handle_connection(self, ws) -> None:
+        """Dispatch incoming WebSocket to gossip hub or circuit relay."""
+        try:
+            path = ws.request.path
+        except AttributeError:
+            path = getattr(ws, "path", "/ws")
+
+        if path.startswith("/relay/"):
+            peer_id = path[len("/relay/"):]
+            await self._handle_circuit_relay(ws, peer_id)
+        elif path == "/health":
+            await ws.send(json.dumps({"status": "ok", "peers": len(self._registry)}))
+            await ws.close()
+        elif path == "/v1/peers":
+            await ws.send(json.dumps(self._registry.list_peers()))
+            await ws.close()
+        else:
+            await self._handle_gossip(ws)
+
+    async def _handle_gossip(self, ws) -> None:
+        """Accept a gossip peer connection, register it, and fan out messages."""
+        peer_id: str | None = None
+        peer_addr: str = ""
+
+        try:
+            async for raw in ws:
+                try:
+                    envelope = json.loads(raw)
+                except (json.JSONDecodeError, TypeError):
+                    continue
+
+                topic = envelope.get("topic", "")
+                from_peer = envelope.get("from_peer", "")
+
+                # Handle peer registration message
+                if topic == "peer-register":
+                    payload = envelope.get("payload", {})
+                    peer_id = payload.get("peer_id") or from_peer
+                    peer_addr = payload.get("addr", "")
+                    if len(self._registry) >= self.max_peers:
+                        await ws.close(1008, "relay at capacity")
+                        return
+                    self._registry.register(peer_id, peer_addr, ws)
+                    log.debug("Peer registered: %s", peer_id)
+                    # Send current peer list back
+                    await ws.send(json.dumps({
+                        "topic": "peer-list",
+                        "version": 1,
+                        "from_peer": "relay",
+                        "payload": {"peers": self._registry.list_peers()},
+                    }))
+                    continue
+
+                # Fan out to all other registered peers
+                if peer_id:
+                    self._registry.touch(peer_id)
+                fan_out_peers = self._registry.all_except(peer_id or "")
+                await _broadcast(raw, fan_out_peers)
+
+        except Exception as exc:
+            log.debug("Gossip connection error: %s", exc)
+        finally:
+            if peer_id:
+                self._registry.unregister(peer_id)
+                log.debug("Peer unregistered: %s", peer_id)
+
+    async def _handle_circuit_relay(self, ws_requester, target_peer_id: str) -> None:
+        """Proxy WebSocket traffic between ws_requester and target_peer_id's ws."""
+        target = self._registry.get(target_peer_id)
+        if target is None:
+            try:
+                await ws_requester.send(json.dumps({
+                    "error": f"peer {target_peer_id!r} not connected to relay"
+                }))
+                await ws_requester.close(1011, "target peer not found")
+            except Exception:
+                pass
+            return
+
+        log.debug("Circuit relay: ??? → %s", target_peer_id)
+
+        async def pipe(src, dst) -> None:
+            try:
+                async for msg in src:
+                    await dst.send(msg)
+            except Exception:
+                pass
+
+        await asyncio.gather(
+            pipe(ws_requester, target.ws),
+            pipe(target.ws, ws_requester),
+            return_exceptions=True,
+        )
+
+
+async def _broadcast(raw: str | bytes, peers: list) -> None:
+    """Send raw message to all peers; ignore individual send failures."""
+    if not peers:
+        return
+    import asyncio
+    await asyncio.gather(
+        *[_safe_send(p.ws, raw) for p in peers],
+        return_exceptions=True,
+    )
+
+
+async def _safe_send(ws, msg) -> None:
+    try:
+        await ws.send(msg)
+    except Exception:
+        pass

packages/relay/pyproject.toml

@@ -0,0 +1,20 @@
+[build-system]
+requires = ["setuptools>=64"]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "meshnet-relay"
+version = "0.1.0"
+description = "Distributed Inference Network NAT-traversal relay and gossip hub"
+requires-python = ">=3.10"
+
+dependencies = [
+    "websockets>=13",
+]
+
+[project.scripts]
+meshnet-relay = "meshnet_relay.cli:main"
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["meshnet_relay*"]

packages/tracker/meshnet_tracker/server.py

@@ -22,11 +22,12 @@ HTTP API contract:
 """
 
 import http.server
+import hashlib
 import json
+import socketserver
 import threading
 import time
 import urllib.parse
-import uuid
 from typing import Any
 
 from .gossip import NodeGossip
@@ -59,6 +60,7 @@ class _NodeEntry:
         "score", "vram_bytes", "ram_bytes", "quantizations",
         "benchmark_tokens_per_sec", "quantization", "managed_assignment",
         "pending_directives", "last_heartbeat", "tracker_mode",
+        "relay_addr", "cert_fingerprint", "peer_id",
     )
 
     def __init__(
@@ -81,6 +83,9 @@ class _NodeEntry:
         tracker_mode: bool = False,
         hf_repo: str | None = None,
         num_layers: int | None = None,
+        relay_addr: str | None = None,
+        cert_fingerprint: str | None = None,
+        peer_id: str | None = None,
     ) -> None:
         self.node_id = node_id
         self.endpoint = endpoint
@@ -100,6 +105,9 @@ class _NodeEntry:
         self.tracker_mode = tracker_mode
         self.hf_repo = hf_repo
         self.num_layers = num_layers
+        self.relay_addr = relay_addr
+        self.cert_fingerprint = cert_fingerprint
+        self.peer_id = peer_id
         self.pending_directives: list[dict] = []
         self.last_heartbeat: float = time.monotonic()
 
@@ -230,6 +238,27 @@ def _coverage_gaps(coverage: list[dict]) -> list[tuple[int, int]]:
     ]
 
 
+def _nodes_and_bounds_for_model(
+    server: "_TrackerHTTPServer",
+    model: str,
+) -> tuple[list[_NodeEntry], int, int] | None:
+    preset = server.model_presets.get(model)
+    if preset is not None:
+        required_start, required_end = _preset_layer_bounds(preset)
+        return [node for node in server.registry.values() if node.model == model], required_start, required_end
+
+    nodes = [
+        node for node in server.registry.values()
+        if (node.hf_repo == model or node.model == model)
+        and node.shard_start is not None
+        and node.shard_end is not None
+        and node.num_layers is not None
+    ]
+    if not nodes:
+        return None
+    return nodes, 0, max(node.num_layers for node in nodes) - 1
+
+
 def _load_directive(node: _NodeEntry, model: str, start: int, end: int, quantization: str) -> dict:
     return {
         "action": "LOAD_SHARD",
@@ -263,7 +292,7 @@ def _purge_expired_nodes_locked(server: "_TrackerHTTPServer") -> list[str]:
     for node_id in expired_ids:
         entry = server.registry.pop(node_id)
         print(
-            f"[tracker] node expired: {node_id[:8]}  {entry.endpoint}  "
+            f"[tracker] node expired: {node_id}  {entry.endpoint}  "
             f"(no heartbeat for >{server.heartbeat_timeout:.0f}s)",
             flush=True,
         )
@@ -369,7 +398,30 @@ def _registration_ban_error(contracts: Any | None, wallet_address: str | None) -
     return None
 
 
-class _TrackerHTTPServer(http.server.HTTPServer):
+def _node_id_for_registration(
+    endpoint: str,
+    model: str,
+    wallet_address: str | None,
+    shard_start: int | None,
+    shard_end: int | None,
+    hf_repo: str | None,
+) -> str:
+    wallet_prefix = wallet_address[:8] if wallet_address else "anon"
+    stable_key = "|".join([
+        wallet_address or "",
+        endpoint.rstrip("/"),
+        model,
+        hf_repo or "",
+        "" if shard_start is None else str(shard_start),
+        "" if shard_end is None else str(shard_end),
+    ])
+    digest = hashlib.sha256(stable_key.encode()).hexdigest()[:12]
+    return f"{wallet_prefix}-{digest}"
+
+
+class _TrackerHTTPServer(socketserver.ThreadingMixIn, http.server.HTTPServer):
+    daemon_threads = True
+
     def __init__(
         self,
         addr: tuple,
@@ -404,7 +456,10 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
         self.send_header("Content-Type", "application/json")
         self.send_header("Content-Length", str(len(body)))
         self.end_headers()
-        self.wfile.write(body)
+        try:
+            self.wfile.write(body)
+        except BrokenPipeError:
+            pass
 
     def _read_json_body(self) -> dict | None:
         length = int(self.headers.get("Content-Length", 0))
@@ -423,6 +478,9 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
         _purge_expired_nodes_locked(server)
 
     def do_POST(self):
+        if self.path == "/v1/chat/completions":
+            self._handle_proxy_chat()
+            return
         if self.path == "/v1/nodes/register":
             self._handle_register()
             return
@@ -463,6 +521,8 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             self._handle_tracker_nodes(model)
         elif parsed.path == "/v1/raft/status":
             self._handle_raft_status()
+        elif parsed.path == "/v1/health":
+            self._send_json(200, {"status": "ok"})
         else:
             self.send_response(404)
             self.end_headers()
@@ -479,6 +539,7 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
                 if not node.wallet_address or not server.contracts.registry.get_wallet(node.wallet_address).banned
             ]
         data = []
+        seen_ids: set[str] = set()
         for name, preset in server.model_presets.items():
             model_nodes = [node for node in alive if node.model == name]
             if not model_nodes:
@@ -489,25 +550,73 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
                 required_start,
                 required_end,
             )
+            aliases = [name]
+            hf_repo = preset.get("hf_repo")
+            if hf_repo and hf_repo not in aliases:
+                aliases.append(hf_repo)
             data.append({
                 "id": name,
                 "object": "model",
                 "created": created,
                 "owned_by": "meshnet",
+                "name": name,
+                "hf_repo": hf_repo,
+                "aliases": aliases,
                 "shard_coverage_percentage": coverage,
             })
+            seen_ids.add(name)
+
+        hf_model_ids = sorted({
+            node.hf_repo or node.model
+            for node in alive
+            if node.model is not None
+            and node.model not in server.model_presets
+            and node.shard_start is not None
+            and node.shard_end is not None
+            and node.num_layers is not None
+        })
+        for model_id in hf_model_ids:
+            if model_id is None or model_id in seen_ids:
+                continue
+            model_nodes = [
+                node for node in alive
+                if node.shard_start is not None
+                and node.shard_end is not None
+                and node.num_layers is not None
+                and (node.hf_repo == model_id or (node.hf_repo is None and node.model == model_id))
+            ]
+            if not model_nodes:
+                continue
+            short_names = sorted({node.model for node in model_nodes if node.model})
+            aliases = [model_id, *[name for name in short_names if name != model_id]]
+            required_start = 0
+            required_end = max(node.num_layers for node in model_nodes) - 1
+            data.append({
+                "id": model_id,
+                "object": "model",
+                "created": created,
+                "owned_by": "meshnet",
+                "name": short_names[0] if short_names else model_id,
+                "hf_repo": model_id if any(node.hf_repo == model_id for node in model_nodes) else None,
+                "aliases": aliases,
+                "shard_coverage_percentage": _coverage_percentage(
+                    model_nodes,
+                    required_start,
+                    required_end,
+                ),
+            })
+            seen_ids.add(model_id)
         self._send_json(200, {"object": "list", "data": data})
 
     def _handle_coverage(self, model: str):
         server: _TrackerHTTPServer = self.server  # type: ignore[assignment]
-        preset = server.model_presets.get(model)
-        if preset is None:
-            self._send_json(404, {"error": f"unknown model preset: {model!r}"})
-            return
-        required_start, required_end = _preset_layer_bounds(preset)
         with server.lock:
             self._purge_expired_nodes()
-            alive = [node for node in server.registry.values() if node.model == model]
+            resolved = _nodes_and_bounds_for_model(server, model)
+        if resolved is None:
+            self._send_json(404, {"error": f"no nodes registered for model {model!r}"})
+            return
+        alive, required_start, required_end = resolved
         if server.contracts is not None:
             alive = [
                 node for node in alive
@@ -550,6 +659,159 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             ],
         })
 
+    # ---------------------------------------------------------------- OpenAI proxy
+
+    def _handle_proxy_chat(self) -> None:
+        """Proxy POST /v1/chat/completions to a tracker-mode (first-shard) node.
+
+        Picks a live tracker-mode node for the requested model using round-robin,
+        then forwards the request verbatim and relays the response (including
+        streaming SSE chunks) back to the caller.
+        """
+        server: _TrackerHTTPServer = self.server  # type: ignore[assignment]
+
+        length = int(self.headers.get("Content-Length", 0))
+        raw_body = self.rfile.read(length) if length else b"{}"
+
+        try:
+            body = json.loads(raw_body)
+        except json.JSONDecodeError:
+            self._send_json(400, {"error": {"message": "invalid JSON", "type": "invalid_request_error", "code": "invalid_request"}})
+            return
+
+        model: str = body.get("model", "")
+        is_stream: bool = bool(body.get("stream", False))
+
+        # Find a live tracker-mode node for this model
+        with server.lock:
+            self._purge_expired_nodes()
+            candidates = [
+                n for n in server.registry.values()
+                if n.tracker_mode and (n.model == model or n.hf_repo == model)
+            ]
+
+        if not candidates:
+            # Fall back: any node serving shard_start=0 for this model
+            with server.lock:
+                candidates = [
+                    n for n in server.registry.values()
+                    if n.shard_start == 0 and (n.model == model or n.hf_repo == model)
+                ]
+
+        if not candidates:
+            self._send_json(503, {"error": {
+                "message": f"no nodes available for model {model!r}",
+                "type": "service_unavailable",
+                "code": "model_not_available",
+            }})
+            return
+
+        # Simple round-robin via list length modulo (stateless, good enough)
+        node = candidates[int(time.time() * 1000) % len(candidates)]
+        target_url = f"{node.endpoint}/v1/chat/completions"
+        request_id = str(body.get("id") or f"req-{time.time_ns():x}")
+
+        # Pre-resolve the downstream route so the first-shard node skips its own
+        # tracker query.  We already hold the full registry picture — no need for
+        # a second round-trip.
+        route_model = node.hf_repo or node.model or model
+        with server.lock:
+            if route_model in server.model_presets:
+                preset = server.model_presets[route_model]
+                rs, re = _preset_layer_bounds(preset)
+                all_nodes: list = [n for n in server.registry.values() if n.model == route_model]
+            else:
+                all_nodes = [
+                    n for n in server.registry.values()
+                    if (n.hf_repo == route_model or n.model == route_model)
+                    and n.shard_start is not None and n.num_layers is not None
+                ]
+                rs, re = 0, (max((n.num_layers for n in all_nodes), default=1) - 1)
+        route_nodes, _ = _select_route(all_nodes, rs, re)
+        # Strip the first-shard node we're about to proxy to — it's already handling the request.
+        downstream_urls = json.dumps([n.endpoint for n in route_nodes if n.endpoint != node.endpoint])
+        route_debug = " -> ".join(
+            f"{n.node_id}@{n.endpoint}[{n.shard_start}-{n.shard_end}]"
+            for n in route_nodes
+        )
+        print(
+            f"[tracker] proxy route {request_id}: model={model!r} "
+            f"head={node.node_id}@{node.endpoint} downstream={downstream_urls} "
+            f"route={route_debug or '<empty>'}",
+            flush=True,
+        )
+
+        req = urllib.request.Request(
+            target_url,
+            data=raw_body,
+            headers={
+                "Content-Type": "application/json",
+                "X-Meshnet-Route": downstream_urls,
+            },
+            method="POST",
+        )
+        # Copy Authorization header from client if present
+        auth = self.headers.get("Authorization")
+        if auth:
+            req.add_header("Authorization", auth)
+
+        try:
+            upstream = urllib.request.urlopen(req, timeout=300.0)
+            print(f"[tracker] proxy connected {request_id}: {target_url}", flush=True)
+        except urllib.error.HTTPError as exc:
+            # Relay error status + body from node
+            err_body = exc.read()
+            self.send_response(exc.code)
+            self.send_header("Content-Type", "application/json")
+            self.send_header("Content-Length", str(len(err_body)))
+            self.end_headers()
+            try:
+                self.wfile.write(err_body)
+            except BrokenPipeError:
+                pass
+            return
+        except Exception as exc:
+            print(f"[tracker] proxy failed {request_id}: {target_url}: {exc}", flush=True)
+            self._send_json(503, {"error": {
+                "message": f"upstream node unreachable: {exc}",
+                "type": "service_unavailable",
+                "code": "upstream_error",
+            }})
+            return
+
+        with upstream:
+            content_type = upstream.headers.get("Content-Type", "application/json")
+            if is_stream or "text/event-stream" in content_type:
+                # Relay SSE stream chunk-by-chunk
+                self.send_response(200)
+                self.send_header("Content-Type", "text/event-stream; charset=utf-8")
+                self.send_header("Cache-Control", "no-cache")
+                self.end_headers()
+                try:
+                    while True:
+                        line = upstream.readline()
+                        if not line:
+                            break
+                        self.wfile.write(line)
+                        self.wfile.flush()
+                except BrokenPipeError:
+                    pass
+            else:
+                # Non-streaming: buffer and relay
+                resp_body = upstream.read()
+                print(
+                    f"[tracker] proxy complete {request_id}: {target_url} bytes={len(resp_body)}",
+                    flush=True,
+                )
+                self.send_response(200)
+                self.send_header("Content-Type", content_type)
+                self.send_header("Content-Length", str(len(resp_body)))
+                self.end_headers()
+                try:
+                    self.wfile.write(resp_body)
+                except BrokenPipeError:
+                    pass
+
     def _handle_register(self):
         server: _TrackerHTTPServer = self.server  # type: ignore[assignment]
         body = self._read_json_body()
@@ -679,8 +941,18 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             except (TypeError, ValueError):
                 self._send_json(400, {"error": "num_layers must be an integer"})
                 return
+        relay_addr = body.get("relay_addr") or None
+        cert_fingerprint = body.get("cert_fingerprint") or None
+        peer_id = body.get("peer_id") or None
 
-        node_id = str(uuid.uuid4())
+        node_id = _node_id_for_registration(
+            endpoint,
+            model,
+            wallet_address,
+            shard_start,
+            shard_end,
+            hf_repo,
+        )
         entry = _NodeEntry(
             node_id=node_id,
             endpoint=endpoint.rstrip("/"),
@@ -700,6 +972,9 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             tracker_mode=tracker_mode,
             hf_repo=hf_repo,
             num_layers=num_layers,
+            relay_addr=relay_addr,
+            cert_fingerprint=cert_fingerprint,
+            peer_id=peer_id,
         )
         with server.lock:
             self._purge_expired_nodes()
@@ -711,7 +986,7 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             for eid in stale_ids:
                 old = server.registry.pop(eid)
                 print(
-                    f"[tracker] node re-registered: replaced {eid[:8]} with {node_id[:8]}"
+                    f"[tracker] node re-registered: replaced {eid} with {node_id}"
                     f"  {old.endpoint}",
                     flush=True,
                 )
@@ -725,7 +1000,7 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
         shard_info = f"layers {shard_start}-{shard_end}" if shard_start is not None else "unsharded"
         repo_info = f" [{hf_repo}]" if hf_repo else ""
         print(
-            f"[tracker] node registered: {node_id[:8]}  {endpoint}  {model}{repo_info}  {shard_info}",
+            f"[tracker] node registered: {node_id}  {endpoint}  {model}{repo_info}  {shard_info}",
             flush=True,
         )
 
@@ -748,6 +1023,13 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
 
     def _handle_heartbeat(self, node_id: str):
         server: _TrackerHTTPServer = self.server  # type: ignore[assignment]
+        body: dict = {}
+        content_length = int(self.headers.get("Content-Length", 0))
+        if content_length > 0:
+            try:
+                body = json.loads(self.rfile.read(content_length))
+            except Exception:
+                pass
         with server.lock:
             self._purge_expired_nodes()
             entry = server.registry.get(node_id)
@@ -755,6 +1037,12 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
                 self._send_json(404, {"error": "node not found"})
                 return
             entry.last_heartbeat = time.monotonic()
+            if body.get("relay_addr"):
+                entry.relay_addr = body["relay_addr"]
+            if body.get("cert_fingerprint"):
+                entry.cert_fingerprint = body["cert_fingerprint"]
+            if body.get("peer_id"):
+                entry.peer_id = body["peer_id"]
             _rebalance_model_locked(server, entry.model or "stub-model")
             directives = list(entry.pending_directives)
             entry.pending_directives.clear()
@@ -1050,6 +1338,7 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
             "route": [e.endpoint for e in route],
             "nodes": [
                 {
+                    "node_id": e.node_id,
                     "endpoint": e.endpoint,
                     "wallet_address": e.wallet_address,
                     "shard_start": e.shard_start,
@@ -1109,6 +1398,7 @@ class _TrackerHandler(http.server.BaseHTTPRequestHandler):
                 "route": [e.endpoint for e in route],
                 "nodes": [
                     {
+                        "node_id": e.node_id,
                         "endpoint": e.endpoint,
                         "wallet_address": e.wallet_address,
                         "shard_start": e.shard_start,

tests/test_gossip_and_relay.py

@@ -0,0 +1,371 @@
+"""Tests for US-017: P2P gossip, relay node, and TLS infrastructure."""
+
+from __future__ import annotations
+
+import json
+import threading
+import time
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+
+# ---------------------------------------------------------------------------
+# identity tests
+# ---------------------------------------------------------------------------
+
+def test_load_or_create_identity_generates_peer_id(tmp_path):
+    from meshnet_p2p.identity import load_or_create_identity
+
+    identity = load_or_create_identity(tmp_path / "identity.json")
+    assert len(identity["peer_id"]) == 16
+    assert "public_key_pem" in identity
+    assert "private_key_pem" in identity
+
+
+def test_identity_is_stable_across_loads(tmp_path):
+    from meshnet_p2p.identity import load_or_create_identity
+
+    path = tmp_path / "identity.json"
+    first = load_or_create_identity(path)
+    second = load_or_create_identity(path)
+    assert first["peer_id"] == second["peer_id"]
+    assert first["public_key_pem"] == second["public_key_pem"]
+
+
+def test_identity_different_for_different_paths(tmp_path):
+    from meshnet_p2p.identity import load_or_create_identity
+
+    a = load_or_create_identity(tmp_path / "a.json")
+    b = load_or_create_identity(tmp_path / "b.json")
+    # Extremely unlikely to collide
+    assert a["peer_id"] != b["peer_id"]
+
+
+# ---------------------------------------------------------------------------
+# TLS / certificate tests
+# ---------------------------------------------------------------------------
+
+def test_generate_self_signed_cert_creates_files(tmp_path):
+    from meshnet_p2p.tls import generate_self_signed_cert
+
+    cert_p, key_p = generate_self_signed_cert(
+        cert_path=tmp_path / "cert.pem",
+        key_path=tmp_path / "key.pem",
+        common_name="localhost",
+    )
+    assert cert_p.exists()
+    assert key_p.exists()
+    assert cert_p.stat().st_size > 100
+    assert key_p.stat().st_size > 100
+
+
+def test_generate_self_signed_cert_is_idempotent(tmp_path):
+    from meshnet_p2p.tls import generate_self_signed_cert
+
+    args = dict(cert_path=tmp_path / "cert.pem", key_path=tmp_path / "key.pem", common_name="test")
+    generate_self_signed_cert(**args)
+    mtime1 = (tmp_path / "cert.pem").stat().st_mtime
+
+    generate_self_signed_cert(**args)
+    mtime2 = (tmp_path / "cert.pem").stat().st_mtime
+    assert mtime1 == mtime2  # file not regenerated
+
+
+def test_cert_fingerprint_returns_sha256_prefix(tmp_path):
+    from meshnet_p2p.tls import generate_self_signed_cert, cert_fingerprint
+
+    cert_p, key_p = generate_self_signed_cert(
+        cert_path=tmp_path / "cert.pem",
+        key_path=tmp_path / "key.pem",
+        common_name="test",
+    )
+    fp = cert_fingerprint(cert_p)
+    assert fp.startswith("sha256:")
+    assert len(fp) == len("sha256:") + 64  # 32 bytes hex = 64 chars
+
+
+def test_make_server_ssl_context_loads_cert(tmp_path):
+    import ssl
+    from meshnet_p2p.tls import generate_self_signed_cert, make_server_ssl_context
+
+    cert_p, key_p = generate_self_signed_cert(
+        cert_path=tmp_path / "cert.pem",
+        key_path=tmp_path / "key.pem",
+        common_name="test",
+    )
+    ctx = make_server_ssl_context(cert_p, key_p)
+    assert isinstance(ctx, ssl.SSLContext)
+
+
+# ---------------------------------------------------------------------------
+# PeerRegistry tests
+# ---------------------------------------------------------------------------
+
+def test_peer_registry_register_and_list():
+    from meshnet_relay.peer_registry import PeerRegistry
+
+    reg = PeerRegistry()
+    ws_mock = MagicMock()
+    reg.register("peer1", "http://1.2.3.4:8001", ws_mock)
+
+    assert len(reg) == 1
+    peers = reg.list_peers()
+    assert len(peers) == 1
+    assert peers[0]["peer_id"] == "peer1"
+
+
+def test_peer_registry_all_except_excludes_sender():
+    from meshnet_relay.peer_registry import PeerRegistry
+
+    reg = PeerRegistry()
+    reg.register("a", "http://a:8001", MagicMock())
+    reg.register("b", "http://b:8001", MagicMock())
+    reg.register("c", "http://c:8001", MagicMock())
+
+    others = reg.all_except("a")
+    assert len(others) == 2
+    assert all(e.peer_id != "a" for e in others)
+
+
+def test_peer_registry_unregister_removes_peer():
+    from meshnet_relay.peer_registry import PeerRegistry
+
+    reg = PeerRegistry()
+    reg.register("x", "http://x:8001", MagicMock())
+    reg.unregister("x")
+    assert len(reg) == 0
+    assert reg.get("x") is None
+
+
+# ---------------------------------------------------------------------------
+# GossipClient + RelayServer integration test
+# ---------------------------------------------------------------------------
+
+def _start_relay(host="127.0.0.1", port=0):
+    from meshnet_relay.server import RelayServer
+    server = RelayServer(host=host, port=port)
+    actual_port = server.start()
+    return server, actual_port
+
+
+def test_gossip_fanout_through_relay():
+    """Node B publishes node-join; node A receives it within 2 seconds."""
+    from meshnet_p2p.gossip import GossipClient, TOPIC_NODE_JOIN
+
+    relay, port = _start_relay()
+    relay_url = f"ws://127.0.0.1:{port}/ws"
+
+    client_a = GossipClient(relay_url=relay_url, peer_id="peer_a")
+    client_b = GossipClient(relay_url=relay_url, peer_id="peer_b")
+
+    received = []
+    client_a.subscribe(TOPIC_NODE_JOIN, lambda env: received.append(env))
+
+    client_a.start()
+    client_b.start()
+
+    assert client_a.wait_connected(timeout=5), "client_a failed to connect to relay"
+    assert client_b.wait_connected(timeout=5), "client_b failed to connect to relay"
+
+    # Give both peers time to register with relay
+    time.sleep(0.2)
+
+    client_b.publish(TOPIC_NODE_JOIN, {"addr": "http://192.168.1.10:8001", "peer_id": "peer_b"})
+
+    deadline = time.monotonic() + 2.0
+    while time.monotonic() < deadline and not received:
+        time.sleep(0.05)
+
+    client_a.stop()
+    client_b.stop()
+    relay.stop()
+
+    assert received, "client_a did not receive node-join message from client_b"
+    assert received[0]["topic"] == TOPIC_NODE_JOIN
+    assert received[0]["from_peer"] == "peer_b"
+
+
+def test_gossip_dedup_prevents_processing_duplicate_message_ids():
+    """A message with a duplicate msg_id is only processed once."""
+    from meshnet_p2p.gossip import GossipClient, TOPIC_NODE_JOIN
+
+    relay, port = _start_relay()
+    relay_url = f"ws://127.0.0.1:{port}/ws"
+
+    client_a = GossipClient(relay_url=relay_url, peer_id="peer_a2")
+    client_b = GossipClient(relay_url=relay_url, peer_id="peer_b2")
+
+    received = []
+    client_a.subscribe(TOPIC_NODE_JOIN, lambda env: received.append(env))
+
+    client_a.start()
+    client_b.start()
+    client_a.wait_connected(5)
+    client_b.wait_connected(5)
+    time.sleep(0.2)
+
+    # Publish once
+    client_b.publish(TOPIC_NODE_JOIN, {"test": "dedup"})
+    time.sleep(0.5)
+
+    count = len(received)
+
+    client_a.stop()
+    client_b.stop()
+    relay.stop()
+
+    # Should have received exactly one message (not duplicated)
+    assert count <= 1
+
+
+def test_relay_server_peer_list_grows_on_connect():
+    """Relay registry grows when clients connect."""
+    from meshnet_p2p.gossip import GossipClient
+
+    relay, port = _start_relay()
+    relay_url = f"ws://127.0.0.1:{port}/ws"
+
+    client = GossipClient(relay_url=relay_url, peer_id="solo_peer")
+    client.start()
+    client.wait_connected(5)
+    time.sleep(0.3)  # let peer-register message process
+
+    peer_count = len(relay.registry)
+    client.stop()
+    relay.stop()
+
+    assert peer_count >= 1
+
+
+def test_relay_circuit_relay_proxies_message():
+    """A node behind NAT (client_a) receives a message via circuit relay from client_b."""
+    import websockets.sync.client  # type: ignore[import]
+    from meshnet_relay.server import RelayServer
+
+    relay = RelayServer(host="127.0.0.1", port=0)
+    port = relay.start()
+
+    # client_a connects to gossip hub and registers
+    received_via_relay = []
+    ready = threading.Event()
+
+    def run_nat_client():
+        import websockets.sync.client as wsc
+        with wsc.connect(f"ws://127.0.0.1:{port}/ws") as ws:
+            ws.send(json.dumps({
+                "topic": "peer-register",
+                "version": 1,
+                "from_peer": "nat_peer",
+                "msg_id": "reg-001",
+                "timestamp": "2026-06-29T00:00:00Z",
+                "ttl": 3,
+                "payload": {"peer_id": "nat_peer", "addr": ""},
+            }))
+            # consume peer-list response
+            ws.recv()
+            ready.set()
+            # wait for a relayed message
+            try:
+                msg = ws.recv(timeout=3)
+                received_via_relay.append(json.loads(msg))
+            except Exception:
+                pass
+
+    nat_thread = threading.Thread(target=run_nat_client, daemon=True)
+    nat_thread.start()
+    ready.wait(timeout=5)
+    time.sleep(0.1)  # ensure peer is in registry
+
+    # client_b connects via circuit relay path
+    def send_via_relay():
+        try:
+            import websockets.sync.client as wsc
+            with wsc.connect(f"ws://127.0.0.1:{port}/relay/nat_peer") as ws:
+                ws.send(json.dumps({"topic": "direct-relay-test", "payload": {"hi": "there"}}))
+                time.sleep(0.3)
+        except Exception:
+            pass
+
+    relay_thread = threading.Thread(target=send_via_relay, daemon=True)
+    relay_thread.start()
+    relay_thread.join(timeout=3)
+    nat_thread.join(timeout=3)
+    relay.stop()
+
+    assert received_via_relay, "NAT'd peer did not receive message via circuit relay"
+
+
+# ---------------------------------------------------------------------------
+# Tracker gossip fields tests
+# ---------------------------------------------------------------------------
+
+def _start_tracker_and_register(extra_fields: dict) -> dict:
+    """Helper: start tracker, register node with extra gossip fields, return response."""
+    import http.server
+    import json as _json
+    import urllib.request
+
+    from meshnet_tracker.server import TrackerServer
+
+    tracker = TrackerServer(host="127.0.0.1", port=0)
+    port = tracker.start()
+    url = f"http://127.0.0.1:{port}"
+
+    payload = {
+        "endpoint": f"http://127.0.0.1:8001",
+        "shard_start": 0,
+        "shard_end": 7,
+        "model": "stub-model",
+        "hardware_profile": {},
+        "score": 1.0,
+        **extra_fields,
+    }
+    data = _json.dumps(payload).encode()
+    req = urllib.request.Request(
+        f"{url}/v1/nodes/register",
+        data=data,
+        headers={"Content-Type": "application/json"},
+        method="POST",
+    )
+    with urllib.request.urlopen(req, timeout=5) as r:
+        resp = _json.loads(r.read())
+
+    tracker.stop()
+    return resp
+
+
+def test_tracker_accepts_relay_addr_in_registration():
+    resp = _start_tracker_and_register({
+        "relay_addr": "ws://relay.meshnet.ai:8765/relay/abc123",
+        "cert_fingerprint": "sha256:deadbeef",
+        "peer_id": "abc123def456ef01",
+    })
+    assert "node_id" in resp
+
+
+def test_tracker_accepts_registration_without_gossip_fields():
+    """Existing registrations without P2P fields still work."""
+    resp = _start_tracker_and_register({})
+    assert "node_id" in resp
+
+
+# ---------------------------------------------------------------------------
+# mDNS (no-op without zeroconf installed)
+# ---------------------------------------------------------------------------
+
+def test_mdns_discovery_is_available_flag():
+    from meshnet_p2p.mdns import MdnsDiscovery
+
+    disc = MdnsDiscovery(peer_id="test", port=8001)
+    # is_available() should be bool regardless of zeroconf install status
+    assert isinstance(disc.is_available(), bool)
+
+
+def test_mdns_start_and_stop_without_zeroconf(monkeypatch):
+    from meshnet_p2p import mdns as mdns_mod
+    monkeypatch.setattr(mdns_mod, "_HAS_ZEROCONF", False)
+    from meshnet_p2p.mdns import MdnsDiscovery
+
+    disc = MdnsDiscovery(peer_id="x", port=8001)
+    disc.start()  # should not raise
+    disc.stop()   # should not raise

tests/test_mining_cli.py

@@ -0,0 +1,356 @@
+"""Tests for US-016: mining-style node startup CLI + live dashboard."""
+
+from __future__ import annotations
+
+import json
+import sys
+import types
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+
+# ---------------------------------------------------------------------------
+# model_catalog tests
+# ---------------------------------------------------------------------------
+
+def test_curated_models_list_is_non_empty():
+    from meshnet_node.model_catalog import CURATED_MODELS
+    assert len(CURATED_MODELS) >= 5
+
+
+def test_model_preset_vram_for_quant():
+    from meshnet_node.model_catalog import CURATED_MODELS
+
+    m = next(m for m in CURATED_MODELS if "Llama-3-70B" in m.name)
+    assert m.vram_for_quant("nf4") == m.vram_nf4
+    assert m.vram_for_quant("int8") == m.vram_int8
+    assert m.vram_for_quant("bf16") == m.vram_bf16
+    assert m.vram_for_quant("bfloat16") == m.vram_bf16  # alias
+
+
+def test_model_preset_fits_vram():
+    from meshnet_node.model_catalog import CURATED_MODELS
+
+    small = next(m for m in CURATED_MODELS if m.vram_nf4 < 10)
+    assert small.fits_vram(small.vram_nf4, "nf4")
+    assert not small.fits_vram(small.vram_nf4 - 1, "nf4")
+
+
+def test_recommended_quant_respects_vram():
+    from meshnet_node.model_catalog import CURATED_MODELS
+
+    m = next(m for m in CURATED_MODELS if "Llama-3-70B" in m.name)
+    # nf4=18, int8=40, bf16=140
+    assert m.recommended_quant(200) == "bf16"
+    assert m.recommended_quant(50) == "int8"
+    assert m.recommended_quant(20) == "nf4"
+    assert m.recommended_quant(5) is None
+
+
+def test_models_with_insufficient_vram_are_marked(monkeypatch):
+    from meshnet_node import wizard as wiz
+
+    # Simulate 6 GB GPU
+    gpus = [{"index": 0, "name": "RTX 3060", "vram_gb": 6.0, "backend": "cuda"}]
+    monkeypatch.setattr(wiz, "_detect_gpus", lambda: gpus)
+
+    # Phi-3 at NF4 needs 4 GB — should fit; Llama-3-70B at NF4 needs 18 GB — should not
+    from meshnet_node.model_catalog import CURATED_MODELS
+
+    phi = next(m for m in CURATED_MODELS if "Phi-3" in m.name)
+    llama = next(m for m in CURATED_MODELS if "Llama-3-70B" in m.name)
+
+    assert phi.fits_vram(6.0, "nf4")
+    assert not llama.fits_vram(6.0, "nf4")
+
+
+# ---------------------------------------------------------------------------
+# config tests
+# ---------------------------------------------------------------------------
+
+def test_load_config_returns_none_when_missing(tmp_path):
+    from meshnet_node.config import load_config
+    assert load_config(tmp_path / "nonexistent.json") is None
+
+
+def test_save_and_load_config_roundtrip(tmp_path):
+    from meshnet_node.config import save_config, load_config
+
+    cfg = {"model_hf_repo": "test/model", "quantization": "nf4", "tracker_url": "http://localhost:8080"}
+    cfg_path = tmp_path / "config.json"
+    save_config(cfg, cfg_path)
+
+    loaded = load_config(cfg_path)
+    assert loaded == cfg
+
+
+def test_save_config_creates_parent_dirs(tmp_path):
+    from meshnet_node.config import save_config, load_config
+
+    nested = tmp_path / "deep" / "nested" / "config.json"
+    save_config({"x": 1}, nested)
+    assert nested.exists()
+    assert load_config(nested) == {"x": 1}
+
+
+def test_merge_cli_overrides_applies_non_none_values():
+    from meshnet_node.config import merge_cli_overrides
+
+    base = {"tracker_url": "http://a:8080", "quantization": "nf4", "port": 7000}
+    result = merge_cli_overrides(base, tracker_url="http://b:9090", port=None)
+    assert result["tracker_url"] == "http://b:9090"
+    assert result["port"] == 7000  # None override ignored
+    assert result["quantization"] == "nf4"  # unchanged
+
+
+# ---------------------------------------------------------------------------
+# wizard tests
+# ---------------------------------------------------------------------------
+
+def test_print_models_table_runs_without_error(capsys, monkeypatch):
+    from meshnet_node import wizard as wiz
+
+    monkeypatch.setattr(wiz, "_detect_gpus", lambda: [{"index": 0, "name": "GPU", "vram_gb": 24.0, "backend": "cuda"}])
+    wiz.print_models_table()
+    out = capsys.readouterr().out
+    assert "Llama" in out or "Qwen" in out or "Phi" in out
+
+
+def test_wizard_writes_config_on_happy_path(tmp_path, monkeypatch):
+    from meshnet_node import wizard as wiz
+    from meshnet_node.config import load_config, save_config
+
+    # Fake GPU
+    gpus = [{"index": 0, "name": "RTX 4090", "vram_gb": 24.0, "backend": "cuda"}]
+    monkeypatch.setattr(wiz, "_detect_gpus", lambda: gpus)
+    # Tracker not reachable (stub)
+    monkeypatch.setattr(wiz, "_ping_tracker", lambda url: False)
+
+    # Simulate user selecting model 1 (Qwen2.5-0.5B), quant 1 (nf4), default dir, default tracker, default wallet
+    inputs = iter([
+        "1",          # pick Qwen2.5-0.5B-Instruct (index 1 in CURATED_MODELS)
+        "1",          # quant NF4
+        str(tmp_path / "models"),  # download dir
+        "http://localhost:8080",   # tracker
+        str(tmp_path / "wallet.json"),  # wallet
+    ])
+    monkeypatch.setattr("builtins.input", lambda prompt="": next(inputs))
+
+    cfg = wiz.run_wizard(config_path_override=tmp_path / "config.json")
+    assert cfg["model_hf_repo"] == "Qwen/Qwen2.5-0.5B-Instruct"
+    assert cfg["quantization"] == "nf4"
+    assert "download_dir" in cfg
+    assert cfg["tracker_url"] == "http://localhost:8080"
+
+
+def test_wizard_raises_keyboard_interrupt_on_ctrl_c(monkeypatch):
+    from meshnet_node import wizard as wiz
+
+    gpus = [{"index": 0, "name": "RTX 4090", "vram_gb": 24.0, "backend": "cuda"}]
+    monkeypatch.setattr(wiz, "_detect_gpus", lambda: gpus)
+
+    call_count = [0]
+
+    def fake_input(prompt=""):
+        call_count[0] += 1
+        if call_count[0] == 1:
+            raise KeyboardInterrupt
+
+    monkeypatch.setattr("builtins.input", fake_input)
+
+    import pytest
+    with pytest.raises(KeyboardInterrupt):
+        wiz.run_wizard()
+
+
+# ---------------------------------------------------------------------------
+# dashboard tests
+# ---------------------------------------------------------------------------
+
+def test_is_interactive_tty_false_when_not_tty(monkeypatch):
+    from meshnet_node import dashboard as dash
+
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: False)
+    assert not dash.is_interactive_tty()
+
+
+def test_dashboard_plain_fallback_on_keyboard_interrupt(monkeypatch):
+    """Plain loop exits cleanly when Ctrl-C is raised."""
+    from meshnet_node import dashboard as dash
+
+    node = MagicMock()
+    node.chat_completion_count = 5
+
+    call_count = [0]
+
+    def fake_sleep(t):
+        call_count[0] += 1
+        if call_count[0] >= 1:
+            raise KeyboardInterrupt
+
+    monkeypatch.setattr(dash.time, "sleep", fake_sleep)
+    monkeypatch.setattr(dash, "_gpu_stats", lambda: [])
+    monkeypatch.setattr(sys.stdout, "isatty", lambda: False)
+
+    cfg = {"model_name": "test-model", "quantization": "nf4"}
+    # Should not raise
+    dash.run_dashboard(node, cfg, start_time=dash.time.monotonic())
+
+
+def test_ema_updates_correctly():
+    from meshnet_node.dashboard import _EMA
+
+    ema = _EMA(alpha=1.0)  # alpha=1.0 → always takes latest sample
+    ema.update(10.0)
+    assert ema.value == 10.0
+    ema.update(20.0)
+    assert ema.value == 20.0
+
+
+# ---------------------------------------------------------------------------
+# CLI integration tests
+# ---------------------------------------------------------------------------
+
+def test_models_command_prints_table(capsys, monkeypatch):
+    """meshnet-node models prints the curated table and exits 0."""
+    from meshnet_node import wizard as wiz
+
+    monkeypatch.setattr(wiz, "_detect_gpus", lambda: [])
+
+    from meshnet_node.cli import main
+    monkeypatch.setattr(sys, "argv", ["meshnet-node", "models"])
+
+    try:
+        main()
+    except SystemExit as exc:
+        assert exc.code == 0
+
+    out = capsys.readouterr().out
+    assert "Llama" in out or "Qwen" in out or "Phi" in out
+
+
+def test_config_command_no_config_exits_1(tmp_path, monkeypatch):
+    from meshnet_node import config as cfg_mod
+    from meshnet_node.cli import main
+
+    monkeypatch.setattr(cfg_mod, "_DEFAULT_CONFIG_FILE", tmp_path / "nonexistent.json")
+    monkeypatch.setattr(sys, "argv", ["meshnet-node", "config"])
+
+    with patch("meshnet_node.config.config_path", return_value=tmp_path / "nonexistent.json"):
+        try:
+            main()
+        except SystemExit as exc:
+            assert exc.code == 1
+
+
+def test_config_command_prints_saved_config(tmp_path, monkeypatch, capsys):
+    from meshnet_node import config as cfg_mod
+    from meshnet_node.config import save_config
+    from meshnet_node.cli import main
+
+    saved = {"model_hf_repo": "meta-llama/Meta-Llama-3-70B-Instruct", "quantization": "nf4"}
+    cfg_file = tmp_path / "config.json"
+    save_config(saved, cfg_file)
+
+    monkeypatch.setattr(sys, "argv", ["meshnet-node", "config"])
+
+    with patch("meshnet_node.config.config_path", return_value=cfg_file):
+        with patch("meshnet_node.config.load_config", return_value=saved):
+            try:
+                main()
+            except SystemExit as exc:
+                assert exc.code == 0
+
+    out = capsys.readouterr().out
+    data = json.loads(out.split("\n", 1)[1])  # skip the "Config: ..." header line
+    assert data["model_hf_repo"] == saved["model_hf_repo"]
+
+
+def test_detect_num_layers_returns_catalog_value_without_network(monkeypatch):
+    """detect_num_layers uses the curated catalog first — no network call."""
+    from meshnet_node.model_catalog import detect_num_layers
+
+    # Qwen2.5-0.5B is in the catalog with 24 layers
+    layers = detect_num_layers("Qwen/Qwen2.5-0.5B-Instruct")
+    assert layers == 24
+
+
+def test_detect_num_layers_returns_none_on_error(monkeypatch):
+    from meshnet_node.model_catalog import detect_num_layers
+
+    # Monkeypatch AutoConfig to raise
+    import meshnet_node.model_catalog as cat
+    monkeypatch.setattr(cat, "detect_num_layers", lambda repo: None if "bad" in repo else detect_num_layers(repo))
+    assert cat.detect_num_layers("bad/repo") is None
+
+
+def test_startup_auto_detects_shard_range(monkeypatch, tmp_path):
+    """When shard_start/end are None, startup reads layer count from catalog."""
+    from meshnet_node import startup as su
+    from meshnet_node.model_catalog import detect_num_layers
+
+    calls = []
+
+    def fake_detect(repo):
+        calls.append(repo)
+        return 24  # Qwen2.5-0.5B
+
+    monkeypatch.setattr(su, "_detect_num_layers", fake_detect)
+
+    # Fake hardware detection
+    monkeypatch.setattr(su, "detect_hardware", lambda: {"device": "cpu", "gpu_name": None, "vram_mb": 0})
+
+    # Fake wallet
+    monkeypatch.setattr(su, "load_or_create_wallet", lambda **kw: (None, None, "fake-wallet"))
+
+    # Fake TorchNodeServer
+    class FakeNode:
+        chat_completion_count = 0
+        def start(self): return 9999
+        def stop(self): pass
+
+    import meshnet_node.startup as su2
+    monkeypatch.setattr(su2, "TorchNodeServer", lambda **kw: FakeNode())
+
+    node = su.run_startup(
+        tracker_url="http://localhost:8080",
+        model_id="Qwen/Qwen2.5-0.5B-Instruct",
+        # shard_start and shard_end intentionally omitted
+        quantization="bfloat16",
+        host="127.0.0.1",
+    )
+    assert calls == ["Qwen/Qwen2.5-0.5B-Instruct"]
+    assert isinstance(node, FakeNode)
+
+
+def test_legacy_start_subcommand_accepted(monkeypatch):
+    """meshnet-node start --tracker http://... does not crash on arg parsing."""
+    from meshnet_node.cli import main
+
+    def fake_run_startup(*args, **kwargs):
+        class _FakeNode:
+            chat_completion_count = 0
+            def stop(self): pass
+        return _FakeNode()
+
+    monkeypatch.setattr(sys, "argv", [
+        "meshnet-node", "start",
+        "--tracker", "http://localhost:8080",
+        "--model", "stub-model",
+        "--port", "0",
+    ])
+
+    raised = []
+
+    def fake_sleep(t):
+        raise KeyboardInterrupt
+
+    with patch("meshnet_node.startup.run_startup", side_effect=fake_run_startup):
+        with patch("time.sleep", side_effect=fake_sleep):
+            try:
+                main()
+            except SystemExit as exc:
+                raised.append(exc.code)
+
+    # Exited (either 0 or via KeyboardInterrupt caught in _cmd_start)
+    # The important thing is no unhandled exception from arg parsing

tests/test_node_startup.py

@@ -370,6 +370,11 @@ def test_real_model_startup_summary_shows_total_layers(tmp_path, monkeypatch, ca
         lambda: {"device": "cpu", "gpu_name": None, "vram_mb": 0},
     )
     monkeypatch.setattr(startup_mod, "TorchNodeServer", FakeTorchNodeServer)
+    monkeypatch.setattr(
+        startup_mod,
+        "_post_json",
+        lambda _url, _payload, timeout=10.0: {"node_id": "node-test-123"},
+    )
 
     node = run_startup(
         tracker_url="http://127.0.0.1:8080",
@@ -380,8 +385,10 @@ def test_real_model_startup_summary_shows_total_layers(tmp_path, monkeypatch, ca
     )
 
     assert node.backend.total_layers == 24
+    assert node.tracker_node_id == "node-test-123"
     output = capsys.readouterr().out
     assert "Shard:        layers 0–23; 24 of 24" in output
+    assert "Node ID:      node-test-123" in output
 
 
 # ---------------------------------------------------------------------------

tests/test_tracker_routing.py

@@ -27,6 +27,132 @@ def _get_json(url: str) -> dict:
         return json.loads(r.read())
 
 
+def test_tracker_send_json_ignores_broken_pipe_after_client_disconnect():
+    """A disconnected client must not dump a BrokenPipe traceback from the tracker."""
+    from meshnet_tracker.server import _TrackerHandler
+
+    class BrokenPipeWriter:
+        def write(self, _body):
+            raise BrokenPipeError
+
+    class DummyHandler:
+        wfile = BrokenPipeWriter()
+
+        def send_response(self, _status):
+            pass
+
+        def send_header(self, _name, _value):
+            pass
+
+        def end_headers(self):
+            pass
+
+    _TrackerHandler._send_json(DummyHandler(), 200, {"ok": True})
+
+
+def test_tracker_serves_health_while_proxy_request_is_in_flight():
+    """Long inference proxy requests must not block heartbeats/health checks."""
+
+    class SlowChatHandler(http.server.BaseHTTPRequestHandler):
+        def log_message(self, fmt, *args):
+            pass
+
+        def do_POST(self):
+            if self.path != "/v1/chat/completions":
+                self.send_response(404)
+                self.end_headers()
+                return
+            length = int(self.headers.get("Content-Length", 0))
+            self.rfile.read(length)
+            time.sleep(2.0)
+            body = json.dumps({"choices": [{"message": {"content": "ok"}}]}).encode()
+            self.send_response(200)
+            self.send_header("Content-Type", "application/json")
+            self.send_header("Content-Length", str(len(body)))
+            self.end_headers()
+            self.wfile.write(body)
+
+    slow_node = http.server.HTTPServer(("127.0.0.1", 0), SlowChatHandler)
+    slow_thread = threading.Thread(target=slow_node.serve_forever, daemon=True)
+    slow_thread.start()
+    tracker = TrackerServer(heartbeat_timeout=60.0)
+    tracker_port = tracker.start()
+    proxy_error = []
+    try:
+        _post_json(
+            f"http://127.0.0.1:{tracker_port}/v1/nodes/register",
+            {"endpoint": f"http://127.0.0.1:{slow_node.server_address[1]}",
+             "model": "slow-model", "hf_repo": "org/slow-model", "num_layers": 1,
+             "shard_start": 0, "shard_end": 0, "tracker_mode": True,
+             "hardware_profile": {}, "score": 1.0},
+        )
+
+        def call_proxy():
+            try:
+                _post_json(
+                    f"http://127.0.0.1:{tracker_port}/v1/chat/completions",
+                    {"model": "slow-model", "messages": [{"role": "user", "content": "hi"}]},
+                )
+            except Exception as exc:
+                proxy_error.append(exc)
+
+        proxy_thread = threading.Thread(target=call_proxy)
+        proxy_thread.start()
+        time.sleep(0.2)
+
+        with urllib.request.urlopen(f"http://127.0.0.1:{tracker_port}/v1/health", timeout=1.0) as resp:
+            assert resp.status == 200
+
+        proxy_thread.join(timeout=3.0)
+        assert not proxy_thread.is_alive()
+        assert not proxy_error
+    finally:
+        tracker.stop()
+        slow_node.shutdown()
+        slow_node.server_close()
+        slow_thread.join(timeout=1.0)
+
+
+def test_tracker_registration_node_id_includes_wallet_prefix_and_stable_suffix():
+    tracker = TrackerServer()
+    tracker_port = tracker.start()
+    wallet = "7j77FsPY1evV8tuf4Z73AVrWwxBEW1pvKwi4EvcRD3g"
+    try:
+        first = _post_json(
+            f"http://127.0.0.1:{tracker_port}/v1/nodes/register",
+            {"endpoint": "http://127.0.0.1:9100", "model": "Qwen2.5-0.5B-Instruct",
+             "hf_repo": "Qwen/Qwen2.5-0.5B-Instruct", "num_layers": 24,
+             "shard_start": 0, "shard_end": 21, "wallet_address": wallet,
+             "hardware_profile": {}, "score": 1.0},
+        )
+        second = _post_json(
+            f"http://127.0.0.1:{tracker_port}/v1/nodes/register",
+            {"endpoint": "http://127.0.0.1:9100", "model": "Qwen2.5-0.5B-Instruct",
+             "hf_repo": "Qwen/Qwen2.5-0.5B-Instruct", "num_layers": 24,
+             "shard_start": 0, "shard_end": 21, "wallet_address": wallet,
+             "hardware_profile": {}, "score": 1.0},
+        )
+        different_endpoint = _post_json(
+            f"http://127.0.0.1:{tracker_port}/v1/nodes/register",
+            {"endpoint": "http://127.0.0.1:9101", "model": "Qwen2.5-0.5B-Instruct",
+             "hf_repo": "Qwen/Qwen2.5-0.5B-Instruct", "num_layers": 24,
+             "shard_start": 20, "shard_end": 23, "wallet_address": wallet,
+             "hardware_profile": {}, "score": 1.0},
+        )
+
+        assert first["node_id"].startswith("7j77FsPY-")
+        assert second["node_id"] == first["node_id"]
+        assert different_endpoint["node_id"].startswith("7j77FsPY-")
+        assert different_endpoint["node_id"] != first["node_id"]
+
+        route_resp = _get_json(
+            f"http://127.0.0.1:{tracker_port}/v1/route?model=Qwen/Qwen2.5-0.5B-Instruct"
+        )
+        assert route_resp["nodes"][0]["node_id"] == first["node_id"]
+    finally:
+        tracker.stop()
+
+
 def test_tracker_node_registration():
     """A node can register with the tracker and receives a node_id."""
     tracker = TrackerServer()
@@ -131,6 +257,64 @@ def test_tracker_coverage_endpoint_reports_uncovered_ranges():
         tracker.stop()
 
 
+def test_tracker_coverage_endpoint_accepts_registered_hf_repo_or_short_name():
+    """Coverage endpoint supports real HF models registered outside preset catalog."""
+    tracker = TrackerServer()
+    tracker_port = tracker.start()
+    try:
+        _post_json(
+            f"http://127.0.0.1:{tracker_port}/v1/nodes/register",
+            {"endpoint": "http://127.0.0.1:9101", "model": "Qwen2.5-0.5B-Instruct",
+             "hf_repo": "Qwen/Qwen2.5-0.5B-Instruct", "num_layers": 24,
+             "shard_start": 0, "shard_end": 21, "hardware_profile": {}, "score": 1.0},
+        )
+        _post_json(
+            f"http://127.0.0.1:{tracker_port}/v1/nodes/register",
+            {"endpoint": "http://127.0.0.1:9102", "model": "Qwen2.5-0.5B-Instruct",
+             "hf_repo": "Qwen/Qwen2.5-0.5B-Instruct", "num_layers": 24,
+             "shard_start": 20, "shard_end": 23, "hardware_profile": {}, "score": 1.0},
+        )
+
+        by_repo = _get_json(
+            f"http://127.0.0.1:{tracker_port}/v1/coverage/Qwen/Qwen2.5-0.5B-Instruct"
+        )
+        by_short_name = _get_json(
+            f"http://127.0.0.1:{tracker_port}/v1/coverage/Qwen2.5-0.5B-Instruct"
+        )
+
+        assert by_repo["model"] == "Qwen/Qwen2.5-0.5B-Instruct"
+        assert by_repo["coverage"] == [
+            {"start_layer": 0, "end_layer": 19, "node_count": 1},
+            {"start_layer": 20, "end_layer": 21, "node_count": 2},
+            {"start_layer": 22, "end_layer": 23, "node_count": 1},
+        ]
+        assert by_short_name["coverage"] == by_repo["coverage"]
+    finally:
+        tracker.stop()
+
+
+def test_tracker_models_endpoint_lists_registered_hf_repo_and_short_name_alias():
+    tracker = TrackerServer()
+    tracker_port = tracker.start()
+    try:
+        _post_json(
+            f"http://127.0.0.1:{tracker_port}/v1/nodes/register",
+            {"endpoint": "http://127.0.0.1:9111", "model": "Qwen2.5-0.5B-Instruct",
+             "hf_repo": "Qwen/Qwen2.5-0.5B-Instruct", "num_layers": 24,
+             "shard_start": 0, "shard_end": 23, "hardware_profile": {}, "score": 1.0},
+        )
+
+        models_resp = _get_json(f"http://127.0.0.1:{tracker_port}/v1/models")
+
+        model = next(item for item in models_resp["data"] if item["id"] == "Qwen/Qwen2.5-0.5B-Instruct")
+        assert model["name"] == "Qwen2.5-0.5B-Instruct"
+        assert model["hf_repo"] == "Qwen/Qwen2.5-0.5B-Instruct"
+        assert model["aliases"] == ["Qwen/Qwen2.5-0.5B-Instruct", "Qwen2.5-0.5B-Instruct"]
+        assert model["shard_coverage_percentage"] == 100.0
+    finally:
+        tracker.stop()
+
+
 def test_tracker_auto_assigns_new_node_to_uncovered_range_first():
     """Capability-driven registration fills the first uncovered layer gap."""
     tracker = TrackerServer(model_presets={