@microsoft/agents-hosting 1.5.0-beta.2.gf6783d691c → 1.5.0-beta.26.gaab35a7b76

package/dist/src/app/agentApplicationOptions.d.ts

@@ -11,6 +11,33 @@ import { TurnState } from './turnState';
 import { HeaderPropagationDefinition } from '../headerPropagation';
 import { AuthorizationOptions } from './auth/types';
 import { Connections } from '../auth/connections';
+import { ProactiveOptions } from './proactive';
+/**
+ * Typing timer settings for a specific channel or the global default.
+ */
+export interface TypingTimingOptions {
+    /**
+     * Delay in milliseconds before the first typing indicator is sent.
+     *
+     * @default 0
+     */
+    initialDelayMs?: number;
+    /**
+     * Delay in milliseconds between subsequent typing indicators.
+     *
+     * @default 4000
+     */
+    intervalMs?: number;
+}
+/**
+ * Configuration options for automatic typing indicators.
+ */
+export interface TypingOptions extends TypingTimingOptions {
+    /**
+     * Optional channel-specific timing overrides keyed by channel ID.
+     */
+    channelStrategies?: Record<string, TypingTimingOptions>;
+}
 /**
  * Configuration options for creating and initializing an Agent Application.
  * This interface defines all the configurable aspects of an agent's behavior,
@@ -53,6 +80,12 @@ export interface AgentApplicationOptions<TState extends TurnState> {
      * @default false
      */
     startTypingTimer: boolean;
+    /**
+     * Optional timing settings for automatic typing indicators.
+     *
+     * @default undefined
+     */
+    typing?: TypingOptions;
     /**
      * Whether to enable support for long-running message processing operations.
      * When enabled, the agent can handle operations that take longer than the typical
@@ -132,4 +165,9 @@ export interface AgentApplicationOptions<TState extends TurnState> {
      * identity providers.
      */
     connections?: Connections;
+    /**
+     * Optional. Configuration for the proactive messaging subsystem.
+     * When provided, `app.proactive` will be available.
+     */
+    proactive?: ProactiveOptions;
 }

package/dist/src/app/attachmentDownloader.js

@@ -9,9 +9,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AttachmentDownloader = void 0;
 const axios_1 = __importDefault(require("axios"));
-const logger_1 = require("@microsoft/agents-activity/logger");
+const agents_telemetry_1 = require("@microsoft/agents-telemetry");
 const auth_1 = require("../auth");
-const logger = (0, logger_1.debug)('agents:attachmentDownloader');
+const logger = (0, agents_telemetry_1.debug)('agents:attachmentDownloader');
 /**
  * A utility class for downloading input files from activity attachments.
  *

package/dist/src/app/attachmentDownloader.js.map

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

package/dist/src/app/auth/authorization.js

@@ -5,9 +5,11 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserAuthorization = void 0;
-const logger_1 = require("@microsoft/agents-activity/logger");
+const agents_telemetry_1 = require("@microsoft/agents-telemetry");
+const agents_activity_1 = require("@microsoft/agents-activity");
 const turnState_1 = require("../turnState");
-const logger = (0, logger_1.debug)('agents:authorization');
+const errorHelper_1 = require("../../errorHelper");
+const logger = (0, agents_telemetry_1.debug)('agents:authorization');
 /**
  * Class responsible for managing authorization and OAuth flows.
  * Handles multiple OAuth providers and manages the complete authentication lifecycle.
@@ -76,7 +78,7 @@ class UserAuthorization {
             const { token } = await handler.token(context, options);
             return { token };
         }
-        throw new Error('Invalid parameters for exchangeToken method.');
+        throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.InvalidExchangeTokenParameters);
     }
     /**
      * Signs out the current user.
@@ -108,7 +110,7 @@ class UserAuthorization {
             await this.getHandler(authHandlerId).signout(context);
         }
         else {
-            for (const handler of Object.values(this.manager.handlers)) {
+            for (const handler of this.manager.handlers) {
                 await handler.signout(context);
             }
         }
@@ -134,7 +136,7 @@ class UserAuthorization {
      * @public
      */
     onSignInSuccess(handler) {
-        for (const authHandler of Object.values(this.manager.handlers)) {
+        for (const authHandler of this.manager.handlers) {
             authHandler.onSuccess((context) => handler(context, new turnState_1.TurnState(), authHandler.id));
         }
     }
@@ -165,7 +167,7 @@ class UserAuthorization {
      * @public
      */
     onSignInFailure(handler) {
-        for (const authHandler of Object.values(this.manager.handlers)) {
+        for (const authHandler of this.manager.handlers) {
             authHandler.onFailure((context, reason) => handler(context, new turnState_1.TurnState(), authHandler.id, reason));
         }
     }
@@ -178,10 +180,11 @@ class UserAuthorization {
      * @private
      */
     getHandler(id) {
-        if (!Object.prototype.hasOwnProperty.call(this.manager.handlers, id)) {
-            throw new Error(`Cannot find auth handler with ID '${id}'. Ensure it is configured in the agent application options.`);
+        const handler = this.manager.handlers.find(e => e.id.toLowerCase() === id.toLowerCase());
+        if (!handler) {
+            throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.AuthHandlerNotFound, undefined, { handlerId: id });
         }
-        return this.manager.handlers[id];
+        return handler;
     }
 }
 exports.UserAuthorization = UserAuthorization;

package/dist/src/app/auth/authorization.js.map

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

package/dist/src/app/auth/authorizationManager.d.ts

@@ -15,6 +15,10 @@ interface AuthorizationManagerProcessResult {
      * Indicates whether the authorization was successful.
      */
     authorized: boolean;
+    /**
+     * The context associated with the authorization process.
+     */
+    context: TurnContext;
 }
 /**
  * Function to retrieve handler IDs for the current activity.
@@ -30,21 +34,26 @@ type GetHandlerIds = (activity: Activity) => string[] | Promise<string[]>;
  */
 export declare class AuthorizationManager {
     private app;
+    private connections;
     private _handlers;
+    /**
+     * Environment variable configuration for the latest format.
+     */
+    private _envLatest;
+    /**
+     * Environment variable configuration for the legacy format.
+     */
+    private _envLegacy;
     /**
      * Creates an instance of the AuthorizationManager.
      * @param app The agent application instance.
      */
     constructor(app: AgentApplication<any>, connections: Connections);
-    /**
-     * Loads and validates the authorization handler options.
-     */
-    private loadOptions;
     /**
      * Gets the registered authorization handlers.
      * @returns A record of authorization handlers by their IDs.
      */
-    get handlers(): Record<string, AuthorizationHandler>;
+    get handlers(): AuthorizationHandler[];
     /**
      * Processes an authorization request.
      * @param context The turn context.
@@ -68,5 +77,13 @@ export declare class AuthorizationManager {
      * Prefixes a message with the handler ID.
      */
     private prefix;
+    /**
+     * Creates authorization handlers based on the application configuration and environment variables.
+     */
+    private createHandlers;
+    /**
+     * Fixes the handler type based on the provided type string, supporting both latest and legacy formats.
+     */
+    private fixType;
 }
 export {};

package/dist/src/app/auth/authorizationManager.js

@@ -6,10 +6,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizationManager = void 0;
 const agents_activity_1 = require("@microsoft/agents-activity");
+const agents_telemetry_1 = require("@microsoft/agents-telemetry");
 const handlers_1 = require("./handlers");
+const turnContext_1 = require("../../turnContext");
 const handlerStorage_1 = require("./handlerStorage");
+const errorHelper_1 = require("../../errorHelper");
 const types_1 = require("./types");
-const logger = (0, agents_activity_1.debug)('agents:authorization:manager');
+const utils_1 = require("./utils");
+const auth_1 = require("../../auth");
+const logger = (0, agents_telemetry_1.debug)('agents:authorization:manager');
+const AGENTIC = 'AgenticUserAuthorization';
+const AGENTIC_LEGACY = 'agentic';
+const AZURE_BOT = 'AzureBotUserAuthorization';
 /**
  * Manages multiple authorization handlers and their interactions.
  * Processes authorization requests and maintains handler states.
@@ -25,46 +33,101 @@ class AuthorizationManager {
      */
     constructor(app, connections) {
         this.app = app;
+        this.connections = connections;
         this._handlers = {};
-        if (!app.options.storage) {
-            throw new Error('Storage is required for Authorization. Ensure that a storage provider is configured in the AgentApplication options.');
-        }
-        if (app.options.authorization === undefined || Object.keys(app.options.authorization).length === 0) {
-            throw new Error('The AgentApplication.authorization does not have any auth handlers');
-        }
-        const settings = { storage: app.options.storage, connections };
-        for (const [id, handler] of Object.entries(app.options.authorization)) {
-            const options = this.loadOptions(id, handler);
-            if (options.type === 'agentic') {
-                this._handlers[id] = new handlers_1.AgenticAuthorization(id, options, settings);
-            }
-            else {
-                this._handlers[id] = new handlers_1.AzureBotAuthorization(id, options, settings);
-            }
-        }
-    }
-    /**
-     * Loads and validates the authorization handler options.
-     */
-    loadOptions(id, options) {
-        var _a, _b;
-        const result = {
-            ...options,
-            type: (_b = ((_a = options.type) !== null && _a !== void 0 ? _a : process.env[`${id}_type`])) === null || _b === void 0 ? void 0 : _b.toLowerCase(),
+        /**
+         * Environment variable configuration for the latest format.
+         */
+        this._envLatest = {
+            key: {
+                prefix: 'AgentApplication__UserAuthorization__Handlers__',
+                separator: '__Settings__',
+                create(id, prop) {
+                    return `${this.prefix}${id}${this.separator}${prop}`;
+                },
+                extract(envKey) {
+                    // Substring: AgentApplication__UserAuthorization__Handlers__<id>__Settings__<prop>
+                    // position —————————————————————————————————————————> start^   ^end         ^prop
+                    const start = this.prefix.length;
+                    const end = envKey.toUpperCase().indexOf(this.separator.toUpperCase());
+                    if (end === -1) {
+                        return { id: undefined, prop: undefined };
+                    }
+                    const id = envKey.substring(start, end);
+                    const prop = envKey.substring(end + this.separator.length);
+                    return { id, prop };
+                }
+            },
+            parser: (0, auth_1.envParser)({
+                // Common
+                type: auth_1.envParserUtils.bypass,
+                // Azure Bot
+                azureBotOAuthConnectionName: auth_1.envParserUtils.bypass,
+                title: auth_1.envParserUtils.bypass,
+                text: auth_1.envParserUtils.bypass,
+                invalidSignInRetryMessage: auth_1.envParserUtils.bypass,
+                invalidSignInRetryMessageFormat: auth_1.envParserUtils.bypass,
+                invalidSignInRetryMaxExceededMessage: auth_1.envParserUtils.bypass,
+                oboConnectionName: auth_1.envParserUtils.bypass,
+                enableSso(value) {
+                    return { value: value !== 'false' };
+                },
+                invalidSignInRetryMax(value) {
+                    return { value: parseInt(value) };
+                },
+                oboScopes(value) {
+                    return this.scopes(value);
+                },
+                // Agentic
+                altBlueprintConnectionName: auth_1.envParserUtils.bypass,
+                scopes(value) {
+                    if (value.includes(',')) {
+                        return { value: value.split(',').map(s => s.trim()).filter(Boolean) };
+                    }
+                    return { value: value.split(/\s+/).filter(Boolean) };
+                }
+            }),
+        };
+        /**
+         * Environment variable configuration for the legacy format.
+         */
+        this._envLegacy = {
+            key: {
+                separator: '_',
+            },
+            parser: (0, auth_1.envParser)({
+                // Common
+                type: auth_1.envParserUtils.redirect(this._envLatest.parser, 'type'),
+                // Azure Bot
+                connectionName: auth_1.envParserUtils.redirect(this._envLatest.parser, 'azureBotOAuthConnectionName'),
+                connectionTitle: auth_1.envParserUtils.redirect(this._envLatest.parser, 'title'),
+                connectionText: auth_1.envParserUtils.redirect(this._envLatest.parser, 'text'),
+                maxAttempts: auth_1.envParserUtils.redirect(this._envLatest.parser, 'invalidSignInRetryMax'),
+                messages_invalidCode: auth_1.envParserUtils.redirect(this._envLatest.parser, 'invalidSignInRetryMessage'),
+                messages_invalidCodeFormat: auth_1.envParserUtils.redirect(this._envLatest.parser, 'invalidSignInRetryMessageFormat'),
+                messages_maxAttemptsExceeded: auth_1.envParserUtils.redirect(this._envLatest.parser, 'invalidSignInRetryMaxExceededMessage'),
+                obo_connection: auth_1.envParserUtils.redirect(this._envLatest.parser, 'oboConnectionName'),
+                obo_scopes: auth_1.envParserUtils.redirect(this._envLatest.parser, 'oboScopes'),
+                enableSso: auth_1.envParserUtils.redirect(this._envLatest.parser, 'enableSso'),
+                // Agentic
+                scopes: auth_1.envParserUtils.redirect(this._envLatest.parser, 'scopes'),
+                altBlueprintConnectionName: auth_1.envParserUtils.redirect(this._envLatest.parser, 'altBlueprintConnectionName')
+            })
         };
-        // Validate supported types, agentic, and default (Azure Bot - undefined)
-        const supportedTypes = ['agentic', undefined];
-        if (!supportedTypes.includes(result.type)) {
-            throw new Error(`Unsupported authorization handler type: '${result.type}' for auth handler: '${id}'. Supported types are: '${supportedTypes.filter(Boolean).join('\', \'')}'.`);
+        this.createHandlers();
+        if (this.handlers.length === 0 && app.options.authorization !== undefined) {
+            throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.NoAuthHandlersConfigured);
+        }
+        for (const [id, handler] of Object.entries(this._handlers)) {
+            logger.debug('auth handler "%s" type=%s scopes=%o', id, handler.type, handler.scopes);
         }
-        return result;
     }
     /**
      * Gets the registered authorization handlers.
      * @returns A record of authorization handlers by their IDs.
      */
     get handlers() {
-        return this._handlers;
+        return Object.values(this._handlers);
     }
     /**
      * Processes an authorization request.
@@ -73,45 +136,64 @@ class AuthorizationManager {
      * @returns The result of the authorization process.
      */
     async process(context, getHandlerIds) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const activity = context.activity;
+        if (this.handlers.length === 0) {
+            return { authorized: true, context };
+        }
         const storage = new handlerStorage_1.HandlerStorage(this.app.options.storage, context);
         let active = await this.active(storage, getHandlerIds);
-        if (active !== undefined && ((_a = active === null || active === void 0 ? void 0 : active.data.activity.conversation) === null || _a === void 0 ? void 0 : _a.id) !== ((_b = context.activity.conversation) === null || _b === void 0 ? void 0 : _b.id)) {
+        if (!active && ((_a = activity.name) === null || _a === void 0 ? void 0 : _a.startsWith('signin/'))) {
+            const reason = `Received '${activity.name}' but no active sign-in flow exists for user '${(_b = activity.from) === null || _b === void 0 ? void 0 : _b.id}'.`;
+            logger.warn(reason, activity);
+            await (0, utils_1.sendInvokeResponse)(context, {
+                status: 400,
+                body: { failureDetail: reason }
+            });
+            return { authorized: false, context };
+        }
+        if (active !== undefined && ((_c = active === null || active === void 0 ? void 0 : active.data.activity.conversation) === null || _c === void 0 ? void 0 : _c.id) !== ((_d = activity.conversation) === null || _d === void 0 ? void 0 : _d.id)) {
             logger.warn('Discarding the active session due to the conversation has changed during an active sign-in process', active === null || active === void 0 ? void 0 : active.data.activity);
             await storage.delete();
-            return { authorized: true };
+            return { authorized: true, context };
         }
-        const handlers = (_e = (_c = active === null || active === void 0 ? void 0 : active.handlers) !== null && _c !== void 0 ? _c : this.mapHandlers((_d = await getHandlerIds(context.activity)) !== null && _d !== void 0 ? _d : [])) !== null && _e !== void 0 ? _e : [];
+        const handlers = (_g = (_e = active === null || active === void 0 ? void 0 : active.handlers) !== null && _e !== void 0 ? _e : this.mapHandlers((_f = await getHandlerIds(activity)) !== null && _f !== void 0 ? _f : [])) !== null && _g !== void 0 ? _g : [];
+        // Create a shallow copy to modify the activity, since the signin process depends on it and we want to ensure the next handler depends on the initial activity, not the modified one.
+        const sharedContext = new turnContext_1.TurnContext(context);
         for (const handler of handlers) {
-            const status = await this.signin(storage, handler, context, active === null || active === void 0 ? void 0 : active.data);
-            logger.debug(this.prefix(handler.id, `Sign-in status: ${status}`));
+            if ((_h = handler.scopes) === null || _h === void 0 ? void 0 : _h.length) {
+                logger.debug('invoking auth handler "%s" scopes=[%s]', handler.id, handler.scopes.join(','));
+            }
+            else {
+                logger.debug('invoking auth handler "%s"', handler.id);
+            }
+            const status = await this.signin(storage, handler, sharedContext, active === null || active === void 0 ? void 0 : active.data);
+            logger.debug('auth handler "%s" sign-in status=%s', handler.id, status);
             if (status === types_1.AuthorizationHandlerStatus.IGNORED) {
                 await storage.delete();
                 continue;
             }
             if (status === types_1.AuthorizationHandlerStatus.PENDING) {
-                return { authorized: false };
+                return { authorized: false, context: sharedContext };
             }
             if (status === types_1.AuthorizationHandlerStatus.REJECTED) {
                 await storage.delete();
-                return { authorized: false };
+                return { authorized: false, context: sharedContext };
             }
             if (status === types_1.AuthorizationHandlerStatus.REVALIDATE) {
                 await storage.delete();
-                return this.process(context, getHandlerIds);
+                return this.process(sharedContext, getHandlerIds);
             }
             if (status !== types_1.AuthorizationHandlerStatus.APPROVED) {
-                throw new Error(this.prefix(handler.id, `Unexpected registration status: ${status}`));
+                throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.UnexpectedRegistrationStatus, undefined, { status });
             }
             await storage.delete();
             if (active) {
-                // Restore the original activity in the turn context for the next handler to process.
-                // This is done like this to avoid losing data that may be set in the turn context.
-                context._activity = agents_activity_1.Activity.fromObject(active.data.activity);
+                sharedContext._activity = agents_activity_1.Activity.fromObject(active.data.activity);
                 active = undefined;
             }
         }
-        return { authorized: true };
+        return { authorized: true, context: sharedContext };
     }
     /**
      * Gets the active handler session from storage.
@@ -145,22 +227,23 @@ class AuthorizationManager {
         }
         catch (cause) {
             await storage.delete();
-            throw new Error(this.prefix(handler.id, 'Failed to sign in'), { cause });
+            throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.FailedToSignIn, cause);
         }
     }
     /**
      * Maps an array of handler IDs to their corresponding handler instances.
      */
     mapHandlers(ids) {
-        let unknownHandlers = '';
+        const unknownHandlers = [];
         const handlers = ids.map(id => {
-            if (!this._handlers[id]) {
-                unknownHandlers += ` ${id}`;
+            const handler = this.handlers.find(e => e.id.toLowerCase() === id.toLowerCase());
+            if (!handler) {
+                unknownHandlers.push(id);
             }
-            return this._handlers[id];
-        });
-        if (unknownHandlers) {
-            throw new Error(`Cannot find auth handlers with ID(s): ${unknownHandlers}`);
+            return handler;
+        }).filter((handler) => handler !== undefined);
+        if (unknownHandlers.length > 0) {
+            throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.AuthHandlersNotFound, undefined, { handlerIds: unknownHandlers.join(', ') });
         }
         return handlers;
     }
@@ -170,6 +253,137 @@ class AuthorizationManager {
     prefix(id, message) {
         return `[handler:${id}] ${message}`;
     }
+    /**
+     * Creates authorization handlers based on the application configuration and environment variables.
+     */
+    createHandlers() {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+        var _w, _x;
+        let legacyMessage = '';
+        const settings = { storage: this.app.options.storage, connections: this.connections };
+        let runtimeEntries = Object.entries((_a = this.app.options.authorization) !== null && _a !== void 0 ? _a : {});
+        const result = { latest: {}, legacy: {} };
+        for (const [envKey, envValue] of Object.entries(process.env)) {
+            if (!(envValue === null || envValue === void 0 ? void 0 : envValue.trim())) {
+                continue;
+            }
+            const upperEnvKey = envKey.toUpperCase();
+            // Legacy: extract handler ID, handler options key and its value, and assign it to the correct runtime handler ID.
+            if (!upperEnvKey.startsWith(this._envLatest.key.prefix.toUpperCase())) {
+                const [id] = (_b = runtimeEntries.find(([id]) => upperEnvKey.startsWith(`${id.toUpperCase()}${this._envLegacy.key.separator}`))) !== null && _b !== void 0 ? _b : [];
+                if (!id) {
+                    continue;
+                }
+                const prop = envKey.substring(id.length + this._envLegacy.key.separator.length);
+                if (!prop) {
+                    continue;
+                }
+                const { key, value } = this._envLegacy.parser.parse(prop, envValue);
+                if (!key) {
+                    continue;
+                }
+                legacyMessage += `  ${envKey}= # Use ${this._envLatest.key.create(id, key)} instead.\n`;
+                (_c = (_w = result.legacy)[id]) !== null && _c !== void 0 ? _c : (_w[id] = {});
+                result.legacy[id][key] = value;
+                continue;
+            }
+            // Latest: extract handler ID, handler options key and its value, and assign it to the correct latest handler ID.
+            const { id, prop } = this._envLatest.key.extract(envKey);
+            if (!id || !prop) {
+                continue;
+            }
+            const { key, value } = this._envLatest.parser.parse(prop, envValue);
+            if (!key) {
+                continue;
+            }
+            // Find existing handler ID case-insensitively to avoid duplicates, but keep the original casing for later processing.
+            // This allows users to specify environment variables in a case-insensitive way, while ensuring that the handler IDs are treated in a case-sensitive way internally, to avoid issues when referencing them later.
+            // For example, if the user specifies AGENTAPPLICATION__USERAUTHORIZATION__HANDLERS__GRAPH__SETTINGS__AZUREBOTOAUTHCONNECTIONNAME and agentapplication__userauthorization__handlers__graph__settings__azurebotoauthconnectionname, we want to treat them as the same handler ID "graph", and not create two separate handlers "GRAPH" and "graph".
+            // Note: the first environment variable that is processed will determine the casing of the handler ID, and any subsequent environment variable that matches the same handler ID case-insensitively will be treated as referring to the same handler, regardless of its casing.
+            const existingId = id in result.latest ? id : Object.keys(result.latest).find(e => e.toLowerCase() === id.toLowerCase());
+            const realId = existingId !== null && existingId !== void 0 ? existingId : id;
+            (_d = (_x = result.latest)[realId]) !== null && _d !== void 0 ? _d : (_x[realId] = {});
+            result.latest[realId][key] = value;
+        }
+        if (legacyMessage.length > 0) {
+            logger.warn('Deprecated environment variables detected, update to the latest format: (case-insensitive)', `[\n${legacyMessage}]`);
+        }
+        // Fix types
+        const fixTypes = (entries) => entries
+            .map(([id, options]) => [id, { ...options, type: this.fixType(id, options === null || options === void 0 ? void 0 : options.type) }]);
+        runtimeEntries = fixTypes(runtimeEntries);
+        const latestEntries = fixTypes(Object.entries(result.latest));
+        const legacyEntries = fixTypes(Object.entries(result.legacy));
+        const registeredHandlers = new Set();
+        for (const [id] of [...runtimeEntries, ...latestEntries]) {
+            if (registeredHandlers.has(id.toLowerCase())) {
+                continue;
+            }
+            // Find entries case-insensitively for later processing
+            const [, runtime] = (_e = runtimeEntries.find(([key]) => key.toLowerCase() === id.toLowerCase())) !== null && _e !== void 0 ? _e : [];
+            const [, latest] = (_f = latestEntries.find(([key]) => key.toLowerCase() === id.toLowerCase())) !== null && _f !== void 0 ? _f : [];
+            const [, legacy] = (_g = legacyEntries.find(([key]) => key.toLowerCase() === id.toLowerCase())) !== null && _g !== void 0 ? _g : [];
+            if (runtime !== undefined && latest !== undefined) {
+                logger.warn(this.prefix(id, 'Both runtime and latest environment variable configurations detected. Runtime configuration will take precedence over latest environment variables.'));
+            }
+            // Normalize runtime legacy options to latest format
+            if ((runtime === null || runtime === void 0 ? void 0 : runtime.type) === AZURE_BOT) {
+                (_h = runtime.azureBotOAuthConnectionName) !== null && _h !== void 0 ? _h : (runtime.azureBotOAuthConnectionName = runtime.name);
+                (_j = runtime.invalidSignInRetryMax) !== null && _j !== void 0 ? _j : (runtime.invalidSignInRetryMax = runtime.maxAttempts);
+                (_k = runtime.invalidSignInRetryMessage) !== null && _k !== void 0 ? _k : (runtime.invalidSignInRetryMessage = (_l = runtime.messages) === null || _l === void 0 ? void 0 : _l.invalidCode);
+                (_m = runtime.invalidSignInRetryMessageFormat) !== null && _m !== void 0 ? _m : (runtime.invalidSignInRetryMessageFormat = (_o = runtime.messages) === null || _o === void 0 ? void 0 : _o.invalidCodeFormat);
+                (_p = runtime.invalidSignInRetryMaxExceededMessage) !== null && _p !== void 0 ? _p : (runtime.invalidSignInRetryMaxExceededMessage = (_q = runtime.messages) === null || _q === void 0 ? void 0 : _q.maxAttemptsExceeded);
+                (_r = runtime.oboConnectionName) !== null && _r !== void 0 ? _r : (runtime.oboConnectionName = (_s = runtime.obo) === null || _s === void 0 ? void 0 : _s.connection);
+                (_t = runtime.oboScopes) !== null && _t !== void 0 ? _t : (runtime.oboScopes = (_u = runtime.obo) === null || _u === void 0 ? void 0 : _u.scopes);
+                delete runtime.name;
+                delete runtime.maxAttempts;
+                delete runtime.messages;
+                delete runtime.obo;
+            }
+            // Helper to remove undefined options
+            const prune = (obj) => {
+                const entries = Object.entries(obj).filter(([, e]) => e !== undefined);
+                return Object.fromEntries(entries);
+            };
+            // Priority: runtime > latest > legacy
+            // Pruning done individually to avoid overwriting with undefined when merging.
+            const options = runtime ? { ...prune(legacy || {}), ...prune(runtime) } : prune(latest || {});
+            if (!settings.storage) {
+                throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.StorageRequiredForAuthorization);
+            }
+            if (options.type === AGENTIC) {
+                this._handlers[id] = new handlers_1.AgenticAuthorization(id, options, settings);
+            }
+            else if (options.type === AZURE_BOT) {
+                // Set default values if not provided
+                options.title || (options.title = 'Sign-in');
+                options.text || (options.text = 'Please sign-in to continue');
+                (_v = options.oboScopes) !== null && _v !== void 0 ? _v : (options.oboScopes = []);
+                options.enableSso = options.enableSso !== false; // default value is true if undefined.
+                this._handlers[id] = new handlers_1.AzureBotAuthorization(id, options, settings);
+            }
+            registeredHandlers.add(id.toLowerCase());
+        }
+    }
+    /**
+     * Fixes the handler type based on the provided type string, supporting both latest and legacy formats.
+     */
+    fixType(handlerId, type) {
+        if (!type) {
+            return AZURE_BOT;
+        }
+        if (type.toLowerCase() === AGENTIC_LEGACY.toLowerCase()) {
+            logger.warn(this.prefix(handlerId, 'The \'agentic\' type is deprecated. Please use \'AgenticUserAuthorization\' instead.'));
+            return AGENTIC;
+        }
+        if (type.toLowerCase() === AGENTIC.toLowerCase()) {
+            return AGENTIC;
+        }
+        if (type.toLowerCase() === AZURE_BOT.toLowerCase()) {
+            return AZURE_BOT;
+        }
+        throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.UnsupportedAuthHandlerType, undefined, { handlerType: type });
+    }
 }
 exports.AuthorizationManager = AuthorizationManager;
 //# sourceMappingURL=authorizationManager.js.map