Merge pull request #857 from dgageot/fix-848

Fix #848

Author: dgageot

pkg/runtime/runtime_test.go

@@ -728,8 +728,6 @@ func TestProcessToolCalls_UnknownTool_NoToolResultMessage(t *testing.T) {
 }
 
 func TestEmitStartupInfo(t *testing.T) {
-	t.Skip("This test is flaky. See #848 for details.")
-
 	// Create a simple agent with mock provider
 	prov := &mockProvider{id: "test/startup-model", stream: &mockStream{}}
 	root := agent.New("startup-test-agent", "You are a startup test agent",
@@ -759,7 +757,7 @@ func TestEmitStartupInfo(t *testing.T) {
 	// Verify expected events are emitted
 	expectedEvents := []Event{
 		AgentInfo("startup-test-agent", "test/startup-model", "This is a startup test agent"),
-		TeamInfo([]string{"startup-test-agent", "other-agent"}, "startup-test-agent"),
+		TeamInfo([]string{"other-agent", "startup-test-agent"}, "startup-test-agent"),
 		ToolsetInfo(0, "startup-test-agent"), // No tools configured
 	}
 

pkg/team/team.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/docker/cagent/pkg/agent"
@@ -31,7 +32,9 @@ func WithAgents(agents ...*agent.Agent) Opt {
 }
 
 func New(opts ...Opt) *Team {
-	t := &Team{agents: make(map[string]*agent.Agent)}
+	t := &Team{
+		agents: make(map[string]*agent.Agent),
+	}
 	for _, opt := range opts {
 		opt(t)
 	}
@@ -43,22 +46,18 @@ func (t *Team) AgentNames() []string {
 	for name := range t.agents {
 		names = append(names, name)
 	}
+	slices.Sort(names)
 	return names
 }
 
 func (t *Team) Agent(name string) (*agent.Agent, error) {
-	if len(t.agents) == 0 {
+	if t.Size() == 0 {
 		return nil, errors.New("no agents loaded; ensure your agent configuration defines at least one agent")
 	}
 
 	found, ok := t.agents[name]
 	if !ok {
-		var names []string
-		for n := range t.agents {
-			names = append(names, n)
-		}
-
-		return nil, fmt.Errorf("agent not found: %s (available agents: %s)", name, strings.Join(names, ", "))
+		return nil, fmt.Errorf("agent not found: %s (available agents: %s)", name, strings.Join(t.AgentNames(), ", "))
 	}
 
 	return found, nil