Merge pull request #488 from dgageot/simple-shared-todo

Simpler shared TODO tool

Author: dgageot

pkg/teamloader/teamloader.go

@@ -141,10 +141,6 @@ func LoadWithOverrides(ctx context.Context, path string, runtimeConfig config.Ru
 	var agents []*agent.Agent
 	agentsByName := make(map[string]*agent.Agent)
 
-	sharedTools := map[string]tools.ToolSet{
-		"todo": builtin.NewTodoTool(),
-	}
-
 	for name := range cfg.Agents {
 		agentConfig := cfg.Agents[name]
 
@@ -172,7 +168,7 @@ func LoadWithOverrides(ctx context.Context, path string, runtimeConfig config.Ru
 			return nil, fmt.Errorf("agent '%s' not found in configuration", name)
 		}
 
-		agentTools, err := getToolsForAgent(ctx, &a, parentDir, sharedTools, models[0], env, runtimeConfig)
+		agentTools, err := getToolsForAgent(ctx, &a, parentDir, models[0], env, runtimeConfig)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get tools: %w", err)
 		}
@@ -238,7 +234,7 @@ func getModelsForAgent(ctx context.Context, cfg *latest.Config, a *latest.AgentC
 }
 
 // getToolsForAgent returns the tool definitions for an agent based on its configuration
-func getToolsForAgent(ctx context.Context, a *latest.AgentConfig, parentDir string, sharedTools map[string]tools.ToolSet, model provider.Provider, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) ([]tools.ToolSet, error) {
+func getToolsForAgent(ctx context.Context, a *latest.AgentConfig, parentDir string, model provider.Provider, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) ([]tools.ToolSet, error) {
 	var t []tools.ToolSet
 
 	if len(a.SubAgents) > 0 {
@@ -248,7 +244,7 @@ func getToolsForAgent(ctx context.Context, a *latest.AgentConfig, parentDir stri
 	for i := range a.Toolsets {
 		toolset := a.Toolsets[i]
 
-		tool, err := createTool(ctx, toolset, a, parentDir, sharedTools, model, envProvider, runtimeConfig)
+		tool, err := createTool(ctx, toolset, a, parentDir, model, envProvider, runtimeConfig)
 		if err != nil {
 			return nil, err
 		}
@@ -259,7 +255,7 @@ func getToolsForAgent(ctx context.Context, a *latest.AgentConfig, parentDir stri
 	return t, nil
 }
 
-func createTool(ctx context.Context, toolset latest.Toolset, a *latest.AgentConfig, parentDir string, sharedTools map[string]tools.ToolSet, model provider.Provider, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
+func createTool(ctx context.Context, toolset latest.Toolset, a *latest.AgentConfig, parentDir string, model provider.Provider, envProvider environment.Provider, runtimeConfig config.RuntimeConfig) (tools.ToolSet, error) {
 	env, err := environment.ExpandAll(ctx, environment.ToValues(toolset.Env), envProvider)
 	if err != nil {
 		return nil, fmt.Errorf("failed to expand the tool's environment variables: %w", err)
@@ -269,7 +265,7 @@ func createTool(ctx context.Context, toolset latest.Toolset, a *latest.AgentConf
 	switch {
 	case toolset.Type == "todo":
 		if toolset.Shared {
-			return sharedTools["todo"], nil
+			return builtin.NewSharedTodoTool(), nil
 		}
 		return builtin.NewTodoTool(), nil
 

pkg/tools/builtin/todo.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"strings"
+	"sync"
 
 	"github.com/docker/cagent/pkg/tools"
 )
@@ -40,6 +41,8 @@ type todoHandler struct {
 	todos map[string]Todo
 }
 
+var NewSharedTodoTool = sync.OnceValue(NewTodoTool)
+
 func NewTodoTool() *TodoTool {
 	return &TodoTool{
 		handler: &todoHandler{