issue #685 - point 8 - Allow disabling the follow-up auto-select timer

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

@@ -36,14 +36,15 @@ export const FollowUpSuggest = ({
 	// Start countdown timer when auto-approval is enabled for follow-up questions
 	useEffect(() => {
 		// Only start countdown if auto-approval is enabled for follow-up questions and no suggestion has been selected
-		// Also stop countdown if the question has been answered or auto-approval is paused (user is typing)
+		// Also stop countdown if the question has been answered or auto-approval is paused (user is typing) or timer is disabled (set to 0)
 		if (
 			autoApprovalEnabled &&
 			alwaysAllowFollowupQuestions &&
 			suggestions.length > 0 &&
 			!suggestionSelected &&
 			!isAnswered &&
-			!isFollowUpAutoApprovalPaused
+			!isFollowUpAutoApprovalPaused &&
+			(followupAutoApproveTimeoutMs ?? DEFAULT_FOLLOWUP_TIMEOUT_MS) > 0
 		) {
 			// Start with the configured timeout in seconds
 			const timeoutMs =

webview-ui/src/components/chat/__tests__/FollowUpSuggest.spec.tsx

@@ -74,6 +74,13 @@ describe("FollowUpSuggest", () => {
 		followupAutoApproveTimeoutMs: 3000, // 3 seconds for testing
 	}
 
+	// Test state with timeout disabled (0)
+	const disabledTimeoutState: TestExtensionState = {
+		autoApprovalEnabled: true,
+		alwaysAllowFollowupQuestions: true,
+		followupAutoApproveTimeoutMs: 0, // Disabled
+	}
+
 	beforeEach(() => {
 		vi.clearAllMocks()
 		vi.useFakeTimers()
@@ -218,6 +225,22 @@ describe("FollowUpSuggest", () => {
 		expect(screen.queryByText(/\d+s/)).not.toBeInTheDocument()
 	})
 
+	// Should not show countdown when timeout is disabled (set to 0)
+	it("should not show countdown when timeout is disabled (set to 0)", () => {
+		renderWithTestProviders(
+			<FollowUpSuggest
+				suggestions={mockSuggestions}
+				onSuggestionClick={mockOnSuggestionClick}
+				ts={1}
+				onCancelAutoApproval={mockOnCancelAutoApproval}
+			/>,
+			disabledTimeoutState,
+		)
+
+		// Should not show countdown when timeout is disabled
+		expect(screen.queryByText(/\d+s/)).not.toBeInTheDocument()
+	})
+
 	it("should not render when no suggestions are provided", () => {
 		const { container } = renderWithTestProviders(
 			<FollowUpSuggest

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

@@ -254,7 +254,7 @@ export const AutoApproveSettings = ({
 							label={t("settings:autoApprove.followupQuestions.timeoutLabel")}>
 							<div className="flex items-center gap-2">
 								<Slider
-									min={1000}
+									min={0}
 									max={300000}
 									step={1000}
 									value={[followupAutoApproveTimeoutMs]}
@@ -263,7 +263,11 @@ export const AutoApproveSettings = ({
 									}
 									data-testid="followup-timeout-slider"
 								/>
-								<span className="w-20">{followupAutoApproveTimeoutMs / 1000}s</span>
+								<span className="w-20">
+									{followupAutoApproveTimeoutMs === 0
+										? "Disabled"
+										: `${followupAutoApproveTimeoutMs / 1000}s`}
+								</span>
 							</div>
 							<div className="text-vscode-descriptionForeground text-sm mt-1">
 								{t("settings:autoApprove.followupQuestions.timeoutLabel")}