From 2af558cebd184665f7708433fe43b565e15882ec Mon Sep 17 00:00:00 2001
From: "google-labs-jules[bot]"
 <161369871+google-labs-jules[bot]@users.noreply.github.com>
Date: Mon, 16 Mar 2026 08:03:25 +0000
Subject: [PATCH] Add logging to Matrix channel and update refactor

Co-authored-by: hobbyistlabs-coder <267281733+hobbyistlabs-coder@users.noreply.github.com>
---
 pkg/channels/matrix/events.go   |  7 +++++++
 pkg/channels/matrix/messages.go | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/pkg/channels/matrix/events.go b/pkg/channels/matrix/events.go
index 8d1b6f25e..4227d9040 100644
--- a/pkg/channels/matrix/events.go
+++ b/pkg/channels/matrix/events.go
@@ -136,6 +136,13 @@ func (c *MatrixChannel) handleMessageEvent(ctx context.Context, evt *event.Event
 		"is_group":   fmt.Sprintf("%t", isGroup),
 		"sender_raw": senderID,
 	}
+
+	logger.DebugCF("matrix", "Received message", map[string]any{
+		"sender_id": senderID,
+		"room_id":   roomID,
+		"is_group":  isGroup,
+	})
+
 	if replyTo := msgEvt.GetRelatesTo().GetReplyTo(); replyTo != "" {
 		metadata["reply_to_msg_id"] = replyTo.String()
 	}
diff --git a/pkg/channels/matrix/messages.go b/pkg/channels/matrix/messages.go
index bbeca8258..9a4643adc 100644
--- a/pkg/channels/matrix/messages.go
+++ b/pkg/channels/matrix/messages.go
@@ -13,6 +13,7 @@ import (
 
 	"jane/pkg/bus"
 	"jane/pkg/channels"
+	"jane/pkg/logger"
 )
 
 func markdownToHTML(md string) string {
@@ -38,8 +39,16 @@ func (c *MatrixChannel) Send(ctx context.Context, msg bus.OutboundMessage) error
 
 	_, err := c.client.SendMessageEvent(ctx, roomID, event.EventMessage, c.messageContent(content))
 	if err != nil {
+		logger.ErrorCF("matrix", "Failed to send message", map[string]any{
+			"room_id": roomID.String(),
+			"error":   err.Error(),
+		})
 		return fmt.Errorf("matrix send: %w", channels.ErrTemporary)
 	}
+
+	logger.DebugCF("matrix", "Sent message", map[string]any{
+		"room_id": roomID.String(),
+	})
 	return nil
 }
 
@@ -93,5 +102,17 @@ func (c *MatrixChannel) EditMessage(ctx context.Context, chatID string, messageI
 	editContent.SetEdit(id.EventID(messageID))
 
 	_, err := c.client.SendMessageEvent(ctx, roomID, event.EventMessage, editContent)
+	if err != nil {
+		logger.ErrorCF("matrix", "Failed to edit message", map[string]any{
+			"room_id":    roomID.String(),
+			"message_id": messageID,
+			"error":      err.Error(),
+		})
+	} else {
+		logger.DebugCF("matrix", "Edited message", map[string]any{
+			"room_id":    roomID.String(),
+			"message_id": messageID,
+		})
+	}
 	return err
 }