Merge branch 'main' into Dileepy/prompt_update

dileepyavan · web-flow · commit ef5da0fd576f · 2026-04-06T21:09:51.000-07:00
diff --git a/package.nls.json b/package.nls.json
@@ -28,8 +28,8 @@
 	"github.copilot.command.openUserPreferences": "Open User Preferences",
 	"github.copilot.command.openMemoryFolder": "Open Memory Folder",
 	"github.copilot.command.sendChatFeedback": "Send Chat Feedback",
-	"github.copilot.command.buildRemoteWorkspaceIndex": "Build Workspace Index",
-	"github.copilot.command.deleteExternalIngestWorkspaceIndex": "Delete External Ingest Workspace Index",
+	"github.copilot.command.buildRemoteWorkspaceIndex": "Build Codebase Semantic Index",
+	"github.copilot.command.deleteExternalIngestWorkspaceIndex": "Delete External Ingest Codebase Index",
 	"github.copilot.viewsWelcome.individual.expired": "Your Copilot subscription has expired.\n\n[Review Copilot Settings](https://github.com/settings/copilot?editor=vscode)",
 	"github.copilot.viewsWelcome.enterprise": "Contact your GitHub organization administrator to enable Copilot.",
 	"github.copilot.viewsWelcome.offline": {
diff --git a/src/extension/chatSessions/copilotcli/node/copilotCli.ts b/src/extension/chatSessions/copilotcli/node/copilotCli.ts
@@ -289,6 +289,11 @@ export class CopilotCLIAgents extends Disposable implements ICopilotCLIAgents {
 			});
 		}
 		for (const promptFile of this.chatPromptFileService.customAgentPromptFiles) {
+			// Skip legacy .chatmode.md files — they are a deprecated format
+			// and should not appear in the Copilot CLI agent list.
+			if (promptFile.uri.path.toLowerCase().endsWith('.chatmode.md')) {
+				continue;
+			}
 			const info = this.toCustomAgent(promptFile);
 			if (!info) {
 				continue;
@@ -346,9 +351,16 @@ export class CopilotCLIAgents extends Disposable implements ICopilotCLIAgents {
 
 export function getAgentFileNameFromFilePath(filePath: URI): string {
 	const nameFromFile = basename(filePath);
-	const indexOfAgentMd = nameFromFile.toLowerCase().indexOf('.agent.md');
-	const agentName = indexOfAgentMd > 0 ? nameFromFile.substring(0, indexOfAgentMd) : nameFromFile;
-	return agentName;
+	const lowerName = nameFromFile.toLowerCase();
+	const indexOfAgentMd = lowerName.indexOf('.agent.md');
+	if (indexOfAgentMd > 0) {
+		return nameFromFile.substring(0, indexOfAgentMd);
+	}
+	const indexOfChatmodeMd = lowerName.indexOf('.chatmode.md');
+	if (indexOfChatmodeMd > 0) {
+		return nameFromFile.substring(0, indexOfChatmodeMd);
+	}
+	return nameFromFile;
 }
 
 
diff --git a/src/extension/chatSessions/copilotcli/node/test/copilotCliAgents.spec.ts b/src/extension/chatSessions/copilotcli/node/test/copilotCliAgents.spec.ts
@@ -202,4 +202,28 @@ Second body`)]);
 		expect(second.map(a => a.agent.name)).toEqual(['Second']);
 		expect(sdk.getPackage).toHaveBeenCalled();
 	});
+
+	it('filters out legacy .chatmode.md files', async () => {
+		const chatmodeFile = new PromptFileParser().parse(
+			URI.file('/workspace/.github/chatmodes/test.chatmode.md'),
+			`---
+name: TestMode
+description: A legacy chatmode
+---
+Body`
+		);
+		const agentFile = parsePromptFile('real.agent.md', `---
+name: RealAgent
+description: A real agent
+---
+Body`);
+		const { agents } = createAgents({
+			sdkAgentsByCall: [[]],
+			promptAgents: [chatmodeFile, agentFile]
+		});
+
+		const result = await agents.getAgents();
+		expect(result).toHaveLength(1);
+		expect(result[0].agent.name).toBe('RealAgent');
+	});
 });
diff --git a/src/extension/chatSessions/vscode-node/copilotCLICustomizationProvider.ts b/src/extension/chatSessions/vscode-node/copilotCLICustomizationProvider.ts
@@ -28,7 +28,7 @@ export class CopilotCLICustomizationProvider extends Disposable implements vscod
 	static get metadata(): vscode.ChatSessionCustomizationProviderMetadata {
 		return {
 			label: 'Copilot CLI',
-			iconId: 'worktree',
+			iconId: 'copilot',
 			supportedTypes: [
 				vscode.ChatSessionCustomizationType.Agent,
 				vscode.ChatSessionCustomizationType.Skill,
diff --git a/src/extension/chatSessions/vscode-node/test/copilotCLICustomizationProvider.spec.ts b/src/extension/chatSessions/vscode-node/test/copilotCLICustomizationProvider.spec.ts
@@ -173,7 +173,7 @@ describe('CopilotCLICustomizationProvider', () => {
 	describe('metadata', () => {
 		it('has correct label and icon', () => {
 			expect(CopilotCLICustomizationProvider.metadata.label).toBe('Copilot CLI');
-			expect(CopilotCLICustomizationProvider.metadata.iconId).toBe('worktree');
+			expect(CopilotCLICustomizationProvider.metadata.iconId).toBe('copilot');
 		});
 
 		it('supports Agent, Skill, Instructions, Hook, and Plugins types', () => {
diff --git a/src/extension/prompt/node/chatMLFetcher.ts b/src/extension/prompt/node/chatMLFetcher.ts
@@ -175,6 +175,7 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
 
 		const baseTelemetry = TelemetryData.createAndMarkAsIssued({
 			...telemetryProperties,
+			headerRequestId: ourRequestId,
 			baseModel: chatEndpoint.model,
 			uiKind: ChatLocation.toString(location)
 		});
@@ -1086,6 +1087,8 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
 		});
 
 		const modelRequestId = getRequestId(connection.responseHeaders);
+		// Preserve ourRequestId as headerRequestId if the server didn't echo x-request-id
+		modelRequestId.headerRequestId = modelRequestId.headerRequestId || ourRequestId;
 		telemetryData.extendWithRequestId(modelRequestId);
 
 		for (const [key, value] of Object.entries(request)) {
@@ -1094,8 +1097,6 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
 			} // Skip messages (PII)
 			telemetryData.properties[`request.option.${key}`] = JSON.stringify(value) ?? 'undefined';
 		}
-
-		telemetryData.properties['headerRequestId'] = ourRequestId;
 		this._telemetryService.sendGHTelemetryEvent('request.sent', telemetryData.properties, telemetryData.measurements);
 
 		const requestStart = Date.now();
@@ -1396,6 +1397,8 @@ export class ChatMLFetcherImpl extends AbstractChatMLFetcher {
 			// This ID is hopefully the one the same as ourRequestId, but it is not guaranteed.
 			// If they are different then we will override the original one we set in telemetryData above.
 			const modelRequestId = getRequestId(response.headers);
+			// Preserve ourRequestId as headerRequestId if the server didn't echo x-request-id
+			modelRequestId.headerRequestId = modelRequestId.headerRequestId || ourRequestId;
 			telemetryData.extendWithRequestId(modelRequestId);
 
 			// TODO: Add response length (requires parsing)
diff --git a/src/extension/prompt/node/executionSubagentToolCallingLoop.ts b/src/extension/prompt/node/executionSubagentToolCallingLoop.ts
@@ -34,6 +34,8 @@ export interface IExecutionSubagentToolCallingLoopOptions extends IToolCallingLo
 	promptText: string;
 	/** Optional pre-generated subagent invocation ID. If not provided, a new UUID will be generated. */
 	subAgentInvocationId?: string;
+	/** The tool_call_id from the parent agent's LLM response that triggered this subagent invocation. */
+	parentToolCallId?: string;
 }
 
 export class ExecutionSubagentToolCallingLoop extends ToolCallingLoop<IExecutionSubagentToolCallingLoopOptions> {
@@ -139,10 +141,12 @@ export class ExecutionSubagentToolCallingLoop extends ToolCallingLoop<IExecution
 			// This loop is inside a tool called from another request, so never user initiated
 			userInitiatedRequest: false,
 			telemetryProperties: {
+				requestId: this.options.subAgentInvocationId,
 				messageId: randomUUID(),
 				messageSource: 'chat.editAgent',
 				subType: 'subagent/execution',
-				conversationId: this.options.conversation.sessionId
+				conversationId: this.options.conversation.sessionId,
+				parentToolCallId: this.options.parentToolCallId,
 			},
 		}, token);
 	}
diff --git a/src/extension/prompt/node/searchSubagentToolCallingLoop.ts b/src/extension/prompt/node/searchSubagentToolCallingLoop.ts
@@ -35,6 +35,8 @@ export interface ISearchSubagentToolCallingLoopOptions extends IToolCallingLoopO
 	promptText: string;
 	/** Optional pre-generated subagent invocation ID. If not provided, a new UUID will be generated. */
 	subAgentInvocationId?: string;
+	/** The tool_call_id from the parent agent's LLM response that triggered this subagent invocation. */
+	parentToolCallId?: string;
 }
 
 export class SearchSubagentToolCallingLoop extends ToolCallingLoop<ISearchSubagentToolCallingLoopOptions> {
@@ -153,10 +155,12 @@ export class SearchSubagentToolCallingLoop extends ToolCallingLoop<ISearchSubage
 			// This loop is inside a tool called from another request, so never user initiated
 			userInitiatedRequest: false,
 			telemetryProperties: {
+				requestId: this.options.subAgentInvocationId,
 				messageId: randomUUID(),
 				messageSource: 'chat.editAgent',
 				subType: 'subagent/search',
-				conversationId: this.options.conversation.sessionId
+				conversationId: this.options.conversation.sessionId,
+				parentToolCallId: this.options.parentToolCallId,
 			},
 			requestKindOptions: { kind: 'subagent' }
 		}, token);
diff --git a/src/extension/tools/node/executionSubagentTool.ts b/src/extension/tools/node/executionSubagentTool.ts
@@ -67,6 +67,7 @@ class ExecutionSubagentTool implements ICopilotTool<IExecutionSubagentParams> {
 			location: request.location,
 			promptText: options.input.query,
 			subAgentInvocationId: subAgentInvocationId,
+			parentToolCallId: options.chatStreamToolCallId,
 		});
 
 		const stream = this._inputContext?.stream && ChatResponseStreamImpl.filter(
diff --git a/src/extension/tools/node/searchSubagentTool.ts b/src/extension/tools/node/searchSubagentTool.ts
@@ -77,6 +77,7 @@ class SearchSubagentTool implements ICopilotTool<ISearchSubagentParams> {
 			location: request.location,
 			promptText: options.input.query,
 			subAgentInvocationId: subAgentInvocationId,
+			parentToolCallId: options.chatStreamToolCallId,
 		});
 
 		const stream = this._inputContext?.stream && ChatResponseStreamImpl.filter(
diff --git a/src/extension/workspaceChunkSearch/vscode-node/commands.ts b/src/extension/workspaceChunkSearch/vscode-node/commands.ts
@@ -23,7 +23,7 @@ export function register(accessor: ServicesAccessor): IDisposable {
 	disposableStore.add(vscode.commands.registerCommand(buildRemoteIndexCommandId, onlyRunOneAtATime(async () => {
 		await vscode.window.withProgress({
 			location: vscode.ProgressLocation.Window,
-			title: t`Building codebase index`,
+			title: t`Building codebase semantic index`,
 		}, async (progress, token) => {
 			const triggerResult = await workspaceChunkSearch.triggerIndexing(
 				'manual',
@@ -34,12 +34,12 @@ export function register(accessor: ServicesAccessor): IDisposable {
 
 			if (triggerResult.isError()) {
 				if (triggerResult.err.id !== TriggerRemoteIndexingError.alreadyIndexed.id) {
-					vscode.window.showWarningMessage(t`Could not build codebase index. ` + '\n\n' + triggerResult.err.userMessage);
+					vscode.window.showWarningMessage(t`Could not build codebase semantic index. ` + '\n\n' + triggerResult.err.userMessage);
 					return;
 				}
 			}
 
-			vscode.window.showInformationMessage(t`Codebase index ready to use.`);
+			vscode.window.showInformationMessage(t`Codebase semantic index ready to use.`);
 		});
 	})));
 
@@ -56,7 +56,7 @@ export function register(accessor: ServicesAccessor): IDisposable {
 	disposableStore.add(vscode.commands.registerCommand('github.copilot.debug.collectWorkspaceIndexDiagnostics', async () => {
 		vscode.window.withProgress({
 			location: vscode.ProgressLocation.Window,
-			title: t`Collecting workspace index diagnostics...`,
+			title: t`Collecting codebase index diagnostics...`,
 		}, async () => {
 			const document = await vscode.workspace.openTextDocument({ language: 'markdown' });
 			const editor = await vscode.window.showTextDocument(document);
diff --git a/src/platform/networking/common/networking.ts b/src/platform/networking/common/networking.ts
@@ -214,6 +214,8 @@ export type IChatRequestTelemetryProperties = {
 	subType?: string;
 	/** For a subagent: The request ID of the parent request that invoked this subagent. */
 	parentRequestId?: string;
+	/** For a subagent: The tool_call_id from the parent agent's LLM response that triggered this subagent invocation. */
+	parentToolCallId?: string;
 }
 
 export interface ICreateEndpointBodyOptions extends IMakeChatRequestOptions {
diff --git a/src/platform/networking/node/chatStream.ts b/src/platform/networking/node/chatStream.ts
@@ -390,6 +390,7 @@ function sendModelCallTelemetry(telemetryService: ITelemetryService, messageData
 
 		// Send one telemetry event per chunk
 		for (let chunkIndex = 0; chunkIndex < chunks.length; chunkIndex++) {
+			const parentToolCallId = telemetryData.properties.parentToolCallId;
 			const modelCallData = TelemetryData.createAndMarkAsIssued({
 				modelCallId,
 				conversationId, // Trajectory identifier linking main and supplementary calls
@@ -402,6 +403,7 @@ function sendModelCallTelemetry(telemetryService: ITelemetryService, messageData
 				...(requestTurn !== undefined && { requestTurn: requestTurn.toString() }), // Add requestTurn only for input calls
 				...(requestOptionsId && { requestOptionsId }), // Add requestOptionsId for input calls
 				...(telemetryData.properties.turnIndex && { turnIndex: telemetryData.properties.turnIndex }), // Add turnIndex from original telemetryData
+				...(parentToolCallId && { parentToolCallId }), // Link subagent calls to parent tool invocation
 			}, telemetryData.measurements); // Include measurements from original telemetryData
 
 			telemetryService.sendInternalMSFTTelemetryEvent(eventName, modelCallData.properties, modelCallData.measurements);
