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. Do **not** run the `ps1` build script or the SVG processing script.
+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.
 
 ## Documentation
 

README.md

@@ -16,15 +16,11 @@ 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 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.
+- **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.
-- **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.
+- **Status icons** – toolbar icons show when classification is in progress and briefly display success or error states.
-- **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.
@@ -73,19 +69,14 @@ 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,
+   reorder them, check *Only apply to unread messages* to skip read mail, and
-   set optional minimum or maximum message age limits, select the accounts or
+   check *Stop after match* to halt further processing. Forward and reply actions
- folders a rule should apply to. Use the
- 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.
-4. If the toolbar icon shows a red X, click the notification's **Dismiss** button to clear the error.
 
 ### Example Filters
 
@@ -127,7 +118,6 @@ 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
@@ -141,8 +131,6 @@ 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
 

_locales/en-US/messages.json

@@ -18,8 +18,7 @@
   "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" }
   ,"action.read": { "message": "read" }
   ,"action.flag": { "message": "flag" }
     ,"action.copy": { "message": "copy" }

ai-filter.sln

@@ -108,7 +108,6 @@ 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

background.js

@@ -26,24 +26,14 @@ let htmlToMarkdown = false;
 let stripUrlParams = false;
 let altTextImages = false;
 let collapseWhitespace = false;
-let tokenReduction = false;
-let maxTokens = 4096;
 let TurndownService = null;
 let userTheme = 'auto';
 let currentTheme = 'light';
 let detectSystemTheme;
-let errorPending = false;
-let showDebugTab = false;
-const ERROR_NOTIFICATION_ID = 'sortana-error';
 
 function normalizeRules(rules) {
     return Array.isArray(rules) ? rules.map(r => {
-        if (r.actions) {
+        if (r.actions) return r;
-            if (!Array.isArray(r.accounts)) r.accounts = [];
-            if (!Array.isArray(r.folders)) r.folders = [];
-            r.enabled = r.enabled !== false;
-            return r;
-        }
         const actions = [];
         if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
@@ -51,11 +41,6 @@ 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;
-        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;
     }) : [];
 }
@@ -73,8 +58,7 @@ 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) {
@@ -88,31 +72,19 @@ function setIcon(path) {
 
 function updateActionIcon() {
     let path = ICONS.logo();
-    if (errorPending) {
+    if (processing || queuedCount > 0) {
-        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') });
@@ -128,16 +100,12 @@ function byteSize(str) {
 }
 
 function replaceInlineBase64(text) {
-    return text.replace(/(?:data:[^;]+;base64,)?[A-Za-z0-9+/=\r\n]{100,}/g,
+    return text.replace(/[A-Za-z0-9+/]{100,}={0,2}/g,
-        m => tokenReduction ? '__BASE64__' : `[base64: ${byteSize(m)} bytes]`);
+        m => `[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('?');
@@ -145,7 +113,7 @@ function sanitizeString(text) {
         });
     }
     if (collapseWhitespace) {
-        t = t.replace(/[\u200B-\u200D\u2060\s]{2,}/g, ' ').replace(/\n{3,}/g, '\n\n');
+        t = t.replace(/[ \t\u00A0]{2,}/g, ' ').replace(/\n{3,}/g, '\n\n');
     }
     return t;
 }
@@ -164,26 +132,12 @@ 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 (tokenReduction) {
+        if (altTextImages) {
-            doc.querySelectorAll('script,style').forEach(el => el.remove());
+            doc.querySelectorAll('img').forEach(img => {
-            const walker = doc.createTreeWalker(doc, NodeFilter.SHOW_COMMENT);
+                const alt = img.getAttribute('alt') || '';
-            let node;
+                img.replaceWith(doc.createTextNode(alt));
-            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');
@@ -210,46 +164,17 @@ function collectText(part, bodyParts, attachments) {
     }
 }
 
-function collectRawText(part, bodyParts, attachments) {
+function buildEmailText(full) {
-    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 = [];
-    const collect = applyTransforms ? collectText : collectRawText;
+    collectText(full, bodyParts, attachments);
-    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();
+    const combined = `${headers}\n${attachInfo}\n\n${bodyParts.join('\n')}`.trim();
-    if (applyTransforms && tokenReduction) {
+    return sanitizeString(combined);
-        const seen = new Set();
-        combined = combined.split('\n').filter(l => {
-            if (seen.has(l)) return false;
-            seen.add(l);
-            return true;
-        }).join('\n');
-    }
-    return applyTransforms ? sanitizeString(combined) : combined;
 }
 
 function updateTimingStats(elapsed) {
@@ -283,17 +208,7 @@ async function processMessage(id) {
     updateActionIcon();
     try {
         const full = await messenger.messages.getFull(id);
-        const originalText = buildEmailText(full, false);
+        const text = buildEmailText(full);
-        let text = buildEmailText(full);
-        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;
@@ -311,32 +226,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;
-            }
-            if (hdr && Array.isArray(rule.folders) && rule.folders.length &&
-                !rule.folders.includes(hdr.folder.path)) {
-                continue;
-            }
             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) {
@@ -382,17 +274,9 @@ async function processMessage(id) {
         const elapsed = Date.now() - currentStart;
         currentStart = 0;
         updateTimingStats(elapsed);
-        await storage.local.set({ classifyStats: timingStats, errorPending: true });
+        await storage.local.set({ classifyStats: timingStats });
-        errorPending = true;
         logger.aiLog("failed to apply AI rules", { level: 'error' }, e);
-        setIcon(ICONS.error());
+        showTransientIcon(ICONS.average);
-        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) {
@@ -451,7 +335,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", "aiRules", "theme"]);
         logger.setDebug(store.debugLogging);
         await AiClassifier.setConfig(store);
         userTheme = store.theme || 'auto';
@@ -461,12 +345,6 @@ async function clearCacheForMessages(idsInput) {
         stripUrlParams = store.stripUrlParams === true;
         altTextImages = store.altTextImages === true;
         collapseWhitespace = store.collapseWhitespace === true;
-        tokenReduction = store.tokenReduction === true;
-        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') {
             Object.assign(timingStats, savedStats.classifyStats);
@@ -482,25 +360,6 @@ 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.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);
-                }
-                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);
@@ -517,17 +376,6 @@ 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.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;
@@ -753,18 +601,6 @@ 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();

manifest.json

@@ -1,13 +1,13 @@
 {
   "manifest_version": 2,
   "name": "Sortana",
-  "version": "2.2.0",
+  "version": "2.1.1",
   "default_locale": "en-US",
   "applications": {
     "gecko": {
       "id": "ai-filter@jordanwages",
       "strict_min_version": "128.0",
-      "strict_max_version": "140.*"
+      "strict_max_version": "139.*"
     }
   },
   "icons": {
@@ -32,18 +32,17 @@
     "page": "options/options.html",
     "open_in_tab": true
   },
-    "permissions": [
+  "permissions": [
-      "storage",
+    "storage",
-      "messagesRead",
+    "messagesRead",
-      "messagesMove",
+    "messagesMove",
-      "messagesUpdate",
+    "messagesUpdate",
-      "messagesTagsList",
+    "messagesTagsList",
-      "accountsRead",
+    "accountsRead",
-      "menus",
+    "menus",
-      "notifications",
+    "scripting",
-      "scripting",
+    "tabs",
-      "tabs",
+    "theme",
-      "theme",
+    "compose"
-      "compose"
+  ]
-    ]
 }

modules/AiClassifier.js

@@ -308,11 +308,6 @@ 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);

options/options.html

@@ -31,10 +31,6 @@
         .tag {
             --bulma-tag-h: 318;
         }
-        #diff-display {
-            white-space: pre-wrap;
-            font-family: monospace;
-        }
     </style>
 </head>
 <body>
@@ -51,7 +47,6 @@
                             <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>
@@ -149,16 +144,6 @@
                             <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="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">
@@ -283,21 +268,8 @@
                     </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 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>
-    <script src="../resources/js/diff_match_patch_uncompressed.js"></script>
     <script src="options.js"></script>
 </body>
 </html>

options/options.js

@@ -16,14 +16,9 @@ document.addEventListener('DOMContentLoaded', async () => {
         'stripUrlParams',
         'altTextImages',
         'collapseWhitespace',
-        'tokenReduction',
         'aiRules',
         'aiCache',
-        'theme',
+        'theme'
-        'showDebugTab',
-        'lastPayload',
-        'lastFullText',
-        'lastPromptText'
     ]);
     const tabButtons = document.querySelectorAll('#main-tabs li');
     const tabs = document.querySelectorAll('.tab-content');
@@ -68,33 +63,6 @@ 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 || '';
-    let lastPayload = defaults.lastPayload ? JSON.stringify(defaults.lastPayload, null, 2) : '';
-
-    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);
@@ -147,20 +115,6 @@ 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 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)) {
         const el = document.getElementById(key);
@@ -169,7 +123,6 @@ document.addEventListener('DOMContentLoaded', async () => {
 
     let tagList = [];
     let folderList = [];
-    let accountList = [];
     try {
         tagList = await messenger.messages.tags.list();
     } catch (e) {
@@ -177,7 +130,6 @@ 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 + '/'));
@@ -328,39 +280,6 @@ document.addEventListener('DOMContentLoaded', async () => {
         return row;
     }
 
-    function createConditionButton(label, sectionEl, checkbox, clearFn) {
-        const btn = document.createElement('button');
-        btn.type = 'button';
-        btn.className = 'button is-small is-light';
-        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-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;
-            if (!active && typeof clearFn === 'function') {
-                clearFn();
-            }
-        }
-
-        btn.addEventListener('click', () => {
-            active = !active;
-            markDirty();
-            update();
-        });
-
-        update();
-        return btn;
-    }
-
     function renderRules(rules = []) {
         ruleCountEl.textContent = rules.length;
         rulesContainer.innerHTML = '';
@@ -394,67 +313,16 @@ 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 is-light rule-toggle';
-            const toggleIcon = document.createElement('img');
-            toggleIcon.width = 16;
-            toggleIcon.height = 16;
-            toggleBtn.appendChild(toggleIcon);
 
             const delBtn = document.createElement('button');
-            delBtn.type = 'button';
+            delBtn.className = 'delete';
-            delBtn.className = 'button is-small is-danger is-light rule-delete';
+            delBtn.setAttribute('aria-label', '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);
-            btnWrap.appendChild(toggleBtn);
-            btnWrap.appendChild(delBtn);
-            header.appendChild(btnWrap);
-
-            updateToggle();
 
             const actionsContainer = document.createElement('div');
             actionsContainer.className = 'rule-actions mb-2';
@@ -470,7 +338,7 @@ document.addEventListener('DOMContentLoaded', async () => {
             addAction.addEventListener('click', () => actionsContainer.appendChild(createActionRow()));
 
            const stopLabel = document.createElement('label');
-           stopLabel.className = 'checkbox mt-2 is-hidden';
+           stopLabel.className = 'checkbox mt-2';
            const stopCheck = document.createElement('input');
            stopCheck.type = 'checkbox';
            stopCheck.className = 'stop-processing';
@@ -479,7 +347,7 @@ document.addEventListener('DOMContentLoaded', async () => {
            stopLabel.append(' Stop after match');
 
             const unreadLabel = document.createElement('label');
-            unreadLabel.className = 'checkbox mt-2 ml-4 is-hidden';
+            unreadLabel.className = 'checkbox mt-2 ml-4';
             const unreadCheck = document.createElement('input');
             unreadCheck.type = 'checkbox';
             unreadCheck.className = 'unread-only';
@@ -487,121 +355,12 @@ 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 is-hidden';
-            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 acctBox = document.createElement('div');
-            acctBox.className = 'field mt-2 is-hidden';
-            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 is-hidden';
-            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);
-
-            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, () => {
-                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);
-            body.appendChild(ageBox);
-            body.appendChild(acctBox);
-            body.appendChild(folderBox);
 
             article.appendChild(header);
             article.appendChild(body);
@@ -640,31 +399,14 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            const enabled = ruleEl.dataset.enabled !== 'false';
+            return { criterion, actions, unreadOnly, stopProcessing };
-            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, 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;
-            if (folders.length) rule.folders = folders;
-            return rule;
         });
-        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false, enabled: true, accounts: [], folders: [] });
+        data.push({ criterion: '', actions: [], unreadOnly: false, stopProcessing: false });
         renderRules(data);
     });
 
     renderRules((defaults.aiRules || []).map(r => {
-        if (r.actions) {
+        if (r.actions) return r;
-            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 = [];
         if (r.tag) actions.push({ type: 'tag', tagKey: r.tag });
         if (r.moveTo) actions.push({ type: 'move', folder: r.moveTo });
@@ -672,11 +414,6 @@ 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;
-        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;
     }));
 
@@ -744,38 +481,6 @@ 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);
-                        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');
-                    }
-                }
-            }
-        } catch {}
     }
 
     refreshMaintenance();
@@ -852,27 +557,13 @@ document.addEventListener('DOMContentLoaded', async () => {
             });
             const stopProcessing = ruleEl.querySelector('.stop-processing')?.checked;
             const unreadOnly = ruleEl.querySelector('.unread-only')?.checked;
-            const enabled = ruleEl.dataset.enabled !== 'false';
+            return { criterion, actions, unreadOnly, stopProcessing };
-            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, 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;
-            if (folders.length) rule.folders = folders;
-            return rule;
         }).filter(r => r.criterion);
         const stripUrlParams = stripUrlToggle.checked;
         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, showDebugTab });
+        await storage.local.set({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging, htmlToMarkdown, stripUrlParams, altTextImages, collapseWhitespace, aiRules: rules, theme });
         await applyTheme(theme);
         try {
             await AiClassifier.setConfig({ endpoint, templateName, customTemplate: customTemplateText, customSystemPrompt, aiParams: aiParamsSave, debugLogging });

resources/svg/circledot.svg

@@ -1,4 +0,0 @@
-<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>

resources/svg/circleslash.svg

@@ -1,3 +0,0 @@
-<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>

resources/svg/plus.svg

@@ -1,3 +0,0 @@
-<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>