[pull] main from mozilla-firefox:main

browser/base/content/browser.js

@@ -4818,7 +4818,7 @@ var ConfirmationHint = {
     if (
       messageId === "confirmation-hint-ipprotection-navigated-to-excluded-site"
     ) {
-      MozXULElement.insertFTLIfNeeded("preview/ipProtection.ftl");
+      MozXULElement.insertFTLIfNeeded("browser/ipProtection.ftl");
     }
 
     document.l10n.setAttributes(this._message, messageId, options.l10nArgs);

browser/base/content/browser.xhtml

@@ -65,6 +65,7 @@
   <link rel="localization" href="browser/firefoxView.ftl"/>
   <link rel="localization" href="browser/genai.ftl"/>
   <link rel="localization" href="browser/identityCredentialNotification.ftl" />
+  <link rel="localization" href="browser/ipProtection.ftl"/>
   <link rel="localization" href="browser/menubar.ftl"/>
   <link rel="localization" href="browser/openTabs.ftl"/>
   <link rel="localization" href="browser/originControls.ftl"/>
@@ -95,7 +96,6 @@
   <link rel="localization" href="preview/onboarding.ftl"/>
   <link rel="localization" href="preview/smartTabGroups.ftl"/>
   <link rel="localization" href="preview/genai.ftl"/>
-  <link rel="localization" href="preview/ipProtection.ftl"/>
   <link rel="localization" href="preview/aiWindow.ftl" />
 
   <title data-l10n-id="browser-main-window-default-title"></title>

browser/components/DesktopActorRegistry.sys.mjs

@@ -231,6 +231,7 @@ let JSWINDOWACTORS = {
       events: {
         "AIChatContent:DispatchSearch": { wantUntrusted: true },
         "AIChatContent:Ready": { wantUntrusted: true },
+        "AIChatContent:DispatchFooterAction": { wantUntrusted: true },
       },
     },
     allFrames: true,

browser/components/aiwindow/ui/actors/AIChatContentChild.sys.mjs

@@ -2,9 +2,18 @@
  * 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/. */
 
+import { XPCOMUtils } from "resource://gre/modules/XPCOMUtils.sys.mjs";
+
 const lazy = {};
 ChromeUtils.defineESModuleGetters(lazy, {});
 
+XPCOMUtils.defineLazyServiceGetter(
+  lazy,
+  "ClipboardHelper",
+  "@mozilla.org/widget/clipboardhelper;1",
+  Ci.nsIClipboardHelper
+);
+
 /**
  * Represents a child actor for getting page data from the browser.
  */
@@ -13,11 +22,18 @@ export class AIChatContentChild extends JSWindowActorChild {
     "AIChatContent:DispatchMessage": {
       event: "aiChatContentActor:message",
     },
+    "AIChatContent:TruncateConversation": {
+      event: "aiChatContentActor:truncate",
+    },
+    "AIChatContent:RemoveAppliedMemory": {
+      event: "aiChatContentActor:remove-applied-memory",
+    },
   };
 
   static #VALID_EVENTS_FROM_CONTENT = new Set([
     "AIChatContent:DispatchSearch",
     "AIChatContent:Ready",
+    "AIChatContent:DispatchFooterAction",
   ]);
 
   /**
@@ -36,6 +52,11 @@ export class AIChatContentChild extends JSWindowActorChild {
         this.#handleSearchDispatch(event);
         break;
 
+      case "AIChatContent:DispatchFooterAction": {
+        this.#handleFooterActionDispatch(event);
+        break;
+      }
+
       case "AIChatContent:Ready":
         this.sendAsyncMessage("AIChatContent:Ready");
         break;
@@ -51,6 +72,18 @@ export class AIChatContentChild extends JSWindowActorChild {
     this.sendAsyncMessage("aiChatContentActor:search", event.detail);
   }
 
+  #handleFooterActionDispatch(event) {
+    const { action, text } = event.detail ?? {};
+    // Copy is handled in the child actor since it depends on content-side
+    // selection and clipboard context.
+    if (action === "copy") {
+      if (text) {
+        lazy.ClipboardHelper.copyString(text, this.windowContext);
+      }
+    }
+    this.sendAsyncMessage("aiChatContentActor:footer-action", event.detail);
+  }
+
   async receiveMessage(message) {
     const mapping =
       AIChatContentChild.#EVENT_MAPPINGS_FROM_PARENT[message.name];

browser/components/aiwindow/ui/actors/AIChatContentParent.sys.mjs

@@ -16,6 +16,14 @@ export class AIChatContentParent extends JSWindowActorParent {
     this.sendAsyncMessage("AIChatContent:DispatchMessage", response);
   }
 
+  dispatchTruncateToChatContent(payload) {
+    this.sendAsyncMessage("AIChatContent:TruncateConversation", payload);
+  }
+
+  dispatchRemoveAppliedMemoryToChatContent(payload) {
+    this.sendAsyncMessage("AIChatContent:RemoveAppliedMemory", payload);
+  }
+
   receiveMessage({ data, name }) {
     switch (name) {
       case "aiChatContentActor:search":
@@ -26,6 +34,10 @@ export class AIChatContentParent extends JSWindowActorParent {
         this.#notifyContentReady();
         break;
 
+      case "aiChatContentActor:footer-action":
+        this.#handleFooterActionFromChild(data);
+        break;
+
       default:
         console.warn(`AIChatContentParent received unknown message: ${name}`);
         break;
@@ -34,8 +46,7 @@ export class AIChatContentParent extends JSWindowActorParent {
   }
 
   #notifyContentReady() {
-    const browser = this.browsingContext.embedderElement;
-    const aiWindow = browser.ownerDocument.querySelector("ai-window");
+    const aiWindow = this.#getAIWindowElement();
     aiWindow.onContentReady();
   }
 
@@ -47,4 +58,22 @@ export class AIChatContentParent extends JSWindowActorParent {
       console.warn("Could not perform search from AI Window chat", e);
     }
   }
+
+  #handleFooterActionFromChild(data) {
+    try {
+      const aiWindow = this.#getAIWindowElement();
+      aiWindow.handleFooterAction(data);
+    } catch (e) {
+      console.warn("Could not handle footer action from AI Window chat", e);
+    }
+  }
+
+  #getAIWindowElement() {
+    const browser = this.browsingContext.embedderElement;
+    const root = browser?.getRootNode?.();
+    if (root?.host?.localName === "ai-window") {
+      return root.host;
+    }
+    return browser?.ownerDocument?.querySelector("ai-window") ?? null;
+  }
 }

browser/components/aiwindow/ui/components/ai-chat-content/ai-chat-content.mjs

@@ -32,6 +32,20 @@ export class AIChatContent extends MozLitElement {
     this.dispatchEvent(
       new CustomEvent("AIChatContent:Ready", { bubbles: true })
     );
+    this.#initFooterActionListeners();
+  }
+
+  #dispatchFooterAction(action, detail) {
+    this.dispatchEvent(
+      new CustomEvent("AIChatContent:DispatchFooterAction", {
+        bubbles: true,
+        composed: true,
+        detail: {
+          action,
+          ...(detail ?? {}),
+        },
+      })
+    );
   }
 
   /**
@@ -43,6 +57,53 @@ export class AIChatContent extends MozLitElement {
       "aiChatContentActor:message",
       this.messageEvent.bind(this)
     );
+
+    this.addEventListener(
+      "aiChatContentActor:truncate",
+      this.truncateEvent.bind(this)
+    );
+
+    this.addEventListener(
+      "aiChatContentActor:remove-applied-memory",
+      this.removeAppliedMemoryEvent.bind(this)
+    );
+  }
+
+  /**
+   * Initialize event listeners for footer actions (retry, copy, etc.)
+   * emitted by child components.
+   */
+
+  #initFooterActionListeners() {
+    this.addEventListener("copy-message", event => {
+      const { messageId } = event.detail ?? {};
+      const text = this.#getAssistantMessageBody(messageId);
+      this.#dispatchFooterAction("copy", { messageId, text });
+    });
+
+    this.addEventListener("retry-message", event => {
+      this.#dispatchFooterAction("retry", event.detail);
+    });
+
+    this.addEventListener("retry-without-memories", event => {
+      this.#dispatchFooterAction("retry-without-memories", event.detail);
+    });
+
+    this.addEventListener("remove-applied-memory", event => {
+      this.#dispatchFooterAction("remove-applied-memory", event.detail);
+    });
+  }
+
+  #getAssistantMessageBody(messageId) {
+    if (!messageId) {
+      return "";
+    }
+
+    const msg = this.conversationState.find(m => {
+      return m?.role === "assistant" && m?.messageId === messageId;
+    });
+
+    return msg?.body ?? "";
   }
 
   messageEvent(event) {
@@ -156,6 +217,36 @@ export class AIChatContent extends MozLitElement {
     });
   }
 
+  truncateEvent(event) {
+    const { messageId } = event.detail ?? {};
+    if (!messageId) {
+      return;
+    }
+
+    const idx = this.conversationState.findIndex(m => {
+      return m?.role === "assistant" && m?.messageId === messageId;
+    });
+
+    if (idx === -1) {
+      return;
+    }
+
+    this.conversationState = this.conversationState.slice(0, idx);
+    this.requestUpdate();
+  }
+
+  removeAppliedMemoryEvent(event) {
+    const { messageId, memoryId } = event.detail ?? {};
+    const msg = this.conversationState.find(m => {
+      return m?.role === "assistant" && m?.messageId === messageId;
+    });
+
+    msg.appliedMemories = msg.appliedMemories.filter(
+      memory => memory?.id !== memoryId
+    );
+    this.requestUpdate();
+  }
+
   render() {
     return html`
       <link

browser/components/aiwindow/ui/components/ai-chat-content/chat-assistant-footer/applied-memories-button.mjs

@@ -33,7 +33,7 @@ import { html, nothing } from "chrome://global/content/vendor/lit.all.mjs";
  *   - "toggle-applied-memories"
  *       detail: { messageId, open }
  *   - "remove-applied-memory"
- *       detail: { messageId, index, memory }
+ *       detail: { memoryId }
  *   - "retry-without-memories"
  *       detail: { messageId }
  */
@@ -116,28 +116,16 @@ export class AppliedMemoriesButton extends MozLitElement {
     );
   }
 
-  _onRemoveMemory(event, index) {
+  _onRemoveMemory(event, memory) {
     event.stopPropagation();
 
-    if (!Array.isArray(this.appliedMemories)) {
-      return;
-    }
-
-    const memory = this.appliedMemories[index];
-
-    // Remove memory visually, but update will be done by parent
-    this.appliedMemories = this.appliedMemories.filter((_, i) => {
-      return i !== index;
-    });
-
     this.dispatchEvent(
       new CustomEvent("remove-applied-memory", {
         bubbles: true,
         composed: true,
         detail: {
-          messageId: this.messageId,
-          index,
           memory,
+          messageId: this.messageId,
         },
       })
     );
@@ -157,14 +145,6 @@ export class AppliedMemoriesButton extends MozLitElement {
     );
   }
 
-  // TODO: Update formatting function once shape of memories passed is confirmed
-  _formatMemoryLabel(memory) {
-    if (typeof memory === "string") {
-      return memory;
-    }
-    return "";
-  }
-
   renderPopover() {
     if (!this._hasMemories) {
       return nothing;
@@ -181,24 +161,19 @@ export class AppliedMemoriesButton extends MozLitElement {
         @click=${event => this._onPopoverClick(event)}
       >
         <ul class="memories-list">
-          ${visibleMemories.map((memory, index) => {
-            const label = this._formatMemoryLabel(memory);
-            if (!label) {
-              return nothing;
-            }
-
+          ${visibleMemories.map(memory => {
             // @todo Bug 2010069
             // Localize aria-label
             return html`
               <li class="memories-list-item">
-                <span class="memories-list-label">${label}</span>
+                <span class="memories-list-label">${memory}</span>
                 <moz-button
                   class="memories-remove-button"
                   type="ghost"
                   size="small"
                   iconsrc="chrome://global/skin/icons/close.svg"
                   aria-label="Remove this memory"
-                  @click=${event => this._onRemoveMemory(event, index)}
+                  @click=${event => this._onRemoveMemory(event, memory)}
                 ></moz-button>
               </li>
             `;
@@ -214,6 +189,7 @@ export class AppliedMemoriesButton extends MozLitElement {
             class="retry-row-button"
             data-l10n-id="aiwindow-retry-without-memories"
             data-l10n-attrs="label"
+            @click=${event => this._onRetryWithoutMemories(event)}
           ></moz-button>
         </div>
       </div>
@@ -235,7 +211,7 @@ export class AppliedMemoriesButton extends MozLitElement {
         type="ghost"
         size="small"
         iconposition="start"
-        iconsrc="chrome://global/skin/icons/highlights.svg"
+        iconsrc="chrome://browser/content/aiwindow/assets/memories-on.svg"
         aria-haspopup="dialog"
         aria-expanded=${this.open && this._hasMemories}
         data-l10n-id="aiwindow-memories-used"