neoagent 3.2.1-beta.9 → 3.3.1-beta.0

package/server/services/messaging/inbound_queue.js

@@ -21,25 +21,72 @@ function cancelPending(queue) {
   for (const item of queue.pending.splice(0)) settleWaiters(item, result);
 }
 
+function queueKeyForMessage(userId, msg) {
+  return [
+    String(userId),
+    String(msg.agentId || 'main'),
+    String(msg.platform || ''),
+    String(msg.chatId || ''),
+  ].join(':');
+}
+
+function batchEntry(msg) {
+  return {
+    sender: msg.sender || null,
+    senderName: msg.senderDisplayName || msg.senderName || msg.senderUsername || null,
+    content: String(msg.content || ''),
+    messageId: msg.messageId || null,
+    timestamp: msg.timestamp || null,
+    wasMentioned: msg.wasMentioned === true,
+    repliedToAgent: msg.repliedToAgent === true,
+  };
+}
+
+function mergeMessage(target, msg) {
+  const existingBatch = Array.isArray(target.message.messageBatch)
+    ? target.message.messageBatch
+    : [batchEntry(target.message)];
+  const nextBatch = [...existingBatch, batchEntry(msg)];
+  target.message.messageBatch = nextBatch;
+  target.message.content = target.message.isGroup
+    ? nextBatch.map((entry) => (
+      `[${entry.senderName || entry.sender || 'participant'}]: ${entry.content}`
+    )).join('\n')
+    : nextBatch.map((entry) => entry.content).join('\n');
+  target.message.messageId = msg.messageId || target.message.messageId;
+  target.message.timestamp = msg.timestamp || target.message.timestamp;
+  target.message.wasMentioned = target.message.wasMentioned === true || msg.wasMentioned === true;
+  target.message.repliedToAgent = target.message.repliedToAgent === true || msg.repliedToAgent === true;
+  target.message.behaviorTurnEpoch = Math.max(
+    Number(target.message.behaviorTurnEpoch || 0),
+    Number(msg.behaviorTurnEpoch || 0),
+  );
+  target.message.inboundJobIds = Array.from(new Set([
+    ...(target.message.inboundJobIds || []),
+    target.message.inboundJobId,
+    ...(msg.inboundJobIds || []),
+    msg.inboundJobId,
+  ].filter(Boolean)));
+}
+
 function queuedResult(queue, msg) {
   let resolveCompletion;
   const completion = new Promise((resolve) => {
     resolveCompletion = resolve;
   });
-  const last = queue.pending[queue.pending.length - 1];
+  const last = queue.collecting && queue.activeItem
+    ? queue.activeItem
+    : queue.pending[queue.pending.length - 1];
   if (
     last
     && last.message.platform === msg.platform
     && last.message.chatId === msg.chatId
-    && String(last.message.sender || '') === String(msg.sender || '')
+    && (
+      last.message.isGroup === true
+      || String(last.message.sender || '') === String(msg.sender || '')
+    )
   ) {
-    last.message.content += `\n${msg.content}`;
-    last.message.messageId = msg.messageId;
-    last.message.inboundJobIds = Array.from(new Set([
-      ...(last.message.inboundJobIds || []),
-      ...(msg.inboundJobIds || []),
-      msg.inboundJobId,
-    ].filter(Boolean)));
+    mergeMessage(last, msg);
     last.waiters.push(resolveCompletion);
   } else {
     queue.pending.push({
@@ -57,14 +104,16 @@ async function processInboundQueue({
   userId,
   msg,
   executeMessage,
-  onProcessingError = null
+  onProcessingError = null,
+  batchWindowMs = 0,
 }) {
-  const agentId = msg.agentId || null;
-  const queueKey = `${userId}:${agentId || 'main'}`;
+  const queueKey = queueKeyForMessage(userId, msg);
   if (!userQueues[queueKey]) {
     userQueues[queueKey] = {
       running: false,
       pending: [],
+      activeItem: null,
+      collecting: false,
       cancelRequested: false,
       cancelPending() {
         cancelPending(this);
@@ -91,6 +140,15 @@ async function processInboundQueue({
 
   try {
     while (currentItem) {
+      queue.activeItem = currentItem;
+      const delayMs = currentItem.message.isGroup
+        ? Math.max(0, Math.min(5000, Number(batchWindowMs) || 0))
+        : 0;
+      if (delayMs > 0) {
+        queue.collecting = true;
+        await new Promise((resolve) => setTimeout(resolve, delayMs));
+        queue.collecting = false;
+      }
       let outcome;
       try {
         outcome = await executeMessage(currentItem.message);
@@ -123,6 +181,8 @@ async function processInboundQueue({
     }
   } finally {
     queue.running = false;
+    queue.collecting = false;
+    queue.activeItem = null;
     cancelPending(queue);
     queue.cancelRequested = false;
     if (userQueues[queueKey] === queue) {
@@ -161,5 +221,6 @@ async function notifyProcessingError(handler, details) {
 }
 
 module.exports = {
-  processInboundQueue
+  processInboundQueue,
+  queueKeyForMessage,
 };

package/server/services/messaging/inbound_store.js

@@ -156,6 +156,38 @@ function attachRunToInboundJobs(jobIds, runId) {
   ))();
 }
 
+function annotateInboundJobs(jobIds, annotation) {
+  const ids = Array.from(new Set(
+    (Array.isArray(jobIds) ? jobIds : [jobIds])
+      .map((value) => String(value || '').trim())
+      .filter(Boolean),
+  ));
+  if (!ids.length) return 0;
+  const read = db.prepare(
+    `SELECT messages.id, messages.metadata
+     FROM messaging_inbound_jobs
+     JOIN messages ON messages.id = messaging_inbound_jobs.message_id
+     WHERE messaging_inbound_jobs.id = ?`,
+  );
+  const update = db.prepare('UPDATE messages SET metadata = ? WHERE id = ?');
+  return db.transaction(() => {
+    let count = 0;
+    for (const id of ids) {
+      const row = read.get(id);
+      if (!row) continue;
+      let metadata = {};
+      try {
+        metadata = row.metadata ? JSON.parse(row.metadata) : {};
+      } catch {
+        metadata = {};
+      }
+      update.run(JSON.stringify({ ...metadata, ...annotation }), row.id);
+      count += 1;
+    }
+    return count;
+  })();
+}
+
 function reconcileInterruptedInboundJobs() {
   return db.transaction(() => {
     const completed = db.prepare(
@@ -214,6 +246,7 @@ function payloadForInboundJob(job) {
 }
 
 module.exports = {
+  annotateInboundJobs,
   attachRunToInboundJobs,
   claimInboundJob,
   enqueueInboundMessage,

package/server/services/messaging/manager.js

@@ -187,6 +187,17 @@ class MessagingManager extends EventEmitter {
       senderUsername: msg.senderUsername,
       senderTag: msg.senderTag,
       isGroup: msg.isGroup,
+      wasMentioned: msg.wasMentioned === true,
+      repliedToAgent: msg.repliedToAgent === true,
+      groupId: msg.groupId || null,
+      groupName: msg.groupName || null,
+      channelId: msg.channelId || null,
+      channelName: msg.channelName || null,
+      serverId: msg.serverId || msg.guildId || null,
+      serverName: msg.serverName || msg.guildName || null,
+      roomId: msg.roomId || null,
+      roomName: msg.roomName || null,
+      roleIds: Array.isArray(msg.roleIds) ? msg.roleIds.map(String) : [],
       mediaType: msg.mediaType,
       localMediaPath: msg.localMediaPath || null,
       ...(msg.metadata && typeof msg.metadata === 'object' ? msg.metadata : {}),
@@ -201,6 +212,8 @@ class MessagingManager extends EventEmitter {
       senderDisplayName: msg.senderDisplayName || null,
       senderUsername: msg.senderUsername || null,
       senderTag: msg.senderTag || null,
+      wasMentioned: msg.wasMentioned === true,
+      repliedToAgent: msg.repliedToAgent === true,
       content: normalizedIncomingContent,
       mediaType: msg.mediaType || null,
       localMediaPath: msg.localMediaPath || null,
@@ -211,6 +224,15 @@ class MessagingManager extends EventEmitter {
       groupName: msg.groupName || null,
       guildName: msg.guildName || null,
       roomName: msg.roomName || null,
+      groupId: msg.groupId || null,
+      channelId: msg.channelId || null,
+      serverId: msg.serverId || msg.guildId || null,
+      guildId: msg.guildId || msg.serverId || null,
+      roomId: msg.roomId || null,
+      roleIds: Array.isArray(msg.roleIds) ? msg.roleIds.map(String) : [],
+      replyToMessageId: msg.replyToMessageId || null,
+      threadId: msg.threadId || msg.threadTs || null,
+      eventType: msg.eventType || 'message',
       metadata: msg.metadata && typeof msg.metadata === 'object' ? msg.metadata : null,
     };
     const queued = enqueueInboundMessage({
@@ -391,7 +413,13 @@ class MessagingManager extends EventEmitter {
     const unique = [];
     const seen = new Set();
     for (const item of merged) {
-      const id = `${item.bucket}:${item.rule.scope}:${item.rule.value}`;
+      const id = [
+        item.bucket,
+        item.rule.scope,
+        item.rule.value,
+        item.rule.spaceScope || '',
+        item.rule.spaceValue || '',
+      ].join(':');
       if (seen.has(id)) continue;
       seen.add(id);
       unique.push(item);
@@ -1105,7 +1133,22 @@ class MessagingManager extends EventEmitter {
 
   async getAccessCatalog(userId, platformName, options = {}) {
     const agentId = this._agentId(userId, options);
-    const discoveredTargets = await this.listAccessTargets(userId, platformName, { agentId });
+    const capabilities = getPlatformAccessCapabilities(platformName);
+    const normalizeTargetBucket = (target) => (
+      target?.bucket === 'directRules'
+      && capabilities.supportsSharedPolicy
+      && capabilities.sharedActorRuleScopes.includes(target.scope)
+        ? { ...target, bucket: 'sharedActorRules' }
+        : target
+    );
+    const listedTargets = await this.listAccessTargets(
+      userId,
+      platformName,
+      { agentId },
+    );
+    const discoveredTargets = (
+      Array.isArray(listedTargets) ? listedTargets : []
+    ).map(normalizeTargetBucket);
 
     const recentRows = db.prepare(
       `SELECT platform_chat_id, metadata
@@ -1122,20 +1165,29 @@ class MessagingManager extends EventEmitter {
         } catch {
           metadata = {};
         }
-        return classifyRecentTarget(platformName, { ...row, metadata });
+        return normalizeTargetBucket(
+          classifyRecentTarget(platformName, { ...row, metadata }),
+        );
       })
       .filter(Boolean);
 
     const seen = new Set();
     const unique = (items) => items.filter((item) => {
-      const keyValue = `${item.bucket}:${item.scope}:${item.value}`;
+      const rule = item?.rule || item || {};
+      const keyValue = [
+        item?.bucket,
+        rule.scope,
+        rule.value,
+        rule.spaceScope || '',
+        rule.spaceValue || '',
+      ].join(':');
       if (seen.has(keyValue)) return false;
       seen.add(keyValue);
       return true;
     });
 
     return {
-      capabilities: getPlatformAccessCapabilities(platformName),
+      capabilities,
       discoveredTargets: unique([...(Array.isArray(discoveredTargets) ? discoveredTargets : []), ...recentTargets]),
       suggestedTargets: unique(this.accessSuggestions.get(this._accessSuggestionKey(userId, agentId, platformName)) || []),
       policy: this._loadAccessPolicy(userId, agentId, platformName),

package/server/services/messaging/telegram.js

@@ -223,7 +223,10 @@ class TelegramPlatform extends BasePlatform {
       ? senderName
       : `${senderName} in ${msg.chat.title || rawChatId}`;
 
-    const channelContext = (!isPrivate && this._isMentioned(msg)) ? this._getContext(rawChatId) : null;
+    const channelContext = !isPrivate ? this._getContext(rawChatId) : null;
+    const repliedToAgent = !isPrivate
+      && msg.reply_to_message?.from?.id
+      && String(msg.reply_to_message.from.id) === String(this._botUser?.id || '');
 
     this.emit('message', {
       platform: 'telegram',
@@ -233,6 +236,12 @@ class TelegramPlatform extends BasePlatform {
       senderDisplayName,
       senderUsername,
       senderTag: senderUsername,
+      wasMentioned: !isPrivate && this._isMentioned(msg),
+      repliedToAgent: Boolean(repliedToAgent),
+      replyToMessageId: msg.reply_to_message?.message_id
+        ? String(msg.reply_to_message.message_id)
+        : null,
+      groupId: isPrivate ? null : rawChatId,
       content,
       mediaType: null,
       isGroup: !isPrivate,

package/server/services/messaging/whatsapp.js

@@ -172,6 +172,7 @@ class WhatsAppPlatform extends BasePlatform {
         const isGroup = chatId?.endsWith('@g.us');
         const sender = isGroup ? msg.key.participant : chatId;
         const pushName = msg.pushName || '';
+        const wasMentioned = isGroup && this._isGroupAddressedToBot(msg.message || {});
 
         let content = '';
         let mediaType = null;
@@ -258,6 +259,16 @@ class WhatsAppPlatform extends BasePlatform {
           senderName: pushName,
           senderDisplayName: pushName || null,
           senderTag: normalizeWhatsAppId(sender) || sender,
+          wasMentioned,
+          repliedToAgent: Boolean(
+            msg.message?.extendedTextMessage?.contextInfo?.stanzaId
+            && msg.message?.extendedTextMessage?.contextInfo?.participant
+            && this._ownIds().has(normalizeWhatsAppId(
+              msg.message.extendedTextMessage.contextInfo.participant
+            ))
+          ),
+          replyToMessageId: msg.message?.extendedTextMessage?.contextInfo?.stanzaId || null,
+          groupId: isGroup ? chatId : null,
           content,
           mediaType,
           localMediaPath,

package/server/services/social_reach/channels/social_video.js

@@ -47,7 +47,7 @@ class SocialVideoReachChannel extends SocialReachChannel {
       };
     });
     const missing = (health.dependencies || [])
-      .filter((item) => !item.available)
+      .filter((item) => item.required !== false && !item.available)
       .map((item) => item.name)
       .filter(Boolean);
 

package/server/services/social_video/captions.js

@@ -27,7 +27,7 @@ function pickCaptionTrack(captionGroups = {}, preferredLanguages = []) {
 
   const preferred = preferredLanguages.map(normalizeLanguageCode).filter(Boolean);
   const preferredOrder = preferred.length > 0 ? preferred : ['en', 'en-us', 'en-gb'];
-  const preferredExt = ['vtt', 'webvtt', 'srt', 'json3'];
+  const preferredExt = ['vtt', 'webvtt', 'srt', 'json3', 'ttml', 'xml', 'json'];
 
   const scoreTrack = (track) => {
     const langIdx = preferredOrder.findIndex((code) => track.language === code || track.language.startsWith(`${code}-`));
@@ -148,7 +148,7 @@ function parseCaptionText(raw, extension = '') {
   if (ext === 'vtt' || ext === 'webvtt') {
     return parseWebVttToText(raw);
   }
-  if (ext === 'ttml') {
+  if (ext === 'ttml' || ext === 'xml') {
     return parseTtmlToText(raw);
   }
   if (ext === 'srt') {