Handle message display in TB 128

background.js

@@ -333,6 +333,19 @@ async function clearCacheForMessages(idsInput) {
         if (browser.messageDisplayAction.setLabel) {
             browser.messageDisplayAction.setLabel({ label: "Details" });
         }
+
+        browser.messageDisplayAction.onClicked.addListener(async (tab) => {
+            const header = await browser.messageDisplay.getDisplayedMessage(tab.id);
+            if (!header) {
+                console.warn("[Sortana] no displayed message in tab", tab.id);
+                return;
+            }
+
+            const popupUrl = `${browser.runtime.getURL("details.html")}?mid=${header.id}`;
+
+            await browser.messageDisplayAction.setPopup({ tabId: tab.id, popup: popupUrl });
+            await browser.messageDisplayAction.openPopup({ tabId: tab.id });
+        });
     }
 
     browser.menus.create({
@@ -370,7 +383,7 @@ async function clearCacheForMessages(idsInput) {
 
 
 
-    browser.menus.onClicked.addListener(async info => {
+    browser.menus.onClicked.addListener(async (info, tab) => {
         if (info.menuItemId === "apply-ai-rules-list" || info.menuItemId === "apply-ai-rules-display") {
             const ids = info.selectedMessages?.messages?.map(m => m.id) ||
                          (info.messageId ? [info.messageId] : []);
@@ -380,11 +393,12 @@ async function clearCacheForMessages(idsInput) {
                          (info.messageId ? [info.messageId] : []);
             await clearCacheForMessages(ids);
         } else if (info.menuItemId === "view-ai-reason-list" || info.menuItemId === "view-ai-reason-display") {
-            const id = info.messageId || info.selectedMessages?.messages?.[0]?.id;
-            if (id) {
-                const url = browser.runtime.getURL(`details.html?mid=${id}`);
-                browser.tabs.create({ url });
-            }
+            const header = await browser.messageDisplay.getDisplayedMessage(tab.id);
+            if (!header) { return; }
+
+            const url = `${browser.runtime.getURL("details.html")}?mid=${header.id}`;
+
+            await browser.tabs.create({ url });
         }
     });
 
@@ -411,19 +425,6 @@ async function clearCacheForMessages(idsInput) {
             // rethrow so the caller sees the failure
             throw err;
         }
-    } else if (msg?.type === "sortana:getActiveMessage") {
-        try {
-            const displayed = await browser.messageDisplay.getDisplayedMessages();
-            let id = displayed[0]?.id;
-            if (!id) {
-                const selected = await browser.mailTabs.getSelectedMessages();
-                id = selected?.messages?.[0]?.id;
-            }
-            return { id: id ?? null };
-        } catch (e) {
-            logger.aiLog("failed to get active message", { level: 'error' }, e);
-            return { id: null };
-        }
     } else if (msg?.type === "sortana:clearCacheForDisplayed") {
         try {
             const msgs = await browser.messageDisplay.getDisplayedMessages();

details.js

@@ -1,48 +1,40 @@
 document.addEventListener('DOMContentLoaded', async () => {
+  const logger = (await import(browser.runtime.getURL('logger.js'))).aiLog;
+
+  const midParam = new URLSearchParams(location.search).get('mid');
+  const messageId = parseInt(midParam, 10);
+
+  if (!messageId) {
+    logger('no ?mid → trying displayedMessage fallback');
+    const openerTabId = (await browser.tabs.getCurrent()).openerTabId;
+    const header = await browser.messageDisplay.getDisplayedMessage(openerTabId);
+    if (!header) {
+      logger('still no message – aborting');
+      return;
+    }
+    loadMessage(header.id);
+    return;
+  }
+
+  loadMessage(messageId);
+});
+
+async function loadMessage(id) {
   const storage = (globalThis.messenger ?? browser).storage;
-  const logger = await import(browser.runtime.getURL('logger.js'));
+  const logMod = await import(browser.runtime.getURL('logger.js'));
   const { debugLogging } = await storage.local.get('debugLogging');
-  logger.setDebug(debugLogging === true);
-  logger.aiLog('details page loaded', { debug: true });
+  logMod.setDebug(debugLogging === true);
+  const log = logMod.aiLog;
 
-  const params = new URLSearchParams(location.search);
-  let id = parseInt(params.get('mid'), 10);
-  logger.aiLog('initial message id', { debug: true }, id);
-
-  if (!id) {
-    try {
-      const msgs = await browser.messageDisplay.getDisplayedMessages();
-      id = msgs[0]?.id;
-      logger.aiLog('message id from displayed messages', { debug: true }, id);
-      if (!id) {
-        const selected = await browser.mailTabs.getSelectedMessages();
-        id = selected?.messages?.[0]?.id;
-        logger.aiLog('message id from selected messages', { debug: true }, id);
-      }
-    } catch (e) {
-      logger.aiLog('failed to determine message id locally', { level: 'error' }, e);
-    }
-  }
-
-  if (!id) {
-    try {
-      const resp = await browser.runtime.sendMessage({ type: 'sortana:getActiveMessage' });
-      id = resp?.id;
-      logger.aiLog('message id from background', { debug: true }, id);
-    } catch (e) {
-      logger.aiLog('failed to get message id from background', { level: 'error' }, e);
-    }
-  }
-
-  if (!id) return;
+  log('details page loaded', { debug: true });
   try {
-    logger.aiLog('requesting message details', {}, id);
+    log('requesting message details', {}, id);
     const { subject, results } = await browser.runtime.sendMessage({ type: 'sortana:getDetails', id });
-    logger.aiLog('received details', { debug: true }, { subject, results });
+    log('received details', { debug: true }, { subject, results });
     document.getElementById('subject').textContent = subject;
     const container = document.getElementById('rules');
     for (const r of results) {
-      logger.aiLog('rendering rule result', { debug: true }, r);
+      log('rendering rule result', { debug: true }, r);
       const article = document.createElement('article');
       const color = r.matched === true ? 'is-success' : 'is-danger';
       article.className = `message ${color} mb-4`;
@@ -62,11 +54,11 @@ document.addEventListener('DOMContentLoaded', async () => {
       container.appendChild(article);
     }
     document.getElementById('clear').addEventListener('click', async () => {
-      logger.aiLog('clearing cache for message', {}, id);
+      log('clearing cache for message', {}, id);
       await browser.runtime.sendMessage({ type: 'sortana:clearCacheForMessage', id });
       window.close();
     });
   } catch (e) {
-    logger.aiLog('failed to load details', { level: 'error' }, e);
+    log('failed to load details', { level: 'error' }, e);
   }
-});
+}

manifest.json

@@ -24,8 +24,7 @@
   "message_display_action": {
     "default_icon": "resources/img/brain.png",
     "default_title": "Details",
-    "default_label": "Details",
-    "default_popup": "details.html"
+    "default_label": "Details"
   },
   "background": { "scripts": [ "background.js" ] },
   "options_ui": {