Fix Hub adapter: await wsPromise so gateway doesn't restart, 5s startup delay, .catch for safety

Author: handsdiff

extensions/hub/src/monitor.ts

@@ -42,7 +42,9 @@ export async function monitorHubProvider(opts: HubMonitorOptions): Promise<{ sto
     ? AbortSignal.any([opts.abortSignal, ac.signal])
     : ac.signal;
 
-  connectHubWebSocket({
+  console.error("[HUB-MONITOR-DEBUG] calling connectHubWebSocket");
+  // Block until abort signal — gateway expects startAccount to stay alive
+  const wsPromise = connectHubWebSocket({
     url: account.url,
     agentId: account.agentId,
     secret: account.secret,
@@ -97,9 +99,11 @@ export async function monitorHubProvider(opts: HubMonitorOptions): Promise<{ sto
     `[${account.accountId}] started Hub provider (${account.url}, agent=${account.agentId})`,
   );
 
-  return {
-    stop: () => {
-      ac.abort();
-    },
+  // Return stop handle but keep the promise chain alive
+  // Gateway expects startAccount to stay running — awaiting wsPromise blocks until abort
+  const stopFn = () => {
+    ac.abort();
   };
+  await wsPromise;
+  return { stop: stopFn };
 }

extensions/hub/src/ws.ts

@@ -27,9 +27,19 @@ export async function connectHubWebSocket(opts: WsHubOptions): Promise<void> {
   const { url, agentId, secret, abortSignal, onMessages, onError, onConnected } = opts;
   let attempt = 0;
 
+  // Initial delay on first attempt to allow Hub server to start
+  if (attempt === 0) {
+    try {
+      await setTimeout(5_000, undefined, { signal: abortSignal });
+    } catch {
+      return;
+    }
+  }
+
   while (!abortSignal?.aborted) {
     try {
       const wsUrl = `${httpToWs(url)}/agents/${encodeURIComponent(agentId)}/ws`;
+      console.error(`[HUB-WS-DEBUG] connecting to ${wsUrl}`);
       const ws = new WebSocket(wsUrl);
 
       await new Promise<void>((resolve, reject) => {