nothumanallowed 10.5.0 → 10.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nothumanallowed",
-  "version": "10.5.0",
+  "version": "10.6.1",
   "description": "NotHumanAllowed — 38 AI agents, 53 tools. Email, calendar, browser automation, screen capture, canvas, cron/heartbeat, GitHub, Notion, Slack, voice chat, 28 languages. Zero-dependency CLI.",
   "type": "module",
   "bin": {

package/src/commands/ui.mjs

@@ -2095,43 +2095,31 @@ export async function cmdUI(args) {
       browserWs.on('error', () => { wsClients.delete(browserWs); if (daemonWs) try { daemonWs.close(); } catch {} });
     });
 
-    // ── Alexandria real-time polling → WS push ──────────────────────
-    // Server-side polling: check Alexandria channels for new messages every 2s
-    // Push new messages to browser via WebSocket — browser does ZERO polling
+    // ── Alexandria real-time — connect to server WS for each channel ──────
     const collabDir = path.join(NHA_DIR, 'collab');
-    const ALEX_API = 'https://nothumanallowed.com/api/v1/alexandria';
-    const channelMessageCounts = new Map(); // channelId → last known count
+    const alexWsConnections = new Map(); // channelId → ws
 
-    setInterval(async () => {
-      if (wsClients.size === 0) return; // no browsers connected
+    function connectAlexandriaWs(channelId, channelName) {
+      if (alexWsConnections.has(channelId)) return;
       try {
-        const chFile = path.join(collabDir, 'channels.json');
-        if (!fs.existsSync(chFile)) return;
-        const channels = JSON.parse(fs.readFileSync(chFile, 'utf-8'));
-        const idFile = path.join(collabDir, 'identity.json');
-        if (!fs.existsSync(idFile)) return;
-        const identity = JSON.parse(fs.readFileSync(idFile, 'utf-8'));
-
-        for (const ch of channels) {
-          const r = await fetch(ALEX_API + '/channels/' + ch.id + '/messages?fp=' + identity.fingerprint);
-          if (!r.ok) continue;
-          const data = await r.json();
-          if (!data.messages) continue;
-
-          const prevCount = channelMessageCounts.get(ch.id) || 0;
-          const newCount = data.messages.length;
+        const { WebSocket: WsClient } = require('ws');
+        const wsUrl = 'wss://nothumanallowed.com/ws/alexandria/' + channelId;
+        const alexWs = new WsClient(wsUrl);
 
-          if (newCount > prevCount && prevCount > 0) {
-            // New messages! Decrypt and push via WS
-            const channelKey = crypto.createHash('sha256').update('alexandria-channel-key-v1').update(ch.id).digest();
-            const newMsgs = data.messages.slice(prevCount);
+        alexWs.on('open', () => {
+          alexWsConnections.set(channelId, alexWs);
+        });
 
-            for (const msg of newMsgs) {
-              if (msg.type === 'system' || !msg.ciphertext || !msg.nonce) continue;
+        alexWs.on('message', (data) => {
+          try {
+            const msg = JSON.parse(data.toString());
+            if (msg.type === 'new_message' && msg.message) {
+              // Decrypt the message
+              const channelKey = crypto.createHash('sha256').update('alexandria-channel-key-v1').update(channelId).digest();
               let content = '[encrypted]';
               try {
-                const nonce = Buffer.from(msg.nonce, 'base64');
-                const raw = Buffer.from(msg.ciphertext, 'base64');
+                const nonce = Buffer.from(msg.message.nonce, 'base64');
+                const raw = Buffer.from(msg.message.ciphertext, 'base64');
                 const tag = raw.subarray(raw.length - 16);
                 const encrypted = raw.subarray(0, raw.length - 16);
                 const decipher = crypto.createDecipheriv('aes-256-gcm', channelKey, nonce);
@@ -2139,25 +2127,46 @@ export async function cmdUI(args) {
                 content = decipher.update(encrypted) + decipher.final('utf-8');
               } catch {}
 
-              const sender = data.members?.find(m => m.fingerprint === msg.senderFingerprint);
+              // Push to browser via local WS
               wsBroadcast({
                 type: 'collab_message',
-                channelId: ch.id,
-                channelName: ch.name,
+                channelId,
+                channelName,
                 message: {
-                  senderName: sender?.displayName || msg.senderFingerprint?.slice(0, 8) || 'Unknown',
-                  senderFingerprint: msg.senderFingerprint,
+                  senderName: msg.message.senderName || msg.message.senderFingerprint?.slice(0, 8) || 'Unknown',
+                  senderFingerprint: msg.message.senderFingerprint,
                   content,
-                  timestamp: msg.timestamp,
-                  type: msg.type,
+                  timestamp: msg.message.timestamp,
+                  type: msg.message.type,
                 },
               });
             }
+          } catch {}
+        });
+
+        alexWs.on('close', () => {
+          alexWsConnections.delete(channelId);
+          // Reconnect after 5s
+          setTimeout(() => connectAlexandriaWs(channelId, channelName), 5000);
+        });
+        alexWs.on('error', () => {
+          alexWsConnections.delete(channelId);
+        });
+      } catch {}
+    }
+
+    // Connect to all channels on startup
+    setTimeout(() => {
+      try {
+        const chFile = path.join(collabDir, 'channels.json');
+        if (fs.existsSync(chFile)) {
+          const channels = JSON.parse(fs.readFileSync(chFile, 'utf-8'));
+          for (const ch of channels) {
+            connectAlexandriaWs(ch.id, ch.name);
           }
-          channelMessageCounts.set(ch.id, newCount);
         }
       } catch {}
-    }, 10000); // 10s interval — gentle on server, WS handles own messages instantly
+    }, 2000);
 
   } catch {
     // ws package not available — live updates disabled

package/src/constants.mjs

@@ -5,7 +5,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-export const VERSION = '10.5.0';
+export const VERSION = '10.6.1';
 export const BASE_URL = 'https://nothumanallowed.com/cli';
 export const API_BASE = 'https://nothumanallowed.com/api/v1';
 

package/src/services/web-ui.mjs

@@ -1744,16 +1744,22 @@ function collabSelect(id){
 
 function collabLoadMessages(){
   if(!collabActiveChannel)return;
-  // Reset unread when viewing
   collabUnreadCount=0;
   updateCollabBadge();
   apiGet('/api/collab/messages?channelId='+collabActiveChannel).then(function(r){
+    if(r&&r.error){
+      var el=document.getElementById('collabMessages');
+      if(el)el.innerHTML='<div style="text-align:center;color:var(--red);padding:20px;font-size:11px">'+esc(r.error)+'<br><span style="color:var(--dim);font-size:10px">This channel may have expired or the server was restarted.</span></div>';
+      return;
+    }
     if(!r||!r.messages)return;
     collabMessages=r.messages;
-    // Update last count for this channel
     var ch=collabChannels.find(function(c){return c.id===collabActiveChannel});
     if(ch)ch._lastCount=r.messages.length;
     renderCollabMessages();
+  }).catch(function(e){
+    var el=document.getElementById('collabMessages');
+    if(el)el.innerHTML='<div style="text-align:center;color:var(--red);padding:20px;font-size:11px">Connection error</div>';
   });
 }