Merge branch 'mozilla-firefox:main' into s2sBranch

Author: fmasalha

accessible/windows/msaa/MsaaAccessible.cpp

@@ -41,7 +41,7 @@ static const GUID IID_MsaaAccessible = {
     0x4afc,
     {0xa3, 0x2c, 0xd6, 0xb5, 0xc0, 0x10, 0x04, 0x6b}};
 
-MOZ_RUNINIT MsaaIdGenerator MsaaAccessible::sIDGen;
+constinit MsaaIdGenerator MsaaAccessible::sIDGen;
 ITypeInfo* MsaaAccessible::gTypeInfo = nullptr;
 
 /* static */

browser/base/content/logos/ipprotection-excluded.svg

@@ -190,15 +190,15 @@ async function testStripOnShare({
     let testJson = {
       global: {
         queryParams: ["utm_ad"],
-        topLevelSites: ["*"],
+        isGlobal: true,
       },
       example: {
         queryParams: ["test_2", "test_1"],
-        topLevelSites: ["www.example.com"],
+        origins: ["www.example.com"],
       },
       exampleNet: {
         queryParams: ["test_3", "test_4"],
-        topLevelSites: ["www.example.net"],
+        origins: ["www.example.net"],
       },
     };
 

browser/base/content/test/contextMenu/browser_strip_on_share_link.js

@@ -115,15 +115,15 @@ async function testStripOnShare({ originalURI, strippedURI }) {
   let testJson = {
     global: {
       queryParams: ["utm_ad"],
-      topLevelSites: ["*"],
+      isGlobal: true,
     },
     example: {
       queryParams: ["test_2", "test_1"],
-      topLevelSites: ["www.example.com"],
+      origins: ["www.example.com"],
     },
     exampleNet: {
       queryParams: ["test_3", "test_4"],
-      topLevelSites: ["www.example.net"],
+      origins: ["www.example.net"],
     },
   };
 

browser/base/content/test/contextMenu/browser_strip_on_share_nested_link.js

@@ -16,6 +16,7 @@ browser.jar:
         content/browser/logos/etp-mobile.svg          (content/logos/etp-mobile.svg)
         content/browser/logos/fxa-logo.svg            (content/logos/fxa-logo.svg)
         content/browser/logos/ipprotection-error.svg  (content/logos/ipprotection-error.svg)
+        content/browser/logos/ipprotection-excluded.svg  (content/logos/ipprotection-excluded.svg)
         content/browser/logos/ipprotection-off.svg    (content/logos/ipprotection-off.svg)
         content/browser/logos/ipprotection-on.svg     (content/logos/ipprotection-on.svg)
         content/browser/logos/lockwise.svg            (content/logos/lockwise.svg)

browser/base/jar.mn

@@ -21,8 +21,8 @@ ChromeUtils.defineLazyGetter(lazy, "console", function () {
 // Generate memories if there have been at least 10 user messages since the last run
 const MEMORIES_SCHEDULER_MESSAGES_THRESHOLD = 10;
 
-// Conversation scheduler tick every 30 mins
-const MEMORIES_SCHEDULER_INTERVAL_MS = 30 * 60 * 1000;
+// Conversation scheduler tick every 2 mins
+const MEMORIES_SCHEDULER_INTERVAL_MS = 2 * 60 * 1000;
 // Cooldown period - don't run more than once every 4 hours
 const MEMORIES_SCHEDULER_COOLDOWN_MS = 4 * 60 * 60 * 1000;
 

browser/components/aiwindow/models/memories/MemoriesConversationScheduler.sys.mjs

@@ -31,8 +31,8 @@ const INITIAL_MEMORIES_PAGES_THRESHOLD = 10;
 // Only run if at least this many pages have been visited.
 const MEMORIES_SCHEDULER_PAGES_THRESHOLD = 15;
 
-// Memories history schedule every 30 mins
-const MEMORIES_SCHEDULER_INTERVAL_MS = 30 * 60 * 1000;
+// Memories history schedule every 2 mins
+const MEMORIES_SCHEDULER_INTERVAL_MS = 2 * 60 * 1000;
 // Cooldown period - don't run more than once every 6 hours
 const MEMORIES_SCHEDULER_COOLDOWN_MS = 6 * 60 * 60 * 1000;
 

browser/components/aiwindow/models/memories/MemoriesHistoryScheduler.sys.mjs

@@ -198,6 +198,19 @@ export class MemoriesManager {
         topkAggregatesOpts
       );
     const sources = { history: [domainItems, titleItems, searchItems] };
+
+    const hasAnyHistory = sources.history.some(
+      items => Array.isArray(items) && !!items.length
+    );
+
+    if (!hasAnyHistory) {
+      console.warn(
+        "MemoriesManager.generateMemoriesFromBrowsingHistory: " +
+          "History aggregates are empty; skipping memory generation."
+      );
+      return [];
+    }
+
     return await this.generateAndSaveMemoriesFromSources(
       sources,
       SOURCE_HISTORY
@@ -240,6 +253,15 @@ export class MemoriesManager {
       DEFAULT_CHAT_HALF_LIFE_DAYS_FULL_RESULTS
     );
     const sources = { conversation: chatMessages };
+
+    if (!Array.isArray(chatMessages) || chatMessages.length === 0) {
+      console.warn(
+        "MemoriesManager.generateMemoriesFromConversationHistory: " +
+          "No recent chat messages found; skipping memory generation."
+      );
+      return [];
+    }
+
     return await this.generateAndSaveMemoriesFromSources(
       sources,
       SOURCE_CONVERSATION