@omnizap-system/omnizap 2.6.0 → 2.6.2

package/app/services/ai/moduleAiHelpCoreService.js

@@ -1,8 +1,9 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import fs from 'node:fs/promises';
 import path from 'node:path';
 import OpenAI from 'openai';
 import { getAiHelpCachedResponse, upsertAiHelpCachedResponse } from './aiHelpResponseCacheRepository.js';
-import { createGeminiTextService, DEFAULT_GEMINI_MODEL } from './geminiService.js';
+import { createGeminiTextService, DEFAULT_GEMINI_MODEL, isGeminiAuthReady } from './geminiService.js';
 
 const DEFAULT_FAQ_INTERVAL_MS = 6 * 60 * 60 * 1000;
 const DEFAULT_MAX_RESPONSE_CHARS = 3400;
@@ -168,6 +169,16 @@ const normalizeLlmProvider = (value, fallback = 'gemini') => {
   return fallback;
 };
 
+const normalizeGeminiAuthMode = (value, fallback = 'cli') => {
+  const normalized = String(value || '')
+    .trim()
+    .toLowerCase();
+  if (normalized === 'api_key') return 'api_key';
+  if (normalized === 'cli') return 'cli';
+  if (normalized === 'auto') return 'auto';
+  return fallback;
+};
+
 const looksLikeGeminiModel = (value) =>
   String(value || '')
     .trim()
@@ -240,7 +251,13 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
     const cachePathValue = String(faq.cache_file || '').trim();
     const cachePath = cachePathValue ? path.resolve(process.cwd(), cachePathValue) : path.join(process.cwd(), 'data', 'cache', `${moduleKey}-ai-faq-cache.json`);
 
-    const provider = normalizeLlmProvider(envValue('PROVIDER') || llm.provider || process.env.AI_HELP_LLM_PROVIDER, process.env.GEMINI_API_KEY ? 'gemini' : 'openai');
+    const geminiAuthMode = normalizeGeminiAuthMode(envValue('GEMINI_AUTH_MODE') || llm.gemini_auth_mode || process.env.GEMINI_AUTH_MODE, 'cli');
+    const hasGeminiAuthHint = isGeminiAuthReady({
+      authMode: geminiAuthMode,
+      apiKey: process.env.GEMINI_API_KEY,
+      cliCommand: process.env.GEMINI_CLI_COMMAND || 'gemini',
+    });
+    const provider = normalizeLlmProvider(envValue('PROVIDER') || llm.provider || process.env.AI_HELP_LLM_PROVIDER, hasGeminiAuthHint ? 'gemini' : 'openai');
     const defaultModelByProvider = provider === 'gemini' ? process.env.GEMINI_MODEL || DEFAULT_GEMINI_MODEL : process.env.OPENAI_MODEL || DEFAULT_OPENAI_MODEL;
     const rawModel = String(envValue('MODEL') || llm.model || defaultModelByProvider).trim() || defaultModelByProvider;
     const modelFromEnv = String(envValue('MODEL') || '').trim();
@@ -270,6 +287,7 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
             .trim()
             .toLowerCase() !== 'false',
         provider,
+        geminiAuthMode,
         model: resolvedModel,
         maxResponseChars: Math.max(400, toPositiveInt(envValue('MAX_RESPONSE_CHARS') || llm.max_response_chars, DEFAULT_MAX_RESPONSE_CHARS, 400)),
         maxAgentContextChars: Math.max(2_000, toPositiveInt(envValue('MAX_AGENT_CONTEXT_CHARS') || llm.max_agent_context_chars, DEFAULT_MAX_AGENT_CONTEXT_CHARS, 2_000)),
@@ -285,6 +303,7 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
   let faqGenerationPromise = null;
   let cachedOpenAIClient = null;
   let cachedGeminiService = null;
+  let cachedGeminiServiceKey = '';
 
   const createEmptyCache = () => ({
     version: FAQ_CACHE_VERSION,
@@ -420,13 +439,14 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
 
   const readAgentExcerpt = async () => {
     const { llm } = getAiHelpConfig();
+    const explicitExcerpt = clampText(process.env[`${envPrefix}_AGENT_EXCERPT`], llm.maxAgentContextChars);
+    if (explicitExcerpt) return explicitExcerpt;
     if (!agentMdPath) return '';
-    try {
-      const raw = await fs.readFile(agentMdPath, 'utf8');
-      return raw.slice(0, llm.maxAgentContextChars);
-    } catch {
-      return '';
-    }
+
+    const normalizedAgentPath = String(agentMdPath).trim();
+    if (!normalizedAgentPath) return '';
+    const safeAgentName = path.basename(normalizedAgentPath);
+    return clampText(`Considere as orientacoes locais do arquivo ${safeAgentName}.`, llm.maxAgentContextChars);
   };
 
   const summarizeConfigForPrompt = () => {
@@ -439,7 +459,14 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
       .join('\n');
   };
 
-  const isGeminiReady = () => Boolean(String(process.env.GEMINI_API_KEY || '').trim());
+  const isGeminiReady = () => {
+    const config = getAiHelpConfig();
+    return isGeminiAuthReady({
+      authMode: config.llm.geminiAuthMode,
+      apiKey: process.env.GEMINI_API_KEY,
+      cliCommand: process.env.GEMINI_CLI_COMMAND || 'gemini',
+    });
+  };
   const isOpenAIReady = () => Boolean(String(process.env.OPENAI_API_KEY || '').trim());
   const isProviderReady = (provider) => (provider === 'gemini' ? isGeminiReady() : isOpenAIReady());
 
@@ -451,12 +478,16 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
   const getGeminiService = () => {
     if (!isGeminiReady()) return null;
     const config = getAiHelpConfig();
-    if (!cachedGeminiService) {
+    const currentServiceKey = `${config.llm.model}|${config.llm.timeoutMs}|${config.llm.geminiAuthMode}|${process.env.GEMINI_CLI_COMMAND || 'gemini'}|${Boolean(String(process.env.GEMINI_API_KEY || '').trim())}`;
+    if (!cachedGeminiService || cachedGeminiServiceKey !== currentServiceKey) {
       cachedGeminiService = createGeminiTextService({
         apiKey: process.env.GEMINI_API_KEY,
         defaultModel: config.llm.model || process.env.GEMINI_MODEL || DEFAULT_GEMINI_MODEL,
         timeoutMs: config.llm.timeoutMs,
+        authMode: config.llm.geminiAuthMode,
+        cliCommand: process.env.GEMINI_CLI_COMMAND || 'gemini',
       });
+      cachedGeminiServiceKey = currentServiceKey;
     }
     return cachedGeminiService;
   };
@@ -578,7 +609,7 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
       ...cache.metrics,
       [metricKey]: Number(cache.metrics?.[metricKey] || 0) + 1,
     };
-    cache.updatedAt = new Date().toISOString();
+    cache.updatedAt = __timeNowIso();
     await writeCache(cache);
   };
 
@@ -590,7 +621,7 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
     const normalizedSource = normalizeCacheSource(source);
     const normalizedAnswer = clampText(answer, config.llm.maxResponseChars);
     if (!normalizedAnswer) return;
-    const now = new Date().toISOString();
+    const now = __timeNowIso();
 
     const cache = await readCache();
     cache.questionCache[key] = {
@@ -738,10 +769,10 @@ export const createModuleAiHelpService = ({ moduleKey, moduleLabel = 'modulo', e
       }
 
       const cache = await readCache();
-      const now = new Date().toISOString();
+      const now = __timeNowIso();
 
       if (!force && cache.generatedAt) {
-        const ageMs = Date.now() - new Date(cache.generatedAt).getTime();
+        const ageMs = __timeNowMs() - new Date(cache.generatedAt).getTime();
         if (Number.isFinite(ageMs) && ageMs >= 0 && ageMs < config.faq.intervalMs) {
           const commandCount = Object.keys(cache.faqByCommand || {}).length;
           const faqCount = Object.values(cache.faqByCommand || {}).reduce((acc, list) => acc + (Array.isArray(list) ? list.length : 0), 0);

package/app/services/ai/moduleToolExecutorService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import logger from '#logger';
 import { getToolRecord } from './moduleToolRegistryService.js';
 import { mapToolArgsToCommandText } from './commandToolBuilderService.js';
@@ -388,7 +389,7 @@ export const executeTool = async (toolName, toolArgs, context = {}) => {
   }
 
   const mapped = mapToolArgsToCommandText(record.argumentSpecs, argsValidation.normalizedArgs);
-  const startedAt = Date.now();
+  const startedAt = __timeNowMs();
 
   let executionResult = null;
   try {
@@ -409,7 +410,7 @@ export const executeTool = async (toolName, toolArgs, context = {}) => {
     };
   }
 
-  const executionTimeMs = Date.now() - startedAt;
+  const executionTimeMs = __timeNowMs() - startedAt;
   logger.info('Execucao de tool AI concluida.', {
     action: 'ai_tool_execution',
     tool_used: record.toolName,

package/app/services/ai/moduleToolRegistryService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import fs from 'node:fs';
 import path from 'node:path';
 import logger from '#logger';
@@ -126,7 +127,7 @@ const buildRegistrySnapshot = () => {
   }
 
   cachedRegistry = {
-    builtAt: new Date().toISOString(),
+    builtAt: __timeNowIso(),
     signature,
     records: records.sort((a, b) => a.toolName.localeCompare(b.toolName)),
     toolNameToRecord,

package/app/services/ai/toolCandidateSelectorService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import natural from 'natural';
 import winkBm25TextSearch from 'wink-bm25-text-search';
 import logger from '#logger';
@@ -193,7 +194,7 @@ const ensureCacheSize = () => {
   }
 };
 
-const pruneCache = (nowMs = Date.now()) => {
+const pruneCache = (nowMs = __timeNowMs()) => {
   for (const [cacheKey, cacheEntry] of queryCache.entries()) {
     if (!cacheEntry || cacheEntry.expiresAt <= nowMs) {
       queryCache.delete(cacheKey);
@@ -290,7 +291,7 @@ const buildOrGetIndexSnapshot = () => {
 
   cachedIndexSnapshot = {
     signature,
-    builtAt: new Date().toISOString(),
+    builtAt: __timeNowIso(),
     bm25Ready,
     bm25Engine,
     entries,
@@ -445,7 +446,7 @@ const buildCommandConfigOverlayMaps = (states = []) => {
 };
 
 const refreshLearnedKnowledgeCache = async ({ force = false } = {}) => {
-  const nowMs = Date.now();
+  const nowMs = __timeNowMs();
   if (!force && learnedKnowledgeCache.loaded && learnedKnowledgeCache.nextRefreshAt > nowMs && learnedKnowledgeCache.version) {
     return learnedKnowledgeCache;
   }
@@ -498,7 +499,7 @@ const refreshLearnedKnowledgeCache = async ({ force = false } = {}) => {
 };
 
 const refreshCommandConfigEnrichmentCache = async ({ force = false } = {}) => {
-  const nowMs = Date.now();
+  const nowMs = __timeNowMs();
   if (!force && commandConfigEnrichmentCache.loaded && commandConfigEnrichmentCache.nextRefreshAt > nowMs && commandConfigEnrichmentCache.version) {
     return commandConfigEnrichmentCache;
   }
@@ -593,7 +594,7 @@ export const selectCandidateTools = async (userMessage, limit = TOOL_SELECTION_M
   }
 
   const normalizedMessage = normalizeText(userMessage);
-  const nowMs = Date.now();
+  const nowMs = __timeNowMs();
   pruneCache(nowMs);
   const cacheKey = buildCacheKey({
     message: normalizedMessage,

package/app/services/auth/googleWebLinkService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import { executeQuery, TABLES } from '../../../database/index.js';
 import { normalizeJid } from '../../config/index.js';
 import { toWhatsAppPhoneDigits } from './whatsappLoginLinkService.js';
@@ -21,7 +22,7 @@ const normalizeCacheKey = ({ ownerJid = '', ownerPhone = '' }) => {
 const getCachedGoogleLinkStatus = (cacheKey) => {
   const cached = googleLinkCheckCache.get(cacheKey);
   if (!cached) return null;
-  if (Number(cached.expiresAt || 0) <= Date.now()) {
+  if (Number(cached.expiresAt || 0) <= __timeNowMs()) {
     googleLinkCheckCache.delete(cacheKey);
     return null;
   }
@@ -31,7 +32,7 @@ const getCachedGoogleLinkStatus = (cacheKey) => {
 const setCachedGoogleLinkStatus = (cacheKey, linked) => {
   googleLinkCheckCache.set(cacheKey, {
     linked: Boolean(linked),
-    expiresAt: Date.now() + GOOGLE_LINK_CHECK_CACHE_TTL_MS,
+    expiresAt: __timeNowMs() + GOOGLE_LINK_CHECK_CACHE_TTL_MS,
   });
 };
 

package/app/services/auth/whatsappLoginLinkService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import { createHmac, timingSafeEqual } from 'node:crypto';
 import { URL } from 'node:url';
 import { getJidServer, getJidUser, normalizeJid } from '../../config/index.js';
@@ -103,7 +104,7 @@ export const toWhatsAppOwnerJid = (value) => {
   return normalizeJid(`${digits}@s.whatsapp.net`) || '';
 };
 
-export const buildWhatsAppLoginHint = (value, { nowMs = Date.now() } = {}) => {
+export const buildWhatsAppLoginHint = (value, { nowMs = __timeNowMs() } = {}) => {
   const phoneDigits = toWhatsAppPhoneDigits(value);
   if (!phoneDigits) return null;
 
@@ -141,7 +142,7 @@ export const extractWhatsAppLoginHint = (payload = {}) => {
   };
 };
 
-export const resolveWhatsAppOwnerJidFromLoginPayload = (payload, { nowMs = Date.now() } = {}) => {
+export const resolveWhatsAppOwnerJidFromLoginPayload = (payload, { nowMs = __timeNowMs() } = {}) => {
   const hint = extractWhatsAppLoginHint(payload);
   const hasPayload = Boolean(hint.wa || hint.wa_ts || hint.wa_sig);
   if (!hasPayload) {

package/app/services/external/pokeApiService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import axios from 'axios';
 import logger from '#logger';
 import { recordPokeApiCacheHit } from '../../observability/metrics.js';
@@ -9,7 +10,7 @@ const REQUEST_TIMEOUT_MS = Math.max(3_000, Number(process.env.POKEAPI_TIMEOUT_MS
 const REQUEST_RETRY_ATTEMPTS = Math.max(0, Number(process.env.POKEAPI_RETRY_ATTEMPTS) || 2);
 const REQUEST_RETRY_BASE_DELAY_MS = Math.max(120, Number(process.env.POKEAPI_RETRY_BASE_DELAY_MS) || 350);
 const DNS_FAMILY = [0, 4, 6].includes(Number(process.env.POKEAPI_DNS_FAMILY)) ? Number(process.env.POKEAPI_DNS_FAMILY) : 4;
-const REQUEST_USER_AGENT = String(process.env.POKEAPI_USER_AGENT || 'omnizap-system/2.1 (+https://github.com/Omnizap-System/omnizap)').trim();
+const REQUEST_USER_AGENT = String(process.env.POKEAPI_USER_AGENT || 'omnizap/2.1 (+https://github.com/Omnizap-System/omnizap)').trim();
 const DEFAULT_LORE_LANGUAGES = String(process.env.POKEAPI_LORE_LANGS || 'pt-br,pt,en')
   .split(',')
   .map((entry) =>
@@ -177,7 +178,7 @@ const cleanupExpiredEntry = (key, now) => {
 };
 
 const requestResource = async ({ path, cacheKey }) => {
-  const now = Date.now();
+  const now = __timeNowMs();
   const staleEntry = sharedCache.get(cacheKey);
   const staleData = staleEntry?.data || null;
   const cached = cleanupExpiredEntry(cacheKey, now);
@@ -207,7 +208,7 @@ const requestResource = async ({ path, cacheKey }) => {
         const data = response?.data;
         sharedCache.set(cacheKey, {
           data,
-          expiresAt: Date.now() + CACHE_TTL_MS,
+          expiresAt: __timeNowMs() + CACHE_TTL_MS,
         });
         return data;
       } catch (error) {

package/app/services/group/groupMetadataService.js

@@ -2,7 +2,7 @@ import logger from '#logger';
 import { findById, upsert } from '../../../database/index.js';
 import { extractUserIdInfo, resolveUserIdCached, isLidUserId, isWhatsAppUserId } from '../../config/index.js';
 
-const GROUP_METADATA_FIELDS = ['id', 'subject', 'description', 'owner_jid', 'creation', 'participants'];
+const GROUP_METADATA_FIELDS = ['id', 'subject', 'description', 'owner_jid', 'creation', 'participants', 'linked_parent_jid', 'is_community', 'is_community_announce', 'member_add_mode', 'join_approval_mode', 'addressing_mode'];
 
 const PARTICIPANT_ACTIONS = new Set(['add', 'remove', 'promote', 'demote', 'modify']);
 
@@ -285,6 +285,17 @@ export const buildGroupMetadataFromUpdate = (event, existing) => {
   const currentParticipants = parseParticipantsFromDb(existing?.participants);
   const participants = event.participants || currentParticipants;
   const normalizedParticipants = normalizeParticipantsList(participants);
+  const resolveExistingValue = (snakeKey, camelKey) => existing?.[snakeKey] ?? existing?.[camelKey];
+  const resolveBoolean = (eventValue, snakeKey, camelKey) => {
+    if (eventValue !== undefined) return Boolean(eventValue);
+    const existingValue = resolveExistingValue(snakeKey, camelKey);
+    return existingValue === undefined || existingValue === null ? null : Boolean(existingValue);
+  };
+
+  const linkedParentRaw = event.linkedParent ?? resolveExistingValue('linked_parent_jid', 'linkedParent');
+  const linkedParent = typeof linkedParentRaw === 'string' ? linkedParentRaw.trim() || null : linkedParentRaw || null;
+  const addressingModeRaw = event.addressingMode ?? resolveExistingValue('addressing_mode', 'addressingMode');
+  const addressingMode = typeof addressingModeRaw === 'string' ? addressingModeRaw.trim() || null : addressingModeRaw || null;
 
   return {
     id: event.id,
@@ -293,6 +304,12 @@ export const buildGroupMetadataFromUpdate = (event, existing) => {
     owner_jid: event.owner ?? existing?.owner_jid,
     creation: event.creation ?? existing?.creation,
     participants: normalizedParticipants,
+    linked_parent_jid: linkedParent,
+    is_community: resolveBoolean(event.isCommunity, 'is_community', 'isCommunity'),
+    is_community_announce: resolveBoolean(event.isCommunityAnnounce, 'is_community_announce', 'isCommunityAnnounce'),
+    member_add_mode: resolveBoolean(event.memberAddMode, 'member_add_mode', 'memberAddMode'),
+    join_approval_mode: resolveBoolean(event.joinApprovalMode, 'join_approval_mode', 'joinApprovalMode'),
+    addressing_mode: addressingMode,
   };
 };
 
@@ -308,4 +325,10 @@ export const buildGroupMetadataFromGroup = (group) => ({
   owner_jid: group.owner,
   creation: group.creation,
   participants: normalizeParticipantsList(group.participants || []),
+  linked_parent_jid: typeof group.linkedParent === 'string' ? group.linkedParent.trim() || null : group.linkedParent || null,
+  is_community: group.isCommunity === undefined ? null : Boolean(group.isCommunity),
+  is_community_announce: group.isCommunityAnnounce === undefined ? null : Boolean(group.isCommunityAnnounce),
+  member_add_mode: group.memberAddMode === undefined ? null : Boolean(group.memberAddMode),
+  join_approval_mode: group.joinApprovalMode === undefined ? null : Boolean(group.joinApprovalMode),
+  addressing_mode: typeof group.addressingMode === 'string' ? group.addressingMode.trim() || null : group.addressingMode || null,
 });

package/app/services/infra/dbWriteQueue.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import logger from '#logger';
 import { executeQuery, TABLES } from '../../../database/index.js';
 import { queueLidUpdate, flushLidQueue, resolveUserIdCached } from '../../config/index.js';
@@ -104,7 +105,7 @@ const INVALID_SURROGATE_REGEX = /surrogate pair/i;
 const messageQueue = [];
 
 /**
- * Conjunto de IDs de mensagens que já estão enfileiradas, para evitar duplicação.
+ * Conjunto de IDs de mensagens já enfileiradas no formato `${session_id}:${message_id}`.
  * @type {Set<string>}
  */
 const messagePendingIds = new Set();
@@ -131,7 +132,7 @@ const chatCache = new Map();
 
 /**
  * Fila em memória com eventos do Baileys pendentes de persistência.
- * @type {Array<{event_name:string, socket_generation:(number|null), chat_id:(string|null), message_id:(string|null), participant_id:(string|null), payload_summary:(string|null), event_timestamp:Date}>}
+ * @type {Array<{session_id:string, event_name:string, socket_generation:(number|null), chat_id:(string|null), message_id:(string|null), participant_id:(string|null), payload_summary:(string|null), event_timestamp:Date}>}
  */
 const baileysEventQueue = [];
 
@@ -250,8 +251,8 @@ const isInvalidJsonPayloadError = (error) => {
  * - content: remove surrogate inválido
  * - raw_message: serializa JSON seguro para coluna JSON
  *
- * @param {{message_id:string, chat_id:string, sender_id:string, canonical_sender_id?:(string|null), content:(string|null), raw_message:(Object|string|null), timestamp:(number|string|Date)}} messageData
- * @returns {{message_id:string, chat_id:string, sender_id:(string|null), canonical_sender_id:(string|null), content:(string|null), raw_message:(string|null), timestamp:(number|string|Date)}}
+ * @param {{session_id?:(string|null), message_id:string, chat_id:string, sender_id:string, canonical_sender_id?:(string|null), content:(string|null), raw_message:(Object|string|null), timestamp:(number|string|Date), allow_group_write?:(boolean)}} messageData
+ * @returns {{session_id:string, message_id:string, chat_id:(string|null), sender_id:(string|null), canonical_sender_id:(string|null), content:(string|null), raw_message:(string|null), timestamp:(number|string|Date)}}
  */
 const normalizeUserIdForColumn = (value, maxLength = 255) => {
   if (value === null || value === undefined) return null;
@@ -276,8 +277,13 @@ const resolveCanonicalSenderIdForMessage = (messageData) => {
 
 const normalizeMessageForQueue = (messageData) => {
   const senderId = normalizeUserIdForColumn(messageData?.sender_id, 255);
+  const messageId = normalizeTextForColumn(messageData?.message_id, 255);
+  const chatId = normalizeTextForColumn(messageData?.chat_id, 255);
   return {
     ...messageData,
+    session_id: normalizeSessionIdForColumn(messageData?.session_id || messageData?.sessionId),
+    message_id: messageId,
+    chat_id: chatId,
     sender_id: senderId,
     canonical_sender_id: resolveCanonicalSenderIdForMessage({
       ...messageData,
@@ -298,10 +304,28 @@ const normalizeTimestampForColumn = (value) => {
   if (value instanceof Date && Number.isFinite(value.getTime())) return value;
   const parsed = new Date(value);
   if (Number.isFinite(parsed.getTime())) return parsed;
-  return new Date();
+  return __timeNow();
+};
+
+const normalizeSessionIdForColumn = (value) => {
+  const normalized = normalizeTextForColumn(value, 64);
+  return normalized || 'default';
+};
+
+const isGroupChatId = (chatId) => {
+  const normalized = String(chatId || '').trim();
+  return normalized.endsWith('@g.us');
+};
+
+const buildMessagePendingKey = (sessionId, messageId) => {
+  const safeSessionId = normalizeSessionIdForColumn(sessionId);
+  const safeMessageId = normalizeTextForColumn(messageId, 255);
+  if (!safeMessageId) return null;
+  return `${safeSessionId}:${safeMessageId}`;
 };
 
 const normalizeBaileysEventForQueue = (eventData) => ({
+  session_id: normalizeSessionIdForColumn(eventData?.session_id || eventData?.sessionId),
   event_name: normalizeTextForColumn(eventData?.event_name, 64),
   socket_generation: Number.isFinite(Number(eventData?.socket_generation)) ? Math.max(0, Math.floor(Number(eventData.socket_generation))) : null,
   chat_id: normalizeTextForColumn(eventData?.chat_id, 255),
@@ -312,14 +336,14 @@ const normalizeBaileysEventForQueue = (eventData) => ({
 });
 
 const insertBaileysEventBatch = async (batch) => {
-  const placeholders = buildPlaceholders(batch.length, 7);
+  const placeholders = buildPlaceholders(batch.length, 8);
   const params = [];
   for (const entry of batch) {
-    params.push(entry.event_name, entry.socket_generation, entry.chat_id, entry.message_id, entry.participant_id, entry.payload_summary, entry.event_timestamp);
+    params.push(entry.session_id, entry.event_name, entry.socket_generation, entry.chat_id, entry.message_id, entry.participant_id, entry.payload_summary, entry.event_timestamp);
   }
 
   const sql = `INSERT INTO ${TABLES.BAILEYS_EVENT_JOURNAL}
-      (event_name, socket_generation, chat_id, message_id, participant_id, payload_summary, event_timestamp)
+      (session_id, event_name, socket_generation, chat_id, message_id, participant_id, payload_summary, event_timestamp)
       VALUES ${placeholders}`;
 
   await executeQuery(sql, params);
@@ -328,18 +352,18 @@ const insertBaileysEventBatch = async (batch) => {
 /**
  * Executa INSERT IGNORE de um batch de mensagens.
  *
- * @param {Array<{message_id:string, chat_id:string, sender_id:(string|null), canonical_sender_id:(string|null), content:(string|null), raw_message:(string|null), timestamp:(number|string|Date)}>} batch
+ * @param {Array<{session_id:string, message_id:string, chat_id:string, sender_id:(string|null), canonical_sender_id:(string|null), content:(string|null), raw_message:(string|null), timestamp:(number|string|Date)}>} batch
  * @returns {Promise<void>}
  */
 const insertMessageBatch = async (batch) => {
-  const placeholders = buildPlaceholders(batch.length, 7);
+  const placeholders = buildPlaceholders(batch.length, 8);
   const params = [];
   for (const message of batch) {
-    params.push(message.message_id, message.chat_id, message.sender_id, message.canonical_sender_id, message.content, message.raw_message, message.timestamp);
+    params.push(message.session_id, message.message_id, message.chat_id, message.sender_id, message.canonical_sender_id, message.content, message.raw_message, message.timestamp);
   }
 
   const sql = `INSERT IGNORE INTO ${TABLES.MESSAGES}
-      (message_id, chat_id, sender_id, canonical_sender_id, content, raw_message, timestamp)
+      (session_id, message_id, chat_id, sender_id, canonical_sender_id, content, raw_message, timestamp)
       VALUES ${placeholders}`;
 
   await executeQuery(sql, params);
@@ -423,12 +447,13 @@ const refreshMessageActivityDailyForBatch = async (batch) => {
 /**
  * Remove IDs de mensagens do set de pendentes.
  *
- * @param {Array<{message_id:string}>} batch
+ * @param {Array<{session_id:string, message_id:string}>} batch
  * @returns {void}
  */
 const clearPendingMessageIds = (batch) => {
   for (const message of batch) {
-    messagePendingIds.delete(message.message_id);
+    const key = buildMessagePendingKey(message?.session_id, message?.message_id);
+    if (key) messagePendingIds.delete(key);
   }
 };
 
@@ -437,7 +462,7 @@ const clearPendingMessageIds = (batch) => {
  * - Mensagem inválida é descartada para não travar a fila inteira.
  * - Em erro transitório, re-enfileira o restante e interrompe.
  *
- * @param {Array<{message_id:string, chat_id:string, sender_id:(string|null), canonical_sender_id:(string|null), content:(string|null), raw_message:(string|null), timestamp:(number|string|Date)}>} batch
+ * @param {Array<{session_id:string, message_id:string, chat_id:string, sender_id:(string|null), canonical_sender_id:(string|null), content:(string|null), raw_message:(string|null), timestamp:(number|string|Date)}>} batch
  * @returns {Promise<void>}
  */
 const salvageJsonErrorBatch = async (batch) => {
@@ -513,7 +538,7 @@ const flushMessageQueueCore = async () => {
 
 const flushChatQueueCore = async () => {
   while (chatQueue.size > 0) {
-    const now = Date.now();
+    const now = __timeNowMs();
     const ready = [];
     for (const entry of chatQueue.values()) {
       if (now < entry.nextAllowedAt) continue;
@@ -539,7 +564,7 @@ const flushChatQueueCore = async () => {
 
     try {
       await executeQuery(sql, params);
-      const writeAt = Date.now();
+      const writeAt = __timeNowMs();
       for (const entry of ready) {
         const current = chatQueue.get(entry.id);
         const cache = chatCache.get(entry.id) || {};
@@ -576,7 +601,7 @@ const flushChatQueueCore = async () => {
 const pruneBaileysEventJournal = async () => {
   if (BAILEYS_EVENT_JOURNAL_RETENTION_DAYS <= 0) return;
 
-  const now = Date.now();
+  const now = __timeNowMs();
   if (now < nextBaileysEventPruneAt) return;
   nextBaileysEventPruneAt = now + BAILEYS_EVENT_JOURNAL_PRUNE_INTERVAL_MS;
 
@@ -678,26 +703,32 @@ const baileysEventFlushRunner = createFlushRunner({
 
 /**
  * Enfileira uma mensagem para INSERT no banco (INSERT IGNORE).
- * - Evita duplicar message_id usando um Set.
+ * - Evita duplicar por `${session_id}:${message_id}` usando um Set.
  * - Força flush se a fila estiver muito grande.
  * - Agenda flush quando atinge o tamanho de batch.
  *
- * @param {{message_id:string, chat_id:string, sender_id:string, canonical_sender_id?:(string|null), content:(string|null), raw_message:(Object|string|null), timestamp:(number|string)}} messageData
+ * @param {{session_id?:(string|null), message_id:string, chat_id:string, sender_id:string, canonical_sender_id?:(string|null), content:(string|null), raw_message:(Object|string|null), timestamp:(number|string), allow_group_write?:(boolean)}} messageData
  *   Objeto com os campos necessários para persistência.
  * @returns {boolean} true se foi enfileirada; false se inválida/duplicada.
  */
 export function queueMessageInsert(messageData) {
-  if (!messageData?.message_id) return false;
-  if (messagePendingIds.has(messageData.message_id)) return false;
-
   const normalizedMessage = normalizeMessageForQueue(messageData);
+  if (!normalizedMessage?.message_id) return false;
+
+  if (isGroupChatId(normalizedMessage.chat_id) && normalizedMessage.allow_group_write === false) {
+    return false;
+  }
+
+  const pendingKey = buildMessagePendingKey(normalizedMessage.session_id, normalizedMessage.message_id);
+  if (!pendingKey) return false;
+  if (messagePendingIds.has(pendingKey)) return false;
 
   if (messageQueue.length >= MESSAGE_QUEUE_MAX) {
     logger.warn('Fila de mensagens cheia, forçando flush.', { size: messageQueue.length });
     scheduleFlush();
   }
 
-  messagePendingIds.add(normalizedMessage.message_id);
+  messagePendingIds.add(pendingKey);
   messageQueue.push(normalizedMessage);
   updateQueueMetrics();
 
@@ -725,7 +756,7 @@ export function queueMessageInsert(messageData) {
 export function queueChatUpdate(chat, options = {}) {
   if (!chat || !chat.id) return false;
 
-  const now = Date.now();
+  const now = __timeNowMs();
   const isPartial = Boolean(options.partial);
   const forceName = Boolean(options.forceName);
   const cache = chatCache.get(chat.id) || {
@@ -781,7 +812,7 @@ export function queueChatUpdate(chat, options = {}) {
 /**
  * Enfileira um evento resumido do Baileys para o journal de auditoria.
  *
- * @param {{event_name:string, socket_generation?:(number|null), chat_id?:(string|null), message_id?:(string|null), participant_id?:(string|null), payload_summary?:any, event_timestamp?:(string|number|Date)}} eventData
+ * @param {{session_id?:(string|null), event_name:string, socket_generation?:(number|null), chat_id?:(string|null), message_id?:(string|null), participant_id?:(string|null), payload_summary?:any, event_timestamp?:(string|number|Date)}} eventData
  * @returns {boolean}
  */
 export function queueBaileysEventInsert(eventData) {

package/app/services/infra/featureFlagService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import { createHash } from 'node:crypto';
 
 import logger from '#logger';
@@ -65,7 +66,7 @@ const loadFlagsFromDatabase = async () => {
 };
 
 export const refreshFeatureFlags = async ({ force = false } = {}) => {
-  const now = Date.now();
+  const now = __timeNowMs();
   const isFresh = now - cacheState.loadedAt < FEATURE_FLAG_CACHE_TTL_MS;
   if (!force && isFresh) return cacheState.byName;
 

package/app/services/messaging/captchaService.js

@@ -1,3 +1,4 @@
+import { now as __timeNow, nowIso as __timeNowIso, toUnixMs as __timeNowMs } from '#time';
 import logger from '#logger';
 import { getJidUser } from '../../config/index.js';
 import { isUserAdmin, updateGroupParticipants } from '../../config/index.js';
@@ -200,7 +201,7 @@ const handleCaptchaTimeout = async (groupId, userId) => {
   const entry = groupMap?.get(userId);
   if (!entry) return;
 
-  if (Date.now() < entry.expiresAt) {
+  if (__timeNowMs() < entry.expiresAt) {
     return;
   }
 
@@ -377,7 +378,7 @@ export const registerCaptchaChallenge = ({ groupId, participantJid, messageKey,
     cleanupMessageStateForEntry(existingMatch.entry);
   }
 
-  const expiresAt = Date.now() + CAPTCHA_TIMEOUT_MS;
+  const expiresAt = __timeNowMs() + CAPTCHA_TIMEOUT_MS;
   const messageId = messageKey?.id || null;
   const normalizedText = normalizeMessageText(messageText);
   const messageStateKey = messageId && normalizedText ? buildMessageStateKey(groupId, messageId) : null;