Merge pull request #1141 from dgageot/tui2

More TUI work

Author: dgageot

pkg/tools/builtin/filesystem.go

@@ -602,7 +602,10 @@ func (t *FilesystemTool) handleReadFile(_ context.Context, args ReadFileArgs) (*
 
 	content, err := os.ReadFile(args.Path)
 	if err != nil {
-		return tools.ResultError(fmt.Sprintf("Error reading file: %s", err)), nil
+		if os.IsNotExist(err) {
+			return tools.ResultError("not found"), nil
+		}
+		return tools.ResultError(fmt.Sprintf("%s", err)), nil
 	}
 
 	return tools.ResultSuccess(string(content)), nil
@@ -637,7 +640,10 @@ func (t *FilesystemTool) handleReadMultipleFiles(ctx context.Context, args ReadM
 
 		content, err := os.ReadFile(path)
 		if err != nil {
-			errMsg := fmt.Sprintf("Error reading file: %s", err)
+			errMsg := fmt.Sprintf("%s", err)
+			if os.IsNotExist(err) {
+				errMsg = "not found"
+			}
 			contents = append(contents, PathContent{
 				Path:    path,
 				Content: errMsg,

pkg/tools/builtin/filesystem_test.go

@@ -188,7 +188,7 @@ func TestFilesystemTool_ReadFile(t *testing.T) {
 		Path: filepath.Join(tmpDir, "nonexistent.txt"),
 	})
 	require.NoError(t, err)
-	assert.Contains(t, result.Output, "Error reading file")
+	assert.Equal(t, "not found", result.Output)
 
 	result, err = tool.handleReadFile(t.Context(), ReadFileArgs{
 		Path: "/etc/passwd",
@@ -225,7 +225,7 @@ func TestFilesystemTool_ReadMultipleFiles(t *testing.T) {
 	})
 	require.NoError(t, err)
 	assert.Contains(t, result.Output, content1)
-	assert.Contains(t, result.Output, "Error reading file")
+	assert.Contains(t, result.Output, "not found")
 }
 
 func TestFilesystemTool_ListDirectory(t *testing.T) {

pkg/tui/components/message/message.go

@@ -134,7 +134,7 @@ func (mv *messageModel) senderPrefix(sender string) string {
 	if sender == "" {
 		return ""
 	}
-	return styles.AgentBadgeStyle.Render(sender+" ▶") + "\n\n"
+	return styles.AgentBadgeStyle.Render(sender) + "\n\n"
 }
 
 // Height calculates the height needed for this message view

pkg/tui/components/messages/messages.go

@@ -698,10 +698,10 @@ func (m *model) AppendToLastMessage(agentName string, messageType types.MessageT
 		m.invalidateItem(lastIdx)
 		// Content will auto-scroll in View() if user hasn't scrolled
 		return nil
-	} else {
-		// Creating a new message, use addMessage for proper auto-scroll
-		return m.addMessage(types.Agent(messageType, agentName, content))
 	}
+
+	// Creating a new message, use addMessage for proper auto-scroll
+	return m.addMessage(types.Agent(messageType, agentName, content))
 }
 
 // ScrollToBottom scrolls to the bottom of the chat
@@ -729,18 +729,20 @@ func (m *model) createMessageView(msg *types.Message) layout.Model {
 
 // removeSpinner removes the last message if it's a spinner
 func (m *model) removeSpinner() {
-	if len(m.messages) > 0 {
-		lastIdx := len(m.messages) - 1
-		lastMessage := m.messages[lastIdx]
-
-		if lastMessage.Type == types.MessageTypeSpinner {
-			m.messages = m.messages[:lastIdx]
-			if len(m.views) > lastIdx {
-				m.views = m.views[:lastIdx]
-			}
-			// Invalidate all items since we've removed a message
-			m.invalidateAllItems()
+	if len(m.messages) == 0 {
+		return
+	}
+
+	lastIdx := len(m.messages) - 1
+	lastMessage := m.messages[lastIdx]
+
+	if lastMessage.Type == types.MessageTypeSpinner {
+		m.messages = m.messages[:lastIdx]
+		if len(m.views) > lastIdx {
+			m.views = m.views[:lastIdx]
 		}
+		// Invalidate all items since we've removed a message
+		m.invalidateAllItems()
 	}
 }
 

pkg/tui/components/sidebar/sidebar.go

@@ -34,7 +34,6 @@ type Model interface {
 
 	SetTokenUsage(event *runtime.TokenUsageEvent)
 	SetTodos(result *tools.ToolCallResult) error
-	SetWorking(working bool) tea.Cmd
 	SetMode(mode Mode)
 	SetAgentInfo(agentName, model, description string)
 	SetTeamInfo(availableAgents []string)
@@ -57,7 +56,6 @@ type model struct {
 	sessionUsage     map[string]*runtime.Usage // sessionID -> latest usage snapshot
 	sessionAgent     map[string]string         // sessionID -> agent name
 	todoComp         *todotool.SidebarComponent
-	working          bool
 	mcpInit          bool
 	ragIndexing      map[string]*ragIndexingState // strategy name -> indexing state
 	spinner          spinner.Spinner
@@ -103,15 +101,6 @@ func (m *model) SetTodos(result *tools.ToolCallResult) error {
 	return m.todoComp.SetTodos(result)
 }
 
-// SetWorking sets the working state and returns a command to start the spinner if needed
-func (m *model) SetWorking(working bool) tea.Cmd {
-	m.working = working
-	if working {
-		return m.spinner.Init()
-	}
-	return nil
-}
-
 // SetAgentInfo sets the current agent information
 func (m *model) SetAgentInfo(agentName, model, description string) {
 	m.currentAgent = agentName
@@ -232,20 +221,16 @@ func (m *model) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 	default:
 		var cmds []tea.Cmd
 
-		// Update main spinner for working/mcpInit states
-		if m.working || m.mcpInit {
-			var cmd tea.Cmd
-			var model layout.Model
-			model, cmd = m.spinner.Update(msg)
+		// Update main spinner
+		if m.mcpInit {
+			model, cmd := m.spinner.Update(msg)
 			m.spinner = model.(spinner.Spinner)
 			cmds = append(cmds, cmd)
 		}
 
 		// Update each RAG indexing spinner
 		for _, state := range m.ragIndexing {
-			var cmd tea.Cmd
-			var model layout.Model
-			model, cmd = state.spinner.Update(msg)
+			model, cmd := state.spinner.Update(msg)
 			state.spinner = model.(spinner.Spinner)
 			cmds = append(cmds, cmd)
 		}
@@ -286,8 +271,6 @@ func (m *model) verticalView() string {
 	}
 	if working := m.workingIndicator(); working != "" {
 		session = append(session, working)
-	} else {
-		session = append(session, "") // spacer for layout consistency
 	}
 
 	var main []string
@@ -314,11 +297,6 @@ func (m *model) verticalView() string {
 func (m *model) workingIndicator() string {
 	var indicators []string
 
-	// Add working indicator if agent is processing
-	if m.working {
-		indicators = append(indicators, styles.ActiveStyle.Render(m.spinner.View()+" "+"Working…"))
-	}
-
 	// Add MCP init indicator if initializing
 	if m.mcpInit {
 		indicators = append(indicators, styles.ActiveStyle.Render(m.spinner.View()+" "+"Initializing MCP servers…"))
@@ -395,10 +373,6 @@ func (m *model) workingIndicator() string {
 func (m *model) workingIndicatorHorizontal() string {
 	var labels []string
 
-	// Add working indicator if agent is processing
-	if m.working {
-		labels = append(labels, "Working…")
-	}
 	// Add MCP init indicator if initializing
 	if m.mcpInit {
 		labels = append(labels, "Initializing MCP servers…")
@@ -534,9 +508,8 @@ func (m *model) agentInfo() string {
 
 	// Agent description if available
 	if m.agentDescription != "" {
-		// Truncate description for sidebar display
 		description := m.agentDescription
-		maxDescWidth := max(m.width-4, 20) // Leave margin for styling
+		maxDescWidth := m.width - 2
 		if len(description) > maxDescWidth {
 			description = description[:maxDescWidth-1] + "…"
 		}

pkg/tui/components/tab/tab.go

@@ -11,7 +11,7 @@ func Render(title, content string, width int) string {
 
 	b.WriteString(styles.RenderComposite(styles.TabTitleStyle, title+" "+strings.Repeat("─", width-len(title)-1)))
 	b.WriteString("\n")
-	b.WriteString(styles.RenderComposite(styles.TabStyle.Width(width-2), content))
+	b.WriteString(styles.RenderComposite(styles.TabStyle.Width(width), content))
 	b.WriteString("\n")
 
 	return b.String()

pkg/tui/components/tool/allowed/allowed.go

@@ -0,0 +1,64 @@
+package allowed
+
+import (
+	"encoding/json"
+
+	tea "charm.land/bubbletea/v2"
+
+	"github.com/docker/cagent/pkg/tools/builtin"
+	"github.com/docker/cagent/pkg/tui/components/spinner"
+	"github.com/docker/cagent/pkg/tui/components/toolcommon"
+	"github.com/docker/cagent/pkg/tui/core/layout"
+	"github.com/docker/cagent/pkg/tui/service"
+	"github.com/docker/cagent/pkg/tui/types"
+)
+
+type Component struct {
+	message *types.Message
+	spinner spinner.Spinner
+	width   int
+	height  int
+}
+
+func New(msg *types.Message, _ *service.SessionState) layout.Model {
+	return &Component{
+		message: msg,
+		spinner: spinner.New(spinner.ModeSpinnerOnly),
+		width:   80,
+		height:  1,
+	}
+}
+
+func (c *Component) SetSize(width, height int) tea.Cmd {
+	c.width = width
+	c.height = height
+	return nil
+}
+
+func (c *Component) Init() tea.Cmd {
+	if c.message.ToolStatus == types.ToolStatusPending || c.message.ToolStatus == types.ToolStatusRunning {
+		return c.spinner.Init()
+	}
+	return nil
+}
+
+func (c *Component) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
+	if c.message.ToolStatus == types.ToolStatusPending || c.message.ToolStatus == types.ToolStatusRunning {
+		model, cmd := c.spinner.Update(msg)
+		c.spinner = model.(spinner.Spinner)
+		return c, cmd
+	}
+
+	return c, nil
+}
+
+func (c *Component) View() string {
+	msg := c.message
+
+	var args builtin.AddAllowedDirectoryArgs
+	if err := json.Unmarshal([]byte(msg.ToolCall.Function.Arguments), &args); err != nil {
+		return toolcommon.RenderTool(msg, c.spinner, "", "", c.width)
+	}
+
+	return toolcommon.RenderTool(msg, c.spinner, args.Path, "", c.width)
+}

pkg/tui/components/tool/api/apitool.go

@@ -49,9 +49,7 @@ func (c *Component) Init() tea.Cmd {
 
 func (c *Component) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 	if c.message.ToolStatus == types.ToolStatusPending || c.message.ToolStatus == types.ToolStatusRunning {
-		var cmd tea.Cmd
-		var model layout.Model
-		model, cmd = c.spinner.Update(msg)
+		model, cmd := c.spinner.Update(msg)
 		c.spinner = model.(spinner.Spinner)
 		return c, cmd
 	}
@@ -64,12 +62,9 @@ func (c *Component) View() string {
 
 	var args map[string]any
 	if err := json.Unmarshal([]byte(msg.ToolCall.Function.Arguments), &args); err != nil {
-		return toolcommon.RenderTool(msg, c.spinner, msg.ToolDefinition.DisplayName(), "", c.width)
+		return toolcommon.RenderTool(msg, c.spinner, "", "", c.width)
 	}
 
-	// Build the display name with inline result
-	displayName := msg.ToolDefinition.DisplayName()
-
 	// Extract argument summary for the tool call display
 	var params string
 	if argsText := formatArgs(args); argsText != "" {
@@ -91,7 +86,7 @@ func (c *Component) View() string {
 	}
 
 	// Render everything on one line
-	return toolcommon.RenderTool(msg, c.spinner, displayName+" "+params, "", c.width)
+	return toolcommon.RenderTool(msg, c.spinner, params, "", c.width)
 }
 
 // extractEndpoint tries to find the endpoint/URL being called

pkg/tui/components/tool/defaulttool/defaulttool.go

@@ -48,9 +48,7 @@ func (c *Component) Init() tea.Cmd {
 
 func (c *Component) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 	if c.message.ToolStatus == types.ToolStatusPending || c.message.ToolStatus == types.ToolStatusRunning {
-		var cmd tea.Cmd
-		var model layout.Model
-		model, cmd = c.spinner.Update(msg)
+		model, cmd := c.spinner.Update(msg)
 		c.spinner = model.(spinner.Spinner)
 		return c, cmd
 	}
@@ -60,21 +58,21 @@ func (c *Component) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 
 func (c *Component) View() string {
 	msg := c.message
-	displayName := msg.ToolDefinition.DisplayName()
 
 	var argsContent string
 	if msg.ToolCall.Function.Arguments != "" {
+		displayName := msg.ToolDefinition.DisplayName()
 		argsContent = renderToolArgs(msg.ToolCall, c.width-4-len(displayName), c.width-3)
 	}
 
 	if argsContent == "" {
-		return toolcommon.RenderTool(msg, c.spinner, msg.ToolDefinition.DisplayName(), "", c.width)
+		return toolcommon.RenderTool(msg, c.spinner, "", "", c.width)
 	}
 
 	var resultContent string
 	if (msg.ToolStatus == types.ToolStatusCompleted || msg.ToolStatus == types.ToolStatusError) && msg.Content != "" {
 		resultContent = toolcommon.FormatToolResult(msg.Content, c.width)
 	}
 
-	return toolcommon.RenderTool(msg, c.spinner, displayName+argsContent, resultContent, c.width)
+	return toolcommon.RenderTool(msg, c.spinner, argsContent, resultContent, c.width)
 }

pkg/tui/components/tool/defaulttool/render.go

@@ -48,7 +48,7 @@ func renderToolArgs(toolCall tools.ToolCall, shortWidth, width int) string {
 	}
 
 	if len(short.String()) <= shortWidth && !strings.Contains(short.String(), "\n") {
-		return " " + short.String()
+		return short.String()
 	}
 
 	return "\n" + styles.ToolCallArgs.Width(width).Render(strings.TrimSuffix(md.String(), "\n"))