Merge pull request #51 from ipnet-mesh/feat/sync-receiver-contacts-on-advert

Receiver nodes now sync contacts to MQTT on every advert received

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [main, master]
+    branches: [main]
   pull_request:
-    branches: [main, master]
+    branches: [main]
 
 jobs:
   lint:

.github/workflows/docker.yml

@@ -2,11 +2,9 @@ name: Docker
 
 on:
   push:
-    branches: [main, master]
+    branches: [main]
     tags:
       - "v*"
-  pull_request:
-    branches: [main, master]
 
 env:
   REGISTRY: ghcr.io
@@ -59,13 +57,13 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            SETUPTOOLS_SCM_PRETEND_VERSION=${{ startsWith(github.ref, 'refs/tags/v') && github.ref_name || format('0.0.0.dev0+g{0}', github.sha) }}
+            BUILD_VERSION=${{ github.ref_name }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
       - name: Test Docker image
         if: github.event_name == 'pull_request'
         run: |
-          docker build -t meshcore-hub-test --build-arg SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0.dev0+g${{ github.sha }} -f Dockerfile .
+          docker build -t meshcore-hub-test --build-arg BUILD_VERSION=${{ github.ref_name }} -f Dockerfile .
           docker run --rm meshcore-hub-test --version
           docker run --rm meshcore-hub-test --help

.gitignore

@@ -218,4 +218,3 @@ __marimo__/
 # MeshCore Hub specific
 *.db
 meshcore.db
-src/meshcore_hub/_version.py

AGENTS.md

@@ -624,6 +624,20 @@ On startup, the receiver performs these initialization steps:
 1. Set device clock to current Unix timestamp
 2. Send a local (non-flood) advertisement
 3. Start automatic message fetching
+4. Sync the device's contact database
+
+### Contact Sync Behavior
+
+The receiver syncs the device's contact database in two scenarios:
+
+1. **Startup**: Initial sync when receiver starts
+2. **Advertisement Events**: Automatic sync triggered whenever an advertisement is received from the mesh
+
+Since advertisements are typically received every ~20 minutes, contact sync happens automatically without manual intervention. Each contact from the device is published individually to MQTT:
+- Topic: `{prefix}/{device_public_key}/event/contact`
+- Payload: `{public_key, adv_name, type}`
+
+This ensures the collector's database stays current with all nodes discovered on the mesh network.
 
 ## References
 

Dockerfile

@@ -21,9 +21,6 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN python -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
-# Build argument for version (set via CI or manually)
-ARG SETUPTOOLS_SCM_PRETEND_VERSION=0.0.0+docker
-
 # Copy project files
 WORKDIR /app
 COPY pyproject.toml README.md ./
@@ -31,9 +28,13 @@ COPY src/ ./src/
 COPY alembic/ ./alembic/
 COPY alembic.ini ./
 
-# Install the package with version from build arg
-RUN pip install --upgrade pip && \
-    SETUPTOOLS_SCM_PRETEND_VERSION=${SETUPTOOLS_SCM_PRETEND_VERSION} pip install .
+# Build argument for version (set via CI or manually)
+ARG BUILD_VERSION=dev
+
+# Set version in _version.py and install the package
+RUN sed -i "s|__version__ = \"dev\"|__version__ = \"${BUILD_VERSION}\"|" src/meshcore_hub/_version.py && \
+    pip install --upgrade pip && \
+    pip install .
 
 # =============================================================================
 # Stage 2: Runtime - Final production image

README.md

@@ -2,6 +2,8 @@
 
 Python 3.11+ platform for managing and orchestrating MeshCore mesh networks.
 
+![MeshCore Hub Web Dashboard](docs/images/web.png)
+
 ## Overview
 
 MeshCore Hub provides a complete solution for monitoring, collecting, and interacting with MeshCore mesh networks. It consists of multiple components that work together:
@@ -318,7 +320,7 @@ All components are configured via environment variables. Create a `.env` file or
 
 #### Webhook Configuration
 
-The collector can forward events to external HTTP endpoints:
+The collector can forward certain events to external HTTP endpoints:
 
 | Variable | Default | Description |
 |----------|---------|-------------|

contrib/seed/ipnet/members.yaml

@@ -1,70 +0,0 @@
-# IPNet Network Members
-members:
-  - name: Louis
-    callsign: Louis
-    role: admin
-    description: IPNet Founder
-    nodes:
-      # ip2-rep01
-      - public_key: 2337484665ced7e210007e9fd9db98ced0a24a6eab8b4cbe3a06b3a1cea33ca1
-        node_role: repeater
-      # ip2-rep02
-      - public_key: 8cb01fff1afc099055af418ce5fc5e60384df9ff763c25dd7e6a5e0922e8df90
-        node_role: repeater
-      # ip2-rep03
-      - public_key: 5b565df747913358e24d890b2227de9c35d09763746b6ec326c15ebbf9b8be3b
-        node_role: repeater
-      # ip2-sol01
-      - public_key: 87eb9487a1a4351e986e55627b2d09c4da61f94d080eaf4d7129caef89886e25
-        node_role: repeater
-      # personal chat node
-      - public_key: c6e0d85528b4b5d7f53aa7dded2b7e0b9c8f8a5c00acfaad47476ef5f3c7dc47
-        node_role: chat
-  - name: Mark
-    callsign: Mark
-    role: member
-    description: IPNet Member
-    nodes:
-      - public_key: 22309435fbd9dd1f14870a1895dc854779f6b2af72b08542f6105d264a493ebe
-        node_role: repeater
-      - public_key: 9135986b83815ada92883358435cc6528c7db60cb647f9b6547739a1ce5eb1c8
-        node_role: repeater
-      - public_key: 2a4f89e766dfa1758e35a69962c1f6d352b206a5e3562a589155a3ebfe7fc2bb
-        node_role: repeater
-      - public_key: e790b73b2d6e377dd0f575c847f3ef42232f610eb9a19af57083fc4f647309ac
-        node_role: repeater
-      - public_key: d3c20d962f7384c111fbafad6fbc1c1dc0e5c3ce802fb3ee11020e8d8207ed3a
-        node_role: repeater
-      - public_key: cd4497d3c2fa2a1df565ae9d1cb8bf87aeaded34059421b63abeaec203f9eda8
-        node_role: repeater
-      - public_key: b00ce9d218203e96d8557a4d59e06f5de59bbc4dcc4df9c870079d2cb8b5bd80
-        node_role: repeater
-      - public_key: 69fb8431e7ab307513797544fab99ce53ce24c46ec2d3a11767fe70f2ca37b23
-        node_role: repeater
-  - name: CCZ
-    callsign: CCZ
-    role: member
-    nodes:
-      - public_key: e334ec5475789d542ed9e692fbeef7444a371fcc05adcbda1f47ba6a3191b459
-        node_role: repeater
-      - public_key: cc15fb33e98f2e098a543f516f770dc3061a1a6b30f79b84780663bf68ae6b53
-        node_role: repeater
-      - public_key: 20ed75ffc0f9777951716bb3d308d7f041fd2ad32fe2e998e600d0361e1fe2ac
-        node_role: repeater
-    description: IPNet Member
-  - name: Walshie
-    callsign: Walshie86
-    role: member
-    description: IPNet Member
-    nodes:
-      - public_key: bd7b5ac75f660675b39f368e1dbb6d1dbcefd8bd7a170e21a942954f67c8bf52
-        node_role: repeater
-      - public_key: 9cf300c40112ea34d0a59858270948b27ab6cd87e840de338f3ca782c17537b2
-        node_role: repeater
-  - name: Craig
-    callsign: M7XCN
-    role: member
-    description: IPNet Member
-    nodes:
-      - public_key: 8accb6d0189ccaffb745ba54793e7fe3edd515edb45554325d957e48c1b9f3b3
-        node_role: repeater

contrib/seed/ipnet/node_tags.yaml

@@ -1,247 +0,0 @@
-# IPNet Network Node Tags
-# Uses YAML primitives: numbers, booleans, and strings are auto-detected
-
-# IP2 Area Nodes
-2337484665ced7e210007e9fd9db98ced0a24a6eab8b4cbe3a06b3a1cea33ca1:
-  friendly_name: IP2 Repeater 1
-  node_id: ip2-rep01.ipnt.uk
-  member_id: louis
-  area: IP2
-  lat: 52.0357627
-  lon: 1.132079
-  location_description: Fountains Road
-  hardware: Heltec V3
-  antenna: Paradar 8.5dBi Omni
-  elevation: 31
-  role: infra
-
-8cb01fff1afc099055af418ce5fc5e60384df9ff763c25dd7e6a5e0922e8df90:
-  friendly_name: IP2 Repeater 2
-  node_id: ip2-rep02.ipnt.uk
-  member_id: louis
-  area: IP2
-  lat: 52.0390682
-  lon: 1.1304141
-  location_description: Belstead Road
-  hardware: Heltec V3
-  antenna: McGill 6dBi Omni
-  elevation: 44
-  role: infra
-
-5b565df747913358e24d890b2227de9c35d09763746b6ec326c15ebbf9b8be3b:
-  friendly_name: IP2 Repeater 3
-  node_id: ip2-rep03.ipnt.uk
-  member_id: louis
-  area: IP2
-  lat: 52.046356
-  lon: 1.134661
-  location_description: Birkfield Drive
-  hardware: Heltec V3
-  antenna: Paradar 8.5dBi Omni
-  elevation: 52
-  role: infra
-
-780d0939f90b22d3bd7cbedcaf4e8d468a12c01886ab24b8cfa11eab2f5516c5:
-  friendly_name: IP2 Integration 1
-  node_id: ip2-int01.ipnt.uk
-  member_id: louis
-  area: IP2
-  lat: 52.0354539
-  lon: 1.1295338
-  location_description: Fountains Road
-  hardware: Heltec V3
-  antenna: Generic 5dBi Whip
-  elevation: 25
-  role: infra
-
-30121dc60362c633c457ffa18f49b3e1d6823402c33709f32d7df70612250b96:
-  friendly_name: MeshBot
-  node_id: bot.ipnt.uk
-  member_id: louis
-  area: IP2
-  lat: 52.0354539
-  lon: 1.1295338
-  location_description: Fountains Road
-  hardware: Heltec V3
-  antenna: Generic 5dBi Whip
-  elevation: 25
-  role: infra
-
-# IP3 Area Nodes
-9135986b83815ada92883358435cc6528c7db60cb647f9b6547739a1ce5eb1c8:
-  friendly_name: IP3 Repeater 1
-  node_id: ip3-rep01.ipnt.uk
-  member_id: markab
-  area: IP3
-  lat: 52.045803
-  lon: 1.204416
-  location_description: Brokehall
-  hardware: Heltec V3
-  antenna: Paradar 8.5dBi Omni
-  elevation: 42
-  role: infra
-
-e334ec5475789d542ed9e692fbeef7444a371fcc05adcbda1f47ba6a3191b459:
-  friendly_name: IP3 Repeater 2
-  node_id: ip3-rep02.ipnt.uk
-  member_id: ccz
-  area: IP3
-  lat: 52.03297
-  lon: 1.17543
-  location_description: Morland Road Allotments
-  hardware: Heltec T114
-  antenna: Unknown
-  elevation: 39
-  role: infra
-
-cc15fb33e98f2e098a543f516f770dc3061a1a6b30f79b84780663bf68ae6b53:
-  friendly_name: IP3 Repeater 3
-  node_id: ip3-rep03.ipnt.uk
-  member_id: ccz
-  area: IP3
-  lat: 52.04499
-  lon: 1.18149
-  location_description: Hatfield Road
-  hardware: Heltec V3
-  antenna: Unknown
-  elevation: 39
-  role: infra
-
-22309435fbd9dd1f14870a1895dc854779f6b2af72b08542f6105d264a493ebe:
-  friendly_name: IP3 Integration 1
-  node_id: ip3-int01.ipnt.uk
-  member_id: markab
-  area: IP3
-  lat: 52.045773
-  lon: 1.212808
-  location_description: Brokehall
-  hardware: Heltec V3
-  antenna: Generic 3dBi Whip
-  elevation: 37
-  role: infra
-
-2a4f89e766dfa1758e35a69962c1f6d352b206a5e3562a589155a3ebfe7fc2bb:
-  friendly_name: IP3 Repeater 4
-  node_id: ip3-rep04.ipnt.uk
-  member_id: markab
-  area: IP3
-  lat: 52.046383
-  lon: 1.174542
-  location_description: Holywells
-  hardware: Sensecap Solar
-  antenna: Paradar 6.5dbi Omni
-  elevation: 21
-  role: infra
-
-e790b73b2d6e377dd0f575c847f3ef42232f610eb9a19af57083fc4f647309ac:
-  friendly_name: IP3 Repeater 5
-  node_id: ip3-rep05.ipnt.uk
-  member_id: markab
-  area: IP3
-  lat: 52.05252
-  lon: 1.17034
-  location_description: Back Hamlet
-  hardware: Heltec T114
-  antenna: Paradar 6.5dBi Omni
-  elevation: 38
-  role: infra
-
-20ed75ffc0f9777951716bb3d308d7f041fd2ad32fe2e998e600d0361e1fe2ac:
-  friendly_name: IP3 Repeater 6
-  node_id: ip3-rep06.ipnt.uk
-  member_id: ccz
-  area: IP3
-  lat: 52.04893
-  lon: 1.18965
-  location_description: Dover Road
-  hardware: Unknown
-  antenna: Generic 5dBi Whip
-  elevation: 38
-  role: infra
-
-69fb8431e7ab307513797544fab99ce53ce24c46ec2d3a11767fe70f2ca37b23:
-  friendly_name: IP3 Test Repeater 1
-  node_id: ip3-tst01.ipnt.uk
-  member_id: markab
-  area: IP3
-  lat: 52.041869
-  lon: 1.204789
-  location_description: Brokehall
-  hardware: Station G2
-  antenna: McGill 10dBi Panel
-  elevation: 37
-  role: infra
-
-ebb16e6c328b3f2fa5bc46a8c3efc8e9ad1960ee49a76dfa85abddbf7911e2ca:
-  friendly_name: IP3 Integration 1
-  node_id: ip3-int01.ipnt.uk
-  member_id: markab
-  area: IP3
-  location_description: Morland Road Allotments
-  role: infra
-
-# IP4 Area Nodes
-c464e725906e956b0cc113f4eb3ae320db66209d0b7cf1924e258b0f86147cae:
-  friendly_name: IP4 Repeater 1
-  node_id: ip4-rep01.ipnt.uk
-  member_id: markab
-  area: IP4
-  lat: 52.052445
-  lon: 1.156882
-  location_description: Wine Rack
-  hardware: Heltec T114
-  antenna: Generic 5dbi Whip
-  elevation: 50
-  role: infra
-
-cd4497d3c2fa2a1df565ae9d1cb8bf87aeaded34059421b63abeaec203f9eda8:
-  friendly_name: IP4 Repeater 2
-  node_id: ip4-rep02.ipnt.uk
-  member_id: markab
-  area: IP4
-  lat: 52.06217
-  lon: 1.18332
-  location_description: Rushmere Road
-  hardware: Heltec V3
-  antenna: Paradar 5dbi Whip
-  elevation: 35
-  role: infra
-
-8accb6d0189ccaffb745ba54793e7fe3edd515edb45554325d957e48c1b9f3b3:
-  friendly_name: IP4 Repeater 3
-  node_id: ip4-rep03.ipnt.uk
-  member_id: craig
-  area: IP4
-  lat: 52.058
-  lon: 1.165
-  location_description: IP4 Area
-  hardware: Heltec v3
-  antenna: Generic Whip
-  elevation: 30
-  role: infra
-
-# IP8 Area Nodes
-bd7b5ac75f660675b39f368e1dbb6d1dbcefd8bd7a170e21a942954f67c8bf52:
-  friendly_name: IP8 Repeater 1
-  node_id: rep01.ip8.ipnt.uk
-  member_id: walshie86
-  area: IP8
-  lat: 52.033684
-  lon: 1.118384
-  location_description: Grove Hill
-  hardware: Heltec V3
-  antenna: McGill 3dBi Omni
-  elevation: 13
-  role: infra
-
-9cf300c40112ea34d0a59858270948b27ab6cd87e840de338f3ca782c17537b2:
-  friendly_name: IP8 Repeater 2
-  node_id: rep02.ip8.ipnt.uk
-  member_id: walshie86
-  area: IP8
-  lat: 52.035648
-  lon: 1.073271
-  location_description: Washbrook
-  hardware: Sensecap Solar
-  elevation: 13
-  role: infra

pyproject.toml

@@ -1,10 +1,10 @@
 [build-system]
-requires = ["setuptools>=68.0", "wheel", "setuptools-scm>=8.0"]
+requires = ["setuptools>=68.0", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "meshcore-hub"
-dynamic = ["version"]
+version = "0.0.0"
 description = "Python monorepo for managing and orchestrating MeshCore mesh networks"
 readme = "README.md"
 license = {text = "GPL-3.0-or-later"}
@@ -68,10 +68,6 @@ Documentation = "https://github.com/ipnet-mesh/meshcore-hub#readme"
 Repository = "https://github.com/ipnet-mesh/meshcore-hub"
 Issues = "https://github.com/ipnet-mesh/meshcore-hub/issues"
 
-[tool.setuptools_scm]
-version_file = "src/meshcore_hub/_version.py"
-fallback_version = "0.0.0+unknown"
-
 [tool.setuptools.packages.find]
 where = ["src"]
 

src/meshcore_hub/__init__.py

@@ -1,5 +1,5 @@
 """MeshCore Hub - Python monorepo for managing MeshCore mesh networks."""
 
-from meshcore_hub._version import __version__, __version_tuple__
+from meshcore_hub._version import __version__
 
-__all__ = ["__version__", "__version_tuple__"]
+__all__ = ["__version__"]

src/meshcore_hub/_version.py

@@ -0,0 +1,8 @@
+"""MeshCore Hub version information.
+
+This file contains the version string for the package.
+It can be overridden at build time by setting BUILD_VERSION environment variable.
+"""
+
+__version__ = "dev"
+__all__ = ["__version__"]

src/meshcore_hub/api/routes/advertisements.py

@@ -19,12 +19,12 @@ from meshcore_hub.common.schemas.messages import (
 router = APIRouter()
 
 
-def _get_friendly_name(node: Optional[Node]) -> Optional[str]:
-    """Extract friendly_name tag from a node's tags."""
+def _get_tag_name(node: Optional[Node]) -> Optional[str]:
+    """Extract name tag from a node's tags."""
     if not node or not node.tags:
         return None
     for tag in node.tags:
-        if tag.key == "friendly_name":
+        if tag.key == "name":
             return tag.value
     return None
 
@@ -57,15 +57,15 @@ def _fetch_receivers_for_events(
     receivers_by_hash: dict[str, list[ReceiverInfo]] = {}
 
     node_ids = [r.node_id for r in results]
-    friendly_names: dict[str, str] = {}
+    tag_names: dict[str, str] = {}
     if node_ids:
-        fn_query = (
+        tag_query = (
             select(NodeTag.node_id, NodeTag.value)
             .where(NodeTag.node_id.in_(node_ids))
-            .where(NodeTag.key == "friendly_name")
+            .where(NodeTag.key == "name")
         )
-        for node_id, value in session.execute(fn_query).all():
-            friendly_names[node_id] = value
+        for node_id, value in session.execute(tag_query).all():
+            tag_names[node_id] = value
 
     for row in results:
         if row.event_hash not in receivers_by_hash:
@@ -76,7 +76,7 @@ def _fetch_receivers_for_events(
                 node_id=row.node_id,
                 public_key=row.public_key,
                 name=row.name,
-                friendly_name=friendly_names.get(row.node_id),
+                tag_name=tag_names.get(row.node_id),
                 snr=row.snr,
                 received_at=row.received_at,
             )
@@ -173,11 +173,11 @@ async def list_advertisements(
         data = {
             "received_by": row.receiver_pk,
             "receiver_name": row.receiver_name,
-            "receiver_friendly_name": _get_friendly_name(receiver_node),
+            "receiver_tag_name": _get_tag_name(receiver_node),
             "public_key": adv.public_key,
             "name": adv.name,
             "node_name": row.source_name,
-            "node_friendly_name": _get_friendly_name(source_node),
+            "node_tag_name": _get_tag_name(source_node),
             "adv_type": adv.adv_type or row.source_adv_type,
             "flags": adv.flags,
             "received_at": adv.received_at,
@@ -255,11 +255,11 @@ async def get_advertisement(
     data = {
         "received_by": result.receiver_pk,
         "receiver_name": result.receiver_name,
-        "receiver_friendly_name": _get_friendly_name(receiver_node),
+        "receiver_tag_name": _get_tag_name(receiver_node),
         "public_key": adv.public_key,
         "name": adv.name,
         "node_name": result.source_name,
-        "node_friendly_name": _get_friendly_name(source_node),
+        "node_tag_name": _get_tag_name(source_node),
         "adv_type": adv.adv_type or result.source_adv_type,
         "flags": adv.flags,
         "received_at": adv.received_at,

src/meshcore_hub/api/routes/dashboard.py

@@ -82,11 +82,11 @@ async def get_stats(
         .all()
     )
 
-    # Get node names, adv_types, and friendly_name tags for the advertised nodes
+    # Get node names, adv_types, and name tags for the advertised nodes
     ad_public_keys = [ad.public_key for ad in recent_ads]
     node_names: dict[str, str] = {}
     node_adv_types: dict[str, str] = {}
-    friendly_names: dict[str, str] = {}
+    tag_names: dict[str, str] = {}
     if ad_public_keys:
         # Get node names and adv_types from Node table
         node_query = select(Node.public_key, Node.name, Node.adv_type).where(
@@ -98,21 +98,21 @@ async def get_stats(
             if adv_type:
                 node_adv_types[public_key] = adv_type
 
-        # Get friendly_name tags
-        friendly_name_query = (
+        # Get name tags
+        tag_name_query = (
             select(Node.public_key, NodeTag.value)
             .join(NodeTag, Node.id == NodeTag.node_id)
             .where(Node.public_key.in_(ad_public_keys))
-            .where(NodeTag.key == "friendly_name")
+            .where(NodeTag.key == "name")
         )
-        for public_key, value in session.execute(friendly_name_query).all():
-            friendly_names[public_key] = value
+        for public_key, value in session.execute(tag_name_query).all():
+            tag_names[public_key] = value
 
     recent_advertisements = [
         RecentAdvertisement(
             public_key=ad.public_key,
             name=ad.name or node_names.get(ad.public_key),
-            friendly_name=friendly_names.get(ad.public_key),
+            tag_name=tag_names.get(ad.public_key),
             adv_type=ad.adv_type or node_adv_types.get(ad.public_key),
             received_at=ad.received_at,
         )
@@ -146,7 +146,7 @@ async def get_stats(
         # Look up sender names for these messages
         msg_prefixes = [m.pubkey_prefix for m in channel_msgs if m.pubkey_prefix]
         msg_sender_names: dict[str, str] = {}
-        msg_friendly_names: dict[str, str] = {}
+        msg_tag_names: dict[str, str] = {}
         if msg_prefixes:
             for prefix in set(msg_prefixes):
                 sender_node_query = select(Node.public_key, Node.name).where(
@@ -156,14 +156,14 @@ async def get_stats(
                     if name:
                         msg_sender_names[public_key[:12]] = name
 
-                sender_friendly_query = (
+                sender_tag_query = (
                     select(Node.public_key, NodeTag.value)
                     .join(NodeTag, Node.id == NodeTag.node_id)
                     .where(Node.public_key.startswith(prefix))
-                    .where(NodeTag.key == "friendly_name")
+                    .where(NodeTag.key == "name")
                 )
-                for public_key, value in session.execute(sender_friendly_query).all():
-                    msg_friendly_names[public_key[:12]] = value
+                for public_key, value in session.execute(sender_tag_query).all():
+                    msg_tag_names[public_key[:12]] = value
 
         channel_messages[int(channel_idx)] = [
             ChannelMessage(
@@ -171,8 +171,8 @@ async def get_stats(
                 sender_name=(
                     msg_sender_names.get(m.pubkey_prefix) if m.pubkey_prefix else None
                 ),
-                sender_friendly_name=(
-                    msg_friendly_names.get(m.pubkey_prefix) if m.pubkey_prefix else None
+                sender_tag_name=(
+                    msg_tag_names.get(m.pubkey_prefix) if m.pubkey_prefix else None
                 ),
                 pubkey_prefix=m.pubkey_prefix,
                 received_at=m.received_at,

src/meshcore_hub/api/routes/members.py

@@ -41,7 +41,7 @@ def _enrich_member_nodes(
                 updated_at=mn.updated_at,
                 node_name=info.get("name"),
                 node_adv_type=info.get("adv_type"),
-                friendly_name=info.get("friendly_name"),
+                tag_name=info.get("tag_name"),
             )
         )
     return enriched_nodes
@@ -100,15 +100,15 @@ async def list_members(
         )
         nodes = session.execute(node_query).scalars().all()
         for node in nodes:
-            friendly_name = None
+            tag_name = None
             for tag in node.tags:
-                if tag.key == "friendly_name":
-                    friendly_name = tag.value
+                if tag.key == "name":
+                    tag_name = tag.value
                     break
             node_info[node.public_key] = {
                 "name": node.name,
                 "adv_type": node.adv_type,
-                "friendly_name": friendly_name,
+                "tag_name": tag_name,
             }
 
     return MemberList(
@@ -145,15 +145,15 @@ async def get_member(
         )
         nodes = session.execute(node_query).scalars().all()
         for node in nodes:
-            friendly_name = None
+            tag_name = None
             for tag in node.tags:
-                if tag.key == "friendly_name":
-                    friendly_name = tag.value
+                if tag.key == "name":
+                    tag_name = tag.value
                     break
             node_info[node.public_key] = {
                 "name": node.name,
                 "adv_type": node.adv_type,
-                "friendly_name": friendly_name,
+                "tag_name": tag_name,
             }
 
     return _member_to_read(member, node_info)

src/meshcore_hub/api/routes/messages.py

@@ -15,12 +15,12 @@ from meshcore_hub.common.schemas.messages import MessageList, MessageRead, Recei
 router = APIRouter()
 
 
-def _get_friendly_name(node: Optional[Node]) -> Optional[str]:
-    """Extract friendly_name tag from a node's tags."""
+def _get_tag_name(node: Optional[Node]) -> Optional[str]:
+    """Extract name tag from a node's tags."""
     if not node or not node.tags:
         return None
     for tag in node.tags:
-        if tag.key == "friendly_name":
+        if tag.key == "name":
             return tag.value
     return None
 
@@ -64,17 +64,17 @@ def _fetch_receivers_for_events(
     # Group by event_hash
     receivers_by_hash: dict[str, list[ReceiverInfo]] = {}
 
-    # Get friendly names for receiver nodes
+    # Get tag names for receiver nodes
     node_ids = [r.node_id for r in results]
-    friendly_names: dict[str, str] = {}
+    tag_names: dict[str, str] = {}
     if node_ids:
-        fn_query = (
+        tag_query = (
             select(NodeTag.node_id, NodeTag.value)
             .where(NodeTag.node_id.in_(node_ids))
-            .where(NodeTag.key == "friendly_name")
+            .where(NodeTag.key == "name")
         )
-        for node_id, value in session.execute(fn_query).all():
-            friendly_names[node_id] = value
+        for node_id, value in session.execute(tag_query).all():
+            tag_names[node_id] = value
 
     for row in results:
         if row.event_hash not in receivers_by_hash:
@@ -85,7 +85,7 @@ def _fetch_receivers_for_events(
                 node_id=row.node_id,
                 public_key=row.public_key,
                 name=row.name,
-                friendly_name=friendly_names.get(row.node_id),
+                tag_name=tag_names.get(row.node_id),
                 snr=row.snr,
                 received_at=row.received_at,
             )
@@ -153,10 +153,10 @@ async def list_messages(
     # Execute
     results = session.execute(query).all()
 
-    # Look up sender names and friendly_names for senders with pubkey_prefix
+    # Look up sender names and tag names for senders with pubkey_prefix
     pubkey_prefixes = [r[0].pubkey_prefix for r in results if r[0].pubkey_prefix]
     sender_names: dict[str, str] = {}
-    friendly_names: dict[str, str] = {}
+    sender_tag_names: dict[str, str] = {}
     if pubkey_prefixes:
         # Find nodes whose public_key starts with any of these prefixes
         for prefix in set(pubkey_prefixes):
@@ -168,15 +168,15 @@ async def list_messages(
                 if name:
                     sender_names[public_key[:12]] = name
 
-            # Get friendly_name tag
-            friendly_name_query = (
+            # Get name tag
+            tag_name_query = (
                 select(Node.public_key, NodeTag.value)
                 .join(NodeTag, Node.id == NodeTag.node_id)
                 .where(Node.public_key.startswith(prefix))
-                .where(NodeTag.key == "friendly_name")
+                .where(NodeTag.key == "name")
             )
-            for public_key, value in session.execute(friendly_name_query).all():
-                friendly_names[public_key[:12]] = value
+            for public_key, value in session.execute(tag_name_query).all():
+                sender_tag_names[public_key[:12]] = value
 
     # Collect receiver node IDs to fetch tags
     receiver_ids = set()
@@ -214,14 +214,14 @@ async def list_messages(
             "receiver_node_id": m.receiver_node_id,
             "received_by": receiver_pk,
             "receiver_name": receiver_name,
-            "receiver_friendly_name": _get_friendly_name(receiver_node),
+            "receiver_tag_name": _get_tag_name(receiver_node),
             "message_type": m.message_type,
             "pubkey_prefix": m.pubkey_prefix,
             "sender_name": (
                 sender_names.get(m.pubkey_prefix) if m.pubkey_prefix else None
             ),
-            "sender_friendly_name": (
-                friendly_names.get(m.pubkey_prefix) if m.pubkey_prefix else None
+            "sender_tag_name": (
+                sender_tag_names.get(m.pubkey_prefix) if m.pubkey_prefix else None
             ),
             "channel_idx": m.channel_idx,
             "text": m.text,

src/meshcore_hub/collector/cli.py

@@ -383,8 +383,11 @@ def _run_seed_import(
             file_path=str(node_tags_file),
             db=db,
             create_nodes=create_nodes,
+            clear_existing=True,
         )
         if verbose:
+            if stats["deleted"]:
+                click.echo(f"  Deleted {stats['deleted']} existing tags")
             click.echo(
                 f"  Tags: {stats['created']} created, {stats['updated']} updated"
             )
@@ -428,16 +431,24 @@ def _run_seed_import(
     default=False,
     help="Skip tags for nodes that don't exist (default: create nodes)",
 )
+@click.option(
+    "--clear-existing",
+    is_flag=True,
+    default=False,
+    help="Delete all existing tags before importing",
+)
 @click.pass_context
 def import_tags_cmd(
     ctx: click.Context,
     file: str | None,
     no_create_nodes: bool,
+    clear_existing: bool,
 ) -> None:
     """Import node tags from a YAML file.
 
     Reads a YAML file containing tag definitions and upserts them
-    into the database. Existing tags are updated, new tags are created.
+    into the database. By default, existing tags are updated and new tags are created.
+    Use --clear-existing to delete all tags before importing.
 
     FILE is the path to the YAML file containing tags.
     If not provided, defaults to {SEED_HOME}/node_tags.yaml.
@@ -492,11 +503,14 @@ def import_tags_cmd(
         file_path=tags_file,
         db=db,
         create_nodes=not no_create_nodes,
+        clear_existing=clear_existing,
     )
 
     # Report results
     click.echo("")
     click.echo("Import complete:")
+    if stats["deleted"]:
+        click.echo(f"  Tags deleted: {stats['deleted']}")
     click.echo(f"  Total tags in file: {stats['total']}")
     click.echo(f"  Tags created: {stats['created']}")
     click.echo(f"  Tags updated: {stats['updated']}")

src/meshcore_hub/collector/tag_import.py

@@ -7,7 +7,7 @@ from typing import Any
 
 import yaml
 from pydantic import BaseModel, Field, model_validator
-from sqlalchemy import select
+from sqlalchemy import delete, func, select
 
 from meshcore_hub.common.database import DatabaseManager
 from meshcore_hub.common.models import Node, NodeTag
@@ -151,16 +151,19 @@ def import_tags(
     file_path: str | Path,
     db: DatabaseManager,
     create_nodes: bool = True,
+    clear_existing: bool = False,
 ) -> dict[str, Any]:
     """Import tags from a YAML file into the database.
 
     Performs upsert operations - existing tags are updated, new tags are created.
+    Optionally clears all existing tags before import.
 
     Args:
         file_path: Path to the tags YAML file
         db: Database manager instance
         create_nodes: If True, create nodes that don't exist. If False, skip tags
                      for non-existent nodes.
+        clear_existing: If True, delete all existing tags before importing.
 
     Returns:
         Dictionary with import statistics:
@@ -169,6 +172,7 @@ def import_tags(
         - updated: Number of existing tags updated
         - skipped: Number of tags skipped (node not found and create_nodes=False)
         - nodes_created: Number of new nodes created
+        - deleted: Number of existing tags deleted (if clear_existing=True)
         - errors: List of error messages
     """
     stats: dict[str, Any] = {
@@ -177,6 +181,7 @@ def import_tags(
         "updated": 0,
         "skipped": 0,
         "nodes_created": 0,
+        "deleted": 0,
         "errors": [],
     }
 
@@ -194,6 +199,15 @@ def import_tags(
     now = datetime.now(timezone.utc)
 
     with db.session_scope() as session:
+        # Clear all existing tags if requested
+        if clear_existing:
+            delete_count = (
+                session.execute(select(func.count()).select_from(NodeTag)).scalar() or 0
+            )
+            session.execute(delete(NodeTag))
+            stats["deleted"] = delete_count
+            logger.info(f"Deleted {delete_count} existing tags")
+
         # Cache nodes by public_key to reduce queries
         node_cache: dict[str, Node] = {}
 
@@ -232,24 +246,8 @@ def import_tags(
                         tag_value = tag_data.get("value")
                         tag_type = tag_data.get("type", "string")
 
-                        # Find or create tag
-                        tag_query = select(NodeTag).where(
-                            NodeTag.node_id == node.id,
-                            NodeTag.key == tag_key,
-                        )
-                        existing_tag = session.execute(tag_query).scalar_one_or_none()
-
-                        if existing_tag:
-                            # Update existing tag
-                            existing_tag.value = tag_value
-                            existing_tag.value_type = tag_type
-                            stats["updated"] += 1
-                            logger.debug(
-                                f"Updated tag {tag_key}={tag_value} "
-                                f"for {public_key[:12]}..."
-                            )
-                        else:
-                            # Create new tag
+                        if clear_existing:
+                            # When clearing, always create new tags
                             new_tag = NodeTag(
                                 node_id=node.id,
                                 key=tag_key,
@@ -262,6 +260,39 @@ def import_tags(
                                 f"Created tag {tag_key}={tag_value} "
                                 f"for {public_key[:12]}..."
                             )
+                        else:
+                            # Find or create tag
+                            tag_query = select(NodeTag).where(
+                                NodeTag.node_id == node.id,
+                                NodeTag.key == tag_key,
+                            )
+                            existing_tag = session.execute(
+                                tag_query
+                            ).scalar_one_or_none()
+
+                            if existing_tag:
+                                # Update existing tag
+                                existing_tag.value = tag_value
+                                existing_tag.value_type = tag_type
+                                stats["updated"] += 1
+                                logger.debug(
+                                    f"Updated tag {tag_key}={tag_value} "
+                                    f"for {public_key[:12]}..."
+                                )
+                            else:
+                                # Create new tag
+                                new_tag = NodeTag(
+                                    node_id=node.id,
+                                    key=tag_key,
+                                    value=tag_value,
+                                    value_type=tag_type,
+                                )
+                                session.add(new_tag)
+                                stats["created"] += 1
+                                logger.debug(
+                                    f"Created tag {tag_key}={tag_value} "
+                                    f"for {public_key[:12]}..."
+                                )
 
                     except Exception as e:
                         error_msg = f"Error processing tag {tag_key} for {public_key[:12]}...: {e}"

src/meshcore_hub/common/schemas/members.py

@@ -35,9 +35,7 @@ class MemberNodeRead(BaseModel):
     node_adv_type: Optional[str] = Field(
         default=None, description="Node's advertisement type"
     )
-    friendly_name: Optional[str] = Field(
-        default=None, description="Node's friendly name tag"
-    )
+    tag_name: Optional[str] = Field(default=None, description="Node's name tag")
 
     class Config:
         from_attributes = True

src/meshcore_hub/common/schemas/messages.py

@@ -12,9 +12,7 @@ class ReceiverInfo(BaseModel):
     node_id: str = Field(..., description="Receiver node UUID")
     public_key: str = Field(..., description="Receiver node public key")
     name: Optional[str] = Field(default=None, description="Receiver node name")
-    friendly_name: Optional[str] = Field(
-        default=None, description="Receiver friendly name from tags"
-    )
+    tag_name: Optional[str] = Field(default=None, description="Receiver name from tags")
     snr: Optional[float] = Field(
         default=None, description="Signal-to-noise ratio at this receiver"
     )
@@ -31,8 +29,8 @@ class MessageRead(BaseModel):
         default=None, description="Receiving interface node public key"
     )
     receiver_name: Optional[str] = Field(default=None, description="Receiver node name")
-    receiver_friendly_name: Optional[str] = Field(
-        default=None, description="Receiver friendly name from tags"
+    receiver_tag_name: Optional[str] = Field(
+        default=None, description="Receiver name from tags"
     )
     message_type: str = Field(..., description="Message type (contact, channel)")
     pubkey_prefix: Optional[str] = Field(
@@ -41,8 +39,8 @@ class MessageRead(BaseModel):
     sender_name: Optional[str] = Field(
         default=None, description="Sender's advertised node name"
     )
-    sender_friendly_name: Optional[str] = Field(
-        default=None, description="Sender's friendly name from node tags"
+    sender_tag_name: Optional[str] = Field(
+        default=None, description="Sender's name from node tags"
     )
     channel_idx: Optional[int] = Field(default=None, description="Channel index")
     text: str = Field(..., description="Message content")
@@ -110,16 +108,16 @@ class AdvertisementRead(BaseModel):
         default=None, description="Receiving interface node public key"
     )
     receiver_name: Optional[str] = Field(default=None, description="Receiver node name")
-    receiver_friendly_name: Optional[str] = Field(
-        default=None, description="Receiver friendly name from tags"
+    receiver_tag_name: Optional[str] = Field(
+        default=None, description="Receiver name from tags"
     )
     public_key: str = Field(..., description="Advertised public key")
     name: Optional[str] = Field(default=None, description="Advertised name")
     node_name: Optional[str] = Field(
         default=None, description="Node name from nodes table"
     )
-    node_friendly_name: Optional[str] = Field(
-        default=None, description="Node friendly name from tags"
+    node_tag_name: Optional[str] = Field(
+        default=None, description="Node name from tags"
     )
     adv_type: Optional[str] = Field(default=None, description="Node type")
     flags: Optional[int] = Field(default=None, description="Capability flags")
@@ -215,7 +213,7 @@ class RecentAdvertisement(BaseModel):
 
     public_key: str = Field(..., description="Node public key")
     name: Optional[str] = Field(default=None, description="Node name")
-    friendly_name: Optional[str] = Field(default=None, description="Friendly name tag")
+    tag_name: Optional[str] = Field(default=None, description="Name tag")
     adv_type: Optional[str] = Field(default=None, description="Node type")
     received_at: datetime = Field(..., description="When received")
 
@@ -225,8 +223,8 @@ class ChannelMessage(BaseModel):
 
     text: str = Field(..., description="Message text")
     sender_name: Optional[str] = Field(default=None, description="Sender name")
-    sender_friendly_name: Optional[str] = Field(
-        default=None, description="Sender friendly name"
+    sender_tag_name: Optional[str] = Field(
+        default=None, description="Sender name from tags"
     )
     pubkey_prefix: Optional[str] = Field(
         default=None, description="Sender public key prefix"

src/meshcore_hub/interface/device.py

@@ -193,11 +193,24 @@ class BaseMeshCoreDevice(ABC):
 
         Triggers a CONTACTS event with all stored contacts from the device.
 
+        Note: This should only be called before the event loop is running.
+
         Returns:
             True if request was sent successfully
         """
         pass
 
+    @abstractmethod
+    def schedule_get_contacts(self) -> bool:
+        """Schedule a get_contacts request on the event loop.
+
+        This is safe to call from event handlers while the event loop is running.
+
+        Returns:
+            True if request was scheduled successfully
+        """
+        pass
+
     @abstractmethod
     def run(self) -> None:
         """Run the device event loop (blocking)."""
@@ -567,7 +580,12 @@ class MeshCoreDevice(BaseMeshCoreDevice):
             return False
 
     def get_contacts(self) -> bool:
-        """Fetch contacts from device contact database."""
+        """Fetch contacts from device contact database.
+
+        Note: This method should only be called before the event loop is running
+        (e.g., during initialization). For calling during event processing,
+        use schedule_get_contacts() instead.
+        """
         if not self._connected or not self._mc:
             logger.error("Cannot get contacts: not connected")
             return False
@@ -584,6 +602,31 @@ class MeshCoreDevice(BaseMeshCoreDevice):
             logger.error(f"Failed to get contacts: {e}")
             return False
 
+    def schedule_get_contacts(self) -> bool:
+        """Schedule a get_contacts request on the event loop.
+
+        This is safe to call from event handlers while the event loop is running.
+        The request is scheduled as a task on the event loop.
+
+        Returns:
+            True if request was scheduled, False if device not connected
+        """
+        if not self._connected or not self._mc:
+            logger.error("Cannot get contacts: not connected")
+            return False
+
+        try:
+
+            async def _get_contacts() -> None:
+                await self._mc.commands.get_contacts()
+
+            asyncio.run_coroutine_threadsafe(_get_contacts(), self._loop)
+            logger.info("Scheduled contact sync request")
+            return True
+        except Exception as e:
+            logger.error(f"Failed to schedule get contacts: {e}")
+            return False
+
     def run(self) -> None:
         """Run the device event loop."""
         self._running = True

src/meshcore_hub/interface/mock_device.py

@@ -292,7 +292,10 @@ class MockMeshCoreDevice(BaseMeshCoreDevice):
         return True
 
     def get_contacts(self) -> bool:
-        """Fetch contacts from mock device contact database."""
+        """Fetch contacts from mock device contact database.
+
+        Note: This should only be called before the event loop is running.
+        """
         if not self._connected:
             logger.error("Cannot get contacts: not connected")
             return False
@@ -318,6 +321,14 @@ class MockMeshCoreDevice(BaseMeshCoreDevice):
         threading.Thread(target=send_contacts, daemon=True).start()
         return True
 
+    def schedule_get_contacts(self) -> bool:
+        """Schedule a get_contacts request.
+
+        For the mock device, this is the same as get_contacts() since we
+        don't have a real async event loop. The contacts are sent via a thread.
+        """
+        return self.get_contacts()
+
     def run(self) -> None:
         """Run the mock device event loop."""
         self._running = True

src/meshcore_hub/interface/receiver.py

@@ -144,9 +144,24 @@ class Receiver:
 
             logger.debug(f"Published {event_name} event to MQTT")
 
+            # Trigger contact sync on advertisements
+            if event_type == EventType.ADVERTISEMENT:
+                self._sync_contacts()
+
         except Exception as e:
             logger.error(f"Failed to publish event to MQTT: {e}")
 
+    def _sync_contacts(self) -> None:
+        """Request contact sync from device.
+
+        Called when advertisements are received to ensure contact database
+        stays current with all nodes on the mesh.
+        """
+        logger.info("Advertisement received, triggering contact sync")
+        success = self.device.schedule_get_contacts()
+        if not success:
+            logger.warning("Contact sync request failed")
+
     def _publish_contacts(self, payload: dict[str, Any]) -> None:
         """Publish each contact as a separate MQTT message.
 

src/meshcore_hub/web/templates/advertisements.html

@@ -49,8 +49,8 @@
             <tr class="hover">
                 <td>
                     <a href="/nodes/{{ ad.public_key }}" class="link link-hover">
-                        {% if ad.node_friendly_name or ad.node_name or ad.name %}
-                        <div class="font-medium">{{ ad.node_friendly_name or ad.node_name or ad.name }}</div>
+                        {% if ad.node_tag_name or ad.node_name or ad.name %}
+                        <div class="font-medium">{{ ad.node_tag_name or ad.node_name or ad.name }}</div>
                         <div class="text-xs font-mono opacity-70">{{ ad.public_key[:16] }}...</div>
                         {% else %}
                         <span class="font-mono text-sm">{{ ad.public_key[:16] }}...</span>
@@ -80,7 +80,7 @@
                             {% for recv in ad.receivers %}
                             <li>
                                 <a href="/nodes/{{ recv.public_key }}" class="text-sm">
-                                    {{ recv.friendly_name or recv.name or recv.public_key[:12] + '...' }}
+                                    {{ recv.tag_name or recv.name or recv.public_key[:12] + '...' }}
                                 </a>
                             </li>
                             {% endfor %}
@@ -88,8 +88,8 @@
                     </div>
                     {% elif ad.receivers and ad.receivers|length == 1 %}
                     <a href="/nodes/{{ ad.receivers[0].public_key }}" class="link link-hover">
-                        {% if ad.receivers[0].friendly_name or ad.receivers[0].name %}
-                        <div class="font-medium">{{ ad.receivers[0].friendly_name or ad.receivers[0].name }}</div>
+                        {% if ad.receivers[0].tag_name or ad.receivers[0].name %}
+                        <div class="font-medium">{{ ad.receivers[0].tag_name or ad.receivers[0].name }}</div>
                         <div class="text-xs font-mono opacity-70">{{ ad.receivers[0].public_key[:16] }}...</div>
                         {% else %}
                         <span class="font-mono text-sm">{{ ad.receivers[0].public_key[:16] }}...</span>
@@ -97,8 +97,8 @@
                     </a>
                     {% elif ad.received_by %}
                     <a href="/nodes/{{ ad.received_by }}" class="link link-hover">
-                        {% if ad.receiver_friendly_name or ad.receiver_name %}
-                        <div class="font-medium">{{ ad.receiver_friendly_name or ad.receiver_name }}</div>
+                        {% if ad.receiver_tag_name or ad.receiver_name %}
+                        <div class="font-medium">{{ ad.receiver_tag_name or ad.receiver_name }}</div>
                         <div class="text-xs font-mono opacity-70">{{ ad.received_by[:16] }}...</div>
                         {% else %}
                         <span class="font-mono text-sm">{{ ad.received_by[:16] }}...</span>

src/meshcore_hub/web/templates/base.html

@@ -83,7 +83,7 @@
             </ul>
         </div>
         <div class="navbar-end">
-            <div class="badge badge-outline badge-sm">v{{ version }}</div>
+            <div class="badge badge-outline badge-sm">{{ version }}</div>
         </div>
     </div>
 
@@ -114,7 +114,7 @@
                 <a href="{{ network_contact_github }}" target="_blank" rel="noopener noreferrer" class="link link-hover">GitHub</a>
                 {% endif %}
             </p>
-            <p class="text-xs opacity-50 mt-2">Powered by <a href="https://github.com/ipnet-mesh/meshcore-hub" target="_blank" rel="noopener noreferrer" class="link link-hover">MeshCore Hub</a> v{{ version }}</p>
+            <p class="text-xs opacity-50 mt-2">Powered by <a href="https://github.com/ipnet-mesh/meshcore-hub" target="_blank" rel="noopener noreferrer" class="link link-hover">MeshCore Hub</a> {{ version }}</p>
         </aside>
     </footer>
 

src/meshcore_hub/web/templates/messages.html

@@ -78,8 +78,8 @@
                     {% if msg.message_type == 'channel' %}
                     <span class="font-mono">CH{{ msg.channel_idx }}</span>
                     {% else %}
-                        {% if msg.sender_friendly_name or msg.sender_name %}
-                        <span class="font-medium">{{ msg.sender_friendly_name or msg.sender_name }}</span>
+                        {% if msg.sender_tag_name or msg.sender_name %}
+                        <span class="font-medium">{{ msg.sender_tag_name or msg.sender_name }}</span>
                         {% else %}
                         <span class="font-mono text-xs">{{ (msg.pubkey_prefix or '-')[:12] }}</span>
                         {% endif %}
@@ -96,7 +96,7 @@
                             {% for recv in msg.receivers %}
                             <li>
                                 <a href="/nodes/{{ recv.public_key }}" class="text-sm">
-                                    <span class="flex-1">{{ recv.friendly_name or recv.name or recv.public_key[:12] + '...' }}</span>
+                                    <span class="flex-1">{{ recv.tag_name or recv.name or recv.public_key[:12] + '...' }}</span>
                                     {% if recv.snr is not none %}
                                     <span class="badge badge-ghost badge-xs">{{ "%.1f"|format(recv.snr) }}</span>
                                     {% endif %}
@@ -107,8 +107,8 @@
                     </div>
                     {% elif msg.receivers and msg.receivers|length == 1 %}
                     <a href="/nodes/{{ msg.receivers[0].public_key }}" class="link link-hover">
-                        {% if msg.receivers[0].friendly_name or msg.receivers[0].name %}
-                        <div class="font-medium">{{ msg.receivers[0].friendly_name or msg.receivers[0].name }}</div>
+                        {% if msg.receivers[0].tag_name or msg.receivers[0].name %}
+                        <div class="font-medium">{{ msg.receivers[0].tag_name or msg.receivers[0].name }}</div>
                         <div class="text-xs font-mono opacity-70">{{ msg.receivers[0].public_key[:16] }}...</div>
                         {% else %}
                         <span class="font-mono text-sm">{{ msg.receivers[0].public_key[:16] }}...</span>
@@ -116,8 +116,8 @@
                     </a>
                     {% elif msg.received_by %}
                     <a href="/nodes/{{ msg.received_by }}" class="link link-hover">
-                        {% if msg.receiver_friendly_name or msg.receiver_name %}
-                        <div class="font-medium">{{ msg.receiver_friendly_name or msg.receiver_name }}</div>
+                        {% if msg.receiver_tag_name or msg.receiver_name %}
+                        <div class="font-medium">{{ msg.receiver_tag_name or msg.receiver_name }}</div>
                         <div class="text-xs font-mono opacity-70">{{ msg.received_by[:16] }}...</div>
                         {% else %}
                         <span class="font-mono text-sm">{{ msg.received_by[:16] }}...</span>

src/meshcore_hub/web/templates/node_detail.html

@@ -8,13 +8,13 @@
         <li><a href="/">Home</a></li>
         <li><a href="/nodes">Nodes</a></li>
         {% if node %}
-        {% set ns = namespace(friendly_name=none) %}
+        {% set ns = namespace(tag_name=none) %}
         {% for tag in node.tags or [] %}
-            {% if tag.key == 'friendly_name' %}
-                {% set ns.friendly_name = tag.value %}
+            {% if tag.key == 'name' %}
+                {% set ns.tag_name = tag.value %}
             {% endif %}
         {% endfor %}
-        <li>{{ ns.friendly_name or node.name or public_key[:12] + '...' }}</li>
+        <li>{{ ns.tag_name or node.name or public_key[:12] + '...' }}</li>
         {% else %}
         <li>Not Found</li>
         {% endif %}
@@ -31,17 +31,17 @@
 {% endif %}
 
 {% if node %}
-{% set ns = namespace(friendly_name=none) %}
+{% set ns = namespace(tag_name=none) %}
 {% for tag in node.tags or [] %}
-    {% if tag.key == 'friendly_name' %}
-        {% set ns.friendly_name = tag.value %}
+    {% if tag.key == 'name' %}
+        {% set ns.tag_name = tag.value %}
     {% endif %}
 {% endfor %}
 <!-- Node Info Card -->
 <div class="card bg-base-100 shadow-xl mb-6">
     <div class="card-body">
         <h1 class="card-title text-2xl">
-            {{ ns.friendly_name or node.name or 'Unnamed Node' }}
+            {{ ns.tag_name or node.name or 'Unnamed Node' }}
             {% if node.adv_type %}
             <span class="badge badge-secondary">{{ node.adv_type }}</span>
             {% endif %}
@@ -125,8 +125,8 @@
                             <td>
                                 {% if adv.received_by %}
                                 <a href="/nodes/{{ adv.received_by }}" class="link link-hover">
-                                    {% if adv.receiver_friendly_name or adv.receiver_name %}
-                                    <div class="font-medium text-sm">{{ adv.receiver_friendly_name or adv.receiver_name }}</div>
+                                    {% if adv.receiver_tag_name or adv.receiver_name %}
+                                    <div class="font-medium text-sm">{{ adv.receiver_tag_name or adv.receiver_name }}</div>
                                     <div class="text-xs font-mono opacity-70">{{ adv.received_by[:16] }}...</div>
                                     {% else %}
                                     <span class="font-mono text-xs">{{ adv.received_by[:16] }}...</span>
@@ -175,8 +175,8 @@
                             <td>
                                 {% if tel.received_by %}
                                 <a href="/nodes/{{ tel.received_by }}" class="link link-hover">
-                                    {% if tel.receiver_friendly_name or tel.receiver_name %}
-                                    <div class="font-medium text-sm">{{ tel.receiver_friendly_name or tel.receiver_name }}</div>
+                                    {% if tel.receiver_tag_name or tel.receiver_name %}
+                                    <div class="font-medium text-sm">{{ tel.receiver_tag_name or tel.receiver_name }}</div>
                                     <div class="text-xs font-mono opacity-70">{{ tel.received_by[:16] }}...</div>
                                     {% else %}
                                     <span class="font-mono text-xs">{{ tel.received_by[:16] }}...</span>

src/meshcore_hub/web/templates/nodes.html

@@ -57,17 +57,17 @@
         </thead>
         <tbody>
             {% for node in nodes %}
-            {% set ns = namespace(friendly_name=none) %}
+            {% set ns = namespace(tag_name=none) %}
             {% for tag in node.tags or [] %}
-                {% if tag.key == 'friendly_name' %}
-                    {% set ns.friendly_name = tag.value %}
+                {% if tag.key == 'name' %}
+                    {% set ns.tag_name = tag.value %}
                 {% endif %}
             {% endfor %}
             <tr class="hover">
                 <td>
                     <a href="/nodes/{{ node.public_key }}" class="link link-hover">
-                        {% if ns.friendly_name or node.name %}
-                        <div class="font-medium">{{ ns.friendly_name or node.name }}</div>
+                        {% if ns.tag_name or node.name %}
+                        <div class="font-medium">{{ ns.tag_name or node.name }}</div>
                         <div class="text-xs font-mono opacity-70">{{ node.public_key[:16] }}...</div>
                         {% else %}
                         <span class="font-mono text-sm">{{ node.public_key[:16] }}...</span>

tests/test_collector/test_tag_import.py

@@ -390,3 +390,64 @@ class TestImportTags:
             assert tag_dict["is_disabled"].value_type == "boolean"
 
         Path(f.name).unlink()
+
+    def test_import_with_clear_existing(self, db_manager):
+        """Test that clear_existing deletes all tags before importing."""
+        # Create initial tags
+        initial_data = {
+            "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef": {
+                "old_tag": "old_value",
+                "shared_tag": "old_value",
+            },
+            "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef": {
+                "another_old_tag": "value",
+            },
+        }
+
+        with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
+            yaml.dump(initial_data, f)
+            f.flush()
+            initial_file = f.name
+
+        stats1 = import_tags(initial_file, db_manager, create_nodes=True)
+        assert stats1["created"] == 3
+        assert stats1["deleted"] == 0
+
+        # Verify initial tags exist
+        with db_manager.session_scope() as session:
+            tags = session.execute(select(NodeTag)).scalars().all()
+            assert len(tags) == 3
+
+        # Import new tags with clear_existing=True
+        new_data = {
+            "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef": {
+                "new_tag": "new_value",
+                "shared_tag": "new_value",
+            }
+        }
+
+        with tempfile.NamedTemporaryFile(mode="w", suffix=".yaml", delete=False) as f:
+            yaml.dump(new_data, f)
+            f.flush()
+            new_file = f.name
+
+        stats2 = import_tags(
+            new_file, db_manager, create_nodes=True, clear_existing=True
+        )
+        assert stats2["deleted"] == 3  # All 3 old tags deleted
+        assert stats2["created"] == 2  # 2 new tags created
+        assert stats2["updated"] == 0  # No updates when clearing
+
+        # Verify only new tags exist
+        with db_manager.session_scope() as session:
+            tags = session.execute(select(NodeTag)).scalars().all()
+            tag_dict = {t.key: t for t in tags}
+            assert len(tags) == 2
+            assert "new_tag" in tag_dict
+            assert "shared_tag" in tag_dict
+            assert tag_dict["shared_tag"].value == "new_value"
+            assert "old_tag" not in tag_dict
+            assert "another_old_tag" not in tag_dict
+
+        Path(initial_file).unlink()
+        Path(new_file).unlink()

tests/test_interface/test_receiver.py

@@ -62,6 +62,56 @@ class TestReceiver:
         # Verify MQTT publish was called
         mock_mqtt_client.publish_event.assert_called()
 
+    def test_receiver_syncs_contacts_on_advertisement(
+        self, receiver, mock_device, mock_mqtt_client
+    ):
+        """Test that receiver syncs contacts when advertisement is received."""
+        import time
+        from unittest.mock import patch
+
+        receiver.start()
+
+        # Patch schedule_get_contacts to track calls
+        with patch.object(
+            mock_device, "schedule_get_contacts", return_value=True
+        ) as mock_get:
+            # Inject an advertisement event
+            mock_device.inject_event(
+                EventType.ADVERTISEMENT,
+                {"pubkey_prefix": "b" * 64, "adv_name": "TestNode", "type": 1},
+            )
+
+            # Allow time for event processing
+            time.sleep(0.1)
+
+            # Verify schedule_get_contacts was called
+            mock_get.assert_called()
+
+    def test_receiver_handles_contact_sync_failure(
+        self, receiver, mock_device, mock_mqtt_client
+    ):
+        """Test that receiver handles contact sync failures gracefully."""
+        import time
+        from unittest.mock import patch
+
+        receiver.start()
+
+        # Patch schedule_get_contacts to return False (failure)
+        with patch.object(
+            mock_device, "schedule_get_contacts", return_value=False
+        ) as mock_get:
+            # Should not raise exception even if sync fails
+            mock_device.inject_event(
+                EventType.ADVERTISEMENT,
+                {"pubkey_prefix": "c" * 64, "adv_name": "FailNode", "type": 1},
+            )
+
+            # Allow time for event processing
+            time.sleep(0.1)
+
+            # Verify it was attempted
+            mock_get.assert_called()
+
 
 class TestCreateReceiver:
     """Tests for create_receiver factory function."""