Merge pull request #525 from dgageot/improve-tool-calls-rendering

Improve tool calls rendering

Author: dgageot

pkg/tools/builtin/filesystem.go

@@ -531,6 +531,10 @@ func (t *FilesystemTool) handleEditFile(ctx context.Context, toolCall tools.Tool
 		return &tools.ToolCallResult{Output: fmt.Sprintf("File edited successfully but post-edit command failed: %s", err)}, nil
 	}
 
+	if len(changes) == 1 {
+		return &tools.ToolCallResult{Output: fmt.Sprintf("File edited successfully. %s", strings.TrimPrefix(changes[0], "Edit 1: "))}, nil
+	}
+
 	return &tools.ToolCallResult{Output: fmt.Sprintf("File edited successfully. Changes:\n%s", strings.Join(changes, "\n"))}, nil
 }
 

pkg/tools/builtin/todo.go

@@ -33,7 +33,7 @@ type CreateTodoArgs struct {
 }
 
 type CreateTodosArgs struct {
-	Todos []CreateTodoItem `json:"todos" jsonschema:"List of todo items"`
+	Descriptions []string `json:"descriptions" jsonschema:"Descriptions of the todo items"`
 }
 
 type UpdateTodoArgs struct {
@@ -90,7 +90,7 @@ func (h *todoHandler) createTodo(_ context.Context, toolCall tools.ToolCall) (*t
 	}
 
 	return &tools.ToolCallResult{
-		Output: fmt.Sprintf("Created todo %s: %s", id, params.Description),
+		Output: fmt.Sprintf("Created todo [%s]: %s", id, params.Description),
 	}, nil
 }
 
@@ -100,20 +100,28 @@ func (h *todoHandler) createTodos(_ context.Context, toolCall tools.ToolCall) (*
 		return nil, fmt.Errorf("invalid arguments: %w", err)
 	}
 
-	ids := make([]string, len(params.Todos))
+	ids := make([]string, len(params.Descriptions))
 	start := len(h.todos)
-	for i, todo := range params.Todos {
+	for i, desc := range params.Descriptions {
 		id := fmt.Sprintf("todo_%d", start+i+1)
 		h.todos[id] = Todo{
 			ID:          id,
-			Description: todo.Description,
+			Description: desc,
 			Status:      "pending",
 		}
 		ids[i] = id
 	}
 
+	output := fmt.Sprintf("Created %d todos: ", len(params.Descriptions))
+	for i, id := range ids {
+		if i > 0 {
+			output += ", "
+		}
+		output += fmt.Sprintf("[%s]", id)
+	}
+
 	return &tools.ToolCallResult{
-		Output: fmt.Sprintf("Created %d todos:\n%s", len(params.Todos), strings.Join(ids, "\n")),
+		Output: output,
 	}, nil
 }
 
@@ -125,14 +133,14 @@ func (h *todoHandler) updateTodo(_ context.Context, toolCall tools.ToolCall) (*t
 
 	todo, exists := h.todos[params.ID]
 	if !exists {
-		return nil, fmt.Errorf("todo %s not found", params.ID)
+		return nil, fmt.Errorf("todo [%s] not found", params.ID)
 	}
 
 	todo.Status = params.Status
 	h.todos[params.ID] = todo
 
 	return &tools.ToolCallResult{
-		Output: fmt.Sprintf("Updated todo %s status to: %s", params.ID, params.Status),
+		Output: fmt.Sprintf("Updated todo [%s] to status: [%s]", params.ID, params.Status),
 	}, nil
 }
 

pkg/tools/builtin/todo_test.go

@@ -68,24 +68,14 @@ func TestTodoTool_Tools(t *testing.T) {
 	assert.JSONEq(t, `{
 	"type": "object",
 	"required": [
-		"todos"
+		"descriptions"
 	],
 	"properties": {
-		"todos": {
+		"descriptions": {
 			"type": "array",
-			"description": "List of todo items",
+			"description": "Descriptions of the todo items",
 			"items": {
-				"type": "object",
-				"required": [
-					"description"
-				],
-				"properties": {
-					"description": {
-						"type": "string",
-						"description": "Description of the todo item"
-					}
-				},
-				"additionalProperties": false
+				"type": "string"
 			}
 		}
 	},
@@ -159,7 +149,7 @@ func TestTodoTool_CreateTodo(t *testing.T) {
 
 	// Verify
 	require.NoError(t, err)
-	assert.Contains(t, result.Output, "Created todo todo_1: Test todo item")
+	assert.Contains(t, result.Output, "Created todo [todo_1]: Test todo item")
 
 	// Verify todo was added to the handler's todos map
 	assert.Len(t, tool.handler.todos, 1)
@@ -181,10 +171,10 @@ func TestTodoTool_CreateTodos(t *testing.T) {
 
 	// Create multiple todos
 	args := CreateTodosArgs{
-		Todos: []CreateTodoItem{
-			{Description: "First todo item"},
-			{Description: "Second todo item"},
-			{Description: "Third todo item"},
+		Descriptions: []string{
+			"First todo item",
+			"Second todo item",
+			"Third todo item",
 		},
 	}
 	argsBytes, err := json.Marshal(args)
@@ -212,8 +202,8 @@ func TestTodoTool_CreateTodos(t *testing.T) {
 
 	// Create multiple todos
 	args = CreateTodosArgs{
-		Todos: []CreateTodoItem{
-			{Description: "Last todo item"},
+		Descriptions: []string{
+			"Last todo item",
 		},
 	}
 	argsBytes, err = json.Marshal(args)
@@ -283,7 +273,7 @@ func TestTodoTool_UpdateTodo(t *testing.T) {
 
 	// Verify
 	require.NoError(t, err)
-	assert.Contains(t, result.Output, "Updated todo todo_1 status to: completed")
+	assert.Contains(t, result.Output, "Updated todo [todo_1] to status: [completed]")
 
 	// Verify todo status was updated
 	todo, exists := tool.handler.todos["todo_1"]

pkg/tui/components/tool/builtins.go

@@ -2,51 +2,14 @@ package tool
 
 import (
 	"encoding/json"
+	"fmt"
 	"strings"
 
-	"github.com/charmbracelet/glamour/v2"
-
-	"github.com/docker/cagent/pkg/codemode"
 	"github.com/docker/cagent/pkg/tools"
 	"github.com/docker/cagent/pkg/tools/builtin"
+	"github.com/docker/cagent/pkg/tui/styles"
 )
 
-func renderSearchFiles(toolCall tools.ToolCall) string {
-	var args builtin.SearchFilesArgs
-	if err := json.Unmarshal([]byte(toolCall.Function.Arguments), &args); err != nil {
-		return ""
-	}
-
-	// Search pattern
-	output := args.Pattern
-
-	// Optional search path
-	if path := args.Path; path != "" && path != "." {
-		output += " in " + path
-	}
-
-	// Optional exclude patterns
-	if exclude := args.ExcludePatterns; len(exclude) > 0 {
-		output += " excluding [" + strings.Join(exclude, ", ") + "]"
-	}
-
-	return output
-}
-
-func renderRunToolsWithJavascript(toolCall tools.ToolCall, renderer *glamour.TermRenderer) string {
-	var args codemode.RunToolsWithJavascriptArgs
-	if err := json.Unmarshal([]byte(toolCall.Function.Arguments), &args); err != nil {
-		return ""
-	}
-
-	md, err := renderer.Render("```javascript\n" + args.Script + "\n```")
-	if err != nil {
-		return args.Script
-	}
-
-	return md
-}
-
 func renderEditFile(toolCall tools.ToolCall, width int) (string, string) {
 	var args builtin.EditFileArgs
 	if err := json.Unmarshal([]byte(toolCall.Function.Arguments), &args); err != nil {
@@ -70,20 +33,67 @@ func renderEditFile(toolCall tools.ToolCall, width int) (string, string) {
 	return output.String(), args.Path
 }
 
-func renderShell(toolCall tools.ToolCall, renderer *glamour.TermRenderer) string {
-	var args builtin.RunShellArgs
-	if err := json.Unmarshal([]byte(toolCall.Function.Arguments), &args); err != nil {
+func renderToolArgs(toolCall tools.ToolCall, width int) string {
+	decoder := json.NewDecoder(strings.NewReader(toolCall.Function.Arguments))
+
+	tok, err := decoder.Token()
+	if err != nil {
+		return ""
+	}
+	if delim, ok := tok.(json.Delim); !ok || delim != '{' {
 		return ""
 	}
 
-	md, err := renderer.Render("```sh\n" + args.Cmd + "\n```")
-	if err != nil {
-		md = args.Cmd
+	type kv struct {
+		Key   string
+		Value any
+	}
+	var kvs []kv
+
+	for decoder.More() {
+		tok, err := decoder.Token()
+		if err != nil {
+			return ""
+		}
+		key, ok := tok.(string)
+		if !ok {
+			return ""
+		}
+
+		var val any
+		if err := decoder.Decode(&val); err != nil {
+			return ""
+		}
+
+		kvs = append(kvs, kv{Key: key, Value: val})
 	}
+	_, _ = decoder.Token()
+
+	style := styles.ToolCallArgs.Width(width)
+
+	var md strings.Builder
+	for i, kv := range kvs {
+		if i > 0 {
+			md.WriteString("\n")
+		}
 
-	if args.Cwd != "." {
-		md += "\n  In directory: " + args.Cwd + "\n"
+		var content string
+		if v, ok := kv.Value.(string); ok {
+			content = v
+		} else {
+			buf, err := json.MarshalIndent(kv.Value, "", "  ")
+			if err != nil {
+				content = fmt.Sprintf("%v", kv.Value)
+			} else {
+				content = string(buf)
+			}
+		}
+
+		fmt.Fprintf(&md, "%s:\n%s", styles.ToolCallArgKey.Render(kv.Key), content)
+		if !strings.HasSuffix(content, "\n") {
+			md.WriteString("\n")
+		}
 	}
 
-	return md
+	return "\n" + style.Render(strings.TrimSuffix(md.String(), "\n"))
 }