Merge branch 'main' into feat/markdown-streaming

Author: OEvgeny

CHANGELOG.md

@@ -165,6 +165,7 @@ Breaking changes in this release:
 
 ### Changed
 
+- Added streaming fast path in activity upsert to skip recomputation for mid-stream revisions, in PR [#5796](https://github.com/microsoft/BotFramework-WebChat/pull/5796), by [@OEvgeny](https://github.com/OEvgeny)
 - Updated `useSuggestedActions` to return the activity the suggested actions originated from, in PR [#5255](https://github.com/microsoft/BotFramework-WebChat/issues/5255), by [@compulim](https://github.com/compulim)
 - Improved focus trap implementation by preserving focus state and removing sentinels, in PR [#5243](https://github.com/microsoft/BotFramework-WebChat/pull/5243), by [@OEvgeny](https://github.com/OEvgeny)
 - Reworked pre-chat activity layout to use author entity for improved consistency and flexibility, in PR [#5274](https://github.com/microsoft/BotFramework-WebChat/pull/5274), by [@OEvgeny](https://github.com/OEvgeny)
@@ -341,7 +342,10 @@ Breaking changes in this release:
 - Improved adaptive cards rendering in copilot variant, in PR [#5682](https://github.com/microsoft/BotFramework-WebChat/pull/5682), by [@OEvgeny](https://github.com/OEvgeny)
 - Bumped to [`botframework-directlinejs@0.15.8`](https://www.npmjs.com/package/botframework-directlinejs/v/0.15.8) to include support for the new `streaming` property, by [@pranavjoshi001](https://github.com/pranavjoshi001), in PR [#5686](https://github.com/microsoft/BotFramework-WebChat/pull/5686)
 - Removed unused deps `simple-git`, by [@compulim](https://github.com/compulim), in PR [#5786](https://github.com/microsoft/BotFramework-WebChat/pull/5786)
-- Improved `ActivityKeyerComposer` performance for append scenarios by adding an incremental fast path that only processes newly-appended activities, in PR [#5790](https://github.com/microsoft/BotFramework-WebChat/pull/5790), by [@OEvgeny](https://github.com/OEvgeny)
+- Improved `ActivityKeyerComposer` performance for append scenarios by adding an incremental fast path that only processes newly-appended activities, in PR [#5790](https://github.com/microsoft/BotFramework-WebChat/pull/5790), in PR [#5797](https://github.com/microsoft/BotFramework-WebChat/pull/5797), by [@OEvgeny](https://github.com/OEvgeny)
+   - Added frozen window optimization to limit reference comparisons to the last 1,000 activities with deferred verification of the frozen portion, in PR [#5797](https://github.com/microsoft/BotFramework-WebChat/pull/5797), by [@OEvgeny](https://github.com/OEvgeny)
+- Improved livestream performance by pruning intermediate revision activities after a stream session is finalized, in PR [#5798](https://github.com/microsoft/BotFramework-WebChat/pull/5798), by [@OEvgeny](https://github.com/OEvgeny)
+- Bumped to [`adaptivecards@3.0.6`](https://www.npmjs.com/package/adaptivecards/v/3.0.6) in PR [#5800](https://github.com/microsoft/BotFramework-WebChat/pull/5800) by [@compulim](https://github.com/compulim)
 
 ### Deprecated
 

__tests__/html2/livestream/activityOrder.html

@@ -246,7 +246,7 @@
         expect(currentActivityKeysWithId).toEqual([
           [firstActivityKey, ['a-00001']],
           [thirdActivityKey, ['a-00003']],
-          [secondActivityKey, ['t-00001', 't-00002', 't-00003', 'a-00002']]
+          [secondActivityKey, ['a-00002']]
         ]);
       });
     </script>

__tests__/html2/livestream/backtrackToEmpty.html

@@ -264,7 +264,7 @@
         // THEN: Should have 2 activity keys only.
         expect(currentActivityKeysWithId).toEqual([
           [expect.any(String), ['a-00001']],
-          [firstTypingActivityKey, ['t-00001', 't-00002', 't-00003', 't-00004']]
+          [firstTypingActivityKey, ['t-00004']]
         ]);
 
         // THEN: Should have no active typing.
@@ -287,7 +287,7 @@
         // THEN: Should have 2 activity keys only.
         expect(currentActivityKeysWithId).toEqual([
           [expect.any(String), ['a-00001']],
-          [firstTypingActivityKey, ['t-00001', 't-00002', 't-00003', 't-00004']],
+          [firstTypingActivityKey, ['t-00004']],
           [expect.any(String), ['a-00002']]
         ]);
 

__tests__/html2/livestream/chunk.html

@@ -204,7 +204,7 @@
         // THEN: Should have 2 activity keys.
         expect(currentActivityKeysWithId).toEqual([
           [firstActivityKey, ['a-00001']],
-          [secondActivityKey, ['t-00001', 't-00002', 't-00003', 'a-00002']]
+          [secondActivityKey, ['a-00002']]
         ]);
       });
     </script>

__tests__/html2/livestream/concludedLivestream.html

@@ -137,7 +137,7 @@
         await host.snapshot('local');
 
         // THEN: Should have 1 activity key only.
-        expect(currentActivityKeysWithId).toEqual([[firstTypingActivityKey, ['t-00001', 't-00002']]]);
+        expect(currentActivityKeysWithId).toEqual([[firstTypingActivityKey, ['t-00002']]]);
 
         // THEN: Should have no active typing.
         expect(currentActiveTyping).toHaveProperty('u-00001', undefined);
@@ -167,8 +167,8 @@
         );
         await host.snapshot('local');
 
-        // THEN: Should have 1 activity key associated with 2 activity IDs only.
-        expect(currentActivityKeysWithId).toEqual([[firstTypingActivityKey, ['t-00001', 't-00002']]]);
+        // THEN: Should have 1 activity key associated with a single activity ID only.
+        expect(currentActivityKeysWithId).toEqual([[firstTypingActivityKey, ['t-00002']]]);
 
         // THEN: Should have no active typing.
         expect(currentActiveTyping).toHaveProperty('u-00001', undefined);
@@ -198,8 +198,8 @@
         );
         await host.snapshot('local');
 
-        // THEN: Should have 1 activity key associated with 2 activity IDs only.
-        expect(currentActivityKeysWithId).toEqual([[firstTypingActivityKey, ['t-00001', 't-00002']]]);
+        // THEN: Should have 1 activity key associated with 1 activity ID only (intermediate revisions pruned).
+        expect(currentActivityKeysWithId).toEqual([[firstTypingActivityKey, ['t-00002']]]);
 
         // THEN: Should have no active typing.
         expect(currentActiveTyping).toHaveProperty('u-00001', undefined);

__tests__/html2/livestream/outOfOrder.html

@@ -247,7 +247,7 @@
         // THEN: Should have 2 activity keys.
         expect(currentActivityKeysWithId).toEqual([
           [firstActivityKey, ['a-00001']],
-          [secondActivityKey, ['t-00001', 't-00002', 't-00003', 'a-00002']]
+          [secondActivityKey, ['a-00002']]
         ]);
 
         // THEN: Should have no typing.

__tests__/html2/livestream/outOfOrder.sequenceNumber.html

@@ -249,7 +249,7 @@
         // THEN: Should have 2 activity keys.
         expect(currentActivityKeysWithId).toEqual([
           [firstActivityKey, ['a-00001']],
-          [secondActivityKey, ['t-00001', 't-00002', 't-00003', 'a-00002']]
+          [secondActivityKey, ['a-00002']]
         ]);
 
         // THEN: Should have no typing.

__tests__/html2/livestream/simultaneous.html

@@ -251,7 +251,7 @@
         expect(currentActivityKeysWithId).toEqual([
           [firstActivityKey, ['a-00001']],
           [thirdActivityKey, ['t-10001', 't-10002']],
-          [secondActivityKey, ['t-00001', 't-00002', 'a-00002']]
+          [secondActivityKey, ['a-00002']]
         ]);
 
         // ---
@@ -289,8 +289,8 @@
         // THEN: Should have 3 activity keys.
         expect(currentActivityKeysWithId).toEqual([
           [firstActivityKey, ['a-00001']],
-          [secondActivityKey, ['t-00001', 't-00002', 'a-00002']],
-          [thirdActivityKey, ['t-10001', 't-10002', 'a-00003']]
+          [secondActivityKey, ['a-00002']],
+          [thirdActivityKey, ['a-00003']]
         ]);
       });
     </script>