@microsoft/agents-a365-tooling 0.1.0-preview.95 → 0.2.0-preview.3

package/dist/cjs/McpToolServerConfigurationService.d.ts

@@ -1,34 +1,85 @@
-import { TurnContext } from '@microsoft/agents-hosting';
-import { OperationResult } from '@microsoft/agents-a365-runtime';
+import { TurnContext, Authorization } from '@microsoft/agents-hosting';
+import { OperationResult, IConfigurationProvider } from '@microsoft/agents-a365-runtime';
 import { MCPServerConfig, McpClientTool, ToolOptions } from './contracts';
 import { ChatHistoryMessage } from './models/index';
+import { ToolingConfiguration } from './configuration';
 /**
  * Service responsible for discovering and normalizing MCP (Model Context Protocol)
  * tool servers and producing configuration objects consumable by the Claude SDK.
  */
 export declare class McpToolServerConfigurationService {
     private readonly logger;
+    private readonly configProvider;
     /**
      * Construct a McpToolServerConfigurationService.
+     * @param configProvider Optional configuration provider. Defaults to defaultToolingConfigurationProvider if not specified.
      */
-    constructor();
+    constructor(configProvider?: IConfigurationProvider<ToolingConfiguration>);
     /**
      * Return MCP server definitions for the given agent. In development (NODE_ENV=Development) this reads the local ToolingManifest.json; otherwise it queries the remote tooling gateway.
      *
+     * @deprecated Use the overload with TurnContext and Authorization parameters instead to enable x-ms-agentid header support and automatic token generation.
      * @param agenticAppId The agentic app id for which to discover servers.
-     * @param authToken Optional bearer token used when querying the remote tooling gateway.
+     * @param authToken Bearer token used when querying the remote tooling gateway.
      * @returns A promise resolving to an array of normalized MCP server configuration objects.
      */
     listToolServers(agenticAppId: string, authToken: string): Promise<MCPServerConfig[]>;
     /**
      * Return MCP server definitions for the given agent. In development (NODE_ENV=Development) this reads the local ToolingManifest.json; otherwise it queries the remote tooling gateway.
      *
+     * @deprecated Use the overload with TurnContext and Authorization parameters instead to enable x-ms-agentid header support and automatic token generation.
      * @param agenticAppId The agentic app id for which to discover servers.
-     * @param authToken Optional bearer token used when querying the remote tooling gateway.
+     * @param authToken Bearer token used when querying the remote tooling gateway.
      * @param options Optional tool options when calling the gateway.
      * @returns A promise resolving to an array of normalized MCP server configuration objects.
      */
     listToolServers(agenticAppId: string, authToken: string, options?: ToolOptions): Promise<MCPServerConfig[]>;
+    /**
+     * Return MCP server definitions for the given agent. In development (NODE_ENV=Development) this reads the local ToolingManifest.json; otherwise it queries the remote tooling gateway.
+     * This overload automatically resolves the agenticAppId from the TurnContext and generates the auth token if not provided.
+     *
+     * @param turnContext The TurnContext of the current request.
+     * @param authorization Authorization object for token exchange.
+     * @param authHandlerName The name of the auth handler to use for token exchange.
+     * @param authToken Optional bearer token. If not provided, will be auto-generated via token exchange.
+     * @param options Optional tool options when calling the gateway.
+     * @returns A promise resolving to an array of normalized MCP server configuration objects.
+     */
+    listToolServers(turnContext: TurnContext, authorization: Authorization, authHandlerName: string, authToken?: string, options?: ToolOptions): Promise<MCPServerConfig[]>;
+    /**
+     * Acquire one token per unique audience across the provided server list and attach
+     * the correct `Authorization: Bearer` header to each server's headers.
+     * V1 servers (no `audience` field, or ATG AppId) all share the same token (one exchange).
+     * V2 servers each get a token scoped to their own audience GUID.
+     * Token acquisition is delegated to `acquire`, enabling different strategies in dev
+     * (env vars via createDevTokenAcquirer) and prod (OBO via createOboTokenAcquirer)
+     * while keeping scope resolution, deduplication, and header attachment identical.
+     */
+    private attachPerAudienceTokens;
+    /**
+     * Returns a TokenAcquirer that resolves tokens from environment variables (local dev only).
+     * Resolution order per server:
+     *   1. BEARER_TOKEN_<MCPSERVERNAME_UPPER>  — per-server token (effective for V2 unique audiences)
+     *   2. BEARER_TOKEN                         — shared fallback (V1 servers share one token)
+     * Returns null when neither variable is set; no Authorization header is attached.
+     * Emits a warning when a V2 server (distinct audience) falls back to the shared BEARER_TOKEN,
+     * because that token is scoped to the shared ATG audience and will cause a 401 at the server.
+     */
+    private createDevTokenAcquirer;
+    /**
+     * Returns a TokenAcquirer for the deprecated legacy (agenticAppId, authToken) overload in prod.
+     * V1 servers (ATG shared scope) receive the caller-supplied authToken directly.
+     * V2 servers (per-audience scope) throw immediately — OBO exchange requires Authorization and
+     * authHandlerName which the legacy signature does not provide; callers must migrate to the
+     * TurnContext-based overload.
+     */
+    private createLegacyProdTokenAcquirer;
+    /**
+     * Returns a TokenAcquirer that performs OBO token exchange via AgenticAuthenticationService.
+     * Throws if the exchange returns null so callers receive an explicit error rather than a
+     * silently missing Authorization header.
+     */
+    private createOboTokenAcquirer;
     /**
      * Connect to the MCP server and return tools with names prefixed by the server name.
      * Throws if the server URL is missing or the client fails to list tools.
@@ -69,6 +120,7 @@ export declare class McpToolServerConfigurationService {
      *
      * @param agenticAppId The agentic app id used by the tooling gateway to scope results.
      * @param authToken Optional Bearer token to include in the Authorization header when calling the gateway.
+     * @param turnContext Optional TurnContext for extracting agent blueprint ID for request headers.
      * @param options Optional tool options when calling the gateway.
      * @throws Error when the gateway call fails or returns an unexpected payload.
      */
@@ -100,10 +152,26 @@ export declare class McpToolServerConfigurationService {
      */
     private getMCPServerConfigsFromManifest;
     /**
-     * Detect if the process is running in a development scenario based on environment variables.
+     * Detect if the process is running in a development scenario based on configuration.
      *
-     * @returns {boolean} True when running in a development environment.
+     * @returns {boolean} True when running in a development environment (NODE_ENV=Development).
      */
     private isDevScenario;
+    /**
+     * Gets the base URL for MCP platform from configuration.
+     */
+    private getMcpPlatformBaseUrl;
+    /**
+     * Construct the tooling gateway URL for a given agent identity.
+     */
+    private getToolingGatewayUrl;
+    /**
+     * Build the full URL for accessing a specific MCP server.
+     */
+    private buildMcpServerUrl;
+    /**
+     * Constructs the endpoint URL for sending chat history.
+     */
+    private getChatHistoryEndpoint;
 }
 //# sourceMappingURL=McpToolServerConfigurationService.d.ts.map

package/dist/cjs/McpToolServerConfigurationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpToolServerConfigurationService.d.ts","sourceRoot":"","sources":["../../src/McpToolServerConfigurationService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAkB,MAAM,gCAAgC,CAAC;AACjF,OAAO,EAAE,eAAe,EAA0B,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAsB,MAAM,gBAAgB,CAAC;AAMxE;;;GAGG;AACH,qBAAa,iCAAiC;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAElC;;OAEG;;IAIH;;;;;;OAMG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAE1F;;;;;;;OAOG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAOjH;;;OAGG;IACG,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA8B1G;;;;;;;;;;;;OAYG;IACG,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAEpH;;;;;;;;;;;;;OAaG;IACG,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;IAyE3I;;;;;;;;OAQG;YACW,qCAAqC;IAsBnD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;YACW,+BAA+B;IAoC7C;;;;OAIG;IACH,OAAO,CAAC,aAAa;CAItB"}
+{"version":3,"file":"McpToolServerConfigurationService.d.ts","sourceRoot":"","sources":["../../src/McpToolServerConfigurationService.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,eAAe,EAAkB,sBAAsB,EAA2D,MAAM,gCAAgC,CAAC;AAClK,OAAO,EAAE,eAAe,EAA0B,aAAa,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClG,OAAO,EAAE,kBAAkB,EAAsB,MAAM,gBAAgB,CAAC;AAExE,OAAO,EAAE,oBAAoB,EAAmE,MAAM,iBAAiB,CAAC;AAWxH;;;GAGG;AACH,qBAAa,iCAAiC;IAC5C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAW;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+C;IAE9E;;;OAGG;gBACS,cAAc,CAAC,EAAE,sBAAsB,CAAC,oBAAoB,CAAC;IAIzE;;;;;;;OAOG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAE1F;;;;;;;;OAQG;IACG,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAEjH;;;;;;;;;;OAUG;IACG,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAkF7K;;;;;;;;OAQG;YACW,uBAAuB;IAuBrC;;;;;;;;OAQG;IACH,OAAO,CAAC,sBAAsB;IAiB9B;;;;;;OAMG;IACH,OAAO,CAAC,6BAA6B;IAcrC;;;;OAIG;IACH,OAAO,CAAC,sBAAsB;IAgB9B;;;OAGG;IACG,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,eAAe,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA8B1G;;;;;;;;;;;;OAYG;IACG,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC;IAEpH;;;;;;;;;;;;;OAaG;IACG,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,EAAE,OAAO,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC;IAyE3I;;;;;;;;;OASG;YACW,qCAAqC;IA8BnD;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;YACW,+BAA+B;IAuC7C;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAIrB;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAI7B;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAI5B;;OAEG;IACH,OAAO,CAAC,iBAAiB;IAIzB;;OAEG;IACH,OAAO,CAAC,sBAAsB;CAG/B"}

package/dist/cjs/McpToolServerConfigurationService.js

@@ -11,6 +11,7 @@ const path_1 = __importDefault(require("path"));
 const axios_1 = __importDefault(require("axios"));
 const agents_a365_runtime_1 = require("@microsoft/agents-a365-runtime");
 const Utility_1 = require("./Utility");
+const configuration_1 = require("./configuration");
 const streamableHttp_js_1 = require("@modelcontextprotocol/sdk/client/streamableHttp.js");
 const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
 /**
@@ -20,13 +21,155 @@ const index_js_1 = require("@modelcontextprotocol/sdk/client/index.js");
 class McpToolServerConfigurationService {
     /**
      * Construct a McpToolServerConfigurationService.
+     * @param configProvider Optional configuration provider. Defaults to defaultToolingConfigurationProvider if not specified.
      */
-    constructor() {
+    constructor(configProvider) {
         this.logger = console;
+        this.configProvider = configProvider ?? configuration_1.defaultToolingConfigurationProvider;
     }
-    async listToolServers(agenticAppId, authToken, options) {
-        return await (this.isDevScenario() ? this.getMCPServerConfigsFromManifest() :
-            this.getMCPServerConfigsFromToolingGateway(agenticAppId, authToken, options));
+    async listToolServers(agenticAppIdOrTurnContext, authTokenOrAuthorization, optionsOrAuthHandlerName, authTokenOrOptions, options) {
+        // Detect which signature is being used based on the type of the first parameter
+        if (typeof agenticAppIdOrTurnContext === 'string') {
+            // LEGACY PATH: listToolServers(agenticAppId, authToken, options?)
+            const agenticAppId = agenticAppIdOrTurnContext;
+            // Runtime validation for legacy signature parameters
+            if (typeof authTokenOrAuthorization !== 'string') {
+                throw new Error('authToken must be a string when using the legacy listToolServers(agenticAppId, authToken) signature');
+            }
+            const authToken = authTokenOrAuthorization;
+            const toolOptions = optionsOrAuthHandlerName;
+            const servers = await (this.isDevScenario()
+                ? this.getMCPServerConfigsFromManifest()
+                : this.getMCPServerConfigsFromToolingGateway(agenticAppId, authToken, undefined, toolOptions));
+            // Apply per-audience tokens on the legacy path too, using the same structural path as the
+            // new overload so V2 servers are never silently missing an Authorization header.
+            // Dev: reads from BEARER_TOKEN_<NAME> / BEARER_TOKEN env vars, supports V1 and V2.
+            // Prod: uses the shared authToken for V1 servers; throws for V2 servers (OBO requires
+            //       Authorization and authHandlerName — use the TurnContext-based overload instead).
+            const acquire = this.isDevScenario()
+                ? this.createDevTokenAcquirer()
+                : this.createLegacyProdTokenAcquirer(authToken);
+            return await this.attachPerAudienceTokens(servers, acquire);
+        }
+        else {
+            // NEW PATH: listToolServers(turnContext, authorization, authHandlerName, authToken?, options?)
+            const turnContext = agenticAppIdOrTurnContext;
+            // Runtime validation for new signature parameters
+            if (typeof authTokenOrAuthorization === 'string') {
+                throw new Error('authorization must be an Authorization object when using the new listToolServers(turnContext, authorization, authHandlerName) signature');
+            }
+            if (typeof optionsOrAuthHandlerName !== 'string') {
+                throw new Error('authHandlerName must be a string when using the new listToolServers(turnContext, authorization, authHandlerName) signature');
+            }
+            const authorization = authTokenOrAuthorization;
+            const authHandlerName = optionsOrAuthHandlerName;
+            let authToken = authTokenOrOptions;
+            const toolOptions = options;
+            // Auto-generate token if not provided
+            if (!authToken) {
+                const scopes = [this.configProvider.getConfiguration().mcpPlatformAuthenticationScope];
+                authToken = await agents_a365_runtime_1.AgenticAuthenticationService.GetAgenticUserToken(authorization, authHandlerName, turnContext, scopes);
+                if (!authToken) {
+                    throw new Error('Failed to obtain authentication token from token exchange');
+                }
+            }
+            // Note: Token validation (format/expiration) is performed inside getMCPServerConfigsFromToolingGateway()
+            // to avoid duplicate validation (it's also called by the legacy path)
+            // Resolve agenticAppId from TurnContext
+            const agenticAppId = agents_a365_runtime_1.Utility.ResolveAgentIdentity(turnContext, authToken);
+            // Discover servers: manifest in dev, gateway in prod
+            const servers = await (this.isDevScenario()
+                ? this.getMCPServerConfigsFromManifest()
+                : this.getMCPServerConfigsFromToolingGateway(agenticAppId, authToken, turnContext, toolOptions));
+            // Acquire and attach per-server tokens via the same structural path in both envs.
+            // Token source differs: env vars in dev, OBO in prod.
+            const acquire = this.isDevScenario()
+                ? this.createDevTokenAcquirer()
+                : this.createOboTokenAcquirer(authorization, authHandlerName, turnContext);
+            return await this.attachPerAudienceTokens(servers, acquire);
+        }
+    }
+    /**
+     * Acquire one token per unique audience across the provided server list and attach
+     * the correct `Authorization: Bearer` header to each server's headers.
+     * V1 servers (no `audience` field, or ATG AppId) all share the same token (one exchange).
+     * V2 servers each get a token scoped to their own audience GUID.
+     * Token acquisition is delegated to `acquire`, enabling different strategies in dev
+     * (env vars via createDevTokenAcquirer) and prod (OBO via createOboTokenAcquirer)
+     * while keeping scope resolution, deduplication, and header attachment identical.
+     */
+    async attachPerAudienceTokens(servers, acquire) {
+        // Fetch once so scope resolution and the legacy-path guard use the same value.
+        const sharedScope = this.configProvider.getConfiguration().mcpPlatformAuthenticationScope;
+        const tokenCache = new Map(); // scope → token (null = no token available)
+        const result = [];
+        for (const server of servers) {
+            const scope = (0, configuration_1.resolveTokenScopeForServer)(server, sharedScope);
+            if (!tokenCache.has(scope)) {
+                tokenCache.set(scope, await acquire(server, scope));
+            }
+            const token = tokenCache.get(scope);
+            result.push(token
+                ? { ...server, headers: { ...server.headers, Authorization: `Bearer ${token}` } }
+                : server // no token available — dev no-op; prod acquirer would have thrown already
+            );
+        }
+        return result;
+    }
+    /**
+     * Returns a TokenAcquirer that resolves tokens from environment variables (local dev only).
+     * Resolution order per server:
+     *   1. BEARER_TOKEN_<MCPSERVERNAME_UPPER>  — per-server token (effective for V2 unique audiences)
+     *   2. BEARER_TOKEN                         — shared fallback (V1 servers share one token)
+     * Returns null when neither variable is set; no Authorization header is attached.
+     * Emits a warning when a V2 server (distinct audience) falls back to the shared BEARER_TOKEN,
+     * because that token is scoped to the shared ATG audience and will cause a 401 at the server.
+     */
+    createDevTokenAcquirer() {
+        const sharedScope = this.configProvider.getConfiguration().mcpPlatformAuthenticationScope;
+        return (server, scope) => {
+            const serverName = server.mcpServerName ?? '';
+            const config = this.configProvider.getConfiguration();
+            const token = config.getBearerTokenForServer(serverName);
+            if (token && !config.hasPerServerBearerToken(serverName) && scope !== sharedScope) {
+                this.logger.warn(`Dev: MCP server '${serverName}' requires scope '${scope}' but only BEARER_TOKEN is set. ` +
+                    `The shared token is scoped to a different audience and will likely cause a 401. ` +
+                    `Set BEARER_TOKEN_${serverName.toUpperCase()} to a token acquired for the correct audience.`);
+            }
+            return Promise.resolve(token ?? null);
+        };
+    }
+    /**
+     * Returns a TokenAcquirer for the deprecated legacy (agenticAppId, authToken) overload in prod.
+     * V1 servers (ATG shared scope) receive the caller-supplied authToken directly.
+     * V2 servers (per-audience scope) throw immediately — OBO exchange requires Authorization and
+     * authHandlerName which the legacy signature does not provide; callers must migrate to the
+     * TurnContext-based overload.
+     */
+    createLegacyProdTokenAcquirer(authToken) {
+        const sharedScope = this.configProvider.getConfiguration().mcpPlatformAuthenticationScope;
+        return (server, scope) => {
+            if (scope !== sharedScope) {
+                throw new Error(`MCP server '${server.mcpServerName}' requires a per-audience token (scope: '${scope}'). ` +
+                    `Per-audience token exchange is not supported by the deprecated listToolServers(agenticAppId, authToken) overload. ` +
+                    `Migrate to listToolServers(turnContext, authorization, authHandlerName) instead.`);
+            }
+            return Promise.resolve(authToken);
+        };
+    }
+    /**
+     * Returns a TokenAcquirer that performs OBO token exchange via AgenticAuthenticationService.
+     * Throws if the exchange returns null so callers receive an explicit error rather than a
+     * silently missing Authorization header.
+     */
+    createOboTokenAcquirer(authorization, authHandlerName, turnContext) {
+        return async (server, scope) => {
+            const token = await agents_a365_runtime_1.AgenticAuthenticationService.GetAgenticUserToken(authorization, authHandlerName, turnContext, [scope]);
+            if (!token) {
+                throw new Error(`Failed to obtain token for MCP server '${server.mcpServerName}' (scope: ${scope})`);
+            }
+            return token;
+        };
     }
     /**
      * Connect to the MCP server and return tools with names prefixed by the server name.
@@ -74,7 +217,7 @@ class McpToolServerConfigurationService {
             throw new Error('User message is required but not found in turn context');
         }
         // Get the endpoint URL
-        const endpoint = Utility_1.Utility.GetChatHistoryEndpoint();
+        const endpoint = this.getChatHistoryEndpoint();
         this.logger.info(`Sending chat history to endpoint: ${endpoint}`);
         // Create the request payload
         const request = {
@@ -117,19 +260,28 @@ class McpToolServerConfigurationService {
      *
      * @param agenticAppId The agentic app id used by the tooling gateway to scope results.
      * @param authToken Optional Bearer token to include in the Authorization header when calling the gateway.
+     * @param turnContext Optional TurnContext for extracting agent blueprint ID for request headers.
      * @param options Optional tool options when calling the gateway.
      * @throws Error when the gateway call fails or returns an unexpected payload.
      */
-    async getMCPServerConfigsFromToolingGateway(agenticAppId, authToken, options) {
+    async getMCPServerConfigsFromToolingGateway(agenticAppId, authToken, turnContext, options) {
         // Validate the authentication token
         Utility_1.Utility.ValidateAuthToken(authToken);
-        const configEndpoint = Utility_1.Utility.GetToolingGatewayForDigitalWorker(agenticAppId);
+        const configEndpoint = this.getToolingGatewayUrl(agenticAppId);
         try {
             const response = await axios_1.default.get(configEndpoint, {
-                headers: Utility_1.Utility.GetToolRequestHeaders(authToken, undefined, options),
+                headers: Utility_1.Utility.GetToolRequestHeaders(authToken, turnContext, options),
                 timeout: 10000 // 10 seconds timeout
             });
-            return (response.data) || [];
+            const rawServers = response.data || [];
+            return rawServers.map(s => ({
+                mcpServerName: s.mcpServerName,
+                url: s.url,
+                headers: s.headers,
+                audience: s.audience,
+                scope: s.scope,
+                publisher: s.publisher,
+            }));
         }
         catch (err) {
             const error = err;
@@ -183,8 +335,11 @@ class McpToolServerConfigurationService {
                 }
                 return {
                     mcpServerName: serverName,
-                    url: s.url || Utility_1.Utility.BuildMcpServerUrl(serverName),
-                    headers: s.headers
+                    url: s.url || this.buildMcpServerUrl(serverName),
+                    headers: s.headers,
+                    audience: s.audience,
+                    scope: s.scope,
+                    publisher: s.publisher,
                 };
             });
         }
@@ -195,13 +350,36 @@ class McpToolServerConfigurationService {
         }
     }
     /**
-     * Detect if the process is running in a development scenario based on environment variables.
+     * Detect if the process is running in a development scenario based on configuration.
      *
-     * @returns {boolean} True when running in a development environment.
+     * @returns {boolean} True when running in a development environment (NODE_ENV=Development).
      */
     isDevScenario() {
-        const environment = process.env.NODE_ENV || '';
-        return environment.toLowerCase() === 'development';
+        return this.configProvider.getConfiguration().useToolingManifest;
+    }
+    /**
+     * Gets the base URL for MCP platform from configuration.
+     */
+    getMcpPlatformBaseUrl() {
+        return this.configProvider.getConfiguration().mcpPlatformEndpoint;
+    }
+    /**
+     * Construct the tooling gateway URL for a given agent identity.
+     */
+    getToolingGatewayUrl(agenticAppId) {
+        return `${this.getMcpPlatformBaseUrl()}/agents/v2/${agenticAppId}/mcpServers`;
+    }
+    /**
+     * Build the full URL for accessing a specific MCP server.
+     */
+    buildMcpServerUrl(serverName) {
+        return `${this.getMcpPlatformBaseUrl()}/agents/servers/${serverName}/`;
+    }
+    /**
+     * Constructs the endpoint URL for sending chat history.
+     */
+    getChatHistoryEndpoint() {
+        return `${this.getMcpPlatformBaseUrl()}/agents/real-time-threat-protection/chat-message`;
     }
 }
 exports.McpToolServerConfigurationService = McpToolServerConfigurationService;

package/dist/cjs/McpToolServerConfigurationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"McpToolServerConfigurationService.js","sourceRoot":"","sources":["../../src/McpToolServerConfigurationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"McpToolServerConfigurationService.js","sourceRoot":"","sources":["../../src/McpToolServerConfigurationService.ts"],"names":[],"mappings":"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"}

package/dist/cjs/Utility.d.ts

@@ -1,9 +1,13 @@
 import { TurnContext } from '@microsoft/agents-hosting';
+import { IConfigurationProvider } from '@microsoft/agents-a365-runtime';
 import { ToolOptions } from './contracts';
+import { ToolingConfiguration } from './configuration';
 export declare class Utility {
     static readonly HEADER_CHANNEL_ID = "x-ms-channel-id";
     static readonly HEADER_SUBCHANNEL_ID = "x-ms-subchannel-id";
     static readonly HEADER_USER_AGENT = "User-Agent";
+    /** Header name for sending the agent identifier to MCP platform for logging/analytics. */
+    static readonly HEADER_AGENT_ID = "x-ms-agentid";
     /**
      * Compose standard headers for MCP tooling requests.
      * Includes Authorization bearer token when provided, and optionally includes channel and subchannel identifiers for routing.
@@ -14,6 +18,18 @@ export declare class Utility {
      * @returns A headers record suitable for HTTP requests.
      */
     static GetToolRequestHeaders(authToken?: string, turnContext?: TurnContext, options?: ToolOptions): Record<string, string>;
+    /**
+     * Resolves the best available agent identifier for the x-ms-agentid header.
+     * Priority: TurnContext.agenticAppBlueprintId > token claims (xms_par_app_azp > appid > azp) > application name
+     *
+     * Note: This differs from RuntimeUtility.ResolveAgentIdentity() which resolves the agenticAppId
+     * for URL construction. This method resolves the identifier specifically for the x-ms-agentid header.
+     *
+     * @param authToken The authentication token to extract claims from.
+     * @param turnContext Optional TurnContext to extract agent blueprint ID from.
+     * @returns Agent ID string or undefined if not available.
+     */
+    private static resolveAgentIdForHeader;
     /**
      * Validates a JWT authentication token.
      * Checks that the token is a valid JWT and is not expired.
@@ -36,18 +52,22 @@ export declare class Utility {
      *
      * Example:
      *   Utility.GetToolingGatewayForDigitalWorker(agenticAppId)
-     *   // => "https://agent365.svc.cloud.microsoft/agents/{agenticAppId}/mcpServers"
+     *   // => "https://agent365.svc.cloud.microsoft/agents/v2/{agenticAppId}/mcpServers"
      *
      * @param agenticAppId - The unique identifier for the agent identity.
+     * @param configProvider - Optional configuration provider. Defaults to defaultToolingConfigurationProvider.
      * @returns A fully-qualified URL pointing at the tooling gateway for the agent.
+     * @deprecated This method is for internal use only. Use McpToolServerConfigurationService.listToolServers() instead.
      */
-    static GetToolingGatewayForDigitalWorker(agenticAppId: string): string;
+    static GetToolingGatewayForDigitalWorker(agenticAppId: string, configProvider?: IConfigurationProvider<ToolingConfiguration>): string;
     /**
      * Get the base URL used to query MCP environments.
      *
+     * @param configProvider - Optional configuration provider. Defaults to defaultToolingConfigurationProvider.
      * @returns The base MCP environments URL.
+     * @deprecated This method is for internal use only. Use McpToolServerConfigurationService instead.
      */
-    static GetMcpBaseUrl(): string;
+    static GetMcpBaseUrl(configProvider?: IConfigurationProvider<ToolingConfiguration>): string;
     /**
      * Build the full URL for accessing a specific MCP server.
      *
@@ -56,25 +76,31 @@ export declare class Utility {
      *   // => "https://agent365.svc.cloud.microsoft/agents/servers/MyServer/"
      *
      * @param serverName - The MCP server resource name.
+     * @param configProvider - Optional configuration provider. Defaults to defaultToolingConfigurationProvider.
      * @returns The fully-qualified MCP server URL including trailing slash.
+     * @deprecated This method is for internal use only. Use McpToolServerConfigurationService instead.
     */
-    static BuildMcpServerUrl(serverName: string): string;
+    static BuildMcpServerUrl(serverName: string, configProvider?: IConfigurationProvider<ToolingConfiguration>): string;
     /**
-     * Gets the base URL for MCP platform, defaults to production URL if not set.
+     * Gets the base URL for MCP platform from configuration.
      *
+     * @param configProvider - Optional configuration provider. Defaults to defaultToolingConfigurationProvider.
      * @returns The base URL for MCP platform.
+     * @deprecated This method is for internal use only. Use ToolingConfiguration.mcpPlatformEndpoint instead.
      */
     private static getMcpPlatformBaseUrl;
     /**
      * Constructs the endpoint URL for sending chat history to the MCP platform for real-time threat protection.
      *
+     * @param configProvider - Optional configuration provider. Defaults to defaultToolingConfigurationProvider.
      * @returns An absolute URL that tooling components can use to send or retrieve chat messages for
      * real-time threat protection scenarios.
      * @remarks
      * Call this method when constructing HTTP requests that need to access the chat-message history
      * for real-time threat protection. The returned URL already includes the MCP platform base address
      * and the fixed path segment `/agents/real-time-threat-protection/chat-message`.
+     * @deprecated This method is for internal use only. Use McpToolServerConfigurationService.sendChatHistory() instead.
      */
-    static GetChatHistoryEndpoint(): string;
+    static GetChatHistoryEndpoint(configProvider?: IConfigurationProvider<ToolingConfiguration>): string;
 }
 //# sourceMappingURL=Utility.d.ts.map

package/dist/cjs/Utility.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Utility.d.ts","sourceRoot":"","sources":["../../src/Utility.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK1C,qBAAa,OAAO;IAClB,gBAAuB,iBAAiB,qBAAqB;IAC7D,gBAAuB,oBAAoB,wBAAwB;IACnE,gBAAuB,iBAAiB,gBAAgB;IAExD;;;;;;;;OAQG;WACW,qBAAqB,CACjC,SAAS,CAAC,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,WAAW,EACzB,OAAO,CAAC,EAAE,WAAW,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAyBzB;;;;;;OAMG;WACW,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAIpE;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAqChC;;;;;;;;;;OAUG;WACW,iCAAiC,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM;IAK7E;;;;OAIG;WACW,aAAa,IAAI,MAAM;IAIrC;;;;;;;;;MASE;WACY,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAI,MAAM;IAK5D;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAQpC;;;;;;;;;OASG;WACW,sBAAsB,IAAI,MAAM;CAG/C"}
+{"version":3,"file":"Utility.d.ts","sourceRoot":"","sources":["../../src/Utility.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EAA6B,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAEnG,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,oBAAoB,EAAuC,MAAM,iBAAiB,CAAC;AAE5F,qBAAa,OAAO;IAClB,gBAAuB,iBAAiB,qBAAqB;IAC7D,gBAAuB,oBAAoB,wBAAwB;IACnE,gBAAuB,iBAAiB,gBAAgB;IACxD,0FAA0F;IAC1F,gBAAuB,eAAe,kBAAkB;IAExD;;;;;;;;OAQG;WACW,qBAAqB,CACjC,SAAS,CAAC,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,WAAW,EACzB,OAAO,CAAC,EAAE,WAAW,GACpB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IA+BzB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAsBtC;;;;;;OAMG;WACW,iBAAiB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAIpE;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,iBAAiB;IAqChC;;;;;;;;;;;;OAYG;WACW,iCAAiC,CAC7C,YAAY,EAAE,MAAM,EACpB,cAAc,CAAC,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,GAC5D,MAAM;IAIT;;;;;;OAMG;WACW,aAAa,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,GAAG,MAAM;IAIlG;;;;;;;;;;;MAWE;WACY,iBAAiB,CAC7B,UAAU,EAAE,MAAM,EAClB,cAAc,CAAC,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,GAC5D,MAAM;IAKT;;;;;;OAMG;IACH,OAAO,CAAC,MAAM,CAAC,qBAAqB;IAKpC;;;;;;;;;;;OAWG;WACW,sBAAsB,CAAC,cAAc,CAAC,EAAE,sBAAsB,CAAC,oBAAoB,CAAC,GAAG,MAAM;CAG5G"}