[PROTOBUS] checkpoints checkpointRestore (RooCodeInc#3046)

* restoreTask protobus

* changeset

* changeset correction

* type safety change

* Fix Non-UTF-8 File Handling: Improve Encoding Detection to Prevent Garbled Text and Binary Misclassification (RooCodeInc#2347)

* Fix Non-UTF-8 File Handling: Improve Encoding Detection to Prevent Garbled Text and Binary Misclassification

* update package-lock.json

* update

* update

* fix

* fix

* fix

* ENG 526/Fix: Versioned Auto Approve settings (RooCodeInc#3014)

* added verisoning for autoApprove settings

* removed lines from source branch

* rebase

* changeset

* one small change

* activating extension with evals.env (RooCodeInc#3041)

Co-authored-by: Cline Evaluation <[email protected]>

* ripping out test build flag (RooCodeInc#3043)

Co-authored-by: Cline Evaluation <[email protected]>

* cleaning up evals.env logic in extension.ts (RooCodeInc#3045)

Co-authored-by: Cline Evaluation <[email protected]>

* ENG-516 Slash commands (RooCodeInc#3044)

* scroll

* menu

* changeset

* nit

* What's yer path? (RooCodeInc#3047)

* update extension imports to use aliasing

* changeset

* ENG-484 Enhance fixWithCline command execution by focusing chat input  (RooCodeInc#3028)

* Enhance fixWithCline command execution by focusing chat input and adding a delay before processing the fixWithCline command.

* feat: add OpenRouter base URL and balance display component

* feat: add OpenRouter base URL and balance display component

* feat: add OpenRouter base URL and balance display component

* new_task prompt (RooCodeInc#3049)

* prompt

* changeset

* words

* prettier

* Added metadata

---------

Co-authored-by: yt3trees <[email protected]>
Co-authored-by: pashpashpash <[email protected]>
Co-authored-by: Cline Evaluation <[email protected]>
Co-authored-by: Toshii <[email protected]>
Co-authored-by: Evan <[email protected]>
Co-authored-by: nomaven <[email protected]>

Author: 7 people

.changeset/weak-emus-joke.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+protobus migration for checkpointRestore

proto/checkpoints.proto

@@ -6,5 +6,12 @@ import "common.proto";
 
 service CheckpointsService {
   rpc checkpointDiff(Int64Request) returns (Empty);
+  rpc checkpointRestore(CheckpointRestoreRequest) returns (Empty);
 }
 
+message CheckpointRestoreRequest {
+  Metadata metadata = 1;
+  int64 number = 2;
+  string restore_type = 3;
+  optional int64 offset = 4;
+}

src/core/controller/checkpoints/checkpointRestore.ts

@@ -0,0 +1,22 @@
+import { Controller } from ".."
+import { ClineCheckpointRestore } from "../../../shared/WebviewMessage"
+import { CheckpointRestoreRequest } from "../../../shared/proto/checkpoints"
+import { Empty } from "../../../shared/proto/common"
+import pWaitFor from "p-wait-for"
+
+export async function checkpointRestore(controller: Controller, request: CheckpointRestoreRequest): Promise<Empty> {
+	await controller.cancelTask() // we cannot alter message history say if the task is active, as it could be in the middle of editing a file or running a command, which expect the ask to be responded to rather than being superseded by a new message eg add deleted_api_reqs
+
+	if (request.number) {
+		// wait for messages to be loaded
+		await pWaitFor(() => controller.task?.isInitialized === true, {
+			timeout: 3_000,
+		}).catch(() => {
+			console.error("Failed to init new cline instance")
+		})
+
+		// NOTE: cancelTask awaits abortTask, which awaits diffViewProvider.revertChanges, which reverts any edited files, allowing us to reset to a checkpoint rather than running into a state where the revertChanges function is called alongside or after the checkpoint reset
+		await controller.task?.restoreCheckpoint(request.number, request.restoreType as ClineCheckpointRestore, request.offset)
+	}
+	return {}
+}

src/core/controller/checkpoints/index.ts

@@ -9,7 +9,7 @@ export type CheckpointsMethodHandler = ServiceMethodHandler
 export const registerMethod = checkpointsService.registerMethod
 
 // Export the request handler
-export const handleCheckpointsDiffServiceRequest = checkpointsService.handleRequest
+export const handleCheckpointsServiceRequest = checkpointsService.handleRequest
 
 // Register all checkpoints methods
 registerAllMethods()

src/core/controller/checkpoints/methods.ts

@@ -4,9 +4,11 @@
 // Import all method implementations
 import { registerMethod } from "./index"
 import { checkpointDiff } from "./checkpointDiff"
+import { checkpointRestore } from "./checkpointRestore"
 
 // Register all checkpoints service methods
 export function registerAllMethods(): void {
 	// Register each method with the registry
 	registerMethod("checkpointDiff", checkpointDiff)
+	registerMethod("checkpointRestore", checkpointRestore)
 }

src/core/controller/grpc-handler.ts

@@ -1,6 +1,6 @@
 import { Controller } from "./index"
 import { handleBrowserServiceRequest } from "./browser/index"
-import { handleCheckpointsDiffServiceRequest } from "./checkpoints"
+import { handleCheckpointsServiceRequest } from "./checkpoints"
 import { handleMcpServiceRequest } from "./mcp"
 
 /**
@@ -36,7 +36,7 @@ export class GrpcHandler {
 					}
 				case "cline.CheckpointsService":
 					return {
-						message: await handleCheckpointsDiffServiceRequest(this.controller, method, message),
+						message: await handleCheckpointsServiceRequest(this.controller, method, message),
 						request_id: requestId,
 					}
 				case "cline.McpService":

src/core/controller/index.ts

@@ -460,21 +460,6 @@ export class Controller {
 			case "openMention":
 				openMention(message.text)
 				break
-			case "checkpointRestore": {
-				await this.cancelTask() // we cannot alter message history say if the task is active, as it could be in the middle of editing a file or running a command, which expect the ask to be responded to rather than being superseded by a new message eg add deleted_api_reqs
-				// cancel task waits for any open editor to be reverted and starts a new cline instance
-				if (message.number) {
-					// wait for messages to be loaded
-					await pWaitFor(() => this.task?.isInitialized === true, {
-						timeout: 3_000,
-					}).catch(() => {
-						console.error("Failed to init new cline instance")
-					})
-					// NOTE: cancelTask awaits abortTask, which awaits diffViewProvider.revertChanges, which reverts any edited files, allowing us to reset to a checkpoint rather than running into a state where the revertChanges function is called alongside or after the checkpoint reset
-					await this.task?.restoreCheckpoint(message.number, message.text! as ClineCheckpointRestore, message.offset)
-				}
-				break
-			}
 			case "taskCompletionViewChanges": {
 				if (message.number) {
 					await this.task?.presentMultifileDiff(message.number, true)

src/shared/WebviewMessage.ts

@@ -42,7 +42,6 @@ export interface WebviewMessage {
 		| "browserSettings"
 		| "browserRelaunchResult"
 		| "togglePlanActMode"
-		| "checkpointRestore"
 		| "taskCompletionViewChanges"
 		| "openExtensionSettings"
 		| "requestVsCodeLmModels"

src/shared/proto/checkpoints.ts

@@ -1,9 +1,10 @@
 import React, { useState, useRef, forwardRef, useCallback } from "react"
 import Thumbnails from "@/components/common/Thumbnails"
 import { highlightText } from "./TaskHeader"
-import { vscode } from "@/utils/vscode"
 import DynamicTextArea from "react-textarea-autosize"
 import { useExtensionState } from "@/context/ExtensionStateContext"
+import { CheckpointsServiceClient } from "@/services/grpc-client"
+import { ClineCheckpointRestore } from "@shared/WebviewMessage"
 
 interface UserMessageProps {
 	text?: string
@@ -35,24 +36,27 @@ const UserMessage: React.FC<UserMessageProps> = ({ text, images, messageTs, send
 		}
 	}, [isEditing])
 
-	const handleRestoreWorkspace = (type: string) => {
+	const handleRestoreWorkspace = async (type: ClineCheckpointRestore) => {
 		const delay = type === "task" ? 500 : 1000 // Delay for task and workspace restore
 		setIsEditing(false)
 
 		if (text === editedText) {
 			return
 		}
 
-		vscode.postMessage({
-			type: "checkpointRestore",
-			number: messageTs,
-			text: type,
-			offset: 1,
-		})
-
-		setTimeout(() => {
-			sendMessageFromChatRow?.(editedText, images || [])
-		}, delay)
+		try {
+			await CheckpointsServiceClient.checkpointRestore({
+				number: messageTs,
+				restoreType: type,
+				offset: 1,
+			})
+
+			setTimeout(() => {
+				sendMessageFromChatRow?.(editedText, images || [])
+			}, delay)
+		} catch (err) {
+			console.error("Checkpoint restore error:", err)
+		}
 	}
 
 	const handleBlur = (e: React.FocusEvent<HTMLTextAreaElement>) => {
@@ -146,10 +150,10 @@ const UserMessage: React.FC<UserMessageProps> = ({ text, images, messageTs, send
 
 // Reusable button component for restore actions
 interface RestoreButtonProps {
-	type: string
+	type: ClineCheckpointRestore
 	label: string
 	isPrimary: boolean
-	onClick: (type: string) => void
+	onClick: (type: ClineCheckpointRestore) => void
 	title?: string
 }