@@ -221,11 +221,15 @@ func (m *messagesCmp) renderMessageWithToolCall(content string, tools []message.
221221 Bold(true).
222222 Foreground(styles.Green).
223223 Render(fmt.Sprintf("%s Result", styles.CheckIcon))
224+
225+ // Use the same style for both header and border if it's an error
226+ borderColor := styles.Green
224227 if result.IsError {
225228 resultHeader = lipgloss.NewStyle().
226229 Bold(true).
227230 Foreground(styles.Red).
228231 Render(fmt.Sprintf("%s Error", styles.ErrorIcon))
232+ borderColor = styles.Red
229233 }
230234
231235 truncate := 200
@@ -235,7 +239,7 @@ func (m *messagesCmp) renderMessageWithToolCall(content string, tools []message.
235239 }
236240
237241 resultContent := lipgloss.JoinVertical(lipgloss.Left, resultHeader, content)
238− return toolResultStyle.Render(resultContent)
242+ return toolResultStyle.BorderForeground(borderColor).Render(resultContent)
239243 }
240244
241245 connector := connectorStyle.Render("└─> Tool Calls:")