Merge pull request #304 from dgageot/compute-messages-once-v1

Compute messages once

Author: dgageot

pkg/runtime/runtime.go

@@ -160,15 +160,16 @@ func (r *runtime) RunStream(ctx context.Context, sess *session.Session) <-chan E
 			telemetryClient.RecordSessionStart(ctx, r.currentAgent, sess.ID)
 		}
 
+		a := r.team.Agent(r.currentAgent)
+		model := a.Model()
+		modelID := model.ID()
+
+		messages := sess.GetMessages(a)
 		if sess.SendUserMessage {
-			events <- UserMessage(sess.GetMessages(r.CurrentAgent())[len(sess.GetMessages(r.CurrentAgent()))-1].Content)
+			events <- UserMessage(messages[len(messages)-1].Content)
 		}
 
 		events <- StreamStarted()
-		a := r.team.Agent(r.currentAgent)
-
-		model := a.Model()
-		modelID := model.ID()
 
 		defer r.finalizeEventChannel(ctx, sess, events)
 
@@ -226,7 +227,6 @@ func (r *runtime) RunStream(ctx context.Context, sess *session.Session) <-chan E
 				return
 			}
 			slog.Debug("Starting conversation loop iteration", "agent", a.Name())
-			messages := sess.GetMessages(a)
 			slog.Debug("Retrieved messages for processing", "agent", a.Name(), "message_count", len(messages))
 
 			// Retry loop for getting agent tools with OAuth handling

pkg/session/session.go

@@ -200,7 +200,7 @@ func New(opts ...Opt) *Session {
 func (s *Session) GetMessages(a *agent.Agent) []chat.Message {
 	slog.Debug("Getting messages for agent", "agent", a.Name(), "session_id", s.ID)
 
-	messages := make([]chat.Message, 0)
+	var messages []chat.Message
 
 	if a.HasSubAgents() {
 		subAgents := append(a.SubAgents(), a.Parents()...)
@@ -213,7 +213,7 @@ func (s *Session) GetMessages(a *agent.Agent) []chat.Message {
 		}
 
 		messages = append(messages, chat.Message{
-			Role:    "system",
+			Role:    chat.MessageRoleSystem,
 			Content: "You are a multi-agent system, make sure to answer the user query in the most helpful way possible. You have access to these sub-agents:\n" + subAgentsStr + "\nIMPORTANT: You can ONLY transfer tasks to the agents listed above using their ID. The valid agent IDs are: " + strings.Join(validAgentIDs, ", ") + ". You MUST NOT attempt to transfer to any other agent IDs - doing so will cause system errors.\n\nIf you are the best to answer the question according to your description, you can answer it.\n\nIf another agent is better for answering the question according to its description, call `transfer_task` function to transfer the question to that agent using the agent's ID. When transferring, do not generate any text other than the function call.\n\n",
 		})
 	}