Merge firefox-autoland to firefox-main

Author: Lando

.cargo/audit.toml

@@ -6,6 +6,4 @@ ignore = [
   "RUSTSEC-2023-0018",
   # paste <https://bugzilla.mozilla.org/show_bug.cgi?id=1998421>
   "RUSTSEC-2024-0436",
-  # serde_cbor <https://bugzilla.mozilla.org/show_bug.cgi?id=1998418>
-  "RUSTSEC-2021-0127",
 ]

.cargo/config.toml.in

@@ -69,6 +69,11 @@ git = "https://github.com/mozilla/audioipc"
 rev = "042d48dc5932ced772c2bf20a2aef2845fd6ec85"
 replace-with = "vendored-sources"
 
+[source."git+https://github.com/mozilla/authenticator-rs?tag=v0.6.0"]
+git = "https://github.com/mozilla/authenticator-rs"
+tag = "v0.6.0"
+replace-with = "vendored-sources"
+
 [source."git+https://github.com/mozilla/cubeb-coreaudio-rs?rev=0bb8a45a040e85d313eb18deb36570e87df3a6af"]
 git = "https://github.com/mozilla/cubeb-coreaudio-rs"
 rev = "0bb8a45a040e85d313eb18deb36570e87df3a6af"

Cargo.lock

@@ -343,9 +343,6 @@ core-graphics-types = { path = "build/rust/core-graphics-types" }
 # Patch `dispatch2` to an empty crate that cannot be built.
 dispatch2 = { path = "build/rust/dispatch2" }
 
-# Patch `half` 1.* to 2.
-half = { path = "build/rust/half" }
-
 # Upgrade `rusqlite` 0.31 to 0.33.
 rusqlite = { path = "build/rust/rusqlite" }
 

Cargo.toml

@@ -3,7 +3,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 <hbox flex="1" id="browser">
-  <box context="sidebar-context-menu" id="sidebar-main" class="chrome-block" hidden="true">
+  <box context="sidebar-context-menu" id="sidebar-container" class="chrome-block" hidden="true">
     <html:sidebar-main flex="1">
       <box id="vertical-tabs" slot="tabstrip" customizable="true" contextmenu="toolbar-context-menu"></box>
     </html:sidebar-main>

browser/base/content/browser-box.inc.xhtml

@@ -308,7 +308,9 @@ document.addEventListener(
     }
     navigatorToolbox.addEventListener("click", onClick);
     widgetOverflow.addEventListener("click", onClick);
-    document.getElementById("sidebar-main").addEventListener("click", onClick);
+    document
+      .getElementById("sidebar-container")
+      .addEventListener("click", onClick);
 
     function onKeyPress(event) {
       const isLikeLeftClick = event.key === "Enter" || event.key === " ";

browser/base/content/navigator-toolbox.js

@@ -31,20 +31,20 @@ async function test_back_button(x, y) {
 
 async function test_sidebar_button(x, y) {
   // If the first button is the sidebar, check initial sidebar state
-  let sidebarMain = document.getElementById("sidebar-main");
-  let initialSidebarHiddenState = sidebarMain.hidden;
+  let sidebarContainer = document.getElementById("sidebar-container");
+  let initialSidebarHiddenState = sidebarContainer.hidden;
 
   EventUtils.synthesizeMouseAtPoint(x, y, {}, window);
   is(
-    sidebarMain.hidden,
+    sidebarContainer.hidden,
     !initialSidebarHiddenState,
     "Clicking the first pixel should toggle the sidebar"
   );
 
   // Ensure sidebar is put back into original state for following tests
   EventUtils.synthesizeMouseAtPoint(x, y, {}, window);
   is(
-    sidebarMain.hidden,
+    sidebarContainer.hidden,
     initialSidebarHiddenState,
     "Clicking the first pixel should toggle the sidebar"
   );

browser/base/content/test/general/browser_backOrSidebarButtonFitts.js

@@ -4,7 +4,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import { ToolRoleOpts } from "moz-src:///browser/components/aiwindow/ui/modules/ChatMessage.sys.mjs";
+import {
+  ToolRoleOpts,
+  AssistantRoleOpts,
+} from "moz-src:///browser/components/aiwindow/ui/modules/ChatMessage.sys.mjs";
 import { openAIEngine } from "moz-src:///browser/components/aiwindow/models/Utils.sys.mjs";
 import {
   toolsConfig,
@@ -415,9 +418,13 @@ Object.assign(Chat, {
             arguments: tc.function.arguments || "{}",
           },
         }));
-        conversation.addAssistantMessage("function", {
-          tool_calls: blockedCalls,
-        });
+        conversation.addAssistantMessage(
+          "function",
+          {
+            tool_calls: blockedCalls,
+          },
+          new AssistantRoleOpts(engineInstance.model)
+        );
 
         for (const tc of pendingToolCalls.slice(0, 1)) {
           const content = {
@@ -467,9 +474,13 @@ Object.assign(Chat, {
         conversation.tokenToUrl
       );
 
-      conversation.addAssistantMessage("function", {
-        tool_calls: [lastToolCall],
-      });
+      conversation.addAssistantMessage(
+        "function",
+        {
+          tool_calls: [lastToolCall],
+        },
+        new AssistantRoleOpts(engineInstance.model)
+      );
 
       lazy.AIWindow.chatStore?.updateConversation(conversation).catch(() => {});
 

browser/components/aiwindow/models/Chat.sys.mjs

@@ -1785,9 +1785,9 @@ export class AIWindow extends MozLitElement {
           skipUserDispatch
         );
 
-        // @todo
-        // fill out these assistant message flags
-        const assistantRoleOpts = new lazy.AssistantRoleOpts();
+        const assistantRoleOpts = new lazy.AssistantRoleOpts(
+          engineInstance.model
+        );
         conversation.addAssistantMessage("text", "", assistantRoleOpts);
 
         this.#sendModelRequestTelemetryEvent();

browser/components/aiwindow/ui/components/ai-window/ai-window.mjs

@@ -23,7 +23,7 @@
     @media not (forced-colors) {
       /* Smart Window Nova Tokens */
       --smartwindow-text-color-accent-primary: light-dark(var(--color-violet-60), var(--color-violet-30));
-      --smartwindow-icon-color-accent-primary-desaturated: light-dark(var(--color-purple-desaturated-50), var(--color-purple-desaturated-10));
+      --smartwindow-icon-color-accent-primary-desaturated: light-dark(var(--color-violet-desaturated-60), var(--color-violet-desaturated-50));
 
       --box-shadow-color-lighter-layer-1: color-mix(in srgb, var(--color-violet-70) 15%, transparent);
       --box-shadow-color-lighter-layer-2: color-mix(in srgb, var(--color-violet-70) 24%, transparent);