Add a category to all TODO tools

Signed-off-by: David Gageot <david.gageot@docker.com>

Author: dgageot

pkg/codemode/codemode.go

@@ -47,9 +47,7 @@ func (c *codeModeTool) Instructions() string {
 }
 
 func isExcludedTool(tool tools.Tool) bool {
-	// TODO(dga): make this more robust. It really a temporary hack to exclude the todo tools.
-	// See #514
-	return strings.Contains(tool.Name, "_todo")
+	return tool.Category == "todo"
 }
 
 func (c *codeModeTool) Tools(ctx context.Context) ([]tools.Tool, error) {

pkg/tools/builtin/todo.go

@@ -154,6 +154,7 @@ func (t *TodoTool) Tools(context.Context) ([]tools.Tool, error) {
 	return []tools.Tool{
 		{
 			Name:         "create_todo",
+			Category:     "todo",
 			Description:  "Create a new todo item with a description",
 			Parameters:   tools.MustSchemaFor[CreateTodoArgs](),
 			OutputSchema: tools.MustSchemaFor[string](),
@@ -165,6 +166,7 @@ func (t *TodoTool) Tools(context.Context) ([]tools.Tool, error) {
 		},
 		{
 			Name:         "create_todos",
+			Category:     "todo",
 			Description:  "Create a list of new todo items with descriptions",
 			Parameters:   tools.MustSchemaFor[CreateTodosArgs](),
 			OutputSchema: tools.MustSchemaFor[string](),
@@ -176,6 +178,7 @@ func (t *TodoTool) Tools(context.Context) ([]tools.Tool, error) {
 		},
 		{
 			Name:         "update_todo",
+			Category:     "todo",
 			Description:  "Update the status of a todo item",
 			Parameters:   tools.MustSchemaFor[UpdateTodoArgs](),
 			OutputSchema: tools.MustSchemaFor[string](),
@@ -187,6 +190,7 @@ func (t *TodoTool) Tools(context.Context) ([]tools.Tool, error) {
 		},
 		{
 			Name:         "list_todos",
+			Category:     "todo",
 			Description:  "List all current todos with their status",
 			OutputSchema: tools.MustSchemaFor[string](),
 			Handler:      t.handler.listTodos,

pkg/tools/builtin/todo_test.go

@@ -34,16 +34,16 @@ func TestTodoTool_Tools(t *testing.T) {
 
 	require.NoError(t, err)
 	assert.Len(t, allTools, 4)
+	for _, tool := range allTools {
+		assert.NotNil(t, tool.Handler)
+		assert.Equal(t, "todo", tool.Category)
+	}
 
 	// Verify tool functions
 	assert.Equal(t, "create_todo", allTools[0].Name)
 	assert.Equal(t, "create_todos", allTools[1].Name)
 	assert.Equal(t, "update_todo", allTools[2].Name)
 	assert.Equal(t, "list_todos", allTools[3].Name)
-	assert.NotNil(t, allTools[0].Handler)
-	assert.NotNil(t, allTools[1].Handler)
-	assert.NotNil(t, allTools[2].Handler)
-	assert.NotNil(t, allTools[3].Handler)
 
 	// Check create_todo parameters
 	schema, err := json.Marshal(allTools[0].Parameters)

pkg/tools/tools.go

@@ -29,6 +29,7 @@ type ToolType string
 
 type Tool struct {
 	Name         string          `json:"name"`
+	Category     string          `json:"category"`
 	Description  string          `json:"description,omitempty"`
 	Parameters   any             `json:"parameters"`
 	Annotations  ToolAnnotations `json:"annotations"`