@livedesk/hub 0.1.14 → 0.1.16

package/src/remote-hub.js

@@ -644,15 +644,27 @@ function safeTaskData(value) {
     }
 }
 
-function normalizeApprovalLevel(value) {
-    const level = safeString(value, 80).toLowerCase();
-    if (level === 'read-only') {
-        return 'read-only';
-    }
-    return level === 'ai-assist' ? 'ai-assist' : 'task-only';
-}
-
-const SUPPORTED_AGENT_OPERATIONS = new Set([
+function normalizeApprovalLevel(value) {
+    const level = safeString(value, 80).toLowerCase();
+    if (level === 'read-only') {
+        return 'read-only';
+    }
+    return 'task-only';
+}
+
+const RETIRED_AGENT_TASK_ERROR = 'agent-ai-assist-retired';
+
+function getRetiredAgentTaskError(options = {}) {
+    const approvalLevel = safeString(options?.approvalLevel, 80).toLowerCase();
+    const hasModelSelection = options
+        && typeof options === 'object'
+        && Object.prototype.hasOwnProperty.call(options, 'model');
+    return approvalLevel === 'ai-assist' || hasModelSelection
+        ? RETIRED_AGENT_TASK_ERROR
+        : '';
+}
+
+const SUPPORTED_AGENT_OPERATIONS = new Set([
     'system.health',
     'gpu.status',
     'disk.status',
@@ -2586,13 +2598,12 @@ export function createRemoteHub(options = {}) {
         const count = clampNumber(options.count, 1, MAX_SYNTHETIC_DEVICES, 250);
         const connectedRatio = Math.max(0, Math.min(1, Number(options.connectedRatio ?? 0.88)));
         const thumbnailRatio = Math.max(0, Math.min(1, Number(options.thumbnailRatio ?? 0.7)));
-        const aiAssistRatio = Math.max(0, Math.min(1, Number(options.aiAssistRatio ?? 0.35)));
-        const liveCount = clampNumber(options.liveCount, 0, Math.min(count, 24), Math.min(6, count));
+        const liveCount = clampNumber(options.liveCount, 0, Math.min(count, 24), Math.min(6, count));
         const replace = options.replace !== false;
         const now = new Date();
         const platforms = ['win32', 'linux', 'darwin'];
         const machineKinds = ['Mac mini', 'Mini PC', 'Client', 'Render node', 'Dev box'];
-        const workloadRoles = ['LLM worker', 'Image worker', 'Video worker', 'Idle reserve', 'Build worker'];
+        const workloadRoles = ['Office computer', 'Media workstation', 'Development machine', 'Idle machine', 'Build machine'];
         const gpuNames = ['Apple M-series GPU', 'NVIDIA RTX local', 'Radeon Pro', 'Intel Arc', 'Integrated GPU'];
         const npuNames = ['Apple Neural Engine', 'Ryzen AI NPU', 'Intel AI Boost', 'Qualcomm Hexagon', 'NPU not present'];
 
@@ -2601,15 +2612,13 @@ export function createRemoteHub(options = {}) {
         }
 
         let connected = 0;
-        let aiAssist = 0;
-        let live = 0;
+        let live = 0;
         for (let index = 0; index < count; index += 1) {
             const ordinal = index + 1;
             const deviceId = `synthetic-${String(ordinal).padStart(4, '0')}`;
             const isConnected = index / count < connectedRatio;
             const hasThumbnail = index / count < thumbnailRatio;
-            const hasAiAssist = index / count < aiAssistRatio;
-            const isLive = isConnected && index < liveCount;
+            const isLive = isConnected && index < liveCount;
             const seenAt = new Date(now.getTime() - index * 1350).toISOString();
             const connectedAt = new Date(now.getTime() - (index + 8) * 60000).toISOString();
             const platform = platforms[index % platforms.length];
@@ -2631,9 +2640,7 @@ export function createRemoteHub(options = {}) {
             const npuTops = index % 5 === 4 ? 0 : platform === 'darwin' ? 38 : index % 2 === 0 ? 45 : 16;
             const machineKind = machineKinds[index % machineKinds.length];
             const workloadRole = workloadRoles[index % workloadRoles.length];
-            const toolBusy = index % 9 === 0;
-            const toolOnline = index % 4 !== 3;
-            const taskStatus = index % 17 === 0
+            const taskStatus = index % 17 === 0
                 ? 'failed'
                 : index % 5 === 0
                     ? 'completed'
@@ -2647,18 +2654,16 @@ export function createRemoteHub(options = {}) {
                     title: taskStatus === 'failed' ? 'Synthetic issue check' : 'Synthetic status task',
                     instructionPreview: 'Synthetic fleet scale validation task.',
                     status: taskStatus,
-                    approvalLevel: hasAiAssist ? 'ai-assist' : 'task-only',
+                    approvalLevel: 'task-only',
                     requestedAt: seenAt,
                     sentAt: seenAt,
                     updatedAt: seenAt,
-                    completedAt: taskStatus === 'completed' || taskStatus === 'failed' ? seenAt : '',
-                    error: taskStatus === 'failed' ? 'Synthetic task failure sample.' : '',
-                    resultKind: 'synthetic-agent-task',
-                    resultModel: hasAiAssist ? 'synthetic-ai' : '',
-                    resultResponseId: hasAiAssist ? `synthetic-response-${ordinal}` : '',
-                    resultSummary: taskStatus === 'failed'
-                        ? 'Synthetic task reported a sample issue.'
-                        : 'Synthetic task completed for scale validation.'
+                    completedAt: taskStatus === 'completed' || taskStatus === 'failed' ? seenAt : '',
+                    error: taskStatus === 'failed' ? 'Synthetic task failure sample.' : '',
+                    resultKind: 'synthetic-agent-task',
+                    resultSummary: taskStatus === 'failed'
+                        ? 'Synthetic task reported a sample issue.'
+                        : 'Synthetic task completed for scale validation.'
                 }
                 : null;
             const device = {
@@ -2677,11 +2682,8 @@ export function createRemoteHub(options = {}) {
                     thumbnail: hasThumbnail,
                     control: false,
                     liveStream: true,
-                    computerAgent: true,
-                    taskDispatch: true,
-                    aiAssist: hasAiAssist,
-                    aiModel: hasAiAssist ? 'synthetic-ai' : '',
-                    aiProvider: hasAiAssist ? 'synthetic' : ''
+                    computerAgent: true,
+                    taskDispatch: true
                 },
                 connected: isConnected,
                 connectedAt: isConnected ? connectedAt : '',
@@ -2740,31 +2742,12 @@ export function createRemoteHub(options = {}) {
                         txMbps: 12 + ((index * 17) % 220),
                         usageRatio: Number(Math.min(0.94, ((index * 9) % 81) / 100).toFixed(2))
                     },
-                    workload: {
-                        role: workloadRole,
-                        status: taskStatus || (toolBusy ? 'running' : 'idle'),
-                        title: taskStatus ? 'Fleet validation task' : toolBusy ? 'Processing local job' : 'idle',
-                        summary: taskStatus ? 'Synthetic status for fleet-scale validation.' : ''
-                    },
-                    tools: {
-                        ollama: {
-                            status: toolOnline ? (toolBusy ? 'busy' : 'online') : 'offline',
-                            port: 11434,
-                            version: toolOnline ? 'local' : ''
-                        },
-                        lmStudio: {
-                            status: index % 5 === 0 ? 'online' : 'offline',
-                            port: 1234
-                        },
-                        comfyui: {
-                            status: index % 3 === 0 ? (toolBusy ? 'busy' : 'online') : 'offline',
-                            port: 8188
-                        },
-                        stableDiffusion: {
-                            status: index % 7 === 0 ? 'online' : 'offline',
-                            port: 7860
-                        }
-                    }
+                    workload: {
+                        role: workloadRole,
+                        status: taskStatus || 'idle',
+                        title: taskStatus ? 'Fleet validation task' : 'idle',
+                        summary: taskStatus ? 'Synthetic status for fleet-scale validation.' : ''
+                    }
                 },
                 latestThumbnail: null,
                 latestLiveFrame: null,
@@ -2839,25 +2822,20 @@ export function createRemoteHub(options = {}) {
             if (isConnected) {
                 connected += 1;
             }
-            if (hasAiAssist) {
-                aiAssist += 1;
-            }
-            devices.set(deviceId, device);
+            devices.set(deviceId, device);
         }
 
         emitRemoteEvent('RemoteSyntheticFleetSeeded', null, {
-            count,
-            connected,
-            aiAssist,
-            live
+            count,
+            connected,
+            live
         });
         return {
             ok: true,
             synthetic: true,
-            seeded: count,
-            connected,
-            aiAssist,
-            live,
+            seeded: count,
+            connected,
+            live,
             total: devices.size,
             max: MAX_SYNTHETIC_DEVICES
         };
@@ -3754,12 +3732,10 @@ export function createRemoteHub(options = {}) {
         task.updatedAt = now;
         task.completedAt = safeString(result?.completedAt, 80) || now;
         task.error = resultError;
-        task.resultSummary = resultError || summarizeTaskResult(result);
-        task.resultData = safeTaskData(result?.data);
-        task.resultKind = safeString(result?.kind || result?.mode || 'agent-task', 80);
-        task.resultModel = safeString(result?.model || result?.aiModel || '', 120);
-        task.resultResponseId = safeString(result?.responseId || result?.id || '', 160);
-        device.latestTask = task;
+        task.resultSummary = resultError || summarizeTaskResult(result);
+        task.resultData = safeTaskData(result?.data);
+        task.resultKind = safeString(result?.kind || result?.mode || 'agent-task', 80);
+        device.latestTask = task;
         device.pendingTaskCommands.delete(commandId);
         device.counters.taskResultsReceived += 1;
         if (status === 'failed') {
@@ -5862,9 +5838,13 @@ export function createRemoteHub(options = {}) {
     }
 
     function requestAgentTask(deviceId, options = {}) {
-        const device = devices.get(String(deviceId || ''));
-        const requestedOperation = safeString(options.operation, 80);
-        const operation = normalizeAgentOperation(requestedOperation);
+        const retiredRequestError = getRetiredAgentTaskError(options);
+        if (retiredRequestError) {
+            return { ok: false, error: retiredRequestError };
+        }
+        const device = devices.get(String(deviceId || ''));
+        const requestedOperation = safeString(options.operation, 80);
+        const operation = normalizeAgentOperation(requestedOperation);
         if (requestedOperation && !operation) {
             return { ok: false, error: 'unsupported-agent-operation' };
         }
@@ -5882,10 +5862,6 @@ export function createRemoteHub(options = {}) {
 
             const now = new Date().toISOString();
             const approvalLevel = normalizeApprovalLevel(options.approvalLevel);
-            if (approvalLevel === 'ai-assist' && !readCapabilityFlag(device.capabilities, 'aiAssist')) {
-                return { ok: false, error: 'device-ai-assist-unavailable' };
-            }
-
             const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
             const taskId = safeString(options.taskId, 128) || crypto.randomUUID();
             const title = safeString(options.title, 120)
@@ -5907,24 +5883,12 @@ export function createRemoteHub(options = {}) {
                 requestedAt: now,
                 sentAt: now,
                 updatedAt: now,
-                completedAt: now,
-                error: '',
-                resultKind: approvalLevel === 'ai-assist' ? 'synthetic-ai-assist' : 'synthetic-agent-task',
-                resultModel: approvalLevel === 'ai-assist'
-                    ? safeString(options.model, 120) || 'synthetic-ai'
-                    : '',
-                resultResponseId: approvalLevel === 'ai-assist'
-                    ? `synthetic-response-${taskId}`
-                    : '',
-                resultSummary: operation === 'process.list'
-                    ? (safeString(options.targetQuery, 160).toLowerCase() === 'comfyui'
-                        ? (device.status?.tools?.comfyui?.status === 'online'
-                            ? 'ComfyUI is running.'
-                            : 'ComfyUI is not running.')
-                        : 'Process list collected.')
-                    : approvalLevel === 'ai-assist'
-                        ? `Synthetic AI assist completed for ${device.deviceName}.`
-                        : `Synthetic task accepted by ${device.deviceName}.`,
+                completedAt: now,
+                error: '',
+                resultKind: 'synthetic-agent-task',
+                resultSummary: operation === 'process.list'
+                    ? 'Process list collected.'
+                    : `Synthetic task accepted by ${device.deviceName}.`,
                 resultData: undefined
             };
 
@@ -5964,10 +5928,6 @@ export function createRemoteHub(options = {}) {
 
         const now = new Date().toISOString();
         const approvalLevel = normalizeApprovalLevel(options.approvalLevel);
-        if (approvalLevel === 'ai-assist' && !readCapabilityFlag(device.capabilities, 'aiAssist')) {
-            return { ok: false, error: 'device-ai-assist-unavailable' };
-        }
-
         const commandId = safeString(options.commandId, 128) || crypto.randomUUID();
         const taskId = safeString(options.taskId, 128) || crypto.randomUUID();
         const title = safeString(options.title, 120)
@@ -5989,14 +5949,12 @@ export function createRemoteHub(options = {}) {
             requestedAt: now,
             sentAt: now,
             updatedAt: now,
-            completedAt: '',
-            error: '',
-            resultKind: '',
-            resultModel: '',
-             resultResponseId: '',
-             resultSummary: '',
-             resultData: undefined
-        };
+            completedAt: '',
+            error: '',
+            resultKind: '',
+            resultSummary: '',
+            resultData: undefined
+        };
 
         const commandName = operation || 'agent.task';
         const sent = writeJsonLine(device.socket, {
@@ -6012,8 +5970,7 @@ export function createRemoteHub(options = {}) {
                  toolArguments: options.toolArguments && typeof options.toolArguments === 'object' ? options.toolArguments : {},
                  permissionMode: safeString(options.permissionMode, 40) || 'ask',
                  approvalLevel,
-                model: safeString(options.model, 120),
-                requestedAt: now
+                requestedAt: now
             },
             issuedAt: now
         });
@@ -6035,15 +5992,26 @@ export function createRemoteHub(options = {}) {
             approvalLevel
         });
         return { ok: true, commandId, taskId, approvalLevel };
-    }
-
-    function requestAgentTaskBatch(deviceIds, options = {}) {
-        const targets = [...new Set((deviceIds || [])
-            .map(deviceId => safeString(deviceId, 128))
-            .filter(Boolean))]
-            .slice(0, 500);
-
-        if (targets.length === 0) {
+    }
+
+    function requestAgentTaskBatch(deviceIds, options = {}) {
+        const targets = [...new Set((deviceIds || [])
+            .map(deviceId => safeString(deviceId, 128))
+            .filter(Boolean))]
+            .slice(0, 500);
+        const retiredRequestError = getRetiredAgentTaskError(options);
+        if (retiredRequestError) {
+            return {
+                ok: false,
+                error: retiredRequestError,
+                total: targets.length,
+                queued: 0,
+                approvalLevel: normalizeApprovalLevel(options.approvalLevel),
+                results: []
+            };
+        }
+
+        if (targets.length === 0) {
             return {
                 ok: false,
                 error: 'no-target-devices',

package/src/server.js

@@ -1427,10 +1427,10 @@ function normalizeMonitorSelections(value) {
   return result;
 }
 
-function normalizeDeviceIds(value) {
-  const raw = Array.isArray(value)
-    ? value
-    : String(value || '').split(',');
+function normalizeDeviceIds(value) {
+  const raw = Array.isArray(value)
+    ? value
+    : String(value || '').split(',');
   const ids = [];
   const seen = new Set();
   for (const entry of raw) {
@@ -1444,10 +1444,24 @@ function normalizeDeviceIds(value) {
       break;
     }
   }
-  return ids;
-}
-
-function normalizeTransferFiles(value) {
+  return ids;
+}
+
+function rejectRetiredAgentTaskRequest(req, res) {
+  const body = req.body && typeof req.body === 'object' ? req.body : {};
+  const approvalLevel = String(body.approvalLevel || '').trim().toLowerCase();
+  const hasModelSelection = Object.prototype.hasOwnProperty.call(body, 'model');
+  if (approvalLevel !== 'ai-assist' && !hasModelSelection) {
+    return false;
+  }
+  res.status(400).json({
+    ok: false,
+    error: 'agent-ai-assist-retired'
+  });
+  return true;
+}
+
+function normalizeTransferFiles(value) {
   const rawFiles = Array.isArray(value) ? value : [];
   const files = [];
   let totalBytes = 0;
@@ -2985,7 +2999,7 @@ app.post('/api/settings/agent/run', async (req, res) => {
   noStore(res);
   try {
     if (!(await synchronizeAgentEnablement())) {
-      throw new AgentProviderError('agent-ai-disabled', 'Enable AI Agent in Settings before running commands.', { status: 409 });
+      throw new AgentProviderError('agent-ai-disabled', 'Enable Codex Agent in Settings before running commands.', { status: 409 });
     }
     const instruction = typeof req.body?.instruction === 'string' ? req.body.instruction.slice(0, 4000) : '';
     const deviceIds = normalizeDeviceIds(req.body?.deviceIds).slice(0, 500);
@@ -3775,12 +3789,11 @@ app.delete('/api/remote/host-target', async (req, res) => {
 
 app.post('/api/remote/synthetic/seed', (req, res) => {
   noStore(res);
-  res.json(remoteHub.seedSyntheticFleet({
-    count: req.body?.count,
-    connectedRatio: req.body?.connectedRatio,
-    thumbnailRatio: req.body?.thumbnailRatio,
-    aiAssistRatio: req.body?.aiAssistRatio,
-    liveCount: req.body?.liveCount,
+  res.json(remoteHub.seedSyntheticFleet({
+    count: req.body?.count,
+    connectedRatio: req.body?.connectedRatio,
+    thumbnailRatio: req.body?.thumbnailRatio,
+    liveCount: req.body?.liveCount,
     replace: req.body?.replace
   }));
 });
@@ -4075,42 +4088,41 @@ app.post('/api/remote/devices/:deviceId/quick-actions', requireHubFeatureAccess,
 });
 
 app.post('/api/remote/devices/:deviceId/tasks', requireHubFeatureAccess, (req, res) => {
-  noStore(res);
-  res.json(remoteHub.requestAgentTask(req.params.deviceId, {
+  noStore(res);
+  if (rejectRetiredAgentTaskRequest(req, res)) {
+    return;
+  }
+  res.json(remoteHub.requestAgentTask(req.params.deviceId, {
     instruction: req.body?.instruction,
     title: req.body?.title,
     taskId: req.body?.taskId,
     commandId: req.body?.commandId,
-    approvalLevel: req.body?.approvalLevel,
-    operation: req.body?.operation,
-    targetQuery: req.body?.targetQuery,
-    model: req.body?.model
+    approvalLevel: req.body?.approvalLevel,
+    operation: req.body?.operation,
+    targetQuery: req.body?.targetQuery
   }));
 });
 
-app.post('/api/remote/tasks', requireHubFeatureAccess, (req, res) => {
-  noStore(res);
-  const requestedIds = normalizeDeviceIds(req.body?.deviceIds);
-  const approvalLevel = req.body?.approvalLevel === 'ai-assist'
-    ? 'ai-assist'
-    : req.body?.approvalLevel === 'read-only'
-      ? 'read-only'
-      : 'task-only';
+app.post('/api/remote/tasks', requireHubFeatureAccess, (req, res) => {
+  noStore(res);
+  if (rejectRetiredAgentTaskRequest(req, res)) {
+    return;
+  }
+  const requestedIds = normalizeDeviceIds(req.body?.deviceIds);
+  const approvalLevel = req.body?.approvalLevel === 'read-only' ? 'read-only' : 'task-only';
   const devices = remoteHub.listDevices({ includeDataUrl: false });
   const targetIds = requestedIds.length > 0
     ? requestedIds
-    : devices
-      .filter(device => device.connected)
-      .filter(device => approvalLevel !== 'ai-assist' || isCapabilityEnabled(device, 'aiAssist'))
-      .map(device => device.deviceId);
+    : devices
+      .filter(device => device.connected)
+      .map(device => device.deviceId);
   const result = remoteHub.requestAgentTaskBatch([...new Set(targetIds)].slice(0, 500), {
     instruction: req.body?.instruction,
     title: req.body?.title,
-    approvalLevel,
-    operation: req.body?.operation,
-    targetQuery: req.body?.targetQuery,
-    model: req.body?.model,
-    batchId: req.body?.batchId
+    approvalLevel,
+    operation: req.body?.operation,
+    targetQuery: req.body?.targetQuery,
+    batchId: req.body?.batchId
   });
   res.json({
     ...result,

package/src/transport/relay-hub-control.js

@@ -21,6 +21,7 @@ const DEFAULT_MAX_PEER_QUEUE_BYTES = 1024 * 1024;
 const DEFAULT_MAX_PEER_QUEUE_MESSAGES = 64;
 const DEFAULT_RECONNECT_MIN_MS = 1_000;
 const DEFAULT_RECONNECT_MAX_MS = 30_000;
+const DEFAULT_CONNECT_TIMEOUT_MS = 5_000;
 
 function isEnabled(value, fallback = false) {
     if (value === undefined || value === null || value === '') return fallback;
@@ -429,6 +430,11 @@ export function createHubRelayControl({
         reconnectMinMs,
         5 * 60_000,
         DEFAULT_RECONNECT_MAX_MS);
+    const connectTimeoutMs = boundedInteger(
+        env.LIVEDESK_RELAY_CONNECT_TIMEOUT_MS,
+        250,
+        30_000,
+        DEFAULT_CONNECT_TIMEOUT_MS);
     const peers = new Map();
     const retiredPeerIds = new Map();
     const sendQueue = [];
@@ -449,6 +455,7 @@ export function createHubRelayControl({
     let connection = null;
     let connectionGeneration = 0;
     let reconnectTimer = null;
+    let connectAttemptTimer = null;
     let reconnectAttempt = 0;
     let receiveBuffer = Buffer.alloc(0);
     let queuedBytes = 0;
@@ -477,7 +484,8 @@ export function createHubRelayControl({
     function releaseQueuedItem(item) {
         queuedBytes = Math.max(0, queuedBytes - item.buffer.length);
         if (!item.peerId) return;
-        const stats = queueStats(item.peerId);
+        const stats = peerQueueStats.get(item.peerId);
+        if (!stats) return;
         stats.messages = Math.max(0, stats.messages - 1);
         stats.bytes = Math.max(0, stats.bytes - item.buffer.length);
     }
@@ -566,7 +574,7 @@ export function createHubRelayControl({
             roomId,
             peerId,
             reason: safeText(reason, 80) || 'relay-peer-closed'
-        }, peerId);
+        });
     }
 
     function closePeer(peerId, reason = 'relay-peer-closed', {
@@ -786,6 +794,24 @@ export function createHubRelayControl({
 
     function handleRelayEnvelope(message) {
         if (!message || typeof message !== 'object' || Array.isArray(message)) return;
+        if (message.type === 'relay.registered') {
+            if (message.protocol !== RELAY_CONTROL_PROTOCOL
+                || message.roomId !== roomId
+                || message.role !== 'hub'
+                || safeText(message.peerId, 64) !== ''
+                || state !== 'registering') {
+                lastError = 'relay-registration-invalid';
+                connection?.destroy();
+                return;
+            }
+            clearConnectAttemptTimer();
+            reconnectAttempt = 0;
+            lastConnectedAt = new Date().toISOString();
+            lastError = '';
+            transition('registered');
+            logEvent('relay', `Encrypted relay control registered at ${host}:${port}`);
+            return;
+        }
         const peerId = safeText(message.peerId, 64);
         if (message.protocol !== RELAY_CONTROL_PROTOCOL || message.roomId !== roomId) {
             if (peerId) rejectPeer(peerId, 'relay-routing-mismatch');
@@ -859,8 +885,14 @@ export function createHubRelayControl({
         reconnectTimer.unref?.();
     }
 
+    function clearConnectAttemptTimer() {
+        if (connectAttemptTimer) clearTimeout(connectAttemptTimer);
+        connectAttemptTimer = null;
+    }
+
     function handleConnectionClosed(socket, generation) {
         if (connection !== socket || generation !== connectionGeneration) return;
+        clearConnectAttemptTimer();
         connection = null;
         receiveBuffer = Buffer.alloc(0);
         clearQueue();
@@ -887,20 +919,17 @@ export function createHubRelayControl({
         socket.once('connect', () => {
             if (connection !== socket || generation !== connectionGeneration || !desired) return;
             counters.connections += 1;
-            reconnectAttempt = 0;
-            lastConnectedAt = new Date().toISOString();
-            lastError = '';
-            transition('registered');
+            transition('registering');
             const registered = enqueueEnvelope({
                 type: 'relay.register',
                 protocol: RELAY_CONTROL_PROTOCOL,
                 roomId,
                 role: 'hub',
                 peerId: '',
+                ack: true,
                 token: registrationToken
             });
             if (!registered) socket.destroy();
-            else logEvent('relay', `Encrypted relay control registered at ${host}:${port}`);
         });
         socket.on('data', onConnectionData);
         socket.on('drain', () => {
@@ -914,6 +943,16 @@ export function createHubRelayControl({
             logWarn('relay', `Encrypted relay control connection failed code=${lastError}`);
         });
         socket.once('close', () => handleConnectionClosed(socket, generation));
+        connectAttemptTimer = setTimeout(() => {
+            if (connection !== socket
+                || generation !== connectionGeneration
+                || socket.destroyed
+                || (state !== 'connecting' && state !== 'registering')) return;
+            lastError = 'relay-connect-timeout';
+            logWarn('relay', `Encrypted relay control connection failed code=${lastError}`);
+            socket.destroy();
+        }, connectTimeoutMs);
+        connectAttemptTimer.unref?.();
     }
 
     async function start() {
@@ -931,6 +970,7 @@ export function createHubRelayControl({
         closing = true;
         if (reconnectTimer) clearTimeout(reconnectTimer);
         reconnectTimer = null;
+        clearConnectAttemptTimer();
         closeAllPeers('hub-shutdown');
         clearQueue();
         const socket = connection;
@@ -975,6 +1015,7 @@ export function createHubRelayControl({
             host,
             port,
             peerCount: peers.size,
+            peerQueueCount: peerQueueStats.size,
             queuedMessages: sendQueue.length,
             queuedBytes,
             maxPeers,