diff --git a/agent-node/agent_node/node.py b/agent-node/agent_node/node.py
index 12823c6..4b6efac 100644
--- a/agent-node/agent_node/node.py
+++ b/agent-node/agent_node/node.py
@@ -15,7 +15,7 @@
 from agent_node.core.watcher import WorkspaceWatcher
 from agent_node.utils.auth import verify_task_signature
 from agent_node.utils.network import get_secure_stub
-from agent_node.config import NODE_ID, NODE_DESC, AUTH_TOKEN, HEALTH_REPORT_INTERVAL, MAX_SKILL_WORKERS, DEBUG_GRPC
+from agent_node.config import NODE_ID, NODE_DESC, AUTH_TOKEN, HEALTH_REPORT_INTERVAL, MAX_SKILL_WORKERS, DEBUG_GRPC, FS_ROOT
 
 
 class AgentNode:
@@ -364,7 +364,7 @@
     def _get_base_dir(self, session_id, create=False):
         """Helper to resolve the effective root for a session (Watcher > SyncDir)."""
         if session_id == "__fs_explorer__":
-            root = os.getenv("CORTEX_FS_ROOT", "/")
+            root = FS_ROOT
             print(f"    [📁] Explorer Root: {root}")
             return root
         
diff --git a/ai-hub/app/api/routes/nodes.py b/ai-hub/app/api/routes/nodes.py
index b0fe226..e15b53f 100644
--- a/ai-hub/app/api/routes/nodes.py
+++ b/ai-hub/app/api/routes/nodes.py
@@ -26,8 +26,9 @@
 import queue
 import uuid
 import secrets
+from typing import Optional, Annotated
 import logging
-from fastapi import APIRouter, HTTPException, WebSocket, WebSocketDisconnect, Depends
+from fastapi import APIRouter, HTTPException, WebSocket, WebSocketDisconnect, Depends, Query, Header
 from fastapi.responses import StreamingResponse
 from sqlalchemy.orm import Session
 
@@ -53,6 +54,36 @@
             raise HTTPException(status_code=403, detail="Admin access required.")
         return user
 
+    def _require_node_access(user_id: str, node_id: str, db: Session):
+        """
+        Ensures the user has permission to interact with a specific node.
+        - Admins always have access to mesh operations.
+        - Normal users must have explicit group access or be in a group with node policy.
+        """
+        user = db.query(models.User).filter(models.User.id == user_id).first()
+        if not user:
+            raise HTTPException(status_code=404, detail="User not found.")
+        
+        # Admin ALWAYS has access to the underlying mesh features (terminal/FS)
+        if user.role == "admin":
+            return user
+            
+        # Check explicit group access
+        access = db.query(models.NodeGroupAccess).filter(
+            models.NodeGroupAccess.node_id == node_id,
+            models.NodeGroupAccess.group_id == user.group_id
+        ).first()
+        if access:
+            return user
+            
+        # Check group policy whitelist
+        if user.group and user.group.policy:
+            policy_nodes = user.group.policy.get("nodes", [])
+            if isinstance(policy_nodes, list) and node_id in policy_nodes:
+                return user
+                
+        raise HTTPException(status_code=403, detail=f"Access Denied: You do not have permission to access node '{node_id}'.")
+
     # ==================================================================
     #  ADMIN ENDPOINTS
     # ==================================================================
@@ -231,7 +262,10 @@
     # ==================================================================
 
     @router.get("/", response_model=list[schemas.AgentNodeUserView], summary="List Accessible Nodes")
-    def list_accessible_nodes(user_id: str, db: Session = Depends(get_db)):
+    def list_accessible_nodes(
+        user_id: str = Query(...), 
+        db: Session = Depends(get_db)
+    ):
         """
         Returns nodes the calling user's group has access to.
         Merges live connection state from the in-memory registry.
@@ -240,44 +274,53 @@
         if not user:
             raise HTTPException(status_code=404, detail="User not found.")
 
-        # Admin sees everything; users see only group-granted nodes
-        if user.role == "admin":
-            nodes = db.query(models.AgentNode).filter(models.AgentNode.is_active == True).all()
-        else:
-            # Nodes accessible via user's group (relational)
-            accesses = db.query(models.NodeGroupAccess).filter(
-                models.NodeGroupAccess.group_id == user.group_id
-            ).all()
-            node_ids = set([a.node_id for a in accesses])
-            
-            # Nodes accessible via group policy whitelist
-            if user.group and user.group.policy:
-                policy_nodes = user.group.policy.get("nodes", [])
-                if isinstance(policy_nodes, list):
-                    for nid in policy_nodes:
-                        node_ids.add(nid)
+        # Both admins and users only see nodes explicitly granted to their group in this user-facing list.
+        # This prevents the 'Personal Preferences' and 'Mesh Explorer' from showing ungranted nodes.
+        
+        # Nodes accessible via user's group (relational)
+        accesses = db.query(models.NodeGroupAccess).filter(
+            models.NodeGroupAccess.group_id == user.group_id
+        ).all()
+        node_ids = set([a.node_id for a in accesses])
+        
+        # Nodes accessible via group policy whitelist
+        if user.group and user.group.policy:
+            policy_nodes = user.group.policy.get("nodes", [])
+            if isinstance(policy_nodes, list):
+                for nid in policy_nodes:
+                    node_ids.add(nid)
 
-            nodes = db.query(models.AgentNode).filter(
-                models.AgentNode.node_id.in_(list(node_ids)),
-                models.AgentNode.is_active == True
-            ).all()
+        nodes = db.query(models.AgentNode).filter(
+            models.AgentNode.node_id.in_(list(node_ids)),
+            models.AgentNode.is_active == True
+        ).all()
 
         registry = _registry()
         return [_node_to_user_view(n, registry) for n in nodes]
 
     @router.get("/{node_id}/status", summary="Quick Node Online Check")
-    def get_node_status(node_id: str):
+    def get_node_status(
+        node_id: str, 
+        user_id: str = Header(..., alias="X-User-ID"), 
+        db: Session = Depends(get_db)
+    ):
+        _require_node_access(user_id, node_id, db)
         live = _registry().get_node(node_id)
         if not live:
             return {"node_id": node_id, "status": "offline"}
         return {"node_id": node_id, "status": live._compute_status(), "stats": live.stats}
     
     @router.get("/{node_id}/terminal", summary="Read Node Terminal History (AI Use Case)")
-    def get_node_terminal(node_id: str):
+    def get_node_terminal(
+        node_id: str, 
+        user_id: str = Header(..., alias="X-User-ID"), 
+        db: Session = Depends(get_db)
+    ):
         """
         AI-Specific: Returns the most recent 150 terminal interaction chunks for a live node.
         This provides context for the AI reasoning agent.
         """
+        _require_node_access(user_id, node_id, db)
         live = _registry().get_node(node_id)
         if not live:
             return {"node_id": node_id, "status": "offline", "terminal": []}
@@ -289,11 +332,17 @@
         }
 
     @router.post("/{node_id}/dispatch", response_model=schemas.NodeDispatchResponse, summary="Dispatch Task to Node")
-    def dispatch_to_node(node_id: str, request: schemas.NodeDispatchRequest):
+    def dispatch_to_node(
+        node_id: str, 
+        request: schemas.NodeDispatchRequest, 
+        user_id: str = Query(...), 
+        db: Session = Depends(get_db)
+    ):
         """
         Queue a shell or browser task to an online node.
         Emits task_assigned immediately so the live UI shows it.
         """
+        _require_node_access(user_id, node_id, db)
         registry = _registry()
         live = registry.get_node(node_id)
         if not live:
@@ -328,11 +377,17 @@
         return schemas.NodeDispatchResponse(task_id=task_id, status="accepted")
 
     @router.post("/{node_id}/cancel", summary="Cancel/Interrupt Task on Node")
-    def cancel_on_node(node_id: str, task_id: str = ""):
+    def cancel_on_node(
+        node_id: str, 
+        task_id: str = "", 
+        user_id: str = Header(..., alias="X-User-ID"), 
+        db: Session = Depends(get_db)
+    ):
         """
         Sends a TaskCancelRequest to the specified node.
         For shell skills, this typically translates to SIGINT (Ctrl+C).
         """
+        _require_node_access(user_id, node_id, db)
         registry = _registry()
         live = registry.get_node(node_id)
         if not live:
@@ -358,9 +413,10 @@
         user = db.query(models.User).filter(models.User.id == user_id).first()
         if not user:
             raise HTTPException(status_code=404, detail="User not found.")
-        existing_prefs = user.preferences or {}
-        existing_prefs["nodes"] = prefs.model_dump()
-        user.preferences = existing_prefs
+        # Create a new dictionary to ensure SQLAlchemy detects the change to the JSON column
+        current_prefs = dict(user.preferences or {})
+        current_prefs["nodes"] = prefs.model_dump()
+        user.preferences = current_prefs
         db.commit()
         return {"message": "Node preferences saved.", "nodes": prefs.model_dump()}
 
@@ -568,8 +624,8 @@
         # Create ZIP in memory
         zip_buffer = io.BytesIO()
         with zipfile.ZipFile(zip_buffer, "a", zipfile.ZIP_DEFLATED, False) as zip_file:
-            # 1. Add Agent Node source files from /app/agent-node-source
-            source_dir = "/app/agent-node-source"
+            # 1. Add Agent Node source files from /app/agent-node
+            source_dir = "/app/agent-node"
             if os.path.exists(source_dir):
                 for root, dirs, files in os.walk(source_dir):
                     # Exclude unwanted directories
@@ -662,11 +718,25 @@
     # ==================================================================
 
     @router.websocket("/{node_id}/stream")
-    async def node_event_stream(websocket: WebSocket, node_id: str):
+    async def node_event_stream(
+        websocket: WebSocket, 
+        node_id: str, 
+        user_id: str = Query(...)
+    ):
         """
         Single-node live event stream with Full-Duplex communication.
         Provides gaming-fast terminal polling, sending commands inbound over the same WS connection!
         """
+        from app.db.session import get_db_session
+        with get_db_session() as db:
+            try:
+                _require_node_access(user_id, node_id, db)
+            except HTTPException as e:
+                await websocket.accept()
+                await websocket.send_json({"event": "error", "message": e.detail})
+                await websocket.close(code=4003)
+                return
+
         await websocket.accept()
         registry = _registry()
 
@@ -776,6 +846,30 @@
         Powers the split-window multi-pane execution UI.
         High-performance edition: streams events with millisecond latency.
         """
+        from app.db.session import get_db_session
+        
+        # 1. Identify accessible nodes for this user based on group policy
+        accessible_ids = []
+        with get_db_session() as db:
+            user = db.query(models.User).filter(models.User.id == user_id).first()
+            if not user:
+                logger.warning(f"[📶] User {user_id} not found for global stream.")
+                return
+                
+            # Nodes accessible via user's group
+            accesses = db.query(models.NodeGroupAccess).filter(
+                models.NodeGroupAccess.group_id == user.group_id
+            ).all()
+            accessible_ids = [a.node_id for a in accesses]
+            
+            # Nodes in group policy
+            if user.group and user.group.policy:
+                policy_nodes = user.group.policy.get("nodes", [])
+                if isinstance(policy_nodes, list):
+                    accessible_ids.extend(policy_nodes)
+            
+            accessible_ids = list(set(accessible_ids))
+
         try:
             await websocket.accept()
         except Exception as e:
@@ -783,13 +877,12 @@
             return
 
         registry = _registry()
-        logger.info(f"[📶] Multi-node stream connected for user={user_id}")
+        logger.info(f"[📶] Multi-node stream connected for user={user_id}. Accessible nodes: {len(accessible_ids)}")
 
         try:
-            # 1. Send initial snapshot immediately
+            # 2. Send initial snapshot of only accessible live nodes
             try:
-                all_live = registry.list_nodes(user_id=user_id)
-                logger.info(f"[📶] Sending initial snapshot for user={user_id} with {len(all_live)} nodes")
+                all_live = [registry.get_node(nid) for nid in accessible_ids if registry.get_node(nid)]
                 snapshot_data = {
                     "event": "initial_snapshot",
                     "user_id": user_id,
@@ -797,26 +890,26 @@
                     "data": {"nodes": [n.to_dict() for n in all_live], "count": len(all_live)},
                 }
                 await websocket.send_json(snapshot_data)
-                logger.info(f"[📶] Initial snapshot sent successfully for user={user_id}")
             except Exception as e:
                 logger.error(f"[📶] Failed to send initial snapshot for user={user_id}: {e}", exc_info=True)
-                await websocket.close(code=1011) # Internal Error
+                await websocket.close(code=1011)
                 return
 
             q: queue.Queue = queue.Queue()
-            registry.subscribe_user(user_id, q)
+            # Subscribe to each accessible node individually
+            for nid in accessible_ids:
+                registry.subscribe_node(nid, q)
 
             async def send_events():
                 import time
                 last_heartbeat = 0
                 try:
                     while True:
-                        # Drain all events from queue and send
                         await _drain(q, websocket)
                         
                         now = time.time()
                         if now - last_heartbeat > HEARTBEAT_INTERVAL_S:
-                            live_nodes = registry.list_nodes(user_id=user_id)
+                            live_nodes = [registry.get_node(nid) for nid in accessible_ids if registry.get_node(nid)]
                             await websocket.send_json({
                                 "event": "mesh_heartbeat",
                                 "user_id": user_id,
@@ -828,7 +921,6 @@
                             })
                             last_heartbeat = now
                         
-                        # High-frequency polling (20Hz) for gaming-fast UI updates
                         await asyncio.sleep(0.05)
                 except WebSocketDisconnect:
                     logger.info(f"[📶] Sender disconnected for user={user_id}")
@@ -836,10 +928,8 @@
                     logger.error(f"[nodes/stream/all_sender] CRASH for user={user_id}: {e}", exc_info=True)
 
             async def receive_events():
-                """Keep connection alive and handle client-initiated pings/close."""
                 try:
                     while True:
-                        # Consume client messages to prevent buffer bloat
                         data = await websocket.receive_json()
                         if data.get("action") == "ping":
                             await websocket.send_json({
@@ -849,11 +939,10 @@
                                 "client_ts": data.get("ts")
                             })
                 except WebSocketDisconnect:
-                    logger.info(f"[📶] Receiver disconnected for user={user_id}")
+                    pass
                 except Exception as e:
                     logger.error(f"[nodes/stream/all_receiver] CRASH for user={user_id}: {e}", exc_info=True)
 
-            # Run sender and receiver concurrently
             sender_task = asyncio.create_task(send_events())
             receiver_task = asyncio.create_task(receive_events())
 
@@ -868,23 +957,30 @@
                 sender_task.cancel()
                 receiver_task.cancel()
             finally:
-                registry.unsubscribe_user(user_id, q)
+                for nid in accessible_ids:
+                    registry.unsubscribe_node(nid, q)
                 logger.info(f"[📶] Multi-node stream disconnected for user={user_id}")
 
         except Exception as e:
             logger.error(f"[nodes/stream/all] Error in stream handler for user={user_id}: {e}", exc_info=True)
-            # Socket will be closed by FastAPI on uncaught exception if not already closed
 
     # ==================================================================
     #  FS EXPLORER ENDPOINTS (Modular Navigator)
     # ==================================================================
 
     @router.get("/{node_id}/fs/ls", response_model=schemas.DirectoryListing, summary="List Directory Content")
-    def fs_ls(node_id: str, path: str = ".", session_id: str = "__fs_explorer__"):
+    def fs_ls(
+        node_id: str, 
+        path: str = ".", 
+        session_id: str = "__fs_explorer__",
+        user_id: str = Header(..., alias="X-User-ID"),
+        db: Session = Depends(get_db)
+    ):
         """
         Request a directory listing from a node.
         Returns a tree-structured list for the File Navigator.
         """
+        _require_node_access(user_id, node_id, db)
         try:
             # Defensive check for orchestrator service injection
             try:
@@ -921,10 +1017,17 @@
             raise HTTPException(status_code=500, detail=f"Internal Server Error: {str(e)}")
 
     @router.get("/{node_id}/fs/cat", summary="Read File Content")
-    def fs_cat(node_id: str, path: str, session_id: str = "__fs_explorer__"):
+    def fs_cat(
+        node_id: str, 
+        path: str, 
+        session_id: str = "__fs_explorer__",
+        user_id: str = Header(..., alias="X-User-ID"),
+        db: Session = Depends(get_db)
+    ):
         """
         Read the content of a file on a remote node.
         """
+        _require_node_access(user_id, node_id, db)
         try:
             orchestrator = services.orchestrator
             res = orchestrator.assistant.cat(node_id, path, session_id=session_id)
@@ -940,10 +1043,16 @@
             raise HTTPException(status_code=500, detail=str(e))
 
     @router.post("/{node_id}/fs/touch", summary="Create File or Directory")
-    def fs_touch(node_id: str, req: schemas.FileWriteRequest):
+    def fs_touch(
+        node_id: str, 
+        req: schemas.FileWriteRequest,
+        user_id: str = Header(..., alias="X-User-ID"),
+        db: Session = Depends(get_db)
+    ):
         """
         Create a new file or directory on the node.
         """
+        _require_node_access(user_id, node_id, db)
         try:
             orchestrator = services.orchestrator
             res = orchestrator.assistant.write(
@@ -965,10 +1074,16 @@
             raise HTTPException(status_code=500, detail=str(e))
 
     @router.post("/{node_id}/fs/rm", summary="Delete File/Directory")
-    def fs_rm(node_id: str, req: schemas.FileDeleteRequest):
+    def fs_rm(
+        node_id: str, 
+        req: schemas.FileDeleteRequest,
+        user_id: str = Header(..., alias="X-User-ID"),
+        db: Session = Depends(get_db)
+    ):
         """
         Delete a file or directory from a remote node.
         """
+        _require_node_access(user_id, node_id, db)
         try:
             orchestrator = services.orchestrator
             res = orchestrator.assistant.rm(node_id, req.path, session_id=req.session_id)
@@ -989,9 +1104,13 @@
 def _generate_node_config_yaml(node: models.AgentNode) -> str:
     """Helper to generate the agent_config.yaml content."""
     hub_url = os.getenv("HUB_PUBLIC_URL", "https://ai.jerxie.com")
-    hub_grpc = os.getenv("HUB_GRPC_ENDPOINT", "ai.jerxie.com:50051")
+    hub_grpc = os.getenv("HUB_GRPC_ENDPOINT", "ai.jerxie.com:443")
     secret_key = os.getenv("SECRET_KEY", "dev-secret-key-1337")
     
+    # Clean up gRPC endpoint - if it ends in :443, remove it as it's implied by TLS
+    if hub_grpc.endswith(":443"):
+        hub_grpc = hub_grpc[:-4]
+    
     skill_cfg = node.skill_config or {}
     if isinstance(skill_cfg, str):
         try:
@@ -1035,6 +1154,9 @@
         "# Workspace sync root — override if needed",
         "sync_root: \"/tmp/cortex-workspace\"",
         "",
+        "# FS Explorer root — defaults to user home if not specified here",
+        "# fs_root: \"/User/username/Documents\"",
+        "",
         "# TLS — set to false only in dev",
         "tls: true",
     ]
diff --git a/ai-hub/app/api/routes/skills.py b/ai-hub/app/api/routes/skills.py
index f088c2d..a6aa2a6 100644
--- a/ai-hub/app/api/routes/skills.py
+++ b/ai-hub/app/api/routes/skills.py
@@ -94,6 +94,10 @@
         db_skill = db.query(models.Skill).filter(models.Skill.id == skill_id).first()
         if not db_skill:
             raise HTTPException(status_code=404, detail="Skill not found")
+        
+        # Block modification of system skills
+        if db_skill.is_system:
+            raise HTTPException(status_code=403, detail="System skills cannot be modified.")
             
         if db_skill.owner_id != current_user.id and current_user.role != 'admin':
             raise HTTPException(status_code=403, detail="Not authorized to update this skill")
@@ -123,6 +127,10 @@
         if not db_skill:
             raise HTTPException(status_code=404, detail="Skill not found")
             
+        # Block deletion of system skills
+        if db_skill.is_system:
+            raise HTTPException(status_code=403, detail="System skills cannot be deleted.")
+
         if db_skill.owner_id != current_user.id and current_user.role != 'admin':
             raise HTTPException(status_code=403, detail="Not authorized to delete this skill")
             
diff --git a/ai-hub/app/api/routes/user.py b/ai-hub/app/api/routes/user.py
index b001d5f..1dea9c6 100644
--- a/ai-hub/app/api/routes/user.py
+++ b/ai-hub/app/api/routes/user.py
@@ -464,12 +464,15 @@
         if prefs.tts: resolve_clone_from("tts", prefs.tts)
         if prefs.stt: resolve_clone_from("stt", prefs.stt)
 
-        user.preferences = {
+        # Preserve other keys like 'nodes'
+        current_prefs = dict(user.preferences or {})
+        current_prefs.update({
             "llm": prefs.llm,
             "tts": prefs.tts,
             "stt": prefs.stt,
             "statuses": prefs.statuses or {}
-        }
+        })
+        user.preferences = current_prefs
         
         # --- Enterprise RBAC Sync ---
         # ONLY admins can sync to Global Settings and persist to config.yaml
diff --git a/ai-hub/app/core/orchestration/architect.py b/ai-hub/app/core/orchestration/architect.py
index 3ae31c4..f5f03dd 100644
--- a/ai-hub/app/core/orchestration/architect.py
+++ b/ai-hub/app/core/orchestration/architect.py
@@ -41,6 +41,13 @@
             db=db, user_id=user_id, prompt_service=prompt_service, prompt_slug=prompt_slug,
             tools=tools
         )
+        
+        # DEBUG: Log the total prompt size to detect bloated contexts
+        total_chars = sum(len(m.get("content", "") or "") for m in messages)
+        logging.info(f"[Architect] Starting autonomous loop (Turn 1). Prompt Size: {total_chars} chars across {len(messages)} messages.")
+        for i, m in enumerate(messages):
+            content = m.get("content", "") or ""
+            logging.info(f"[Architect] Msg {i} ({m['role']}): {content[:500]}...")
 
         # 2. Setup Mesh Observation
         mesh_bridge = queue.Queue()
@@ -86,7 +93,12 @@
                 accumulated_reasoning = ""
                 tool_calls_map = {}
                 
+                chunk_count = 0
                 async for chunk in prediction:
+                    chunk_count += 1
+                    if chunk_count == 1:
+                        logging.info(f"[Architect] First chunk received after {time.time() - turn_start_time:.2f}s")
+                    
                     if not chunk.choices: continue
                     delta = chunk.choices[0].delta
                     
@@ -221,7 +233,7 @@
             kwargs["tools"] = tools
             kwargs["tool_choice"] = "auto"
         try:
-            return await llm_provider.acompletion(messages=messages, **kwargs)
+            return await llm_provider.acompletion(messages=messages, timeout=60, **kwargs)
         except Exception as e:
             logging.error(f"[Architect] LLM Exception: {e}")
             return None
diff --git a/ai-hub/app/core/services/node_registry.py b/ai-hub/app/core/services/node_registry.py
index 3606e70..0054d64 100644
--- a/ai-hub/app/core/services/node_registry.py
+++ b/ai-hub/app/core/services/node_registry.py
@@ -322,7 +322,10 @@
                     if not is_tty_char:
                         node.terminal_history.append(f"$ {cmd}\n")
             elif event_type == "task_stdout" and isinstance(data, str):
-                node.terminal_history.append(data)
+                # NEW: Strip ANSI codes for AI readability
+                ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+                clean_output = ansi_escape.sub('', data)
+                node.terminal_history.append(clean_output)
             elif event_type == "skill_event" and isinstance(data, dict):
                 if data.get("type") == "output":
                     output_data = data.get("data", "")
diff --git a/ai-hub/app/core/services/rag.py b/ai-hub/app/core/services/rag.py
index e81c465..b7c01b1 100644
--- a/ai-hub/app/core/services/rag.py
+++ b/ai-hub/app/core/services/rag.py
@@ -1,4 +1,8 @@
+import logging
+import re
 from typing import List, Tuple, Optional
+
+logger = logging.getLogger(__name__)
 from sqlalchemy.orm import Session, joinedload
 
 from app.db import models
@@ -127,7 +131,7 @@
 
                     shell_config = (node.skill_config or {}).get("shell", {})
                     if shell_config.get("enabled"):
-                        sandbox = shell_config.get("sandbox", {})
+                        sandbox = shell_config.get("sandbox") or {}
                         mode = sandbox.get("mode", "PERMISSIVE")
                         allowed = sandbox.get("allowed_commands", [])
                         denied = sandbox.get("denied_commands", [])
@@ -149,13 +153,27 @@
                     if registry:
                         live = registry.get_node(node.node_id)
                         if live and live.terminal_history:
-                            history = live.terminal_history[-40:]
+                            # Grab recent chunks and join
+                            history_blob = "".join(live.terminal_history[-40:])
+                            
+                            # Extreme Sanity Check: Strip ANSI again just in case, and limit total size
+                            ansi_escape = re.compile(r'\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])')
+                            clean_history = ansi_escape.sub('', history_blob)
+                            
+                            # Limit to 2000 chars to avoid bloating the context / breaking LLMs
+                            if len(clean_history) > 2000:
+                                clean_history = "...[truncated]...\n" + clean_history[-2000:]
+                            
                             mesh_context += "  Recent Terminal Output:\n"
                             mesh_context += "  ```\n"
-                            for line in history: mesh_context += f"  {line}"
-                            if not history[-1].endswith('\n'): mesh_context += "\n"
+                            mesh_context += f"  {clean_history}"
+                            if not clean_history.endswith('\n'): mesh_context += "\n"
                             mesh_context += "  ```\n"
                 mesh_context += "\n"
+        
+        logger.info(f"[RAG] Mesh Context gathered. Length: {len(mesh_context)} chars.")
+        if mesh_context:
+            logger.info(f"[RAG] Mesh Context excerpt: {mesh_context[:200]}...")
 
         # Accumulators for the DB save at the end
         full_answer = ""
diff --git a/ui/client-app/src/pages/NodesPage.js b/ui/client-app/src/pages/NodesPage.js
index 7e782c5..7caf16a 100644
--- a/ui/client-app/src/pages/NodesPage.js
+++ b/ui/client-app/src/pages/NodesPage.js
@@ -518,13 +518,15 @@
                                                     <div className="space-y-5">
                                                         <div className="flex justify-between items-center mb-1">
                                                             <h4 className="text-xs font-black uppercase tracking-widest text-gray-500">General Configuration</h4>
-                                                            {editingNodeId !== node.node_id ? (
-                                                                <button onClick={() => startEditing(node)} className="text-xs font-bold text-indigo-600 hover:underline">Edit Node</button>
-                                                            ) : (
-                                                                <div className="space-x-4">
-                                                                    <button onClick={() => handleUpdateNode(node.node_id)} className="text-xs font-bold text-green-600 hover:underline">Save Changes</button>
-                                                                    <button onClick={() => setEditingNodeId(null)} className="text-xs font-bold text-gray-500 hover:underline">Cancel</button>
-                                                                </div>
+                                                            {isAdmin && (
+                                                                editingNodeId !== node.node_id ? (
+                                                                    <button onClick={() => startEditing(node)} className="text-xs font-bold text-indigo-600 hover:underline">Edit Node</button>
+                                                                ) : (
+                                                                    <div className="space-x-4">
+                                                                        <button onClick={() => handleUpdateNode(node.node_id)} className="text-xs font-bold text-green-600 hover:underline">Save Changes</button>
+                                                                        <button onClick={() => setEditingNodeId(null)} className="text-xs font-bold text-gray-500 hover:underline">Cancel</button>
+                                                                    </div>
+                                                                )
                                                             )}
                                                         </div>
                                                         <div className="space-y-4">
@@ -700,13 +702,15 @@
                                                             <p className="text-[10px] text-gray-400 mt-3 italic">* Skills are defined via the Node Manifest in the bundle.</p>
                                                         </div>
                                                         <div className="pt-2 border-t dark:border-gray-700 flex flex-wrap gap-2">
-                                                            <button
-                                                                onClick={() => adminDownloadNodeBundle(node.node_id)}
-                                                                className="flex-1 bg-white dark:bg-gray-700 border dark:border-gray-600 text-gray-700 dark:text-gray-200 px-4 py-2 rounded-lg text-xs font-bold hover:bg-gray-50 dark:hover:bg-gray-600 shadow-sm transition-all flex items-center justify-center active:scale-95"
-                                                            >
-                                                                <svg className="w-4 h-4 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" /></svg>
-                                                                Download Bundle (M5)
-                                                            </button>
+                                                            {isAdmin && (
+                                                                <button
+                                                                    onClick={() => adminDownloadNodeBundle(node.node_id)}
+                                                                    className="flex-1 bg-white dark:bg-gray-700 border dark:border-gray-600 text-gray-700 dark:text-gray-200 px-4 py-2 rounded-lg text-xs font-bold hover:bg-gray-50 dark:hover:bg-gray-600 shadow-sm transition-all flex items-center justify-center active:scale-95"
+                                                                >
+                                                                    <svg className="w-4 h-4 mr-2" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" /></svg>
+                                                                    Download Bundle (M5)
+                                                                </button>
+                                                            )}
                                                         </div>
                                                     </div>
                                                 </div>
diff --git a/ui/client-app/src/pages/ProfilePage.js b/ui/client-app/src/pages/ProfilePage.js
index 1fcd5e1..b8e25a7 100644
--- a/ui/client-app/src/pages/ProfilePage.js
+++ b/ui/client-app/src/pages/ProfilePage.js
@@ -228,18 +228,16 @@
                         </div>
 
                         {/* Node Defaults Section */}
-                        <div className="mt-10 pt-8 border-t border-gray-100 dark:border-gray-700 space-y-6">
-                            <h3 className="text-lg font-black flex items-center gap-3">
-                                <svg className="w-5 h-5 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2.5} d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-7 0V4" /></svg>
-                                Default Node Attachment
-                            </h3>
-                            <div className="space-y-3">
-                                <label className={labelClass}>Auto-attach these nodes to new sessions:</label>
-                                <div className="flex flex-wrap gap-2">
-                                    {accessibleNodes.length === 0 ? (
-                                        <p className="text-xs text-gray-500 bg-gray-100 dark:bg-gray-800 p-3 rounded-xl w-full border border-dashed border-gray-300 dark:border-gray-700 italic">No agent nodes accessible to your group.</p>
-                                    ) : (
-                                        accessibleNodes.map(node => {
+                        {accessibleNodes.length > 0 && (
+                            <div className="mt-10 pt-8 border-t border-gray-100 dark:border-gray-700 space-y-6">
+                                <h3 className="text-lg font-black flex items-center gap-3">
+                                    <svg className="w-5 h-5 text-indigo-500" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2.5} d="M5 12h14M5 12a2 2 0 01-2-2V6a2 2 0 012-2h14a2 2 0 012 2v4a2 2 0 01-2 2M5 12a2 2 0 00-2 2v4a2 2 0 002 2h14a2 2 0 002-2v-4a2 2 0 00-2-2m-7 0V4" /></svg>
+                                    Default Node Attachment
+                                </h3>
+                                <div className="space-y-3">
+                                    <label className={labelClass}>Auto-attach these nodes to new sessions:</label>
+                                    <div className="flex flex-wrap gap-2">
+                                        {accessibleNodes.map(node => {
                                             const isActive = (nodePrefs.default_node_ids || []).includes(node.node_id);
                                             return (
                                                 <button
@@ -253,37 +251,38 @@
                                                     {node.display_name}
                                                 </button>
                                             );
-                                        })
-                                    )}
+                                        })}
+                                    </div>
                                 </div>
-                            </div>
 
-                            <div className="space-y-3 pt-4">
-                                <label className={labelClass}>Default Sync Workspace Directory</label>
-                                <div className="flex gap-2">
-                                    <select
-                                        value={nodePrefs.data_source?.source || 'empty'}
-                                        onChange={(e) => handleNodePrefChange({ data_source: { ...nodePrefs.data_source, source: e.target.value } })}
-                                        className="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-700 rounded-xl px-3 py-2 text-xs font-bold text-gray-700 dark:text-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500"
-                                    >
-                                        <option value="empty">Empty Workspace</option>
-                                        <option value="node_local">Node Local Path</option>
-                                    </select>
-                                    {nodePrefs.data_source?.source === 'node_local' && (
-                                        <input
-                                            type="text"
-                                            value={nodePrefs.data_source?.path || ''}
-                                            onChange={(e) => handleNodePrefChange({ data_source: { ...nodePrefs.data_source, path: e.target.value } })}
-                                            placeholder="/home/user/workspace"
-                                            className="flex-1 bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-700 rounded-xl px-3 py-2 text-xs font-mono text-indigo-600 dark:text-indigo-400 focus:outline-none focus:ring-2 focus:ring-indigo-500"
-                                        />
-                                    )}
+                                <div className="space-y-3 pt-4">
+                                    <label className={labelClass}>Default Sync Workspace Directory</label>
+                                    <div className="flex gap-2">
+                                        <select
+                                            value={nodePrefs.data_source?.source || 'empty'}
+                                            onChange={(e) => handleNodePrefChange({ data_source: { ...nodePrefs.data_source, source: e.target.value } })}
+                                            className="bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-700 rounded-xl px-3 py-2 text-xs font-bold text-gray-700 dark:text-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500"
+                                        >
+                                            <option value="empty">Empty Workspace</option>
+                                            <option value="node_local">Node Local Path</option>
+                                        </select>
+                                        {nodePrefs.data_source?.source === 'node_local' && (
+                                            <input
+                                                type="text"
+                                                value={nodePrefs.data_source?.path || ''}
+                                                onChange={(e) => handleNodePrefChange({ data_source: { ...nodePrefs.data_source, path: e.target.value } })}
+                                                placeholder="/home/user/workspace"
+                                                className="flex-1 bg-gray-50 dark:bg-gray-900 border border-gray-200 dark:border-gray-700 rounded-xl px-3 py-2 text-xs font-mono text-indigo-600 dark:text-indigo-400 focus:outline-none focus:ring-2 focus:ring-indigo-500"
+                                            />
+                                        )}
+                                    </div>
+                                    <p className="text-[10px] text-gray-400 italic font-medium ml-1">
+                                        Determines where the agent should look for files on the node when starting a chat.
+                                    </p>
                                 </div>
-                                <p className="text-[10px] text-gray-400 italic font-medium ml-1">
-                                    Determines where the agent should look for files on the node when starting a chat.
-                                </p>
                             </div>
-                        </div>
+                        )}
+
 
                         <div className="mt-8 flex flex-wrap gap-4 items-center p-3 bg-gray-50 dark:bg-gray-800/50 rounded-xl border border-dashed border-gray-200 dark:border-gray-700">
                             <span className="text-[10px] font-black uppercase tracking-widest text-gray-400">Status:</span>
diff --git a/ui/client-app/src/pages/SettingsPage.js b/ui/client-app/src/pages/SettingsPage.js
index e186d31..dd4fc8e 100644
--- a/ui/client-app/src/pages/SettingsPage.js
+++ b/ui/client-app/src/pages/SettingsPage.js
@@ -4,7 +4,8 @@
     verifyProvider, getProviderModels, getAllProviders, getVoices,
     getAdminUsers, updateUserRole, getAdminGroups, createAdminGroup,
     updateAdminGroup, deleteAdminGroup, updateUserGroup, getAdminNodes,
-    getSkills
+    getSkills, getUserNodePreferences, updateUserNodePreferences,
+    getUserAccessibleNodes
 } from '../services/apiService';
 
 const SettingsPage = () => {
@@ -36,6 +37,8 @@
     const [nodesLoading, setNodesLoading] = useState(false);
     const [allSkills, setAllSkills] = useState([]);
     const [skillsLoading, setSkillsLoading] = useState(false);
+    const [accessibleNodes, setAccessibleNodes] = useState([]);
+    const [nodePrefs, setNodePrefs] = useState({ default_node_ids: [], data_source: { source: 'empty', path: '' } });
     const fileInputRef = useRef(null);
 
     const handleViewVoices = async (providerId, apiKey = null) => {
@@ -78,8 +81,22 @@
         loadGroups();
         loadNodes();
         loadSkills();
+        loadPersonalNodePrefs();
     }, []);
 
+    const loadPersonalNodePrefs = async () => {
+        try {
+            const [nodes, prefs] = await Promise.all([
+                getUserAccessibleNodes(),
+                getUserNodePreferences()
+            ]);
+            setAccessibleNodes(nodes);
+            setNodePrefs(prefs);
+        } catch (e) {
+            console.error("Failed to load personal node prefs", e);
+        }
+    };
+
     const loadSkills = async () => {
         try {
             setSkillsLoading(true);
@@ -151,6 +168,26 @@
         }
     };
 
+    const handleNodePrefChange = async (updates) => {
+        try {
+            const newNodePrefs = { ...nodePrefs, ...updates };
+            await updateUserNodePreferences(newNodePrefs);
+            setNodePrefs(newNodePrefs);
+            setMessage({ type: 'success', text: 'Personal node preferences updated.' });
+            setTimeout(() => setMessage({ type: '', text: '' }), 3000);
+        } catch (err) {
+            setMessage({ type: 'error', text: 'Failed to update node preferences.' });
+        }
+    };
+
+    const toggleDefaultNode = (nodeId) => {
+        const current = nodePrefs.default_node_ids || [];
+        const next = current.includes(nodeId)
+            ? current.filter(id => id !== nodeId)
+            : [...current, nodeId];
+        handleNodePrefChange({ default_node_ids: next });
+    };
+
     const handleSaveGroup = async (e) => {
         e.preventDefault();
         try {
@@ -1021,7 +1058,7 @@
 
                         {/* Admin Tabs */}
                         <div className="flex border-b border-gray-200 dark:border-gray-700 bg-gray-50/50 dark:bg-gray-800/50 overflow-x-auto no-scrollbar">
-                            {['groups', 'users'].map((tab) => (
+                            {['groups', 'users', 'personal'].map((tab) => (
                                 <button
                                     key={tab}
                                     type="button"
@@ -1031,7 +1068,7 @@
                                         : 'text-gray-400 dark:text-gray-500 hover:text-gray-600 dark:hover:text-gray-300 hover:bg-gray-100/50 dark:hover:bg-gray-700/30'
                                         }`}
                                 >
-                                    {tab === 'groups' ? 'Groups' : 'Users'}
+                                    {tab === 'groups' ? 'Groups' : tab === 'users' ? 'Users' : 'My Profile'}
                                 </button>
                             ))}
                         </div>
@@ -1197,7 +1234,7 @@
                                                                 </div>
                                                                 <div className="grid grid-cols-2 sm:grid-cols-3 gap-2">
                                                                     {(section === 'nodes' ? allNodes.map(n => ({ id: n.node_id, label: n.display_name })) :
-                                                                        (section === 'skills' ? allSkills.map(s => ({ id: s.name, label: s.name })) :
+                                                                        (section === 'skills' ? allSkills.filter(s => !s.is_system).map(s => ({ id: s.name, label: s.name })) :
                                                                             (effective[section]?.providers ? Object.keys(effective[section].providers) : []).map(pId => {
                                                                                 const baseType = pId.split('_')[0];
                                                                                 const baseDef = providerLists[section].find(ld => ld.id === baseType || ld.id === pId);
@@ -1340,6 +1377,80 @@
                                     </div>
                                 </div>
                             )}
+
+                            {/* Personal Settings */}
+                            {activeAdminTab === 'personal' && (
+                                <div className={sectionClass}>
+                                    <div className="space-y-8">
+                                        <div className="flex items-center gap-3">
+                                            <div className="p-2 bg-indigo-50 dark:bg-indigo-900/30 rounded-lg text-indigo-600 dark:text-indigo-400">
+                                                <svg className="w-5 h-5" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2.5} d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" /></svg>
+                                            </div>
+                                            <div>
+                                                <h3 className="text-lg font-black text-gray-900 dark:text-white uppercase tracking-wider">My Preferences</h3>
+                                                <p className="text-[10px] text-gray-500 dark:text-gray-400 font-bold uppercase tracking-widest">Customize your individual experience</p>
+                                            </div>
+                                        </div>
+
+                                        <div className="bg-gray-50/50 dark:bg-gray-900/30 p-6 rounded-3xl border border-gray-100 dark:border-gray-700 space-y-8">
+                                            {accessibleNodes.length > 0 ? (
+                                                <div className="space-y-4">
+                                                    <label className="text-sm font-black uppercase tracking-widest text-gray-500 block">Default Node Attachment</label>
+                                                    <p className="text-xs text-gray-400 mb-4">Auto-attach these nodes to new sessions:</p>
+                                                    <div className="flex flex-wrap gap-2">
+                                                        {accessibleNodes.map(node => {
+                                                            const isActive = (nodePrefs.default_node_ids || []).includes(node.node_id);
+                                                            return (
+                                                                <button
+                                                                    key={node.node_id}
+                                                                    type="button"
+                                                                    onClick={() => toggleDefaultNode(node.node_id)}
+                                                                    className={`px-4 py-2 rounded-xl text-[10px] font-black uppercase tracking-widest border-2 transition-all ${isActive
+                                                                        ? 'bg-emerald-600 border-emerald-600 text-white shadow-lg shadow-emerald-200 dark:shadow-none translate-y-[-1px]'
+                                                                        : 'bg-white dark:bg-gray-800 border-gray-200 dark:border-gray-700 text-gray-400 hover:border-emerald-300'
+                                                                        }`}
+                                                                >
+                                                                    {node.display_name}
+                                                                </button>
+                                                            );
+                                                        })}
+                                                    </div>
+                                                </div>
+                                            ) : (
+                                                <div className="p-4 bg-gray-100/50 dark:bg-gray-800/50 rounded-2xl border border-dashed border-gray-200 dark:border-gray-700">
+                                                    <p className="text-xs text-gray-500 italic">No agent nodes are currently assigned to your group.</p>
+                                                </div>
+                                            )}
+
+                                            <div className="space-y-4 pt-4 border-t border-gray-100 dark:border-gray-700">
+                                                <label className="text-sm font-black uppercase tracking-widest text-gray-500 block">Default Sync Workspace Directory</label>
+                                                <div className="flex flex-col sm:flex-row gap-3">
+                                                    <select
+                                                        value={nodePrefs.data_source?.source || 'empty'}
+                                                        onChange={(e) => handleNodePrefChange({ data_source: { ...nodePrefs.data_source, source: e.target.value } })}
+                                                        className="bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl px-4 py-3 text-xs font-bold text-gray-700 dark:text-gray-300 focus:outline-none focus:ring-2 focus:ring-indigo-500 shadow-sm"
+                                                    >
+                                                        <option value="empty">Empty Workspace</option>
+                                                        <option value="node_local">Node Local Path</option>
+                                                    </select>
+                                                    {nodePrefs.data_source?.source === 'node_local' && (
+                                                        <input
+                                                            type="text"
+                                                            value={nodePrefs.data_source?.path || ''}
+                                                            onChange={(e) => handleNodePrefChange({ data_source: { ...nodePrefs.data_source, path: e.target.value } })}
+                                                            placeholder="/home/user/workspace"
+                                                            className="flex-1 bg-white dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-xl px-4 py-3 text-xs font-mono text-indigo-600 dark:text-indigo-400 focus:outline-none focus:ring-2 focus:ring-indigo-500 shadow-sm"
+                                                        />
+                                                    )}
+                                                </div>
+                                                <p className="text-[10px] text-gray-400 italic font-medium">
+                                                    Determines where the agent should look for files on the node when starting a chat.
+                                                </p>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            )}
                         </div>
                     </div>
                 </div>
diff --git a/ui/client-app/src/pages/SkillsPage.js b/ui/client-app/src/pages/SkillsPage.js
index 29e3586..d49aa29 100644
--- a/ui/client-app/src/pages/SkillsPage.js
+++ b/ui/client-app/src/pages/SkillsPage.js
@@ -277,7 +277,7 @@
 
                                     <div className="mt-auto flex items-center justify-between pt-4 border-t border-gray-50 dark:border-gray-700/50">
                                         <div className="flex space-x-1 opacity-0 group-hover:opacity-100 transition-opacity duration-300">
-                                            {(isAdmin || skill.owner_id === user?.id) && (
+                                            {(isAdmin || skill.owner_id === user?.id) && !skill.is_system && (
                                                 <button onClick={() => openModal(skill)} className="p-2 text-gray-400 hover:text-indigo-500 hover:bg-indigo-50 dark:hover:bg-indigo-900/30 rounded-xl transition-all" title="Edit Logic">
                                                     <Icon path="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" className="w-4 h-4" />
                                                 </button>
@@ -285,8 +285,8 @@
                                             <button onClick={() => handleClone(skill)} className="p-2 text-gray-400 hover:text-green-500 hover:bg-green-50 dark:hover:bg-green-900/30 rounded-xl transition-all" title="Clone Pattern">
                                                 <Icon path="M8 7v8a2 2 0 002 2h6M8 7V5a2 2 0 012-2h4.586a1 1 0 01.707.293l4.414 4.414a1 1 0 01.293.707V15a2 2 0 01-2 2h-2M8 7H6a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2v-2" className="w-4 h-4" />
                                             </button>
-                                            {(isAdmin || skill.owner_id === user?.id) && (
-                                                <button onClick={() => handleDelete(skill.id)} className="p-2 text-gray-400 hover:text-red-500 hover:bg-red-50 dark:hover:bg-red-900/30 rounded-xl transition-all" title="Burn (Delete)">
+                                            {(isAdmin || skill.owner_id === user?.id) && !skill.is_system && (
+                                                <button onClick={() => handleDelete(skill.id)} className="p-2 text-gray-400 hover:text-red-500 hover:bg-red-50 dark:hover:bg-green-900/30 rounded-xl transition-all" title="Burn (Delete)">
                                                     <Icon path="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" className="w-4 h-4" />
                                                 </button>
                                             )}
@@ -539,7 +539,7 @@
                                     {editingSkill ? 'Commit Changes' : 'Deploy Skill'}
                                 </button>
                             )}
-                            {viewingDoc && (isAdmin || viewingDoc.owner_id === user?.id) && (
+                            {viewingDoc && (isAdmin || viewingDoc.owner_id === user?.id) && !viewingDoc.is_system && (
                                 <button
                                     onClick={() => { closeModal(); openModal(viewingDoc); }}
                                     className="px-10 py-3 bg-indigo-600 hover:bg-indigo-700 text-white text-sm font-black uppercase rounded-[20px] shadow-xl shadow-indigo-600/20 hover:scale-105 active:scale-95 transition-all flex items-center gap-2"
diff --git a/ui/client-app/src/pages/SwarmControlPage.js b/ui/client-app/src/pages/SwarmControlPage.js
index e4ad285..e4a4999 100644
--- a/ui/client-app/src/pages/SwarmControlPage.js
+++ b/ui/client-app/src/pages/SwarmControlPage.js
@@ -14,14 +14,32 @@
 
   const onNewSessionCreated = useCallback(async (newSid) => {
     try {
-      const nodes = await getUserAccessibleNodes();
-      const ids = nodes.map(n => n.node_id);
-      if (ids.length > 0) {
-        // Authoritative attach: overwrite session nodes with all available nodes
-        await attachNodesToSession(newSid, ids, { source: 'server' });
-        // Immediate local sync
-        setAttachedNodeIds(ids);
-        // Refresh full status immediately
+      const [accessibleNodes, prefs] = await Promise.all([
+        getUserAccessibleNodes(),
+        getUserNodePreferences()
+      ]);
+
+      let targetIds = [];
+      const defaultIds = prefs.default_node_ids || [];
+
+      if (defaultIds.length > 0) {
+        // Filter defaults by what is actually accessible
+        const accessibleIds = accessibleNodes.map(n => n.node_id);
+        targetIds = defaultIds.filter(id => accessibleIds.includes(id));
+      } else {
+        // Fallback: attach all accessible nodes if no defaults specified
+        targetIds = accessibleNodes.map(n => n.node_id);
+      }
+
+      if (targetIds.length > 0) {
+        const syncConfig = prefs.data_source || { source: 'server' };
+        await attachNodesToSession(newSid, targetIds, syncConfig);
+
+        // Immediate local sync for UI
+        setAttachedNodeIds(targetIds);
+        setSyncConfig(syncConfig); // Ensure UI matches the applied config
+
+        // Refresh full status from server to stay in sync
         const status = await getSessionNodeStatus(newSid);
         const apiIds = (status.nodes || []).map(n => n.node_id);
         setAttachedNodeIds(apiIds);
diff --git a/ui/client-app/src/services/apiService.js b/ui/client-app/src/services/apiService.js
index 98d468b..0dabf65 100644
--- a/ui/client-app/src/services/apiService.js
+++ b/ui/client-app/src/services/apiService.js
@@ -1062,7 +1062,8 @@
   // Convert http://... to ws://...
   const wsBase = API_BASE_URL.replace(/^http/, 'ws');
   if (nodeId) {
-    return `${wsBase}/nodes/${nodeId}/stream`;
+    const userId = getUserId();
+    return `${wsBase}/nodes/${nodeId}/stream?user_id=${userId}`;
   }
   const userId = localStorage.getItem('userId');
   return `${wsBase}/nodes/stream/all?user_id=${userId}`;