neoagent 2.2.1-beta.7 → 2.3.0

package/server/services/messaging/telegram.js

@@ -19,6 +19,8 @@ class TelegramPlatform extends BasePlatform {
     this._contextBuffers = new Map();
     this._contextMaxSize = 25;
     this._contextMaxChats = 200;
+    this._seenUsers = new Map();
+    this._seenGroups = new Map();
   }
 
   async connect() {
@@ -91,6 +93,8 @@ class TelegramPlatform extends BasePlatform {
     this.status = 'disconnected';
     this._botUser = null;
     this._contextBuffers.clear();
+    this._seenUsers.clear();
+    this._seenGroups.clear();
     this.emit('disconnected', { manual: true });
   }
 
@@ -98,25 +102,6 @@ class TelegramPlatform extends BasePlatform {
   getStatus() { return this.status; }
   getAuthInfo() { return this._botUser ? { username: this._botUser.username, id: this._botUser.id } : null; }
 
-  _checkAccess(msg) {
-    const userId = String(msg.from.id);
-    const chatId = String(msg.chat.id);
-    const isPrivate = msg.chat.type === 'private';
-    const userAllowed = super._checkAccess(`user:${userId}`) || super._checkAccess(userId);
-
-    if (isPrivate) {
-      return {
-        allowed: this.allowedEntries.size === 0 || userAllowed,
-        requireMention: false,
-      };
-    }
-
-    return {
-      allowed: userAllowed || super._checkAccess(`group:${chatId}`),
-      requireMention: true,
-    };
-  }
-
   _isMentioned(msg) {
     if (!this._botUser) return false;
     const text = msg.text || msg.caption || '';
@@ -195,6 +180,10 @@ class TelegramPlatform extends BasePlatform {
     const senderDisplayName = [msg.from.first_name, msg.from.last_name].filter(Boolean).join(' ')
       || senderUsername || userId;
     const senderName = senderDisplayName;
+    this._seenUsers.set(userId, senderDisplayName);
+    if (!isPrivate) {
+      this._seenGroups.set(rawChatId, msg.chat.title || rawChatId);
+    }
 
     this._addToContext(rawChatId, {
       author: senderName,
@@ -202,30 +191,30 @@ class TelegramPlatform extends BasePlatform {
       mine: false,
     });
 
-    const { allowed, requireMention } = this._checkAccess(msg);
-
-    if (requireMention && !this._isMentioned(msg)) return;
-
-    if (!allowed) {
-      const suggestions = [
-        { label: `Add user (${senderName})`, prefixedId: `user:${userId}` },
-      ];
-      if (!isPrivate) suggestions.push({
-        label: `Add group (${msg.chat.title || rawChatId})`,
-        prefixedId: `group:${rawChatId}`,
-      });
+    const access = this._checkInboundAccess({
+      platform: 'telegram',
+      senderId: userId,
+      chatId: outputChatId,
+      isDirect: isPrivate,
+      isShared: !isPrivate,
+      groupId: !isPrivate ? rawChatId : '',
+      channelId: '',
+      serverId: '',
+      roomId: '',
+      roleIds: [],
+      phoneNumber: '',
+      wasMentioned: isPrivate ? false : this._isMentioned(msg),
+    }, {
+      senderName,
+      meta: msg.chat.title ? `Group: ${msg.chat.title}` : '',
+      groupLabel: msg.chat.title || rawChatId,
+    });
 
-      this.emit('blocked_sender', {
-        sender: userId,
-        chatId: outputChatId,
-        senderName,
-        groupName: msg.chat.title || null,
-        suggestions,
-      });
+    if (!access.allowed) {
       return;
     }
 
-    let content = requireMention ? this._stripMention(text) : text;
+    let content = (!isPrivate && this._isMentioned(msg)) ? this._stripMention(text) : text;
     if (!content && msg.photo) content = `[photo]`;
     if (!content && msg.document) content = `[document: ${msg.document.file_name || 'file'}]`;
     if (!content) return;
@@ -234,7 +223,7 @@ class TelegramPlatform extends BasePlatform {
       ? senderName
       : `${senderName} in ${msg.chat.title || rawChatId}`;
 
-    const channelContext = (!isPrivate && requireMention) ? this._getContext(rawChatId) : null;
+    const channelContext = (!isPrivate && this._isMentioned(msg)) ? this._getContext(rawChatId) : null;
 
     this.emit('message', {
       platform: 'telegram',
@@ -282,6 +271,31 @@ class TelegramPlatform extends BasePlatform {
       await this._bot.telegram.sendChatAction(id, 'typing');
     } catch {}
   }
+
+  async listAccessTargets() {
+    const targets = [];
+    for (const [userId, label] of this._seenUsers.entries()) {
+      targets.push({
+        source: 'live',
+        bucket: 'directRules',
+        scope: 'user',
+        value: userId,
+        label,
+        subtitle: 'Telegram user',
+      });
+    }
+    for (const [groupId, label] of this._seenGroups.entries()) {
+      targets.push({
+        source: 'live',
+        bucket: 'sharedSpaceRules',
+        scope: 'group',
+        value: groupId,
+        label,
+        subtitle: 'Telegram group',
+      });
+    }
+    return targets;
+  }
 }
 
 module.exports = { TelegramPlatform };

package/server/services/messaging/telnyx.js

@@ -39,9 +39,7 @@ class TelnyxVoicePlatform extends BasePlatform {
     this.ttsVoice = resolveTtsVoice(this.ttsProvider, config.ttsVoice);
     this.ttsModel = resolveTtsModel(this.ttsProvider, config.ttsModel);
     this.sttModel = resolveSttModel(this.sttProvider, config.sttModel);
-    this.allowedNumbers = Array.isArray(config.allowedNumbers)
-      ? config.allowedNumbers
-      : [];
+    this.allowedNumbers = Array.isArray(this.allowedNumbers) ? this.allowedNumbers : [];
     this.voiceSecret = String(config.voiceSecret || '').replace(/\D/g, '');
     this.voiceRuntimeManager = config.voiceRuntimeManager || null;
     this.userId = config.userId || null;
@@ -110,8 +108,21 @@ class TelnyxVoicePlatform extends BasePlatform {
   getAuthInfo() { return { phoneNumber: this.phoneNumber }; }
 
   setAllowedNumbers(numbers) {
-    this.allowedNumbers = Array.isArray(numbers) ? numbers : [];
-    console.log(`[TelnyxVoice] Whitelist updated: ${this.allowedNumbers.length} number(s)`);
+    return this.setAccessPolicy({
+      directPolicy: Array.isArray(numbers) && numbers.length > 0 ? 'allowlist' : 'disabled',
+      directRules: (Array.isArray(numbers) ? numbers : []).map((value) => ({
+        scope: 'phone_number',
+        value,
+      })),
+    });
+  }
+
+  setAccessPolicy(policy) {
+    const normalized = super.setAccessPolicy(policy);
+    this.allowedNumbers = normalized.directRules
+      .filter((rule) => rule.scope === 'phone_number')
+      .map((rule) => rule.value);
+    return normalized;
   }
 
   setVoiceSecret(secret) {
@@ -160,13 +171,20 @@ class TelnyxVoicePlatform extends BasePlatform {
   }
 
   _isAllowed(number) {
-    if (!this.allowedNumbers || !this.allowedNumbers.length) return false;
-    const normalize = (n) => n.replace(/\D/g, '');
-    const cn = normalize(number);
-    return this.allowedNumbers.some(wl => {
-      const cw = normalize(wl);
-      return cn === cw || cn.endsWith(cw) || cw.endsWith(cn);
-    });
+    return this.evaluateAccess({
+      platform: 'telnyx',
+      senderId: this._normalizeNumber(number),
+      chatId: this._normalizeNumber(number),
+      isDirect: true,
+      isShared: false,
+      groupId: '',
+      channelId: '',
+      serverId: '',
+      roomId: '',
+      roleIds: [],
+      phoneNumber: this._normalizeNumber(number),
+      wasMentioned: false,
+    }).allowed;
   }
 
   _normalizeNumber(n) {
@@ -414,16 +432,27 @@ class TelnyxVoicePlatform extends BasePlatform {
           if (payload.direction !== 'incoming') break;
           const caller = payload.from;
           if (!this._isAllowed(caller)) {
+            const blockedInfo = {
+              caller,
+              ccId,
+              meta: 'Caller is not allowed by the access policy.',
+              suggestions: [{
+                label: `Allow number (${caller})`,
+                prefixedId: caller,
+                bucket: 'directRules',
+                rule: { scope: 'phone_number', value: this._normalizeNumber(caller) },
+              }],
+            };
             if (this._isBanned(caller)) {
               console.log(`[TelnyxVoice] Rejecting banned caller: ${caller}`);
               await this._rejectCall(ccId);
-              this.emit('blocked_caller', { caller, ccId });
+              this.emit('blocked_caller', blockedInfo);
               break;
             }
             if (!this.voiceSecret) {
               console.log(`[TelnyxVoice] Blocked non-whitelisted caller (no secret set): ${caller}`);
               await this._rejectCall(ccId);
-              this.emit('blocked_caller', { caller, ccId });
+              this.emit('blocked_caller', blockedInfo);
               break;
             }
             console.log(`[TelnyxVoice] Non-whitelisted caller ${caller} — awaiting secret code`);

package/server/services/messaging/whatsapp.js

@@ -341,6 +341,33 @@ class WhatsAppPlatform extends BasePlatform {
     }
   }
 
+  async listAccessTargets() {
+    const [contacts, chats] = await Promise.all([
+      this.getContacts(),
+      this.getChats(),
+    ]);
+    return [
+      ...contacts
+        .filter((item) => !item.isGroup)
+        .map((item) => ({
+          source: 'live',
+          bucket: 'directRules',
+          scope: 'phone_number',
+          value: String(item.id || '').split('@')[0],
+          label: item.name || String(item.id || '').split('@')[0],
+          subtitle: 'WhatsApp contact',
+        })),
+      ...chats.map((chat) => ({
+        source: 'live',
+        bucket: 'sharedSpaceRules',
+        scope: 'group',
+        value: chat.id,
+        label: chat.name || chat.id,
+        subtitle: 'WhatsApp group',
+      })),
+    ];
+  }
+
   getAuthInfo() {
     return { qrCode: this.qrCode, status: this.status };
   }