@shykaruu/jarvis-brain 0.4.2 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shykaruu/jarvis-brain",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "J.A.R.V.I.S. — Just A Rather Very Intelligent System. An always-on autonomous AI daemon.",
   "module": "src/daemon/index.ts",
   "type": "module",

package/src/comms/websocket.test.ts

@@ -363,10 +363,10 @@ test('WebSocketServer - WebSocket allowed with auth cookie', async () => {
   }
 });
 
-test('WebSocketServer - sidecar websocket accepts /sidecar path with bearer auth', async () => {
-  const authServer = new WebSocketServer(3156);
-  authServer.setSidecarManager({
-    async validateToken(token: string) {
+test('WebSocketServer - sidecar websocket accepts /sidecar path with bearer auth', async () => {
+  const authServer = new WebSocketServer(3156);
+  authServer.setSidecarManager({
+    async validateToken(token: string) {
       if (token === 'sidecar-token') {
         return { sid: 'sidecar-123' } as any;
       }
@@ -377,23 +377,31 @@ test('WebSocketServer - sidecar websocket accepts /sidecar path with bearer auth
   } as any);
   authServer.start();
 
-  try {
-    const ws = new WebSocket('ws://localhost:3156/sidecar', {
-      headers: { Authorization: 'Bearer sidecar-token' },
-    } as any);
-
-    const connected = await new Promise<boolean>((resolve) => {
-      ws.onopen = () => resolve(true);
-      ws.onerror = () => resolve(false);
-      setTimeout(() => resolve(false), 2000);
-    });
-
-    expect(connected).toBe(true);
-    ws.close();
-    await new Promise((resolve) => setTimeout(resolve, 100));
-  } finally {
-    authServer.stop();
-  }
+  try {
+    const ws = new WebSocket('ws://localhost:3156/sidecar', {
+      headers: { Authorization: 'Bearer sidecar-token' },
+    } as any);
+    const received: any[] = [];
+
+    const connected = await new Promise<boolean>((resolve) => {
+      ws.onopen = () => resolve(true);
+      ws.onerror = () => resolve(false);
+      setTimeout(() => resolve(false), 2000);
+    });
+
+    expect(connected).toBe(true);
+    ws.onmessage = (e) => {
+      if (typeof e.data === 'string') {
+        received.push(JSON.parse(e.data));
+      }
+    };
+    await new Promise((resolve) => setTimeout(resolve, 200));
+    expect(received.some(msg => msg.type === 'sidecar_ready')).toBe(true);
+    ws.close();
+    await new Promise((resolve) => setTimeout(resolve, 100));
+  } finally {
+    authServer.stop();
+  }
 });
 
 test('WebSocketServer - sendToClient unicasts JSON', async () => {

package/src/comms/websocket.ts

@@ -428,7 +428,7 @@ export class WebSocketServer {
         // Limit individual WS messages to 16 MB (defense against abusive HMR payloads)
         maxPayloadLength: 16 * 1024 * 1024,
 
-        open(ws) {
+        open(ws) {
           // HMR proxy WebSocket — bridge to dev server
           const proxyTarget = (ws.data as any)?.proxy_target as string | undefined;
           if (proxyTarget) {
@@ -448,11 +448,21 @@ export class WebSocketServer {
             return;
           }
 
-          const sidecarId = (ws.data as any)?.sidecar_id as string | undefined;
-          if (sidecarId && self.sidecarManager) {
-            self.sidecarManager.handleSidecarConnect(ws, sidecarId);
-            return;
-          }
+          const sidecarId = (ws.data as any)?.sidecar_id as string | undefined;
+          if (sidecarId && self.sidecarManager) {
+            self.sidecarManager.handleSidecarConnect(ws, sidecarId);
+            try {
+              ws.send(JSON.stringify({
+                type: 'sidecar_ready',
+                sidecar_id: sidecarId,
+                timestamp: Date.now(),
+              }));
+            } catch (error) {
+              console.error('[WebSocketServer] Failed to send sidecar_ready frame:', error);
+              try { ws.close(); } catch { /* ignore */ }
+            }
+            return;
+          }
 
           self.clients.add(ws);
           console.log('[WebSocketServer] Client connected. Total clients:', self.clients.size);
@@ -518,7 +528,7 @@ export class WebSocketServer {
           }
         },
 
-        close(ws) {
+        close(ws, code, reason) {
           // HMR proxy cleanup
           const proxyUpstream = (ws.data as any)?._proxyUpstream as WebSocket | undefined;
           if (proxyUpstream) {
@@ -526,11 +536,12 @@ export class WebSocketServer {
             return;
           }
 
-          const sidecarId = (ws.data as any)?.sidecar_id as string | undefined;
-          if (sidecarId && self.sidecarManager) {
-            self.sidecarManager.handleSidecarDisconnect(sidecarId);
-            return;
-          }
+          const sidecarId = (ws.data as any)?.sidecar_id as string | undefined;
+          if (sidecarId && self.sidecarManager) {
+            console.log(`[WebSocketServer] Sidecar socket closed: ${sidecarId} (${code}${reason ? `, ${reason}` : ''})`);
+            self.sidecarManager.handleSidecarDisconnect(sidecarId);
+            return;
+          }
 
           self.clients.delete(ws);
           console.log('[WebSocketServer] Client disconnected. Total clients:', self.clients.size);

package/src/sidecar/manager.ts

@@ -422,20 +422,29 @@ export class SidecarManager implements Service {
     if (typeof message === 'string') {
       try {
         const parsed = JSON.parse(message);
-        if (parsed.type === 'register') {
-          const record = this.getSidecar(sidecarId);
-          this.registerConnection({
-            id: sidecarId,
+        if (parsed.type === 'register') {
+          const record = this.getSidecar(sidecarId);
+          this.registerConnection({
+            id: sidecarId,
             name: record?.name ?? parsed.hostname ?? sidecarId,
             hostname: parsed.hostname ?? 'unknown',
             os: parsed.os ?? 'unknown',
             platform: parsed.platform ?? 'unknown',
             capabilities: parsed.capabilities ?? [],
-            unavailableCapabilities: parsed.unavailable_capabilities ?? [],
-            connectedAt: new Date(),
-          });
-          return;
-        }
+            unavailableCapabilities: parsed.unavailable_capabilities ?? [],
+            connectedAt: new Date(),
+          });
+          try {
+            ws.send(JSON.stringify({
+              type: 'sidecar_registered',
+              sidecar_id: sidecarId,
+              timestamp: Date.now(),
+            }));
+          } catch (error) {
+            console.warn(`[SidecarManager] Failed to send registration ack to ${sidecarId}:`, error);
+          }
+          return;
+        }
         if (parsed.type === 'capabilities_update') {
           this.updateCapabilities(sidecarId, parsed.capabilities ?? [], parsed.unavailable_capabilities ?? []);
           return;