inbound dedupe + ekg stratification: channel-level message_id dedupe and source/channel-separated ekg stats

pkg/channels/base.go

@@ -5,7 +5,9 @@ import (
 	"fmt"
 	"path/filepath"
 	"strings"
+	"sync"
 	"sync/atomic"
+	"time"
 
 	"clawgo/pkg/bus"
 	"clawgo/pkg/logger"
@@ -32,6 +34,8 @@ type BaseChannel struct {
 	running   atomic.Bool
 	name      string
 	allowList []string
+	recentMsgMu sync.Mutex
+	recentMsg   map[string]time.Time
 }
 
 func NewBaseChannel(name string, config interface{}, bus *bus.MessageBus, allowList []string) *BaseChannel {
@@ -40,6 +44,7 @@ func NewBaseChannel(name string, config interface{}, bus *bus.MessageBus, allowL
 		bus:       bus,
 		name:      name,
 		allowList: allowList,
+		recentMsg: map[string]time.Time{},
 	}
 }
 
@@ -78,6 +83,29 @@ func (c *BaseChannel) IsAllowed(senderID string) bool {
 	return false
 }
 
+func (c *BaseChannel) isDuplicateInboundMessage(messageID string) bool {
+	messageID = strings.TrimSpace(messageID)
+	if messageID == "" {
+		return false
+	}
+	now := time.Now()
+	const ttl = 10 * time.Minute
+	c.recentMsgMu.Lock()
+	defer c.recentMsgMu.Unlock()
+	for id, ts := range c.recentMsg {
+		if now.Sub(ts) > ttl {
+			delete(c.recentMsg, id)
+		}
+	}
+	if ts, ok := c.recentMsg[messageID]; ok {
+		if now.Sub(ts) <= ttl {
+			return true
+		}
+	}
+	c.recentMsg[messageID] = now
+	return false
+}
+
 func (c *BaseChannel) HandleMessage(senderID, chatID, content string, media []string, metadata map[string]string) {
 	if !c.IsAllowed(senderID) {
 		logger.WarnCF("channels", "Message rejected by allowlist", map[string]interface{}{
@@ -88,6 +116,19 @@ func (c *BaseChannel) HandleMessage(senderID, chatID, content string, media []st
 		return
 	}
 
+	if metadata != nil {
+		if messageID := strings.TrimSpace(metadata["message_id"]); messageID != "" {
+			if c.isDuplicateInboundMessage(c.name + ":" + messageID) {
+				logger.WarnCF("channels", "Duplicate inbound message skipped", map[string]interface{}{
+					logger.FieldChannel: c.name,
+					"message_id":      messageID,
+					logger.FieldChatID: chatID,
+				})
+				return
+			}
+		}
+	}
+
 	// Build session key: channel:chatID
 	sessionKey := fmt.Sprintf("%s:%s", c.name, chatID)
 

pkg/channels/feishu.go

@@ -41,9 +41,6 @@ type FeishuChannel struct {
 	tenantAccessToken string
 	tenantTokenExpire time.Time
 	tenantTokenErr    error
-
-	recentMsgMu sync.Mutex
-	recentMsg   map[string]time.Time
 }
 
 func (c *FeishuChannel) SupportsAction(action string) bool {
@@ -62,7 +59,6 @@ func NewFeishuChannel(cfg config.FeishuConfig, bus *bus.MessageBus) (*FeishuChan
 		BaseChannel: base,
 		config:      cfg,
 		client:      lark.NewClient(cfg.AppID, cfg.AppSecret),
-		recentMsg:   map[string]time.Time{},
 	}, nil
 }
 
@@ -226,12 +222,6 @@ func (c *FeishuChannel) handleMessageReceive(ctx context.Context, event *larkim.
 	if sender != nil && sender.TenantKey != nil {
 		metadata["tenant_key"] = *sender.TenantKey
 	}
-	if messageID := metadata["message_id"]; messageID != "" {
-		if c.isDuplicateInboundMessage(messageID) {
-			logger.WarnCF("feishu", "Duplicate Feishu inbound message skipped", map[string]interface{}{"message_id": messageID, logger.FieldChatID: chatID})
-			return nil
-		}
-	}
 
 	logger.InfoCF("feishu", "Feishu message received", map[string]interface{}{
 		logger.FieldSenderID: senderID,
@@ -332,29 +322,6 @@ func (c *FeishuChannel) isAllowedChat(chatID, chatType string) bool {
 	return false
 }
 
-func (c *FeishuChannel) isDuplicateInboundMessage(messageID string) bool {
-	messageID = strings.TrimSpace(messageID)
-	if messageID == "" {
-		return false
-	}
-	now := time.Now()
-	const ttl = 10 * time.Minute
-	c.recentMsgMu.Lock()
-	defer c.recentMsgMu.Unlock()
-	for id, ts := range c.recentMsg {
-		if now.Sub(ts) > ttl {
-			delete(c.recentMsg, id)
-		}
-	}
-	if ts, ok := c.recentMsg[messageID]; ok {
-		if now.Sub(ts) <= ttl {
-			return true
-		}
-	}
-	c.recentMsg[messageID] = now
-	return false
-}
-
 func (c *FeishuChannel) shouldHandleGroupMessage(chatType, content string) bool {
 	chatType = strings.ToLower(strings.TrimSpace(chatType))
 	isGroup := chatType != "" && chatType != "p2p"