change to atomic.bool for fetching details / smart

updates
consolidate info bar data
2026-03-22 13:36:16 +01:00 · 2025-12-18 15:02:59 -05:00 · 2025-12-18 12:34:11 -05:00 · 2025-12-17 19:03:31 -05:00 · 2025-12-17 17:32:59 -05:00 · 2025-12-16 18:33:32 -05:00
45 changed files with 774 additions and 1378 deletions
--- a/agent/agent.go
+++ b/agent/agent.go
@@ -84,7 +84,6 @@ func NewAgent(dataDir ...string) (agent *Agent, err error) {
 			slog.Warn("Invalid DISK_USAGE_CACHE", "err", err)
 		}
 	}
-
 	// Set up slog with a log level determined by the LOG_LEVEL env var
 	if logLevelStr, exists := GetEnv("LOG_LEVEL"); exists {
 		switch strings.ToLower(logLevelStr) {
@@ -104,17 +103,7 @@ func NewAgent(dataDir ...string) (agent *Agent, err error) {
 	agent.dockerManager = newDockerManager()

 	// initialize system info
-	agent.refreshSystemDetails()
-
-	// SMART_INTERVAL env var to update smart data at this interval
-	if smartIntervalEnv, exists := GetEnv("SMART_INTERVAL"); exists {
-		if duration, err := time.ParseDuration(smartIntervalEnv); err == nil && duration > 0 {
-			agent.systemDetails.SmartInterval = duration
-			slog.Info("SMART_INTERVAL", "duration", duration)
-		} else {
-			slog.Warn("Invalid SMART_INTERVAL", "err", err)
-		}
-	}
+	agent.refreshStaticInfo()

 	// initialize connection manager
 	agent.connectionManager = newConnectionManager(agent)
@@ -177,7 +166,7 @@ func (a *Agent) gatherStats(options common.DataRequestOptions) *system.CombinedD
 		Info:  a.systemInfo,
 	}

-	// Include static system details only when requested
+	// Include static info only when requested
 	if options.IncludeDetails {
 		data.Details = &a.systemDetails
 	}
@@ -244,8 +233,7 @@ func (a *Agent) getFingerprint() string {

 	// if no fingerprint is found, generate one
 	fingerprint, err := host.HostID()
-	// we ignore a commonly known "product_uuid" known not to be unique
-	if err != nil || fingerprint == "" || fingerprint == "03000200-0400-0500-0006-000700080009" {
+	if err != nil || fingerprint == "" {
 		fingerprint = a.systemDetails.Hostname + a.systemDetails.CpuModel
 	}

--- a/agent/client.go
+++ b/agent/client.go
@@ -15,6 +15,9 @@ import (

 	"github.com/henrygd/beszel"
 	"github.com/henrygd/beszel/internal/common"
+	"github.com/henrygd/beszel/internal/entities/smart"
+	"github.com/henrygd/beszel/internal/entities/system"
+	"github.com/henrygd/beszel/internal/entities/systemd"

 	"github.com/fxamacker/cbor/v2"
 	"github.com/lxzan/gws"
@@ -256,16 +259,40 @@ func (client *WebSocketClient) sendMessage(data any) error {
 	return err
 }

-// sendResponse sends a response with optional request ID.
-// For ID-based requests, we must populate legacy typed fields for backward
-// compatibility with older hubs (<= 0.17) that don't read the generic Data field.
+// sendResponse sends a response with optional request ID for the new protocol
 func (client *WebSocketClient) sendResponse(data any, requestID *uint32) error {
 	if requestID != nil {
-		response := newAgentResponse(data, requestID)
+		// New format with ID - use typed fields
+		response := common.AgentResponse{
+			Id: requestID,
+		}
+
+		// Set the appropriate typed field based on data type
+		switch v := data.(type) {
+		case *system.CombinedData:
+			response.SystemData = v
+		case *common.FingerprintResponse:
+			response.Fingerprint = v
+		case string:
+			response.String = &v
+		case map[string]smart.SmartData:
+			response.SmartData = v
+		case systemd.ServiceDetails:
+			response.ServiceInfo = v
+		// case []byte:
+		// 	response.RawBytes = v
+		// case string:
+		// 	response.RawBytes = []byte(v)
+		default:
+			// For any other type, convert to error
+			response.Error = fmt.Sprintf("unsupported response type: %T", data)
+		}
+
 		return client.sendMessage(response)
+	} else {
+		// Legacy format - send data directly
+		return client.sendMessage(data)
 	}
-	// Legacy format - send data directly
-	return client.sendMessage(data)
 }

 // getUserAgent returns one of two User-Agent strings based on current time.
--- a/agent/docker.go
+++ b/agent/docker.go
@@ -694,8 +694,7 @@ func (dm *dockerManager) getLogs(ctx context.Context, containerID string) (strin
 	}

 	var builder strings.Builder
-	multiplexed := resp.Header.Get("Content-Type") == "application/vnd.docker.multiplexed-stream"
-	if err := decodeDockerLogStream(resp.Body, &builder, multiplexed); err != nil {
+	if err := decodeDockerLogStream(resp.Body, &builder); err != nil {
 		return "", err
 	}

@@ -707,11 +706,7 @@ func (dm *dockerManager) getLogs(ctx context.Context, containerID string) (strin
 	return logs, nil
 }

-func decodeDockerLogStream(reader io.Reader, builder *strings.Builder, multiplexed bool) error {
-	if !multiplexed {
-		_, err := io.Copy(builder, io.LimitReader(reader, maxTotalLogSize))
-		return err
-	}
+func decodeDockerLogStream(reader io.Reader, builder *strings.Builder) error {
 	const headerSize = 8
 	var header [headerSize]byte
 	totalBytesRead := 0
@@ -762,6 +757,7 @@ func (dm *dockerManager) GetHostInfo() (info container.HostInfo, err error) {
 	defer resp.Body.Close()

 	if err := json.NewDecoder(resp.Body).Decode(&info); err != nil {
+		slog.Error("Failed to decode Docker version response", "error", err)
 		return info, err
 	}

--- a/agent/docker_test.go
+++ b/agent/docker_test.go
@@ -950,7 +950,6 @@ func TestDecodeDockerLogStream(t *testing.T) {
 		input       []byte
 		expected    string
 		expectError bool
-		multiplexed bool
 	}{
 		{
 			name: "simple log entry",
@@ -961,7 +960,6 @@ func TestDecodeDockerLogStream(t *testing.T) {
 			},
 			expected:    "Hello World",
 			expectError: false,
-			multiplexed: true,
 		},
 		{
 			name: "multiple frames",
@@ -975,7 +973,6 @@ func TestDecodeDockerLogStream(t *testing.T) {
 			},
 			expected:    "HelloWorld",
 			expectError: false,
-			multiplexed: true,
 		},
 		{
 			name: "zero length frame",
@@ -988,20 +985,12 @@ func TestDecodeDockerLogStream(t *testing.T) {
 			},
 			expected:    "Hello",
 			expectError: false,
-			multiplexed: true,
 		},
 		{
 			name:        "empty input",
 			input:       []byte{},
 			expected:    "",
 			expectError: false,
-			multiplexed: true,
-		},
-		{
-			name:        "raw stream (not multiplexed)",
-			input:       []byte("raw log content"),
-			expected:    "raw log content",
-			multiplexed: false,
 		},
 	}

@@ -1009,7 +998,7 @@ func TestDecodeDockerLogStream(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			reader := bytes.NewReader(tt.input)
 			var builder strings.Builder
-			err := decodeDockerLogStream(reader, &builder, tt.multiplexed)
+			err := decodeDockerLogStream(reader, &builder)

 			if tt.expectError {
 				assert.Error(t, err)
@@ -1033,7 +1022,7 @@ func TestDecodeDockerLogStreamMemoryProtection(t *testing.T) {

 		reader := bytes.NewReader(input)
 		var builder strings.Builder
-		err := decodeDockerLogStream(reader, &builder, true)
+		err := decodeDockerLogStream(reader, &builder)

 		assert.Error(t, err)
 		assert.Contains(t, err.Error(), "log frame size")
@@ -1067,7 +1056,7 @@ func TestDecodeDockerLogStreamMemoryProtection(t *testing.T) {

 		reader := bytes.NewReader(input)
 		var builder strings.Builder
-		err := decodeDockerLogStream(reader, &builder, true)
+		err := decodeDockerLogStream(reader, &builder)

 		// Should complete without error (graceful truncation)
 		assert.NoError(t, err)
--- a/agent/gpu.go
+++ b/agent/gpu.go
@@ -15,7 +15,7 @@ import (

 	"github.com/henrygd/beszel/internal/entities/system"

-	"log/slog"
+	"golang.org/x/exp/slog"
 )

 const (
@@ -44,7 +44,6 @@ type GPUManager struct {
 	rocmSmi       bool
 	tegrastats    bool
 	intelGpuStats bool
-	nvml          bool
 	GpuDataMap    map[string]*system.GPUData
 	// lastAvgData stores the last calculated averages for each GPU
 	// Used when a collection happens before new data arrives (Count == 0)
@@ -298,13 +297,8 @@ func (gm *GPUManager) calculateGPUAverage(id string, gpu *system.GPUData, cacheK
 	currentCount := uint32(gpu.Count)
 	deltaCount := gm.calculateDeltaCount(currentCount, lastSnapshot)

-	// If no new data arrived
+	// If no new data arrived, use last known average
 	if deltaCount == 0 {
-		// If GPU appears suspended (instantaneous values are 0), return zero values
-		// Otherwise return last known average for temporary collection gaps
-		if gpu.Temperature == 0 && gpu.MemoryUsed == 0 {
-			return system.GPUData{Name: gpu.Name}
-		}
 		return gm.lastAvgData[id] // zero value if not found
 	}

@@ -402,7 +396,7 @@ func (gm *GPUManager) detectGPUs() error {
 	if _, err := exec.LookPath(intelGpuStatsCmd); err == nil {
 		gm.intelGpuStats = true
 	}
-	if gm.nvidiaSmi || gm.rocmSmi || gm.tegrastats || gm.intelGpuStats || gm.nvml {
+	if gm.nvidiaSmi || gm.rocmSmi || gm.tegrastats || gm.intelGpuStats {
 		return nil
 	}
 	return fmt.Errorf("no GPU found - install nvidia-smi, rocm-smi, tegrastats, or intel_gpu_top")
@@ -473,20 +467,7 @@ func NewGPUManager() (*GPUManager, error) {
 	gm.GpuDataMap = make(map[string]*system.GPUData)

 	if gm.nvidiaSmi {
-		if nvml, _ := GetEnv("NVML"); nvml == "true" {
-			gm.nvml = true
-			gm.nvidiaSmi = false
-			collector := &nvmlCollector{gm: &gm}
-			if err := collector.init(); err == nil {
-				go collector.start()
-			} else {
-				slog.Warn("Failed to initialize NVML, falling back to nvidia-smi", "err", err)
-				gm.nvidiaSmi = true
-				gm.startCollector(nvidiaSmiCmd)
-			}
-		} else {
-			gm.startCollector(nvidiaSmiCmd)
-		}
+		gm.startCollector(nvidiaSmiCmd)
 	}
 	if gm.rocmSmi {
 		gm.startCollector(rocmSmiCmd)
--- a/agent/gpu_nvml.go
+++ b/agent/gpu_nvml.go
@@ -1,222 +0,0 @@
-package agent
-
-import (
-	"fmt"
-	"log/slog"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/ebitengine/purego"
-	"github.com/henrygd/beszel/internal/entities/system"
-)
-
-// NVML constants and types
-const (
-	nvmlSuccess int = 0
-)
-
-type nvmlDevice uintptr
-
-type nvmlReturn int
-
-type nvmlMemoryV1 struct {
-	Total uint64
-	Free  uint64
-	Used  uint64
-}
-
-type nvmlMemoryV2 struct {
-	Version  uint32
-	Total    uint64
-	Reserved uint64
-	Free     uint64
-	Used     uint64
-}
-
-type nvmlUtilization struct {
-	Gpu    uint32
-	Memory uint32
-}
-
-type nvmlPciInfo struct {
-	BusId          [16]byte
-	Domain         uint32
-	Bus            uint32
-	Device         uint32
-	PciDeviceId    uint32
-	PciSubSystemId uint32
-}
-
-// NVML function signatures
-var (
-	nvmlInit                      func() nvmlReturn
-	nvmlShutdown                  func() nvmlReturn
-	nvmlDeviceGetCount            func(count *uint32) nvmlReturn
-	nvmlDeviceGetHandleByIndex    func(index uint32, device *nvmlDevice) nvmlReturn
-	nvmlDeviceGetName             func(device nvmlDevice, name *byte, length uint32) nvmlReturn
-	nvmlDeviceGetMemoryInfo       func(device nvmlDevice, memory uintptr) nvmlReturn
-	nvmlDeviceGetUtilizationRates func(device nvmlDevice, utilization *nvmlUtilization) nvmlReturn
-	nvmlDeviceGetTemperature      func(device nvmlDevice, sensorType int, temp *uint32) nvmlReturn
-	nvmlDeviceGetPowerUsage       func(device nvmlDevice, power *uint32) nvmlReturn
-	nvmlDeviceGetPciInfo          func(device nvmlDevice, pci *nvmlPciInfo) nvmlReturn
-	nvmlErrorString               func(result nvmlReturn) string
-)
-
-type nvmlCollector struct {
-	gm      *GPUManager
-	lib     uintptr
-	devices []nvmlDevice
-	bdfs    []string
-	isV2    bool
-}
-
-func (c *nvmlCollector) init() error {
-	slog.Debug("NVML: Initializing")
-	libPath := getNVMLPath()
-
-	lib, err := openLibrary(libPath)
-	if err != nil {
-		return fmt.Errorf("failed to load %s: %w", libPath, err)
-	}
-	c.lib = lib
-
-	purego.RegisterLibFunc(&nvmlInit, lib, "nvmlInit")
-	purego.RegisterLibFunc(&nvmlShutdown, lib, "nvmlShutdown")
-	purego.RegisterLibFunc(&nvmlDeviceGetCount, lib, "nvmlDeviceGetCount")
-	purego.RegisterLibFunc(&nvmlDeviceGetHandleByIndex, lib, "nvmlDeviceGetHandleByIndex")
-	purego.RegisterLibFunc(&nvmlDeviceGetName, lib, "nvmlDeviceGetName")
-	// Try to get v2 memory info, fallback to v1 if not available
-	if hasSymbol(lib, "nvmlDeviceGetMemoryInfo_v2") {
-		c.isV2 = true
-		purego.RegisterLibFunc(&nvmlDeviceGetMemoryInfo, lib, "nvmlDeviceGetMemoryInfo_v2")
-	} else {
-		purego.RegisterLibFunc(&nvmlDeviceGetMemoryInfo, lib, "nvmlDeviceGetMemoryInfo")
-	}
-	purego.RegisterLibFunc(&nvmlDeviceGetUtilizationRates, lib, "nvmlDeviceGetUtilizationRates")
-	purego.RegisterLibFunc(&nvmlDeviceGetTemperature, lib, "nvmlDeviceGetTemperature")
-	purego.RegisterLibFunc(&nvmlDeviceGetPowerUsage, lib, "nvmlDeviceGetPowerUsage")
-	purego.RegisterLibFunc(&nvmlDeviceGetPciInfo, lib, "nvmlDeviceGetPciInfo")
-	purego.RegisterLibFunc(&nvmlErrorString, lib, "nvmlErrorString")
-
-	if ret := nvmlInit(); ret != nvmlReturn(nvmlSuccess) {
-		return fmt.Errorf("nvmlInit failed: %v", ret)
-	}
-
-	var count uint32
-	if ret := nvmlDeviceGetCount(&count); ret != nvmlReturn(nvmlSuccess) {
-		return fmt.Errorf("nvmlDeviceGetCount failed: %v", ret)
-	}
-
-	for i := uint32(0); i < count; i++ {
-		var device nvmlDevice
-		if ret := nvmlDeviceGetHandleByIndex(i, &device); ret == nvmlReturn(nvmlSuccess) {
-			c.devices = append(c.devices, device)
-			// Get BDF for power state check
-			var pci nvmlPciInfo
-			if ret := nvmlDeviceGetPciInfo(device, &pci); ret == nvmlReturn(nvmlSuccess) {
-				busID := string(pci.BusId[:])
-				if idx := strings.Index(busID, "\x00"); idx != -1 {
-					busID = busID[:idx]
-				}
-				c.bdfs = append(c.bdfs, strings.ToLower(busID))
-			} else {
-				c.bdfs = append(c.bdfs, "")
-			}
-		}
-	}
-
-	return nil
-}
-
-func (c *nvmlCollector) start() {
-	defer nvmlShutdown()
-	ticker := time.Tick(3 * time.Second)
-
-	for range ticker {
-		c.collect()
-	}
-}
-
-func (c *nvmlCollector) collect() {
-	c.gm.Lock()
-	defer c.gm.Unlock()
-
-	for i, device := range c.devices {
-		id := fmt.Sprintf("%d", i)
-		bdf := c.bdfs[i]
-
-		// Update GPUDataMap
-		if _, ok := c.gm.GpuDataMap[id]; !ok {
-			var nameBuf [64]byte
-			if ret := nvmlDeviceGetName(device, &nameBuf[0], 64); ret != nvmlReturn(nvmlSuccess) {
-				continue
-			}
-			name := string(nameBuf[:strings.Index(string(nameBuf[:]), "\x00")])
-			name = strings.TrimPrefix(name, "NVIDIA ")
-			c.gm.GpuDataMap[id] = &system.GPUData{Name: strings.TrimSuffix(name, " Laptop GPU")}
-		}
-		gpu := c.gm.GpuDataMap[id]
-
-		if bdf != "" && !c.isGPUActive(bdf) {
-			slog.Debug("NVML: GPU is suspended, skipping", "bdf", bdf)
-			gpu.Temperature = 0
-			gpu.MemoryUsed = 0
-			continue
-		}
-
-		// Utilization
-		var utilization nvmlUtilization
-		if ret := nvmlDeviceGetUtilizationRates(device, &utilization); ret != nvmlReturn(nvmlSuccess) {
-			slog.Debug("NVML: Utilization failed (GPU likely suspended)", "bdf", bdf, "ret", ret)
-			gpu.Temperature = 0
-			gpu.MemoryUsed = 0
-			continue
-		}
-
-		slog.Debug("NVML: Collecting data for GPU", "bdf", bdf)
-
-		// Temperature
-		var temp uint32
-		nvmlDeviceGetTemperature(device, 0, &temp) // 0 is NVML_TEMPERATURE_GPU
-
-		// Memory: only poll if GPU is active to avoid leaving D3cold state (#1522)
-		if utilization.Gpu > 0 {
-			var usedMem, totalMem uint64
-			if c.isV2 {
-				var memory nvmlMemoryV2
-				memory.Version = 0x02000028 // (2 << 24) | 40 bytes
-				if ret := nvmlDeviceGetMemoryInfo(device, uintptr(unsafe.Pointer(&memory))); ret != nvmlReturn(nvmlSuccess) {
-					slog.Debug("NVML: MemoryInfo_v2 failed", "bdf", bdf, "ret", ret)
-				} else {
-					usedMem = memory.Used
-					totalMem = memory.Total
-				}
-			} else {
-				var memory nvmlMemoryV1
-				if ret := nvmlDeviceGetMemoryInfo(device, uintptr(unsafe.Pointer(&memory))); ret != nvmlReturn(nvmlSuccess) {
-					slog.Debug("NVML: MemoryInfo failed", "bdf", bdf, "ret", ret)
-				} else {
-					usedMem = memory.Used
-					totalMem = memory.Total
-				}
-			}
-			if totalMem > 0 {
-				gpu.MemoryUsed = float64(usedMem) / 1024 / 1024 / mebibytesInAMegabyte
-				gpu.MemoryTotal = float64(totalMem) / 1024 / 1024 / mebibytesInAMegabyte
-			}
-		} else {
-			slog.Debug("NVML: Skipping memory info (utilization=0)", "bdf", bdf)
-		}
-
-		// Power
-		var power uint32
-		nvmlDeviceGetPowerUsage(device, &power)
-
-		gpu.Temperature = float64(temp)
-		gpu.Usage += float64(utilization.Gpu)
-		gpu.Power += float64(power) / 1000.0
-		gpu.Count++
-		slog.Debug("NVML: Collected data", "gpu", gpu)
-	}
-}
--- a/agent/gpu_nvml_linux.go
+++ b/agent/gpu_nvml_linux.go
@@ -1,57 +0,0 @@
-//go:build linux
-
-package agent
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/ebitengine/purego"
-	"log/slog"
-)
-
-func openLibrary(name string) (uintptr, error) {
-	return purego.Dlopen(name, purego.RTLD_NOW|purego.RTLD_GLOBAL)
-}
-
-func getNVMLPath() string {
-	return "libnvidia-ml.so.1"
-}
-
-func hasSymbol(lib uintptr, symbol string) bool {
-	_, err := purego.Dlsym(lib, symbol)
-	return err == nil
-}
-
-func (c *nvmlCollector) isGPUActive(bdf string) bool {
-	// runtime_status
-	statusPath := filepath.Join("/sys/bus/pci/devices", bdf, "power/runtime_status")
-	status, err := os.ReadFile(statusPath)
-	if err != nil {
-		slog.Debug("NVML: Can't read runtime_status", "bdf", bdf, "err", err)
-		return true // Assume active if we can't read status
-	}
-	statusStr := strings.TrimSpace(string(status))
-	if statusStr != "active" && statusStr != "resuming" {
-		slog.Debug("NVML: GPU not active", "bdf", bdf, "status", statusStr)
-		return false
-	}
-
-	// power_state (D0 check)
-	// Find any drm card device power_state
-	pstatePathPattern := filepath.Join("/sys/bus/pci/devices", bdf, "drm/card*/device/power_state")
-	matches, _ := filepath.Glob(pstatePathPattern)
-	if len(matches) > 0 {
-		pstate, err := os.ReadFile(matches[0])
-		if err == nil {
-			pstateStr := strings.TrimSpace(string(pstate))
-			if pstateStr != "D0" {
-				slog.Debug("NVML: GPU not in D0 state", "bdf", bdf, "pstate", pstateStr)
-				return false
-			}
-		}
-	}
-
-	return true
-}
--- a/agent/gpu_nvml_unsupported.go
+++ b/agent/gpu_nvml_unsupported.go
@@ -1,21 +0,0 @@
-//go:build !linux && !windows
-
-package agent
-
-import "fmt"
-
-func openLibrary(name string) (uintptr, error) {
-	return 0, fmt.Errorf("nvml not supported on this platform")
-}
-
-func getNVMLPath() string {
-	return ""
-}
-
-func hasSymbol(lib uintptr, symbol string) bool {
-	return false
-}
-
-func (c *nvmlCollector) isGPUActive(bdf string) bool {
-	return true
-}
--- a/agent/gpu_nvml_windows.go
+++ b/agent/gpu_nvml_windows.go
@@ -1,25 +0,0 @@
-//go:build windows
-
-package agent
-
-import (
-	"golang.org/x/sys/windows"
-)
-
-func openLibrary(name string) (uintptr, error) {
-	handle, err := windows.LoadLibrary(name)
-	return uintptr(handle), err
-}
-
-func getNVMLPath() string {
-	return "nvml.dll"
-}
-
-func hasSymbol(lib uintptr, symbol string) bool {
-	_, err := windows.GetProcAddress(windows.Handle(lib), symbol)
-	return err == nil
-}
-
-func (c *nvmlCollector) isGPUActive(bdf string) bool {
-	return true
-}
--- a/agent/gpu_test.go
+++ b/agent/gpu_test.go
@@ -825,7 +825,7 @@ func TestInitializeSnapshots(t *testing.T) {
 }

 func TestCalculateGPUAverage(t *testing.T) {
-	t.Run("returns cached average when deltaCount is zero", func(t *testing.T) {
+	t.Run("returns zero value when deltaCount is zero", func(t *testing.T) {
 		gm := &GPUManager{
 			lastSnapshots: map[uint16]map[string]*gpuSnapshot{
 				5000: {
@@ -838,10 +838,9 @@ func TestCalculateGPUAverage(t *testing.T) {
 		}

 		gpu := &system.GPUData{
-			Count:       10.0, // Same as snapshot, so delta = 0
-			Usage:       100.0,
-			Power:       200.0,
-			Temperature: 50.0, // Non-zero to avoid "suspended" check
+			Count: 10.0, // Same as snapshot, so delta = 0
+			Usage: 100.0,
+			Power: 200.0,
 		}

 		result := gm.calculateGPUAverage("0", gpu, 5000)
@@ -850,31 +849,6 @@ func TestCalculateGPUAverage(t *testing.T) {
 		assert.Equal(t, 100.0, result.Power, "Should return cached average")
 	})

-	t.Run("returns zero value when GPU is suspended", func(t *testing.T) {
-		gm := &GPUManager{
-			lastSnapshots: map[uint16]map[string]*gpuSnapshot{
-				5000: {
-					"0": {count: 10, usage: 100, power: 200},
-				},
-			},
-			lastAvgData: map[string]system.GPUData{
-				"0": {Usage: 50.0, Power: 100.0},
-			},
-		}
-
-		gpu := &system.GPUData{
-			Name:        "Test GPU",
-			Count:       10.0,
-			Temperature: 0,
-			MemoryUsed:  0,
-		}
-
-		result := gm.calculateGPUAverage("0", gpu, 5000)
-
-		assert.Equal(t, 0.0, result.Usage, "Should return zero usage")
-		assert.Equal(t, 0.0, result.Power, "Should return zero power")
-	})
-
 	t.Run("calculates average for standard GPU", func(t *testing.T) {
 		gm := &GPUManager{
 			lastSnapshots: map[uint16]map[string]*gpuSnapshot{
--- a/agent/handlers.go
+++ b/agent/handlers.go
@@ -9,7 +9,7 @@ import (
 	"github.com/henrygd/beszel/internal/common"
 	"github.com/henrygd/beszel/internal/entities/smart"

-	"log/slog"
+	"golang.org/x/exp/slog"
 )

 // HandlerContext provides context for request handlers
--- a/agent/response.go
+++ b/agent/response.go
@@ -1,31 +0,0 @@
-package agent
-
-import (
-	"github.com/fxamacker/cbor/v2"
-	"github.com/henrygd/beszel/internal/common"
-	"github.com/henrygd/beszel/internal/entities/smart"
-	"github.com/henrygd/beszel/internal/entities/system"
-	"github.com/henrygd/beszel/internal/entities/systemd"
-)
-
-// newAgentResponse creates an AgentResponse using legacy typed fields.
-// This maintains backward compatibility with <= 0.17 hubs that expect specific fields.
-func newAgentResponse(data any, requestID *uint32) common.AgentResponse {
-	response := common.AgentResponse{Id: requestID}
-	switch v := data.(type) {
-	case *system.CombinedData:
-		response.SystemData = v
-	case *common.FingerprintResponse:
-		response.Fingerprint = v
-	case string:
-		response.String = &v
-	case map[string]smart.SmartData:
-		response.SmartData = v
-	case systemd.ServiceDetails:
-		response.ServiceInfo = v
-	default:
-		// For unknown types, use the generic Data field
-		response.Data, _ = cbor.Marshal(data)
-	}
-	return response
-}
--- a/agent/server.go
+++ b/agent/server.go
@@ -13,7 +13,9 @@ import (

 	"github.com/henrygd/beszel"
 	"github.com/henrygd/beszel/internal/common"
+	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/henrygd/beszel/internal/entities/system"
+	"github.com/henrygd/beszel/internal/entities/systemd"

 	"github.com/blang/semver"
 	"github.com/fxamacker/cbor/v2"
@@ -163,9 +165,20 @@ func (a *Agent) handleSSHRequest(w io.Writer, req *common.HubRequest[cbor.RawMes
 	}

 	// responder that writes AgentResponse to stdout
-	// Uses legacy typed fields for backward compatibility with <= 0.17
 	sshResponder := func(data any, requestID *uint32) error {
-		response := newAgentResponse(data, requestID)
+		response := common.AgentResponse{Id: requestID}
+		switch v := data.(type) {
+		case *system.CombinedData:
+			response.SystemData = v
+		case string:
+			response.String = &v
+		case map[string]smart.SmartData:
+			response.SmartData = v
+		case systemd.ServiceDetails:
+			response.ServiceInfo = v
+		default:
+			response.Error = fmt.Sprintf("unsupported response type: %T", data)
+		}
 		return cbor.NewEncoder(w).Encode(response)
 	}

--- a/agent/server_test.go
+++ b/agent/server_test.go
@@ -550,9 +550,6 @@ func createTestCombinedData() *system.CombinedData {
 			DiskUsed:  549755813888,  // 512GB
 			DiskPct:   50.0,
 		},
-		Details: &system.Details{
-			Hostname: "test-host",
-		},
 		Info: system.Info{
 			Uptime:       3600,
 			AgentVersion: "0.12.0",
--- a/agent/smart.go
+++ b/agent/smart.go
@@ -19,7 +19,7 @@ import (

 	"github.com/henrygd/beszel/internal/entities/smart"

-	"log/slog"
+	"golang.org/x/exp/slog"
 )

 // SmartManager manages data collection for SMART devices
--- a/agent/system.go
+++ b/agent/system.go
@@ -30,7 +30,7 @@ type prevDisk struct {
 }

 // Sets initial / non-changing values about the host system
-func (a *Agent) refreshSystemDetails() {
+func (a *Agent) refreshStaticInfo() {
 	a.systemInfo.AgentVersion = beszel.Version

 	// get host info from Docker if available
@@ -246,6 +246,7 @@ func (a *Agent) getSystemStats(cacheTimeMs uint16) system.Stats {
 	a.systemInfo.Uptime, _ = host.Uptime()
 	a.systemInfo.BandwidthBytes = systemStats.Bandwidth[0] + systemStats.Bandwidth[1]
 	a.systemInfo.Threads = a.systemDetails.Threads
+	slog.Debug("sysinfo", "data", a.systemInfo)

 	return systemStats
 }
--- a/agent/systemd.go
+++ b/agent/systemd.go
@@ -8,7 +8,6 @@ import (
 	"log/slog"
 	"maps"
 	"math"
-	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -29,29 +28,11 @@ type systemdManager struct {
 	patterns        []string
 }

-// isSystemdAvailable checks if systemd is used on the system to avoid unnecessary connection attempts.
-func isSystemdAvailable() bool {
-	if _, err := os.Stat("/run/systemd/system"); err == nil {
-		return true
-	}
-	if data, err := os.ReadFile("/proc/1/comm"); err == nil {
-		return strings.TrimSpace(string(data)) == "systemd"
-	}
-	return false
-}
-
 // newSystemdManager creates a new systemdManager.
 func newSystemdManager() (*systemdManager, error) {
 	if skipSystemd, _ := GetEnv("SKIP_SYSTEMD"); skipSystemd == "true" {
 		return nil, nil
 	}
-
-	// Check if systemd is available on the system before attempting connection
-	if !isSystemdAvailable() {
-		slog.Debug("Systemd not available on this system")
-		return nil, nil
-	}
-
 	conn, err := dbus.NewSystemConnectionContext(context.Background())
 	if err != nil {
 		slog.Debug("Error connecting to systemd", "err", err, "ref", "https://beszel.dev/guide/systemd")
--- a/agent/systemd_test.go
+++ b/agent/systemd_test.go
@@ -4,7 +4,6 @@ package agent

 import (
 	"os"
-	"strings"
 	"testing"

 	"github.com/stretchr/testify/assert"
@@ -49,35 +48,6 @@ func TestUnescapeServiceNameInvalid(t *testing.T) {
 	}
 }

-func TestIsSystemdAvailable(t *testing.T) {
-	// Note: This test's result will vary based on the actual system running the tests
-	// On systems with systemd, it should return true
-	// On systems without systemd, it should return false
-	result := isSystemdAvailable()
-
-	// Check if either the /run/systemd/system directory exists or PID 1 is systemd
-	runSystemdExists := false
-	if _, err := os.Stat("/run/systemd/system"); err == nil {
-		runSystemdExists = true
-	}
-
-	pid1IsSystemd := false
-	if data, err := os.ReadFile("/proc/1/comm"); err == nil {
-		pid1IsSystemd = strings.TrimSpace(string(data)) == "systemd"
-	}
-
-	expected := runSystemdExists || pid1IsSystemd
-
-	assert.Equal(t, expected, result, "isSystemdAvailable should correctly detect systemd presence")
-
-	// Log the result for informational purposes
-	if result {
-		t.Log("Systemd is available on this system")
-	} else {
-		t.Log("Systemd is not available on this system")
-	}
-}
-
 func TestGetServicePatterns(t *testing.T) {
 	tests := []struct {
 		name           string
--- a/beszel.go
+++ b/beszel.go
@@ -6,7 +6,7 @@ import "github.com/blang/semver"

 const (
 	// Version is the current version of the application.
-	Version = "0.18.0-beta.2"
+	Version = "0.18.0-beta.1"
 	// AppName is the name of the application.
 	AppName = "beszel"
 )
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,6 @@ require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/coreos/go-systemd/v22 v22.6.0
 	github.com/distatus/battery v0.11.0
-	github.com/ebitengine/purego v0.9.1
 	github.com/fxamacker/cbor/v2 v2.9.0
 	github.com/gliderlabs/ssh v0.3.8
 	github.com/google/uuid v1.6.0
@@ -21,7 +20,6 @@ require (
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/crypto v0.45.0
 	golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39
-	golang.org/x/sys v0.38.0
 	gopkg.in/yaml.v3 v3.0.1
 )

@@ -33,6 +31,7 @@ require (
 	github.com/dolthub/maphash v0.1.0 // indirect
 	github.com/domodwyer/mailyak/v3 v3.6.2 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/ebitengine/purego v0.9.1 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.11 // indirect
 	github.com/ganigeorgiev/fexpr v0.5.0 // indirect
@@ -58,6 +57,7 @@ require (
 	golang.org/x/net v0.47.0 // indirect
 	golang.org/x/oauth2 v0.33.0 // indirect
 	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
 	golang.org/x/term v0.37.0 // indirect
 	golang.org/x/text v0.31.0 // indirect
 	howett.net/plist v1.0.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -62,6 +62,8 @@ github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8 h1:3DsUAV+VNEQa2CUVLx
 github.com/google/pprof v0.0.0-20251114195745-4902fdda35c8/go.mod h1:I6V7YzU0XDpsHqbsyrghnFZLO1gwK6NPTNvmetQIk9U=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A=
@@ -171,18 +173,22 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 howett.net/plist v1.0.1 h1:37GdZ8tP09Q35o9ych3ehygcsL+HqKSwzctveSlarvM=
 howett.net/plist v1.0.1/go.mod h1:lqaXoTrLY4hg8tnEzNru53gicrbv7rrk+2xJA/7hw9g=
-modernc.org/cc/v4 v4.26.5 h1:xM3bX7Mve6G8K8b+T11ReenJOT+BmVqQj0FY5T4+5Y4=
-modernc.org/cc/v4 v4.26.5/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
-modernc.org/ccgo/v4 v4.28.1 h1:wPKYn5EC/mYTqBO373jKjvX2n+3+aK7+sICCv4Fjy1A=
-modernc.org/ccgo/v4 v4.28.1/go.mod h1:uD+4RnfrVgE6ec9NGguUNdhqzNIeeomeXf6CL0GTE5Q=
+modernc.org/cc/v4 v4.27.1 h1:9W30zRlYrefrDV2JE2O8VDtJ1yPGownxciz5rrbQZis=
+modernc.org/cc/v4 v4.27.1/go.mod h1:uVtb5OGqUKpoLWhqwNQo/8LwvoiEBLvZXIQ/SmO6mL0=
+modernc.org/ccgo/v4 v4.30.1 h1:4r4U1J6Fhj98NKfSjnPUN7Ze2c6MnAdL0hWw6+LrJpc=
+modernc.org/ccgo/v4 v4.30.1/go.mod h1:bIOeI1JL54Utlxn+LwrFyjCx2n2RDiYEaJVSrgdrRfM=
 modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA=
 modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc=
 modernc.org/gc/v2 v2.6.5 h1:nyqdV8q46KvTpZlsw66kWqwXRHdjIlJOhG6kxiV/9xI=
 modernc.org/gc/v2 v2.6.5/go.mod h1:YgIahr1ypgfe7chRuJi2gD7DBQiKSLMPgBQe9oIiito=
+modernc.org/gc/v3 v3.1.1 h1:k8T3gkXWY9sEiytKhcgyiZ2L0DTyCQ/nvX+LoCljoRE=
+modernc.org/gc/v3 v3.1.1/go.mod h1:HFK/6AGESC7Ex+EZJhJ2Gni6cTaYpSMmU/cT9RmlfYY=
 modernc.org/goabi0 v0.2.0 h1:HvEowk7LxcPd0eq6mVOAEMai46V+i7Jrj13t4AzuNks=
 modernc.org/goabi0 v0.2.0/go.mod h1:CEFRnnJhKvWT1c1JTI3Avm+tgOWbkOu5oPA8eH8LnMI=
 modernc.org/libc v1.66.10 h1:yZkb3YeLx4oynyR+iUsXsybsX4Ubx7MQlSYEw4yj59A=
 modernc.org/libc v1.66.10/go.mod h1:8vGSEwvoUoltr4dlywvHqjtAqHBaw0j1jI7iFBTAr2I=
+modernc.org/libc v1.67.1 h1:bFaqOaa5/zbWYJo8aW0tXPX21hXsngG2M7mckCnFSVk=
+modernc.org/libc v1.67.1/go.mod h1:QvvnnJ5P7aitu0ReNpVIEyesuhmDLQ8kaEoyMjIFZJA=
 modernc.org/mathutil v1.7.1 h1:GCZVGXdaN8gTqB1Mf/usp1Y/hSqgI2vAGGP4jZMCxOU=
 modernc.org/mathutil v1.7.1/go.mod h1:4p5IwJITfppl0G4sUEDtCr4DthTaT47/N3aT6MhfgJg=
 modernc.org/memory v1.11.0 h1:o4QC8aMQzmcwCK3t3Ux/ZHmwFPzE6hf2Y5LbkRs+hbI=
--- a/internal/common/common-ws.go
+++ b/internal/common/common-ws.go
@@ -1,7 +1,6 @@
 package common

 import (
-	"github.com/fxamacker/cbor/v2"
 	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/henrygd/beszel/internal/entities/system"
 	"github.com/henrygd/beszel/internal/entities/systemd"
@@ -35,14 +34,14 @@ type HubRequest[T any] struct {
 // AgentResponse defines the structure for responses sent from agent to hub.
 type AgentResponse struct {
 	Id          *uint32                    `cbor:"0,keyasint,omitempty"`
-	SystemData  *system.CombinedData       `cbor:"1,keyasint,omitempty,omitzero"` // Legacy (<= 0.17)
-	Fingerprint *FingerprintResponse       `cbor:"2,keyasint,omitempty,omitzero"` // Legacy (<= 0.17)
+	SystemData  *system.CombinedData       `cbor:"1,keyasint,omitempty,omitzero"`
+	Fingerprint *FingerprintResponse       `cbor:"2,keyasint,omitempty,omitzero"`
 	Error       string                     `cbor:"3,keyasint,omitempty,omitzero"`
-	String      *string                    `cbor:"4,keyasint,omitempty,omitzero"` // Legacy (<= 0.17)
-	SmartData   map[string]smart.SmartData `cbor:"5,keyasint,omitempty,omitzero"` // Legacy (<= 0.17)
-	ServiceInfo systemd.ServiceDetails     `cbor:"6,keyasint,omitempty,omitzero"` // Legacy (<= 0.17)
-	// Data is the generic response payload for new endpoints (0.18+)
-	Data cbor.RawMessage `cbor:"7,keyasint,omitempty,omitzero"`
+	String      *string                    `cbor:"4,keyasint,omitempty,omitzero"`
+	SmartData   map[string]smart.SmartData `cbor:"5,keyasint,omitempty,omitzero"`
+	ServiceInfo systemd.ServiceDetails     `cbor:"6,keyasint,omitempty,omitzero"`
+	// Logs        *LogsPayload         `cbor:"4,keyasint,omitempty,omitzero"`
+	// RawBytes    []byte               `cbor:"4,keyasint,omitempty,omitzero"`
 }

 type FingerprintRequest struct {
--- a/internal/entities/container/container.go
+++ b/internal/entities/container/container.go
@@ -34,12 +34,15 @@ type ApiStats struct {
 	MemoryStats MemoryStats `json:"memory_stats"`
 }

-// Docker system info from /info API endpoint
+// Docker system info from /info
 type HostInfo struct {
 	OperatingSystem string `json:"OperatingSystem"`
 	KernelVersion   string `json:"KernelVersion"`
 	NCPU            int    `json:"NCPU"`
 	MemTotal        uint64 `json:"MemTotal"`
+	// OSVersion       string `json:"OSVersion"`
+	// OSType          string `json:"OSType"`
+	// Architecture    string `json:"Architecture"`
 }

 func (s *ApiStats) CalculateCpuPercentLinux(prevCpuContainer uint64, prevCpuSystem uint64) float64 {
--- a/internal/entities/system/system.go
+++ b/internal/entities/system/system.go
@@ -125,22 +125,22 @@ const (

 // Core system data that is needed in All Systems table
 type Info struct {
-	Hostname      string `json:"h,omitempty" cbor:"0,keyasint,omitempty"` // deprecated - moved to Details struct
-	KernelVersion string `json:"k,omitempty" cbor:"1,keyasint,omitempty"` // deprecated - moved to Details struct
-	Cores         int    `json:"c,omitzero" cbor:"2,keyasint,omitzero"`   // deprecated - moved to Details struct
+	Hostname      string `json:"h,omitempty" cbor:"0,keyasint,omitempty"`   // deprecated - moved to Details struct
+	KernelVersion string `json:"k,omitempty" cbor:"1,keyasint,omitempty"`   // deprecated - moved to Details struct
+	Cores         int    `json:"c,omitzero" cbor:"2,keyasint,omitzero"`     // deprecated - moved to Details struct
+	CpuModel      string `json:"m,omitempty" cbor:"4,keyasint,omitempty"`   // deprecated - moved to Details struct
+	Podman        bool   `json:"p,omitempty" cbor:"11,keyasint,omitempty"`  // deprecated - moved to Details struct
+	Os            Os     `json:"os,omitempty" cbor:"14,keyasint,omitempty"` // deprecated - moved to Details struct
 	// Threads is needed in Info struct to calculate load average thresholds
 	Threads        int     `json:"t,omitempty" cbor:"3,keyasint,omitempty"`
-	CpuModel       string  `json:"m,omitempty" cbor:"4,keyasint,omitempty"` // deprecated - moved to Details struct
 	Uptime         uint64  `json:"u" cbor:"5,keyasint"`
 	Cpu            float64 `json:"cpu" cbor:"6,keyasint"`
 	MemPct         float64 `json:"mp" cbor:"7,keyasint"`
 	DiskPct        float64 `json:"dp" cbor:"8,keyasint"`
 	Bandwidth      float64 `json:"b" cbor:"9,keyasint"`
 	AgentVersion   string  `json:"v" cbor:"10,keyasint"`
-	Podman         bool    `json:"p,omitempty" cbor:"11,keyasint,omitempty"` // deprecated - moved to Details struct
 	GpuPct         float64 `json:"g,omitempty" cbor:"12,keyasint,omitempty"`
 	DashboardTemp  float64 `json:"dt,omitempty" cbor:"13,keyasint,omitempty"`
-	Os             Os      `json:"os,omitempty" cbor:"14,keyasint,omitempty"`  // deprecated - moved to Details struct
 	LoadAvg1       float64 `json:"l1,omitempty" cbor:"15,keyasint,omitempty"`  // deprecated - use `la` array instead
 	LoadAvg5       float64 `json:"l5,omitempty" cbor:"16,keyasint,omitempty"`  // deprecated - use `la` array instead
 	LoadAvg15      float64 `json:"l15,omitempty" cbor:"17,keyasint,omitempty"` // deprecated - use `la` array instead
@@ -155,17 +155,16 @@ type Info struct {

 // Data that does not change during process lifetime and is not needed in All Systems table
 type Details struct {
-	Hostname      string        `cbor:"0,keyasint"`
-	Kernel        string        `cbor:"1,keyasint,omitempty"`
-	Cores         int           `cbor:"2,keyasint"`
-	Threads       int           `cbor:"3,keyasint"`
-	CpuModel      string        `cbor:"4,keyasint"`
-	Os            Os            `cbor:"5,keyasint"`
-	OsName        string        `cbor:"6,keyasint"`
-	Arch          string        `cbor:"7,keyasint"`
-	Podman        bool          `cbor:"8,keyasint,omitempty"`
-	MemoryTotal   uint64        `cbor:"9,keyasint"`
-	SmartInterval time.Duration `cbor:"10,keyasint,omitempty"`
+	Hostname    string `cbor:"0,keyasint"`
+	Kernel      string `cbor:"1,keyasint,omitempty"`
+	Cores       int    `cbor:"2,keyasint"`
+	Threads     int    `cbor:"3,keyasint"`
+	CpuModel    string `cbor:"4,keyasint"`
+	Os          Os     `cbor:"5,keyasint"`
+	OsName      string `cbor:"6,keyasint"`
+	Arch        string `cbor:"7,keyasint"`
+	Podman      bool   `cbor:"8,keyasint,omitempty"`
+	MemoryTotal uint64 `cbor:"9,keyasint"`
 }

 // Final data structure to return to the hub
--- a/internal/hub/expirymap/expirymap_test.go
+++ b/internal/hub/expirymap/expirymap_test.go
@@ -415,11 +415,7 @@ func TestExpiryMap_RemoveValue_WithExpiration(t *testing.T) {
 	// Wait for first value to expire
 	time.Sleep(time.Millisecond * 20)

-	// Trigger lazy cleanup of the expired key
-	_, ok := em.GetOk("key1")
-	assert.False(t, ok)
-
-	// Try to remove the remaining "value1" entry (key3)
+	// Try to remove the expired value - should remove one of the "value1" entries
 	removedValue, ok := em.RemovebyValue("value1")
 	assert.True(t, ok)
 	assert.Equal(t, "value1", removedValue)
@@ -427,9 +423,14 @@ func TestExpiryMap_RemoveValue_WithExpiration(t *testing.T) {
 	// Should still have key2 (different value)
 	assert.True(t, em.Has("key2"))

-	// key1 should be gone due to expiration and key3 should be removed by value.
-	assert.False(t, em.Has("key1"))
-	assert.False(t, em.Has("key3"))
+	// Should have removed one of the "value1" entries (either key1 or key3)
+	// But we can't predict which one due to map iteration order
+	key1Exists := em.Has("key1")
+	key3Exists := em.Has("key3")
+
+	// Exactly one of key1 or key3 should be gone
+	assert.False(t, key1Exists && key3Exists) // Both shouldn't exist
+	assert.True(t, key1Exists || key3Exists)  // At least one should still exist
 }

 func TestExpiryMap_ValueOperations_Integration(t *testing.T) {
--- a/internal/hub/systems/system.go
+++ b/internal/hub/systems/system.go
@@ -13,11 +13,9 @@ import (
 	"time"

 	"github.com/henrygd/beszel/internal/common"
-	"github.com/henrygd/beszel/internal/hub/transport"
 	"github.com/henrygd/beszel/internal/hub/ws"

 	"github.com/henrygd/beszel/internal/entities/container"
-	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/henrygd/beszel/internal/entities/system"
 	"github.com/henrygd/beszel/internal/entities/systemd"

@@ -25,30 +23,27 @@ import (

 	"github.com/blang/semver"
 	"github.com/fxamacker/cbor/v2"
-	"github.com/lxzan/gws"
 	"github.com/pocketbase/dbx"
 	"github.com/pocketbase/pocketbase/core"
 	"golang.org/x/crypto/ssh"
 )

 type System struct {
-	Id             string                  `db:"id"`
-	Host           string                  `db:"host"`
-	Port           string                  `db:"port"`
-	Status         string                  `db:"status"`
-	manager        *SystemManager          // Manager that this system belongs to
-	client         *ssh.Client             // SSH client for fetching data
-	sshTransport   *transport.SSHTransport // SSH transport for requests
-	data           *system.CombinedData    // system data from agent
-	ctx            context.Context         // Context for stopping the updater
-	cancel         context.CancelFunc      // Stops and removes system from updater
-	WsConn         *ws.WsConn              // Handler for agent WebSocket connection
-	agentVersion   semver.Version          // Agent version
-	updateTicker   *time.Ticker            // Ticker for updating the system
-	detailsFetched atomic.Bool             // True if static system details have been fetched and saved
-	smartFetching  atomic.Bool             // True if SMART devices are currently being fetched
-	smartInterval  time.Duration           // Interval for periodic SMART data updates
-	lastSmartFetch atomic.Int64            // Unix milliseconds of last SMART data fetch
+	Id             string               `db:"id"`
+	Host           string               `db:"host"`
+	Port           string               `db:"port"`
+	Status         string               `db:"status"`
+	manager        *SystemManager       // Manager that this system belongs to
+	client         *ssh.Client          // SSH client for fetching data
+	data           *system.CombinedData // system data from agent
+	ctx            context.Context      // Context for stopping the updater
+	cancel         context.CancelFunc   // Stops and removes system from updater
+	WsConn         *ws.WsConn           // Handler for agent WebSocket connection
+	agentVersion   semver.Version       // Agent version
+	updateTicker   *time.Ticker         // Ticker for updating the system
+	detailsFetched atomic.Bool          // True if static system details have been fetched and saved
+	smartFetched   atomic.Bool          // True if SMART devices have been fetched and saved
+	smartFetching  atomic.Bool          // True if SMART devices are currently being fetched
 }

 func (sm *SystemManager) NewSystem(systemId string) *System {
@@ -128,30 +123,10 @@ func (sys *System) update() error {
 	if !sys.detailsFetched.Load() {
 		options.IncludeDetails = true
 	}
-
 	data, err := sys.fetchDataFromAgent(options)
-	if err != nil {
-		return err
+	if err == nil {
+		_, err = sys.createRecords(data)
 	}
-
-	// create system records
-	_, err = sys.createRecords(data)
-
-	// Fetch and save SMART devices when system first comes online or at intervals
-	if backgroundSmartFetchEnabled() {
-		if sys.smartInterval <= 0 {
-			sys.smartInterval = time.Hour
-		}
-		lastFetch := sys.lastSmartFetch.Load()
-		if time.Since(time.UnixMilli(lastFetch)) >= sys.smartInterval && sys.smartFetching.CompareAndSwap(false, true) {
-			go func() {
-				defer sys.smartFetching.Store(false)
-				sys.lastSmartFetch.Store(time.Now().UnixMilli())
-				_ = sys.FetchAndSaveSmartDevices()
-			}()
-		}
-	}
-
 	return err
 }

@@ -222,10 +197,6 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 				return err
 			}
 			sys.detailsFetched.Store(true)
-			// update smart interval if it's set on the agent side
-			if data.Details.SmartInterval > 0 {
-				sys.smartInterval = data.Details.SmartInterval
-			}
 		}

 		// update system record (do this last because it triggers alerts and we need above records to be inserted first)
@@ -237,6 +208,18 @@ func (sys *System) createRecords(data *system.CombinedData) (*core.Record, error
 		return nil
 	})

+	// Fetch and save SMART devices when system first comes online
+	if err == nil {
+		if !sys.smartFetched.Load() && sys.smartFetching.CompareAndSwap(false, true) {
+			go func() {
+				defer sys.smartFetching.Store(false)
+				if err := sys.FetchAndSaveSmartDevices(); err == nil {
+					sys.smartFetched.Store(true)
+				}
+			}()
+		}
+	}
+
 	return systemRecord, err
 }

@@ -363,78 +346,8 @@ func (sys *System) getContext() (context.Context, context.CancelFunc) {
 	return sys.ctx, sys.cancel
 }

-// request sends a request to the agent, trying WebSocket first, then SSH.
-// This is the unified request method that uses the transport abstraction.
-func (sys *System) request(ctx context.Context, action common.WebSocketAction, req any, dest any) error {
-	// Try WebSocket first
-	if sys.WsConn != nil && sys.WsConn.IsConnected() {
-		wsTransport := transport.NewWebSocketTransport(sys.WsConn)
-		if err := wsTransport.Request(ctx, action, req, dest); err == nil {
-			return nil
-		} else if !shouldFallbackToSSH(err) {
-			return err
-		} else if shouldCloseWebSocket(err) {
-			sys.closeWebSocketConnection()
-		}
-	}
-
-	// Fall back to SSH if WebSocket fails
-	if err := sys.ensureSSHTransport(); err != nil {
-		return err
-	}
-	err := sys.sshTransport.RequestWithRetry(ctx, action, req, dest, 1)
-	// Keep legacy SSH client/version fields in sync for other code paths.
-	if sys.sshTransport != nil {
-		sys.client = sys.sshTransport.GetClient()
-		sys.agentVersion = sys.sshTransport.GetAgentVersion()
-	}
-	return err
-}
-
-func shouldFallbackToSSH(err error) bool {
-	if err == nil {
-		return false
-	}
-	if errors.Is(err, context.DeadlineExceeded) || errors.Is(err, context.Canceled) {
-		return true
-	}
-	if errors.Is(err, gws.ErrConnClosed) {
-		return true
-	}
-	return errors.Is(err, transport.ErrWebSocketNotConnected)
-}
-
-func shouldCloseWebSocket(err error) bool {
-	if err == nil {
-		return false
-	}
-	return errors.Is(err, gws.ErrConnClosed) || errors.Is(err, transport.ErrWebSocketNotConnected)
-}
-
-// ensureSSHTransport ensures the SSH transport is initialized and connected.
-func (sys *System) ensureSSHTransport() error {
-	if sys.sshTransport == nil {
-		if sys.manager.sshConfig == nil {
-			if err := sys.manager.createSSHClientConfig(); err != nil {
-				return err
-			}
-		}
-		sys.sshTransport = transport.NewSSHTransport(transport.SSHTransportConfig{
-			Host:    sys.Host,
-			Port:    sys.Port,
-			Config:  sys.manager.sshConfig,
-			Timeout: 4 * time.Second,
-		})
-	}
-	// Sync client state with transport
-	if sys.client != nil {
-		sys.sshTransport.SetClient(sys.client)
-		sys.sshTransport.SetAgentVersion(sys.agentVersion)
-	}
-	return nil
-}
-
-// fetchDataFromAgent attempts to fetch data from the agent, prioritizing WebSocket if available.
+// fetchDataFromAgent attempts to fetch data from the agent,
+// prioritizing WebSocket if available.
 func (sys *System) fetchDataFromAgent(options common.DataRequestOptions) (*system.CombinedData, error) {
 	if sys.data == nil {
 		sys.data = &system.CombinedData{}
@@ -460,47 +373,114 @@ func (sys *System) fetchDataViaWebSocket(options common.DataRequestOptions) (*sy
 	if sys.WsConn == nil || !sys.WsConn.IsConnected() {
 		return nil, errors.New("no websocket connection")
 	}
-	wsTransport := transport.NewWebSocketTransport(sys.WsConn)
-	err := wsTransport.Request(context.Background(), common.GetData, options, sys.data)
+	err := sys.WsConn.RequestSystemData(context.Background(), sys.data, options)
 	if err != nil {
 		return nil, err
 	}
 	return sys.data, nil
 }

+// fetchStringFromAgentViaSSH is a generic function to fetch strings via SSH
+func (sys *System) fetchStringFromAgentViaSSH(action common.WebSocketAction, requestData any, errorMsg string) (string, error) {
+	var result string
+	err := sys.runSSHOperation(4*time.Second, 1, func(session *ssh.Session) (bool, error) {
+		stdout, err := session.StdoutPipe()
+		if err != nil {
+			return false, err
+		}
+		stdin, stdinErr := session.StdinPipe()
+		if stdinErr != nil {
+			return false, stdinErr
+		}
+		if err := session.Shell(); err != nil {
+			return false, err
+		}
+		reqDataBytes, _ := cbor.Marshal(requestData)
+		req := common.HubRequest[cbor.RawMessage]{Action: action, Data: reqDataBytes}
+		_ = cbor.NewEncoder(stdin).Encode(req)
+		_ = stdin.Close()
+		var resp common.AgentResponse
+		err = cbor.NewDecoder(stdout).Decode(&resp)
+		if err != nil {
+			return false, err
+		}
+		if resp.String == nil {
+			return false, errors.New(errorMsg)
+		}
+		result = *resp.String
+		return false, nil
+	})
+	return result, err
+}
+
 // FetchContainerInfoFromAgent fetches container info from the agent
 func (sys *System) FetchContainerInfoFromAgent(containerID string) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	var result string
-	err := sys.request(ctx, common.GetContainerInfo, common.ContainerInfoRequest{ContainerID: containerID}, &result)
-	return result, err
+	// fetch via websocket
+	if sys.WsConn != nil && sys.WsConn.IsConnected() {
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		return sys.WsConn.RequestContainerInfo(ctx, containerID)
+	}
+	// fetch via SSH
+	return sys.fetchStringFromAgentViaSSH(common.GetContainerInfo, common.ContainerInfoRequest{ContainerID: containerID}, "no info in response")
 }

 // FetchContainerLogsFromAgent fetches container logs from the agent
 func (sys *System) FetchContainerLogsFromAgent(containerID string) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	var result string
-	err := sys.request(ctx, common.GetContainerLogs, common.ContainerLogsRequest{ContainerID: containerID}, &result)
-	return result, err
+	// fetch via websocket
+	if sys.WsConn != nil && sys.WsConn.IsConnected() {
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		return sys.WsConn.RequestContainerLogs(ctx, containerID)
+	}
+	// fetch via SSH
+	return sys.fetchStringFromAgentViaSSH(common.GetContainerLogs, common.ContainerLogsRequest{ContainerID: containerID}, "no logs in response")
 }

 // FetchSystemdInfoFromAgent fetches detailed systemd service information from the agent
 func (sys *System) FetchSystemdInfoFromAgent(serviceName string) (systemd.ServiceDetails, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	var result systemd.ServiceDetails
-	err := sys.request(ctx, common.GetSystemdInfo, common.SystemdInfoRequest{ServiceName: serviceName}, &result)
-	return result, err
-}
+	// fetch via websocket
+	if sys.WsConn != nil && sys.WsConn.IsConnected() {
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		return sys.WsConn.RequestSystemdInfo(ctx, serviceName)
+	}
+
+	var result systemd.ServiceDetails
+	err := sys.runSSHOperation(5*time.Second, 1, func(session *ssh.Session) (bool, error) {
+		stdout, err := session.StdoutPipe()
+		if err != nil {
+			return false, err
+		}
+		stdin, stdinErr := session.StdinPipe()
+		if stdinErr != nil {
+			return false, stdinErr
+		}
+		if err := session.Shell(); err != nil {
+			return false, err
+		}
+
+		reqDataBytes, _ := cbor.Marshal(common.SystemdInfoRequest{ServiceName: serviceName})
+		req := common.HubRequest[cbor.RawMessage]{Action: common.GetSystemdInfo, Data: reqDataBytes}
+		if err := cbor.NewEncoder(stdin).Encode(req); err != nil {
+			return false, err
+		}
+		_ = stdin.Close()
+
+		var resp common.AgentResponse
+		if err := cbor.NewDecoder(stdout).Decode(&resp); err != nil {
+			return false, err
+		}
+		if resp.ServiceInfo == nil {
+			if resp.Error != "" {
+				return false, errors.New(resp.Error)
+			}
+			return false, errors.New("no systemd info in response")
+		}
+		result = resp.ServiceInfo
+		return false, nil
+	})

-// FetchSmartDataFromAgent fetches SMART data from the agent
-func (sys *System) FetchSmartDataFromAgent() (map[string]smart.SmartData, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
-	defer cancel()
-	var result map[string]smart.SmartData
-	err := sys.request(ctx, common.GetSmartData, nil, &result)
 	return result, err
 }

@@ -529,7 +509,8 @@ func (sys *System) fetchDataViaSSH(options common.DataRequestOptions) (*system.C
 		*sys.data = system.CombinedData{}

 		if sys.agentVersion.GTE(beszel.MinVersionAgentResponse) && stdinErr == nil {
-			req := common.HubRequest[any]{Action: common.GetData, Data: options}
+			reqDataBytes, _ := cbor.Marshal(options)
+			req := common.HubRequest[cbor.RawMessage]{Action: common.GetData, Data: reqDataBytes}
 			_ = cbor.NewEncoder(stdin).Encode(req)
 			_ = stdin.Close()

@@ -665,9 +646,6 @@ func (sys *System) createSessionWithTimeout(timeout time.Duration) (*ssh.Session

 // closeSSHConnection closes the SSH connection but keeps the system in the manager
 func (sys *System) closeSSHConnection() {
-	if sys.sshTransport != nil {
-		sys.sshTransport.Close()
-	}
 	if sys.client != nil {
 		sys.client.Close()
 		sys.client = nil
--- a/internal/hub/systems/system_smart.go
+++ b/internal/hub/systems/system_smart.go
@@ -1,14 +1,54 @@
 package systems

 import (
+	"context"
 	"database/sql"
 	"errors"
 	"strings"
+	"time"

+	"github.com/fxamacker/cbor/v2"
+	"github.com/henrygd/beszel/internal/common"
 	"github.com/henrygd/beszel/internal/entities/smart"
 	"github.com/pocketbase/pocketbase/core"
+	"golang.org/x/crypto/ssh"
 )

+// FetchSmartDataFromAgent fetches SMART data from the agent
+func (sys *System) FetchSmartDataFromAgent() (map[string]smart.SmartData, error) {
+	// fetch via websocket
+	if sys.WsConn != nil && sys.WsConn.IsConnected() {
+		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+		defer cancel()
+		return sys.WsConn.RequestSmartData(ctx)
+	}
+	// fetch via SSH
+	var result map[string]smart.SmartData
+	err := sys.runSSHOperation(5*time.Second, 1, func(session *ssh.Session) (bool, error) {
+		stdout, err := session.StdoutPipe()
+		if err != nil {
+			return false, err
+		}
+		stdin, stdinErr := session.StdinPipe()
+		if stdinErr != nil {
+			return false, stdinErr
+		}
+		if err := session.Shell(); err != nil {
+			return false, err
+		}
+		req := common.HubRequest[any]{Action: common.GetSmartData}
+		_ = cbor.NewEncoder(stdin).Encode(req)
+		_ = stdin.Close()
+		var resp common.AgentResponse
+		if err := cbor.NewDecoder(stdout).Decode(&resp); err != nil {
+			return false, err
+		}
+		result = resp.SmartData
+		return false, nil
+	})
+	return result, err
+}
+
 // FetchAndSaveSmartDevices fetches SMART data from the agent and saves it to the database
 func (sys *System) FetchAndSaveSmartDevices() error {
 	smartData, err := sys.FetchSmartDataFromAgent()
--- a/internal/hub/systems/systems_production.go
+++ b/internal/hub/systems/systems_production.go
@@ -1,10 +0,0 @@
-//go:build !testing
-// +build !testing
-
-package systems
-
-// Background SMART fetching is enabled in production but disabled for tests (systems_test_helpers.go).
-//
-// The hub integration tests create/replace systems and clean up the test apps quickly.
-// Background SMART fetching can outlive teardown and crash in PocketBase internals (nil DB).
-func backgroundSmartFetchEnabled() bool { return true }
--- a/internal/hub/systems/systems_test_helpers.go
+++ b/internal/hub/systems/systems_test_helpers.go
@@ -10,13 +10,6 @@ import (
 	entities "github.com/henrygd/beszel/internal/entities/system"
 )

-// The hub integration tests create/replace systems and cleanup the test apps quickly.
-// Background SMART fetching can outlive teardown and crash in PocketBase internals (nil DB).
-//
-// We keep the explicit SMART refresh endpoint / method available, but disable
-// the automatic background fetch during tests.
-func backgroundSmartFetchEnabled() bool { return false }
-
 // TESTING ONLY: GetSystemCount returns the number of systems in the store
 func (sm *SystemManager) GetSystemCount() int {
 	return sm.systems.Length()
--- a/internal/hub/transport/ssh.go
+++ b/internal/hub/transport/ssh.go
@@ -1,227 +0,0 @@
-package transport
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/blang/semver"
-	"github.com/fxamacker/cbor/v2"
-	"github.com/henrygd/beszel/internal/common"
-	"golang.org/x/crypto/ssh"
-)
-
-// SSHTransport implements Transport over SSH connections.
-type SSHTransport struct {
-	client       *ssh.Client
-	config       *ssh.ClientConfig
-	host         string
-	port         string
-	agentVersion semver.Version
-	timeout      time.Duration
-}
-
-// SSHTransportConfig holds configuration for creating an SSH transport.
-type SSHTransportConfig struct {
-	Host         string
-	Port         string
-	Config       *ssh.ClientConfig
-	AgentVersion semver.Version
-	Timeout      time.Duration
-}
-
-// NewSSHTransport creates a new SSH transport with the given configuration.
-func NewSSHTransport(cfg SSHTransportConfig) *SSHTransport {
-	timeout := cfg.Timeout
-	if timeout == 0 {
-		timeout = 4 * time.Second
-	}
-	return &SSHTransport{
-		config:       cfg.Config,
-		host:         cfg.Host,
-		port:         cfg.Port,
-		agentVersion: cfg.AgentVersion,
-		timeout:      timeout,
-	}
-}
-
-// SetClient sets the SSH client for reuse across requests.
-func (t *SSHTransport) SetClient(client *ssh.Client) {
-	t.client = client
-}
-
-// SetAgentVersion sets the agent version (extracted from SSH handshake).
-func (t *SSHTransport) SetAgentVersion(version semver.Version) {
-	t.agentVersion = version
-}
-
-// GetClient returns the current SSH client (for connection management).
-func (t *SSHTransport) GetClient() *ssh.Client {
-	return t.client
-}
-
-// GetAgentVersion returns the agent version.
-func (t *SSHTransport) GetAgentVersion() semver.Version {
-	return t.agentVersion
-}
-
-// Request sends a request to the agent via SSH and unmarshals the response.
-func (t *SSHTransport) Request(ctx context.Context, action common.WebSocketAction, req any, dest any) error {
-	if t.client == nil {
-		if err := t.connect(); err != nil {
-			return err
-		}
-	}
-
-	session, err := t.createSessionWithTimeout(ctx)
-	if err != nil {
-		return err
-	}
-	defer session.Close()
-
-	stdout, err := session.StdoutPipe()
-	if err != nil {
-		return err
-	}
-	stdin, err := session.StdinPipe()
-	if err != nil {
-		return err
-	}
-	if err := session.Shell(); err != nil {
-		return err
-	}
-
-	// Send request
-	hubReq := common.HubRequest[any]{Action: action, Data: req}
-	if err := cbor.NewEncoder(stdin).Encode(hubReq); err != nil {
-		return fmt.Errorf("failed to encode request: %w", err)
-	}
-	stdin.Close()
-
-	// Read response
-	var resp common.AgentResponse
-	if err := cbor.NewDecoder(stdout).Decode(&resp); err != nil {
-		return fmt.Errorf("failed to decode response: %w", err)
-	}
-
-	if resp.Error != "" {
-		return errors.New(resp.Error)
-	}
-
-	if err := session.Wait(); err != nil {
-		return err
-	}
-
-	return UnmarshalResponse(resp, action, dest)
-}
-
-// IsConnected returns true if the SSH connection is active.
-func (t *SSHTransport) IsConnected() bool {
-	return t.client != nil
-}
-
-// Close terminates the SSH connection.
-func (t *SSHTransport) Close() {
-	if t.client != nil {
-		t.client.Close()
-		t.client = nil
-	}
-}
-
-// connect establishes a new SSH connection.
-func (t *SSHTransport) connect() error {
-	if t.config == nil {
-		return errors.New("SSH config not set")
-	}
-
-	network := "tcp"
-	host := t.host
-	if strings.HasPrefix(host, "/") {
-		network = "unix"
-	} else {
-		host = net.JoinHostPort(host, t.port)
-	}
-
-	client, err := ssh.Dial(network, host, t.config)
-	if err != nil {
-		return err
-	}
-	t.client = client
-
-	// Extract agent version from server version string
-	t.agentVersion, _ = extractAgentVersion(string(client.Conn.ServerVersion()))
-	return nil
-}
-
-// createSessionWithTimeout creates a new SSH session with a timeout.
-func (t *SSHTransport) createSessionWithTimeout(ctx context.Context) (*ssh.Session, error) {
-	if t.client == nil {
-		return nil, errors.New("client not initialized")
-	}
-
-	ctx, cancel := context.WithTimeout(ctx, t.timeout)
-	defer cancel()
-
-	sessionChan := make(chan *ssh.Session, 1)
-	errChan := make(chan error, 1)
-
-	go func() {
-		session, err := t.client.NewSession()
-		if err != nil {
-			errChan <- err
-		} else {
-			sessionChan <- session
-		}
-	}()
-
-	select {
-	case session := <-sessionChan:
-		return session, nil
-	case err := <-errChan:
-		return nil, err
-	case <-ctx.Done():
-		return nil, errors.New("timeout creating session")
-	}
-}
-
-// extractAgentVersion extracts the beszel version from SSH server version string.
-func extractAgentVersion(versionString string) (semver.Version, error) {
-	_, after, _ := strings.Cut(versionString, "_")
-	return semver.Parse(after)
-}
-
-// RequestWithRetry sends a request with automatic retry on connection failures.
-func (t *SSHTransport) RequestWithRetry(ctx context.Context, action common.WebSocketAction, req any, dest any, retries int) error {
-	var lastErr error
-	for attempt := 0; attempt <= retries; attempt++ {
-		err := t.Request(ctx, action, req, dest)
-		if err == nil {
-			return nil
-		}
-		lastErr = err
-
-		// Check if it's a connection error that warrants a retry
-		if isConnectionError(err) && attempt < retries {
-			t.Close()
-			continue
-		}
-		return err
-	}
-	return lastErr
-}
-
-// isConnectionError checks if an error indicates a connection problem.
-func isConnectionError(err error) bool {
-	if err == nil {
-		return false
-	}
-	errStr := err.Error()
-	return strings.Contains(errStr, "connection") ||
-		strings.Contains(errStr, "EOF") ||
-		strings.Contains(errStr, "closed") ||
-		errors.Is(err, io.EOF)
-}
--- a/internal/hub/transport/transport.go
+++ b/internal/hub/transport/transport.go
@@ -1,112 +0,0 @@
-// Package transport provides a unified abstraction for hub-agent communication
-// over different transports (WebSocket, SSH).
-package transport
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/fxamacker/cbor/v2"
-	"github.com/henrygd/beszel/internal/common"
-	"github.com/henrygd/beszel/internal/entities/smart"
-	"github.com/henrygd/beszel/internal/entities/system"
-	"github.com/henrygd/beszel/internal/entities/systemd"
-)
-
-// Transport defines the interface for hub-agent communication.
-// Both WebSocket and SSH transports implement this interface.
-type Transport interface {
-	// Request sends a request to the agent and unmarshals the response into dest.
-	// The dest parameter should be a pointer to the expected response type.
-	Request(ctx context.Context, action common.WebSocketAction, req any, dest any) error
-	// IsConnected returns true if the transport connection is active.
-	IsConnected() bool
-	// Close terminates the transport connection.
-	Close()
-}
-
-// UnmarshalResponse unmarshals an AgentResponse into the destination type.
-// It first checks the generic Data field (0.19+ agents), then falls back
-// to legacy typed fields for backward compatibility with 0.18.0 agents.
-func UnmarshalResponse(resp common.AgentResponse, action common.WebSocketAction, dest any) error {
-	if dest == nil {
-		return errors.New("nil destination")
-	}
-	// Try generic Data field first (0.19+)
-	if len(resp.Data) > 0 {
-		if err := cbor.Unmarshal(resp.Data, dest); err != nil {
-			return fmt.Errorf("failed to unmarshal generic response data: %w", err)
-		}
-		return nil
-	}
-	// Fall back to legacy typed fields for older agents/hubs.
-	return unmarshalLegacyResponse(resp, action, dest)
-}
-
-// unmarshalLegacyResponse handles legacy responses that use typed fields.
-func unmarshalLegacyResponse(resp common.AgentResponse, action common.WebSocketAction, dest any) error {
-	switch action {
-	case common.GetData:
-		d, ok := dest.(*system.CombinedData)
-		if !ok {
-			return fmt.Errorf("unexpected dest type for GetData: %T", dest)
-		}
-		if resp.SystemData == nil {
-			return errors.New("no system data in response")
-		}
-		*d = *resp.SystemData
-		return nil
-	case common.CheckFingerprint:
-		d, ok := dest.(*common.FingerprintResponse)
-		if !ok {
-			return fmt.Errorf("unexpected dest type for CheckFingerprint: %T", dest)
-		}
-		if resp.Fingerprint == nil {
-			return errors.New("no fingerprint in response")
-		}
-		*d = *resp.Fingerprint
-		return nil
-	case common.GetContainerLogs:
-		d, ok := dest.(*string)
-		if !ok {
-			return fmt.Errorf("unexpected dest type for GetContainerLogs: %T", dest)
-		}
-		if resp.String == nil {
-			return errors.New("no logs in response")
-		}
-		*d = *resp.String
-		return nil
-	case common.GetContainerInfo:
-		d, ok := dest.(*string)
-		if !ok {
-			return fmt.Errorf("unexpected dest type for GetContainerInfo: %T", dest)
-		}
-		if resp.String == nil {
-			return errors.New("no info in response")
-		}
-		*d = *resp.String
-		return nil
-	case common.GetSmartData:
-		d, ok := dest.(*map[string]smart.SmartData)
-		if !ok {
-			return fmt.Errorf("unexpected dest type for GetSmartData: %T", dest)
-		}
-		if resp.SmartData == nil {
-			return errors.New("no SMART data in response")
-		}
-		*d = resp.SmartData
-		return nil
-	case common.GetSystemdInfo:
-		d, ok := dest.(*systemd.ServiceDetails)
-		if !ok {
-			return fmt.Errorf("unexpected dest type for GetSystemdInfo: %T", dest)
-		}
-		if resp.ServiceInfo == nil {
-			return errors.New("no systemd info in response")
-		}
-		*d = resp.ServiceInfo
-		return nil
-	}
-	return fmt.Errorf("unsupported action: %d", action)
-}
--- a/internal/hub/transport/websocket.go
+++ b/internal/hub/transport/websocket.go
@@ -1,74 +0,0 @@
-package transport
-
-import (
-	"context"
-	"errors"
-
-	"github.com/fxamacker/cbor/v2"
-	"github.com/henrygd/beszel"
-	"github.com/henrygd/beszel/internal/common"
-	"github.com/henrygd/beszel/internal/hub/ws"
-)
-
-// ErrWebSocketNotConnected indicates a WebSocket transport is not currently connected.
-var ErrWebSocketNotConnected = errors.New("websocket not connected")
-
-// WebSocketTransport implements Transport over WebSocket connections.
-type WebSocketTransport struct {
-	wsConn *ws.WsConn
-}
-
-// NewWebSocketTransport creates a new WebSocket transport wrapper.
-func NewWebSocketTransport(wsConn *ws.WsConn) *WebSocketTransport {
-	return &WebSocketTransport{wsConn: wsConn}
-}
-
-// Request sends a request to the agent via WebSocket and unmarshals the response.
-func (t *WebSocketTransport) Request(ctx context.Context, action common.WebSocketAction, req any, dest any) error {
-	if !t.IsConnected() {
-		return ErrWebSocketNotConnected
-	}
-
-	pendingReq, err := t.wsConn.SendRequest(ctx, action, req)
-	if err != nil {
-		return err
-	}
-
-	// Wait for response
-	select {
-	case message := <-pendingReq.ResponseCh:
-		defer message.Close()
-		defer pendingReq.Cancel()
-
-		// Legacy agents (< MinVersionAgentResponse) respond with a raw payload instead of an AgentResponse wrapper.
-		if t.wsConn.AgentVersion().LT(beszel.MinVersionAgentResponse) {
-			return cbor.Unmarshal(message.Data.Bytes(), dest)
-		}
-
-		var agentResponse common.AgentResponse
-		if err := cbor.Unmarshal(message.Data.Bytes(), &agentResponse); err != nil {
-			return err
-		}
-
-		if agentResponse.Error != "" {
-			return errors.New(agentResponse.Error)
-		}
-
-		return UnmarshalResponse(agentResponse, action, dest)
-
-	case <-pendingReq.Context.Done():
-		return pendingReq.Context.Err()
-	}
-}
-
-// IsConnected returns true if the WebSocket connection is active.
-func (t *WebSocketTransport) IsConnected() bool {
-	return t.wsConn != nil && t.wsConn.IsConnected()
-}
-
-// Close terminates the WebSocket connection.
-func (t *WebSocketTransport) Close() {
-	if t.wsConn != nil {
-		t.wsConn.Close(nil)
-	}
-}
--- a/internal/hub/ws/handlers.go
+++ b/internal/hub/ws/handlers.go
@@ -6,12 +6,14 @@ import (

 	"github.com/fxamacker/cbor/v2"
 	"github.com/henrygd/beszel/internal/common"
+	"github.com/henrygd/beszel/internal/entities/smart"
+	"github.com/henrygd/beszel/internal/entities/system"
+	"github.com/henrygd/beszel/internal/entities/systemd"
 	"github.com/lxzan/gws"
 	"golang.org/x/crypto/ssh"
 )

-// ResponseHandler defines interface for handling agent responses.
-// This is used by handleAgentRequest for legacy response handling.
+// ResponseHandler defines interface for handling agent responses
 type ResponseHandler interface {
 	Handle(agentResponse common.AgentResponse) error
 	HandleLegacy(rawData []byte) error
@@ -25,7 +27,167 @@ func (h *BaseHandler) HandleLegacy(rawData []byte) error {
 }

 ////////////////////////////////////////////////////////////////////////////
-// Fingerprint handling (used for WebSocket authentication)
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+
+// systemDataHandler implements ResponseHandler for system data requests
+type systemDataHandler struct {
+	data *system.CombinedData
+}
+
+func (h *systemDataHandler) HandleLegacy(rawData []byte) error {
+	return cbor.Unmarshal(rawData, h.data)
+}
+
+func (h *systemDataHandler) Handle(agentResponse common.AgentResponse) error {
+	if agentResponse.SystemData != nil {
+		*h.data = *agentResponse.SystemData
+	}
+	return nil
+}
+
+// RequestSystemData requests system metrics from the agent and unmarshals the response.
+func (ws *WsConn) RequestSystemData(ctx context.Context, data *system.CombinedData, options common.DataRequestOptions) error {
+	if !ws.IsConnected() {
+		return gws.ErrConnClosed
+	}
+
+	req, err := ws.requestManager.SendRequest(ctx, common.GetData, options)
+	if err != nil {
+		return err
+	}
+
+	handler := &systemDataHandler{data: data}
+	return ws.handleAgentRequest(req, handler)
+}
+
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+
+// stringResponseHandler is a generic handler for string responses from agents
+type stringResponseHandler struct {
+	BaseHandler
+	value    string
+	errorMsg string
+}
+
+func (h *stringResponseHandler) Handle(agentResponse common.AgentResponse) error {
+	if agentResponse.String == nil {
+		return errors.New(h.errorMsg)
+	}
+	h.value = *agentResponse.String
+	return nil
+}
+
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+
+// requestContainerStringViaWS is a generic function to request container-related strings via WebSocket
+func (ws *WsConn) requestContainerStringViaWS(ctx context.Context, action common.WebSocketAction, requestData any, errorMsg string) (string, error) {
+	if !ws.IsConnected() {
+		return "", gws.ErrConnClosed
+	}
+
+	req, err := ws.requestManager.SendRequest(ctx, action, requestData)
+	if err != nil {
+		return "", err
+	}
+
+	handler := &stringResponseHandler{errorMsg: errorMsg}
+	if err := ws.handleAgentRequest(req, handler); err != nil {
+		return "", err
+	}
+
+	return handler.value, nil
+}
+
+// RequestContainerLogs requests logs for a specific container via WebSocket.
+func (ws *WsConn) RequestContainerLogs(ctx context.Context, containerID string) (string, error) {
+	return ws.requestContainerStringViaWS(ctx, common.GetContainerLogs, common.ContainerLogsRequest{ContainerID: containerID}, "no logs in response")
+}
+
+// RequestContainerInfo requests information about a specific container via WebSocket.
+func (ws *WsConn) RequestContainerInfo(ctx context.Context, containerID string) (string, error) {
+	return ws.requestContainerStringViaWS(ctx, common.GetContainerInfo, common.ContainerInfoRequest{ContainerID: containerID}, "no info in response")
+}
+
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+
+// RequestSystemdInfo requests detailed information about a systemd service via WebSocket.
+func (ws *WsConn) RequestSystemdInfo(ctx context.Context, serviceName string) (systemd.ServiceDetails, error) {
+	if !ws.IsConnected() {
+		return nil, gws.ErrConnClosed
+	}
+
+	req, err := ws.requestManager.SendRequest(ctx, common.GetSystemdInfo, common.SystemdInfoRequest{ServiceName: serviceName})
+	if err != nil {
+		return nil, err
+	}
+
+	var result systemd.ServiceDetails
+	handler := &systemdInfoHandler{result: &result}
+	if err := ws.handleAgentRequest(req, handler); err != nil {
+		return nil, err
+	}
+
+	return result, nil
+}
+
+// systemdInfoHandler parses ServiceDetails from AgentResponse
+type systemdInfoHandler struct {
+	BaseHandler
+	result *systemd.ServiceDetails
+}
+
+func (h *systemdInfoHandler) Handle(agentResponse common.AgentResponse) error {
+	if agentResponse.ServiceInfo == nil {
+		return errors.New("no systemd info in response")
+	}
+	*h.result = agentResponse.ServiceInfo
+	return nil
+}
+
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
+
+// RequestSmartData requests SMART data via WebSocket.
+func (ws *WsConn) RequestSmartData(ctx context.Context) (map[string]smart.SmartData, error) {
+	if !ws.IsConnected() {
+		return nil, gws.ErrConnClosed
+	}
+	req, err := ws.requestManager.SendRequest(ctx, common.GetSmartData, nil)
+	if err != nil {
+		return nil, err
+	}
+	var result map[string]smart.SmartData
+	handler := ResponseHandler(&smartDataHandler{result: &result})
+	if err := ws.handleAgentRequest(req, handler); err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+// smartDataHandler parses SMART data map from AgentResponse
+type smartDataHandler struct {
+	BaseHandler
+	result *map[string]smart.SmartData
+}
+
+func (h *smartDataHandler) Handle(agentResponse common.AgentResponse) error {
+	if agentResponse.SmartData == nil {
+		return errors.New("no SMART data in response")
+	}
+	*h.result = agentResponse.SmartData
+	return nil
+}
+
+////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////

 // fingerprintHandler implements ResponseHandler for fingerprint requests
--- a/internal/hub/ws/handlers_test.go
+++ b/internal/hub/ws/handlers_test.go
@@ -0,0 +1,75 @@
+//go:build testing
+
+package ws
+
+import (
+	"testing"
+
+	"github.com/henrygd/beszel/internal/common"
+	"github.com/henrygd/beszel/internal/entities/systemd"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSystemdInfoHandlerSuccess(t *testing.T) {
+	handler := &systemdInfoHandler{
+		result: &systemd.ServiceDetails{},
+	}
+
+	// Test successful handling with valid ServiceInfo
+	testDetails := systemd.ServiceDetails{
+		"Id":             "nginx.service",
+		"ActiveState":    "active",
+		"SubState":       "running",
+		"Description":    "A high performance web server",
+		"ExecMainPID":    1234,
+		"MemoryCurrent":  1024000,
+	}
+
+	response := common.AgentResponse{
+		ServiceInfo: testDetails,
+	}
+
+	err := handler.Handle(response)
+	assert.NoError(t, err)
+	assert.Equal(t, testDetails, *handler.result)
+}
+
+func TestSystemdInfoHandlerError(t *testing.T) {
+	handler := &systemdInfoHandler{
+		result: &systemd.ServiceDetails{},
+	}
+
+	// Test error handling when ServiceInfo is nil
+	response := common.AgentResponse{
+		ServiceInfo: nil,
+		Error:       "service not found",
+	}
+
+	err := handler.Handle(response)
+	assert.Error(t, err)
+	assert.Equal(t, "no systemd info in response", err.Error())
+}
+
+func TestSystemdInfoHandlerEmptyResponse(t *testing.T) {
+	handler := &systemdInfoHandler{
+		result: &systemd.ServiceDetails{},
+	}
+
+	// Test with completely empty response
+	response := common.AgentResponse{}
+
+	err := handler.Handle(response)
+	assert.Error(t, err)
+	assert.Equal(t, "no systemd info in response", err.Error())
+}
+
+func TestSystemdInfoHandlerLegacyNotSupported(t *testing.T) {
+	handler := &systemdInfoHandler{
+		result: &systemd.ServiceDetails{},
+	}
+
+	// Test that legacy format is not supported
+	err := handler.HandleLegacy([]byte("some data"))
+	assert.Error(t, err)
+	assert.Equal(t, "legacy format not supported", err.Error())
+}
--- a/internal/hub/ws/request_manager.go
+++ b/internal/hub/ws/request_manager.go
@@ -45,15 +45,7 @@ func NewRequestManager(conn *gws.Conn) *RequestManager {
 func (rm *RequestManager) SendRequest(ctx context.Context, action common.WebSocketAction, data any) (*PendingRequest, error) {
 	reqID := RequestID(rm.nextID.Add(1))

-	// Respect any caller-provided deadline. If none is set, apply a reasonable default
-	// so pending requests don't live forever if the agent never responds.
-	reqCtx := ctx
-	var cancel context.CancelFunc
-	if _, hasDeadline := ctx.Deadline(); hasDeadline {
-		reqCtx, cancel = context.WithCancel(ctx)
-	} else {
-		reqCtx, cancel = context.WithTimeout(ctx, 5*time.Second)
-	}
+	reqCtx, cancel := context.WithTimeout(ctx, 5*time.Second)

 	req := &PendingRequest{
 		ID:         reqID,
@@ -108,11 +100,6 @@ func (rm *RequestManager) handleResponse(message *gws.Message) {
 		return
 	}

-	if response.Id == nil {
-		rm.routeLegacyResponse(message)
-		return
-	}
-
 	reqID := RequestID(*response.Id)

 	rm.RLock()
--- a/internal/hub/ws/ws.go
+++ b/internal/hub/ws/ws.go
@@ -1,7 +1,6 @@
 package ws

 import (
-	"context"
 	"errors"
 	"time"
 	"weak"
@@ -162,14 +161,3 @@ func (ws *WsConn) handleAgentRequest(req *PendingRequest, handler ResponseHandle
 func (ws *WsConn) IsConnected() bool {
 	return ws.conn != nil
 }
-
-// AgentVersion returns the connected agent's version (as reported during handshake).
-func (ws *WsConn) AgentVersion() semver.Version {
-	return ws.agentVersion
-}
-
-// SendRequest sends a request to the agent and returns a pending request handle.
-// This is used by the transport layer to send requests.
-func (ws *WsConn) SendRequest(ctx context.Context, action common.WebSocketAction, data any) (*PendingRequest, error) {
-	return ws.requestManager.SendRequest(ctx, action, data)
-}
--- a/internal/hub/ws/ws_test.go
+++ b/internal/hub/ws/ws_test.go
@@ -184,18 +184,14 @@ func TestCommonActions(t *testing.T) {
 	assert.Equal(t, common.WebSocketAction(2), common.GetContainerLogs, "GetLogs should be action 2")
 }

-func TestFingerprintHandler(t *testing.T) {
-	var result common.FingerprintResponse
-	h := &fingerprintHandler{result: &result}
+func TestLogsHandler(t *testing.T) {
+	h := &stringResponseHandler{errorMsg: "no logs in response"}

-	resp := common.AgentResponse{Fingerprint: &common.FingerprintResponse{
-		Fingerprint: "test-fingerprint",
-		Hostname:    "test-host",
-	}}
+	logValue := "test logs"
+	resp := common.AgentResponse{String: &logValue}
 	err := h.Handle(resp)
 	assert.NoError(t, err)
-	assert.Equal(t, "test-fingerprint", result.Fingerprint)
-	assert.Equal(t, "test-host", result.Hostname)
+	assert.Equal(t, logValue, h.value)
 }

 // TestHandler tests that we can create a Handler
--- a/internal/site/bun.lock
+++ b/internal/site/bun.lock
@@ -36,8 +36,8 @@
        "lucide-react": "^0.452.0",
        "nanostores": "^0.11.4",
        "pocketbase": "^0.26.2",
-        "react": "^19.1.2",
-        "react-dom": "^19.1.2",
+        "react": "^19.1.1",
+        "react-dom": "^19.1.1",
        "recharts": "^2.15.4",
        "shiki": "^3.13.0",
        "tailwind-merge": "^3.3.1",
@@ -811,9 +811,9 @@

    "punycode": ["punycode@2.3.1", "", {}, "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg=="],

-    "react": ["react@19.2.3", "", {}, "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA=="],
+    "react": ["react@19.1.1", "", {}, "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ=="],

-    "react-dom": ["react-dom@19.2.3", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.3" } }, "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg=="],
+    "react-dom": ["react-dom@19.1.1", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.1" } }, "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw=="],

    "react-is": ["react-is@18.3.1", "", {}, "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="],

@@ -851,7 +851,7 @@

    "safe-buffer": ["safe-buffer@5.2.1", "", {}, "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="],

-    "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="],
+    "scheduler": ["scheduler@0.26.0", "", {}, "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA=="],

    "semver": ["semver@6.3.1", "", { "bin": "bin/semver.js" }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],

@@ -971,6 +971,8 @@

    "prop-types/react-is": ["react-is@16.13.1", "", {}, "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="],

+    "pseudolocale/commander": ["commander@10.0.1", "", {}, "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug=="],
+
    "readdirp/picomatch": ["picomatch@2.3.1", "", {}, "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="],

    "restore-cursor/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],
@@ -979,18 +981,28 @@

    "string-width-cjs/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

+    "string-width-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
+
+    "strip-ansi-cjs/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
+
    "wrap-ansi/ansi-styles": ["ansi-styles@6.2.1", "", {}, "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug=="],

    "wrap-ansi/strip-ansi": ["strip-ansi@7.1.0", "", { "dependencies": { "ansi-regex": "^6.0.1" } }, "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ=="],

    "wrap-ansi-cjs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],

+    "wrap-ansi-cjs/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
+
    "@isaacs/cliui/strip-ansi/ansi-regex": ["ansi-regex@6.0.1", "", {}, "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="],

+    "string-width-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
+
    "string-width/strip-ansi/ansi-regex": ["ansi-regex@6.0.1", "", {}, "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="],

    "wrap-ansi-cjs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

+    "wrap-ansi-cjs/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
+
    "wrap-ansi/strip-ansi/ansi-regex": ["ansi-regex@6.0.1", "", {}, "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA=="],
  }
 }
--- a/internal/site/package.json
+++ b/internal/site/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "beszel",
 	"private": true,
-	"version": "0.18.0-beta.2",
+	"version": "0.18.0-beta.1",
 	"type": "module",
 	"scripts": {
 		"dev": "vite --host",
--- a/internal/site/src/components/routes/system.tsx
+++ b/internal/site/src/components/routes/system.tsx
@@ -16,7 +16,7 @@ import MemChart from "@/components/charts/mem-chart"
 import SwapChart from "@/components/charts/swap-chart"
 import TemperatureChart from "@/components/charts/temperature-chart"
 import { getPbTimestamp, pb } from "@/lib/api"
-import { ChartType, SystemStatus, Unit } from "@/lib/enums"
+import { ChartType, Os, SystemStatus, Unit } from "@/lib/enums"
 import { batteryStateTranslations } from "@/lib/i18n"
 import {
 	$allSystemsById,
@@ -46,7 +46,6 @@ import type {
 	ChartTimes,
 	ContainerStatsRecord,
 	GPUData,
-	SystemDetailsRecord,
 	SystemInfo,
 	SystemRecord,
 	SystemStats,
@@ -167,7 +166,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 	const isLongerChart = !["1m", "1h"].includes(chartTime) // true if chart time is not 1m or 1h
 	const userSettings = $userSettings.get()
 	const chartWrapRef = useRef<HTMLDivElement>(null)
-	const [details, setDetails] = useState<SystemDetailsRecord>({} as SystemDetailsRecord)
+	const [isPodman, setIsPodman] = useState(system.info?.p ?? false)

 	useEffect(() => {
 		return () => {
@@ -177,7 +176,6 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 			persistChartTime.current = false
 			setSystemStats([])
 			setContainerData([])
-			setDetails({} as SystemDetailsRecord)
 			$containerFilter.set("")
 		}
 	}, [id])
@@ -205,23 +203,8 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 		}
 	}, [system?.info?.v])

-	// fetch system details
-	useEffect(() => {
-		// if system.info.m exists, agent is old version without system details
-		if (!system.id || system.info?.m) {
-			return
-		}
-		pb.collection<SystemDetailsRecord>("system_details")
-			.getOne(system.id, {
-				fields: "hostname,kernel,cores,threads,cpu,os,os_name,arch,memory,podman",
-				headers: {
-					"Cache-Control": "public, max-age=60",
-				},
-			})
-			.then(setDetails)
-	}, [system.id])
-
 	// subscribe to realtime metrics if chart time is 1m
+	// biome-ignore lint/correctness/useExhaustiveDependencies: not necessary
 	useEffect(() => {
 		let unsub = () => {}
 		if (!system.id || chartTime !== "1m") {
@@ -259,6 +242,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 		}
 	}, [chartTime, system.id])

+	// biome-ignore lint/correctness/useExhaustiveDependencies: not necessary
 	const chartData: ChartData = useMemo(() => {
 		const lastCreated = Math.max(
 			(systemStats.at(-1)?.created as number) ?? 0,
@@ -298,6 +282,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 	}, [])

 	// get stats
+	// biome-ignore lint/correctness/useExhaustiveDependencies: not necessary
 	useEffect(() => {
 		if (!system.id || !chartTime || chartTime === "1m") {
 			return
@@ -337,6 +322,10 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 		})
 	}, [system, chartTime])

+	useEffect(() => {
+		setIsPodman(system.info?.p ?? false)
+	}, [system.info?.p])
+
 	/** Space for tooltip if more than 10 sensors and no containers table */
 	useEffect(() => {
 		const sensors = Object.keys(systemStats.at(-1)?.stats.t ?? {})
@@ -400,42 +389,16 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 	const containerFilterBar = containerData.length ? <FilterBar /> : null

 	const dataEmpty = !chartLoading && chartData.systemStats.length === 0
-	const lastGpus = systemStats.at(-1)?.stats?.g
-
-	let hasGpuData = false
-	let hasGpuEnginesData = false
-	let hasGpuPowerData = false
-
-	if (lastGpus) {
-		// check if there are any GPUs with engines
-		for (const id in lastGpus) {
-			hasGpuData = true
-			if (lastGpus[id].e !== undefined) {
-				hasGpuEnginesData = true
-				break
-			}
-		}
-		// check if there are any GPUs with power data
-		for (let i = 0; i < systemStats.length && !hasGpuPowerData; i++) {
-			const gpus = systemStats[i].stats?.g
-			if (!gpus) continue
-			for (const id in gpus) {
-				if (gpus[id].p !== undefined || gpus[id].pp !== undefined) {
-					hasGpuPowerData = true
-					break
-				}
-			}
-		}
-	}
-
-	const isLinux = !(details?.os ?? system.info?.os)
-	const isPodman = details?.podman ?? system.info?.p ?? false
+	const lastGpuVals = Object.values(systemStats.at(-1)?.stats.g ?? {})
+	const hasGpuData = lastGpuVals.length > 0
+	const hasGpuPowerData = lastGpuVals.some((gpu) => gpu.p !== undefined || gpu.pp !== undefined)
+	const hasGpuEnginesData = lastGpuVals.some((gpu) => gpu.e !== undefined)

 	return (
 		<>
 			<div ref={chartWrapRef} className="grid gap-4 mb-14 overflow-x-clip">
 				{/* system info */}
-				<InfoBar system={system} chartData={chartData} grid={grid} setGrid={setGrid} details={details} />
+				<InfoBar system={system} chartData={chartData} grid={grid} setGrid={setGrid} setIsPodman={setIsPodman} />

 				{/* <Tabs defaultValue="overview" className="w-full">
 					<TabsList className="w-full h-11">
@@ -739,65 +702,64 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 								<GpuEnginesChart chartData={chartData} />
 							</ChartCard>
 						)}
-						{lastGpus &&
-							Object.keys(lastGpus).map((id) => {
-								const gpu = lastGpus[id] as GPUData
-								return (
-									<div key={id} className="contents">
+						{Object.keys(systemStats.at(-1)?.stats.g ?? {}).map((id) => {
+							const gpu = systemStats.at(-1)?.stats.g?.[id] as GPUData
+							return (
+								<div key={id} className="contents">
+									<ChartCard
+										className={cn(grid && "!col-span-1")}
+										empty={dataEmpty}
+										grid={grid}
+										title={`${gpu.n} ${t`Usage`}`}
+										description={t`Average utilization of ${gpu.n}`}
+									>
+										<AreaChartDefault
+											chartData={chartData}
+											dataPoints={[
+												{
+													label: t`Usage`,
+													dataKey: ({ stats }) => stats?.g?.[id]?.u ?? 0,
+													color: 1,
+													opacity: 0.35,
+												},
+											]}
+											tickFormatter={(val) => `${toFixedFloat(val, 2)}%`}
+											contentFormatter={({ value }) => `${decimalString(value)}%`}
+										/>
+									</ChartCard>
+
+									{(gpu.mt ?? 0) > 0 && (
 										<ChartCard
-											className={cn(grid && "!col-span-1")}
 											empty={dataEmpty}
 											grid={grid}
-											title={`${gpu.n} ${t`Usage`}`}
-											description={t`Average utilization of ${gpu.n}`}
+											title={`${gpu.n} VRAM`}
+											description={t`Precise utilization at the recorded time`}
 										>
 											<AreaChartDefault
 												chartData={chartData}
 												dataPoints={[
 													{
 														label: t`Usage`,
-														dataKey: ({ stats }) => stats?.g?.[id]?.u ?? 0,
-														color: 1,
-														opacity: 0.35,
+														dataKey: ({ stats }) => stats?.g?.[id]?.mu ?? 0,
+														color: 2,
+														opacity: 0.25,
 													},
 												]}
-												tickFormatter={(val) => `${toFixedFloat(val, 2)}%`}
-												contentFormatter={({ value }) => `${decimalString(value)}%`}
+												max={gpu.mt}
+												tickFormatter={(val) => {
+													const { value, unit } = formatBytes(val, false, Unit.Bytes, true)
+													return `${toFixedFloat(value, value >= 10 ? 0 : 1)} ${unit}`
+												}}
+												contentFormatter={({ value }) => {
+													const { value: convertedValue, unit } = formatBytes(value, false, Unit.Bytes, true)
+													return `${decimalString(convertedValue)} ${unit}`
+												}}
 											/>
 										</ChartCard>
-
-										{(gpu.mt ?? 0) > 0 && (
-											<ChartCard
-												empty={dataEmpty}
-												grid={grid}
-												title={`${gpu.n} VRAM`}
-												description={t`Precise utilization at the recorded time`}
-											>
-												<AreaChartDefault
-													chartData={chartData}
-													dataPoints={[
-														{
-															label: t`Usage`,
-															dataKey: ({ stats }) => stats?.g?.[id]?.mu ?? 0,
-															color: 2,
-															opacity: 0.25,
-														},
-													]}
-													max={gpu.mt}
-													tickFormatter={(val) => {
-														const { value, unit } = formatBytes(val, false, Unit.Bytes, true)
-														return `${toFixedFloat(value, value >= 10 ? 0 : 1)} ${unit}`
-													}}
-													contentFormatter={({ value }) => {
-														const { value: convertedValue, unit } = formatBytes(value, false, Unit.Bytes, true)
-														return `${decimalString(convertedValue)} ${unit}`
-													}}
-												/>
-											</ChartCard>
-										)}
-									</div>
-								)
-							})}
+									)}
+								</div>
+							)
+						})}
 					</div>
 				)}

@@ -879,7 +841,7 @@ export default memo(function SystemDetail({ id }: { id: string }) {
 					<LazyContainersTable systemId={system.id} />
 				)}

-				{isLinux && compareSemVer(chartData.agentVersion, parseSemVer("0.16.0")) >= 0 && (
+				{system.info?.os === Os.Linux && compareSemVer(chartData.agentVersion, parseSemVer("0.16.0")) >= 0 && (
 					<LazySystemdTable systemId={system.id} />
 				)}
 			</div>
--- a/internal/site/src/components/routes/system/info-bar.tsx
+++ b/internal/site/src/components/routes/system/info-bar.tsx
@@ -11,13 +11,14 @@ import {
 	MonitorIcon,
 	Rows,
 } from "lucide-react"
-import { useMemo } from "react"
+import { useEffect, useMemo, useState } from "react"
 import ChartTimeSelect from "@/components/charts/chart-time-select"
 import { Button } from "@/components/ui/button"
 import { Card } from "@/components/ui/card"
 import { FreeBsdIcon, TuxIcon, WebSocketIcon, WindowsIcon } from "@/components/ui/icons"
 import { Separator } from "@/components/ui/separator"
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip"
+import { pb } from "@/lib/api"
 import { ConnectionType, connectionTypeLabels, Os, SystemStatus } from "@/lib/enums"
 import { cn, formatBytes, getHostDisplayValue, secondsToString, toFixedFloat } from "@/lib/utils"
 import type { ChartData, SystemDetailsRecord, SystemRecord } from "@/types"
@@ -27,15 +28,44 @@ export default function InfoBar({
 	chartData,
 	grid,
 	setGrid,
-	details,
+	setIsPodman,
 }: {
 	system: SystemRecord
 	chartData: ChartData
 	grid: boolean
 	setGrid: (grid: boolean) => void
-	details: SystemDetailsRecord | null
+	setIsPodman: (isPodman: boolean) => void
 }) {
 	const { t } = useLingui()
+	const [details, setDetails] = useState<SystemDetailsRecord | null>(null)
+
+	// Fetch system_details on mount / when system changes
+	useEffect(() => {
+		let active = true
+		setDetails(null)
+		// skip fetching system details if agent is older version which includes details in Info struct
+		if (!system.id || system.info?.m) {
+			return
+		}
+		pb.collection<SystemDetailsRecord>("system_details")
+			.getOne(system.id, {
+				fields: "hostname,kernel,cores,threads,cpu,os,os_name,arch,memory,podman",
+				headers: {
+					"Cache-Control": "public, max-age=60",
+				},
+			})
+			.then((details) => {
+				if (active) {
+					setDetails(details)
+					setIsPodman(details.podman)
+				}
+			})
+			.catch(() => {})
+
+		return () => {
+			active = false
+		}
+	}, [system.id])

 	// values for system info bar - use details with fallback to system.info
 	const systemInfo = useMemo(() => {
--- a/internal/site/src/components/routes/system/smart-table.tsx
+++ b/internal/site/src/components/routes/system/smart-table.tsx
@@ -93,15 +93,51 @@ export const smartColumns: ColumnDef<SmartAttribute>[] = [
 	},
 ]

+export type DiskInfo = {
+	id: string
+	system: string
+	device: string
+	model: string
+	capacity: string
+	status: string
+	temperature: number
+	deviceType: string
+	powerOnHours?: number
+	powerCycles?: number
+	attributes?: SmartAttribute[]
+	updated: string
+}
+
 // Function to format capacity display
 function formatCapacity(bytes: number): string {
 	const { value, unit } = formatBytes(bytes)
 	return `${toFixedFloat(value, value >= 10 ? 1 : 2)} ${unit}`
 }

+// Function to convert SmartDeviceRecord to DiskInfo
+function convertSmartDeviceRecordToDiskInfo(records: SmartDeviceRecord[]): DiskInfo[] {
+	const unknown = "Unknown"
+	return records.map((record) => ({
+		id: record.id,
+		system: record.system,
+		device: record.name || unknown,
+		model: record.model || unknown,
+		serialNumber: record.serial || unknown,
+		firmwareVersion: record.firmware || unknown,
+		capacity: record.capacity ? formatCapacity(record.capacity) : unknown,
+		status: record.state || unknown,
+		temperature: record.temp || 0,
+		deviceType: record.type || unknown,
+		attributes: record.attributes,
+		updated: record.updated,
+		powerOnHours: record.hours,
+		powerCycles: record.cycles,
+	}))
+}
+
 const SMART_DEVICE_FIELDS = "id,system,name,model,state,capacity,temp,type,hours,cycles,updated"

-export const columns: ColumnDef<SmartDeviceRecord>[] = [
+export const columns: ColumnDef<DiskInfo>[] = [
 	{
 		id: "system",
 		accessorFn: (record) => record.system,
@@ -118,12 +154,12 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 		},
 	},
 	{
-		accessorKey: "name",
-		sortingFn: (a, b) => a.original.name.localeCompare(b.original.name),
+		accessorKey: "device",
+		sortingFn: (a, b) => a.original.device.localeCompare(b.original.device),
 		header: ({ column }) => <HeaderButton column={column} name={t`Device`} Icon={HardDrive} />,
-		cell: ({ getValue }) => (
-			<div className="font-medium max-w-40 truncate ms-1.5" title={getValue() as string}>
-				{getValue() as string}
+		cell: ({ row }) => (
+			<div className="font-medium max-w-40 truncate ms-1.5" title={row.getValue("device")}>
+				{row.getValue("device")}
 			</div>
 		),
 	},
@@ -131,20 +167,19 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 		accessorKey: "model",
 		sortingFn: (a, b) => a.original.model.localeCompare(b.original.model),
 		header: ({ column }) => <HeaderButton column={column} name={t`Model`} Icon={Box} />,
-		cell: ({ getValue }) => (
-			<div className="max-w-48 truncate ms-1.5" title={getValue() as string}>
-				{getValue() as string}
+		cell: ({ row }) => (
+			<div className="max-w-48 truncate ms-1.5" title={row.getValue("model")}>
+				{row.getValue("model")}
 			</div>
 		),
 	},
 	{
 		accessorKey: "capacity",
-		invertSorting: true,
 		header: ({ column }) => <HeaderButton column={column} name={t`Capacity`} Icon={BinaryIcon} />,
-		cell: ({ getValue }) => <span className="ms-1.5">{formatCapacity(getValue() as number)}</span>,
+		cell: ({ getValue }) => <span className="ms-1.5">{getValue() as string}</span>,
 	},
 	{
-		accessorKey: "state",
+		accessorKey: "status",
 		header: ({ column }) => <HeaderButton column={column} name={t`Status`} Icon={Activity} />,
 		cell: ({ getValue }) => {
 			const status = getValue() as string
@@ -156,8 +191,8 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 		},
 	},
 	{
-		accessorKey: "type",
-		sortingFn: (a, b) => a.original.type.localeCompare(b.original.type),
+		accessorKey: "deviceType",
+		sortingFn: (a, b) => a.original.deviceType.localeCompare(b.original.deviceType),
 		header: ({ column }) => <HeaderButton column={column} name={t`Type`} Icon={ArrowLeftRightIcon} />,
 		cell: ({ getValue }) => (
 			<div className="ms-1.5">
@@ -168,7 +203,7 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 		),
 	},
 	{
-		accessorKey: "hours",
+		accessorKey: "powerOnHours",
 		invertSorting: true,
 		header: ({ column }) => (
 			<HeaderButton column={column} name={t({ message: "Power On", comment: "Power On Time" })} Icon={Clock} />
@@ -188,7 +223,7 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 		},
 	},
 	{
-		accessorKey: "cycles",
+		accessorKey: "powerCycles",
 		invertSorting: true,
 		header: ({ column }) => (
 			<HeaderButton column={column} name={t({ message: "Cycles", comment: "Power Cycles" })} Icon={RotateCwIcon} />
@@ -202,7 +237,7 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 		},
 	},
 	{
-		accessorKey: "temp",
+		accessorKey: "temperature",
 		invertSorting: true,
 		header: ({ column }) => <HeaderButton column={column} name={t`Temp`} Icon={ThermometerIcon} />,
 		cell: ({ getValue }) => {
@@ -211,14 +246,14 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 		},
 	},
 	// {
-	// 	accessorKey: "serial",
-	// 	sortingFn: (a, b) => a.original.serial.localeCompare(b.original.serial),
+	// 	accessorKey: "serialNumber",
+	// 	sortingFn: (a, b) => a.original.serialNumber.localeCompare(b.original.serialNumber),
 	// 	header: ({ column }) => <HeaderButton column={column} name={t`Serial Number`} Icon={HashIcon} />,
 	// 	cell: ({ getValue }) => <span className="ms-1.5">{getValue() as string}</span>,
 	// },
 	// {
-	// 	accessorKey: "firmware",
-	// 	sortingFn: (a, b) => a.original.firmware.localeCompare(b.original.firmware),
+	// 	accessorKey: "firmwareVersion",
+	// 	sortingFn: (a, b) => a.original.firmwareVersion.localeCompare(b.original.firmwareVersion),
 	// 	header: ({ column }) => <HeaderButton column={column} name={t`Firmware`} Icon={CpuIcon} />,
 	// 	cell: ({ getValue }) => <span className="ms-1.5">{getValue() as string}</span>,
 	// },
@@ -237,15 +272,7 @@ export const columns: ColumnDef<SmartDeviceRecord>[] = [
 	},
 ]

-function HeaderButton({
-	column,
-	name,
-	Icon,
-}: {
-	column: Column<SmartDeviceRecord>
-	name: string
-	Icon: React.ElementType
-}) {
+function HeaderButton({ column, name, Icon }: { column: Column<DiskInfo>; name: string; Icon: React.ElementType }) {
 	const isSorted = column.getIsSorted()
 	return (
 		<Button
@@ -263,7 +290,7 @@ function HeaderButton({
 }

 export default function DisksTable({ systemId }: { systemId?: string }) {
-	const [sorting, setSorting] = useState<SortingState>([{ id: systemId ? "name" : "system", desc: false }])
+	const [sorting, setSorting] = useState<SortingState>([{ id: systemId ? "device" : "system", desc: false }])
 	const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([])
 	const [rowSelection, setRowSelection] = useState({})
 	const [smartDevices, setSmartDevices] = useState<SmartDeviceRecord[] | undefined>(undefined)
@@ -272,95 +299,96 @@ export default function DisksTable({ systemId }: { systemId?: string }) {
 	const [rowActionState, setRowActionState] = useState<{ type: "refresh" | "delete"; id: string } | null>(null)
 	const [globalFilter, setGlobalFilter] = useState("")

-	const openSheet = (disk: SmartDeviceRecord) => {
+	const openSheet = (disk: DiskInfo) => {
 		setActiveDiskId(disk.id)
 		setSheetOpen(true)
 	}

-	// Fetch smart devices
-	useEffect(() => {
-		const controller = new AbortController()
-
+	// Fetch smart devices from collection (without attributes to save bandwidth)
+	const fetchSmartDevices = useCallback(() => {
 		pb.collection<SmartDeviceRecord>("smart_devices")
 			.getFullList({
 				filter: systemId ? pb.filter("system = {:system}", { system: systemId }) : undefined,
 				fields: SMART_DEVICE_FIELDS,
-				signal: controller.signal,
 			})
-			.then(setSmartDevices)
-			.catch((err) => {
-				if (!err.isAbort) {
-					setSmartDevices([])
-				}
+			.then((records) => {
+				setSmartDevices(records)
 			})
-
-		return () => controller.abort()
+			.catch(() => setSmartDevices([]))
 	}, [systemId])

-	// Subscribe to updates
+	// Fetch smart devices when component mounts or systemId changes
+	useEffect(() => {
+		fetchSmartDevices()
+	}, [fetchSmartDevices])
+
+	// Subscribe to live updates so rows add/remove without manual refresh/filtering
 	useEffect(() => {
 		let unsubscribe: (() => void) | undefined
 		const pbOptions = systemId
 			? { fields: SMART_DEVICE_FIELDS, filter: pb.filter("system = {:system}", { system: systemId }) }
 			: { fields: SMART_DEVICE_FIELDS }

-			; (async () => {
-				try {
-					unsubscribe = await pb.collection("smart_devices").subscribe(
-						"*",
-						(event) => {
-							const record = event.record as SmartDeviceRecord
-							setSmartDevices((currentDevices) => {
-								const devices = currentDevices ?? []
-								const matchesSystemScope = !systemId || record.system === systemId
+		;(async () => {
+			try {
+				unsubscribe = await pb.collection("smart_devices").subscribe(
+					"*",
+					(event) => {
+						const record = event.record as SmartDeviceRecord
+						setSmartDevices((currentDevices) => {
+							const devices = currentDevices ?? []
+							const matchesSystemScope = !systemId || record.system === systemId

-								if (event.action === "delete") {
-									return devices.filter((device) => device.id !== record.id)
-								}
+							if (event.action === "delete") {
+								return devices.filter((device) => device.id !== record.id)
+							}

-								if (!matchesSystemScope) {
-									// Record moved out of scope; ensure it disappears locally.
-									return devices.filter((device) => device.id !== record.id)
-								}
+							if (!matchesSystemScope) {
+								// Record moved out of scope; ensure it disappears locally.
+								return devices.filter((device) => device.id !== record.id)
+							}

-								const existingIndex = devices.findIndex((device) => device.id === record.id)
-								if (existingIndex === -1) {
-									return [record, ...devices]
-								}
+							const existingIndex = devices.findIndex((device) => device.id === record.id)
+							if (existingIndex === -1) {
+								return [record, ...devices]
+							}

-								const next = [...devices]
-								next[existingIndex] = record
-								return next
-							})
-						},
-						pbOptions
-					)
-				} catch (error) {
-					console.error("Failed to subscribe to SMART device updates:", error)
-				}
-			})()
+							const next = [...devices]
+							next[existingIndex] = record
+							return next
+						})
+					},
+					pbOptions
+				)
+			} catch (error) {
+				console.error("Failed to subscribe to SMART device updates:", error)
+			}
+		})()

 		return () => {
 			unsubscribe?.()
 		}
 	}, [systemId])

-	const handleRowRefresh = useCallback(async (disk: SmartDeviceRecord) => {
-		if (!disk.system) return
-		setRowActionState({ type: "refresh", id: disk.id })
-		try {
-			await pb.send("/api/beszel/smart/refresh", {
-				method: "POST",
-				query: { system: disk.system },
-			})
-		} catch (error) {
-			console.error("Failed to refresh SMART device:", error)
-		} finally {
-			setRowActionState((state) => (state?.id === disk.id ? null : state))
-		}
-	}, [])
+	const handleRowRefresh = useCallback(
+		async (disk: DiskInfo) => {
+			if (!disk.system) return
+			setRowActionState({ type: "refresh", id: disk.id })
+			try {
+				await pb.send("/api/beszel/smart/refresh", {
+					method: "POST",
+					query: { system: disk.system },
+				})
+			} catch (error) {
+				console.error("Failed to refresh SMART device:", error)
+			} finally {
+				setRowActionState((state) => (state?.id === disk.id ? null : state))
+			}
+		},
+		[fetchSmartDevices]
+	)

-	const handleDeleteDevice = useCallback(async (disk: SmartDeviceRecord) => {
+	const handleDeleteDevice = useCallback(async (disk: DiskInfo) => {
 		setRowActionState({ type: "delete", id: disk.id })
 		try {
 			await pb.collection("smart_devices").delete(disk.id)
@@ -372,7 +400,7 @@ export default function DisksTable({ systemId }: { systemId?: string }) {
 		}
 	}, [])

-	const actionColumn = useMemo<ColumnDef<SmartDeviceRecord>>(
+	const actionColumn = useMemo<ColumnDef<DiskInfo>>(
 		() => ({
 			id: "actions",
 			enableSorting: false,
@@ -440,8 +468,13 @@ export default function DisksTable({ systemId }: { systemId?: string }) {
 		return [...baseColumns, actionColumn]
 	}, [systemId, actionColumn])

+	// Convert SmartDeviceRecord to DiskInfo
+	const diskData = useMemo(() => {
+		return smartDevices ? convertSmartDeviceRecordToDiskInfo(smartDevices) : []
+	}, [smartDevices])
+
 	const table = useReactTable({
-		data: smartDevices || ([] as SmartDeviceRecord[]),
+		data: diskData,
 		columns: tableColumns,
 		onSortingChange: setSorting,
 		onColumnFiltersChange: setColumnFilters,
@@ -459,10 +492,10 @@ export default function DisksTable({ systemId }: { systemId?: string }) {
 		globalFilterFn: (row, _columnId, filterValue) => {
 			const disk = row.original
 			const systemName = $allSystemsById.get()[disk.system]?.name ?? ""
-			const device = disk.name ?? ""
+			const device = disk.device ?? ""
 			const model = disk.model ?? ""
-			const status = disk.state ?? ""
-			const type = disk.type ?? ""
+			const status = disk.status ?? ""
+			const type = disk.deviceType ?? ""
 			const searchString = `${systemName} ${device} ${model} ${status} ${type}`.toLowerCase()
 			return (filterValue as string)
 				.toLowerCase()
@@ -472,7 +505,7 @@ export default function DisksTable({ systemId }: { systemId?: string }) {
 	})

 	// Hide the table on system pages if there's no data, but always show on global page
-	if (systemId && !smartDevices?.length && !columnFilters.length) {
+	if (systemId && !diskData.length && !columnFilters.length) {
 		return null
 	}

--- a/internal/site/src/components/systems-table/systems-table-columns.tsx
+++ b/internal/site/src/components/systems-table/systems-table-columns.tsx
@@ -287,12 +287,12 @@ export function SystemsTableColumns(viewMode: "table" | "grid"): ColumnDef<Syste
 					return null
 				}

+				const iconColor = pct < 10 ? "text-red-500" : pct < 25 ? "text-yellow-500" : "text-muted-foreground"
+
 				let Icon = PlugChargingIcon
-				let iconColor = "text-muted-foreground"

 				if (state !== BatteryState.Charging) {
 					if (pct < 25) {
-						iconColor = pct < 11 ? "text-red-500" : "text-yellow-500"
 						Icon = BatteryLowIcon
 					} else if (pct < 75) {
 						Icon = BatteryMediumIcon
--- a/internal/site/src/components/ui/icons.tsx
+++ b/internal/site/src/components/ui/icons.tsx
@@ -154,7 +154,7 @@ export function BatteryMediumIcon(props: SVGProps<SVGSVGElement>) {
 export function BatteryLowIcon(props: SVGProps<SVGSVGElement>) {
 	return (
 		<svg viewBox="0 0 24 24" {...props} fill="currentColor">
-			<path d="M16 17H8V6h8m.7-2H15V2H9v2H7.3A1.3 1.3 0 0 0 6 5.3v15.4q.1 1.2 1.3 1.3h9.4a1.3 1.3 0 0 0 1.3-1.3V5.3q-.1-1.2-1.3-1.3" />
+			<path d="M16 20H8V6h8m.67-2H15V2H9v2H7.33C6.6 4 6 4.6 6 5.33v15.34C6 21.4 6.6 22 7.33 22h9.34c.74 0 1.33-.59 1.33-1.33V5.33C18 4.6 17.4 4 16.67 4M15 16H9v3h6zm0-4.5H9v3h6z" />
 		</svg>
 	)
 }
--- a/supplemental/CHANGELOG.md
+++ b/supplemental/CHANGELOG.md
@@ -1,14 +1,8 @@
 ## 0.18.0

- Collect S.M.A.R.T. data in the background every hour.
+- Remove `la1`, `la5`, `la15` fields from `Info` struct in favor of `la` array.

- Add `SMART_INTERVAL` environment variable to customize S.M.A.R.T. data collection interval.
-
- Collect system distribution and architecture.
-
- Add `system_details` collection to store infrequently updated system information.
-
- Skip known non-unique product UUID when generating fingerprints. (#1556)
+- Remove `MB` bandwidth values in favor of bytes.

 ## 0.17.0
Author	SHA1	Message	Date
henrygd	330d375997	change to atomic.bool for fetching details / smart	2025-12-18 15:02:59 -05:00
henrygd	8627e3ee97	updates	2025-12-18 12:34:11 -05:00
henrygd	5d04ee5a65	consolidate info bar data	2025-12-17 19:03:31 -05:00
henrygd	d93067ec34	updates	2025-12-17 17:32:59 -05:00
henrygd	82bd953941	add arch	2025-12-16 18:33:32 -05:00
henrygd	996444abeb	update	2025-12-16 17:45:26 -05:00
henrygd	aef4baff5e	rm index	2025-12-15 18:59:25 -05:00
henrygd	3dea061e93	progress	2025-12-15 18:29:51 -05:00