@microsoft/agents-hosting 0.1.49 → 0.2.7-gd7a3e9ef95

package/dist/src/oauth/userTokenClient.js

@@ -8,7 +8,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserTokenClient = void 0;
 const axios_1 = __importDefault(require("axios"));
 const logger_1 = require("../logger");
-const logger = (0, logger_1.debug)('agents:userTokenClient');
+const activityWireCompat_1 = require("../activityWireCompat");
+const tokenResponse_1 = require("./tokenResponse");
+const getProductInfo_1 = require("../getProductInfo");
+const logger = (0, logger_1.debug)('agents:user-token-client');
 /**
  * Client for managing user tokens.
  */
@@ -22,7 +25,8 @@ class UserTokenClient {
         const axiosInstance = axios_1.default.create({
             baseURL,
             headers: {
-                Accept: 'application/json'
+                Accept: 'application/json',
+                'User-Agent': (0, getProductInfo_1.getProductInfo)(),
             }
         });
         axiosInstance.defaults.headers.common.Authorization = `Bearer ${token}`;
@@ -41,13 +45,16 @@ class UserTokenClient {
         try {
             const params = { connectionName, channelId, userId, code };
             const response = await this.client.get('/api/usertoken/GetToken', { params });
-            return response.data;
+            return { ...response.data, status: tokenResponse_1.TokenRequestStatus.Success };
         }
         catch (error) {
             if (((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== 404) {
                 logger.error(error);
             }
-            return null;
+            return {
+                status: tokenResponse_1.TokenRequestStatus.Failed,
+                token: undefined
+            };
         }
     }
     /**
@@ -61,11 +68,13 @@ class UserTokenClient {
         try {
             const params = { userId, connectionName, channelId };
             const response = await this.client.delete('/api/usertoken/SignOut', { params });
-            return response.data;
+            if (response.status !== 200) {
+                throw new Error('Failed to sign out');
+            }
         }
         catch (error) {
             logger.error(error);
-            return null;
+            throw new Error('Failed to sign out');
         }
     }
     /**
@@ -78,12 +87,13 @@ class UserTokenClient {
     async getSignInResource(appId, cnxName, activity) {
         try {
             const tokenExchangeState = {
-                ConnectionName: cnxName,
-                Conversation: activity.getConversationReference(),
-                RelatesTo: activity.RelatesTo,
-                MsAppId: appId
+                connectionName: cnxName,
+                conversation: activity.getConversationReference(),
+                relatesTo: activity.RelatesTo,
+                msAppId: appId
             };
-            const state = Buffer.from(JSON.stringify(tokenExchangeState)).toString('base64');
+            const tokenExchangeStateNormalized = (0, activityWireCompat_1.normalizeTokenExchangeState)(tokenExchangeState);
+            const state = Buffer.from(JSON.stringify(tokenExchangeStateNormalized)).toString('base64');
             const params = { state };
             const response = await this.client.get('/api/botsignin/GetSignInResource', { params });
             return response.data;
@@ -105,11 +115,11 @@ class UserTokenClient {
         try {
             const params = { userId, connectionName, channelId };
             const response = await this.client.post('/api/usertoken/exchange', tokenExchangeRequest, { params });
-            return response.data;
+            return { ...response.data, status: tokenResponse_1.TokenRequestStatus.Success };
         }
         catch (error) {
             logger.error(error);
-            return null;
+            return { status: tokenResponse_1.TokenRequestStatus.Failed, token: undefined };
         }
     }
 }

package/dist/src/oauth/userTokenClient.js.map

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

package/dist/src/state/agentState.d.ts

@@ -11,6 +11,10 @@ export interface CachedAgentState {
     };
     hash: string;
 }
+export interface CustomKey {
+    channelId: string;
+    conversationId: string;
+}
 /**
  * Manages the state of an Agent.
  */
@@ -36,14 +40,15 @@ export declare class AgentState {
      * @param force Whether to force loading the state.
      * @returns A promise that resolves to the loaded state.
      */
-    load(context: TurnContext, force?: boolean): Promise<any>;
+    load(context: TurnContext, force?: boolean, customKey?: CustomKey): Promise<any>;
     /**
      * Saves the state to storage.
      * @param context The turn context.
      * @param force Whether to force saving the state.
      * @returns A promise that resolves when the save operation is complete.
      */
-    saveChanges(context: TurnContext, force?: boolean): Promise<void>;
+    saveChanges(context: TurnContext, force?: boolean, customKey?: CustomKey): Promise<void>;
+    private getStorageOrCustomKey;
     /**
      * Clears the state from the turn context.
      * @param context The turn context.
@@ -55,7 +60,7 @@ export declare class AgentState {
      * @param context The turn context.
      * @returns A promise that resolves when the delete operation is complete.
      */
-    delete(context: TurnContext): Promise<void>;
+    delete(context: TurnContext, customKey?: CustomKey): Promise<void>;
     /**
      * Gets the state from the turn context.
      * @param context The turn context.

package/dist/src/state/agentState.js

@@ -51,10 +51,10 @@ class AgentState {
      * @param force Whether to force loading the state.
      * @returns A promise that resolves to the loaded state.
      */
-    async load(context, force = false) {
+    async load(context, force = false, customKey) {
         const cached = context.turnState.get(this.stateKey);
         if (force || !cached || !cached.state) {
-            const key = await this.storageKey(context);
+            const key = await this.getStorageOrCustomKey(customKey, context);
             logger.info(`Reading storage with key ${key}`);
             const storedItem = await this.storage.read([key]);
             const state = storedItem[key] || {};
@@ -70,7 +70,7 @@ class AgentState {
      * @param force Whether to force saving the state.
      * @returns A promise that resolves when the save operation is complete.
      */
-    async saveChanges(context, force = false) {
+    async saveChanges(context, force = false, customKey) {
         let cached = context.turnState.get(this.stateKey);
         if (force || (cached && cached.hash !== this.calculateChangeHash(cached === null || cached === void 0 ? void 0 : cached.state))) {
             if (!cached) {
@@ -78,7 +78,7 @@ class AgentState {
             }
             cached.state.eTag = '*';
             const changes = {};
-            const key = await this.storageKey(context);
+            const key = await this.getStorageOrCustomKey(customKey, context);
             changes[key] = cached.state;
             logger.info(`Writing storage with key ${key}`);
             await this.storage.write(changes);
@@ -86,6 +86,17 @@ class AgentState {
             context.turnState.set(this.stateKey, cached);
         }
     }
+    async getStorageOrCustomKey(customKey, context) {
+        let key;
+        if (customKey && customKey.channelId && customKey.conversationId) {
+            // TODO check ConversationState.ts line 40. This line below should follow the same pattern
+            key = `${customKey.channelId}/conversations/${customKey.conversationId}`;
+        }
+        else {
+            key = await this.storageKey(context);
+        }
+        return key;
+    }
     /**
      * Clears the state from the turn context.
      * @param context The turn context.
@@ -100,11 +111,11 @@ class AgentState {
      * @param context The turn context.
      * @returns A promise that resolves when the delete operation is complete.
      */
-    async delete(context) {
+    async delete(context, customKey) {
         if (context.turnState.has(this.stateKey)) {
             context.turnState.delete(this.stateKey);
         }
-        const key = await this.storageKey(context);
+        const key = await this.getStorageOrCustomKey(customKey, context);
         logger.info(`Deleting storage with key ${key}`);
         await this.storage.delete([key]);
     }

package/dist/src/state/agentState.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentState.js","sourceRoot":"","sources":["../../../src/state/agentState.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAIH,6CAAwC;AACxC,2EAAwE;AACxE,sCAAiC;AAEjC,MAAM,MAAM,GAAG,IAAA,cAAK,EAAC,cAAc,CAAC,CAAA;AAOpC;;GAEG;AACH,MAAa,UAAU;IAGrB;;;;QAII;IACJ,YAAuB,OAAgB,EAAY,UAA6B;QAAzD,YAAO,GAAP,OAAO,CAAS;QAAY,eAAU,GAAV,UAAU,CAAmB;QAP/D,aAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,CAAA;QAuG3C;;;;WAIG;QACc,wBAAmB,GAAG,CAAC,IAAe,EAAU,EAAE;YACjE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAA;YAE9B,sCAAsC;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;YAEnC,MAAM,IAAI,GAAG,IAAA,wBAAU,EAAC,QAAQ,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;YACxD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YAEhD,OAAO,MAAM,CAAA;QACf,CAAC,CAAA;IA/GmF,CAAC;IAErF;;;;OAIG;IACH,cAAc,CAAU,IAAY;QAClC,MAAM,IAAI,GAAkC,IAAI,sDAA0B,CAAI,IAAI,EAAE,IAAI,CAAC,CAAA;QACzF,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,IAAI,CAAE,OAAoB,EAAE,KAAK,GAAG,KAAK;QACpD,MAAM,MAAM,GAAqB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAErE,IAAI,KAAK,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACtC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAC1C,MAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;YAC9C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;YAEjD,MAAM,KAAK,GAAQ,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,CAAA;YACxC,MAAM,IAAI,GAAW,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAA;YACpD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAA;YAErD,OAAO,KAAK,CAAA;QACd,CAAC;QAED,OAAO,MAAM,CAAC,KAAK,CAAA;IACrB,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,WAAW,CAAE,OAAoB,EAAE,KAAK,GAAG,KAAK;QAC3D,IAAI,MAAM,GAAqB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACnE,IAAI,KAAK,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,mBAAmB,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,CAAC,CAAC,EAAE,CAAC;YACjF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;YAClC,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,GAAG,CAAA;YACvB,MAAM,OAAO,GAAc,EAAe,CAAA;YAE1C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;YAC1C,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,KAAK,CAAA;YAE3B,MAAM,CAAC,IAAI,CAAC,4BAA4B,GAAG,EAAE,CAAC,CAAA;YAC9C,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;YACjC,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;YACpD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAA;QAC9C,CAAC;IACH,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,KAAK,CAAE,OAAoB;QACtC,MAAM,sBAAsB,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;QACtD,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,sBAAsB,CAAC,CAAA;IAC9D,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,MAAM,CAAE,OAAoB;QACvC,IAAI,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACzC,CAAC;QACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAA;QAC1C,MAAM,CAAC,IAAI,CAAC,6BAA6B,GAAG,EAAE,CAAC,CAAA;QAC/C,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;IAClC,CAAC;IAED;;;;OAIG;IACI,GAAG,CAAE,OAAoB;QAC9B,MAAM,MAAM,GAAqB,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAErE,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,OAAO,MAAM,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAA;IAClG,CAAC;CAkBF;AAxHD,gCAwHC"}
+{"version":3,"file":"agentState.js","sourceRoot":"","sources":["../../../src/state/agentState.ts"],"names":[],"mappings":"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"}

package/dist/src/state/agentStatePropertyAccesor.d.ts

@@ -3,11 +3,64 @@
  * Licensed under the MIT License.
  */
 import { TurnContext } from '../turnContext';
-import { AgentState } from './agentState';
+import { AgentState, CustomKey } from './agentState';
+export interface StatePropertyAccessor<T = any> {
+    /**
+     * Deletes the persisted property from its backing storage object.
+     *
+     * @remarks
+     * The properties backing storage object SHOULD be loaded into memory on first access.
+     *
+     * ```JavaScript
+     * await myProperty.delete(context);
+     * ```
+     * @param context Context for the current turn of conversation with the user.
+     */
+    delete(context: TurnContext): Promise<void>;
+    /**
+     * Reads a persisted property from its backing storage object.
+     *
+     * @remarks
+     * The properties backing storage object SHOULD be loaded into memory on first access.
+     *
+     * If the property does not currently exist on the storage object and a `defaultValue` has been
+     * specified, a clone of the `defaultValue` SHOULD be copied to the storage object. If a
+     * `defaultValue` has not been specified then a value of `undefined` SHOULD be returned.
+     *
+     * ```JavaScript
+     * const value = await myProperty.get(context, { count: 0 });
+     * ```
+     * @param context Context for the current turn of conversation with the user.
+     */
+    get(context: TurnContext): Promise<T | undefined>;
+    /**
+     * Reads a persisted property from its backing storage object.
+     *
+     * @param context Context for the current turn of conversation with the user.
+     * @param defaultValue (Optional) default value to copy to the backing storage object if the property isn't found.
+     */
+    get(context: TurnContext, defaultValue: T): Promise<T>;
+    /**
+     * Assigns a new value to the properties backing storage object.
+     *
+     * @remarks
+     * The properties backing storage object SHOULD be loaded into memory on first access.
+     *
+     * Depending on the state systems implementation, an additional step may be required to
+     * persist the actual changes to disk.
+     *
+     * ```JavaScript
+     * await myProperty.set(context, value);
+     * ```
+     * @param context Context for the current turn of conversation with the user.
+     * @param value Value to assign.
+     */
+    set(context: TurnContext, value: T): Promise<void>;
+}
 /**
  * Provides access to an Agent state property.
  */
-export declare class AgentStatePropertyAccessor<T = any> {
+export declare class AgentStatePropertyAccessor<T = any> implements StatePropertyAccessor<T> {
     protected readonly state: AgentState;
     readonly name: string;
     /**
@@ -21,19 +74,19 @@ export declare class AgentStatePropertyAccessor<T = any> {
      * @param context The turn context.
      * @returns A promise that resolves when the delete operation is complete.
      */
-    delete(context: TurnContext): Promise<void>;
+    delete(context: TurnContext, customKey?: CustomKey): Promise<void>;
     /**
      * Gets the value of the property from the state.
      * @param context The turn context.
      * @param defaultValue The default value to return if the property is not found.
      * @returns A promise that resolves to the value of the property.
      */
-    get(context: TurnContext, defaultValue?: T): Promise<T>;
+    get(context: TurnContext, defaultValue?: T, customKey?: CustomKey): Promise<T>;
     /**
      * Sets the value of the property in the state.
      * @param context The turn context.
      * @param value The value to set.
      * @returns A promise that resolves when the set operation is complete.
      */
-    set(context: TurnContext, value: T): Promise<void>;
+    set(context: TurnContext, value: T, customKey?: CustomKey): Promise<void>;
 }

package/dist/src/state/agentStatePropertyAccesor.js

@@ -23,8 +23,8 @@ class AgentStatePropertyAccessor {
      * @param context The turn context.
      * @returns A promise that resolves when the delete operation is complete.
      */
-    async delete(context) {
-        const obj = await this.state.load(context);
+    async delete(context, customKey) {
+        const obj = await this.state.load(context, false, customKey);
         if (Object.prototype.hasOwnProperty.call(obj, this.name)) {
             delete obj[this.name];
         }
@@ -35,8 +35,8 @@ class AgentStatePropertyAccessor {
      * @param defaultValue The default value to return if the property is not found.
      * @returns A promise that resolves to the value of the property.
      */
-    async get(context, defaultValue) {
-        const obj = await this.state.load(context);
+    async get(context, defaultValue, customKey) {
+        const obj = await this.state.load(context, false, customKey);
         if (!Object.prototype.hasOwnProperty.call(obj, this.name) && defaultValue !== undefined) {
             const clone = typeof defaultValue === 'object' || Array.isArray(defaultValue)
                 ? JSON.parse(JSON.stringify(defaultValue))
@@ -51,8 +51,8 @@ class AgentStatePropertyAccessor {
      * @param value The value to set.
      * @returns A promise that resolves when the set operation is complete.
      */
-    async set(context, value) {
-        const obj = await this.state.load(context);
+    async set(context, value, customKey) {
+        const obj = await this.state.load(context, false, customKey);
         obj[this.name] = value;
     }
 }

package/dist/src/state/agentStatePropertyAccesor.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentStatePropertyAccesor.js","sourceRoot":"","sources":["../../../src/state/agentStatePropertyAccesor.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AAKH;;GAEG;AACH,MAAa,0BAA0B;IACrC;;;;OAIG;IACH,YAAgC,KAAiB,EAAkB,IAAY;QAA/C,UAAK,GAAL,KAAK,CAAY;QAAkB,SAAI,GAAJ,IAAI,CAAQ;IAAI,CAAC;IAEpF;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAE,OAAoB;QAChC,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACzD,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAE,OAAoB,EAAE,YAAgB;QAC/C,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC/C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YACxF,MAAM,KAAK,GACT,OAAO,YAAY,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC7D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAC1C,CAAC,CAAC,YAAY,CAAA;YAClB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;QACxB,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAE,OAAoB,EAAE,KAAQ;QACvC,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC/C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IACxB,CAAC;CACF;AAjDD,gEAiDC"}
+{"version":3,"file":"agentStatePropertyAccesor.js","sourceRoot":"","sources":["../../../src/state/agentStatePropertyAccesor.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;AA8DH;;GAEG;AACH,MAAa,0BAA0B;IACrC;;;;OAIG;IACH,YAAgC,KAAiB,EAAkB,IAAY;QAA/C,UAAK,GAAL,KAAK,CAAY;QAAkB,SAAI,GAAJ,IAAI,CAAQ;IAAI,CAAC;IAEpF;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAE,OAAoB,EAAE,SAAqB;QACvD,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QACjE,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YACzD,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAE,OAAoB,EAAE,YAAgB,EAAE,SAAqB;QACtE,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QACjE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YACxF,MAAM,KAAK,GACT,OAAO,YAAY,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC;gBAC7D,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAC1C,CAAC,CAAC,YAAY,CAAA;YAClB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;QACxB,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACvB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAE,OAAoB,EAAE,KAAQ,EAAE,SAAqB;QAC9D,MAAM,GAAG,GAAQ,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QACjE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAA;IACxB,CAAC;CACF;AAjDD,gEAiDC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@microsoft/agents-hosting",
-  "version": "0.1.49",
+  "version": "0.2.7-gd7a3e9ef95",
   "homepage": "https://github.com/microsoft/Agents-for-js",
   "repository": {
     "type": "git",
@@ -19,16 +19,13 @@
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "dependencies": {
-    "@microsoft/agents-activity": "0.1.49",
-    "@azure/msal-node": "^3.4.1",
+    "@microsoft/agents-activity": "0.2.7-gd7a3e9ef95",
+    "@azure/msal-node": "^3.5.1",
     "jsonwebtoken": "^9.0.2",
     "jwks-rsa": "^3.2.0",
     "axios": "^1.8.2",
     "debug": "^4.3.7"
   },
-  "devDependencies": {
-    "@types/express": "^5.0.1"
-  },
   "license": "MIT",
   "files": [
     "README.md",

package/src/activityWireCompat.ts

@@ -0,0 +1,45 @@
+/**
+ * @private
+ * Normalizes an incoming payload by converting the `bot` property in `relatesTo` to `agent`.
+ * This ensures compatibility with the activity wire protocol.
+ *
+ * @param payload - The incoming payload object to normalize.
+ * @returns The normalized payload object with `bot` replaced by `agent` in `relatesTo`.
+ */
+export function normalizeIncomingActivity (payload: any): object {
+  if (payload['relatesTo'] && payload['relatesTo']['bot']) {
+    const relatesTo = payload['relatesTo']
+    const ov = relatesTo['bot']
+    delete relatesTo['bot']
+    relatesTo['agent'] = ov
+  }
+  return payload
+}
+
+/**
+ * @private
+ * Normalizes an outgoing payload by converting the `agent` property in `relatesTo` to `bot`.
+ * This ensures compatibility with the activity wire protocol.
+ *
+ * @param payload - The outgoing payload object to normalize.
+ * @returns The normalized payload object with `agent` replaced by `bot` in `relatesTo`.
+ */
+export function normalizeOutgoingActivity (payload: any): object {
+  if (payload['relatesTo'] && payload['relatesTo']['agent']) {
+    const relatesTo = payload['relatesTo']
+    const ov = relatesTo['agent']
+    delete relatesTo['agent']
+    relatesTo['bot'] = ov
+  }
+  return payload
+}
+
+export function normalizeTokenExchangeState (payload: any): object {
+  if (payload['conversation'] && payload['conversation']['agent']) {
+    const conversation = payload['conversation']
+    const ov = conversation['agent']
+    delete conversation['agent']
+    conversation['bot'] = ov
+  }
+  return payload
+}

package/src/agent-client/agentClient.ts

@@ -1,8 +1,9 @@
 import { AuthConfiguration, MsalTokenProvider } from '../auth'
-import { Activity, RoleTypes } from '@microsoft/agents-activity'
+import { Activity, ConversationReference, RoleTypes } from '@microsoft/agents-activity'
 import { v4 } from 'uuid'
 import { debug } from '../logger'
-import { MemoryStorage, StoreItem } from '../storage'
+import { ConversationState } from '../state'
+import { TurnContext } from '../turnContext'
 
 const logger = debug('agents:agent-client')
 
@@ -12,6 +13,11 @@ export interface AgentClientConfig {
   serviceUrl: string
 }
 
+export interface ConversationData {
+  nameRequested: boolean
+  conversationReference: ConversationReference
+}
+
 export class AgentClient {
   agentClientConfig: AgentClientConfig
 
@@ -19,7 +25,7 @@ export class AgentClient {
     this.agentClientConfig = this.loadAgentClientConfig(agentConfigKey)
   }
 
-  public async postActivity (activity: Activity, authConfig: AuthConfiguration): Promise<string> {
+  public async postActivity (activity: Activity, authConfig: AuthConfiguration, conversationState: ConversationState, context: TurnContext): Promise<string> {
     const activityCopy = activity.clone()
     activityCopy.serviceUrl = this.agentClientConfig.serviceUrl
     activityCopy.recipient = { ...activityCopy.recipient, role: RoleTypes.Skill }
@@ -35,20 +41,21 @@ export class AgentClient {
     }
     activityCopy.conversation!.id = v4()
 
-    const memory = MemoryStorage.getSingleInstance()
-    const changes: StoreItem = {} as StoreItem
-    changes[activityCopy.conversation!.id] = {
-      conversationReference: activity.getConversationReference()
-    }
-    await memory.write(changes)
-    const memoryChanges = JSON.stringify(changes)
-    logger.debug('memoryChanges: ', memoryChanges)
+    const conversationDataAccessor = conversationState.createProperty<ConversationData>(activityCopy.conversation!.id)
+    const convRef = await conversationDataAccessor.set(context,
+      { conversationReference: activity.getConversationReference(), nameRequested: false },
+      { channelId: activityCopy.channelId!, conversationId: activityCopy.conversation!.id }
+    )
+
+    const stateChanges = JSON.stringify(convRef)
+    logger.debug('stateChanges: ', stateChanges)
 
     const authProvider = new MsalTokenProvider()
     const token = await authProvider.getAccessToken(authConfig, this.agentClientConfig.clientId)
 
     logger.debug('agent request: ', activityCopy)
 
+    await conversationState.saveChanges(context, false, { channelId: activityCopy.channelId!, conversationId: activityCopy.conversation!.id })
     const response = await fetch(this.agentClientConfig.endPoint, {
       method: 'POST',
       headers: {
@@ -59,6 +66,7 @@ export class AgentClient {
       body: JSON.stringify(activityCopy)
     })
     if (!response.ok) {
+      await conversationDataAccessor.delete(context, { channelId: activityCopy.channelId!, conversationId: activityCopy.conversation!.id })
       throw new Error(`Failed to post activity to agent: ${response.statusText}`)
     }
     return response.statusText
@@ -67,8 +75,8 @@ export class AgentClient {
   private loadAgentClientConfig (agentName: string): AgentClientConfig {
     if (agentName) {
       if (process.env[`${agentName}_endpoint`] !== undefined &&
-          process.env[`${agentName}_clientId`] !== undefined &&
-          process.env[`${agentName}_serviceUrl`] !== undefined) {
+        process.env[`${agentName}_clientId`] !== undefined &&
+        process.env[`${agentName}_serviceUrl`] !== undefined) {
         return {
           endPoint: process.env[`${agentName}_endpoint`]!,
           clientId: process.env[`${agentName}_clientId`]!,

package/src/agent-client/{expressApi.ts → agentResponseHandler.ts}

@@ -1,34 +1,42 @@
-import { Activity, ActivityTypes } from '@microsoft/agents-activity'
+import { Activity, ActivityTypes, ConversationReference } from '@microsoft/agents-activity'
 import { ActivityHandler } from '../activityHandler'
 import { CloudAdapter } from '../cloudAdapter'
 import { Request, Response, Application } from 'express'
-import { MemoryStorage } from '../storage'
 import { TurnContext } from '../turnContext'
 import { v4 } from 'uuid'
+import { normalizeIncomingActivity } from '../activityWireCompat'
 import { debug } from '../logger'
+import { ConversationState } from '../state'
 
 const logger = debug('agents:agent-client')
 
-export const configureResponseController = (app: Application, adapter: CloudAdapter, agent: ActivityHandler) => {
-  app.post('/api/botresponse/v3/conversations/:conversationId/activities/:activityId', handleResponse(adapter, agent))
+interface ConversationReferenceState {
+  conversationReference: ConversationReference
 }
 
-const handleResponse = (adapter: CloudAdapter, handler: ActivityHandler) => async (req: Request, res: Response) => {
-  const activity = Activity.fromObject(req.body!)
+export const configureResponseController = (app: Application, adapter: CloudAdapter, agent: ActivityHandler, conversationState: ConversationState) => {
+  app.post('/api/agentresponse/v3/conversations/:conversationId/activities/:activityId', handleResponse(adapter, agent, conversationState))
+}
+
+const handleResponse = (adapter: CloudAdapter, handler: ActivityHandler, conversationState: ConversationState) => async (req: Request, res: Response) => {
+  const incoming = normalizeIncomingActivity(req.body!)
+  const activity = Activity.fromObject(incoming)
 
   logger.debug('received response: ', activity)
 
-  const requestData = await MemoryStorage.getSingleInstance().read([req.params!.conversationId])
-  const conversationReference = requestData[req.params!.conversationId].conversationReference
-  logger.debug('memoryChanges: ', requestData)
+  const myTurnContext = new TurnContext(adapter, activity)
+  const conversationDataAccessor = conversationState.createProperty<ConversationReferenceState>(req.params!.conversationId)
+  const conversationRefState = await conversationDataAccessor.get(myTurnContext, undefined, { channelId: activity.channelId!, conversationId: req.params!.conversationId })
 
+  const conversationRef = JSON.stringify(conversationRefState.conversationReference)
+  console.log('conversationRef', conversationRef)
   const callback = async (turnContext: TurnContext) => {
-    activity.applyConversationReference(conversationReference)
+    activity.applyConversationReference(conversationRefState.conversationReference)
     turnContext.activity.id = req.params!.activityId
 
     let response
     if (activity.type === ActivityTypes.EndOfConversation) {
-      await MemoryStorage.getSingleInstance().delete([activity.conversation!.id])
+      await conversationDataAccessor.delete(turnContext, { channelId: activity.channelId!, conversationId: activity.conversation!.id })
 
       applyActivityToTurnContext(turnContext, activity)
       await handler.run(turnContext)
@@ -40,7 +48,7 @@ const handleResponse = (adapter: CloudAdapter, handler: ActivityHandler) => asyn
     res.status(200).send(response)
   }
 
-  await adapter.continueConversation(conversationReference, callback, true)
+  await adapter.continueConversation(conversationRefState.conversationReference, callback, true)
 }
 
 const applyActivityToTurnContext = (turnContext : TurnContext, activity : Activity) => {

package/src/agent-client/index.ts

@@ -1,2 +1,2 @@
 export * from './agentClient'
-export * from './expressApi'
+export * from './agentResponseHandler'