zgsm-ai
diff --git a/‎packages/types/src/global-settings.ts‎
Lines changed: 1 addition & 5 deletions b/‎packages/types/src/global-settings.ts‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎src/core/auto-approval/index.ts‎
Lines changed: 1 addition & 3 deletions b/‎src/core/auto-approval/index.ts‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎src/core/task/Task.ts‎
Lines changed: 5 additions & 6 deletions b/‎src/core/task/Task.ts‎
Lines changed: 5 additions & 6 deletions
diff --git a/‎src/core/task/__tests__/Task.spec.ts‎
Lines changed: 6 additions & 12 deletions b/‎src/core/task/__tests__/Task.spec.ts‎
Lines changed: 6 additions & 12 deletions
diff --git a/‎src/core/webview/ClineProvider.ts‎
Lines changed: 0 additions & 9 deletions b/‎src/core/webview/ClineProvider.ts‎
Lines changed: 0 additions & 9 deletions
diff --git a/‎src/core/webview/__tests__/ClineProvider.spec.ts‎
Lines changed: 0 additions & 38 deletions b/‎src/core/webview/__tests__/ClineProvider.spec.ts‎
Lines changed: 0 additions & 38 deletions
diff --git a/‎src/shared/ExtensionMessage.ts‎
Lines changed: 1 addition & 3 deletions b/‎src/shared/ExtensionMessage.ts‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎webview-ui/src/components/chat/AutoApproveDropdown.tsx‎
Lines changed: 1 addition & 21 deletions b/‎webview-ui/src/components/chat/AutoApproveDropdown.tsx‎
Lines changed: 1 addition & 21 deletions
diff --git a/‎webview-ui/src/components/chat/ChatView.tsx‎
Lines changed: 0 additions & 5 deletions b/‎webview-ui/src/components/chat/ChatView.tsx‎
Lines changed: 0 additions & 5 deletions
@@ -82,15 +82,13 @@ export const globalSettingsSchema = z.object({
 	alwaysAllowWriteProtected: z.boolean().optional(),
 	writeDelayMs: z.number().min(0).optional(),
 	alwaysAllowBrowser: z.boolean().optional(),
-	alwaysApproveResubmit: z.boolean().optional(),
 	requestDelaySeconds: z.number().optional(),
 	alwaysAllowMcp: z.boolean().optional(),
 	alwaysAllowModeSwitch: z.boolean().optional(),
 	alwaysAllowSubtasks: z.boolean().optional(),
 	alwaysAllowExecute: z.boolean().optional(),
 	alwaysAllowFollowupQuestions: z.boolean().optional(),
 	followupAutoApproveTimeoutMs: z.number().optional(),
-	alwaysAllowUpdateTodoList: z.boolean().optional(),
 	allowedCommands: z.array(z.string()).optional(),
 	deniedCommands: z.array(z.string()).optional(),
 	commandExecutionTimeout: z.number().optional(),
@@ -324,14 +322,12 @@ export const EVALS_SETTINGS: RooCodeSettings = {
 	alwaysAllowWriteProtected: false,
 	writeDelayMs: 1000,
 	alwaysAllowBrowser: true,
-	alwaysApproveResubmit: true,
-	requestDelaySeconds: 3,
+	requestDelaySeconds: 10,
 	alwaysAllowMcp: true,
 	alwaysAllowModeSwitch: true,
 	alwaysAllowSubtasks: true,
 	alwaysAllowExecute: true,
 	alwaysAllowFollowupQuestions: true,
-	alwaysAllowUpdateTodoList: true,
 	followupAutoApproveTimeoutMs: 0,
 	allowedCommands: ["*"],
 	commandExecutionTimeout: 20,
 
@@ -12,13 +12,11 @@ export type AutoApprovalState =
 	| "alwaysAllowReadOnly"
 	| "alwaysAllowWrite"
 	| "alwaysAllowBrowser"
-	| "alwaysApproveResubmit"
 	| "alwaysAllowMcp"
 	| "alwaysAllowModeSwitch"
 	| "alwaysAllowSubtasks"
 	| "alwaysAllowExecute"
 	| "alwaysAllowFollowupQuestions"
-	| "alwaysAllowUpdateTodoList"
 
 // Some of these actions have additional settings associated with them.
 export type AutoApprovalStateOptions =
@@ -146,7 +144,7 @@ export async function checkAutoApproval({
 		}
 
 		if (tool.tool === "updateTodoList") {
-			return state.alwaysAllowUpdateTodoList === true ? { decision: "approve" } : { decision: "ask" }
+			return { decision: "approve" }
 		}
 
 		if (tool?.tool === "fetchInstructions") {
 
@@ -3126,7 +3126,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 
 							// Apply exponential backoff similar to first-chunk errors when auto-resubmit is enabled
 							const stateForBackoff = await this.providerRef.deref()?.getState()
-							if (stateForBackoff?.autoApprovalEnabled && stateForBackoff?.alwaysApproveResubmit) {
+							if (stateForBackoff?.autoApprovalEnabled) {
 								await this.backoffAndAnnounce(
 									currentItem.retryAttempt ?? 0,
 									error,
@@ -3389,7 +3389,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 					// Check if we should auto-retry or prompt the user
 					let errorMsg = t("common:errors.unexpected_api_response")
 					// Reuse the state variable from above
-					if (state?.autoApprovalEnabled && state?.alwaysApproveResubmit) {
+					if (state?.autoApprovalEnabled) {
 						// Auto-retry with backoff - don't persist failure message when retrying
 						if (shouldStop) {
 							errorMsg = streamingFailedMessage
@@ -3690,8 +3690,7 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 		const {
 			apiConfiguration,
 			autoApprovalEnabled,
-			alwaysApproveResubmit,
-			// requestDelaySeconds,
+			requestDelaySeconds,
 			mode,
 			zgsmCodeMode,
 			autoCondenseContext = true,
@@ -4031,8 +4030,8 @@ export class Task extends EventEmitter<TaskEvents> implements TaskLike {
 			}
 
 			// note that this api_req_failed ask is unique in that we only present this option if the api hasn't streamed any content yet (ie it fails on the first chunk due), as it would allow them to hit a retry button. However if the api failed mid-stream, it could be in any arbitrary state where some tools may have executed, so that error is handled differently and requires cancelling the task entirely.
-			if (autoApprovalEnabled && alwaysApproveResubmit) {
-				// let errorMsg
+			if (autoApprovalEnabled) {
+				let errorMsg
 
 				// if (error.error?.metadata?.raw) {
 				// 	errorMsg = JSON.stringify(error.error.metadata.raw, null, 2)
 
@@ -711,11 +711,8 @@ describe("Cline", () => {
 					return mockSuccessStream
 				})
 
-				// Set alwaysApproveResubmit and requestDelaySeconds
-				mockProvider.getState = vi.fn().mockResolvedValue({
-					alwaysApproveResubmit: true,
-					requestDelaySeconds: 3,
-				})
+				// Set up mock state
+				mockProvider.getState = vi.fn().mockResolvedValue({})
 
 				// Mock previous API request message
 				cline.clineMessages = [
@@ -737,7 +734,7 @@ describe("Cline", () => {
 				await iterator.next()
 
 				// Calculate expected delay for first retry
-				const baseDelay = 3 // from requestDelaySeconds
+				const baseDelay = 3 // test retry delay
 
 				// Verify countdown messages
 				for (let i = baseDelay; i > 0; i--) {
@@ -835,11 +832,8 @@ describe("Cline", () => {
 					return mockSuccessStream
 				})
 
-				// Set alwaysApproveResubmit and requestDelaySeconds
-				mockProvider.getState = vi.fn().mockResolvedValue({
-					alwaysApproveResubmit: true,
-					requestDelaySeconds: 3,
-				})
+				// Set up mock state
+				mockProvider.getState = vi.fn().mockResolvedValue({})
 
 				// Mock previous API request message
 				cline.clineMessages = [
@@ -861,7 +855,7 @@ describe("Cline", () => {
 				await iterator.next()
 
 				// Verify delay is only applied for the countdown
-				const baseDelay = 3 // from requestDelaySeconds
+				const baseDelay = 3 // test retry delay
 				const expectedDelayCount = baseDelay // One delay per second for countdown
 				expect(mockDelay).toHaveBeenCalledTimes(expectedDelayCount)
 				expect(mockDelay).toHaveBeenCalledWith(1000) // Each delay should be 1 second
 
@@ -1907,7 +1907,6 @@ export class ClineProvider
 			alwaysAllowMcp,
 			alwaysAllowModeSwitch,
 			alwaysAllowSubtasks,
-			alwaysAllowUpdateTodoList,
 			allowedMaxRequests,
 			allowedMaxCost,
 			autoCondenseContext,
@@ -1941,8 +1940,6 @@ export class ClineProvider
 			fuzzyMatchThreshold,
 			mcpEnabled,
 			enableMcpServerCreation,
-			alwaysApproveResubmit,
-			requestDelaySeconds,
 			currentApiConfigName,
 			listApiConfigMeta,
 			pinnedApiConfigs,
@@ -2043,7 +2040,6 @@ export class ClineProvider
 			alwaysAllowMcp: alwaysAllowMcp ?? false,
 			alwaysAllowModeSwitch: alwaysAllowModeSwitch ?? false,
 			alwaysAllowSubtasks: alwaysAllowSubtasks ?? false,
-			alwaysAllowUpdateTodoList: alwaysAllowUpdateTodoList ?? false,
 			isBrowserSessionActive,
 			allowedMaxRequests,
 			allowedMaxCost,
@@ -2091,8 +2087,6 @@ export class ClineProvider
 			fuzzyMatchThreshold: fuzzyMatchThreshold ?? 1.0,
 			mcpEnabled: mcpEnabled ?? true,
 			enableMcpServerCreation: enableMcpServerCreation ?? true,
-			alwaysApproveResubmit: alwaysApproveResubmit ?? false,
-			requestDelaySeconds: requestDelaySeconds ?? 3,
 			currentApiConfigName: currentApiConfigName ?? "default",
 			listApiConfigMeta: listApiConfigMeta ?? [],
 			pinnedApiConfigs: pinnedApiConfigs ?? {},
@@ -2289,7 +2283,6 @@ export class ClineProvider
 			alwaysAllowModeSwitch: stateValues.alwaysAllowModeSwitch ?? false,
 			alwaysAllowSubtasks: stateValues.alwaysAllowSubtasks ?? false,
 			alwaysAllowFollowupQuestions: stateValues.alwaysAllowFollowupQuestions ?? false,
-			alwaysAllowUpdateTodoList: stateValues.alwaysAllowUpdateTodoList ?? false,
 			isBrowserSessionActive,
 			followupAutoApproveTimeoutMs: stateValues.followupAutoApproveTimeoutMs ?? 60000,
 			diagnosticsEnabled: stateValues.diagnosticsEnabled ?? true,
@@ -2335,8 +2328,6 @@ export class ClineProvider
 			mcpEnabled: stateValues.mcpEnabled ?? true,
 			enableMcpServerCreation: stateValues.enableMcpServerCreation ?? true,
 			mcpServers: this.mcpHub?.getAllServers() ?? [],
-			alwaysApproveResubmit: stateValues.alwaysApproveResubmit ?? false,
-			requestDelaySeconds: Math.max(3, stateValues.requestDelaySeconds ?? 3),
 			currentApiConfigName: stateValues.currentApiConfigName ?? "default",
 			listApiConfigMeta: stateValues.listApiConfigMeta ?? [],
 			pinnedApiConfigs: stateValues.pinnedApiConfigs ?? {},
 
@@ -581,7 +581,6 @@ describe("ClineProvider", () => {
 			fuzzyMatchThreshold: 1.0,
 			mcpEnabled: true,
 			enableMcpServerCreation: false,
-			requestDelaySeconds: 5,
 			mode: defaultModeSlug,
 			customModes: [],
 			experiments: experimentDefault,
@@ -864,27 +863,6 @@ describe("ClineProvider", () => {
 		expect(mockPostMessage).toHaveBeenCalled()
 	})
 
-	test("requestDelaySeconds defaults to 3 seconds", async () => {
-		// Mock globalState.get to return undefined for requestDelaySeconds
-		;(mockContext.globalState.get as any).mockImplementation((key: string) => {
-			if (key === "requestDelaySeconds") {
-				return undefined
-			}
-			return null
-		})
-
-		const state = await provider.getState()
-		expect(state.requestDelaySeconds).toBe(3)
-	})
-
-	test("alwaysApproveResubmit defaults to false", async () => {
-		// Mock globalState.get to return undefined for alwaysApproveResubmit
-		;(mockContext.globalState.get as any).mockReturnValue(undefined)
-
-		const state = await provider.getState()
-		expect(state.alwaysApproveResubmit).toBe(false)
-	})
-
 	test("autoCondenseContext defaults to true", async () => {
 		// Mock globalState.get to return undefined for autoCondenseContext
 		;(mockContext.globalState.get as any).mockImplementation((key: string) =>
@@ -1055,22 +1033,6 @@ describe("ClineProvider", () => {
 		expect((await provider.getState()).showRooIgnoredFiles).toBe(false)
 	})
 
-	test("handles request delay settings messages", async () => {
-		await provider.resolveWebviewView(mockWebviewView)
-		const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
-
-		// Test alwaysApproveResubmit
-		await messageHandler({ type: "updateSettings", updatedSettings: { alwaysApproveResubmit: true } })
-		expect(updateGlobalStateSpy).toHaveBeenCalledWith("alwaysApproveResubmit", true)
-		expect(mockContext.globalState.update).toHaveBeenCalledWith("alwaysApproveResubmit", true)
-		expect(mockPostMessage).toHaveBeenCalled()
-
-		// Test requestDelaySeconds
-		await messageHandler({ type: "updateSettings", updatedSettings: { requestDelaySeconds: 10 } })
-		expect(mockContext.globalState.update).toHaveBeenCalledWith("requestDelaySeconds", 10)
-		expect(mockPostMessage).toHaveBeenCalled()
-	})
-
 	test("handles updatePrompt message correctly", async () => {
 		await provider.resolveWebviewView(mockWebviewView)
 		const messageHandler = (mockWebviewView.webview.onDidReceiveMessage as any).mock.calls[0][0]
 
@@ -265,13 +265,11 @@ export type ExtensionState = Pick<
 	| "alwaysAllowWriteOutsideWorkspace"
 	| "alwaysAllowWriteProtected"
 	| "alwaysAllowBrowser"
-	| "alwaysApproveResubmit"
 	| "alwaysAllowMcp"
 	| "alwaysAllowModeSwitch"
 	| "alwaysAllowSubtasks"
 	| "alwaysAllowFollowupQuestions"
 	| "alwaysAllowExecute"
-	| "alwaysAllowUpdateTodoList"
 	| "followupAutoApproveTimeoutMs"
 	| "allowedCommands"
 	| "deniedCommands"
@@ -324,6 +322,7 @@ export type ExtensionState = Pick<
 	| "includeCurrentTime"
 	| "includeCurrentCost"
 	| "maxGitStatusFiles"
+	| "requestDelaySeconds"
 > & {
 	version: string
 	clineMessages: ClineMessage[]
@@ -336,7 +335,6 @@ export type ExtensionState = Pick<
 	taskHistory: HistoryItem[]
 
 	writeDelayMs: number
-	requestDelaySeconds: number
 
 	enableCheckpoints: boolean
 	checkpointTimeout: number // Timeout for checkpoint initialization in seconds (default: 15)
 
@@ -32,29 +32,17 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
 	const {
 		autoApprovalEnabled,
 		setAutoApprovalEnabled,
-		alwaysApproveResubmit,
 		setAlwaysAllowReadOnly,
 		setAlwaysAllowWrite,
 		setAlwaysAllowExecute,
 		setAlwaysAllowBrowser,
 		setAlwaysAllowMcp,
 		setAlwaysAllowModeSwitch,
 		setAlwaysAllowSubtasks,
-		setAlwaysApproveResubmit,
 		setAlwaysAllowFollowupQuestions,
-		setAlwaysAllowUpdateTodoList,
 	} = useExtensionState()
 
-	const baseToggles = useAutoApprovalToggles()
-
-	// Include alwaysApproveResubmit in addition to the base toggles.
-	const toggles = React.useMemo(
-		() => ({
-			...baseToggles,
-			alwaysApproveResubmit: alwaysApproveResubmit,
-		}),
-		[baseToggles, alwaysApproveResubmit],
-	)
+	const toggles = useAutoApprovalToggles()
 
 	const onAutoApproveToggle = React.useCallback(
 		(key: AutoApproveSetting, value: boolean) => {
@@ -82,15 +70,9 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
 				case "alwaysAllowSubtasks":
 					setAlwaysAllowSubtasks(value)
 					break
-				case "alwaysApproveResubmit":
-					setAlwaysApproveResubmit(value)
-					break
 				case "alwaysAllowFollowupQuestions":
 					setAlwaysAllowFollowupQuestions(value)
 					break
-				case "alwaysAllowUpdateTodoList":
-					setAlwaysAllowUpdateTodoList(value)
-					break
 			}
 
 			// If enabling any option, ensure autoApprovalEnabled is true.
@@ -108,9 +90,7 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
 			setAlwaysAllowMcp,
 			setAlwaysAllowModeSwitch,
 			setAlwaysAllowSubtasks,
-			setAlwaysApproveResubmit,
 			setAlwaysAllowFollowupQuestions,
-			setAlwaysAllowUpdateTodoList,
 			setAutoApprovalEnabled,
 		],
 	)
 
@@ -98,7 +98,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		mode,
 		setMode,
 		alwaysAllowModeSwitch,
-		alwaysAllowUpdateTodoList,
 		customModes,
 		// telemetrySetting,
 		hasSystemPromptOverride,
@@ -1407,9 +1406,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 									tool = { tool: "updateTodoList" }
 								}
 							}
-							if (tool.tool === "updateTodoList" && alwaysAllowUpdateTodoList) {
-								return false
-							}
 							return tool.tool === "updateTodoList" && enableButtons && !!primaryButtonText
 						})()
 					}
@@ -1437,7 +1433,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			showSearch,
 			searchQuery,
 			isFollowUpAutoApprovalPaused,
-			alwaysAllowUpdateTodoList,
 			enableButtons,
 		],
 	)
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro`
`98`	`98`	`mode,`
`99`	`99`	`setMode,`
`100`	`100`	`alwaysAllowModeSwitch,`
`101`		`- alwaysAllowUpdateTodoList,`
`102`	`101`	`customModes,`
`103`	`102`	`// telemetrySetting,`
`104`	`103`	`hasSystemPromptOverride,`
`@@ -1407,9 +1406,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro`
`1407`	`1406`	`tool = { tool: "updateTodoList" }`
`1408`	`1407`	`}`
`1409`	`1408`	`}`
`1410`		`- if (tool.tool === "updateTodoList" && alwaysAllowUpdateTodoList) {`
`1411`		`- return false`
`1412`		`- }`
`1413`	`1409`	`return tool.tool === "updateTodoList" && enableButtons && !!primaryButtonText`
`1414`	`1410`	`})()`
`1415`	`1411`	`}`
`@@ -1437,7 +1433,6 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro`
`1437`	`1433`	`showSearch,`
`1438`	`1434`	`searchQuery,`
`1439`	`1435`	`isFollowUpAutoApprovalPaused,`
`1440`		`- alwaysAllowUpdateTodoList,`
`1441`	`1436`	`enableButtons,`
`1442`	`1437`	`],`
`1443`	`1438`	`)`