feat: edit/delete user message

Author: NaccOll

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

@@ -317,7 +317,6 @@ describe("Checkpoint functionality", () => {
 				},
 			]
 			mockCheckpointService.getDiff.mockResolvedValue(mockChanges)
-			mockCheckpointService.getCheckpoints = vi.fn(() => ["commit1", "commit2"])
 			await checkpointDiff(mockTask, {
 				ts: 4,
 				commitHash: "commit1",
@@ -343,7 +342,6 @@ describe("Checkpoint functionality", () => {
 				},
 			]
 			mockCheckpointService.getDiff.mockResolvedValue(mockChanges)
-			mockCheckpointService.getCheckpoints = vi.fn(() => ["commit1", "commit2"])
 
 			await checkpointDiff(mockTask, {
 				ts: 4,

src/core/checkpoints/index.ts

@@ -271,15 +271,16 @@ export async function checkpointDiff(task: Task, { ts, previousCommitHash, commi
 	TelemetryService.instance.captureCheckpointDiffed(task.taskId)
 
 	let prevHash = commitHash
-	let nextHash: string | undefined
-
-	const checkpoints = typeof service.getCheckpoints === "function" ? service.getCheckpoints() : []
-	const idx = checkpoints.indexOf(commitHash)
-
-	if (idx !== -1 && idx < checkpoints.length - 1) {
-		nextHash = checkpoints[idx + 1]
-	} else {
-		nextHash = undefined
+	let nextHash: string | undefined = undefined
+
+	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
+		}
 	}
 
 	try {

src/core/webview/webviewMessageHandler.ts

@@ -110,9 +110,9 @@ export const webviewMessageHandler = async (
 			const { messageIndex } = findMessageIndices(messageTs, currentCline)
 			if (messageIndex !== -1) {
 				// Find the last checkpoint before this message
-				const checkpoints = currentCline.clineMessages
-					.filter((msg) => msg.say === "checkpoint_saved" && msg.ts < messageTs)
-					.sort((a, b) => b.ts - a.ts)
+				const checkpoints = currentCline.clineMessages.filter(
+					(msg) => msg.say === "checkpoint_saved" && msg.ts > messageTs,
+				)
 
 				hasCheckpoint = checkpoints.length > 0
 			} else {
@@ -153,19 +153,19 @@ export const webviewMessageHandler = async (
 			// If checkpoint restoration is requested, find and restore to the last checkpoint before this message
 			if (restoreCheckpoint) {
 				// Find the last checkpoint before this message
-				const checkpoints = currentCline.clineMessages
-					.filter((msg) => msg.say === "checkpoint_saved" && msg.ts < messageTs)
-					.sort((a, b) => b.ts - a.ts)
+				const checkpoints = currentCline.clineMessages.filter(
+					(msg) => msg.say === "checkpoint_saved" && msg.ts > messageTs,
+				)
 
-				const lastCheckpoint = checkpoints[0]
+				const nextCheckpoint = checkpoints[0]
 
-				if (lastCheckpoint && lastCheckpoint.text) {
+				if (nextCheckpoint && nextCheckpoint.text) {
 					await handleCheckpointRestoreOperation({
 						provider,
 						currentCline,
 						messageTs: targetMessage.ts!,
 						messageIndex,
-						checkpoint: { hash: lastCheckpoint.text },
+						checkpoint: { hash: nextCheckpoint.text },
 						operation: "delete",
 					})
 				} else {
@@ -221,9 +221,9 @@ export const webviewMessageHandler = async (
 			const { messageIndex } = findMessageIndices(messageTs, currentCline)
 			if (messageIndex !== -1) {
 				// Find the last checkpoint before this message
-				const checkpoints = currentCline.clineMessages
-					.filter((msg) => msg.say === "checkpoint_saved" && msg.ts < messageTs)
-					.sort((a, b) => b.ts - a.ts)
+				const checkpoints = currentCline.clineMessages.filter(
+					(msg) => msg.say === "checkpoint_saved" && msg.ts > messageTs,
+				)
 
 				hasCheckpoint = checkpoints.length > 0
 			} else {
@@ -274,19 +274,19 @@ export const webviewMessageHandler = async (
 			// If checkpoint restoration is requested, find and restore to the last checkpoint before this message
 			if (restoreCheckpoint) {
 				// Find the last checkpoint before this message
-				const checkpoints = currentCline.clineMessages
-					.filter((msg) => msg.say === "checkpoint_saved" && msg.ts < messageTs)
-					.sort((a, b) => b.ts - a.ts)
+				const checkpoints = currentCline.clineMessages.filter(
+					(msg) => msg.say === "checkpoint_saved" && msg.ts > messageTs,
+				)
 
-				const lastCheckpoint = checkpoints[0]
+				const nextCheckpoint = checkpoints[0]
 
-				if (lastCheckpoint && lastCheckpoint.text) {
+				if (nextCheckpoint && nextCheckpoint.text) {
 					await handleCheckpointRestoreOperation({
 						provider,
 						currentCline,
 						messageTs: targetMessage.ts!,
 						messageIndex,
-						checkpoint: { hash: lastCheckpoint.text },
+						checkpoint: { hash: nextCheckpoint.text },
 						operation: "edit",
 						editData: {
 							editedContent,

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

@@ -46,6 +46,7 @@ import { appendImages } from "@src/utils/imageUtils"
 import { McpExecution } from "./McpExecution"
 import { ChatTextArea } from "./ChatTextArea"
 import { MAX_IMAGES_PER_MESSAGE } from "./ChatView"
+import { useSelectedModel } from "../ui/hooks/useSelectedModel"
 
 interface ChatRowProps {
 	message: ClineMessage
@@ -115,8 +116,8 @@ export const ChatRowContent = ({
 }: ChatRowContentProps) => {
 	const { t } = useTranslation()
 
-	const { mcpServers, alwaysAllowMcp, currentCheckpoint, mode } = useExtensionState()
-
+	const { mcpServers, alwaysAllowMcp, currentCheckpoint, mode, apiConfiguration } = useExtensionState()
+	const { info: model } = useSelectedModel(apiConfiguration)
 	const [reasoningCollapsed, setReasoningCollapsed] = useState(true)
 	const [isDiffErrorExpanded, setIsDiffErrorExpanded] = useState(false)
 	const [showCopySuccess, setShowCopySuccess] = useState(false)
@@ -1184,7 +1185,7 @@ export const ChatRowContent = ({
 										setSelectedImages={setEditImages}
 										onSend={handleSaveEdit}
 										onSelectImages={handleSelectImages}
-										shouldDisableImages={false}
+										shouldDisableImages={!model?.supportsImages}
 										mode={editMode}
 										setMode={setEditMode}
 										modeShortcutText=""