Enhance Diff View

src/core/checkpoints/__tests__/checkpoint.test.ts

@@ -283,7 +283,7 @@ describe("Checkpoint functionality", () => {
 			]
 		})
 
-		it("should show diff for full mode", async () => {
+		it("should show diff for to-current mode", async () => {
 			const mockChanges = [
 				{
 					paths: { absolute: "/test/file.ts", relative: "file.ts" },
@@ -295,7 +295,7 @@ describe("Checkpoint functionality", () => {
 			await checkpointDiff(mockTask, {
 				ts: 4,
 				commitHash: "commit2",
-				mode: "full",
+				mode: "to-current",
 			})
 
 			expect(mockCheckpointService.getDiff).toHaveBeenCalledWith({
@@ -304,7 +304,7 @@ describe("Checkpoint functionality", () => {
 			})
 			expect(vscode.commands.executeCommand).toHaveBeenCalledWith(
 				"vscode.changes",
-				"Changes since task started",
+				"Changes to current workspace",
 				expect.any(Array),
 			)
 		})
@@ -361,7 +361,7 @@ describe("Checkpoint functionality", () => {
 			await checkpointDiff(mockTask, {
 				ts: 4,
 				commitHash: "commit2",
-				mode: "full",
+				mode: "to-current",
 			})
 
 			expect(vscode.window.showInformationMessage).toHaveBeenCalledWith("No changes found.")
@@ -374,7 +374,7 @@ describe("Checkpoint functionality", () => {
 			await checkpointDiff(mockTask, {
 				ts: 4,
 				commitHash: "commit2",
-				mode: "full",
+				mode: "to-current",
 			})
 
 			expect(mockTask.enableCheckpoints).toBe(false)

src/core/checkpoints/index.ts

@@ -270,10 +270,10 @@ export async function checkpointRestore(
 }
 
 export type CheckpointDiffOptions = {
-	ts: number
+	ts?: number
 	previousCommitHash?: string
 	commitHash: string
-	mode: "full" | "checkpoint"
+	mode: "from-init" | "checkpoint" | "to-current" | "full"
 }
 
 export async function checkpointDiff(task: Task, { ts, previousCommitHash, commitHash, mode }: CheckpointDiffOptions) {
@@ -285,21 +285,43 @@ export async function checkpointDiff(task: Task, { ts, previousCommitHash, commi
 
 	TelemetryService.instance.captureCheckpointDiffed(task.taskId)
 
-	let prevHash = commitHash
-	let nextHash: string | undefined = undefined
+	let fromHash: string | undefined
+	let toHash: string | undefined
+	let title: string
+
+	const checkpoints = task.clineMessages.filter(({ say }) => say === "checkpoint_saved").map(({ text }) => text!)
+
+	const idx = checkpoints.indexOf(commitHash)
+	switch (mode) {
+		case "checkpoint":
+			fromHash = commitHash
+			toHash = idx !== -1 && idx < checkpoints.length - 1 ? checkpoints[idx + 1] : undefined
+			title = "Changes compare with next checkpoint"
+			break
+		case "from-init":
+			fromHash = checkpoints[0]
+			toHash = commitHash
+			title = "Changes since first checkpoint"
+			break
+		case "to-current":
+			fromHash = commitHash
+			toHash = undefined
+			title = "Changes to current workspace"
+			break
+		case "full":
+			fromHash = checkpoints[0]
+			toHash = undefined
+			title = "Changes since first checkpoint"
+			break
+	}
 
-	if (mode !== "full") {
-		const checkpoints = task.clineMessages.filter(({ say }) => say === "checkpoint_saved").map(({ text }) => text!)
-		const idx = checkpoints.indexOf(commitHash)
-		if (idx !== -1 && idx < checkpoints.length - 1) {
-			nextHash = checkpoints[idx + 1]
-		} else {
-			nextHash = undefined
-		}
+	if (!fromHash) {
+		vscode.window.showInformationMessage("No previous checkpoint to compare.")
+		return
 	}
 
 	try {
-		const changes = await service.getDiff({ from: prevHash, to: nextHash })
+		const changes = await service.getDiff({ from: fromHash, to: toHash })
 
 		if (!changes?.length) {
 			vscode.window.showInformationMessage("No changes found.")
@@ -308,7 +330,7 @@ export async function checkpointDiff(task: Task, { ts, previousCommitHash, commi
 
 		await vscode.commands.executeCommand(
 			"vscode.changes",
-			mode === "full" ? "Changes since task started" : "Changes compare with next checkpoint",
+			title,
 			changes.map((change) => [
 				vscode.Uri.file(change.paths.absolute),
 				vscode.Uri.parse(`${DIFF_VIEW_URI_SCHEME}:${change.paths.relative}`).with({

src/shared/WebviewMessage.ts

@@ -296,10 +296,10 @@ export interface WebviewMessage {
 }
 
 export const checkoutDiffPayloadSchema = z.object({
-	ts: z.number(),
+	ts: z.number().optional(),
 	previousCommitHash: z.string().optional(),
 	commitHash: z.string(),
-	mode: z.enum(["full", "checkpoint"]),
+	mode: z.enum(["full", "checkpoint", "from-init", "to-current"]),
 })
 
 export type CheckpointDiffPayload = z.infer<typeof checkoutDiffPayloadSchema>

webview-ui/src/components/chat/ChatRow.tsx

@@ -17,7 +17,7 @@ import { findMatchingResourceOrTemplate } from "@src/utils/mcp"
 import { vscode } from "@src/utils/vscode"
 import { removeLeadingNonAlphanumeric } from "@src/utils/removeLeadingNonAlphanumeric"
 import { getLanguageFromPath } from "@src/utils/getLanguageFromPath"
-import { Button } from "@src/components/ui"
+import { Button, StandardTooltip } from "@src/components/ui"
 
 import { ToolUseBlock, ToolUseBlockHeader } from "../common/ToolUseBlock"
 import UpdateTodoListToolBlock from "./UpdateTodoListToolBlock"
@@ -61,6 +61,7 @@ interface ChatRowProps {
 	onFollowUpUnmount?: () => void
 	isFollowUpAnswered?: boolean
 	editable?: boolean
+	hasCheckpoint?: boolean
 }
 
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
@@ -113,6 +114,7 @@ export const ChatRowContent = ({
 	onBatchFileResponse,
 	isFollowUpAnswered,
 	editable,
+	hasCheckpoint,
 }: ChatRowContentProps) => {
 	const { t } = useTranslation()
 
@@ -953,6 +955,25 @@ export const ChatRowContent = ({
 		}
 	}
 
+	const viewFullDiffBtn =
+		hasCheckpoint && isLast && !isStreaming ? (
+			<div style={{ marginTop: 16, display: "flex", justifyContent: "flex-start" }}>
+				<StandardTooltip content={t("chat:showChangesFromInit")}>
+					<VSCodeButton
+						appearance="primary"
+						className="flex-1 mr-[6px]"
+						onClick={() =>
+							vscode.postMessage({
+								type: "checkpointDiff",
+								payload: { mode: "full", commitHash: "" },
+							})
+						}>
+						{t("chat:checkpoint.menu.viewDiffFromInit")}
+					</VSCodeButton>
+				</StandardTooltip>
+			</div>
+		) : null
+
 	switch (message.type) {
 		case "say":
 			switch (message.say) {
@@ -1272,6 +1293,7 @@ export const ChatRowContent = ({
 							</div>
 							<div style={{ color: "var(--vscode-charts-green)", paddingTop: 10 }}>
 								<Markdown markdown={message.text} />
+								{viewFullDiffBtn}
 							</div>
 						</>
 					)
@@ -1515,6 +1537,7 @@ export const ChatRowContent = ({
 								</div>
 								<div style={{ color: "var(--vscode-charts-green)", paddingTop: 10 }}>
 									<Markdown markdown={message.text} partial={message.partial} />
+									{viewFullDiffBtn}
 								</div>
 							</div>
 						)

webview-ui/src/components/chat/ChatView.tsx

@@ -1514,6 +1514,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 					/>
 				)
 			}
+			const hasCheckpoint = modifiedMessages.some((message) => message.say === "checkpoint_saved")
 
 			// regular message
 			return (
@@ -1548,6 +1549,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 							return tool.tool === "updateTodoList" && enableButtons && !!primaryButtonText
 						})()
 					}
+					hasCheckpoint={hasCheckpoint}
 				/>
 			)
 		},

webview-ui/src/components/chat/checkpoints/CheckpointMenu.tsx

@@ -32,6 +32,20 @@ export const CheckpointMenu = ({ ts, commitHash, currentHash, checkpoint }: Chec
 		})
 	}, [ts, previousCommitHash, commitHash])
 
+	const onDiffFromInit = useCallback(() => {
+		vscode.postMessage({
+			type: "checkpointDiff",
+			payload: { ts, commitHash, mode: "from-init" },
+		})
+	}, [ts, commitHash])
+
+	const onDiffWithCurrent = useCallback(() => {
+		vscode.postMessage({
+			type: "checkpointDiff",
+			payload: { ts, commitHash, mode: "to-current" },
+		})
+	}, [ts, commitHash])
+
 	const onPreview = useCallback(() => {
 		vscode.postMessage({ type: "checkpointRestore", payload: { ts, commitHash, mode: "preview" } })
 		setIsOpen(false)
@@ -49,6 +63,16 @@ export const CheckpointMenu = ({ ts, commitHash, currentHash, checkpoint }: Chec
 					<span className="codicon codicon-diff-single" />
 				</Button>
 			</StandardTooltip>
+			<StandardTooltip content={t("chat:checkpoint.menu.viewDiffFromInit")}>
+				<Button variant="ghost" size="icon" onClick={onDiffFromInit}>
+					<span className="codicon codicon-versions" />
+				</Button>
+			</StandardTooltip>
+			<StandardTooltip content={t("chat:checkpoint.menu.viewDiffWithCurrent")}>
+				<Button variant="ghost" size="icon" onClick={onDiffWithCurrent}>
+					<span className="codicon codicon-diff" />
+				</Button>
+			</StandardTooltip>
 			<Popover
 				open={isOpen}
 				onOpenChange={(open) => {

webview-ui/src/i18n/locales/en/chat.json

@@ -152,6 +152,8 @@
 		"initializingWarning": "Still initializing checkpoint... If this takes too long, you can disable checkpoints in <settingsLink>settings</settingsLink> and restart your task.",
 		"menu": {
 			"viewDiff": "View Diff",
+			"viewDiffFromInit": "View Diff With First Checkpoint",
+			"viewDiffWithCurrent": "View Diff With Current Workspace",
 			"restore": "Restore Checkpoint",
 			"restoreFiles": "Restore Files",
 			"restoreFilesDescription": "Restores your project's files back to a snapshot taken at this point.",