fix(nomad): Correct env var name to ND_PLUGINS_FOLDER

conductor/archive/implement_ttl_heartbeat_20260208/index.md

@@ -0,0 +1,5 @@
+# Track implement_ttl_heartbeat_20260208 Context
+
+- [Specification](./spec.md)
+- [Implementation Plan](./plan.md)
+- [Metadata](./metadata.json)

conductor/archive/implement_ttl_heartbeat_20260208/metadata.json

@@ -0,0 +1,8 @@
+{
+  "track_id": "implement_ttl_heartbeat_20260208",
+  "type": "enhancement",
+  "status": "new",
+  "created_at": "2026-02-08T19:00:00Z",
+  "updated_at": "2026-02-08T19:00:00Z",
+  "description": "Implement TTL Heartbeat architecture for robust Consul service registration and cleaner failure handling."
+}

conductor/archive/implement_ttl_heartbeat_20260208/plan.md

@@ -0,0 +1,22 @@
+# Plan: Implement TTL Heartbeat Service Registration (`implement_ttl_heartbeat`)
+
+## Phase 1: Container Environment Preparation [x] [checkpoint: 51b8fce]
+- [x] Task: Update `Dockerfile` to install `curl` and `jq` (f7fe258)
+- [x] Task: Verify `litefs.yml` points to `entrypoint.sh` (should already be correct) (verified)
+- [x] Task: Conductor - User Manual Verification 'Phase 1: Container Environment Preparation' (Protocol in workflow.md)
+
+## Phase 2: Script Implementation [x] [checkpoint: 139016f]
+- [x] Task: Refactor `entrypoint.sh` with the TTL Heartbeat logic (d977301)
+    - [x] Implement `register_service` with TTL check definition
+    - [x] Implement `pass_ttl` loop
+    - [x] Implement robust `stop_app` and signal trapping
+    - [x] Ensure correct Primary/Replica detection logic (LiteFS 0.5: Primary = No `.primary` file)
+- [x] Task: Conductor - User Manual Verification 'Phase 2: Script Implementation' (Protocol in workflow.md)
+
+## Phase 3: Deployment and Verification [ ]
+- [~] Task: Commit changes and push to Gitea to trigger build
+- [ ] Task: Monitor Gitea build completion
+- [ ] Task: Deploy updated Nomad job (forcing update if necessary)
+- [ ] Task: Verify "Clean" state in Consul (only one primary registered)
+- [ ] Task: Verify Failover/Stop behavior (immediate deregistration vs TTL expiry)
+- [ ] Task: Conductor - User Manual Verification 'Phase 3: Deployment and Verification' (Protocol in workflow.md)

conductor/archive/implement_ttl_heartbeat_20260208/spec.md

@@ -0,0 +1,32 @@
+# Specification: Implement TTL Heartbeat Service Registration (`implement_ttl_heartbeat`)
+
+## Overview
+Replace the current "register and forget" Consul registration logic with a robust "TTL Heartbeat" pattern. This ensures that only the active Primary node is registered in Consul, and service entries are automatically removed (deregistered) if the node crashes, failover occurs, or Nomad stops the allocation.
+
+## Functional Requirements
+- **Supervisor Script (`entrypoint.sh`):**
+    - Refactor to implement the "Self-Registration" pattern with TTL checks.
+    - **Leadership Detection:** Monitor `/data/.primary` (LiteFS 0.5).
+        - **Primary:** Absence of file. Start Navidrome, register service with TTL.
+        - **Replica:** Presence of file. Stop Navidrome, deregister service.
+    - **Heartbeat:** Periodically (e.g., every 5-10s) PUT to Consul to pass the TTL check while Primary.
+    - **Signal Handling:** Trap `SIGTERM`/`SIGINT` to gracefully stop Navidrome and deregister immediately.
+- **Docker Image:**
+    - Ensure `curl` and `jq` are installed (prerequisites for the script).
+- **Nomad Configuration:**
+    - Ensure `NOMAD_IP_http` and `NOMAD_PORT_http` are accessible to the task (standard, but verifying).
+
+## Non-Functional Requirements
+- **Resilience:** The script must handle Consul unavailability gracefully (retries) without crashing the application loop.
+- **Cleanliness:** No "ghost" services. Replicas must not appear in the service catalog.
+
+## Acceptance Criteria
+- [ ] Navidrome runs ONLY on the Primary.
+- [ ] Only ONE `navidrome` service is registered in Consul (pointing to the Primary).
+- [ ] Stopping the Primary allocation results in immediate deregistration (via trap).
+- [ ] Hard killing the Primary allocation results in deregistration after TTL expires (approx 15s).
+- [ ] Replicas do not register any service.
+
+## Implementation Details
+- **Script Name:** We will stick with `entrypoint.sh` for consistency with `litefs.yml` configuration, refactoring its content.
+- **Service ID:** Use `navidrome-${NOMAD_ALLOC_ID}` to ensure uniqueness and traceability.

conductor/archive/update_monitor_discovery_20260208/index.md

@@ -0,0 +1,5 @@
+# Track update_monitor_discovery_20260208 Context
+
+- [Specification](./spec.md)
+- [Implementation Plan](./plan.md)
+- [Metadata](./metadata.json)

conductor/archive/update_monitor_discovery_20260208/metadata.json

@@ -0,0 +1,8 @@
+{
+  "track_id": "update_monitor_discovery_20260208",
+  "type": "enhancement",
+  "status": "new",
+  "created_at": "2026-02-08T20:00:00Z",
+  "updated_at": "2026-02-08T20:00:00Z",
+  "description": "Update cluster monitoring script to discover nodes via Nomad instead of Consul, ensuring all replicas are visible."
+}

conductor/archive/update_monitor_discovery_20260208/plan.md

@@ -0,0 +1,25 @@
+# Plan: Update Monitor Discovery Logic (`update_monitor_discovery`)
+
+## Phase 1: Nomad Discovery Enhancement [x] [checkpoint: 353683e]
+- [x] Task: Update `nomad_client.py` to fetch job allocations with IPs (353683e)
+    - [x] Write tests for parsing allocation IPs from `nomad job status` or `nomad alloc status`
+    - [x] Implement `get_job_allocations(job_id)` returning a list of dicts (id, node, ip)
+- [x] Task: Conductor - User Manual Verification 'Phase 1: Nomad Discovery Enhancement' (Protocol in workflow.md)
+
+## Phase 2: Aggregator Refactor [x] [checkpoint: 655a9b2]
+- [x] Task: Refactor `cluster_aggregator.py` to drive discovery via Nomad (655a9b2)
+    - [x] Update `get_cluster_status` to call `nomad_client.get_job_allocations` first
+    - [x] Update loop to iterate over allocations and supplement with LiteFS and Consul data
+- [x] Task: Update `consul_client.py` to fetch all services once and allow lookup by IP/ID (655a9b2)
+- [x] Task: Update tests for the new discovery flow (655a9b2)
+- [x] Task: Conductor - User Manual Verification 'Phase 2: Aggregator Refactor' (Protocol in workflow.md)
+
+## Phase 3: UI and Health Logic [x] [checkpoint: 21e9c3d]
+- [x] Task: Update `output_formatter.py` for "Standby" nodes (21e9c3d)
+    - [x] Update table formatting to handle missing Consul status for replicas
+- [x] Task: Update Cluster Health calculation (21e9c3d)
+    - [x] "Healthy" = 1 Primary (Consul passing) + N Replicas (LiteFS connected)
+- [~] Task: Extract Uptime from Nomad and internal LiteFS states (txid, checksum)
+- [~] Task: Update aggregator and formatter to display detailed database info
+- [x] Task: Final verification run (21e9c3d)
+- [x] Task: Conductor - User Manual Verification 'Phase 3: Final Verification' (Protocol in workflow.md)

conductor/archive/update_monitor_discovery_20260208/spec.md

@@ -0,0 +1,30 @@
+# Specification: Update Monitor Discovery Logic (`update_monitor_discovery`)
+
+## Overview
+Refactor the cluster monitoring script (`scripts/cluster_status`) to use Nomad as the primary source of discovery. Currently, the script queries Consul for services, which only shows the Primary node in the new architecture. By querying Nomad allocations first, we can identify all running LiteFS nodes (Primary and Replicas) and then inspect their individual health and replication status.
+
+## Functional Requirements
+- **Nomad Client (`nomad_client.py`):**
+    - Add a function to list all active allocations for a job and extract their host IPs and node names.
+- **Consul Client (`consul_client.py`):**
+    - Modify to allow checking the registration status of a *specific* node/allocation ID rather than just listing all services.
+- **Aggregator (`cluster_aggregator.py`):**
+    - **New Discovery Flow:**
+        1. Query Nomad for all allocations of `navidrome-litefs`.
+        2. For each allocation:
+            - Get the Node Name and IP.
+            - Query the LiteFS API (`:20202`) on that IP for role/DB info.
+            - Query Consul to see if a matching service registration exists (and its health).
+- **Formatter (`output_formatter.py`):**
+    - Handle nodes that are "Standby" (running in Nomad and LiteFS, but not registered in Consul).
+    - Ensure the table correctly displays all 4 nodes.
+
+## Non-Functional Requirements
+- **Efficiency:** Minimize CLI calls by batching Nomad/Consul queries where possible.
+- **Robustness:** Gracefully handle cases where an allocation has no IP yet (starting state).
+
+## Acceptance Criteria
+- [ ] Script output shows all 4 Nomad allocations.
+- [ ] Primary node is clearly identified with its Consul health status.
+- [ ] Replica nodes are shown with their LiteFS role and DB status, even if not in Consul.
+- [ ] Overall cluster health is calculated based on the existence of exactly one Primary and healthy replication on all nodes.

conductor/product.md

@@ -14,3 +14,4 @@ A highly available and durable personal music streaming service built on Navidro
 - **High-Quality Streaming:** Support for advanced audio formats and on-the-fly transcoding (Opus/FLAC) to ensure the best possible listening experience.
 - **Universal Compatibility:** Full support for the Subsonic API to allow connection from a wide variety of mobile and desktop music clients.
 - **Automated Infrastructure:** Managed by Nomad and Consul for seamless cluster operations and service discovery.
+- **Robust High Availability:** Automatic failover with TTL-based self-registration for clean and resilient service catalog management.

conductor/tech-stack.md

@@ -8,7 +8,7 @@
 ## Storage & Database
 - **SQLite:** The primary relational database used by Navidrome for metadata and state.
 - **LiteFS:** A FUSE-based filesystem that provides synchronous replication of the SQLite database across the cluster.
-- **Process Management:** LiteFS-supervised with a leadership-aware entrypoint script ensuring Navidrome only runs on the primary node.
+- **Process Management:** LiteFS-supervised with a robust TTL-heartbeat registration script ensuring zero-downtime failover and clean service catalog management.
 
 ## Automation & Delivery
 - **Gitea Actions:** Automates the multi-arch (AMD64/ARM64) building and pushing of the custom supervised container image.
@@ -19,4 +19,4 @@
 - **LiteFS Proxy:** Handles transparent write-forwarding to the cluster leader.
 
 ## Monitoring & Tooling
-- **Python (Cluster Status Script):** A local CLI tool for monitoring Consul service registration, LiteFS replication status, and diagnosing Nomad allocation logs.
+- **Python (Cluster Status Script):** A local CLI tool for hybrid monitoring using Nomad (discovery & uptime), Consul (service health), and LiteFS HTTP API (internal replication state).

conductor/tracks.md

@@ -1,4 +1,8 @@
 # Project Tracks
 
 This file tracks all major tracks for the project. Each track has its own detailed plan in its respective folder.
----
+---
+---
+
+- [x] **Track: Update Monitor Discovery Logic**
+*Link: [./tracks/update_monitor_discovery_20260208/](./update_monitor_discovery_20260208/)*

conductor/tracks/fix_navidrome_paths_20260209/plan.md

@@ -0,0 +1,17 @@
+# Plan: Correct Navidrome Database and Plugins Location (`fix_navidrome_paths`)
+
+## Phase 1: Configuration Updates [x]
+- [x] Task: Update `navidrome-litefs-v2.nomad` with corrected paths (76398de)
+- [x] Task: Update `entrypoint.sh` to handle plugins folder and environment cleanup (decb9f5)
+- [x] Task: Conductor - User Manual Verification 'Phase 1: Configuration Updates' (Protocol in workflow.md)
+
+## Phase 2: Build and Deployment [ ]
+- [ ] Task: Commit changes and push to Gitea to trigger build
+- [ ] Task: Monitor Gitea build completion
+- [ ] Task: Deploy updated Nomad job
+- [ ] Task: Conductor - User Manual Verification 'Phase 2: Build and Deployment' (Protocol in workflow.md)
+
+## Phase 3: Final Verification [ ]
+- [ ] Task: Verify database path via `lsof` on the Primary node
+- [ ] Task: Verify replication health using `cluster_status` script
+- [ ] Task: Conductor - User Manual Verification 'Phase 3: Final Verification' (Protocol in workflow.md)

conductor/tracks/update_monitor_discovery_20260208/plan.md

@@ -0,0 +1,23 @@
+# Plan: Update Monitor Discovery Logic (`update_monitor_discovery`)
+
+## Phase 1: Nomad Discovery Enhancement [x] [checkpoint: 353683e]
+- [x] Task: Update `nomad_client.py` to fetch job allocations with IPs (353683e)
+    - [x] Write tests for parsing allocation IPs from `nomad job status` or `nomad alloc status`
+    - [x] Implement `get_job_allocations(job_id)` returning a list of dicts (id, node, ip)
+- [x] Task: Conductor - User Manual Verification 'Phase 1: Nomad Discovery Enhancement' (Protocol in workflow.md)
+
+## Phase 2: Aggregator Refactor [x] [checkpoint: 655a9b2]
+- [x] Task: Refactor `cluster_aggregator.py` to drive discovery via Nomad (655a9b2)
+    - [x] Update `get_cluster_status` to call `nomad_client.get_job_allocations` first
+    - [x] Update loop to iterate over allocations and supplement with LiteFS and Consul data
+- [x] Task: Update `consul_client.py` to fetch all services once and allow lookup by IP/ID (655a9b2)
+- [x] Task: Update tests for the new discovery flow (655a9b2)
+- [x] Task: Conductor - User Manual Verification 'Phase 2: Aggregator Refactor' (Protocol in workflow.md)
+
+## Phase 3: UI and Health Logic [x] [checkpoint: 21e9c3d]
+- [x] Task: Update `output_formatter.py` for "Standby" nodes (21e9c3d)
+    - [x] Update table formatting to handle missing Consul status for replicas
+- [x] Task: Update Cluster Health calculation (21e9c3d)
+    - [x] "Healthy" = 1 Primary (Consul passing) + N Replicas (LiteFS connected)
+- [x] Task: Final verification run (21e9c3d)
+- [x] Task: Conductor - User Manual Verification 'Phase 3: Final Verification' (Protocol in workflow.md)

entrypoint.sh

@@ -48,10 +48,8 @@ deregister_service() {
 start_app() {
   echo "Node is Primary. Starting Navidrome..."
   
-  # Ensure DB path and local data folder are set
-  export ND_DATABASE_PATH="/data/navidrome.db"
-  export ND_DATAFOLDER="/local/data"
-  mkdir -p /local/data
+  # Ensure shared directories exist
+  mkdir -p /shared_data/plugins /shared_data/cache /shared_data/backup
 
   /app/navidrome &
   NAVIDROME_PID=$!
@@ -121,4 +119,4 @@ while true; do
   # Sleep short enough to update TTL (every 5s is safe for 15s TTL)
   sleep 5 &
   wait $! # Wait allows the 'trap' to interrupt the sleep instantly
-done
+done

navidrome-litefs-v2.nomad

@@ -37,7 +37,7 @@ job "navidrome-litefs" {
       driver = "docker"
 
       config {
-        image      = "gitea.service.dc1.fbleagh.duckdns.org/sstent/navidrome-litefs:latest"
+        image      = "gitea.service.dc1.fbleagh.duckdns.org/sstent/navidrome-litefs:e56fb94fdc0ac1f70abdb613b64ce6b4d7a770cf"
         privileged = true # Still needed for FUSE
         ports      = ["http", "litefs"]
         force_pull = true
@@ -58,17 +58,11 @@ job "navidrome-litefs" {
         PORT         = "8080" # Internal proxy port (unused but kept)
 
         # Navidrome Config
-        ND_DATAFOLDER   = "/local/data"
-        ND_CACHEFOLDER  = "/shared_data/cache"
-        ND_BACKUP_PATH  = "/shared_data/backup"
-        ND_CONFIGFILE   = "/local/data/navidrome.toml"
+        ND_DATAFOLDER    = "/data"
+        ND_PLUGINS_FOLDER = "/shared_data/plugins"
+        ND_CACHEFOLDER   = "/shared_data/cache"
+        ND_BACKUP_PATH   = "/shared_data/backup"
         
-        # Database is on the LiteFS FUSE mount. Forced v35.
-        ND_DATABASE_PATH = "/data/navidrome.db"
-        
-        ND_SCANSCHEDULE              = "0"
-        ND_SCANNER_FSWATCHER_ENABLED = "false"
-        ND_FORCE_REDEPLOY            = "2"
         ND_LOGLEVEL                  = "info"
         ND_REVERSEPROXYWHITELIST     = "0.0.0.0/0"
         ND_REVERSEPROXYUSERHEADER    = "X-Forwarded-User"

scripts/cluster_status/cluster_aggregator.py

@@ -4,59 +4,81 @@ import nomad_client
 
 def get_cluster_status(consul_url, job_id="navidrome-litefs"):
     """
-    Aggregates cluster data from Consul, LiteFS, and Nomad.
+    Aggregates cluster data from Nomad (Discovery), LiteFS (Role), and Consul (Routing Health).
     """
-    consul_nodes = consul_client.get_cluster_services(consul_url)
-    aggregated_nodes = []
+    # 1. Discover all nodes via Nomad Allocations
+    allocations = nomad_client.get_job_allocations(job_id)
+    nomad_available = bool(nomad_client.get_node_map())
     
+    # 2. Get all Consul registrations for 'navidrome'
+    consul_services = consul_client.get_cluster_services(consul_url)
+    # Create a map for easy lookup by IP
+    consul_map = {s["address"]: s for s in consul_services}
+    
+    aggregated_nodes = []
     is_healthy = True
     primary_count = 0
     
-    # Check Nomad connectivity
-    node_map = nomad_client.get_node_map()
-    nomad_available = bool(node_map)
-    
-    for node in consul_nodes:
-        # Fetch allocation ID first to enable nomad exec fallback
-        alloc_id = nomad_client.get_allocation_id(node["node"], job_id)
+    for alloc in allocations:
+        node_name = alloc["node"]
+        address = alloc["ip"]
+        alloc_id = alloc["id"]
         
-        litefs_status = litefs_client.get_node_status(node["address"], alloc_id=alloc_id)
+        # 3. Get LiteFS Status
+        litefs_status = litefs_client.get_node_status(address, alloc_id=alloc_id)
+        
+        # 4. Match with Consul info
+        consul_info = consul_map.get(address)
         
-        # Merge data
         node_data = {
-            **node,
+            "node": node_name,
+            "address": address,
+            "alloc_id": alloc_id,
             "litefs_primary": litefs_status.get("is_primary", False),
-            "uptime": litefs_status.get("uptime", "N/A"),
-            "advertise_url": litefs_status.get("advertise_url", ""),
+            "candidate": litefs_status.get("candidate", False),
+            "uptime": alloc.get("uptime", "N/A"),
             "replication_lag": litefs_status.get("replication_lag", "N/A"),
-            "litefs_error": litefs_status.get("error", None),
-            "nomad_logs": None,
-            "alloc_id": alloc_id
+            "dbs": litefs_status.get("dbs", {}),
+            "litefs_error": litefs_status.get("error"),
+            "nomad_logs": None
         }
         
-        if node["status"] != "passing":
-            is_healthy = False
-            # Fetch Nomad logs for critical nodes
-            if alloc_id:
-                node_data["nomad_logs"] = nomad_client.get_allocation_logs(alloc_id)
-            
+        # Legacy compat for formatter
+        node_data["active_dbs"] = list(node_data["dbs"].keys())
+        
         if node_data["litefs_primary"]:
             primary_count += 1
-            
-        # Check for active databases
-        node_dbs = litefs_status.get("dbs", {})
-        if node_dbs:
-            node_data["active_dbs"] = list(node_dbs.keys())
+            node_data["role"] = "primary"
         else:
-            node_data["active_dbs"] = []
+            node_data["role"] = "replica"
             
+        # 5. Determine Consul status
+        if consul_info:
+            node_data["status"] = consul_info["status"]
+            node_data["check_output"] = consul_info["check_output"]
+            if node_data["status"] != "passing":
+                is_healthy = False
+                node_data["nomad_logs"] = nomad_client.get_allocation_logs(alloc_id)
+        else:
+            # Not in Consul
+            if node_data["litefs_primary"]:
+                # If it's primary in LiteFS but not in Consul, that's an error (unless just started)
+                node_data["status"] = "unregistered"
+                is_healthy = False
+                node_data["nomad_logs"] = nomad_client.get_allocation_logs(alloc_id)
+            else:
+                # Replicas are expected to be unregistered in the new model
+                node_data["status"] = "standby"
+                node_data["check_output"] = "Clean catalog (expected for replica)"
+                
         aggregated_nodes.append(node_data)
         
     # Final health check
     health = "Healthy"
     if not is_healthy:
         health = "Unhealthy"
-    elif primary_count == 0:
+    
+    if primary_count == 0:
         health = "No Primary Detected"
     elif primary_count > 1:
         health = "Split Brain Detected (Multiple Primaries)"

scripts/cluster_status/consul_client.py

@@ -2,55 +2,45 @@ import requests
 
 def get_cluster_services(consul_url):
     """
-    Queries Consul health API for navidrome and replica-navidrome services.
+    Queries Consul health API for all 'navidrome' services.
     Returns a list of dictionaries with node info.
     """
     services = []
     
-    # Define roles to fetch
-    role_map = {
-        "navidrome": "primary",
-        "replica-navidrome": "replica"
-    }
-    
-    for service_name, role in role_map.items():
-        url = f"{consul_url}/v1/health/service/{service_name}"
-        try:
-            response = requests.get(url, timeout=5)
-            response.raise_for_status()
-            data = response.json()
+    url = f"{consul_url}/v1/health/service/navidrome"
+    try:
+        response = requests.get(url, timeout=5)
+        response.raise_for_status()
+        data = response.json()
+        
+        for item in data:
+            node_name = item["Node"]["Node"]
+            address = item["Node"]["Address"]
+            port = item["Service"]["Port"]
             
-            for item in data:
-                node_name = item["Node"]["Node"]
-                address = item["Node"]["Address"]
-                port = item["Service"]["Port"]
-                
-                # Determine overall status from checks and extract output
-                checks = item.get("Checks", [])
-                status = "passing"
-                check_output = ""
-                for check in checks:
-                    if check["Status"] != "passing":
-                        status = check["Status"]
+            # Determine overall status from checks and extract output
+            checks = item.get("Checks", [])
+            status = "passing"
+            check_output = ""
+            for check in checks:
+                if check["Status"] != "passing":
+                    status = check["Status"]
+                    check_output = check.get("Output", "")
+                    break
+                else:
+                    if not check_output:
                         check_output = check.get("Output", "")
-                        break
-                    else:
-                        # Even if passing, store the output of the first check if it's the only one
-                        if not check_output:
-                            check_output = check.get("Output", "")
-                
-                services.append({
-                    "node": node_name,
-                    "address": address,
-                    "port": port,
-                    "role": role,
-                    "status": status,
-                    "service_id": item["Service"]["ID"],
-                    "check_output": check_output
-                })
-        except Exception as e:
-            # For now, we just don't add the service if it fails to fetch
-            # In a real script we might want to report the error
-            print(f"Error fetching {service_name}: {e}")
+            
+            services.append({
+                "node": node_name,
+                "address": address,
+                "port": port,
+                "role": "primary", # If it's in Consul as 'navidrome', it's intended to be primary
+                "status": status,
+                "service_id": item["Service"]["ID"],
+                "check_output": check_output
+            })
+    except Exception as e:
+        print(f"Error fetching navidrome services from Consul: {e}")
             
     return services

scripts/cluster_status/litefs_client.py

@@ -59,7 +59,8 @@ def get_node_status(node_address, port=20202, alloc_id=None):
             store = data.get("store", {})
             status = {
                 "is_primary": store.get("isPrimary", False),
-                "uptime": "N/A",
+                "candidate": store.get("candidate", False),
+                "uptime": "N/A", # Will be filled by Nomad uptime
                 "advertise_url": f"http://{node_address}:{port}",
                 "dbs": store.get("dbs", {})
             }

scripts/cluster_status/nomad_client.py

@@ -1,6 +1,7 @@
 import subprocess
 import re
 import sys
+from datetime import datetime, timezone
 
 def get_node_map():
     """
@@ -29,6 +30,93 @@ def get_node_map():
         print(f"Error getting node map: {e}", file=sys.stderr)
         return {}
 
+def get_job_allocations(job_id):
+    """
+    Returns a list of all active allocations for a job with their IPs and uptimes.
+    """
+    try:
+        # 1. Get list of allocations
+        result = subprocess.run(
+            ["nomad", "job", "status", job_id],
+            capture_output=True, text=True, check=True
+        )
+        
+        alloc_ids = []
+        lines = result.stdout.splitlines()
+        start_parsing = False
+        for line in lines:
+            if "Allocations" in line:
+                start_parsing = True
+                continue
+            if start_parsing and line.strip() and not line.startswith("ID") and not line.startswith("=="):
+                parts = re.split(r"\s+", line.strip())
+                if len(parts) >= 5:
+                    alloc_id = parts[0]
+                    # Status is usually the 6th or 8th column depending on verbose
+                    # We'll look for 'running' in any part from 3 onwards
+                    if any(p == "running" for p in parts[3:]):
+                        alloc_ids.append(alloc_id)
+        
+        # 2. For each allocation, get its IP and Uptime
+        allocations = []
+        now = datetime.now(timezone.utc)
+        
+        for alloc_id in alloc_ids:
+            res_alloc = subprocess.run(
+                ["nomad", "alloc", "status", alloc_id],
+                capture_output=True, text=True, check=True
+            )
+            
+            node_name = ""
+            ip = ""
+            full_id = alloc_id
+            uptime = "N/A"
+            
+            for l in res_alloc.stdout.splitlines():
+                if l.startswith("ID") and "=" in l:
+                    full_id = l.split("=")[1].strip()
+                if l.startswith("Node Name") and "=" in l:
+                    node_name = l.split("=")[1].strip()
+                # Extract IP from Allocation Addresses
+                if "*litefs" in l:
+                    # e.g. "*litefs  yes      1.1.1.1:20202 -> 20202"
+                    m = re.search(r"(\d+\.\d+\.\d+\.\d+):", l)
+                    if m:
+                        ip = m.group(1)
+                
+                # Extract Uptime from Started At
+                if "Started At" in l and "=" in l:
+                    # e.g. "Started At     = 2026-02-09T14:04:28Z"
+                    ts_str = l.split("=")[1].strip()
+                    if ts_str and ts_str != "N/A":
+                        try:
+                            # Parse ISO timestamp
+                            started_at = datetime.fromisoformat(ts_str.replace("Z", "+00:00"))
+                            duration = now - started_at
+                            # Format duration
+                            secs = int(duration.total_seconds())
+                            if secs < 60:
+                                uptime = f"{secs}s"
+                            elif secs < 3600:
+                                uptime = f"{secs//60}m{secs%60}s"
+                            else:
+                                uptime = f"{secs//3600}h{(secs%3600)//60}m"
+                        except Exception:
+                            uptime = ts_str
+            
+            allocations.append({
+                "id": full_id,
+                "node": node_name,
+                "ip": ip,
+                "uptime": uptime
+            })
+            
+        return allocations
+                        
+    except Exception as e:
+        print(f"Error getting job allocations: {e}", file=sys.stderr)
+        return []
+
 def get_allocation_id(node_name, job_id):
     """
     Finds the FULL allocation ID for a specific node and job.
@@ -120,4 +208,4 @@ def restart_allocation(alloc_id):
         return True
     except Exception as e:
         print(f"Error restarting allocation: {e}", file=sys.stderr)
-        return False
+        return False

scripts/cluster_status/output_formatter.py

@@ -38,13 +38,21 @@ def format_node_table(nodes, use_color=True):
     """
     Formats the node list as a table.
     """
-    headers = ["Node", "Role", "Consul Status", "LiteFS Role", "Uptime", "Lag", "DBs", "LiteFS Info"]
+    headers = ["Node", "Role", "Consul Status", "LiteFS Role", "Cand", "Uptime", "Lag", "DBs", "LiteFS Info"]
     table_data = []
     
     for node in nodes:
         # Consul status color
         status = node["status"]
-        status_color = GREEN if status == "passing" else RED
+        if status == "passing":
+            status_color = GREEN
+        elif status == "standby":
+            status_color = CYAN
+        elif status == "unregistered":
+            status_color = YELLOW
+        else:
+            status_color = RED
+            
         colored_status = colorize(status, status_color, use_color)
         
         # Role color
@@ -56,6 +64,11 @@ def format_node_table(nodes, use_color=True):
         litefs_primary = node["litefs_primary"]
         litefs_role = "primary" if litefs_primary else "replica"
         
+        # Candidate status
+        candidate = "✓" if node.get("candidate") else "✗"
+        candidate_color = GREEN if node.get("candidate") else RESET
+        colored_candidate = colorize(candidate, candidate_color, use_color)
+
         # Highlight discrepancy if consul and litefs disagree
         litefs_role_color = RESET
         if (role == "primary" and not litefs_primary) or (role == "replica" and litefs_primary):
@@ -66,21 +79,33 @@ def format_node_table(nodes, use_color=True):
             
         colored_litefs_role = colorize(litefs_role, litefs_role_color, use_color)
         
+        # Database details (name, txid, checksum)
+        db_infos = []
+        dbs = node.get("dbs", {})
+        for db_name, db_data in dbs.items():
+            txid = db_data.get("txid", "0")
+            chk = db_data.get("checksum", "0")
+            # Only show first 8 chars of checksum for space
+            db_infos.append(f"{db_name} (tx:{int(txid, 16)}, chk:{chk[:8]})")
+        
+        db_str = "\n".join(db_infos) if db_infos else "None"
+
         # Error info
         info = ""
         if node.get("litefs_error"):
             info = colorize("LiteFS API Error", RED, use_color)
         else:
-            info = node.get("advertise_url", "")
+            info = node.get("address", "")
             
         table_data.append([
             colorize(node["node"], BOLD, use_color),
             colored_role,
             colored_status,
             colored_litefs_role,
+            colored_candidate,
             node.get("uptime", "N/A"),
             node.get("replication_lag", "N/A"),
-            ", ".join(node.get("active_dbs", [])),
+            db_str,
             info
         ])
         
@@ -90,7 +115,9 @@ def format_diagnostics(nodes, use_color=True):
     """
     Formats detailed diagnostic information for nodes with errors.
     """
-    error_nodes = [n for n in nodes if n["status"] != "passing" or n.get("litefs_error")]
+    # Only show diagnostics if status is critical/unregistered OR if there is a LiteFS error
+    # Ignore 'standby' since it is expected for replicas
+    error_nodes = [n for n in nodes if (n["status"] not in ["passing", "standby"]) or n.get("litefs_error")]
     
     if not error_nodes:
         return ""

scripts/cluster_status/tests/test_aggregator.py

@@ -1,29 +1,32 @@
 import pytest
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
 import cluster_aggregator
 
 @patch("consul_client.get_cluster_services")
 @patch("litefs_client.get_node_status")
-@patch("nomad_client.get_allocation_id")
-@patch("nomad_client.get_allocation_logs")
+@patch("nomad_client.get_job_allocations")
 @patch("nomad_client.get_node_map")
-def test_aggregate_cluster_status(mock_node_map, mock_nomad_logs, mock_nomad_id, mock_litefs, mock_consul):
-    """Test aggregating Consul and LiteFS data."""
+def test_aggregate_cluster_status(mock_node_map, mock_nomad_allocs, mock_litefs, mock_consul):
+    """Test aggregating Nomad, Consul and LiteFS data."""
     mock_node_map.return_value = {"id": "name"}
-    # Mock Consul data
+    # Mock Nomad allocations
+    mock_nomad_allocs.return_value = [
+        {"id": "alloc1", "node": "node1", "ip": "1.1.1.1"},
+        {"id": "alloc2", "node": "node2", "ip": "1.1.1.2"}
+    ]
+    
+    # Mock Consul data (only node1 is registered as primary)
     mock_consul.return_value = [
-        {"node": "node1", "address": "1.1.1.1", "role": "primary", "status": "passing"},
-        {"node": "node2", "address": "1.1.1.2", "role": "replica", "status": "passing"}
+        {"node": "node1", "address": "1.1.1.1", "role": "primary", "status": "passing", "check_output": "OK"}
     ]
     
     # Mock LiteFS data
     def litefs_side_effect(addr, **kwargs):
         if addr == "1.1.1.1":
-            return {"is_primary": True, "uptime": 100, "advertise_url": "url1", "dbs": {"db1": {}}}
-        return {"is_primary": False, "uptime": 50, "advertise_url": "url2", "replication_lag": 10, "dbs": {"db1": {}}}
+            return {"is_primary": True, "candidate": True, "uptime": 100, "dbs": {"db1": {"txid": "0000000000000001", "checksum": "abc"}}}
+        return {"is_primary": False, "candidate": True, "uptime": 50, "dbs": {"db1": {"txid": "0000000000000001", "checksum": "abc"}}}
         
     mock_litefs.side_effect = litefs_side_effect
-    mock_nomad_id.return_value = None
     
     cluster_data = cluster_aggregator.get_cluster_status("http://consul:8500")
     
@@ -32,27 +35,27 @@ def test_aggregate_cluster_status(mock_node_map, mock_nomad_logs, mock_nomad_id,
     
     node1 = next(n for n in cluster_data["nodes"] if n["node"] == "node1")
     assert node1["litefs_primary"] is True
-    assert node1["role"] == "primary"
-    
-    node2 = next(n for n in cluster_data["nodes"] if n["node"] == "node2")
-    assert node2["litefs_primary"] is False
-    assert node2["replication_lag"] == 10
+    assert node1["candidate"] is True
+    assert "db1" in node1["dbs"]
 
 @patch("consul_client.get_cluster_services")
 @patch("litefs_client.get_node_status")
-@patch("nomad_client.get_allocation_id")
+@patch("nomad_client.get_job_allocations")
 @patch("nomad_client.get_allocation_logs")
 @patch("nomad_client.get_node_map")
-def test_aggregate_cluster_status_unhealthy(mock_node_map, mock_nomad_logs, mock_nomad_id, mock_litefs, mock_consul):
-    """Test health calculation when nodes are critical."""
-    mock_node_map.return_value = {}
-    mock_consul.return_value = [
-        {"node": "node1", "address": "1.1.1.1", "role": "primary", "status": "critical"}
+def test_aggregate_cluster_status_unhealthy(mock_node_map, mock_nomad_logs, mock_nomad_allocs, mock_litefs, mock_consul):
+    """Test health calculation when primary is unregistered or failing."""
+    mock_node_map.return_value = {"id": "name"}
+    mock_nomad_allocs.return_value = [
+        {"id": "alloc1", "node": "node1", "ip": "1.1.1.1"}
     ]
-    mock_litefs.return_value = {"is_primary": True, "uptime": 100, "dbs": {"db1": {}}}
-    mock_nomad_id.return_value = "alloc1"
+    # Primary in LiteFS but missing in Consul
+    mock_litefs.return_value = {"is_primary": True, "candidate": True, "uptime": 100, "dbs": {"db1": {"txid": "1", "checksum": "abc"}}}
+    mock_consul.return_value = []
+    mock_nomad_logs.return_code = 0
     mock_nomad_logs.return_value = "error logs"
     
     cluster_data = cluster_aggregator.get_cluster_status("http://consul:8500")
     assert cluster_data["health"] == "Unhealthy"
-    assert cluster_data["nodes"][0]["nomad_logs"] == "error logs"
+    assert cluster_data["nodes"][0]["status"] == "unregistered"
+    assert cluster_data["nodes"][0]["nomad_logs"] == "error logs"

scripts/cluster_status/tests/test_consul_client.py

@@ -1,11 +1,12 @@
 import pytest
 from unittest.mock import patch, MagicMock
 import consul_client
+import requests
 
 @patch("requests.get")
 def test_get_cluster_services(mock_get):
     """Test fetching healthy services from Consul."""
-    # Mock responses for navidrome and replica-navidrome
+    # Mock responses for navidrome
     mock_navidrome = [
         {
             "Node": {"Node": "node1", "Address": "192.168.1.101"},
@@ -13,55 +14,19 @@ def test_get_cluster_services(mock_get):
             "Checks": [{"Status": "passing"}]
         }
     ]
-    mock_replicas = [
-        {
-            "Node": {"Node": "node2", "Address": "192.168.1.102"},
-            "Service": {"Service": "replica-navidrome", "Port": 4533, "ID": "replica-1"},
-            "Checks": [{"Status": "passing"}]
-        },
-        {
-            "Node": {"Node": "node3", "Address": "192.168.1.103"},
-            "Service": {"Service": "replica-navidrome", "Port": 4533, "ID": "replica-2"},
-            "Checks": [{"Status": "critical"}] # One failing check
-        }
-    ]
     
-    def side_effect(url, params=None, timeout=None):
-        if "health/service/navidrome" in url:
-            m = MagicMock()
-            m.json.return_value = mock_navidrome
-            m.raise_for_status.return_value = None
-            return m
-        elif "health/service/replica-navidrome" in url:
-            m = MagicMock()
-            m.json.return_value = mock_replicas
-            m.raise_for_status.return_value = None
-            return m
-        return MagicMock()
+    m = MagicMock()
+    m.json.return_value = mock_navidrome
+    m.raise_for_status.return_value = None
+    mock_get.return_value = m
 
-    mock_get.side_effect = side_effect
-    
     consul_url = "http://consul:8500"
     services = consul_client.get_cluster_services(consul_url)
-    
-    # Should find 3 nodes total (node1 primary, node2 healthy replica, node3 critical replica)
-    assert len(services) == 3
-    
-    # Check node1 (primary)
-    node1 = next(s for s in services if s["node"] == "node1")
-    assert node1["role"] == "primary"
-    assert node1["status"] == "passing"
-    assert node1["address"] == "192.168.1.101"
-    
-    # Check node2 (healthy replica)
-    node2 = next(s for s in services if s["node"] == "node2")
-    assert node2["role"] == "replica"
-    assert node2["status"] == "passing"
-    
-    # Check node3 (critical replica)
-    node3 = next(s for s in services if s["node"] == "node3")
-    assert node3["role"] == "replica"
-    assert node3["status"] == "critical"
+
+    # Should find 1 node (primary)
+    assert len(services) == 1
+    assert services[0]["node"] == "node1"
+    assert services[0]["status"] == "passing"
 
 @patch("requests.get")
 def test_get_cluster_services_with_errors(mock_get):
@@ -71,38 +36,18 @@ def test_get_cluster_services_with_errors(mock_get):
             "Node": {"Node": "node1", "Address": "192.168.1.101"},
             "Service": {"Service": "navidrome", "Port": 4533, "ID": "navidrome-1"},
             "Checks": [
-                {"Status": "passing", "Output": "HTTP GET http://192.168.1.101:4533/app: 200 OK"}
-            ]
-        }
-    ]
-    mock_replicas = [
-        {
-            "Node": {"Node": "node3", "Address": "192.168.1.103"},
-            "Service": {"Service": "replica-navidrome", "Port": 4533, "ID": "replica-2"},
-            "Checks": [
-                {"Status": "critical", "Output": "HTTP GET http://192.168.1.103:4533/app: 500 Internal Server Error"}
+                {"Status": "critical", "Output": "HTTP GET http://192.168.1.101:4533/app: 500 Internal Server Error"}
             ]
         }
     ]
     
-    def side_effect(url, params=None, timeout=None):
-        if "health/service/navidrome" in url:
-            m = MagicMock()
-            m.json.return_value = mock_navidrome
-            m.raise_for_status.return_value = None
-            return m
-        elif "health/service/replica-navidrome" in url:
-            m = MagicMock()
-            m.json.return_value = mock_replicas
-            m.raise_for_status.return_value = None
-            return m
-        return MagicMock()
+    m = MagicMock()
+    m.json.return_value = mock_navidrome
+    m.raise_for_status.return_value = None
+    mock_get.return_value = m
 
-    mock_get.side_effect = side_effect
-    
     services = consul_client.get_cluster_services("http://consul:8500")
     
-    node3 = next(s for s in services if s["node"] == "node3")
-    assert node3["status"] == "critical"
-    assert "500 Internal Server Error" in node3["check_output"]
-
+    node1 = next(s for s in services if s["node"] == "node1")
+    assert node1["status"] == "critical"
+    assert "500 Internal Server Error" in node1["check_output"]

scripts/cluster_status/tests/test_formatter.py

@@ -21,15 +21,19 @@ def test_format_node_table():
             "node": "node1",
             "role": "primary",
             "status": "passing",
-            "uptime": 100,
+            "candidate": True,
+            "uptime": "1h",
             "replication_lag": "N/A",
-            "litefs_primary": True
+            "litefs_primary": True,
+            "dbs": {"db1": {"txid": "1", "checksum": "abc"}}
         }
     ]
     table = output_formatter.format_node_table(nodes, use_color=False)
     assert "node1" in table
     assert "primary" in table
     assert "passing" in table
+    assert "db1" in table
+    assert "Cand" in table
 
 def test_format_diagnostics():
     """Test the diagnostics section generation."""
@@ -54,8 +58,25 @@ def test_format_diagnostics_empty():
             "node": "node1",
             "status": "passing",
             "litefs_error": None
+        },
+        {
+            "node": "node2",
+            "status": "standby", # Should also be empty
+            "litefs_error": None
         }
     ]
     diagnostics = output_formatter.format_diagnostics(nodes, use_color=False)
     assert diagnostics == ""
 
+def test_format_node_table_status_colors():
+    """Test that different statuses are handled."""
+    nodes = [
+        {"node": "n1", "role": "primary", "status": "passing", "litefs_primary": True},
+        {"node": "n2", "role": "replica", "status": "standby", "litefs_primary": False},
+        {"node": "n3", "role": "primary", "status": "unregistered", "litefs_primary": True},
+    ]
+    table = output_formatter.format_node_table(nodes, use_color=False)
+    assert "passing" in table
+    assert "standby" in table
+    assert "unregistered" in table
+

scripts/cluster_status/tests/test_nomad_client.py

@@ -88,4 +88,48 @@ def test_get_node_map_failure(mock_run):
     
     # It should not raise
     node_map = nomad_client.get_node_map()
-    assert node_map == {}
+    assert node_map == {}
+
+@patch("subprocess.run")
+def test_get_job_allocations(mock_run):
+    """Test getting all allocations for a job with their IPs."""
+    # Mock 'nomad job status navidrome-litefs'
+    mock_job_status = MagicMock()
+    mock_job_status.stdout = """
+Allocations
+ID        Node ID   Node Name  Status    Created
+abc12345  node1     host1      running   1h ago
+def67890  node2     host2      running   1h ago
+"""
+    
+    # Mock 'nomad alloc status' for each alloc
+    mock_alloc1 = MagicMock()
+    mock_alloc1.stdout = """
+ID = abc12345
+Node Name = host1
+Allocation Addresses:
+Label    Dynamic  Address
+*http    yes      1.1.1.1:4533 -> 4533
+*litefs  yes      1.1.1.1:20202 -> 20202
+Task Events:
+Started At     = 2026-02-09T14:00:00Z
+"""
+    mock_alloc2 = MagicMock()
+    mock_alloc2.stdout = """
+ID = def67890
+Node Name = host2
+Allocation Addresses:
+Label    Dynamic  Address
+*http    yes      2.2.2.2:4533 -> 4533
+*litefs  yes      2.2.2.2:20202 -> 20202
+Task Events:
+Started At     = 2026-02-09T14:00:00Z
+"""
+    
+    mock_run.side_effect = [mock_job_status, mock_alloc1, mock_alloc2]
+    
+    allocs = nomad_client.get_job_allocations("navidrome-litefs")
+    assert len(allocs) == 2
+    assert allocs[0]["ip"] == "1.1.1.1"
+    assert "uptime" in allocs[0]
+    assert allocs[0]["uptime"] != "N/A"