Supporting v140+

After testing in Betterbird v140, updating manifest.

README.md

@@ -16,7 +16,7 @@ message meets a specified criterion.
 - **Advanced parameters** – tune generation settings like temperature, top‑p and more from the options page.
 - **Markdown conversion** – optionally convert HTML bodies to Markdown before sending them to the AI service.
 - **Debug logging** – optional colorized logs help troubleshoot interactions with the AI service.
-- **Debug tab** – view the last request payload and message diff with live updates.
+- **Debug tab** – view the last request payload and a diff between the unaltered message text and the final prompt.
 - **Light/Dark themes** – automatically match Thunderbird's appearance with optional manual override.
 - **Automatic rules** – create rules that tag, move, copy, forward, reply, delete, archive, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages and can ignore messages outside a chosen age range.
 - **Rule ordering** – drag rules to prioritize them and optionally stop processing after a match.

background.js

@@ -210,17 +210,38 @@ function collectText(part, bodyParts, attachments) {
     }
 }
 
-function buildEmailText(full) {
+function collectRawText(part, bodyParts, attachments) {
+    if (part.parts && part.parts.length) {
+        for (const p of part.parts) collectRawText(p, bodyParts, attachments);
+        return;
+    }
+    const ct = (part.contentType || "text/plain").toLowerCase();
+    const cd = (part.headers?.["content-disposition"]?.[0] || "").toLowerCase();
+    const body = String(part.body || "");
+    if (cd.includes("attachment") || !ct.startsWith("text/")) {
+        const nameMatch = /filename\s*=\s*"?([^";]+)/i.exec(cd) || /name\s*=\s*"?([^";]+)/i.exec(part.headers?.["content-type"]?.[0] || "");
+        const name = nameMatch ? nameMatch[1] : "";
+        attachments.push(`${name} (${ct}, ${part.size || byteSize(body)} bytes)`);
+    } else if (ct.startsWith("text/html")) {
+        const doc = new DOMParser().parseFromString(body, 'text/html');
+        bodyParts.push(doc.body.textContent || "");
+    } else {
+        bodyParts.push(body);
+    }
+}
+
+function buildEmailText(full, applyTransforms = true) {
     const bodyParts = [];
     const attachments = [];
-    collectText(full, bodyParts, attachments);
+    const collect = applyTransforms ? collectText : collectRawText;
+    collect(full, bodyParts, attachments);
     const headers = Object.entries(full.headers || {})
         .map(([k, v]) => `${k}: ${v.join(' ')}`)
         .join('\n');
     const attachInfo = `Attachments: ${attachments.length}` +
         (attachments.length ? "\n" + attachments.map(a => ` - ${a}`).join('\n') : "");
     let combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
-    if (tokenReduction) {
+    if (applyTransforms && tokenReduction) {
         const seen = new Set();
         combined = combined.split('\n').filter(l => {
             if (seen.has(l)) return false;
@@ -228,7 +249,7 @@ function buildEmailText(full) {
             return true;
         }).join('\n');
     }
-    return sanitizeString(combined);
+    return applyTransforms ? sanitizeString(combined) : combined;
 }
 
 function updateTimingStats(elapsed) {
@@ -262,8 +283,8 @@ async function processMessage(id) {
     updateActionIcon();
     try {
         const full = await messenger.messages.getFull(id);
+        const originalText = buildEmailText(full, false);
         let text = buildEmailText(full);
-        const originalText = text;
         if (tokenReduction && maxTokens > 0) {
             const limit = Math.floor(maxTokens * 0.9);
             if (text.length > limit) {

manifest.json

@@ -1,13 +1,13 @@
 {
   "manifest_version": 2,
   "name": "Sortana",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "default_locale": "en-US",
   "applications": {
     "gecko": {
       "id": "ai-filter@jordanwages",
       "strict_min_version": "128.0",
-      "strict_max_version": "139.*"
+      "strict_max_version": "140.*"
     }
   },
   "icons": {

options/options.html

@@ -154,6 +154,11 @@
                             <input type="checkbox" id="token-reduction"> Aggressive token reduction
                         </label>
                     </div>
+                    <div class="field">
+                        <label class="checkbox">
+                            <input type="checkbox" id="show-debug-tab"> Show debug information
+                        </label>
+                    </div>
                     <div class="field">
                         <label class="label" for="max_tokens">Max tokens</label>
                         <div class="control">
@@ -220,11 +225,6 @@
                             <input class="input" type="number" step="0.01" id="tfs">
                         </div>
                     </div>
-                    <div class="field">
-                        <label class="checkbox">
-                            <input type="checkbox" id="show-debug-tab"> Advanced Options
-                        </label>
-                    </div>
                 </div>
             </div>
 
@@ -290,7 +290,10 @@
                     <span>Debug</span>
                 </h2>
                 <pre id="payload-display"></pre>
-                <div id="diff-display" class="mt-4"></div>
+                <div id="diff-container" class="mt-4 is-hidden">
+                    <label class="label">Prompt diff</label>
+                    <div id="diff-display" class="box content is-family-monospace"></div>
+                </div>
             </div>
         </div>
     </section>

options/options.js

@@ -70,6 +70,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     await applyTheme(themeSelect.value);
     const payloadDisplay = document.getElementById('payload-display');
     const diffDisplay = document.getElementById('diff-display');
+    const diffContainer = document.getElementById('diff-container');
 
     let lastFullText = defaults.lastFullText || '';
     let lastPromptText = defaults.lastPromptText || '';
@@ -83,7 +84,16 @@ document.addEventListener('DOMContentLoaded', async () => {
         dmp.Diff_EditCost = 4;
         const diffs = dmp.diff_main(lastFullText, lastPromptText);
         dmp.diff_cleanupEfficiency(diffs);
+        const hasDiff = diffs.some(d => d[0] !== 0);
+        if (hasDiff) {
             diffDisplay.innerHTML = dmp.diff_prettyHtml(diffs);
+            diffContainer.classList.remove('is-hidden');
+        } else {
+            diffDisplay.innerHTML = '';
+            diffContainer.classList.add('is-hidden');
+        }
+    } else {
+        diffContainer.classList.add('is-hidden');
     }
     themeSelect.addEventListener('change', async () => {
         markDirty();
@@ -751,9 +761,17 @@ document.addEventListener('DOMContentLoaded', async () => {
                         dmp.Diff_EditCost = 4;
                         const diffs = dmp.diff_main(lastFullText, lastPromptText);
                         dmp.diff_cleanupEfficiency(diffs);
+                        const hasDiff = diffs.some(d => d[0] !== 0);
+                        if (hasDiff) {
                             diffDisplay.innerHTML = dmp.diff_prettyHtml(diffs);
+                            diffContainer.classList.remove('is-hidden');
                         } else {
                             diffDisplay.innerHTML = '';
+                            diffContainer.classList.add('is-hidden');
+                        }
+                    } else {
+                        diffDisplay.innerHTML = '';
+                        diffContainer.classList.add('is-hidden');
                     }
                 }
             }