Merge pull request #1422 from Pnkcaht/fix/1366-editor-scroll-after-failed-edit

tui(edit_file): skip diff rendering on tool failure

Author: krissetto

pkg/tui/components/tool/editfile/editfile.go

@@ -15,37 +15,88 @@ import (
 
 type ToggleDiffViewMsg struct{}
 
+// New creates the edit_file tool UI model.
 func New(msg *types.Message, sessionState *service.SessionState) layout.Model {
 	return toolcommon.NewBase(msg, sessionState, render)
 }
 
-func render(msg *types.Message, s spinner.Spinner, sessionState *service.SessionState, width, _ int) string {
+// render displays the edit_file tool output in the TUI.
+// It prioritizes the agent-provided friendly header when available,
+// hides results when collapsed by the user, and renders tool errors
+// in a single-line error style consistent with other tools.
+func render(
+	msg *types.Message,
+	s spinner.Spinner,
+	sessionState *service.SessionState,
+	width,
+	_ int,
+) string {
+	// Parse tool arguments to extract the file path for display.
 	var args builtin.EditFileArgs
 	if err := json.Unmarshal([]byte(msg.ToolCall.Function.Arguments), &args); err != nil {
+		// If arguments cannot be parsed, fail silently to avoid breaking the TUI.
 		return ""
 	}
 
+	// When the tool failed, render a single-line error header
+	// consistent with other tool error renderings.
+	if msg.ToolStatus == types.ToolStatusError {
+		if msg.Content == "" {
+			return ""
+		}
+
+		// Render everything on a single line:
+		// - error icon
+		// - tool name in error style
+		// - rejection/error message
+		line := fmt.Sprintf(
+			"%s%s %s",
+			toolcommon.Icon(msg, s),
+			styles.ToolNameError.Render(msg.ToolDefinition.DisplayName()),
+			styles.ToolErrorMessageStyle.Render(msg.Content),
+		)
+
+		// Truncate to terminal width to avoid wrapping
+		return styles.BaseStyle.
+			MaxWidth(width).
+			Render(line)
+	}
+
+	// ---- Normal (non-error) rendering ----
+
 	// Check for friendly description first
 	var content string
 	if header, ok := toolcommon.RenderFriendlyHeader(msg, s); ok {
 		content = header
 	} else {
-		content = fmt.Sprintf("%s%s %s",
+		content = fmt.Sprintf(
+			"%s%s %s",
 			toolcommon.Icon(msg, s),
 			styles.ToolName.Render(msg.ToolDefinition.DisplayName()),
-			styles.ToolMessageStyle.Render(toolcommon.ShortenPath(args.Path)))
+			styles.ToolMessageStyle.Render(toolcommon.ShortenPath(args.Path)),
+		)
 	}
 
-	if !sessionState.HideToolResults() {
-		if msg.ToolCall.Function.Arguments != "" {
-			contentWidth := width - styles.ToolCallResult.GetHorizontalFrameSize()
-			content += "\n" + styles.ToolCallResult.Render(
-				renderEditFile(msg.ToolCall, contentWidth, sessionState.SplitDiffView(), msg.ToolStatus))
-		}
+	// Tool results are hidden when the user collapses them.
+	if sessionState.HideToolResults() {
+		return content
+	}
 
-		if (msg.ToolStatus == types.ToolStatusError) && msg.Content != "" {
-			content += toolcommon.FormatToolResult(msg.Content, width)
-		}
+	// Successful (or pending/confirmation) execution:
+	// render the diff output inside the ToolCallResult container.
+	if msg.ToolCall.Function.Arguments != "" {
+		// Calculate available width for diff rendering, accounting for
+		// ToolCallResult frame padding.
+		contentWidth := width - styles.ToolCallResult.GetHorizontalFrameSize()
+
+		content += "\n" + styles.ToolCallResult.Render(
+			renderEditFile(
+				msg.ToolCall,
+				contentWidth,
+				sessionState.SplitDiffView(),
+				msg.ToolStatus,
+			),
+		)
 	}
 
 	return content