From f477ed8cacc990beb5b194883859d0901227f7e1 Mon Sep 17 00:00:00 2001
From: Let Me Duck You <race-relish-stick@duck.com>
Date: Sat, 5 Jul 2025 12:12:03 +0600
Subject: [PATCH 1/3] feat: Add setting to show all workspace tasks by
 preference

---
 packages/types/src/global-settings.ts         |  1 +
 src/core/webview/ClineProvider.ts             |  3 ++
 .../webview/__tests__/ClineProvider.spec.ts   |  1 +
 src/core/webview/webviewMessageHandler.ts     |  5 +++
 src/shared/ExtensionMessage.ts                |  2 ++
 src/shared/WebviewMessage.ts                  |  1 +
 .../src/components/history/HistoryView.tsx    | 21 ++++++++----
 .../history/__tests__/useTaskSearch.spec.tsx  | 24 +++++++-------
 .../src/components/history/useTaskSearch.ts   | 11 +++----
 .../components/settings/GeneralSettings.tsx   | 33 +++++++++++++++++++
 .../src/components/settings/SettingsView.tsx  | 22 +++++++++++++
 .../src/context/ExtensionStateContext.tsx     |  5 +++
 .../__tests__/ExtensionStateContext.spec.tsx  |  3 +-
 webview-ui/src/i18n/locales/ca/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/de/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/en/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/es/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/fr/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/hi/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/id/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/it/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/ja/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/ko/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/nl/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/pl/settings.json  |  7 ++++
 .../src/i18n/locales/pt-BR/settings.json      |  7 ++++
 webview-ui/src/i18n/locales/ru/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/tr/settings.json  |  7 ++++
 webview-ui/src/i18n/locales/vi/settings.json  |  7 ++++
 .../src/i18n/locales/zh-CN/settings.json      |  7 ++++
 .../src/i18n/locales/zh-TW/settings.json      |  9 ++++-
 31 files changed, 235 insertions(+), 25 deletions(-)
 create mode 100644 webview-ui/src/components/settings/GeneralSettings.tsx

diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts
index 6a0dda1cf2..01037dd102 100644
--- a/packages/types/src/global-settings.ts
+++ b/packages/types/src/global-settings.ts
@@ -27,6 +27,7 @@ export const globalSettingsSchema = z.object({
 	lastShownAnnouncementId: z.string().optional(),
 	customInstructions: z.string().optional(),
 	taskHistory: z.array(historyItemSchema).optional(),
+	showAllWorkspacesTasks: z.boolean().optional(),
 
 	condensingApiConfigId: z.string().optional(),
 	customCondensingPrompt: z.string().optional(),
diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts
index d8aca8fbcb..3b87c44c79 100644
--- a/src/core/webview/ClineProvider.ts
+++ b/src/core/webview/ClineProvider.ts
@@ -1408,6 +1408,7 @@ export class ClineProvider
 			profileThresholds,
 			alwaysAllowFollowupQuestions,
 			followupAutoApproveTimeoutMs,
+			showAllWorkspacesTasks,
 		} = await this.getState()
 
 		const telemetryKey = process.env.POSTHOG_API_KEY
@@ -1520,6 +1521,7 @@ export class ClineProvider
 			hasOpenedModeSelector: this.getGlobalState("hasOpenedModeSelector") ?? false,
 			alwaysAllowFollowupQuestions: alwaysAllowFollowupQuestions ?? false,
 			followupAutoApproveTimeoutMs: followupAutoApproveTimeoutMs ?? 60000,
+			showAllWorkspacesTasks: showAllWorkspacesTasks ?? false,
 		}
 	}
 
@@ -1672,6 +1674,7 @@ export class ClineProvider
 				codebaseIndexEmbedderModelId: "",
 			},
 			profileThresholds: stateValues.profileThresholds ?? {},
+			showAllWorkspacesTasks: stateValues.showAllWorkspacesTasks ?? false,
 		}
 	}
 
diff --git a/src/core/webview/__tests__/ClineProvider.spec.ts b/src/core/webview/__tests__/ClineProvider.spec.ts
index 801c6c4774..c7f45a1e07 100644
--- a/src/core/webview/__tests__/ClineProvider.spec.ts
+++ b/src/core/webview/__tests__/ClineProvider.spec.ts
@@ -491,6 +491,7 @@ describe("ClineProvider", () => {
 			version: "1.0.0",
 			clineMessages: [],
 			taskHistory: [],
+			showAllWorkspacesTasks: false,
 			shouldShowAnnouncement: false,
 			apiConfiguration: {
 				apiProvider: "openrouter",
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
index 1828e8ab5b..5ad2d3afa2 100644
--- a/src/core/webview/webviewMessageHandler.ts
+++ b/src/core/webview/webviewMessageHandler.ts
@@ -2060,5 +2060,10 @@ export const webviewMessageHandler = async (
 			}
 			break
 		}
+
+		case "showAllWorkspacesTasks":
+			await updateGlobalState("showAllWorkspacesTasks", message.bool ?? false)
+			await provider.postStateToWebview()
+			break
 	}
 }
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
index 9db0889c88..ffd8203f33 100644
--- a/src/shared/ExtensionMessage.ts
+++ b/src/shared/ExtensionMessage.ts
@@ -105,6 +105,7 @@ export interface ExtensionMessage {
 		| "shareTaskSuccess"
 		| "codeIndexSettingsSaved"
 		| "codeIndexSecretStatus"
+		| "showAllWorkspacesTasks"
 	text?: string
 	payload?: any // Add a generic payload for now, can refine later
 	action?:
@@ -230,6 +231,7 @@ export type ExtensionState = Pick<
 	version: string
 	clineMessages: ClineMessage[]
 	currentTaskItem?: HistoryItem
+	showAllWorkspacesTasks: boolean
 	apiConfiguration?: ProviderSettings
 	uriScheme?: string
 	shouldShowAnnouncement: boolean
diff --git a/src/shared/WebviewMessage.ts b/src/shared/WebviewMessage.ts
index c8a787c1f2..bb1df3e809 100644
--- a/src/shared/WebviewMessage.ts
+++ b/src/shared/WebviewMessage.ts
@@ -185,6 +185,7 @@ export interface WebviewMessage {
 		| "checkRulesDirectoryResult"
 		| "saveCodeIndexSettingsAtomic"
 		| "requestCodeIndexSecretStatus"
+		| "showAllWorkspacesTasks"
 	text?: string
 	tab?: "settings" | "history" | "mcp" | "modes" | "chat" | "marketplace" | "account"
 	disabled?: boolean
diff --git a/webview-ui/src/components/history/HistoryView.tsx b/webview-ui/src/components/history/HistoryView.tsx
index 2f156d0418..001fcddb25 100644
--- a/webview-ui/src/components/history/HistoryView.tsx
+++ b/webview-ui/src/components/history/HistoryView.tsx
@@ -1,4 +1,6 @@
 import React, { memo, useState } from "react"
+
+import { vscode } from "@/utils/vscode"
 import { DeleteTaskDialog } from "./DeleteTaskDialog"
 import { BatchDeleteTaskDialog } from "./BatchDeleteTaskDialog"
 import { Virtuoso } from "react-virtuoso"
@@ -35,8 +37,8 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 		sortOption,
 		setSortOption,
 		setLastNonRelevantSort,
-		showAllWorkspaces,
-		setShowAllWorkspaces,
+		showAllWorkspacesTasks,
+		setShowAllWorkspacesTasks,
 	} = useTaskSearch()
 	const { t } = useAppTranslation()
 
@@ -129,12 +131,19 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 					</VSCodeTextField>
 					<div className="flex gap-2">
 						<Select
-							value={showAllWorkspaces ? "all" : "current"}
-							onValueChange={(value) => setShowAllWorkspaces(value === "all")}>
+							value={showAllWorkspacesTasks ? "all" : "current"}
+							onValueChange={(value) => {
+								const showAll = value === "all"
+								setShowAllWorkspacesTasks(showAll)
+								vscode.postMessage({
+									type: "showAllWorkspacesTasks",
+									bool: showAll,
+								})
+							}}>
 							<SelectTrigger className="flex-1">
 								<SelectValue>
 									{t("history:workspace.prefix")}{" "}
-									{t(`history:workspace.${showAllWorkspaces ? "all" : "current"}`)}
+									{t(`history:workspace.${showAllWorkspacesTasks ? "all" : "current"}`)}
 								</SelectValue>
 							</SelectTrigger>
 							<SelectContent>
@@ -238,7 +247,7 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 							key={item.id}
 							item={item}
 							variant="full"
-							showWorkspace={showAllWorkspaces}
+							showWorkspace={showAllWorkspacesTasks}
 							isSelectionMode={isSelectionMode}
 							isSelected={selectedTaskIds.includes(item.id)}
 							onToggleSelection={toggleTaskSelection}
diff --git a/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx b/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx
index bea79814fa..ced3519085 100644
--- a/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx
+++ b/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx
@@ -57,6 +57,8 @@ describe("useTaskSearch", () => {
 		mockUseExtensionState.mockReturnValue({
 			taskHistory: mockTaskHistory,
 			cwd: "/workspace/project1",
+			showAllWorkspacesTasks: false,
+			setShowAllWorkspacesTasks: vi.fn(),
 		} as any)
 	})
 
@@ -75,22 +77,22 @@ describe("useTaskSearch", () => {
 		expect(result.current.tasks.every((task) => task.workspace === "/workspace/project1")).toBe(true)
 	})
 
-	it("shows all workspaces when showAllWorkspaces is true", () => {
+	it("shows all workspaces when showAllWorkspacesTasks is true", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 		})
 
 		expect(result.current.tasks).toHaveLength(3)
-		expect(result.current.showAllWorkspaces).toBe(true)
+		expect(result.current.showAllWorkspacesTasks).toBe(true)
 	})
 
 	it("sorts by newest by default", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 		})
 
 		expect(result.current.sortOption).toBe("newest")
@@ -103,7 +105,7 @@ describe("useTaskSearch", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSortOption("oldest")
 		})
 
@@ -116,7 +118,7 @@ describe("useTaskSearch", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSortOption("mostExpensive")
 		})
 
@@ -129,7 +131,7 @@ describe("useTaskSearch", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSortOption("mostTokens")
 		})
 
@@ -145,7 +147,7 @@ describe("useTaskSearch", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSearchQuery("React")
 		})
 
@@ -252,7 +254,7 @@ describe("useTaskSearch", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 		})
 
 		// Should only include tasks with both ts and task content
@@ -264,7 +266,7 @@ describe("useTaskSearch", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSearchQuery("nonexistent")
 		})
 
@@ -275,7 +277,7 @@ describe("useTaskSearch", () => {
 		const { result } = renderHook(() => useTaskSearch())
 
 		act(() => {
-			result.current.setShowAllWorkspaces(true)
+			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSearchQuery("test")
 			result.current.setSortOption("mostRelevant")
 		})
diff --git a/webview-ui/src/components/history/useTaskSearch.ts b/webview-ui/src/components/history/useTaskSearch.ts
index 3969985b98..faf3e73408 100644
--- a/webview-ui/src/components/history/useTaskSearch.ts
+++ b/webview-ui/src/components/history/useTaskSearch.ts
@@ -7,11 +7,10 @@ import { useExtensionState } from "@/context/ExtensionStateContext"
 type SortOption = "newest" | "oldest" | "mostExpensive" | "mostTokens" | "mostRelevant"
 
 export const useTaskSearch = () => {
-	const { taskHistory, cwd } = useExtensionState()
+	const { taskHistory, cwd, showAllWorkspacesTasks, setShowAllWorkspacesTasks } = useExtensionState()
 	const [searchQuery, setSearchQuery] = useState("")
 	const [sortOption, setSortOption] = useState<SortOption>("newest")
 	const [lastNonRelevantSort, setLastNonRelevantSort] = useState<SortOption | null>("newest")
-	const [showAllWorkspaces, setShowAllWorkspaces] = useState(false)
 
 	useEffect(() => {
 		if (searchQuery && sortOption !== "mostRelevant" && !lastNonRelevantSort) {
@@ -25,11 +24,11 @@ export const useTaskSearch = () => {
 
 	const presentableTasks = useMemo(() => {
 		let tasks = taskHistory.filter((item) => item.ts && item.task)
-		if (!showAllWorkspaces) {
+		if (!showAllWorkspacesTasks) {
 			tasks = tasks.filter((item) => item.workspace === cwd)
 		}
 		return tasks
-	}, [taskHistory, showAllWorkspaces, cwd])
+	}, [taskHistory, showAllWorkspacesTasks, cwd])
 
 	const fzf = useMemo(() => {
 		return new Fzf(presentableTasks, {
@@ -86,7 +85,7 @@ export const useTaskSearch = () => {
 		setSortOption,
 		lastNonRelevantSort,
 		setLastNonRelevantSort,
-		showAllWorkspaces,
-		setShowAllWorkspaces,
+		showAllWorkspacesTasks,
+		setShowAllWorkspacesTasks,
 	}
 }
diff --git a/webview-ui/src/components/settings/GeneralSettings.tsx b/webview-ui/src/components/settings/GeneralSettings.tsx
new file mode 100644
index 0000000000..d4111c6458
--- /dev/null
+++ b/webview-ui/src/components/settings/GeneralSettings.tsx
@@ -0,0 +1,33 @@
+import { VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react"
+import { useAppTranslation } from "@src/i18n/TranslationContext"
+
+import { ExtensionStateContextType } from "@/context/ExtensionStateContext"
+import { SetCachedStateField } from "./types"
+import { Section } from "./Section"
+
+type GeneralProps = {
+	showAllWorkspacesTasks: boolean
+	setCachedStateField: SetCachedStateField<keyof ExtensionStateContextType>
+}
+
+export const GeneralSettings = ({ showAllWorkspacesTasks, setCachedStateField }: GeneralProps) => {
+	const { t } = useAppTranslation()
+
+	return (
+		<Section>
+			<div>
+				<VSCodeCheckbox
+					checked={showAllWorkspacesTasks}
+					onChange={(e) => {
+						const checked = (e.target as HTMLInputElement).checked
+						setCachedStateField("showAllWorkspacesTasks", checked)
+					}}>
+					<span className="font-medium">{t("settings:general.showAllWorkspacesTasks.label")}</span>
+				</VSCodeCheckbox>
+				<div className="text-vscode-descriptionForeground text-sm mt-1">
+					{t("settings:general.showAllWorkspacesTasks.description")}
+				</div>
+			</div>
+		</Section>
+	)
+}
diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx
index 3ece8146af..c118492003 100644
--- a/webview-ui/src/components/settings/SettingsView.tsx
+++ b/webview-ui/src/components/settings/SettingsView.tsx
@@ -23,6 +23,7 @@ import {
 	Info,
 	MessageSquare,
 	LucideIcon,
+	Settings2,
 } from "lucide-react"
 
 import type { ProviderSettings, ExperimentId } from "@roo-code/types"
@@ -65,6 +66,7 @@ import { LanguageSettings } from "./LanguageSettings"
 import { About } from "./About"
 import { Section } from "./Section"
 import PromptsSettings from "./PromptsSettings"
+import { GeneralSettings } from "./GeneralSettings"
 import { cn } from "@/lib/utils"
 
 export const settingsTabsContainer = "flex flex-1 overflow-hidden [&.narrow_.tab-label]:hidden"
@@ -79,6 +81,7 @@ export interface SettingsViewRef {
 }
 
 const sectionNames = [
+	"general",
 	"providers",
 	"autoApprove",
 	"browser",
@@ -176,6 +179,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 		profileThresholds,
 		alwaysAllowFollowupQuestions,
 		followupAutoApproveTimeoutMs,
+		showAllWorkspacesTasks,
 	} = cachedState
 
 	const apiConfiguration = useMemo(() => cachedState.apiConfiguration ?? {}, [cachedState.apiConfiguration])
@@ -320,6 +324,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 			vscode.postMessage({ type: "updateSupportPrompt", values: customSupportPrompts || {} })
 			vscode.postMessage({ type: "upsertApiConfiguration", text: currentApiConfigName, apiConfiguration })
 			vscode.postMessage({ type: "telemetrySetting", text: telemetrySetting })
+			vscode.postMessage({ type: "showAllWorkspacesTasks", bool: showAllWorkspacesTasks })
 			if (codebaseIndexConfig) {
 				vscode.postMessage({ type: "codebaseIndexEnabled", bool: codebaseIndexConfig.codebaseIndexEnabled })
 			}
@@ -393,6 +398,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 
 	const sections: { id: SectionName; icon: LucideIcon }[] = useMemo(
 		() => [
+			{ id: "general", icon: Settings2 },
 			{ id: "providers", icon: Webhook },
 			{ id: "autoApprove", icon: CheckCheck },
 			{ id: "browser", icon: SquareMousePointer },
@@ -540,6 +546,22 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 
 				{/* Content area */}
 				<TabContent className="p-0 flex-1 overflow-auto">
+					{activeTab === "general" && (
+						<div>
+							<SectionHeader>
+								<div className="flex items-center gap-2">
+									<Settings2 className="w-4" />
+									<div>{t("settings:sections.general")}</div>
+								</div>
+							</SectionHeader>
+							<Section>
+								<GeneralSettings
+									showAllWorkspacesTasks={showAllWorkspacesTasks}
+									setCachedStateField={setCachedStateField}
+								/>
+							</Section>
+						</div>
+					)}
 					{/* Providers Section */}
 					{activeTab === "providers" && (
 						<div>
diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx
index ea3c6208d7..214abb65bc 100644
--- a/webview-ui/src/context/ExtensionStateContext.tsx
+++ b/webview-ui/src/context/ExtensionStateContext.tsx
@@ -129,6 +129,8 @@ export interface ExtensionStateContextType extends ExtensionState {
 	autoCondenseContextPercent: number
 	setAutoCondenseContextPercent: (value: number) => void
 	routerModels?: RouterModels
+	showAllWorkspacesTasks: boolean
+	setShowAllWorkspacesTasks: (value: boolean) => void
 }
 
 export const ExtensionStateContext = createContext<ExtensionStateContextType | undefined>(undefined)
@@ -219,6 +221,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 			codebaseIndexEmbedderModelId: "",
 		},
 		codebaseIndexModels: { ollama: {}, openai: {} },
+		showAllWorkspacesTasks: false,
 	})
 
 	const [didHydrateState, setDidHydrateState] = useState(false)
@@ -457,6 +460,8 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode
 		setCustomCondensingPrompt: (value) =>
 			setState((prevState) => ({ ...prevState, customCondensingPrompt: value })),
 		setProfileThresholds: (value) => setState((prevState) => ({ ...prevState, profileThresholds: value })),
+		setShowAllWorkspacesTasks: (value) =>
+			setState((prevState) => ({ ...prevState, showAllWorkspacesTasks: value })),
 	}
 
 	return <ExtensionStateContext.Provider value={contextValue}>{children}</ExtensionStateContext.Provider>
diff --git a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx
index 1e5867d3fc..cbc000e44e 100644
--- a/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx
+++ b/webview-ui/src/context/__tests__/ExtensionStateContext.spec.tsx
@@ -208,7 +208,8 @@ describe("mergeExtensionState", () => {
 			cloudIsAuthenticated: false,
 			sharingEnabled: false,
 			profileThresholds: {},
-			hasOpenedModeSelector: false, // Add the new required property
+			hasOpenedModeSelector: false,
+			showAllWorkspacesTasks: false, // Add the new required property
 		}
 
 		const prevState: ExtensionState = {
diff --git a/webview-ui/src/i18n/locales/ca/settings.json b/webview-ui/src/i18n/locales/ca/settings.json
index 325f4c4f0f..0cb886e08a 100644
--- a/webview-ui/src/i18n/locales/ca/settings.json
+++ b/webview-ui/src/i18n/locales/ca/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Descartar canvis"
 	},
 	"sections": {
+		"general": "General",
 		"providers": "Proveïdors",
 		"autoApprove": "Auto-aprovació",
 		"browser": "Accés a l'ordinador",
@@ -33,6 +34,12 @@
 		"language": "Idioma",
 		"about": "Sobre Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Mostrar totes les tasques",
+			"description": "Mostrar tasques de tots els projectes en lloc de només l'actual"
+		}
+	},
 	"prompts": {
 		"description": "Configura les indicacions de suport utilitzades per a accions ràpides com millorar indicacions, explicar codi i solucionar problemes. Aquestes indicacions ajuden Roo a proporcionar millor assistència per a tasques comunes de desenvolupament."
 	},
diff --git a/webview-ui/src/i18n/locales/de/settings.json b/webview-ui/src/i18n/locales/de/settings.json
index 045b9b5739..89b2c15354 100644
--- a/webview-ui/src/i18n/locales/de/settings.json
+++ b/webview-ui/src/i18n/locales/de/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Änderungen verwerfen"
 	},
 	"sections": {
+		"general": "Allgemein",
 		"providers": "Anbieter",
 		"autoApprove": "Auto-Genehmigung",
 		"browser": "Computerzugriff",
@@ -33,6 +34,12 @@
 		"language": "Sprache",
 		"about": "Über Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Alle Aufgaben anzeigen",
+			"description": "Aufgaben aus allen Projekten statt nur dem aktuellen anzeigen"
+		}
+	},
 	"prompts": {
 		"description": "Konfiguriere Support-Prompts, die für schnelle Aktionen wie das Verbessern von Prompts, das Erklären von Code und das Beheben von Problemen verwendet werden. Diese Prompts helfen Roo dabei, bessere Unterstützung für häufige Entwicklungsaufgaben zu bieten."
 	},
diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json
index 4beebbda0d..f6441829be 100644
--- a/webview-ui/src/i18n/locales/en/settings.json
+++ b/webview-ui/src/i18n/locales/en/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Discard changes"
 	},
 	"sections": {
+		"general": "General",
 		"providers": "Providers",
 		"autoApprove": "Auto-Approve",
 		"browser": "Browser",
@@ -33,6 +34,12 @@
 		"language": "Language",
 		"about": "About Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Show All Tasks",
+			"description": "Show tasks from all projects instead of only the current one"
+		}
+	},
 	"prompts": {
 		"description": "Configure support prompts that are used for quick actions like enhancing prompts, explaining code, and fixing issues. These prompts help Roo provide better assistance for common development tasks."
 	},
diff --git a/webview-ui/src/i18n/locales/es/settings.json b/webview-ui/src/i18n/locales/es/settings.json
index f33b96d17a..b728cc1c30 100644
--- a/webview-ui/src/i18n/locales/es/settings.json
+++ b/webview-ui/src/i18n/locales/es/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Descartar cambios"
 	},
 	"sections": {
+		"general": "General",
 		"providers": "Proveedores",
 		"autoApprove": "Auto-aprobación",
 		"browser": "Acceso al ordenador",
@@ -33,6 +34,12 @@
 		"language": "Idioma",
 		"about": "Acerca de Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Mostrar todas las tareas",
+			"description": "Mostrar tareas de todos los proyectos en lugar de solo el actual"
+		}
+	},
 	"prompts": {
 		"description": "Configura indicaciones de soporte que se utilizan para acciones rápidas como mejorar indicaciones, explicar código y solucionar problemas. Estas indicaciones ayudan a Roo a brindar mejor asistencia para tareas comunes de desarrollo."
 	},
diff --git a/webview-ui/src/i18n/locales/fr/settings.json b/webview-ui/src/i18n/locales/fr/settings.json
index f74c5cd925..6c5114a867 100644
--- a/webview-ui/src/i18n/locales/fr/settings.json
+++ b/webview-ui/src/i18n/locales/fr/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Ignorer les modifications"
 	},
 	"sections": {
+		"general": "Général",
 		"providers": "Fournisseurs",
 		"autoApprove": "Auto-approbation",
 		"browser": "Accès ordinateur",
@@ -33,6 +34,12 @@
 		"language": "Langue",
 		"about": "À propos de Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Afficher toutes les tâches",
+			"description": "Afficher les tâches de tous les projets au lieu du seul projet actuel"
+		}
+	},
 	"prompts": {
 		"description": "Configurez les invites de support utilisées pour les actions rapides comme l'amélioration des invites, l'explication du code et la résolution des problèmes. Ces invites aident Roo à fournir une meilleure assistance pour les tâches de développement courantes."
 	},
diff --git a/webview-ui/src/i18n/locales/hi/settings.json b/webview-ui/src/i18n/locales/hi/settings.json
index dd3e6fd2fa..0e456fed68 100644
--- a/webview-ui/src/i18n/locales/hi/settings.json
+++ b/webview-ui/src/i18n/locales/hi/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "परिवर्तन छोड़ें"
 	},
 	"sections": {
+		"general": "सामान्य",
 		"providers": "प्रदाता",
 		"autoApprove": "अनुमोदन",
 		"browser": "ब्राउज़र",
@@ -33,6 +34,12 @@
 		"language": "भाषा",
 		"about": "परिचय"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "सभी कार्य दिखाएँ",
+			"description": "केवल वर्तमान के बजाय सभी परियोजनाओं से कार्य दिखाएँ"
+		}
+	},
 	"prompts": {
 		"description": "प्रॉम्प्ट्स को बेहतर बनाना, कोड की व्याख्या करना और समस्याओं को ठीक करना जैसी त्वरित कार्रवाइयों के लिए उपयोग किए जाने वाले सहायक प्रॉम्प्ट्स को कॉन्फ़िगर करें। ये प्रॉम्प्ट्स Roo को सामान्य विकास कार्यों के लिए बेहतर सहायता प्रदान करने में मदद करते हैं।"
 	},
diff --git a/webview-ui/src/i18n/locales/id/settings.json b/webview-ui/src/i18n/locales/id/settings.json
index 72d8ca1966..3f35e9e9ff 100644
--- a/webview-ui/src/i18n/locales/id/settings.json
+++ b/webview-ui/src/i18n/locales/id/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Buang perubahan"
 	},
 	"sections": {
+		"general": "Umum",
 		"providers": "Provider",
 		"autoApprove": "Auto-Approve",
 		"browser": "Browser",
@@ -33,6 +34,12 @@
 		"language": "Bahasa",
 		"about": "Tentang Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Tampilkan Semua Tugas",
+			"description": "Tampilkan tugas dari semua proyek, bukan hanya yang saat ini"
+		}
+	},
 	"prompts": {
 		"description": "Konfigurasi support prompt yang digunakan untuk aksi cepat seperti meningkatkan prompt, menjelaskan kode, dan memperbaiki masalah. Prompt ini membantu Roo memberikan bantuan yang lebih baik untuk tugas pengembangan umum."
 	},
diff --git a/webview-ui/src/i18n/locales/it/settings.json b/webview-ui/src/i18n/locales/it/settings.json
index 31ab5963f9..ccb3d93561 100644
--- a/webview-ui/src/i18n/locales/it/settings.json
+++ b/webview-ui/src/i18n/locales/it/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Scarta modifiche"
 	},
 	"sections": {
+		"general": "Generale",
 		"providers": "Fornitori",
 		"autoApprove": "Auto-approvazione",
 		"browser": "Accesso computer",
@@ -33,6 +34,12 @@
 		"language": "Lingua",
 		"about": "Informazioni su Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Mostra tutte le attività",
+			"description": "Mostra le attività di tutti i progetti invece del solo progetto corrente"
+		}
+	},
 	"prompts": {
 		"description": "Configura i prompt di supporto utilizzati per azioni rapide come il miglioramento dei prompt, la spiegazione del codice e la risoluzione dei problemi. Questi prompt aiutano Roo a fornire una migliore assistenza per le attività di sviluppo comuni."
 	},
diff --git a/webview-ui/src/i18n/locales/ja/settings.json b/webview-ui/src/i18n/locales/ja/settings.json
index ff518b7d97..547e59514e 100644
--- a/webview-ui/src/i18n/locales/ja/settings.json
+++ b/webview-ui/src/i18n/locales/ja/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "変更を破棄"
 	},
 	"sections": {
+		"general": "一般",
 		"providers": "プロバイダー",
 		"autoApprove": "自動承認",
 		"browser": "コンピューターアクセス",
@@ -33,6 +34,12 @@
 		"language": "言語",
 		"about": "Roo Codeについて"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "すべてのタスクを表示",
+			"description": "現在のプロジェクトだけでなく、すべてのプロジェクトのタスクを表示"
+		}
+	},
 	"prompts": {
 		"description": "プロンプトの強化、コードの説明、問題の修正などの迅速なアクションに使用されるサポートプロンプトを設定します。これらのプロンプトは、Rooが一般的な開発タスクでより良いサポートを提供するのに役立ちます。"
 	},
diff --git a/webview-ui/src/i18n/locales/ko/settings.json b/webview-ui/src/i18n/locales/ko/settings.json
index 59e34aedb4..52d9323565 100644
--- a/webview-ui/src/i18n/locales/ko/settings.json
+++ b/webview-ui/src/i18n/locales/ko/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "변경 사항 버리기"
 	},
 	"sections": {
+		"general": "일반",
 		"providers": "공급자",
 		"autoApprove": "자동 승인",
 		"browser": "컴퓨터 접근",
@@ -33,6 +34,12 @@
 		"language": "언어",
 		"about": "Roo Code 정보"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "모든 작업 표시",
+			"description": "현재 프로젝트뿐만 아니라 모든 프로젝트의 작업을 표시합니다"
+		}
+	},
 	"prompts": {
 		"description": "프롬프트 향상, 코드 설명, 문제 해결과 같은 빠른 작업에 사용되는 지원 프롬프트를 구성합니다. 이러한 프롬프트는 Roo가 일반적인 개발 작업에 대해 더 나은 지원을 제공하는 데 도움이 됩니다."
 	},
diff --git a/webview-ui/src/i18n/locales/nl/settings.json b/webview-ui/src/i18n/locales/nl/settings.json
index c367ec9e96..ed51dda231 100644
--- a/webview-ui/src/i18n/locales/nl/settings.json
+++ b/webview-ui/src/i18n/locales/nl/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Wijzigingen negeren"
 	},
 	"sections": {
+		"general": "Algemeen",
 		"providers": "Providers",
 		"autoApprove": "Auto-goedkeuren",
 		"browser": "Browser",
@@ -33,6 +34,12 @@
 		"language": "Taal",
 		"about": "Over Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Toon alle taken",
+			"description": "Toon taken van alle projecten in plaats van alleen de huidige"
+		}
+	},
 	"prompts": {
 		"description": "Configureer ondersteuningsprompts die worden gebruikt voor snelle acties zoals het verbeteren van prompts, het uitleggen van code en het oplossen van problemen. Deze prompts helpen Roo om betere ondersteuning te bieden voor veelvoorkomende ontwikkelingstaken."
 	},
diff --git a/webview-ui/src/i18n/locales/pl/settings.json b/webview-ui/src/i18n/locales/pl/settings.json
index bc68eaf2e1..0095b16e53 100644
--- a/webview-ui/src/i18n/locales/pl/settings.json
+++ b/webview-ui/src/i18n/locales/pl/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Odrzuć zmiany"
 	},
 	"sections": {
+		"general": "Ogólne",
 		"providers": "Dostawcy",
 		"autoApprove": "Auto-zatwierdzanie",
 		"browser": "Dostęp komputera",
@@ -33,6 +34,12 @@
 		"language": "Język",
 		"about": "O Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Pokaż wszystkie zadania",
+			"description": "Pokaż zadania ze wszystkich projektów, zamiast tylko bieżącego"
+		}
+	},
 	"prompts": {
 		"description": "Skonfiguruj podpowiedzi wsparcia używane do szybkich działań, takich jak ulepszanie podpowiedzi, wyjaśnianie kodu i rozwiązywanie problemów. Te podpowiedzi pomagają Roo zapewnić lepsze wsparcie dla typowych zadań programistycznych."
 	},
diff --git a/webview-ui/src/i18n/locales/pt-BR/settings.json b/webview-ui/src/i18n/locales/pt-BR/settings.json
index e442e23a97..76f82a1c19 100644
--- a/webview-ui/src/i18n/locales/pt-BR/settings.json
+++ b/webview-ui/src/i18n/locales/pt-BR/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Descartar alterações"
 	},
 	"sections": {
+		"general": "Geral",
 		"providers": "Provedores",
 		"autoApprove": "Aprovação",
 		"browser": "Navegador",
@@ -33,6 +34,12 @@
 		"language": "Idioma",
 		"about": "Sobre"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Mostrar Todas as Tarefas",
+			"description": "Mostrar tarefas de todos os projetos em vez de apenas o atual"
+		}
+	},
 	"prompts": {
 		"description": "Configure prompts de suporte usados para ações rápidas como melhorar prompts, explicar código e corrigir problemas. Esses prompts ajudam o Roo a fornecer melhor assistência para tarefas comuns de desenvolvimento."
 	},
diff --git a/webview-ui/src/i18n/locales/ru/settings.json b/webview-ui/src/i18n/locales/ru/settings.json
index b4ca35aba9..de849622df 100644
--- a/webview-ui/src/i18n/locales/ru/settings.json
+++ b/webview-ui/src/i18n/locales/ru/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Отменить изменения"
 	},
 	"sections": {
+		"general": "Общие",
 		"providers": "Провайдеры",
 		"autoApprove": "Автоодобрение",
 		"browser": "Доступ к компьютеру",
@@ -33,6 +34,12 @@
 		"language": "Язык",
 		"about": "О Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Показать все задачи",
+			"description": "Показать задачи из всех проектов, а не только текущего"
+		}
+	},
 	"prompts": {
 		"description": "Настройте промпты поддержки, используемые для быстрых действий, таких как улучшение промптов, объяснение кода и исправление проблем. Эти промпты помогают Roo обеспечить лучшую поддержку для общих задач разработки."
 	},
diff --git a/webview-ui/src/i18n/locales/tr/settings.json b/webview-ui/src/i18n/locales/tr/settings.json
index 0a8a294d56..b5e51fa695 100644
--- a/webview-ui/src/i18n/locales/tr/settings.json
+++ b/webview-ui/src/i18n/locales/tr/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Değişiklikleri At"
 	},
 	"sections": {
+		"general": "Genel",
 		"providers": "Sağlayıcılar",
 		"autoApprove": "Oto-Onay",
 		"browser": "Bilgisayar Erişimi",
@@ -33,6 +34,12 @@
 		"language": "Dil",
 		"about": "Roo Code Hakkında"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Tüm Görevleri Göster",
+			"description": "Yalnızca mevcut olan yerine tüm projelerdeki görevleri göster"
+		}
+	},
 	"prompts": {
 		"description": "Prompt geliştirme, kod açıklama ve sorun çözme gibi hızlı eylemler için kullanılan destek promptlarını yapılandırın. Bu promptlar, Roo'nun yaygın geliştirme görevleri için daha iyi destek sağlamasına yardımcı olur."
 	},
diff --git a/webview-ui/src/i18n/locales/vi/settings.json b/webview-ui/src/i18n/locales/vi/settings.json
index e2d4e3451d..d594035229 100644
--- a/webview-ui/src/i18n/locales/vi/settings.json
+++ b/webview-ui/src/i18n/locales/vi/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "Hủy thay đổi"
 	},
 	"sections": {
+		"general": "Chung",
 		"providers": "Nhà cung cấp",
 		"autoApprove": "Phê duyệt",
 		"browser": "Trình duyệt",
@@ -33,6 +34,12 @@
 		"language": "Ngôn ngữ",
 		"about": "Giới thiệu"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "Hiển thị tất cả các tác vụ",
+			"description": "Hiển thị tác vụ từ tất cả các dự án thay vì chỉ dự án hiện tại"
+		}
+	},
 	"prompts": {
 		"description": "Cấu hình các lời nhắc hỗ trợ được sử dụng cho các hành động nhanh như cải thiện lời nhắc, giải thích mã và khắc phục sự cố. Những lời nhắc này giúp Roo cung cấp hỗ trợ tốt hơn cho các tác vụ phát triển phổ biến."
 	},
diff --git a/webview-ui/src/i18n/locales/zh-CN/settings.json b/webview-ui/src/i18n/locales/zh-CN/settings.json
index da9cca02ac..92873a3493 100644
--- a/webview-ui/src/i18n/locales/zh-CN/settings.json
+++ b/webview-ui/src/i18n/locales/zh-CN/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "放弃更改"
 	},
 	"sections": {
+		"general": "通用",
 		"providers": "提供商",
 		"autoApprove": "自动批准",
 		"browser": "计算机交互",
@@ -33,6 +34,12 @@
 		"language": "语言",
 		"about": "关于 Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "显示所有任务",
+			"description": "显示所有项目的任务，而不仅仅是当前项目"
+		}
+	},
 	"prompts": {
 		"description": "配置用于快速操作的支持提示词，如增强提示词、解释代码和修复问题。这些提示词帮助 Roo 为常见开发任务提供更好的支持。"
 	},
diff --git a/webview-ui/src/i18n/locales/zh-TW/settings.json b/webview-ui/src/i18n/locales/zh-TW/settings.json
index 4b2cf41958..d0d7f4ae08 100644
--- a/webview-ui/src/i18n/locales/zh-TW/settings.json
+++ b/webview-ui/src/i18n/locales/zh-TW/settings.json
@@ -21,6 +21,7 @@
 		"discardButton": "取消變更"
 	},
 	"sections": {
+		"general": "一般",
 		"providers": "供應商",
 		"autoApprove": "自動核准",
 		"browser": "電腦存取",
@@ -33,8 +34,14 @@
 		"language": "語言",
 		"about": "關於 Roo Code"
 	},
+	"general": {
+		"showAllWorkspacesTasks": {
+			"label": "顯示所有任務",
+			"description": "顯示所有專案的任務，而非僅限目前專案"
+		}
+	},
 	"prompts": {
-		"description": "設定用於快速操作的支援提示詞，如增強提示詞、解釋程式碼和修復問題。這些提示詞幫助 Roo 為常見開發工作提供更好的支援。"
+		"description": "設定用於快速操作的支援提示詞，如增強提示詞、解釋程式碼和修復問題。這些提示詞幫助 Roo 提供支援更好的支援，以協助處理常見的開發任務。"
 	},
 	"codeIndex": {
 		"title": "程式碼庫索引",

From ae1fc41cfbd3d69e68235509890d40cf9fe825ec Mon Sep 17 00:00:00 2001
From: Let Me Duck You <race-relish-stick@duck.com>
Date: Sat, 5 Jul 2025 12:58:23 +0600
Subject: [PATCH 2/3] Fixed test error

---
 .../history/__tests__/useTaskSearch.spec.tsx  | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx b/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx
index ced3519085..445c6a0bdb 100644
--- a/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx
+++ b/webview-ui/src/components/history/__tests__/useTaskSearch.spec.tsx
@@ -52,14 +52,20 @@ const mockTaskHistory: HistoryItem[] = [
 ]
 
 describe("useTaskSearch", () => {
+	let showAllWorkspacesTasks = false
+	const setShowAllWorkspacesTasks = vi.fn().mockImplementation((value) => {
+		showAllWorkspacesTasks = value
+	})
+
 	beforeEach(() => {
 		vi.clearAllMocks()
-		mockUseExtensionState.mockReturnValue({
+		showAllWorkspacesTasks = false
+		mockUseExtensionState.mockImplementation(() => ({
 			taskHistory: mockTaskHistory,
 			cwd: "/workspace/project1",
-			showAllWorkspacesTasks: false,
-			setShowAllWorkspacesTasks: vi.fn(),
-		} as any)
+			showAllWorkspacesTasks,
+			setShowAllWorkspacesTasks,
+		}))
 	})
 
 	it("returns all tasks by default", () => {
@@ -78,22 +84,24 @@ describe("useTaskSearch", () => {
 	})
 
 	it("shows all workspaces when showAllWorkspacesTasks is true", () => {
-		const { result } = renderHook(() => useTaskSearch())
+		const { result, rerender } = renderHook(() => useTaskSearch())
 
 		act(() => {
 			result.current.setShowAllWorkspacesTasks(true)
 		})
+		rerender()
 
 		expect(result.current.tasks).toHaveLength(3)
 		expect(result.current.showAllWorkspacesTasks).toBe(true)
 	})
 
 	it("sorts by newest by default", () => {
-		const { result } = renderHook(() => useTaskSearch())
+		const { result, rerender } = renderHook(() => useTaskSearch())
 
 		act(() => {
 			result.current.setShowAllWorkspacesTasks(true)
 		})
+		rerender()
 
 		expect(result.current.sortOption).toBe("newest")
 		expect(result.current.tasks[0].id).toBe("task-2") // Feb 17
@@ -102,12 +110,13 @@ describe("useTaskSearch", () => {
 	})
 
 	it("sorts by oldest", () => {
-		const { result } = renderHook(() => useTaskSearch())
+		const { result, rerender } = renderHook(() => useTaskSearch())
 
 		act(() => {
 			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSortOption("oldest")
 		})
+		rerender()
 
 		expect(result.current.tasks[0].id).toBe("task-3") // Feb 15
 		expect(result.current.tasks[1].id).toBe("task-1") // Feb 16
@@ -115,12 +124,13 @@ describe("useTaskSearch", () => {
 	})
 
 	it("sorts by most expensive", () => {
-		const { result } = renderHook(() => useTaskSearch())
+		const { result, rerender } = renderHook(() => useTaskSearch())
 
 		act(() => {
 			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSortOption("mostExpensive")
 		})
+		rerender()
 
 		expect(result.current.tasks[0].id).toBe("task-3") // $0.05
 		expect(result.current.tasks[1].id).toBe("task-2") // $0.02
@@ -128,12 +138,13 @@ describe("useTaskSearch", () => {
 	})
 
 	it("sorts by most tokens", () => {
-		const { result } = renderHook(() => useTaskSearch())
+		const { result, rerender } = renderHook(() => useTaskSearch())
 
 		act(() => {
 			result.current.setShowAllWorkspacesTasks(true)
 			result.current.setSortOption("mostTokens")
 		})
+		rerender()
 
 		// task-2: 200 + 100 + 25 + 10 = 335 tokens
 		// task-3: 150 + 75 = 225 tokens
@@ -246,16 +257,19 @@ describe("useTaskSearch", () => {
 			},
 		] as HistoryItem[]
 
-		mockUseExtensionState.mockReturnValue({
+		mockUseExtensionState.mockImplementation(() => ({
 			taskHistory: incompleteTaskHistory,
 			cwd: "/workspace/project1",
-		} as any)
+			showAllWorkspacesTasks,
+			setShowAllWorkspacesTasks,
+		}))
 
-		const { result } = renderHook(() => useTaskSearch())
+		const { result, rerender } = renderHook(() => useTaskSearch())
 
 		act(() => {
 			result.current.setShowAllWorkspacesTasks(true)
 		})
+		rerender()
 
 		// Should only include tasks with both ts and task content
 		expect(result.current.tasks).toHaveLength(3)

From f1111bb2a96af5f359054c64add5e85f10da0377 Mon Sep 17 00:00:00 2001
From: Let Me Duck You <race-relish-stick@duck.com>
Date: Thu, 10 Jul 2025 11:30:59 +0600
Subject: [PATCH 3/3] Fix: Remove outdated codebaseIndexConfig reference and
 merge upstream changes

---
 webview-ui/src/components/settings/SettingsView.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/webview-ui/src/components/settings/SettingsView.tsx b/webview-ui/src/components/settings/SettingsView.tsx
index e6bd000926..3eb599d174 100644
--- a/webview-ui/src/components/settings/SettingsView.tsx
+++ b/webview-ui/src/components/settings/SettingsView.tsx
@@ -325,9 +325,6 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 			vscode.postMessage({ type: "upsertApiConfiguration", text: currentApiConfigName, apiConfiguration })
 			vscode.postMessage({ type: "telemetrySetting", text: telemetrySetting })
 			vscode.postMessage({ type: "showAllWorkspacesTasks", bool: showAllWorkspacesTasks })
-			if (codebaseIndexConfig) {
-				vscode.postMessage({ type: "codebaseIndexEnabled", bool: codebaseIndexConfig.codebaseIndexEnabled })
-			}
 			vscode.postMessage({ type: "profileThresholds", values: profileThresholds })
 			setChangeDetected(false)
 		}