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

package/dist/cjs/Utility.js

@@ -4,8 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Utility = void 0;
 const agents_a365_runtime_1 = require("@microsoft/agents-a365-runtime");
-// Constant for MCP Platform base URL in production
-const MCP_PLATFORM_PROD_BASE_URL = 'https://agent365.svc.cloud.microsoft';
+const configuration_1 = require("./configuration");
 class Utility {
     /**
      * Compose standard headers for MCP tooling requests.
@@ -20,6 +19,11 @@ class Utility {
         const headers = {};
         if (authToken) {
             headers['Authorization'] = `Bearer ${authToken}`;
+            // Add x-ms-agentid header with priority fallback (only when authToken present)
+            const agentId = this.resolveAgentIdForHeader(authToken, turnContext);
+            if (agentId) {
+                headers[Utility.HEADER_AGENT_ID] = agentId;
+            }
         }
         const channelId = turnContext?.activity?.channelId;
         const subChannelId = turnContext?.activity?.channelIdSubChannel;
@@ -34,6 +38,33 @@ class Utility {
         }
         return headers;
     }
+    /**
+     * 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.
+     */
+    static resolveAgentIdForHeader(authToken, turnContext) {
+        // Priority 1: Agent Blueprint ID from TurnContext
+        // The 'from' property may include agenticAppBlueprintId when the request originates from an agentic app
+        const blueprintId = turnContext?.activity?.from?.agenticAppBlueprintId;
+        if (blueprintId) {
+            return blueprintId;
+        }
+        // Priority 2 & 3: Agent ID from token (xms_par_app_azp > appid > azp)
+        // Single decode, checks claims in priority order
+        const agentId = agents_a365_runtime_1.Utility.getAgentIdFromToken(authToken);
+        if (agentId) {
+            return agentId;
+        }
+        // Priority 4: Application name from npm_package_name or package.json
+        return agents_a365_runtime_1.Utility.getApplicationName();
+    }
     /**
      * Validates a JWT authentication token.
      * Checks that the token is a valid JWT and is not expired.
@@ -89,22 +120,25 @@ 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) {
-        // The endpoint needs to be updated based on the environment (prod, dev, etc.)
-        return `${this.getMcpPlatformBaseUrl()}/agents/${agenticAppId}/mcpServers`;
+    static GetToolingGatewayForDigitalWorker(agenticAppId, configProvider) {
+        return `${this.getMcpPlatformBaseUrl(configProvider)}/agents/v2/${agenticAppId}/mcpServers`;
     }
     /**
      * 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() {
-        return `${this.getMcpPlatformBaseUrl()}/agents/servers`;
+    static GetMcpBaseUrl(configProvider) {
+        return `${this.getMcpPlatformBaseUrl(configProvider)}/agents/servers`;
     }
     /**
      * Build the full URL for accessing a specific MCP server.
@@ -114,39 +148,45 @@ 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) {
-        const baseUrl = this.GetMcpBaseUrl();
-        return `${baseUrl}/${serverName}`;
+    static BuildMcpServerUrl(serverName, configProvider) {
+        const baseUrl = this.GetMcpBaseUrl(configProvider);
+        return `${baseUrl}/${serverName}/`;
     }
     /**
-     * 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.
      */
-    static getMcpPlatformBaseUrl() {
-        if (process.env.MCP_PLATFORM_ENDPOINT) {
-            return process.env.MCP_PLATFORM_ENDPOINT;
-        }
-        return MCP_PLATFORM_PROD_BASE_URL;
+    static getMcpPlatformBaseUrl(configProvider) {
+        const provider = configProvider ?? configuration_1.defaultToolingConfigurationProvider;
+        return provider.getConfiguration().mcpPlatformEndpoint;
     }
     /**
      * 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() {
-        return `${this.getMcpPlatformBaseUrl()}/agents/real-time-threat-protection/chat-message`;
+    static GetChatHistoryEndpoint(configProvider) {
+        return `${this.getMcpPlatformBaseUrl(configProvider)}/agents/real-time-threat-protection/chat-message`;
     }
 }
 exports.Utility = Utility;
 Utility.HEADER_CHANNEL_ID = 'x-ms-channel-id';
 Utility.HEADER_SUBCHANNEL_ID = 'x-ms-subchannel-id';
 Utility.HEADER_USER_AGENT = 'User-Agent';
+/** Header name for sending the agent identifier to MCP platform for logging/analytics. */
+Utility.HEADER_AGENT_ID = 'x-ms-agentid';
 //# sourceMappingURL=Utility.js.map

package/dist/cjs/Utility.js.map

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

package/dist/cjs/configuration/ToolingConfiguration.d.ts

@@ -0,0 +1,51 @@
+import { RuntimeConfiguration } from '@microsoft/agents-a365-runtime';
+import { ToolingConfigurationOptions } from './ToolingConfigurationOptions';
+import { MCPServerConfig } from '../contracts';
+/**
+ * Resolve the OAuth scope to request for a given MCP server.
+ *
+ * V2 servers carry their own audience in the `audience` field and get a per-audience token.
+ * V1 servers (no `audience`, or audience matching the shared scope's own audience in plain
+ * or api:// form) fall back to `sharedScope` — the configured mcpPlatformAuthenticationScope.
+ *
+ * @param server     The MCP server config returned by the gateway or manifest.
+ * @param sharedScope The configured shared scope (mcpPlatformAuthenticationScope).
+ *   Defaults to the prod ATG scope so that external callers without a custom config
+ *   continue to work without passing the argument.
+ */
+export declare function resolveTokenScopeForServer(server: MCPServerConfig, sharedScope?: string): string;
+/**
+ * Configuration for tooling package.
+ * Inherits runtime settings and adds tooling-specific settings.
+ */
+export declare class ToolingConfiguration extends RuntimeConfiguration {
+    protected get toolingOverrides(): ToolingConfigurationOptions;
+    constructor(overrides?: ToolingConfigurationOptions);
+    get mcpPlatformEndpoint(): string;
+    /**
+     * Whether to use the ToolingManifest.json file instead of gateway discovery.
+     * Returns true when NODE_ENV is set to 'development' (case-insensitive), or
+     * when explicitly overridden via configuration.
+     */
+    get useToolingManifest(): boolean;
+    /**
+     * Gets the MCP platform authentication scope.
+     * Used by AgenticAuthenticationService for token exchange.
+     * Trims whitespace to prevent token exchange failures.
+     */
+    get mcpPlatformAuthenticationScope(): string;
+    /**
+     * Returns the dev-mode bearer token for an MCP server by name.
+     * Checks BEARER_TOKEN_<SERVERNAME_UPPER> first, then falls back to BEARER_TOKEN.
+     * Returns undefined when the variable is not set (no Authorization header will be attached).
+     */
+    getBearerTokenForServer(mcpServerName: string): string | undefined;
+    /**
+     * Returns true when a per-server bearer token env var (BEARER_TOKEN_<SERVERNAME_UPPER>)
+     * is explicitly set for the given server, false when only the shared BEARER_TOKEN fallback
+     * would be used. Used to detect V2 servers that are silently falling back to a
+     * wrong-audience token in dev mode.
+     */
+    hasPerServerBearerToken(mcpServerName: string): boolean;
+}
+//# sourceMappingURL=ToolingConfiguration.d.ts.map

package/dist/cjs/configuration/ToolingConfiguration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolingConfiguration.d.ts","sourceRoot":"","sources":["../../../src/configuration/ToolingConfiguration.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAM/C;;;;;;;;;;;GAWG;AACH,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,eAAe,EACvB,WAAW,GAAE,MAA+C,GAC3D,MAAM,CAoBR;AAUD;;;GAGG;AACH,qBAAa,oBAAqB,SAAQ,oBAAoB;IAE5D,SAAS,KAAK,gBAAgB,IAAI,2BAA2B,CAE5D;gBAEW,SAAS,CAAC,EAAE,2BAA2B;IAMnD,IAAI,mBAAmB,IAAI,MAAM,CAQhC;IAED;;;;OAIG;IACH,IAAI,kBAAkB,IAAI,OAAO,CAKhC;IAED;;;;OAIG;IACH,IAAI,8BAA8B,IAAI,MAAM,CAQ3C;IAED;;;;OAIG;IACH,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAKlE;;;;;OAKG;IACH,uBAAuB,CAAC,aAAa,EAAE,MAAM,GAAG,OAAO;CAIxD"}

package/dist/cjs/configuration/ToolingConfiguration.js

@@ -0,0 +1,118 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ToolingConfiguration = void 0;
+exports.resolveTokenScopeForServer = resolveTokenScopeForServer;
+const agents_a365_runtime_1 = require("@microsoft/agents-a365-runtime");
+// Constants for tooling-specific settings
+const MCP_PLATFORM_PROD_BASE_URL = 'https://agent365.svc.cloud.microsoft';
+const PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE = 'ea9ffc3e-8a23-4a7d-836d-234d7c7565c1/.default';
+/**
+ * Resolve the OAuth scope to request for a given MCP server.
+ *
+ * V2 servers carry their own audience in the `audience` field and get a per-audience token.
+ * V1 servers (no `audience`, or audience matching the shared scope's own audience in plain
+ * or api:// form) fall back to `sharedScope` — the configured mcpPlatformAuthenticationScope.
+ *
+ * @param server     The MCP server config returned by the gateway or manifest.
+ * @param sharedScope The configured shared scope (mcpPlatformAuthenticationScope).
+ *   Defaults to the prod ATG scope so that external callers without a custom config
+ *   continue to work without passing the argument.
+ */
+function resolveTokenScopeForServer(server, sharedScope = PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE) {
+    if (server.audience) {
+        // Extract the audience portion of sharedScope (everything before the last '/').
+        // e.g. 'ea9ffc3e-.../.default'      → 'ea9ffc3e-...'
+        //      'api://ea9ffc3e-.../.default' → 'api://ea9ffc3e-...'
+        const sharedAudience = sharedScope.slice(0, sharedScope.lastIndexOf('/'));
+        // Build the alternate form so we match both 'guid' and 'api://guid'.
+        const sharedAudienceAlt = sharedAudience.startsWith('api://')
+            ? sharedAudience.slice(6) // 'api://guid' → 'guid'
+            : `api://${sharedAudience}`; // 'guid'       → 'api://guid'
+        if (server.audience !== sharedAudience && server.audience !== sharedAudienceAlt) {
+            // V2 server: use its own audience with explicit scope or /.default fallback.
+            return server.scope
+                ? `${server.audience}/${server.scope}`
+                : `${server.audience}/.default`;
+        }
+    }
+    // V1 server: no audience, or audience matches the shared ATG audience.
+    return sharedScope;
+}
+/**
+ * Normalize URL by trimming whitespace and removing trailing slashes.
+ * Prevents double-slash issues in URL construction (e.g., "https://example.com//api").
+ */
+function normalizeUrl(url) {
+    return url.trim().replace(/\/+$/, '');
+}
+/**
+ * Configuration for tooling package.
+ * Inherits runtime settings and adds tooling-specific settings.
+ */
+class ToolingConfiguration extends agents_a365_runtime_1.RuntimeConfiguration {
+    // Type-safe access to tooling overrides
+    get toolingOverrides() {
+        return this.overrides;
+    }
+    constructor(overrides) {
+        super(overrides);
+    }
+    // Inherited: clusterCategory, isDevelopmentEnvironment, isNodeEnvDevelopment
+    get mcpPlatformEndpoint() {
+        const override = this.toolingOverrides.mcpPlatformEndpoint?.();
+        if (override)
+            return normalizeUrl(override);
+        const envValue = process.env.MCP_PLATFORM_ENDPOINT?.trim();
+        if (envValue)
+            return normalizeUrl(envValue);
+        return MCP_PLATFORM_PROD_BASE_URL;
+    }
+    /**
+     * Whether to use the ToolingManifest.json file instead of gateway discovery.
+     * Returns true when NODE_ENV is set to 'development' (case-insensitive), or
+     * when explicitly overridden via configuration.
+     */
+    get useToolingManifest() {
+        const override = this.toolingOverrides.useToolingManifest?.();
+        if (override !== undefined)
+            return override;
+        return this.isNodeEnvDevelopment;
+    }
+    /**
+     * Gets the MCP platform authentication scope.
+     * Used by AgenticAuthenticationService for token exchange.
+     * Trims whitespace to prevent token exchange failures.
+     */
+    get mcpPlatformAuthenticationScope() {
+        const override = this.toolingOverrides.mcpPlatformAuthenticationScope?.()?.trim();
+        if (override)
+            return override;
+        const envValue = process.env.MCP_PLATFORM_AUTHENTICATION_SCOPE?.trim();
+        if (envValue)
+            return envValue;
+        return PROD_MCP_PLATFORM_AUTHENTICATION_SCOPE;
+    }
+    /**
+     * Returns the dev-mode bearer token for an MCP server by name.
+     * Checks BEARER_TOKEN_<SERVERNAME_UPPER> first, then falls back to BEARER_TOKEN.
+     * Returns undefined when the variable is not set (no Authorization header will be attached).
+     */
+    getBearerTokenForServer(mcpServerName) {
+        const key = mcpServerName.toUpperCase();
+        return process.env[`BEARER_TOKEN_${key}`] ?? process.env['BEARER_TOKEN'];
+    }
+    /**
+     * Returns true when a per-server bearer token env var (BEARER_TOKEN_<SERVERNAME_UPPER>)
+     * is explicitly set for the given server, false when only the shared BEARER_TOKEN fallback
+     * would be used. Used to detect V2 servers that are silently falling back to a
+     * wrong-audience token in dev mode.
+     */
+    hasPerServerBearerToken(mcpServerName) {
+        const key = mcpServerName.toUpperCase();
+        return !!process.env[`BEARER_TOKEN_${key}`];
+    }
+}
+exports.ToolingConfiguration = ToolingConfiguration;
+//# sourceMappingURL=ToolingConfiguration.js.map

package/dist/cjs/configuration/ToolingConfiguration.js.map

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

package/dist/cjs/configuration/ToolingConfigurationOptions.d.ts

@@ -0,0 +1,23 @@
+import { RuntimeConfigurationOptions } from '@microsoft/agents-a365-runtime';
+/**
+ * Tooling configuration options - extends runtime options.
+ * All overrides are functions called on each property access.
+ *
+ * Inherited from RuntimeConfigurationOptions:
+ * - clusterCategory
+ * - isNodeEnvDevelopment
+ */
+export type ToolingConfigurationOptions = RuntimeConfigurationOptions & {
+    mcpPlatformEndpoint?: () => string;
+    /**
+     * Override for using ToolingManifest.json vs gateway discovery.
+     * Falls back to inherited isNodeEnvDevelopment.
+     */
+    useToolingManifest?: () => boolean;
+    /**
+     * Override for MCP platform authentication scope.
+     * Falls back to MCP_PLATFORM_AUTHENTICATION_SCOPE env var, then production default.
+     */
+    mcpPlatformAuthenticationScope?: () => string;
+};
+//# sourceMappingURL=ToolingConfigurationOptions.d.ts.map

package/dist/cjs/configuration/ToolingConfigurationOptions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolingConfigurationOptions.d.ts","sourceRoot":"","sources":["../../../src/configuration/ToolingConfigurationOptions.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,2BAA2B,EAAE,MAAM,gCAAgC,CAAC;AAE7E;;;;;;;GAOG;AACH,MAAM,MAAM,2BAA2B,GAAG,2BAA2B,GAAG;IACtE,mBAAmB,CAAC,EAAE,MAAM,MAAM,CAAC;IACnC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,MAAM,OAAO,CAAC;IACnC;;;OAGG;IACH,8BAA8B,CAAC,EAAE,MAAM,MAAM,CAAC;CAC/C,CAAC"}

package/dist/cjs/configuration/ToolingConfigurationOptions.js

@@ -0,0 +1,5 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=ToolingConfigurationOptions.js.map

package/dist/cjs/configuration/ToolingConfigurationOptions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ToolingConfigurationOptions.js","sourceRoot":"","sources":["../../../src/configuration/ToolingConfigurationOptions.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC"}

package/dist/cjs/configuration/index.d.ts

@@ -0,0 +1,9 @@
+import { DefaultConfigurationProvider } from '@microsoft/agents-a365-runtime';
+import { ToolingConfiguration } from './ToolingConfiguration';
+export * from './ToolingConfigurationOptions';
+export * from './ToolingConfiguration';
+/**
+ * Shared default provider for ToolingConfiguration.
+ */
+export declare const defaultToolingConfigurationProvider: DefaultConfigurationProvider<ToolingConfiguration>;
+//# sourceMappingURL=index.d.ts.map

package/dist/cjs/configuration/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/configuration/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,cAAc,+BAA+B,CAAC;AAC9C,cAAc,wBAAwB,CAAC;AAEvC;;GAEG;AACH,eAAO,MAAM,mCAAmC,oDACoB,CAAC"}

package/dist/cjs/configuration/index.js

@@ -0,0 +1,28 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultToolingConfigurationProvider = void 0;
+const agents_a365_runtime_1 = require("@microsoft/agents-a365-runtime");
+const ToolingConfiguration_1 = require("./ToolingConfiguration");
+__exportStar(require("./ToolingConfigurationOptions"), exports);
+__exportStar(require("./ToolingConfiguration"), exports);
+/**
+ * Shared default provider for ToolingConfiguration.
+ */
+exports.defaultToolingConfigurationProvider = new agents_a365_runtime_1.DefaultConfigurationProvider(() => new ToolingConfiguration_1.ToolingConfiguration());
+//# sourceMappingURL=index.js.map

package/dist/cjs/configuration/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/configuration/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;;AAElC,wEAA8E;AAC9E,iEAA8D;AAE9D,gEAA8C;AAC9C,yDAAuC;AAEvC;;GAEG;AACU,QAAA,mCAAmC,GAC9C,IAAI,kDAA4B,CAAC,GAAG,EAAE,CAAC,IAAI,2CAAoB,EAAE,CAAC,CAAC"}

package/dist/cjs/contracts.d.ts

@@ -2,10 +2,16 @@ export interface MCPServerConfig {
     mcpServerName: string;
     url: string;
     headers?: Record<string, string>;
+    audience?: string;
+    scope?: string;
+    publisher?: string;
 }
 export type MCPServerManifestEntry = {
     url?: string;
     headers?: Record<string, string>;
+    audience?: string;
+    scope?: string;
+    publisher?: string;
 } & ({
     mcpServerName: string;
     mcpServerUniqueName?: string;

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

@@ -1 +1 @@
-{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/contracts.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC,GAAG,CACA;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,mBAAmB,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAC1D,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B"}
+{"version":3,"file":"contracts.d.ts","sourceRoot":"","sources":["../../src/contracts.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,CACA;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;CAAE,GACvD;IAAE,mBAAmB,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAC1D,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,WAAW,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,WAAW,WAAW;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B"}

package/dist/cjs/index.d.ts

@@ -2,4 +2,5 @@ export * from './Utility';
 export * from './McpToolServerConfigurationService';
 export * from './contracts';
 export * from './models';
+export * from './configuration';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAC;AAC1B,cAAc,qCAAqC,CAAC;AACpD,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,WAAW,CAAC;AAC1B,cAAc,qCAAqC,CAAC;AACpD,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,iBAAiB,CAAC"}

package/dist/cjs/index.js

@@ -1,4 +1,6 @@
 "use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -18,4 +20,5 @@ __exportStar(require("./Utility"), exports);
 __exportStar(require("./McpToolServerConfigurationService"), exports);
 __exportStar(require("./contracts"), exports);
 __exportStar(require("./models"), exports);
+__exportStar(require("./configuration"), exports);
 //# sourceMappingURL=index.js.map

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAA0B;AAC1B,sEAAoD;AACpD,8CAA4B;AAC5B,2CAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;;;;;;;;;;;;;AAElC,4CAA0B;AAC1B,sEAAoD;AACpD,8CAA4B;AAC5B,2CAAyB;AACzB,kDAAgC"}

package/dist/esm/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/esm/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"}