AGENTS.md

@@ -10,9 +10,8 @@ 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 (openai, qwen, mistral, harmony).
+- `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
 
@@ -31,11 +30,6 @@ 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.
-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
 
 Additional documentation exists outside this repository.
@@ -79,3 +73,4 @@ 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.
+

README.md

@@ -4,36 +4,31 @@
 
 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. 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, 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.
+HTTP endpoint. The endpoint should respond with JSON indicating whether the
+message meets a specified criterion.
 
 ## Features
 
-- **Configurable endpoint** – set the classification service base URL on the options page.
-- **Prompt templates** – choose between OpenAI/ChatML, Qwen, Mistral, Harmony (gpt-oss), or provide your own custom template.
+- **Configurable endpoint** – set the classification service 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.
 - **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.
+- **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.
 - **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 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.
+- **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.
-- **Packaging scripts** – `build-xpi.ps1` (PowerShell) or `build-xpi.sh` (bash) build an XPI ready for installation.
+- **Packaging script** – `build-xpi.ps1` builds an XPI ready for installation.
 - **Maintenance tab** – view rule counts, cache entries and clear cached results from the options page.
 
 ### Cache Storage
@@ -69,17 +64,15 @@ 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` or `./build-xpi.sh` 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` 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
 
-1. Open the add-on's options and set the base URL of your classification service
-   (Sortana will append `/v1/completions`).
+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, forwarding, replying,
    deleting or archiving a message when it matches. Drag rules to
@@ -92,7 +85,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, it will clear after a few seconds. Open the Errors tab in Options to review the latest failures.
+4. If the toolbar icon shows a red X, click the notification's **Dismiss** button to clear the error.
 
 ### Example Filters
 
@@ -165,3 +158,4 @@ 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.
+

_locales/en-US/messages.json

@@ -12,7 +12,6 @@
   "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" },

ai-filter.sln

@@ -44,7 +44,6 @@ 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}"

background.js

@@ -19,7 +19,6 @@ 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;
@@ -34,11 +33,8 @@ 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 => {
@@ -112,42 +108,11 @@ function showTransientIcon(factory, delay = 1500) {
 
 async function clearError() {
     errorPending = false;
-    clearTimeout(errorTimer);
+    await storage.local.set({ errorPending: false });
     await browser.notifications.clear(ERROR_NOTIFICATION_ID);
     updateActionIcon();
 }
 
-function recordError(context, err) {
-    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,
-        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') });
@@ -245,38 +210,17 @@ function collectText(part, bodyParts, attachments) {
     }
 }
 
-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) {
+function buildEmailText(full) {
     const bodyParts = [];
     const attachments = [];
-    const collect = applyTransforms ? collectText : collectRawText;
-    collect(full, bodyParts, attachments);
+    collectText(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 (applyTransforms && tokenReduction) {
+    if (tokenReduction) {
         const seen = new Set();
         combined = combined.split('\n').filter(l => {
             if (seen.has(l)) return false;
@@ -284,7 +228,7 @@ function buildEmailText(full, applyTransforms = true) {
             return true;
         }).join('\n');
     }
-    return applyTransforms ? sanitizeString(combined) : combined;
+    return sanitizeString(combined);
 }
 
 function updateTimingStats(elapsed) {
@@ -318,8 +262,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) {
@@ -417,14 +361,16 @@ 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);
-        recordError("Failed to apply AI rules", e);
+        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'
+            message: 'Failed to apply AI rules',
+            buttons: [{ title: 'Dismiss' }]
         });
     }
 }
@@ -484,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", "showDebugTab"]);
+        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';
@@ -498,6 +444,7 @@ 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') {
@@ -556,6 +503,10 @@ 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;
@@ -748,11 +699,6 @@ 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: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;
@@ -784,7 +730,6 @@ 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 => {

build-xpi.sh

@@ -1,77 +0,0 @@
-#!/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"

manifest.json

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

modules/AiClassifier.js

@@ -15,8 +15,6 @@ 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.
 `;
@@ -25,13 +23,12 @@ 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, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise
 
 Do not add any other keys, text, or formatting.`;
 
-let gEndpointBase = "http://127.0.0.1:5000";
-let gEndpoint = buildEndpointUrl(gEndpointBase);
+let gEndpoint = "http://127.0.0.1:5000/v1/classify";
 let gTemplateName = "openai";
 let gCustomTemplate = "";
 let gCustomSystemPrompt = DEFAULT_CUSTOM_SYSTEM_PROMPT;
@@ -42,28 +39,6 @@ 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);
@@ -183,12 +158,8 @@ function loadTemplateSync(name) {
 }
 
 async function setConfig(config = {}) {
-  if (typeof config.endpoint === "string") {
-    const base = normalizeEndpointBase(config.endpoint);
-    if (base) {
-      gEndpointBase = base;
-    }
-    gEndpoint = buildEndpointUrl(gEndpointBase);
+  if (config.endpoint) {
+    gEndpoint = config.endpoint;
   }
   if (config.templateName) {
     gTemplateName = config.templateName;
@@ -216,10 +187,6 @@ 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});
 }
@@ -266,95 +233,15 @@ 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 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 };
+  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 };
 }
 
 function cacheEntry(cacheKey, matched, reason) {
@@ -457,4 +344,4 @@ async function init() {
   await loadCache();
 }
 
-export { buildEndpointUrl, normalizeEndpointBase, classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };
+export { classifyText, setConfig, removeCacheEntries, clearCache, getReason, getCachedResult, buildCacheKey, getCacheSize, init };

options/options.html

@@ -51,7 +51,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="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>
@@ -74,7 +73,6 @@
                     <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">
@@ -286,32 +284,6 @@
                 </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>
@@ -319,10 +291,7 @@
                 </h2>
                 <pre id="payload-display"></pre>
                 <div id="diff-container" class="mt-4 is-hidden">
-                    <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>
+                    <label class="label">Prompt diff</label>
                     <div id="diff-display" class="box content is-family-monospace"></div>
                 </div>
             </div>

options/options.js

@@ -71,7 +71,6 @@ 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 || '';
@@ -80,31 +79,32 @@ 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);
     });
-    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();
+    document.getElementById('endpoint').value = defaults.endpoint || 'http://127.0.0.1:5000/v1/completions';
 
     const templates = {
         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');
@@ -150,58 +150,8 @@ 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');
-    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);
@@ -210,79 +160,6 @@ 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 => {
-        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)) {
@@ -879,7 +756,23 @@ document.addEventListener('DOMContentLoaded', async () => {
                 if (latest.lastFullText !== lastFullText || latest.lastPromptText !== lastPromptText) {
                     lastFullText = latest.lastFullText || '';
                     lastPromptText = latest.lastPromptText || '';
-                    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');
+                        }
+                    } else {
+                        diffDisplay.innerHTML = '';
+                        diffContainer.classList.add('is-hidden');
+                    }
                 }
             }
         } catch {}
@@ -913,7 +806,7 @@ document.addEventListener('DOMContentLoaded', async () => {
     initialized = true;
 
     document.getElementById('save').addEventListener('click', async () => {
-        const endpoint = endpointInput.value.trim();
+        const endpoint = document.getElementById('endpoint').value;
         const templateName = templateSelect.value;
         const customTemplateText = customTemplate.value;
         const customSystemPrompt = systemBox.value;

prompt_templates/harmony.txt

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

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, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise
 
 Do not add any other keys, text, or formatting.
 [/INST]

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, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise
 
 Do not add any other keys, text, or formatting.<|im_end|>
 <|im_start|>assistant

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, "reason": "<short explanation>"} - if the email satisfies the criterion
-{"match": false, "reason": "<short explanation>"} - otherwise
+{"match": true} - if the email satisfies the criterion
+{"match": false} - otherwise
 
 Do not add any other keys, text, or formatting.
 <|im_end|>