Add basic github lexical search

extensions/copilot/package.json

@@ -1051,6 +1051,38 @@
 					]
 				}
 			},
+			{
+				"name": "copilot_githubTextSearch",
+				"legacyToolReferenceFullNames": [
+					"githubTextSearch"
+				],
+				"toolReferenceName": "githubTextSearch",
+				"displayName": "%github.copilot.tools.githubTextSearch.name%",
+				"modelDescription": "Lexically searches a GitHub repository or organization for files containing specific keywords or code patterns. Use this when looking for exact strings, function names, or identifiers in a GitHub repo or org. Unlike the semantic search tool, this uses keyword matching rather than meaning-based search.",
+				"userDescription": "%github.copilot.tools.githubTextSearch.userDescription%",
+				"icon": "$(search)",
+				"inputSchema": {
+					"type": "object",
+					"properties": {
+						"scope": {
+							"type": "string",
+							"description": "The GitHub scope to search. Use 'owner/repo' to search a single repository, or an org name (no slash) to search across an entire organization."
+						},
+						"query": {
+							"type": "string",
+							"description": "The keyword search query. Supports GitHub code search syntax such as 'language:typescript', 'extension:ts', 'path:src/', etc."
+						},
+						"maxResults": {
+							"type": "number",
+							"description": "Optional. The maximum number of search results to return. Defaults to 100."
+						}
+					},
+					"required": [
+						"scope",
+						"query"
+					]
+				}
+			},
 			{
 				"name": "copilot_switchAgent",
 				"toolReferenceName": "switchAgent",
@@ -1271,7 +1303,8 @@
 				"icon": "$(globe)",
 				"tools": [
 					"fetch",
-					"githubRepo"
+					"githubRepo",
+					"githubTextSearch"
 				]
 			}
 		],

extensions/copilot/package.nls.json

@@ -274,8 +274,10 @@
 	"github.copilot.tools.searchResults.name": "Search View Results",
 	"github.copilot.tools.searchResults.description": "Get the results of the search view",
 	"github.copilot.config.getSearchViewResultsSkill.enabled": "Enable the Search View Results skill and disable the corresponding tool.",
-	"github.copilot.tools.githubRepo.name": "Search GitHub Repository",
-	"github.copilot.tools.githubRepo.userDescription": "Search a GitHub repository for relevant source code snippets. You can specify a repository using `owner/repo`",
+	"github.copilot.tools.githubRepo.name": "Semantic Search GitHub Repository",
+	"github.copilot.tools.githubRepo.userDescription": "Semantic Search a GitHub repository for relevant source code snippets. You can specify a repository using `owner/repo`",
+	"github.copilot.tools.githubTextSearch.name": "GitHub Text Search",
+	"github.copilot.tools.githubTextSearch.userDescription": "Text search a GitHub repository or organization for files containing specific keywords or code patterns.",
 	"github.copilot.config.autoFix": "Automatically fix diagnostics for edited files.",
 	"github.copilot.config.rateLimitAutoSwitchToAuto": "Automatically switch to the Auto model and retry when you hit a per-model rate limit.",
 	"github.copilot.tools.createNewWorkspace.userDescription": "Scaffold a new workspace in VS Code",

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-opus-4.5/all_non_edit_tools.spec.snap

@@ -91,6 +91,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-opus-4.5/all_tools.spec.snap

@@ -90,6 +90,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-opus-4.6/all_non_edit_tools.spec.snap

@@ -73,6 +73,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-opus-4.6/all_tools.spec.snap

@@ -73,6 +73,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-sonnet-4.5/all_non_edit_tools.spec.snap

@@ -91,6 +91,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-sonnet-4.5/all_tools.spec.snap

@@ -90,6 +90,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-sonnet-4.6/all_non_edit_tools.spec.snap

@@ -73,6 +73,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/prompts/node/agent/test/__snapshots__/agentPrompts-claude-sonnet-4.6/all_tools.spec.snap

@@ -73,6 +73,7 @@ get_project_setup_info
 get_search_view_results
 get_vscode_api
 github_repo
+github_text_search
 install_extension
 read_notebook_cell_output
 read_project_structure

extensions/copilot/src/extension/tools/common/toolNames.ts

@@ -47,7 +47,8 @@ export enum ToolName {
 	FindTestFiles = 'test_search',
 	GetProjectSetupInfo = 'get_project_setup_info',
 	SearchViewResults = 'get_search_view_results',
-	GithubRepo = 'github_repo',
+	GithubSemanticRepoSearch = 'github_repo',
+	GithubTextSearch = 'github_text_search',
 	CreateDirectory = 'create_directory',
 	RunVscodeCmd = 'run_vscode_command',
 	CoreManageTodoList = 'manage_todo_list',
@@ -132,7 +133,8 @@ export enum ContributedToolName {
 	FindTestFiles = 'copilot_findTestFiles',
 	GetProjectSetupInfo = 'copilot_getProjectSetupInfo',
 	SearchViewResults = 'copilot_getSearchResults',
-	GithubRepo = 'copilot_githubRepo',
+	GithubSemanticRepoSearch = 'copilot_githubRepo',
+	GithubTextSearch = 'copilot_githubTextSearch',
 	CreateAndRunTask = 'copilot_createAndRunTask',
 	CreateDirectory = 'copilot_createDirectory',
 	RunVscodeCmd = 'copilot_runVscodeCommand',
@@ -223,7 +225,8 @@ export const toolCategories: Record<ToolName, ToolCategory> = {
 
 	// Web Interaction
 	[ToolName.FetchWebPage]: ToolCategory.WebInteraction,
-	[ToolName.GithubRepo]: ToolCategory.WebInteraction,
+	[ToolName.GithubSemanticRepoSearch]: ToolCategory.WebInteraction,
+	[ToolName.GithubTextSearch]: ToolCategory.WebInteraction,
 	[ToolName.CoreOpenBrowserPage]: ToolCategory.WebInteraction,
 	[ToolName.CoreClickElement]: ToolCategory.WebInteraction,
 	[ToolName.CoreScreenshotPage]: ToolCategory.WebInteraction,

extensions/copilot/src/extension/tools/node/allTools.ts

@@ -15,7 +15,8 @@ import './findTextInFilesTool';
 import './getErrorsTool';
 import './getNotebookCellOutputTool';
 import './getSearchViewResultsTool';
-import './githubRepoTool';
+import './githubRepoSemanticSearchTool.tsx';
+import './githubTextSearchTool';
 import './insertEditTool';
 import './installExtensionTool';
 import './listDirTool';

extensions/copilot/src/extension/tools/node/githubRepoTool.tsx → extensions/copilot/src/extension/tools/node/githubRepoSemanticSearchTool.tsx

@@ -38,9 +38,8 @@ interface PrepareError {
 	readonly details?: string;
 }
 
-export class GithubRepoTool implements ICopilotTool<GithubRepoToolParams> {
-	public static readonly toolName = ToolName.GithubRepo;
-
+export class GithubRepoSemanticSearchTool implements ICopilotTool<GithubRepoToolParams> {
+	public static readonly toolName = ToolName.GithubSemanticRepoSearch;
 
 	constructor(
 		@IRunCommandExecutionService _commandService: IRunCommandExecutionService,
@@ -61,14 +60,15 @@ export class GithubRepoTool implements ICopilotTool<GithubRepoToolParams> {
 			throw new Error('No embedding models available');
 		}
 
-		const searchResults = await this._githubCodeSearch.searchRepo({ silent: true }, embeddingType, { githubRepoId, localRepoRoot: undefined, indexedCommit: undefined }, options.input.query, 64, {}, new TelemetryCorrelationId('github-repo-tool'), token);
+		const searchResults = await this._githubCodeSearch.semanticSearch({ silent: true }, embeddingType, { kind: 'repo', githubRepoId, localRepoRoot: undefined, indexedCommit: undefined }, options.input.query, 64, {}, new TelemetryCorrelationId('github-repo-tool'), token);
 
-		// Map the chunks to URIs
-		// TODO: Won't work for proxima or branches not called main
+		// Map the chunks to URIs using the remote URL and ref from the search response
+		const repoBaseUrl = searchResults.remoteUrl ?? `https://github.com/${toGithubNwo(githubRepoId)}`;
+		const ref = searchResults.refName ?? 'main';
 		const chunks = searchResults.chunks.map((entry): FileChunkAndScore => ({
 			chunk: {
 				...entry.chunk,
-				file: URI.joinPath(URI.parse('https://github.com'), toGithubNwo(githubRepoId), 'tree', 'main', entry.chunk.file.path).with({
+				file: URI.joinPath(URI.parse(repoBaseUrl), 'tree', ref, entry.chunk.file.path).with({
 					fragment: `L${entry.chunk.range.startLineNumber}-L${entry.chunk.range.endLineNumber}`,
 				}),
 			},
@@ -229,4 +229,4 @@ class GithubChunkSearchResults extends PromptElement<GithubChunkSearchResultsPro
 }
 
 
-ToolRegistry.registerTool(GithubRepoTool);
+ToolRegistry.registerTool(GithubRepoSemanticSearchTool);

extensions/copilot/src/extension/tools/node/githubTextSearchTool.tsx

@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as l10n from '@vscode/l10n';
+import { BasePromptElementProps, PromptElement, PromptPiece, PromptReference, PromptSizing, TextChunk } from '@vscode/prompt-tsx';
+import type * as vscode from 'vscode';
+import { FileChunkAndScore } from '../../../platform/chunking/common/chunk';
+import { GithubRepoId } from '../../../platform/git/common/gitService';
+import { GithubCodeSearchScope, IGithubCodeSearchService } from '../../../platform/remoteCodeSearch/common/githubCodeSearchService';
+import { createFencedCodeBlock, getLanguageId } from '../../../util/common/markdown';
+import { TelemetryCorrelationId } from '../../../util/common/telemetryCorrelationId';
+import { isLocation, isUri } from '../../../util/common/types';
+import { CancellationToken } from '../../../util/vs/base/common/cancellation';
+import { URI } from '../../../util/vs/base/common/uri';
+import { IInstantiationService } from '../../../util/vs/platform/instantiation/common/instantiation';
+import { ExtendedLanguageModelToolResult, LanguageModelPromptTsxPart, MarkdownString } from '../../../vscodeTypes';
+import { getUniqueReferences } from '../../prompt/common/conversation';
+import { renderPromptElementJSON } from '../../prompts/node/base/promptRenderer';
+import { ToolName } from '../common/toolNames';
+import { ICopilotTool, ToolRegistry } from '../common/toolsRegistry';
+
+export interface GithubTextSearchToolParams {
+	readonly query: string;
+	/** Either 'owner/repo' for a single repo, or an org name (no slash) */
+	readonly scope: string;
+	readonly maxResults?: number;
+}
+
+export class GithubTextSearchTool implements ICopilotTool<GithubTextSearchToolParams> {
+	public static readonly toolName = ToolName.GithubTextSearch;
+
+	constructor(
+		@IInstantiationService private readonly _instantiationService: IInstantiationService,
+		@IGithubCodeSearchService private readonly _githubCodeSearch: IGithubCodeSearchService,
+	) { }
+
+	async invoke(options: vscode.LanguageModelToolInvocationOptions<GithubTextSearchToolParams>, token: CancellationToken): Promise<vscode.LanguageModelToolResult> {
+		const scope = parseScope(options.input.scope);
+		if (!scope) {
+			throw new Error(l10n.t`Invalid input. Could not parse 'scope' argument`);
+		}
+
+		const maxResults = options.input.maxResults ?? 100;
+
+		const searchResults = await this._githubCodeSearch.lexicalSearch(
+			{ silent: true },
+			scope,
+			options.input.query,
+			maxResults,
+			{},
+			new TelemetryCorrelationId('github-text-search-tool'),
+			token,
+		);
+
+		const chunks = searchResults.chunks.map((entry): FileChunkAndScore => {
+			let file = entry.file;
+			if (file.scheme === 'githubRepoResult') {
+				// Path format: /owner/repo/relative/file/path
+				const parts = file.path.split('/').filter(Boolean);
+				if (parts.length >= 3) {
+					const nwo = `${parts[0]}/${parts[1]}`;
+					const relativePath = parts.slice(2).join('/');
+					file = URI.joinPath(URI.parse('https://github.com'), nwo, 'tree', 'main', '/' + relativePath).with({
+						fragment: entry.range.startLineNumber > 0
+							? `L${entry.range.startLineNumber}-L${entry.range.endLineNumber}`
+							: undefined,
+					});
+				}
+			}
+			return { chunk: { ...entry, file }, distance: undefined };
+		});
+
+		let references: PromptReference[] = [];
+		const json = await renderPromptElementJSON(this._instantiationService, GithubTextSearchResults, {
+			chunks,
+			referencesOut: references,
+		});
+		const result = new ExtendedLanguageModelToolResult([
+			new LanguageModelPromptTsxPart(json),
+		]);
+
+		references = getUniqueReferences(references);
+		const scopeLabel = options.input.scope;
+		result.toolResultMessage = references.length === 0 ?
+			new MarkdownString(l10n.t`Searched ${scopeLabel} for "${options.input.query}", no results`) :
+			references.length === 1 ?
+				new MarkdownString(l10n.t`Searched ${scopeLabel} for "${options.input.query}", 1 result`) :
+				new MarkdownString(l10n.t`Searched ${scopeLabel} for "${options.input.query}", ${references.length} results`);
+		result.toolResultDetails = references
+			.map(r => r.anchor)
+			.filter(r => isUri(r) || isLocation(r));
+		return result;
+	}
+
+	async prepareInvocation(options: vscode.LanguageModelToolInvocationPrepareOptions<GithubTextSearchToolParams>, _token: vscode.CancellationToken): Promise<vscode.PreparedToolInvocation> {
+		if (!options.input.scope) {
+			throw new Error(l10n.t`Invalid input. No 'scope' argument provided`);
+		}
+		if (!parseScope(options.input.scope)) {
+			throw new Error(l10n.t`Invalid input. Could not parse 'scope' argument`);
+		}
+		return {
+			invocationMessage: l10n.t("Searching '{0}' for '{1}'", options.input.scope, options.input.query),
+		};
+	}
+}
+
+function parseScope(scope: string): GithubCodeSearchScope | undefined {
+	if (!scope) {
+		return undefined;
+	}
+	if (scope.includes('/')) {
+		const repoId = GithubRepoId.parse(scope);
+		if (!repoId) {
+			return undefined;
+		}
+		return { kind: 'repo', githubRepoId: repoId, localRepoRoot: undefined, indexedCommit: undefined };
+	}
+
+	return { kind: 'org', org: scope };
+}
+
+interface GithubTextSearchResultsProps extends BasePromptElementProps {
+	readonly chunks: FileChunkAndScore[];
+	readonly referencesOut: PromptReference[];
+}
+
+class GithubTextSearchResults extends PromptElement<GithubTextSearchResultsProps> {
+	override render(_state: void, _sizing: PromptSizing): PromptPiece | undefined {
+		const references: PromptReference[] = [];
+		const seenFiles = new Set<string>();
+
+		const renderedChunks = this.props.chunks
+			.filter(x => x.chunk.text)
+			.map(chunk => {
+				const fileKey = chunk.chunk.file.toString();
+				if (!seenFiles.has(fileKey)) {
+					seenFiles.add(fileKey);
+					references.push(new PromptReference(chunk.chunk.file));
+				}
+
+				const githubInfo = parseGithubFileUrl(chunk.chunk.file);
+				const displayPath = githubInfo?.path ?? chunk.chunk.file.toString();
+				const nwoLabel = githubInfo?.nwo;
+
+				const lineInfo = ` starting at line ${chunk.chunk.range.startLineNumber}`;
+
+				const headerText = nwoLabel
+					? `Text match excerpt from \`${nwoLabel}\` in \`${displayPath}\`${lineInfo}:`
+					: `Text match excerpt in \`${displayPath}\`${lineInfo}:`;
+
+				return <TextChunk>
+					{headerText}<br />
+					{createFencedCodeBlock(getLanguageId(chunk.chunk.file), chunk.chunk.text)}<br /><br />
+				</TextChunk>;
+			});
+
+		this.props.referencesOut.push(...references);
+
+		return <>
+			<references value={references} />
+			{renderedChunks}
+		</>;
+	}
+}
+
+function parseGithubFileUrl(uri: URI): { nwo: string; path: string } | undefined {
+	if (uri.scheme === 'https' && uri.authority === 'github.com') {
+		const parts = uri.path.split('/').filter(Boolean);
+		// Pattern: /owner/repo/tree/branch/...path
+		if (parts.length >= 4 && parts[2] === 'tree') {
+			return {
+				nwo: `${parts[0]}/${parts[1]}`,
+				path: parts.slice(4).join('/'),
+			};
+		}
+	}
+	return undefined;
+}
+
+ToolRegistry.registerTool(GithubTextSearchTool);