Sub-sessions shouldn't send the user message event

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>

Author: rumpl

pkg/runtime/runtime.go

@@ -126,7 +126,9 @@ func (r *Runtime) RunStream(ctx context.Context, sess *session.Session) <-chan E
 	events := make(chan Event, 128)
 
 	go func() {
-		events <- UserMessage(sess.GetMessages(r.CurrentAgent())[len(sess.GetMessages(r.CurrentAgent()))-1].Content)
+		if sess.SendUserMessage {
+			events <- UserMessage(sess.GetMessages(r.CurrentAgent())[len(sess.GetMessages(r.CurrentAgent()))-1].Content)
+		}
 		events <- StreamStarted()
 		a := r.team.Agent(r.currentAgent)
 
@@ -658,11 +660,9 @@ func (r *Runtime) handleTaskTransfer(ctx context.Context, sess *session.Session,
 
 	slog.Debug("Creating new session with parent session", "parent_session_id", sess.ID, "tools_approved", sess.ToolsApproved)
 	s := session.New(session.WithSystemMessage(memberAgentTask))
+	s.SendUserMessage = false
 	s.ToolsApproved = sess.ToolsApproved
 
-	// No delay needed: ToolCall event now carries the agent name so the CLI can
-	// render deterministically before sub-agent output begins.
-
 	for event := range r.RunStream(ctx, s) {
 		evts <- event
 		if errEvent, ok := event.(*ErrorEvent); ok {

pkg/session/session.go

@@ -54,6 +54,9 @@ type Session struct {
 	// ToolsApproved is a flag to indicate if the tools have been approved
 	ToolsApproved bool `json:"tools_approved"`
 
+	// SendUserMessage is a flag to indicate if the user message should be sent
+	SendUserMessage bool
+
 	InputTokens  int     `json:"input_tokens"`
 	OutputTokens int     `json:"output_tokens"`
 	Cost         float64 `json:"cost"`
@@ -164,12 +167,13 @@ func New(opts ...Opt) *Session {
 	slog.Debug("Creating new session", "session_id", sessionID)
 
 	s := &Session{
-		ID:            sessionID,
-		CreatedAt:     time.Now(),
-		Messages:      make([]Item, 0),
-		ToolsApproved: false,
-		InputTokens:   0,
-		OutputTokens:  0,
+		ID:              sessionID,
+		CreatedAt:       time.Now(),
+		Messages:        make([]Item, 0),
+		ToolsApproved:   false,
+		InputTokens:     0,
+		OutputTokens:    0,
+		SendUserMessage: true,
 	}
 
 	for _, opt := range opts {