Migrate LM tools over to MCP (#1528)

MicroFish91 · web-flow · commit 483ead0631fe · 2026-06-30T11:26:23.000-07:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -98,20 +98,6 @@
                 ]
             }
         ],
-        "languageModelTools": [
-            {
-                "displayName": "Azure Resources: Get Azure Activity Log",
-                "icon": "$(azure)",
-                "inputSchema": {},
-                "modelDescription": "Gets the Azure activity log",
-                "name": "azureResources_getAzureActivityLog",
-                "canBeReferencedInPrompt": true,
-                "toolReferenceName": "azureActivityLog",
-                "tags": [
-                    "azure"
-                ]
-            }
-        ],
         "terminal": {
             "profiles": [
                 {
@@ -894,6 +880,12 @@
                     }
                 ]
             }
+        ],
+        "mcpServerDefinitionProviders": [
+            {
+                "id": "vscode-azureresourcegroups.mcp",
+                "label": "%azureResourceGroups.copilot.mcp.label%"
+            }
         ]
     },
     "scripts": {
@@ -930,13 +922,15 @@
         "@microsoft/vscode-azext-azureauth": "^6.1.0-alpha.2",
         "@microsoft/vscode-azext-azureutils": "^4.3.0",
         "@microsoft/vscode-azext-utils": "^4.1.0",
+        "@microsoft/vscode-inproc-mcp": "^0.3.0",
         "form-data": "^4.0.6",
         "fs-extra": "^11.3.0",
         "jsonc-parser": "^2.2.1",
         "semver": "^7.7.3",
         "uuid": "^14.0.0",
         "vscode-nls": "^5.0.1",
         "vscode-uri": "^3.0.7",
-        "ws": "^8.21.0"
+        "ws": "^8.21.0",
+        "zod": "^4.4.3"
     }
 }
diff --git a/package.nls.json b/package.nls.json
@@ -63,5 +63,6 @@
             "Do not translate '@azure'; it is the syntax for addressing the Azure agent.",
             "Do not translate any of the words in the command URL."
         ]
-    }
+    },
+    "azureResourceGroups.copilot.mcp.label": "Copilot Azure Resources Extension Tools"
 }
diff --git a/src/chat/askAgentAboutActivityLog/askAgentAboutActivityLog.ts b/src/chat/askAgentAboutActivityLog/askAgentAboutActivityLog.ts
@@ -45,6 +45,10 @@ export async function askAgentAboutActivityLog(context: IActionContext, item?: A
         }
     }
 
+    if (!activitySelectedCache.selectionCount) {
+        return;
+    }
+
     await vscode.commands.executeCommand("workbench.action.chat.newChat");
     await vscode.commands.executeCommand("workbench.action.chat.open", { mode: 'agent', query: genericActivityLogPrompt });
 }
diff --git a/src/chat/tools/GetAzureActivityLog/GetAzureActivityLog.ts b/src/chat/tools/GetAzureActivityLog/GetAzureActivityLog.ts
diff --git a/src/chat/tools/azureActivityLog/getAzureActivityLog/GetAzureActivityLogContext.ts b/src/chat/tools/azureActivityLog/getAzureActivityLog/GetAzureActivityLogContext.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IActionContext } from "@microsoft/vscode-azext-utils";
-import { ActivitySelectedCache } from "../../askAgentAboutActivityLog/ActivitySelectedCache";
+import { ActivitySelectedCache } from "../../../askAgentAboutActivityLog/ActivitySelectedCache";
 
 export interface GetAzureActivityLogContext extends IActionContext {
     activitySelectedCache: ActivitySelectedCache;
diff --git a/src/chat/tools/azureActivityLog/getAzureActivityLog/convertActivityTree.ts b/src/chat/tools/azureActivityLog/getAzureActivityLog/convertActivityTree.ts
@@ -4,9 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ActivityAttributes, ActivityChildItemBase, ActivityChildType } from "@microsoft/vscode-azext-utils";
-import { ext } from "../../../extensionVariables";
-import { ActivityItem, ActivityStatus } from "../../../tree/activityLog/ActivityItem";
-import { TreeDataItem } from "../../../tree/ResourceGroupsItem";
+import { ext } from "../../../../extensionVariables";
+import { ActivityItem, ActivityStatus } from "../../../../tree/activityLog/ActivityItem";
+import { TreeDataItem } from "../../../../tree/ResourceGroupsItem";
 import { GetAzureActivityLogContext } from "./GetAzureActivityLogContext";
 
 export type ConvertedActivityItem = {
diff --git a/src/chat/tools/azureActivityLog/getAzureActivityLog/getAzureActivityLog.ts b/src/chat/tools/azureActivityLog/getAzureActivityLog/getAzureActivityLog.ts
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { callWithTelemetryAndErrorHandling, IActionContext } from "@microsoft/vscode-azext-utils";
+import { CopilotTool } from "@microsoft/vscode-inproc-mcp";
+import { UnspecifiedOutputSchema } from "@microsoft/vscode-inproc-mcp/mcp";
+import { l10n } from "vscode";
+import type { z } from "zod";
+import { ext } from "../../../../extensionVariables";
+import { ActivitySelectedCache } from "../../../askAgentAboutActivityLog/ActivitySelectedCache";
+import { GetAzureActivityLogContext } from "./GetAzureActivityLogContext";
+import { convertActivityTreeToSimpleObjectArray, ConvertedActivityItem, ExcludedActivityItem } from "./convertActivityTree";
+import { logActivityTelemetry, logSelectedActivityTelemetry } from "./logTelemetry";
+
+const getAzureActivityLogToolName = 'get_azure_activity_log';
+
+export const getAzureActivityLogTool: CopilotTool<z.ZodVoid, typeof UnspecifiedOutputSchema> = {
+    name: getAzureActivityLogToolName,
+    description: 'Get the Azure activity log from VS Code.',
+    annotations: {
+        readOnlyHint: true,
+        idempotentHint: true,
+    },
+    execute: async (_, extras) => {
+        return await callWithTelemetryAndErrorHandling(`mcpTool/${getAzureActivityLogToolName}/execute`, async (context: IActionContext) => {
+            context.telemetry.properties.isCopilotEvent = 'true';
+            context.telemetry.properties.sessionId = extras?.sessionId;
+            context.telemetry.properties.requestId = extras?.requestId.toString();
+            return await getAzureActivityLog(context);
+        }) ?? {
+            message: l10n.t('Failed to get the Azure activity log.'),
+            activityItems: [],
+        };
+    }
+};
+
+async function getAzureActivityLog(actionContext: IActionContext): Promise<{ message: string; activityItems: string[] }> {
+    const context: GetAzureActivityLogContext = Object.assign(actionContext, { activitySelectedCache: ActivitySelectedCache.getInstance() });
+
+    const convertedActivityItems: ConvertedActivityItem[] = await convertActivityTreeToSimpleObjectArray(context);
+    logActivityTelemetry(context, convertedActivityItems);
+
+    let selectedActivityItems: ConvertedActivityItem[] = convertedActivityItems.filter(item => !(item as ExcludedActivityItem)._exclude);
+    logSelectedActivityTelemetry(context, selectedActivityItems);
+
+    if (!context.activitySelectedCache.selectionCount) {
+        // If no items were selected (i.e. invoked mcp without using a VS Code command), default to providing the entire activity tree.
+        selectedActivityItems = convertedActivityItems;
+    } else if (selectedActivityItems.length !== context.activitySelectedCache.selectionCount) {
+        // If we weren't able to verify all of the selected items, fallback to providing the entire activity tree
+        selectedActivityItems = convertedActivityItems;
+
+        const warning: string = l10n.t('Failed to provide some of the selected item(s) to Copilot. Falling back to providing the entire activity log tree.');
+        void context.ui.showWarningMessage(warning);
+        ext.outputChannel.warn(warning);
+    }
+
+    context.activitySelectedCache.reset();
+
+    if (selectedActivityItems.length === 0) {
+        return {
+            message:
+                'No activity log items found.',
+            activityItems: [],
+        };
+    }
+
+    return {
+        message:
+            'Explain the data from the following activity items. ' +
+            'Prefer explaining the data more conversationally rather than responding with the raw json data. ' +
+            'The activities provided are in chronological order.',
+        activityItems: selectedActivityItems.map(item => JSON.stringify(item)),
+    };
+}
diff --git a/src/chat/tools/azureActivityLog/getAzureActivityLog/logTelemetry.ts b/src/chat/tools/azureActivityLog/getAzureActivityLog/logTelemetry.ts
diff --git a/src/chat/tools/registerLMTools.ts b/src/chat/tools/registerLMTools.ts
diff --git a/src/chat/tools/registerMcpTools.ts b/src/chat/tools/registerMcpTools.ts
@@ -0,0 +1,12 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { registerMcpToolWithTelemetry } from "@microsoft/vscode-inproc-mcp/vscode";
+import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { getAzureActivityLogTool } from "./azureActivityLog/getAzureActivityLog/getAzureActivityLog";
+
+export function registerMcpTools(mcpServer: McpServer): void {
+    registerMcpToolWithTelemetry(mcpServer, getAzureActivityLogTool);
+}
diff --git a/src/constants.ts b/src/constants.ts
@@ -3,10 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { l10n } from 'vscode';
+
+export const resourcesExtensionId: string = 'ms-azuretools.vscode-azureresourcegroups';
 export const azureResourceProviderId: string = 'vscode-azureresourcegroups.azureResourceProvider';
 export const contributesKey = 'x-azResources';
 // every group id has a groupBySetting/value format, so just following it
 export const ungroupedId = 'group/ungrouped';
 export const showHiddenTypesSettingKey = 'showHiddenTypes';
 export const hasFocusedGroupContextKey = 'ms-azuretools.vscode-azureresourcegroups.hasFocusedGroup';
 export const canFocusContextValue = 'canFocus';
+
+export const mcpServerId = 'vscode-azureresourcegroups.mcp';
+export const mcpServerLabel = l10n.t('Copilot Azure Resources Extension Tools');
diff --git a/src/extension.ts b/src/extension.ts
@@ -7,6 +7,7 @@
 
 import { LocationListStep, registerAzureUtilsExtensionVariables, setupAzureLogger } from '@microsoft/vscode-azext-azureutils';
 import { AzExtTreeDataProvider, AzureExtensionApiFactory, IActionContext, callWithTelemetryAndErrorHandling, createApiProvider, createAzExtLogOutputChannel, createExperimentationService, registerUIExtensionVariables } from '@microsoft/vscode-azext-utils';
+import { registerMcpHttpProvider } from '@microsoft/vscode-inproc-mcp/vscode';
 import { AzureSubscription } from 'api/src';
 import { GetApiOptions, apiUtils } from 'api/src/utils/apiUtils';
 import * as vscode from 'vscode';
@@ -23,7 +24,7 @@ import { registerWorkspaceResourceProvider } from './api/compatibility/registerW
 import { createAzureResourcesHostApi } from './api/createAzureResourcesHostApi';
 import { createWrappedAzureResourcesExtensionApi } from './api/createWrappedAzureResourcesExtensionApi';
 import { registerChatStandInParticipantIfNeeded } from './chat/chatStandIn';
-import { registerLMTools } from './chat/tools/registerLMTools';
+import { registerMcpTools } from './chat/tools/registerMcpTools';
 import { createCloudConsole } from './cloudConsole/cloudConsole';
 import { registerActivity } from './commands/activities/registerActivity';
 import { registerActivityLogTree } from './commands/activities/registerActivityLogTree';
@@ -32,6 +33,7 @@ import { deleteResourceGroupV2 } from './commands/deleteResourceGroup/v2/deleteR
 import { registerCommands } from './commands/registerCommands';
 import { TagFileSystem } from './commands/tags/TagFileSystem';
 import { registerTagDiagnostics } from './commands/tags/registerTagDiagnostics';
+import { mcpServerId, mcpServerLabel, resourcesExtensionId } from './constants';
 import { registerExportAuthRecordOnSessionChange } from './exportAuthRecord';
 import { ext } from './extensionVariables';
 import { AzureResourcesApiInternal } from './hostapi.v2.internal';
@@ -62,6 +64,7 @@ export async function activate(context: vscode.ExtensionContext, perfStats: { lo
     perfStats ||= { loadStartTime: Date.now(), loadEndTime: Date.now() };
 
     ext.context = context;
+    ext.version = vscode.extensions.getExtension(resourcesExtensionId)?.packageJSON.version;
     ext.outputChannel = createAzExtLogOutputChannel('Azure Resource Groups');
     context.subscriptions.push(ext.outputChannel);
     context.subscriptions.push(setupAzureLogger(ext.outputChannel));
@@ -90,7 +93,6 @@ export async function activate(context: vscode.ExtensionContext, perfStats: { lo
         activateContext.telemetry.properties.isActivationEvent = 'true';
         activateContext.telemetry.measurements.mainFileLoad = (perfStats.loadEndTime - perfStats.loadStartTime) / 1000;
 
-
         ext.subscriptionProviderFactory = getSubscriptionProviderFactory();
 
         ext.tagFS = new TagFileSystem(ext.appResourceTree);
@@ -118,7 +120,12 @@ export async function activate(context: vscode.ExtensionContext, perfStats: { lo
         survey(context);
 
         registerChatStandInParticipantIfNeeded(context);
-        registerLMTools();
+        registerMcpHttpProvider(context, {
+            id: mcpServerId,
+            serverLabel: mcpServerLabel,
+            serverVersion: ext.version,
+            registerTools: (server) => registerMcpTools(server),
+        });
     });
 
     const extensionManager = new ResourceGroupsExtensionManager();
@@ -202,7 +209,7 @@ export async function activate(context: vscode.ExtensionContext, perfStats: { lo
         }
     };
 
-    ext.v2.api = v2ApiFactory.createApi({ extensionId: 'ms-azuretools.vscode-azureresourcegroups' });
+    ext.v2.api = v2ApiFactory.createApi({ extensionId: resourcesExtensionId });
     ext.managedIdentityBranchDataProvider = new ManagedIdentityBranchDataProvider();
     ext.v2.api.resources.registerAzureResourceBranchDataProvider(AzExtResourceType.ManagedIdentityUserAssignedIdentities, ext.managedIdentityBranchDataProvider);
 
diff --git a/src/extensionVariables.ts b/src/extensionVariables.ts
@@ -6,7 +6,7 @@
 import { AzureSubscriptionProvider } from "@microsoft/vscode-azext-azureauth";
 import { AzExtTreeDataProvider, IAzExtLogOutputChannel, IExperimentationServiceAdapter } from "@microsoft/vscode-azext-utils";
 import { AzExtResourceType } from "api/src/AzExtResourceType";
-import { DiagnosticCollection, Disposable, ExtensionContext, TreeView } from "vscode";
+import type { DiagnosticCollection, Disposable, ExtensionContext, TreeView } from "vscode";
 import { TagFileSystem } from "./commands/tags/TagFileSystem";
 import { AzureResourcesApiInternal } from "./hostapi.v2.internal";
 import { ManagedIdentityBranchDataProvider } from "./managedIdentity/ManagedIdentityBranchDataProvider";
@@ -31,6 +31,7 @@ export namespace extActions {
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace ext {
     export let context: ExtensionContext;
+    export let version: string;
     // TODO: do we need this? only used by load more command
     export let appResourceTree: AzExtTreeDataProvider;
     export let appResourceTreeView: TreeView<unknown>;

Original file line number	Diff line number	Diff line change
`@@ -98,20 +98,6 @@`
`98`	`98`	`]`
`99`	`99`	`}`
`100`	`100`	`],`
`101`		`- "languageModelTools": [`
`102`		`- {`
`103`		`- "displayName": "Azure Resources: Get Azure Activity Log",`
`104`		`- "icon": "$(azure)",`
`105`		`- "inputSchema": {},`
`106`		`- "modelDescription": "Gets the Azure activity log",`
`107`		`- "name": "azureResources_getAzureActivityLog",`
`108`		`- "canBeReferencedInPrompt": true,`
`109`		`- "toolReferenceName": "azureActivityLog",`
`110`		`- "tags": [`
`111`		`- "azure"`
`112`		`- ]`
`113`		`- }`
`114`		`- ],`
`115`	`101`	`"terminal": {`
`116`	`102`	`"profiles": [`
`117`	`103`	`{`
`@@ -894,6 +880,12 @@`
`894`	`880`	`}`
`895`	`881`	`]`
`896`	`882`	`}`
	`883`	`+ ],`
	`884`	`+ "mcpServerDefinitionProviders": [`
	`885`	`+ {`
	`886`	`+ "id": "vscode-azureresourcegroups.mcp",`
	`887`	`+ "label": "%azureResourceGroups.copilot.mcp.label%"`
	`888`	`+ }`
`897`	`889`	`]`
`898`	`890`	`},`
`899`	`891`	`"scripts": {`
`@@ -930,13 +922,15 @@`
`930`	`922`	`"@microsoft/vscode-azext-azureauth": "^6.1.0-alpha.2",`
`931`	`923`	`"@microsoft/vscode-azext-azureutils": "^4.3.0",`
`932`	`924`	`"@microsoft/vscode-azext-utils": "^4.1.0",`
	`925`	`+ "@microsoft/vscode-inproc-mcp": "^0.3.0",`
`933`	`926`	`"form-data": "^4.0.6",`
`934`	`927`	`"fs-extra": "^11.3.0",`
`935`	`928`	`"jsonc-parser": "^2.2.1",`
`936`	`929`	`"semver": "^7.7.3",`
`937`	`930`	`"uuid": "^14.0.0",`
`938`	`931`	`"vscode-nls": "^5.0.1",`
`939`	`932`	`"vscode-uri": "^3.0.7",`
`940`		`- "ws": "^8.21.0"`
	`933`	`+ "ws": "^8.21.0",`
	`934`	`+ "zod": "^4.4.3"`
`941`	`935`	`}`
`942`	`936`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,6 @@`
`63`	`63`	`"Do not translate '@azure'; it is the syntax for addressing the Azure agent.",`
`64`	`64`	`"Do not translate any of the words in the command URL."`
`65`	`65`	`]`
`66`		`- }`
	`66`	`+ },`
	`67`	`+ "azureResourceGroups.copilot.mcp.label": "Copilot Azure Resources Extension Tools"`
`67`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,10 @@ export async function askAgentAboutActivityLog(context: IActionContext, item?: A`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
	`48`	`+ if (!activitySelectedCache.selectionCount) {`
	`49`	`+ return;`
	`50`	`+ }`
	`51`	`+`
`48`	`52`	`await vscode.commands.executeCommand("workbench.action.chat.newChat");`
`49`	`53`	`await vscode.commands.executeCommand("workbench.action.chat.open", { mode: 'agent', query: genericActivityLogPrompt });`
`50`	`54`	`}`