tools: ensure groups of referenced tools are expanded by default (#525)

Closes microsoft/vscode#257379

Author: connor4312

src/extension/prompt/node/defaultIntentRequestHandler.ts

@@ -697,6 +697,9 @@ class DefaultToolCallingLoop extends ToolCallingLoop<IDefaultToolLoopOptions> {
 			this.toolGrouping.tools = tools;
 		} else {
 			this.toolGrouping = this.toolGroupingService.create(this.options.conversation.sessionId, tools);
+			for (const ref of this.options.request.toolReferences) {
+				this.toolGrouping.ensureExpanded(ref.name);
+			}
 		}
 
 		if (!this.toolGrouping.isEnabled) {

src/extension/tools/common/virtualTools/toolGrouping.ts

@@ -32,6 +32,7 @@ export class ToolGrouping implements IToolGrouping {
 	private _didToolsChange = true;
 	private _turnNo = 0;
 	private _trimOnNextCompute = false;
+	private _expandOnNext?: Set<string>;
 
 	public get tools(): readonly LanguageModelToolInformation[] {
 		return this._tools;
@@ -116,6 +117,11 @@ export class ToolGrouping implements IToolGrouping {
 		this._trimOnNextCompute = true;
 	}
 
+	ensureExpanded(toolName: string): void {
+		this._expandOnNext ??= new Set();
+		this._expandOnNext.add(toolName);
+	}
+
 	async compute(token: CancellationToken): Promise<LanguageModelToolInformation[]> {
 		await this._doCompute(token);
 		return [...this._root.tools()];
@@ -132,6 +138,16 @@ export class ToolGrouping implements IToolGrouping {
 			this._didToolsChange = false;
 		}
 
+		if (this._expandOnNext) {
+			for (const toolName of this._expandOnNext) {
+				this._root.find(toolName)?.path.forEach(p => {
+					p.isExpanded = true;
+					p.lastUsedOnTurn = this._turnNo;
+				});
+			}
+			this._expandOnNext = undefined;
+		}
+
 		let trimDownTo = HARD_TOOL_LIMIT;
 
 		if (this._trimOnNextCompute) {

src/extension/tools/common/virtualTools/virtualToolTypes.ts

@@ -44,6 +44,11 @@ export interface IToolGrouping {
 	 */
 	getContainerFor(toolName: string): VirtualTool | undefined;
 
+	/**
+	 * Ensures the given tool is available in the next call to `compute`.
+	 */
+	ensureExpanded(toolName: string): void;
+
 	/**
 	 * Returns a list of tools that should be used for the given request.
 	 * Internally re-reads the request and conversation state.