diff --git a/pkg/agent/context.go b/pkg/agent/context.go
index 506e5dc..7e8612e 100644
--- a/pkg/agent/context.go
+++ b/pkg/agent/context.go
@@ -146,11 +146,7 @@ func (cb *ContextBuilder) LoadBootstrapFiles() string {
 	return result
 }
 
-<<<<<<< HEAD
-func (cb *ContextBuilder) BuildMessages(history []providers.Message, summary string, currentMessage string, media []string) []providers.Message {
-=======
 func (cb *ContextBuilder) BuildMessages(history []providers.Message, summary string, currentMessage string, media []string, channel, chatID string) []providers.Message {
->>>>>>> fd1dd87 (Add memory system, debug mode, and tools)
 	messages := []providers.Message{}
 
 	systemPrompt := cb.BuildSystemPrompt()
@@ -243,7 +239,8 @@ func (cb *ContextBuilder) GetSkillsInfo() map[string]interface{} {
 		skillNames = append(skillNames, s.Name)
 	}
 	return map[string]interface{}{
-		"total": len(allSkills),
-		"names": skillNames,
+		"total":     len(allSkills),
+		"available": len(allSkills),
+		"names":     skillNames,
 	}
 }
diff --git a/pkg/agent/loop.go b/pkg/agent/loop.go
index 5737396..d38848b 100644
--- a/pkg/agent/loop.go
+++ b/pkg/agent/loop.go
@@ -159,8 +159,12 @@ func (al *AgentLoop) processMessage(ctx context.Context, msg bus.InboundMessage)
 		}
 	}
 
+	history := al.sessions.GetHistory(msg.SessionKey)
+	summary := al.sessions.GetSummary(msg.SessionKey)
+
 	messages := al.contextBuilder.BuildMessages(
-		al.sessions.GetHistory(msg.SessionKey),
+		history,
+		summary,
 		msg.Content,
 		nil,
 		msg.Channel,
@@ -347,8 +351,11 @@ func (al *AgentLoop) processSystemMessage(ctx context.Context, msg bus.InboundMe
 	}
 
 	// Build messages with the announce content
+	history := al.sessions.GetHistory(sessionKey)
+	summary := al.sessions.GetSummary(sessionKey)
 	messages := al.contextBuilder.BuildMessages(
-		al.sessions.GetHistory(sessionKey),
+		history,
+		summary,
 		msg.Content,
 		nil,
 		originChannel,