Remove confusing GitHub repository tip from chat tips (microsoft#295177)

Author: Copilot

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

@@ -106,18 +106,6 @@ export interface ITipDefinition {
 	 * The tip won't be shown if the tool it describes has already been used.
 	 */
 	readonly excludeWhenToolsInvoked?: string[];
-	/**
-	 * Tool set reference names. If any tool belonging to one of these tool sets
-	 * has ever been invoked in this workspace, the tip becomes ineligible.
-	 * Unlike {@link excludeWhenToolsInvoked}, this does not require listing
-	 * individual tool IDs, it checks all tools that belong to the named sets.
-	 */
-	readonly excludeWhenAnyToolSetToolInvoked?: string[];
-	/**
-	 * Tool set reference names where at least one must be registered for the tip to be eligible.
-	 * If none of the listed tool sets are registered, the tip is not shown.
-	 */
-	readonly requiresAnyToolSetRegistered?: string[];
 	/**
 	 * If set, exclude this tip when prompt files of the specified type exist in the workspace.
 	 */
@@ -210,16 +198,6 @@ const TIP_CATALOG: ITipDefinition[] = [
 		when: ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
 		excludeWhenToolsInvoked: ['renderMermaidDiagram'],
 	},
-	{
-		id: 'tip.githubRepo',
-		message: localize('tip.githubRepo', "Tip: Mention a GitHub repository (@owner/repo) in your prompt to let the agent search code, browse issues, and explore pull requests from that repo."),
-		when: ContextKeyExpr.and(
-			ChatContextKeys.chatModeKind.isEqualTo(ChatModeKind.Agent),
-			ContextKeyExpr.notEquals('gitOpenRepositoryCount', '0'),
-		),
-		excludeWhenAnyToolSetToolInvoked: ['github', 'github-pull-request'],
-		requiresAnyToolSetRegistered: ['github', 'github-pull-request'],
-	},
 	{
 		id: 'tip.subagents',
 		message: localize('tip.subagents', "Tip: Ask the agent to work in parallel to complete large tasks faster."),
@@ -265,9 +243,6 @@ export class TipEligibilityTracker extends Disposable {
 	private readonly _pendingModes: Set<string>;
 	private readonly _pendingTools: Set<string>;
 
-	/** Tool set reference names monitored via {@link ITipDefinition.excludeWhenAnyToolSetToolInvoked}. */
-	private readonly _monitoredToolSets: Set<string>;
-
 	private readonly _commandListener = this._register(new MutableDisposable());
 	private readonly _toolListener = this._register(new MutableDisposable());
 
@@ -333,13 +308,6 @@ export class TipEligibilityTracker extends Disposable {
 			}
 		}
 
-		this._monitoredToolSets = new Set<string>();
-		for (const tip of tips) {
-			for (const name of tip.excludeWhenAnyToolSetToolInvoked ?? []) {
-				this._monitoredToolSets.add(name);
-			}
-		}
-
 		// --- Set up command listener (auto-disposes when all seen) --------------
 
 		if (this._pendingCommands.size > 0) {
@@ -358,44 +326,17 @@ export class TipEligibilityTracker extends Disposable {
 
 		// --- Set up tool listener (auto-disposes when all seen) -----------------
 
-		if (this._pendingTools.size > 0 || this._monitoredToolSets.size > 0) {
+		if (this._pendingTools.size > 0) {
 			this._toolListener.value = this._languageModelToolsService.onDidInvokeTool(e => {
-				let changed = false;
-
 				// Track explicit tool IDs
 				if (this._pendingTools.has(e.toolId)) {
 					this._invokedTools.add(e.toolId);
 					this._pendingTools.delete(e.toolId);
-					changed = true;
-				}
-
-				// Track tools belonging to monitored tool sets
-				if (this._monitoredToolSets.size > 0 && !this._invokedTools.has(e.toolId)) {
-					for (const setName of this._monitoredToolSets) {
-						const toolSet = this._languageModelToolsService.getToolSetByName(setName);
-						if (toolSet) {
-							for (const tool of toolSet.getTools()) {
-								if (tool.id === e.toolId) {
-									this._invokedTools.add(e.toolId);
-									// Remove set name from monitoring since ANY tool from the set excludes the tip.
-									// The tip remains excluded via _invokedTools even after we stop monitoring.
-									this._monitoredToolSets.delete(setName);
-									changed = true;
-									break;
-								}
-							}
-						}
-						if (changed) {
-							break;
-						}
-					}
-				}
 
-				if (changed) {
 					this._persistSet(TipEligibilityTracker._TOOLS_STORAGE_KEY, this._invokedTools);
 				}
 
-				if (this._pendingTools.size === 0 && this._monitoredToolSets.size === 0) {
+				if (this._pendingTools.size === 0) {
 					this._toolListener.clear();
 				}
 			});
@@ -477,30 +418,10 @@ export class TipEligibilityTracker extends Disposable {
 				}
 			}
 		}
-		if (tip.excludeWhenAnyToolSetToolInvoked) {
-			for (const setName of tip.excludeWhenAnyToolSetToolInvoked) {
-				const toolSet = this._languageModelToolsService.getToolSetByName(setName);
-				if (toolSet) {
-					for (const tool of toolSet.getTools()) {
-						if (this._invokedTools.has(tool.id)) {
-							this._logService.debug('#ChatTips: tip excluded because tool set tool was invoked', tip.id, setName, tool.id);
-							return true;
-						}
-					}
-				}
-			}
-		}
 		if (tip.excludeWhenPromptFilesExist && this._excludedByFiles.has(tip.id)) {
 			this._logService.debug('#ChatTips: tip excluded because prompt files exist', tip.id);
 			return true;
 		}
-		if (tip.requiresAnyToolSetRegistered) {
-			const hasAny = tip.requiresAnyToolSetRegistered.some(name => this._languageModelToolsService.getToolSetByName(name));
-			if (!hasAny) {
-				this._logService.debug('#ChatTips: tip excluded because no required tool sets are registered', tip.id);
-				return true;
-			}
-		}
 		return false;
 	}
 

src/vs/workbench/contrib/chat/test/browser/chatTipService.test.ts

@@ -21,7 +21,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { ChatContextKeys } from '../../common/actions/chatContextKeys.js';
 import { ChatAgentLocation, ChatModeKind } from '../../common/constants.js';
 import { PromptsType } from '../../common/promptSyntax/promptTypes.js';
-import { ILanguageModelToolsService, IToolData, ToolDataSource } from '../../common/tools/languageModelToolsService.js';
+import { ILanguageModelToolsService } from '../../common/tools/languageModelToolsService.js';
 import { MockLanguageModelToolsService } from '../common/tools/mockLanguageModelToolsService.js';
 
 class MockContextKeyServiceWithRulesMatching extends MockContextKeyService {
@@ -635,74 +635,6 @@ suite('ChatTipService', () => {
 		assert.strictEqual(tracker.isExcluded(tip), false, 'Should not be excluded when no skill files exist');
 	});
 
-	test('excludes tip when requiresAnyToolSetRegistered tool sets are not registered', () => {
-		const tip: ITipDefinition = {
-			id: 'tip.githubRepo',
-			message: 'test',
-			requiresAnyToolSetRegistered: ['github', 'github-pull-request'],
-		};
-
-		const tracker = testDisposables.add(new TipEligibilityTracker(
-			[tip],
-			{ onDidExecuteCommand: Event.None, onWillExecuteCommand: Event.None } as Partial<ICommandService> as ICommandService,
-			storageService,
-			createMockPromptsService() as IPromptsService,
-			createMockToolsService(),
-			new NullLogService(),
-		));
-
-		assert.strictEqual(tracker.isExcluded(tip), true, 'Should be excluded when no required tool sets are registered');
-	});
-
-	test('excludes tip when a tool belonging to a monitored tool set has been invoked', () => {
-		const mockToolsService = createMockToolsService();
-		const toolInSet: IToolData = { id: 'mcp_github_get_me', source: ToolDataSource.Internal, displayName: 'Get Me', modelDescription: 'Get Me' };
-		mockToolsService.addRegisteredToolSetName('github', [toolInSet]);
-
-		const tip: ITipDefinition = {
-			id: 'tip.githubRepo',
-			message: 'test',
-			excludeWhenAnyToolSetToolInvoked: ['github'],
-		};
-
-		const tracker = testDisposables.add(new TipEligibilityTracker(
-			[tip],
-			{ onDidExecuteCommand: Event.None, onWillExecuteCommand: Event.None } as Partial<ICommandService> as ICommandService,
-			storageService,
-			createMockPromptsService() as IPromptsService,
-			mockToolsService,
-			new NullLogService(),
-		));
-
-		assert.strictEqual(tracker.isExcluded(tip), false, 'Should not be excluded before any tool set tool is invoked');
-
-		mockToolsService.fireOnDidInvokeTool({ toolId: 'mcp_github_get_me', sessionResource: undefined, requestId: undefined, subagentInvocationId: undefined });
-
-		assert.strictEqual(tracker.isExcluded(tip), true, 'Should be excluded after a tool from the monitored tool set is invoked');
-	});
-
-	test('does not exclude tip when at least one requiresAnyToolSetRegistered tool set is registered', () => {
-		const mockToolsService = createMockToolsService();
-		mockToolsService.addRegisteredToolSetName('github');
-
-		const tip: ITipDefinition = {
-			id: 'tip.githubRepo',
-			message: 'test',
-			requiresAnyToolSetRegistered: ['github', 'github-pull-request'],
-		};
-
-		const tracker = testDisposables.add(new TipEligibilityTracker(
-			[tip],
-			{ onDidExecuteCommand: Event.None, onWillExecuteCommand: Event.None } as Partial<ICommandService> as ICommandService,
-			storageService,
-			createMockPromptsService() as IPromptsService,
-			mockToolsService,
-			new NullLogService(),
-		));
-
-		assert.strictEqual(tracker.isExcluded(tip), false, 'Should not be excluded when at least one required tool set is registered');
-	});
-
 	test('re-checks agent file exclusion when onDidChangeCustomAgents fires', async () => {
 		const agentChangeEmitter = testDisposables.add(new Emitter<void>());
 		let agentFiles: IPromptPath[] = [];