Avoid recreating deriveds (microsoft#262150)

Author: aeschli

src/vs/workbench/contrib/chat/browser/chatSelectedTools.ts

@@ -64,76 +64,74 @@ export class ChatSelectedTools extends Disposable {
 	/**
 	 * All tools and tool sets with their enabled state.
 	 */
-	get entriesMap(): IObservable<IToolAndToolSetEnablementMap> {
-		return derived(r => {
-			const map = new Map<IToolData | ToolSet, boolean>();
+	public readonly entriesMap: IObservable<IToolAndToolSetEnablementMap> = derived(r => {
+		const map = new Map<IToolData | ToolSet, boolean>();
 
-			const currentMode = this._mode.read(r);
+		const currentMode = this._mode.read(r);
 
-			let currentMap = this._sessionStates.observable.read(r).get(currentMode.id);
-			const modeTools = currentMode.customTools?.read(r);
-			if (!currentMap && currentMode.kind === ChatModeKind.Agent && modeTools) {
-				currentMap = this._toolsService.toToolAndToolSetEnablementMap(modeTools);
-			}
-			if (currentMap) {
-				for (const tool of this._allTools.read(r)) {
-					if (tool.canBeReferencedInPrompt) {
-						map.set(tool, currentMap.get(tool) === true); // false if not present
-					}
-				}
-				for (const toolSet of this._toolsService.toolSets.read(r)) {
-					map.set(toolSet, currentMap.get(toolSet) === true); // false if not present
-				}
-			} else {
-				const currData = this._selectedTools.read(r);
-				const disabledToolSets = new Set(currData.disabledToolSets ?? []);
-				const disabledTools = new Set(currData.disabledTools ?? []);
-
-				for (const tool of this._allTools.read(r)) {
-					if (tool.canBeReferencedInPrompt) {
-						map.set(tool, !disabledTools.has(tool.id));
-					}
+		let currentMap = this._sessionStates.observable.read(r).get(currentMode.id);
+		const modeTools = currentMode.customTools?.read(r);
+		if (!currentMap && currentMode.kind === ChatModeKind.Agent && modeTools) {
+			currentMap = this._toolsService.toToolAndToolSetEnablementMap(modeTools);
+		}
+		if (currentMap) {
+			for (const tool of this._allTools.read(r)) {
+				if (tool.canBeReferencedInPrompt) {
+					map.set(tool, currentMap.get(tool) === true); // false if not present
 				}
-				for (const toolSet of this._toolsService.toolSets.read(r)) {
-					map.set(toolSet, !disabledToolSets.has(toolSet.id));
+			}
+			for (const toolSet of this._toolsService.toolSets.read(r)) {
+				map.set(toolSet, currentMap.get(toolSet) === true); // false if not present
+			}
+		} else {
+			const currData = this._selectedTools.read(r);
+			const disabledToolSets = new Set(currData.disabledToolSets ?? []);
+			const disabledTools = new Set(currData.disabledTools ?? []);
+
+			for (const tool of this._allTools.read(r)) {
+				if (tool.canBeReferencedInPrompt) {
+					map.set(tool, !disabledTools.has(tool.id));
 				}
 			}
-			return map;
-		});
-	}
+			for (const toolSet of this._toolsService.toolSets.read(r)) {
+				map.set(toolSet, !disabledToolSets.has(toolSet.id));
+			}
+		}
+		return map;
+	});
 
-	get userSelectedTools(): IObservable<UserSelectedTools> {
-		return derived(r => {
-			const result: UserSelectedTools = {};
 
-			const _set = (tool: IToolData, enabled: boolean) => {
-				// ONLY disable a tool that isn't enabled yet
-				const enabledNow = result[tool.id];
-				if (enabled || !enabledNow) {
-					result[tool.id] = enabled;
-				}
-			};
+	public readonly userSelectedTools: IObservable<UserSelectedTools> = derived(r => {
+		const result: UserSelectedTools = {};
 
-			const map = this.entriesMap.read(r);
-			for (const [item, enabled] of map) {
-				if (item instanceof ToolSet) {
-					for (const tool of item.getTools(r)) {
-						// Tools from an mcp tool set are explicitly enabled/disabled under the tool set.
-						// Other toolsets don't show individual tools under the tool set and enablement just follows the toolset.
-						const toolEnabled = item.source.type === 'mcp' ?
-							map.get(tool) ?? enabled :
-							enabled;
-						_set(tool, toolEnabled);
-					}
-				} else {
-					if (item.canBeReferencedInPrompt) {
-						_set(item, enabled);
-					}
+		const _set = (tool: IToolData, enabled: boolean) => {
+			// ONLY disable a tool that isn't enabled yet
+			const enabledNow = result[tool.id];
+			if (enabled || !enabledNow) {
+				result[tool.id] = enabled;
+			}
+		};
+
+		const map = this.entriesMap.read(r);
+		for (const [item, enabled] of map) {
+			if (item instanceof ToolSet) {
+				for (const tool of item.getTools(r)) {
+					// Tools from an mcp tool set are explicitly enabled/disabled under the tool set.
+					// Other toolsets don't show individual tools under the tool set and enablement just follows the toolset.
+					const toolEnabled = item.source.type === 'mcp' ?
+						map.get(tool) ?? enabled :
+						enabled;
+					_set(tool, toolEnabled);
+				}
+			} else {
+				if (item.canBeReferencedInPrompt) {
+					_set(item, enabled);
 				}
 			}
-			return result;
-		});
-	}
+		}
+		return result;
+	});
+
 
 	get entriesScope() {
 		const mode = this._mode.get();