merge conflicts

.changeset/loud-worms-applaud.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Migrate updateTerminalConnectionTimeout to protobus

proto/state.proto

@@ -9,6 +9,7 @@ service StateService {
   rpc toggleFavoriteModel(StringRequest) returns (Empty);
   rpc resetState(EmptyRequest) returns (Empty);
   rpc togglePlanActMode(TogglePlanActModeRequest) returns (Empty);
+  rpc updateTerminalConnectionTimeout(Int64Request) returns (Int64);
 }
 
 message State {

src/core/controller/index.ts

@@ -529,21 +529,6 @@ export class Controller {
 				break
 			}
 
-			case "updateTerminalConnectionTimeout": {
-				if (message.shellIntegrationTimeout !== undefined) {
-					const timeout = message.shellIntegrationTimeout
-
-					if (typeof timeout === "number" && !isNaN(timeout) && timeout > 0) {
-						await updateGlobalState(this.context, "shellIntegrationTimeout", timeout)
-						await this.postStateToWebview()
-					} else {
-						console.warn(
-							`Invalid shell integration timeout value received: ${timeout}. ` + `Expected a positive number.`,
-						)
-					}
-				}
-				break
-			}
 			// Add more switch case statements here as more webview message commands
 			// are created within the webview context (i.e. inside media/main.js)
 		}

src/core/controller/state/methods.ts

@@ -8,6 +8,7 @@ import { resetState } from "./resetState"
 import { subscribeToState } from "./subscribeToState"
 import { toggleFavoriteModel } from "./toggleFavoriteModel"
 import { togglePlanActMode } from "./togglePlanActMode"
+import { updateTerminalConnectionTimeout } from "./updateTerminalConnectionTimeout"
 
 // Streaming methods for this service
 export const streamingMethods = ["subscribeToState"]
@@ -20,4 +21,5 @@ export function registerAllMethods(): void {
 	registerMethod("subscribeToState", subscribeToState, { isStreaming: true })
 	registerMethod("toggleFavoriteModel", toggleFavoriteModel)
 	registerMethod("togglePlanActMode", togglePlanActMode)
+	registerMethod("updateTerminalConnectionTimeout", updateTerminalConnectionTimeout)
 }

src/core/controller/state/updateTerminalConnectionTimeout.ts

@@ -0,0 +1,27 @@
+import { Controller } from ".."
+import { Int64, Int64Request } from "../../../shared/proto/common"
+import { updateGlobalState } from "../../storage/state"
+
+/**
+ * Updates the terminal connection timeout setting
+ * @param controller The controller instance
+ * @param request The request containing the timeout value in milliseconds
+ * @returns The updated timeout value
+ */
+export async function updateTerminalConnectionTimeout(controller: Controller, request: Int64Request): Promise<Int64> {
+	try {
+		const timeout = request.value
+
+		if (typeof timeout === "number" && !isNaN(timeout) && timeout > 0) {
+			// Update the global state directly
+			await updateGlobalState(controller.context, "shellIntegrationTimeout", timeout)
+			return { value: timeout }
+		} else {
+			console.warn(`Invalid shell integration timeout value received: ${timeout}. Expected a positive number.`)
+			throw new Error("Invalid timeout value. Expected a positive number.")
+		}
+	} catch (error) {
+		console.error(`Failed to update terminal connection timeout: ${error}`)
+		throw error
+	}
+}

src/shared/WebviewMessage.ts

@@ -43,7 +43,6 @@ export interface WebviewMessage {
 		| "grpc_request_cancel"
 		| "toggleWindsurfRule"
 		| "toggleWorkflow"
-		| "updateTerminalConnectionTimeout"
 
 	text?: string
 	disabled?: boolean

src/shared/proto/state.ts

@@ -6,7 +6,7 @@
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire"
-import { Empty, EmptyRequest, Metadata, StringRequest } from "./common"
+import { Empty, EmptyRequest, Int64, Int64Request, Metadata, StringRequest } from "./common"
 
 export const protobufPackage = "cline"
 
@@ -436,6 +436,14 @@ export const StateServiceDefinition = {
 			responseStream: false,
 			options: {},
 		},
+		updateTerminalConnectionTimeout: {
+			name: "updateTerminalConnectionTimeout",
+			requestType: Int64Request,
+			requestStream: false,
+			responseType: Int64,
+			responseStream: false,
+			options: {},
+		},
 	},
 } as const
 

src/standalone/server-setup.ts

@@ -60,6 +60,7 @@ import { subscribeToState } from "../core/controller/state/subscribeToState"
 import { toggleFavoriteModel } from "../core/controller/state/toggleFavoriteModel"
 import { resetState } from "../core/controller/state/resetState"
 import { togglePlanActMode } from "../core/controller/state/togglePlanActMode"
+import { updateTerminalConnectionTimeout } from "../core/controller/state/updateTerminalConnectionTimeout"
 
 // Task Service
 import { cancelTask } from "../core/controller/task/cancelTask"
@@ -160,6 +161,7 @@ export function addServices(
 		toggleFavoriteModel: wrapper(toggleFavoriteModel, controller),
 		resetState: wrapper(resetState, controller),
 		togglePlanActMode: wrapper(togglePlanActMode, controller),
+		updateTerminalConnectionTimeout: wrapper(updateTerminalConnectionTimeout, controller),
 	})
 
 	// Task Service

webview-ui/src/components/settings/TerminalSettingsSection.tsx

@@ -1,7 +1,8 @@
 import React, { useState } from "react"
 import { VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
 import { useExtensionState } from "@/context/ExtensionStateContext"
-import { vscode } from "@/utils/vscode"
+import { StateServiceClient } from "@/services/grpc-client"
+import { Int64, Int64Request } from "@shared/proto/common"
 
 export const TerminalSettingsSection: React.FC = () => {
 	const { shellIntegrationTimeout, setShellIntegrationTimeout } = useExtensionState()
@@ -26,11 +27,17 @@ export const TerminalSettingsSection: React.FC = () => {
 		// Update local state
 		setShellIntegrationTimeout(timeout)
 
-		// Send to extension
-		vscode.postMessage({
-			type: "updateTerminalConnectionTimeout",
-			shellIntegrationTimeout: timeout,
-		})
+		// Send to extension using gRPC
+		StateServiceClient.updateTerminalConnectionTimeout({
+			value: timeout,
+		} as Int64Request)
+			.then((response: Int64) => {
+				setShellIntegrationTimeout(response.value)
+				setInputValue((response.value / 1000).toString())
+			})
+			.catch((error) => {
+				console.error("Failed to update terminal connection timeout:", error)
+			})
 	}
 
 	const handleInputBlur = () => {