Improve chat privacy and draft focus

Add a display-only recent conversation privacy toggle with a keyboard shortcut, preserve queued-message editor caret position during chat updates, and keep new task drafts focused in the chat pane.

Co-Authored-By: Oz <oz-agent@warp.dev>

Author: allquixotic

src/package.json

@@ -3,7 +3,7 @@
 	"displayName": "%extension.displayName%",
 	"description": "%extension.description%",
 	"publisher": "allquixotic",
-	"version": "3.53.17",
+	"version": "3.53.18",
 	"icon": "assets/icons/icon.png",
 	"galleryBanner": {
 		"color": "#617A91",

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

@@ -10,7 +10,15 @@ import { appendImages } from "@src/utils/imageUtils"
 import { getCostBreakdownIfNeeded } from "@src/utils/costFormatting"
 import { batchConsecutive } from "@src/utils/batchConsecutive"
 
-import type { ClineAsk, ClineSayTool, ClineMessage, ExtensionMessage, AudioType } from "@roo-code/types"
+import type {
+	ClineAsk,
+	ClineSayTool,
+	ClineMessage,
+	ExtensionMessage,
+	AudioType,
+	TodoItem,
+	QueuedMessage,
+} from "@roo-code/types"
 import { isRetiredProvider } from "@roo-code/types"
 
 import { findLast } from "@roo/array"
@@ -62,6 +70,12 @@ interface DraftConversation {
 	title: string
 }
 
+const EMPTY_MESSAGES: ClineMessage[] = []
+const EMPTY_TODOS: TodoItem[] = []
+const EMPTY_MESSAGE_QUEUE: QueuedMessage[] = []
+const RECENT_CONVERSATIONS_HIDDEN_STORAGE_KEY = "crc.recentConversationsHidden"
+const RECENT_CONVERSATIONS_TOGGLE_SHORTCUT = "Ctrl+Shift+H"
+
 const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewProps> = ({ isHidden }, ref) => {
 	const [audioBaseUri] = useState(() => {
 		return (window as unknown as { AUDIO_BASE_URI?: string }).AUDIO_BASE_URI || ""
@@ -71,10 +85,10 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 	const modeShortcutText = `${isMac ? "⌘" : "Ctrl"} + . ${t("chat:forNextMode")}, ${isMac ? "⌘" : "Ctrl"} + Shift + . ${t("chat:forPreviousMode")}`
 
 	const {
-		clineMessages: messages,
-		currentTaskId,
-		currentTaskItem,
-		currentTaskTodos,
+		clineMessages: contextMessages,
+		currentTaskId: contextCurrentTaskId,
+		currentTaskItem: contextCurrentTaskItem,
+		currentTaskTodos: contextCurrentTaskTodos,
 		activeConversations = [],
 		taskHistory,
 		apiConfiguration,
@@ -85,12 +99,34 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		customModes,
 		soundEnabled,
 		soundVolume,
-		messageQueue = [],
+		messageQueue: contextMessageQueue = EMPTY_MESSAGE_QUEUE,
 		showWorktreesInHomeScreen,
 		currentAskDecision,
 	} = useExtensionState()
 	const [draftConversations, setDraftConversations] = useState<DraftConversation[]>([])
 	const [selectedDraftId, setSelectedDraftId] = useState<string | undefined>(undefined)
+	const [areRecentConversationsHidden, setAreRecentConversationsHidden] = useState(() => {
+		try {
+			return window.localStorage.getItem(RECENT_CONVERSATIONS_HIDDEN_STORAGE_KEY) === "true"
+		} catch {
+			return false
+		}
+	})
+	const isDraftSelected = selectedDraftId !== undefined
+	const messages = useMemo(
+		() => (isDraftSelected ? EMPTY_MESSAGES : contextMessages),
+		[contextMessages, isDraftSelected],
+	)
+	const currentTaskId = isDraftSelected ? undefined : contextCurrentTaskId
+	const currentTaskItem = isDraftSelected ? undefined : contextCurrentTaskItem
+	const currentTaskTodos = useMemo(
+		() => (isDraftSelected ? EMPTY_TODOS : contextCurrentTaskTodos),
+		[contextCurrentTaskTodos, isDraftSelected],
+	)
+	const messageQueue = useMemo(
+		() => (isDraftSelected ? EMPTY_MESSAGE_QUEUE : contextMessageQueue),
+		[contextMessageQueue, isDraftSelected],
+	)
 
 	const visibleConversationIds = useMemo(
 		() =>
@@ -112,6 +148,17 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 	}, [selectedDraftId, visibleConversationIds])
 
 	const selectedConversationId = selectedDraftId ?? currentTaskId
+	const toggleRecentConversationsVisibility = useCallback(() => {
+		setAreRecentConversationsHidden((prev) => {
+			const next = !prev
+			try {
+				window.localStorage.setItem(RECENT_CONVERSATIONS_HIDDEN_STORAGE_KEY, String(next))
+			} catch {
+				// Ignore storage failures; the in-memory display toggle still works.
+			}
+			return next
+		})
+	}, [])
 
 	const conversations = useMemo<ConversationListItem[]>(() => {
 		const draftItems = draftConversations
@@ -785,7 +832,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				// Mark that user has responded - this prevents any pending auto-approvals.
 				userRespondedRef.current = true
 
-				if (messagesRef.current.length === 0) {
+				if (selectedDraftId || messagesRef.current.length === 0) {
 					vscode.postMessage({ type: "newTask", taskId: selectedDraftId, text, images })
 				} else if (clineAskRef.current) {
 					if (clineAskRef.current === "followup") {
@@ -885,20 +932,41 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 		},
 		[inputValue, selectedImages],
 	)
-
-	const startNewTask = useCallback(() => {
-		const draftId = `draft-${typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID() : Date.now().toString(36)}`
+	const resetDraftSelectionState = useCallback(() => {
 		setShowRetiredProviderWarning(false)
 		setInputValue("")
 		setSelectedImages([])
+		setSendingDisabled(false)
+		setClineAsk(undefined)
+		setEnableButtons(false)
+		setPrimaryButtonText(undefined)
+		setSecondaryButtonText(undefined)
+		setDidClickCancel(false)
+		setExpandedRows({})
+		setCurrentFollowUpTs(null)
+		setCheckpointWarning(undefined)
+		everVisibleMessagesTsRef.current.clear()
+
+		if (autoApproveTimeoutRef.current) {
+			clearTimeout(autoApproveTimeoutRef.current)
+			autoApproveTimeoutRef.current = null
+		}
+
+		userRespondedRef.current = false
+	}, [])
+
+	const startNewTask = useCallback(() => {
+		const draftId = `draft-${typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? crypto.randomUUID() : Date.now().toString(36)}`
+		resetDraftSelectionState()
 		setSelectedDraftId(draftId)
 		setDraftConversations((prev) => [{ id: draftId, ts: Date.now(), title: "New conversation" }, ...prev])
 		vscode.postMessage({ type: "clearTask" })
-	}, [])
+	}, [resetDraftSelectionState])
 
 	const handleSelectConversation = useCallback(
 		(conversation: ConversationListItem) => {
 			if (conversation.kind === "draft") {
+				resetDraftSelectionState()
 				setSelectedDraftId(conversation.activeTaskId)
 				if (currentTaskId) {
 					vscode.postMessage({ type: "clearTask" })
@@ -909,7 +977,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 			setSelectedDraftId(undefined)
 			vscode.postMessage({ type: "showTaskWithId", text: conversation.activeTaskId })
 		},
-		[currentTaskId],
+		[currentTaskId, resetDraftSelectionState],
 	)
 
 	const handleDeleteConversation = useCallback((conversation: ConversationListItem) => {
@@ -983,6 +1051,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 						)
 					if (isCompletedSubtaskForClick) {
 						startNewTask()
+						return
 					} else {
 						// Only send text/images if they exist
 						if (trimmedInput || (images && images.length > 0)) {
@@ -1009,7 +1078,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				case "resume_completed_task":
 					// Waiting for feedback, but we can just present a new task button
 					startNewTask()
-					break
+					return
 				case "command_output":
 					vscode.postMessage({
 						type: "terminalOperation",
@@ -1046,7 +1115,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				case "mistake_limit_reached":
 				case "resume_task":
 					startNewTask()
-					break
+					return
 				case "command":
 				case "tool":
 				case "use_mcp_server":
@@ -1762,6 +1831,11 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 	// (PageUp, Home, ArrowUp) is handled by useScrollLifecycle.
 	const handleKeyDown = useCallback(
 		(event: KeyboardEvent) => {
+			if (event.ctrlKey && event.shiftKey && !event.altKey && !event.metaKey && event.key.toLowerCase() === "h") {
+				event.preventDefault()
+				toggleRecentConversationsVisibility()
+				return
+			}
 			if ((event.metaKey || event.ctrlKey) && event.key === ".") {
 				event.preventDefault()
 				if (event.shiftKey) {
@@ -1771,7 +1845,7 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 				}
 			}
 		},
-		[switchToNextMode, switchToPreviousMode],
+		[switchToNextMode, switchToPreviousMode, toggleRecentConversationsVisibility],
 	)
 
 	useEffect(() => {
@@ -1877,7 +1951,40 @@ const ChatViewComponent: React.ForwardRefRenderFunction<ChatViewRef, ChatViewPro
 									{/* Show RooTips when authenticated or when user is new */}
 									{taskHistory.length < 6 && <RooTips />}
 									{/* Everyone should see their task history if any */}
-									{taskHistory.length > 0 && <HistoryPreview />}
+									{taskHistory.length > 0 && (
+										<div className="flex flex-col gap-2">
+											<div className="flex justify-end">
+												<Button
+													variant="secondary"
+													size="sm"
+													className="h-7 px-2 text-xs"
+													onClick={toggleRecentConversationsVisibility}
+													aria-label={
+														areRecentConversationsHidden
+															? `Show recent conversations (${RECENT_CONVERSATIONS_TOGGLE_SHORTCUT})`
+															: `Hide recent conversations (${RECENT_CONVERSATIONS_TOGGLE_SHORTCUT})`
+													}>
+													{areRecentConversationsHidden
+														? "Show recent conversations"
+														: "Hide recent conversations"}
+													<span className="ml-2 text-[10px] opacity-70">
+														{RECENT_CONVERSATIONS_TOGGLE_SHORTCUT}
+													</span>
+												</Button>
+											</div>
+											{areRecentConversationsHidden ? (
+												<div
+													className="rounded-md border border-vscode-editorGroup-border bg-vscode-editor-background/60 px-3 py-2 text-sm text-vscode-descriptionForeground"
+													data-testid="recent-conversations-hidden">
+													Recent conversations are hidden for privacy. Your history is still
+													saved; use the button or {RECENT_CONVERSATIONS_TOGGLE_SHORTCUT} to
+													show it again.
+												</div>
+											) : (
+												<HistoryPreview />
+											)}
+										</div>
+									)}
 								</div>
 							</div>
 						</div>

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

@@ -1,4 +1,4 @@
-import { useState } from "react"
+import { useLayoutEffect, useRef, useState } from "react"
 import { useTranslation } from "react-i18next"
 
 import { QueuedMessage } from "@roo-code/types"
@@ -14,6 +14,51 @@ interface QueuedMessagesProps {
 	onRemove: (messageId: string) => void
 	onUpdate: (message: QueuedMessage, updates: { text?: string; deliveryMode?: QueuedMessage["deliveryMode"] }) => void
 }
+interface QueuedMessageEditorProps {
+	value: string
+	onChange: (value: string) => void
+	onSave: () => void
+	onCancel: () => void
+	placeholder: string
+	rows: number
+}
+
+const QueuedMessageEditor = ({ value, onChange, onSave, onCancel, placeholder, rows }: QueuedMessageEditorProps) => {
+	const textareaRef = useRef<HTMLTextAreaElement | null>(null)
+	const didPlaceInitialCaretRef = useRef(false)
+
+	useLayoutEffect(() => {
+		if (didPlaceInitialCaretRef.current || !textareaRef.current) {
+			return
+		}
+
+		didPlaceInitialCaretRef.current = true
+		const textarea = textareaRef.current
+		textarea.focus()
+		textarea.setSelectionRange(textarea.value.length, textarea.value.length)
+	}, [])
+
+	return (
+		<textarea
+			ref={textareaRef}
+			value={value}
+			onChange={(e) => onChange(e.target.value)}
+			onBlur={onSave}
+			onKeyDown={(e) => {
+				if (e.key === "Enter" && !e.shiftKey) {
+					e.preventDefault()
+					onSave()
+				}
+				if (e.key === "Escape") {
+					onCancel()
+				}
+			}}
+			className="w-full bg-vscode-input-background text-vscode-input-foreground border border-vscode-input-border rounded px-2 py-1 resize-none focus:outline-0 focus:ring-1 focus:ring-vscode-focusBorder"
+			placeholder={placeholder}
+			rows={rows}
+		/>
+	)
+}
 
 export const QueuedMessages = ({ queue, onRemove, onUpdate }: QueuedMessagesProps) => {
 	const { t } = useTranslation("chat")
@@ -37,6 +82,9 @@ export const QueuedMessages = ({ queue, onRemove, onUpdate }: QueuedMessagesProp
 		onUpdate(message, { text: newValue })
 		setEditState(message.id, false)
 	}
+	const handleCancelEdit = (message: QueuedMessage) => {
+		setEditState(message.id, false, message.text)
+	}
 
 	const renderLane = (
 		title: string,
@@ -75,30 +123,12 @@ export const QueuedMessages = ({ queue, onRemove, onUpdate }: QueuedMessagesProp
 											</span>
 										</div>
 										{editState.isEditing ? (
-											<textarea
-												ref={(textarea) => {
-													if (textarea) {
-														textarea.setSelectionRange(
-															textarea.value.length,
-															textarea.value.length,
-														)
-													}
-												}}
+											<QueuedMessageEditor
 												value={editState.value}
-												onChange={(e) => setEditState(message.id, true, e.target.value)}
-												onBlur={() => handleSaveEdit(message, editState.value)}
-												onKeyDown={(e) => {
-													if (e.key === "Enter" && !e.shiftKey) {
-														e.preventDefault()
-														handleSaveEdit(message, editState.value)
-													}
-													if (e.key === "Escape") {
-														setEditState(message.id, false, message.text)
-													}
-												}}
-												className="w-full bg-vscode-input-background text-vscode-input-foreground border border-vscode-input-border rounded px-2 py-1 resize-none focus:outline-0 focus:ring-1 focus:ring-vscode-focusBorder"
+												onChange={(value) => setEditState(message.id, true, value)}
+												onSave={() => handleSaveEdit(message, editState.value)}
+												onCancel={() => handleCancelEdit(message)}
 												placeholder={t("chat:editMessage.placeholder")}
-												autoFocus
 												rows={Math.min(editState.value.split("\n").length, 10)}
 											/>
 										) : (