Server connection issues

server/auth.js

@@ -100,13 +100,6 @@ export async function getUsageInfo(accessToken, clientId = '') {
     if (clientId) h['X-Client-ID'] = clientId;
     const r = await fetch('https://sharktide-lightning.hf.space/usage', { headers: h });
     const payload = r.ok ? await r.json() : null;
-    console.log('[Usage API]', JSON.stringify({
-      ok: r.ok,
-      status: r.status,
-      clientId: clientId || null,
-      hasAuth: !!accessToken,
-      payload,
-    }));
     return payload;
   } catch (err) {
     console.error('[Usage API] request failed:', err.message);

server/chatStream.js

@@ -18,7 +18,7 @@ const WORKER_PATH = path.join(__dirname, "searchWorker.js");
 // Persistent WebSocket pool
 let persistentWs = null;
 let wsAuthPromise = null;
-let requestIdCounter = 0;
+let requestIdCounter = 0; // Upstream request IDs are scoped to the current websocket connection.
 let activeStreamHandlers = new Map(); // Track active stream handlers by request ID
 let errorHandlers = new Map(); // Track error handlers by request ID
 
@@ -31,6 +31,7 @@ function invalidatePersistentWebSocket(ws, reason, err = null) {
 
   persistentWs = null;
   wsAuthPromise = null;
+  requestIdCounter = 0;
   activeStreamHandlers.delete("__messageListener__");
   activeStreamHandlers.delete("__errorHandler__");
   activeStreamHandlers.delete("__closeHandler__");
@@ -226,6 +227,7 @@ async function getSafeWebSocket() {
     ws.on("message", globalMessageHandler);
     ws.on("error", globalErrorHandler);
     ws.on("close", globalCloseHandler);
+    requestIdCounter = 0;
     activeStreamHandlers.set("__messageListener__", globalMessageHandler);
     activeStreamHandlers.set("__errorHandler__", globalErrorHandler);
     activeStreamHandlers.set("__closeHandler__", globalCloseHandler);
@@ -1618,7 +1620,7 @@ export async function streamChat({
     const sessionName = extractSessionName(assistantText);
 
     if (typeof onDone === "function") {
-      onDone(assistantText, allToolCalls, false, sessionName, responseEdits, responseSegments);
+      await onDone(assistantText, allToolCalls, false, sessionName, responseEdits, responseSegments);
     }
 
     clearPromptState(sessionId);
@@ -1626,10 +1628,10 @@ export async function streamChat({
   } catch (err) {
     clearPromptState(sessionId);
     if (err.name === "AbortError" || err.message === "AbortError") {
-      if (typeof onDone === "function") onDone(null, null, true, null);
+      if (typeof onDone === "function") await onDone(null, null, true, null);
     } else {
       console.error("streamChat error:", err?.internalMessage || err);
-      if (typeof onError === "function") onError(getPublicErrorMessage(err));
+      if (typeof onError === "function") await onError(getPublicErrorMessage(err));
     }
   }
 }

server/wsHandler.js

@@ -439,6 +439,7 @@ const handlers = {
         activeStreams.delete(ws);
         console.error('streamChat error:', err);
         safeSend(ws, { type: 'chat:error', error: String(err), sessionId });
+        safeSend(ws, { type: 'chat:aborted', sessionId, reason: 'error' });
       },
     });
   },
@@ -693,6 +694,7 @@ const handlers = {
         activeStreams.delete(ws);
         console.error('assistant action streamChat error:', err);
         safeSend(ws, { type: 'chat:error', error: String(err), sessionId });
+        safeSend(ws, { type: 'chat:aborted', sessionId, reason: 'error' });
       },
     });
   },