termsearch 0.3.2 → 0.3.3

package/README.md

@@ -1,6 +1,6 @@
 # TermSearch - Personal Search Engine
 
-[![Status](https://img.shields.io/badge/Status-0.3.2-blue.svg)](#project-status)
+[![Status](https://img.shields.io/badge/Status-0.3.3-blue.svg)](#project-status)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 [![Node.js](https://img.shields.io/badge/Node.js-18%2B-green.svg)](https://nodejs.org)
 [![Target](https://img.shields.io/badge/Target-Termux%20%2F%20Linux%20%2F%20macOS-green.svg)](https://termux.dev)
@@ -24,7 +24,7 @@ Core capabilities:
 
 ## Project Status
 
-- Current line: `0.3.2`
+- Current line: `0.3.3`
 - Core is MIT — zero required API keys
 - AI features are optional, configured via Settings page in browser
 - Tested on: Ubuntu 24.04, Termux (Android 15/16)
@@ -112,7 +112,7 @@ All providers use the OpenAI-compatible `/chat/completions` format. Leave API ke
 src/
   config/           config manager — load/save/defaults/env overrides
   search/
-    providers/      DuckDuckGo, Wikipedia, Brave, Mojeek, SearXNG, GitHub API
+    providers/      DuckDuckGo, Wikipedia, Brave, Mojeek, SearXNG, GitHub API, Yandex, Ahmia, Marginalia
     engine.js       fan-out, merge, rank, cache
     ranking.js      source diversity ranking
     cache.js        tiered cache (L1 Map + L2 disk JSON)
@@ -177,6 +177,8 @@ TERMSEARCH_AI_API_KEY=
 TERMSEARCH_AI_MODEL=glm-4.7
 TERMSEARCH_BRAVE_API_KEY=
 TERMSEARCH_MOJEEK_API_KEY=
+TERMSEARCH_MARGINALIA_API_KEY=public
+TERMSEARCH_MARGINALIA_API_BASE=https://api2.marginalia-search.com
 TERMSEARCH_SEARXNG_URL=
 TERMSEARCH_GITHUB_TOKEN=
 TERMSEARCH_INSTAGRAM_SESSION=

package/config.example.json

@@ -24,6 +24,17 @@
     "enabled": false,
     "api_key": ""
   },
+  "yandex": {
+    "enabled": true
+  },
+  "ahmia": {
+    "enabled": true
+  },
+  "marginalia": {
+    "enabled": true,
+    "api_key": "public",
+    "api_base": "https://api2.marginalia-search.com"
+  },
   "searxng": {
     "enabled": false,
     "url": ""

package/frontend/dist/app.js

@@ -9,6 +9,15 @@ const state = {
   aiStatus: 'idle',
   aiError: null,
   aiMeta: null,
+  aiProgress: 0,
+  aiSteps: [],
+  aiSources: [],
+  aiExpanded: false,
+  aiStartTime: null,
+  aiLatencyMs: null,
+  aiLastQuery: null,
+  aiLastResults: null,
+  aiLastLang: null,
   profilerData: null,
   profilerLoading: false,
   torrentData: [],
@@ -140,6 +149,16 @@ function setSelectedEngines(engines) {
   persistSelectedEngines();
 }
 
+function sanitizeHttpUrl(raw) {
+  try {
+    const url = new URL(String(raw || '').trim());
+    if (url.protocol !== 'http:' && url.protocol !== 'https:') return '';
+    return url.toString();
+  } catch {
+    return '';
+  }
+}
+
 // ─── SVG Icons ────────────────────────────────────────────────────────────
 function svg(paths, size = 16, extra = '') {
   return `<svg xmlns="http://www.w3.org/2000/svg" width="${size}" height="${size}" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" ${extra}>${paths}</svg>`;
@@ -200,17 +219,18 @@ const LANGS = [
 ];
 
 const AI_PRESETS = [
-  { id: 'openai', label: 'OpenAI', api_base: 'https://api.openai.com/v1', keyRequired: true, defaultModel: 'gpt-4o-mini' },
-  { id: 'chutes', label: 'Chutes.ai', api_base: 'https://llm.chutes.ai/v1', keyRequired: true, defaultModel: 'deepseek-ai/DeepSeek-V3.2-TEE' },
-  { id: 'openrouter', label: 'OpenRoute/OpenRouter', api_base: 'https://openrouter.ai/api/v1', keyRequired: true, defaultModel: 'openai/gpt-4o-mini' },
-  { id: 'anthropic', label: 'Anthropic', api_base: 'https://api.anthropic.com/v1', keyRequired: true, defaultModel: 'claude-3-5-haiku-latest' },
-  { id: 'ollama', label: 'Ollama', api_base: 'http://127.0.0.1:11434/v1', keyRequired: false, defaultModel: 'qwen3.5:4b' },
-  { id: 'lmstudio', label: 'LM Studio', api_base: 'http://127.0.0.1:1234/v1', keyRequired: false, defaultModel: '' },
-  { id: 'llamacpp', label: 'llama.cpp server', api_base: 'http://127.0.0.1:8080/v1', keyRequired: false, defaultModel: '' },
+  { id: 'ollama',   label: 'LocalHost — Ollama',       api_base: 'http://127.0.0.1:11434/v1', keyRequired: false, defaultModel: 'qwen3.5:4b' },
+  { id: 'lmstudio', label: 'LocalHost — LM Studio',    api_base: 'http://127.0.0.1:1234/v1',  keyRequired: false, defaultModel: '' },
+  { id: 'llamacpp', label: 'LocalHost — llama.cpp',    api_base: 'http://127.0.0.1:8080/v1',  keyRequired: false, defaultModel: '' },
+  { id: 'chutes',   label: 'Chutes.ai TEE',            api_base: 'https://llm.chutes.ai/v1',  keyRequired: true,  defaultModel: 'deepseek-ai/DeepSeek-V3.2-TEE' },
+  { id: 'anthropic',label: 'Anthropic',                api_base: 'https://api.anthropic.com/v1', keyRequired: true, defaultModel: 'claude-3-5-haiku-latest' },
+  { id: 'openai',   label: 'OpenAI',                   api_base: 'https://api.openai.com/v1', keyRequired: true,  defaultModel: 'gpt-4o-mini' },
+  { id: 'openrouter', label: 'OpenRoute/OpenRouter',   api_base: 'https://openrouter.ai/api/v1', keyRequired: true, defaultModel: 'openai/gpt-4o-mini' },
 ];
 
 const ENGINE_GROUPS = [
   { label: 'Web Core', items: ['duckduckgo', 'wikipedia', 'brave', 'startpage', 'qwant', 'mojeek', 'bing', 'google', 'yahoo'] },
+  { label: 'Uncensored', items: ['yandex', 'marginalia', 'ahmia'] },
   { label: 'Code & Dev', items: ['github', 'github-api', 'hackernews', 'reddit'] },
   { label: 'Media', items: ['youtube', 'sepiasearch'] },
   { label: 'Research', items: ['wikidata', 'crossref', 'openalex', 'openlibrary'] },
@@ -419,37 +439,96 @@ function renderAiPanel() {
   if (!isActive) { panel.style.display = 'none'; return; }
   panel.style.display = 'block';
 
-  const dotsClass = state.aiStatus === 'done' ? 'done' : state.aiStatus === 'error' ? 'error' : '';
-  const statusText = state.aiStatus === 'loading' ? 'Thinking…' : state.aiStatus === 'streaming' ? 'Generating…' : state.aiStatus === 'done' ? 'AI Summary' : 'Error';
+  const isLoading = state.aiStatus === 'loading' || state.aiStatus === 'streaming';
+  const isDone    = state.aiStatus === 'done';
+  const isError   = state.aiStatus === 'error';
+  const dotsClass = isDone ? 'done' : isError ? 'error' : '';
+  const statusText = state.aiStatus === 'loading' ? 'Thinking…'
+    : state.aiStatus === 'streaming' ? 'Generating…'
+    : isDone ? 'AI Summary' : 'Error';
 
+  // Dots
   const dotsEl = el('div', { className: 'ai-dots' });
   ['violet', 'indigo', 'dim'].forEach(c => {
     dotsEl.append(el('div', { className: `ai-dot ${dotsClass || c}` }));
   });
 
-  const header = el('div', { className: 'panel-header' },
-    el('div', { className: 'panel-header-left' },
-      dotsEl,
-      el('span', { className: 'panel-label' }, statusText),
-      state.aiMeta?.model ? el('span', { style: 'font-size:10px;color:var(--text3);margin-left:6px' }, state.aiMeta.model) : null,
-    ),
-  );
+  // Latency
+  const latMs = state.aiLatencyMs;
+  const latLabel = latMs != null ? (latMs < 1000 ? `${latMs}ms` : `${(latMs / 1000).toFixed(1)}s`) : null;
 
-  const content = el('div', { className: 'ai-content' });
-  if (state.aiError) {
-    content.style.color = '#f87171';
-    content.textContent = state.aiError;
+  // Header
+  const headerLeft = el('div', { className: 'panel-header-left' },
+    dotsEl,
+    el('span', { className: 'panel-label' }, statusText),
+    state.aiMeta?.model ? el('span', { className: 'ai-model-label' }, state.aiMeta.model) : null,
+    latLabel ? el('span', { className: 'ai-latency-label' }, `· ${latLabel}`) : null,
+  );
+  const chevronPath = state.aiExpanded ? '<polyline points="18 15 12 9 6 15"/>' : '<polyline points="6 9 12 15 18 9"/>';
+  const expandBtn = el('button', { className: 'ai-expand-btn', type: 'button', title: state.aiExpanded ? 'Collapse' : 'Expand' });
+  expandBtn.innerHTML = svg(chevronPath, 14);
+  expandBtn.onclick = () => { state.aiExpanded = !state.aiExpanded; renderAiPanel(); };
+  const header = el('div', { className: 'panel-header' }, headerLeft, expandBtn);
+
+  // Progress bar
+  const showProgress = isLoading && state.aiProgress > 0;
+  const progressEl = showProgress ? el('div', { className: 'ai-progress-wrap' },
+    el('div', { className: 'ai-progress-bar', style: `width:${state.aiProgress}%` }),
+  ) : null;
+
+  // Steps
+  const showSteps = isLoading && state.aiSteps.length > 0;
+  const stepsEl = showSteps ? el('div', { className: 'ai-steps' },
+    ...state.aiSteps.slice(-4).map(s => el('div', { className: 'ai-step' }, s)),
+  ) : null;
+
+  // Content
+  const contentEl = el('div', { className: `ai-content${!state.aiExpanded && !isLoading ? ' ai-content-collapsed' : ''}` });
+  if (isError) {
+    contentEl.style.color = '#f87171';
+    contentEl.textContent = state.aiError;
   } else {
-    content.textContent = state.aiSummary;
+    contentEl.textContent = state.aiSummary;
   }
 
-  panel.innerHTML = '';
-  panel.append(header, content);
+  // Sources (shown when expanded + done)
+  const showSources = isDone && state.aiExpanded && state.aiSources.length > 0;
+  const sourcesEl = showSources ? el('div', { className: 'ai-sources' },
+    ...state.aiSources.slice(0, 8).map((src, i) => {
+      const safeSrc = sanitizeHttpUrl(src);
+      if (!safeSrc) return null;
+      let label = src;
+      try {
+        const { hostname, pathname } = new URL(safeSrc);
+        const host = hostname.replace(/^www\./, '');
+        const segs = pathname.replace(/\/$/, '').split('/').filter(Boolean).slice(0, 2);
+        label = segs.length ? `${host} › ${segs.join('/')}` : host;
+      } catch {}
+      const a = el('a', { className: 'ai-source-pill', href: safeSrc, target: '_blank', rel: 'noopener noreferrer' }, `[${i + 1}] ${label}`);
+      return a;
+    }),
+  ) : null;
+
+  // Footer: retry + expand/collapse
+  const retryBtn = el('button', { className: 'ai-retry-btn', type: 'button' }, 'Retry');
+  retryBtn.onclick = () => {
+    if (state.aiLastQuery) startAiSummary(state.aiLastQuery, state.aiLastResults || [], state.aiLastLang || 'en-US');
+  };
+  const toggleBtn = el('button', { className: 'ai-toggle-btn', type: 'button' },
+    state.aiExpanded ? 'Show less' : 'Show more',
+  );
+  toggleBtn.onclick = () => { state.aiExpanded = !state.aiExpanded; renderAiPanel(); };
+  const footer = el('div', { className: 'ai-footer' }, retryBtn, toggleBtn);
 
-  if (state.aiMeta?.fetchedCount) {
-    panel.append(el('div', { className: 'ai-meta' }, `Read ${state.aiMeta.fetchedCount} pages`));
-  }
-  if (state.aiStatus === 'streaming') {
+  panel.innerHTML = '';
+  panel.append(header);
+  if (progressEl) panel.append(progressEl);
+  if (stepsEl)    panel.append(stepsEl);
+  panel.append(contentEl);
+  if (sourcesEl)  panel.append(sourcesEl);
+  panel.append(footer);
+
+  if (state.aiStatus === 'streaming' && state.aiSummary.length < 60) {
     panel.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
   }
 }
@@ -793,6 +872,15 @@ async function doSearch(q, category = state.category) {
 async function startAiSummary(query, results, lang) {
   state.aiStatus = 'loading';
   state.aiSummary = '';
+  state.aiError = null;
+  state.aiProgress = 0;
+  state.aiSteps = [];
+  state.aiSources = [];
+  state.aiStartTime = Date.now();
+  state.aiLatencyMs = null;
+  state.aiLastQuery = query;
+  state.aiLastResults = results;
+  state.aiLastLang = lang;
   renderAiPanel();
 
   try {
@@ -819,13 +907,22 @@ async function startAiSummary(query, results, lang) {
         if (!line.startsWith('data: ')) continue;
         try {
           const d = JSON.parse(line.slice(6));
-          if (d.chunk)          { state.aiSummary += d.chunk; renderAiPanel(); }
-          else if (d.error)     { state.aiStatus = 'error'; state.aiError = d.message || d.error; renderAiPanel(); }
-          else if (d.model || d.sites) { state.aiStatus = 'done'; state.aiMeta = { fetchedCount: d.fetchedCount, model: d.model }; renderAiPanel(); }
+          if (d.chunk !== undefined)    { state.aiSummary += d.chunk; renderAiPanel(); }
+          else if (d.progress !== undefined) { state.aiProgress = d.progress; renderAiPanel(); }
+          else if (d.step)              { state.aiSteps = [...state.aiSteps.slice(-3), d.step]; renderAiPanel(); }
+          else if (d.error)             { state.aiStatus = 'error'; state.aiError = d.message || d.error; renderAiPanel(); }
+          else if (d.model != null || d.sites != null) {
+            state.aiStatus = 'done';
+            state.aiProgress = 100;
+            state.aiSources = Array.isArray(d.sites) ? d.sites.map(sanitizeHttpUrl).filter(Boolean) : [];
+            state.aiMeta = { fetchedCount: d.fetchedCount, model: d.model };
+            state.aiLatencyMs = Date.now() - state.aiStartTime;
+            renderAiPanel();
+          }
         } catch { /* ignore */ }
       }
     }
-    if (state.aiStatus === 'streaming') { state.aiStatus = 'done'; renderAiPanel(); }
+    if (state.aiStatus === 'streaming') { state.aiStatus = 'done'; state.aiLatencyMs = Date.now() - state.aiStartTime; renderAiPanel(); }
   } catch (e) {
     state.aiStatus = 'error';
     state.aiError = e.message;
@@ -1278,7 +1375,7 @@ async function renderSettings() {
         el('label', { className: 'form-label', for: 'ai-base' }, 'API Endpoint'),
         makeInput('ai-base', ai.api_base, 'http://localhost:11434/v1'),
         el('div', { className: 'form-hint' },
-          'Included presets: Chutes.ai · Anthropic · OpenAI · OpenRoute/OpenRouter · llama.cpp · Ollama · LM Studio',
+          'Included presets: LocalHost (Ollama · LM Studio · llama.cpp) · Chutes.ai TEE · Anthropic · OpenAI · OpenRoute/OpenRouter',
           el('br', {}),
           'You can also keep custom OpenAI-compatible endpoints.',
         ),
@@ -1395,7 +1492,7 @@ async function renderSettings() {
     // Server info
     el('div', { className: 'settings-section' },
       el('h2', {}, 'Server Info'),
-      el('div', { className: 'info-row' }, el('span', { className: 'info-key' }, 'Version'),          el('span', { className: 'info-val' }, health?.version || '0.3.2')),
+      el('div', { className: 'info-row' }, el('span', { className: 'info-key' }, 'Version'),          el('span', { className: 'info-val' }, health?.version || '0.3.3')),
       el('div', { className: 'info-row' }, el('span', { className: 'info-key' }, 'Active providers'), el('span', { className: 'info-val' }, (health?.providers || []).join(', ') || 'none')),
       el('div', { className: 'info-row' }, el('span', { className: 'info-key' }, 'AI'),               el('span', { className: 'info-val' }, health?.ai_enabled ? `enabled (${health.ai_model})` : 'not configured')),
       el('div', { className: 'info-row' }, el('span', { className: 'info-key' }, 'GitHub'),           el('a', { href: 'https://github.com/DioNanos/termsearch', target: '_blank', className: 'info-val', style: 'color:var(--link)' }, 'DioNanos/termsearch')),

package/frontend/dist/style.css

@@ -565,6 +565,22 @@ a:hover { color: var(--link-h); }
 .ai-dot.dim    { background: #5b21b6; animation: pulse 1.4s ease-in-out 300ms infinite; }
 .ai-dot.done   { background: #34d399; animation: none; }
 .ai-dot.error  { background: #f87171; animation: none; }
+.panel-ai .panel-header { cursor: default; }
+.ai-model-label  { font-size: 10px; color: var(--text3); margin-left: 6px; }
+.ai-latency-label{ font-size: 10px; color: #4b5563; margin-left: 4px; }
+.ai-expand-btn   { background: none; border: none; color: var(--text3); cursor: pointer; padding: 0; margin-left: auto; display: flex; align-items: center; }
+.ai-expand-btn:hover { color: var(--text2); }
+
+/* Progress bar */
+.ai-progress-wrap { height: 3px; background: rgba(255,255,255,0.06); border-radius: 99px; margin: 8px 0; overflow: hidden; }
+.ai-progress-bar  { height: 100%; background: linear-gradient(90deg, #7c3aed, #6366f1); border-radius: 99px; transition: width 0.4s ease; }
+
+/* Steps */
+.ai-steps { margin: 6px 0 4px; display: flex; flex-direction: column; gap: 3px; }
+.ai-step  { font-size: 10px; color: #4b5563; display: flex; align-items: center; gap: 6px; }
+.ai-step::before { content: ''; display: inline-block; width: 4px; height: 4px; border-radius: 50%; background: #6366f1; flex-shrink: 0; }
+
+/* Content */
 .ai-content {
   font-size: 14px;
   color: #d1d5db;
@@ -575,9 +591,32 @@ a:hover { color: var(--link-h); }
   border: 1px solid rgba(129,140,248,0.22);
   border-radius: var(--radius-sm);
   padding: 10px;
-  max-height: 280px;
-  overflow: auto;
+  overflow: hidden;
 }
+.ai-content.ai-content-collapsed {
+  display: -webkit-box;
+  -webkit-line-clamp: 4;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+/* Sources */
+.ai-sources { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 10px; }
+.ai-source-pill {
+  font-size: 10px; color: #6b7280;
+  border: 1px solid #1f2937; border-radius: 99px;
+  padding: 2px 8px; text-decoration: none;
+  white-space: nowrap; overflow: hidden; max-width: 200px; text-overflow: ellipsis;
+  transition: color 0.15s, border-color 0.15s;
+}
+.ai-source-pill:hover { color: #a78bfa; border-color: #4c1d95; }
+
+/* Footer */
+.ai-footer     { display: flex; align-items: center; justify-content: space-between; margin-top: 10px; }
+.ai-retry-btn  { font-size: 12px; color: #a78bfa; background: none; border: none; cursor: pointer; padding: 0; }
+.ai-retry-btn:hover  { color: #c4b5fd; }
+.ai-toggle-btn { font-size: 11px; color: #4b5563; background: none; border: none; cursor: pointer; padding: 0; }
+.ai-toggle-btn:hover { color: #9ca3af; }
 .ai-meta { font-size: 11px; color: var(--text3); margin-top: 8px; }
 
 /* Profiler panel */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termsearch",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Personal search engine for Termux/Linux/macOS — zero-config, privacy-first, AI-optional",
   "type": "module",
   "bin": {

package/src/ai/orchestrator.js

@@ -45,8 +45,14 @@ export async function generateSummary({
   results = [],
   session = [],
   onToken = null,
+  onProgress = null,
+  onStep = null,
   docCache = null,
 }, aiConfig) {
+  const emit = (progress, step) => {
+    if (onProgress) onProgress(progress);
+    if (step && onStep) onStep(step);
+  };
   if (!aiConfig?.enabled || !aiConfig?.api_base || !aiConfig?.model) {
     return { error: 'ai_not_configured', message: 'AI not configured. Add endpoint in Settings.' };
   }
@@ -61,6 +67,7 @@ export async function generateSummary({
 
   try {
     // Phase 1: AI decides which URLs to fetch
+    emit(5, 'Analyzing query…');
     const phase1Prompt = buildFetchDecisionPrompt({
       query,
       results,
@@ -83,6 +90,15 @@ export async function generateSummary({
     const allResultUrls = results.slice(0, 10).map((r) => r.url).filter(Boolean);
     const { urls: urlsToFetch } = parseFetchDecision(phase1Result?.content, allResultUrls);
 
+    // Emit step per URL before batch fetch
+    emit(15, `Fetching ${urlsToFetch.length || allResultUrls.slice(0, 2).length} source(s)…`);
+    urlsToFetch.slice(0, 6).forEach((url) => {
+      try {
+        const host = new URL(url).hostname.replace(/^www\./, '');
+        if (onStep) onStep(`Reading: ${host}`);
+      } catch { if (onStep) onStep('Reading source…'); }
+    });
+
     // Fetch the selected URLs
     let documents = [];
     if (urlsToFetch.length > 0) {
@@ -99,6 +115,8 @@ export async function generateSummary({
       documents = fallback.filter((d) => d.status === 'ok' && d.content);
     }
 
+    emit(60, `Synthesizing from ${documents.length} page(s)…`);
+
     // Phase 2: synthesize summary
     const phase2Prompt = buildAgenticSummaryPrompt({ query, lang, results, documents, session });
 
@@ -107,6 +125,7 @@ export async function generateSummary({
 
     if (typeof onToken === 'function') {
       // Streaming mode
+      emit(65, 'Generating summary…');
       const streamResult = await stream(phase2Prompt, onToken, {
         ...ai,
         systemPrompt: 'You are a search assistant. Write your answer directly. Do not include reasoning or thinking.',

package/src/api/routes.js

@@ -11,7 +11,7 @@ import { detectProfileTarget, scanProfile, PROFILER_PLATFORMS } from '../profile
 import { fetchBlueskyPosts, fetchBlueskyActors, fetchGdeltArticles } from '../social/search.js';
 import { scrapeTPB, scrape1337x, extractMagnetFromUrl } from '../torrent/scrapers.js';
 
-const APP_VERSION = '0.3.2';
+const APP_VERSION = '0.3.3';
 const ALLOWED_CATEGORIES = new Set(['web', 'images', 'news']);
 const ALLOWED_LANGS = new Set(['auto', 'it-IT', 'en-US', 'es-ES', 'fr-FR', 'de-DE', 'pt-PT', 'ru-RU', 'zh-CN', 'ja-JP']);
 
@@ -409,7 +409,9 @@ export function createRouter(config, rateLimiters) {
       const result = await generateSummary(
         {
           query, lang, results, session,
-          onToken: (chunk) => sendEvent('token', { chunk }),
+          onToken:    (chunk) => sendEvent('token',    { chunk }),
+          onProgress: (p)     => sendEvent('progress', { progress: p }),
+          onStep:     (text)  => sendEvent('step',     { step: text }),
           docCache: getDocCache(),
         },
         cfg.ai
@@ -450,7 +452,7 @@ export function createRouter(config, rateLimiters) {
       return sendJson(res, 400, { error: 'invalid_body' });
     }
     // Whitelist accepted config keys to prevent unexpected writes
-    const allowed = ['port', 'host', 'ai', 'brave', 'mojeek', 'searxng', 'search', 'rate_limit'];
+    const allowed = ['port', 'host', 'ai', 'brave', 'mojeek', 'yandex', 'ahmia', 'marginalia', 'searxng', 'search', 'rate_limit'];
     const filtered = {};
     for (const key of allowed) {
       if (key in body) filtered[key] = body[key];

package/src/config/defaults.js

@@ -49,6 +49,20 @@ export const DEFAULTS = {
     api_base: 'https://api.mojeek.com',
   },
 
+  yandex: {
+    enabled: true,
+  },
+
+  ahmia: {
+    enabled: true,
+  },
+
+  marginalia: {
+    enabled: true,
+    api_key: 'public',
+    api_base: 'https://api2.marginalia-search.com',
+  },
+
   searxng: {
     enabled: false,
     url: '',  // e.g. http://localhost:9090

package/src/config/manager.js

@@ -91,6 +91,12 @@ class ConfigManager {
     if (process.env.TERMSEARCH_MOJEEK_API_KEY) {
       overrides.mojeek = { api_key: process.env.TERMSEARCH_MOJEEK_API_KEY, enabled: true };
     }
+    if (process.env.TERMSEARCH_MARGINALIA_API_KEY) {
+      overrides.marginalia = { api_key: process.env.TERMSEARCH_MARGINALIA_API_KEY, enabled: true };
+    }
+    if (process.env.TERMSEARCH_MARGINALIA_API_BASE) {
+      overrides.marginalia = { ...(overrides.marginalia || {}), api_base: process.env.TERMSEARCH_MARGINALIA_API_BASE, enabled: true };
+    }
     if (process.env.TERMSEARCH_SEARXNG_URL) {
       overrides.searxng = { url: process.env.TERMSEARCH_SEARXNG_URL, enabled: true };
     }
@@ -113,6 +119,9 @@ class ConfigManager {
     if (safePartial?.mojeek?.api_key && !safePartial?.mojeek?.hasOwnProperty('enabled')) {
       this._config.mojeek.enabled = Boolean(this._config.mojeek.api_key);
     }
+    if (safePartial?.marginalia?.api_key && !safePartial?.marginalia?.hasOwnProperty('enabled')) {
+      this._config.marginalia.enabled = Boolean(this._config.marginalia.api_key);
+    }
     if (safePartial?.searxng?.url && !safePartial?.searxng?.hasOwnProperty('enabled')) {
       this._config.searxng.enabled = Boolean(this._config.searxng.url);
     }
@@ -120,7 +129,7 @@ class ConfigManager {
   }
 
   _sanitizeSensitiveKeys(partial) {
-    const sections = ['ai', 'brave', 'mojeek'];
+    const sections = ['ai', 'brave', 'mojeek', 'marginalia'];
     for (const section of sections) {
       const block = partial?.[section];
       if (!block || typeof block !== 'object' || !Object.prototype.hasOwnProperty.call(block, 'api_key')) continue;
@@ -173,6 +182,7 @@ class ConfigManager {
       ai: { ...c.ai, api_key: maskKey(c.ai.api_key) },
       brave: { ...c.brave, api_key: maskKey(c.brave.api_key) },
       mojeek: { ...c.mojeek, api_key: maskKey(c.mojeek.api_key) },
+      marginalia: { ...c.marginalia, api_key: maskKey(c.marginalia.api_key) },
     };
   }
 }

package/src/search/engine.js

@@ -9,6 +9,9 @@ import * as brave from './providers/brave.js';
 import * as mojeek from './providers/mojeek.js';
 import * as searxng from './providers/searxng.js';
 import * as github from './providers/github.js';
+import * as yandex from './providers/yandex.js';
+import * as ahmia from './providers/ahmia.js';
+import * as marginalia from './providers/marginalia.js';
 
 let _searchCache = null;
 let _docCache = null;
@@ -49,6 +52,10 @@ export const ALLOWED_ENGINES = new Set([
   '1337x',
   'piratebay',
   'nyaa',
+  // uncensored / alternative index engines
+  'yandex',
+  'ahmia',
+  'marginalia',
   // local aliases for direct providers
   'ddg',
   'wiki',
@@ -96,6 +103,24 @@ const PROVIDER_REGISTRY = {
     run: github.search,
     defaultProvider: false,
   },
+  yandex: {
+    aliases: new Set(['yandex']),
+    enabled: (cfg) => cfg?.yandex?.enabled !== false,
+    run: yandex.search,
+    defaultProvider: false,
+  },
+  ahmia: {
+    aliases: new Set(['ahmia']),
+    enabled: (cfg) => cfg?.ahmia?.enabled !== false,
+    run: ahmia.search,
+    defaultProvider: false,
+  },
+  marginalia: {
+    aliases: new Set(['marginalia']),
+    enabled: (cfg) => cfg?.marginalia?.enabled !== false,
+    run: marginalia.search,
+    defaultProvider: false,
+  },
 };
 
 export function initCaches(dataDir, cfg) {
@@ -162,10 +187,7 @@ function resolveProviderPlan(cfg, requestedEngines = [], category = 'web') {
 
   const providers = [...explicitProviders].filter((name) => enabledProviders.includes(name));
   if (providers.length === 0) {
-    return {
-      providers: defaultProviders,
-      searxEngines: category === 'web' && defaultProviders.includes('searxng') ? CURATED_WEB_ENGINES.slice() : [],
-    };
+    return { providers: [], searxEngines: [] };
   }
 
   return { providers, searxEngines };
@@ -301,6 +323,7 @@ async function runProviderDetailed(name, args) {
     const responded = new Set();
     const failed = new Set();
     const failedDetails = [];
+    const skipHealth = new Set();
 
     if (name === 'searxng') {
       const unresponsive = Array.isArray(meta.unresponsive) ? meta.unresponsive.map((engine) => normalizeEngineName(engine)).filter(Boolean) : [];
@@ -327,9 +350,15 @@ async function runProviderDetailed(name, args) {
       failedDetails.push({ engine: name, reason: String(meta.error) });
     } else {
       responded.add(name);
+      if (results.length === 0 || meta.skipHealth === true || meta.empty === true) {
+        skipHealth.add(name);
+      }
     }
 
-    for (const engine of responded) recordEngineOutcome(engine, true);
+    for (const engine of responded) {
+      if (skipHealth.has(engine)) continue;
+      recordEngineOutcome(engine, true);
+    }
     for (const detail of failedDetails) recordEngineOutcome(detail.engine, false, detail.reason);
 
     return {
@@ -558,5 +587,8 @@ export function getEnabledProviders(cfg) {
   if (cfg.mojeek?.enabled && cfg.mojeek?.api_key) providers.push('mojeek');
   if (cfg.searxng?.enabled && cfg.searxng?.url) providers.push('searxng');
   providers.push('github-api');
+  if (cfg?.yandex?.enabled !== false) providers.push('yandex');
+  if (cfg?.ahmia?.enabled !== false) providers.push('ahmia');
+  if (cfg?.marginalia?.enabled !== false) providers.push('marginalia');
   return providers;
 }

package/src/search/providers/ahmia.js

@@ -0,0 +1,61 @@
+// Ahmia.fi — clearnet index of Tor hidden services (.onion)
+// No API key required — results include .onion URLs (accessible via Tor Browser)
+
+const AHMIA_ENDPOINT = 'https://ahmia.fi/search/';
+const UA = 'Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0';
+
+function parseAhmia(html) {
+  const results = [];
+  // Each result: <h4><a href="...">Title</a></h4> followed by <p>snippet</p>
+  const blockRe = /<h4[^>]*>([\s\S]*?)<\/h4>([\s\S]*?)(?=<h4|<\/ol|$)/gi;
+  let m;
+  while ((m = blockRe.exec(html)) !== null && results.length < 15) {
+    const titleBlock = m[1];
+    const afterBlock = m[2];
+
+    const aMatch = titleBlock.match(/<a[^>]+href="([^"]+)"[^>]*>([\s\S]*?)<\/a>/i);
+    if (!aMatch) continue;
+
+    const url = aMatch[1];
+    if (!url.startsWith('http') || url.includes('ahmia.fi')) continue;
+
+    const title = aMatch[2].replace(/<[^>]+>/g, '').trim();
+    if (!title) continue;
+
+    const pMatch = afterBlock.match(/<p[^>]*>([\s\S]*?)<\/p>/i);
+    const snippet = pMatch
+      ? pMatch[1].replace(/<[^>]+>/g, '').replace(/&amp;/g, '&').replace(/&nbsp;/g, ' ').trim().slice(0, 300)
+      : '';
+
+    results.push({ title, url, snippet, engine: 'ahmia', score: 0 });
+  }
+  return results;
+}
+
+export async function search({ query, page = 1, timeoutMs = 12000 }) {
+  const params = new URLSearchParams({ q: query });
+  if (page > 1) params.set('page', String(page - 1));
+
+  const ac = new AbortController();
+  const timer = setTimeout(() => ac.abort(), timeoutMs);
+  try {
+    const r = await fetch(`${AHMIA_ENDPOINT}?${params}`, {
+      headers: {
+        'User-Agent': UA,
+        Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'Accept-Language': 'en-US,en;q=0.5',
+      },
+      signal: ac.signal,
+    });
+    clearTimeout(timer);
+    if (!r.ok) return { results: [], _meta: { error: `ahmia_http_${r.status}` } };
+    const html = await r.text();
+    if (html.length < 500) return { results: [], _meta: { error: 'ahmia_unexpected_html' } };
+    const results = parseAhmia(html);
+    if (results.length === 0) return { results: [], _meta: { empty: true, skipHealth: true } };
+    return { results, _meta: {} };
+  } catch {
+    clearTimeout(timer);
+    return { results: [], _meta: { error: 'ahmia_unreachable' } };
+  }
+}

package/src/search/providers/marginalia.js

@@ -0,0 +1,49 @@
+// Marginalia Search provider (api2, key-based).
+// Public key works with shared limits; user key can be configured.
+
+const DEFAULT_API = 'https://api2.marginalia-search.com';
+
+export async function search({ query, page = 1, timeoutMs = 10000, config }) {
+  const cfg = config || {};
+  const apiBase = String(cfg?.marginalia?.api_base || DEFAULT_API).replace(/\/$/, '');
+  const apiKey = String(cfg?.marginalia?.api_key || process.env.TERMSEARCH_MARGINALIA_API_KEY || 'public').trim() || 'public';
+  const enabled = cfg?.marginalia?.enabled !== false;
+  if (!enabled) return { results: [], _meta: { error: 'marginalia_disabled' } };
+
+  const params = new URLSearchParams({
+    query,
+    count: '10',
+    page: String(Math.max(1, Number(page) || 1)),
+  });
+
+  const ac = new AbortController();
+  const timer = setTimeout(() => ac.abort(), timeoutMs);
+  try {
+    const r = await fetch(`${apiBase}/search?${params}`, {
+      headers: {
+        Accept: 'application/json',
+        'User-Agent': 'TermSearch/1.0 (personal search)',
+        'API-Key': apiKey,
+      },
+      signal: ac.signal,
+    });
+    clearTimeout(timer);
+    if (!r.ok) return { results: [], _meta: { error: `marginalia_http_${r.status}` } };
+    const data = await r.json();
+    const list = Array.isArray(data.results)
+      ? data.results
+      : (Array.isArray(data.result) ? data.result : []);
+    const results = list.slice(0, 15).map((item) => ({
+      title:   String(item.title || item.url || '').trim(),
+      url:     String(item.url || '').trim(),
+      snippet: String(item.description || item.snippet || '').trim(),
+      engine:  'marginalia',
+      score:   0,
+    })).filter((r) => r.url.startsWith('http'));
+    if (results.length === 0) return { results: [], _meta: { empty: true, skipHealth: true } };
+    return { results, _meta: {} };
+  } catch {
+    clearTimeout(timer);
+    return { results: [], _meta: { error: 'marginalia_unreachable' } };
+  }
+}

package/src/search/providers/yandex.js

@@ -0,0 +1,68 @@
+// Yandex HTML scraper — no API key required
+// Different political/content filtering than US engines; Russian/global index
+
+const YANDEX_ENDPOINT = 'https://yandex.com/search/';
+const UA = 'Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0';
+
+function parseYandex(html) {
+  const results = [];
+
+  // Primary: OrganicTitle-Link class (standard desktop layout)
+  const titleRe = /<a[^>]+class="[^"]*OrganicTitle-Link[^"]*"[^>]+href="([^"#]+)"[^>]*>([\s\S]*?)<\/a>/gi;
+  let m;
+  while ((m = titleRe.exec(html)) !== null && results.length < 15) {
+    const url = m[1];
+    if (!url.startsWith('http') || url.includes('yandex.') || url.includes('ya.ru')) continue;
+    const title = m[2].replace(/<[^>]+>/g, '').replace(/&amp;/g, '&').trim();
+    if (!title) continue;
+
+    // Look for snippet in the 3KB after the title match
+    const chunk = html.slice(m.index, m.index + 3000);
+    const snipM = chunk.match(/class="[^"]*(?:OrganicText|TextContainer|Organic-Text|organic__text)[^"]*"[^>]*>([\s\S]*?)<\/(?:div|span|p)>/i);
+    const snippet = snipM
+      ? snipM[1].replace(/<[^>]+>/g, '').replace(/&amp;/g, '&').replace(/&nbsp;/g, ' ').trim().slice(0, 300)
+      : '';
+
+    results.push({ title, url, snippet, engine: 'yandex', score: 0 });
+  }
+
+  return results;
+}
+
+export async function search({ query, lang = 'en-US', page = 1, timeoutMs = 12000 }) {
+  const params = new URLSearchParams({
+    text:    query,
+    p:       String(Math.max(0, Number(page) - 1)),
+    numdoc:  '10',
+    lr:      '10417', // world region
+  });
+
+  const ac = new AbortController();
+  const timer = setTimeout(() => ac.abort(), timeoutMs);
+  try {
+    const r = await fetch(`${YANDEX_ENDPOINT}?${params}`, {
+      headers: {
+        'User-Agent': UA,
+        Accept: 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+        'Accept-Language': 'en-US,en;q=0.5',
+      },
+      signal: ac.signal,
+    });
+    clearTimeout(timer);
+    if (!r.ok) return { results: [], _meta: { error: `yandex_http_${r.status}` } };
+    const html = await r.text();
+    // Explicit detection: Yandex can serve anti-bot pages.
+    if (html.includes('showcaptcha') || html.includes('robot-captcha')) {
+      return { results: [], _meta: { error: 'yandex_captcha' } };
+    }
+    if (html.length < 2000) {
+      return { results: [], _meta: { error: 'yandex_unexpected_html' } };
+    }
+    const results = parseYandex(html);
+    if (results.length === 0) return { results: [], _meta: { empty: true, skipHealth: true } };
+    return { results, _meta: {} };
+  } catch {
+    clearTimeout(timer);
+    return { results: [], _meta: { error: 'yandex_unreachable' } };
+  }
+}