From 32e79a13d54f064f20fdae1bd48b663a774e9801 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 8 Jul 2025 17:34:26 -0500
Subject: [PATCH 01/50] Add shared defaults for AI parameters

---
 modules/AiClassifier.js  | 15 ++-------------
 modules/defaultParams.js | 16 ++++++++++++++++
 options/options.js       | 14 +-------------
 3 files changed, 19 insertions(+), 26 deletions(-)
 create mode 100644 modules/defaultParams.js

diff --git a/modules/AiClassifier.js b/modules/AiClassifier.js
index 3c526f8..7e757dd 100644
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@@ -1,5 +1,6 @@
 "use strict";
 import { aiLog, setDebug } from "../logger.js";
+import { DEFAULT_AI_PARAMS } from "./defaultParams.js";
 
 const storage = (globalThis.messenger ?? globalThis.browser).storage;
 
@@ -33,19 +34,7 @@ let gCustomTemplate = "";
 let gCustomSystemPrompt = DEFAULT_CUSTOM_SYSTEM_PROMPT;
 let gTemplateText = "";
 
-let gAiParams = {
-  max_tokens: 4096,
-  temperature: 0.6,
-  top_p: 0.95,
-  seed: -1,
-  repetition_penalty: 1.0,
-  top_k: 20,
-  min_p: 0,
-  presence_penalty: 0,
-  frequency_penalty: 0,
-  typical_p: 1,
-  tfs: 1,
-};
+let gAiParams = Object.assign({}, DEFAULT_AI_PARAMS);
 
 let gCache = new Map();
 let gCacheLoaded = false;
diff --git a/modules/defaultParams.js b/modules/defaultParams.js
new file mode 100644
index 0000000..a8afe53
--- /dev/null
+++ b/modules/defaultParams.js
@@ -0,0 +1,16 @@
+"use strict";
+
+export const DEFAULT_AI_PARAMS = {
+  max_tokens: 4096,
+  temperature: 0.6,
+  top_p: 0.95,
+  seed: -1,
+  repetition_penalty: 1.0,
+  top_k: 20,
+  min_p: 0,
+  presence_penalty: 0,
+  frequency_penalty: 0,
+  typical_p: 1,
+  tfs: 1,
+};
+
diff --git a/options/options.js b/options/options.js
index 5132807..b465998 100644
--- a/options/options.js
+++ b/options/options.js
@@ -4,6 +4,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     const AiClassifier = await import(browser.runtime.getURL('modules/AiClassifier.js'));
     const dataTransfer = await import(browser.runtime.getURL('options/dataTransfer.js'));
     const { detectSystemTheme } = await import(browser.runtime.getURL('modules/themeUtils.js'));
+    const { DEFAULT_AI_PARAMS } = await import(browser.runtime.getURL('modules/defaultParams.js'));
     const defaults = await storage.local.get([
         'endpoint',
         'templateName',
@@ -66,19 +67,6 @@ document.addEventListener('DOMContentLoaded', async () => {
         markDirty();
         await applyTheme(themeSelect.value);
     });
-    const DEFAULT_AI_PARAMS = {
-        max_tokens: 4096,
-        temperature: 0.6,
-        top_p: 0.95,
-        seed: -1,
-        repetition_penalty: 1.0,
-        top_k: 20,
-        min_p: 0,
-        presence_penalty: 0,
-        frequency_penalty: 0,
-        typical_p: 1,
-        tfs: 1
-    };
     document.getElementById('endpoint').value = defaults.endpoint || 'http://127.0.0.1:5000/v1/completions';
 
     const templates = {

From f3e20f8941da5b8e343c6b2d69ff898cc3984ea2 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 8 Jul 2025 17:53:35 -0500
Subject: [PATCH 02/50] Remove unused sync classifier API

---
 modules/AiClassifier.js | 72 +++--------------------------------------
 1 file changed, 4 insertions(+), 68 deletions(-)

diff --git a/modules/AiClassifier.js b/modules/AiClassifier.js
index 7e757dd..b35cb2c 100644
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@@ -61,10 +61,6 @@ async function sha256Hex(str) {
   return sha256HexSync(str);
 }
 
-function buildCacheKeySync(id, criterion) {
-  return sha256HexSync(`${id}|${criterion}`);
-}
-
 async function resolveHeaderId(id) {
   if (typeof id === "number" && typeof messenger?.messages?.get === "function") {
     try {
@@ -82,7 +78,7 @@ async function resolveHeaderId(id) {
 async function buildCacheKey(id, criterion) {
   const resolvedId = await resolveHeaderId(id);
   if (Services) {
-    return buildCacheKeySync(resolvedId, criterion);
+    return sha256HexSync(`${resolvedId}|${criterion}`);
   }
   return sha256Hex(`${resolvedId}|${criterion}`);
 }
@@ -122,16 +118,6 @@ async function loadCache() {
   gCacheLoaded = true;
 }
 
-function loadCacheSync() {
-  if (!gCacheLoaded) {
-    if (!Services?.tm?.spinEventLoopUntil) {
-      throw new Error("loadCacheSync requires Services");
-    }
-    let done = false;
-    loadCache().finally(() => { done = true; });
-    Services.tm.spinEventLoopUntil(() => done);
-  }
-}
 
 async function saveCache(updatedKey, updatedValue) {
   if (typeof updatedKey !== "undefined") {
@@ -222,11 +208,7 @@ function buildPrompt(body, criterion) {
 
 function getCachedResult(cacheKey) {
   if (!gCacheLoaded) {
-    if (Services?.tm?.spinEventLoopUntil) {
-      loadCacheSync();
-    } else {
-      return null;
-    }
+    return null;
   }
   if (cacheKey && gCache.has(cacheKey)) {
     aiLog(`[AiClassifier] Cache hit for key: ${cacheKey}`, {debug: true});
@@ -238,11 +220,7 @@ function getCachedResult(cacheKey) {
 
 function getReason(cacheKey) {
   if (!gCacheLoaded) {
-    if (Services?.tm?.spinEventLoopUntil) {
-      loadCacheSync();
-    } else {
-      return null;
-    }
+    return null;
   }
   const entry = gCache.get(cacheKey);
   return cacheKey && entry ? entry.reason || null : null;
@@ -319,48 +297,6 @@ async function getCacheSize() {
   return gCache.size;
 }
 
-function classifyTextSync(text, criterion, cacheKey = null) {
-  if (!Services?.tm?.spinEventLoopUntil) {
-    throw new Error("classifyTextSync requires Services");
-  }
-  const cached = getCachedResult(cacheKey);
-  if (cached !== null) {
-    return cached;
-  }
-
-  const payload = buildPayload(text, criterion);
-
-  aiLog(`[AiClassifier] Sending classification request to ${gEndpoint}`, {debug: true});
-
-  let result;
-  let done = false;
-  (async () => {
-    try {
-      const response = await fetch(gEndpoint, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: payload,
-      });
-      if (response.ok) {
-        const json = await response.json();
-        aiLog(`[AiClassifier] Received response:`, {debug: true}, json);
-        result = parseMatch(json);
-        cacheEntry(cacheKey, result.matched, result.reason);
-        result = result.matched;
-      } else {
-        aiLog(`HTTP status ${response.status}`, {level: 'warn'});
-        result = false;
-      }
-    } catch (e) {
-      aiLog(`HTTP request failed`, {level: 'error'}, e);
-      result = false;
-    } finally {
-      done = true;
-    }
-  })();
-  Services.tm.spinEventLoopUntil(() => done);
-  return result;
-}
 
 async function classifyText(text, criterion, cacheKey = null) {
   if (!gCacheLoaded) {
@@ -403,4 +339,4 @@ async function init() {
   await loadCache();
 }
 
-export { classifyText, classifyTextSync, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, buildCacheKeySync, getCacheSize, init };
+export { classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };

From 1b7fa3d5eeac2379287e38082ad6bd72453025c3 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 8 Jul 2025 19:45:57 -0500
Subject: [PATCH 03/50] Refactor message processing

---
 background.js | 133 +++++++++++++++++++++++++-------------------------
 1 file changed, 67 insertions(+), 66 deletions(-)

diff --git a/background.js b/background.js
index 5d4de8d..e8741dd 100644
--- a/background.js
+++ b/background.js
@@ -169,10 +169,75 @@ function buildEmailText(full) {
     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') : "");
+    const attachInfo = `Attachments: ${attachments.length}` +
+        (attachments.length ? "\n" + attachments.map(a => ` - ${a}`).join('\n') : "");
     const combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
     return sanitizeString(combined);
 }
+
+function updateTimingStats(elapsed) {
+    const t = timingStats;
+    t.count += 1;
+    t.total += elapsed;
+    t.last = elapsed;
+    const delta = elapsed - t.mean;
+    t.mean += delta / t.count;
+    t.m2 += delta * (elapsed - t.mean);
+}
+
+async function processMessage(id) {
+    processing = true;
+    currentStart = Date.now();
+    queuedCount--;
+    updateActionIcon();
+    try {
+        const full = await messenger.messages.getFull(id);
+        const text = buildEmailText(full);
+        let currentTags = [];
+        try {
+            const hdr = await messenger.messages.get(id);
+            currentTags = Array.isArray(hdr.tags) ? [...hdr.tags] : [];
+        } catch (e) {
+            currentTags = [];
+        }
+
+        for (const rule of aiRules) {
+            const cacheKey = await AiClassifier.buildCacheKey(id, rule.criterion);
+            const matched = await AiClassifier.classifyText(text, rule.criterion, cacheKey);
+            if (matched) {
+                for (const act of (rule.actions || [])) {
+                    if (act.type === 'tag' && act.tagKey) {
+                        if (!currentTags.includes(act.tagKey)) {
+                            currentTags.push(act.tagKey);
+                            await messenger.messages.update(id, { tags: currentTags });
+                        }
+                    } else if (act.type === 'move' && act.folder) {
+                        await messenger.messages.move([id], act.folder);
+                    } else if (act.type === 'junk') {
+                        await messenger.messages.update(id, { junk: !!act.junk });
+                    }
+                }
+                if (rule.stopProcessing) {
+                    break;
+                }
+            }
+        }
+        processing = false;
+        const elapsed = Date.now() - currentStart;
+        currentStart = 0;
+        updateTimingStats(elapsed);
+        await storage.local.set({ classifyStats: timingStats });
+        showTransientIcon(ICONS.circle);
+    } catch (e) {
+        processing = false;
+        const elapsed = Date.now() - currentStart;
+        currentStart = 0;
+        updateTimingStats(elapsed);
+        await storage.local.set({ classifyStats: timingStats });
+        logger.aiLog("failed to apply AI rules", { level: 'error' }, e);
+        showTransientIcon(ICONS.average);
+    }
+}
 async function applyAiRules(idsInput) {
     const ids = Array.isArray(idsInput) ? idsInput : [idsInput];
     if (!ids.length) return queue;
@@ -186,71 +251,7 @@ async function applyAiRules(idsInput) {
         const id = msg?.id ?? msg;
         queuedCount++;
         updateActionIcon();
-        queue = queue.then(async () => {
-            processing = true;
-            currentStart = Date.now();
-            queuedCount--;
-            updateActionIcon();
-            try {
-                const full = await messenger.messages.getFull(id);
-                const text = buildEmailText(full);
-                let currentTags = [];
-                try {
-                    const hdr = await messenger.messages.get(id);
-                    currentTags = Array.isArray(hdr.tags) ? [...hdr.tags] : [];
-                } catch (e) {
-                    currentTags = [];
-                }
-
-                for (const rule of aiRules) {
-                    const cacheKey = await AiClassifier.buildCacheKey(id, rule.criterion);
-                    const matched = await AiClassifier.classifyText(text, rule.criterion, cacheKey);
-                    if (matched) {
-                        for (const act of (rule.actions || [])) {
-                            if (act.type === 'tag' && act.tagKey) {
-                                if (!currentTags.includes(act.tagKey)) {
-                                    currentTags.push(act.tagKey);
-                                    await messenger.messages.update(id, { tags: currentTags });
-                                }
-                            } else if (act.type === 'move' && act.folder) {
-                                await messenger.messages.move([id], act.folder);
-                            } else if (act.type === 'junk') {
-                                await messenger.messages.update(id, { junk: !!act.junk });
-                            }
-                        }
-                        if (rule.stopProcessing) {
-                            break;
-                        }
-                    }
-                }
-                processing = false;
-                const elapsed = Date.now() - currentStart;
-                currentStart = 0;
-                const t = timingStats;
-                t.count += 1;
-                t.total += elapsed;
-                t.last = elapsed;
-                const delta = elapsed - t.mean;
-                t.mean += delta / t.count;
-                t.m2 += delta * (elapsed - t.mean);
-                await storage.local.set({ classifyStats: t });
-                showTransientIcon(ICONS.circle);
-            } catch (e) {
-                processing = false;
-                const elapsed = Date.now() - currentStart;
-                currentStart = 0;
-                const t = timingStats;
-                t.count += 1;
-                t.total += elapsed;
-                t.last = elapsed;
-                const delta = elapsed - t.mean;
-                t.mean += delta / t.count;
-                t.m2 += delta * (elapsed - t.mean);
-                await storage.local.set({ classifyStats: t });
-                logger.aiLog("failed to apply AI rules", { level: 'error' }, e);
-                showTransientIcon(ICONS.average);
-            }
-        });
+        queue = queue.then(() => processMessage(id));
     }
 
     return queue;

From 044e7df07df09efbd56f6461543eabf275f67ab7 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 8 Jul 2025 21:59:25 -0500
Subject: [PATCH 04/50] Update documentation

---
 AGENTS.md | 9 +++++----
 README.md | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index c51f40c..9b94461 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -5,8 +5,9 @@ This file provides guidelines for codex agents contributing to the Sortana proje
 ## Repository Overview
 
 - `background.js`: Handles startup tasks and coordinates message passing within the extension.
-- `modules/`: Contains reusable JavaScript modules such as `AiClassifier.js`.
-- `options/`: The options page HTML, JavaScript and Bulma CSS.
+- `modules/`: Contains reusable JavaScript modules such as `AiClassifier.js`,
+  `defaultParams.js` and `themeUtils.js`.
+- `options/`: The options page HTML, JavaScript and bundled Bulma CSS (v1.0.3).
 - `details.html` and `details.js`: View AI reasoning and clear cache for a message.
 - `resources/`: Images and other static files.
 - `prompt_templates/`: Prompt template files for the AI service.
@@ -41,7 +42,7 @@ Additional documentation exists outside this repository.
 - Thunderbird Add-on Store Policies
   - [Third Party Library Usage](https://extensionworkshop.com/documentation/publish/third-party-library-usage/)
 - Third Party Libraries
-  - [Bulma.css](https://github.com/jgthms/bulma)
+  - [Bulma.css v1.0.3](https://github.com/jgthms/bulma/blob/1.0.3/css/bulma.css)
 - Issue tracker: [Thunderbird tracker on Bugzilla](https://bugzilla.mozilla.org/describecomponents.cgi?product=Thunderbird)
 
 
@@ -71,5 +72,5 @@ time the add-on loads after an update.
 Toolbar and menu icons reside under `resources/img` and are provided in 16, 32
 and 64 pixel variants. When changing these icons, pass a dictionary mapping the
 sizes to the paths in `browserAction.setIcon` or `messageDisplayAction.setIcon`.
-Use `resources/svg/svg2img.ps1` to regenerate PNGs from the SVG sources.
+Use `resources/svg2img.ps1` to regenerate PNGs from the SVG sources.
 
diff --git a/README.md b/README.md
index 4447c9b..3393a6b 100644
--- a/README.md
+++ b/README.md
@@ -59,12 +59,12 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 
 1. Ensure PowerShell is available (for Windows) or adapt the script for other
    environments.
-2. Ensure the Bulma stylesheet (v1.0.4) is saved as `options/bulma.css`. You can
-   download it from <https://github.com/jgthms/bulma/blob/1.0.4/css/bulma.css>.
+2. The Bulma stylesheet (v1.0.3) is already included as `options/bulma.css`.
 3. Run `powershell ./build-xpi.ps1` from the repository root. The script reads
    the version from `manifest.json` and creates an XPI in the `release` folder.
 4. Install the generated XPI in Thunderbird via the Add-ons Manager. During
    development you can also load the directory as a temporary add-on.
+5. To regenerate PNG icons from the SVG sources, run `resources/svg2img.ps1`.
 
 ## Usage
 
@@ -124,7 +124,7 @@ requires disclosure of third party libraries that are included in the add-on. Ev
 the disclosure is only required for add-on review, they'll be listed here as well. Sortana
 uses the following third party libraries:
 
-- [Bulma.css v1.0.4](https://github.com/jgthms/bulma/blob/1.0.4/css/bulma.css)
+- [Bulma.css v1.0.3](https://github.com/jgthms/bulma/blob/1.0.3/css/bulma.css)
   - MIT License
 - [turndown v7.2.0](https://github.com/mixmark-io/turndown/tree/v7.2.0)
   - MIT License

From 52583cebc16510cbba58758e45f08f69f0bf6429 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 9 Jul 2025 00:38:56 -0500
Subject: [PATCH 05/50] Update README.md

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index 3393a6b..2244d49 100644
--- a/README.md
+++ b/README.md
@@ -115,7 +115,6 @@ Sortana requests the following Thunderbird permissions:
 - `accountsRead` – list accounts and folders for move actions.
 - `menus` – add context menu commands.
 - `tabs` – open new tabs and query the active tab.
-- Host permissions (`*://*/*`) – allow network requests to your configured classification service.
 
 ## Thunderbird Add-on Store Disclosures
 

From ea8888f05764c343dd3303b4c37e652ad7cc965f Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 9 Jul 2025 03:24:33 -0500
Subject: [PATCH 06/50] Update ai-filter.sln

---
 ai-filter.sln | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ai-filter.sln b/ai-filter.sln
index f41f23f..57705eb 100644
--- a/ai-filter.sln
+++ b/ai-filter.sln
@@ -56,9 +56,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{F266602F-175
 		resources\img\average-16.png = resources\img\average-16.png
 		resources\img\average-32.png = resources\img\average-32.png
 		resources\img\average-64.png = resources\img\average-64.png
+		resources\img\check-16.png = resources\img\check-16.png
+		resources\img\check-32.png = resources\img\check-32.png
+		resources\img\check-64.png = resources\img\check-64.png
 		resources\img\circle-16.png = resources\img\circle-16.png
 		resources\img\circle-32.png = resources\img\circle-32.png
 		resources\img\circle-64.png = resources\img\circle-64.png
+		resources\img\circledots-16.png = resources\img\circledots-16.png
+		resources\img\circledots-32.png = resources\img\circledots-32.png
+		resources\img\circledots-64.png = resources\img\circledots-64.png
 		resources\img\clipboarddata-16.png = resources\img\clipboarddata-16.png
 		resources\img\clipboarddata-32.png = resources\img\clipboarddata-32.png
 		resources\img\clipboarddata-64.png = resources\img\clipboarddata-64.png
@@ -95,6 +101,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{F266602F-175
 		resources\img\upload-16.png = resources\img\upload-16.png
 		resources\img\upload-32.png = resources\img\upload-32.png
 		resources\img\upload-64.png = resources\img\upload-64.png
+		resources\img\x-16.png = resources\img\x-16.png
+		resources\img\x-32.png = resources\img\x-32.png
+		resources\img\x-64.png = resources\img\x-64.png
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js", "js", "{21D2A42C-3F85-465C-9141-C106AFD92B68}"
@@ -102,6 +111,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js", "js", "{21D2A42C-3F85-
 		resources\js\turndown.js = resources\js\turndown.js
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "svg", "svg", "{D4E9C905-4884-488E-B763-5BD39049C1B1}"
+	ProjectSection(SolutionItems) = preProject
+		resources\svg\average.svg = resources\svg\average.svg
+		resources\svg\check.svg = resources\svg\check.svg
+		resources\svg\circle.svg = resources\svg\circle.svg
+		resources\svg\circledots.svg = resources\svg\circledots.svg
+		resources\svg\clipboarddata.svg = resources\svg\clipboarddata.svg
+		resources\svg\download.svg = resources\svg\download.svg
+		resources\svg\eye.svg = resources\svg\eye.svg
+		resources\svg\flag.svg = resources\svg\flag.svg
+		resources\svg\gear.svg = resources\svg\gear.svg
+		resources\svg\reply.svg = resources\svg\reply.svg
+		resources\svg\settings.svg = resources\svg\settings.svg
+		resources\svg\trash.svg = resources\svg\trash.svg
+		resources\svg\upload.svg = resources\svg\upload.svg
+		resources\svg\x.svg = resources\svg\x.svg
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -115,5 +142,6 @@ Global
 		{68A87938-5C2B-49F5-8AAA-8A34FBBFD854} = {BCC6E6D2-343B-4C48-854D-5FE3BBC3CB70}
 		{F266602F-1755-4A95-A11B-6C90C701C5BF} = {68A87938-5C2B-49F5-8AAA-8A34FBBFD854}
 		{21D2A42C-3F85-465C-9141-C106AFD92B68} = {68A87938-5C2B-49F5-8AAA-8A34FBBFD854}
+		{D4E9C905-4884-488E-B763-5BD39049C1B1} = {68A87938-5C2B-49F5-8AAA-8A34FBBFD854}
 	EndGlobalSection
 EndGlobal

From 3c87950dfb7d072a7f0c98ae2b2d71d1a329b45f Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 20:57:57 -0500
Subject: [PATCH 07/50] Update maintenance stats

---
 options/options.html |  2 ++
 options/options.js   | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/options/options.html b/options/options.html
index 58cfe37..57f407c 100644
--- a/options/options.html
+++ b/options/options.html
@@ -236,6 +236,8 @@
                         <tr><th>Last run time</th><td id="last-time">--:--:--</td></tr>
                         <tr><th>Average run time</th><td id="average-time">--:--:--</td></tr>
                         <tr><th>Total run time</th><td id="total-time">--:--:--</td></tr>
+                        <tr><th>Messages per hour</th><td id="per-hour">0</td></tr>
+                        <tr><th>Messages per day</th><td id="per-day">0</td></tr>
                     </tbody>
                 </table>
                 <button class="button is-danger" id="clear-cache" type="button">
diff --git a/options/options.js b/options/options.js
index b465998..7eadc27 100644
--- a/options/options.js
+++ b/options/options.js
@@ -229,6 +229,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     }
 
     function renderRules(rules = []) {
+        ruleCountEl.textContent = rules.length;
         rulesContainer.innerHTML = '';
         for (const rule of rules) {
             const article = document.createElement('article');
@@ -265,7 +266,10 @@ document.addEventListener('DOMContentLoaded', async () => {
             const delBtn = document.createElement('button');
             delBtn.className = 'delete';
             delBtn.setAttribute('aria-label', 'delete');
-            delBtn.addEventListener('click', () => article.remove());
+            delBtn.addEventListener('click', () => {
+                article.remove();
+                ruleCountEl.textContent = rulesContainer.querySelectorAll('.rule').length;
+            });
             header.appendChild(delBtn);
 
             const actionsContainer = document.createElement('div');
@@ -343,6 +347,8 @@ document.addEventListener('DOMContentLoaded', async () => {
     const lastTimeEl = document.getElementById('last-time');
     const averageTimeEl = document.getElementById('average-time');
     const totalTimeEl = document.getElementById('total-time');
+    const perHourEl = document.getElementById('per-hour');
+    const perDayEl = document.getElementById('per-day');
     let timingLogged = false;
     ruleCountEl.textContent = (defaults.aiRules || []).length;
     cacheCountEl.textContent = defaults.aiCache ? Object.keys(defaults.aiCache).length : 0;
@@ -386,6 +392,10 @@ document.addEventListener('DOMContentLoaded', async () => {
             }
             averageTimeEl.textContent = stats.runs > 0 ? format(stats.average) : '--:--:--';
             totalTimeEl.textContent = format(stats.total);
+            const perHour = stats.average > 0 ? Math.round(3600000 / stats.average) : 0;
+            const perDay = stats.average > 0 ? Math.round(86400000 / stats.average) : 0;
+            perHourEl.textContent = perHour;
+            perDayEl.textContent = perDay;
             if (!timingLogged) {
                 logger.aiLog('retrieved timing stats', {debug: true});
                 timingLogged = true;
@@ -396,11 +406,13 @@ document.addEventListener('DOMContentLoaded', async () => {
             lastTimeEl.textContent = '--:--:--';
             averageTimeEl.textContent = '--:--:--';
             totalTimeEl.textContent = '--:--:--';
+            perHourEl.textContent = '0';
+            perDayEl.textContent = '0';
         }
 
-        ruleCountEl.textContent = document.querySelectorAll('#rules-container .rule').length;
         try {
-            cacheCountEl.textContent = await AiClassifier.getCacheSize();
+            const { aiCache } = await storage.local.get('aiCache');
+            cacheCountEl.textContent = aiCache ? Object.keys(aiCache).length : 0;
         } catch {
             cacheCountEl.textContent = '?';
         }

From 0c105cb6e4f558f752d084812b12ea54793fd855 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 20:58:42 -0500
Subject: [PATCH 08/50] Handle multi-page selected message lists

---
 background.js | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/background.js b/background.js
index e8741dd..7e9b9c7 100644
--- a/background.js
+++ b/background.js
@@ -185,6 +185,20 @@ function updateTimingStats(elapsed) {
     t.m2 += delta * (elapsed - t.mean);
 }
 
+async function getAllMessageIds(list) {
+    const ids = [];
+    if (!list) {
+        return ids;
+    }
+    let page = list;
+    ids.push(...(page.messages || []).map(m => m.id));
+    while (page.id) {
+        page = await messenger.messages.continueList(page.id);
+        ids.push(...(page.messages || []).map(m => m.id));
+    }
+    return ids;
+}
+
 async function processMessage(id) {
     processing = true;
     currentStart = Date.now();
@@ -409,12 +423,16 @@ async function clearCacheForMessages(idsInput) {
 
     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] : []);
+            let ids = info.messageId ? [info.messageId] : [];
+            if (info.selectedMessages) {
+                ids = await getAllMessageIds(info.selectedMessages);
+            }
             await applyAiRules(ids);
         } else if (info.menuItemId === "clear-ai-cache-list" || info.menuItemId === "clear-ai-cache-display") {
-            const ids = info.selectedMessages?.messages?.map(m => m.id) ||
-                (info.messageId ? [info.messageId] : []);
+            let ids = info.messageId ? [info.messageId] : [];
+            if (info.selectedMessages) {
+                ids = await getAllMessageIds(info.selectedMessages);
+            }
             await clearCacheForMessages(ids);
         } else if (info.menuItemId === "view-ai-reason-list" || info.menuItemId === "view-ai-reason-display") {
             const [header] = await browser.messageDisplay.getDisplayedMessages(tab.id);

From 64d5c99ba53366c12c84027d072ac7510e1cdcae Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 21:04:58 -0500
Subject: [PATCH 09/50] Update manifest.json

140 testing failing, so reverting support back a version.
---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 0cbfb13..c333fa6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,7 +7,7 @@
     "gecko": {
       "id": "ai-filter@jordanwages",
       "strict_min_version": "128.0",
-      "strict_max_version": "140.*"
+      "strict_max_version": "139.*"
     }
   },
   "icons": {

From 2d2240419856596025dd5ac6bf4d789423bd6a49 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 21:42:32 -0500
Subject: [PATCH 10/50] Fix rule count initialization

---
 options/options.js | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/options/options.js b/options/options.js
index 7eadc27..83893c5 100644
--- a/options/options.js
+++ b/options/options.js
@@ -151,6 +151,19 @@ document.addEventListener('DOMContentLoaded', async () => {
     const rulesContainer = document.getElementById('rules-container');
     const addRuleBtn = document.getElementById('add-rule');
 
+    const ruleCountEl = document.getElementById('rule-count');
+    const cacheCountEl = document.getElementById('cache-count');
+    const queueCountEl = document.getElementById('queue-count');
+    const currentTimeEl = document.getElementById('current-time');
+    const lastTimeEl = document.getElementById('last-time');
+    const averageTimeEl = document.getElementById('average-time');
+    const totalTimeEl = document.getElementById('total-time');
+    const perHourEl = document.getElementById('per-hour');
+    const perDayEl = document.getElementById('per-day');
+    let timingLogged = false;
+    ruleCountEl.textContent = (defaults.aiRules || []).length;
+    cacheCountEl.textContent = defaults.aiCache ? Object.keys(defaults.aiCache).length : 0;
+
     function createActionRow(action = {type: 'tag'}) {
         const row = document.createElement('div');
         row.className = 'action-row field is-grouped mb-2';
@@ -340,18 +353,6 @@ document.addEventListener('DOMContentLoaded', async () => {
         return rule;
     }));
 
-    const ruleCountEl = document.getElementById('rule-count');
-    const cacheCountEl = document.getElementById('cache-count');
-    const queueCountEl = document.getElementById('queue-count');
-    const currentTimeEl = document.getElementById('current-time');
-    const lastTimeEl = document.getElementById('last-time');
-    const averageTimeEl = document.getElementById('average-time');
-    const totalTimeEl = document.getElementById('total-time');
-    const perHourEl = document.getElementById('per-hour');
-    const perDayEl = document.getElementById('per-day');
-    let timingLogged = false;
-    ruleCountEl.textContent = (defaults.aiRules || []).length;
-    cacheCountEl.textContent = defaults.aiCache ? Object.keys(defaults.aiCache).length : 0;
 
     function format(ms) {
         if (ms < 0) return '--:--:--';

From 0d543e556764f667bd42c4cc9d51f62c5c9ee545 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 21:45:28 -0500
Subject: [PATCH 11/50] Update manifest.json

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index c333fa6..0783cef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Sortana",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "default_locale": "en-US",
   "applications": {
     "gecko": {

From 34ed955a5b8894a472ca22f10b839a54dcb56386 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 21:56:58 -0500
Subject: [PATCH 12/50] Add read and flag rule actions

---
 README.md                    |  6 +++---
 _locales/en-US/messages.json |  6 ++++++
 background.js                |  4 ++++
 options/options.js           | 34 +++++++++++++++++++++++++++++++++-
 4 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 2244d49..3cdc2cc 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ message meets a specified criterion.
 - **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.
 - **Light/Dark themes** – automatically match Thunderbird's appearance with optional manual override.
-- **Automatic rules** – create rules that tag or move new messages based on AI classification.
+- **Automatic rules** – create rules that tag, move, mark read/unread or flag/unflag messages based on AI classification.
 - **Rule ordering** – drag rules to prioritize them and optionally stop processing after a match.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
@@ -101,7 +101,7 @@ Here are some useful and fun example criteria you can use in your filters. Filte
   For when you're ready to filter based on vibes.
 
 You can define as many filters as you'd like, each using a different prompt and
-triggering tags, moves, or actions based on the model's classification.
+triggering tags, moves, read/unread changes or flag updates based on the model's classification.
 
 ## Required Permissions
 
@@ -110,7 +110,7 @@ Sortana requests the following Thunderbird permissions:
 - `storage` – store configuration and cached classification results.
 - `messagesRead` – read message contents for classification.
 - `messagesMove` – move messages when a rule specifies a target folder.
-- `messagesUpdate` – change message properties such as tags and junk status.
+ - `messagesUpdate` – change message properties such as tags, junk status, read/unread state and flags.
 - `messagesTagsList` – retrieve existing message tags for rule actions.
 - `accountsRead` – list accounts and folders for move actions.
 - `menus` – add context menu commands.
diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index 97a356b..01d6c92 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -19,4 +19,10 @@
   "options.stripUrlParams": { "message": "Remove URL tracking parameters" },
   "options.altTextImages": { "message": "Replace images with alt text" },
   "options.collapseWhitespace": { "message": "Collapse long whitespace" }
+  ,"action.read": { "message": "read" }
+  ,"action.flag": { "message": "flag" }
+  ,"param.markRead": { "message": "mark read" }
+  ,"param.markUnread": { "message": "mark unread" }
+  ,"param.flag": { "message": "flag" }
+  ,"param.unflag": { "message": "unflag" }
 }
diff --git a/background.js b/background.js
index 7e9b9c7..6469288 100644
--- a/background.js
+++ b/background.js
@@ -229,6 +229,10 @@ async function processMessage(id) {
                         await messenger.messages.move([id], act.folder);
                     } else if (act.type === 'junk') {
                         await messenger.messages.update(id, { junk: !!act.junk });
+                    } else if (act.type === 'read') {
+                        await messenger.messages.update(id, { read: !!act.read });
+                    } else if (act.type === 'flag') {
+                        await messenger.messages.update(id, { flagged: !!act.flagged });
                     }
                 }
                 if (rule.stopProcessing) {
diff --git a/options/options.js b/options/options.js
index 83893c5..35d9a2c 100644
--- a/options/options.js
+++ b/options/options.js
@@ -171,7 +171,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         const typeWrapper = document.createElement('div');
         typeWrapper.className = 'select is-small mr-2';
         const typeSelect = document.createElement('select');
-        ['tag','move','junk'].forEach(t => {
+        ['tag','move','junk','read','flag'].forEach(t => {
             const opt = document.createElement('option');
             opt.value = t;
             opt.textContent = t;
@@ -222,6 +222,26 @@ document.addEventListener('DOMContentLoaded', async () => {
                 sel.value = String(action.junk ?? true);
                 wrap.appendChild(sel);
                 paramSpan.appendChild(wrap);
+            } else if (typeSelect.value === 'read') {
+                const wrap = document.createElement('div');
+                wrap.className = 'select is-small';
+                const sel = document.createElement('select');
+                sel.className = 'read-select';
+                sel.appendChild(new Option('mark read','true'));
+                sel.appendChild(new Option('mark unread','false'));
+                sel.value = String(action.read ?? true);
+                wrap.appendChild(sel);
+                paramSpan.appendChild(wrap);
+            } else if (typeSelect.value === 'flag') {
+                const wrap = document.createElement('div');
+                wrap.className = 'select is-small';
+                const sel = document.createElement('select');
+                sel.className = 'flag-select';
+                sel.appendChild(new Option('flag','true'));
+                sel.appendChild(new Option('unflag','false'));
+                sel.value = String(action.flagged ?? true);
+                wrap.appendChild(sel);
+                paramSpan.appendChild(wrap);
             }
         }
 
@@ -334,6 +354,12 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (type === 'junk') {
                     return { type, junk: row.querySelector('.junk-select').value === 'true' };
                 }
+                if (type === 'read') {
+                    return { type, read: row.querySelector('.read-select').value === 'true' };
+                }
+                if (type === 'flag') {
+                    return { type, flagged: row.querySelector('.flag-select').value === 'true' };
+                }
                 return { type };
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
@@ -474,6 +500,12 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (type === 'junk') {
                     return { type, junk: row.querySelector('.junk-select').value === 'true' };
                 }
+                if (type === 'read') {
+                    return { type, read: row.querySelector('.read-select').value === 'true' };
+                }
+                if (type === 'flag') {
+                    return { type, flagged: row.querySelector('.flag-select').value === 'true' };
+                }
                 return { type };
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;

From 85224f2d4d3557e05bcdb3bcfeb7ed65bd0c203c Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 22:12:35 -0500
Subject: [PATCH 13/50] Add unread-only option for rules

---
 README.md          |  5 +++--
 background.js      |  7 +++++++
 options/options.js | 35 ++++++++++++++++++++++++-----------
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 3cdc2cc..d8e1bb2 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ message meets a specified criterion.
 - **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.
 - **Light/Dark themes** – automatically match Thunderbird's appearance with optional manual override.
-- **Automatic rules** – create rules that tag, move, mark read/unread or flag/unflag messages based on AI classification.
+- **Automatic rules** – create rules that tag, move, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages.
 - **Rule ordering** – drag rules to prioritize them and optionally stop processing after a match.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
@@ -71,7 +71,8 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 1. Open the add-on's options and set the URL of your classification service.
 2. Use the **Classification Rules** section to add a criterion and optional
    actions such as tagging or moving a message when it matches. Drag rules to
-   reorder them and check *Stop after match* to halt further processing.
+   reorder them, check *Only apply to unread messages* to skip read mail, and
+   check *Stop after match* to halt further processing.
 3. Save your settings. New mail will be evaluated automatically using the
    configured rules.
 
diff --git a/background.js b/background.js
index 6469288..ad2bbcb 100644
--- a/background.js
+++ b/background.js
@@ -39,6 +39,7 @@ function normalizeRules(rules) {
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
         const rule = { criterion: r.criterion, actions };
         if (r.stopProcessing) rule.stopProcessing = true;
+        if (r.unreadOnly) rule.unreadOnly = true;
         return rule;
     }) : [];
 }
@@ -208,14 +209,20 @@ async function processMessage(id) {
         const full = await messenger.messages.getFull(id);
         const text = buildEmailText(full);
         let currentTags = [];
+        let alreadyRead = false;
         try {
             const hdr = await messenger.messages.get(id);
             currentTags = Array.isArray(hdr.tags) ? [...hdr.tags] : [];
+            alreadyRead = hdr.read === true;
         } catch (e) {
             currentTags = [];
+            alreadyRead = false;
         }
 
         for (const rule of aiRules) {
+            if (rule.unreadOnly && alreadyRead) {
+                continue;
+            }
             const cacheKey = await AiClassifier.buildCacheKey(id, rule.criterion);
             const matched = await AiClassifier.classifyText(text, rule.criterion, cacheKey);
             if (matched) {
diff --git a/options/options.js b/options/options.js
index 35d9a2c..ab63644 100644
--- a/options/options.js
+++ b/options/options.js
@@ -318,20 +318,30 @@ document.addEventListener('DOMContentLoaded', async () => {
             addAction.className = 'button is-small mb-2';
             addAction.addEventListener('click', () => actionsContainer.appendChild(createActionRow()));
 
-            const stopLabel = document.createElement('label');
-            stopLabel.className = 'checkbox mt-2';
-            const stopCheck = document.createElement('input');
-            stopCheck.type = 'checkbox';
-            stopCheck.className = 'stop-processing';
-            stopCheck.checked = rule.stopProcessing === true;
-            stopLabel.appendChild(stopCheck);
-            stopLabel.append(' Stop after match');
+           const stopLabel = document.createElement('label');
+           stopLabel.className = 'checkbox mt-2';
+           const stopCheck = document.createElement('input');
+           stopCheck.type = 'checkbox';
+           stopCheck.className = 'stop-processing';
+           stopCheck.checked = rule.stopProcessing === true;
+           stopLabel.appendChild(stopCheck);
+           stopLabel.append(' Stop after match');
+
+            const unreadLabel = document.createElement('label');
+            unreadLabel.className = 'checkbox mt-2 ml-4';
+            const unreadCheck = document.createElement('input');
+            unreadCheck.type = 'checkbox';
+            unreadCheck.className = 'unread-only';
+            unreadCheck.checked = rule.unreadOnly === true;
+            unreadLabel.appendChild(unreadCheck);
+            unreadLabel.append(' Only apply to unread messages');
 
             const body = document.createElement('div');
             body.className = 'message-body';
             body.appendChild(actionsContainer);
             body.appendChild(addAction);
             body.appendChild(stopLabel);
+            body.appendChild(unreadLabel);
 
             article.appendChild(header);
             article.appendChild(body);
@@ -363,9 +373,10 @@ document.addEventListener('DOMContentLoaded', async () => {
                 return { type };
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
-            return { criterion, actions, stopProcessing };
+            const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
+            return { criterion, actions, unreadOnly, stopProcessing };
         });
-        data.push({ criterion: '', actions: [], stopProcessing: false });
+        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false });
         renderRules(data);
     });
 
@@ -376,6 +387,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
         const rule = { criterion: r.criterion, actions };
         if (r.stopProcessing) rule.stopProcessing = true;
+        if (r.unreadOnly) rule.unreadOnly = true;
         return rule;
     }));
 
@@ -509,7 +521,8 @@ document.addEventListener('DOMContentLoaded', async () => {
                 return { type };
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
-            return { criterion, actions, stopProcessing };
+            const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
+            return { criterion, actions, unreadOnly, stopProcessing };
         }).filter(r => r.criterion);
         const stripUrlParams = stripUrlToggle.checked;
         const altTextImages = altTextToggle.checked;

From 5c309c9b698daaaa98ba4e451101ee3df0c59b23 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 22:33:46 -0500
Subject: [PATCH 14/50] Add copy action support

---
 README.md                    |  8 ++++----
 _locales/en-US/messages.json |  1 +
 background.js                |  3 +++
 options/options.js           | 13 ++++++++++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index d8e1bb2..4bcef29 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ message meets a specified criterion.
 - **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.
 - **Light/Dark themes** – automatically match Thunderbird's appearance with optional manual override.
-- **Automatic rules** – create rules that tag, move, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages.
+- **Automatic rules** – create rules that tag, move, copy, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages.
 - **Rule ordering** – drag rules to prioritize them and optionally stop processing after a match.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
@@ -102,7 +102,7 @@ Here are some useful and fun example criteria you can use in your filters. Filte
   For when you're ready to filter based on vibes.
 
 You can define as many filters as you'd like, each using a different prompt and
-triggering tags, moves, read/unread changes or flag updates based on the model's classification.
+triggering tags, moves, copies, read/unread changes or flag updates based on the model's classification.
 
 ## Required Permissions
 
@@ -110,10 +110,10 @@ Sortana requests the following Thunderbird permissions:
 
 - `storage` – store configuration and cached classification results.
 - `messagesRead` – read message contents for classification.
-- `messagesMove` – move messages when a rule specifies a target folder.
+- `messagesMove` – move or copy messages when a rule specifies a target folder.
  - `messagesUpdate` – change message properties such as tags, junk status, read/unread state and flags.
 - `messagesTagsList` – retrieve existing message tags for rule actions.
-- `accountsRead` – list accounts and folders for move actions.
+- `accountsRead` – list accounts and folders for move or copy actions.
 - `menus` – add context menu commands.
 - `tabs` – open new tabs and query the active tab.
 
diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index 01d6c92..6fc5b61 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -21,6 +21,7 @@
   "options.collapseWhitespace": { "message": "Collapse long whitespace" }
   ,"action.read": { "message": "read" }
   ,"action.flag": { "message": "flag" }
+  ,"action.copy": { "message": "copy" }
   ,"param.markRead": { "message": "mark read" }
   ,"param.markUnread": { "message": "mark unread" }
   ,"param.flag": { "message": "flag" }
diff --git a/background.js b/background.js
index ad2bbcb..8a26971 100644
--- a/background.js
+++ b/background.js
@@ -37,6 +37,7 @@ function normalizeRules(rules) {
         const actions = [];
         if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
+        if (r.copyTarget || r.copyTo) actions.push({ type: 'copy', copyTarget: r.copyTarget || r.copyTo });
         const rule = { criterion: r.criterion, actions };
         if (r.stopProcessing) rule.stopProcessing = true;
         if (r.unreadOnly) rule.unreadOnly = true;
@@ -234,6 +235,8 @@ async function processMessage(id) {
                         }
                     } else if (act.type === 'move' && act.folder) {
                         await messenger.messages.move([id], act.folder);
+                    } else if (act.type === 'copy' && act.copyTarget) {
+                        await messenger.messages.copy([id], act.copyTarget);
                     } else if (act.type === 'junk') {
                         await messenger.messages.update(id, { junk: !!act.junk });
                     } else if (act.type === 'read') {
diff --git a/options/options.js b/options/options.js
index ab63644..7ec57ee 100644
--- a/options/options.js
+++ b/options/options.js
@@ -171,7 +171,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         const typeWrapper = document.createElement('div');
         typeWrapper.className = 'select is-small mr-2';
         const typeSelect = document.createElement('select');
-        ['tag','move','junk','read','flag'].forEach(t => {
+        ['tag','move','copy','junk','read','flag'].forEach(t => {
             const opt = document.createElement('option');
             opt.value = t;
             opt.textContent = t;
@@ -198,7 +198,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                 sel.value = action.tagKey || '';
                 wrap.appendChild(sel);
                 paramSpan.appendChild(wrap);
-            } else if (typeSelect.value === 'move') {
+            } else if (typeSelect.value === 'move' || typeSelect.value === 'copy') {
                 const wrap = document.createElement('div');
                 wrap.className = 'select is-small';
                 const sel = document.createElement('select');
@@ -209,7 +209,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                     opt.textContent = f.name;
                     sel.appendChild(opt);
                 }
-                sel.value = action.folder || '';
+                sel.value = action.folder || action.copyTarget || '';
                 wrap.appendChild(sel);
                 paramSpan.appendChild(wrap);
             } else if (typeSelect.value === 'junk') {
@@ -361,6 +361,9 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (type === 'move') {
                     return { type, folder: row.querySelector('.folder-select').value };
                 }
+                if (type === 'copy') {
+                    return { type, copyTarget: row.querySelector('.folder-select').value };
+                }
                 if (type === 'junk') {
                     return { type, junk: row.querySelector('.junk-select').value === 'true' };
                 }
@@ -385,6 +388,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         const actions = [];
         if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
+        if (r.copyTarget || r.copyTo) actions.push({ type: 'copy', copyTarget: r.copyTarget || r.copyTo });
         const rule = { criterion: r.criterion, actions };
         if (r.stopProcessing) rule.stopProcessing = true;
         if (r.unreadOnly) rule.unreadOnly = true;
@@ -509,6 +513,9 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (type === 'move') {
                     return { type, folder: row.querySelector('.folder-select').value };
                 }
+                if (type === 'copy') {
+                    return { type, copyTarget: row.querySelector('.folder-select').value };
+                }
                 if (type === 'junk') {
                     return { type, junk: row.querySelector('.junk-select').value === 'true' };
                 }

From fa62afa50eaed2fb591c545960069629d9ec6c8c Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 22:38:53 -0500
Subject: [PATCH 15/50] Add delete and archive rule actions

---
 README.md                    | 6 +++---
 _locales/en-US/messages.json | 4 +++-
 background.js                | 4 ++++
 options/options.js           | 7 ++++++-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 4bcef29..1458d4e 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ message meets a specified criterion.
 - **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.
 - **Light/Dark themes** – automatically match Thunderbird's appearance with optional manual override.
-- **Automatic rules** – create rules that tag, move, copy, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages.
+- **Automatic rules** – create rules that tag, move, copy, delete, archive, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages.
 - **Rule ordering** – drag rules to prioritize them and optionally stop processing after a match.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
@@ -70,7 +70,7 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 
 1. Open the add-on's options and set the URL of your classification service.
 2. Use the **Classification Rules** section to add a criterion and optional
-   actions such as tagging or moving a message when it matches. Drag rules to
+   actions such as tagging, moving, copying, deleting or archiving a message when it matches. Drag rules to
    reorder them, check *Only apply to unread messages* to skip read mail, and
    check *Stop after match* to halt further processing.
 3. Save your settings. New mail will be evaluated automatically using the
@@ -102,7 +102,7 @@ Here are some useful and fun example criteria you can use in your filters. Filte
   For when you're ready to filter based on vibes.
 
 You can define as many filters as you'd like, each using a different prompt and
-triggering tags, moves, copies, read/unread changes or flag updates based on the model's classification.
+triggering tags, moves, copies, deletes, archives, read/unread changes or flag updates based on the model's classification.
 
 ## Required Permissions
 
diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index 6fc5b61..7d8fa37 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -21,7 +21,9 @@
   "options.collapseWhitespace": { "message": "Collapse long whitespace" }
   ,"action.read": { "message": "read" }
   ,"action.flag": { "message": "flag" }
-  ,"action.copy": { "message": "copy" }
+    ,"action.copy": { "message": "copy" }
+    ,"action.delete": { "message": "delete" }
+    ,"action.archive": { "message": "archive" }
   ,"param.markRead": { "message": "mark read" }
   ,"param.markUnread": { "message": "mark unread" }
   ,"param.flag": { "message": "flag" }
diff --git a/background.js b/background.js
index 8a26971..3309339 100644
--- a/background.js
+++ b/background.js
@@ -243,6 +243,10 @@ async function processMessage(id) {
                         await messenger.messages.update(id, { read: !!act.read });
                     } else if (act.type === 'flag') {
                         await messenger.messages.update(id, { flagged: !!act.flagged });
+                    } else if (act.type === 'delete') {
+                        await messenger.messages.delete([id]);
+                    } else if (act.type === 'archive') {
+                        await messenger.messages.archive([id]);
                     }
                 }
                 if (rule.stopProcessing) {
diff --git a/options/options.js b/options/options.js
index 7ec57ee..ce6c81b 100644
--- a/options/options.js
+++ b/options/options.js
@@ -171,7 +171,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         const typeWrapper = document.createElement('div');
         typeWrapper.className = 'select is-small mr-2';
         const typeSelect = document.createElement('select');
-        ['tag','move','copy','junk','read','flag'].forEach(t => {
+        ['tag','move','copy','junk','read','flag','delete','archive'].forEach(t => {
             const opt = document.createElement('option');
             opt.value = t;
             opt.textContent = t;
@@ -242,6 +242,8 @@ document.addEventListener('DOMContentLoaded', async () => {
                 sel.value = String(action.flagged ?? true);
                 wrap.appendChild(sel);
                 paramSpan.appendChild(wrap);
+            } else if (typeSelect.value === 'delete' || typeSelect.value === 'archive') {
+                paramSpan.appendChild(document.createElement('span'));
             }
         }
 
@@ -373,6 +375,9 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (type === 'flag') {
                     return { type, flagged: row.querySelector('.flag-select').value === 'true' };
                 }
+                if (type === 'delete' || type === 'archive') {
+                    return { type };
+                }
                 return { type };
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;

From 9a2ecb01622900d4a9f853c4620b580a7500cf73 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 22:44:47 -0500
Subject: [PATCH 16/50] Add forward and reply rule actions

---
 README.md                    |  9 ++++++---
 _locales/en-US/messages.json |  7 ++++++-
 background.js                | 11 ++++++++++-
 manifest.json                |  3 ++-
 options/options.js           | 25 ++++++++++++++++++++++++-
 5 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 1458d4e..f9a92f7 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ message meets a specified criterion.
 - **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.
 - **Light/Dark themes** – automatically match Thunderbird's appearance with optional manual override.
-- **Automatic rules** – create rules that tag, move, copy, delete, archive, mark read/unread or flag/unflag messages based on AI classification. Rules can optionally apply only to unread messages.
+- **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.
 - **Rule ordering** – drag rules to prioritize them and optionally stop processing after a match.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
@@ -70,9 +70,11 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 
 1. Open the add-on's options and set the URL of your classification service.
 2. Use the **Classification Rules** section to add a criterion and optional
-   actions such as tagging, moving, copying, deleting or archiving a message when it matches. Drag rules to
+   actions such as tagging, moving, copying, forwarding, replying,
+   deleting or archiving a message when it matches. Drag rules to
    reorder them, check *Only apply to unread messages* to skip read mail, and
-   check *Stop after match* to halt further processing.
+   check *Stop after match* to halt further processing. Forward and reply actions
+   open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
    configured rules.
 
@@ -116,6 +118,7 @@ Sortana requests the following Thunderbird permissions:
 - `accountsRead` – list accounts and folders for move or copy actions.
 - `menus` – add context menu commands.
 - `tabs` – open new tabs and query the active tab.
+- `compose` – create reply and forward compose windows for matching rules.
 
 ## Thunderbird Add-on Store Disclosures
 
diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index 7d8fa37..983bb86 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -23,9 +23,14 @@
   ,"action.flag": { "message": "flag" }
     ,"action.copy": { "message": "copy" }
     ,"action.delete": { "message": "delete" }
-    ,"action.archive": { "message": "archive" }
+  ,"action.archive": { "message": "archive" }
+  ,"action.forward": { "message": "forward" }
+  ,"action.reply": { "message": "reply" }
   ,"param.markRead": { "message": "mark read" }
   ,"param.markUnread": { "message": "mark unread" }
   ,"param.flag": { "message": "flag" }
   ,"param.unflag": { "message": "unflag" }
+  ,"param.address": { "message": "address" }
+  ,"param.replyAll": { "message": "reply all" }
+  ,"param.replySender": { "message": "reply sender" }
 }
diff --git a/background.js b/background.js
index 3309339..9a230e1 100644
--- a/background.js
+++ b/background.js
@@ -209,15 +209,20 @@ async function processMessage(id) {
     try {
         const full = await messenger.messages.getFull(id);
         const text = buildEmailText(full);
+        let hdr;
         let currentTags = [];
         let alreadyRead = false;
+        let identityId = null;
         try {
-            const hdr = await messenger.messages.get(id);
+            hdr = await messenger.messages.get(id);
             currentTags = Array.isArray(hdr.tags) ? [...hdr.tags] : [];
             alreadyRead = hdr.read === true;
+            const ids = await messenger.identities.list(hdr.folder.accountId);
+            identityId = ids[0]?.id || null;
         } catch (e) {
             currentTags = [];
             alreadyRead = false;
+            identityId = null;
         }
 
         for (const rule of aiRules) {
@@ -247,6 +252,10 @@ async function processMessage(id) {
                         await messenger.messages.delete([id]);
                     } else if (act.type === 'archive') {
                         await messenger.messages.archive([id]);
+                    } else if (act.type === 'forward' && act.address && identityId) {
+                        await browser.compose.beginForward(id, { to: [act.address], identityId });
+                    } else if (act.type === 'reply' && act.replyType && identityId) {
+                        await browser.compose.beginReply(id, { replyType: act.replyType, identityId });
                     }
                 }
                 if (rule.stopProcessing) {
diff --git a/manifest.json b/manifest.json
index 0783cef..fe019ab 100644
--- a/manifest.json
+++ b/manifest.json
@@ -42,6 +42,7 @@
     "menus",
     "scripting",
     "tabs",
-    "theme"
+    "theme",
+    "compose"
   ]
 }
diff --git a/options/options.js b/options/options.js
index ce6c81b..951c135 100644
--- a/options/options.js
+++ b/options/options.js
@@ -171,7 +171,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         const typeWrapper = document.createElement('div');
         typeWrapper.className = 'select is-small mr-2';
         const typeSelect = document.createElement('select');
-        ['tag','move','copy','junk','read','flag','delete','archive'].forEach(t => {
+        ['tag','move','copy','junk','read','flag','delete','archive','forward','reply'].forEach(t => {
             const opt = document.createElement('option');
             opt.value = t;
             opt.textContent = t;
@@ -242,6 +242,23 @@ document.addEventListener('DOMContentLoaded', async () => {
                 sel.value = String(action.flagged ?? true);
                 wrap.appendChild(sel);
                 paramSpan.appendChild(wrap);
+            } else if (typeSelect.value === 'forward') {
+                const input = document.createElement('input');
+                input.type = 'text';
+                input.className = 'input is-small forward-input';
+                input.placeholder = 'address@example.com';
+                input.value = action.address || '';
+                paramSpan.appendChild(input);
+            } else if (typeSelect.value === 'reply') {
+                const wrap = document.createElement('div');
+                wrap.className = 'select is-small';
+                const sel = document.createElement('select');
+                sel.className = 'reply-select';
+                sel.appendChild(new Option('all','all'));
+                sel.appendChild(new Option('sender','sender'));
+                sel.value = action.replyType || 'all';
+                wrap.appendChild(sel);
+                paramSpan.appendChild(wrap);
             } else if (typeSelect.value === 'delete' || typeSelect.value === 'archive') {
                 paramSpan.appendChild(document.createElement('span'));
             }
@@ -530,6 +547,12 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (type === 'flag') {
                     return { type, flagged: row.querySelector('.flag-select').value === 'true' };
                 }
+                if (type === 'forward') {
+                    return { type, address: row.querySelector('.forward-input').value.trim() };
+                }
+                if (type === 'reply') {
+                    return { type, replyType: row.querySelector('.reply-select').value };
+                }
                 return { type };
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;

From 6fd6da8a1247ee7255e33d0a13fd41c3d21c65fc Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 22:50:50 -0500
Subject: [PATCH 17/50] Add age filters to rules

---
 README.md          |  5 +++--
 background.js      | 14 ++++++++++++++
 options/options.js | 34 ++++++++++++++++++++++++++++++++--
 3 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f9a92f7..de61261 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ message meets a specified criterion.
 - **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.
 - **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.
+- **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.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
@@ -72,7 +72,8 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 2. Use the **Classification Rules** section to add a criterion and optional
    actions such as tagging, moving, copying, forwarding, replying,
    deleting or archiving a message when it matches. Drag rules to
-   reorder them, check *Only apply to unread messages* to skip read mail, and
+   reorder them, check *Only apply to unread messages* to skip read mail,
+   set optional minimum or maximum message age limits, and
    check *Stop after match* to halt further processing. Forward and reply actions
    open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
diff --git a/background.js b/background.js
index 9a230e1..6636f60 100644
--- a/background.js
+++ b/background.js
@@ -41,6 +41,8 @@ function normalizeRules(rules) {
         const rule = { criterion: r.criterion, actions };
         if (r.stopProcessing) rule.stopProcessing = true;
         if (r.unreadOnly) rule.unreadOnly = true;
+        if (typeof r.minAgeDays === 'number') rule.minAgeDays = r.minAgeDays;
+        if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
         return rule;
     }) : [];
 }
@@ -229,6 +231,18 @@ async function processMessage(id) {
             if (rule.unreadOnly && alreadyRead) {
                 continue;
             }
+            if (hdr && (typeof rule.minAgeDays === 'number' || typeof rule.maxAgeDays === 'number')) {
+                const msgTime = new Date(hdr.date).getTime();
+                if (!isNaN(msgTime)) {
+                    const ageDays = (Date.now() - msgTime) / 86400000;
+                    if (typeof rule.minAgeDays === 'number' && ageDays < rule.minAgeDays) {
+                        continue;
+                    }
+                    if (typeof rule.maxAgeDays === 'number' && ageDays > rule.maxAgeDays) {
+                        continue;
+                    }
+                }
+            }
             const cacheKey = await AiClassifier.buildCacheKey(id, rule.criterion);
             const matched = await AiClassifier.classifyText(text, rule.criterion, cacheKey);
             if (matched) {
diff --git a/options/options.js b/options/options.js
index 951c135..b089568 100644
--- a/options/options.js
+++ b/options/options.js
@@ -355,12 +355,30 @@ document.addEventListener('DOMContentLoaded', async () => {
             unreadLabel.appendChild(unreadCheck);
             unreadLabel.append(' Only apply to unread messages');
 
+            const ageBox = document.createElement('div');
+            ageBox.className = 'field is-grouped mt-2';
+            const minInput = document.createElement('input');
+            minInput.type = 'number';
+            minInput.placeholder = 'Min days';
+            minInput.className = 'input is-small min-age mr-2';
+            minInput.style.width = '6em';
+            if (typeof rule.minAgeDays === 'number') minInput.value = rule.minAgeDays;
+            const maxInput = document.createElement('input');
+            maxInput.type = 'number';
+            maxInput.placeholder = 'Max days';
+            maxInput.className = 'input is-small max-age';
+            maxInput.style.width = '6em';
+            if (typeof rule.maxAgeDays === 'number') maxInput.value = rule.maxAgeDays;
+            ageBox.appendChild(minInput);
+            ageBox.appendChild(maxInput);
+
             const body = document.createElement('div');
             body.className = 'message-body';
             body.appendChild(actionsContainer);
             body.appendChild(addAction);
             body.appendChild(stopLabel);
             body.appendChild(unreadLabel);
+            body.appendChild(ageBox);
 
             article.appendChild(header);
             article.appendChild(body);
@@ -399,7 +417,12 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            return { criterion, actions, unreadOnly, stopProcessing };
+            const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
+            const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
+            const rule = { criterion, actions, unreadOnly, stopProcessing };
+            if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
+            if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
+            return rule;
         });
         data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false });
         renderRules(data);
@@ -414,6 +437,8 @@ document.addEventListener('DOMContentLoaded', async () => {
         const rule = { criterion: r.criterion, actions };
         if (r.stopProcessing) rule.stopProcessing = true;
         if (r.unreadOnly) rule.unreadOnly = true;
+        if (typeof r.minAgeDays === 'number') rule.minAgeDays = r.minAgeDays;
+        if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
         return rule;
     }));
 
@@ -557,7 +582,12 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            return { criterion, actions, unreadOnly, stopProcessing };
+            const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
+            const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
+            const rule = { criterion, actions, unreadOnly, stopProcessing };
+            if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
+            if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
+            return rule;
         }).filter(r => r.criterion);
         const stripUrlParams = stripUrlToggle.checked;
         const altTextImages = altTextToggle.checked;

From cd0a31ed9866cfd156b79a36c5d3b69b418ea292 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 22:58:27 -0500
Subject: [PATCH 18/50] Add account and folder filters for rules

---
 README.md          |  6 ++--
 background.js      | 16 ++++++++++-
 options/options.js | 70 ++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 87 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index de61261..adebc99 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ message meets a specified criterion.
 - **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.
+- **Account & folder filters** – limit rules to specific accounts or folders.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
 - **View reasoning** – inspect why rules matched via the Details popup.
@@ -69,11 +70,12 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 ## Usage
 
 1. Open the add-on's options and set the URL of your classification service.
-2. Use the **Classification Rules** section to add a criterion and optional
+ 2. Use the **Classification Rules** section to add a criterion and optional
    actions such as tagging, moving, copying, forwarding, replying,
    deleting or archiving a message when it matches. Drag rules to
    reorder them, check *Only apply to unread messages* to skip read mail,
-   set optional minimum or maximum message age limits, and
+   set optional minimum or maximum message age limits, select the accounts or
+   folders a rule should apply to, and
    check *Stop after match* to halt further processing. Forward and reply actions
    open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
diff --git a/background.js b/background.js
index 6636f60..fb820bb 100644
--- a/background.js
+++ b/background.js
@@ -33,7 +33,11 @@ let detectSystemTheme;
 
 function normalizeRules(rules) {
     return Array.isArray(rules) ? rules.map(r => {
-        if (r.actions) return r;
+        if (r.actions) {
+            if (!Array.isArray(r.accounts)) r.accounts = [];
+            if (!Array.isArray(r.folders)) r.folders = [];
+            return r;
+        }
         const actions = [];
         if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
@@ -43,6 +47,8 @@ function normalizeRules(rules) {
         if (r.unreadOnly) rule.unreadOnly = true;
         if (typeof r.minAgeDays === 'number') rule.minAgeDays = r.minAgeDays;
         if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
+        if (Array.isArray(r.accounts)) rule.accounts = r.accounts;
+        if (Array.isArray(r.folders)) rule.folders = r.folders;
         return rule;
     }) : [];
 }
@@ -228,6 +234,14 @@ async function processMessage(id) {
         }
 
         for (const rule of aiRules) {
+            if (hdr && Array.isArray(rule.accounts) && rule.accounts.length &&
+                !rule.accounts.includes(hdr.folder.accountId)) {
+                continue;
+            }
+            if (hdr && Array.isArray(rule.folders) && rule.folders.length &&
+                !rule.folders.includes(hdr.folder.path)) {
+                continue;
+            }
             if (rule.unreadOnly && alreadyRead) {
                 continue;
             }
diff --git a/options/options.js b/options/options.js
index b089568..0042004 100644
--- a/options/options.js
+++ b/options/options.js
@@ -123,6 +123,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     let tagList = [];
     let folderList = [];
+    let accountList = [];
     try {
         tagList = await messenger.messages.tags.list();
     } catch (e) {
@@ -130,6 +131,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     }
     try {
         const accounts = await messenger.accounts.list(true);
+        accountList = accounts.map(a => ({ id: a.id, name: a.name }));
         const collect = (f, prefix='') => {
             folderList.push({ id: f.id ?? f.path, name: prefix + f.name });
             (f.subFolders || []).forEach(sf => collect(sf, prefix + f.name + '/'));
@@ -372,6 +374,54 @@ document.addEventListener('DOMContentLoaded', async () => {
             ageBox.appendChild(minInput);
             ageBox.appendChild(maxInput);
 
+            const acctBox = document.createElement('div');
+            acctBox.className = 'field mt-2';
+            const acctLabel = document.createElement('label');
+            acctLabel.className = 'label';
+            acctLabel.textContent = 'Accounts';
+            const acctControl = document.createElement('div');
+            const acctWrap = document.createElement('div');
+            acctWrap.className = 'select is-multiple is-small';
+            const acctSel = document.createElement('select');
+            acctSel.className = 'account-select';
+            acctSel.multiple = true;
+            acctSel.size = Math.min(accountList.length, 4) || 1;
+            for (const a of accountList) {
+                const opt = document.createElement('option');
+                opt.value = a.id;
+                opt.textContent = a.name;
+                if ((rule.accounts || []).includes(a.id)) opt.selected = true;
+                acctSel.appendChild(opt);
+            }
+            acctWrap.appendChild(acctSel);
+            acctControl.appendChild(acctWrap);
+            acctBox.appendChild(acctLabel);
+            acctBox.appendChild(acctControl);
+
+            const folderBox = document.createElement('div');
+            folderBox.className = 'field mt-2';
+            const folderLabel = document.createElement('label');
+            folderLabel.className = 'label';
+            folderLabel.textContent = 'Folders';
+            const folderControl = document.createElement('div');
+            const folderWrap = document.createElement('div');
+            folderWrap.className = 'select is-multiple is-small';
+            const folderSel = document.createElement('select');
+            folderSel.className = 'folder-filter-select';
+            folderSel.multiple = true;
+            folderSel.size = Math.min(folderList.length, 6) || 1;
+            for (const f of folderList) {
+                const opt = document.createElement('option');
+                opt.value = f.id;
+                opt.textContent = f.name;
+                if ((rule.folders || []).includes(f.id)) opt.selected = true;
+                folderSel.appendChild(opt);
+            }
+            folderWrap.appendChild(folderSel);
+            folderControl.appendChild(folderWrap);
+            folderBox.appendChild(folderLabel);
+            folderBox.appendChild(folderControl);
+
             const body = document.createElement('div');
             body.className = 'message-body';
             body.appendChild(actionsContainer);
@@ -379,6 +429,8 @@ document.addEventListener('DOMContentLoaded', async () => {
             body.appendChild(stopLabel);
             body.appendChild(unreadLabel);
             body.appendChild(ageBox);
+            body.appendChild(acctBox);
+            body.appendChild(folderBox);
 
             article.appendChild(header);
             article.appendChild(body);
@@ -419,17 +471,25 @@ document.addEventListener('DOMContentLoaded', async () => {
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
             const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
+            const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
+            const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
             const rule = { criterion, actions, unreadOnly, stopProcessing };
             if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
             if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
+            if (accounts.length) rule.accounts = accounts;
+            if (folders.length) rule.folders = folders;
             return rule;
         });
-        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false });
+        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false, accounts: [], folders: [] });
         renderRules(data);
     });
 
     renderRules((defaults.aiRules || []).map(r => {
-        if (r.actions) return r;
+        if (r.actions) {
+            if (!Array.isArray(r.accounts)) r.accounts = [];
+            if (!Array.isArray(r.folders)) r.folders = [];
+            return r;
+        }
         const actions = [];
         if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
@@ -439,6 +499,8 @@ document.addEventListener('DOMContentLoaded', async () => {
         if (r.unreadOnly) rule.unreadOnly = true;
         if (typeof r.minAgeDays === 'number') rule.minAgeDays = r.minAgeDays;
         if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
+        if (Array.isArray(r.accounts)) rule.accounts = r.accounts;
+        if (Array.isArray(r.folders)) rule.folders = r.folders;
         return rule;
     }));
 
@@ -584,9 +646,13 @@ document.addEventListener('DOMContentLoaded', async () => {
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
             const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
+            const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
+            const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
             const rule = { criterion, actions, unreadOnly, stopProcessing };
             if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
             if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
+            if (accounts.length) rule.accounts = accounts;
+            if (folders.length) rule.folders = folders;
             return rule;
         }).filter(r => r.criterion);
         const stripUrlParams = stripUrlToggle.checked;

From fa84f37637e1bc5bd012ca565987c0f0ab180a74 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 23:07:55 -0500
Subject: [PATCH 19/50] Add rule enable toggle

---
 README.md          |  5 +++--
 background.js      |  5 +++++
 options/options.js | 20 +++++++++++++++++---
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index adebc99..60cbe13 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ message meets a specified criterion.
 - **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.
+- **Rule enable/disable** – temporarily turn a rule off without removing it.
 - **Account & folder filters** – limit rules to specific accounts or folders.
 - **Context menu** – apply AI rules from the message list or the message display action button.
 - **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
@@ -75,8 +76,8 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
    deleting or archiving a message when it matches. Drag rules to
    reorder them, check *Only apply to unread messages* to skip read mail,
    set optional minimum or maximum message age limits, select the accounts or
-   folders a rule should apply to, and
-   check *Stop after match* to halt further processing. Forward and reply actions
+  folders a rule should apply to, uncheck *Enabled* to temporarily disable a rule, and
+  check *Stop after match* to halt further processing. Forward and reply actions
    open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
    configured rules.
diff --git a/background.js b/background.js
index fb820bb..b0db614 100644
--- a/background.js
+++ b/background.js
@@ -36,6 +36,7 @@ function normalizeRules(rules) {
         if (r.actions) {
             if (!Array.isArray(r.accounts)) r.accounts = [];
             if (!Array.isArray(r.folders)) r.folders = [];
+            r.enabled = r.enabled !== false;
             return r;
         }
         const actions = [];
@@ -49,6 +50,7 @@ function normalizeRules(rules) {
         if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
         if (Array.isArray(r.accounts)) rule.accounts = r.accounts;
         if (Array.isArray(r.folders)) rule.folders = r.folders;
+        rule.enabled = r.enabled !== false;
         return rule;
     }) : [];
 }
@@ -234,6 +236,9 @@ async function processMessage(id) {
         }
 
         for (const rule of aiRules) {
+            if (rule.enabled === false) {
+                continue;
+            }
             if (hdr && Array.isArray(rule.accounts) && rule.accounts.length &&
                 !rule.accounts.includes(hdr.folder.accountId)) {
                 continue;
diff --git a/options/options.js b/options/options.js
index 0042004..3d02639 100644
--- a/options/options.js
+++ b/options/options.js
@@ -326,6 +326,16 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             header.appendChild(delBtn);
 
+            const enabledLabel = document.createElement('label');
+            enabledLabel.className = 'checkbox ml-2';
+            const enabledCheck = document.createElement('input');
+            enabledCheck.type = 'checkbox';
+            enabledCheck.className = 'rule-enabled';
+            enabledCheck.checked = rule.enabled !== false;
+            enabledLabel.appendChild(enabledCheck);
+            enabledLabel.append(' Enabled');
+            header.appendChild(enabledLabel);
+
             const actionsContainer = document.createElement('div');
             actionsContainer.className = 'rule-actions mb-2';
 
@@ -469,18 +479,19 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
+            const enabled = ruleEl.querySelector('.rule-enabled')?.checked !== false;
             const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
             const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
             const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
-            const rule = { criterion, actions, unreadOnly, stopProcessing };
+            const rule = { criterion, actions, unreadOnly, stopProcessing, enabled };
             if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
             if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
             if (accounts.length) rule.accounts = accounts;
             if (folders.length) rule.folders = folders;
             return rule;
         });
-        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false, accounts: [], folders: [] });
+        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false, enabled: true, accounts: [], folders: [] });
         renderRules(data);
     });
 
@@ -488,6 +499,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         if (r.actions) {
             if (!Array.isArray(r.accounts)) r.accounts = [];
             if (!Array.isArray(r.folders)) r.folders = [];
+            if (r.enabled !== false) r.enabled = true; else r.enabled = false;
             return r;
         }
         const actions = [];
@@ -501,6 +513,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         if (typeof r.maxAgeDays === 'number') rule.maxAgeDays = r.maxAgeDays;
         if (Array.isArray(r.accounts)) rule.accounts = r.accounts;
         if (Array.isArray(r.folders)) rule.folders = r.folders;
+        rule.enabled = r.enabled !== false;
         return rule;
     }));
 
@@ -644,11 +657,12 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
+            const enabled = ruleEl.querySelector('.rule-enabled')?.checked !== false;
             const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
             const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
             const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
-            const rule = { criterion, actions, unreadOnly, stopProcessing };
+            const rule = { criterion, actions, unreadOnly, stopProcessing, enabled };
             if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
             if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
             if (accounts.length) rule.accounts = accounts;

From 65ff743676f152e93d6f939bf96ffde158b0fe44 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 23:16:43 -0500
Subject: [PATCH 20/50] Persist error icon and add notification

---
 README.md     |  6 ++++--
 background.js | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 60cbe13..9c75c61 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,8 @@ message meets a specified criterion.
 - **Rule enable/disable** – temporarily turn a rule off without removing it.
 - **Account & folder filters** – limit rules to specific accounts or folders.
 - **Context menu** – apply AI rules from the message list or the message display action button.
-- **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
+- **Status icons** – toolbar icons show when classification is in progress and briefly display success states. If a failure occurs the icon turns red until you dismiss the notification.
+- **Error notification** – failed classification displays a notification with a button to clear the error and reset the icon.
 - **View reasoning** – inspect why rules matched via the Details popup.
 - **Cache management** – clear cached results from the context menu or options page.
 - **Queue & timing stats** – monitor processing time on the Maintenance tab.
@@ -76,11 +77,12 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
    deleting or archiving a message when it matches. Drag rules to
    reorder them, check *Only apply to unread messages* to skip read mail,
    set optional minimum or maximum message age limits, select the accounts or
-  folders a rule should apply to, uncheck *Enabled* to temporarily disable a rule, and
+ folders a rule should apply to, uncheck *Enabled* to temporarily disable a rule, and
   check *Stop after match* to halt further processing. Forward and reply actions
    open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
    configured rules.
+4. If the toolbar icon shows a red X, click the notification's **Dismiss** button to clear the error.
 
 ### Example Filters
 
diff --git a/background.js b/background.js
index b0db614..06683e2 100644
--- a/background.js
+++ b/background.js
@@ -30,6 +30,8 @@ let TurndownService = null;
 let userTheme = 'auto';
 let currentTheme = 'light';
 let detectSystemTheme;
+let errorPending = false;
+const ERROR_NOTIFICATION_ID = 'sortana-error';
 
 function normalizeRules(rules) {
     return Array.isArray(rules) ? rules.map(r => {
@@ -68,7 +70,8 @@ const ICONS = {
     logo: () => 'resources/img/logo.png',
     circledots: () => iconPaths('circledots'),
     circle: () => iconPaths('circle'),
-    average: () => iconPaths('average')
+    average: () => iconPaths('average'),
+    error: () => iconPaths('x')
 };
 
 function setIcon(path) {
@@ -82,19 +85,31 @@ function setIcon(path) {
 
 function updateActionIcon() {
     let path = ICONS.logo();
-    if (processing || queuedCount > 0) {
+    if (errorPending) {
+        path = ICONS.error();
+    } else if (processing || queuedCount > 0) {
         path = ICONS.circledots();
     }
     setIcon(path);
 }
 
 function showTransientIcon(factory, delay = 1500) {
+    if (errorPending) {
+        return;
+    }
     clearTimeout(iconTimer);
     const path = typeof factory === 'function' ? factory() : factory;
     setIcon(path);
     iconTimer = setTimeout(updateActionIcon, delay);
 }
 
+async function clearError() {
+    errorPending = false;
+    await storage.local.set({ errorPending: false });
+    await browser.notifications.clear(ERROR_NOTIFICATION_ID);
+    updateActionIcon();
+}
+
 function refreshMenuIcons() {
     browser.menus.update('apply-ai-rules-list', { icons: iconPaths('eye') });
     browser.menus.update('apply-ai-rules-display', { icons: iconPaths('eye') });
@@ -307,9 +322,17 @@ async function processMessage(id) {
         const elapsed = Date.now() - currentStart;
         currentStart = 0;
         updateTimingStats(elapsed);
-        await storage.local.set({ classifyStats: timingStats });
+        await storage.local.set({ classifyStats: timingStats, errorPending: true });
+        errorPending = true;
         logger.aiLog("failed to apply AI rules", { level: 'error' }, e);
-        showTransientIcon(ICONS.average);
+        setIcon(ICONS.error());
+        browser.notifications.create(ERROR_NOTIFICATION_ID, {
+            type: 'basic',
+            iconUrl: browser.runtime.getURL('resources/img/logo.png'),
+            title: 'Sortana Error',
+            message: 'Failed to apply AI rules',
+            buttons: [{ title: 'Dismiss' }]
+        });
     }
 }
 async function applyAiRules(idsInput) {
@@ -368,7 +391,7 @@ async function clearCacheForMessages(idsInput) {
     }
 
     try {
-        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "aiRules", "theme"]);
+        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "aiRules", "theme", "errorPending"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -378,6 +401,7 @@ async function clearCacheForMessages(idsInput) {
         stripUrlParams = store.stripUrlParams === true;
         altTextImages = store.altTextImages === true;
         collapseWhitespace = store.collapseWhitespace === true;
+        errorPending = store.errorPending === true;
         const savedStats = await storage.local.get('classifyStats');
         if (savedStats.classifyStats && typeof savedStats.classifyStats === 'object') {
             Object.assign(timingStats, savedStats.classifyStats);
@@ -409,6 +433,10 @@ async function clearCacheForMessages(idsInput) {
                 collapseWhitespace = changes.collapseWhitespace.newValue === true;
                 logger.aiLog("collapseWhitespace updated from storage change", { debug: true }, collapseWhitespace);
             }
+            if (changes.errorPending) {
+                errorPending = changes.errorPending.newValue === true;
+                updateActionIcon();
+            }
             if (changes.theme) {
                 userTheme = changes.theme.newValue || 'auto';
                 currentTheme = userTheme === 'auto' ? await detectSystemTheme() : userTheme;
@@ -634,6 +662,18 @@ async function clearCacheForMessages(idsInput) {
         logger.aiLog("Unhandled promise rejection", { level: 'error' }, ev.reason);
     });
 
+    browser.notifications.onClicked.addListener(id => {
+        if (id === ERROR_NOTIFICATION_ID) {
+            clearError();
+        }
+    });
+
+    browser.notifications.onButtonClicked.addListener((id) => {
+        if (id === ERROR_NOTIFICATION_ID) {
+            clearError();
+        }
+    });
+
     browser.runtime.onInstalled.addListener(async ({ reason }) => {
         if (reason === "install") {
             await browser.runtime.openOptionsPage();

From 8bfd00dc493fe371ae0ac09527bef7b38ee4f0c8 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 23:44:43 -0500
Subject: [PATCH 21/50] Added svg

---
 resources/svg/circleslash.svg | 3 +++
 resources/svg/plus.svg        | 3 +++
 2 files changed, 6 insertions(+)
 create mode 100644 resources/svg/circleslash.svg
 create mode 100644 resources/svg/plus.svg

diff --git a/resources/svg/circleslash.svg b/resources/svg/circleslash.svg
new file mode 100644
index 0000000..861352d
--- /dev/null
+++ b/resources/svg/circleslash.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" data-attribution="cc0-icons" viewBox="0 0 24 24">
+  <path d="M12 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10Zm-7-3L19 5"/>
+</svg>
diff --git a/resources/svg/plus.svg b/resources/svg/plus.svg
new file mode 100644
index 0000000..e665b91
--- /dev/null
+++ b/resources/svg/plus.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" data-attribution="cc0-icons" viewBox="0 0 24 24">
+  <path d="M21 12H3m9-9v18"/>
+</svg>

From 0cddb5b204a1ac23d614835b5d2481c40dff4206 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Tue, 15 Jul 2025 23:50:49 -0500
Subject: [PATCH 22/50] Use SVG icons for rule controls and remove extra PNGs

---
 README.md                     |  3 +-
 options/options.js            | 71 +++++++++++++++++++++++++++--------
 resources/svg/circleslash.svg |  4 ++
 3 files changed, 62 insertions(+), 16 deletions(-)
 create mode 100644 resources/svg/circleslash.svg

diff --git a/README.md b/README.md
index 9c75c61..7637f85 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,8 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
    deleting or archiving a message when it matches. Drag rules to
    reorder them, check *Only apply to unread messages* to skip read mail,
    set optional minimum or maximum message age limits, select the accounts or
- folders a rule should apply to, uncheck *Enabled* to temporarily disable a rule, and
+ folders a rule should apply to. Use the
+  slashed-circle/check button to disable or re-enable a rule, and
   check *Stop after match* to halt further processing. Forward and reply actions
    open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
diff --git a/options/options.js b/options/options.js
index 3d02639..68b58da 100644
--- a/options/options.js
+++ b/options/options.js
@@ -315,26 +315,67 @@ document.addEventListener('DOMContentLoaded', async () => {
 
             const header = document.createElement('div');
             header.className = 'message-header';
-            header.appendChild(critInput);
+
+            const leftWrap = document.createElement('div');
+            leftWrap.style.display = 'flex';
+            leftWrap.style.alignItems = 'center';
+            leftWrap.style.flexGrow = '1';
+
+            const statusSpan = document.createElement('span');
+            statusSpan.className = 'rule-status has-text-weight-semibold mr-2';
+
+            leftWrap.appendChild(statusSpan);
+            leftWrap.appendChild(critInput);
+            header.appendChild(leftWrap);
+
+            const btnWrap = document.createElement('div');
+            btnWrap.style.display = 'flex';
+            btnWrap.style.gap = '0.25em';
+
+            let enabled = rule.enabled !== false;
+
+            const toggleBtn = document.createElement('button');
+            toggleBtn.type = 'button';
+            toggleBtn.className = 'button is-small rule-toggle';
+            const toggleIcon = document.createElement('img');
+            toggleIcon.width = 16;
+            toggleIcon.height = 16;
+            toggleBtn.appendChild(toggleIcon);
 
             const delBtn = document.createElement('button');
-            delBtn.className = 'delete';
-            delBtn.setAttribute('aria-label', 'delete');
+            delBtn.type = 'button';
+            delBtn.className = 'button is-small is-danger is-light rule-delete';
+            const delIcon = document.createElement('img');
+            delIcon.src = browser.runtime.getURL('resources/svg/trash.svg');
+            delIcon.width = 16;
+            delIcon.height = 16;
+            delBtn.appendChild(delIcon);
+
+            function updateToggle() {
+                toggleIcon.src = browser.runtime.getURL(
+                    `resources/svg/${enabled ? 'circleslash' : 'check'}.svg`
+                );
+                statusSpan.textContent = enabled ? '' : '(Disabled)';
+                article.dataset.enabled = String(enabled);
+            }
+
+            toggleBtn.addEventListener('click', () => {
+                enabled = !enabled;
+                markDirty();
+                updateToggle();
+            });
+
             delBtn.addEventListener('click', () => {
                 article.remove();
                 ruleCountEl.textContent = rulesContainer.querySelectorAll('.rule').length;
+                markDirty();
             });
-            header.appendChild(delBtn);
 
-            const enabledLabel = document.createElement('label');
-            enabledLabel.className = 'checkbox ml-2';
-            const enabledCheck = document.createElement('input');
-            enabledCheck.type = 'checkbox';
-            enabledCheck.className = 'rule-enabled';
-            enabledCheck.checked = rule.enabled !== false;
-            enabledLabel.appendChild(enabledCheck);
-            enabledLabel.append(' Enabled');
-            header.appendChild(enabledLabel);
+            btnWrap.appendChild(toggleBtn);
+            btnWrap.appendChild(delBtn);
+            header.appendChild(btnWrap);
+
+            updateToggle();
 
             const actionsContainer = document.createElement('div');
             actionsContainer.className = 'rule-actions mb-2';
@@ -479,7 +520,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            const enabled = ruleEl.querySelector('.rule-enabled')?.checked !== false;
+            const enabled = ruleEl.dataset.enabled !== 'false';
             const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
             const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
@@ -657,7 +698,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            const enabled = ruleEl.querySelector('.rule-enabled')?.checked !== false;
+            const enabled = ruleEl.dataset.enabled !== 'false';
             const minAgeDays = parseFloat(ruleEl.querySelector('.min-age')?.value);
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
             const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
diff --git a/resources/svg/circleslash.svg b/resources/svg/circleslash.svg
new file mode 100644
index 0000000..3f16f96
--- /dev/null
+++ b/resources/svg/circleslash.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" data-attribution="cc0-icons" viewBox="0 0 24 24">
+  <path d="M12 21c4.97 0 9-4.03 9-9S16.97 3 12 3 3 7.03 3 12s4.03 9 9 9Z"/>
+  <path d="M5.5 5.5 18.5 18.5"/>
+</svg>

From f156a653ef50e6842b9e4327f9d66c4e6cc155ac Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 00:04:11 -0500
Subject: [PATCH 23/50] Fix rule toggle button style

---
 options/options.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/options.js b/options/options.js
index 68b58da..336c30a 100644
--- a/options/options.js
+++ b/options/options.js
@@ -336,7 +336,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 
             const toggleBtn = document.createElement('button');
             toggleBtn.type = 'button';
-            toggleBtn.className = 'button is-small rule-toggle';
+            toggleBtn.className = 'button is-small is-light rule-toggle';
             const toggleIcon = document.createElement('img');
             toggleIcon.width = 16;
             toggleIcon.height = 16;

From a56b79dceaa3a3ab17a82a4e1c2cd21483221420 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 00:17:53 -0500
Subject: [PATCH 24/50] Add condition toggle buttons to rule editor

---
 options/options.js | 61 ++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 56 insertions(+), 5 deletions(-)

diff --git a/options/options.js b/options/options.js
index 336c30a..3c2df3e 100644
--- a/options/options.js
+++ b/options/options.js
@@ -282,6 +282,30 @@ document.addEventListener('DOMContentLoaded', async () => {
         return row;
     }
 
+    function createConditionButton(label, sectionEl, checkbox) {
+        const btn = document.createElement('button');
+        btn.type = 'button';
+        btn.className = 'button is-small is-light';
+        btn.textContent = label;
+
+        let active = checkbox ? checkbox.checked : sectionEl && !sectionEl.classList.contains('is-hidden');
+
+        function update() {
+            btn.classList.toggle('is-info', active);
+            if (sectionEl) sectionEl.classList.toggle('is-hidden', !active);
+            if (checkbox) checkbox.checked = active;
+        }
+
+        btn.addEventListener('click', () => {
+            active = !active;
+            markDirty();
+            update();
+        });
+
+        update();
+        return btn;
+    }
+
     function renderRules(rules = []) {
         ruleCountEl.textContent = rules.length;
         rulesContainer.innerHTML = '';
@@ -391,7 +415,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             addAction.addEventListener('click', () => actionsContainer.appendChild(createActionRow()));
 
            const stopLabel = document.createElement('label');
-           stopLabel.className = 'checkbox mt-2';
+           stopLabel.className = 'checkbox mt-2 is-hidden';
            const stopCheck = document.createElement('input');
            stopCheck.type = 'checkbox';
            stopCheck.className = 'stop-processing';
@@ -400,7 +424,7 @@ document.addEventListener('DOMContentLoaded', async () => {
            stopLabel.append(' Stop after match');
 
             const unreadLabel = document.createElement('label');
-            unreadLabel.className = 'checkbox mt-2 ml-4';
+            unreadLabel.className = 'checkbox mt-2 ml-4 is-hidden';
             const unreadCheck = document.createElement('input');
             unreadCheck.type = 'checkbox';
             unreadCheck.className = 'unread-only';
@@ -409,7 +433,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             unreadLabel.append(' Only apply to unread messages');
 
             const ageBox = document.createElement('div');
-            ageBox.className = 'field is-grouped mt-2';
+            ageBox.className = 'field is-grouped mt-2 is-hidden';
             const minInput = document.createElement('input');
             minInput.type = 'number';
             minInput.placeholder = 'Min days';
@@ -426,7 +450,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             ageBox.appendChild(maxInput);
 
             const acctBox = document.createElement('div');
-            acctBox.className = 'field mt-2';
+            acctBox.className = 'field mt-2 is-hidden';
             const acctLabel = document.createElement('label');
             acctLabel.className = 'label';
             acctLabel.textContent = 'Accounts';
@@ -450,7 +474,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             acctBox.appendChild(acctControl);
 
             const folderBox = document.createElement('div');
-            folderBox.className = 'field mt-2';
+            folderBox.className = 'field mt-2 is-hidden';
             const folderLabel = document.createElement('label');
             folderLabel.className = 'label';
             folderLabel.textContent = 'Folders';
@@ -473,10 +497,37 @@ document.addEventListener('DOMContentLoaded', async () => {
             folderBox.appendChild(folderLabel);
             folderBox.appendChild(folderControl);
 
+            if (typeof rule.minAgeDays === 'number' || typeof rule.maxAgeDays === 'number') {
+                ageBox.classList.remove('is-hidden');
+            }
+            if ((rule.accounts || []).length) {
+                acctBox.classList.remove('is-hidden');
+            }
+            if ((rule.folders || []).length) {
+                folderBox.classList.remove('is-hidden');
+            }
+
+            const condButtons = document.createElement('div');
+            condButtons.className = 'field is-grouped is-grouped-multiline mb-2';
+
+            function addCond(btn) {
+                const p = document.createElement('p');
+                p.className = 'control';
+                p.appendChild(btn);
+                condButtons.appendChild(p);
+            }
+
+            addCond(createConditionButton('Stop', null, stopCheck));
+            addCond(createConditionButton('Unread', null, unreadCheck));
+            addCond(createConditionButton('Age', ageBox));
+            addCond(createConditionButton('Accounts', acctBox));
+            addCond(createConditionButton('Folders', folderBox));
+
             const body = document.createElement('div');
             body.className = 'message-body';
             body.appendChild(actionsContainer);
             body.appendChild(addAction);
+            body.appendChild(condButtons);
             body.appendChild(stopLabel);
             body.appendChild(unreadLabel);
             body.appendChild(ageBox);

From 57860499504344f0bbb9b0abc2b27c1a04848957 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 00:32:25 -0500
Subject: [PATCH 25/50] Updated icons

---
 resources/img/circleslash-dark-16.png  | Bin 0 -> 392 bytes
 resources/img/circleslash-dark-32.png  | Bin 0 -> 768 bytes
 resources/img/circleslash-dark-64.png  | Bin 0 -> 1620 bytes
 resources/img/circleslash-light-16.png | Bin 0 -> 393 bytes
 resources/img/circleslash-light-32.png | Bin 0 -> 764 bytes
 resources/img/circleslash-light-64.png | Bin 0 -> 1572 bytes
 resources/img/plus-dark-16.png         | Bin 0 -> 199 bytes
 resources/img/plus-dark-32.png         | Bin 0 -> 301 bytes
 resources/img/plus-dark-64.png         | Bin 0 -> 431 bytes
 resources/img/plus-light-16.png        | Bin 0 -> 215 bytes
 resources/img/plus-light-32.png        | Bin 0 -> 305 bytes
 resources/img/plus-light-64.png        | Bin 0 -> 457 bytes
 resources/svg/circledot.svg            |   4 ++++
 13 files changed, 4 insertions(+)
 create mode 100644 resources/img/circleslash-dark-16.png
 create mode 100644 resources/img/circleslash-dark-32.png
 create mode 100644 resources/img/circleslash-dark-64.png
 create mode 100644 resources/img/circleslash-light-16.png
 create mode 100644 resources/img/circleslash-light-32.png
 create mode 100644 resources/img/circleslash-light-64.png
 create mode 100644 resources/img/plus-dark-16.png
 create mode 100644 resources/img/plus-dark-32.png
 create mode 100644 resources/img/plus-dark-64.png
 create mode 100644 resources/img/plus-light-16.png
 create mode 100644 resources/img/plus-light-32.png
 create mode 100644 resources/img/plus-light-64.png
 create mode 100644 resources/svg/circledot.svg

diff --git a/resources/img/circleslash-dark-16.png b/resources/img/circleslash-dark-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..a7057deb4d2f26e80f2726ca830bb866b0621565
GIT binary patch
literal 392
zcmV;30eAk1P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10ToF^
zK~y-6jng|$!%z?f&~XV1AW-t(0fKe#EfCvC$7eMVU?q^$P$1DF(EuGOawt58C(B6~
zX{2Y*-0M4Ut}Dcp=taa@o?j#4t+NYdRyf8;9p9NS#8LMAVoLBL?(l(gY!tOkT;LP8
zSZEVexW^M#TdK<Jr<&VFNmDq<FV6y>Vw@yjI4lW9DSICHG@mc=*buB>(wcb|xVe)F
zdV#&X>8b;KoVBx#ZGB@museld8n_`CV<)iOF+!K@GPe@5)Vvtxp8o?5T;ZYI!jak}
z{eOVhbB+5YL4|=j`g6d~xYjaKsO>pOC6_s8Q`=72U%1g><x<I^+9VTyKhq><K4@>N
mmeCzc5wV`<mxy@pYWe~6u;zyyl`>@j0000<MNUMnLSTX$hokiX

literal 0
HcmV?d00001

diff --git a/resources/img/circleslash-dark-32.png b/resources/img/circleslash-dark-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d34f0129926b8dffacb61ac614e6c2dd35e3512
GIT binary patch
literal 768
zcmV+b1ONPqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000xO
z000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10*y&T
zK~z|U#h2esQ$Y~MzZPsF(L{knC0-bj@C05VMz7Sw_zsG4qg2#q(8M>v2QVT*%Acsn
z8{my5AVQ*Eh<afOKQDHdPM6cup3^o?GTCN#X1;Id>~v=ffc~fS=I|MmbWzeNNoW1s
zrlcK7Ym&ZaiUzczeLxvl0`_Pudq4%4@;*&tH#6u3CV?*v0Jps+$tG|Y=*df<ADEAV
zE&>mM5#WfiE%~`=T$Zf722N%rZ~^#eg1iGRrR^lrap1l2Uk8R;CD3oc_km|XF#~we
zA}|w?IFyN`ZywUV4@~3$wprMvUgn6-MC>$ajGuN0d>43O;?`{{F12vl-;yuwN#Nr?
z)~cV|#FVIYEE|?t4qP+vuy)zRe~?5Vl+R)pz=JOP^-4@&0I2%Kat`n@;HUTh4P0$t
z_sHAq0fUyn4U?XcF6=z$sKL1gsOYbRAwTX*`kdh^8I$x<(lJSYB;As<l4Ac!Qn-GH
zBpnbq<Hv83su{pvNjmPqZ%V2(@%ig94iN~f3S9&b5-_j?zWQ-cQmKpJB}oJR_m(BF
zW!Rld2{0~c)`S0&bUg#OB%N0+18&m^WjNhtsio-??_c$pb$>*QesQVIQcKenA7dfR
z*~KYSqZXi3;8#ri`$+`)a2Ex*W}?_Z@E%~z$JqdmCJ_*>hYK>(A#efDP24+nEs5zI
z_0lf*Jriq|CJl*jZPR*`iM%bD-T69jBDQPfJRFf&#ogyw4%~+byyd3UW+MI^%eX6b
z6xWIe+mfGqOs&*{%qH!;6$0T*Oi-(iSa!T7$p&znHXbHc`*3a40_jh)D)0tZ=Le;h
yrUl6SIv$XFoSs(w<8)i@arz@musj4hD*pgE9+=@hjn3Tw0000<MNUMnLSTabDq0Bu

literal 0
HcmV?d00001

diff --git a/resources/img/circleslash-dark-64.png b/resources/img/circleslash-dark-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc2721212e01affc3abd34ae151af053c97f2a3a
GIT binary patch
literal 1620
zcmV-a2CMmrP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm001Xm
z001Xm0nfo$jsO4v8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11>s3V
zK~#90<(tcoR7DiVf8z`cQ3e@CGYINJ5s*j_1ZRu}<RMXmTSXH#nqXw%pCCeXXC#2S
z)}R3s6j>o45Z#FQnjtP=fJig~0Tl$4M|aQXqIyD2b=B?L_tCeFUs8*zTXpKZs_v~*
z=e9}W|BRc8W}s*kt$^{sEk!cW(S$iB0SkeCU<NP~m<&vG`dt9d07rnMz(L?E;Lkjn
zYs+a5m;$^2tOVwg+|!1EAAqgZayk?4Y)Hzo^h??)sjTc#mb61sUzR*)MQE<1eK`mn
z!d^*pvfw@K5|{wI0jvSqV~!~Uzhc(*rD|Ij&;#5_{C%kmybHVrT#PxU25A&9ANUx!
zr%t~!z#d>fa0oa7To3de3rqw0fW^RaptlbF6Tox8_p!Kkk<fKsk#sG>MJtlFOL|&T
zdkPorsM6S8r5VCiNiQdvqtO9vlHQD9WLVM%lBTB+I#gyz+ESe(g!OqUpiR<y5t9!{
zdL#$I-SViU!3aJ!=cRy<<%cD0kTkXl!jF_rNt+^+ur6x_tO-nXRnoIf6x=R7l75a*
z!s@IPut5F|@1mq71qwe9A-rUaGcT<ICP+FFAl}NtkKmZ3t~3hR=pj0+V%<I@{K-K3
z+esBLTT;nGa6>`DcT4&%Amo6g+a$f?c~+A2U=js<;UV^;n!DS_vHU>wIWljD!=667
z8&yD`he$=udCw=YyxspX`9GGtyoV<J%tPS)0)&ridAEGz>Axec0(w=u_RGrW^EOM%
z+hwL|&kiL?lij|)NX;s0kEA<*p+u*xWat4701tVd4FXGn-y_B!0d_iV9l-N7Jw4j<
zY5l1tT0W`UyJdxE{6V*$J7|)}bxzA1OaDv4BWaAJvkr~2q=|MvcL_XBZ2)r*Ci;>$
zx`Exm9M7{sU>Wd71N2J3UZ<@cSY$W2!uELx9cW<Eq)5BwL)h<W>$fYe0%mvy97-^8
zBj^G45w`qN8ne8OZ#-?IWUQxvGH^WM<Z+O-+q)P7Do)#UyW%Qfic|lEZ~!wc@^X6{
z*D(=j8&mCyt$;SnU7d~dDH#YMZ_C@b;MBY9imiZ~sr87<88Km_8?!ryEWeEOmbc;F
z8MI?$1)6_5+-%|N!dAdPn9E2T?vhA@qJ*E|)GHWSfzb*OwJzVC5fjbW@Ir8};V;=0
zcL|(w>UU$VtJ0vE8=i|!;4Y`_H@o60;D}T20Pan}K#`UQxR2UP+fk=lR{=*oM0}se
zaggU1UR?NiA7x}$0lrVi#R(=Z((P?5@w6QrRdbGz-Jav{nFf!;SsrQAl+bbb)~Ms~
zc}z}@jb6+>eH^rc+mGN$;C83&Ti`Fd!S^Aw&C~W`j0sywc<}RFE1So4d_mEQq*)Q}
zmL`CiN4Z}ygQ6h<zOeX~K;Kqb^LE+l;pG!w-w=U^Jp_g&Epqy`n&naWVq`%h3P2_m
z&BdV1^;4@_ew?JAJpAkmjfo;QThet8v5jg?%OigZPe~Cuh4lz-2ncyHLii#qkEB%r
zp5BTYSC43yq~ig?tt9+%`LkG#N*bR=0m!78Ty1gTFMD{pqKLeJMihWd!chn(3lx5p
z!U>x%#i7y2Wa}f8uvs_W4$Uaz6rHoUHZHA3C*B+}>0z07aNfc%l>b#Xf=!LkOTxgq
zh{=Z~eJFE3pS9q#WWMmCQf1dRN;fGps};R5R%AXsS18@h@)$|aNcvRK$<kL8bIrRY
zO}hL%OuGEEI{nUJZkP{X0xrjZYk|I<m@rl!CYbRAwMSYPLzr~=fmmESNc+P?7w|gp
zD)E1Gs9*w<=eQAt9*+@pD)E23C;^+Q^C!Q+N#UM$nJww_2p7#7yCgl31@BpJR10L*
zt1rPaElM)`%KR*O&g-|iUQ9yLO3be{aoyTQ1rx^FhWTyoY$n`U$V&k>CSuZ3`Z0I&
zGl4s*?QPXQ!rbDX!i46BfUkisabkE`qZtZ_!pLv4e;36-(F!OWMgKfqIQ|8rXRcaJ
SCJyfa0000<MNUMnLSTaSzW2%i

literal 0
HcmV?d00001

diff --git a/resources/img/circleslash-light-16.png b/resources/img/circleslash-light-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..51c8c3fb7d90606f49817b37e3db270cecd287a7
GIT binary patch
literal 393
zcmV;40e1e0P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10TxL_
zK~y-6jng|$13?f3&^MtufDIu(a{~nD0Bi!pHJtG|4d0Vs6GMPRibR5);lM-Ei^l84
zc%@lsrn{<Zx_VO1S<{zN>R>Cj?>Xm>#>AZS??OT!&&c?Wl`%pOX%16>*YJQZTwte&
z?cx$++@m!|5S1VCg3Yo*P2nKa+*eAfz-d%o20p_yNG3Qb37&DW0{ATUR~S|XY+zR2
zc^SCq$qXGhj83Npa6e+_4Q_qoK>QX6{sI>SQ|!Zf{R&O8YXsfEw5x*=E>{6Z&NZG&
z7kV)ygB8HrVdGJKknUng2LFIxaWgka5o`s?IDGCFvAvKz!R^8**SdRxVKk|FOfx*;
nxb9Y3@|@ct8QyZvpG|o`f`EVKz>1ZM00000NkvXXu0mjfAl#rS

literal 0
HcmV?d00001

diff --git a/resources/img/circleslash-light-32.png b/resources/img/circleslash-light-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..a5cddafe898238f4751f222f4e8f2f968090df48
GIT binary patch
literal 764
zcmV<Y0t5YtP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000xO
z000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10*OgP
zK~z|U#h2esQ$Y~Me_ODLO-#f#@lU)kBH;<V!V<hv6JG+0+yE8z88q=t@CihMv|vEw
z4e%C3NYD#WFDyD<oT;5|&)<3)H`$z=voqiK&Fs#eT_+;^&o-RZ!8um}ZUPs9tNM8#
zI0AM=<Z~uK5lQSo38(|>z$qXR{S;^b3qUCqb^`G*FbjN)AUxC_HntDU07HEV04@Nl
z9%vJI1dIV^jBQcBEozpm&ud^LlK|ib@WFs=0k_hmRQ;>KJLA6#jHVKxk+;cz1J8j%
zT5^L^0G2!vJ(&ob^HoD$%S!BJ;l!Jc6@N|mPP4}NSx)39z)OQ$3l*TH)?V$K{iHpD
zysFc&ZK|UbCZKLqre1JK<YsKr;LnE%XqQhjZ*pU^q2rA%0YDjO>0rGN@(JLp`hN#*
zN7y~4vtw4QfO{rAV|hnzY{w1H9V?)wAAezXxV$1a_C+mk0j5QS0ztd1&tnm3k)k>0
zCV*GKIp7CyUql*lJ|glHIM&xIz+VCFLxCF<xplXkZ2_P3S#i!42Su*fWqm!c0uGG2
zYcT*-U|Gq(0e3S*4se}L27;hN%5X7{1s8$wRQ+2(+24qoI=KEXrIsMztzxW&?Su<-
zYP324@+pHq7bc)Y@S_ld!$cuR@*!YHarS_-Jp$Bl#;9D%gIsZ67~BV4V<AdcjBy_1
z4-M8baR(B07$G=5*-Z3%B(st40_S_|BAiD(5!=9I#s&A@BTsiI^)lg4#|FVKbsQ)f
z+oFDZVoJ@Xy(jWS0cK6qOm+DENPF1W9x(0Cc_slyNC}t+)`-8FwSYIkoGrDu?vx;P
ubIz3sE~l61zMLKsTu#4a!pkZk@Ad~<!b4l&Eyh{^0000<MNUMnLSTYBQ$%I}

literal 0
HcmV?d00001

diff --git a/resources/img/circleslash-light-64.png b/resources/img/circleslash-light-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3482952a56731d5b8f4ce28d3b584d3f0b3e001
GIT binary patch
literal 1572
zcmV+<2HW|GP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm001Xm
z001Xm0nfo$jsO4v8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H11+hs)
zK~#90<(pk>6-5-se`9M)u&piCfFEy0C`}urw6;b93dBSruSQLbQIZ;cFfs92f#{pD
zfvV3cl9C9bPly$bzED4+Eg_MjgeFEys`4$Mx3}ZN%!TdTvwP?6-MxDoPBIU(JA3AT
z{%7XQ?0hJ#H8--{lr?~?B~t>FQcX&!TQbFvb{9}eEdka61HcNP16T&MIz`U`r-9?Z
zBrpbiqqRPhD!w!bP)gkiJOw-ftR{X-n*)9XMt~8m^>i`_1ERG~EMdI-DKHD@gwrf=
z0O(H?b3%r%1`elSbXXb%RwaSGqAsA6Y5`scUIgkqKbr-91I_>!?XzZ}9k?5)FGJ5e
zz^hv83%;0(qyn$^0w*c$t!dzW;2B^g&=8@s0q6vt1wOz8#Zvlz1=dux3ji+w|3-ky
z1N(r@KwSkS*IOO?tj@6dt^&`eP5_{QHzI({S#K{-qJKJduK;%2I>PGTks1Nk_;({J
z9|s;t+He8KgTO=tj^VTj2=n|LFcj6dQy`%c*cCy-_CyK5MES73_jt7ocQCaBry@ug
zOoRZSFC^ey05)W3{CI@%1?TisL;%o&Jk(vSapMc=7ofQk0(OS<`7E1#nDJ8~&)<qg
z0MHHO1cgHx8Q%u{5Mtywa2xQp@Gb}37l(i^1Z6)_#c1#8`Ej7#mTLr#3S|zJMF7w*
zD9KZWaXyaco$_muCrcvsuu4A>6ueifo)^B`Ba}bjMF6l===-yzFuhIE^Uk*&6#qNq
zfMq@eydqTi(L(UNqvK=Y+n0R^kXV0oAsKJ=JSKcU7D)iGL})tGK>b28-s-v;m=U^i
zYp|TVSosje3z(m4t!GJDlu~WLAz+p8dIH#_wf@^zpVm5uSvm_!9k4$5z%{mC(DjvX
zrEx_m)o$xqBfOpfHfpW^ilO>T;n_ei;}Wn!_~5%36?=;{{xIR5-&l_49r;#xHs404
z-~3GR(2?5Aj|zr5PyG!PFVP>13WDdI!Y3C(z$;PDDM$BNF$gN96wu@}m$N?YtXxSt
z;FXYbPQE#q3C4iM6vu>134ypK*7#Av1Ky^X0WVD4J%c)>)Z#*>s=LD(7++F?1YE}a
zMFqv}60s#i<6E43UTb~1khw;HHW9;Z@@+{VNO7F^5qBH@;=Eki!yqXSbtUR<q{J}j
z#(?8az8<(ICi7W)9^hVzH*HS@GcEy>f)Z(ZTvAe=;rWV$eV&tD0;H+q!{ydm<#9er
zHVDtg=H-O`>i!O&ri|ZVsx-s%z!CO4eCxb&!iV1rz&9@><1Lmg0)``QIcXxaS9tcE
z@NAycNS_aigt^!@fjMbWG!Jyv;!qcYXC-kLMXds9S$ub`H~Rpl5dq77v22Kf`vnDa
z!1`MDyu}o@G1BKvfK@aqD475nYuNLPfMWulgQ4F<DC-9P6O`?&MbBHz(h;5<5oZcZ
zDI5wha;la*Z?Qfdg6Yl3?@B0b#+<{G6xWjRk0767nFN|*6JVA1U`~Y8vhkM$Ojn3F
z7vN2Rtz<C5_^FJWeb|A`tzJ6HsBA|B3B%aYp-P4?3JG|H^qRM>GAkaAsPrhXwhG3t
zLmui1X;)eLVgT44QTZJ3A<&V6;hmTnUer-pZ_mdjz=9bp5g7Bpe#{ni?44!IFYOl0
zUVqeK=_|f{J`n;exE{<oyi&vCjBOQLfv%`nfmy@rvSs&B{68<HNj#!`SgQ2GL^H4r
zcnSZD4td~r;7_ivLN@`o19#zn@gj#gFT71_9e)ESq5jzoe1_kIDT#Ct=t=~85=sI@
z^kMp|bilIGl*7c8-Xt-nb!~1b@FeEiTrd93+Lb(JiEc0E+T2Vs2(L>uE>5;$j-?C$
z%P~jT?!fHWC|gWpc5(l}1ho^u5#VdB_4!osrA<I&<@VaF*7~2!Fl0$UEyxXjd;EW>
W9v{7)Jvxj40000<MNUMnLSTXyd(zzi

literal 0
HcmV?d00001

diff --git a/resources/img/plus-dark-16.png b/resources/img/plus-dark-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..89cfee99eb430107b80ac07a31b2d19aafe4cc82
GIT binary patch
literal 199
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#X#yh2s3WX6W<OLlq_+L
zC<)F_D=AMbN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PEETD8$pnF~p)b`Op9V_ROjcoeg`m
zMIN*0u<&p+UfO-Kl+n?EhbN)MZLv19(t!z$x>M|WT=RIDnGff!+Q}e3gLCQSLQRPu
o4l)(Y98X(KTX+;ixLFt(1S5r_Qda5p0nKOdboFyt=akR{08x)R?EnA(

literal 0
HcmV?d00001

diff --git a/resources/img/plus-dark-32.png b/resources/img/plus-dark-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..fdb1a30bedc11e42ccd5fecf2b7f7b04d8d3c2b4
GIT binary patch
literal 301
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4`^&rfc{H*UVP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXprT!#E{-7)t#7Aq<T_*^(6+y0
zxA*Q_M~}9DdRZg)oNw2at$KEjGP4|bI?gVAs&R+Ek^AAK{yT-!E#BMCy0voNJ_ZNr
zwus+c_t|!^|7O{vGW*IM2X>i5FP6;Cv18{sz`&F6o1s!Ouko?Z{m=Zr=g&JJp{|#C
zocBY5*4pe>zL%`8I6v6L?wQH4?%+O#zdrld3p}wjSk}$@s&V!Ke|r|T1O^~7m7m<W
ua-&Q1l0D*6wCYZ)JgpXN$XfaQ0Q=TFCCg74zZ`+SVDNPHb6Mw<&;$Skk9T$e

literal 0
HcmV?d00001

diff --git a/resources/img/plus-dark-64.png b/resources/img/plus-dark-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..957956e775c69625911e827c5e7cdb3b20b0120d
GIT binary patch
literal 431
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GUaUjfi{$NBOP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_nkOPZ!6KiaBp*8~PnKU~r8O
zWL0liT(Y?OsHlacv9+*x#&$VYKZofXmN<1~X*0j`e)@memG1cYDejx5UNzwPa%Qe>
z!eoYR4ZhzQuRXf+{lMuTe>msxaB3f5-oS45_`UK5*1C1NNxF@)_4V^UR;G7EFwRTs
zGhP1M*MKpHaW=~a)*PV&VjDaeq7SHH6?n&drSItZ=imBypViK@{3c%$yt6z)G_QU6
z^KaYzKHging=HC(_1kvAZ`A-UhPUPiub;eOU65fAUMjq1FRR}Hcjkr0ml@a}tbJG`
z{<4nW1E*!E&RJ5qALP_BoqLmx))*zTHni55q_Rb@++@jxxV(<hqS(~c%!@@47}yM+
Lu6{1-oD!M<kU^y3

literal 0
HcmV?d00001

diff --git a/resources/img/plus-light-16.png b/resources/img/plus-light-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..dba672156e2cba3af66501392d391b6ca58b48a8
GIT binary patch
literal 215
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#X#yh2s3WX6W<OLlq_+L
zC<)F_D=AMbN@XZ7FW1Y=%Pvk%EJ)SMFG`>N&PEETD8<voF~p)b`Op9V_ROjcoby$b
zl^1J+u$`$6iw;NQrQIis7!4C7Bo6%e|G%Cs!=pW6;`Y`{?Hf<5{rUg@|GZZ_7?!Ij
zKlWi`V`~HQmp=|N{?KUgflc5PcQ%J)gSl7-BZJNji3H)ca223^44$rjF6*2UngCGx
BN(uk~

literal 0
HcmV?d00001

diff --git a/resources/img/plus-light-32.png b/resources/img/plus-light-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..337833b683b4e408bd6aa7eedd525fa92c8ec150
GIT binary patch
literal 305
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?4`^&rfc{H*UVP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IXprU=AE{-7)t#7AW^Bpn}aJj$W
zi;1Uq7T?jA7W}1MAs3c$sz*q%->hkw+Op&3M4h*%;@(a^_Q^fX&GT(nSv;4*%86G*
z7$<}<+g@m|h-O&8`YmybDnr;rW{U=93kOm4hcWgk*W?~Y1m&HdJ(KtRnKK;WMZ7%?
ze=B<&Y`^N}H9lfL$-{k4(T*`TEjGz<6Z@efAHqI4>dz}rD?7>J5psu#y?}wepyAc`
xN$Ynpeb<<$s{3<}-~CNbs_qIU@QU7N=J)pu<jBw3<OK8ygQu&X%Q~loCIAe-aq<8F

literal 0
HcmV?d00001

diff --git a/resources/img/plus-light-64.png b/resources/img/plus-light-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c0d1a8a34335651169b93bcf1fe02ac7ec41c91
GIT binary patch
literal 457
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GUaUjfi{$NBOP*AeO
zHKHUqKdq!Zu_%?Hyu4g5GcUV1Ik6yBFTW^#_B$IX1_s73PZ!6KiaBp*8~Pn~5MjOF
zFJR|r!6o}8aF&dM`r>8FoxUvb>SI#(m^ELi+u`80pbhgnYLz3s!n(?AChcDu(RU`~
z^qCAsDfR`d8MF8coO5Law@;e(^mTTcoB;nLJpsYFOUgaJr)H|ZG&KGmygOj}0jK-w
z>pxXGb_6iK(~DW{_u2UZBUHakgV=&XhNy;P*aT)hW9G3F|M7AE-#v%+@z-Vx1}19P
zX1&?zoc7O3rF7D^NuTD+M0>`*-^s@k5!?7BUViny;@mnmlX^}bJLx$I9P7?so2Qzq
z^~ThSh5bF#Q+9pPmXKwCD;s>%?5^I(?|GKqz<hzpgwKKdf(3)F!()am487O|7~cLa
zd>B=_f+62(uiEFM>(==4eL6Sc$`9}0>n-gH5UpngYnB_iefH6L0*nR*Pgg&ebxsLQ
E09huj2mk;8

literal 0
HcmV?d00001

diff --git a/resources/svg/circledot.svg b/resources/svg/circledot.svg
new file mode 100644
index 0000000..e380e09
--- /dev/null
+++ b/resources/svg/circledot.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.8" data-attribution="cc0-icons" viewBox="0 0 24 24">
+  <path d="M12 22c5.523 0 10-4.477 10-10S17.523 2 12 2 2 6.477 2 12s4.477 10 10 10Z"/>
+  <path d="M12 14a2 2 0 1 0 0-4 2 2 0 0 0 0 4Z"/>
+</svg>

From 20dfba840689221271cd0ac1320a1819479bf926 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 00:40:03 -0500
Subject: [PATCH 26/50] Add active state icons for rule condition buttons

---
 README.md          |  5 +++--
 options/options.js | 10 ++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7637f85..7436436 100644
--- a/README.md
+++ b/README.md
@@ -78,8 +78,9 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
    reorder them, check *Only apply to unread messages* to skip read mail,
    set optional minimum or maximum message age limits, select the accounts or
  folders a rule should apply to. Use the
-  slashed-circle/check button to disable or re-enable a rule, and
-  check *Stop after match* to halt further processing. Forward and reply actions
+ slashed-circle/check button to disable or re-enable a rule. The small
+ circle buttons for optional conditions show a filled dot when active, and
+ check *Stop after match* to halt further processing. Forward and reply actions
    open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
    configured rules.
diff --git a/options/options.js b/options/options.js
index 3c2df3e..1cfd03a 100644
--- a/options/options.js
+++ b/options/options.js
@@ -286,12 +286,18 @@ document.addEventListener('DOMContentLoaded', async () => {
         const btn = document.createElement('button');
         btn.type = 'button';
         btn.className = 'button is-small is-light';
-        btn.textContent = label;
+        const icon = document.createElement('img');
+        icon.width = 16;
+        icon.height = 16;
+        icon.className = 'mr-1';
+        btn.appendChild(icon);
+        btn.append(label);
 
         let active = checkbox ? checkbox.checked : sectionEl && !sectionEl.classList.contains('is-hidden');
 
         function update() {
-            btn.classList.toggle('is-info', active);
+            btn.classList.toggle('is-active', active);
+            icon.src = browser.runtime.getURL(`resources/svg/${active ? 'circledot' : 'circle'}.svg`);
             if (sectionEl) sectionEl.classList.toggle('is-hidden', !active);
             if (checkbox) checkbox.checked = active;
         }

From 1432690fa818bde2ddf0db02cf5daec5bb3d18be Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 00:55:44 -0500
Subject: [PATCH 27/50] Fix rule condition toggles and add divider

---
 options/options.js | 37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/options/options.js b/options/options.js
index 1cfd03a..096f1a8 100644
--- a/options/options.js
+++ b/options/options.js
@@ -282,7 +282,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         return row;
     }
 
-    function createConditionButton(label, sectionEl, checkbox) {
+    function createConditionButton(label, sectionEl, checkbox, clearFn) {
         const btn = document.createElement('button');
         btn.type = 'button';
         btn.className = 'button is-small is-light';
@@ -300,6 +300,9 @@ document.addEventListener('DOMContentLoaded', async () => {
             icon.src = browser.runtime.getURL(`resources/svg/${active ? 'circledot' : 'circle'}.svg`);
             if (sectionEl) sectionEl.classList.toggle('is-hidden', !active);
             if (checkbox) checkbox.checked = active;
+            if (!active && typeof clearFn === 'function') {
+                clearFn();
+            }
         }
 
         btn.addEventListener('click', () => {
@@ -523,16 +526,30 @@ document.addEventListener('DOMContentLoaded', async () => {
                 condButtons.appendChild(p);
             }
 
-            addCond(createConditionButton('Stop', null, stopCheck));
-            addCond(createConditionButton('Unread', null, unreadCheck));
-            addCond(createConditionButton('Age', ageBox));
-            addCond(createConditionButton('Accounts', acctBox));
-            addCond(createConditionButton('Folders', folderBox));
+            addCond(createConditionButton('Stop', null, stopCheck, () => {
+                stopCheck.checked = false;
+            }));
+            addCond(createConditionButton('Unread', null, unreadCheck, () => {
+                unreadCheck.checked = false;
+            }));
+            addCond(createConditionButton('Age', ageBox, null, () => {
+                minInput.value = '';
+                maxInput.value = '';
+            }));
+            addCond(createConditionButton('Accounts', acctBox, null, () => {
+                for (const opt of acctSel.options) opt.selected = false;
+            }));
+            addCond(createConditionButton('Folders', folderBox, null, () => {
+                for (const opt of folderSel.options) opt.selected = false;
+            }));
 
             const body = document.createElement('div');
             body.className = 'message-body';
             body.appendChild(actionsContainer);
             body.appendChild(addAction);
+            const condDivider = document.createElement('hr');
+            condDivider.className = 'mt-3 mb-2';
+            body.appendChild(condDivider);
             body.appendChild(condButtons);
             body.appendChild(stopLabel);
             body.appendChild(unreadLabel);
@@ -582,7 +599,9 @@ document.addEventListener('DOMContentLoaded', async () => {
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
             const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
             const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
-            const rule = { criterion, actions, unreadOnly, stopProcessing, enabled };
+            const rule = { criterion, actions, enabled };
+            if (unreadOnly) rule.unreadOnly = true;
+            if (stopProcessing) rule.stopProcessing = true;
             if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
             if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
             if (accounts.length) rule.accounts = accounts;
@@ -760,7 +779,9 @@ document.addEventListener('DOMContentLoaded', async () => {
             const maxAgeDays = parseFloat(ruleEl.querySelector('.max-age')?.value);
             const accounts = [...(ruleEl.querySelector('.account-select')?.selectedOptions || [])].map(o => o.value);
             const folders = [...(ruleEl.querySelector('.folder-filter-select')?.selectedOptions || [])].map(o => o.value);
-            const rule = { criterion, actions, unreadOnly, stopProcessing, enabled };
+            const rule = { criterion, actions, enabled };
+            if (unreadOnly) rule.unreadOnly = true;
+            if (stopProcessing) rule.stopProcessing = true;
             if (!isNaN(minAgeDays)) rule.minAgeDays = minAgeDays;
             if (!isNaN(maxAgeDays)) rule.maxAgeDays = maxAgeDays;
             if (accounts.length) rule.accounts = accounts;

From 32c8a0f4158261ac0035fd83352f9e2deaae6904 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 02:22:44 -0500
Subject: [PATCH 28/50] Update AGENTS.md

Adding direction to skip running the build scripts.
---
 AGENTS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AGENTS.md b/AGENTS.md
index 9b94461..401f962 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -28,7 +28,7 @@ This file provides guidelines for codex agents contributing to the Sortana proje
 
 ## Testing
 
-There are currently no automated tests for this project. If you add tests in the future, specify the commands to run them here. For now, verification must happen manually in Thunderbird.
+There are currently no automated tests for this project. If you add tests in the future, specify the commands to run them here. For now, verification must happen manually in Thunderbird. Do **not** run the `ps1` build script or the SVG processing script.
 
 ## Documentation
 

From 598e74f8cb342348b1367cdb22d158e49aa606c8 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 19:18:21 -0500
Subject: [PATCH 29/50] Add notifications permission

---
 README.md     |  1 +
 manifest.json | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 7436436..3853127 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,7 @@ Sortana requests the following Thunderbird permissions:
 - `accountsRead` – list accounts and folders for move or copy actions.
 - `menus` – add context menu commands.
 - `tabs` – open new tabs and query the active tab.
+- `notifications` – display error notifications.
 - `compose` – create reply and forward compose windows for matching rules.
 
 ## Thunderbird Add-on Store Disclosures
diff --git a/manifest.json b/manifest.json
index fe019ab..c3b45a7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -32,17 +32,18 @@
     "page": "options/options.html",
     "open_in_tab": true
   },
-  "permissions": [
-    "storage",
-    "messagesRead",
-    "messagesMove",
-    "messagesUpdate",
-    "messagesTagsList",
-    "accountsRead",
-    "menus",
-    "scripting",
-    "tabs",
-    "theme",
-    "compose"
-  ]
+    "permissions": [
+      "storage",
+      "messagesRead",
+      "messagesMove",
+      "messagesUpdate",
+      "messagesTagsList",
+      "accountsRead",
+      "menus",
+      "notifications",
+      "scripting",
+      "tabs",
+      "theme",
+      "compose"
+    ]
 }

From d3b16640b99afcfc6b16027de5448551398ea64d Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 19:43:24 -0500
Subject: [PATCH 30/50] Handle endpoint changes without restart

---
 background.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/background.js b/background.js
index 06683e2..c7579d0 100644
--- a/background.js
+++ b/background.js
@@ -417,6 +417,20 @@ async function clearCacheForMessages(idsInput) {
                 aiRules = normalizeRules(newRules);
                 logger.aiLog("aiRules updated from storage change", { debug: true }, aiRules);
             }
+            if (changes.endpoint || changes.templateName || changes.customTemplate || changes.customSystemPrompt || changes.aiParams || changes.debugLogging) {
+                const config = {};
+                if (changes.endpoint) config.endpoint = changes.endpoint.newValue;
+                if (changes.templateName) config.templateName = changes.templateName.newValue;
+                if (changes.customTemplate) config.customTemplate = changes.customTemplate.newValue;
+                if (changes.customSystemPrompt) config.customSystemPrompt = changes.customSystemPrompt.newValue;
+                if (changes.aiParams) config.aiParams = changes.aiParams.newValue;
+                if (changes.debugLogging) {
+                    config.debugLogging = changes.debugLogging.newValue === true;
+                    logger.setDebug(config.debugLogging);
+                }
+                await AiClassifier.setConfig(config);
+                logger.aiLog("AiClassifier config updated from storage change", { debug: true }, config);
+            }
             if (changes.htmlToMarkdown) {
                 htmlToMarkdown = changes.htmlToMarkdown.newValue === true;
                 logger.aiLog("htmlToMarkdown updated from storage change", { debug: true }, htmlToMarkdown);

From f56057c0428c5f5244b6e1de092d7ae12356f008 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Wed, 16 Jul 2025 20:56:55 -0500
Subject: [PATCH 31/50] updated manifest to new version for bug fixes.

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index c3b45a7..a3c9f7c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Sortana",
-  "version": "2.1.1",
+  "version": "2.1.2",
   "default_locale": "en-US",
   "applications": {
     "gecko": {

From 183ca8f355783f43a21555338cae6144190c871e Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 17:31:03 -0500
Subject: [PATCH 32/50] Add token reduction options and context length cap

---
 _locales/en-US/messages.json |  4 ++-
 background.js                | 64 ++++++++++++++++++++++++++++++------
 options/options.html         | 11 +++++++
 options/options.js           | 12 ++++++-
 4 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index 983bb86..fb439b9 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -18,7 +18,9 @@
   "options.htmlToMarkdown": { "message": "Convert HTML body to Markdown" },
   "options.stripUrlParams": { "message": "Remove URL tracking parameters" },
   "options.altTextImages": { "message": "Replace images with alt text" },
-  "options.collapseWhitespace": { "message": "Collapse long whitespace" }
+  "options.collapseWhitespace": { "message": "Collapse long whitespace" },
+  "options.tokenReduction": { "message": "Aggressive token reduction" },
+  "options.contextLength": { "message": "Context length" }
   ,"action.read": { "message": "read" }
   ,"action.flag": { "message": "flag" }
     ,"action.copy": { "message": "copy" }
diff --git a/background.js b/background.js
index c7579d0..c44bfed 100644
--- a/background.js
+++ b/background.js
@@ -26,6 +26,8 @@ let htmlToMarkdown = false;
 let stripUrlParams = false;
 let altTextImages = false;
 let collapseWhitespace = false;
+let tokenReduction = false;
+let contextLength = 16384;
 let TurndownService = null;
 let userTheme = 'auto';
 let currentTheme = 'light';
@@ -125,12 +127,16 @@ function byteSize(str) {
 }
 
 function replaceInlineBase64(text) {
-    return text.replace(/[A-Za-z0-9+/]{100,}={0,2}/g,
-        m => `[base64: ${byteSize(m)} bytes]`);
+    return text.replace(/(?:data:[^;]+;base64,)?[A-Za-z0-9+/=\r\n]{100,}/g,
+        m => tokenReduction ? '__BASE64__' : `[base64: ${byteSize(m)} bytes]`);
 }
 
 function sanitizeString(text) {
     let t = String(text);
+    if (tokenReduction) {
+        t = t.replace(/<!--.*?-->/gs, '')
+            .replace(/url\([^\)]*\)/gi, 'url(__IMG__)');
+    }
     if (stripUrlParams) {
         t = t.replace(/https?:\/\/[^\s)]+/g, m => {
             const idx = m.indexOf('?');
@@ -138,7 +144,7 @@ function sanitizeString(text) {
         });
     }
     if (collapseWhitespace) {
-        t = t.replace(/[ \t\u00A0]{2,}/g, ' ').replace(/\n{3,}/g, '\n\n');
+        t = t.replace(/[\u200B-\u200D\u2060\s]{2,}/g, ' ').replace(/\n{3,}/g, '\n\n');
     }
     return t;
 }
@@ -157,12 +163,26 @@ function collectText(part, bodyParts, attachments) {
         attachments.push(`${name} (${ct}, ${part.size || byteSize(body)} bytes)`);
     } else if (ct.startsWith("text/html")) {
         const doc = new DOMParser().parseFromString(body, 'text/html');
-        if (altTextImages) {
-            doc.querySelectorAll('img').forEach(img => {
-                const alt = img.getAttribute('alt') || '';
-                img.replaceWith(doc.createTextNode(alt));
+        if (tokenReduction) {
+            doc.querySelectorAll('script,style').forEach(el => el.remove());
+            const walker = doc.createTreeWalker(doc, NodeFilter.SHOW_COMMENT);
+            let node;
+            while ((node = walker.nextNode())) {
+                node.parentNode.removeChild(node);
+            }
+            doc.querySelectorAll('*').forEach(el => {
+                for (const attr of Array.from(el.attributes)) {
+                    if (!['href','src','alt'].includes(attr.name)) {
+                        el.removeAttribute(attr.name);
+                    }
+                }
             });
         }
+        doc.querySelectorAll('img').forEach(img => {
+            const alt = img.getAttribute('alt') || '';
+            const text = altTextImages ? alt : '__IMG__';
+            img.replaceWith(doc.createTextNode(text));
+        });
         if (stripUrlParams) {
             doc.querySelectorAll('[href]').forEach(a => {
                 const href = a.getAttribute('href');
@@ -198,7 +218,15 @@ function buildEmailText(full) {
         .join('\n');
     const attachInfo = `Attachments: ${attachments.length}` +
         (attachments.length ? "\n" + attachments.map(a => ` - ${a}`).join('\n') : "");
-    const combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
+    let combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
+    if (tokenReduction) {
+        const seen = new Set();
+        combined = combined.split('\n').filter(l => {
+            if (seen.has(l)) return false;
+            seen.add(l);
+            return true;
+        }).join('\n');
+    }
     return sanitizeString(combined);
 }
 
@@ -233,7 +261,13 @@ async function processMessage(id) {
     updateActionIcon();
     try {
         const full = await messenger.messages.getFull(id);
-        const text = buildEmailText(full);
+        let text = buildEmailText(full);
+        if (tokenReduction && contextLength > 0) {
+            const limit = Math.floor(contextLength * 0.9);
+            if (text.length > limit) {
+                text = text.slice(0, limit);
+            }
+        }
         let hdr;
         let currentTags = [];
         let alreadyRead = false;
@@ -391,7 +425,7 @@ async function clearCacheForMessages(idsInput) {
     }
 
     try {
-        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "aiRules", "theme", "errorPending"]);
+        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "contextLength", "aiRules", "theme", "errorPending"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -401,6 +435,8 @@ async function clearCacheForMessages(idsInput) {
         stripUrlParams = store.stripUrlParams === true;
         altTextImages = store.altTextImages === true;
         collapseWhitespace = store.collapseWhitespace === true;
+        tokenReduction = store.tokenReduction === true;
+        contextLength = parseInt(store.contextLength) || contextLength;
         errorPending = store.errorPending === true;
         const savedStats = await storage.local.get('classifyStats');
         if (savedStats.classifyStats && typeof savedStats.classifyStats === 'object') {
@@ -447,6 +483,14 @@ async function clearCacheForMessages(idsInput) {
                 collapseWhitespace = changes.collapseWhitespace.newValue === true;
                 logger.aiLog("collapseWhitespace updated from storage change", { debug: true }, collapseWhitespace);
             }
+            if (changes.tokenReduction) {
+                tokenReduction = changes.tokenReduction.newValue === true;
+                logger.aiLog("tokenReduction updated from storage change", { debug: true }, tokenReduction);
+            }
+            if (changes.contextLength) {
+                contextLength = parseInt(changes.contextLength.newValue) || contextLength;
+                logger.aiLog("contextLength updated from storage change", { debug: true }, contextLength);
+            }
             if (changes.errorPending) {
                 errorPending = changes.errorPending.newValue === true;
                 updateActionIcon();
diff --git a/options/options.html b/options/options.html
index 57f407c..108d7f9 100644
--- a/options/options.html
+++ b/options/options.html
@@ -144,6 +144,17 @@
                             <input type="checkbox" id="collapse-whitespace"> Collapse long whitespace
                         </label>
                     </div>
+                    <div class="field">
+                        <label class="checkbox">
+                            <input type="checkbox" id="token-reduction"> Aggressive token reduction
+                        </label>
+                    </div>
+                    <div class="field">
+                        <label class="label" for="context-length">Context length</label>
+                        <div class="control">
+                            <input class="input" type="number" id="context-length">
+                        </div>
+                    </div>
                     <div class="field">
                         <label class="label" for="max_tokens">Max tokens</label>
                         <div class="control">
diff --git a/options/options.js b/options/options.js
index 096f1a8..f5af1b6 100644
--- a/options/options.js
+++ b/options/options.js
@@ -16,6 +16,8 @@ document.addEventListener('DOMContentLoaded', async () => {
         'stripUrlParams',
         'altTextImages',
         'collapseWhitespace',
+        'tokenReduction',
+        'contextLength',
         'aiRules',
         'aiCache',
         'theme'
@@ -115,6 +117,12 @@ document.addEventListener('DOMContentLoaded', async () => {
     const collapseWhitespaceToggle = document.getElementById('collapse-whitespace');
     collapseWhitespaceToggle.checked = defaults.collapseWhitespace === true;
 
+    const tokenReductionToggle = document.getElementById('token-reduction');
+    tokenReductionToggle.checked = defaults.tokenReduction === true;
+
+    const contextLengthInput = document.getElementById('context-length');
+    contextLengthInput.value = defaults.contextLength || 16384;
+
     const aiParams = Object.assign({}, DEFAULT_AI_PARAMS, defaults.aiParams || {});
     for (const [key, val] of Object.entries(aiParams)) {
         const el = document.getElementById(key);
@@ -791,8 +799,10 @@ document.addEventListener('DOMContentLoaded', async () => {
         const stripUrlParams = stripUrlToggle.checked;
         const altTextImages = altTextToggle.checked;
         const collapseWhitespace = collapseWhitespaceToggle.checked;
+        const tokenReduction = tokenReductionToggle.checked;
+        const contextLength = parseInt(contextLengthInput.value) || 0;
         const theme = themeSelect.value;
-        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, aiRules: rules, theme });
+        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, contextLength, aiRules: rules, theme });
         await applyTheme(theme);
         try {
             await AiClassifier.setConfig({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });

From 91b8d1557322d1fee91b92ed9d3fd0a2387a96f7 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 17:33:59 -0500
Subject: [PATCH 33/50] updated icons

---
 resources/img/circledot-dark-16.png  | Bin 0 -> 413 bytes
 resources/img/circledot-dark-32.png  | Bin 0 -> 828 bytes
 resources/img/circledot-dark-64.png  | Bin 0 -> 1753 bytes
 resources/img/circledot-light-16.png | Bin 0 -> 408 bytes
 resources/img/circledot-light-32.png | Bin 0 -> 813 bytes
 resources/img/circledot-light-64.png | Bin 0 -> 1737 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 resources/img/circledot-dark-16.png
 create mode 100644 resources/img/circledot-dark-32.png
 create mode 100644 resources/img/circledot-dark-64.png
 create mode 100644 resources/img/circledot-light-16.png
 create mode 100644 resources/img/circledot-light-32.png
 create mode 100644 resources/img/circledot-light-64.png

diff --git a/resources/img/circledot-dark-16.png b/resources/img/circledot-dark-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..db602abfd60d10c744105a8849186b1ed8d39651
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10V+vE
zK~y-6jgv7>13?T$|D*yAkU+^Ufr<kl0pSjiz-b_y1`;>|1vMlM2tk2Fi$p_Gg=Qbc
zdccf!Lo9u1wD$LWum1!<HPMok+4)V<du0{i5rAW0Oc`GWfDzEMnjelQuK-uTCvXaE
zxLg}J117)_SWX)R;2L-a))Q48nbi!Vl9)KLo9B^zlPS>k4aO$>KXODLxQ`9ifFhY$
zKnHj<>?OIjaasY`k#s9*Ns`~`lcXC-4M_)*wp}hrnn~(364IXy8@a9~NGb%Z){L+Z
zJQ#M9+@^7w@x#dWyy#Cn2k!h9dS;Sr0dj6@JWP!=Fq6z{k^?WmMQS8b+H+t^`Zj0G
zZJF#Ta7l%gy^^k(q~P~46*lt`$zv*IR7X=%Zs%7?A5}%)+lquESY;#500000NkvXX
Hu0mjfLU^6T

literal 0
HcmV?d00001

diff --git a/resources/img/circledot-dark-32.png b/resources/img/circledot-dark-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..d29ac166e645083f94860aed3be1122ef452ae70
GIT binary patch
literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000xO
z000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10?A24
zK~z|U#g{uzltC1R-(7GMDL@3H5<5WcjWJO`I&ZCsCRPU2Ld8pCw6ZW>==>Ghs4Wr&
z1QkU80BE8Kt3skC#!fc-Sj>zZhTZ+XU6=SKC$pLFT;4f*=FCh6(EmhZ4L0qP_Db3+
zX@{T7OIngNE9rYx-hedH1PlQ$fCA-F0LFof-X_s^l0qYJ7WiBy;G&mO$OD5wL#+fh
z1J5F-6Tl^)8`xlUbAIkJE=v|qf!1mXbOH0m$!nme(n=!f1*VPt9MGATKx-8IK9H><
zc#sTm6DS%IYcf&lKM!dy0s}P!j%Co07$vHSSoxe;`K>wx4|3P|UA3rqtA%QRRb$%A
zNfwy#zVnzZYL$iz%W4WPt@IiH7fKNb+h<}Of(M!OF~-AO);Gj9N&Efp$0-_Ui=<&m
zFTLE8)SSZZi649ATKeA%95LzXPFTez-~(&%9%xCh-DUI-*$i~}u_)<N!YZyy>h!t~
zyc8vMNxGI``%zLjemkU<({Q^Vze!q7aB|R(4<()QzcZ3fO6pIr{q19H2?Rn00;^1d
z0}HF0Evr@D4rwI=U;WrFDd(A%!?>h<l1><h$IZ7&$jKGFBz<u-TyY#W#j!J?kXn4f
z#h3@06Kr?KMHn*hR#L%d<fx?i3aj`jX^*5Ek`DN}DM@!E{YuEdF+Ub0y|Wn*t^t8-
zNbA*zrhJUCFlUSBkstfy8b!U)FR3SrwdOF&dxq20_b_SzX1(tPU}N|eE1oe$a=VTM
zhK=9T_FE~Yqh7II7ZSUu5fUyW!d;u@jM2Yd$pTVc$%1r7BxZ2udD`Ipz?&#|>PxB3
z#3-vV30%RQYB{5u^K(~O*=hkJxD&KwoHW%tz{>83vE-!`7H|bu^TWhS6Yd%{M&+m3
zGVmNYkJ)OKBm-5yj@#rOr`xppak?n?IQ>zLvswt$6@LJo{<`ZPn7_sV0000<MNUMn
GLSTYA3UliK

literal 0
HcmV?d00001

diff --git a/resources/img/circledot-dark-64.png b/resources/img/circledot-dark-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..f29bb77e985194dde2afb10a51503b496241e179
GIT binary patch
literal 1753
zcmV;~1}6E5P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm001Xm
z001Xm0nfo$jsO4v8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H124+b_
zK~#90<(plIRaF$nf1{(5=7=AKmRV4yCJv=&Gf`+t35inp;8#r#1x6A<4~1c9N?H$*
zsD02&pcW=rVi0DQ9}#FurK06W_AqIq8D)+iGtS4qhkdV}yYD_{&b?>fdnWqBdN_-H
z*7~n?_SyUFwfCuz#Qz!H(k75L(oR4h;QBNPRF=WV0AK=82aEtl0)v5mR=ab+Y2XNO
z6xaiN1N>D=aup>S18xT90<(cJ6yMW2fFFSM8EN#wE(l3JrB2djNp13vHc6W#)%xV@
z%g`7}UzZ^0Fl>`_w-4?~UxB{BYruS<d(3;<fZs6hc2h=I4GaWsA^y132D}3-0?x<0
zCl5&yFb>!N+}=sM)4-R&c3>}X0=N>=wkI$Qs0AhgQ-DF8*gpZx0=|#M+D4IG=UGWD
z5nZ%h(nd*BC3R2GMJqElHfC&wp;^*1#rP=nh6+i`B8YTIS|e$Af}q1>grs#DA7NNp
z$^=wMdN;!Peo6P0AaGmmmvkV4$LdlgV0nbo_a*f#L-1MYA?Xc;_l70D6EHu-QM06(
zWenVwISL<(=J`s%_z)-OB~4B-_^do6smZ~wS<={~3Fs^7M2PXO5PUERu7`A7QgxC9
ztaKRdP`cedOy)SaO43`!CZI-AtHa=mE)Z;(yzSuID(RkL67ZG7*pDjjXkVyQNjm7@
zy|vH;)H;l`t3303Qh7k`>CwqOY@PnHL$?mtUDWq>dGRf#c3|TrS7X;=Xb^Cc+*MgS
zFbX*4fnYf>5;#n5A*Kx&idmdpg{ueDlfNY0#D6DvFlDvPmaY<*V>fgqV75c|fd^9M
zhKutoTVcNf1Aw#SCgwDz>$G_y)*E;Pco0(n0rSf31hxQ|Jo)JXoC0nP=-PoBFa=lx
zYgC-!7(Lf`9HF0-)adY$MWdv8kN!S#_;@sG7N~V(a)+lU@;a~vQxXruU|=n#%;p2z
z9lE;Ug`I#AjvMxRATk$NP(b^Iz)TN*zjNqvVzkGApD|NN7HycFo3I*Q98>|nV)hCO
z!6{6=F^TV<m@y?-ussZn&R*C(z$V#{kO07RhuzDVO7d+Pc`l<1VhAuTq3<i03bbwa
zDuM~9!0gop@pnQ3023X$1;Bfl1UF#H+Y4jfTPV(1*VVy`U;=uR-y<$~ATZRSvp-V6
zd~Dgc)q{U~&!9UdRv^9I;fk2Lk|UUaOPI~bAnaG77&JI^k2!QRV%}RQ`dZiR1U|Nc
z2@v^RzP|?oyBxaZn1L@l2tJQ{?%(Obzr79L6uc<MG}r^PedQVpqHq$pBcbmq;35S~
zgGa3E$_$AlXa!y@;=UJ1J_X-N{-$lts@6`xQHK%N=W(If04yt@{Ze3~2fr@vIS<)R
zfa}w7k_RFHuK-UFeafQ|cpO;l$>(H;Zcp&S9s~LVf0CP+Gni$oujOzr%yM`l*XH>K
z%%W>6`Co*^B5XN45cub+#<7Il=U75c^|(YWmrQrWvD<Fv`Vjiqp?k{HQz<80obzIf
zTNLd8YJi`7u`4m|0uE7RQS=P(xuxrdyHws)v55TGKEnzg2;CUD*YW;zNSfFM-tEpL
zY-41+t9_KAZ4M&`WVWBu4l+!xlXS?zdrR0oQO0T{U2zy&*#!a(6W0-*Rz;jC?9AW_
zhe63~MW-FCE%hN>-;BDiGo#g#esLIWkvWu*cF<XwBKHA_qmue0NdPj(Oqw0Wo4QC6
zrbxQr;CERO=K=~z05S)TTxgLrH^t!V6@EzS={PnDakezXktD5^)T@kvSIK>RCyT{#
zZ58Txb%fJ{GIMaLgP$PxRF}o7LhKboU`d4Y4oM$M8d-wCM@d?*=%ccW3$<G;nR#*#
zj9Iix`b5$+nFG(o`spFFs{2&Yhovto<~wgolH>AYF_oTSowPfPIWE5gQ*b#Bw1l*+
z!j!RUF~y9B$z9L8a168Wzdsgh3rT;Ns0LoeRCVM2=+KTSRGj5n6}k^5&>_VC@uC%2
zmGNKv22O(R8I&4HUqp0K-`FB)v=8pS2deQh@2l&8Wm2@tj4R`OaxT?xbAvDkl4fIm
zt%=*MZL|aXFqNG3z#m@N1yHI41kn#u0IdUtV>VuH%ILHEfx_(K{*EclAH$qU+(oc}
vSpt+J0a3{QHhVEG0%<28b)^0Cbn5sQ=z)1={^||<00000NkvXXu0mjf@q#fR

literal 0
HcmV?d00001

diff --git a/resources/img/circledot-light-16.png b/resources/img/circledot-light-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..4809c5ac4d11094ddd47913c943a9b612fa3dfb2
GIT binary patch
literal 408
zcmV;J0cZY+P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000Ts
z000Ts0kLiuw*UYD8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10VPR9
zK~y-6mD4#+1VIc1&{ssj0a!wYE#d%3Y<FNi4FjiPJputSO9Da=Adw=G01+gZ#Epv9
z3`<K6y1xIntG-<#La(osGKx<AK19T0&%}uM3KVSO5`p)Ozy&r?zHut@FpltyZA?|z
zG`e`fA%?yQWaVSrVxq3l>adeJhfOC9u$7hjl3OCLSg!>xvHcsl64}9dW575*>N_W}
zjO&cW7B-!n(SmuLVlXOCODQ)v!2nhwVy?mp-mpB77WH&E$^CLlc44f~6_#+7vCzV1
zk~7jAT%h}pN8H6(?ZQS5N#_sb$+U5`JxB*RBz;Aae1|>tASF1IA}{IlOoh#6+ppNy
z9_7|Dt>Zi&sad8EoMBCCnaU6AJd!QLeMCI<%KHSW>~1$Tknv>z0000<MNUMnLSTZ4
CfTsxn

literal 0
HcmV?d00001

diff --git a/resources/img/circledot-light-32.png b/resources/img/circledot-light-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..06c342f7400d916b5b4127b1faf078b8a9251bef
GIT binary patch
literal 813
zcmV+|1JeA7P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000xO
z000xO0b}Nl!vFvP8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10=h{=
zK~z|U#h1%Y6+sY&zdqneJc(R97%y>$s4rmL2(nZ6CYrb+pe}$T=)$;jVTiKxDfAJP
zC>Qa9yn$e%38;{u55OU(TyzZ-!<?BO9AYPxNv6C0|DT$w>TV|@{Lj&v*TFg01zZ4*
z1E=-%DzFYLipcL=fFhD<Kn17)bHElLO>7I80Y-sJ5OxM}D{u$+(S&eKEop8Q7y?@M
zB>*@IyorI%0{4I(;E-8c)^}qXCF}DV=*%SmI0GyhkdMHnkdUf>FYw9ue*wCK1OS~e
z^5;M)l-%Gr;4#oJBKAZg>7PeoZvcaNi4%kj84*+QoQN;JYrg!+zmgl=rv`U0QGk|O
zl<gn(6ZRAVC1Al+M<q!>&8Q4cxEvz-4E{)xfT(<CizYW5@04R^mjIv&)OE5J0Mrgl
z0`JwH0c`<(<Lq?IE-T=g2~ST3NC)sW)@%e=2HG=x&zbdCM1&H4oYH3l_)hwG1a#}#
z7itZB^Lm)!`%THWIiub1q&_!9q@DqCS)VUO<Q9N)&H*=p{xnAs*>uir0LLN$Q3N7Y
zE`!_-ySCJHRdc`X&Ij;IpIy$mvWRS^0L%avfgAqAalmym*PPk8GCtt}etH=`Ij*vk
z9A^V6V41y1xI{)J0OyG%VNw~61(Z`8zP-+?O#nv%{2nMr9jL||(X39+9bhAxSB~kV
zPB?19(|Z8q{RV$HNk9d^Q3(DpQRHUS0xT-_3UGLj09|<7sGKNJz@)()*fp1+bc$jR
zB=)0Tk#-<ahfe(Qsi-5FJr|}Q$&7P%OvD1vmowo$$H>DDrLjm%84$tm=i~TYt!&no
z_1%3_YBua0O?d*cchFQv+}72S=2n1#_&?7jzzC@TBfvE2SF<|s78tgrmS#=~f`@ai
riocwmVE5&84SzZPlM64efTG7=cGHKb4{C8?00000NkvXXu0mjf>c(M)

literal 0
HcmV?d00001

diff --git a/resources/img/circledot-light-64.png b/resources/img/circledot-light-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..cb8634a6126b789ca3b9b97553f9b376bd851849
GIT binary patch
literal 1737
zcmV;)1~&PLP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm001Xm
z001Xm0nfo$jsO4v8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H123AQ#
zK~#90<(pfGR#g<of7_XH(q_c6n8`~$L|z7ma?&&sjgTPera?IqQ<N}Kgy2IDy_kw!
z9wJdI=q1t;4NNNt6}!I}6q#b=SQ2=@gn7%`H{Yxt_WAUD`|NYR^PRKLcN7=whqKvd
zt^ZnUuYFm2ZzUpJ%QPTw0C`ic22e^hDW$H@6+_k`pp?21m<CJ%#sFi1R$!>n^aOAi
z*ah?gKLJ0A$ni|^WnloN)Nr5+m;+28c~9#Heg)P5YeeLb8-zX*5oZPM<u8CfKpdAo
zU;{AODP~8CPXNBjK<Tiu1-R1%_EaIDlo|po0bT;?V*b_#>;sMir@gvnU>GnGsIP+0
zd%yw_ITaUkfKqsUBCv<b-Z})V1fB)P0Rtm=4g}hO=YUn{L9r75zks`I8UnzJz=a4<
zMPMB;6R1mJ<a&?CI*(_Vyz{^dnHvC5!0Qn}`aN%tb`hV3>@mQ{o{TX0i!(ETr~La7
z!hZwqb*;Ds$9=%|2plW2GQb-VLO+O#?F@|20K65^8x}b=0D6=Ui@hgnrMLxGXT(_4
z<HP{Kq!1yefCutY-iL1ndOEc^rz4dCfFanYy7O0p@`e#?PWlsQPGf*&AtQZm-97?q
zXGkc#lgI!-J5aDNT$;DC5t!e#;4J`mB{9I)7G~ROIoc;MKqIijf_rmS1^^~om=vkO
zJnz5=Q$walEA}uZpIaDwl(%wK7-6*q{{~yzz-~|})dK9Nd{<Tk+C*eGR{<%d#sa@n
zo`~rKMv2H_e_LCorkmiFbi>u6Jb;MoLMLYYRF9r1%E)GbIhMK)9pI`p*)Tt4R+NQ+
zm%uzmxnT~YyH1}AR7$DAz(c_O=mZGpkoz9kC?aPa$!P!%05|)pi@;4Ha^g~rF?h@-
zIC!jdI5<6nPLPCcsty6&84re!`P-NwFxg_v?~;1KPfDpb(Yb=wh-R(8Dy7sC7czlw
zEp=1MzG6&&Z4NxqW#L<?q+V_V<1KvGm$fl|_`_&iAmz#ry*fLPzySLl$R0>AMZYsD
z1cn>mdqw1;r5ja4k68GgL+2Q7^UBL!ou5Vk52q3AVc%!rTh^##Ek!W#_=|&XxPqW}
z=ULj#x3pX4K>jv^XJ1$k7))?oa3-Pg{WQu_XD(7epZb_|s{{GwnL(X56$AO54y%}T
znUmiDXVJSTKQ%d!vDZ@fxTS7(%zvw;A;x!6{EICkUQSXTFMAxs;1dL6`z(6kD-DA4
z(1W1aZk7Z2e;Yjit@Sk6;CZszX>gwd*^N{=4em0&>w()tx>hU_kpl2af?wx5n1b&h
zcxYR;t2GVKYhhwr9#=&o@+taAEiNq<k#%Y1V#i+YWTVT>BHPW-)4)NCj8ZuWbUBn~
z+YCMGZ)0wUZvg(Gyk{H%MvA-b@F4VdcsiHo`Mu~(*JcqhSA<FBgl&h1iO9)IH5RM=
zOwejGU3sNe1-%3}_1J2*vn_<yTI!xp>5x3ghB>I4#d0kK4@62y(cC>7)BEEH?rRD_
zYsDTQB1eF)jOqcvtBL%O4=o@#!+j}6Mi>b80MCN=5R9LGV0zx(jp6;UgON$r_7RM>
zSeR@F8uL~%0`qmiP7Cghq5niMYX>e`n5EvMXJ`Q16`leScM2;pTxww`Kxf{{TCjG9
zV0}CCzY0v7(f9C7rWb%2c`NP1`5^WS61_lEVgq>0JJ2^mOy;Mr1S5FLpRwRON5s8=
z*aq-~^n`S;3piZ6Cs4jS#Pb5ojm4u1VT(fq3Hn;=pc*RPi2eFbsk|1OSCxWo8QxOa
z0Zgrd^3y`5x>8wQ6~6=k7DWi}2R;GDW}tW*`r$;>RoU2{Piz1WOi#$bSSm%}GxWhm
zeF~);(7U?zL|>LZ7dPge7{CM9fxd?q2C7t!dc9&U`m8Q=CF#ZXc(3hh@83%Ndx<gH
zhn2JsCYphT=&WwshYm$_qT(2r4_=zkiHi}$e|S*<mIDh#B>4f3qxftGHc{DIuF6JW
zyc6s$nD`7a2_3Jt3zlh10X?ovbcs2uXLBv+3rTa(Pix|KYm<uT6x~|%v$>;g5MHKQ
zJe(YgPJm7UMx!52-hzHOSvn6C^ux)6=s|5auod`0{0Yn~@MUd)Na5bISrPd!Hw<|i
f;7Xut{`L6(SmooGdQ@<n00000NkvXXu0mjf-0&7v

literal 0
HcmV?d00001


From 3391905254980b6c5b5670fbb0eb2588df000b3e Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 18:42:39 -0500
Subject: [PATCH 34/50] Remove context length option

---
 _locales/en-US/messages.json |  3 +--
 background.js                | 23 +++++++++++++----------
 options/options.html         |  6 ------
 options/options.js           |  6 +-----
 4 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index fb439b9..65181c8 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -19,8 +19,7 @@
   "options.stripUrlParams": { "message": "Remove URL tracking parameters" },
   "options.altTextImages": { "message": "Replace images with alt text" },
   "options.collapseWhitespace": { "message": "Collapse long whitespace" },
-  "options.tokenReduction": { "message": "Aggressive token reduction" },
-  "options.contextLength": { "message": "Context length" }
+  "options.tokenReduction": { "message": "Aggressive token reduction" }
   ,"action.read": { "message": "read" }
   ,"action.flag": { "message": "flag" }
     ,"action.copy": { "message": "copy" }
diff --git a/background.js b/background.js
index c44bfed..b5667e6 100644
--- a/background.js
+++ b/background.js
@@ -27,7 +27,7 @@ let stripUrlParams = false;
 let altTextImages = false;
 let collapseWhitespace = false;
 let tokenReduction = false;
-let contextLength = 16384;
+let maxTokens = 4096;
 let TurndownService = null;
 let userTheme = 'auto';
 let currentTheme = 'light';
@@ -262,8 +262,8 @@ async function processMessage(id) {
     try {
         const full = await messenger.messages.getFull(id);
         let text = buildEmailText(full);
-        if (tokenReduction && contextLength > 0) {
-            const limit = Math.floor(contextLength * 0.9);
+        if (tokenReduction && maxTokens > 0) {
+            const limit = Math.floor(maxTokens * 0.9);
             if (text.length > limit) {
                 text = text.slice(0, limit);
             }
@@ -425,7 +425,7 @@ async function clearCacheForMessages(idsInput) {
     }
 
     try {
-        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "contextLength", "aiRules", "theme", "errorPending"]);
+        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "errorPending"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -436,7 +436,9 @@ async function clearCacheForMessages(idsInput) {
         altTextImages = store.altTextImages === true;
         collapseWhitespace = store.collapseWhitespace === true;
         tokenReduction = store.tokenReduction === true;
-        contextLength = parseInt(store.contextLength) || contextLength;
+        if (store.aiParams && typeof store.aiParams.max_tokens !== 'undefined') {
+            maxTokens = parseInt(store.aiParams.max_tokens) || maxTokens;
+        }
         errorPending = store.errorPending === true;
         const savedStats = await storage.local.get('classifyStats');
         if (savedStats.classifyStats && typeof savedStats.classifyStats === 'object') {
@@ -459,7 +461,12 @@ async function clearCacheForMessages(idsInput) {
                 if (changes.templateName) config.templateName = changes.templateName.newValue;
                 if (changes.customTemplate) config.customTemplate = changes.customTemplate.newValue;
                 if (changes.customSystemPrompt) config.customSystemPrompt = changes.customSystemPrompt.newValue;
-                if (changes.aiParams) config.aiParams = changes.aiParams.newValue;
+                if (changes.aiParams) {
+                    config.aiParams = changes.aiParams.newValue;
+                    if (changes.aiParams.newValue && typeof changes.aiParams.newValue.max_tokens !== 'undefined') {
+                        maxTokens = parseInt(changes.aiParams.newValue.max_tokens) || maxTokens;
+                    }
+                }
                 if (changes.debugLogging) {
                     config.debugLogging = changes.debugLogging.newValue === true;
                     logger.setDebug(config.debugLogging);
@@ -487,10 +494,6 @@ async function clearCacheForMessages(idsInput) {
                 tokenReduction = changes.tokenReduction.newValue === true;
                 logger.aiLog("tokenReduction updated from storage change", { debug: true }, tokenReduction);
             }
-            if (changes.contextLength) {
-                contextLength = parseInt(changes.contextLength.newValue) || contextLength;
-                logger.aiLog("contextLength updated from storage change", { debug: true }, contextLength);
-            }
             if (changes.errorPending) {
                 errorPending = changes.errorPending.newValue === true;
                 updateActionIcon();
diff --git a/options/options.html b/options/options.html
index 108d7f9..69158b1 100644
--- a/options/options.html
+++ b/options/options.html
@@ -149,12 +149,6 @@
                             <input type="checkbox" id="token-reduction"> Aggressive token reduction
                         </label>
                     </div>
-                    <div class="field">
-                        <label class="label" for="context-length">Context length</label>
-                        <div class="control">
-                            <input class="input" type="number" id="context-length">
-                        </div>
-                    </div>
                     <div class="field">
                         <label class="label" for="max_tokens">Max tokens</label>
                         <div class="control">
diff --git a/options/options.js b/options/options.js
index f5af1b6..ee2914a 100644
--- a/options/options.js
+++ b/options/options.js
@@ -17,7 +17,6 @@ document.addEventListener('DOMContentLoaded', async () => {
         'altTextImages',
         'collapseWhitespace',
         'tokenReduction',
-        'contextLength',
         'aiRules',
         'aiCache',
         'theme'
@@ -120,8 +119,6 @@ document.addEventListener('DOMContentLoaded', async () => {
     const tokenReductionToggle = document.getElementById('token-reduction');
     tokenReductionToggle.checked = defaults.tokenReduction === true;
 
-    const contextLengthInput = document.getElementById('context-length');
-    contextLengthInput.value = defaults.contextLength || 16384;
 
     const aiParams = Object.assign({}, DEFAULT_AI_PARAMS, defaults.aiParams || {});
     for (const [key, val] of Object.entries(aiParams)) {
@@ -800,9 +797,8 @@ document.addEventListener('DOMContentLoaded', async () => {
         const altTextImages = altTextToggle.checked;
         const collapseWhitespace = collapseWhitespaceToggle.checked;
         const tokenReduction = tokenReductionToggle.checked;
-        const contextLength = parseInt(contextLengthInput.value) || 0;
         const theme = themeSelect.value;
-        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, contextLength, aiRules: rules, theme });
+        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme });
         await applyTheme(theme);
         try {
             await AiClassifier.setConfig({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });

From db7ce49a5b47ea495681510396d7cbb26ed26343 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 19:03:37 -0500
Subject: [PATCH 35/50] Add debug tab with payload viewer

---
 README.md               |  1 +
 modules/AiClassifier.js |  5 +++++
 options/options.html    | 14 ++++++++++++++
 options/options.js      | 21 +++++++++++++++++++--
 4 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 3853127..43a515b 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +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 sent to the AI service.
 - **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.
diff --git a/modules/AiClassifier.js b/modules/AiClassifier.js
index b35cb2c..8313654 100644
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@@ -308,6 +308,11 @@ async function classifyText(text, criterion, cacheKey = null) {
   }
 
   const payload = buildPayload(text, criterion);
+  try {
+    await storage.local.set({ lastPayload: JSON.parse(payload) });
+  } catch (e) {
+    aiLog('failed to save last payload', { level: 'warn' }, e);
+  }
 
   aiLog(`[AiClassifier] Sending classification request to ${gEndpoint}`, {debug: true});
   aiLog(`[AiClassifier] Classification request payload:`, { debug: true }, payload);
diff --git a/options/options.html b/options/options.html
index 69158b1..d14ce99 100644
--- a/options/options.html
+++ b/options/options.html
@@ -47,6 +47,7 @@
                             <li class="is-active" data-tab="settings"><a><span class="icon is-small"><img data-icon="settings" data-size="16" src="../resources/img/settings-light-16.png" alt=""></span><span>Settings</span></a></li>
                             <li data-tab="rules"><a><span class="icon is-small"><img data-icon="clipboarddata" data-size="16" src="../resources/img/clipboarddata-light-16.png" alt=""></span><span>Rules</span></a></li>
                             <li data-tab="maintenance"><a><span class="icon is-small"><img data-icon="gear" data-size="16" src="../resources/img/gear-light-16.png" alt=""></span><span>Maintenance</span></a></li>
+                            <li id="debug-tab-button" class="is-hidden" data-tab="debug"><a><span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span><span>Debug</span></a></li>
                         </ul>
                     </div>
                 </div>
@@ -215,6 +216,11 @@
                             <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>
 
@@ -273,6 +279,14 @@
                     </p>
                 </div>
             </div>
+
+            <div id="debug-tab" class="tab-content is-hidden">
+                <h2 class="title is-4">
+                    <span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span>
+                    <span>Debug</span>
+                </h2>
+                <pre id="payload-display"></pre>
+            </div>
         </div>
     </section>
     <script src="options.js"></script>
diff --git a/options/options.js b/options/options.js
index ee2914a..ebd7497 100644
--- a/options/options.js
+++ b/options/options.js
@@ -19,7 +19,9 @@ document.addEventListener('DOMContentLoaded', async () => {
         'tokenReduction',
         'aiRules',
         'aiCache',
-        'theme'
+        'theme',
+        'showDebugTab',
+        'lastPayload'
     ]);
     const tabButtons = document.querySelectorAll('#main-tabs li');
     const tabs = document.querySelectorAll('.tab-content');
@@ -64,6 +66,10 @@ document.addEventListener('DOMContentLoaded', async () => {
     }
 
     await applyTheme(themeSelect.value);
+    const payloadDisplay = document.getElementById('payload-display');
+    if (defaults.lastPayload) {
+        payloadDisplay.textContent = JSON.stringify(defaults.lastPayload, null, 2);
+    }
     themeSelect.addEventListener('change', async () => {
         markDirty();
         await applyTheme(themeSelect.value);
@@ -119,6 +125,16 @@ document.addEventListener('DOMContentLoaded', async () => {
     const tokenReductionToggle = document.getElementById('token-reduction');
     tokenReductionToggle.checked = defaults.tokenReduction === true;
 
+    const debugTabToggle = document.getElementById('show-debug-tab');
+    const debugTabBtn = document.getElementById('debug-tab-button');
+    function updateDebugTab() {
+        const visible = debugTabToggle.checked;
+        debugTabBtn.classList.toggle('is-hidden', !visible);
+    }
+    debugTabToggle.checked = defaults.showDebugTab === true;
+    debugTabToggle.addEventListener('change', () => { updateDebugTab(); markDirty(); });
+    updateDebugTab();
+
 
     const aiParams = Object.assign({}, DEFAULT_AI_PARAMS, defaults.aiParams || {});
     for (const [key, val] of Object.entries(aiParams)) {
@@ -797,8 +813,9 @@ document.addEventListener('DOMContentLoaded', async () => {
         const altTextImages = altTextToggle.checked;
         const collapseWhitespace = collapseWhitespaceToggle.checked;
         const tokenReduction = tokenReductionToggle.checked;
+        const showDebugTab = debugTabToggle.checked;
         const theme = themeSelect.value;
-        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme });
+        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme, showDebugTab });
         await applyTheme(theme);
         try {
             await AiClassifier.setConfig({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });

From d2de1818ca11956dfa73bb21cddc0feeb4e8c349 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 19:24:47 -0500
Subject: [PATCH 36/50] Adding diff library

---
 README.md                                     |    2 +
 ai-filter.sln                                 |    1 +
 resources/js/diff_match_patch_uncompressed.js | 2236 +++++++++++++++++
 3 files changed, 2239 insertions(+)
 create mode 100644 resources/js/diff_match_patch_uncompressed.js

diff --git a/README.md b/README.md
index 43a515b..64fbf26 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,8 @@ uses the following third party libraries:
   - MIT License
 - [turndown v7.2.0](https://github.com/mixmark-io/turndown/tree/v7.2.0)
   - MIT License
+- [diff](https://github.com/google/diff-match-patch/blob/62f2e689f498f9c92dbc588c58750addec9b1654/javascript/diff_match_patch_uncompressed.js)
+  -  Apache-2.0 license
 
 ## License
 
diff --git a/ai-filter.sln b/ai-filter.sln
index 57705eb..ea71f1b 100644
--- a/ai-filter.sln
+++ b/ai-filter.sln
@@ -108,6 +108,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "img", "img", "{F266602F-175
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "js", "js", "{21D2A42C-3F85-465C-9141-C106AFD92B68}"
 	ProjectSection(SolutionItems) = preProject
+		resources\js\diff_match_patch_uncompressed.js = resources\js\diff_match_patch_uncompressed.js
 		resources\js\turndown.js = resources\js\turndown.js
 	EndProjectSection
 EndProject
diff --git a/resources/js/diff_match_patch_uncompressed.js b/resources/js/diff_match_patch_uncompressed.js
new file mode 100644
index 0000000..88a702c
--- /dev/null
+++ b/resources/js/diff_match_patch_uncompressed.js
@@ -0,0 +1,2236 @@
+/**
+ * Diff Match and Patch
+ * Copyright 2018 The diff-match-patch Authors.
+ * https://github.com/google/diff-match-patch
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Computes the difference between two texts to create a patch.
+ * Applies the patch onto another text, allowing for errors.
+ * @author fraser@google.com (Neil Fraser)
+ */
+
+/**
+ * Class containing the diff, match and patch methods.
+ * @constructor
+ */
+var diff_match_patch = function() {
+
+  // Defaults.
+  // Redefine these in your program to override the defaults.
+
+  // Number of seconds to map a diff before giving up (0 for infinity).
+  this.Diff_Timeout = 1.0;
+  // Cost of an empty edit operation in terms of edit characters.
+  this.Diff_EditCost = 4;
+  // At what point is no match declared (0.0 = perfection, 1.0 = very loose).
+  this.Match_Threshold = 0.5;
+  // How far to search for a match (0 = exact location, 1000+ = broad match).
+  // A match this many characters away from the expected location will add
+  // 1.0 to the score (0.0 is a perfect match).
+  this.Match_Distance = 1000;
+  // When deleting a large block of text (over ~64 characters), how close do
+  // the contents have to be to match the expected contents. (0.0 = perfection,
+  // 1.0 = very loose).  Note that Match_Threshold controls how closely the
+  // end points of a delete need to match.
+  this.Patch_DeleteThreshold = 0.5;
+  // Chunk size for context length.
+  this.Patch_Margin = 4;
+
+  // The number of bits in an int.
+  this.Match_MaxBits = 32;
+};
+
+
+//  DIFF FUNCTIONS
+
+
+/**
+ * The data structure representing a diff is an array of tuples:
+ * [[DIFF_DELETE, 'Hello'], [DIFF_INSERT, 'Goodbye'], [DIFF_EQUAL, ' world.']]
+ * which means: delete 'Hello', add 'Goodbye' and keep ' world.'
+ */
+var DIFF_DELETE = -1;
+var DIFF_INSERT = 1;
+var DIFF_EQUAL = 0;
+
+/**
+ * Class representing one diff tuple.
+ * Attempts to look like a two-element array (which is what this used to be).
+ * @param {number} op Operation, one of: DIFF_DELETE, DIFF_INSERT, DIFF_EQUAL.
+ * @param {string} text Text to be deleted, inserted, or retained.
+ * @constructor
+ */
+diff_match_patch.Diff = function(op, text) {
+  this[0] = op;
+  this[1] = text;
+};
+
+diff_match_patch.Diff.prototype.length = 2;
+
+/**
+ * Emulate the output of a two-element array.
+ * @return {string} Diff operation as a string.
+ */
+diff_match_patch.Diff.prototype.toString = function() {
+  return this[0] + ',' + this[1];
+};
+
+
+/**
+ * Find the differences between two texts.  Simplifies the problem by stripping
+ * any common prefix or suffix off the texts before diffing.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @param {boolean=} opt_checklines Optional speedup flag. If present and false,
+ *     then don't run a line-level diff first to identify the changed areas.
+ *     Defaults to true, which does a faster, slightly less optimal diff.
+ * @param {number=} opt_deadline Optional time when the diff should be complete
+ *     by.  Used internally for recursive calls.  Users should set DiffTimeout
+ *     instead.
+ * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
+ */
+diff_match_patch.prototype.diff_main = function(text1, text2, opt_checklines,
+    opt_deadline) {
+  // Set a deadline by which time the diff must be complete.
+  if (typeof opt_deadline == 'undefined') {
+    if (this.Diff_Timeout <= 0) {
+      opt_deadline = Number.MAX_VALUE;
+    } else {
+      opt_deadline = (new Date).getTime() + this.Diff_Timeout * 1000;
+    }
+  }
+  var deadline = opt_deadline;
+
+  // Check for null inputs.
+  if (text1 == null || text2 == null) {
+    throw new Error('Null input. (diff_main)');
+  }
+
+  // Check for equality (speedup).
+  if (text1 == text2) {
+    if (text1) {
+      return [new diff_match_patch.Diff(DIFF_EQUAL, text1)];
+    }
+    return [];
+  }
+
+  if (typeof opt_checklines == 'undefined') {
+    opt_checklines = true;
+  }
+  var checklines = opt_checklines;
+
+  // Trim off common prefix (speedup).
+  var commonlength = this.diff_commonPrefix(text1, text2);
+  var commonprefix = text1.substring(0, commonlength);
+  text1 = text1.substring(commonlength);
+  text2 = text2.substring(commonlength);
+
+  // Trim off common suffix (speedup).
+  commonlength = this.diff_commonSuffix(text1, text2);
+  var commonsuffix = text1.substring(text1.length - commonlength);
+  text1 = text1.substring(0, text1.length - commonlength);
+  text2 = text2.substring(0, text2.length - commonlength);
+
+  // Compute the diff on the middle block.
+  var diffs = this.diff_compute_(text1, text2, checklines, deadline);
+
+  // Restore the prefix and suffix.
+  if (commonprefix) {
+    diffs.unshift(new diff_match_patch.Diff(DIFF_EQUAL, commonprefix));
+  }
+  if (commonsuffix) {
+    diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, commonsuffix));
+  }
+  this.diff_cleanupMerge(diffs);
+  return diffs;
+};
+
+
+/**
+ * Find the differences between two texts.  Assumes that the texts do not
+ * have any common prefix or suffix.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @param {boolean} checklines Speedup flag.  If false, then don't run a
+ *     line-level diff first to identify the changed areas.
+ *     If true, then run a faster, slightly less optimal diff.
+ * @param {number} deadline Time when the diff should be complete by.
+ * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
+ * @private
+ */
+diff_match_patch.prototype.diff_compute_ = function(text1, text2, checklines,
+    deadline) {
+  var diffs;
+
+  if (!text1) {
+    // Just add some text (speedup).
+    return [new diff_match_patch.Diff(DIFF_INSERT, text2)];
+  }
+
+  if (!text2) {
+    // Just delete some text (speedup).
+    return [new diff_match_patch.Diff(DIFF_DELETE, text1)];
+  }
+
+  var longtext = text1.length > text2.length ? text1 : text2;
+  var shorttext = text1.length > text2.length ? text2 : text1;
+  var i = longtext.indexOf(shorttext);
+  if (i != -1) {
+    // Shorter text is inside the longer text (speedup).
+    diffs = [new diff_match_patch.Diff(DIFF_INSERT, longtext.substring(0, i)),
+             new diff_match_patch.Diff(DIFF_EQUAL, shorttext),
+             new diff_match_patch.Diff(DIFF_INSERT,
+                 longtext.substring(i + shorttext.length))];
+    // Swap insertions for deletions if diff is reversed.
+    if (text1.length > text2.length) {
+      diffs[0][0] = diffs[2][0] = DIFF_DELETE;
+    }
+    return diffs;
+  }
+
+  if (shorttext.length == 1) {
+    // Single character string.
+    // After the previous speedup, the character can't be an equality.
+    return [new diff_match_patch.Diff(DIFF_DELETE, text1),
+            new diff_match_patch.Diff(DIFF_INSERT, text2)];
+  }
+
+  // Check to see if the problem can be split in two.
+  var hm = this.diff_halfMatch_(text1, text2);
+  if (hm) {
+    // A half-match was found, sort out the return data.
+    var text1_a = hm[0];
+    var text1_b = hm[1];
+    var text2_a = hm[2];
+    var text2_b = hm[3];
+    var mid_common = hm[4];
+    // Send both pairs off for separate processing.
+    var diffs_a = this.diff_main(text1_a, text2_a, checklines, deadline);
+    var diffs_b = this.diff_main(text1_b, text2_b, checklines, deadline);
+    // Merge the results.
+    return diffs_a.concat([new diff_match_patch.Diff(DIFF_EQUAL, mid_common)],
+                          diffs_b);
+  }
+
+  if (checklines && text1.length > 100 && text2.length > 100) {
+    return this.diff_lineMode_(text1, text2, deadline);
+  }
+
+  return this.diff_bisect_(text1, text2, deadline);
+};
+
+
+/**
+ * Do a quick line-level diff on both strings, then rediff the parts for
+ * greater accuracy.
+ * This speedup can produce non-minimal diffs.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @param {number} deadline Time when the diff should be complete by.
+ * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
+ * @private
+ */
+diff_match_patch.prototype.diff_lineMode_ = function(text1, text2, deadline) {
+  // Scan the text on a line-by-line basis first.
+  var a = this.diff_linesToChars_(text1, text2);
+  text1 = a.chars1;
+  text2 = a.chars2;
+  var linearray = a.lineArray;
+
+  var diffs = this.diff_main(text1, text2, false, deadline);
+
+  // Convert the diff back to original text.
+  this.diff_charsToLines_(diffs, linearray);
+  // Eliminate freak matches (e.g. blank lines)
+  this.diff_cleanupSemantic(diffs);
+
+  // Rediff any replacement blocks, this time character-by-character.
+  // Add a dummy entry at the end.
+  diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, ''));
+  var pointer = 0;
+  var count_delete = 0;
+  var count_insert = 0;
+  var text_delete = '';
+  var text_insert = '';
+  while (pointer < diffs.length) {
+    switch (diffs[pointer][0]) {
+      case DIFF_INSERT:
+        count_insert++;
+        text_insert += diffs[pointer][1];
+        break;
+      case DIFF_DELETE:
+        count_delete++;
+        text_delete += diffs[pointer][1];
+        break;
+      case DIFF_EQUAL:
+        // Upon reaching an equality, check for prior redundancies.
+        if (count_delete >= 1 && count_insert >= 1) {
+          // Delete the offending records and add the merged ones.
+          diffs.splice(pointer - count_delete - count_insert,
+                       count_delete + count_insert);
+          pointer = pointer - count_delete - count_insert;
+          var subDiff =
+              this.diff_main(text_delete, text_insert, false, deadline);
+          for (var j = subDiff.length - 1; j >= 0; j--) {
+            diffs.splice(pointer, 0, subDiff[j]);
+          }
+          pointer = pointer + subDiff.length;
+        }
+        count_insert = 0;
+        count_delete = 0;
+        text_delete = '';
+        text_insert = '';
+        break;
+    }
+    pointer++;
+  }
+  diffs.pop();  // Remove the dummy entry at the end.
+
+  return diffs;
+};
+
+
+/**
+ * Find the 'middle snake' of a diff, split the problem in two
+ * and return the recursively constructed diff.
+ * See Myers 1986 paper: An O(ND) Difference Algorithm and Its Variations.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @param {number} deadline Time at which to bail if not yet complete.
+ * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
+ * @private
+ */
+diff_match_patch.prototype.diff_bisect_ = function(text1, text2, deadline) {
+  // Cache the text lengths to prevent multiple calls.
+  var text1_length = text1.length;
+  var text2_length = text2.length;
+  var max_d = Math.ceil((text1_length + text2_length) / 2);
+  var v_offset = max_d;
+  var v_length = 2 * max_d;
+  var v1 = new Array(v_length);
+  var v2 = new Array(v_length);
+  // Setting all elements to -1 is faster in Chrome & Firefox than mixing
+  // integers and undefined.
+  for (var x = 0; x < v_length; x++) {
+    v1[x] = -1;
+    v2[x] = -1;
+  }
+  v1[v_offset + 1] = 0;
+  v2[v_offset + 1] = 0;
+  var delta = text1_length - text2_length;
+  // If the total number of characters is odd, then the front path will collide
+  // with the reverse path.
+  var front = (delta % 2 != 0);
+  // Offsets for start and end of k loop.
+  // Prevents mapping of space beyond the grid.
+  var k1start = 0;
+  var k1end = 0;
+  var k2start = 0;
+  var k2end = 0;
+  for (var d = 0; d < max_d; d++) {
+    // Bail out if deadline is reached.
+    if ((new Date()).getTime() > deadline) {
+      break;
+    }
+
+    // Walk the front path one step.
+    for (var k1 = -d + k1start; k1 <= d - k1end; k1 += 2) {
+      var k1_offset = v_offset + k1;
+      var x1;
+      if (k1 == -d || (k1 != d && v1[k1_offset - 1] < v1[k1_offset + 1])) {
+        x1 = v1[k1_offset + 1];
+      } else {
+        x1 = v1[k1_offset - 1] + 1;
+      }
+      var y1 = x1 - k1;
+      while (x1 < text1_length && y1 < text2_length &&
+             text1.charAt(x1) == text2.charAt(y1)) {
+        x1++;
+        y1++;
+      }
+      v1[k1_offset] = x1;
+      if (x1 > text1_length) {
+        // Ran off the right of the graph.
+        k1end += 2;
+      } else if (y1 > text2_length) {
+        // Ran off the bottom of the graph.
+        k1start += 2;
+      } else if (front) {
+        var k2_offset = v_offset + delta - k1;
+        if (k2_offset >= 0 && k2_offset < v_length && v2[k2_offset] != -1) {
+          // Mirror x2 onto top-left coordinate system.
+          var x2 = text1_length - v2[k2_offset];
+          if (x1 >= x2) {
+            // Overlap detected.
+            return this.diff_bisectSplit_(text1, text2, x1, y1, deadline);
+          }
+        }
+      }
+    }
+
+    // Walk the reverse path one step.
+    for (var k2 = -d + k2start; k2 <= d - k2end; k2 += 2) {
+      var k2_offset = v_offset + k2;
+      var x2;
+      if (k2 == -d || (k2 != d && v2[k2_offset - 1] < v2[k2_offset + 1])) {
+        x2 = v2[k2_offset + 1];
+      } else {
+        x2 = v2[k2_offset - 1] + 1;
+      }
+      var y2 = x2 - k2;
+      while (x2 < text1_length && y2 < text2_length &&
+             text1.charAt(text1_length - x2 - 1) ==
+             text2.charAt(text2_length - y2 - 1)) {
+        x2++;
+        y2++;
+      }
+      v2[k2_offset] = x2;
+      if (x2 > text1_length) {
+        // Ran off the left of the graph.
+        k2end += 2;
+      } else if (y2 > text2_length) {
+        // Ran off the top of the graph.
+        k2start += 2;
+      } else if (!front) {
+        var k1_offset = v_offset + delta - k2;
+        if (k1_offset >= 0 && k1_offset < v_length && v1[k1_offset] != -1) {
+          var x1 = v1[k1_offset];
+          var y1 = v_offset + x1 - k1_offset;
+          // Mirror x2 onto top-left coordinate system.
+          x2 = text1_length - x2;
+          if (x1 >= x2) {
+            // Overlap detected.
+            return this.diff_bisectSplit_(text1, text2, x1, y1, deadline);
+          }
+        }
+      }
+    }
+  }
+  // Diff took too long and hit the deadline or
+  // number of diffs equals number of characters, no commonality at all.
+  return [new diff_match_patch.Diff(DIFF_DELETE, text1),
+          new diff_match_patch.Diff(DIFF_INSERT, text2)];
+};
+
+
+/**
+ * Given the location of the 'middle snake', split the diff in two parts
+ * and recurse.
+ * @param {string} text1 Old string to be diffed.
+ * @param {string} text2 New string to be diffed.
+ * @param {number} x Index of split point in text1.
+ * @param {number} y Index of split point in text2.
+ * @param {number} deadline Time at which to bail if not yet complete.
+ * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
+ * @private
+ */
+diff_match_patch.prototype.diff_bisectSplit_ = function(text1, text2, x, y,
+    deadline) {
+  var text1a = text1.substring(0, x);
+  var text2a = text2.substring(0, y);
+  var text1b = text1.substring(x);
+  var text2b = text2.substring(y);
+
+  // Compute both diffs serially.
+  var diffs = this.diff_main(text1a, text2a, false, deadline);
+  var diffsb = this.diff_main(text1b, text2b, false, deadline);
+
+  return diffs.concat(diffsb);
+};
+
+
+/**
+ * Split two texts into an array of strings.  Reduce the texts to a string of
+ * hashes where each Unicode character represents one line.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {{chars1: string, chars2: string, lineArray: !Array.<string>}}
+ *     An object containing the encoded text1, the encoded text2 and
+ *     the array of unique strings.
+ *     The zeroth element of the array of unique strings is intentionally blank.
+ * @private
+ */
+diff_match_patch.prototype.diff_linesToChars_ = function(text1, text2) {
+  var lineArray = [];  // e.g. lineArray[4] == 'Hello\n'
+  var lineHash = {};   // e.g. lineHash['Hello\n'] == 4
+
+  // '\x00' is a valid character, but various debuggers don't like it.
+  // So we'll insert a junk entry to avoid generating a null character.
+  lineArray[0] = '';
+
+  /**
+   * Split a text into an array of strings.  Reduce the texts to a string of
+   * hashes where each Unicode character represents one line.
+   * Modifies linearray and linehash through being a closure.
+   * @param {string} text String to encode.
+   * @return {string} Encoded string.
+   * @private
+   */
+  function diff_linesToCharsMunge_(text) {
+    var chars = '';
+    // Walk the text, pulling out a substring for each line.
+    // text.split('\n') would would temporarily double our memory footprint.
+    // Modifying text would create many large strings to garbage collect.
+    var lineStart = 0;
+    var lineEnd = -1;
+    // Keeping our own length variable is faster than looking it up.
+    var lineArrayLength = lineArray.length;
+    while (lineEnd < text.length - 1) {
+      lineEnd = text.indexOf('\n', lineStart);
+      if (lineEnd == -1) {
+        lineEnd = text.length - 1;
+      }
+      var line = text.substring(lineStart, lineEnd + 1);
+
+      if (lineHash.hasOwnProperty ? lineHash.hasOwnProperty(line) :
+          (lineHash[line] !== undefined)) {
+        chars += String.fromCharCode(lineHash[line]);
+      } else {
+        if (lineArrayLength == maxLines) {
+          // Bail out at 65535 because
+          // String.fromCharCode(65536) == String.fromCharCode(0)
+          line = text.substring(lineStart);
+          lineEnd = text.length;
+        }
+        chars += String.fromCharCode(lineArrayLength);
+        lineHash[line] = lineArrayLength;
+        lineArray[lineArrayLength++] = line;
+      }
+      lineStart = lineEnd + 1;
+    }
+    return chars;
+  }
+  // Allocate 2/3rds of the space for text1, the rest for text2.
+  var maxLines = 40000;
+  var chars1 = diff_linesToCharsMunge_(text1);
+  maxLines = 65535;
+  var chars2 = diff_linesToCharsMunge_(text2);
+  return {chars1: chars1, chars2: chars2, lineArray: lineArray};
+};
+
+
+/**
+ * Rehydrate the text in a diff from a string of line hashes to real lines of
+ * text.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ * @param {!Array.<string>} lineArray Array of unique strings.
+ * @private
+ */
+diff_match_patch.prototype.diff_charsToLines_ = function(diffs, lineArray) {
+  for (var i = 0; i < diffs.length; i++) {
+    var chars = diffs[i][1];
+    var text = [];
+    for (var j = 0; j < chars.length; j++) {
+      text[j] = lineArray[chars.charCodeAt(j)];
+    }
+    diffs[i][1] = text.join('');
+  }
+};
+
+
+/**
+ * Determine the common prefix of two strings.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {number} The number of characters common to the start of each
+ *     string.
+ */
+diff_match_patch.prototype.diff_commonPrefix = function(text1, text2) {
+  // Quick check for common null cases.
+  if (!text1 || !text2 || text1.charAt(0) != text2.charAt(0)) {
+    return 0;
+  }
+  // Binary search.
+  // Performance analysis: https://neil.fraser.name/news/2007/10/09/
+  var pointermin = 0;
+  var pointermax = Math.min(text1.length, text2.length);
+  var pointermid = pointermax;
+  var pointerstart = 0;
+  while (pointermin < pointermid) {
+    if (text1.substring(pointerstart, pointermid) ==
+        text2.substring(pointerstart, pointermid)) {
+      pointermin = pointermid;
+      pointerstart = pointermin;
+    } else {
+      pointermax = pointermid;
+    }
+    pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  }
+  return pointermid;
+};
+
+
+/**
+ * Determine the common suffix of two strings.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {number} The number of characters common to the end of each string.
+ */
+diff_match_patch.prototype.diff_commonSuffix = function(text1, text2) {
+  // Quick check for common null cases.
+  if (!text1 || !text2 ||
+      text1.charAt(text1.length - 1) != text2.charAt(text2.length - 1)) {
+    return 0;
+  }
+  // Binary search.
+  // Performance analysis: https://neil.fraser.name/news/2007/10/09/
+  var pointermin = 0;
+  var pointermax = Math.min(text1.length, text2.length);
+  var pointermid = pointermax;
+  var pointerend = 0;
+  while (pointermin < pointermid) {
+    if (text1.substring(text1.length - pointermid, text1.length - pointerend) ==
+        text2.substring(text2.length - pointermid, text2.length - pointerend)) {
+      pointermin = pointermid;
+      pointerend = pointermin;
+    } else {
+      pointermax = pointermid;
+    }
+    pointermid = Math.floor((pointermax - pointermin) / 2 + pointermin);
+  }
+  return pointermid;
+};
+
+
+/**
+ * Determine if the suffix of one string is the prefix of another.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {number} The number of characters common to the end of the first
+ *     string and the start of the second string.
+ * @private
+ */
+diff_match_patch.prototype.diff_commonOverlap_ = function(text1, text2) {
+  // Cache the text lengths to prevent multiple calls.
+  var text1_length = text1.length;
+  var text2_length = text2.length;
+  // Eliminate the null case.
+  if (text1_length == 0 || text2_length == 0) {
+    return 0;
+  }
+  // Truncate the longer string.
+  if (text1_length > text2_length) {
+    text1 = text1.substring(text1_length - text2_length);
+  } else if (text1_length < text2_length) {
+    text2 = text2.substring(0, text1_length);
+  }
+  var text_length = Math.min(text1_length, text2_length);
+  // Quick check for the worst case.
+  if (text1 == text2) {
+    return text_length;
+  }
+
+  // Start by looking for a single character match
+  // and increase length until no match is found.
+  // Performance analysis: https://neil.fraser.name/news/2010/11/04/
+  var best = 0;
+  var length = 1;
+  while (true) {
+    var pattern = text1.substring(text_length - length);
+    var found = text2.indexOf(pattern);
+    if (found == -1) {
+      return best;
+    }
+    length += found;
+    if (found == 0 || text1.substring(text_length - length) ==
+        text2.substring(0, length)) {
+      best = length;
+      length++;
+    }
+  }
+};
+
+
+/**
+ * Do the two texts share a substring which is at least half the length of the
+ * longer text?
+ * This speedup can produce non-minimal diffs.
+ * @param {string} text1 First string.
+ * @param {string} text2 Second string.
+ * @return {Array.<string>} Five element Array, containing the prefix of
+ *     text1, the suffix of text1, the prefix of text2, the suffix of
+ *     text2 and the common middle.  Or null if there was no match.
+ * @private
+ */
+diff_match_patch.prototype.diff_halfMatch_ = function(text1, text2) {
+  if (this.Diff_Timeout <= 0) {
+    // Don't risk returning a non-optimal diff if we have unlimited time.
+    return null;
+  }
+  var longtext = text1.length > text2.length ? text1 : text2;
+  var shorttext = text1.length > text2.length ? text2 : text1;
+  if (longtext.length < 4 || shorttext.length * 2 < longtext.length) {
+    return null;  // Pointless.
+  }
+  var dmp = this;  // 'this' becomes 'window' in a closure.
+
+  /**
+   * Does a substring of shorttext exist within longtext such that the substring
+   * is at least half the length of longtext?
+   * Closure, but does not reference any external variables.
+   * @param {string} longtext Longer string.
+   * @param {string} shorttext Shorter string.
+   * @param {number} i Start index of quarter length substring within longtext.
+   * @return {Array.<string>} Five element Array, containing the prefix of
+   *     longtext, the suffix of longtext, the prefix of shorttext, the suffix
+   *     of shorttext and the common middle.  Or null if there was no match.
+   * @private
+   */
+  function diff_halfMatchI_(longtext, shorttext, i) {
+    // Start with a 1/4 length substring at position i as a seed.
+    var seed = longtext.substring(i, i + Math.floor(longtext.length / 4));
+    var j = -1;
+    var best_common = '';
+    var best_longtext_a, best_longtext_b, best_shorttext_a, best_shorttext_b;
+    while ((j = shorttext.indexOf(seed, j + 1)) != -1) {
+      var prefixLength = dmp.diff_commonPrefix(longtext.substring(i),
+                                               shorttext.substring(j));
+      var suffixLength = dmp.diff_commonSuffix(longtext.substring(0, i),
+                                               shorttext.substring(0, j));
+      if (best_common.length < suffixLength + prefixLength) {
+        best_common = shorttext.substring(j - suffixLength, j) +
+            shorttext.substring(j, j + prefixLength);
+        best_longtext_a = longtext.substring(0, i - suffixLength);
+        best_longtext_b = longtext.substring(i + prefixLength);
+        best_shorttext_a = shorttext.substring(0, j - suffixLength);
+        best_shorttext_b = shorttext.substring(j + prefixLength);
+      }
+    }
+    if (best_common.length * 2 >= longtext.length) {
+      return [best_longtext_a, best_longtext_b,
+              best_shorttext_a, best_shorttext_b, best_common];
+    } else {
+      return null;
+    }
+  }
+
+  // First check if the second quarter is the seed for a half-match.
+  var hm1 = diff_halfMatchI_(longtext, shorttext,
+                             Math.ceil(longtext.length / 4));
+  // Check again based on the third quarter.
+  var hm2 = diff_halfMatchI_(longtext, shorttext,
+                             Math.ceil(longtext.length / 2));
+  var hm;
+  if (!hm1 && !hm2) {
+    return null;
+  } else if (!hm2) {
+    hm = hm1;
+  } else if (!hm1) {
+    hm = hm2;
+  } else {
+    // Both matched.  Select the longest.
+    hm = hm1[4].length > hm2[4].length ? hm1 : hm2;
+  }
+
+  // A half-match was found, sort out the return data.
+  var text1_a, text1_b, text2_a, text2_b;
+  if (text1.length > text2.length) {
+    text1_a = hm[0];
+    text1_b = hm[1];
+    text2_a = hm[2];
+    text2_b = hm[3];
+  } else {
+    text2_a = hm[0];
+    text2_b = hm[1];
+    text1_a = hm[2];
+    text1_b = hm[3];
+  }
+  var mid_common = hm[4];
+  return [text1_a, text1_b, text2_a, text2_b, mid_common];
+};
+
+
+/**
+ * Reduce the number of edits by eliminating semantically trivial equalities.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ */
+diff_match_patch.prototype.diff_cleanupSemantic = function(diffs) {
+  var changes = false;
+  var equalities = [];  // Stack of indices where equalities are found.
+  var equalitiesLength = 0;  // Keeping our own length var is faster in JS.
+  /** @type {?string} */
+  var lastEquality = null;
+  // Always equal to diffs[equalities[equalitiesLength - 1]][1]
+  var pointer = 0;  // Index of current position.
+  // Number of characters that changed prior to the equality.
+  var length_insertions1 = 0;
+  var length_deletions1 = 0;
+  // Number of characters that changed after the equality.
+  var length_insertions2 = 0;
+  var length_deletions2 = 0;
+  while (pointer < diffs.length) {
+    if (diffs[pointer][0] == DIFF_EQUAL) {  // Equality found.
+      equalities[equalitiesLength++] = pointer;
+      length_insertions1 = length_insertions2;
+      length_deletions1 = length_deletions2;
+      length_insertions2 = 0;
+      length_deletions2 = 0;
+      lastEquality = diffs[pointer][1];
+    } else {  // An insertion or deletion.
+      if (diffs[pointer][0] == DIFF_INSERT) {
+        length_insertions2 += diffs[pointer][1].length;
+      } else {
+        length_deletions2 += diffs[pointer][1].length;
+      }
+      // Eliminate an equality that is smaller or equal to the edits on both
+      // sides of it.
+      if (lastEquality && (lastEquality.length <=
+          Math.max(length_insertions1, length_deletions1)) &&
+          (lastEquality.length <= Math.max(length_insertions2,
+                                           length_deletions2))) {
+        // Duplicate record.
+        diffs.splice(equalities[equalitiesLength - 1], 0,
+                     new diff_match_patch.Diff(DIFF_DELETE, lastEquality));
+        // Change second copy to insert.
+        diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
+        // Throw away the equality we just deleted.
+        equalitiesLength--;
+        // Throw away the previous equality (it needs to be reevaluated).
+        equalitiesLength--;
+        pointer = equalitiesLength > 0 ? equalities[equalitiesLength - 1] : -1;
+        length_insertions1 = 0;  // Reset the counters.
+        length_deletions1 = 0;
+        length_insertions2 = 0;
+        length_deletions2 = 0;
+        lastEquality = null;
+        changes = true;
+      }
+    }
+    pointer++;
+  }
+
+  // Normalize the diff.
+  if (changes) {
+    this.diff_cleanupMerge(diffs);
+  }
+  this.diff_cleanupSemanticLossless(diffs);
+
+  // Find any overlaps between deletions and insertions.
+  // e.g: <del>abcxxx</del><ins>xxxdef</ins>
+  //   -> <del>abc</del>xxx<ins>def</ins>
+  // e.g: <del>xxxabc</del><ins>defxxx</ins>
+  //   -> <ins>def</ins>xxx<del>abc</del>
+  // Only extract an overlap if it is as big as the edit ahead or behind it.
+  pointer = 1;
+  while (pointer < diffs.length) {
+    if (diffs[pointer - 1][0] == DIFF_DELETE &&
+        diffs[pointer][0] == DIFF_INSERT) {
+      var deletion = diffs[pointer - 1][1];
+      var insertion = diffs[pointer][1];
+      var overlap_length1 = this.diff_commonOverlap_(deletion, insertion);
+      var overlap_length2 = this.diff_commonOverlap_(insertion, deletion);
+      if (overlap_length1 >= overlap_length2) {
+        if (overlap_length1 >= deletion.length / 2 ||
+            overlap_length1 >= insertion.length / 2) {
+          // Overlap found.  Insert an equality and trim the surrounding edits.
+          diffs.splice(pointer, 0, new diff_match_patch.Diff(DIFF_EQUAL,
+              insertion.substring(0, overlap_length1)));
+          diffs[pointer - 1][1] =
+              deletion.substring(0, deletion.length - overlap_length1);
+          diffs[pointer + 1][1] = insertion.substring(overlap_length1);
+          pointer++;
+        }
+      } else {
+        if (overlap_length2 >= deletion.length / 2 ||
+            overlap_length2 >= insertion.length / 2) {
+          // Reverse overlap found.
+          // Insert an equality and swap and trim the surrounding edits.
+          diffs.splice(pointer, 0, new diff_match_patch.Diff(DIFF_EQUAL,
+              deletion.substring(0, overlap_length2)));
+          diffs[pointer - 1][0] = DIFF_INSERT;
+          diffs[pointer - 1][1] =
+              insertion.substring(0, insertion.length - overlap_length2);
+          diffs[pointer + 1][0] = DIFF_DELETE;
+          diffs[pointer + 1][1] =
+              deletion.substring(overlap_length2);
+          pointer++;
+        }
+      }
+      pointer++;
+    }
+    pointer++;
+  }
+};
+
+
+/**
+ * Look for single edits surrounded on both sides by equalities
+ * which can be shifted sideways to align the edit to a word boundary.
+ * e.g: The c<ins>at c</ins>ame. -> The <ins>cat </ins>came.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ */
+diff_match_patch.prototype.diff_cleanupSemanticLossless = function(diffs) {
+  /**
+   * Given two strings, compute a score representing whether the internal
+   * boundary falls on logical boundaries.
+   * Scores range from 6 (best) to 0 (worst).
+   * Closure, but does not reference any external variables.
+   * @param {string} one First string.
+   * @param {string} two Second string.
+   * @return {number} The score.
+   * @private
+   */
+  function diff_cleanupSemanticScore_(one, two) {
+    if (!one || !two) {
+      // Edges are the best.
+      return 6;
+    }
+
+    // Each port of this function behaves slightly differently due to
+    // subtle differences in each language's definition of things like
+    // 'whitespace'.  Since this function's purpose is largely cosmetic,
+    // the choice has been made to use each language's native features
+    // rather than force total conformity.
+    var char1 = one.charAt(one.length - 1);
+    var char2 = two.charAt(0);
+    var nonAlphaNumeric1 = char1.match(diff_match_patch.nonAlphaNumericRegex_);
+    var nonAlphaNumeric2 = char2.match(diff_match_patch.nonAlphaNumericRegex_);
+    var whitespace1 = nonAlphaNumeric1 &&
+        char1.match(diff_match_patch.whitespaceRegex_);
+    var whitespace2 = nonAlphaNumeric2 &&
+        char2.match(diff_match_patch.whitespaceRegex_);
+    var lineBreak1 = whitespace1 &&
+        char1.match(diff_match_patch.linebreakRegex_);
+    var lineBreak2 = whitespace2 &&
+        char2.match(diff_match_patch.linebreakRegex_);
+    var blankLine1 = lineBreak1 &&
+        one.match(diff_match_patch.blanklineEndRegex_);
+    var blankLine2 = lineBreak2 &&
+        two.match(diff_match_patch.blanklineStartRegex_);
+
+    if (blankLine1 || blankLine2) {
+      // Five points for blank lines.
+      return 5;
+    } else if (lineBreak1 || lineBreak2) {
+      // Four points for line breaks.
+      return 4;
+    } else if (nonAlphaNumeric1 && !whitespace1 && whitespace2) {
+      // Three points for end of sentences.
+      return 3;
+    } else if (whitespace1 || whitespace2) {
+      // Two points for whitespace.
+      return 2;
+    } else if (nonAlphaNumeric1 || nonAlphaNumeric2) {
+      // One point for non-alphanumeric.
+      return 1;
+    }
+    return 0;
+  }
+
+  var pointer = 1;
+  // Intentionally ignore the first and last element (don't need checking).
+  while (pointer < diffs.length - 1) {
+    if (diffs[pointer - 1][0] == DIFF_EQUAL &&
+        diffs[pointer + 1][0] == DIFF_EQUAL) {
+      // This is a single edit surrounded by equalities.
+      var equality1 = diffs[pointer - 1][1];
+      var edit = diffs[pointer][1];
+      var equality2 = diffs[pointer + 1][1];
+
+      // First, shift the edit as far left as possible.
+      var commonOffset = this.diff_commonSuffix(equality1, edit);
+      if (commonOffset) {
+        var commonString = edit.substring(edit.length - commonOffset);
+        equality1 = equality1.substring(0, equality1.length - commonOffset);
+        edit = commonString + edit.substring(0, edit.length - commonOffset);
+        equality2 = commonString + equality2;
+      }
+
+      // Second, step character by character right, looking for the best fit.
+      var bestEquality1 = equality1;
+      var bestEdit = edit;
+      var bestEquality2 = equality2;
+      var bestScore = diff_cleanupSemanticScore_(equality1, edit) +
+          diff_cleanupSemanticScore_(edit, equality2);
+      while (edit.charAt(0) === equality2.charAt(0)) {
+        equality1 += edit.charAt(0);
+        edit = edit.substring(1) + equality2.charAt(0);
+        equality2 = equality2.substring(1);
+        var score = diff_cleanupSemanticScore_(equality1, edit) +
+            diff_cleanupSemanticScore_(edit, equality2);
+        // The >= encourages trailing rather than leading whitespace on edits.
+        if (score >= bestScore) {
+          bestScore = score;
+          bestEquality1 = equality1;
+          bestEdit = edit;
+          bestEquality2 = equality2;
+        }
+      }
+
+      if (diffs[pointer - 1][1] != bestEquality1) {
+        // We have an improvement, save it back to the diff.
+        if (bestEquality1) {
+          diffs[pointer - 1][1] = bestEquality1;
+        } else {
+          diffs.splice(pointer - 1, 1);
+          pointer--;
+        }
+        diffs[pointer][1] = bestEdit;
+        if (bestEquality2) {
+          diffs[pointer + 1][1] = bestEquality2;
+        } else {
+          diffs.splice(pointer + 1, 1);
+          pointer--;
+        }
+      }
+    }
+    pointer++;
+  }
+};
+
+// Define some regex patterns for matching boundaries.
+diff_match_patch.nonAlphaNumericRegex_ = /[^a-zA-Z0-9]/;
+diff_match_patch.whitespaceRegex_ = /\s/;
+diff_match_patch.linebreakRegex_ = /[\r\n]/;
+diff_match_patch.blanklineEndRegex_ = /\n\r?\n$/;
+diff_match_patch.blanklineStartRegex_ = /^\r?\n\r?\n/;
+
+/**
+ * Reduce the number of edits by eliminating operationally trivial equalities.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ */
+diff_match_patch.prototype.diff_cleanupEfficiency = function(diffs) {
+  var changes = false;
+  var equalities = [];  // Stack of indices where equalities are found.
+  var equalitiesLength = 0;  // Keeping our own length var is faster in JS.
+  /** @type {?string} */
+  var lastEquality = null;
+  // Always equal to diffs[equalities[equalitiesLength - 1]][1]
+  var pointer = 0;  // Index of current position.
+  // Is there an insertion operation before the last equality.
+  var pre_ins = false;
+  // Is there a deletion operation before the last equality.
+  var pre_del = false;
+  // Is there an insertion operation after the last equality.
+  var post_ins = false;
+  // Is there a deletion operation after the last equality.
+  var post_del = false;
+  while (pointer < diffs.length) {
+    if (diffs[pointer][0] == DIFF_EQUAL) {  // Equality found.
+      if (diffs[pointer][1].length < this.Diff_EditCost &&
+          (post_ins || post_del)) {
+        // Candidate found.
+        equalities[equalitiesLength++] = pointer;
+        pre_ins = post_ins;
+        pre_del = post_del;
+        lastEquality = diffs[pointer][1];
+      } else {
+        // Not a candidate, and can never become one.
+        equalitiesLength = 0;
+        lastEquality = null;
+      }
+      post_ins = post_del = false;
+    } else {  // An insertion or deletion.
+      if (diffs[pointer][0] == DIFF_DELETE) {
+        post_del = true;
+      } else {
+        post_ins = true;
+      }
+      /*
+       * Five types to be split:
+       * <ins>A</ins><del>B</del>XY<ins>C</ins><del>D</del>
+       * <ins>A</ins>X<ins>C</ins><del>D</del>
+       * <ins>A</ins><del>B</del>X<ins>C</ins>
+       * <ins>A</del>X<ins>C</ins><del>D</del>
+       * <ins>A</ins><del>B</del>X<del>C</del>
+       */
+      if (lastEquality && ((pre_ins && pre_del && post_ins && post_del) ||
+                           ((lastEquality.length < this.Diff_EditCost / 2) &&
+                            (pre_ins + pre_del + post_ins + post_del) == 3))) {
+        // Duplicate record.
+        diffs.splice(equalities[equalitiesLength - 1], 0,
+                     new diff_match_patch.Diff(DIFF_DELETE, lastEquality));
+        // Change second copy to insert.
+        diffs[equalities[equalitiesLength - 1] + 1][0] = DIFF_INSERT;
+        equalitiesLength--;  // Throw away the equality we just deleted;
+        lastEquality = null;
+        if (pre_ins && pre_del) {
+          // No changes made which could affect previous entry, keep going.
+          post_ins = post_del = true;
+          equalitiesLength = 0;
+        } else {
+          equalitiesLength--;  // Throw away the previous equality.
+          pointer = equalitiesLength > 0 ?
+              equalities[equalitiesLength - 1] : -1;
+          post_ins = post_del = false;
+        }
+        changes = true;
+      }
+    }
+    pointer++;
+  }
+
+  if (changes) {
+    this.diff_cleanupMerge(diffs);
+  }
+};
+
+
+/**
+ * Reorder and merge like edit sections.  Merge equalities.
+ * Any edit section can move as long as it doesn't cross an equality.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ */
+diff_match_patch.prototype.diff_cleanupMerge = function(diffs) {
+  // Add a dummy entry at the end.
+  diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, ''));
+  var pointer = 0;
+  var count_delete = 0;
+  var count_insert = 0;
+  var text_delete = '';
+  var text_insert = '';
+  var commonlength;
+  while (pointer < diffs.length) {
+    switch (diffs[pointer][0]) {
+      case DIFF_INSERT:
+        count_insert++;
+        text_insert += diffs[pointer][1];
+        pointer++;
+        break;
+      case DIFF_DELETE:
+        count_delete++;
+        text_delete += diffs[pointer][1];
+        pointer++;
+        break;
+      case DIFF_EQUAL:
+        // Upon reaching an equality, check for prior redundancies.
+        if (count_delete + count_insert > 1) {
+          if (count_delete !== 0 && count_insert !== 0) {
+            // Factor out any common prefixies.
+            commonlength = this.diff_commonPrefix(text_insert, text_delete);
+            if (commonlength !== 0) {
+              if ((pointer - count_delete - count_insert) > 0 &&
+                  diffs[pointer - count_delete - count_insert - 1][0] ==
+                  DIFF_EQUAL) {
+                diffs[pointer - count_delete - count_insert - 1][1] +=
+                    text_insert.substring(0, commonlength);
+              } else {
+                diffs.splice(0, 0, new diff_match_patch.Diff(DIFF_EQUAL,
+                    text_insert.substring(0, commonlength)));
+                pointer++;
+              }
+              text_insert = text_insert.substring(commonlength);
+              text_delete = text_delete.substring(commonlength);
+            }
+            // Factor out any common suffixies.
+            commonlength = this.diff_commonSuffix(text_insert, text_delete);
+            if (commonlength !== 0) {
+              diffs[pointer][1] = text_insert.substring(text_insert.length -
+                  commonlength) + diffs[pointer][1];
+              text_insert = text_insert.substring(0, text_insert.length -
+                  commonlength);
+              text_delete = text_delete.substring(0, text_delete.length -
+                  commonlength);
+            }
+          }
+          // Delete the offending records and add the merged ones.
+          pointer -= count_delete + count_insert;
+          diffs.splice(pointer, count_delete + count_insert);
+          if (text_delete.length) {
+            diffs.splice(pointer, 0,
+                new diff_match_patch.Diff(DIFF_DELETE, text_delete));
+            pointer++;
+          }
+          if (text_insert.length) {
+            diffs.splice(pointer, 0,
+                new diff_match_patch.Diff(DIFF_INSERT, text_insert));
+            pointer++;
+          }
+          pointer++;
+        } else if (pointer !== 0 && diffs[pointer - 1][0] == DIFF_EQUAL) {
+          // Merge this equality with the previous one.
+          diffs[pointer - 1][1] += diffs[pointer][1];
+          diffs.splice(pointer, 1);
+        } else {
+          pointer++;
+        }
+        count_insert = 0;
+        count_delete = 0;
+        text_delete = '';
+        text_insert = '';
+        break;
+    }
+  }
+  if (diffs[diffs.length - 1][1] === '') {
+    diffs.pop();  // Remove the dummy entry at the end.
+  }
+
+  // Second pass: look for single edits surrounded on both sides by equalities
+  // which can be shifted sideways to eliminate an equality.
+  // e.g: A<ins>BA</ins>C -> <ins>AB</ins>AC
+  var changes = false;
+  pointer = 1;
+  // Intentionally ignore the first and last element (don't need checking).
+  while (pointer < diffs.length - 1) {
+    if (diffs[pointer - 1][0] == DIFF_EQUAL &&
+        diffs[pointer + 1][0] == DIFF_EQUAL) {
+      // This is a single edit surrounded by equalities.
+      if (diffs[pointer][1].substring(diffs[pointer][1].length -
+          diffs[pointer - 1][1].length) == diffs[pointer - 1][1]) {
+        // Shift the edit over the previous equality.
+        diffs[pointer][1] = diffs[pointer - 1][1] +
+            diffs[pointer][1].substring(0, diffs[pointer][1].length -
+                                        diffs[pointer - 1][1].length);
+        diffs[pointer + 1][1] = diffs[pointer - 1][1] + diffs[pointer + 1][1];
+        diffs.splice(pointer - 1, 1);
+        changes = true;
+      } else if (diffs[pointer][1].substring(0, diffs[pointer + 1][1].length) ==
+          diffs[pointer + 1][1]) {
+        // Shift the edit over the next equality.
+        diffs[pointer - 1][1] += diffs[pointer + 1][1];
+        diffs[pointer][1] =
+            diffs[pointer][1].substring(diffs[pointer + 1][1].length) +
+            diffs[pointer + 1][1];
+        diffs.splice(pointer + 1, 1);
+        changes = true;
+      }
+    }
+    pointer++;
+  }
+  // If shifts were made, the diff needs reordering and another shift sweep.
+  if (changes) {
+    this.diff_cleanupMerge(diffs);
+  }
+};
+
+
+/**
+ * loc is a location in text1, compute and return the equivalent location in
+ * text2.
+ * e.g. 'The cat' vs 'The big cat', 1->1, 5->8
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ * @param {number} loc Location within text1.
+ * @return {number} Location within text2.
+ */
+diff_match_patch.prototype.diff_xIndex = function(diffs, loc) {
+  var chars1 = 0;
+  var chars2 = 0;
+  var last_chars1 = 0;
+  var last_chars2 = 0;
+  var x;
+  for (x = 0; x < diffs.length; x++) {
+    if (diffs[x][0] !== DIFF_INSERT) {  // Equality or deletion.
+      chars1 += diffs[x][1].length;
+    }
+    if (diffs[x][0] !== DIFF_DELETE) {  // Equality or insertion.
+      chars2 += diffs[x][1].length;
+    }
+    if (chars1 > loc) {  // Overshot the location.
+      break;
+    }
+    last_chars1 = chars1;
+    last_chars2 = chars2;
+  }
+  // Was the location was deleted?
+  if (diffs.length != x && diffs[x][0] === DIFF_DELETE) {
+    return last_chars2;
+  }
+  // Add the remaining character length.
+  return last_chars2 + (loc - last_chars1);
+};
+
+
+/**
+ * Convert a diff array into a pretty HTML report.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ * @return {string} HTML representation.
+ */
+diff_match_patch.prototype.diff_prettyHtml = function(diffs) {
+  var html = [];
+  var pattern_amp = /&/g;
+  var pattern_lt = /</g;
+  var pattern_gt = />/g;
+  var pattern_para = /\n/g;
+  for (var x = 0; x < diffs.length; x++) {
+    var op = diffs[x][0];    // Operation (insert, delete, equal)
+    var data = diffs[x][1];  // Text of change.
+    var text = data.replace(pattern_amp, '&amp;').replace(pattern_lt, '&lt;')
+        .replace(pattern_gt, '&gt;').replace(pattern_para, '&para;<br>');
+    switch (op) {
+      case DIFF_INSERT:
+        html[x] = '<ins style="background:#e6ffe6;">' + text + '</ins>';
+        break;
+      case DIFF_DELETE:
+        html[x] = '<del style="background:#ffe6e6;">' + text + '</del>';
+        break;
+      case DIFF_EQUAL:
+        html[x] = '<span>' + text + '</span>';
+        break;
+    }
+  }
+  return html.join('');
+};
+
+
+/**
+ * Compute and return the source text (all equalities and deletions).
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ * @return {string} Source text.
+ */
+diff_match_patch.prototype.diff_text1 = function(diffs) {
+  var text = [];
+  for (var x = 0; x < diffs.length; x++) {
+    if (diffs[x][0] !== DIFF_INSERT) {
+      text[x] = diffs[x][1];
+    }
+  }
+  return text.join('');
+};
+
+
+/**
+ * Compute and return the destination text (all equalities and insertions).
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ * @return {string} Destination text.
+ */
+diff_match_patch.prototype.diff_text2 = function(diffs) {
+  var text = [];
+  for (var x = 0; x < diffs.length; x++) {
+    if (diffs[x][0] !== DIFF_DELETE) {
+      text[x] = diffs[x][1];
+    }
+  }
+  return text.join('');
+};
+
+
+/**
+ * Compute the Levenshtein distance; the number of inserted, deleted or
+ * substituted characters.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ * @return {number} Number of changes.
+ */
+diff_match_patch.prototype.diff_levenshtein = function(diffs) {
+  var levenshtein = 0;
+  var insertions = 0;
+  var deletions = 0;
+  for (var x = 0; x < diffs.length; x++) {
+    var op = diffs[x][0];
+    var data = diffs[x][1];
+    switch (op) {
+      case DIFF_INSERT:
+        insertions += data.length;
+        break;
+      case DIFF_DELETE:
+        deletions += data.length;
+        break;
+      case DIFF_EQUAL:
+        // A deletion and an insertion is one substitution.
+        levenshtein += Math.max(insertions, deletions);
+        insertions = 0;
+        deletions = 0;
+        break;
+    }
+  }
+  levenshtein += Math.max(insertions, deletions);
+  return levenshtein;
+};
+
+
+/**
+ * Crush the diff into an encoded string which describes the operations
+ * required to transform text1 into text2.
+ * E.g. =3\t-2\t+ing  -> Keep 3 chars, delete 2 chars, insert 'ing'.
+ * Operations are tab-separated.  Inserted text is escaped using %xx notation.
+ * @param {!Array.<!diff_match_patch.Diff>} diffs Array of diff tuples.
+ * @return {string} Delta text.
+ */
+diff_match_patch.prototype.diff_toDelta = function(diffs) {
+  var text = [];
+  for (var x = 0; x < diffs.length; x++) {
+    switch (diffs[x][0]) {
+      case DIFF_INSERT:
+        text[x] = '+' + encodeURI(diffs[x][1]);
+        break;
+      case DIFF_DELETE:
+        text[x] = '-' + diffs[x][1].length;
+        break;
+      case DIFF_EQUAL:
+        text[x] = '=' + diffs[x][1].length;
+        break;
+    }
+  }
+  return text.join('\t').replace(/%20/g, ' ');
+};
+
+
+/**
+ * Given the original text1, and an encoded string which describes the
+ * operations required to transform text1 into text2, compute the full diff.
+ * @param {string} text1 Source string for the diff.
+ * @param {string} delta Delta text.
+ * @return {!Array.<!diff_match_patch.Diff>} Array of diff tuples.
+ * @throws {!Error} If invalid input.
+ */
+diff_match_patch.prototype.diff_fromDelta = function(text1, delta) {
+  var diffs = [];
+  var diffsLength = 0;  // Keeping our own length var is faster in JS.
+  var pointer = 0;  // Cursor in text1
+  var tokens = delta.split(/\t/g);
+  for (var x = 0; x < tokens.length; x++) {
+    // Each token begins with a one character parameter which specifies the
+    // operation of this token (delete, insert, equality).
+    var param = tokens[x].substring(1);
+    switch (tokens[x].charAt(0)) {
+      case '+':
+        try {
+          diffs[diffsLength++] =
+              new diff_match_patch.Diff(DIFF_INSERT, decodeURI(param));
+        } catch (ex) {
+          // Malformed URI sequence.
+          throw new Error('Illegal escape in diff_fromDelta: ' + param);
+        }
+        break;
+      case '-':
+        // Fall through.
+      case '=':
+        var n = parseInt(param, 10);
+        if (isNaN(n) || n < 0) {
+          throw new Error('Invalid number in diff_fromDelta: ' + param);
+        }
+        var text = text1.substring(pointer, pointer += n);
+        if (tokens[x].charAt(0) == '=') {
+          diffs[diffsLength++] = new diff_match_patch.Diff(DIFF_EQUAL, text);
+        } else {
+          diffs[diffsLength++] = new diff_match_patch.Diff(DIFF_DELETE, text);
+        }
+        break;
+      default:
+        // Blank tokens are ok (from a trailing \t).
+        // Anything else is an error.
+        if (tokens[x]) {
+          throw new Error('Invalid diff operation in diff_fromDelta: ' +
+                          tokens[x]);
+        }
+    }
+  }
+  if (pointer != text1.length) {
+    throw new Error('Delta length (' + pointer +
+        ') does not equal source text length (' + text1.length + ').');
+  }
+  return diffs;
+};
+
+
+//  MATCH FUNCTIONS
+
+
+/**
+ * Locate the best instance of 'pattern' in 'text' near 'loc'.
+ * @param {string} text The text to search.
+ * @param {string} pattern The pattern to search for.
+ * @param {number} loc The location to search around.
+ * @return {number} Best match index or -1.
+ */
+diff_match_patch.prototype.match_main = function(text, pattern, loc) {
+  // Check for null inputs.
+  if (text == null || pattern == null || loc == null) {
+    throw new Error('Null input. (match_main)');
+  }
+
+  loc = Math.max(0, Math.min(loc, text.length));
+  if (text == pattern) {
+    // Shortcut (potentially not guaranteed by the algorithm)
+    return 0;
+  } else if (!text.length) {
+    // Nothing to match.
+    return -1;
+  } else if (text.substring(loc, loc + pattern.length) == pattern) {
+    // Perfect match at the perfect spot!  (Includes case of null pattern)
+    return loc;
+  } else {
+    // Do a fuzzy compare.
+    return this.match_bitap_(text, pattern, loc);
+  }
+};
+
+
+/**
+ * Locate the best instance of 'pattern' in 'text' near 'loc' using the
+ * Bitap algorithm.
+ * @param {string} text The text to search.
+ * @param {string} pattern The pattern to search for.
+ * @param {number} loc The location to search around.
+ * @return {number} Best match index or -1.
+ * @private
+ */
+diff_match_patch.prototype.match_bitap_ = function(text, pattern, loc) {
+  if (pattern.length > this.Match_MaxBits) {
+    throw new Error('Pattern too long for this browser.');
+  }
+
+  // Initialise the alphabet.
+  var s = this.match_alphabet_(pattern);
+
+  var dmp = this;  // 'this' becomes 'window' in a closure.
+
+  /**
+   * Compute and return the score for a match with e errors and x location.
+   * Accesses loc and pattern through being a closure.
+   * @param {number} e Number of errors in match.
+   * @param {number} x Location of match.
+   * @return {number} Overall score for match (0.0 = good, 1.0 = bad).
+   * @private
+   */
+  function match_bitapScore_(e, x) {
+    var accuracy = e / pattern.length;
+    var proximity = Math.abs(loc - x);
+    if (!dmp.Match_Distance) {
+      // Dodge divide by zero error.
+      return proximity ? 1.0 : accuracy;
+    }
+    return accuracy + (proximity / dmp.Match_Distance);
+  }
+
+  // Highest score beyond which we give up.
+  var score_threshold = this.Match_Threshold;
+  // Is there a nearby exact match? (speedup)
+  var best_loc = text.indexOf(pattern, loc);
+  if (best_loc != -1) {
+    score_threshold = Math.min(match_bitapScore_(0, best_loc), score_threshold);
+    // What about in the other direction? (speedup)
+    best_loc = text.lastIndexOf(pattern, loc + pattern.length);
+    if (best_loc != -1) {
+      score_threshold =
+          Math.min(match_bitapScore_(0, best_loc), score_threshold);
+    }
+  }
+
+  // Initialise the bit arrays.
+  var matchmask = 1 << (pattern.length - 1);
+  best_loc = -1;
+
+  var bin_min, bin_mid;
+  var bin_max = pattern.length + text.length;
+  var last_rd;
+  for (var d = 0; d < pattern.length; d++) {
+    // Scan for the best match; each iteration allows for one more error.
+    // Run a binary search to determine how far from 'loc' we can stray at this
+    // error level.
+    bin_min = 0;
+    bin_mid = bin_max;
+    while (bin_min < bin_mid) {
+      if (match_bitapScore_(d, loc + bin_mid) <= score_threshold) {
+        bin_min = bin_mid;
+      } else {
+        bin_max = bin_mid;
+      }
+      bin_mid = Math.floor((bin_max - bin_min) / 2 + bin_min);
+    }
+    // Use the result from this iteration as the maximum for the next.
+    bin_max = bin_mid;
+    var start = Math.max(1, loc - bin_mid + 1);
+    var finish = Math.min(loc + bin_mid, text.length) + pattern.length;
+
+    var rd = Array(finish + 2);
+    rd[finish + 1] = (1 << d) - 1;
+    for (var j = finish; j >= start; j--) {
+      // The alphabet (s) is a sparse hash, so the following line generates
+      // warnings.
+      var charMatch = s[text.charAt(j - 1)];
+      if (d === 0) {  // First pass: exact match.
+        rd[j] = ((rd[j + 1] << 1) | 1) & charMatch;
+      } else {  // Subsequent passes: fuzzy match.
+        rd[j] = (((rd[j + 1] << 1) | 1) & charMatch) |
+                (((last_rd[j + 1] | last_rd[j]) << 1) | 1) |
+                last_rd[j + 1];
+      }
+      if (rd[j] & matchmask) {
+        var score = match_bitapScore_(d, j - 1);
+        // This match will almost certainly be better than any existing match.
+        // But check anyway.
+        if (score <= score_threshold) {
+          // Told you so.
+          score_threshold = score;
+          best_loc = j - 1;
+          if (best_loc > loc) {
+            // When passing loc, don't exceed our current distance from loc.
+            start = Math.max(1, 2 * loc - best_loc);
+          } else {
+            // Already passed loc, downhill from here on in.
+            break;
+          }
+        }
+      }
+    }
+    // No hope for a (better) match at greater error levels.
+    if (match_bitapScore_(d + 1, loc) > score_threshold) {
+      break;
+    }
+    last_rd = rd;
+  }
+  return best_loc;
+};
+
+
+/**
+ * Initialise the alphabet for the Bitap algorithm.
+ * @param {string} pattern The text to encode.
+ * @return {!Object} Hash of character locations.
+ * @private
+ */
+diff_match_patch.prototype.match_alphabet_ = function(pattern) {
+  var s = {};
+  for (var i = 0; i < pattern.length; i++) {
+    s[pattern.charAt(i)] = 0;
+  }
+  for (var i = 0; i < pattern.length; i++) {
+    s[pattern.charAt(i)] |= 1 << (pattern.length - i - 1);
+  }
+  return s;
+};
+
+
+//  PATCH FUNCTIONS
+
+
+/**
+ * Increase the context until it is unique,
+ * but don't let the pattern expand beyond Match_MaxBits.
+ * @param {!diff_match_patch.patch_obj} patch The patch to grow.
+ * @param {string} text Source text.
+ * @private
+ */
+diff_match_patch.prototype.patch_addContext_ = function(patch, text) {
+  if (text.length == 0) {
+    return;
+  }
+  if (patch.start2 === null) {
+    throw Error('patch not initialized');
+  }
+  var pattern = text.substring(patch.start2, patch.start2 + patch.length1);
+  var padding = 0;
+
+  // Look for the first and last matches of pattern in text.  If two different
+  // matches are found, increase the pattern length.
+  while (text.indexOf(pattern) != text.lastIndexOf(pattern) &&
+         pattern.length < this.Match_MaxBits - this.Patch_Margin -
+         this.Patch_Margin) {
+    padding += this.Patch_Margin;
+    pattern = text.substring(patch.start2 - padding,
+                             patch.start2 + patch.length1 + padding);
+  }
+  // Add one chunk for good luck.
+  padding += this.Patch_Margin;
+
+  // Add the prefix.
+  var prefix = text.substring(patch.start2 - padding, patch.start2);
+  if (prefix) {
+    patch.diffs.unshift(new diff_match_patch.Diff(DIFF_EQUAL, prefix));
+  }
+  // Add the suffix.
+  var suffix = text.substring(patch.start2 + patch.length1,
+                              patch.start2 + patch.length1 + padding);
+  if (suffix) {
+    patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, suffix));
+  }
+
+  // Roll back the start points.
+  patch.start1 -= prefix.length;
+  patch.start2 -= prefix.length;
+  // Extend the lengths.
+  patch.length1 += prefix.length + suffix.length;
+  patch.length2 += prefix.length + suffix.length;
+};
+
+
+/**
+ * Compute a list of patches to turn text1 into text2.
+ * Use diffs if provided, otherwise compute it ourselves.
+ * There are four ways to call this function, depending on what data is
+ * available to the caller:
+ * Method 1:
+ * a = text1, b = text2
+ * Method 2:
+ * a = diffs
+ * Method 3 (optimal):
+ * a = text1, b = diffs
+ * Method 4 (deprecated, use method 3):
+ * a = text1, b = text2, c = diffs
+ *
+ * @param {string|!Array.<!diff_match_patch.Diff>} a text1 (methods 1,3,4) or
+ * Array of diff tuples for text1 to text2 (method 2).
+ * @param {string|!Array.<!diff_match_patch.Diff>=} opt_b text2 (methods 1,4) or
+ * Array of diff tuples for text1 to text2 (method 3) or undefined (method 2).
+ * @param {string|!Array.<!diff_match_patch.Diff>=} opt_c Array of diff tuples
+ * for text1 to text2 (method 4) or undefined (methods 1,2,3).
+ * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects.
+ */
+diff_match_patch.prototype.patch_make = function(a, opt_b, opt_c) {
+  var text1, diffs;
+  if (typeof a == 'string' && typeof opt_b == 'string' &&
+      typeof opt_c == 'undefined') {
+    // Method 1: text1, text2
+    // Compute diffs from text1 and text2.
+    text1 = /** @type {string} */(a);
+    diffs = this.diff_main(text1, /** @type {string} */(opt_b), true);
+    if (diffs.length > 2) {
+      this.diff_cleanupSemantic(diffs);
+      this.diff_cleanupEfficiency(diffs);
+    }
+  } else if (a && typeof a == 'object' && typeof opt_b == 'undefined' &&
+      typeof opt_c == 'undefined') {
+    // Method 2: diffs
+    // Compute text1 from diffs.
+    diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(a);
+    text1 = this.diff_text1(diffs);
+  } else if (typeof a == 'string' && opt_b && typeof opt_b == 'object' &&
+      typeof opt_c == 'undefined') {
+    // Method 3: text1, diffs
+    text1 = /** @type {string} */(a);
+    diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(opt_b);
+  } else if (typeof a == 'string' && typeof opt_b == 'string' &&
+      opt_c && typeof opt_c == 'object') {
+    // Method 4: text1, text2, diffs
+    // text2 is not used.
+    text1 = /** @type {string} */(a);
+    diffs = /** @type {!Array.<!diff_match_patch.Diff>} */(opt_c);
+  } else {
+    throw new Error('Unknown call format to patch_make.');
+  }
+
+  if (diffs.length === 0) {
+    return [];  // Get rid of the null case.
+  }
+  var patches = [];
+  var patch = new diff_match_patch.patch_obj();
+  var patchDiffLength = 0;  // Keeping our own length var is faster in JS.
+  var char_count1 = 0;  // Number of characters into the text1 string.
+  var char_count2 = 0;  // Number of characters into the text2 string.
+  // Start with text1 (prepatch_text) and apply the diffs until we arrive at
+  // text2 (postpatch_text).  We recreate the patches one by one to determine
+  // context info.
+  var prepatch_text = text1;
+  var postpatch_text = text1;
+  for (var x = 0; x < diffs.length; x++) {
+    var diff_type = diffs[x][0];
+    var diff_text = diffs[x][1];
+
+    if (!patchDiffLength && diff_type !== DIFF_EQUAL) {
+      // A new patch starts here.
+      patch.start1 = char_count1;
+      patch.start2 = char_count2;
+    }
+
+    switch (diff_type) {
+      case DIFF_INSERT:
+        patch.diffs[patchDiffLength++] = diffs[x];
+        patch.length2 += diff_text.length;
+        postpatch_text = postpatch_text.substring(0, char_count2) + diff_text +
+                         postpatch_text.substring(char_count2);
+        break;
+      case DIFF_DELETE:
+        patch.length1 += diff_text.length;
+        patch.diffs[patchDiffLength++] = diffs[x];
+        postpatch_text = postpatch_text.substring(0, char_count2) +
+                         postpatch_text.substring(char_count2 +
+                             diff_text.length);
+        break;
+      case DIFF_EQUAL:
+        if (diff_text.length <= 2 * this.Patch_Margin &&
+            patchDiffLength && diffs.length != x + 1) {
+          // Small equality inside a patch.
+          patch.diffs[patchDiffLength++] = diffs[x];
+          patch.length1 += diff_text.length;
+          patch.length2 += diff_text.length;
+        } else if (diff_text.length >= 2 * this.Patch_Margin) {
+          // Time for a new patch.
+          if (patchDiffLength) {
+            this.patch_addContext_(patch, prepatch_text);
+            patches.push(patch);
+            patch = new diff_match_patch.patch_obj();
+            patchDiffLength = 0;
+            // Unlike Unidiff, our patch lists have a rolling context.
+            // https://github.com/google/diff-match-patch/wiki/Unidiff
+            // Update prepatch text & pos to reflect the application of the
+            // just completed patch.
+            prepatch_text = postpatch_text;
+            char_count1 = char_count2;
+          }
+        }
+        break;
+    }
+
+    // Update the current character count.
+    if (diff_type !== DIFF_INSERT) {
+      char_count1 += diff_text.length;
+    }
+    if (diff_type !== DIFF_DELETE) {
+      char_count2 += diff_text.length;
+    }
+  }
+  // Pick up the leftover patch if not empty.
+  if (patchDiffLength) {
+    this.patch_addContext_(patch, prepatch_text);
+    patches.push(patch);
+  }
+
+  return patches;
+};
+
+
+/**
+ * Given an array of patches, return another array that is identical.
+ * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
+ * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects.
+ */
+diff_match_patch.prototype.patch_deepCopy = function(patches) {
+  // Making deep copies is hard in JavaScript.
+  var patchesCopy = [];
+  for (var x = 0; x < patches.length; x++) {
+    var patch = patches[x];
+    var patchCopy = new diff_match_patch.patch_obj();
+    patchCopy.diffs = [];
+    for (var y = 0; y < patch.diffs.length; y++) {
+      patchCopy.diffs[y] =
+          new diff_match_patch.Diff(patch.diffs[y][0], patch.diffs[y][1]);
+    }
+    patchCopy.start1 = patch.start1;
+    patchCopy.start2 = patch.start2;
+    patchCopy.length1 = patch.length1;
+    patchCopy.length2 = patch.length2;
+    patchesCopy[x] = patchCopy;
+  }
+  return patchesCopy;
+};
+
+
+/**
+ * Merge a set of patches onto the text.  Return a patched text, as well
+ * as a list of true/false values indicating which patches were applied.
+ * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
+ * @param {string} text Old text.
+ * @return {!Array.<string|!Array.<boolean>>} Two element Array, containing the
+ *      new text and an array of boolean values.
+ */
+diff_match_patch.prototype.patch_apply = function(patches, text) {
+  if (patches.length == 0) {
+    return [text, []];
+  }
+
+  // Deep copy the patches so that no changes are made to originals.
+  patches = this.patch_deepCopy(patches);
+
+  var nullPadding = this.patch_addPadding(patches);
+  text = nullPadding + text + nullPadding;
+
+  this.patch_splitMax(patches);
+  // delta keeps track of the offset between the expected and actual location
+  // of the previous patch.  If there are patches expected at positions 10 and
+  // 20, but the first patch was found at 12, delta is 2 and the second patch
+  // has an effective expected position of 22.
+  var delta = 0;
+  var results = [];
+  for (var x = 0; x < patches.length; x++) {
+    var expected_loc = patches[x].start2 + delta;
+    var text1 = this.diff_text1(patches[x].diffs);
+    var start_loc;
+    var end_loc = -1;
+    if (text1.length > this.Match_MaxBits) {
+      // patch_splitMax will only provide an oversized pattern in the case of
+      // a monster delete.
+      start_loc = this.match_main(text, text1.substring(0, this.Match_MaxBits),
+                                  expected_loc);
+      if (start_loc != -1) {
+        end_loc = this.match_main(text,
+            text1.substring(text1.length - this.Match_MaxBits),
+            expected_loc + text1.length - this.Match_MaxBits);
+        if (end_loc == -1 || start_loc >= end_loc) {
+          // Can't find valid trailing context.  Drop this patch.
+          start_loc = -1;
+        }
+      }
+    } else {
+      start_loc = this.match_main(text, text1, expected_loc);
+    }
+    if (start_loc == -1) {
+      // No match found.  :(
+      results[x] = false;
+      // Subtract the delta for this failed patch from subsequent patches.
+      delta -= patches[x].length2 - patches[x].length1;
+    } else {
+      // Found a match.  :)
+      results[x] = true;
+      delta = start_loc - expected_loc;
+      var text2;
+      if (end_loc == -1) {
+        text2 = text.substring(start_loc, start_loc + text1.length);
+      } else {
+        text2 = text.substring(start_loc, end_loc + this.Match_MaxBits);
+      }
+      if (text1 == text2) {
+        // Perfect match, just shove the replacement text in.
+        text = text.substring(0, start_loc) +
+               this.diff_text2(patches[x].diffs) +
+               text.substring(start_loc + text1.length);
+      } else {
+        // Imperfect match.  Run a diff to get a framework of equivalent
+        // indices.
+        var diffs = this.diff_main(text1, text2, false);
+        if (text1.length > this.Match_MaxBits &&
+            this.diff_levenshtein(diffs) / text1.length >
+            this.Patch_DeleteThreshold) {
+          // The end points match, but the content is unacceptably bad.
+          results[x] = false;
+        } else {
+          this.diff_cleanupSemanticLossless(diffs);
+          var index1 = 0;
+          var index2;
+          for (var y = 0; y < patches[x].diffs.length; y++) {
+            var mod = patches[x].diffs[y];
+            if (mod[0] !== DIFF_EQUAL) {
+              index2 = this.diff_xIndex(diffs, index1);
+            }
+            if (mod[0] === DIFF_INSERT) {  // Insertion
+              text = text.substring(0, start_loc + index2) + mod[1] +
+                     text.substring(start_loc + index2);
+            } else if (mod[0] === DIFF_DELETE) {  // Deletion
+              text = text.substring(0, start_loc + index2) +
+                     text.substring(start_loc + this.diff_xIndex(diffs,
+                         index1 + mod[1].length));
+            }
+            if (mod[0] !== DIFF_DELETE) {
+              index1 += mod[1].length;
+            }
+          }
+        }
+      }
+    }
+  }
+  // Strip the padding off.
+  text = text.substring(nullPadding.length, text.length - nullPadding.length);
+  return [text, results];
+};
+
+
+/**
+ * Add some padding on text start and end so that edges can match something.
+ * Intended to be called only from within patch_apply.
+ * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
+ * @return {string} The padding string added to each side.
+ */
+diff_match_patch.prototype.patch_addPadding = function(patches) {
+  var paddingLength = this.Patch_Margin;
+  var nullPadding = '';
+  for (var x = 1; x <= paddingLength; x++) {
+    nullPadding += String.fromCharCode(x);
+  }
+
+  // Bump all the patches forward.
+  for (var x = 0; x < patches.length; x++) {
+    patches[x].start1 += paddingLength;
+    patches[x].start2 += paddingLength;
+  }
+
+  // Add some padding on start of first diff.
+  var patch = patches[0];
+  var diffs = patch.diffs;
+  if (diffs.length == 0 || diffs[0][0] != DIFF_EQUAL) {
+    // Add nullPadding equality.
+    diffs.unshift(new diff_match_patch.Diff(DIFF_EQUAL, nullPadding));
+    patch.start1 -= paddingLength;  // Should be 0.
+    patch.start2 -= paddingLength;  // Should be 0.
+    patch.length1 += paddingLength;
+    patch.length2 += paddingLength;
+  } else if (paddingLength > diffs[0][1].length) {
+    // Grow first equality.
+    var extraLength = paddingLength - diffs[0][1].length;
+    diffs[0][1] = nullPadding.substring(diffs[0][1].length) + diffs[0][1];
+    patch.start1 -= extraLength;
+    patch.start2 -= extraLength;
+    patch.length1 += extraLength;
+    patch.length2 += extraLength;
+  }
+
+  // Add some padding on end of last diff.
+  patch = patches[patches.length - 1];
+  diffs = patch.diffs;
+  if (diffs.length == 0 || diffs[diffs.length - 1][0] != DIFF_EQUAL) {
+    // Add nullPadding equality.
+    diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, nullPadding));
+    patch.length1 += paddingLength;
+    patch.length2 += paddingLength;
+  } else if (paddingLength > diffs[diffs.length - 1][1].length) {
+    // Grow last equality.
+    var extraLength = paddingLength - diffs[diffs.length - 1][1].length;
+    diffs[diffs.length - 1][1] += nullPadding.substring(0, extraLength);
+    patch.length1 += extraLength;
+    patch.length2 += extraLength;
+  }
+
+  return nullPadding;
+};
+
+
+/**
+ * Look through the patches and break up any which are longer than the maximum
+ * limit of the match algorithm.
+ * Intended to be called only from within patch_apply.
+ * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
+ */
+diff_match_patch.prototype.patch_splitMax = function(patches) {
+  var patch_size = this.Match_MaxBits;
+  for (var x = 0; x < patches.length; x++) {
+    if (patches[x].length1 <= patch_size) {
+      continue;
+    }
+    var bigpatch = patches[x];
+    // Remove the big old patch.
+    patches.splice(x--, 1);
+    var start1 = bigpatch.start1;
+    var start2 = bigpatch.start2;
+    var precontext = '';
+    while (bigpatch.diffs.length !== 0) {
+      // Create one of several smaller patches.
+      var patch = new diff_match_patch.patch_obj();
+      var empty = true;
+      patch.start1 = start1 - precontext.length;
+      patch.start2 = start2 - precontext.length;
+      if (precontext !== '') {
+        patch.length1 = patch.length2 = precontext.length;
+        patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, precontext));
+      }
+      while (bigpatch.diffs.length !== 0 &&
+             patch.length1 < patch_size - this.Patch_Margin) {
+        var diff_type = bigpatch.diffs[0][0];
+        var diff_text = bigpatch.diffs[0][1];
+        if (diff_type === DIFF_INSERT) {
+          // Insertions are harmless.
+          patch.length2 += diff_text.length;
+          start2 += diff_text.length;
+          patch.diffs.push(bigpatch.diffs.shift());
+          empty = false;
+        } else if (diff_type === DIFF_DELETE && patch.diffs.length == 1 &&
+                   patch.diffs[0][0] == DIFF_EQUAL &&
+                   diff_text.length > 2 * patch_size) {
+          // This is a large deletion.  Let it pass in one chunk.
+          patch.length1 += diff_text.length;
+          start1 += diff_text.length;
+          empty = false;
+          patch.diffs.push(new diff_match_patch.Diff(diff_type, diff_text));
+          bigpatch.diffs.shift();
+        } else {
+          // Deletion or equality.  Only take as much as we can stomach.
+          diff_text = diff_text.substring(0,
+              patch_size - patch.length1 - this.Patch_Margin);
+          patch.length1 += diff_text.length;
+          start1 += diff_text.length;
+          if (diff_type === DIFF_EQUAL) {
+            patch.length2 += diff_text.length;
+            start2 += diff_text.length;
+          } else {
+            empty = false;
+          }
+          patch.diffs.push(new diff_match_patch.Diff(diff_type, diff_text));
+          if (diff_text == bigpatch.diffs[0][1]) {
+            bigpatch.diffs.shift();
+          } else {
+            bigpatch.diffs[0][1] =
+                bigpatch.diffs[0][1].substring(diff_text.length);
+          }
+        }
+      }
+      // Compute the head context for the next patch.
+      precontext = this.diff_text2(patch.diffs);
+      precontext =
+          precontext.substring(precontext.length - this.Patch_Margin);
+      // Append the end context for this patch.
+      var postcontext = this.diff_text1(bigpatch.diffs)
+                            .substring(0, this.Patch_Margin);
+      if (postcontext !== '') {
+        patch.length1 += postcontext.length;
+        patch.length2 += postcontext.length;
+        if (patch.diffs.length !== 0 &&
+            patch.diffs[patch.diffs.length - 1][0] === DIFF_EQUAL) {
+          patch.diffs[patch.diffs.length - 1][1] += postcontext;
+        } else {
+          patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, postcontext));
+        }
+      }
+      if (!empty) {
+        patches.splice(++x, 0, patch);
+      }
+    }
+  }
+};
+
+
+/**
+ * Take a list of patches and return a textual representation.
+ * @param {!Array.<!diff_match_patch.patch_obj>} patches Array of Patch objects.
+ * @return {string} Text representation of patches.
+ */
+diff_match_patch.prototype.patch_toText = function(patches) {
+  var text = [];
+  for (var x = 0; x < patches.length; x++) {
+    text[x] = patches[x];
+  }
+  return text.join('');
+};
+
+
+/**
+ * Parse a textual representation of patches and return a list of Patch objects.
+ * @param {string} textline Text representation of patches.
+ * @return {!Array.<!diff_match_patch.patch_obj>} Array of Patch objects.
+ * @throws {!Error} If invalid input.
+ */
+diff_match_patch.prototype.patch_fromText = function(textline) {
+  var patches = [];
+  if (!textline) {
+    return patches;
+  }
+  var text = textline.split('\n');
+  var textPointer = 0;
+  var patchHeader = /^@@ -(\d+),?(\d*) \+(\d+),?(\d*) @@$/;
+  while (textPointer < text.length) {
+    var m = text[textPointer].match(patchHeader);
+    if (!m) {
+      throw new Error('Invalid patch string: ' + text[textPointer]);
+    }
+    var patch = new diff_match_patch.patch_obj();
+    patches.push(patch);
+    patch.start1 = parseInt(m[1], 10);
+    if (m[2] === '') {
+      patch.start1--;
+      patch.length1 = 1;
+    } else if (m[2] == '0') {
+      patch.length1 = 0;
+    } else {
+      patch.start1--;
+      patch.length1 = parseInt(m[2], 10);
+    }
+
+    patch.start2 = parseInt(m[3], 10);
+    if (m[4] === '') {
+      patch.start2--;
+      patch.length2 = 1;
+    } else if (m[4] == '0') {
+      patch.length2 = 0;
+    } else {
+      patch.start2--;
+      patch.length2 = parseInt(m[4], 10);
+    }
+    textPointer++;
+
+    while (textPointer < text.length) {
+      var sign = text[textPointer].charAt(0);
+      try {
+        var line = decodeURI(text[textPointer].substring(1));
+      } catch (ex) {
+        // Malformed URI sequence.
+        throw new Error('Illegal escape in patch_fromText: ' + line);
+      }
+      if (sign == '-') {
+        // Deletion.
+        patch.diffs.push(new diff_match_patch.Diff(DIFF_DELETE, line));
+      } else if (sign == '+') {
+        // Insertion.
+        patch.diffs.push(new diff_match_patch.Diff(DIFF_INSERT, line));
+      } else if (sign == ' ') {
+        // Minor equality.
+        patch.diffs.push(new diff_match_patch.Diff(DIFF_EQUAL, line));
+      } else if (sign == '@') {
+        // Start of next patch.
+        break;
+      } else if (sign === '') {
+        // Blank line?  Whatever.
+      } else {
+        // WTF?
+        throw new Error('Invalid patch mode "' + sign + '" in: ' + line);
+      }
+      textPointer++;
+    }
+  }
+  return patches;
+};
+
+
+/**
+ * Class representing one patch operation.
+ * @constructor
+ */
+diff_match_patch.patch_obj = function() {
+  /** @type {!Array.<!diff_match_patch.Diff>} */
+  this.diffs = [];
+  /** @type {?number} */
+  this.start1 = null;
+  /** @type {?number} */
+  this.start2 = null;
+  /** @type {number} */
+  this.length1 = 0;
+  /** @type {number} */
+  this.length2 = 0;
+};
+
+
+/**
+ * Emulate GNU diff's format.
+ * Header: @@ -382,8 +481,9 @@
+ * Indices are printed as 1-based, not 0-based.
+ * @return {string} The GNU diff string.
+ */
+diff_match_patch.patch_obj.prototype.toString = function() {
+  var coords1, coords2;
+  if (this.length1 === 0) {
+    coords1 = this.start1 + ',0';
+  } else if (this.length1 == 1) {
+    coords1 = this.start1 + 1;
+  } else {
+    coords1 = (this.start1 + 1) + ',' + this.length1;
+  }
+  if (this.length2 === 0) {
+    coords2 = this.start2 + ',0';
+  } else if (this.length2 == 1) {
+    coords2 = this.start2 + 1;
+  } else {
+    coords2 = (this.start2 + 1) + ',' + this.length2;
+  }
+  var text = ['@@ -' + coords1 + ' +' + coords2 + ' @@\n'];
+  var op;
+  // Escape the body of the patch with %xx notation.
+  for (var x = 0; x < this.diffs.length; x++) {
+    switch (this.diffs[x][0]) {
+      case DIFF_INSERT:
+        op = '+';
+        break;
+      case DIFF_DELETE:
+        op = '-';
+        break;
+      case DIFF_EQUAL:
+        op = ' ';
+        break;
+    }
+    text[x + 1] = op + encodeURI(this.diffs[x][1]) + '\n';
+  }
+  return text.join('').replace(/%20/g, ' ');
+};
+
+// CLOSURE:begin_strip
+// Lines below here will not be included in the Closure-compatible library.
+
+// Export these global variables so that they survive Google's JS compiler.
+// In a browser, 'this' will be 'window'.
+// Users of node.js should 'require' the uncompressed version since Google's
+// JS compiler may break the following exports for non-browser environments.
+/** @suppress {globalThis} */
+this['diff_match_patch'] = diff_match_patch;
+/** @suppress {globalThis} */
+this['DIFF_DELETE'] = DIFF_DELETE;
+/** @suppress {globalThis} */
+this['DIFF_INSERT'] = DIFF_INSERT;
+/** @suppress {globalThis} */
+this['DIFF_EQUAL'] = DIFF_EQUAL;

From 55ccf083c836043c7c242448762571494d41a75d Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 19:32:36 -0500
Subject: [PATCH 37/50] Add debug diff view

---
 background.js        | 11 ++++++++++-
 options/options.html |  6 ++++++
 options/options.js   | 12 +++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/background.js b/background.js
index b5667e6..58a5de5 100644
--- a/background.js
+++ b/background.js
@@ -33,6 +33,7 @@ let userTheme = 'auto';
 let currentTheme = 'light';
 let detectSystemTheme;
 let errorPending = false;
+let showDebugTab = false;
 const ERROR_NOTIFICATION_ID = 'sortana-error';
 
 function normalizeRules(rules) {
@@ -262,12 +263,16 @@ async function processMessage(id) {
     try {
         const full = await messenger.messages.getFull(id);
         let text = buildEmailText(full);
+        const originalText = text;
         if (tokenReduction && maxTokens > 0) {
             const limit = Math.floor(maxTokens * 0.9);
             if (text.length > limit) {
                 text = text.slice(0, limit);
             }
         }
+        if (showDebugTab) {
+            await storage.local.set({ lastFullText: originalText, lastPromptText: text });
+        }
         let hdr;
         let currentTags = [];
         let alreadyRead = false;
@@ -425,7 +430,7 @@ async function clearCacheForMessages(idsInput) {
     }
 
     try {
-        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "errorPending"]);
+        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "errorPending", "showDebugTab"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -440,6 +445,7 @@ async function clearCacheForMessages(idsInput) {
             maxTokens = parseInt(store.aiParams.max_tokens) || maxTokens;
         }
         errorPending = store.errorPending === true;
+        showDebugTab = store.showDebugTab === true;
         const savedStats = await storage.local.get('classifyStats');
         if (savedStats.classifyStats && typeof savedStats.classifyStats === 'object') {
             Object.assign(timingStats, savedStats.classifyStats);
@@ -494,6 +500,9 @@ async function clearCacheForMessages(idsInput) {
                 tokenReduction = changes.tokenReduction.newValue === true;
                 logger.aiLog("tokenReduction updated from storage change", { debug: true }, tokenReduction);
             }
+            if (changes.showDebugTab) {
+                showDebugTab = changes.showDebugTab.newValue === true;
+            }
             if (changes.errorPending) {
                 errorPending = changes.errorPending.newValue === true;
                 updateActionIcon();
diff --git a/options/options.html b/options/options.html
index d14ce99..3618a20 100644
--- a/options/options.html
+++ b/options/options.html
@@ -31,6 +31,10 @@
         .tag {
             --bulma-tag-h: 318;
         }
+        #diff-display {
+            white-space: pre-wrap;
+            font-family: monospace;
+        }
     </style>
 </head>
 <body>
@@ -286,9 +290,11 @@
                     <span>Debug</span>
                 </h2>
                 <pre id="payload-display"></pre>
+                <div id="diff-display" class="mt-4"></div>
             </div>
         </div>
     </section>
+    <script src="../resources/js/diff_match_patch_uncompressed.js"></script>
     <script src="options.js"></script>
 </body>
 </html>
diff --git a/options/options.js b/options/options.js
index ebd7497..3a09d37 100644
--- a/options/options.js
+++ b/options/options.js
@@ -21,7 +21,9 @@ document.addEventListener('DOMContentLoaded', async () => {
         'aiCache',
         'theme',
         'showDebugTab',
-        'lastPayload'
+        'lastPayload',
+        'lastFullText',
+        'lastPromptText'
     ]);
     const tabButtons = document.querySelectorAll('#main-tabs li');
     const tabs = document.querySelectorAll('.tab-content');
@@ -67,9 +69,17 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     await applyTheme(themeSelect.value);
     const payloadDisplay = document.getElementById('payload-display');
+    const diffDisplay = document.getElementById('diff-display');
     if (defaults.lastPayload) {
         payloadDisplay.textContent = JSON.stringify(defaults.lastPayload, null, 2);
     }
+    if (defaults.lastFullText && defaults.lastPromptText && diff_match_patch) {
+        const dmp = new diff_match_patch();
+        dmp.Diff_EditCost = 4;
+        const diffs = dmp.diff_main(defaults.lastFullText, defaults.lastPromptText);
+        dmp.diff_cleanupEfficiency(diffs);
+        diffDisplay.innerHTML = dmp.diff_prettyHtml(diffs);
+    }
     themeSelect.addEventListener('change', async () => {
         markDirty();
         await applyTheme(themeSelect.value);

From 841a697c69a9204bcaf7c22c30be8fd5259837f5 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 19:46:44 -0500
Subject: [PATCH 38/50] Update debug tab with live refresh

---
 README.md          |  2 +-
 options/options.js | 37 +++++++++++++++++++++++++++++++++----
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 64fbf26..82649d0 100644
--- a/README.md
+++ b/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 sent to the AI service.
+- **Debug tab** – view the last request payload and message diff with live updates.
 - **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.
diff --git a/options/options.js b/options/options.js
index 3a09d37..3402dcf 100644
--- a/options/options.js
+++ b/options/options.js
@@ -70,13 +70,18 @@ document.addEventListener('DOMContentLoaded', async () => {
     await applyTheme(themeSelect.value);
     const payloadDisplay = document.getElementById('payload-display');
     const diffDisplay = document.getElementById('diff-display');
-    if (defaults.lastPayload) {
-        payloadDisplay.textContent = JSON.stringify(defaults.lastPayload, null, 2);
+
+    let lastFullText = defaults.lastFullText || '';
+    let lastPromptText = defaults.lastPromptText || '';
+    let lastPayload = defaults.lastPayload ? JSON.stringify(defaults.lastPayload, null, 2) : '';
+
+    if (lastPayload) {
+        payloadDisplay.textContent = lastPayload;
     }
-    if (defaults.lastFullText && defaults.lastPromptText && diff_match_patch) {
+    if (lastFullText && lastPromptText && diff_match_patch) {
         const dmp = new diff_match_patch();
         dmp.Diff_EditCost = 4;
-        const diffs = dmp.diff_main(defaults.lastFullText, defaults.lastPromptText);
+        const diffs = dmp.diff_main(lastFullText, lastPromptText);
         dmp.diff_cleanupEfficiency(diffs);
         diffDisplay.innerHTML = dmp.diff_prettyHtml(diffs);
     }
@@ -729,6 +734,30 @@ document.addEventListener('DOMContentLoaded', async () => {
         } catch {
             cacheCountEl.textContent = '?';
         }
+
+        try {
+            if (debugTabToggle.checked) {
+                const latest = await storage.local.get(['lastPayload', 'lastFullText', 'lastPromptText']);
+                const payloadStr = latest.lastPayload ? JSON.stringify(latest.lastPayload, null, 2) : '';
+                if (payloadStr !== lastPayload) {
+                    lastPayload = payloadStr;
+                    payloadDisplay.textContent = payloadStr;
+                }
+                if (latest.lastFullText !== lastFullText || latest.lastPromptText !== lastPromptText) {
+                    lastFullText = latest.lastFullText || '';
+                    lastPromptText = latest.lastPromptText || '';
+                    if (lastFullText && lastPromptText && diff_match_patch) {
+                        const dmp = new diff_match_patch();
+                        dmp.Diff_EditCost = 4;
+                        const diffs = dmp.diff_main(lastFullText, lastPromptText);
+                        dmp.diff_cleanupEfficiency(diffs);
+                        diffDisplay.innerHTML = dmp.diff_prettyHtml(diffs);
+                    } else {
+                        diffDisplay.innerHTML = '';
+                    }
+                }
+            }
+        } catch {}
     }
 
     refreshMaintenance();

From bcac4ad01709c85002e2f8123406bacffcf1d4cd Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 21:58:37 -0500
Subject: [PATCH 39/50] Improve debug tab layout

---
 options/options.html | 15 +++++++++------
 options/options.js   | 22 ++++++++++++++++++++--
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/options/options.html b/options/options.html
index 3618a20..ddc5ee0 100644
--- a/options/options.html
+++ b/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>
diff --git a/options/options.js b/options/options.js
index 3402dcf..d881d6a 100644
--- a/options/options.js
+++ b/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);
-        diffDisplay.innerHTML = dmp.diff_prettyHtml(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);
-                        diffDisplay.innerHTML = dmp.diff_prettyHtml(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');
                     }
                 }
             }

From 9cad2674e3841fbc40d237f7233fbd6784f61760 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Sat, 19 Jul 2025 22:44:04 -0500
Subject: [PATCH 40/50] Capture raw message text for debug

---
 README.md     |  2 +-
 background.js | 31 ++++++++++++++++++++++++++-----
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 82649d0..57a0285 100644
--- a/README.md
+++ b/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.
diff --git a/background.js b/background.js
index 58a5de5..fc585ff 100644
--- a/background.js
+++ b/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) {

From c622c07c66a6936c4c8d3bb039b1f0bba4692384 Mon Sep 17 00:00:00 2001
From: Jordan Wages <jordan@jordanwages.com>
Date: Mon, 18 Aug 2025 19:39:35 -0500
Subject: [PATCH 41/50] Supporting v140+

After testing in Betterbird v140, updating manifest.
---
 manifest.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest.json b/manifest.json
index a3c9f7c..e7cb9d8 100644
--- a/manifest.json
+++ b/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": {

From 0f2f148b71913b89489cf72ab6bc0efc263c1064 Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Tue, 6 Jan 2026 20:45:31 -0600
Subject: [PATCH 42/50] Normalize completions endpoint base

---
 AGENTS.md               |  5 ++++-
 README.md               | 11 ++++++-----
 modules/AiClassifier.js | 41 +++++++++++++++++++++++++++++++++++++----
 options/options.html    |  1 +
 options/options.js      | 18 ++++++++++++++++--
 5 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 401f962..e2a1696 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -30,6 +30,10 @@ This file provides guidelines for codex agents contributing to the Sortana proje
 
 There are currently no automated tests for this project. If you add tests in the future, specify the commands to run them here. For now, verification must happen manually in Thunderbird. Do **not** run the `ps1` build script or the SVG processing script.
 
+## Endpoint Notes
+
+Sortana targets the `/v1/completions` API. The endpoint value stored in settings is a base URL; the full request URL is constructed by appending `/v1/completions` (adding a slash when needed) and defaulting to `https://` if no scheme is provided.
+
 ## Documentation
 
 Additional documentation exists outside this repository.
@@ -73,4 +77,3 @@ Toolbar and menu icons reside under `resources/img` and are provided in 16, 32
 and 64 pixel variants. When changing these icons, pass a dictionary mapping the
 sizes to the paths in `browserAction.setIcon` or `messageDisplayAction.setIcon`.
 Use `resources/svg2img.ps1` to regenerate PNGs from the SVG sources.
-
diff --git a/README.md b/README.md
index 57a0285..2f8f204 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,13 @@
 
 Sortana is an experimental Thunderbird add-on that integrates an AI-powered filter rule. 
 It allows you to classify email messages by sending their contents to a configurable
-HTTP endpoint. The endpoint should respond with JSON indicating whether the
-message meets a specified criterion.
+HTTP endpoint. Sortana uses the `/v1/completions` API; the options page stores a base
+URL and appends `/v1/completions` when sending requests. The endpoint should respond
+with JSON indicating whether the message meets a specified criterion.
 
 ## Features
 
-- **Configurable endpoint** – set the classification service URL on the options page.
+- **Configurable endpoint** – set the classification service base URL on the options page.
 - **Prompt templates** – choose between several model formats or provide your own custom template.
 - **Custom system prompts** – tailor the instructions sent to the model for more precise results.
 - **Persistent result caching** – classification results and reasoning are saved to disk so messages aren't re-evaluated across restarts.
@@ -72,7 +73,8 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 
 ## Usage
 
-1. Open the add-on's options and set the URL of your classification service.
+1. Open the add-on's options and set the base URL of your classification service
+   (Sortana will append `/v1/completions`).
  2. Use the **Classification Rules** section to add a criterion and optional
    actions such as tagging, moving, copying, forwarding, replying,
    deleting or archiving a message when it matches. Drag rules to
@@ -158,4 +160,3 @@ how Thunderbird's WebExtension and experiment APIs can be extended. Their code
 provided invaluable guidance during development.
 
 - Icons from [cc0-icons.jonh.eu](https://cc0-icons.jonh.eu/) are used under the CC0 license.
-
diff --git a/modules/AiClassifier.js b/modules/AiClassifier.js
index 8313654..f5a3bff 100644
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@@ -15,6 +15,8 @@ try {
   Services = undefined;
 }
 
+const COMPLETIONS_PATH = "/v1/completions";
+
 const SYSTEM_PREFIX = `You are an email-classification assistant.
 Read the email below and the classification criterion provided by the user.
 `;
@@ -28,7 +30,8 @@ Return ONLY a JSON object on a single line of the form:
 
 Do not add any other keys, text, or formatting.`;
 
-let gEndpoint = "http://127.0.0.1:5000/v1/classify";
+let gEndpointBase = "http://127.0.0.1:5000";
+let gEndpoint = buildEndpointUrl(gEndpointBase);
 let gTemplateName = "openai";
 let gCustomTemplate = "";
 let gCustomSystemPrompt = DEFAULT_CUSTOM_SYSTEM_PROMPT;
@@ -39,6 +42,28 @@ let gAiParams = Object.assign({}, DEFAULT_AI_PARAMS);
 let gCache = new Map();
 let gCacheLoaded = false;
 
+function normalizeEndpointBase(endpoint) {
+  if (typeof endpoint !== "string") {
+    return "";
+  }
+  let base = endpoint.trim();
+  if (!base) {
+    return "";
+  }
+  base = base.replace(/\/v1\/completions\/?$/i, "");
+  return base;
+}
+
+function buildEndpointUrl(endpointBase) {
+  const base = normalizeEndpointBase(endpointBase);
+  if (!base) {
+    return "";
+  }
+  const withScheme = /^https?:\/\//i.test(base) ? base : `https://${base}`;
+  const needsSlash = withScheme.endsWith("/");
+  return `${withScheme}${needsSlash ? "" : "/"}v1/completions`;
+}
+
 function sha256HexSync(str) {
   try {
     const hasher = Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash);
@@ -158,8 +183,12 @@ function loadTemplateSync(name) {
 }
 
 async function setConfig(config = {}) {
-  if (config.endpoint) {
-    gEndpoint = config.endpoint;
+  if (typeof config.endpoint === "string") {
+    const base = normalizeEndpointBase(config.endpoint);
+    if (base) {
+      gEndpointBase = base;
+    }
+    gEndpoint = buildEndpointUrl(gEndpointBase);
   }
   if (config.templateName) {
     gTemplateName = config.templateName;
@@ -187,6 +216,10 @@ async function setConfig(config = {}) {
   } else {
     gTemplateText = await loadTemplate(gTemplateName);
   }
+  if (!gEndpoint) {
+    gEndpoint = buildEndpointUrl(gEndpointBase);
+  }
+  aiLog(`[AiClassifier] Endpoint base set to ${gEndpointBase}`, {debug: true});
   aiLog(`[AiClassifier] Endpoint set to ${gEndpoint}`, {debug: true});
   aiLog(`[AiClassifier] Template set to ${gTemplateName}`, {debug: true});
 }
@@ -344,4 +377,4 @@ async function init() {
   await loadCache();
 }
 
-export { classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };
+export { buildEndpointUrl, normalizeEndpointBase, classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };
diff --git a/options/options.html b/options/options.html
index ddc5ee0..59ebc83 100644
--- a/options/options.html
+++ b/options/options.html
@@ -73,6 +73,7 @@
                     <div class="control">
                         <input class="input" type="text" id="endpoint" placeholder="https://api.example.com">
                     </div>
+                    <p class="help" id="endpoint-preview"></p>
                 </div>
 
                 <div class="field">
diff --git a/options/options.js b/options/options.js
index d881d6a..30fa5f3 100644
--- a/options/options.js
+++ b/options/options.js
@@ -99,7 +99,21 @@ document.addEventListener('DOMContentLoaded', async () => {
         markDirty();
         await applyTheme(themeSelect.value);
     });
-    document.getElementById('endpoint').value = defaults.endpoint || 'http://127.0.0.1:5000/v1/completions';
+    const endpointInput = document.getElementById('endpoint');
+    const endpointPreview = document.getElementById('endpoint-preview');
+    const fallbackEndpoint = 'http://127.0.0.1:5000';
+    const storedEndpoint = defaults.endpoint || fallbackEndpoint;
+    const endpointBase = AiClassifier.normalizeEndpointBase(storedEndpoint) || storedEndpoint;
+    endpointInput.value = endpointBase;
+
+    function updateEndpointPreview() {
+        const resolved = AiClassifier.buildEndpointUrl(endpointInput.value);
+        endpointPreview.textContent = resolved
+            ? `Resolved endpoint: ${resolved}`
+            : 'Resolved endpoint: (invalid)';
+    }
+    endpointInput.addEventListener('input', updateEndpointPreview);
+    updateEndpointPreview();
 
     const templates = {
         openai: browser.i18n.getMessage('template.openai'),
@@ -806,7 +820,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     initialized = true;
 
     document.getElementById('save').addEventListener('click', async () => {
-        const endpoint = document.getElementById('endpoint').value;
+        const endpoint = endpointInput.value.trim();
         const templateName = templateSelect.value;
         const customTemplateText = customTemplate.value;
         const customSystemPrompt = systemBox.value;

From 2178de9a90ba4ea8c846d839f138de183c0186a2 Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Tue, 6 Jan 2026 21:07:55 -0600
Subject: [PATCH 43/50] Add bash build script

---
 AGENTS.md    |  1 +
 README.md    |  7 +++--
 build-xpi.sh | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100755 build-xpi.sh

diff --git a/AGENTS.md b/AGENTS.md
index e2a1696..23080ae 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -12,6 +12,7 @@ This file provides guidelines for codex agents contributing to the Sortana proje
 - `resources/`: Images and other static files.
 - `prompt_templates/`: Prompt template files for the AI service.
 - `build-xpi.ps1`: PowerShell script to package the extension.
+- `build-xpi.sh`: Bash script to package the extension.
 
 ## Coding Style
 
diff --git a/README.md b/README.md
index 2f8f204..a58a799 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ with JSON indicating whether the message meets a specified criterion.
 - **View reasoning** – inspect why rules matched via the Details popup.
 - **Cache management** – clear cached results from the context menu or options page.
 - **Queue & timing stats** – monitor processing time on the Maintenance tab.
-- **Packaging script** – `build-xpi.ps1` builds an XPI ready for installation.
+- **Packaging scripts** – `build-xpi.ps1` (PowerShell) or `build-xpi.sh` (bash) build an XPI ready for installation.
 - **Maintenance tab** – view rule counts, cache entries and clear cached results from the options page.
 
 ### Cache Storage
@@ -65,8 +65,9 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 1. Ensure PowerShell is available (for Windows) or adapt the script for other
    environments.
 2. The Bulma stylesheet (v1.0.3) is already included as `options/bulma.css`.
-3. Run `powershell ./build-xpi.ps1` from the repository root. The script reads
-   the version from `manifest.json` and creates an XPI in the `release` folder.
+3. Run `powershell ./build-xpi.ps1` or `./build-xpi.sh` from the repository root.
+   The script reads the version from `manifest.json` and creates an XPI in the
+   `release` folder.
 4. Install the generated XPI in Thunderbird via the Add-ons Manager. During
    development you can also load the directory as a temporary add-on.
 5. To regenerate PNG icons from the SVG sources, run `resources/svg2img.ps1`.
diff --git a/build-xpi.sh b/build-xpi.sh
new file mode 100755
index 0000000..20c6e15
--- /dev/null
+++ b/build-xpi.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+release_dir="$script_dir/release"
+manifest="$script_dir/manifest.json"
+
+if [[ ! -f "$manifest" ]]; then
+  echo "manifest.json not found at $manifest" >&2
+  exit 1
+fi
+
+if ! command -v zip >/dev/null 2>&1; then
+  echo "zip is required to build the XPI." >&2
+  exit 1
+fi
+
+if command -v jq >/dev/null 2>&1; then
+  version="$(jq -r '.version // empty' "$manifest")"
+else
+  if ! command -v python3 >/dev/null 2>&1; then
+    echo "python3 is required to read manifest.json without jq." >&2
+    exit 1
+  fi
+  version="$(python3 - <<'PY'
+import json
+import sys
+with open(sys.argv[1], 'r', encoding='utf-8') as f:
+    data = json.load(f)
+print(data.get('version', '') or '')
+PY
+"$manifest")"
+fi
+
+if [[ -z "$version" ]]; then
+  echo "No version found in manifest.json" >&2
+  exit 1
+fi
+
+mkdir -p "$release_dir"
+
+xpi_name="sortana-$version.xpi"
+zip_path="$release_dir/ai-filter-$version.zip"
+xpi_path="$release_dir/$xpi_name"
+
+rm -f "$zip_path" "$xpi_path"
+
+mapfile -d '' files < <(
+  find "$script_dir" -type f \
+    ! -name '*.sln' \
+    ! -name '*.ps1' \
+    ! -name '*.sh' \
+    ! -path "$release_dir/*" \
+    ! -path "$script_dir/.vs/*" \
+    ! -path "$script_dir/.git/*" \
+    -printf '%P\0'
+)
+
+if [[ ${#files[@]} -eq 0 ]]; then
+  echo "No files found to package." >&2
+  exit 0
+fi
+
+for rel in "${files[@]}"; do
+  full="$script_dir/$rel"
+  size=$(stat -c '%s' "$full")
+  echo "Zipping: $rel <- $full ($size bytes)"
+done
+
+(
+  cd "$script_dir"
+  printf '%s\n' "${files[@]}" | zip -q -9 -@ "$zip_path"
+)
+
+mv -f "$zip_path" "$xpi_path"
+
+echo "Built XPI at: $xpi_path"

From af6702bceb57fa65fda3d47c218d42b40cc83bfe Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Tue, 6 Jan 2026 21:42:57 -0600
Subject: [PATCH 44/50] Add prompt reduction badge to debug diff

---
 options/options.html |  5 ++-
 options/options.js   | 88 +++++++++++++++++++++++++++-----------------
 2 files changed, 59 insertions(+), 34 deletions(-)

diff --git a/options/options.html b/options/options.html
index 59ebc83..b118ee0 100644
--- a/options/options.html
+++ b/options/options.html
@@ -292,7 +292,10 @@
                 </h2>
                 <pre id="payload-display"></pre>
                 <div id="diff-container" class="mt-4 is-hidden">
-                    <label class="label">Prompt diff</label>
+                    <div class="is-flex is-align-items-center is-justify-content-space-between">
+                        <label class="label mb-0">Prompt diff</label>
+                        <span id="prompt-reduction" class="tag is-info is-light is-hidden">Prompt Token Reduction: 0%</span>
+                    </div>
                     <div id="diff-display" class="box content is-family-monospace"></div>
                 </div>
             </div>
diff --git a/options/options.js b/options/options.js
index 30fa5f3..046c674 100644
--- a/options/options.js
+++ b/options/options.js
@@ -71,6 +71,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     const payloadDisplay = document.getElementById('payload-display');
     const diffDisplay = document.getElementById('diff-display');
     const diffContainer = document.getElementById('diff-container');
+    const promptReductionLabel = document.getElementById('prompt-reduction');
 
     let lastFullText = defaults.lastFullText || '';
     let lastPromptText = defaults.lastPromptText || '';
@@ -79,22 +80,6 @@ document.addEventListener('DOMContentLoaded', async () => {
     if (lastPayload) {
         payloadDisplay.textContent = lastPayload;
     }
-    if (lastFullText && lastPromptText && diff_match_patch) {
-        const dmp = new diff_match_patch();
-        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();
         await applyTheme(themeSelect.value);
@@ -164,6 +149,51 @@ document.addEventListener('DOMContentLoaded', async () => {
     const tokenReductionToggle = document.getElementById('token-reduction');
     tokenReductionToggle.checked = defaults.tokenReduction === true;
 
+    function tokenSavingEnabled() {
+        return htmlToggle.checked
+            || stripUrlToggle.checked
+            || altTextToggle.checked
+            || collapseWhitespaceToggle.checked
+            || tokenReductionToggle.checked;
+    }
+
+    function updatePromptReductionLabel(hasDiff) {
+        if (!promptReductionLabel) return;
+        if (!hasDiff || !tokenSavingEnabled() || !lastFullText || !lastPromptText) {
+            promptReductionLabel.classList.add('is-hidden');
+            return;
+        }
+        const baseLength = lastFullText.length;
+        const promptLength = lastPromptText.length;
+        const percentSaved = baseLength > 0
+            ? Math.max(0, Math.round((1 - (promptLength / baseLength)) * 100))
+            : 0;
+        promptReductionLabel.textContent = `Prompt Token Reduction: ${percentSaved}%`;
+        promptReductionLabel.classList.remove('is-hidden');
+    }
+
+    function updateDiffDisplay() {
+        if (lastFullText && lastPromptText && diff_match_patch) {
+            const dmp = new diff_match_patch();
+            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');
+            }
+            updatePromptReductionLabel(hasDiff);
+        } else {
+            diffDisplay.innerHTML = '';
+            diffContainer.classList.add('is-hidden');
+            updatePromptReductionLabel(false);
+        }
+    }
+
     const debugTabToggle = document.getElementById('show-debug-tab');
     const debugTabBtn = document.getElementById('debug-tab-button');
     function updateDebugTab() {
@@ -174,6 +204,14 @@ document.addEventListener('DOMContentLoaded', async () => {
     debugTabToggle.addEventListener('change', () => { updateDebugTab(); markDirty(); });
     updateDebugTab();
 
+    updateDiffDisplay();
+
+    [htmlToggle, stripUrlToggle, altTextToggle, collapseWhitespaceToggle, tokenReductionToggle].forEach(toggle => {
+        toggle.addEventListener('change', () => {
+            updatePromptReductionLabel(!diffContainer.classList.contains('is-hidden'));
+        });
+    });
+
 
     const aiParams = Object.assign({}, DEFAULT_AI_PARAMS, defaults.aiParams || {});
     for (const [key, val] of Object.entries(aiParams)) {
@@ -770,23 +808,7 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (latest.lastFullText !== lastFullText || latest.lastPromptText !== lastPromptText) {
                     lastFullText = latest.lastFullText || '';
                     lastPromptText = latest.lastPromptText || '';
-                    if (lastFullText && lastPromptText && diff_match_patch) {
-                        const dmp = new diff_match_patch();
-                        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');
-                    }
+                    updateDiffDisplay();
                 }
             }
         } catch {}

From 9269225a0c5da9e13a024677be8375694ac7d93a Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Tue, 6 Jan 2026 22:01:20 -0600
Subject: [PATCH 45/50] Add session error log and transient error icon

---
 README.md            |  7 +++--
 background.js        | 46 +++++++++++++++++++++--------
 options/options.html | 27 +++++++++++++++++
 options/options.js   | 70 ++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 135 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index a58a799..87a3565 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,9 @@ with JSON indicating whether the message meets a specified criterion.
 - **Rule enable/disable** – temporarily turn a rule off without removing it.
 - **Account & folder filters** – limit rules to specific accounts or folders.
 - **Context menu** – apply AI rules from the message list or the message display action button.
-- **Status icons** – toolbar icons show when classification is in progress and briefly display success states. If a failure occurs the icon turns red until you dismiss the notification.
-- **Error notification** – failed classification displays a notification with a button to clear the error and reset the icon.
+- **Status icons** – toolbar icons show when classification is in progress and briefly display success states. If a failure occurs the icon turns red briefly before returning to normal.
+- **Error notification** – failed classification displays a notification in Thunderbird.
+- **Session error log** – the Errors tab (visible only when errors occur) shows errors recorded since the last add-on start.
 - **View reasoning** – inspect why rules matched via the Details popup.
 - **Cache management** – clear cached results from the context menu or options page.
 - **Queue & timing stats** – monitor processing time on the Maintenance tab.
@@ -88,7 +89,7 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
    open a compose window using the account that received the message.
 3. Save your settings. New mail will be evaluated automatically using the
    configured rules.
-4. If the toolbar icon shows a red X, click the notification's **Dismiss** button to clear the error.
+4. If the toolbar icon shows a red X, it will clear after a few seconds. Open the Errors tab in Options to review the latest failures.
 
 ### Example Filters
 
diff --git a/background.js b/background.js
index fc585ff..e16d5a3 100644
--- a/background.js
+++ b/background.js
@@ -19,6 +19,7 @@ let queue = Promise.resolve();
 let queuedCount = 0;
 let processing = false;
 let iconTimer = null;
+let errorTimer = null;
 let timingStats = { count: 0, mean: 0, m2: 0, total: 0, last: -1 };
 let currentStart = 0;
 let logGetTiming = true;
@@ -33,8 +34,11 @@ let userTheme = 'auto';
 let currentTheme = 'light';
 let detectSystemTheme;
 let errorPending = false;
+let errorLog = [];
 let showDebugTab = false;
 const ERROR_NOTIFICATION_ID = 'sortana-error';
+const ERROR_ICON_TIMEOUT = 4500;
+const MAX_ERROR_LOG = 50;
 
 function normalizeRules(rules) {
     return Array.isArray(rules) ? rules.map(r => {
@@ -108,11 +112,33 @@ function showTransientIcon(factory, delay = 1500) {
 
 async function clearError() {
     errorPending = false;
-    await storage.local.set({ errorPending: false });
+    clearTimeout(errorTimer);
     await browser.notifications.clear(ERROR_NOTIFICATION_ID);
     updateActionIcon();
 }
 
+function recordError(context, err) {
+    const message = err instanceof Error ? err.message : String(err || 'Unknown error');
+    const detail = err instanceof Error ? err.stack : '';
+    errorLog.unshift({
+        time: Date.now(),
+        context,
+        message,
+        detail
+    });
+    if (errorLog.length > MAX_ERROR_LOG) {
+        errorLog.length = MAX_ERROR_LOG;
+    }
+    errorPending = true;
+    updateActionIcon();
+    clearTimeout(errorTimer);
+    errorTimer = setTimeout(() => {
+        errorPending = false;
+        updateActionIcon();
+    }, ERROR_ICON_TIMEOUT);
+    browser.runtime.sendMessage({ type: 'sortana:errorLogUpdated', count: errorLog.length }).catch(() => {});
+}
+
 function refreshMenuIcons() {
     browser.menus.update('apply-ai-rules-list', { icons: iconPaths('eye') });
     browser.menus.update('apply-ai-rules-display', { icons: iconPaths('eye') });
@@ -382,16 +408,14 @@ async function processMessage(id) {
         const elapsed = Date.now() - currentStart;
         currentStart = 0;
         updateTimingStats(elapsed);
-        await storage.local.set({ classifyStats: timingStats, errorPending: true });
-        errorPending = true;
+        await storage.local.set({ classifyStats: timingStats });
         logger.aiLog("failed to apply AI rules", { level: 'error' }, e);
-        setIcon(ICONS.error());
+        recordError("Failed to apply AI rules", e);
         browser.notifications.create(ERROR_NOTIFICATION_ID, {
             type: 'basic',
             iconUrl: browser.runtime.getURL('resources/img/logo.png'),
             title: 'Sortana Error',
-            message: 'Failed to apply AI rules',
-            buttons: [{ title: 'Dismiss' }]
+            message: 'Failed to apply AI rules'
         });
     }
 }
@@ -451,7 +475,7 @@ async function clearCacheForMessages(idsInput) {
     }
 
     try {
-        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "errorPending", "showDebugTab"]);
+        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "showDebugTab"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -465,7 +489,6 @@ async function clearCacheForMessages(idsInput) {
         if (store.aiParams && typeof store.aiParams.max_tokens !== 'undefined') {
             maxTokens = parseInt(store.aiParams.max_tokens) || maxTokens;
         }
-        errorPending = store.errorPending === true;
         showDebugTab = store.showDebugTab === true;
         const savedStats = await storage.local.get('classifyStats');
         if (savedStats.classifyStats && typeof savedStats.classifyStats === 'object') {
@@ -524,10 +547,6 @@ async function clearCacheForMessages(idsInput) {
             if (changes.showDebugTab) {
                 showDebugTab = changes.showDebugTab.newValue === true;
             }
-            if (changes.errorPending) {
-                errorPending = changes.errorPending.newValue === true;
-                updateActionIcon();
-            }
             if (changes.theme) {
                 userTheme = changes.theme.newValue || 'auto';
                 currentTheme = userTheme === 'auto' ? await detectSystemTheme() : userTheme;
@@ -720,6 +739,8 @@ async function clearCacheForMessages(idsInput) {
             }
         } else if (msg?.type === "sortana:getQueueCount") {
             return { count: queuedCount + (processing ? 1 : 0) };
+        } else if (msg?.type === "sortana:getErrorLog") {
+            return { errors: errorLog.slice() };
         } else if (msg?.type === "sortana:getTiming") {
             const t = timingStats;
             const std = t.count > 1 ? Math.sqrt(t.m2 / (t.count - 1)) : 0;
@@ -751,6 +772,7 @@ async function clearCacheForMessages(idsInput) {
     // Catch any unhandled rejections
     window.addEventListener("unhandledrejection", ev => {
         logger.aiLog("Unhandled promise rejection", { level: 'error' }, ev.reason);
+        recordError("Unhandled promise rejection", ev.reason);
     });
 
     browser.notifications.onClicked.addListener(id => {
diff --git a/options/options.html b/options/options.html
index b118ee0..fd8700c 100644
--- a/options/options.html
+++ b/options/options.html
@@ -51,6 +51,7 @@
                             <li class="is-active" data-tab="settings"><a><span class="icon is-small"><img data-icon="settings" data-size="16" src="../resources/img/settings-light-16.png" alt=""></span><span>Settings</span></a></li>
                             <li data-tab="rules"><a><span class="icon is-small"><img data-icon="clipboarddata" data-size="16" src="../resources/img/clipboarddata-light-16.png" alt=""></span><span>Rules</span></a></li>
                             <li data-tab="maintenance"><a><span class="icon is-small"><img data-icon="gear" data-size="16" src="../resources/img/gear-light-16.png" alt=""></span><span>Maintenance</span></a></li>
+                            <li id="errors-tab-button" class="is-hidden" data-tab="errors"><a><span class="icon is-small"><img data-icon="x" data-size="16" src="../resources/img/x-light-16.png" alt=""></span><span>Errors</span></a></li>
                             <li id="debug-tab-button" class="is-hidden" data-tab="debug"><a><span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span><span>Debug</span></a></li>
                         </ul>
                     </div>
@@ -285,6 +286,32 @@
                 </div>
             </div>
 
+            <div id="errors-tab" class="tab-content is-hidden">
+                <h2 class="title is-4">
+                    <span class="icon is-small"><img data-icon="x" data-size="16" src="../resources/img/x-light-16.png" alt=""></span>
+                    <span>Session Errors</span>
+                </h2>
+                <div id="errors-empty" class="notification is-success is-light">
+                    No errors have been recorded since the last start.
+                </div>
+                <div id="errors-panel" class="is-hidden">
+                    <div class="box mb-4">
+                        <div class="level">
+                            <div class="level-left">
+                                <div>
+                                    <p class="title is-5 mb-1">Error Log</p>
+                                    <p class="subtitle is-6">Visible only for this session.</p>
+                                </div>
+                            </div>
+                            <div class="level-right">
+                                <span class="tag is-danger is-light" id="errors-count">0</span>
+                            </div>
+                        </div>
+                    </div>
+                    <div id="errors-list"></div>
+                </div>
+            </div>
+
             <div id="debug-tab" class="tab-content is-hidden">
                 <h2 class="title is-4">
                     <span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span>
diff --git a/options/options.js b/options/options.js
index 046c674..d905d7d 100644
--- a/options/options.js
+++ b/options/options.js
@@ -196,6 +196,11 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     const debugTabToggle = document.getElementById('show-debug-tab');
     const debugTabBtn = document.getElementById('debug-tab-button');
+    const errorTabBtn = document.getElementById('errors-tab-button');
+    const errorsEmpty = document.getElementById('errors-empty');
+    const errorsPanel = document.getElementById('errors-panel');
+    const errorsList = document.getElementById('errors-list');
+    const errorsCount = document.getElementById('errors-count');
     function updateDebugTab() {
         const visible = debugTabToggle.checked;
         debugTabBtn.classList.toggle('is-hidden', !visible);
@@ -204,6 +209,71 @@ document.addEventListener('DOMContentLoaded', async () => {
     debugTabToggle.addEventListener('change', () => { updateDebugTab(); markDirty(); });
     updateDebugTab();
 
+    function formatErrorTime(value) {
+        try {
+            return new Date(value).toLocaleString();
+        } catch (e) {
+            return '';
+        }
+    }
+
+    function renderErrors(entries = []) {
+        const hasErrors = entries.length > 0;
+        errorTabBtn.classList.toggle('is-hidden', !hasErrors);
+        errorsEmpty.classList.toggle('is-hidden', hasErrors);
+        errorsPanel.classList.toggle('is-hidden', !hasErrors);
+        errorsList.innerHTML = '';
+        errorsCount.textContent = String(entries.length);
+        if (!hasErrors) {
+            return;
+        }
+        entries.forEach(entry => {
+            const card = document.createElement('article');
+            card.className = 'message is-danger is-light mb-4';
+            const header = document.createElement('div');
+            header.className = 'message-header';
+            const title = document.createElement('p');
+            title.textContent = entry.context || 'Error';
+            const time = document.createElement('span');
+            time.className = 'is-size-7 has-text-weight-normal';
+            time.textContent = formatErrorTime(entry.time);
+            header.appendChild(title);
+            header.appendChild(time);
+            const body = document.createElement('div');
+            body.className = 'message-body';
+            const summary = document.createElement('p');
+            summary.className = 'mb-2';
+            summary.textContent = entry.message || 'Unknown error';
+            body.appendChild(summary);
+            if (entry.detail) {
+                const detail = document.createElement('pre');
+                detail.className = 'is-family-monospace is-size-7';
+                detail.textContent = entry.detail;
+                body.appendChild(detail);
+            }
+            card.appendChild(header);
+            card.appendChild(body);
+            errorsList.appendChild(card);
+        });
+    }
+
+    async function loadErrors() {
+        try {
+            const response = await browser.runtime.sendMessage({ type: 'sortana:getErrorLog' });
+            renderErrors(response?.errors || []);
+        } catch (e) {
+            renderErrors([]);
+        }
+    }
+
+    browser.runtime.onMessage.addListener((msg) => {
+        if (msg?.type === 'sortana:errorLogUpdated') {
+            loadErrors();
+        }
+    });
+
+    await loadErrors();
+
     updateDiffDisplay();
 
     [htmlToggle, stripUrlToggle, altTextToggle, collapseWhitespaceToggle, tokenReductionToggle].forEach(toggle => {

From 42d013fccd0090816111f5032c1aea85b426ac30 Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Wed, 7 Jan 2026 03:32:29 -0600
Subject: [PATCH 46/50] Update AI response parsing for JSON reasoning

---
 AGENTS.md                    |  1 +
 README.md                    |  5 +-
 background.js                | 16 +++++-
 modules/AiClassifier.js      | 98 ++++++++++++++++++++++++++++++++----
 prompt_templates/mistral.txt |  4 +-
 prompt_templates/openai.txt  |  4 +-
 prompt_templates/qwen.txt    |  4 +-
 7 files changed, 114 insertions(+), 18 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 23080ae..5f5f2f6 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -34,6 +34,7 @@ There are currently no automated tests for this project. If you add tests in the
 ## Endpoint Notes
 
 Sortana targets the `/v1/completions` API. The endpoint value stored in settings is a base URL; the full request URL is constructed by appending `/v1/completions` (adding a slash when needed) and defaulting to `https://` if no scheme is provided.
+Responses are expected to include a JSON object with `match` (or `matched`) plus a short `reason` string; the parser extracts the last JSON object in the response text and ignores any surrounding commentary.
 
 ## Documentation
 
diff --git a/README.md b/README.md
index 87a3565..aec6884 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,10 @@ Sortana is an experimental Thunderbird add-on that integrates an AI-powered filt
 It allows you to classify email messages by sending their contents to a configurable
 HTTP endpoint. Sortana uses the `/v1/completions` API; the options page stores a base
 URL and appends `/v1/completions` when sending requests. The endpoint should respond
-with JSON indicating whether the message meets a specified criterion.
+with JSON indicating whether the message meets a specified criterion, including a
+short reasoning summary.
+Responses are parsed by extracting the last JSON object in the response text and
+expecting a `match` (or `matched`) boolean plus a `reason` string.
 
 ## Features
 
diff --git a/background.js b/background.js
index e16d5a3..64aad50 100644
--- a/background.js
+++ b/background.js
@@ -118,8 +118,17 @@ async function clearError() {
 }
 
 function recordError(context, err) {
-    const message = err instanceof Error ? err.message : String(err || 'Unknown error');
-    const detail = err instanceof Error ? err.stack : '';
+    let message = 'Unknown error';
+    let detail = '';
+    if (err instanceof Error) {
+        message = err.message;
+        detail = err.stack || '';
+    } else if (err && typeof err === 'object') {
+        message = typeof err.message === 'string' ? err.message : String(err || 'Unknown error');
+        detail = typeof err.detail === 'string' ? err.detail : '';
+    } else {
+        message = String(err || 'Unknown error');
+    }
     errorLog.unshift({
         time: Date.now(),
         context,
@@ -741,6 +750,9 @@ async function clearCacheForMessages(idsInput) {
             return { count: queuedCount + (processing ? 1 : 0) };
         } else if (msg?.type === "sortana:getErrorLog") {
             return { errors: errorLog.slice() };
+        } else if (msg?.type === "sortana:recordError") {
+            recordError(msg.context || "Sortana Error", { message: msg.message, detail: msg.detail });
+            return { ok: true };
         } else if (msg?.type === "sortana:getTiming") {
             const t = timingStats;
             const std = t.count > 1 ? Math.sqrt(t.m2 / (t.count - 1)) : 0;
diff --git a/modules/AiClassifier.js b/modules/AiClassifier.js
index f5a3bff..603c088 100644
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@@ -25,8 +25,8 @@ const DEFAULT_CUSTOM_SYSTEM_PROMPT = "Determine whether the email satisfies the
 
 const SYSTEM_SUFFIX = `
 Return ONLY a JSON object on a single line of the form:
-{"match": true} - if the email satisfies the criterion
-{"match": false} - otherwise
+{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
+{"match": false, "reason": "<short explanation>"} - otherwise
 
 Do not add any other keys, text, or formatting.`;
 
@@ -266,15 +266,95 @@ function buildPayload(text, criterion) {
   return JSON.stringify(payloadObj);
 }
 
+function reportParseError(message, detail) {
+  try {
+    const runtime = (globalThis.browser ?? globalThis.messenger)?.runtime;
+    if (!runtime?.sendMessage) {
+      return;
+    }
+    runtime.sendMessage({
+      type: "sortana:recordError",
+      context: "AI response parsing",
+      message,
+      detail
+    }).catch(() => {});
+  } catch (e) {
+    aiLog("Failed to report parse error", { level: "warn" }, e);
+  }
+}
+
+function extractLastJsonObject(text) {
+  let last = null;
+  let start = -1;
+  let depth = 0;
+  let inString = false;
+  let escape = false;
+
+  for (let i = 0; i < text.length; i += 1) {
+    const ch = text[i];
+    if (inString) {
+      if (escape) {
+        escape = false;
+        continue;
+      }
+      if (ch === "\\") {
+        escape = true;
+        continue;
+      }
+      if (ch === "\"") {
+        inString = false;
+      }
+      continue;
+    }
+    if (ch === "\"") {
+      inString = true;
+      continue;
+    }
+    if (ch === "{") {
+      if (depth === 0) {
+        start = i;
+      }
+      depth += 1;
+      continue;
+    }
+    if (ch === "}" && depth > 0) {
+      depth -= 1;
+      if (depth === 0 && start !== -1) {
+        last = text.slice(start, i + 1);
+        start = -1;
+      }
+    }
+  }
+
+  return last;
+}
+
 function parseMatch(result) {
   const rawText = result.choices?.[0]?.text || "";
-  const thinkText = rawText.match(/<think>[\s\S]*?<\/think>/gi)?.join('') || '';
-  aiLog('[AiClassifier] ⮡ Reasoning:', {debug: true}, thinkText);
-  const cleanedText = rawText.replace(/<think>[\s\S]*?<\/think>/gi, "").trim();
-  aiLog('[AiClassifier] ⮡ Cleaned Response Text:', {debug: true}, cleanedText);
-  const obj = JSON.parse(cleanedText);
-  const matched = obj.matched === true || obj.match === true;
-  return { matched, reason: thinkText };
+  const candidate = extractLastJsonObject(rawText);
+  if (!candidate) {
+    reportParseError("No JSON object found in AI response.", rawText.slice(0, 800));
+    return { matched: false, reason: "" };
+  }
+
+  let obj;
+  try {
+    obj = JSON.parse(candidate);
+  } catch (e) {
+    reportParseError("Failed to parse JSON from AI response.", candidate.slice(0, 800));
+    return { matched: false, reason: "" };
+  }
+
+  const matchValue = Object.prototype.hasOwnProperty.call(obj, "match") ? obj.match : obj.matched;
+  const matched = matchValue === true;
+  if (matchValue !== true && matchValue !== false) {
+    reportParseError("AI response missing valid match boolean.", candidate.slice(0, 800));
+  }
+
+  const reasonValue = obj.reason ?? obj.reasoning ?? obj.explaination;
+  const reason = typeof reasonValue === "string" ? reasonValue : "";
+
+  return { matched, reason };
 }
 
 function cacheEntry(cacheKey, matched, reason) {
diff --git a/prompt_templates/mistral.txt b/prompt_templates/mistral.txt
index f78bed7..1ee56fa 100644
--- a/prompt_templates/mistral.txt
+++ b/prompt_templates/mistral.txt
@@ -5,8 +5,8 @@ Email:
 
 Criterion: {{query}}
 Remember, return ONLY a JSON object on a single line of the form:
-{"match": true} - if the email satisfies the criterion
-{"match": false} - otherwise
+{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
+{"match": false, "reason": "<short explanation>"} - otherwise
 
 Do not add any other keys, text, or formatting.
 [/INST]
diff --git a/prompt_templates/openai.txt b/prompt_templates/openai.txt
index bf7cea1..c770394 100644
--- a/prompt_templates/openai.txt
+++ b/prompt_templates/openai.txt
@@ -7,8 +7,8 @@
 ```
 Classification Criterion: {{query}}
 Remember, return ONLY a JSON object on a single line of the form:
-{"match": true} - if the email satisfies the criterion
-{"match": false} - otherwise
+{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
+{"match": false, "reason": "<short explanation>"} - otherwise
 
 Do not add any other keys, text, or formatting.<|im_end|>
 <|im_start|>assistant
diff --git a/prompt_templates/qwen.txt b/prompt_templates/qwen.txt
index 0c25472..1aa0ef0 100644
--- a/prompt_templates/qwen.txt
+++ b/prompt_templates/qwen.txt
@@ -7,8 +7,8 @@ Email:
 
 Criterion: {{query}}
 Remember, return ONLY a JSON object on a single line of the form:
-{"match": true} - if the email satisfies the criterion
-{"match": false} - otherwise
+{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
+{"match": false, "reason": "<short explanation>"} - otherwise
 
 Do not add any other keys, text, or formatting.
 <|im_end|>

From 6d169e1b8cc2c244e1603636120aa340f99a67c6 Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Wed, 7 Jan 2026 13:39:02 -0600
Subject: [PATCH 47/50] Add harmony prompt template

---
 AGENTS.md                    |  2 +-
 README.md                    |  2 +-
 _locales/en-US/messages.json |  1 +
 ai-filter.sln                |  1 +
 options/options.js           |  1 +
 prompt_templates/harmony.txt | 21 +++++++++++++++++++++
 6 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 prompt_templates/harmony.txt

diff --git a/AGENTS.md b/AGENTS.md
index 5f5f2f6..3e3cba4 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -10,7 +10,7 @@ This file provides guidelines for codex agents contributing to the Sortana proje
 - `options/`: The options page HTML, JavaScript and bundled Bulma CSS (v1.0.3).
 - `details.html` and `details.js`: View AI reasoning and clear cache for a message.
 - `resources/`: Images and other static files.
-- `prompt_templates/`: Prompt template files for the AI service.
+- `prompt_templates/`: Prompt template files for the AI service (openai, qwen, mistral, harmony).
 - `build-xpi.ps1`: PowerShell script to package the extension.
 - `build-xpi.sh`: Bash script to package the extension.
 
diff --git a/README.md b/README.md
index aec6884..8779d1a 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ expecting a `match` (or `matched`) boolean plus a `reason` string.
 ## Features
 
 - **Configurable endpoint** – set the classification service base URL on the options page.
-- **Prompt templates** – choose between several model formats or provide your own custom template.
+- **Prompt templates** – choose between OpenAI/ChatML, Qwen, Mistral, Harmony (gpt-oss), or provide your own custom template.
 - **Custom system prompts** – tailor the instructions sent to the model for more precise results.
 - **Persistent result caching** – classification results and reasoning are saved to disk so messages aren't re-evaluated across restarts.
 - **Advanced parameters** – tune generation settings like temperature, top‑p and more from the options page.
diff --git a/_locales/en-US/messages.json b/_locales/en-US/messages.json
index 65181c8..017e1a3 100644
--- a/_locales/en-US/messages.json
+++ b/_locales/en-US/messages.json
@@ -12,6 +12,7 @@
   "template.openai": { "message": "OpenAI / ChatML" },
   "template.qwen": { "message": "Qwen" },
   "template.mistral": { "message": "Mistral" },
+  "template.harmony": { "message": "Harmony (gpt-oss)" },
   "template.custom": { "message": "Custom" },
   "options.save": { "message": "Save" },
   "options.debugLogging": { "message": "Enable debug logging" },
diff --git a/ai-filter.sln b/ai-filter.sln
index ea71f1b..7ded341 100644
--- a/ai-filter.sln
+++ b/ai-filter.sln
@@ -44,6 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prompt_templates", "prompt_
 		prompt_templates\mistral.txt = prompt_templates\mistral.txt
 		prompt_templates\openai.txt = prompt_templates\openai.txt
 		prompt_templates\qwen.txt = prompt_templates\qwen.txt
+		prompt_templates\harmony.txt = prompt_templates\harmony.txt
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resources", "resources", "{68A87938-5C2B-49F5-8AAA-8A34FBBFD854}"
diff --git a/options/options.js b/options/options.js
index d905d7d..860c944 100644
--- a/options/options.js
+++ b/options/options.js
@@ -104,6 +104,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         openai: browser.i18n.getMessage('template.openai'),
         qwen: browser.i18n.getMessage('template.qwen'),
         mistral: browser.i18n.getMessage('template.mistral'),
+        harmony: browser.i18n.getMessage('template.harmony'),
         custom: browser.i18n.getMessage('template.custom')
     };
     const templateSelect = document.getElementById('template');
diff --git a/prompt_templates/harmony.txt b/prompt_templates/harmony.txt
new file mode 100644
index 0000000..5054543
--- /dev/null
+++ b/prompt_templates/harmony.txt
@@ -0,0 +1,21 @@
+<|start|>system<|message|>You are ChatGPT, a large language model trained by OpenAI.
+Knowledge cutoff: 2024-06
+Current date: 2025-06-28
+
+Reasoning: medium
+
+# Valid channels: analysis, commentary, final. Channel must be included for every message.<|end|>
+<|start|>developer<|message|># Instructions
+
+{{system}}<|end|>
+<|start|>user<|message|>**Email Contents**
+```
+{{email}}
+```
+Classification Criterion: {{query}}
+Remember, return ONLY a JSON object on a single line of the form:
+{"match": true, "reason": "<short explanation>"} - if the email satisfies the criterion
+{"match": false, "reason": "<short explanation>"} - otherwise
+
+Do not add any other keys, text, or formatting.<|end|>
+<|start|>assistant

From 35aadfac5a1407b1730967349a39c7bdb03c113c Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Fri, 30 Jan 2026 02:11:08 -0600
Subject: [PATCH 48/50] Add model selection to OpenAI payloads

---
 AGENTS.md               |  1 +
 README.md               |  4 +-
 background.js           |  5 ++-
 manifest.json           |  2 +-
 modules/AiClassifier.js | 26 ++++++++++--
 options/dataTransfer.js |  1 +
 options/options.html    | 15 +++++++
 options/options.js      | 89 ++++++++++++++++++++++++++++++++++++++++-
 8 files changed, 134 insertions(+), 9 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index 3e3cba4..f2ea2d9 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -34,6 +34,7 @@ There are currently no automated tests for this project. If you add tests in the
 ## Endpoint Notes
 
 Sortana targets the `/v1/completions` API. The endpoint value stored in settings is a base URL; the full request URL is constructed by appending `/v1/completions` (adding a slash when needed) and defaulting to `https://` if no scheme is provided.
+The options page can query `/v1/models` from the same base URL to populate the Model dropdown; selecting **None** omits the `model` field from the request payload.
 Responses are expected to include a JSON object with `match` (or `matched`) plus a short `reason` string; the parser extracts the last JSON object in the response text and ignores any surrounding commentary.
 
 ## Documentation
diff --git a/README.md b/README.md
index 8779d1a..957e5e0 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,7 @@ expecting a `match` (or `matched`) boolean plus a `reason` string.
 ## Features
 
 - **Configurable endpoint** – set the classification service base URL on the options page.
+- **Model selection** – load available models from the endpoint and choose one (or omit the model field).
 - **Prompt templates** – choose between OpenAI/ChatML, Qwen, Mistral, Harmony (gpt-oss), or provide your own custom template.
 - **Custom system prompts** – tailor the instructions sent to the model for more precise results.
 - **Persistent result caching** – classification results and reasoning are saved to disk so messages aren't re-evaluated across restarts.
@@ -79,7 +80,8 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 ## Usage
 
 1. Open the add-on's options and set the base URL of your classification service
-   (Sortana will append `/v1/completions`).
+   (Sortana will append `/v1/completions`). Use the Model dropdown to load
+   `/v1/models` and select a model or choose **None** to omit the `model` field.
  2. Use the **Classification Rules** section to add a criterion and optional
    actions such as tagging, moving, copying, forwarding, replying,
    deleting or archiving a message when it matches. Drag rules to
diff --git a/background.js b/background.js
index 64aad50..aef8cbb 100644
--- a/background.js
+++ b/background.js
@@ -484,7 +484,7 @@ async function clearCacheForMessages(idsInput) {
     }
 
     try {
-        const store = await storage.local.get(["endpoint", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "showDebugTab"]);
+        const store = await storage.local.get(["endpoint", "model", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "showDebugTab"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -514,9 +514,10 @@ async function clearCacheForMessages(idsInput) {
                 aiRules = normalizeRules(newRules);
                 logger.aiLog("aiRules updated from storage change", { debug: true }, aiRules);
             }
-            if (changes.endpoint || changes.templateName || changes.customTemplate || changes.customSystemPrompt || changes.aiParams || changes.debugLogging) {
+            if (changes.endpoint || changes.model || changes.templateName || changes.customTemplate || changes.customSystemPrompt || changes.aiParams || changes.debugLogging) {
                 const config = {};
                 if (changes.endpoint) config.endpoint = changes.endpoint.newValue;
+                if (changes.model) config.model = changes.model.newValue;
                 if (changes.templateName) config.templateName = changes.templateName.newValue;
                 if (changes.customTemplate) config.customTemplate = changes.customTemplate.newValue;
                 if (changes.customSystemPrompt) config.customSystemPrompt = changes.customSystemPrompt.newValue;
diff --git a/manifest.json b/manifest.json
index e7cb9d8..a18e7cd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Sortana",
-  "version": "2.2.0",
+  "version": "2.4.0",
   "default_locale": "en-US",
   "applications": {
     "gecko": {
diff --git a/modules/AiClassifier.js b/modules/AiClassifier.js
index 603c088..cb68382 100644
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@@ -16,6 +16,7 @@ try {
 }
 
 const COMPLETIONS_PATH = "/v1/completions";
+const MODELS_PATH = "/v1/models";
 
 const SYSTEM_PREFIX = `You are an email-classification assistant.
 Read the email below and the classification criterion provided by the user.
@@ -38,6 +39,7 @@ let gCustomSystemPrompt = DEFAULT_CUSTOM_SYSTEM_PROMPT;
 let gTemplateText = "";
 
 let gAiParams = Object.assign({}, DEFAULT_AI_PARAMS);
+let gModel = "";
 
 let gCache = new Map();
 let gCacheLoaded = false;
@@ -50,7 +52,7 @@ function normalizeEndpointBase(endpoint) {
   if (!base) {
     return "";
   }
-  base = base.replace(/\/v1\/completions\/?$/i, "");
+  base = base.replace(/\/v1\/(completions|models)\/?$/i, "");
   return base;
 }
 
@@ -61,7 +63,19 @@ function buildEndpointUrl(endpointBase) {
   }
   const withScheme = /^https?:\/\//i.test(base) ? base : `https://${base}`;
   const needsSlash = withScheme.endsWith("/");
-  return `${withScheme}${needsSlash ? "" : "/"}v1/completions`;
+  const path = COMPLETIONS_PATH.replace(/^\//, "");
+  return `${withScheme}${needsSlash ? "" : "/"}${path}`;
+}
+
+function buildModelsUrl(endpointBase) {
+  const base = normalizeEndpointBase(endpointBase);
+  if (!base) {
+    return "";
+  }
+  const withScheme = /^https?:\/\//i.test(base) ? base : `https://${base}`;
+  const needsSlash = withScheme.endsWith("/");
+  const path = MODELS_PATH.replace(/^\//, "");
+  return `${withScheme}${needsSlash ? "" : "/"}${path}`;
 }
 
 function sha256HexSync(str) {
@@ -206,6 +220,9 @@ async function setConfig(config = {}) {
       }
     }
   }
+  if (typeof config.model === "string") {
+    gModel = config.model.trim();
+  }
   if (typeof config.debugLogging === "boolean") {
     setDebug(config.debugLogging);
   }
@@ -263,6 +280,9 @@ function buildPayload(text, criterion) {
   let payloadObj = Object.assign({
     prompt: buildPrompt(text, criterion)
   }, gAiParams);
+  if (gModel) {
+    payloadObj.model = gModel;
+  }
   return JSON.stringify(payloadObj);
 }
 
@@ -457,4 +477,4 @@ async function init() {
   await loadCache();
 }
 
-export { buildEndpointUrl, normalizeEndpointBase, classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };
+export { buildEndpointUrl, buildModelsUrl, normalizeEndpointBase, classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };
diff --git a/options/dataTransfer.js b/options/dataTransfer.js
index b289c02..fdf096f 100644
--- a/options/dataTransfer.js
+++ b/options/dataTransfer.js
@@ -3,6 +3,7 @@ const storage = (globalThis.messenger ?? browser).storage;
 const KEY_GROUPS = {
     settings: [
         'endpoint',
+        'model',
         'templateName',
         'customTemplate',
         'customSystemPrompt',
diff --git a/options/options.html b/options/options.html
index fd8700c..4c1fd79 100644
--- a/options/options.html
+++ b/options/options.html
@@ -77,6 +77,21 @@
                     <p class="help" id="endpoint-preview"></p>
                 </div>
 
+                <div class="field">
+                    <label class="label" for="model-select">Model</label>
+                    <div class="field has-addons">
+                        <div class="control is-expanded">
+                            <div class="select is-fullwidth">
+                                <select id="model-select"></select>
+                            </div>
+                        </div>
+                        <div class="control">
+                            <button class="button" id="refresh-models" type="button">Refresh</button>
+                        </div>
+                    </div>
+                    <p class="help" id="model-help"></p>
+                </div>
+
                 <div class="field">
                     <label class="label" for="template">Prompt template</label>
                     <div class="control">
diff --git a/options/options.js b/options/options.js
index 860c944..5e46857 100644
--- a/options/options.js
+++ b/options/options.js
@@ -10,6 +10,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         'templateName',
         'customTemplate',
         'customSystemPrompt',
+        'model',
         'aiParams',
         'debugLogging',
         'htmlToMarkdown',
@@ -100,6 +101,88 @@ document.addEventListener('DOMContentLoaded', async () => {
     endpointInput.addEventListener('input', updateEndpointPreview);
     updateEndpointPreview();
 
+    const modelSelect = document.getElementById('model-select');
+    const refreshModelsBtn = document.getElementById('refresh-models');
+    const modelHelp = document.getElementById('model-help');
+    const storedModel = typeof defaults.model === 'string' ? defaults.model : '';
+
+    function setModelHelp(message = '', isError = false) {
+        if (!modelHelp) return;
+        modelHelp.textContent = message;
+        modelHelp.classList.toggle('is-danger', isError);
+    }
+
+    function populateModelOptions(models = [], selectedModel = '') {
+        if (!modelSelect) return;
+        const modelIds = Array.isArray(models) ? models.filter(Boolean) : [];
+        modelSelect.innerHTML = '';
+
+        const noneOpt = document.createElement('option');
+        noneOpt.value = '';
+        noneOpt.textContent = 'None (omit model)';
+        modelSelect.appendChild(noneOpt);
+
+        if (selectedModel && !modelIds.includes(selectedModel)) {
+            const storedOpt = document.createElement('option');
+            storedOpt.value = selectedModel;
+            storedOpt.textContent = `Stored: ${selectedModel}`;
+            modelSelect.appendChild(storedOpt);
+        }
+
+        for (const id of modelIds) {
+            const opt = document.createElement('option');
+            opt.value = id;
+            opt.textContent = id;
+            modelSelect.appendChild(opt);
+        }
+
+        const hasSelected = [...modelSelect.options].some(opt => opt.value === selectedModel);
+        modelSelect.value = hasSelected ? selectedModel : '';
+    }
+
+    async function fetchModels(preferredModel = '') {
+        if (!modelSelect || !refreshModelsBtn) return;
+        const modelsUrl = AiClassifier.buildModelsUrl(endpointInput.value);
+        if (!modelsUrl) {
+            setModelHelp('Set a valid endpoint to load models.', true);
+            populateModelOptions([], preferredModel || modelSelect.value);
+            return;
+        }
+
+        refreshModelsBtn.disabled = true;
+        setModelHelp('Loading models...');
+
+        try {
+            const response = await fetch(modelsUrl, { method: 'GET' });
+            if (!response.ok) {
+                throw new Error(`HTTP ${response.status}`);
+            }
+            const data = await response.json();
+            let models = [];
+            if (Array.isArray(data?.data)) {
+                models = data.data.map(model => model?.id ?? model?.name ?? model?.model ?? '').filter(Boolean);
+            } else if (Array.isArray(data?.models)) {
+                models = data.models.map(model => model?.id ?? model?.name ?? model?.model ?? '').filter(Boolean);
+            } else if (Array.isArray(data)) {
+                models = data.map(model => model?.id ?? model?.name ?? model?.model ?? model).filter(Boolean);
+            }
+            models = [...new Set(models)];
+            populateModelOptions(models, preferredModel || modelSelect.value);
+            setModelHelp(models.length ? `Loaded ${models.length} model${models.length === 1 ? '' : 's'}.` : 'No models returned.');
+        } catch (e) {
+            logger.aiLog('[options] failed to load models', { level: 'warn' }, e);
+            setModelHelp('Failed to load models. Check the endpoint and network.', true);
+            populateModelOptions([], preferredModel || modelSelect.value);
+        } finally {
+            refreshModelsBtn.disabled = false;
+        }
+    }
+
+    populateModelOptions([], storedModel);
+    refreshModelsBtn?.addEventListener('click', () => {
+        fetchModels(modelSelect.value);
+    });
+
     const templates = {
         openai: browser.i18n.getMessage('template.openai'),
         qwen: browser.i18n.getMessage('template.qwen'),
@@ -276,6 +359,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     await loadErrors();
 
     updateDiffDisplay();
+    await fetchModels(storedModel);
 
     [htmlToggle, stripUrlToggle, altTextToggle, collapseWhitespaceToggle, tokenReductionToggle].forEach(toggle => {
         toggle.addEventListener('change', () => {
@@ -914,6 +998,7 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     document.getElementById('save').addEventListener('click', async () => {
         const endpoint = endpointInput.value.trim();
+        const model = modelSelect?.value || '';
         const templateName = templateSelect.value;
         const customTemplateText = customTemplate.value;
         const customSystemPrompt = systemBox.value;
@@ -979,10 +1064,10 @@ document.addEventListener('DOMContentLoaded', async () => {
         const tokenReduction = tokenReductionToggle.checked;
         const showDebugTab = debugTabToggle.checked;
         const theme = themeSelect.value;
-        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme, showDebugTab });
+        await storage.local.set({ endpoint, model, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme, showDebugTab });
         await applyTheme(theme);
         try {
-            await AiClassifier.setConfig({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });
+            await AiClassifier.setConfig({ endpoint, model, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });
             logger.setDebug(debugLogging);
         } catch (e) {
             logger.aiLog('[options] failed to apply config', {level: 'error'}, e);

From 1680ad6c3085a11a36dcb138103f1787367d64d1 Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Fri, 30 Jan 2026 02:54:19 -0600
Subject: [PATCH 49/50] Add optional OpenAI auth headers

---
 AGENTS.md               |  1 +
 README.md               |  3 +++
 background.js           |  7 ++++--
 manifest.json           |  2 +-
 modules/AiClassifier.js | 28 ++++++++++++++++++++++-
 options/dataTransfer.js |  3 +++
 options/options.html    | 26 ++++++++++++++++++++++
 options/options.js      | 49 ++++++++++++++++++++++++++++++++++++++---
 8 files changed, 112 insertions(+), 7 deletions(-)

diff --git a/AGENTS.md b/AGENTS.md
index f2ea2d9..aece578 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -35,6 +35,7 @@ There are currently no automated tests for this project. If you add tests in the
 
 Sortana targets the `/v1/completions` API. The endpoint value stored in settings is a base URL; the full request URL is constructed by appending `/v1/completions` (adding a slash when needed) and defaulting to `https://` if no scheme is provided.
 The options page can query `/v1/models` from the same base URL to populate the Model dropdown; selecting **None** omits the `model` field from the request payload.
+Advanced options allow an optional API key plus `OpenAI-Organization` and `OpenAI-Project` headers; these headers are only sent when values are provided.
 Responses are expected to include a JSON object with `match` (or `matched`) plus a short `reason` string; the parser extracts the last JSON object in the response text and ignores any surrounding commentary.
 
 ## Documentation
diff --git a/README.md b/README.md
index 957e5e0..5b908ea 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ expecting a `match` (or `matched`) boolean plus a `reason` string.
 
 - **Configurable endpoint** – set the classification service base URL on the options page.
 - **Model selection** – load available models from the endpoint and choose one (or omit the model field).
+- **Optional OpenAI auth headers** – provide an API key plus optional organization/project headers when needed.
 - **Prompt templates** – choose between OpenAI/ChatML, Qwen, Mistral, Harmony (gpt-oss), or provide your own custom template.
 - **Custom system prompts** – tailor the instructions sent to the model for more precise results.
 - **Persistent result caching** – classification results and reasoning are saved to disk so messages aren't re-evaluated across restarts.
@@ -82,6 +83,8 @@ Sortana is implemented entirely with standard WebExtension scripts—no custom e
 1. Open the add-on's options and set the base URL of your classification service
    (Sortana will append `/v1/completions`). Use the Model dropdown to load
    `/v1/models` and select a model or choose **None** to omit the `model` field.
+   Advanced settings include optional API key, organization, and project headers
+   for OpenAI-hosted endpoints.
  2. Use the **Classification Rules** section to add a criterion and optional
    actions such as tagging, moving, copying, forwarding, replying,
    deleting or archiving a message when it matches. Drag rules to
diff --git a/background.js b/background.js
index aef8cbb..827dec8 100644
--- a/background.js
+++ b/background.js
@@ -484,7 +484,7 @@ async function clearCacheForMessages(idsInput) {
     }
 
     try {
-        const store = await storage.local.get(["endpoint", "model", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "showDebugTab"]);
+        const store = await storage.local.get(["endpoint", "model", "apiKey", "openaiOrganization", "openaiProject", "templateName", "customTemplate", "customSystemPrompt", "aiParams", "debugLogging", "htmlToMarkdown", "stripUrlParams", "altTextImages", "collapseWhitespace", "tokenReduction", "aiRules", "theme", "showDebugTab"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -514,10 +514,13 @@ async function clearCacheForMessages(idsInput) {
                 aiRules = normalizeRules(newRules);
                 logger.aiLog("aiRules updated from storage change", { debug: true }, aiRules);
             }
-            if (changes.endpoint || changes.model || changes.templateName || changes.customTemplate || changes.customSystemPrompt || changes.aiParams || changes.debugLogging) {
+            if (changes.endpoint || changes.model || changes.apiKey || changes.openaiOrganization || changes.openaiProject || changes.templateName || changes.customTemplate || changes.customSystemPrompt || changes.aiParams || changes.debugLogging) {
                 const config = {};
                 if (changes.endpoint) config.endpoint = changes.endpoint.newValue;
                 if (changes.model) config.model = changes.model.newValue;
+                if (changes.apiKey) config.apiKey = changes.apiKey.newValue;
+                if (changes.openaiOrganization) config.openaiOrganization = changes.openaiOrganization.newValue;
+                if (changes.openaiProject) config.openaiProject = changes.openaiProject.newValue;
                 if (changes.templateName) config.templateName = changes.templateName.newValue;
                 if (changes.customTemplate) config.customTemplate = changes.customTemplate.newValue;
                 if (changes.customSystemPrompt) config.customSystemPrompt = changes.customSystemPrompt.newValue;
diff --git a/manifest.json b/manifest.json
index a18e7cd..81baae5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Sortana",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "default_locale": "en-US",
   "applications": {
     "gecko": {
diff --git a/modules/AiClassifier.js b/modules/AiClassifier.js
index cb68382..b4c0907 100644
--- a/modules/AiClassifier.js
+++ b/modules/AiClassifier.js
@@ -40,6 +40,9 @@ let gTemplateText = "";
 
 let gAiParams = Object.assign({}, DEFAULT_AI_PARAMS);
 let gModel = "";
+let gApiKey = "";
+let gOpenaiOrganization = "";
+let gOpenaiProject = "";
 
 let gCache = new Map();
 let gCacheLoaded = false;
@@ -223,6 +226,15 @@ async function setConfig(config = {}) {
   if (typeof config.model === "string") {
     gModel = config.model.trim();
   }
+  if (typeof config.apiKey === "string") {
+    gApiKey = config.apiKey.trim();
+  }
+  if (typeof config.openaiOrganization === "string") {
+    gOpenaiOrganization = config.openaiOrganization.trim();
+  }
+  if (typeof config.openaiProject === "string") {
+    gOpenaiProject = config.openaiProject.trim();
+  }
   if (typeof config.debugLogging === "boolean") {
     setDebug(config.debugLogging);
   }
@@ -241,6 +253,20 @@ async function setConfig(config = {}) {
   aiLog(`[AiClassifier] Template set to ${gTemplateName}`, {debug: true});
 }
 
+function buildAuthHeaders() {
+  const headers = {};
+  if (gApiKey) {
+    headers.Authorization = `Bearer ${gApiKey}`;
+  }
+  if (gOpenaiOrganization) {
+    headers["OpenAI-Organization"] = gOpenaiOrganization;
+  }
+  if (gOpenaiProject) {
+    headers["OpenAI-Project"] = gOpenaiProject;
+  }
+  return headers;
+}
+
 function buildSystemPrompt() {
   return SYSTEM_PREFIX + (gCustomSystemPrompt || DEFAULT_CUSTOM_SYSTEM_PROMPT) + SYSTEM_SUFFIX;
 }
@@ -453,7 +479,7 @@ async function classifyText(text, criterion, cacheKey = null) {
   try {
     const response = await fetch(gEndpoint, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
+      headers: { "Content-Type": "application/json", ...buildAuthHeaders() },
       body: payload,
     });
 
diff --git a/options/dataTransfer.js b/options/dataTransfer.js
index fdf096f..393b533 100644
--- a/options/dataTransfer.js
+++ b/options/dataTransfer.js
@@ -4,6 +4,9 @@ const KEY_GROUPS = {
     settings: [
         'endpoint',
         'model',
+        'apiKey',
+        'openaiOrganization',
+        'openaiProject',
         'templateName',
         'customTemplate',
         'customSystemPrompt',
diff --git a/options/options.html b/options/options.html
index 4c1fd79..2a1431e 100644
--- a/options/options.html
+++ b/options/options.html
@@ -141,6 +141,32 @@
                 </div>
 
                 <div id="advanced-options" class="mt-4 is-hidden">
+                    <div class="field">
+                        <label class="label" for="api-key">API key</label>
+                        <div class="field has-addons">
+                            <div class="control is-expanded">
+                                <input class="input" type="password" id="api-key" placeholder="sk-...">
+                            </div>
+                            <div class="control">
+                                <button class="button" id="toggle-api-key" type="button">Show</button>
+                            </div>
+                        </div>
+                        <p class="help">Leave blank for unauthenticated endpoints.</p>
+                    </div>
+                    <div class="field">
+                        <label class="label" for="openai-organization">OpenAI Organization</label>
+                        <div class="control">
+                            <input class="input" type="text" id="openai-organization" placeholder="org-...">
+                        </div>
+                        <p class="help">Optional header for OpenAI-hosted endpoints.</p>
+                    </div>
+                    <div class="field">
+                        <label class="label" for="openai-project">OpenAI Project</label>
+                        <div class="control">
+                            <input class="input" type="text" id="openai-project" placeholder="proj_...">
+                        </div>
+                        <p class="help">Optional header for OpenAI-hosted endpoints.</p>
+                    </div>
                     <div class="field">
                         <label class="checkbox">
                             <input type="checkbox" id="debug-logging"> Enable debug logging
diff --git a/options/options.js b/options/options.js
index 5e46857..872a7c9 100644
--- a/options/options.js
+++ b/options/options.js
@@ -11,6 +11,9 @@ document.addEventListener('DOMContentLoaded', async () => {
         'customTemplate',
         'customSystemPrompt',
         'model',
+        'apiKey',
+        'openaiOrganization',
+        'openaiProject',
         'aiParams',
         'debugLogging',
         'htmlToMarkdown',
@@ -140,6 +143,23 @@ document.addEventListener('DOMContentLoaded', async () => {
         modelSelect.value = hasSelected ? selectedModel : '';
     }
 
+    function buildAuthHeaders() {
+        const headers = {};
+        const apiKey = apiKeyInput?.value.trim();
+        if (apiKey) {
+            headers.Authorization = `Bearer ${apiKey}`;
+        }
+        const organization = openaiOrgInput?.value.trim();
+        if (organization) {
+            headers["OpenAI-Organization"] = organization;
+        }
+        const project = openaiProjectInput?.value.trim();
+        if (project) {
+            headers["OpenAI-Project"] = project;
+        }
+        return headers;
+    }
+
     async function fetchModels(preferredModel = '') {
         if (!modelSelect || !refreshModelsBtn) return;
         const modelsUrl = AiClassifier.buildModelsUrl(endpointInput.value);
@@ -153,7 +173,7 @@ document.addEventListener('DOMContentLoaded', async () => {
         setModelHelp('Loading models...');
 
         try {
-            const response = await fetch(modelsUrl, { method: 'GET' });
+            const response = await fetch(modelsUrl, { method: 'GET', headers: buildAuthHeaders() });
             if (!response.ok) {
                 throw new Error(`HTTP ${response.status}`);
             }
@@ -215,6 +235,26 @@ document.addEventListener('DOMContentLoaded', async () => {
         advancedBox.classList.toggle('is-hidden');
     });
 
+    const apiKeyInput = document.getElementById('api-key');
+    const apiKeyToggle = document.getElementById('toggle-api-key');
+    const openaiOrgInput = document.getElementById('openai-organization');
+    const openaiProjectInput = document.getElementById('openai-project');
+    if (apiKeyInput) {
+        apiKeyInput.value = typeof defaults.apiKey === 'string' ? defaults.apiKey : '';
+    }
+    if (openaiOrgInput) {
+        openaiOrgInput.value = typeof defaults.openaiOrganization === 'string' ? defaults.openaiOrganization : '';
+    }
+    if (openaiProjectInput) {
+        openaiProjectInput.value = typeof defaults.openaiProject === 'string' ? defaults.openaiProject : '';
+    }
+    apiKeyToggle?.addEventListener('click', () => {
+        if (!apiKeyInput) return;
+        const show = apiKeyInput.type === 'password';
+        apiKeyInput.type = show ? 'text' : 'password';
+        apiKeyToggle.textContent = show ? 'Hide' : 'Show';
+    });
+
     const debugToggle = document.getElementById('debug-logging');
     debugToggle.checked = defaults.debugLogging === true;
 
@@ -999,6 +1039,9 @@ document.addEventListener('DOMContentLoaded', async () => {
     document.getElementById('save').addEventListener('click', async () => {
         const endpoint = endpointInput.value.trim();
         const model = modelSelect?.value || '';
+        const apiKey = apiKeyInput?.value.trim() || '';
+        const openaiOrganization = openaiOrgInput?.value.trim() || '';
+        const openaiProject = openaiProjectInput?.value.trim() || '';
         const templateName = templateSelect.value;
         const customTemplateText = customTemplate.value;
         const customSystemPrompt = systemBox.value;
@@ -1064,10 +1107,10 @@ document.addEventListener('DOMContentLoaded', async () => {
         const tokenReduction = tokenReductionToggle.checked;
         const showDebugTab = debugTabToggle.checked;
         const theme = themeSelect.value;
-        await storage.local.set({ endpoint, model, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme, showDebugTab });
+        await storage.local.set({ endpoint, model, apiKey, openaiOrganization, openaiProject, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, tokenReduction, aiRules: rules, theme, showDebugTab });
         await applyTheme(theme);
         try {
-            await AiClassifier.setConfig({ endpoint, model, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });
+            await AiClassifier.setConfig({ endpoint, model, apiKey, openaiOrganization, openaiProject, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });
             logger.setDebug(debugLogging);
         } catch (e) {
             logger.aiLog('[options] failed to apply config', {level: 'error'}, e);

From 5996a87058363f01cf2deeb53361b7915d3ab94c Mon Sep 17 00:00:00 2001
From: wagesj45 <jordan@jordanwages.com>
Date: Fri, 30 Jan 2026 15:08:33 -0600
Subject: [PATCH 50/50] Add timing stats reset button

---
 background.js        |  9 +++++++++
 manifest.json        |  2 +-
 options/options.html | 14 ++++++++++----
 options/options.js   |  5 +++++
 4 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/background.js b/background.js
index 827dec8..b2efc89 100644
--- a/background.js
+++ b/background.js
@@ -750,6 +750,15 @@ async function clearCacheForMessages(idsInput) {
                 logger.aiLog("failed to clear cache for message", { level: 'error' }, e);
                 return { ok: false };
             }
+        } else if (msg?.type === "sortana:resetTimingStats") {
+            const last = timingStats.last;
+            timingStats.count = 0;
+            timingStats.mean = 0;
+            timingStats.m2 = 0;
+            timingStats.total = 0;
+            timingStats.last = typeof last === 'number' ? last : -1;
+            await storage.local.set({ classifyStats: timingStats });
+            return { ok: true };
         } else if (msg?.type === "sortana:getQueueCount") {
             return { count: queuedCount + (processing ? 1 : 0) };
         } else if (msg?.type === "sortana:getErrorLog") {
diff --git a/manifest.json b/manifest.json
index 81baae5..dcddb67 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Sortana",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "default_locale": "en-US",
   "applications": {
     "gecko": {
diff --git a/options/options.html b/options/options.html
index 2a1431e..cfc370d 100644
--- a/options/options.html
+++ b/options/options.html
@@ -298,10 +298,16 @@
                         <tr><th>Messages per day</th><td id="per-day">0</td></tr>
                     </tbody>
                 </table>
-                <button class="button is-danger" id="clear-cache" type="button">
-                    <span class="icon is-small"><img data-icon="trash" data-size="16" src="../resources/img/trash-light-16.png" alt=""></span>
-                    <span>Clear Cache</span>
-                </button>
+                <div class="buttons">
+                    <button class="button is-danger" id="clear-cache" type="button">
+                        <span class="icon is-small"><img data-icon="trash" data-size="16" src="../resources/img/trash-light-16.png" alt=""></span>
+                        <span>Clear Cache</span>
+                    </button>
+                    <button class="button is-warning" id="reset-timing" type="button">
+                        <span class="icon is-small"><img data-icon="average" data-size="16" src="../resources/img/average-light-16.png" alt=""></span>
+                        <span>Reset Timing Stats</span>
+                    </button>
+                </div>
                 <div class="field mt-4">
                     <label class="label">Data categories</label>
                     <div class="control">
diff --git a/options/options.js b/options/options.js
index 872a7c9..9a61542 100644
--- a/options/options.js
+++ b/options/options.js
@@ -1017,6 +1017,11 @@ document.addEventListener('DOMContentLoaded', async () => {
         cacheCountEl.textContent = '0';
     });
 
+    document.getElementById('reset-timing').addEventListener('click', async () => {
+        await browser.runtime.sendMessage({ type: 'sortana:resetTimingStats' });
+        await refreshMaintenance();
+    });
+
     function selectedCategories() {
         return [...document.querySelectorAll('.transfer-category:checked')].map(el => el.value);
     }