feat: enrich receive messages with display names

internal/tools/isphere_read.go

@@ -10,6 +10,7 @@ import (
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 
 	"isphere-ai-bridge/internal/isphere"
+	"isphere-ai-bridge/internal/msglib"
 )
 
 const ToolNameReceiveMessages = "isphere_receive_messages"
@@ -30,6 +31,10 @@ type ReceiveMessagesArgs struct {
 }
 
 func RegisterISphereReadTools(server *mcp.Server, source ReceiveMessagesSource) {
+	RegisterISphereReadToolsWithDisplayEntities(server, source, nil)
+}
+
+func RegisterISphereReadToolsWithDisplayEntities(server *mcp.Server, source ReceiveMessagesSource, displaySource DisplayEntitySource) {
 	if source == nil {
 		source = isphere.EncryptedPacketLogSource{}
 	}
@@ -51,8 +56,17 @@ func RegisterISphereReadTools(server *mcp.Server, source ReceiveMessagesSource)
 		if err != nil {
 			return nil, nil, err
 		}
+		displayNames := receiveMessageDisplayNames{}
+		if displaySource != nil && len(result.Messages) > 0 {
+			loaded, err := loadReceiveMessageDisplayNames(ctx, displaySource)
+			if err != nil {
+				return nil, nil, err
+			}
+			displayNames = loaded
+		}
 		return nil, receiveMessagesResultToMap(result, started, time.Now().UTC(), receiveMessagesMapOptions{
 			IncludeAttachmentMetadata: includeReceiveMessageAttachmentMetadata(input),
+			DisplayNames:              displayNames,
 		}), nil
 	})
 }
@@ -83,6 +97,12 @@ func includeReceiveMessageAttachmentMetadata(input ReceiveMessagesArgs) bool {
 
 type receiveMessagesMapOptions struct {
 	IncludeAttachmentMetadata bool
+	DisplayNames              receiveMessageDisplayNames
+}
+
+type receiveMessageDisplayNames struct {
+	Contacts map[string]string
+	Groups   map[string]string
 }
 
 func receiveMessagesResultToMap(result isphere.ReceiveMessagesResult, started time.Time, finished time.Time, options receiveMessagesMapOptions) map[string]any {
@@ -92,13 +112,14 @@ func receiveMessagesResultToMap(result isphere.ReceiveMessagesResult, started ti
 		if options.IncludeAttachmentMetadata {
 			attachments = receiveMessageAttachments(message)
 		}
+		senderName := nullableDisplayName(options.DisplayNames.Contacts, message.SenderID)
 		messages = append(messages, map[string]any{
 			"id":                message.ID,
 			"message_id":        message.ID,
 			"conversation_id":   message.ConversationID,
 			"conversation_type": message.ConversationType,
 			"sender_id":         message.SenderID,
-			"sender_name":       nil,
+			"sender_name":       senderName,
 			"receiver_id":       message.ReceiverID,
 			"text":              message.Text,
 			"content_type":      receiveMessageContentType(message, attachments),
@@ -116,7 +137,7 @@ func receiveMessagesResultToMap(result isphere.ReceiveMessagesResult, started ti
 	}
 	return map[string]any{
 		"ok":           true,
-		"conversation": receiveMessagesConversation(result.Messages),
+		"conversation": receiveMessagesConversation(result.Messages, options.DisplayNames),
 		"messages":     messages,
 		"next_cursor":  nil,
 		"audit": map[string]any{
@@ -130,18 +151,85 @@ func receiveMessagesResultToMap(result isphere.ReceiveMessagesResult, started ti
 	}
 }
 
-func receiveMessagesConversation(messages []isphere.Message) any {
+func receiveMessagesConversation(messages []isphere.Message, displayNames receiveMessageDisplayNames) any {
 	if len(messages) == 0 {
 		return nil
 	}
 	first := messages[0]
+	conversationType := contractConversationType(first.ConversationType)
+	displayName := first.ConversationID
+	if conversationType == "group" {
+		if name := lookupDisplayName(displayNames.Groups, first.SenderID, first.ReceiverID, first.ConversationID); name != "" {
+			displayName = name
+		}
+	} else if name := lookupDisplayName(displayNames.Contacts, first.SenderID, first.ReceiverID); name != "" {
+		displayName = name
+	}
 	return map[string]any{
 		"conversation_id":   first.ConversationID,
-		"conversation_type": contractConversationType(first.ConversationType),
-		"display_name":      first.ConversationID,
+		"conversation_type": conversationType,
+		"display_name":      displayName,
 	}
 }
 
+func loadReceiveMessageDisplayNames(ctx context.Context, source DisplayEntitySource) (receiveMessageDisplayNames, error) {
+	contacts, err := source.DisplayEntities(ctx, msglib.DisplayEntitiesOptions{EntityType: msglib.EntityTypeContacts, Limit: msglib.MaxDisplayEntityLimit})
+	if err != nil {
+		return receiveMessageDisplayNames{}, err
+	}
+	groups, err := source.DisplayEntities(ctx, msglib.DisplayEntitiesOptions{EntityType: msglib.EntityTypeGroups, Limit: msglib.MaxDisplayEntityLimit})
+	if err != nil {
+		return receiveMessageDisplayNames{}, err
+	}
+	return receiveMessageDisplayNames{
+		Contacts: displayEntityNameMap(contacts, msglib.EntityTypeContacts),
+		Groups:   displayEntityNameMap(groups, msglib.EntityTypeGroups),
+	}, nil
+}
+
+func displayEntityNameMap(entities []msglib.DisplayEntity, entityType string) map[string]string {
+	names := map[string]string{}
+	for _, entity := range entities {
+		if entity.EntityType != "" && entity.EntityType != entityType {
+			continue
+		}
+		jid := strings.ToLower(strings.TrimSpace(entity.JID))
+		name := strings.TrimSpace(entity.DisplayName)
+		if jid == "" || name == "" {
+			continue
+		}
+		if _, exists := names[jid]; !exists {
+			names[jid] = name
+		}
+	}
+	return names
+}
+
+func nullableDisplayName(names map[string]string, id string) any {
+	if name := lookupDisplayName(names, id); name != "" {
+		return name
+	}
+	return nil
+}
+
+func lookupDisplayName(names map[string]string, candidates ...string) string {
+	if len(names) == 0 {
+		return ""
+	}
+	for _, candidate := range candidates {
+		for _, part := range strings.Split(candidate, "|") {
+			key := strings.ToLower(strings.TrimSpace(part))
+			if key == "" {
+				continue
+			}
+			if name := names[key]; name != "" {
+				return name
+			}
+		}
+	}
+	return ""
+}
+
 func contractConversationType(value string) string {
 	switch strings.ToLower(strings.TrimSpace(value)) {
 	case "groupchat", "group":