pixeldevel · pull · Feb 7, 2026 · Feb 6, 2026 · Feb 6, 2026 · Feb 6, 2026
diff --git a/accessible/base/TextLeafRange.cpp b/accessible/base/TextLeafRange.cpp
@@ -661,6 +661,18 @@ static bool IsCaretValid(TextLeafPoint aPoint) {
   return focus->State() & states::EDITABLE;
 }
 
+static bool IsStartOfFocusedEditor(TextLeafPoint& aPoint) {
+  if (aPoint.mOffset != 0) {
+    return false;
+  }
+  Accessible* focus = FocusMgr() ? FocusMgr()->FocusedAccessible() : nullptr;
+  if (!focus || !(focus->State() & states::EDITABLE)) {
+    // There isn't a focused editor.
+    return false;
+  }
+  return aPoint == TextLeafPoint(focus, 0);
+}
+
 /*** TextLeafPoint ***/
 
 TextLeafPoint::TextLeafPoint(Accessible* aAcc, int32_t aOffset) {
@@ -1149,17 +1161,19 @@ TextLeafPoint TextLeafPoint::GetCaret(Accessible* aAcc) {
       // node.
       // 3. The caret is somewhere other than the start of a line and the user
       // presses down or up arrow to move by line.
+      // 4. The user focuses a contentEditable and the caret is positioned on
+      // the first character.
       if (point.mOffset <
           static_cast<int32_t>(nsAccUtils::TextLength(point.mAcc))) {
         // The caret is at the end of a line if the point is at the start of a
-        // line but not at the start of a paragraph.
+        // line but not the start of a focused editor.
         point.mIsEndOfLineInsertionPoint =
             point.FindPrevLineStartSameLocalAcc(/* aIncludeOrigin */ true) ==
                 point &&
-            !point.IsParagraphStart();
+            !IsStartOfFocusedEditor(point);
       } else {
-        // This is the end of a node. CaretAssociationHint::Before is only used
-        // at the end of a node if the caret is at the end of a line.
+        // CaretAssociationHint::Before is only used at the end of a node if the
+        // caret is both at the end of a node and at the end of a line.
         point.mIsEndOfLineInsertionPoint = true;
       }
     }

diff --git a/accessible/tests/browser/bounds/browser_caret_rect.js b/accessible/tests/browser/bounds/browser_caret_rect.js
@@ -88,7 +88,10 @@ function testCaretRect(
   atLineEnd = false,
   isVertical = false
 ) {
-  const acc = findAccessibleChildByID(docAcc, id, [nsIAccessibleText]);
+  const acc = findAccessibleChildByID(docAcc, id, [
+    nsIAccessibleText,
+    nsIAccessibleHyperText,
+  ]);
   is(acc.caretOffset, offset, `Caret at offset ${offset}`);
   const atEnd = offset == acc.characterCount;
   const empty = offset == 0 && atEnd;
@@ -102,8 +105,11 @@ function testCaretRect(
 
   const [caretX, caretY, caretW, caretH] = getCaretRect(docAcc, id);
 
-  if (!empty) {
-    // In case of an empty input `getRangeExtents()` will return the full accessible bounds.
+  // In case of an empty input `getRangeExtents()` will return the full accessible bounds.
+  // When called on an embedded object, `getRangeExtents()` will return the
+  // bounds for the content inside it, so it isn't a collapsed range and thus it
+  // won't match the caret.
+  if (!empty && acc.getLinkIndexAtOffset(offset) == -1) {
     let [currRangeX, currRangeY, currRangeW] = getCollapsedRangeExtents(
       acc,
       acc.caretOffset
@@ -555,3 +561,40 @@ addAccessibleTask(
     }
   }
 );
+
+/**
+ * Test a contentEditable with a paragraph containing a line break.
+ */
+addAccessibleTask(
+  `
+<style>
+  @font-face {
+    font-family: Ahem;
+    src: url(${CURRENT_CONTENT_DIR}e10s/fonts/Ahem.sjs);
+  }
+  #editable {
+    font: 10px/10px Ahem;
+  }
+</style>
+<div id="editable" contenteditable>a<p><br></p></div>
+  `,
+  async function testEditablePBr(browser, docAcc) {
+    const editable = findAccessibleChildByID(docAcc, "editable", [
+      nsIAccessibleText,
+    ]);
+    const fetchedBounds = await fetchCollapsedRangeBounds(docAcc, editable);
+
+    info("Focusing editable");
+    let moved = waitForEvent(EVENT_FOCUS, editable);
+    editable.takeFocus();
+    await moved;
+    testCaretRect(docAcc, "editable", 0, fetchedBounds);
+
+    info("Pressing ArrowRight");
+    moved = waitForEvent(EVENT_TEXT_CARET_MOVED);
+    EventUtils.synthesizeKey("KEY_ArrowRight");
+    await moved;
+    testCaretRect(docAcc, "editable", 1, fetchedBounds, true);
+  },
+  { chrome: true, topLevel: true }
+);
diff --git a/accessible/tests/browser/text/browser_text_caret.js b/accessible/tests/browser/text/browser_text_caret.js
@@ -19,8 +19,10 @@ addAccessibleTask(
           cols="6">ab cd e</textarea>
 <textarea id="empty"></textarea>
 <div id="contentEditable" contenteditable>a<span>b</span></div>
+<div id="editableWithTextThenP" contenteditable>a<p>b</p></div>
+<div id="editableWithTextAndLink" contenteditable>a<a href="#">b</a>c</div>
   `,
-  async function (browser, docAcc) {
+  async function testRetrieval(browser, docAcc) {
     const textarea = findAccessibleChildByID(docAcc, "textarea", [
       nsIAccessibleText,
     ]);
@@ -513,6 +515,62 @@ addAccessibleTask(
       kOk,
       kOk
     );
+
+    const editableWithTextThenP = findAccessibleChildByID(
+      docAcc,
+      "editableWithTextThenP",
+      [nsIAccessibleText]
+    );
+    info("Focusing editableWithTextThenP");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextThenP);
+    editableWithTextThenP.takeFocus();
+    evt = await caretMoved;
+    is(
+      editableWithTextThenP.caretOffset,
+      0,
+      "Initial caret offset in editableWithTextThenP is 0"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(!evt.isAtEndOfLine, "Caret is not at end of line");
+    info("Pressing ArrowRight");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextThenP);
+    EventUtils.synthesizeKey("KEY_ArrowRight");
+    evt = await caretMoved;
+    is(
+      editableWithTextThenP.caretOffset,
+      1,
+      "Caret offset is 1 after ArrowRight"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(evt.isAtEndOfLine, "Caret is at end of line");
+
+    const editableWithTextAndLink = findAccessibleChildByID(
+      docAcc,
+      "editableWithTextAndLink",
+      [nsIAccessibleText]
+    );
+    info("Focusing editableWithTextAndLink");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextAndLink);
+    editableWithTextAndLink.takeFocus();
+    evt = await caretMoved;
+    is(
+      editableWithTextAndLink.caretOffset,
+      0,
+      "Initial caret offset in editableWithTextAndLink is 0"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(!evt.isAtEndOfLine, "Caret is not at end of line");
+    info("Pressing ArrowRight");
+    caretMoved = waitForEvent(EVENT_TEXT_CARET_MOVED, editableWithTextAndLink);
+    EventUtils.synthesizeKey("KEY_ArrowRight");
+    evt = await caretMoved;
+    is(
+      editableWithTextAndLink.caretOffset,
+      1,
+      "Caret offset is 1 after ArrowRight"
+    );
+    evt.QueryInterface(nsIAccessibleCaretMoveEvent);
+    ok(!evt.isAtEndOfLine, "Caret is not at end of line");
   },
   { chrome: true, topLevel: true, iframe: true, remoteIframe: true }
 );

diff --git a/browser/app/distribution/distribution.ini b/browser/app/distribution/distribution.ini
@@ -0,0 +1,4 @@
+[Global]
+id=mozilla-official
+version=1.0
+about=Mozilla Firefox Official Build
diff --git a/browser/app/distribution/moz.build b/browser/app/distribution/moz.build
@@ -0,0 +1,12 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+DIST_SUBDIR = ""
+
+if CONFIG["BUILT_BY_MOZILLA"]:
+    FINAL_TARGET_FILES.distribution += [
+        "distribution.ini",
+    ]
diff --git a/browser/app/moz.build b/browser/app/moz.build
@@ -29,6 +29,8 @@ with Files("profile/channel-prefs.js"):
 with Files("profile/firefox.js"):
     BUG_COMPONENT = ("Firefox", "General")
 
+DIRS += ["distribution"]
+
 if CONFIG["MOZ_MACBUNDLE_NAME"]:
     DIRS += ["macbuild/Contents"]
 

diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
@@ -490,8 +490,7 @@ pref("browser.urlbar.suggest.quicksuggest.nonsponsored", false, sticky);
 pref("browser.urlbar.suggest.quicksuggest.sponsored", false, sticky);
 
 // Whether online Firefox Suggest is available to the user. This is only
-// relevant when Suggest overall is enabled [1]. When true, a checkbox will be
-// shown in the settings UI allowing to the user to toggle online Suggest.
+// relevant when Suggest overall is enabled [1].
 //
 // [1] browser.urlbar.quicksuggest.enabled
 pref("browser.urlbar.quicksuggest.online.available", false);
@@ -658,7 +657,25 @@ pref("browser.urlbar.keepPanelOpenDuringImeComposition", false);
 pref("browser.urlbar.groupLabels.enabled", true);
 
 // The Merino endpoint URL, not including parameters.
+#ifdef NIGHTLY_BUILD
+pref("browser.urlbar.merino.endpointURL", "https://prod.merino.prod.webservices.mozgcp.net/api/v1/suggest");
+#else
 pref("browser.urlbar.merino.endpointURL", "https://merino.services.mozilla.com/api/v1/suggest");
+#endif
+
+// OHTTP config URL for Merino requests
+#ifdef NIGHTLY_BUILD
+pref("browser.urlbar.merino.ohttpConfigURL", "https://prod.merino.prod.webservices.mozgcp.net/ohttp-configs");
+#else
+pref("browser.urlbar.merino.ohttpConfigURL", "");
+#endif
+
+// OHTTP relay URL for Merino requests
+#ifdef NIGHTLY_BUILD
+pref("browser.urlbar.merino.ohttpRelayURL", "https://ohttp-merino.mozilla.fastly-edge.com");
+#else
+pref("browser.urlbar.merino.ohttpRelayURL", "");
+#endif
 
 // Timeout for Merino fetches (ms).
 pref("browser.urlbar.merino.timeoutMs", 200);
@@ -669,12 +686,6 @@ pref("browser.urlbar.merino.providers", "");
 // Comma-separated list of client variants to send to Merino
 pref("browser.urlbar.merino.clientVariants", "");
 
-// OHTTP config URL for Merino requests
-pref("browser.urlbar.merino.ohttpConfigURL", "");
-
-// OHTTP relay URL for Merino requests
-pref("browser.urlbar.merino.ohttpRelayURL", "");
-
 // OHTTP hpke for DAP
 pref("dap.ohttp.hpke", "gAAgJSO22Y3HKzRSese15JtQVuuFfOIcTrZ56lQ5kDQwS0oABAABAAE");
 

diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
@@ -715,7 +715,7 @@
               <image class="PanelUI-fxa-menu-vpn-button ctaMenuLogo" role="presentation" />
               <label id="fxa-menu-header-title" crop="end" data-l10n-id="appmenuitem-vpn-title" />
             </hbox>
-            <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-vpn-description" />
+            <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-vpn-description-2" />
           </vbox>
         </toolbarbutton>
       </vbox>

diff --git a/browser/base/content/test/about/browser_aboutDialog_distribution.js b/browser/base/content/test/about/browser_aboutDialog_distribution.js
@@ -13,6 +13,14 @@ add_task(async function verify_distribution_info_hides() {
 
   defaultBranch.setCharPref("distribution.id", "mozilla-test-distribution-id");
   defaultBranch.setCharPref("distribution.version", "1.0");
+  if (
+    !(
+      AppConstants.platform === "win" &&
+      Services.sysinfo.getProperty("hasWinPackageId")
+    )
+  ) {
+    defaultBranch.setCharPref("distribution.about", "");
+  }
 
   let aboutDialog = await waitForAboutDialog();
 

diff --git a/browser/base/content/test/siteIdentity/browser.toml b/browser/base/content/test/siteIdentity/browser.toml
@@ -78,9 +78,6 @@ skip-if = [
 ]
 
 ["browser_identityPopup_qwacs.js"]
-skip-if = [
-  "true", # Bug 2014612
-]
 
 ["browser_identity_UI.js"]
 https_first_disabled = true

diff --git a/browser/components/aiwindow/models/Utils.sys.mjs b/browser/components/aiwindow/models/Utils.sys.mjs
@@ -125,7 +125,7 @@ export const DEFAULT_MODEL = Object.freeze({
  * - Old clients will continue using old major version
  */
 export const FEATURE_MAJOR_VERSIONS = Object.freeze({
-  [MODEL_FEATURES.CHAT]: 1,
+  [MODEL_FEATURES.CHAT]: 2,
   [MODEL_FEATURES.TITLE_GENERATION]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_SIDEBAR_STARTER]: 1,
   [MODEL_FEATURES.CONVERSATION_SUGGESTIONS_FOLLOWUP]: 1,

diff --git a/browser/components/aiwindow/models/memories/MemoriesChatSource.sys.mjs b/browser/components/aiwindow/models/memories/MemoriesChatSource.sys.mjs
@@ -15,6 +15,7 @@ import { BlockListManager } from "chrome://global/content/ml/Utils.sys.mjs";
 // Chat fetch defaults
 const DEFAULT_MAX_RESULTS = 50;
 const DEFAULT_HALF_LIFE_DAYS = 7;
+const MESSAGE_LENGTH_THRESHOLD = 1000;
 const MS_PER_SEC = 1_000;
 const SEC_PER_MIN = 60;
 const MINS_PER_HOUR = 60;
@@ -71,10 +72,14 @@ export async function getRecentChats(
   const chatMessages = filtered.map(msg => {
     const createdDate = msg.createdDate;
     const freshness_score = computeFreshnessScore(createdDate, halfLifeDays);
+    let content = msg.content?.body ?? null;
+    if (content && content.length > MESSAGE_LENGTH_THRESHOLD) {
+      content = content.substring(0, MESSAGE_LENGTH_THRESHOLD);
+    }
     return {
       createdDate,
       role: msg.role,
-      content: msg.content?.body ?? null,
+      content,
       pageUrl: msg.pageUrl,
       freshness_score,
     };

diff --git a/browser/components/aiwindow/models/memories/MemoriesHistoryScheduler.sys.mjs b/browser/components/aiwindow/models/memories/MemoriesHistoryScheduler.sys.mjs
@@ -29,7 +29,7 @@ ChromeUtils.defineLazyGetter(lazy, "console", function () {
 const INITIAL_MEMORIES_PAGES_THRESHOLD = 0;
 
 // Only run if at least this many pages have been visited.
-const MEMORIES_SCHEDULER_PAGES_THRESHOLD = 2;
+const MEMORIES_SCHEDULER_PAGES_THRESHOLD = 30;
 
 // Memories history schedule every 2 mins
 const MEMORIES_SCHEDULER_INTERVAL_MS = 2 * 60 * 1000;

diff --git a/browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs b/browser/components/aiwindow/models/memories/MemoriesHistorySource.sys.mjs
@@ -212,7 +212,8 @@ export async function getRecentHistory(opts = {}) {
           const onlyTitle = row.getResultByName("title") || "";
           let title;
           if (onlyTitle) {
-            title = onlyTitle + " | " + host;
+            const sanitizedTitle = sanitizeTitle(onlyTitle);
+            title = sanitizedTitle + " | " + host;
           } else {
             title = onlyTitle;
           }
@@ -761,11 +762,39 @@ function round2(x) {
   return Math.round(Number(x) * 100) / 100;
 }
 
+/**
+ * Sanitize title text to prevent JSON parsing issues in LLM outputs.
+ * Removes/replaces characters that commonly cause problems:
+ * - Backslashes (replaced with forward slashes)
+ * - Control characters (replaced with spaces)
+ *
+ * @param {string} title - Raw title from Places database
+ * @returns {string} - Sanitized title
+ */
+function sanitizeTitle(title) {
+  if (typeof title !== "string") {
+    return "";
+  }
+
+  return (
+    title
+      .replace(/\\/g, "/") // Replace backslash with forward slash
+      // eslint-disable-next-line no-control-regex
+      .replace(/[\x00-\x1F\x7F]/g, " ") // Replace control chars (0-31, 127) with space
+      .replace(/\s+/g, " ") // Collapse multiple spaces
+      .trim()
+  );
+}
+
 // for tests only
 export function _setBlockListManagerForTesting(mgr) {
   _mgr = mgr;
 }
 
+export function _sanitizeTitleForTesting(title) {
+  return sanitizeTitle(title);
+}
+
 /**
  * Return the number of history visits since `days` ago.
  *