Merge remote-tracking branch 'origin/main'

1 files changed, 14 insertions, 0 deletions

diff --git a/packages/meshbay-node/src/meshbay_node/daemon.py b/packages/meshbay-node/src/meshbay_node/daemon.py
index 266693a..e1e4dee 100644
--- a/packages/meshbay-node/src/meshbay_node/daemon.py
+++ b/packages/meshbay-node/src/meshbay_node/daemon.py
@@ -267,6 +267,20 @@ class NodeDaemon:
             await self._roster.open()
             await self._roster.purge_expired()
 
+            # Apply any roster overrides to node config (panel-edited values
+            # take precedence over node.toml defaults).
+            nd = self._config.node
+            defaults = {
+                "invite_ttl_hours": nd.invite_ttl_hours,
+                "pair_ttl_hours": nd.pair_ttl_hours,
+                "device_request_ttl_minutes": nd.device_request_ttl_minutes,
+                "max_concurrent_streams": nd.max_concurrent_streams,
+                "transcode_incompatible_video": nd.transcode_incompatible_video,
+            }
+            effective = await self._roster.node_settings(defaults)
+            for k, v in effective.items():
+                setattr(nd, k, v)
+
             # X25519 key material for GEK unwrapping
             from cryptography.hazmat.primitives import serialization
             sk_x_raw = keys.sk_x25519.private_bytes(