Add diff opening at all task completion points

Author: proggod

src/core/tools/attemptCompletionTool.ts

@@ -14,6 +14,31 @@ import { formatResponse } from "../prompts/responses"
 import { telemetryService } from "../../services/telemetry/TelemetryService"
 import Anthropic from "@anthropic-ai/sdk"
 
+// Helper function to open diff viewer at task completion
+async function openDiffViewer(cline: Cline) {
+	console.log("************************* TASK COMPLETE *************************")
+	console.log("[TASK_COMPLETE_DEBUG] Entering auto-diff section")
+	console.log("[TASK_COMPLETE_DEBUG] cline instance:", {
+		hasCheckpointDiff: !!cline.checkpointDiff,
+		taskId: cline.taskId,
+		instance: cline.instanceId,
+	})
+	// Show a UI message to verify execution reaches this point
+	const vscode = require("vscode")
+	vscode.window.showInformationMessage("Task completed - opening diff viewer")
+	try {
+		console.log("[attemptCompletionTool] Attempting to auto-open diff viewer")
+		await cline.checkpointDiff({
+			ts: Date.now(),
+			previousCommitHash: undefined, // Diff against working tree
+			mode: "checkpoint",
+		})
+		console.log("[attemptCompletionTool] Successfully opened diff viewer")
+	} catch (error) {
+		console.warn("[attemptCompletionTool] Failed to auto-open diff viewer:", error)
+	}
+}
+
 export async function attemptCompletionTool(
 	cline: Cline,
 	block: ToolUse,
@@ -45,6 +70,9 @@ export async function attemptCompletionTool(
 					telemetryService.captureTaskCompleted(cline.taskId)
 					cline.emit("taskCompleted", cline.taskId, cline.getTokenUsage())
 
+					// Task completed - open diff viewer
+					await openDiffViewer(cline)
+
 					await cline.ask("command", removeClosingTag("command", command), block.partial).catch(() => {})
 				}
 			} else {
@@ -69,6 +97,9 @@ export async function attemptCompletionTool(
 					await cline.say("completion_result", result, undefined, false)
 					telemetryService.captureTaskCompleted(cline.taskId)
 					cline.emit("taskCompleted", cline.taskId, cline.getTokenUsage())
+
+					// Task completed - open diff viewer
+					await openDiffViewer(cline)
 				}
 
 				// Complete command message.
@@ -92,6 +123,9 @@ export async function attemptCompletionTool(
 				await cline.say("completion_result", result, undefined, false)
 				telemetryService.captureTaskCompleted(cline.taskId)
 				cline.emit("taskCompleted", cline.taskId, cline.getTokenUsage())
+
+				// Task completed - open diff viewer
+				await openDiffViewer(cline)
 			}
 
 			if (cline.parentTask) {
@@ -111,29 +145,6 @@ export async function attemptCompletionTool(
 			// button and field.
 			const { response, text, images } = await cline.ask("completion_result", "", false)
 
-			// Auto-open diff viewer regardless of response
-			console.log("************************* TASK COMPLETE *************************")
-			console.log("[TASK_COMPLETE_DEBUG] Entering auto-diff section")
-			console.log("[TASK_COMPLETE_DEBUG] cline instance:", {
-				hasCheckpointDiff: !!cline.checkpointDiff,
-				taskId: cline.taskId,
-				instance: cline.instanceId,
-			})
-			// Show a UI message to verify execution reaches this point
-			const vscode = require("vscode")
-			vscode.window.showInformationMessage("About to attempt opening diff viewer")
-			try {
-				console.log("[attemptCompletionTool] Attempting to auto-open diff viewer")
-				await cline.checkpointDiff({
-					ts: Date.now(),
-					previousCommitHash: undefined, // Diff against working tree
-					mode: "checkpoint",
-				})
-				console.log("[attemptCompletionTool] Successfully opened diff viewer")
-			} catch (error) {
-				console.warn("[attemptCompletionTool] Failed to auto-open diff viewer:", error)
-			}
-
 			// Signals to recursive loop to stop (for now
 			// cline never happens since yesButtonClicked
 			// will trigger a new task).