From c9477d13fc78043a8513ed2ae46d5e412da7020f Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 18:45:38 +0200
Subject: [PATCH 01/31] Remove backend vision autocomplete stack

---
 .../app/agents/autocomplete/__init__.py       |  11 -
 .../agents/autocomplete/autocomplete_agent.py | 495 ------------------
 surfsense_backend/app/routes/__init__.py      |   2 -
 .../app/routes/autocomplete_routes.py         |  45 --
 .../services/vision_autocomplete_service.py   | 158 ------
 5 files changed, 711 deletions(-)
 delete mode 100644 surfsense_backend/app/agents/autocomplete/__init__.py
 delete mode 100644 surfsense_backend/app/agents/autocomplete/autocomplete_agent.py
 delete mode 100644 surfsense_backend/app/routes/autocomplete_routes.py
 delete mode 100644 surfsense_backend/app/services/vision_autocomplete_service.py

diff --git a/surfsense_backend/app/agents/autocomplete/__init__.py b/surfsense_backend/app/agents/autocomplete/__init__.py
deleted file mode 100644
index 55d7a692d..000000000
--- a/surfsense_backend/app/agents/autocomplete/__init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
-"""Agent-based vision autocomplete with scoped filesystem exploration."""
-
-from app.agents.autocomplete.autocomplete_agent import (
-    create_autocomplete_agent,
-    stream_autocomplete_agent,
-)
-
-__all__ = [
-    "create_autocomplete_agent",
-    "stream_autocomplete_agent",
-]
diff --git a/surfsense_backend/app/agents/autocomplete/autocomplete_agent.py b/surfsense_backend/app/agents/autocomplete/autocomplete_agent.py
deleted file mode 100644
index 2d8f05fd3..000000000
--- a/surfsense_backend/app/agents/autocomplete/autocomplete_agent.py
+++ /dev/null
@@ -1,495 +0,0 @@
-"""Vision autocomplete agent with scoped filesystem exploration.
-
-Converts the stateless single-shot vision autocomplete into an agent that
-seeds a virtual filesystem from KB search results and lets the vision LLM
-explore documents via ``ls``, ``read_file``, ``glob``, ``grep``, etc.
-before generating the final completion.
-
-Performance: KB search and agent graph compilation run in parallel so
-the only sequential latency is KB-search (or agent compile, whichever is
-slower) + the agent's LLM turns.  There is no separate "query extraction"
-LLM call — the window title is used directly as the KB search query.
-"""
-
-from __future__ import annotations
-
-import asyncio
-import json
-import logging
-import re
-import uuid
-from collections.abc import AsyncGenerator
-from typing import Any
-
-from deepagents.graph import BASE_AGENT_PROMPT
-from deepagents.middleware.patch_tool_calls import PatchToolCallsMiddleware
-from langchain.agents import create_agent
-from langchain_anthropic.middleware import AnthropicPromptCachingMiddleware
-from langchain_core.language_models import BaseChatModel
-from langchain_core.messages import AIMessage, ToolMessage
-
-from app.agents.new_chat.middleware.filesystem import SurfSenseFilesystemMiddleware
-from app.agents.new_chat.middleware.knowledge_search import (
-    build_scoped_filesystem,
-    search_knowledge_base,
-)
-from app.services.new_streaming_service import VercelStreamingService
-
-logger = logging.getLogger(__name__)
-
-KB_TOP_K = 10
-
-# ---------------------------------------------------------------------------
-# System prompt
-# ---------------------------------------------------------------------------
-
-AUTOCOMPLETE_SYSTEM_PROMPT = """You are a smart writing assistant that analyzes the user's screen to draft or complete text.
-
-You will receive a screenshot of the user's screen. Your PRIMARY source of truth is the screenshot itself — the visual context determines what to write.
-
-Your job:
-1. Analyze the ENTIRE screenshot to understand what the user is working on (email thread, chat conversation, document, code editor, form, etc.).
-2. Identify the text area where the user will type.
-3. Generate the text the user most likely wants to write based on the visual context.
-
-You also have access to the user's knowledge base documents via filesystem tools. However:
-- ONLY consult the knowledge base if the screenshot clearly involves a topic where your KB documents are DIRECTLY relevant (e.g., the user is writing about a specific project/topic that matches a document title).
-- Do NOT explore documents just because they exist. Most autocomplete requests can be answered purely from the screenshot.
-- If you do read a document, only incorporate information that is 100% relevant to what the user is typing RIGHT NOW. Do not add extra details, background, or tangential information from the KB.
-- Keep your output SHORT — autocomplete should feel like a natural continuation, not an essay.
-
-Key behavior:
-- If the text area is EMPTY, draft a concise response or message based on what you see on screen (e.g., reply to an email, respond to a chat message, continue a document).
-- If the text area already has text, continue it naturally — typically just a sentence or two.
-
-Rules:
-- Be CONCISE. Prefer a single paragraph or a few sentences. Autocomplete is a quick assist, not a full draft.
-- Match the tone and formality of the surrounding context.
-- If the screen shows code, write code. If it shows a casual chat, be casual. If it shows a formal email, be formal.
-- Do NOT describe the screenshot or explain your reasoning.
-- Do NOT cite or reference documents explicitly — just let the knowledge inform your writing naturally.
-- If you cannot determine what to write, output an empty JSON array: []
-
-## Output Format
-
-You MUST provide exactly 3 different suggestion options. Each should be a distinct, plausible completion — vary the tone, detail level, or angle.
-
-Return your suggestions as a JSON array of exactly 3 strings. Output ONLY the JSON array, nothing else — no markdown fences, no explanation, no commentary.
-
-Example format:
-["First suggestion text here.", "Second suggestion — a different take.", "Third option with another approach."]
-
-## Filesystem Tools `ls`, `read_file`, `write_file`, `edit_file`, `glob`, `grep`
-
-All file paths must start with a `/`.
-- ls: list files and directories at a given path.
-- read_file: read a file from the filesystem.
-- write_file: create a temporary file in the session (not persisted).
-- edit_file: edit a file in the session (not persisted for /documents/ files).
-- glob: find files matching a pattern (e.g., "**/*.xml").
-- grep: search for text within files.
-
-## When to Use Filesystem Tools
-
-BEFORE reaching for any tool, ask yourself: "Can I write a good completion purely from the screenshot?" If yes, just write it — do NOT explore the KB.
-
-Only use tools when:
-- The user is clearly writing about a specific topic that likely has detailed information in their KB.
-- You need a specific fact, name, number, or reference that the screenshot doesn't provide.
-
-When you do use tools, be surgical:
-- Check the `ls` output first. If no document title looks relevant, stop — do not read files just to see what's there.
-- If a title looks relevant, read only the `<chunk_index>` (first ~20 lines) and jump to matched chunks. Do not read entire documents.
-- Extract only the specific information you need and move on to generating the completion.
-
-## Reading Documents Efficiently
-
-Documents are formatted as XML. Each document contains:
-- `<document_metadata>` — title, type, URL, etc.
-- `<chunk_index>` — a table of every chunk with its **line range** and a
-  `matched="true"` flag for chunks that matched the search query.
-- `<document_content>` — the actual chunks in original document order.
-
-**Workflow**: read the first ~20 lines to see the `<chunk_index>`, identify
-chunks marked `matched="true"`, then use `read_file(path, offset=<start_line>,
-limit=<lines>)` to jump directly to those sections."""
-
-APP_CONTEXT_BLOCK = """
-
-The user is currently working in "{app_name}" (window: "{window_title}"). Use this to understand the type of application and adapt your tone and format accordingly."""
-
-
-def _build_autocomplete_system_prompt(app_name: str, window_title: str) -> str:
-    prompt = AUTOCOMPLETE_SYSTEM_PROMPT
-    if app_name:
-        prompt += APP_CONTEXT_BLOCK.format(app_name=app_name, window_title=window_title)
-    return prompt
-
-
-# ---------------------------------------------------------------------------
-# Pre-compute KB filesystem (runs in parallel with agent compilation)
-# ---------------------------------------------------------------------------
-
-
-class _KBResult:
-    """Container for pre-computed KB filesystem results."""
-
-    __slots__ = ("files", "ls_ai_msg", "ls_tool_msg")
-
-    def __init__(
-        self,
-        files: dict[str, Any] | None = None,
-        ls_ai_msg: AIMessage | None = None,
-        ls_tool_msg: ToolMessage | None = None,
-    ) -> None:
-        self.files = files
-        self.ls_ai_msg = ls_ai_msg
-        self.ls_tool_msg = ls_tool_msg
-
-    @property
-    def has_documents(self) -> bool:
-        return bool(self.files)
-
-
-async def precompute_kb_filesystem(
-    search_space_id: int,
-    query: str,
-    top_k: int = KB_TOP_K,
-) -> _KBResult:
-    """Search the KB and build the scoped filesystem outside the agent.
-
-    This is designed to be called via ``asyncio.gather`` alongside agent
-    graph compilation so the two run concurrently.
-    """
-    if not query:
-        return _KBResult()
-
-    try:
-        search_results = await search_knowledge_base(
-            query=query,
-            search_space_id=search_space_id,
-            top_k=top_k,
-        )
-
-        if not search_results:
-            return _KBResult()
-
-        new_files, _ = await build_scoped_filesystem(
-            documents=search_results,
-            search_space_id=search_space_id,
-        )
-
-        if not new_files:
-            return _KBResult()
-
-        doc_paths = [
-            p
-            for p, v in new_files.items()
-            if p.startswith("/documents/") and v is not None
-        ]
-        tool_call_id = f"auto_ls_{uuid.uuid4().hex[:12]}"
-        ai_msg = AIMessage(
-            content="",
-            tool_calls=[
-                {"name": "ls", "args": {"path": "/documents"}, "id": tool_call_id}
-            ],
-        )
-        tool_msg = ToolMessage(
-            content=str(doc_paths) if doc_paths else "No documents found.",
-            tool_call_id=tool_call_id,
-        )
-        return _KBResult(files=new_files, ls_ai_msg=ai_msg, ls_tool_msg=tool_msg)
-
-    except Exception:
-        logger.warning(
-            "KB pre-computation failed, proceeding without KB", exc_info=True
-        )
-        return _KBResult()
-
-
-# ---------------------------------------------------------------------------
-# Filesystem middleware — no save_document, no persistence
-# ---------------------------------------------------------------------------
-
-
-class AutocompleteFilesystemMiddleware(SurfSenseFilesystemMiddleware):
-    """Filesystem middleware for autocomplete — read-only exploration only.
-
-    Strips ``save_document`` (permanent KB persistence) and passes
-    ``search_space_id=None`` so ``write_file`` / ``edit_file`` stay ephemeral.
-    """
-
-    def __init__(self) -> None:
-        super().__init__(search_space_id=None, created_by_id=None)
-        self.tools = [t for t in self.tools if t.name != "save_document"]
-
-
-# ---------------------------------------------------------------------------
-# Agent factory
-# ---------------------------------------------------------------------------
-
-
-async def _compile_agent(
-    llm: BaseChatModel,
-    app_name: str,
-    window_title: str,
-) -> Any:
-    """Compile the agent graph (CPU-bound, runs in a thread)."""
-    system_prompt = _build_autocomplete_system_prompt(app_name, window_title)
-    final_system_prompt = system_prompt + "\n\n" + BASE_AGENT_PROMPT
-
-    middleware = [
-        AutocompleteFilesystemMiddleware(),
-        PatchToolCallsMiddleware(),
-        AnthropicPromptCachingMiddleware(unsupported_model_behavior="ignore"),
-    ]
-
-    agent = await asyncio.to_thread(
-        create_agent,
-        llm,
-        system_prompt=final_system_prompt,
-        tools=[],
-        middleware=middleware,
-    )
-    return agent.with_config({"recursion_limit": 200})
-
-
-async def create_autocomplete_agent(
-    llm: BaseChatModel,
-    *,
-    search_space_id: int,
-    kb_query: str,
-    app_name: str = "",
-    window_title: str = "",
-) -> tuple[Any, _KBResult]:
-    """Create the autocomplete agent and pre-compute KB in parallel.
-
-    Returns ``(agent, kb_result)`` so the caller can inject the pre-computed
-    filesystem into the agent's initial state without any middleware delay.
-    """
-    agent, kb = await asyncio.gather(
-        _compile_agent(llm, app_name, window_title),
-        precompute_kb_filesystem(search_space_id, kb_query),
-    )
-    return agent, kb
-
-
-# ---------------------------------------------------------------------------
-# JSON suggestion parsing (with fallback)
-# ---------------------------------------------------------------------------
-
-
-def _parse_suggestions(raw: str) -> list[str]:
-    """Extract a list of suggestion strings from the agent's output.
-
-    Tries, in order:
-      1. Direct ``json.loads``
-      2. Extract content between ```json ... ``` fences
-      3. Find the first ``[`` … ``]`` span
-    Falls back to wrapping the raw text as a single suggestion.
-    """
-    text = raw.strip()
-    if not text:
-        return []
-
-    for candidate in _json_candidates(text):
-        try:
-            parsed = json.loads(candidate)
-            if isinstance(parsed, list) and all(isinstance(s, str) for s in parsed):
-                return [s for s in parsed if s.strip()]
-        except (json.JSONDecodeError, ValueError):
-            continue
-
-    return [text]
-
-
-def _json_candidates(text: str) -> list[str]:
-    """Yield candidate JSON strings from raw text."""
-    candidates = [text]
-
-    fence = re.search(r"```(?:json)?\s*\n?(.*?)```", text, re.DOTALL)
-    if fence:
-        candidates.append(fence.group(1).strip())
-
-    bracket = re.search(r"\[.*]", text, re.DOTALL)
-    if bracket:
-        candidates.append(bracket.group(0))
-
-    return candidates
-
-
-# ---------------------------------------------------------------------------
-# Streaming helper
-# ---------------------------------------------------------------------------
-
-
-async def stream_autocomplete_agent(
-    agent: Any,
-    input_data: dict[str, Any],
-    streaming_service: VercelStreamingService,
-    *,
-    emit_message_start: bool = True,
-) -> AsyncGenerator[str, None]:
-    """Stream agent events as Vercel SSE, with thinking steps for tool calls.
-
-    When ``emit_message_start`` is False the caller has already sent the
-    ``message_start`` event (e.g. to show preparation steps before the agent
-    runs).
-    """
-    thread_id = uuid.uuid4().hex
-    config = {"configurable": {"thread_id": thread_id}}
-
-    text_buffer: list[str] = []
-    active_tool_depth = 0
-    thinking_step_counter = 0
-    tool_step_ids: dict[str, str] = {}
-    step_titles: dict[str, str] = {}
-    completed_step_ids: set[str] = set()
-    last_active_step_id: str | None = None
-
-    def next_thinking_step_id() -> str:
-        nonlocal thinking_step_counter
-        thinking_step_counter += 1
-        return f"autocomplete-step-{thinking_step_counter}"
-
-    def complete_current_step() -> str | None:
-        nonlocal last_active_step_id
-        if last_active_step_id and last_active_step_id not in completed_step_ids:
-            completed_step_ids.add(last_active_step_id)
-            title = step_titles.get(last_active_step_id, "Done")
-            event = streaming_service.format_thinking_step(
-                step_id=last_active_step_id,
-                title=title,
-                status="complete",
-            )
-            last_active_step_id = None
-            return event
-        return None
-
-    if emit_message_start:
-        yield streaming_service.format_message_start()
-
-    gen_step_id = next_thinking_step_id()
-    last_active_step_id = gen_step_id
-    step_titles[gen_step_id] = "Generating suggestions"
-    yield streaming_service.format_thinking_step(
-        step_id=gen_step_id,
-        title="Generating suggestions",
-        status="in_progress",
-    )
-
-    try:
-        async for event in agent.astream_events(
-            input_data, config=config, version="v2"
-        ):
-            event_type = event.get("event", "")
-            if event_type == "on_chat_model_stream":
-                if active_tool_depth > 0:
-                    continue
-                if "surfsense:internal" in event.get("tags", []):
-                    continue
-                chunk = event.get("data", {}).get("chunk")
-                if chunk and hasattr(chunk, "content"):
-                    content = chunk.content
-                    if content and isinstance(content, str):
-                        text_buffer.append(content)
-
-            elif event_type == "on_chat_model_end":
-                if active_tool_depth > 0:
-                    continue
-                if "surfsense:internal" in event.get("tags", []):
-                    continue
-                output = event.get("data", {}).get("output")
-                if output and hasattr(output, "content"):
-                    if getattr(output, "tool_calls", None):
-                        continue
-                    content = output.content
-                    if content and isinstance(content, str) and not text_buffer:
-                        text_buffer.append(content)
-
-            elif event_type == "on_tool_start":
-                active_tool_depth += 1
-                tool_name = event.get("name", "unknown_tool")
-                run_id = event.get("run_id", "")
-                tool_input = event.get("data", {}).get("input", {})
-
-                step_event = complete_current_step()
-                if step_event:
-                    yield step_event
-
-                tool_step_id = next_thinking_step_id()
-                tool_step_ids[run_id] = tool_step_id
-                last_active_step_id = tool_step_id
-
-                title, items = _describe_tool_call(tool_name, tool_input)
-                step_titles[tool_step_id] = title
-                yield streaming_service.format_thinking_step(
-                    step_id=tool_step_id,
-                    title=title,
-                    status="in_progress",
-                    items=items,
-                )
-
-            elif event_type == "on_tool_end":
-                active_tool_depth = max(0, active_tool_depth - 1)
-                run_id = event.get("run_id", "")
-                step_id = tool_step_ids.pop(run_id, None)
-                if step_id and step_id not in completed_step_ids:
-                    completed_step_ids.add(step_id)
-                    title = step_titles.get(step_id, "Done")
-                    yield streaming_service.format_thinking_step(
-                        step_id=step_id,
-                        title=title,
-                        status="complete",
-                    )
-                    if last_active_step_id == step_id:
-                        last_active_step_id = None
-
-        step_event = complete_current_step()
-        if step_event:
-            yield step_event
-
-        raw_text = "".join(text_buffer)
-        suggestions = _parse_suggestions(raw_text)
-
-        yield streaming_service.format_data("suggestions", {"options": suggestions})
-
-        yield streaming_service.format_finish()
-        yield streaming_service.format_done()
-
-    except Exception as e:
-        logger.error(f"Autocomplete agent streaming error: {e}", exc_info=True)
-        yield streaming_service.format_error("Autocomplete failed. Please try again.")
-        yield streaming_service.format_done()
-
-
-def _describe_tool_call(tool_name: str, tool_input: Any) -> tuple[str, list[str]]:
-    """Return a human-readable (title, items) for a tool call thinking step."""
-    inp = tool_input if isinstance(tool_input, dict) else {}
-    if tool_name == "ls":
-        path = inp.get("path", "/")
-        return "Listing files", [path]
-    if tool_name == "read_file":
-        fp = inp.get("file_path", "")
-        display = fp if len(fp) <= 80 else "…" + fp[-77:]
-        return "Reading file", [display]
-    if tool_name == "write_file":
-        fp = inp.get("file_path", "")
-        display = fp if len(fp) <= 80 else "…" + fp[-77:]
-        return "Writing file", [display]
-    if tool_name == "edit_file":
-        fp = inp.get("file_path", "")
-        display = fp if len(fp) <= 80 else "…" + fp[-77:]
-        return "Editing file", [display]
-    if tool_name == "glob":
-        pat = inp.get("pattern", "")
-        base = inp.get("path", "/")
-        return "Searching files", [f"{pat} in {base}"]
-    if tool_name == "grep":
-        pat = inp.get("pattern", "")
-        path = inp.get("path", "")
-        display_pat = pat[:60] + ("…" if len(pat) > 60 else "")
-        return "Searching content", [
-            f'"{display_pat}"' + (f" in {path}" if path else "")
-        ]
-    return f"Using {tool_name}", []
diff --git a/surfsense_backend/app/routes/__init__.py b/surfsense_backend/app/routes/__init__.py
index 40ca7a7e8..9464a7ded 100644
--- a/surfsense_backend/app/routes/__init__.py
+++ b/surfsense_backend/app/routes/__init__.py
@@ -3,7 +3,6 @@ from fastapi import APIRouter
 from .airtable_add_connector_route import (
     router as airtable_add_connector_router,
 )
-from .autocomplete_routes import router as autocomplete_router
 from .chat_comments_routes import router as chat_comments_router
 from .circleback_webhook_route import router as circleback_webhook_router
 from .clickup_add_connector_route import router as clickup_add_connector_router
@@ -104,4 +103,3 @@ router.include_router(stripe_router)  # Stripe checkout for additional page pack
 router.include_router(youtube_router)  # YouTube playlist resolution
 router.include_router(prompts_router)
 router.include_router(memory_router)  # User personal memory (memory.md style)
-router.include_router(autocomplete_router)  # Lightweight autocomplete with KB context
diff --git a/surfsense_backend/app/routes/autocomplete_routes.py b/surfsense_backend/app/routes/autocomplete_routes.py
deleted file mode 100644
index a11b7dbc1..000000000
--- a/surfsense_backend/app/routes/autocomplete_routes.py
+++ /dev/null
@@ -1,45 +0,0 @@
-from fastapi import APIRouter, Depends
-from fastapi.responses import StreamingResponse
-from pydantic import BaseModel, Field
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.db import User, get_async_session
-from app.services.new_streaming_service import VercelStreamingService
-from app.services.vision_autocomplete_service import stream_vision_autocomplete
-from app.users import current_active_user
-from app.utils.rbac import check_search_space_access
-
-router = APIRouter(prefix="/autocomplete", tags=["autocomplete"])
-
-MAX_SCREENSHOT_SIZE = 20 * 1024 * 1024  # 20 MB base64 ceiling
-
-
-class VisionAutocompleteRequest(BaseModel):
-    screenshot: str = Field(..., max_length=MAX_SCREENSHOT_SIZE)
-    search_space_id: int
-    app_name: str = ""
-    window_title: str = ""
-
-
-@router.post("/vision/stream")
-async def vision_autocomplete_stream(
-    body: VisionAutocompleteRequest,
-    user: User = Depends(current_active_user),
-    session: AsyncSession = Depends(get_async_session),
-):
-    await check_search_space_access(session, user, body.search_space_id)
-
-    return StreamingResponse(
-        stream_vision_autocomplete(
-            body.screenshot,
-            body.search_space_id,
-            session,
-            app_name=body.app_name,
-            window_title=body.window_title,
-        ),
-        media_type="text/event-stream",
-        headers={
-            **VercelStreamingService.get_response_headers(),
-            "X-Accel-Buffering": "no",
-        },
-    )
diff --git a/surfsense_backend/app/services/vision_autocomplete_service.py b/surfsense_backend/app/services/vision_autocomplete_service.py
deleted file mode 100644
index c28962b31..000000000
--- a/surfsense_backend/app/services/vision_autocomplete_service.py
+++ /dev/null
@@ -1,158 +0,0 @@
-"""Vision autocomplete service — agent-based with scoped filesystem.
-
-Optimized pipeline:
-1. Start the SSE stream immediately so the UI shows progress.
-2. Derive a KB search query from window_title (no separate LLM call).
-3. Run KB filesystem pre-computation and agent graph compilation in PARALLEL.
-4. Inject pre-computed KB files as initial state and stream the agent.
-"""
-
-import logging
-from collections.abc import AsyncGenerator
-
-from langchain_core.messages import HumanMessage
-from sqlalchemy.ext.asyncio import AsyncSession
-
-from app.agents.autocomplete import create_autocomplete_agent, stream_autocomplete_agent
-from app.services.llm_service import get_vision_llm
-from app.services.new_streaming_service import VercelStreamingService
-
-logger = logging.getLogger(__name__)
-
-PREP_STEP_ID = "autocomplete-prep"
-
-
-def _derive_kb_query(app_name: str, window_title: str) -> str:
-    parts = [p for p in (window_title, app_name) if p]
-    return " ".join(parts)
-
-
-def _is_vision_unsupported_error(e: Exception) -> bool:
-    msg = str(e).lower()
-    return "content must be a string" in msg or "does not support image" in msg
-
-
-# ---------------------------------------------------------------------------
-# Main entry point
-# ---------------------------------------------------------------------------
-
-
-async def stream_vision_autocomplete(
-    screenshot_data_url: str,
-    search_space_id: int,
-    session: AsyncSession,
-    *,
-    app_name: str = "",
-    window_title: str = "",
-) -> AsyncGenerator[str, None]:
-    """Analyze a screenshot with a vision-LLM agent and stream a text completion."""
-    streaming = VercelStreamingService()
-    vision_error_msg = (
-        "The selected model does not support vision. "
-        "Please set a vision-capable model (e.g. GPT-4o, Gemini) in your search space settings."
-    )
-
-    llm = await get_vision_llm(session, search_space_id)
-    if not llm:
-        yield streaming.format_message_start()
-        yield streaming.format_error("No Vision LLM configured for this search space")
-        yield streaming.format_done()
-        return
-
-    # Start SSE stream immediately so the UI has something to show
-    yield streaming.format_message_start()
-
-    kb_query = _derive_kb_query(app_name, window_title)
-
-    # Show a preparation step while KB search + agent compile run
-    yield streaming.format_thinking_step(
-        step_id=PREP_STEP_ID,
-        title="Searching knowledge base",
-        status="in_progress",
-        items=[kb_query] if kb_query else [],
-    )
-
-    try:
-        agent, kb = await create_autocomplete_agent(
-            llm,
-            search_space_id=search_space_id,
-            kb_query=kb_query,
-            app_name=app_name,
-            window_title=window_title,
-        )
-    except Exception as e:
-        if _is_vision_unsupported_error(e):
-            logger.warning("Vision autocomplete: model does not support vision: %s", e)
-            yield streaming.format_error(vision_error_msg)
-            yield streaming.format_done()
-            return
-        logger.error("Failed to create autocomplete agent: %s", e, exc_info=True)
-        yield streaming.format_error("Autocomplete failed. Please try again.")
-        yield streaming.format_done()
-        return
-
-    has_kb = kb.has_documents
-    doc_count = len(kb.files) if has_kb else 0  # type: ignore[arg-type]
-
-    yield streaming.format_thinking_step(
-        step_id=PREP_STEP_ID,
-        title="Searching knowledge base",
-        status="complete",
-        items=[f"Found {doc_count} document{'s' if doc_count != 1 else ''}"]
-        if kb_query
-        else ["Skipped"],
-    )
-
-    # Build agent input with pre-computed KB as initial state
-    if has_kb:
-        instruction = (
-            "Analyze this screenshot, then explore the knowledge base documents "
-            "listed above — read the chunk index of any document whose title "
-            "looks relevant and check matched chunks for useful facts. "
-            "Finally, generate a concise autocomplete for the active text area, "
-            "enhanced with any relevant KB information you found."
-        )
-    else:
-        instruction = (
-            "Analyze this screenshot and generate a concise autocomplete "
-            "for the active text area based on what you see."
-        )
-
-    user_message = HumanMessage(
-        content=[
-            {"type": "text", "text": instruction},
-            {"type": "image_url", "image_url": {"url": screenshot_data_url}},
-        ]
-    )
-
-    input_data: dict = {"messages": [user_message]}
-
-    if has_kb:
-        input_data["files"] = kb.files
-        input_data["messages"] = [kb.ls_ai_msg, kb.ls_tool_msg, user_message]
-        logger.info(
-            "Autocomplete: injected %d KB files into agent initial state", doc_count
-        )
-    else:
-        logger.info(
-            "Autocomplete: no KB documents found, proceeding with screenshot only"
-        )
-
-    # Stream the agent (message_start already sent above)
-    try:
-        async for sse in stream_autocomplete_agent(
-            agent,
-            input_data,
-            streaming,
-            emit_message_start=False,
-        ):
-            yield sse
-    except Exception as e:
-        if _is_vision_unsupported_error(e):
-            logger.warning("Vision autocomplete: model does not support vision: %s", e)
-            yield streaming.format_error(vision_error_msg)
-            yield streaming.format_done()
-        else:
-            logger.error("Vision autocomplete streaming error: %s", e, exc_info=True)
-            yield streaming.format_error("Autocomplete failed. Please try again.")
-            yield streaming.format_done()

From d1080b12988ca11f43cc0d16476c39e0b088b6e6 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 18:48:02 +0200
Subject: [PATCH 02/31] Extend new chat streaming for multimodal user turns

---
 .../app/routes/new_chat_routes.py             | 48 ++++++++---
 surfsense_backend/app/schemas/new_chat.py     | 39 ++++++++-
 .../app/tasks/chat/stream_new_chat.py         | 34 ++++++--
 .../app/utils/user_message_multimodal.py      | 80 +++++++++++++++++++
 4 files changed, 178 insertions(+), 23 deletions(-)
 create mode 100644 surfsense_backend/app/utils/user_message_multimodal.py

diff --git a/surfsense_backend/app/routes/new_chat_routes.py b/surfsense_backend/app/routes/new_chat_routes.py
index 85a8658ec..854627d4b 100644
--- a/surfsense_backend/app/routes/new_chat_routes.py
+++ b/surfsense_backend/app/routes/new_chat_routes.py
@@ -24,9 +24,9 @@ from sqlalchemy.orm import selectinload
 
 from app.agents.new_chat.filesystem_selection import (
     ClientPlatform,
-    LocalFilesystemMount,
     FilesystemMode,
     FilesystemSelection,
+    LocalFilesystemMount,
 )
 from app.config import config
 from app.db import (
@@ -64,6 +64,10 @@ from app.services.token_tracking_service import record_token_usage
 from app.tasks.chat.stream_new_chat import stream_new_chat, stream_resume_chat
 from app.users import current_active_user
 from app.utils.rbac import check_permission
+from app.utils.user_message_multimodal import (
+    split_langchain_human_content,
+    split_persisted_user_content_parts,
+)
 
 _logger = logging.getLogger(__name__)
 _background_tasks: set[asyncio.Task] = set()
@@ -1237,6 +1241,10 @@ async def handle_new_chat(
         # connection (the "Exception terminating connection" errors).
         await session.close()
 
+        image_urls = (
+            [p.as_data_url() for p in request.user_images] if request.user_images else None
+        )
+
         return StreamingResponse(
             stream_new_chat(
                 user_query=request.user_query,
@@ -1252,6 +1260,7 @@ async def handle_new_chat(
                 disabled_tools=request.disabled_tools,
                 filesystem_selection=filesystem_selection,
                 request_id=getattr(http_request.state, "request_id", "unknown"),
+                user_image_data_urls=image_urls,
             ),
             media_type="text/event-stream",
             headers={
@@ -1360,6 +1369,7 @@ async def regenerate_response(
 
         target_checkpoint_id = None
         user_query_to_use = request.user_query
+        regenerate_image_urls: list[str] = []
 
         # Look through checkpoints to find the right one
         # We want to find the checkpoint just before the last HumanMessage
@@ -1385,9 +1395,13 @@ async def regenerate_response(
                             prev_messages = prev_channel_values.get("messages", [])
                             for msg in reversed(prev_messages):
                                 if isinstance(msg, HumanMessage):
-                                    user_query_to_use = msg.content
+                                    q, imgs = split_langchain_human_content(msg.content)
+                                    user_query_to_use = q
+                                    regenerate_image_urls = imgs
                                     break
-                            if user_query_to_use:
+                            if user_query_to_use is not None and (
+                                str(user_query_to_use).strip() or regenerate_image_urls
+                            ):
                                 break
 
                     target_checkpoint_id = cp_tuple.config["configurable"][
@@ -1405,7 +1419,9 @@ async def regenerate_response(
                     state_messages = channel_values.get("messages", [])
                     for msg in state_messages:
                         if isinstance(msg, HumanMessage):
-                            user_query_to_use = msg.content
+                            q, imgs = split_langchain_human_content(msg.content)
+                            user_query_to_use = q
+                            regenerate_image_urls = imgs
                             break
             else:
                 # Use the oldest checkpoint
@@ -1431,20 +1447,25 @@ async def regenerate_response(
                 if isinstance(content, str):
                     user_query_to_use = content
                 elif isinstance(content, list):
-                    # Extract text from content parts
-                    for part in content:
-                        if isinstance(part, dict) and part.get("type") == "text":
-                            user_query_to_use = part.get("text", "")
-                            break
-                        elif isinstance(part, str):
-                            user_query_to_use = part
-                            break
+                    plain, imgs = split_persisted_user_content_parts(content)
+                    user_query_to_use = plain
+                    regenerate_image_urls = imgs
+
+        if isinstance(user_query_to_use, list):
+            user_query_to_use, regenerate_image_urls = split_langchain_human_content(
+                user_query_to_use
+            )
 
         if user_query_to_use is None:
             raise HTTPException(
                 status_code=400,
                 detail="Could not determine user query for regeneration. Please provide a user_query.",
             )
+        if not str(user_query_to_use).strip() and not regenerate_image_urls:
+            raise HTTPException(
+                status_code=400,
+                detail="Could not determine user query for regeneration. Please provide a user_query.",
+            )
 
         # Get the last two messages to delete AFTER streaming succeeds
         # This prevents data loss if streaming fails
@@ -1483,7 +1504,7 @@ async def regenerate_response(
             streaming_completed = False
             try:
                 async for chunk in stream_new_chat(
-                    user_query=user_query_to_use,
+                    user_query=str(user_query_to_use),
                     search_space_id=request.search_space_id,
                     chat_id=thread_id,
                     user_id=str(user.id),
@@ -1497,6 +1518,7 @@ async def regenerate_response(
                     disabled_tools=request.disabled_tools,
                     filesystem_selection=filesystem_selection,
                     request_id=getattr(http_request.state, "request_id", "unknown"),
+                    user_image_data_urls=regenerate_image_urls or None,
                 ):
                     yield chunk
                 streaming_completed = True
diff --git a/surfsense_backend/app/schemas/new_chat.py b/surfsense_backend/app/schemas/new_chat.py
index 1222deab2..e757ce178 100644
--- a/surfsense_backend/app/schemas/new_chat.py
+++ b/surfsense_backend/app/schemas/new_chat.py
@@ -7,12 +7,13 @@ These schemas follow the assistant-ui ThreadHistoryAdapter pattern:
 """
 
 from datetime import datetime
-from typing import Any, Literal
+from typing import Any, Literal, Self
 from uuid import UUID
 
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
 
 from app.db import ChatVisibility, NewChatMessageRole
+from app.utils.user_message_multimodal import decode_base64_image, to_data_url
 
 from .base import IDModel, TimestampModel
 
@@ -173,6 +174,26 @@ class LocalFilesystemMountPayload(BaseModel):
     root_path: str
 
 
+MAX_NEW_CHAT_IMAGE_BYTES = 8 * 1024 * 1024
+MAX_NEW_CHAT_IMAGES = 4
+
+
+class NewChatUserImagePart(BaseModel):
+    """One inline image for a user turn (raw base64 body, no data: URL prefix)."""
+
+    media_type: Literal["image/png", "image/jpeg", "image/webp"]
+    data: str = Field(..., min_length=1)
+
+    @field_validator("data")
+    @classmethod
+    def _validate_payload(cls, v: str) -> str:
+        decode_base64_image(v, max_bytes=MAX_NEW_CHAT_IMAGE_BYTES)
+        return v
+
+    def as_data_url(self) -> str:
+        return to_data_url(self.media_type, self.data)
+
+
 class NewChatRequest(BaseModel):
     """Request schema for the deep agent chat endpoint."""
 
@@ -192,6 +213,20 @@ class NewChatRequest(BaseModel):
     filesystem_mode: Literal["cloud", "desktop_local_folder"] = "cloud"
     client_platform: Literal["web", "desktop"] = "web"
     local_filesystem_mounts: list[LocalFilesystemMountPayload] | None = None
+    user_images: list[NewChatUserImagePart] | None = Field(
+        default=None,
+        description="Optional images for this user turn",
+    )
+
+    @model_validator(mode="after")
+    def _require_text_or_images(self) -> Self:
+        has_text = bool(self.user_query.strip())
+        has_images = bool(self.user_images)
+        if not has_text and not has_images:
+            raise ValueError("Provide non-empty user_query and/or user_images")
+        if self.user_images is not None and len(self.user_images) > MAX_NEW_CHAT_IMAGES:
+            raise ValueError(f"At most {MAX_NEW_CHAT_IMAGES} images allowed")
+        return self
 
 
 class RegenerateRequest(BaseModel):
diff --git a/surfsense_backend/app/tasks/chat/stream_new_chat.py b/surfsense_backend/app/tasks/chat/stream_new_chat.py
index 5a6117808..396c7574e 100644
--- a/surfsense_backend/app/tasks/chat/stream_new_chat.py
+++ b/surfsense_backend/app/tasks/chat/stream_new_chat.py
@@ -31,7 +31,6 @@ from sqlalchemy.orm import selectinload
 from app.agents.new_chat.chat_deepagent import create_surfsense_deep_agent
 from app.agents.new_chat.checkpointer import get_checkpointer
 from app.agents.new_chat.filesystem_selection import FilesystemSelection
-from app.config import config
 from app.agents.new_chat.llm_config import (
     AgentConfig,
     create_chat_litellm_from_agent_config,
@@ -62,6 +61,7 @@ from app.services.connector_service import ConnectorService
 from app.services.new_streaming_service import VercelStreamingService
 from app.utils.content_utils import bootstrap_history_from_db
 from app.utils.perf import get_perf_logger, log_system_snapshot, trim_native_heap
+from app.utils.user_message_multimodal import build_human_message_content
 
 _background_tasks: set[asyncio.Task] = set()
 _perf_log = get_perf_logger()
@@ -1350,6 +1350,7 @@ async def stream_new_chat(
     disabled_tools: list[str] | None = None,
     filesystem_selection: FilesystemSelection | None = None,
     request_id: str | None = None,
+    user_image_data_urls: list[str] | None = None,
 ) -> AsyncGenerator[str, None]:
     """
     Stream chat responses from the new SurfSense deep agent.
@@ -1625,8 +1626,10 @@ async def stream_new_chat(
         #         elif msg.role == "assistant":
         #             langchain_messages.append(AIMessage(content=msg.content))
         # else:
-        # Fallback: just use the current user query with attachment context
-        langchain_messages.append(HumanMessage(content=final_query))
+        human_content = build_human_message_content(
+            final_query, list(user_image_data_urls or ())
+        )
+        langchain_messages.append(HumanMessage(content=human_content))
 
         input_state = {
             # Lets not pass this message atm because we are using the checkpointer to manage the conversation history
@@ -1687,8 +1690,13 @@ async def stream_new_chat(
             action_verb = "Processing"
 
         processing_parts = []
-        query_text = user_query[:80] + ("..." if len(user_query) > 80 else "")
-        processing_parts.append(query_text)
+        if user_query.strip():
+            query_text = user_query[:80] + ("..." if len(user_query) > 80 else "")
+            processing_parts.append(query_text)
+        elif user_image_data_urls:
+            processing_parts.append(f"[{len(user_image_data_urls)} image(s)]")
+        else:
+            processing_parts.append("(message)")
 
         if mentioned_surfsense_docs:
             doc_names = []
@@ -1750,8 +1758,13 @@ async def stream_new_chat(
 
                     _turn_accumulator.set(None)
 
+                    title_seed = user_query.strip() or (
+                        f"[{len(user_image_data_urls or [])} image(s)]"
+                        if user_image_data_urls
+                        else ""
+                    )
                     prompt = TITLE_GENERATION_PROMPT.replace(
-                        "{user_query}", user_query[:500]
+                        "{user_query}", title_seed[:500] or "(message)"
                     )
                     messages = [{"role": "user", "content": prompt}]
 
@@ -1947,10 +1960,15 @@ async def stream_new_chat(
         # Fire background memory extraction if the agent didn't handle it.
         # Shared threads write to team memory; private threads write to user memory.
         if not stream_result.agent_called_update_memory:
+            memory_seed = user_query.strip() or (
+                f"[{len(user_image_data_urls or [])} image(s)]"
+                if user_image_data_urls
+                else "(message)"
+            )
             if visibility == ChatVisibility.SEARCH_SPACE:
                 task = asyncio.create_task(
                     extract_and_save_team_memory(
-                        user_message=user_query,
+                        user_message=memory_seed,
                         search_space_id=search_space_id,
                         llm=llm,
                         author_display_name=current_user_display_name,
@@ -1961,7 +1979,7 @@ async def stream_new_chat(
             elif user_id:
                 task = asyncio.create_task(
                     extract_and_save_memory(
-                        user_message=user_query,
+                        user_message=memory_seed,
                         user_id=user_id,
                         llm=llm,
                     )
diff --git a/surfsense_backend/app/utils/user_message_multimodal.py b/surfsense_backend/app/utils/user_message_multimodal.py
new file mode 100644
index 000000000..1d0691697
--- /dev/null
+++ b/surfsense_backend/app/utils/user_message_multimodal.py
@@ -0,0 +1,80 @@
+"""Helpers for multimodal user turns (text + inline images) in LangChain messages."""
+
+from __future__ import annotations
+
+import base64
+import binascii
+from typing import Any
+
+
+def build_human_message_content(final_query: str, image_data_urls: list[str]) -> str | list[dict[str, Any]]:
+    if not image_data_urls:
+        return final_query
+    parts: list[dict[str, Any]] = [{"type": "text", "text": final_query}]
+    for url in image_data_urls:
+        parts.append({"type": "image_url", "image_url": {"url": url}})
+    return parts
+
+
+def split_langchain_human_content(content: str | list[Any]) -> tuple[str, list[str]]:
+    """Return plain text and data URLs from a LangChain HumanMessage ``content`` value."""
+    if isinstance(content, str):
+        return content, []
+    if not isinstance(content, list):
+        return "", []
+
+    text_chunks: list[str] = []
+    urls: list[str] = []
+    for block in content:
+        if not isinstance(block, dict):
+            continue
+        btype = block.get("type")
+        if btype == "text":
+            t = block.get("text")
+            if isinstance(t, str) and t:
+                text_chunks.append(t)
+        elif btype == "image_url":
+            iu = block.get("image_url")
+            if isinstance(iu, dict):
+                u = iu.get("url")
+                if isinstance(u, str) and u.startswith("data:"):
+                    urls.append(u)
+            elif isinstance(iu, str) and iu.startswith("data:"):
+                urls.append(iu)
+    return "\n".join(text_chunks), urls
+
+
+def decode_base64_image(data: str, *, max_bytes: int) -> bytes:
+    raw = data.strip()
+    if not raw:
+        raise ValueError("empty image payload")
+    try:
+        decoded = base64.b64decode(raw, validate=True)
+    except binascii.Error as e:
+        raise ValueError("invalid base64 image data") from e
+    if len(decoded) > max_bytes:
+        raise ValueError("image exceeds maximum size")
+    return decoded
+
+
+def to_data_url(media_type: str, raw_b64: str) -> str:
+    return f"data:{media_type};base64,{raw_b64.strip()}"
+
+
+def split_persisted_user_content_parts(parts: list[Any]) -> tuple[str, list[str]]:
+    """Extract plain text and data URLs from persisted assistant-ui style user ``content``."""
+    text_chunks: list[str] = []
+    urls: list[str] = []
+    for block in parts:
+        if not isinstance(block, dict):
+            continue
+        btype = block.get("type")
+        if btype == "text":
+            t = block.get("text")
+            if isinstance(t, str):
+                text_chunks.append(t)
+        elif btype == "image":
+            u = block.get("image")
+            if isinstance(u, str) and u.startswith("data:"):
+                urls.append(u)
+    return "".join(text_chunks), urls

From dfa6c0423d938be6938c83fb9e54c396bf38c39d Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 18:49:22 +0200
Subject: [PATCH 03/31] Tidy alembic migration version scripts

---
 ..._optimize_zero_publication_column_lists.py | 60 ++++++++++---------
 .../versions/121_add_memory_md_columns.py     | 34 +++++++----
 2 files changed, 55 insertions(+), 39 deletions(-)

diff --git a/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py b/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py
index 78a26a381..3ad5a043b 100644
--- a/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py
+++ b/surfsense_backend/alembic/versions/117_optimize_zero_publication_column_lists.py
@@ -79,40 +79,44 @@ def _terminate_blocked_pids(conn, table: str) -> None:
 
 def upgrade() -> None:
     conn = op.get_bind()
+    # asyncpg requires LOCK TABLE inside a transaction block. Alembic already
+    # opened one via context.begin_transaction(), but the driver still errors
+    # unless we use an explicit SAVEPOINT (nested transaction) for this block.
+    tx = conn.begin_nested() if conn.in_transaction() else conn.begin()
+    with tx:
+        conn.execute(sa.text("SET lock_timeout = '10s'"))
 
-    conn.execute(sa.text("SET lock_timeout = '10s'"))
+        for tbl in sorted(TABLES_WITH_FULL_IDENTITY):
+            _terminate_blocked_pids(conn, tbl)
+            conn.execute(sa.text(f'LOCK TABLE "{tbl}" IN ACCESS EXCLUSIVE MODE'))
 
-    for tbl in sorted(TABLES_WITH_FULL_IDENTITY):
-        _terminate_blocked_pids(conn, tbl)
-        conn.execute(sa.text(f'LOCK TABLE "{tbl}" IN ACCESS EXCLUSIVE MODE'))
+        for tbl in TABLES_WITH_FULL_IDENTITY:
+            conn.execute(sa.text(f'ALTER TABLE "{tbl}" REPLICA IDENTITY DEFAULT'))
 
-    for tbl in TABLES_WITH_FULL_IDENTITY:
-        conn.execute(sa.text(f'ALTER TABLE "{tbl}" REPLICA IDENTITY DEFAULT'))
+        conn.execute(sa.text(f"DROP PUBLICATION IF EXISTS {PUBLICATION_NAME}"))
 
-    conn.execute(sa.text(f"DROP PUBLICATION IF EXISTS {PUBLICATION_NAME}"))
+        has_zero_ver = conn.execute(
+            sa.text(
+                "SELECT 1 FROM information_schema.columns "
+                "WHERE table_name = 'documents' AND column_name = '_0_version'"
+            )
+        ).fetchone()
 
-    has_zero_ver = conn.execute(
-        sa.text(
-            "SELECT 1 FROM information_schema.columns "
-            "WHERE table_name = 'documents' AND column_name = '_0_version'"
+        cols = DOCUMENT_COLS + (['"_0_version"'] if has_zero_ver else [])
+        col_list = ", ".join(cols)
+
+        conn.execute(
+            sa.text(
+                f"CREATE PUBLICATION {PUBLICATION_NAME} FOR TABLE "
+                f"notifications, "
+                f"documents ({col_list}), "
+                f"folders, "
+                f"search_source_connectors, "
+                f"new_chat_messages, "
+                f"chat_comments, "
+                f"chat_session_state"
+            )
         )
-    ).fetchone()
-
-    cols = DOCUMENT_COLS + (['"_0_version"'] if has_zero_ver else [])
-    col_list = ", ".join(cols)
-
-    conn.execute(
-        sa.text(
-            f"CREATE PUBLICATION {PUBLICATION_NAME} FOR TABLE "
-            f"notifications, "
-            f"documents ({col_list}), "
-            f"folders, "
-            f"search_source_connectors, "
-            f"new_chat_messages, "
-            f"chat_comments, "
-            f"chat_session_state"
-        )
-    )
 
 
 def downgrade() -> None:
diff --git a/surfsense_backend/alembic/versions/121_add_memory_md_columns.py b/surfsense_backend/alembic/versions/121_add_memory_md_columns.py
index d5ff967fd..ac248dfca 100644
--- a/surfsense_backend/alembic/versions/121_add_memory_md_columns.py
+++ b/surfsense_backend/alembic/versions/121_add_memory_md_columns.py
@@ -12,8 +12,6 @@ from __future__ import annotations
 
 from collections.abc import Sequence
 
-import sqlalchemy as sa
-
 from alembic import op
 
 revision: str = "121"
@@ -23,16 +21,30 @@ depends_on: str | Sequence[str] | None = None
 
 
 def upgrade() -> None:
-    op.add_column(
-        "user",
-        sa.Column("memory_md", sa.Text(), nullable=True, server_default=""),
-    )
-    op.add_column(
-        "searchspaces",
-        sa.Column("shared_memory_md", sa.Text(), nullable=True, server_default=""),
+    # Idempotent: column(s) may already exist after a failed run or manual DDL.
+    op.execute(
+        """
+        DO $$
+        BEGIN
+            IF NOT EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_schema = 'public' AND table_name = 'user'
+                  AND column_name = 'memory_md'
+            ) THEN
+                ALTER TABLE "user" ADD COLUMN memory_md TEXT DEFAULT '';
+            END IF;
+            IF NOT EXISTS (
+                SELECT 1 FROM information_schema.columns
+                WHERE table_schema = 'public' AND table_name = 'searchspaces'
+                  AND column_name = 'shared_memory_md'
+            ) THEN
+                ALTER TABLE searchspaces ADD COLUMN shared_memory_md TEXT DEFAULT '';
+            END IF;
+        END$$;
+        """
     )
 
 
 def downgrade() -> None:
-    op.drop_column("searchspaces", "shared_memory_md")
-    op.drop_column("user", "memory_md")
+    op.execute("ALTER TABLE searchspaces DROP COLUMN IF EXISTS shared_memory_md")
+    op.execute('ALTER TABLE "user" DROP COLUMN IF EXISTS memory_md')

From 6c178a027191f520d24340635c546ad8ce6179b8 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 18:49:51 +0200
Subject: [PATCH 04/31] Remove desktop autocomplete native window modules

---
 .../src/modules/autocomplete/index.ts         | 143 ------------------
 .../src/modules/autocomplete/screenshot.ts    |  27 ----
 .../modules/autocomplete/suggestion-window.ts | 112 --------------
 3 files changed, 282 deletions(-)
 delete mode 100644 surfsense_desktop/src/modules/autocomplete/index.ts
 delete mode 100644 surfsense_desktop/src/modules/autocomplete/screenshot.ts
 delete mode 100644 surfsense_desktop/src/modules/autocomplete/suggestion-window.ts

diff --git a/surfsense_desktop/src/modules/autocomplete/index.ts b/surfsense_desktop/src/modules/autocomplete/index.ts
deleted file mode 100644
index d4eb727fd..000000000
--- a/surfsense_desktop/src/modules/autocomplete/index.ts
+++ /dev/null
@@ -1,143 +0,0 @@
-import { clipboard, globalShortcut, ipcMain, screen } from 'electron';
-import { IPC_CHANNELS } from '../../ipc/channels';
-import { getFrontmostApp, getWindowTitle, hasAccessibilityPermission, simulatePaste } from '../platform';
-import { hasScreenRecordingPermission, requestAccessibility, requestScreenRecording } from '../permissions';
-import { captureScreen } from './screenshot';
-import { createSuggestionWindow, destroySuggestion, getSuggestionWindow } from './suggestion-window';
-import { getShortcuts } from '../shortcuts';
-import { getActiveSearchSpaceId } from '../active-search-space';
-import { trackEvent } from '../analytics';
-
-let currentShortcut = '';
-let autocompleteEnabled = true;
-let savedClipboard = '';
-let sourceApp = '';
-
-function isSurfSenseWindow(): boolean {
-  const app = getFrontmostApp();
-  return app === 'Electron' || app === 'SurfSense' || app === 'surfsense-desktop';
-}
-
-async function triggerAutocomplete(): Promise<void> {
-  if (!autocompleteEnabled) return;
-  if (isSurfSenseWindow()) return;
-
-  if (!hasScreenRecordingPermission()) {
-    requestScreenRecording();
-    return;
-  }
-
-  sourceApp = getFrontmostApp();
-  const windowTitle = getWindowTitle();
-  savedClipboard = clipboard.readText();
-
-  const screenshot = await captureScreen();
-  if (!screenshot) {
-    console.error('[autocomplete] Screenshot capture failed');
-    return;
-  }
-
-  const searchSpaceId = await getActiveSearchSpaceId();
-  if (!searchSpaceId) {
-    console.warn('[autocomplete] No active search space. Select a search space first.');
-    return;
-  }
-  trackEvent('desktop_autocomplete_triggered', { search_space_id: searchSpaceId });
-  const cursor = screen.getCursorScreenPoint();
-  const win = createSuggestionWindow(cursor.x, cursor.y);
-
-  win.webContents.once('did-finish-load', () => {
-    const sw = getSuggestionWindow();
-    setTimeout(() => {
-      if (sw && !sw.isDestroyed()) {
-        sw.webContents.send(IPC_CHANNELS.AUTOCOMPLETE_CONTEXT, {
-          screenshot,
-          searchSpaceId,
-          appName: sourceApp,
-          windowTitle,
-        });
-      }
-    }, 300);
-  });
-}
-
-async function acceptAndInject(text: string): Promise<void> {
-  if (!sourceApp) return;
-
-  if (!hasAccessibilityPermission()) {
-    requestAccessibility();
-    return;
-  }
-
-  clipboard.writeText(text);
-  destroySuggestion();
-
-  try {
-    await new Promise((r) => setTimeout(r, 50));
-    simulatePaste();
-    await new Promise((r) => setTimeout(r, 100));
-    clipboard.writeText(savedClipboard);
-  } catch {
-    clipboard.writeText(savedClipboard);
-  }
-}
-
-let ipcRegistered = false;
-
-function registerIpcHandlers(): void {
-  if (ipcRegistered) return;
-  ipcRegistered = true;
-
-  ipcMain.handle(IPC_CHANNELS.ACCEPT_SUGGESTION, async (_event, text: string) => {
-    trackEvent('desktop_autocomplete_accepted');
-    await acceptAndInject(text);
-  });
-  ipcMain.handle(IPC_CHANNELS.DISMISS_SUGGESTION, () => {
-    trackEvent('desktop_autocomplete_dismissed');
-    destroySuggestion();
-  });
-  ipcMain.handle(IPC_CHANNELS.SET_AUTOCOMPLETE_ENABLED, (_event, enabled: boolean) => {
-    autocompleteEnabled = enabled;
-    if (!enabled) {
-      destroySuggestion();
-    }
-  });
-  ipcMain.handle(IPC_CHANNELS.GET_AUTOCOMPLETE_ENABLED, () => autocompleteEnabled);
-}
-
-function autocompleteHandler(): void {
-  const sw = getSuggestionWindow();
-  if (sw && !sw.isDestroyed()) {
-    destroySuggestion();
-    return;
-  }
-  triggerAutocomplete();
-}
-
-async function registerShortcut(): Promise<void> {
-  const shortcuts = await getShortcuts();
-  currentShortcut = shortcuts.autocomplete;
-
-  const ok = globalShortcut.register(currentShortcut, autocompleteHandler);
-
-  if (!ok) {
-    console.error(`[autocomplete] Failed to register shortcut ${currentShortcut}`);
-  } else {
-    console.log(`[autocomplete] Registered shortcut ${currentShortcut}`);
-  }
-}
-
-export async function registerAutocomplete(): Promise<void> {
-  registerIpcHandlers();
-  await registerShortcut();
-}
-
-export function unregisterAutocomplete(): void {
-  if (currentShortcut) globalShortcut.unregister(currentShortcut);
-  destroySuggestion();
-}
-
-export async function reregisterAutocomplete(): Promise<void> {
-  unregisterAutocomplete();
-  await registerShortcut();
-}
diff --git a/surfsense_desktop/src/modules/autocomplete/screenshot.ts b/surfsense_desktop/src/modules/autocomplete/screenshot.ts
deleted file mode 100644
index 22b7c1b14..000000000
--- a/surfsense_desktop/src/modules/autocomplete/screenshot.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { desktopCapturer, screen } from 'electron';
-
-/**
- * Captures the primary display as a base64-encoded PNG data URL.
- * Uses the display's actual size for full-resolution capture.
- */
-export async function captureScreen(): Promise<string | null> {
-  try {
-    const primaryDisplay = screen.getPrimaryDisplay();
-    const { width, height } = primaryDisplay.size;
-
-    const sources = await desktopCapturer.getSources({
-      types: ['screen'],
-      thumbnailSize: { width, height },
-    });
-
-    if (!sources.length) {
-      console.error('[screenshot] No screen sources found');
-      return null;
-    }
-
-    return sources[0].thumbnail.toDataURL();
-  } catch (err) {
-    console.error('[screenshot] Failed to capture screen:', err);
-    return null;
-  }
-}
diff --git a/surfsense_desktop/src/modules/autocomplete/suggestion-window.ts b/surfsense_desktop/src/modules/autocomplete/suggestion-window.ts
deleted file mode 100644
index 8f61b2901..000000000
--- a/surfsense_desktop/src/modules/autocomplete/suggestion-window.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { BrowserWindow, screen, shell } from 'electron';
-import path from 'path';
-import { getServerPort } from '../server';
-
-const TOOLTIP_WIDTH = 420;
-const TOOLTIP_HEIGHT = 38;
-const MAX_HEIGHT = 400;
-
-let suggestionWindow: BrowserWindow | null = null;
-let resizeTimer: ReturnType<typeof setInterval> | null = null;
-let cursorOrigin = { x: 0, y: 0 };
-
-const CURSOR_GAP = 20;
-
-function positionOnScreen(cursorX: number, cursorY: number, w: number, h: number): { x: number; y: number } {
-  const display = screen.getDisplayNearestPoint({ x: cursorX, y: cursorY });
-  const { x: dx, y: dy, width: dw, height: dh } = display.workArea;
-
-  const x = Math.max(dx, Math.min(cursorX, dx + dw - w));
-
-  const spaceBelow = (dy + dh) - (cursorY + CURSOR_GAP);
-  const y = spaceBelow >= h
-    ? cursorY + CURSOR_GAP
-    : cursorY - h - CURSOR_GAP;
-
-  return { x, y: Math.max(dy, y) };
-}
-
-function stopResizePolling(): void {
-  if (resizeTimer) { clearInterval(resizeTimer); resizeTimer = null; }
-}
-
-function startResizePolling(win: BrowserWindow): void {
-  stopResizePolling();
-  let lastH = 0;
-  resizeTimer = setInterval(async () => {
-    if (!win || win.isDestroyed()) { stopResizePolling(); return; }
-    try {
-      const h: number = await win.webContents.executeJavaScript(
-        `document.body.scrollHeight`
-      );
-      if (h > 0 && h !== lastH) {
-        lastH = h;
-        const clamped = Math.min(h, MAX_HEIGHT);
-        const pos = positionOnScreen(cursorOrigin.x, cursorOrigin.y, TOOLTIP_WIDTH, clamped);
-        win.setBounds({ x: pos.x, y: pos.y, width: TOOLTIP_WIDTH, height: clamped });
-      }
-    } catch {}
-  }, 150);
-}
-
-export function getSuggestionWindow(): BrowserWindow | null {
-  return suggestionWindow;
-}
-
-export function destroySuggestion(): void {
-  stopResizePolling();
-  if (suggestionWindow && !suggestionWindow.isDestroyed()) {
-    suggestionWindow.close();
-  }
-  suggestionWindow = null;
-}
-
-export function createSuggestionWindow(x: number, y: number): BrowserWindow {
-  destroySuggestion();
-  cursorOrigin = { x, y };
-
-  const pos = positionOnScreen(x, y, TOOLTIP_WIDTH, TOOLTIP_HEIGHT);
-
-  suggestionWindow = new BrowserWindow({
-    width: TOOLTIP_WIDTH,
-    height: TOOLTIP_HEIGHT,
-    x: pos.x,
-    y: pos.y,
-    frame: false,
-    transparent: true,
-    focusable: false,
-    alwaysOnTop: true,
-    skipTaskbar: true,
-    hasShadow: true,
-    type: 'panel',
-    webPreferences: {
-      preload: path.join(__dirname, 'preload.js'),
-      contextIsolation: true,
-      nodeIntegration: false,
-      sandbox: true,
-    },
-    show: false,
-  });
-
-  suggestionWindow.loadURL(`http://localhost:${getServerPort()}/desktop/suggestion?t=${Date.now()}`);
-
-  suggestionWindow.once('ready-to-show', () => {
-    suggestionWindow?.showInactive();
-    if (suggestionWindow) startResizePolling(suggestionWindow);
-  });
-
-  suggestionWindow.webContents.setWindowOpenHandler(({ url }) => {
-    if (url.startsWith('http://localhost')) {
-      return { action: 'allow' };
-    }
-    shell.openExternal(url);
-    return { action: 'deny' };
-  });
-
-  suggestionWindow.on('closed', () => {
-    stopResizePolling();
-    suggestionWindow = null;
-  });
-
-  return suggestionWindow;
-}

From 7097f542fb878e8a277a1901305f73d24ac0d20d Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 19:13:14 +0200
Subject: [PATCH 05/31] Add native screen region capture modules and preload
 build

---
 surfsense_desktop/scripts/build-electron.mjs  |   6 +
 .../src/modules/general-assist.ts             |  21 ++
 .../src/modules/screen-region-picker.ts       | 271 ++++++++++++++++++
 .../src/screen-region-preload.ts              |  11 +
 4 files changed, 309 insertions(+)
 create mode 100644 surfsense_desktop/src/modules/general-assist.ts
 create mode 100644 surfsense_desktop/src/modules/screen-region-picker.ts
 create mode 100644 surfsense_desktop/src/screen-region-preload.ts

diff --git a/surfsense_desktop/scripts/build-electron.mjs b/surfsense_desktop/scripts/build-electron.mjs
index 90d76ef7a..0c8f08d52 100644
--- a/surfsense_desktop/scripts/build-electron.mjs
+++ b/surfsense_desktop/scripts/build-electron.mjs
@@ -132,6 +132,12 @@ async function buildElectron() {
     outfile: 'dist/preload.js',
   });
 
+  await build({
+    ...shared,
+    entryPoints: ['src/screen-region-preload.ts'],
+    outfile: 'dist/screen-region-preload.js',
+  });
+
   console.log('Electron build complete');
   resolveStandaloneSymlinks();
 }
diff --git a/surfsense_desktop/src/modules/general-assist.ts b/surfsense_desktop/src/modules/general-assist.ts
new file mode 100644
index 000000000..9d39f068a
--- /dev/null
+++ b/surfsense_desktop/src/modules/general-assist.ts
@@ -0,0 +1,21 @@
+import { IPC_CHANNELS } from '../ipc/channels';
+import { trackEvent } from './analytics';
+import { pickScreenRegion } from './screen-region-picker';
+import { getMainWindow, showMainWindow } from './window';
+import { hasScreenRecordingPermission, requestScreenRecording } from './permissions';
+
+export async function runGeneralAssistShortcut(): Promise<void> {
+  console.log('[general-assist] Shortcut triggered');
+  showMainWindow('shortcut');
+  await new Promise((r) => setTimeout(r, 400));
+  if (!hasScreenRecordingPermission()) {
+    requestScreenRecording();
+    return;
+  }
+  const url = await pickScreenRegion();
+  const mw = getMainWindow();
+  if (url && mw && !mw.isDestroyed()) {
+    mw.webContents.send(IPC_CHANNELS.CHAT_SCREEN_CAPTURE, url);
+    trackEvent('desktop_screen_region_to_chat', {});
+  }
+}
diff --git a/surfsense_desktop/src/modules/screen-region-picker.ts b/surfsense_desktop/src/modules/screen-region-picker.ts
new file mode 100644
index 000000000..0a924eec9
--- /dev/null
+++ b/surfsense_desktop/src/modules/screen-region-picker.ts
@@ -0,0 +1,271 @@
+import { BrowserWindow, desktopCapturer, nativeImage, screen } from 'electron';
+import path from 'path';
+import { IPC_CHANNELS } from '../ipc/channels';
+
+// One getSources per pick; overlay and final crop share that bitmap (avoids a second portal session, e.g. Wayland).
+
+let pickInProgress = false;
+
+async function captureDisplayDataUrl(display: Electron.Display): Promise<{
+  dataUrl: string;
+  width: number;
+  height: number;
+} | null> {
+  try {
+    const sf = display.scaleFactor || 1;
+    const tw = Math.max(1, Math.round(display.size.width * sf));
+    const th = Math.max(1, Math.round(display.size.height * sf));
+    const sources = await desktopCapturer.getSources({
+      types: ['screen'],
+      thumbnailSize: { width: tw, height: th },
+    });
+    if (!sources.length) return null;
+    const idStr = String(display.id);
+    let chosen =
+      sources.find((s) => s.display_id === idStr) ||
+      sources.find((s) => s.display_id && s.display_id === idStr) ||
+      null;
+    if (!chosen && screen.getPrimaryDisplay().id === display.id) {
+      chosen = sources[0];
+    }
+    if (!chosen) chosen = sources[0];
+    const dataUrl = chosen.thumbnail.toDataURL();
+    const { width, height } = chosen.thumbnail.getSize();
+    return { dataUrl, width, height };
+  } catch {
+    return null;
+  }
+}
+
+function buildInjectScript(dataUrl: string, iw: number, ih: number): string {
+  return `(() => {
+    const api = window.surfsenseScreenRegion;
+    if (!api) return;
+    const dataUrl = ${JSON.stringify(dataUrl)};
+    const iw = ${iw};
+    const ih = ${ih};
+    document.body.style.margin = '0';
+    document.body.style.overflow = 'hidden';
+    document.body.style.background = '#000';
+    const img = document.createElement('img');
+    img.draggable = false;
+    img.src = dataUrl;
+    img.style.cssText = 'position:fixed;inset:0;width:100vw;height:100vh;object-fit:fill;user-select:none;pointer-events:none;';
+    const veil = document.createElement('div');
+    veil.style.cssText = 'position:fixed;inset:0;cursor:crosshair;background:rgba(0,0,0,0.15);';
+    const sel = document.createElement('div');
+    sel.style.cssText = 'position:fixed;border:2px solid #38bdf8;box-shadow:0 0 0 9999px rgba(0,0,0,0.45);display:none;pointer-events:none;z-index:2;';
+    document.body.appendChild(img);
+    document.body.appendChild(veil);
+    document.body.appendChild(sel);
+    let ax = 0, ay = 0, dragging = false;
+    function show(x0, y0, x1, y1) {
+      const l = Math.min(x0, x1), t = Math.min(y0, y1);
+      const w = Math.abs(x1 - x0), h = Math.abs(y1 - y0);
+      if (w < 2 || h < 2) { sel.style.display = 'none'; return; }
+      sel.style.display = 'block';
+      sel.style.left = l + 'px';
+      sel.style.top = t + 'px';
+      sel.style.width = w + 'px';
+      sel.style.height = h + 'px';
+    }
+    function mapRect(l, t, w, h) {
+      const vw = window.innerWidth, vh = window.innerHeight;
+      const sx = Math.round((l / vw) * iw);
+      const sy = Math.round((t / vh) * ih);
+      const sw = Math.max(1, Math.round((w / vw) * iw));
+      const sh = Math.max(1, Math.round((h / vh) * ih));
+      const cx = Math.min(Math.max(0, sx), iw - 1);
+      const cy = Math.min(Math.max(0, sy), ih - 1);
+      const cw = Math.min(sw, iw - cx);
+      const ch = Math.min(sh, ih - cy);
+      return { x: cx, y: cy, width: cw, height: ch };
+    }
+    function endDrag(clientX, clientY, pointerId) {
+      if (!dragging) return;
+      dragging = false;
+      if (typeof pointerId === 'number' && pointerId >= 0) {
+        try { veil.releasePointerCapture(pointerId); } catch (_) {}
+      }
+      const l = Math.min(ax, clientX), t = Math.min(ay, clientY);
+      const w = Math.abs(clientX - ax), h = Math.abs(clientY - ay);
+      if (w < 4 || h < 4) { sel.style.display = 'none'; return; }
+      api.submit(mapRect(l, t, w, h));
+    }
+    veil.addEventListener('pointerdown', (e) => {
+      if (e.button !== 0) return;
+      try { veil.setPointerCapture(e.pointerId); } catch (_) {}
+      dragging = true;
+      ax = e.clientX; ay = e.clientY;
+      show(ax, ay, ax, ay);
+    });
+    veil.addEventListener('pointermove', (e) => {
+      if (!dragging) return;
+      show(ax, ay, e.clientX, e.clientY);
+    });
+    veil.addEventListener('pointerup', (e) => {
+      endDrag(e.clientX, e.clientY, e.pointerId);
+    });
+    window.addEventListener('pointerup', (e) => {
+      endDrag(e.clientX, e.clientY, e.pointerId);
+    });
+    document.addEventListener(
+      'mouseup',
+      (e) => {
+        endDrag(e.clientX, e.clientY, -1);
+      },
+      true
+    );
+    veil.addEventListener('pointercancel', (e) => {
+      if (!dragging) return;
+      dragging = false;
+      try { veil.releasePointerCapture(e.pointerId); } catch (_) {}
+      sel.style.display = 'none';
+    });
+    window.addEventListener('keydown', (e) => {
+      if (e.key === 'Escape') { api.cancel(); return; }
+      if (e.key === 'Enter' && sel.style.display === 'block') {
+        const l = parseFloat(sel.style.left), t = parseFloat(sel.style.top);
+        const w = parseFloat(sel.style.width), h = parseFloat(sel.style.height);
+        if (w >= 4 && h >= 4) api.submit(mapRect(l, t, w, h));
+      }
+    });
+  })();`;
+}
+
+export function pickScreenRegion(): Promise<string | null> {
+  if (pickInProgress) return Promise.resolve(null);
+  pickInProgress = true;
+
+  return new Promise((resolve) => {
+    const display = screen.getDisplayNearestPoint(screen.getCursorScreenPoint());
+    let settled = false;
+    let overlay: BrowserWindow | null = null;
+    /** webContents for listener removal after `BrowserWindow` may already be destroyed. */
+    let overlayWc: Electron.WebContents | null = null;
+
+    const cleanupListeners = () => {
+      const wc = overlayWc;
+      overlayWc = null;
+      if (!wc || wc.isDestroyed()) return;
+      wc.removeListener('before-input-event', onBeforeInput);
+      wc.ipc.removeListener(IPC_CHANNELS.SCREEN_REGION_SUBMIT, onSubmit);
+      wc.ipc.removeListener(IPC_CHANNELS.SCREEN_REGION_CANCEL, onCancel);
+    };
+
+    const finish = (result: string | null) => {
+      if (settled) return;
+      settled = true;
+      pickInProgress = false;
+      cleanupListeners();
+      if (overlay && !overlay.isDestroyed()) {
+        overlay.removeAllListeners('closed');
+        overlay.close();
+      }
+      overlay = null;
+      resolve(result);
+    };
+
+    let snapshot: { dataUrl: string; width: number; height: number } | null = null;
+
+    const onSubmit = (
+      _event: Electron.IpcMainEvent,
+      rect: { x: number; y: number; width: number; height: number }
+    ) => {
+      if (settled || !overlay || overlay.isDestroyed()) return;
+      if (!rect || rect.width < 1 || rect.height < 1) {
+        finish(null);
+        return;
+      }
+      if (!snapshot) {
+        finish(null);
+        return;
+      }
+      try {
+        const full = nativeImage.createFromDataURL(snapshot.dataUrl);
+        const cropped = full.crop({
+          x: Math.floor(rect.x),
+          y: Math.floor(rect.y),
+          width: Math.floor(rect.width),
+          height: Math.floor(rect.height),
+        });
+        finish(cropped.toDataURL());
+      } catch {
+        finish(null);
+      }
+    };
+
+    const onCancel = (_event: Electron.IpcMainEvent) => {
+      if (settled || !overlay || overlay.isDestroyed()) return;
+      finish(null);
+    };
+
+    const onBeforeInput = (_event: Electron.Event, input: Electron.Input) => {
+      if (input.type === 'keyDown' && input.key === 'Escape') {
+        finish(null);
+      }
+    };
+
+    void captureDisplayDataUrl(display)
+      .then((cap) => {
+        if (!cap) {
+          finish(null);
+          return;
+        }
+        snapshot = cap;
+
+        overlay = new BrowserWindow({
+          x: display.bounds.x,
+          y: display.bounds.y,
+          width: display.bounds.width,
+          height: display.bounds.height,
+          frame: false,
+          transparent: true,
+          fullscreenable: false,
+          skipTaskbar: true,
+          alwaysOnTop: true,
+          focusable: true,
+          show: false,
+          autoHideMenuBar: true,
+          backgroundColor: '#00000000',
+          webPreferences: {
+            preload: path.join(__dirname, 'screen-region-preload.js'),
+            contextIsolation: true,
+            nodeIntegration: false,
+            sandbox: true,
+          },
+        });
+
+        overlayWc = overlay.webContents;
+        overlayWc.on('before-input-event', onBeforeInput);
+        overlayWc.ipc.on(IPC_CHANNELS.SCREEN_REGION_SUBMIT, onSubmit);
+        overlayWc.ipc.on(IPC_CHANNELS.SCREEN_REGION_CANCEL, onCancel);
+
+        overlay.setIgnoreMouseEvents(false);
+        overlay.loadURL(
+          'data:text/html;charset=utf-8,' +
+            encodeURIComponent('<!doctype html><html><head><meta charset="utf-8"/></head><body></body></html>')
+        );
+
+        overlay.on('closed', () => {
+          if (!settled) finish(null);
+        });
+
+        overlay.webContents.once('did-finish-load', () => {
+          if (!overlay || overlay.isDestroyed()) return;
+          overlay.webContents
+            .executeJavaScript(buildInjectScript(cap.dataUrl, cap.width, cap.height), true)
+            .then(() => {
+              overlay?.show();
+              overlay?.focus();
+            })
+            .catch(() => {
+              finish(null);
+            });
+        });
+      })
+      .catch(() => {
+        finish(null);
+      });
+  });
+}
diff --git a/surfsense_desktop/src/screen-region-preload.ts b/surfsense_desktop/src/screen-region-preload.ts
new file mode 100644
index 000000000..6eab9f162
--- /dev/null
+++ b/surfsense_desktop/src/screen-region-preload.ts
@@ -0,0 +1,11 @@
+import { contextBridge, ipcRenderer } from 'electron';
+import { IPC_CHANNELS } from './ipc/channels';
+
+contextBridge.exposeInMainWorld('surfsenseScreenRegion', {
+  submit: (rect: { x: number; y: number; width: number; height: number }) => {
+    ipcRenderer.send(IPC_CHANNELS.SCREEN_REGION_SUBMIT, rect);
+  },
+  cancel: () => {
+    ipcRenderer.send(IPC_CHANNELS.SCREEN_REGION_CANCEL);
+  },
+});

From b0810b4d47a937b890bbf8166dd94bafd9ddf7e9 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 19:14:37 +0200
Subject: [PATCH 06/31] Wire General Assist and screen capture through Electron
 IPC

---
 surfsense_desktop/src/ipc/channels.ts      |  9 +++-----
 surfsense_desktop/src/ipc/handlers.ts      |  2 --
 surfsense_desktop/src/main.ts              |  3 ---
 surfsense_desktop/src/modules/shortcuts.ts | 16 ++++++-------
 surfsense_desktop/src/modules/tray.ts      | 26 ++++++++--------------
 surfsense_desktop/src/modules/window.ts    | 13 +++++++++++
 surfsense_desktop/src/preload.ts           | 20 ++++++-----------
 7 files changed, 40 insertions(+), 49 deletions(-)

diff --git a/surfsense_desktop/src/ipc/channels.ts b/surfsense_desktop/src/ipc/channels.ts
index ccd166899..69fb89419 100644
--- a/surfsense_desktop/src/ipc/channels.ts
+++ b/surfsense_desktop/src/ipc/channels.ts
@@ -11,12 +11,9 @@ export const IPC_CHANNELS = {
   REQUEST_ACCESSIBILITY: 'request-accessibility',
   REQUEST_SCREEN_RECORDING: 'request-screen-recording',
   RESTART_APP: 'restart-app',
-  // Autocomplete
-  AUTOCOMPLETE_CONTEXT: 'autocomplete-context',
-  ACCEPT_SUGGESTION: 'accept-suggestion',
-  DISMISS_SUGGESTION: 'dismiss-suggestion',
-  SET_AUTOCOMPLETE_ENABLED: 'set-autocomplete-enabled',
-  GET_AUTOCOMPLETE_ENABLED: 'get-autocomplete-enabled',
+  SCREEN_REGION_SUBMIT: 'screen-region:submit',
+  SCREEN_REGION_CANCEL: 'screen-region:cancel',
+  CHAT_SCREEN_CAPTURE: 'chat:screen-capture',
   // Folder sync channels
   FOLDER_SYNC_SELECT_FOLDER: 'folder-sync:select-folder',
   FOLDER_SYNC_ADD_FOLDER: 'folder-sync:add-folder',
diff --git a/surfsense_desktop/src/ipc/handlers.ts b/surfsense_desktop/src/ipc/handlers.ts
index 54882f4ee..5f55dccf6 100644
--- a/surfsense_desktop/src/ipc/handlers.ts
+++ b/surfsense_desktop/src/ipc/handlers.ts
@@ -27,7 +27,6 @@ import { getShortcuts, setShortcuts, type ShortcutConfig } from '../modules/shor
 import { getAutoLaunchState, setAutoLaunch } from '../modules/auto-launch';
 import { getActiveSearchSpaceId, setActiveSearchSpaceId } from '../modules/active-search-space';
 import { reregisterQuickAsk } from '../modules/quick-ask';
-import { reregisterAutocomplete } from '../modules/autocomplete';
 import { reregisterGeneralAssist } from '../modules/tray';
 import {
   getDistinctId,
@@ -184,7 +183,6 @@ export function registerIpcHandlers(): void {
     const updated = await setShortcuts(config);
     if (config.generalAssist) await reregisterGeneralAssist();
     if (config.quickAsk) await reregisterQuickAsk();
-    if (config.autocomplete) await reregisterAutocomplete();
     trackEvent('desktop_shortcut_updated', {
       keys: Object.keys(config),
     });
diff --git a/surfsense_desktop/src/main.ts b/surfsense_desktop/src/main.ts
index 399144bed..492c61f17 100644
--- a/surfsense_desktop/src/main.ts
+++ b/surfsense_desktop/src/main.ts
@@ -7,7 +7,6 @@ import { setupDeepLinks, handlePendingDeepLink, hasPendingDeepLink } from './mod
 import { setupAutoUpdater } from './modules/auto-updater';
 import { setupMenu } from './modules/menu';
 import { registerQuickAsk, unregisterQuickAsk } from './modules/quick-ask';
-import { registerAutocomplete, unregisterAutocomplete } from './modules/autocomplete';
 import { registerFolderWatcher, unregisterFolderWatcher } from './modules/folder-watcher';
 import { registerIpcHandlers } from './ipc/handlers';
 import { createTray, destroyTray } from './modules/tray';
@@ -60,7 +59,6 @@ app.whenReady().then(async () => {
   }
 
   await registerQuickAsk();
-  await registerAutocomplete();
   registerFolderWatcher();
   setupAutoUpdater();
 
@@ -94,7 +92,6 @@ app.on('will-quit', async (e) => {
   didCleanup = true;
   e.preventDefault();
   unregisterQuickAsk();
-  unregisterAutocomplete();
   unregisterFolderWatcher();
   destroyTray();
   await shutdownAnalytics();
diff --git a/surfsense_desktop/src/modules/shortcuts.ts b/surfsense_desktop/src/modules/shortcuts.ts
index 6948a005e..0b122a2a2 100644
--- a/surfsense_desktop/src/modules/shortcuts.ts
+++ b/surfsense_desktop/src/modules/shortcuts.ts
@@ -1,13 +1,11 @@
 export interface ShortcutConfig {
   generalAssist: string;
   quickAsk: string;
-  autocomplete: string;
 }
 
 const DEFAULTS: ShortcutConfig = {
-  generalAssist: 'CommandOrControl+Shift+S',
-  quickAsk: 'CommandOrControl+Alt+S',
-  autocomplete: 'CommandOrControl+Shift+Space',
+  generalAssist: 'Alt+Shift+G',
+  quickAsk: 'Alt+Shift+Q',
 };
 
 const STORE_KEY = 'shortcuts';
@@ -27,14 +25,16 @@ async function getStore() {
 
 export async function getShortcuts(): Promise<ShortcutConfig> {
   const s = await getStore();
-  const stored = s.get(STORE_KEY) as Partial<ShortcutConfig> | undefined;
-  return { ...DEFAULTS, ...stored };
+  const raw = (s.get(STORE_KEY) as Record<string, string> | undefined) ?? {};
+  const { autocomplete: _drop, ...rest } = raw;
+  return { ...DEFAULTS, ...rest };
 }
 
 export async function setShortcuts(config: Partial<ShortcutConfig>): Promise<ShortcutConfig> {
   const s = await getStore();
-  const current = (s.get(STORE_KEY) as ShortcutConfig) ?? DEFAULTS;
-  const merged = { ...current, ...config };
+  const raw = (s.get(STORE_KEY) as Record<string, string> | undefined) ?? {};
+  const { autocomplete: _drop, ...current } = raw;
+  const merged = { ...DEFAULTS, ...current, ...config };
   s.set(STORE_KEY, merged);
   return merged;
 }
diff --git a/surfsense_desktop/src/modules/tray.ts b/surfsense_desktop/src/modules/tray.ts
index 88444cc54..97d6146e8 100644
--- a/surfsense_desktop/src/modules/tray.ts
+++ b/surfsense_desktop/src/modules/tray.ts
@@ -1,13 +1,14 @@
-import { app, globalShortcut, Menu, nativeImage, Tray } from 'electron';
+import { app, globalShortcut, Menu, nativeImage, Tray, type NativeImage } from 'electron';
 import path from 'path';
-import { getMainWindow, createMainWindow } from './window';
+import { runGeneralAssistShortcut } from './general-assist';
+import { showMainWindow } from './window';
 import { getShortcuts } from './shortcuts';
 import { trackEvent } from './analytics';
 
 let tray: Tray | null = null;
 let currentShortcut: string | null = null;
 
-function getTrayIcon(): nativeImage {
+function getTrayIcon(): NativeImage {
   const iconName = process.platform === 'win32' ? 'icon.ico' : 'icon.png';
   const iconPath = app.isPackaged
     ? path.join(process.resourcesPath, 'assets', iconName)
@@ -16,18 +17,6 @@ function getTrayIcon(): nativeImage {
   return img.resize({ width: 16, height: 16 });
 }
 
-function showMainWindow(source: 'tray_click' | 'tray_menu' | 'shortcut' = 'tray_click'): void {
-  const existing = getMainWindow();
-  const reopened = !existing || existing.isDestroyed();
-  if (reopened) {
-    createMainWindow('/dashboard');
-  } else {
-    existing.show();
-    existing.focus();
-  }
-  trackEvent('desktop_main_window_shown', { source, reopened });
-}
-
 function registerShortcut(accelerator: string): void {
   if (currentShortcut) {
     globalShortcut.unregister(currentShortcut);
@@ -35,11 +24,14 @@ function registerShortcut(accelerator: string): void {
   }
   if (!accelerator) return;
   try {
-    const ok = globalShortcut.register(accelerator, () => showMainWindow('shortcut'));
+    const ok = globalShortcut.register(accelerator, () => {
+      void runGeneralAssistShortcut();
+    });
     if (ok) {
       currentShortcut = accelerator;
+      console.log(`[general-assist] Register ${accelerator}: OK`);
     } else {
-      console.warn(`[tray] Failed to register General Assist shortcut: ${accelerator}`);
+      console.warn(`[general-assist] Register ${accelerator}: FAILED (OS or another app may own this chord)`);
     }
   } catch (err) {
     console.error(`[tray] Error registering General Assist shortcut:`, err);
diff --git a/surfsense_desktop/src/modules/window.ts b/surfsense_desktop/src/modules/window.ts
index c925bf947..8b7c02133 100644
--- a/surfsense_desktop/src/modules/window.ts
+++ b/surfsense_desktop/src/modules/window.ts
@@ -1,5 +1,6 @@
 import { app, BrowserWindow, shell, session } from 'electron';
 import path from 'path';
+import { trackEvent } from './analytics';
 import { showErrorDialog } from './errors';
 import { getServerPort } from './server';
 import { setActiveSearchSpaceId } from './active-search-space';
@@ -93,3 +94,15 @@ export function createMainWindow(initialPath = '/dashboard'): BrowserWindow {
 
   return mainWindow;
 }
+
+export function showMainWindow(source: 'tray_click' | 'tray_menu' | 'shortcut' = 'tray_click'): void {
+  const existing = getMainWindow();
+  const reopened = !existing || existing.isDestroyed();
+  if (reopened) {
+    createMainWindow('/dashboard');
+  } else {
+    existing.show();
+    existing.focus();
+  }
+  trackEvent('desktop_main_window_shown', { source, reopened });
+}
diff --git a/surfsense_desktop/src/preload.ts b/surfsense_desktop/src/preload.ts
index 9c538f691..087cabd75 100644
--- a/surfsense_desktop/src/preload.ts
+++ b/surfsense_desktop/src/preload.ts
@@ -17,6 +17,13 @@ contextBridge.exposeInMainWorld('electronAPI', {
       ipcRenderer.removeListener(IPC_CHANNELS.DEEP_LINK, listener);
     };
   },
+  onChatScreenCapture: (callback: (dataUrl: string) => void) => {
+    const listener = (_event: unknown, dataUrl: string) => callback(dataUrl);
+    ipcRenderer.on(IPC_CHANNELS.CHAT_SCREEN_CAPTURE, listener);
+    return () => {
+      ipcRenderer.removeListener(IPC_CHANNELS.CHAT_SCREEN_CAPTURE, listener);
+    };
+  },
   getQuickAskText: () => ipcRenderer.invoke(IPC_CHANNELS.QUICK_ASK_TEXT),
   setQuickAskMode: (mode: string) => ipcRenderer.invoke(IPC_CHANNELS.SET_QUICK_ASK_MODE, mode),
   getQuickAskMode: () => ipcRenderer.invoke(IPC_CHANNELS.GET_QUICK_ASK_MODE),
@@ -26,19 +33,6 @@ contextBridge.exposeInMainWorld('electronAPI', {
   requestAccessibility: () => ipcRenderer.invoke(IPC_CHANNELS.REQUEST_ACCESSIBILITY),
   requestScreenRecording: () => ipcRenderer.invoke(IPC_CHANNELS.REQUEST_SCREEN_RECORDING),
   restartApp: () => ipcRenderer.invoke(IPC_CHANNELS.RESTART_APP),
-  // Autocomplete
-  onAutocompleteContext: (callback: (data: { screenshot: string; searchSpaceId?: string; appName?: string; windowTitle?: string }) => void) => {
-    const listener = (_event: unknown, data: { screenshot: string; searchSpaceId?: string; appName?: string; windowTitle?: string }) => callback(data);
-    ipcRenderer.on(IPC_CHANNELS.AUTOCOMPLETE_CONTEXT, listener);
-    return () => {
-      ipcRenderer.removeListener(IPC_CHANNELS.AUTOCOMPLETE_CONTEXT, listener);
-    };
-  },
-  acceptSuggestion: (text: string) => ipcRenderer.invoke(IPC_CHANNELS.ACCEPT_SUGGESTION, text),
-  dismissSuggestion: () => ipcRenderer.invoke(IPC_CHANNELS.DISMISS_SUGGESTION),
-  setAutocompleteEnabled: (enabled: boolean) => ipcRenderer.invoke(IPC_CHANNELS.SET_AUTOCOMPLETE_ENABLED, enabled),
-  getAutocompleteEnabled: () => ipcRenderer.invoke(IPC_CHANNELS.GET_AUTOCOMPLETE_ENABLED),
-
   // Folder sync
   selectFolder: () => ipcRenderer.invoke(IPC_CHANNELS.FOLDER_SYNC_SELECT_FOLDER),
   addWatchedFolder: (config: any) => ipcRenderer.invoke(IPC_CHANNELS.FOLDER_SYNC_ADD_FOLDER, config),

From a7d3e4ff18f772c3163b54e74c6611ed1245c20b Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 19:15:02 +0200
Subject: [PATCH 07/31] Extend desktop package scripts and local dependency
 compose

---
 docker/docker-compose.deps-only.yml           | 123 ++++++++++++++++++
 surfsense_desktop/README.md                   |   5 +-
 surfsense_desktop/package.json                |   4 +-
 surfsense_desktop/scripts/electron-dev.mjs    |  24 ++++
 .../scripts/postinstall-rebuild.mjs           |  25 ++++
 5 files changed, 178 insertions(+), 3 deletions(-)
 create mode 100644 docker/docker-compose.deps-only.yml
 create mode 100644 surfsense_desktop/scripts/electron-dev.mjs
 create mode 100644 surfsense_desktop/scripts/postinstall-rebuild.mjs

diff --git a/docker/docker-compose.deps-only.yml b/docker/docker-compose.deps-only.yml
new file mode 100644
index 000000000..ee09a4d5b
--- /dev/null
+++ b/docker/docker-compose.deps-only.yml
@@ -0,0 +1,123 @@
+# =============================================================================
+# SurfSense — Dependencies only (no backend / frontend / Celery images)
+# =============================================================================
+# Postgres, Redis, SearXNG, pgAdmin, Zero — run API + Next + Celery on the host.
+# Celery is not Dockerized here: use `uv run` from surfsense_backend/ (no extra
+# backend image build just for workers).
+#
+# From repo root (SurfSense/):
+#   docker compose -f docker/docker-compose.deps-only.yml up -d
+#
+# Compose variable substitution uses `docker/.env` (copy from .env.example).
+# Bind mounts use ./postgresql.conf and ./searxng in this directory.
+#
+# Local Celery (from surfsense_backend/, after Redis is up):
+#   uv run celery -A celery_worker.celery_app worker --loglevel=info --concurrency=1 --pool=solo --queues=surfsense,surfsense.connectors
+#   uv run celery -A celery_worker.celery_app beat --loglevel=info
+#
+# Host setup:
+#   - Backend .env: DATABASE_URL=postgresql+asyncpg://postgres:postgres@localhost:5432/surfsense
+#   - Backend .env: SEARXNG_DEFAULT_HOST=http://localhost:${SEARXNG_PORT:-8888}
+#   - Backend .env: CELERY_BROKER_URL / REDIS_APP_URL → redis://localhost:6379/0
+#   - Web .env: NEXT_PUBLIC_ZERO_CACHE_URL=http://localhost:${ZERO_CACHE_PORT:-4848}
+# =============================================================================
+
+name: surfsense-deps
+
+services:
+  db:
+    image: pgvector/pgvector:pg17
+    ports:
+      - "${POSTGRES_PORT:-5432}:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+      - ./postgresql.conf:/etc/postgresql/postgresql.conf:ro
+    environment:
+      - POSTGRES_USER=${DB_USER:-postgres}
+      - POSTGRES_PASSWORD=${DB_PASSWORD:-postgres}
+      - POSTGRES_DB=${DB_NAME:-surfsense}
+    command: postgres -c config_file=/etc/postgresql/postgresql.conf
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U ${DB_USER:-postgres} -d ${DB_NAME:-surfsense}"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  pgadmin:
+    image: dpage/pgadmin4
+    ports:
+      - "${PGADMIN_PORT:-5050}:80"
+    environment:
+      - PGADMIN_DEFAULT_EMAIL=${PGADMIN_DEFAULT_EMAIL:-admin@surfsense.com}
+      - PGADMIN_DEFAULT_PASSWORD=${PGADMIN_DEFAULT_PASSWORD:-surfsense}
+    volumes:
+      - pgadmin_data:/var/lib/pgadmin
+    depends_on:
+      - db
+
+  redis:
+    image: redis:8-alpine
+    ports:
+      - "${REDIS_PORT:-6379}:6379"
+    volumes:
+      - redis_data:/data
+    command: redis-server --appendonly yes
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  searxng:
+    image: searxng/searxng:2026.3.13-3c1f68c59
+    ports:
+      - "${SEARXNG_PORT:-8888}:8080"
+    volumes:
+      - ./searxng:/etc/searxng
+    environment:
+      - SEARXNG_SECRET=${SEARXNG_SECRET:-surfsense-searxng-secret}
+    healthcheck:
+      test: ["CMD", "wget", "--spider", "-q", "http://localhost:8080/healthz"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+  zero-cache:
+    image: rocicorp/zero:0.26.2
+    ports:
+      - "${ZERO_CACHE_PORT:-4848}:4848"
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
+    depends_on:
+      db:
+        condition: service_healthy
+    environment:
+      - ZERO_UPSTREAM_DB=postgresql://${DB_USER:-postgres}:${DB_PASSWORD:-postgres}@db:5432/${DB_NAME:-surfsense}?sslmode=${DB_SSLMODE:-disable}
+      - ZERO_CVR_DB=postgresql://${DB_USER:-postgres}:${DB_PASSWORD:-postgres}@db:5432/${DB_NAME:-surfsense}?sslmode=${DB_SSLMODE:-disable}
+      - ZERO_CHANGE_DB=postgresql://${DB_USER:-postgres}:${DB_PASSWORD:-postgres}@db:5432/${DB_NAME:-surfsense}?sslmode=${DB_SSLMODE:-disable}
+      - ZERO_REPLICA_FILE=/data/zero.db
+      - ZERO_ADMIN_PASSWORD=${ZERO_ADMIN_PASSWORD:-surfsense-zero-admin}
+      - ZERO_APP_PUBLICATIONS=${ZERO_APP_PUBLICATIONS:-zero_publication}
+      - ZERO_NUM_SYNC_WORKERS=${ZERO_NUM_SYNC_WORKERS:-4}
+      - ZERO_UPSTREAM_MAX_CONNS=${ZERO_UPSTREAM_MAX_CONNS:-20}
+      - ZERO_CVR_MAX_CONNS=${ZERO_CVR_MAX_CONNS:-30}
+      - ZERO_QUERY_URL=${ZERO_QUERY_URL:-http://host.docker.internal:3000/api/zero/query}
+      - ZERO_MUTATE_URL=${ZERO_MUTATE_URL:-http://host.docker.internal:3000/api/zero/mutate}
+    volumes:
+      - zero_cache_data:/data
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost:4848/keepalive"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
+volumes:
+  postgres_data:
+    name: surfsense-deps-postgres
+  pgadmin_data:
+    name: surfsense-deps-pgadmin
+  redis_data:
+    name: surfsense-deps-redis
+  zero_cache_data:
+    name: surfsense-deps-zero-cache
diff --git a/surfsense_desktop/README.md b/surfsense_desktop/README.md
index 80efefba8..0f7a99e93 100644
--- a/surfsense_desktop/README.md
+++ b/surfsense_desktop/README.md
@@ -17,6 +17,8 @@ pnpm dev
 
 This starts the Next.js dev server and Electron concurrently. Hot reload works — edit the web app and changes appear immediately.
 
+On **Linux**, `pnpm dev` runs Electron through `scripts/electron-dev.mjs`: it sets `ELECTRON_DISABLE_SANDBOX=1` for the sandbox issue and passes **`--ozone-platform=x11`** (XWayland) unless **`SURFSENSE_ELECTRON_WAYLAND=1`** is set, so dev tends to behave closer to X11 for shortcuts and Ozone. Packaged Linux builds are unchanged.
+
 ## Configuration
 
 Two `.env` files control the build:
@@ -43,12 +45,13 @@ cd ../surfsense_desktop
 pnpm build
 ```
 
-**Step 3** — Package into a distributable:
+**Step 3** — Package into a distributable (after steps 1–2):
 
 ```bash
 pnpm dist:mac      # macOS (.dmg + .zip)
 pnpm dist:win      # Windows (.exe)
 pnpm dist:linux    # Linux (.deb + .AppImage)
+pnpm pack:dir      # optional: unpacked app only → release/… (run that binary yourself)
 ```
 
 **Step 4** — Find the output:
diff --git a/surfsense_desktop/package.json b/surfsense_desktop/package.json
index 638fd3ffc..7f787c373 100644
--- a/surfsense_desktop/package.json
+++ b/surfsense_desktop/package.json
@@ -4,7 +4,7 @@
   "description": "SurfSense Desktop App",
   "main": "dist/main.js",
   "scripts": {
-    "dev": "pnpm build && concurrently -k \"pnpm --dir ../surfsense_web dev\" \"wait-on http://localhost:3000 && electron .\"",
+    "dev": "pnpm build && concurrently -k \"pnpm --dir ../surfsense_web dev\" \"wait-on http://localhost:3000 && node scripts/electron-dev.mjs\"",
     "build": "node scripts/build-electron.mjs",
     "pack:dir": "pnpm build && electron-builder --dir --config electron-builder.yml",
     "dist": "pnpm build && electron-builder --config electron-builder.yml",
@@ -12,7 +12,7 @@
     "dist:win": "pnpm build && electron-builder --win --config electron-builder.yml",
     "dist:linux": "pnpm build && electron-builder --linux --config electron-builder.yml",
     "typecheck": "tsc --noEmit",
-    "postinstall": "electron-rebuild"
+    "postinstall": "node scripts/postinstall-rebuild.mjs"
   },
   "homepage": "https://github.com/MODSetter/SurfSense",
   "author": {
diff --git a/surfsense_desktop/scripts/electron-dev.mjs b/surfsense_desktop/scripts/electron-dev.mjs
new file mode 100644
index 000000000..64be03211
--- /dev/null
+++ b/surfsense_desktop/scripts/electron-dev.mjs
@@ -0,0 +1,24 @@
+/**
+ * Linux dev: (1) ELECTRON_DISABLE_SANDBOX before start — setuid chrome-sandbox in node_modules.
+ * (2) --ozone-platform=x11 — use X11 via XWayland so global shortcuts / GPU warnings match many
+ *     Linux Electron setups better than native Wayland. Set SURFSENSE_ELECTRON_WAYLAND=1 to skip (2).
+ * Packaged apps are not launched through this script.
+ */
+import { spawnSync } from 'child_process';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+
+const root = join(dirname(fileURLToPath(import.meta.url)), '..');
+const cli = join(root, 'node_modules', 'electron', 'cli.js');
+
+const env = { ...process.env };
+const args = [cli, '.'];
+if (process.platform === 'linux') {
+  env.ELECTRON_DISABLE_SANDBOX = '1';
+  if (env.SURFSENSE_ELECTRON_WAYLAND !== '1') {
+    args.push('--ozone-platform=x11');
+  }
+}
+
+const r = spawnSync(process.execPath, args, { cwd: root, env, stdio: 'inherit' });
+process.exit(r.status === null ? 1 : r.status ?? 0);
diff --git a/surfsense_desktop/scripts/postinstall-rebuild.mjs b/surfsense_desktop/scripts/postinstall-rebuild.mjs
new file mode 100644
index 000000000..d1cfd0732
--- /dev/null
+++ b/surfsense_desktop/scripts/postinstall-rebuild.mjs
@@ -0,0 +1,25 @@
+/**
+ * node-mac-permissions is macOS-only; electron-rebuild would still compile it on Linux/Windows
+ * (missing `make`, wrong platform). We skip rebuild there.
+ */
+import { existsSync } from 'fs';
+import { spawnSync } from 'child_process';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+
+const root = join(dirname(fileURLToPath(import.meta.url)), '..');
+
+if (process.platform !== 'darwin') {
+  console.log('[surfsense-desktop] Skipping electron-rebuild on non-macOS (native permissions module is darwin-only).');
+  process.exit(0);
+}
+
+const bin = join(root, 'node_modules', '.bin', 'electron-rebuild');
+
+if (!existsSync(bin)) {
+  console.warn('[surfsense-desktop] electron-rebuild not found in node_modules/.bin, skipping.');
+  process.exit(0);
+}
+
+const result = spawnSync(bin, [], { cwd: root, stdio: 'inherit' });
+process.exit(result.status === null ? 1 : result.status);

From 3f97b77ab64976118cb6c8881178d1c6d6baddb1 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 19:17:43 +0200
Subject: [PATCH 08/31] Support multimodal chat with pending screen images on
 web

---
 .../[search_space_id]/client-layout.tsx       |  10 ++
 .../new-chat/[[...chat_id]]/page.tsx          |  73 ++++++-----
 .../atoms/chat/pending-user-images.atom.ts    |   3 +
 .../components/assistant-ui/thread.tsx        |  58 ++++++++-
 .../lib/chat/display-media-capture.ts         | 120 ++++++++++++++++++
 surfsense_web/lib/chat/user-turn-api-parts.ts |  57 +++++++++
 6 files changed, 285 insertions(+), 36 deletions(-)
 create mode 100644 surfsense_web/atoms/chat/pending-user-images.atom.ts
 create mode 100644 surfsense_web/lib/chat/display-media-capture.ts
 create mode 100644 surfsense_web/lib/chat/user-turn-api-parts.ts

diff --git a/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx b/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx
index eceb46231..d95aab6e8 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/client-layout.tsx
@@ -6,6 +6,7 @@ import { useTranslations } from "next-intl";
 import type React from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
+import { pendingUserImageDataUrlsAtom } from "@/atoms/chat/pending-user-images.atom";
 import { myAccessAtom } from "@/atoms/members/members-query.atoms";
 import { updateLLMPreferencesMutationAtom } from "@/atoms/new-llm-config/new-llm-config-mutation.atoms";
 import {
@@ -33,6 +34,7 @@ export function DashboardClientLayout({
 	const pathname = usePathname();
 	const { search_space_id } = useParams();
 	const setActiveSearchSpaceIdState = useSetAtom(activeSearchSpaceIdAtom);
+	const setPendingUserImageUrls = useSetAtom(pendingUserImageDataUrlsAtom);
 
 	const {
 		data: preferences = {},
@@ -142,6 +144,14 @@ export function DashboardClientLayout({
 
 	const electronAPI = useElectronAPI();
 
+	useEffect(() => {
+		if (!electronAPI?.onChatScreenCapture) return;
+		return electronAPI.onChatScreenCapture((dataUrl: string) => {
+			if (typeof dataUrl !== "string" || !dataUrl.startsWith("data:image/")) return;
+			setPendingUserImageUrls((prev) => [...prev, dataUrl]);
+		});
+	}, [electronAPI, setPendingUserImageUrls]);
+
 	useEffect(() => {
 		const activeSeacrhSpaceId =
 			typeof search_space_id === "string"
diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index 62332d2c4..fe23cb2c7 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -26,6 +26,7 @@ import {
 	messageDocumentsMapAtom,
 	sidebarSelectedDocumentsAtom,
 } from "@/atoms/chat/mentioned-documents.atom";
+import { pendingUserImageDataUrlsAtom } from "@/atoms/chat/pending-user-images.atom";
 import {
 	clearPlanOwnerRegistry,
 	// extractWriteTodosFromContent,
@@ -45,8 +46,8 @@ import {
 } from "@/components/assistant-ui/token-usage-context";
 import { useChatSessionStateSync } from "@/hooks/use-chat-session-state";
 import { useMessagesSync } from "@/hooks/use-messages-sync";
-import { documentsApiService } from "@/lib/apis/documents-api.service";
 import { getAgentFilesystemSelection } from "@/lib/agent-filesystem";
+import { documentsApiService } from "@/lib/apis/documents-api.service";
 import { getBearerToken } from "@/lib/auth-utils";
 import { convertToThreadMessage } from "@/lib/chat/message-utils";
 import {
@@ -76,6 +77,7 @@ import {
 	type ThreadListResponse,
 	type ThreadRecord,
 } from "@/lib/chat/thread-persistence";
+import { extractUserTurnForNewChatApi } from "@/lib/chat/user-turn-api-parts";
 import { NotFoundError } from "@/lib/error";
 import {
 	trackChatCreated,
@@ -231,6 +233,8 @@ export default function NewChatPage() {
 	const updateChatTabTitle = useSetAtom(updateChatTabTitleAtom);
 	const removeChatTab = useSetAtom(removeChatTabAtom);
 	const setAgentCreatedDocuments = useSetAtom(agentCreatedDocumentsAtom);
+	const pendingUserImageUrls = useAtomValue(pendingUserImageDataUrlsAtom);
+	const setPendingUserImageUrls = useSetAtom(pendingUserImageDataUrlsAtom);
 
 	// Get current user for author info in shared chats
 	const { data: currentUser } = useAtomValue(currentUserAtom);
@@ -494,18 +498,13 @@ export default function NewChatPage() {
 				abortControllerRef.current = null;
 			}
 
-			// Extract user query text from content parts
-			let userQuery = "";
-			for (const part of message.content) {
-				if (part.type === "text") {
-					userQuery += part.text;
-				}
-			}
+			const urlsSnapshot = [...pendingUserImageUrls];
+			setPendingUserImageUrls([]);
+			const { userQuery, userImages } = extractUserTurnForNewChatApi(message, urlsSnapshot);
 
-			if (!userQuery.trim()) return;
+			if (!userQuery.trim() && userImages.length === 0) return;
 
-			// Check if podcast is already generating
-			if (isPodcastGenerating() && looksLikePodcastRequest(userQuery)) {
+			if (userQuery.trim() && isPodcastGenerating() && looksLikePodcastRequest(userQuery)) {
 				toast.warning("A podcast is already being generated.");
 				return;
 			}
@@ -560,10 +559,27 @@ export default function NewChatPage() {
 					}
 				: undefined;
 
+			const existingImageUrls = new Set(
+				message.content
+					.filter(
+						(p): p is { type: "image"; image: string } =>
+							typeof p === "object" &&
+							p !== null &&
+							"type" in p &&
+							p.type === "image" &&
+							"image" in p
+					)
+					.map((p) => p.image)
+			);
+			const extraImageParts = urlsSnapshot
+				.filter((u) => !existingImageUrls.has(u))
+				.map((image) => ({ type: "image" as const, image }));
+			const userDisplayContent = [...message.content, ...extraImageParts];
+
 			const userMessage: ThreadMessageLike = {
 				id: userMsgId,
 				role: "user",
-				content: message.content,
+				content: userDisplayContent,
 				createdAt: new Date(),
 				metadata: authorMetadata,
 			};
@@ -571,7 +587,7 @@ export default function NewChatPage() {
 
 			// Track message sent
 			trackChatMessageSent(searchSpaceId, currentThreadId, {
-				hasAttachments: false,
+				hasAttachments: userImages.length > 0,
 				hasMentionedDocuments:
 					mentionedDocumentIds.surfsense_doc_ids.length > 0 ||
 					mentionedDocumentIds.document_ids.length > 0,
@@ -596,7 +612,7 @@ export default function NewChatPage() {
 				}));
 			}
 
-			const persistContent: unknown[] = [...message.content];
+			const persistContent: unknown[] = [...userDisplayContent];
 
 			if (allMentionedDocs.length > 0) {
 				persistContent.push({
@@ -661,8 +677,7 @@ export default function NewChatPage() {
 				const selection = await getAgentFilesystemSelection();
 				if (
 					selection.filesystem_mode === "desktop_local_folder" &&
-					(!selection.local_filesystem_mounts ||
-						selection.local_filesystem_mounts.length === 0)
+					(!selection.local_filesystem_mounts || selection.local_filesystem_mounts.length === 0)
 				) {
 					toast.error("Select a local folder before using Local Folder mode.");
 					return;
@@ -711,6 +726,7 @@ export default function NewChatPage() {
 							? mentionedDocumentIds.surfsense_doc_ids
 							: undefined,
 						disabled_tools: disabledTools.length > 0 ? disabledTools : undefined,
+						...(userImages.length > 0 ? { user_images: userImages } : {}),
 					}),
 					signal: controller.signal,
 				});
@@ -842,14 +858,7 @@ export default function NewChatPage() {
 									});
 								} else {
 									const tcId = `interrupt-${action.name}`;
-									addToolCall(
-										contentPartsState,
-										toolsWithUI,
-										tcId,
-										action.name,
-										action.args,
-										true
-									);
+									addToolCall(contentPartsState, toolsWithUI, tcId, action.name, action.args, true);
 									updateToolCall(contentPartsState, tcId, {
 										result: { __interrupt__: true, ...interruptData },
 									});
@@ -989,6 +998,9 @@ export default function NewChatPage() {
 			disabledTools,
 			updateChatTabTitle,
 			tokenUsageStore,
+			pendingUserImageUrls,
+			setPendingUserImageUrls,
+			toolsWithUI,
 		]
 	);
 
@@ -1189,14 +1201,7 @@ export default function NewChatPage() {
 									});
 								} else {
 									const tcId = `interrupt-${action.name}`;
-									addToolCall(
-										contentPartsState,
-										toolsWithUI,
-										tcId,
-										action.name,
-										action.args,
-										true
-									);
+									addToolCall(contentPartsState, toolsWithUI, tcId, action.name, action.args, true);
 									updateToolCall(contentPartsState, tcId, {
 										result: {
 											__interrupt__: true,
@@ -1261,7 +1266,7 @@ export default function NewChatPage() {
 				abortControllerRef.current = null;
 			}
 		},
-		[pendingInterrupt, messages, searchSpaceId, tokenUsageStore]
+		[pendingInterrupt, messages, searchSpaceId, tokenUsageStore, toolsWithUI]
 	);
 
 	useEffect(() => {
@@ -1588,7 +1593,7 @@ export default function NewChatPage() {
 				abortControllerRef.current = null;
 			}
 		},
-		[threadId, searchSpaceId, messages, disabledTools, tokenUsageStore]
+		[threadId, searchSpaceId, messages, disabledTools, tokenUsageStore, toolsWithUI]
 	);
 
 	// Handle editing a message - truncates history and regenerates with new query
diff --git a/surfsense_web/atoms/chat/pending-user-images.atom.ts b/surfsense_web/atoms/chat/pending-user-images.atom.ts
new file mode 100644
index 000000000..6898e745d
--- /dev/null
+++ b/surfsense_web/atoms/chat/pending-user-images.atom.ts
@@ -0,0 +1,3 @@
+import { atom } from "jotai";
+
+export const pendingUserImageDataUrlsAtom = atom<string[]>([]);
diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 2ec422fbf..6862662f2 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -16,6 +16,7 @@ import {
 	ChevronUp,
 	Clipboard,
 	Dot,
+	Camera,
 	Globe,
 	Plus,
 	Settings2,
@@ -40,6 +41,7 @@ import {
 	mentionedDocumentsAtom,
 	sidebarSelectedDocumentsAtom,
 } from "@/atoms/chat/mentioned-documents.atom";
+import { pendingUserImageDataUrlsAtom } from "@/atoms/chat/pending-user-images.atom";
 import { connectorDialogOpenAtom } from "@/atoms/connector-dialog/connector-dialog.atoms";
 import { connectorsAtom } from "@/atoms/connectors/connector-query.atoms";
 import { documentsSidebarOpenAtom } from "@/atoms/documents/ui.atoms";
@@ -89,6 +91,7 @@ import { useBatchCommentsPreload } from "@/hooks/use-comments";
 import { useCommentsSync } from "@/hooks/use-comments-sync";
 import { useMediaQuery } from "@/hooks/use-media-query";
 import { useElectronAPI } from "@/hooks/use-platform";
+import { captureDisplayToPngDataUrl } from "@/lib/chat/display-media-capture";
 import { SLIDEOUT_PANEL_OPENED_EVENT } from "@/lib/layout-events";
 import { cn } from "@/lib/utils";
 
@@ -295,6 +298,32 @@ const ConnectToolsBanner: FC<{ isThreadEmpty: boolean }> = ({ isThreadEmpty }) =
 	);
 };
 
+const PendingScreenImageStrip: FC = () => {
+	const [urls, setUrls] = useAtom(pendingUserImageDataUrlsAtom);
+	if (urls.length === 0) return null;
+	return (
+		<div className="mx-3 mt-2 flex flex-wrap gap-2">
+			{urls.map((url, index) => (
+				<div
+					key={url}
+					className="group relative h-14 w-14 shrink-0 overflow-hidden rounded-md border border-border/50 bg-muted"
+				>
+					{/* biome-ignore lint/performance/noImgElement: data URL thumbnails from capture */}
+					<img src={url} alt="" className="size-full object-cover" draggable={false} />
+					<button
+						type="button"
+						onClick={() => setUrls((prev) => prev.filter((_, i) => i !== index))}
+						className="absolute right-0.5 top-0.5 flex size-5 items-center justify-center rounded-full bg-background/90 text-muted-foreground shadow-sm transition-opacity hover:text-foreground sm:opacity-0 sm:group-hover:opacity-100"
+						aria-label="Remove screenshot"
+					>
+						<X className="size-3" />
+					</button>
+				</div>
+			))}
+		</div>
+	);
+};
+
 const ClipboardChip: FC<{ text: string; onDismiss: () => void }> = ({ text, onDismiss }) => {
 	const [expanded, setExpanded] = useState(false);
 	const isLong = text.length > 120;
@@ -702,6 +731,7 @@ const Composer: FC = () => {
 				</div>
 			)}
 			<div className="aui-composer-attachment-dropzone flex w-full flex-col overflow-hidden rounded-2xl border-input bg-muted pt-2 outline-none transition-shadow">
+				<PendingScreenImageStrip />
 				{clipboardInitialText && (
 					<ClipboardChip
 						text={clipboardInitialText}
@@ -761,11 +791,21 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 		},
 		[]
 	);
+	const pendingScreenImages = useAtomValue(pendingUserImageDataUrlsAtom);
+	const setPendingScreenImages = useSetAtom(pendingUserImageDataUrlsAtom);
+	const electronAPI = useElectronAPI();
+
 	const isComposerTextEmpty = useAuiState(({ composer }) => {
 		const text = composer.text?.trim() || "";
 		return text.length === 0;
 	});
-	const isComposerEmpty = isComposerTextEmpty && mentionedDocuments.length === 0;
+	const isComposerEmpty =
+		isComposerTextEmpty && mentionedDocuments.length === 0 && pendingScreenImages.length === 0;
+
+	const handleScreenCapture = useCallback(async () => {
+		const url = await captureDisplayToPngDataUrl();
+		if (url) setPendingScreenImages((prev) => [...prev, url]);
+	}, [setPendingScreenImages]);
 
 	const { data: userConfigs } = useAtomValue(newLLMConfigsAtom);
 	const { data: globalConfigs } = useAtomValue(globalNewLLMConfigsAtom);
@@ -1201,6 +1241,20 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 				</div>
 			)}
 			<div className="flex items-center gap-2">
+				{/* Electron: native shortcut → pending images; skip in-webview getDisplayMedia. */}
+				{!electronAPI && (
+					<TooltipIconButton
+						tooltip="Capture screen"
+						type="button"
+						variant="ghost"
+						size="icon"
+						className="size-8 rounded-full"
+						aria-label="Capture screen"
+						onClick={() => void handleScreenCapture()}
+					>
+						<Camera className="size-4" />
+					</TooltipIconButton>
+				)}
 				<AuiIf condition={({ thread }) => !thread.isRunning}>
 					<ComposerPrimitive.Send asChild disabled={isSendDisabled}>
 						<TooltipIconButton
@@ -1210,7 +1264,7 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 									: !hasModelConfigured
 										? "Please select a model from the header to start chatting"
 										: isComposerEmpty
-											? "Enter a message to send"
+											? "Enter a message or add a screenshot to send"
 											: "Send message"
 							}
 							side="bottom"
diff --git a/surfsense_web/lib/chat/display-media-capture.ts b/surfsense_web/lib/chat/display-media-capture.ts
new file mode 100644
index 000000000..c2fb69aae
--- /dev/null
+++ b/surfsense_web/lib/chat/display-media-capture.ts
@@ -0,0 +1,120 @@
+/** `getDisplayMedia` → single PNG frame (data URL). */
+function getImageCaptureCtor():
+	| (new (
+			track: MediaStreamTrack
+	  ) => { grabFrame: () => Promise<ImageBitmap> })
+	| undefined {
+	if (typeof window === "undefined") return undefined;
+	const IC = (
+		window as unknown as {
+			ImageCapture?: new (track: MediaStreamTrack) => { grabFrame: () => Promise<ImageBitmap> };
+		}
+	).ImageCapture;
+	return typeof IC === "function" ? IC : undefined;
+}
+
+function stopAllTracks(stream: MediaStream): void {
+	for (const t of stream.getTracks()) {
+		t.stop();
+	}
+}
+
+async function captureTrackToPngDataUrl(
+	track: MediaStreamTrack,
+	stream: MediaStream
+): Promise<string | null> {
+	const ImageCtor = getImageCaptureCtor();
+	if (ImageCtor !== undefined) {
+		try {
+			const ic = new ImageCtor(track);
+			const bitmap = await ic.grabFrame();
+			try {
+				const canvas = document.createElement("canvas");
+				canvas.width = bitmap.width;
+				canvas.height = bitmap.height;
+				const ctx = canvas.getContext("2d");
+				if (!ctx) {
+					stopAllTracks(stream);
+					return null;
+				}
+				ctx.drawImage(bitmap, 0, 0);
+				stopAllTracks(stream);
+				return canvas.toDataURL("image/png");
+			} finally {
+				if ("close" in bitmap && typeof bitmap.close === "function") {
+					bitmap.close();
+				}
+			}
+		} catch {
+			/* fall through to <video> */
+		}
+	}
+
+	const videoEl = document.createElement("video");
+	videoEl.srcObject = stream;
+	videoEl.muted = true;
+	const haveCurrentData = 2;
+	const dataReady = new Promise<void>((resolve) => {
+		if (videoEl.readyState >= haveCurrentData) {
+			resolve();
+			return;
+		}
+		videoEl.addEventListener("loadeddata", () => resolve(), { once: true });
+	});
+	await videoEl.play();
+	await Promise.race([
+		dataReady,
+		new Promise<void>((resolve) => {
+			setTimeout(resolve, 500);
+		}),
+	]);
+	const w = videoEl.videoWidth;
+	const h = videoEl.videoHeight;
+	if (!w || !h) {
+		stopAllTracks(stream);
+		return null;
+	}
+	const canvas = document.createElement("canvas");
+	canvas.width = w;
+	canvas.height = h;
+	const ctx = canvas.getContext("2d");
+	if (!ctx) {
+		stopAllTracks(stream);
+		return null;
+	}
+	ctx.drawImage(videoEl, 0, 0);
+	stopAllTracks(stream);
+	return canvas.toDataURL("image/png");
+}
+
+export async function captureDisplayToPngDataUrl(): Promise<string | null> {
+	if (typeof navigator === "undefined" || !navigator.mediaDevices?.getDisplayMedia) {
+		return null;
+	}
+	let stream: MediaStream | null = null;
+	try {
+		stream = await navigator.mediaDevices.getDisplayMedia({
+			video: { frameRate: { ideal: 1, max: 5 } },
+			audio: false,
+			selfBrowserSurface: "exclude",
+		} as Parameters<MediaDevices["getDisplayMedia"]>[0]);
+
+		const track = stream.getVideoTracks()[0];
+		if (!track) {
+			stopAllTracks(stream);
+			return null;
+		}
+
+		const dataUrl = await captureTrackToPngDataUrl(track, stream);
+		stream = null;
+		return dataUrl;
+	} catch (e) {
+		if (typeof process !== "undefined" && process.env?.NODE_ENV !== "production") {
+			console.warn("[captureDisplayToPngDataUrl]", e);
+		}
+		if (stream) {
+			stopAllTracks(stream);
+		}
+		return null;
+	}
+}
diff --git a/surfsense_web/lib/chat/user-turn-api-parts.ts b/surfsense_web/lib/chat/user-turn-api-parts.ts
new file mode 100644
index 000000000..48d27a7ba
--- /dev/null
+++ b/surfsense_web/lib/chat/user-turn-api-parts.ts
@@ -0,0 +1,57 @@
+import type { AppendMessage } from "@assistant-ui/react";
+
+const MAX_IMAGES = 4;
+
+export type NewChatUserImagePayload = {
+	media_type: "image/png" | "image/jpeg" | "image/webp";
+	data: string;
+};
+
+function dataUrlToPayload(dataUrl: string): NewChatUserImagePayload | null {
+	const m = /^data:(image\/(?:png|jpeg|webp|jpg));base64,([\s\S]+)$/i.exec(dataUrl.trim());
+	if (!m) return null;
+	let media = m[1].toLowerCase() as string;
+	if (media === "image/jpg") media = "image/jpeg";
+	if (media !== "image/png" && media !== "image/jpeg" && media !== "image/webp") return null;
+	const data = m[2].replace(/\s/g, "");
+	if (!data) return null;
+	return { media_type: media as NewChatUserImagePayload["media_type"], data };
+}
+
+function collectImageDataUrlsFromParts(parts: AppendMessage["content"]): string[] {
+	const out: string[] = [];
+	for (const part of parts) {
+		if (typeof part !== "object" || part === null || !("type" in part)) continue;
+		if (part.type !== "image") continue;
+		const img = "image" in part && typeof part.image === "string" ? part.image : null;
+		if (img && dataUrlToPayload(img)) out.push(img);
+	}
+	return out;
+}
+
+export function extractUserTurnForNewChatApi(
+	message: AppendMessage,
+	extraDataUrls: readonly string[]
+): { userQuery: string; userImages: NewChatUserImagePayload[] } {
+	let userQuery = "";
+	for (const part of message.content) {
+		if (part.type === "text") {
+			userQuery += part.text;
+		}
+	}
+
+	const merged = [...extraDataUrls, ...collectImageDataUrlsFromParts(message.content)];
+	const payloads: NewChatUserImagePayload[] = [];
+	const seen = new Set<string>();
+	for (const url of merged) {
+		const p = dataUrlToPayload(url);
+		if (!p) continue;
+		const key = `${p.media_type}:${p.data.length}`;
+		if (seen.has(key)) continue;
+		seen.add(key);
+		payloads.push(p);
+		if (payloads.length >= MAX_IMAGES) break;
+	}
+
+	return { userQuery, userImages: payloads };
+}

From 8034f372e7722c9465e1db77bf7203e30e16fce3 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 19:18:09 +0200
Subject: [PATCH 09/31] Remove desktop suggestion UI and refresh settings
 surfaces

---
 .../components/DesktopContent.tsx             |  38 +-
 .../components/DesktopShortcutsContent.tsx    |  60 ++-
 surfsense_web/app/desktop/login/page.tsx      |  25 +-
 .../app/desktop/suggestion/layout.tsx         |   9 -
 surfsense_web/app/desktop/suggestion/page.tsx | 384 ------------------
 .../app/desktop/suggestion/suggestion.css     | 352 ----------------
 .../components/desktop/shortcut-recorder.tsx  |   5 +-
 surfsense_web/types/window.d.ts               |  25 +-
 8 files changed, 49 insertions(+), 849 deletions(-)
 delete mode 100644 surfsense_web/app/desktop/suggestion/layout.tsx
 delete mode 100644 surfsense_web/app/desktop/suggestion/page.tsx
 delete mode 100644 surfsense_web/app/desktop/suggestion/suggestion.css

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
index 9861f5536..4ce6f386c 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
@@ -20,7 +20,6 @@ import { searchSpacesApiService } from "@/lib/apis/search-spaces-api.service";
 export function DesktopContent() {
 	const api = useElectronAPI();
 	const [loading, setLoading] = useState(true);
-	const [enabled, setEnabled] = useState(true);
 
 	const [searchSpaces, setSearchSpaces] = useState<SearchSpace[]>([]);
 	const [activeSpaceId, setActiveSpaceId] = useState<string | null>(null);
@@ -41,14 +40,12 @@ export function DesktopContent() {
 		setAutoLaunchSupported(hasAutoLaunchApi);
 
 		Promise.all([
-			api.getAutocompleteEnabled(),
 			api.getActiveSearchSpace?.() ?? Promise.resolve(null),
 			searchSpacesApiService.getSearchSpaces(),
 			hasAutoLaunchApi ? api.getAutoLaunch() : Promise.resolve(null),
 		])
-			.then(([autoEnabled, spaceId, spaces, autoLaunch]) => {
+			.then(([spaceId, spaces, autoLaunch]) => {
 				if (!mounted) return;
-				setEnabled(autoEnabled);
 				setActiveSpaceId(spaceId);
 				if (spaces) setSearchSpaces(spaces);
 				if (autoLaunch) {
@@ -86,11 +83,6 @@ export function DesktopContent() {
 		);
 	}
 
-	const handleToggle = async (checked: boolean) => {
-		setEnabled(checked);
-		await api.setAutocompleteEnabled(checked);
-	};
-
 	const handleAutoLaunchToggle = async (checked: boolean) => {
 		if (!autoLaunchSupported || !api.setAutoLaunch) {
 			toast.error("Please update the desktop app to configure launch on startup");
@@ -133,13 +125,11 @@ export function DesktopContent() {
 
 	return (
 		<div className="space-y-4 md:space-y-6">
-			{/* Default Search Space */}
 			<Card>
 				<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
 					<CardTitle className="text-base md:text-lg">Default Search Space</CardTitle>
 					<CardDescription className="text-xs md:text-sm">
-						Choose which search space General Assist, Quick Assist, and Extreme Assist operate
-						against.
+						Choose which search space General Assist and Quick Assist use by default.
 					</CardDescription>
 				</CardHeader>
 				<CardContent className="px-3 md:px-6 pb-3 md:pb-6">
@@ -164,7 +154,6 @@ export function DesktopContent() {
 				</CardContent>
 			</Card>
 
-			{/* Launch on Startup */}
 			<Card>
 				<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
 					<CardTitle className="text-base md:text-lg flex items-center gap-2">
@@ -215,29 +204,6 @@ export function DesktopContent() {
 					</div>
 				</CardContent>
 			</Card>
-
-			{/* Extreme Assist Toggle */}
-			<Card>
-				<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
-					<CardTitle className="text-base md:text-lg">Extreme Assist</CardTitle>
-					<CardDescription className="text-xs md:text-sm">
-						Get inline writing suggestions powered by your knowledge base as you type in any app.
-					</CardDescription>
-				</CardHeader>
-				<CardContent className="px-3 md:px-6 pb-3 md:pb-6">
-					<div className="flex items-center justify-between rounded-lg border p-4">
-						<div className="space-y-0.5">
-							<Label htmlFor="autocomplete-toggle" className="text-sm font-medium cursor-pointer">
-								Enable Extreme Assist
-							</Label>
-							<p className="text-xs text-muted-foreground">
-								Show suggestions while typing in other applications.
-							</p>
-						</div>
-						<Switch id="autocomplete-toggle" checked={enabled} onCheckedChange={handleToggle} />
-					</div>
-				</CardContent>
-			</Card>
 		</div>
 	);
 }
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
index 6207457c4..0b7f330d9 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { BrainCog, Rocket, RotateCcw, Zap } from "lucide-react";
+import { Rocket, RotateCcw, Zap } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import { DEFAULT_SHORTCUTS, keyEventToAccelerator } from "@/components/desktop/shortcut-recorder";
@@ -9,13 +9,12 @@ import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
 import { Spinner } from "@/components/ui/spinner";
 import { useElectronAPI } from "@/hooks/use-platform";
 
-type ShortcutKey = "generalAssist" | "quickAsk" | "autocomplete";
+type ShortcutKey = "generalAssist" | "quickAsk";
 type ShortcutMap = typeof DEFAULT_SHORTCUTS;
 
 const HOTKEY_ROWS: Array<{ key: ShortcutKey; label: string; icon: React.ElementType }> = [
 	{ key: "generalAssist", label: "General Assist", icon: Rocket },
 	{ key: "quickAsk", label: "Quick Assist", icon: Zap },
-	{ key: "autocomplete", label: "Extreme Assist", icon: BrainCog },
 ];
 
 function acceleratorToKeys(accel: string, isMac: boolean): string[] {
@@ -111,9 +110,7 @@ function HotkeyRow({
 					}
 				>
 					{recording ? (
-						<span className="px-2 text-[9px] text-primary whitespace-nowrap">
-							Press hotkeys...
-						</span>
+						<span className="px-2 text-[9px] text-primary whitespace-nowrap">Press hotkeys...</span>
 					) : (
 						<ShortcutKbd keys={displayKeys} className="ml-0 px-1.5 text-foreground/85" />
 					)}
@@ -155,15 +152,14 @@ export function DesktopShortcutsContent() {
 	if (!api) {
 		return (
 			<div className="flex flex-col items-center justify-center py-12 text-center">
-				<p className="text-sm text-muted-foreground">Hotkeys are only available in the SurfSense desktop app.</p>
+				<p className="text-sm text-muted-foreground">
+					Hotkeys are only available in the SurfSense desktop app.
+				</p>
 			</div>
 		);
 	}
 
-	const updateShortcut = (
-		key: "generalAssist" | "quickAsk" | "autocomplete",
-		accelerator: string
-	) => {
+	const updateShortcut = (key: ShortcutKey, accelerator: string) => {
 		setShortcuts((prev) => {
 			const updated = { ...prev, [key]: accelerator };
 			api.setShortcuts?.({ [key]: accelerator }).catch(() => {
@@ -178,28 +174,26 @@ export function DesktopShortcutsContent() {
 		updateShortcut(key, DEFAULT_SHORTCUTS[key]);
 	};
 
-	return (
-		shortcutsLoaded ? (
-			<div className="flex flex-col gap-3">
-				<div>
-					{HOTKEY_ROWS.map((row) => (
-						<HotkeyRow
-							key={row.key}
-							label={row.label}
-							value={shortcuts[row.key]}
-							defaultValue={DEFAULT_SHORTCUTS[row.key]}
-							icon={row.icon}
-							isMac={isMac}
-							onChange={(accel) => updateShortcut(row.key, accel)}
-							onReset={() => resetShortcut(row.key)}
-						/>
-					))}
-				</div>
+	return shortcutsLoaded ? (
+		<div className="flex flex-col gap-3">
+			<div>
+				{HOTKEY_ROWS.map((row) => (
+					<HotkeyRow
+						key={row.key}
+						label={row.label}
+						value={shortcuts[row.key]}
+						defaultValue={DEFAULT_SHORTCUTS[row.key]}
+						icon={row.icon}
+						isMac={isMac}
+						onChange={(accel) => updateShortcut(row.key, accel)}
+						onReset={() => resetShortcut(row.key)}
+					/>
+				))}
 			</div>
-		) : (
-			<div className="flex justify-center py-4">
-				<Spinner size="sm" />
-			</div>
-		)
+		</div>
+	) : (
+		<div className="flex justify-center py-4">
+			<Spinner size="sm" />
+		</div>
 	);
 }
diff --git a/surfsense_web/app/desktop/login/page.tsx b/surfsense_web/app/desktop/login/page.tsx
index 451143949..edb6cffab 100644
--- a/surfsense_web/app/desktop/login/page.tsx
+++ b/surfsense_web/app/desktop/login/page.tsx
@@ -2,7 +2,7 @@
 
 import { IconBrandGoogleFilled } from "@tabler/icons-react";
 import { useAtom } from "jotai";
-import { BrainCog, Eye, EyeOff, Rocket, RotateCcw, Zap } from "lucide-react";
+import { Eye, EyeOff, Rocket, RotateCcw, Zap } from "lucide-react";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -21,10 +21,15 @@ import { setBearerToken } from "@/lib/auth-utils";
 import { AUTH_TYPE, BACKEND_URL } from "@/lib/env-config";
 
 const isGoogleAuth = AUTH_TYPE === "GOOGLE";
-type ShortcutKey = "generalAssist" | "quickAsk" | "autocomplete";
+type ShortcutKey = "generalAssist" | "quickAsk";
 type ShortcutMap = typeof DEFAULT_SHORTCUTS;
 
-const HOTKEY_ROWS: Array<{ key: ShortcutKey; label: string; description: string; icon: React.ElementType }> = [
+const HOTKEY_ROWS: Array<{
+	key: ShortcutKey;
+	label: string;
+	description: string;
+	icon: React.ElementType;
+}> = [
 	{
 		key: "generalAssist",
 		label: "General Assist",
@@ -37,12 +42,6 @@ const HOTKEY_ROWS: Array<{ key: ShortcutKey; label: string; description: string;
 		description: "Select text anywhere, then ask AI to explain, rewrite, or act on it",
 		icon: Zap,
 	},
-	{
-		key: "autocomplete",
-		label: "Extreme Assist",
-		description: "AI drafts text using your screen context and knowledge base",
-		icon: BrainCog,
-	},
 ];
 
 function acceleratorToKeys(accel: string, isMac: boolean): string[] {
@@ -182,7 +181,7 @@ export default function DesktopLoginPage() {
 	}, [api]);
 
 	const updateShortcut = useCallback(
-		(key: "generalAssist" | "quickAsk" | "autocomplete", accelerator: string) => {
+		(key: ShortcutKey, accelerator: string) => {
 			setShortcuts((prev) => {
 				const updated = { ...prev, [key]: accelerator };
 				api?.setShortcuts?.({ [key]: accelerator }).catch(() => {
@@ -196,7 +195,7 @@ export default function DesktopLoginPage() {
 	);
 
 	const resetShortcut = useCallback(
-		(key: "generalAssist" | "quickAsk" | "autocomplete") => {
+		(key: ShortcutKey) => {
 			updateShortcut(key, DEFAULT_SHORTCUTS[key]);
 		},
 		[updateShortcut]
@@ -369,7 +368,9 @@ export default function DesktopLoginPage() {
 
 									<Button type="submit" disabled={isLoggingIn} className="relative h-9 mt-1">
 										<span className={isLoggingIn ? "opacity-0" : ""}>Sign in</span>
-										{isLoggingIn && <Spinner size="sm" className="absolute text-primary-foreground" />}
+										{isLoggingIn && (
+											<Spinner size="sm" className="absolute text-primary-foreground" />
+										)}
 									</Button>
 								</form>
 							)}
diff --git a/surfsense_web/app/desktop/suggestion/layout.tsx b/surfsense_web/app/desktop/suggestion/layout.tsx
deleted file mode 100644
index fd8faf099..000000000
--- a/surfsense_web/app/desktop/suggestion/layout.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import "./suggestion.css";
-
-export const metadata = {
-	title: "SurfSense Suggestion",
-};
-
-export default function SuggestionLayout({ children }: { children: React.ReactNode }) {
-	return <div className="suggestion-body">{children}</div>;
-}
diff --git a/surfsense_web/app/desktop/suggestion/page.tsx b/surfsense_web/app/desktop/suggestion/page.tsx
deleted file mode 100644
index d30da65f6..000000000
--- a/surfsense_web/app/desktop/suggestion/page.tsx
+++ /dev/null
@@ -1,384 +0,0 @@
-"use client";
-
-import { useCallback, useEffect, useRef, useState } from "react";
-import { useElectronAPI } from "@/hooks/use-platform";
-import { ensureTokensFromElectron, getBearerToken } from "@/lib/auth-utils";
-
-type SSEEvent =
-	| { type: "text-delta"; id: string; delta: string }
-	| { type: "text-start"; id: string }
-	| { type: "text-end"; id: string }
-	| { type: "start"; messageId: string }
-	| { type: "finish" }
-	| { type: "error"; errorText: string }
-	| {
-			type: "data-thinking-step";
-			data: { id: string; title: string; status: string; items: string[] };
-	  }
-	| {
-			type: "data-suggestions";
-			data: { options: string[] };
-	  };
-
-interface AgentStep {
-	id: string;
-	title: string;
-	status: string;
-	items: string[];
-}
-
-type FriendlyError = { message: string; isSetup?: boolean };
-
-function friendlyError(raw: string | number): FriendlyError {
-	if (typeof raw === "number") {
-		if (raw === 401) return { message: "Please sign in to use suggestions." };
-		if (raw === 403) return { message: "You don\u2019t have permission for this." };
-		if (raw === 404) return { message: "Suggestion service not found. Is the backend running?" };
-		if (raw >= 500) return { message: "Something went wrong on the server. Try again." };
-		return { message: "Something went wrong. Try again." };
-	}
-	const lower = raw.toLowerCase();
-	if (lower.includes("not authenticated") || lower.includes("unauthorized"))
-		return { message: "Please sign in to use suggestions." };
-	if (lower.includes("no vision llm configured") || lower.includes("no llm configured"))
-		return {
-			message: "Configure a vision-capable model (e.g. GPT-4o, Gemini) to enable autocomplete.",
-			isSetup: true,
-		};
-	if (lower.includes("does not support vision"))
-		return {
-			message: "The selected model doesn\u2019t support vision. Choose a vision-capable model.",
-			isSetup: true,
-		};
-	if (lower.includes("fetch") || lower.includes("network") || lower.includes("econnrefused"))
-		return { message: "Can\u2019t reach the server. Check your connection." };
-	return { message: "Something went wrong. Try again." };
-}
-
-const AUTO_DISMISS_MS = 3000;
-
-function StepIcon({ status }: { status: string }) {
-	if (status === "complete") {
-		return (
-			<svg
-				className="step-icon step-icon-done"
-				viewBox="0 0 16 16"
-				fill="none"
-				aria-label="Step complete"
-			>
-				<circle cx="8" cy="8" r="7" stroke="#4ade80" strokeWidth="1.5" />
-				<path
-					d="M5 8.5l2 2 4-4.5"
-					stroke="#4ade80"
-					strokeWidth="1.5"
-					strokeLinecap="round"
-					strokeLinejoin="round"
-				/>
-			</svg>
-		);
-	}
-	return <span className="step-spinner" />;
-}
-
-export default function SuggestionPage() {
-	const api = useElectronAPI();
-	const [options, setOptions] = useState<string[]>([]);
-	const [isLoading, setIsLoading] = useState(true);
-	const [error, setError] = useState<FriendlyError | null>(null);
-	const [steps, setSteps] = useState<AgentStep[]>([]);
-	const [expandedOption, setExpandedOption] = useState<number | null>(null);
-	const abortRef = useRef<AbortController | null>(null);
-
-	const isDesktop = !!api?.onAutocompleteContext;
-
-	useEffect(() => {
-		if (!api?.onAutocompleteContext) {
-			setIsLoading(false);
-		}
-	}, [api]);
-
-	useEffect(() => {
-		if (!error || error.isSetup) return;
-		const timer = setTimeout(() => {
-			api?.dismissSuggestion?.();
-		}, AUTO_DISMISS_MS);
-		return () => clearTimeout(timer);
-	}, [error, api]);
-
-	useEffect(() => {
-		if (isLoading || error || options.length > 0) return;
-		const timer = setTimeout(() => {
-			api?.dismissSuggestion?.();
-		}, AUTO_DISMISS_MS);
-		return () => clearTimeout(timer);
-	}, [isLoading, error, options, api]);
-
-	const fetchSuggestion = useCallback(
-		async (screenshot: string, searchSpaceId: string, appName?: string, windowTitle?: string) => {
-			abortRef.current?.abort();
-			const controller = new AbortController();
-			abortRef.current = controller;
-
-			setIsLoading(true);
-			setOptions([]);
-			setError(null);
-			setSteps([]);
-			setExpandedOption(null);
-
-			let token = getBearerToken();
-			if (!token) {
-				await ensureTokensFromElectron();
-				token = getBearerToken();
-			}
-			if (!token) {
-				setError(friendlyError("not authenticated"));
-				setIsLoading(false);
-				return;
-			}
-
-			const backendUrl = process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL || "http://localhost:8000";
-
-			try {
-				const response = await fetch(`${backendUrl}/api/v1/autocomplete/vision/stream`, {
-					method: "POST",
-					headers: {
-						Authorization: `Bearer ${token}`,
-						"Content-Type": "application/json",
-					},
-					body: JSON.stringify({
-						screenshot,
-						search_space_id: parseInt(searchSpaceId, 10),
-						app_name: appName || "",
-						window_title: windowTitle || "",
-					}),
-					signal: controller.signal,
-				});
-
-				if (!response.ok) {
-					setError(friendlyError(response.status));
-					setIsLoading(false);
-					return;
-				}
-
-				if (!response.body) {
-					setError(friendlyError("network error"));
-					setIsLoading(false);
-					return;
-				}
-
-				const reader = response.body.getReader();
-				const decoder = new TextDecoder();
-				let buffer = "";
-
-				while (true) {
-					const { done, value } = await reader.read();
-					if (done) break;
-
-					buffer += decoder.decode(value, { stream: true });
-					const events = buffer.split(/\r?\n\r?\n/);
-					buffer = events.pop() || "";
-
-					for (const event of events) {
-						const lines = event.split(/\r?\n/);
-						for (const line of lines) {
-							if (!line.startsWith("data: ")) continue;
-							const data = line.slice(6).trim();
-							if (!data || data === "[DONE]") continue;
-
-							try {
-								const parsed: SSEEvent = JSON.parse(data);
-								if (parsed.type === "data-suggestions") {
-									setOptions(parsed.data.options);
-								} else if (parsed.type === "error") {
-									setError(friendlyError(parsed.errorText));
-								} else if (parsed.type === "data-thinking-step") {
-									const { id, title, status, items } = parsed.data;
-									setSteps((prev) => {
-										const existing = prev.findIndex((s) => s.id === id);
-										if (existing >= 0) {
-											const updated = [...prev];
-											updated[existing] = { id, title, status, items };
-											return updated;
-										}
-										return [...prev, { id, title, status, items }];
-									});
-								}
-							} catch {}
-						}
-					}
-				}
-			} catch (err) {
-				if (err instanceof DOMException && err.name === "AbortError") return;
-				setError(friendlyError("network error"));
-			} finally {
-				setIsLoading(false);
-			}
-		},
-		[]
-	);
-
-	useEffect(() => {
-		if (!api?.onAutocompleteContext) return;
-
-		const cleanup = api.onAutocompleteContext((data) => {
-			const searchSpaceId = data.searchSpaceId || "1";
-			if (data.screenshot) {
-				fetchSuggestion(data.screenshot, searchSpaceId, data.appName, data.windowTitle);
-			}
-		});
-
-		return cleanup;
-	}, [fetchSuggestion, api]);
-
-	if (!isDesktop) {
-		return (
-			<div className="suggestion-tooltip">
-				<span className="suggestion-error-text">
-					This page is only available in the SurfSense desktop app.
-				</span>
-			</div>
-		);
-	}
-
-	if (error) {
-		if (error.isSetup) {
-			return (
-				<div className="suggestion-tooltip suggestion-setup">
-					<div className="setup-icon">
-						<svg viewBox="0 0 24 24" fill="none" width="28" height="28" aria-hidden="true">
-							<path
-								d="M1 12C1 12 5 4 12 4C19 4 23 12 23 12C23 12 19 20 12 20C5 20 1 12 1 12Z"
-								stroke="#a78bfa"
-								strokeWidth="1.5"
-								strokeLinecap="round"
-								strokeLinejoin="round"
-							/>
-							<circle
-								cx="12"
-								cy="12"
-								r="3"
-								stroke="#a78bfa"
-								strokeWidth="1.5"
-								strokeLinecap="round"
-								strokeLinejoin="round"
-							/>
-						</svg>
-					</div>
-					<div className="setup-content">
-						<span className="setup-title">Vision Model Required</span>
-						<span className="setup-message">{error.message}</span>
-						<span className="setup-hint">Settings → Vision Models</span>
-					</div>
-					<button
-						type="button"
-						className="setup-dismiss"
-						onClick={() => api?.dismissSuggestion?.()}
-					>
-						✕
-					</button>
-				</div>
-			);
-		}
-		return (
-			<div className="suggestion-tooltip suggestion-error">
-				<span className="suggestion-error-text">{error.message}</span>
-			</div>
-		);
-	}
-
-	const showLoading = isLoading && options.length === 0;
-
-	if (showLoading) {
-		return (
-			<div className="suggestion-tooltip">
-				<div className="agent-activity">
-					{steps.length === 0 && (
-						<div className="activity-initial">
-							<span className="step-spinner" />
-							<span className="activity-label">Preparing…</span>
-						</div>
-					)}
-					{steps.length > 0 && (
-						<div className="activity-steps">
-							{steps.map((step) => (
-								<div key={step.id} className="activity-step">
-									<StepIcon status={step.status} />
-									<span className="step-label">
-										{step.title}
-										{step.items.length > 0 && (
-											<span className="step-detail"> · {step.items[0]}</span>
-										)}
-									</span>
-								</div>
-							))}
-						</div>
-					)}
-				</div>
-			</div>
-		);
-	}
-
-	const handleSelect = (text: string) => {
-		api?.acceptSuggestion?.(text);
-	};
-
-	const handleDismiss = () => {
-		api?.dismissSuggestion?.();
-	};
-
-	const TRUNCATE_LENGTH = 120;
-
-	if (options.length === 0) {
-		return (
-			<div className="suggestion-tooltip suggestion-error">
-				<span className="suggestion-error-text">No suggestions available.</span>
-			</div>
-		);
-	}
-
-	return (
-		<div className="suggestion-tooltip">
-			<div className="suggestion-options">
-				{options.map((option, index) => {
-					const isExpanded = expandedOption === index;
-					const needsTruncation = option.length > TRUNCATE_LENGTH;
-					const displayText =
-						needsTruncation && !isExpanded ? option.slice(0, TRUNCATE_LENGTH) + "…" : option;
-
-					return (
-						<button
-							type="button"
-							key={index}
-							className="suggestion-option"
-							onClick={() => handleSelect(option)}
-						>
-							<span className="option-number">{index + 1}</span>
-							<span className="option-text">{displayText}</span>
-							{needsTruncation && (
-								<button
-									type="button"
-									className="option-expand"
-									onClick={(e) => {
-										e.stopPropagation();
-										setExpandedOption(isExpanded ? null : index);
-									}}
-								>
-									{isExpanded ? "less" : "more"}
-								</button>
-							)}
-						</button>
-					);
-				})}
-			</div>
-			<div className="suggestion-actions">
-				<button
-					type="button"
-					className="suggestion-btn suggestion-btn-dismiss"
-					onClick={handleDismiss}
-				>
-					Dismiss
-				</button>
-			</div>
-		</div>
-	);
-}
diff --git a/surfsense_web/app/desktop/suggestion/suggestion.css b/surfsense_web/app/desktop/suggestion/suggestion.css
deleted file mode 100644
index b27fe7874..000000000
--- a/surfsense_web/app/desktop/suggestion/suggestion.css
+++ /dev/null
@@ -1,352 +0,0 @@
-html:has(.suggestion-body),
-body:has(.suggestion-body) {
-	margin: 0 !important;
-	padding: 0 !important;
-	background: transparent !important;
-	overflow: hidden !important;
-	height: auto !important;
-	width: 100% !important;
-}
-
-.suggestion-body {
-	margin: 0;
-	padding: 0;
-	background: transparent;
-	font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-	-webkit-font-smoothing: antialiased;
-	user-select: none;
-	-webkit-app-region: no-drag;
-}
-
-.suggestion-tooltip {
-	box-sizing: border-box;
-	background: #1e1e1e;
-	border: 1px solid #3c3c3c;
-	border-radius: 8px;
-	padding: 8px 12px;
-	margin: 4px;
-	max-width: 400px;
-	/* MAX_HEIGHT in suggestion-window.ts is 400px. Subtract 8px for margin
-     (4px * 2) so the tooltip + margin fits within the Electron window.
-     box-sizing: border-box ensures padding + border are included. */
-	max-height: 392px;
-	box-shadow: 0 4px 16px rgba(0, 0, 0, 0.5);
-	display: flex;
-	flex-direction: column;
-	overflow: hidden;
-}
-
-.suggestion-text {
-	color: #d4d4d4;
-	font-size: 13px;
-	line-height: 1.45;
-	margin: 0 0 6px 0;
-	word-wrap: break-word;
-	white-space: pre-wrap;
-	overflow-y: auto;
-	flex: 1 1 auto;
-	min-height: 0;
-}
-
-.suggestion-text::-webkit-scrollbar {
-	width: 5px;
-}
-
-.suggestion-text::-webkit-scrollbar-track {
-	background: transparent;
-}
-
-.suggestion-text::-webkit-scrollbar-thumb {
-	background: #555;
-	border-radius: 3px;
-}
-
-.suggestion-text::-webkit-scrollbar-thumb:hover {
-	background: #777;
-}
-
-.suggestion-actions {
-	display: flex;
-	justify-content: flex-end;
-	gap: 4px;
-	border-top: 1px solid #2a2a2a;
-	padding-top: 6px;
-	flex-shrink: 0;
-}
-
-.suggestion-btn {
-	padding: 2px 8px;
-	border-radius: 3px;
-	border: 1px solid #3c3c3c;
-	font-family: inherit;
-	font-size: 10px;
-	font-weight: 500;
-	cursor: pointer;
-	line-height: 16px;
-	transition:
-		background 0.15s,
-		border-color 0.15s;
-}
-
-.suggestion-btn-accept {
-	background: #2563eb;
-	border-color: #3b82f6;
-	color: #fff;
-}
-
-.suggestion-btn-accept:hover {
-	background: #1d4ed8;
-}
-
-.suggestion-btn-dismiss {
-	background: #2a2a2a;
-	color: #999;
-}
-
-.suggestion-btn-dismiss:hover {
-	background: #333;
-	color: #ccc;
-}
-
-.suggestion-error {
-	border-color: #5c2626;
-}
-
-.suggestion-error-text {
-	color: #f48771;
-	font-size: 12px;
-}
-
-/* --- Setup prompt (vision model not configured) --- */
-
-.suggestion-setup {
-	display: flex;
-	flex-direction: row;
-	align-items: flex-start;
-	gap: 10px;
-	border-color: #3b2d6b;
-	padding: 10px 14px;
-}
-
-.setup-icon {
-	flex-shrink: 0;
-	margin-top: 1px;
-}
-
-.setup-content {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-	min-width: 0;
-}
-
-.setup-title {
-	font-size: 13px;
-	font-weight: 600;
-	color: #c4b5fd;
-}
-
-.setup-message {
-	font-size: 11.5px;
-	color: #a1a1aa;
-	line-height: 1.4;
-}
-
-.setup-hint {
-	font-size: 10.5px;
-	color: #7c6dac;
-	margin-top: 2px;
-}
-
-.setup-dismiss {
-	flex-shrink: 0;
-	align-self: flex-start;
-	background: none;
-	border: none;
-	color: #6b6b7b;
-	font-size: 14px;
-	cursor: pointer;
-	padding: 2px 4px;
-	line-height: 1;
-	border-radius: 4px;
-	transition:
-		color 0.15s,
-		background 0.15s;
-}
-
-.setup-dismiss:hover {
-	color: #c4b5fd;
-	background: rgba(124, 109, 172, 0.15);
-}
-
-/* --- Agent activity indicator --- */
-
-.agent-activity {
-	display: flex;
-	flex-direction: column;
-	gap: 4px;
-	overflow-y: auto;
-	max-height: 340px;
-}
-
-.agent-activity::-webkit-scrollbar {
-	display: none;
-}
-
-.activity-initial {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	padding: 2px 0;
-}
-
-.activity-label {
-	color: #a1a1aa;
-	font-size: 12px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.activity-steps {
-	display: flex;
-	flex-direction: column;
-	gap: 3px;
-}
-
-.activity-step {
-	display: flex;
-	align-items: center;
-	gap: 6px;
-	min-height: 18px;
-}
-
-.step-label {
-	color: #d4d4d4;
-	font-size: 12px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.step-detail {
-	color: #71717a;
-	font-size: 11px;
-}
-
-/* Spinner (in_progress) */
-.step-spinner {
-	width: 14px;
-	height: 14px;
-	flex-shrink: 0;
-	border: 1.5px solid #3f3f46;
-	border-top-color: #a78bfa;
-	border-radius: 50%;
-	animation: step-spin 0.7s linear infinite;
-}
-
-/* Checkmark icon (complete) */
-.step-icon {
-	width: 14px;
-	height: 14px;
-	flex-shrink: 0;
-}
-
-@keyframes step-spin {
-	to {
-		transform: rotate(360deg);
-	}
-}
-
-/* --- Suggestion option cards --- */
-
-.suggestion-options {
-	display: flex;
-	flex-direction: column;
-	gap: 4px;
-	overflow-y: auto;
-	flex: 1 1 auto;
-	min-height: 0;
-	margin-bottom: 6px;
-}
-
-.suggestion-options::-webkit-scrollbar {
-	width: 5px;
-}
-
-.suggestion-options::-webkit-scrollbar-track {
-	background: transparent;
-}
-
-.suggestion-options::-webkit-scrollbar-thumb {
-	background: #555;
-	border-radius: 3px;
-}
-
-.suggestion-option {
-	display: flex;
-	align-items: flex-start;
-	gap: 8px;
-	padding: 6px 8px;
-	border-radius: 5px;
-	border: 1px solid #333;
-	background: #262626;
-	cursor: pointer;
-	text-align: left;
-	font-family: inherit;
-	transition:
-		background 0.15s,
-		border-color 0.15s;
-	width: 100%;
-}
-
-.suggestion-option:hover {
-	background: #2a2d3a;
-	border-color: #3b82f6;
-}
-
-.option-number {
-	flex-shrink: 0;
-	width: 18px;
-	height: 18px;
-	border-radius: 50%;
-	background: #3f3f46;
-	color: #d4d4d4;
-	font-size: 10px;
-	font-weight: 600;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	margin-top: 1px;
-}
-
-.suggestion-option:hover .option-number {
-	background: #2563eb;
-	color: #fff;
-}
-
-.option-text {
-	color: #d4d4d4;
-	font-size: 12px;
-	line-height: 1.45;
-	word-wrap: break-word;
-	white-space: pre-wrap;
-	flex: 1 1 auto;
-	min-width: 0;
-}
-
-.option-expand {
-	flex-shrink: 0;
-	background: none;
-	border: none;
-	color: #71717a;
-	font-size: 10px;
-	cursor: pointer;
-	padding: 0 2px;
-	font-family: inherit;
-	margin-top: 1px;
-}
-
-.option-expand:hover {
-	color: #a1a1aa;
-}
diff --git a/surfsense_web/components/desktop/shortcut-recorder.tsx b/surfsense_web/components/desktop/shortcut-recorder.tsx
index c872afaf1..50ced5313 100644
--- a/surfsense_web/components/desktop/shortcut-recorder.tsx
+++ b/surfsense_web/components/desktop/shortcut-recorder.tsx
@@ -36,9 +36,8 @@ export function acceleratorToDisplay(accel: string): string[] {
 }
 
 export const DEFAULT_SHORTCUTS = {
-	generalAssist: "CommandOrControl+Shift+S",
-	quickAsk: "CommandOrControl+Alt+S",
-	autocomplete: "CommandOrControl+Shift+Space",
+	generalAssist: "Alt+Shift+G",
+	quickAsk: "Alt+Shift+Q",
 };
 
 // ---------------------------------------------------------------------------
diff --git a/surfsense_web/types/window.d.ts b/surfsense_web/types/window.d.ts
index e9f29a8f3..a8f02fd20 100644
--- a/surfsense_web/types/window.d.ts
+++ b/surfsense_web/types/window.d.ts
@@ -71,6 +71,7 @@ interface ElectronAPI {
 	openExternal: (url: string) => void;
 	getAppVersion: () => Promise<string>;
 	onDeepLink: (callback: (url: string) => void) => () => void;
+	onChatScreenCapture: (callback: (dataUrl: string) => void) => () => void;
 	getQuickAskText: () => Promise<string>;
 	setQuickAskMode: (mode: string) => Promise<void>;
 	getQuickAskMode: () => Promise<string>;
@@ -83,19 +84,6 @@ interface ElectronAPI {
 	requestAccessibility: () => Promise<void>;
 	requestScreenRecording: () => Promise<void>;
 	restartApp: () => Promise<void>;
-	// Autocomplete
-	onAutocompleteContext: (
-		callback: (data: {
-			screenshot: string;
-			searchSpaceId?: string;
-			appName?: string;
-			windowTitle?: string;
-		}) => void
-	) => () => void;
-	acceptSuggestion: (text: string) => Promise<void>;
-	dismissSuggestion: () => Promise<void>;
-	setAutocompleteEnabled: (enabled: boolean) => Promise<void>;
-	getAutocompleteEnabled: () => Promise<boolean>;
 	// Folder sync
 	selectFolder: () => Promise<string | null>;
 	addWatchedFolder: (config: WatchedFolderConfig) => Promise<WatchedFolderConfig[]>;
@@ -115,18 +103,15 @@ interface ElectronAPI {
 	browseFiles: () => Promise<string[] | null>;
 	readLocalFiles: (paths: string[]) => Promise<LocalFileData[]>;
 	readAgentLocalFileText: (virtualPath: string) => Promise<LocalTextFileResult>;
-	writeAgentLocalFileText: (
-		virtualPath: string,
-		content: string
-	) => Promise<LocalTextFileResult>;
+	writeAgentLocalFileText: (virtualPath: string, content: string) => Promise<LocalTextFileResult>;
 	// Auth token sync across windows
 	getAuthTokens: () => Promise<{ bearer: string; refresh: string } | null>;
 	setAuthTokens: (bearer: string, refresh: string) => Promise<void>;
 	// Keyboard shortcut configuration
-	getShortcuts: () => Promise<{ generalAssist: string; quickAsk: string; autocomplete: string }>;
+	getShortcuts: () => Promise<{ generalAssist: string; quickAsk: string }>;
 	setShortcuts: (
-		config: Partial<{ generalAssist: string; quickAsk: string; autocomplete: string }>
-	) => Promise<{ generalAssist: string; quickAsk: string; autocomplete: string }>;
+		config: Partial<{ generalAssist: string; quickAsk: string }>
+	) => Promise<{ generalAssist: string; quickAsk: string }>;
 	// Launch on system startup
 	getAutoLaunch: () => Promise<{
 		enabled: boolean;

From ed0bcafe49a946bea1cc6bb02933780f111efbee Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 19:19:04 +0200
Subject: [PATCH 10/31] Align connectors, editors, and layout with desktop
 context

---
 .../assistant-ui/connector-popup.tsx          |  50 ++++---
 .../components/mcp-connect-form.tsx           |  14 +-
 .../components/mcp-config.tsx                 |  14 +-
 .../components/teams-config.tsx               |   6 +-
 .../views/connector-edit-view.tsx             |   6 +-
 .../views/indexing-configuration-view.tsx     |   5 +-
 .../tabs/active-connectors-tab.tsx            |   6 +-
 .../views/connector-accounts-list-view.tsx    | 129 +++++++++--------
 .../components/assistant-ui/markdown-text.tsx |   2 +-
 .../components/editor-panel/editor-panel.tsx  | 134 +++++++++---------
 .../editor/plugins/fixed-toolbar-kit.tsx      |   3 +-
 .../components/editor/source-code-editor.tsx  |   2 +-
 .../components/homepage/hero-section.tsx      |   4 +-
 .../layout/ui/right-panel/RightPanel.tsx      |   8 +-
 .../layout/ui/sidebar/DocumentsSidebar.tsx    |  19 ++-
 .../ui/sidebar/LocalFilesystemBrowser.tsx     |  10 +-
 .../settings/user-settings-dialog.tsx         |  17 ++-
 .../tool-ui/generic-hitl-approval.tsx         |   4 +-
 .../tool-ui/google-calendar/create-event.tsx  |   9 +-
 surfsense_web/contracts/enums/toolIcons.tsx   |   2 +-
 20 files changed, 243 insertions(+), 201 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/connector-popup.tsx b/surfsense_web/components/assistant-ui/connector-popup.tsx
index 66333a9ef..32943142a 100644
--- a/surfsense_web/components/assistant-ui/connector-popup.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup.tsx
@@ -123,9 +123,9 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 			handleSkipIndexing,
 			handleStartEdit,
 			handleSaveConnector,
-		handleDisconnectConnector,
-		handleDisconnectFromList,
-		handleBackFromEdit,
+			handleDisconnectConnector,
+			handleDisconnectFromList,
+			handleBackFromEdit,
 			handleBackFromConnect,
 			handleBackFromYouTube,
 			handleViewAccountsList,
@@ -226,27 +226,31 @@ export const ConnectorIndicator = forwardRef<ConnectorIndicatorHandle, Connector
 					{isYouTubeView && searchSpaceId ? (
 						<YouTubeCrawlerView searchSpaceId={searchSpaceId} onBack={handleBackFromYouTube} />
 					) : viewingMCPList ? (
-					<ConnectorAccountsListView
-						connectorType="MCP_CONNECTOR"
-						connectorTitle="MCP Connectors"
-						connectors={(allConnectors || []) as SearchSourceConnector[]}
-						indexingConnectorIds={indexingConnectorIds}
-						onBack={handleBackFromMCPList}
-						onManage={handleStartEdit}
-						onDisconnect={(connector) => handleDisconnectFromList(connector, () => refreshConnectors())}
-						onAddAccount={handleAddNewMCPFromList}
-						addButtonText="Add New MCP Server"
-					/>
+						<ConnectorAccountsListView
+							connectorType="MCP_CONNECTOR"
+							connectorTitle="MCP Connectors"
+							connectors={(allConnectors || []) as SearchSourceConnector[]}
+							indexingConnectorIds={indexingConnectorIds}
+							onBack={handleBackFromMCPList}
+							onManage={handleStartEdit}
+							onDisconnect={(connector) =>
+								handleDisconnectFromList(connector, () => refreshConnectors())
+							}
+							onAddAccount={handleAddNewMCPFromList}
+							addButtonText="Add New MCP Server"
+						/>
 					) : viewingAccountsType ? (
-					<ConnectorAccountsListView
-						connectorType={viewingAccountsType.connectorType}
-						connectorTitle={viewingAccountsType.connectorTitle}
-						connectors={(connectors || []) as SearchSourceConnector[]}
-						indexingConnectorIds={indexingConnectorIds}
-						onBack={handleBackFromAccountsList}
-						onManage={handleStartEdit}
-						onDisconnect={(connector) => handleDisconnectFromList(connector, () => refreshConnectors())}
-						onAddAccount={() => {
+						<ConnectorAccountsListView
+							connectorType={viewingAccountsType.connectorType}
+							connectorTitle={viewingAccountsType.connectorTitle}
+							connectors={(connectors || []) as SearchSourceConnector[]}
+							indexingConnectorIds={indexingConnectorIds}
+							onBack={handleBackFromAccountsList}
+							onManage={handleStartEdit}
+							onDisconnect={(connector) =>
+								handleDisconnectFromList(connector, () => refreshConnectors())
+							}
+							onAddAccount={() => {
 								// Check both OAUTH_CONNECTORS and COMPOSIO_CONNECTORS
 								const oauthConnector =
 									OAUTH_CONNECTORS.find(
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
index fc9812240..d9a740af2 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connect-forms/components/mcp-connect-form.tsx
@@ -213,13 +213,13 @@ export const MCPConnectForm: FC<ConnectFormProps> = ({ onSubmit, isSubmitting })
 							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80"
 						>
 							{isTesting ? (
-							<>
-								<Loader2 className="h-3.5 w-3.5 animate-spin" />
-								Testing Connection...
-							</>
-						) : (
-							"Test Connection"
-						)}
+								<>
+									<Loader2 className="h-3.5 w-3.5 animate-spin" />
+									Testing Connection...
+								</>
+							) : (
+								"Test Connection"
+							)}
 						</Button>
 					</div>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
index d6f60e824..97b5de675 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/mcp-config.tsx
@@ -218,13 +218,13 @@ export const MCPConfig: FC<MCPConfigProps> = ({ connector, onConfigChange, onNam
 							className="w-full h-8 text-[13px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80"
 						>
 							{isTesting ? (
-							<>
-								<Loader2 className="h-3.5 w-3.5 animate-spin" />
-								Testing Connection...
-							</>
-						) : (
-							"Test Connection"
-						)}
+								<>
+									<Loader2 className="h-3.5 w-3.5 animate-spin" />
+									Testing Connection...
+								</>
+							) : (
+								"Test Connection"
+							)}
 						</Button>
 					</div>
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
index e96ddfd29..06ce21dae 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/components/teams-config.tsx
@@ -18,9 +18,9 @@ export const TeamsConfig: FC<TeamsConfigProps> = () => {
 				<div className="text-xs sm:text-sm">
 					<p className="font-medium text-xs sm:text-sm">Microsoft Teams Access</p>
 					<p className="text-muted-foreground mt-1 text-[10px] sm:text-sm">
-						Your agent can search and read messages from Teams channels you have access to,
-						and send messages on your behalf. Make sure you&#39;re a member of the teams
-						you want to interact with.
+						Your agent can search and read messages from Teams channels you have access to, and send
+						messages on your behalf. Make sure you&#39;re a member of the teams you want to interact
+						with.
 					</p>
 				</div>
 			</div>
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
index 44461c351..48f42c3b4 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/connector-edit-view.tsx
@@ -15,7 +15,7 @@ import { DateRangeSelector } from "../../components/date-range-selector";
 import { PeriodicSyncConfig } from "../../components/periodic-sync-config";
 import { SummaryConfig } from "../../components/summary-config";
 import { VisionLLMConfig } from "../../components/vision-llm-config";
-import { LIVE_CONNECTOR_TYPES, getReauthEndpoint } from "../../constants/connector-constants";
+import { getReauthEndpoint, LIVE_CONNECTOR_TYPES } from "../../constants/connector-constants";
 import { getConnectorDisplayName } from "../../tabs/all-connectors-tab";
 import { MCPServiceConfig } from "../components/mcp-service-config";
 import { type ConnectorConfigProps, getConnectorConfigComponent } from "../index";
@@ -367,8 +367,8 @@ export const ConnectorEditView: FC<ConnectorEditViewProps> = ({
 
 			{/* Fixed Footer - Action buttons */}
 			<div className="flex-shrink-0 flex flex-col sm:flex-row items-stretch sm:items-center justify-between gap-3 sm:gap-0 px-6 sm:px-12 py-6 sm:py-6 bg-muted border-t border-border">
-			{showDisconnectConfirm ? (
-				<div className="flex flex-col sm:flex-row items-stretch sm:items-center gap-3 flex-1 sm:flex-initial">
+				{showDisconnectConfirm ? (
+					<div className="flex flex-col sm:flex-row items-stretch sm:items-center gap-3 flex-1 sm:flex-initial">
 						<span className="text-xs sm:text-sm text-muted-foreground sm:whitespace-nowrap">
 							{isLive
 								? "Your agent will lose access to this service."
diff --git a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
index c65367e65..e8dffb3c3 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/connector-configs/views/indexing-configuration-view.tsx
@@ -11,7 +11,10 @@ import { DateRangeSelector } from "../../components/date-range-selector";
 import { PeriodicSyncConfig } from "../../components/periodic-sync-config";
 import { SummaryConfig } from "../../components/summary-config";
 import { VisionLLMConfig } from "../../components/vision-llm-config";
-import { LIVE_CONNECTOR_TYPES, type IndexingConfigState } from "../../constants/connector-constants";
+import {
+	type IndexingConfigState,
+	LIVE_CONNECTOR_TYPES,
+} from "../../constants/connector-constants";
 import { getConnectorDisplayName } from "../../tabs/all-connectors-tab";
 import { getConnectorConfigComponent } from "../index";
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
index fe9aab14f..755086ba5 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/tabs/active-connectors-tab.tsx
@@ -9,7 +9,11 @@ import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
 import type { SearchSourceConnector } from "@/contracts/types/connector.types";
 import { getDocumentTypeLabel } from "@/lib/documents/document-type-labels";
 import { cn } from "@/lib/utils";
-import { COMPOSIO_CONNECTORS, LIVE_CONNECTOR_TYPES, OAUTH_CONNECTORS } from "../constants/connector-constants";
+import {
+	COMPOSIO_CONNECTORS,
+	LIVE_CONNECTOR_TYPES,
+	OAUTH_CONNECTORS,
+} from "../constants/connector-constants";
 import { getDocumentCountForConnector } from "../utils/connector-document-mapping";
 import { getConnectorDisplayName } from "./all-connectors-tab";
 
diff --git a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
index b3c087599..8aee7e005 100644
--- a/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
+++ b/surfsense_web/components/assistant-ui/connector-popup/views/connector-accounts-list-view.tsx
@@ -13,7 +13,7 @@ import type { SearchSourceConnector } from "@/contracts/types/connector.types";
 import { authenticatedFetch } from "@/lib/auth-utils";
 import { formatRelativeDate } from "@/lib/format-date";
 import { cn } from "@/lib/utils";
-import { LIVE_CONNECTOR_TYPES, getReauthEndpoint } from "../constants/connector-constants";
+import { getReauthEndpoint, LIVE_CONNECTOR_TYPES } from "../constants/connector-constants";
 import { useConnectorStatus } from "../hooks/use-connector-status";
 import { getConnectorDisplayName } from "../tabs/all-connectors-tab";
 
@@ -182,11 +182,14 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 					</div>
 				) : (
 					<div className="grid grid-cols-1 sm:grid-cols-2 gap-3">
-					{typeConnectors.map((connector) => {
-						const isIndexing = indexingConnectorIds.has(connector.id);
-						const connectorReauthEndpoint = getReauthEndpoint(connector);
-						const isAuthExpired = !!connectorReauthEndpoint && connector.config?.auth_expired === true;
-						const isLive = LIVE_CONNECTOR_TYPES.has(connector.connector_type) || Boolean(connector.config?.server_config);
+						{typeConnectors.map((connector) => {
+							const isIndexing = indexingConnectorIds.has(connector.id);
+							const connectorReauthEndpoint = getReauthEndpoint(connector);
+							const isAuthExpired =
+								!!connectorReauthEndpoint && connector.config?.auth_expired === true;
+							const isLive =
+								LIVE_CONNECTOR_TYPES.has(connector.connector_type) ||
+								Boolean(connector.config?.server_config);
 
 							return (
 								<div
@@ -225,73 +228,73 @@ export const ConnectorAccountsListView: FC<ConnectorAccountsListViewProps> = ({
 											</p>
 										) : null}
 									</div>
-								{isAuthExpired ? (
-									<Button
-										size="sm"
-										className="h-8 text-[11px] px-3 rounded-lg font-medium bg-amber-600 hover:bg-amber-700 text-white border-0 shadow-xs shrink-0"
-										onClick={() => handleReauth(connector)}
-										disabled={reauthingId === connector.id}
-									>
-										<RefreshCw
-											className={cn("size-3.5", reauthingId === connector.id && "animate-spin")}
-										/>
-										Re-authenticate
-									</Button>
-								) : isLive && onDisconnect ? (
-									confirmDisconnectId === connector.id ? (
-										<div className="flex items-center gap-1.5 shrink-0">
+									{isAuthExpired ? (
+										<Button
+											size="sm"
+											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-amber-600 hover:bg-amber-700 text-white border-0 shadow-xs shrink-0"
+											onClick={() => handleReauth(connector)}
+											disabled={reauthingId === connector.id}
+										>
+											<RefreshCw
+												className={cn("size-3.5", reauthingId === connector.id && "animate-spin")}
+											/>
+											Re-authenticate
+										</Button>
+									) : isLive && onDisconnect ? (
+										confirmDisconnectId === connector.id ? (
+											<div className="flex items-center gap-1.5 shrink-0">
+												<Button
+													variant="destructive"
+													size="sm"
+													className="h-8 text-[11px] px-3 rounded-lg font-medium shadow-xs"
+													onClick={async () => {
+														setDisconnectingId(connector.id);
+														setConfirmDisconnectId(null);
+														try {
+															await onDisconnect(connector);
+														} finally {
+															setDisconnectingId(null);
+														}
+													}}
+													disabled={disconnectingId === connector.id}
+												>
+													{disconnectingId === connector.id ? (
+														<RefreshCw className="size-3.5 animate-spin" />
+													) : (
+														"Confirm"
+													)}
+												</Button>
+												<Button
+													variant="ghost"
+													size="sm"
+													className="h-8 text-[11px] px-2 rounded-lg"
+													onClick={() => setConfirmDisconnectId(null)}
+													disabled={disconnectingId === connector.id}
+												>
+													Cancel
+												</Button>
+											</div>
+										) : (
 											<Button
-												variant="destructive"
+												variant="secondary"
 												size="sm"
-												className="h-8 text-[11px] px-3 rounded-lg font-medium shadow-xs"
-											onClick={async () => {
-												setDisconnectingId(connector.id);
-												setConfirmDisconnectId(null);
-												try {
-													await onDisconnect(connector);
-												} finally {
-													setDisconnectingId(null);
-												}
-											}}
-												disabled={disconnectingId === connector.id}
+												className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-red-50 hover:text-red-700 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-red-950 dark:hover:text-red-400 shrink-0"
+												onClick={() => setConfirmDisconnectId(connector.id)}
 											>
-												{disconnectingId === connector.id ? (
-													<RefreshCw className="size-3.5 animate-spin" />
-												) : (
-													"Confirm"
-												)}
+												<Trash2 className="size-3.5" />
+												Disconnect
 											</Button>
-											<Button
-												variant="ghost"
-												size="sm"
-												className="h-8 text-[11px] px-2 rounded-lg"
-												onClick={() => setConfirmDisconnectId(null)}
-												disabled={disconnectingId === connector.id}
-											>
-												Cancel
-											</Button>
-										</div>
+										)
 									) : (
 										<Button
 											variant="secondary"
 											size="sm"
-											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-red-50 hover:text-red-700 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-red-950 dark:hover:text-red-400 shrink-0"
-											onClick={() => setConfirmDisconnectId(connector.id)}
+											className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
+											onClick={() => onManage(connector)}
 										>
-											<Trash2 className="size-3.5" />
-											Disconnect
+											Manage
 										</Button>
-									)
-								) : (
-									<Button
-										variant="secondary"
-										size="sm"
-										className="h-8 text-[11px] px-3 rounded-lg font-medium bg-white text-slate-700 hover:bg-slate-50 border-0 shadow-xs dark:bg-secondary dark:text-secondary-foreground dark:hover:bg-secondary/80 shrink-0"
-										onClick={() => onManage(connector)}
-									>
-										Manage
-									</Button>
-								)}
+									)}
 								</div>
 							);
 						})}
diff --git a/surfsense_web/components/assistant-ui/markdown-text.tsx b/surfsense_web/components/assistant-ui/markdown-text.tsx
index a15ff1cd7..140ddcae7 100644
--- a/surfsense_web/components/assistant-ui/markdown-text.tsx
+++ b/surfsense_web/components/assistant-ui/markdown-text.tsx
@@ -20,7 +20,6 @@ import { openEditorPanelAtom } from "@/atoms/editor/editor-panel.atom";
 import { ImagePreview, ImageRoot, ImageZoom } from "@/components/assistant-ui/image";
 import "katex/dist/katex.min.css";
 import { InlineCitation, UrlCitation } from "@/components/assistant-ui/inline-citation";
-import { useElectronAPI } from "@/hooks/use-platform";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
 	Table,
@@ -30,6 +29,7 @@ import {
 	TableHeader,
 	TableRow,
 } from "@/components/ui/table";
+import { useElectronAPI } from "@/hooks/use-platform";
 import { cn } from "@/lib/utils";
 
 function MarkdownCodeBlockSkeleton() {
diff --git a/surfsense_web/components/editor-panel/editor-panel.tsx b/surfsense_web/components/editor-panel/editor-panel.tsx
index 1f1b41c3e..49cf99229 100644
--- a/surfsense_web/components/editor-panel/editor-panel.tsx
+++ b/surfsense_web/components/editor-panel/editor-panel.tsx
@@ -226,67 +226,68 @@ export function EditorPanelContent({
 		}
 	}, [editorDoc?.source_markdown]);
 
-	const handleSave = useCallback(async (options?: { silent?: boolean }) => {
-		setSaving(true);
-		try {
-			if (isLocalFileMode) {
-				if (!localFilePath) {
-					throw new Error("Missing local file path");
+	const handleSave = useCallback(
+		async (options?: { silent?: boolean }) => {
+			setSaving(true);
+			try {
+				if (isLocalFileMode) {
+					if (!localFilePath) {
+						throw new Error("Missing local file path");
+					}
+					if (!electronAPI?.writeAgentLocalFileText) {
+						throw new Error("Local file editor is available only in desktop mode.");
+					}
+					const contentToSave = markdownRef.current;
+					const writeResult = await electronAPI.writeAgentLocalFileText(
+						localFilePath,
+						contentToSave
+					);
+					if (!writeResult.ok) {
+						throw new Error(writeResult.error || "Failed to save local file");
+					}
+					setEditorDoc((prev) => (prev ? { ...prev, source_markdown: contentToSave } : prev));
+					setEditedMarkdown(markdownRef.current === contentToSave ? null : markdownRef.current);
+					return true;
 				}
-				if (!electronAPI?.writeAgentLocalFileText) {
-					throw new Error("Local file editor is available only in desktop mode.");
+				if (!searchSpaceId || !documentId) {
+					throw new Error("Missing document context");
 				}
-				const contentToSave = markdownRef.current;
-				const writeResult = await electronAPI.writeAgentLocalFileText(
-					localFilePath,
-					contentToSave
+				const token = getBearerToken();
+				if (!token) {
+					toast.error("Please login to save");
+					redirectToLogin();
+					return;
+				}
+				const response = await authenticatedFetch(
+					`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-spaces/${searchSpaceId}/documents/${documentId}/save`,
+					{
+						method: "POST",
+						headers: { "Content-Type": "application/json" },
+						body: JSON.stringify({ source_markdown: markdownRef.current }),
+					}
 				);
-				if (!writeResult.ok) {
-					throw new Error(writeResult.error || "Failed to save local file");
+
+				if (!response.ok) {
+					const errorData = await response
+						.json()
+						.catch(() => ({ detail: "Failed to save document" }));
+					throw new Error(errorData.detail || "Failed to save document");
 				}
-				setEditorDoc((prev) =>
-					prev ? { ...prev, source_markdown: contentToSave } : prev
-				);
-				setEditedMarkdown(markdownRef.current === contentToSave ? null : markdownRef.current);
+
+				setEditorDoc((prev) => (prev ? { ...prev, source_markdown: markdownRef.current } : prev));
+				setEditedMarkdown(null);
+				toast.success("Document saved! Reindexing in background...");
 				return true;
+			} catch (err) {
+				console.error("Error saving document:", err);
+				toast.error(err instanceof Error ? err.message : "Failed to save document");
+				return false;
+			} finally {
+				setSaving(false);
 			}
-			if (!searchSpaceId || !documentId) {
-				throw new Error("Missing document context");
-			}
-			const token = getBearerToken();
-			if (!token) {
-				toast.error("Please login to save");
-				redirectToLogin();
-				return;
-			}
-			const response = await authenticatedFetch(
-				`${process.env.NEXT_PUBLIC_FASTAPI_BACKEND_URL}/api/v1/search-spaces/${searchSpaceId}/documents/${documentId}/save`,
-				{
-					method: "POST",
-					headers: { "Content-Type": "application/json" },
-					body: JSON.stringify({ source_markdown: markdownRef.current }),
-				}
-			);
-
-			if (!response.ok) {
-				const errorData = await response
-					.json()
-					.catch(() => ({ detail: "Failed to save document" }));
-				throw new Error(errorData.detail || "Failed to save document");
-			}
-
-			setEditorDoc((prev) => (prev ? { ...prev, source_markdown: markdownRef.current } : prev));
-			setEditedMarkdown(null);
-			toast.success("Document saved! Reindexing in background...");
-			return true;
-		} catch (err) {
-			console.error("Error saving document:", err);
-			toast.error(err instanceof Error ? err.message : "Failed to save document");
-			return false;
-		} finally {
-			setSaving(false);
-		}
-	}, [documentId, electronAPI, isLocalFileMode, localFilePath, searchSpaceId]);
+		},
+		[documentId, electronAPI, isLocalFileMode, localFilePath, searchSpaceId]
+	);
 
 	const isEditableType = editorDoc
 		? (editorRenderMode === "source_code" ||
@@ -383,9 +384,15 @@ export function EditorPanelContent({
 									)}
 								</>
 							)}
-							{!showEditingActions && !isLocalFileMode && editorDoc?.document_type && documentId && (
-								<VersionHistoryButton documentId={documentId} documentType={editorDoc.document_type} />
-							)}
+							{!showEditingActions &&
+								!isLocalFileMode &&
+								editorDoc?.document_type &&
+								documentId && (
+									<VersionHistoryButton
+										documentId={documentId}
+										documentType={editorDoc.document_type}
+									/>
+								)}
 						</div>
 					</div>
 				</div>
@@ -533,11 +540,7 @@ export function EditorPanelContent({
 										}
 									}}
 								>
-									{downloading ? (
-										<Spinner size="xs" />
-									) : (
-										<Download className="size-3.5" />
-									)}
+									{downloading ? <Spinner size="xs" /> : <Download className="size-3.5" />}
 									{downloading ? "Preparing..." : "Download .md"}
 								</Button>
 							</AlertDescription>
@@ -564,7 +567,7 @@ export function EditorPanelContent({
 					</div>
 				) : isEditableType ? (
 					<PlateEditor
-						key={`${isLocalFileMode ? localFilePath ?? "local-file" : documentId}-${isEditing ? "editing" : "viewing"}`}
+						key={`${isLocalFileMode ? (localFilePath ?? "local-file") : documentId}-${isEditing ? "editing" : "viewing"}`}
 						preset="full"
 						markdown={editorDoc.source_markdown}
 						onMarkdownChange={handleMarkdownChange}
@@ -684,7 +687,8 @@ export function MobileEditorPanel() {
 			? !!panelState.documentId && !!panelState.searchSpaceId
 			: !!panelState.localFilePath;
 
-	if (isDesktop || !panelState.isOpen || !hasTarget || panelState.kind === "local_file") return null;
+	if (isDesktop || !panelState.isOpen || !hasTarget || panelState.kind === "local_file")
+		return null;
 
 	return <MobileEditorDrawer />;
 }
diff --git a/surfsense_web/components/editor/plugins/fixed-toolbar-kit.tsx b/surfsense_web/components/editor/plugins/fixed-toolbar-kit.tsx
index bdda0263d..346fe0378 100644
--- a/surfsense_web/components/editor/plugins/fixed-toolbar-kit.tsx
+++ b/surfsense_web/components/editor/plugins/fixed-toolbar-kit.tsx
@@ -1,7 +1,6 @@
 "use client";
 
-import { createPlatePlugin } from "platejs/react";
-import { useEditorReadOnly } from "platejs/react";
+import { createPlatePlugin, useEditorReadOnly } from "platejs/react";
 
 import { useEditorSave } from "@/components/editor/editor-save-context";
 import { FixedToolbar } from "@/components/ui/fixed-toolbar";
diff --git a/surfsense_web/components/editor/source-code-editor.tsx b/surfsense_web/components/editor/source-code-editor.tsx
index 5cab8e5b1..9a763db27 100644
--- a/surfsense_web/components/editor/source-code-editor.tsx
+++ b/surfsense_web/components/editor/source-code-editor.tsx
@@ -1,8 +1,8 @@
 "use client";
 
 import dynamic from "next/dynamic";
-import { useEffect, useRef } from "react";
 import { useTheme } from "next-themes";
+import { useEffect, useRef } from "react";
 import { Spinner } from "@/components/ui/spinner";
 
 const MonacoEditor = dynamic(() => import("@monaco-editor/react"), {
diff --git a/surfsense_web/components/homepage/hero-section.tsx b/surfsense_web/components/homepage/hero-section.tsx
index ce0074042..a29d02882 100644
--- a/surfsense_web/components/homepage/hero-section.tsx
+++ b/surfsense_web/components/homepage/hero-section.tsx
@@ -63,9 +63,9 @@ const TAB_ITEMS = [
 		featured: true,
 	},
 	{
-		title: "Extreme Assist",
+		title: "Screen capture in chat",
 		description:
-			"Get inline writing suggestions powered by your knowledge base as you type in any app.",
+			"Capture your screen and send it with your message so the AI can see what you see.",
 		src: "/homepage/hero_tutorial/extreme_assist.mp4",
 		featured: true,
 	},
diff --git a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
index c26cc9b23..04bae010c 100644
--- a/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
+++ b/surfsense_web/components/layout/ui/right-panel/RightPanel.tsx
@@ -72,9 +72,7 @@ export function RightPanelExpandButton() {
 	const reportOpen = reportState.isOpen && !!reportState.reportId;
 	const editorOpen =
 		editorState.isOpen &&
-		(editorState.kind === "document"
-			? !!editorState.documentId
-			: !!editorState.localFilePath);
+		(editorState.kind === "document" ? !!editorState.documentId : !!editorState.localFilePath);
 	const hitlEditOpen = hitlEditState.isOpen && !!hitlEditState.onSave;
 	const hasContent = documentsOpen || reportOpen || editorOpen || hitlEditOpen;
 
@@ -116,9 +114,7 @@ export function RightPanel({ documentsPanel }: RightPanelProps) {
 	const reportOpen = reportState.isOpen && !!reportState.reportId;
 	const editorOpen =
 		editorState.isOpen &&
-		(editorState.kind === "document"
-			? !!editorState.documentId
-			: !!editorState.localFilePath);
+		(editorState.kind === "document" ? !!editorState.documentId : !!editorState.localFilePath);
 	const hitlEditOpen = hitlEditState.isOpen && !!hitlEditState.onSave;
 
 	useEffect(() => {
diff --git a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
index 5819dcef4..e88478259 100644
--- a/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/DocumentsSidebar.tsx
@@ -7,8 +7,8 @@ import {
 	ChevronRight,
 	FileText,
 	Folder,
-	FolderPlus,
 	FolderClock,
+	FolderPlus,
 	Laptop,
 	Lock,
 	Paperclip,
@@ -63,6 +63,7 @@ import {
 } from "@/components/ui/alert-dialog";
 import { Avatar, AvatarFallback, AvatarGroup } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
+import { Drawer, DrawerContent, DrawerHandle, DrawerTitle } from "@/components/ui/drawer";
 import {
 	DropdownMenu,
 	DropdownMenuContent,
@@ -71,7 +72,6 @@ import {
 	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
-import { Drawer, DrawerContent, DrawerHandle, DrawerTitle } from "@/components/ui/drawer";
 import { Input } from "@/components/ui/input";
 import { Separator } from "@/components/ui/separator";
 import { Spinner } from "@/components/ui/spinner";
@@ -525,7 +525,9 @@ function AuthenticatedDocumentsSidebar({
 			if (!electronAPI) return;
 
 			const watchedFolders = (await electronAPI.getWatchedFolders()) as WatchedFolderEntry[];
-			const matched = watchedFolders.find((wf: WatchedFolderEntry) => wf.rootFolderId === folder.id);
+			const matched = watchedFolders.find(
+				(wf: WatchedFolderEntry) => wf.rootFolderId === folder.id
+			);
 			if (!matched) {
 				toast.error("This folder is not being watched");
 				return;
@@ -555,7 +557,9 @@ function AuthenticatedDocumentsSidebar({
 			if (!electronAPI) return;
 
 			const watchedFolders = (await electronAPI.getWatchedFolders()) as WatchedFolderEntry[];
-			const matched = watchedFolders.find((wf: WatchedFolderEntry) => wf.rootFolderId === folder.id);
+			const matched = watchedFolders.find(
+				(wf: WatchedFolderEntry) => wf.rootFolderId === folder.id
+			);
 			if (!matched) {
 				toast.error("This folder is not being watched");
 				return;
@@ -988,7 +992,8 @@ function AuthenticatedDocumentsSidebar({
 	}, [open, onOpenChange, isMobile, setRightPanelCollapsed]);
 
 	const showFilesystemTabs = !isMobile && !!electronAPI && !!filesystemSettings;
-	const currentFilesystemTab = filesystemSettings?.mode === "desktop_local_folder" ? "local" : "cloud";
+	const currentFilesystemTab =
+		filesystemSettings?.mode === "desktop_local_folder" ? "local" : "cloud";
 
 	const cloudContent = (
 		<>
@@ -1401,8 +1406,8 @@ function AuthenticatedDocumentsSidebar({
 					<AlertDialogHeader>
 						<AlertDialogTitle>Trust this workspace?</AlertDialogTitle>
 						<AlertDialogDescription>
-							Local mode can read and edit files inside the folders you select. Continue only if
-							you trust this workspace and its contents.
+							Local mode can read and edit files inside the folders you select. Continue only if you
+							trust this workspace and its contents.
 						</AlertDialogDescription>
 						{pendingLocalPath && (
 							<AlertDialogDescription className="mt-1 whitespace-pre-wrap break-words font-mono text-xs">
diff --git a/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx b/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
index 5b08f2e37..93227054b 100644
--- a/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
+++ b/surfsense_web/components/layout/ui/sidebar/LocalFilesystemBrowser.tsx
@@ -273,7 +273,10 @@ export function LocalFilesystemBrowser({
 				const mount = mountByRootKey.get(rootKey);
 				if (!state || state.loading) {
 					return (
-						<div key={rootPath} className="flex h-16 items-center gap-2 px-3 text-sm text-muted-foreground">
+						<div
+							key={rootPath}
+							className="flex h-16 items-center gap-2 px-3 text-sm text-muted-foreground"
+						>
 							<Spinner size="sm" />
 							<span>Loading {getFolderDisplayName(rootPath)}...</span>
 						</div>
@@ -281,7 +284,10 @@ export function LocalFilesystemBrowser({
 				}
 				if (state.error) {
 					return (
-						<div key={rootPath} className="rounded-md border border-destructive/20 bg-destructive/5 p-3">
+						<div
+							key={rootPath}
+							className="rounded-md border border-destructive/20 bg-destructive/5 p-3"
+						>
 							<p className="text-sm font-medium text-destructive">Failed to load local folder</p>
 							<p className="mt-1 text-xs text-muted-foreground">{state.error}</p>
 						</div>
diff --git a/surfsense_web/components/settings/user-settings-dialog.tsx b/surfsense_web/components/settings/user-settings-dialog.tsx
index cc36392ae..6740aad92 100644
--- a/surfsense_web/components/settings/user-settings-dialog.tsx
+++ b/surfsense_web/components/settings/user-settings-dialog.tsx
@@ -1,7 +1,16 @@
 "use client";
 
 import { useAtom } from "jotai";
-import { Brain, CircleUser, Globe, Keyboard, KeyRound, Monitor, ReceiptText, Sparkles } from "lucide-react";
+import {
+	Brain,
+	CircleUser,
+	Globe,
+	Keyboard,
+	KeyRound,
+	Monitor,
+	ReceiptText,
+	Sparkles,
+} from "lucide-react";
 import dynamic from "next/dynamic";
 import { useTranslations } from "next-intl";
 import { useMemo } from "react";
@@ -53,9 +62,9 @@ const DesktopContent = dynamic(
 );
 const DesktopShortcutsContent = dynamic(
 	() =>
-		import("@/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent").then(
-			(m) => ({ default: m.DesktopShortcutsContent })
-		),
+		import(
+			"@/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent"
+		).then((m) => ({ default: m.DesktopShortcutsContent })),
 	{ ssr: false }
 );
 const MemoryContent = dynamic(
diff --git a/surfsense_web/components/tool-ui/generic-hitl-approval.tsx b/surfsense_web/components/tool-ui/generic-hitl-approval.tsx
index c83bf55d5..ceb1d0209 100644
--- a/surfsense_web/components/tool-ui/generic-hitl-approval.tsx
+++ b/surfsense_web/components/tool-ui/generic-hitl-approval.tsx
@@ -118,7 +118,9 @@ function GenericApprovalCard({
 		setProcessing();
 		onDecision({ type: "approve" });
 		connectorsApiService.trustMCPTool(mcpConnectorId, toolName).catch(() => {
-			toast.error("Failed to save 'Always Allow' preference. The tool will still require approval next time.");
+			toast.error(
+				"Failed to save 'Always Allow' preference. The tool will still require approval next time."
+			);
 		});
 	}, [phase, setProcessing, onDecision, isMCPTool, mcpConnectorId, toolName]);
 
diff --git a/surfsense_web/components/tool-ui/google-calendar/create-event.tsx b/surfsense_web/components/tool-ui/google-calendar/create-event.tsx
index 9427c989b..523be31f6 100644
--- a/surfsense_web/components/tool-ui/google-calendar/create-event.tsx
+++ b/surfsense_web/components/tool-ui/google-calendar/create-event.tsx
@@ -2,7 +2,14 @@
 
 import type { ToolCallMessagePartProps } from "@assistant-ui/react";
 import { useSetAtom } from "jotai";
-import { ClockIcon, CornerDownLeftIcon, GlobeIcon, MapPinIcon, Pencil, UsersIcon } from "lucide-react";
+import {
+	ClockIcon,
+	CornerDownLeftIcon,
+	GlobeIcon,
+	MapPinIcon,
+	Pencil,
+	UsersIcon,
+} from "lucide-react";
 import { useCallback, useEffect, useMemo, useState } from "react";
 import type { ExtraField } from "@/atoms/chat/hitl-edit-panel.atom";
 import { openHitlEditPanelAtom } from "@/atoms/chat/hitl-edit-panel.atom";
diff --git a/surfsense_web/contracts/enums/toolIcons.tsx b/surfsense_web/contracts/enums/toolIcons.tsx
index 3bc639d33..bc63bc1b0 100644
--- a/surfsense_web/contracts/enums/toolIcons.tsx
+++ b/surfsense_web/contracts/enums/toolIcons.tsx
@@ -1,8 +1,8 @@
 import {
 	BookOpen,
 	Brain,
-	FileUser,
 	FileText,
+	FileUser,
 	Film,
 	Globe,
 	ImageIcon,

From ba25c68c0d9b237202f19d3aa8352dab96ec8110 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 20:43:04 +0200
Subject: [PATCH 11/31] Restore default desktop shortcuts and Linux pack
 scripts

---
 surfsense_desktop/package.json                     |  3 ++-
 surfsense_desktop/src/modules/shortcuts.ts         | 14 ++++++++++++--
 .../components/desktop/shortcut-recorder.tsx       |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/surfsense_desktop/package.json b/surfsense_desktop/package.json
index 7f787c373..e2712d8ea 100644
--- a/surfsense_desktop/package.json
+++ b/surfsense_desktop/package.json
@@ -7,10 +7,11 @@
     "dev": "pnpm build && concurrently -k \"pnpm --dir ../surfsense_web dev\" \"wait-on http://localhost:3000 && node scripts/electron-dev.mjs\"",
     "build": "node scripts/build-electron.mjs",
     "pack:dir": "pnpm build && electron-builder --dir --config electron-builder.yml",
+    "pack:dir:linux": "pnpm build && electron-builder --dir --linux --config electron-builder.yml -c.npmRebuild=false",
     "dist": "pnpm build && electron-builder --config electron-builder.yml",
     "dist:mac": "pnpm build && electron-builder --mac --config electron-builder.yml",
     "dist:win": "pnpm build && electron-builder --win --config electron-builder.yml",
-    "dist:linux": "pnpm build && electron-builder --linux --config electron-builder.yml",
+    "dist:linux": "pnpm build && electron-builder --linux --config electron-builder.yml -c.npmRebuild=false",
     "typecheck": "tsc --noEmit",
     "postinstall": "node scripts/postinstall-rebuild.mjs"
   },
diff --git a/surfsense_desktop/src/modules/shortcuts.ts b/surfsense_desktop/src/modules/shortcuts.ts
index 0b122a2a2..3eb3ca5c9 100644
--- a/surfsense_desktop/src/modules/shortcuts.ts
+++ b/surfsense_desktop/src/modules/shortcuts.ts
@@ -4,8 +4,8 @@ export interface ShortcutConfig {
 }
 
 const DEFAULTS: ShortcutConfig = {
-  generalAssist: 'Alt+Shift+G',
-  quickAsk: 'Alt+Shift+Q',
+  generalAssist: 'CommandOrControl+Shift+S',
+  quickAsk: 'CommandOrControl+Alt+S',
 };
 
 const STORE_KEY = 'shortcuts';
@@ -23,10 +23,20 @@ async function getStore() {
   return store;
 }
 
+/** One-time fix if both shortcuts match the mistaken Alt+Shift pair. */
+function wasRegressionAltPair(rest: Record<string, string>): boolean {
+  return rest.generalAssist === 'Alt+Shift+G' && rest.quickAsk === 'Alt+Shift+Q';
+}
+
 export async function getShortcuts(): Promise<ShortcutConfig> {
   const s = await getStore();
   const raw = (s.get(STORE_KEY) as Record<string, string> | undefined) ?? {};
   const { autocomplete: _drop, ...rest } = raw;
+  if (wasRegressionAltPair(rest)) {
+    const fixed = { ...DEFAULTS };
+    s.set(STORE_KEY, { ...fixed });
+    return fixed;
+  }
   return { ...DEFAULTS, ...rest };
 }
 
diff --git a/surfsense_web/components/desktop/shortcut-recorder.tsx b/surfsense_web/components/desktop/shortcut-recorder.tsx
index 50ced5313..119cd298f 100644
--- a/surfsense_web/components/desktop/shortcut-recorder.tsx
+++ b/surfsense_web/components/desktop/shortcut-recorder.tsx
@@ -36,8 +36,8 @@ export function acceleratorToDisplay(accel: string): string[] {
 }
 
 export const DEFAULT_SHORTCUTS = {
-	generalAssist: "Alt+Shift+G",
-	quickAsk: "Alt+Shift+Q",
+	generalAssist: "CommandOrControl+Shift+S",
+	quickAsk: "CommandOrControl+Alt+S",
 };
 
 // ---------------------------------------------------------------------------

From 18108267d1be639fcd54000de4257186e4ffa054 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Fri, 24 Apr 2026 20:58:39 +0200
Subject: [PATCH 12/31] Defer clearing pending chat screenshots until send
 commits

---
 .../[search_space_id]/new-chat/[[...chat_id]]/page.tsx       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index fe23cb2c7..da134c4cf 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -499,7 +499,6 @@ export default function NewChatPage() {
 			}
 
 			const urlsSnapshot = [...pendingUserImageUrls];
-			setPendingUserImageUrls([]);
 			const { userQuery, userImages } = extractUserTurnForNewChatApi(message, urlsSnapshot);
 
 			if (!userQuery.trim() && userImages.length === 0) return;
@@ -544,6 +543,10 @@ export default function NewChatPage() {
 				}
 			}
 
+			if (urlsSnapshot.length > 0) {
+				setPendingUserImageUrls((prev) => prev.filter((u) => !urlsSnapshot.includes(u)));
+			}
+
 			// Add user message to state
 			const userMsgId = `msg-user-${Date.now()}`;
 

From 62b9e328b4b87fe4122eb3d179c314d9a5d964fe Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:15 +0200
Subject: [PATCH 13/31] Add desktop IPC, preload, and window types for chat
 screen capture and full-screen capture.

---
 surfsense_desktop/src/ipc/channels.ts |  1 +
 surfsense_desktop/src/preload.ts      |  1 +
 surfsense_web/types/window.d.ts       | 15 ++++++++++++---
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/surfsense_desktop/src/ipc/channels.ts b/surfsense_desktop/src/ipc/channels.ts
index 69fb89419..9f084af85 100644
--- a/surfsense_desktop/src/ipc/channels.ts
+++ b/surfsense_desktop/src/ipc/channels.ts
@@ -11,6 +11,7 @@ export const IPC_CHANNELS = {
   REQUEST_ACCESSIBILITY: 'request-accessibility',
   REQUEST_SCREEN_RECORDING: 'request-screen-recording',
   RESTART_APP: 'restart-app',
+  CAPTURE_FULL_SCREEN: 'capture-full-screen',
   SCREEN_REGION_SUBMIT: 'screen-region:submit',
   SCREEN_REGION_CANCEL: 'screen-region:cancel',
   CHAT_SCREEN_CAPTURE: 'chat:screen-capture',
diff --git a/surfsense_desktop/src/preload.ts b/surfsense_desktop/src/preload.ts
index 087cabd75..7ce2cbcf8 100644
--- a/surfsense_desktop/src/preload.ts
+++ b/surfsense_desktop/src/preload.ts
@@ -32,6 +32,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   getPermissionsStatus: () => ipcRenderer.invoke(IPC_CHANNELS.GET_PERMISSIONS_STATUS),
   requestAccessibility: () => ipcRenderer.invoke(IPC_CHANNELS.REQUEST_ACCESSIBILITY),
   requestScreenRecording: () => ipcRenderer.invoke(IPC_CHANNELS.REQUEST_SCREEN_RECORDING),
+  captureFullScreen: () => ipcRenderer.invoke(IPC_CHANNELS.CAPTURE_FULL_SCREEN),
   restartApp: () => ipcRenderer.invoke(IPC_CHANNELS.RESTART_APP),
   // Folder sync
   selectFolder: () => ipcRenderer.invoke(IPC_CHANNELS.FOLDER_SYNC_SELECT_FOLDER),
diff --git a/surfsense_web/types/window.d.ts b/surfsense_web/types/window.d.ts
index a8f02fd20..ea55743db 100644
--- a/surfsense_web/types/window.d.ts
+++ b/surfsense_web/types/window.d.ts
@@ -83,6 +83,7 @@ interface ElectronAPI {
 	}>;
 	requestAccessibility: () => Promise<void>;
 	requestScreenRecording: () => Promise<void>;
+	captureFullScreen: () => Promise<string | null>;
 	restartApp: () => Promise<void>;
 	// Folder sync
 	selectFolder: () => Promise<string | null>;
@@ -108,10 +109,18 @@ interface ElectronAPI {
 	getAuthTokens: () => Promise<{ bearer: string; refresh: string } | null>;
 	setAuthTokens: (bearer: string, refresh: string) => Promise<void>;
 	// Keyboard shortcut configuration
-	getShortcuts: () => Promise<{ generalAssist: string; quickAsk: string }>;
+	getShortcuts: () => Promise<{
+		generalAssist: string;
+		quickAsk: string;
+		screenshotAssist: string;
+	}>;
 	setShortcuts: (
-		config: Partial<{ generalAssist: string; quickAsk: string }>
-	) => Promise<{ generalAssist: string; quickAsk: string }>;
+		config: Partial<{ generalAssist: string; quickAsk: string; screenshotAssist: string }>
+	) => Promise<{
+		generalAssist: string;
+		quickAsk: string;
+		screenshotAssist: string;
+	}>;
 	// Launch on system startup
 	getAutoLaunch: () => Promise<{
 		enabled: boolean;

From d212422bf5bea6dcbc7bf3a8c399b6503462b38b Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:20 +0200
Subject: [PATCH 14/31] Add full-screen display capture alongside the region
 picker for desktop chat.

---
 .../src/modules/screen-region-picker.ts          | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/surfsense_desktop/src/modules/screen-region-picker.ts b/surfsense_desktop/src/modules/screen-region-picker.ts
index 0a924eec9..cc9303040 100644
--- a/surfsense_desktop/src/modules/screen-region-picker.ts
+++ b/surfsense_desktop/src/modules/screen-region-picker.ts
@@ -6,11 +6,13 @@ import { IPC_CHANNELS } from '../ipc/channels';
 
 let pickInProgress = false;
 
-async function captureDisplayDataUrl(display: Electron.Display): Promise<{
+type DisplayCaptureSnapshot = {
   dataUrl: string;
   width: number;
   height: number;
-} | null> {
+};
+
+async function captureDisplaySnapshot(display: Electron.Display): Promise<DisplayCaptureSnapshot | null> {
   try {
     const sf = display.scaleFactor || 1;
     const tw = Math.max(1, Math.round(display.size.width * sf));
@@ -37,6 +39,12 @@ async function captureDisplayDataUrl(display: Electron.Display): Promise<{
   }
 }
 
+export async function captureCurrentDisplayDataUrl(): Promise<string | null> {
+  const display = screen.getDisplayNearestPoint(screen.getCursorScreenPoint());
+  const snapshot = await captureDisplaySnapshot(display);
+  return snapshot?.dataUrl ?? null;
+}
+
 function buildInjectScript(dataUrl: string, iw: number, ih: number): string {
   return `(() => {
     const api = window.surfsenseScreenRegion;
@@ -166,7 +174,7 @@ export function pickScreenRegion(): Promise<string | null> {
       resolve(result);
     };
 
-    let snapshot: { dataUrl: string; width: number; height: number } | null = null;
+    let snapshot: DisplayCaptureSnapshot | null = null;
 
     const onSubmit = (
       _event: Electron.IpcMainEvent,
@@ -206,7 +214,7 @@ export function pickScreenRegion(): Promise<string | null> {
       }
     };
 
-    void captureDisplayDataUrl(display)
+    void captureDisplaySnapshot(display)
       .then((cap) => {
         if (!cap) {
           finish(null);

From 7145a15149130b16890b1c31e43d3a8372f5f5c8 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:24 +0200
Subject: [PATCH 15/31] Add Screenshot Assist shortcut flow: show window, pick
 region, send data URL to chat.

---
 .../src/modules/screenshot-assist.ts          | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 surfsense_desktop/src/modules/screenshot-assist.ts

diff --git a/surfsense_desktop/src/modules/screenshot-assist.ts b/surfsense_desktop/src/modules/screenshot-assist.ts
new file mode 100644
index 000000000..2500bf1d5
--- /dev/null
+++ b/surfsense_desktop/src/modules/screenshot-assist.ts
@@ -0,0 +1,20 @@
+import { IPC_CHANNELS } from '../ipc/channels';
+import { trackEvent } from './analytics';
+import { pickScreenRegion } from './screen-region-picker';
+import { getMainWindow, showMainWindow } from './window';
+import { hasScreenRecordingPermission, requestScreenRecording } from './permissions';
+
+export async function runScreenshotAssistShortcut(): Promise<void> {
+  showMainWindow('shortcut');
+  await new Promise((r) => setTimeout(r, 400));
+  if (!hasScreenRecordingPermission()) {
+    requestScreenRecording();
+    return;
+  }
+  const url = await pickScreenRegion();
+  const mw = getMainWindow();
+  if (url && mw && !mw.isDestroyed()) {
+    mw.webContents.send(IPC_CHANNELS.CHAT_SCREEN_CAPTURE, url);
+    trackEvent('desktop_screenshot_assist_region_to_chat', {});
+  }
+}

From 24a5a06f215719278e3fde85f9082ec0271ab20c Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:27 +0200
Subject: [PATCH 16/31] Make General Assist only focus the main window, without
 region capture.

---
 .../src/modules/general-assist.ts             | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/surfsense_desktop/src/modules/general-assist.ts b/surfsense_desktop/src/modules/general-assist.ts
index 9d39f068a..7d202caa2 100644
--- a/surfsense_desktop/src/modules/general-assist.ts
+++ b/surfsense_desktop/src/modules/general-assist.ts
@@ -1,21 +1,5 @@
-import { IPC_CHANNELS } from '../ipc/channels';
-import { trackEvent } from './analytics';
-import { pickScreenRegion } from './screen-region-picker';
-import { getMainWindow, showMainWindow } from './window';
-import { hasScreenRecordingPermission, requestScreenRecording } from './permissions';
+import { showMainWindow } from './window';
 
-export async function runGeneralAssistShortcut(): Promise<void> {
-  console.log('[general-assist] Shortcut triggered');
+export function runGeneralAssistShortcut(): void {
   showMainWindow('shortcut');
-  await new Promise((r) => setTimeout(r, 400));
-  if (!hasScreenRecordingPermission()) {
-    requestScreenRecording();
-    return;
-  }
-  const url = await pickScreenRegion();
-  const mw = getMainWindow();
-  if (url && mw && !mw.isDestroyed()) {
-    mw.webContents.send(IPC_CHANNELS.CHAT_SCREEN_CAPTURE, url);
-    trackEvent('desktop_screen_region_to_chat', {});
-  }
 }

From f489fee2e8b91abedb6d9a30d08dfd754fa99a30 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:30 +0200
Subject: [PATCH 17/31] Register General Assist and Screenshot Assist as two
 independent global shortcuts.

---
 surfsense_desktop/src/modules/tray.ts | 70 ++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 17 deletions(-)

diff --git a/surfsense_desktop/src/modules/tray.ts b/surfsense_desktop/src/modules/tray.ts
index 97d6146e8..07b53bafb 100644
--- a/surfsense_desktop/src/modules/tray.ts
+++ b/surfsense_desktop/src/modules/tray.ts
@@ -1,12 +1,14 @@
 import { app, globalShortcut, Menu, nativeImage, Tray, type NativeImage } from 'electron';
 import path from 'path';
 import { runGeneralAssistShortcut } from './general-assist';
+import { runScreenshotAssistShortcut } from './screenshot-assist';
 import { showMainWindow } from './window';
 import { getShortcuts } from './shortcuts';
 import { trackEvent } from './analytics';
 
 let tray: Tray | null = null;
-let currentShortcut: string | null = null;
+let registeredGeneralAssist: string | null = null;
+let registeredScreenshotAssist: string | null = null;
 
 function getTrayIcon(): NativeImage {
   const iconName = process.platform === 'win32' ? 'icon.ico' : 'icon.png';
@@ -17,25 +19,29 @@ function getTrayIcon(): NativeImage {
   return img.resize({ width: 16, height: 16 });
 }
 
-function registerShortcut(accelerator: string): void {
-  if (currentShortcut) {
-    globalShortcut.unregister(currentShortcut);
-    currentShortcut = null;
+function registerOne(
+  previous: string | null,
+  accelerator: string,
+  onFire: () => void | Promise<void>,
+  label: string
+): string | null {
+  if (previous) {
+    globalShortcut.unregister(previous);
   }
-  if (!accelerator) return;
+  if (!accelerator) return null;
   try {
     const ok = globalShortcut.register(accelerator, () => {
-      void runGeneralAssistShortcut();
+      void Promise.resolve(onFire());
     });
     if (ok) {
-      currentShortcut = accelerator;
-      console.log(`[general-assist] Register ${accelerator}: OK`);
-    } else {
-      console.warn(`[general-assist] Register ${accelerator}: FAILED (OS or another app may own this chord)`);
+      console.log(`[hotkeys] Register ${label} ${accelerator}: OK`);
+      return accelerator;
     }
+    console.warn(`[hotkeys] Register ${label} ${accelerator}: FAILED (OS or another app may own this chord)`);
   } catch (err) {
-    console.error(`[tray] Error registering General Assist shortcut:`, err);
+    console.error(`[tray] Error registering ${label} shortcut:`, err);
   }
+  return null;
 }
 
 export async function createTray(): Promise<void> {
@@ -60,18 +66,48 @@ export async function createTray(): Promise<void> {
   tray.on('double-click', () => showMainWindow('tray_click'));
 
   const shortcuts = await getShortcuts();
-  registerShortcut(shortcuts.generalAssist);
+  registeredGeneralAssist = registerOne(
+    null,
+    shortcuts.generalAssist,
+    runGeneralAssistShortcut,
+    'General Assist'
+  );
+  registeredScreenshotAssist = registerOne(
+    null,
+    shortcuts.screenshotAssist,
+    runScreenshotAssistShortcut,
+    'Screenshot Assist'
+  );
 }
 
 export async function reregisterGeneralAssist(): Promise<void> {
   const shortcuts = await getShortcuts();
-  registerShortcut(shortcuts.generalAssist);
+  registeredGeneralAssist = registerOne(
+    registeredGeneralAssist,
+    shortcuts.generalAssist,
+    runGeneralAssistShortcut,
+    'General Assist'
+  );
+}
+
+export async function reregisterScreenshotAssist(): Promise<void> {
+  const shortcuts = await getShortcuts();
+  registeredScreenshotAssist = registerOne(
+    registeredScreenshotAssist,
+    shortcuts.screenshotAssist,
+    runScreenshotAssistShortcut,
+    'Screenshot Assist'
+  );
 }
 
 export function destroyTray(): void {
-  if (currentShortcut) {
-    globalShortcut.unregister(currentShortcut);
-    currentShortcut = null;
+  if (registeredGeneralAssist) {
+    globalShortcut.unregister(registeredGeneralAssist);
+    registeredGeneralAssist = null;
+  }
+  if (registeredScreenshotAssist) {
+    globalShortcut.unregister(registeredScreenshotAssist);
+    registeredScreenshotAssist = null;
   }
   tray?.destroy();
   tray = null;

From 1c7362d9c680bd4d1c91e264ee77c1f9dc5b7421 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:33 +0200
Subject: [PATCH 18/31] Handle full-screen capture IPC and reregister
 Screenshot Assist when its shortcut changes.

---
 surfsense_desktop/src/ipc/handlers.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/surfsense_desktop/src/ipc/handlers.ts b/surfsense_desktop/src/ipc/handlers.ts
index 5f55dccf6..8361b9a38 100644
--- a/surfsense_desktop/src/ipc/handlers.ts
+++ b/surfsense_desktop/src/ipc/handlers.ts
@@ -2,10 +2,12 @@ import { app, ipcMain, shell } from 'electron';
 import { IPC_CHANNELS } from './channels';
 import {
   getPermissionsStatus,
+  hasScreenRecordingPermission,
   requestAccessibility,
   requestScreenRecording,
   restartApp,
 } from '../modules/permissions';
+import { captureCurrentDisplayDataUrl } from '../modules/screen-region-picker';
 import {
   selectFolder,
   addWatchedFolder,
@@ -27,7 +29,7 @@ import { getShortcuts, setShortcuts, type ShortcutConfig } from '../modules/shor
 import { getAutoLaunchState, setAutoLaunch } from '../modules/auto-launch';
 import { getActiveSearchSpaceId, setActiveSearchSpaceId } from '../modules/active-search-space';
 import { reregisterQuickAsk } from '../modules/quick-ask';
-import { reregisterGeneralAssist } from '../modules/tray';
+import { reregisterGeneralAssist, reregisterScreenshotAssist } from '../modules/tray';
 import {
   getDistinctId,
   getMachineId,
@@ -78,6 +80,14 @@ export function registerIpcHandlers(): void {
     restartApp();
   });
 
+  ipcMain.handle(IPC_CHANNELS.CAPTURE_FULL_SCREEN, async () => {
+    if (!hasScreenRecordingPermission()) {
+      requestScreenRecording();
+      return null;
+    }
+    return captureCurrentDisplayDataUrl();
+  });
+
   // Folder sync handlers
   ipcMain.handle(IPC_CHANNELS.FOLDER_SYNC_SELECT_FOLDER, () => selectFolder());
 
@@ -182,6 +192,7 @@ export function registerIpcHandlers(): void {
   ipcMain.handle(IPC_CHANNELS.SET_SHORTCUTS, async (_event, config: Partial<ShortcutConfig>) => {
     const updated = await setShortcuts(config);
     if (config.generalAssist) await reregisterGeneralAssist();
+    if (config.screenshotAssist) await reregisterScreenshotAssist();
     if (config.quickAsk) await reregisterQuickAsk();
     trackEvent('desktop_shortcut_updated', {
       keys: Object.keys(config),

From df952ffa2812dbfd66a2207af0e3c81d691a7e9a Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:36 +0200
Subject: [PATCH 19/31] Add Screenshot Assist to stored shortcuts, default to
 Shift+Space, and migrate legacy autocomplete.

---
 surfsense_desktop/src/modules/shortcuts.ts | 26 +++++++++++++---------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/surfsense_desktop/src/modules/shortcuts.ts b/surfsense_desktop/src/modules/shortcuts.ts
index 3eb3ca5c9..64687f7db 100644
--- a/surfsense_desktop/src/modules/shortcuts.ts
+++ b/surfsense_desktop/src/modules/shortcuts.ts
@@ -1,11 +1,13 @@
 export interface ShortcutConfig {
   generalAssist: string;
   quickAsk: string;
+  screenshotAssist: string;
 }
 
 const DEFAULTS: ShortcutConfig = {
   generalAssist: 'CommandOrControl+Shift+S',
   quickAsk: 'CommandOrControl+Alt+S',
+  screenshotAssist: 'CommandOrControl+Shift+Space',
 };
 
 const STORE_KEY = 'shortcuts';
@@ -23,21 +25,25 @@ async function getStore() {
   return store;
 }
 
-/** One-time fix if both shortcuts match the mistaken Alt+Shift pair. */
-function wasRegressionAltPair(rest: Record<string, string>): boolean {
-  return rest.generalAssist === 'Alt+Shift+G' && rest.quickAsk === 'Alt+Shift+Q';
-}
-
 export async function getShortcuts(): Promise<ShortcutConfig> {
   const s = await getStore();
   const raw = (s.get(STORE_KEY) as Record<string, string> | undefined) ?? {};
+  const legacyAutocomplete = raw.autocomplete;
   const { autocomplete: _drop, ...rest } = raw;
-  if (wasRegressionAltPair(rest)) {
-    const fixed = { ...DEFAULTS };
-    s.set(STORE_KEY, { ...fixed });
-    return fixed;
+  let merged: ShortcutConfig = { ...DEFAULTS, ...rest };
+  if (
+    typeof legacyAutocomplete === 'string' &&
+    legacyAutocomplete.length > 0 &&
+    !('screenshotAssist' in raw)
+  ) {
+    merged = { ...merged, screenshotAssist: legacyAutocomplete };
+    s.set(STORE_KEY, {
+      generalAssist: merged.generalAssist,
+      quickAsk: merged.quickAsk,
+      screenshotAssist: merged.screenshotAssist,
+    });
   }
-  return { ...DEFAULTS, ...rest };
+  return merged;
 }
 
 export async function setShortcuts(config: Partial<ShortcutConfig>): Promise<ShortcutConfig> {

From 97488218db75fba1e6aaf1b4c28b5fd7af3dfdf3 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:40 +0200
Subject: [PATCH 20/31] Expose Screenshot Assist in desktop login and settings
 with shared shortcut defaults.

---
 .../user-settings/components/DesktopContent.tsx        |  3 ++-
 .../components/DesktopShortcutsContent.tsx             |  5 +++--
 surfsense_web/app/desktop/login/page.tsx               | 10 ++++++++--
 surfsense_web/components/desktop/shortcut-recorder.tsx |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
index 4ce6f386c..3368066c1 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopContent.tsx
@@ -129,7 +129,8 @@ export function DesktopContent() {
 				<CardHeader className="px-3 md:px-6 pt-3 md:pt-6 pb-2 md:pb-3">
 					<CardTitle className="text-base md:text-lg">Default Search Space</CardTitle>
 					<CardDescription className="text-xs md:text-sm">
-						Choose which search space General Assist and Quick Assist use by default.
+						Choose which search space General Assist, Screenshot Assist, and Quick Assist use by
+						default.
 					</CardDescription>
 				</CardHeader>
 				<CardContent className="px-3 md:px-6 pb-3 md:pb-6">
diff --git a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
index 0b7f330d9..f1679cb15 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/user-settings/components/DesktopShortcutsContent.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import { Rocket, RotateCcw, Zap } from "lucide-react";
+import { Crop, Rocket, RotateCcw, Zap } from "lucide-react";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 import { DEFAULT_SHORTCUTS, keyEventToAccelerator } from "@/components/desktop/shortcut-recorder";
@@ -9,11 +9,12 @@ import { ShortcutKbd } from "@/components/ui/shortcut-kbd";
 import { Spinner } from "@/components/ui/spinner";
 import { useElectronAPI } from "@/hooks/use-platform";
 
-type ShortcutKey = "generalAssist" | "quickAsk";
+type ShortcutKey = "generalAssist" | "quickAsk" | "screenshotAssist";
 type ShortcutMap = typeof DEFAULT_SHORTCUTS;
 
 const HOTKEY_ROWS: Array<{ key: ShortcutKey; label: string; icon: React.ElementType }> = [
 	{ key: "generalAssist", label: "General Assist", icon: Rocket },
+	{ key: "screenshotAssist", label: "Screenshot Assist", icon: Crop },
 	{ key: "quickAsk", label: "Quick Assist", icon: Zap },
 ];
 
diff --git a/surfsense_web/app/desktop/login/page.tsx b/surfsense_web/app/desktop/login/page.tsx
index edb6cffab..c8ec4dfce 100644
--- a/surfsense_web/app/desktop/login/page.tsx
+++ b/surfsense_web/app/desktop/login/page.tsx
@@ -2,7 +2,7 @@
 
 import { IconBrandGoogleFilled } from "@tabler/icons-react";
 import { useAtom } from "jotai";
-import { Eye, EyeOff, Rocket, RotateCcw, Zap } from "lucide-react";
+import { Crop, Eye, EyeOff, Rocket, RotateCcw, Zap } from "lucide-react";
 import Image from "next/image";
 import { useRouter } from "next/navigation";
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
@@ -21,7 +21,7 @@ import { setBearerToken } from "@/lib/auth-utils";
 import { AUTH_TYPE, BACKEND_URL } from "@/lib/env-config";
 
 const isGoogleAuth = AUTH_TYPE === "GOOGLE";
-type ShortcutKey = "generalAssist" | "quickAsk";
+type ShortcutKey = "generalAssist" | "quickAsk" | "screenshotAssist";
 type ShortcutMap = typeof DEFAULT_SHORTCUTS;
 
 const HOTKEY_ROWS: Array<{
@@ -36,6 +36,12 @@ const HOTKEY_ROWS: Array<{
 		description: "Launch SurfSense instantly from any application",
 		icon: Rocket,
 	},
+	{
+		key: "screenshotAssist",
+		label: "Screenshot Assist",
+		description: "Draw a region on screen to attach that capture to chat",
+		icon: Crop,
+	},
 	{
 		key: "quickAsk",
 		label: "Quick Assist",
diff --git a/surfsense_web/components/desktop/shortcut-recorder.tsx b/surfsense_web/components/desktop/shortcut-recorder.tsx
index 119cd298f..388bb1bf8 100644
--- a/surfsense_web/components/desktop/shortcut-recorder.tsx
+++ b/surfsense_web/components/desktop/shortcut-recorder.tsx
@@ -38,6 +38,7 @@ export function acceleratorToDisplay(accel: string): string[] {
 export const DEFAULT_SHORTCUTS = {
 	generalAssist: "CommandOrControl+Shift+S",
 	quickAsk: "CommandOrControl+Alt+S",
+	screenshotAssist: "CommandOrControl+Shift+Space",
 };
 
 // ---------------------------------------------------------------------------

From d310663993e35748b21c290c4fa6f49118c64cb6 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:43 +0200
Subject: [PATCH 21/31] Wire Electron chat thread to screen capture events and
 full-screen capture from the composer.

---
 .../components/assistant-ui/thread.tsx        | 33 +++++++++----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/surfsense_web/components/assistant-ui/thread.tsx b/surfsense_web/components/assistant-ui/thread.tsx
index 6862662f2..e7ae2f471 100644
--- a/surfsense_web/components/assistant-ui/thread.tsx
+++ b/surfsense_web/components/assistant-ui/thread.tsx
@@ -12,11 +12,11 @@ import {
 	AlertCircle,
 	ArrowDownIcon,
 	ArrowUpIcon,
+	Camera,
 	ChevronDown,
 	ChevronUp,
 	Clipboard,
 	Dot,
-	Camera,
 	Globe,
 	Plus,
 	Settings2,
@@ -803,9 +803,11 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 		isComposerTextEmpty && mentionedDocuments.length === 0 && pendingScreenImages.length === 0;
 
 	const handleScreenCapture = useCallback(async () => {
-		const url = await captureDisplayToPngDataUrl();
+		const url = electronAPI?.captureFullScreen
+			? await electronAPI.captureFullScreen()
+			: await captureDisplayToPngDataUrl();
 		if (url) setPendingScreenImages((prev) => [...prev, url]);
-	}, [setPendingScreenImages]);
+	}, [electronAPI, setPendingScreenImages]);
 
 	const { data: userConfigs } = useAtomValue(newLLMConfigsAtom);
 	const { data: globalConfigs } = useAtomValue(globalNewLLMConfigsAtom);
@@ -1241,20 +1243,17 @@ const ComposerAction: FC<ComposerActionProps> = ({ isBlockedByOtherUser = false
 				</div>
 			)}
 			<div className="flex items-center gap-2">
-				{/* Electron: native shortcut → pending images; skip in-webview getDisplayMedia. */}
-				{!electronAPI && (
-					<TooltipIconButton
-						tooltip="Capture screen"
-						type="button"
-						variant="ghost"
-						size="icon"
-						className="size-8 rounded-full"
-						aria-label="Capture screen"
-						onClick={() => void handleScreenCapture()}
-					>
-						<Camera className="size-4" />
-					</TooltipIconButton>
-				)}
+				<TooltipIconButton
+					tooltip="Capture screen"
+					type="button"
+					variant="ghost"
+					size="icon"
+					className="size-8 rounded-full"
+					aria-label="Capture screen"
+					onClick={() => void handleScreenCapture()}
+				>
+					<Camera className="size-4" />
+				</TooltipIconButton>
 				<AuiIf condition={({ thread }) => !thread.isRunning}>
 					<ComposerPrimitive.Send asChild disabled={isSendDisabled}>
 						<TooltipIconButton

From d184fd796a343249af9ee3505853ed1a4d07ca3e Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:50 +0200
Subject: [PATCH 22/31] Rename homepage tutorial media to screenshot assist and
 point the hero tab at the new asset.

---
 surfsense_web/components/homepage/hero-section.tsx  |   6 +++---
 .../{extreme_assist.gif => screenshot_assist.gif}   | Bin
 .../{extreme_assist.mp4 => screenshot_assist.mp4}   | Bin
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename surfsense_web/public/homepage/hero_tutorial/{extreme_assist.gif => screenshot_assist.gif} (100%)
 rename surfsense_web/public/homepage/hero_tutorial/{extreme_assist.mp4 => screenshot_assist.mp4} (100%)

diff --git a/surfsense_web/components/homepage/hero-section.tsx b/surfsense_web/components/homepage/hero-section.tsx
index a29d02882..ec09fa34d 100644
--- a/surfsense_web/components/homepage/hero-section.tsx
+++ b/surfsense_web/components/homepage/hero-section.tsx
@@ -63,10 +63,10 @@ const TAB_ITEMS = [
 		featured: true,
 	},
 	{
-		title: "Screen capture in chat",
+		title: "Screenshot Assist",
 		description:
-			"Capture your screen and send it with your message so the AI can see what you see.",
-		src: "/homepage/hero_tutorial/extreme_assist.mp4",
+			"Use a global shortcut to select a region on your screen and attach it to your chat message.",
+		src: "/homepage/hero_tutorial/screenshot_assist.mp4",
 		featured: true,
 	},
 	{
diff --git a/surfsense_web/public/homepage/hero_tutorial/extreme_assist.gif b/surfsense_web/public/homepage/hero_tutorial/screenshot_assist.gif
similarity index 100%
rename from surfsense_web/public/homepage/hero_tutorial/extreme_assist.gif
rename to surfsense_web/public/homepage/hero_tutorial/screenshot_assist.gif
diff --git a/surfsense_web/public/homepage/hero_tutorial/extreme_assist.mp4 b/surfsense_web/public/homepage/hero_tutorial/screenshot_assist.mp4
similarity index 100%
rename from surfsense_web/public/homepage/hero_tutorial/extreme_assist.mp4
rename to surfsense_web/public/homepage/hero_tutorial/screenshot_assist.mp4

From 36d891d41316c98a3beec847006a6195a171e91b Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:49:54 +0200
Subject: [PATCH 23/31] Update READMEs in all languages to describe Screenshot
 Assist instead of Extreme Assist.

---
 README.es.md    | 10 +++++-----
 README.hi.md    | 10 +++++-----
 README.md       | 10 +++++-----
 README.pt-BR.md | 10 +++++-----
 README.zh-CN.md | 10 +++++-----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/README.es.md b/README.es.md
index 299c6e95c..4e16af936 100644
--- a/README.es.md
+++ b/README.es.md
@@ -41,7 +41,7 @@ NotebookLM es una de las mejores y más útiles plataformas de IA que existen, p
 - **Sin Dependencia de Proveedores** - Configura cualquier modelo LLM, de imagen, TTS y STT.
 - **25+ Fuentes de Datos Externas** - Agrega tus fuentes desde Google Drive, OneDrive, Dropbox, Notion y muchos otros servicios externos.
 - **Soporte Multijugador en Tiempo Real** - Trabaja fácilmente con los miembros de tu equipo en un notebook compartido.
-- **Aplicación de Escritorio** - Obtén asistencia de IA en cualquier aplicación con Quick Assist, General Assist, Extreme Assist y sincronización de carpetas locales.
+- **Aplicación de Escritorio** - Obtén asistencia de IA en cualquier aplicación con Quick Assist, General Assist, Screenshot Assist y sincronización de carpetas locales.
 
 ...y más por venir.
 
@@ -84,9 +84,9 @@ https://github.com/user-attachments/assets/a0a16566-6967-4374-ac51-9b3e07fbecd7
 
    <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/quick_assist.gif" alt="Quick Assist" /></p>
 
-   - Aplicación de Escritorio — Extreme Assist
+   - Aplicación de Escritorio — Screenshot Assist
 
-   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/extreme_assist.gif" alt="Extreme Assist" /></p>
+   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/screenshot_assist.gif" alt="Screenshot Assist" /></p>
 
    - Aplicación de Escritorio — Watch Local Folder
 
@@ -150,7 +150,7 @@ La aplicación de escritorio incluye estas potentes funciones:
 
 - **General Assist** — Lanza SurfSense al instante desde cualquier aplicación con un atajo global.
 - **Quick Assist** — Selecciona texto en cualquier lugar, luego pide a la IA que lo explique, reescriba o actúe sobre él.
-- **Extreme Assist** — Obtén sugerencias de escritura en línea impulsadas por tu base de conocimiento mientras escribes en cualquier aplicación.
+- **Screenshot Assist** — Selecciona una región de tu pantalla y adjúntala al chat para que las respuestas se basen en tu base de conocimiento.
 - **Watch Local Folder** — Vigila una carpeta local y sincroniza automáticamente los cambios de archivos con tu base de conocimiento. **Pro tip:** Apúntalo a tu bóveda de Obsidian para mantener tus notas buscables en SurfSense.
 
 Todas las funciones operan contra tu espacio de búsqueda elegido, por lo que tus respuestas siempre están basadas en tus propios datos.
@@ -199,7 +199,7 @@ Todas las funciones operan contra tu espacio de búsqueda elegido, por lo que tu
 | **Generación de Videos** | Resúmenes en video cinemáticos vía Veo 3 (solo Ultra) | Disponible (NotebookLM es mejor aquí, mejorando activamente) |
 | **Generación de Presentaciones** | Diapositivas más atractivas pero no editables | Crea presentaciones editables basadas en diapositivas |
 | **Generación de Podcasts** | Resúmenes de audio con hosts e idiomas personalizables | Disponible con múltiples proveedores TTS (NotebookLM es mejor aquí, mejorando activamente) |
-| **Aplicación de Escritorio** | No | Aplicación nativa con General Assist, Quick Assist, Extreme Assist y sincronización de carpetas locales |
+| **Aplicación de Escritorio** | No | Aplicación nativa con General Assist, Quick Assist, Screenshot Assist y sincronización de carpetas locales |
 | **Extensión de Navegador** | No | Extensión multi-navegador para guardar cualquier página web, incluyendo páginas protegidas por autenticación |
 
 <details>
diff --git a/README.hi.md b/README.hi.md
index 11a25ee0d..96f4d0da6 100644
--- a/README.hi.md
+++ b/README.hi.md
@@ -41,7 +41,7 @@ NotebookLM वहाँ उपलब्ध सबसे अच्छे और 
 - **कोई विक्रेता लॉक-इन नहीं** - किसी भी LLM, इमेज, TTS और STT मॉडल को कॉन्फ़िगर करें।
 - **25+ बाहरी डेटा स्रोत** - Google Drive, OneDrive, Dropbox, Notion और कई अन्य बाहरी सेवाओं से अपने स्रोत जोड़ें।
 - **रीयल-टाइम मल्टीप्लेयर सपोर्ट** - एक साझा notebook में अपनी टीम के सदस्यों के साथ आसानी से काम करें।
-- **डेस्कटॉप ऐप** - Quick Assist, General Assist, Extreme Assist और लोकल फ़ोल्डर सिंक के साथ किसी भी एप्लिकेशन में AI सहायता प्राप्त करें।
+- **डेस्कटॉप ऐप** - Quick Assist, General Assist, Screenshot Assist और लोकल फ़ोल्डर सिंक के साथ किसी भी एप्लिकेशन में AI सहायता प्राप्त करें।
 
 ...और भी बहुत कुछ आने वाला है।
 
@@ -84,9 +84,9 @@ https://github.com/user-attachments/assets/a0a16566-6967-4374-ac51-9b3e07fbecd7
 
    <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/quick_assist.gif" alt="Quick Assist" /></p>
 
-   - डेस्कटॉप ऐप — Extreme Assist
+   - डेस्कटॉप ऐप — Screenshot Assist
 
-   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/extreme_assist.gif" alt="Extreme Assist" /></p>
+   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/screenshot_assist.gif" alt="Screenshot Assist" /></p>
 
    - डेस्कटॉप ऐप — Watch Local Folder
 
@@ -150,7 +150,7 @@ SurfSense एक डेस्कटॉप ऐप भी प्रदान क
 
 - **General Assist** — एक ग्लोबल शॉर्टकट से किसी भी एप्लिकेशन से तुरंत SurfSense लॉन्च करें।
 - **Quick Assist** — कहीं भी टेक्स्ट चुनें, फिर AI से समझाने, फिर से लिखने या उस पर कार्रवाई करने को कहें।
-- **Extreme Assist** — किसी भी ऐप में टाइप करते समय अपनी नॉलेज बेस से संचालित इनलाइन लेखन सुझाव प्राप्त करें।
+- **Screenshot Assist** — स्क्रीन पर एक क्षेत्र चुनें और उसे चैट में जोड़ें, ताकि उत्तर आपकी नॉलेज बेस पर आधारित रहें।
 - **Watch Local Folder** — एक लोकल फ़ोल्डर को वॉच करें और फ़ाइल परिवर्तनों को स्वचालित रूप से अपनी नॉलेज बेस में सिंक करें। **Pro tip:** इसे अपने Obsidian vault पर पॉइंट करें ताकि आपके नोट्स SurfSense में सर्च करने योग्य रहें।
 
 सभी सुविधाएं आपके चुने हुए सर्च स्पेस पर काम करती हैं, ताकि आपके उत्तर हमेशा आपके अपने डेटा पर आधारित हों।
@@ -199,7 +199,7 @@ SurfSense एक डेस्कटॉप ऐप भी प्रदान क
 | **वीडियो जनरेशन** | Veo 3 के माध्यम से सिनेमैटिक वीडियो ओवरव्यू (केवल Ultra) | उपलब्ध (NotebookLM यहाँ बेहतर है, सक्रिय रूप से सुधार हो रहा है) |
 | **प्रेजेंटेशन जनरेशन** | बेहतर दिखने वाली स्लाइड्स लेकिन संपादन योग्य नहीं | संपादन योग्य, स्लाइड आधारित प्रेजेंटेशन बनाएं |
 | **पॉडकास्ट जनरेशन** | कस्टमाइज़ेबल होस्ट और भाषाओं के साथ ऑडियो ओवरव्यू | कई TTS प्रदाताओं के साथ उपलब्ध (NotebookLM यहाँ बेहतर है, सक्रिय रूप से सुधार हो रहा है) |
-| **डेस्कटॉप ऐप** | नहीं | General Assist, Quick Assist, Extreme Assist और लोकल फ़ोल्डर सिंक के साथ नेटिव ऐप |
+| **डेस्कटॉप ऐप** | नहीं | General Assist, Quick Assist, Screenshot Assist और लोकल फ़ोल्डर सिंक के साथ नेटिव ऐप |
 | **ब्राउज़र एक्सटेंशन** | नहीं | किसी भी वेबपेज को सहेजने के लिए क्रॉस-ब्राउज़र एक्सटेंशन, प्रमाणीकरण सुरक्षित पेज सहित |
 
 <details>
diff --git a/README.md b/README.md
index 9714b9e65..4dc9433ea 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ NotebookLM is one of the best and most useful AI platforms out there, but once y
 - **25+ External Data Sources** - Add your sources from Google Drive, OneDrive, Dropbox, Notion, and many other external services.
 - **Real-Time Multiplayer Support** - Work easily with your team members in a shared notebook.
 - **AI File Sorting** - Automatically organize your documents into a smart folder hierarchy using AI-powered categorization by source, date, and topic.
-- **Desktop App** - Get AI assistance in any application with Quick Assist, General Assist, Extreme Assist, and local folder sync.
+- **Desktop App** - Get AI assistance in any application with Quick Assist, General Assist, Screenshot Assist, and local folder sync.
 
 ...and more to come.
 
@@ -85,9 +85,9 @@ https://github.com/user-attachments/assets/a0a16566-6967-4374-ac51-9b3e07fbecd7
 
    <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/quick_assist.gif" alt="Quick Assist" /></p>
 
-   - Desktop App — Extreme Assist
+   - Desktop App — Screenshot Assist
 
-   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/extreme_assist.gif" alt="Extreme Assist" /></p>
+   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/screenshot_assist.gif" alt="Screenshot Assist" /></p>
 
    - Desktop App — Watch Local Folder
 
@@ -151,7 +151,7 @@ The desktop app includes these powerful features:
 
 - **General Assist** — Launch SurfSense instantly from any application with a global shortcut.
 - **Quick Assist** — Select text anywhere, then ask AI to explain, rewrite, or act on it.
-- **Extreme Assist** — Get inline writing suggestions powered by your knowledge base as you type in any app.
+- **Screenshot Assist** — Select a region on your screen and attach it to chat so answers stay grounded in your knowledge base.
 - **Watch Local Folder** — Watch a local folder and automatically sync file changes to your knowledge base. **Pro tip:** Point it at your Obsidian vault to keep your notes searchable in SurfSense.
 
 All features operate against your chosen search space, so your answers are always grounded in your own data.
@@ -201,7 +201,7 @@ All features operate against your chosen search space, so your answers are alway
 | **Presentation Generation** | Better looking slides but not editable | Create editable, slide-based presentations |
 | **Podcast Generation** | Audio Overviews with customizable hosts and languages | Available with multiple TTS providers (NotebookLM is better here, actively improving) |
 | **AI File Sorting** | No | LLM-powered auto-categorization into source, date, category, and subcategory folders |
-| **Desktop App** | No | Native app with General Assist, Quick Assist, Extreme Assist, and local folder sync |
+| **Desktop App** | No | Native app with General Assist, Quick Assist, Screenshot Assist, and local folder sync |
 | **Browser Extension** | No | Cross-browser extension to save any webpage, including auth-protected pages |
 
 <details>
diff --git a/README.pt-BR.md b/README.pt-BR.md
index 9323b2bce..d3cb36ad0 100644
--- a/README.pt-BR.md
+++ b/README.pt-BR.md
@@ -41,7 +41,7 @@ O NotebookLM é uma das melhores e mais úteis plataformas de IA disponíveis, m
 - **Sem Dependência de Fornecedor** - Configure qualquer modelo LLM, de imagem, TTS e STT.
 - **25+ Fontes de Dados Externas** - Adicione suas fontes do Google Drive, OneDrive, Dropbox, Notion e muitos outros serviços externos.
 - **Suporte Multiplayer em Tempo Real** - Trabalhe facilmente com os membros da sua equipe em um notebook compartilhado.
-- **Aplicativo Desktop** - Obtenha assistência de IA em qualquer aplicativo com Quick Assist, General Assist, Extreme Assist e sincronização de pastas locais.
+- **Aplicativo Desktop** - Obtenha assistência de IA em qualquer aplicativo com Quick Assist, General Assist, Screenshot Assist e sincronização de pastas locais.
 
 ...e mais por vir.
 
@@ -84,9 +84,9 @@ https://github.com/user-attachments/assets/a0a16566-6967-4374-ac51-9b3e07fbecd7
 
    <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/quick_assist.gif" alt="Quick Assist" /></p>
 
-   - Aplicativo Desktop — Extreme Assist
+   - Aplicativo Desktop — Screenshot Assist
 
-   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/extreme_assist.gif" alt="Extreme Assist" /></p>
+   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/screenshot_assist.gif" alt="Screenshot Assist" /></p>
 
    - Aplicativo Desktop — Watch Local Folder
 
@@ -150,7 +150,7 @@ O aplicativo desktop inclui estes recursos poderosos:
 
 - **General Assist** — Abra o SurfSense instantaneamente de qualquer aplicativo com um atalho global.
 - **Quick Assist** — Selecione texto em qualquer lugar, depois peça à IA para explicar, reescrever ou agir sobre ele.
-- **Extreme Assist** — Receba sugestões de escrita em linha alimentadas pela sua base de conhecimento enquanto digita em qualquer aplicativo.
+- **Screenshot Assist** — Selecione uma região da tela e anexe ao chat para respostas fundamentadas na sua base de conhecimento.
 - **Watch Local Folder** — Monitore uma pasta local e sincronize automaticamente as alterações de arquivos com sua base de conhecimento. **Pro tip:** Aponte para seu cofre do Obsidian para manter suas notas pesquisáveis no SurfSense.
 
 Todos os recursos operam no espaço de busca escolhido, para que suas respostas sejam sempre baseadas nos seus próprios dados.
@@ -199,7 +199,7 @@ Todos os recursos operam no espaço de busca escolhido, para que suas respostas
 | **Geração de Vídeos** | Visões gerais cinemáticas via Veo 3 (apenas Ultra) | Disponível (NotebookLM é melhor aqui, melhorando ativamente) |
 | **Geração de Apresentações** | Slides mais bonitos mas não editáveis | Cria apresentações editáveis baseadas em slides |
 | **Geração de Podcasts** | Visões gerais em áudio com hosts e idiomas personalizáveis | Disponível com múltiplos provedores TTS (NotebookLM é melhor aqui, melhorando ativamente) |
-| **Aplicativo Desktop** | Não | Aplicativo nativo com General Assist, Quick Assist, Extreme Assist e sincronização de pastas locais |
+| **Aplicativo Desktop** | Não | Aplicativo nativo com General Assist, Quick Assist, Screenshot Assist e sincronização de pastas locais |
 | **Extensão de Navegador** | Não | Extensão multi-navegador para salvar qualquer página web, incluindo páginas protegidas por autenticação |
 
 <details>
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 29200243b..3e2bd095d 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -41,7 +41,7 @@ NotebookLM 是目前最好、最实用的 AI 平台之一，但当你开始经
 - **无供应商锁定** - 配置任何 LLM、图像、TTS 和 STT 模型。
 - **25+ 外部数据源** - 从 Google Drive、OneDrive、Dropbox、Notion 和许多其他外部服务添加你的来源。
 - **实时多人协作支持** - 在共享笔记本中轻松与团队成员协作。
-- **桌面应用** - 通过 Quick Assist、General Assist、Extreme Assist 和本地文件夹同步在任何应用程序中获得 AI 助手。
+- **桌面应用** - 通过 Quick Assist、General Assist、Screenshot Assist 和本地文件夹同步在任何应用程序中获得 AI 助手。
 
 ...更多功能即将推出。
 
@@ -84,9 +84,9 @@ https://github.com/user-attachments/assets/a0a16566-6967-4374-ac51-9b3e07fbecd7
 
    <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/quick_assist.gif" alt="Quick Assist" /></p>
 
-   - 桌面应用 — Extreme Assist
+   - 桌面应用 — Screenshot Assist
 
-   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/extreme_assist.gif" alt="Extreme Assist" /></p>
+   <p align="center"><img src="surfsense_web/public/homepage/hero_tutorial/screenshot_assist.gif" alt="Screenshot Assist" /></p>
 
    - 桌面应用 — Watch Local Folder
 
@@ -150,7 +150,7 @@ SurfSense 还提供桌面应用，将 AI 助手带到您计算机上的每个应
 
 - **General Assist** — 通过全局快捷键从任何应用程序即时启动 SurfSense。
 - **Quick Assist** — 在任何位置选中文本，然后让 AI 解释、改写或对其执行操作。
-- **Extreme Assist** — 在任何应用中输入时，获得基于您知识库的内联写作建议。
+- **Screenshot Assist** — 在屏幕上框选区域并附加到聊天，让回复基于您的知识库。
 - **Watch Local Folder** — 监视本地文件夹，自动将文件更改同步到您的知识库。**Pro tip：** 将其指向您的 Obsidian vault，让笔记在 SurfSense 中随时可搜索。
 
 所有功能均基于您选择的搜索空间运行，确保回答始终以您自己的数据为依据。
@@ -199,7 +199,7 @@ SurfSense 还提供桌面应用，将 AI 助手带到您计算机上的每个应
 | **视频生成** | 通过 Veo 3 的电影级视频概览（仅 Ultra） | 可用（NotebookLM 在此方面更好，正在积极改进） |
 | **演示文稿生成** | 更美观的幻灯片但不可编辑 | 创建可编辑的幻灯片式演示文稿 |
 | **播客生成** | 可自定义主持人和语言的音频概览 | 可用，支持多种 TTS 提供商（NotebookLM 在此方面更好，正在积极改进） |
-| **桌面应用** | 否 | 原生应用，包含 General Assist、Quick Assist、Extreme Assist 和本地文件夹同步 |
+| **桌面应用** | 否 | 原生应用，包含 General Assist、Quick Assist、Screenshot Assist 和本地文件夹同步 |
 | **浏览器扩展** | 否 | 跨浏览器扩展，保存任何网页，包括需要身份验证的页面 |
 
 <details>

From 9f5b6205e1cf3fe5a5e681ac8886129257f42709 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 18:50:01 +0200
Subject: [PATCH 24/31] Align macOS accessibility and screen capture usage
 strings with Screenshot Assist and chat.

---
 surfsense_desktop/electron-builder.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/surfsense_desktop/electron-builder.yml b/surfsense_desktop/electron-builder.yml
index 2c46c827a..360519516 100644
--- a/surfsense_desktop/electron-builder.yml
+++ b/surfsense_desktop/electron-builder.yml
@@ -49,8 +49,8 @@ mac:
   hardenedRuntime: false
   gatekeeperAssess: false
   extendInfo:
-    NSAccessibilityUsageDescription: "SurfSense uses accessibility features to insert suggestions into the active application."
-    NSScreenCaptureUsageDescription: "SurfSense uses screen capture to analyze your screen and provide context-aware writing suggestions."
+    NSAccessibilityUsageDescription: "SurfSense uses accessibility features to bring the app to the foreground and interact with the active application when you use desktop assists."
+    NSScreenCaptureUsageDescription: "SurfSense uses screen capture so you can attach a selected region to chat (Screenshot Assist) or capture the full screen from the composer."
     NSAppleEventsUsageDescription: "SurfSense uses Apple Events to interact with the active application."
   target:
     - target: dmg

From 056870464ab77dff01ccbc7a484db27174c4a0d8 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 19:25:20 +0200
Subject: [PATCH 25/31] Accept optional user_images on regenerate and apply
 them when resolving the model turn.

---
 surfsense_backend/app/routes/new_chat_routes.py |  3 +++
 surfsense_backend/app/schemas/new_chat.py       | 13 +++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/surfsense_backend/app/routes/new_chat_routes.py b/surfsense_backend/app/routes/new_chat_routes.py
index 854627d4b..cbc660222 100644
--- a/surfsense_backend/app/routes/new_chat_routes.py
+++ b/surfsense_backend/app/routes/new_chat_routes.py
@@ -1456,6 +1456,9 @@ async def regenerate_response(
                 user_query_to_use
             )
 
+        if request.user_images is not None:
+            regenerate_image_urls = [p.as_data_url() for p in request.user_images]
+
         if user_query_to_use is None:
             raise HTTPException(
                 status_code=400,
diff --git a/surfsense_backend/app/schemas/new_chat.py b/surfsense_backend/app/schemas/new_chat.py
index e757ce178..477fdf2ca 100644
--- a/surfsense_backend/app/schemas/new_chat.py
+++ b/surfsense_backend/app/schemas/new_chat.py
@@ -238,6 +238,9 @@ class RegenerateRequest(BaseModel):
     2. Reload: Leave user_query empty to regenerate the last AI response with the same query
 
     Both operations rewind the LangGraph checkpointer to the appropriate state.
+
+    For edit, optional user_images (when not None) replaces image URLs resolved from
+    checkpoint/DB so the client can send the full user turn (text and/or images).
     """
 
     search_space_id: int
@@ -250,6 +253,16 @@ class RegenerateRequest(BaseModel):
     filesystem_mode: Literal["cloud", "desktop_local_folder"] = "cloud"
     client_platform: Literal["web", "desktop"] = "web"
     local_filesystem_mounts: list[LocalFilesystemMountPayload] | None = None
+    user_images: list[NewChatUserImagePart] | None = Field(
+        default=None,
+        description="If set, use these images for the regenerated turn (edit); overrides checkpoint/DB",
+    )
+
+    @model_validator(mode="after")
+    def _validate_regenerate_user_images(self) -> Self:
+        if self.user_images is not None and len(self.user_images) > MAX_NEW_CHAT_IMAGES:
+            raise ValueError(f"At most {MAX_NEW_CHAT_IMAGES} images allowed")
+        return self
 
 
 # =============================================================================

From a07c44f4965daafc70512f9dcbc64028c6e28a4e Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 19:25:26 +0200
Subject: [PATCH 26/31] Send edited user images and full message content in
 chat regenerate while leaving reload on server-resolved turns.

---
 .../new-chat/[[...chat_id]]/page.tsx          | 74 +++++++++++--------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
index da134c4cf..10abe13b1 100644
--- a/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
+++ b/surfsense_web/app/dashboard/[search_space_id]/new-chat/[[...chat_id]]/page.tsx
@@ -77,7 +77,10 @@ import {
 	type ThreadListResponse,
 	type ThreadRecord,
 } from "@/lib/chat/thread-persistence";
-import { extractUserTurnForNewChatApi } from "@/lib/chat/user-turn-api-parts";
+import {
+	extractUserTurnForNewChatApi,
+	type NewChatUserImagePayload,
+} from "@/lib/chat/user-turn-api-parts";
 import { NotFoundError } from "@/lib/error";
 import {
 	trackChatCreated,
@@ -1337,15 +1340,24 @@ export default function NewChatPage() {
 	 * Handle regeneration (edit or reload) by calling the regenerate endpoint
 	 * and streaming the response. This rewinds the LangGraph checkpointer state.
 	 *
-	 * @param newUserQuery - The new user query (for edit). Pass null/undefined for reload.
+	 * @param newUserQuery - `null` = reload with same turn from the server. A string = edit
+	 *   (including an empty string when the edited turn is images-only); pass `editExtras` for images/content.
 	 */
 	const handleRegenerate = useCallback(
-		async (newUserQuery?: string | null) => {
+		async (
+			newUserQuery: string | null,
+			editExtras?: {
+				userMessageContent: ThreadMessageLike["content"];
+				userImages: NewChatUserImagePayload[];
+			}
+		) => {
 			if (!threadId) {
 				toast.error("Cannot regenerate: no active chat thread");
 				return;
 			}
 
+			const isEdit = newUserQuery !== null;
+
 			// Abort any previous streaming request
 			if (abortControllerRef.current) {
 				abortControllerRef.current.abort();
@@ -1359,11 +1371,11 @@ export default function NewChatPage() {
 			}
 
 			// Extract the original user query BEFORE removing messages (for reload mode)
-			let userQueryToDisplay = newUserQuery;
+			let userQueryToDisplay: string | undefined;
 			let originalUserMessageContent: ThreadMessageLike["content"] | null = null;
 			let originalUserMessageMetadata: ThreadMessageLike["metadata"] | undefined;
 
-			if (!newUserQuery) {
+			if (!isEdit) {
 				// Reload mode - find and preserve the last user message content
 				const lastUserMessage = [...messages].reverse().find((m) => m.role === "user");
 				if (lastUserMessage) {
@@ -1377,6 +1389,8 @@ export default function NewChatPage() {
 						}
 					}
 				}
+			} else {
+				userQueryToDisplay = newUserQuery;
 			}
 
 			// Remove the last two messages (user + assistant) from the UI immediately
@@ -1412,11 +1426,13 @@ export default function NewChatPage() {
 			const userMessage: ThreadMessageLike = {
 				id: userMsgId,
 				role: "user",
-				content: newUserQuery
-					? [{ type: "text", text: newUserQuery }]
+				content: isEdit
+					? (editExtras?.userMessageContent ?? [
+							{ type: "text", text: newUserQuery ?? "" },
+						])
 					: originalUserMessageContent || [{ type: "text", text: userQueryToDisplay || "" }],
 				createdAt: new Date(),
-				metadata: newUserQuery ? undefined : originalUserMessageMetadata,
+				metadata: isEdit ? undefined : originalUserMessageMetadata,
 			};
 			setMessages((prev) => [...prev, userMessage]);
 
@@ -1433,20 +1449,24 @@ export default function NewChatPage() {
 
 			try {
 				const selection = await getAgentFilesystemSelection();
+				const requestBody: Record<string, unknown> = {
+					search_space_id: searchSpaceId,
+					user_query: newUserQuery,
+					disabled_tools: disabledTools.length > 0 ? disabledTools : undefined,
+					filesystem_mode: selection.filesystem_mode,
+					client_platform: selection.client_platform,
+					local_filesystem_mounts: selection.local_filesystem_mounts,
+				};
+				if (isEdit) {
+					requestBody.user_images = editExtras?.userImages ?? [];
+				}
 				const response = await fetch(getRegenerateUrl(threadId), {
 					method: "POST",
 					headers: {
 						"Content-Type": "application/json",
 						Authorization: `Bearer ${token}`,
 					},
-					body: JSON.stringify({
-						search_space_id: searchSpaceId,
-						user_query: newUserQuery || null,
-						disabled_tools: disabledTools.length > 0 ? disabledTools : undefined,
-						filesystem_mode: selection.filesystem_mode,
-						client_platform: selection.client_platform,
-						local_filesystem_mounts: selection.local_filesystem_mounts,
-					}),
+					body: JSON.stringify(requestBody),
 					signal: controller.signal,
 				});
 
@@ -1536,8 +1556,10 @@ export default function NewChatPage() {
 				if (contentParts.length > 0) {
 					try {
 						// Persist user message (for both edit and reload modes, since backend deleted it)
-						const userContentToPersist = newUserQuery
-							? [{ type: "text", text: newUserQuery }]
+						const userContentToPersist = isEdit
+							? (editExtras?.userMessageContent ?? [
+									{ type: "text", text: newUserQuery ?? "" },
+								])
 							: originalUserMessageContent || [{ type: "text", text: userQueryToDisplay || "" }];
 
 						const savedUserMessage = await appendMessage(threadId, {
@@ -1602,21 +1624,15 @@ export default function NewChatPage() {
 	// Handle editing a message - truncates history and regenerates with new query
 	const onEdit = useCallback(
 		async (message: AppendMessage) => {
-			// Extract the new user query from the message content
-			let newUserQuery = "";
-			for (const part of message.content) {
-				if (part.type === "text") {
-					newUserQuery += part.text;
-				}
-			}
-
-			if (!newUserQuery.trim()) {
+			const { userQuery, userImages } = extractUserTurnForNewChatApi(message, []);
+			const queryForApi = userQuery.trim();
+			if (!queryForApi && userImages.length === 0) {
 				toast.error("Cannot edit with empty message");
 				return;
 			}
 
-			// Call regenerate with the new query
-			await handleRegenerate(newUserQuery.trim());
+			const userMessageContent = message.content as unknown as ThreadMessageLike["content"];
+			await handleRegenerate(queryForApi, { userMessageContent, userImages });
 		},
 		[handleRegenerate]
 	);

From 8b542ca3dd77d2905d0a357cc438d385695cf42d Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 19:25:39 +0200
Subject: [PATCH 27/31] Deduplicate user-turn images by full base64 data and
 update desktop permissions copy for Screenshot Assist.

---
 surfsense_web/app/desktop/permissions/page.tsx | 8 +++++---
 surfsense_web/lib/chat/user-turn-api-parts.ts  | 5 ++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/surfsense_web/app/desktop/permissions/page.tsx b/surfsense_web/app/desktop/permissions/page.tsx
index a2fadc8ff..e30a76f83 100644
--- a/surfsense_web/app/desktop/permissions/page.tsx
+++ b/surfsense_web/app/desktop/permissions/page.tsx
@@ -19,14 +19,15 @@ const STEPS = [
 		id: "screen-recording",
 		title: "Screen Recording",
 		description:
-			"Lets SurfSense capture your screen to understand context and provide smart writing suggestions.",
+			"Lets SurfSense capture a region of your screen, full display, or browser (where supported) to attach to chat in Screenshot Assist, or to capture the full display from the composer.",
 		action: "requestScreenRecording",
 		field: "screenRecording" as const,
 	},
 	{
 		id: "accessibility",
 		title: "Accessibility",
-		description: "Lets SurfSense insert suggestions seamlessly, right where you\u2019re typing.",
+		description:
+			"Lets SurfSense bring the app to the foreground and work with the active application (for example Quick Assist) when you use desktop shortcuts.",
 		action: "requestAccessibility",
 		field: "accessibility" as const,
 	},
@@ -131,7 +132,8 @@ export default function DesktopPermissionsPage() {
 					<div className="space-y-1">
 						<h1 className="text-2xl font-semibold tracking-tight">System Permissions</h1>
 						<p className="text-sm text-muted-foreground">
-							SurfSense needs two macOS permissions to provide context-aware writing suggestions.
+							SurfSense needs two macOS permissions for Screenshot Assist and for desktop features that
+							require focusing the app or the active application.
 						</p>
 					</div>
 				</div>
diff --git a/surfsense_web/lib/chat/user-turn-api-parts.ts b/surfsense_web/lib/chat/user-turn-api-parts.ts
index 48d27a7ba..5e063492f 100644
--- a/surfsense_web/lib/chat/user-turn-api-parts.ts
+++ b/surfsense_web/lib/chat/user-turn-api-parts.ts
@@ -46,9 +46,8 @@ export function extractUserTurnForNewChatApi(
 	for (const url of merged) {
 		const p = dataUrlToPayload(url);
 		if (!p) continue;
-		const key = `${p.media_type}:${p.data.length}`;
-		if (seen.has(key)) continue;
-		seen.add(key);
+		if (seen.has(p.data)) continue;
+		seen.add(p.data);
 		payloads.push(p);
 		if (payloads.length >= MAX_IMAGES) break;
 	}

From 9cd4daa6b394e33b9a3325baa59c6244dce59d64 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 20:35:47 +0200
Subject: [PATCH 28/31] Add a single-session desktop window picker and route
 screenshot assist, region crop, and fullscreen capture through the cached
 frame.

---
 surfsense_desktop/scripts/build-electron.mjs  |   6 +
 surfsense_desktop/src/ipc/channels.ts         |   3 +
 surfsense_desktop/src/ipc/handlers.ts         |   5 +-
 .../src/modules/screen-region-picker.ts       | 174 ++++++++-----
 .../src/modules/screenshot-assist.ts          |  14 +-
 .../src/modules/window-picker.ts              | 244 ++++++++++++++++++
 .../src/window-picker-preload.ts              |  15 ++
 7 files changed, 396 insertions(+), 65 deletions(-)
 create mode 100644 surfsense_desktop/src/modules/window-picker.ts
 create mode 100644 surfsense_desktop/src/window-picker-preload.ts

diff --git a/surfsense_desktop/scripts/build-electron.mjs b/surfsense_desktop/scripts/build-electron.mjs
index 0c8f08d52..ca17e4c48 100644
--- a/surfsense_desktop/scripts/build-electron.mjs
+++ b/surfsense_desktop/scripts/build-electron.mjs
@@ -138,6 +138,12 @@ async function buildElectron() {
     outfile: 'dist/screen-region-preload.js',
   });
 
+  await build({
+    ...shared,
+    entryPoints: ['src/window-picker-preload.ts'],
+    outfile: 'dist/window-picker-preload.js',
+  });
+
   console.log('Electron build complete');
   resolveStandaloneSymlinks();
 }
diff --git a/surfsense_desktop/src/ipc/channels.ts b/surfsense_desktop/src/ipc/channels.ts
index 9f084af85..1007e3a37 100644
--- a/surfsense_desktop/src/ipc/channels.ts
+++ b/surfsense_desktop/src/ipc/channels.ts
@@ -14,6 +14,9 @@ export const IPC_CHANNELS = {
   CAPTURE_FULL_SCREEN: 'capture-full-screen',
   SCREEN_REGION_SUBMIT: 'screen-region:submit',
   SCREEN_REGION_CANCEL: 'screen-region:cancel',
+  WINDOW_PICK_LIST: 'window-pick:list',
+  WINDOW_PICK_SUBMIT: 'window-pick:submit',
+  WINDOW_PICK_CANCEL: 'window-pick:cancel',
   CHAT_SCREEN_CAPTURE: 'chat:screen-capture',
   // Folder sync channels
   FOLDER_SYNC_SELECT_FOLDER: 'folder-sync:select-folder',
diff --git a/surfsense_desktop/src/ipc/handlers.ts b/surfsense_desktop/src/ipc/handlers.ts
index 8361b9a38..d68d4a5bf 100644
--- a/surfsense_desktop/src/ipc/handlers.ts
+++ b/surfsense_desktop/src/ipc/handlers.ts
@@ -7,7 +7,7 @@ import {
   requestScreenRecording,
   restartApp,
 } from '../modules/permissions';
-import { captureCurrentDisplayDataUrl } from '../modules/screen-region-picker';
+import { pickOpenWindowCapture } from '../modules/window-picker';
 import {
   selectFolder,
   addWatchedFolder,
@@ -85,7 +85,8 @@ export function registerIpcHandlers(): void {
       requestScreenRecording();
       return null;
     }
-    return captureCurrentDisplayDataUrl();
+    const picked = await pickOpenWindowCapture();
+    return picked?.dataUrl ?? null;
   });
 
   // Folder sync handlers
diff --git a/surfsense_desktop/src/modules/screen-region-picker.ts b/surfsense_desktop/src/modules/screen-region-picker.ts
index cc9303040..1c4b77195 100644
--- a/surfsense_desktop/src/modules/screen-region-picker.ts
+++ b/surfsense_desktop/src/modules/screen-region-picker.ts
@@ -1,6 +1,17 @@
 import { BrowserWindow, desktopCapturer, nativeImage, screen } from 'electron';
 import path from 'path';
 import { IPC_CHANNELS } from '../ipc/channels';
+function fitNativeImageToWorkArea(img: Electron.NativeImage, display: Electron.Display): Electron.NativeImage {
+  const wa = display.workArea;
+  const { width: iw, height: ih } = img.getSize();
+  const scale = Math.min(1, wa.width / iw, wa.height / ih);
+  if (scale >= 1) return img;
+  return img.resize({
+    width: Math.max(1, Math.floor(iw * scale)),
+    height: Math.max(1, Math.floor(ih * scale)),
+    quality: 'best',
+  });
+}
 
 // One getSources per pick; overlay and final crop share that bitmap (avoids a second portal session, e.g. Wayland).
 
@@ -141,7 +152,7 @@ function buildInjectScript(dataUrl: string, iw: number, ih: number): string {
   })();`;
 }
 
-export function pickScreenRegion(): Promise<string | null> {
+export function pickScreenRegion(opts?: { windowDataUrl?: string }): Promise<string | null> {
   if (pickInProgress) return Promise.resolve(null);
   pickInProgress = true;
 
@@ -175,6 +186,7 @@ export function pickScreenRegion(): Promise<string | null> {
     };
 
     let snapshot: DisplayCaptureSnapshot | null = null;
+    let cropSource: Electron.NativeImage | null = null;
 
     const onSubmit = (
       _event: Electron.IpcMainEvent,
@@ -185,17 +197,25 @@ export function pickScreenRegion(): Promise<string | null> {
         finish(null);
         return;
       }
-      if (!snapshot) {
+      if (!snapshot || !cropSource) {
         finish(null);
         return;
       }
       try {
-        const full = nativeImage.createFromDataURL(snapshot.dataUrl);
-        const cropped = full.crop({
-          x: Math.floor(rect.x),
-          y: Math.floor(rect.y),
-          width: Math.floor(rect.width),
-          height: Math.floor(rect.height),
+        const iw = snapshot.width;
+        const ih = snapshot.height;
+        const { width: cw, height: ch } = cropSource.getSize();
+        const scaleX = cw / iw;
+        const scaleY = ch / ih;
+        const ox = Math.floor(rect.x * scaleX);
+        const oy = Math.floor(rect.y * scaleY);
+        const ow = Math.min(Math.floor(rect.width * scaleX), cw - ox);
+        const oh = Math.min(Math.floor(rect.height * scaleY), ch - oy);
+        const cropped = cropSource.crop({
+          x: ox,
+          y: oy,
+          width: Math.max(1, ow),
+          height: Math.max(1, oh),
         });
         finish(cropped.toDataURL());
       } catch {
@@ -214,66 +234,102 @@ export function pickScreenRegion(): Promise<string | null> {
       }
     };
 
-    void captureDisplaySnapshot(display)
-      .then((cap) => {
+    const openOverlay = (
+      cap: DisplayCaptureSnapshot,
+      crop: Electron.NativeImage,
+      bounds: { x: number; y: number; width: number; height: number }
+    ) => {
+      snapshot = cap;
+      cropSource = crop;
+
+      overlay = new BrowserWindow({
+        x: bounds.x,
+        y: bounds.y,
+        width: bounds.width,
+        height: bounds.height,
+        frame: false,
+        transparent: true,
+        fullscreenable: false,
+        skipTaskbar: true,
+        alwaysOnTop: true,
+        focusable: true,
+        show: false,
+        autoHideMenuBar: true,
+        backgroundColor: '#00000000',
+        webPreferences: {
+          preload: path.join(__dirname, 'screen-region-preload.js'),
+          contextIsolation: true,
+          nodeIntegration: false,
+          sandbox: true,
+        },
+      });
+
+      overlayWc = overlay.webContents;
+      overlayWc.on('before-input-event', onBeforeInput);
+      overlayWc.ipc.on(IPC_CHANNELS.SCREEN_REGION_SUBMIT, onSubmit);
+      overlayWc.ipc.on(IPC_CHANNELS.SCREEN_REGION_CANCEL, onCancel);
+
+      overlay.setIgnoreMouseEvents(false);
+      overlay.loadURL(
+        'data:text/html;charset=utf-8,' +
+          encodeURIComponent('<!doctype html><html><head><meta charset="utf-8"/></head><body></body></html>')
+      );
+
+      overlay.on('closed', () => {
+        if (!settled) finish(null);
+      });
+
+      overlay.webContents.once('did-finish-load', () => {
+        if (!overlay || overlay.isDestroyed()) return;
+        overlay.webContents
+          .executeJavaScript(buildInjectScript(cap.dataUrl, cap.width, cap.height), true)
+          .then(() => {
+            overlay?.show();
+            overlay?.focus();
+          })
+          .catch(() => {
+            finish(null);
+          });
+      });
+    };
+
+    void (async () => {
+      try {
+        if (opts?.windowDataUrl) {
+          const fullRes = nativeImage.createFromDataURL(opts.windowDataUrl);
+          if (fullRes.isEmpty()) {
+            finish(null);
+            return;
+          }
+          const fitted = fitNativeImageToWorkArea(fullRes, display);
+          const fw = fitted.getSize().width;
+          const fh = fitted.getSize().height;
+          const wa = display.workArea;
+          const x = wa.x + Math.floor((wa.width - fw) / 2);
+          const y = wa.y + Math.floor((wa.height - fh) / 2);
+          openOverlay(
+            { dataUrl: fitted.toDataURL(), width: fw, height: fh },
+            fullRes,
+            { x, y, width: fw, height: fh }
+          );
+          return;
+        }
+
+        const cap = await captureDisplaySnapshot(display);
         if (!cap) {
           finish(null);
           return;
         }
-        snapshot = cap;
-
-        overlay = new BrowserWindow({
+        const crop = nativeImage.createFromDataURL(cap.dataUrl);
+        openOverlay(cap, crop, {
           x: display.bounds.x,
           y: display.bounds.y,
           width: display.bounds.width,
           height: display.bounds.height,
-          frame: false,
-          transparent: true,
-          fullscreenable: false,
-          skipTaskbar: true,
-          alwaysOnTop: true,
-          focusable: true,
-          show: false,
-          autoHideMenuBar: true,
-          backgroundColor: '#00000000',
-          webPreferences: {
-            preload: path.join(__dirname, 'screen-region-preload.js'),
-            contextIsolation: true,
-            nodeIntegration: false,
-            sandbox: true,
-          },
         });
-
-        overlayWc = overlay.webContents;
-        overlayWc.on('before-input-event', onBeforeInput);
-        overlayWc.ipc.on(IPC_CHANNELS.SCREEN_REGION_SUBMIT, onSubmit);
-        overlayWc.ipc.on(IPC_CHANNELS.SCREEN_REGION_CANCEL, onCancel);
-
-        overlay.setIgnoreMouseEvents(false);
-        overlay.loadURL(
-          'data:text/html;charset=utf-8,' +
-            encodeURIComponent('<!doctype html><html><head><meta charset="utf-8"/></head><body></body></html>')
-        );
-
-        overlay.on('closed', () => {
-          if (!settled) finish(null);
-        });
-
-        overlay.webContents.once('did-finish-load', () => {
-          if (!overlay || overlay.isDestroyed()) return;
-          overlay.webContents
-            .executeJavaScript(buildInjectScript(cap.dataUrl, cap.width, cap.height), true)
-            .then(() => {
-              overlay?.show();
-              overlay?.focus();
-            })
-            .catch(() => {
-              finish(null);
-            });
-        });
-      })
-      .catch(() => {
+      } catch {
         finish(null);
-      });
+      }
+    })();
   });
 }
diff --git a/surfsense_desktop/src/modules/screenshot-assist.ts b/surfsense_desktop/src/modules/screenshot-assist.ts
index 2500bf1d5..34fd0f489 100644
--- a/surfsense_desktop/src/modules/screenshot-assist.ts
+++ b/surfsense_desktop/src/modules/screenshot-assist.ts
@@ -1,19 +1,25 @@
 import { IPC_CHANNELS } from '../ipc/channels';
 import { trackEvent } from './analytics';
 import { pickScreenRegion } from './screen-region-picker';
+import { pickOpenWindowCapture } from './window-picker';
 import { getMainWindow, showMainWindow } from './window';
 import { hasScreenRecordingPermission, requestScreenRecording } from './permissions';
 
 export async function runScreenshotAssistShortcut(): Promise<void> {
-  showMainWindow('shortcut');
-  await new Promise((r) => setTimeout(r, 400));
   if (!hasScreenRecordingPermission()) {
     requestScreenRecording();
     return;
   }
-  const url = await pickScreenRegion();
+
+  const picked = await pickOpenWindowCapture();
+  if (!picked) return;
+
+  const url = await pickScreenRegion({ windowDataUrl: picked.dataUrl });
+  if (!url) return;
+
+  showMainWindow('shortcut');
   const mw = getMainWindow();
-  if (url && mw && !mw.isDestroyed()) {
+  if (mw && !mw.isDestroyed()) {
     mw.webContents.send(IPC_CHANNELS.CHAT_SCREEN_CAPTURE, url);
     trackEvent('desktop_screenshot_assist_region_to_chat', {});
   }
diff --git a/surfsense_desktop/src/modules/window-picker.ts b/surfsense_desktop/src/modules/window-picker.ts
new file mode 100644
index 000000000..0e8505bcb
--- /dev/null
+++ b/surfsense_desktop/src/modules/window-picker.ts
@@ -0,0 +1,244 @@
+import { BrowserWindow, desktopCapturer, ipcMain, screen } from 'electron';
+import path from 'path';
+import { IPC_CHANNELS } from '../ipc/channels';
+
+let pickInProgress = false;
+
+const PREVIEW_THUMB = { width: 280, height: 180 } as const;
+
+function maxCaptureThumbSize(): { width: number; height: number } {
+  const d = screen.getPrimaryDisplay();
+  const sf = d.scaleFactor || 1;
+  const w = Math.min(3840, Math.max(1280, Math.round(d.size.width * sf)));
+  const h = Math.min(2160, Math.max(720, Math.round(d.size.height * sf)));
+  return { width: w, height: h };
+}
+
+function isDesktopWindowSourceId(s: string): boolean {
+  return typeof s === 'string' && s.startsWith('window:');
+}
+
+export type PickedWindowResult = {
+  sourceId: string;
+  /** Same pixels as the one `desktopCapturer` snapshot (max thumbnail size). */
+  dataUrl: string;
+};
+
+function buildPickerInjectScript(): string {
+  return `(async function () {
+    const api = window.surfsenseWindowPick;
+    if (!api) return;
+    const items = await api.list();
+    document.body.style.cssText =
+      'margin:0;font-family:system-ui,-apple-system,sans-serif;background:#0f172a;color:#e2e8f0;min-height:100vh;padding:16px;box-sizing:border-box;';
+    const top = document.createElement('div');
+    top.style.cssText =
+      'display:flex;justify-content:space-between;align-items:center;margin-bottom:12px;flex-wrap:wrap;gap:8px;';
+    const t = document.createElement('strong');
+    t.textContent = 'Open windows';
+    const hint = document.createElement('span');
+    hint.style.cssText = 'opacity:0.75;font-size:13px;';
+    hint.textContent = 'Click a window · Esc to cancel';
+    top.appendChild(t);
+    top.appendChild(hint);
+    document.body.appendChild(top);
+    if (!items || !items.length) {
+      const p = document.createElement('p');
+      p.style.cssText = 'line-height:1.5;max-width:42rem;';
+      p.textContent =
+        'No windows were returned by the system. On Linux, allow screen capture when prompted. If other apps are open, try again.';
+      document.body.appendChild(p);
+      return;
+    }
+    const grid = document.createElement('div');
+    grid.style.cssText =
+      'display:grid;grid-template-columns:repeat(auto-fill,minmax(200px,1fr));gap:12px;max-height:calc(100vh - 88px);overflow:auto;padding-bottom:8px;';
+    for (const it of items) {
+      const card = document.createElement('button');
+      card.type = 'button';
+      card.style.cssText =
+        'text-align:left;background:#1e293b;border:1px solid #334155;border-radius:8px;padding:8px;cursor:pointer;color:inherit;';
+      card.addEventListener('mouseenter', function () {
+        card.style.borderColor = '#38bdf8';
+      });
+      card.addEventListener('mouseleave', function () {
+        card.style.borderColor = '#334155';
+      });
+      const img = document.createElement('img');
+      img.alt = '';
+      img.src =
+        it.thumbDataUrl ||
+        'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==';
+      img.style.cssText =
+        'width:100%;height:100px;object-fit:cover;border-radius:4px;background:#000;display:block;';
+      const cap = document.createElement('div');
+      cap.textContent = it.name || '(untitled)';
+      cap.style.cssText =
+        'margin-top:6px;font-size:12px;line-height:1.35;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;';
+      card.appendChild(img);
+      card.appendChild(cap);
+      card.addEventListener('click', function () {
+        api.submit(it.id);
+      });
+      grid.appendChild(card);
+    }
+    document.body.appendChild(grid);
+    window.addEventListener('keydown', function (e) {
+      if (e.key === 'Escape') api.cancel();
+    });
+  })();`;
+}
+
+/**
+ * One OS / Chromium capture session: `getSources` runs once (important on Wayland /
+ * PipeWire so the portal is not opened again for the same flow). Opens our grid to
+ * choose a window; resolves with the chosen snapshot for region or full-frame use.
+ */
+export function pickOpenWindowCapture(): Promise<PickedWindowResult | null> {
+  if (pickInProgress) return Promise.resolve(null);
+  pickInProgress = true;
+
+  return new Promise((resolve) => {
+    let settled = false;
+    let picker: BrowserWindow | null = null;
+    let pickerWc: Electron.WebContents | null = null;
+    /** Filled once before the grid runs — reused for list + final image (no second getSources). */
+    let sessionSources: Electron.DesktopCapturerSource[] = [];
+
+    const finish = (result: PickedWindowResult | null) => {
+      if (settled) return;
+      settled = true;
+      pickInProgress = false;
+      ipcMain.removeHandler(IPC_CHANNELS.WINDOW_PICK_LIST);
+      const wc = pickerWc;
+      pickerWc = null;
+      if (wc && !wc.isDestroyed()) {
+        wc.removeListener('before-input-event', onBeforeInput);
+        wc.ipc.removeListener(IPC_CHANNELS.WINDOW_PICK_SUBMIT, onSubmit);
+        wc.ipc.removeListener(IPC_CHANNELS.WINDOW_PICK_CANCEL, onCancel);
+      }
+      if (picker && !picker.isDestroyed()) {
+        picker.removeAllListeners('closed');
+        picker.close();
+      }
+      picker = null;
+      resolve(result);
+    };
+
+    const onSubmit = (_event: Electron.IpcMainEvent, sourceId: string) => {
+      if (settled || !picker || picker.isDestroyed()) return;
+      if (!isDesktopWindowSourceId(sourceId)) {
+        finish(null);
+        return;
+      }
+      const hit = sessionSources.find((s) => s.id === sourceId);
+      if (!hit || hit.thumbnail.isEmpty()) {
+        finish(null);
+        return;
+      }
+      finish({ sourceId, dataUrl: hit.thumbnail.toDataURL() });
+    };
+
+    const onCancel = () => {
+      if (settled || !picker || picker.isDestroyed()) return;
+      finish(null);
+    };
+
+    const onBeforeInput = (_event: Electron.Event, input: Electron.Input) => {
+      if (input.type === 'keyDown' && input.key === 'Escape') {
+        finish(null);
+      }
+    };
+
+    ipcMain.handle(IPC_CHANNELS.WINDOW_PICK_LIST, async () => {
+      return sessionSources.map((s, i) => {
+        let thumbDataUrl = '';
+        if (!s.thumbnail.isEmpty()) {
+          try {
+            const sm = s.thumbnail.resize({
+              width: PREVIEW_THUMB.width,
+              height: PREVIEW_THUMB.height,
+              quality: 'good',
+            });
+            thumbDataUrl = sm.toDataURL();
+          } catch {
+            thumbDataUrl = s.thumbnail.toDataURL();
+          }
+        }
+        return {
+          id: s.id,
+          name: (s.name || '').trim() || `Window ${i + 1}`,
+          thumbDataUrl,
+        };
+      });
+    });
+
+    picker = new BrowserWindow({
+      width: 760,
+      height: 560,
+      show: false,
+      center: true,
+      autoHideMenuBar: true,
+      title: 'SurfSense — choose window',
+      webPreferences: {
+        preload: path.join(__dirname, 'window-picker-preload.js'),
+        contextIsolation: true,
+        nodeIntegration: false,
+        sandbox: true,
+      },
+    });
+
+    pickerWc = picker.webContents;
+
+    pickerWc.on('before-input-event', onBeforeInput);
+    pickerWc.ipc.on(IPC_CHANNELS.WINDOW_PICK_SUBMIT, onSubmit);
+    pickerWc.ipc.on(IPC_CHANNELS.WINDOW_PICK_CANCEL, onCancel);
+
+    picker.on('closed', () => {
+      if (!settled) finish(null);
+    });
+
+    picker
+      .loadURL(
+        'data:text/html;charset=utf-8,' +
+          encodeURIComponent('<!doctype html><html><head><meta charset="utf-8"/></head><body></body></html>')
+      )
+      .catch(() => finish(null));
+
+    picker.webContents.once('did-finish-load', () => {
+      void (async () => {
+        if (!picker || picker.isDestroyed()) return;
+        let selfId = '';
+        try {
+          selfId = picker.getMediaSourceId();
+        } catch {
+          selfId = '';
+        }
+        try {
+          const { width, height } = maxCaptureThumbSize();
+          const sources = await desktopCapturer.getSources({
+            types: ['window'],
+            thumbnailSize: { width, height },
+            fetchWindowIcons: false,
+          });
+          sessionSources = sources.filter((s) => !(selfId && s.id === selfId));
+        } catch {
+          sessionSources = [];
+        }
+        if (sessionSources.length === 1) {
+          const only = sessionSources[0];
+          if (!only.thumbnail.isEmpty()) {
+            finish({ sourceId: only.id, dataUrl: only.thumbnail.toDataURL() });
+            return;
+          }
+        }
+        try {
+          await picker.webContents.executeJavaScript(buildPickerInjectScript(), true);
+          if (!picker.isDestroyed()) picker.show();
+        } catch {
+          finish(null);
+        }
+      })();
+    });
+  });
+}
diff --git a/surfsense_desktop/src/window-picker-preload.ts b/surfsense_desktop/src/window-picker-preload.ts
new file mode 100644
index 000000000..9b582cede
--- /dev/null
+++ b/surfsense_desktop/src/window-picker-preload.ts
@@ -0,0 +1,15 @@
+import { contextBridge, ipcRenderer } from 'electron';
+import { IPC_CHANNELS } from './ipc/channels';
+
+contextBridge.exposeInMainWorld('surfsenseWindowPick', {
+  list: () =>
+    ipcRenderer.invoke(IPC_CHANNELS.WINDOW_PICK_LIST) as Promise<
+      { id: string; name: string; thumbDataUrl: string }[]
+    >,
+  submit: (sourceId: string) => {
+    ipcRenderer.send(IPC_CHANNELS.WINDOW_PICK_SUBMIT, sourceId);
+  },
+  cancel: () => {
+    ipcRenderer.send(IPC_CHANNELS.WINDOW_PICK_CANCEL);
+  },
+});

From d4caae6de96274917fb383b3d68473071b2ed5a4 Mon Sep 17 00:00:00 2001
From: CREDO23 <bakerathierry@gmail.com>
Date: Mon, 27 Apr 2026 20:39:03 +0200
Subject: [PATCH 29/31] Move desktop screen capture into modules/screen-capture
 and align preload build paths and imports.

---
 surfsense_desktop/scripts/build-electron.mjs              | 8 ++++----
 surfsense_desktop/src/ipc/handlers.ts                     | 2 +-
 surfsense_desktop/src/modules/screen-capture/index.ts     | 7 +++++++
 .../modules/{ => screen-capture}/screen-region-picker.ts  | 4 ++--
 .../{ => modules/screen-capture}/screen-region-preload.ts | 2 +-
 .../src/modules/{ => screen-capture}/screenshot-assist.ts | 8 ++++----
 .../{ => modules/screen-capture}/window-picker-preload.ts | 2 +-
 .../src/modules/{ => screen-capture}/window-picker.ts     | 4 ++--
 surfsense_desktop/src/modules/tray.ts                     | 2 +-
 9 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 surfsense_desktop/src/modules/screen-capture/index.ts
 rename surfsense_desktop/src/modules/{ => screen-capture}/screen-region-picker.ts (98%)
 rename surfsense_desktop/src/{ => modules/screen-capture}/screen-region-preload.ts (87%)
 rename surfsense_desktop/src/modules/{ => screen-capture}/screenshot-assist.ts (80%)
 rename surfsense_desktop/src/{ => modules/screen-capture}/window-picker-preload.ts (89%)
 rename surfsense_desktop/src/modules/{ => screen-capture}/window-picker.ts (98%)

diff --git a/surfsense_desktop/scripts/build-electron.mjs b/surfsense_desktop/scripts/build-electron.mjs
index ca17e4c48..75a3cdf61 100644
--- a/surfsense_desktop/scripts/build-electron.mjs
+++ b/surfsense_desktop/scripts/build-electron.mjs
@@ -134,14 +134,14 @@ async function buildElectron() {
 
   await build({
     ...shared,
-    entryPoints: ['src/screen-region-preload.ts'],
-    outfile: 'dist/screen-region-preload.js',
+    entryPoints: ['src/modules/screen-capture/screen-region-preload.ts'],
+    outfile: 'dist/modules/screen-capture/screen-region-preload.js',
   });
 
   await build({
     ...shared,
-    entryPoints: ['src/window-picker-preload.ts'],
-    outfile: 'dist/window-picker-preload.js',
+    entryPoints: ['src/modules/screen-capture/window-picker-preload.ts'],
+    outfile: 'dist/modules/screen-capture/window-picker-preload.js',
   });
 
   console.log('Electron build complete');
diff --git a/surfsense_desktop/src/ipc/handlers.ts b/surfsense_desktop/src/ipc/handlers.ts
index d68d4a5bf..b524a91a1 100644
--- a/surfsense_desktop/src/ipc/handlers.ts
+++ b/surfsense_desktop/src/ipc/handlers.ts
@@ -7,7 +7,7 @@ import {
   requestScreenRecording,
   restartApp,
 } from '../modules/permissions';
-import { pickOpenWindowCapture } from '../modules/window-picker';
+import { pickOpenWindowCapture } from '../modules/screen-capture';
 import {
   selectFolder,
   addWatchedFolder,
diff --git a/surfsense_desktop/src/modules/screen-capture/index.ts b/surfsense_desktop/src/modules/screen-capture/index.ts
new file mode 100644
index 000000000..6c1c75509
--- /dev/null
+++ b/surfsense_desktop/src/modules/screen-capture/index.ts
@@ -0,0 +1,7 @@
+/**
+ * Window capture for Screenshot Assist and chat fullscreen: single-session
+ * desktopCapturer, region overlay, and shortcut entry point.
+ */
+export { pickOpenWindowCapture, type PickedWindowResult } from './window-picker';
+export { pickScreenRegion, captureCurrentDisplayDataUrl } from './screen-region-picker';
+export { runScreenshotAssistShortcut } from './screenshot-assist';
diff --git a/surfsense_desktop/src/modules/screen-region-picker.ts b/surfsense_desktop/src/modules/screen-capture/screen-region-picker.ts
similarity index 98%
rename from surfsense_desktop/src/modules/screen-region-picker.ts
rename to surfsense_desktop/src/modules/screen-capture/screen-region-picker.ts
index 1c4b77195..fd771b0f7 100644
--- a/surfsense_desktop/src/modules/screen-region-picker.ts
+++ b/surfsense_desktop/src/modules/screen-capture/screen-region-picker.ts
@@ -1,6 +1,6 @@
 import { BrowserWindow, desktopCapturer, nativeImage, screen } from 'electron';
 import path from 'path';
-import { IPC_CHANNELS } from '../ipc/channels';
+import { IPC_CHANNELS } from '../../ipc/channels';
 function fitNativeImageToWorkArea(img: Electron.NativeImage, display: Electron.Display): Electron.NativeImage {
   const wa = display.workArea;
   const { width: iw, height: ih } = img.getSize();
@@ -257,7 +257,7 @@ export function pickScreenRegion(opts?: { windowDataUrl?: string }): Promise<str
         autoHideMenuBar: true,
         backgroundColor: '#00000000',
         webPreferences: {
-          preload: path.join(__dirname, 'screen-region-preload.js'),
+            preload: path.join(__dirname, 'modules', 'screen-capture', 'screen-region-preload.js'),
           contextIsolation: true,
           nodeIntegration: false,
           sandbox: true,
diff --git a/surfsense_desktop/src/screen-region-preload.ts b/surfsense_desktop/src/modules/screen-capture/screen-region-preload.ts
similarity index 87%
rename from surfsense_desktop/src/screen-region-preload.ts
rename to surfsense_desktop/src/modules/screen-capture/screen-region-preload.ts
index 6eab9f162..4263e0f6e 100644
--- a/surfsense_desktop/src/screen-region-preload.ts
+++ b/surfsense_desktop/src/modules/screen-capture/screen-region-preload.ts
@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer } from 'electron';
-import { IPC_CHANNELS } from './ipc/channels';
+import { IPC_CHANNELS } from '../../ipc/channels';
 
 contextBridge.exposeInMainWorld('surfsenseScreenRegion', {
   submit: (rect: { x: number; y: number; width: number; height: number }) => {
diff --git a/surfsense_desktop/src/modules/screenshot-assist.ts b/surfsense_desktop/src/modules/screen-capture/screenshot-assist.ts
similarity index 80%
rename from surfsense_desktop/src/modules/screenshot-assist.ts
rename to surfsense_desktop/src/modules/screen-capture/screenshot-assist.ts
index 34fd0f489..171b98a57 100644
--- a/surfsense_desktop/src/modules/screenshot-assist.ts
+++ b/surfsense_desktop/src/modules/screen-capture/screenshot-assist.ts
@@ -1,9 +1,9 @@
-import { IPC_CHANNELS } from '../ipc/channels';
-import { trackEvent } from './analytics';
+import { IPC_CHANNELS } from '../../ipc/channels';
+import { trackEvent } from '../analytics';
 import { pickScreenRegion } from './screen-region-picker';
 import { pickOpenWindowCapture } from './window-picker';
-import { getMainWindow, showMainWindow } from './window';
-import { hasScreenRecordingPermission, requestScreenRecording } from './permissions';
+import { getMainWindow, showMainWindow } from '../window';
+import { hasScreenRecordingPermission, requestScreenRecording } from '../permissions';
 
 export async function runScreenshotAssistShortcut(): Promise<void> {
   if (!hasScreenRecordingPermission()) {
diff --git a/surfsense_desktop/src/window-picker-preload.ts b/surfsense_desktop/src/modules/screen-capture/window-picker-preload.ts
similarity index 89%
rename from surfsense_desktop/src/window-picker-preload.ts
rename to surfsense_desktop/src/modules/screen-capture/window-picker-preload.ts
index 9b582cede..dd0acd81e 100644
--- a/surfsense_desktop/src/window-picker-preload.ts
+++ b/surfsense_desktop/src/modules/screen-capture/window-picker-preload.ts
@@ -1,5 +1,5 @@
 import { contextBridge, ipcRenderer } from 'electron';
-import { IPC_CHANNELS } from './ipc/channels';
+import { IPC_CHANNELS } from '../../ipc/channels';
 
 contextBridge.exposeInMainWorld('surfsenseWindowPick', {
   list: () =>
diff --git a/surfsense_desktop/src/modules/window-picker.ts b/surfsense_desktop/src/modules/screen-capture/window-picker.ts
similarity index 98%
rename from surfsense_desktop/src/modules/window-picker.ts
rename to surfsense_desktop/src/modules/screen-capture/window-picker.ts
index 0e8505bcb..b66e23c5c 100644
--- a/surfsense_desktop/src/modules/window-picker.ts
+++ b/surfsense_desktop/src/modules/screen-capture/window-picker.ts
@@ -1,6 +1,6 @@
 import { BrowserWindow, desktopCapturer, ipcMain, screen } from 'electron';
 import path from 'path';
-import { IPC_CHANNELS } from '../ipc/channels';
+import { IPC_CHANNELS } from '../../ipc/channels';
 
 let pickInProgress = false;
 
@@ -181,7 +181,7 @@ export function pickOpenWindowCapture(): Promise<PickedWindowResult | null> {
       autoHideMenuBar: true,
       title: 'SurfSense — choose window',
       webPreferences: {
-        preload: path.join(__dirname, 'window-picker-preload.js'),
+        preload: path.join(__dirname, 'modules', 'screen-capture', 'window-picker-preload.js'),
         contextIsolation: true,
         nodeIntegration: false,
         sandbox: true,
diff --git a/surfsense_desktop/src/modules/tray.ts b/surfsense_desktop/src/modules/tray.ts
index 07b53bafb..5fb1acbdf 100644
--- a/surfsense_desktop/src/modules/tray.ts
+++ b/surfsense_desktop/src/modules/tray.ts
@@ -1,7 +1,7 @@
 import { app, globalShortcut, Menu, nativeImage, Tray, type NativeImage } from 'electron';
 import path from 'path';
 import { runGeneralAssistShortcut } from './general-assist';
-import { runScreenshotAssistShortcut } from './screenshot-assist';
+import { runScreenshotAssistShortcut } from './screen-capture';
 import { showMainWindow } from './window';
 import { getShortcuts } from './shortcuts';
 import { trackEvent } from './analytics';

From e1acb7e7c3cd317304f8e06e79afd3450b81fcb8 Mon Sep 17 00:00:00 2001
From: jimmyzhuu <ziming_zhu2002@163.com>
Date: Sun, 26 Apr 2026 16:43:52 +0800
Subject: [PATCH 30/31] docs: add Baidu Search connector guide

---
 README.es.md                                  |   2 +-
 README.hi.md                                  |   2 +-
 README.md                                     |   2 +-
 README.pt-BR.md                               |   2 +-
 README.zh-CN.md                               |   2 +-
 .../content/docs/connectors/baidu-search.mdx  | 121 ++++++++++++++++++
 .../content/docs/connectors/index.mdx         |   5 +
 .../content/docs/connectors/meta.json         |   1 +
 .../content/docs/how-to/web-search.mdx        |  19 ++-
 9 files changed, 150 insertions(+), 6 deletions(-)
 create mode 100644 surfsense_web/content/docs/connectors/baidu-search.mdx

diff --git a/README.es.md b/README.es.md
index 4e16af936..dea86a793 100644
--- a/README.es.md
+++ b/README.es.md
@@ -206,7 +206,7 @@ Todas las funciones operan contra tu espacio de búsqueda elegido, por lo que tu
 <summary><b>Lista completa de Fuentes Externas</b></summary>
 <a id="fuentes-externas"></a>
 
-Motores de Búsqueda (Tavily, LinkUp) · SearxNG · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · Videos de YouTube · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, y más por venir.
+Motores de Búsqueda (SearXNG, Tavily, LinkUp, Baidu Search) · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · Videos de YouTube · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, y más por venir.
 
 </details>
 
diff --git a/README.hi.md b/README.hi.md
index 96f4d0da6..43e24c3ee 100644
--- a/README.hi.md
+++ b/README.hi.md
@@ -206,7 +206,7 @@ SurfSense एक डेस्कटॉप ऐप भी प्रदान क
 <summary><b>बाहरी स्रोतों की पूरी सूची</b></summary>
 <a id="बाहरी-स्रोत"></a>
 
-सर्च इंजन (Tavily, LinkUp) · SearxNG · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · YouTube वीडियो · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, और भी बहुत कुछ आने वाला है।
+सर्च इंजन (SearXNG, Tavily, LinkUp, Baidu Search) · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · YouTube वीडियो · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, और भी बहुत कुछ आने वाला है।
 
 </details>
 
diff --git a/README.md b/README.md
index 4dc9433ea..ab9f9e221 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,7 @@ All features operate against your chosen search space, so your answers are alway
 <summary><b>Full list of External Sources</b></summary>
 <a id="external-sources"></a>
 
-Search Engines (Tavily, LinkUp) · SearxNG · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · YouTube Videos · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, and more to come.
+Search Engines (SearXNG, Tavily, LinkUp, Baidu Search) · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · YouTube Videos · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, and more to come.
 
 </details>
 
diff --git a/README.pt-BR.md b/README.pt-BR.md
index d3cb36ad0..fcb004cd6 100644
--- a/README.pt-BR.md
+++ b/README.pt-BR.md
@@ -206,7 +206,7 @@ Todos os recursos operam no espaço de busca escolhido, para que suas respostas
 <summary><b>Lista completa de Fontes Externas</b></summary>
 <a id="fontes-externas"></a>
 
-Mecanismos de Busca (Tavily, LinkUp) · SearxNG · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · Vídeos do YouTube · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, e mais por vir.
+Mecanismos de Busca (SearXNG, Tavily, LinkUp, Baidu Search) · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · Vídeos do YouTube · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian, e mais por vir.
 
 </details>
 
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 3e2bd095d..a07f4afdc 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -206,7 +206,7 @@ SurfSense 还提供桌面应用，将 AI 助手带到您计算机上的每个应
 <summary><b>外部数据源完整列表</b></summary>
 <a id="外部数据源"></a>
 
-搜索引擎（Tavily、LinkUp）· SearxNG · Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · YouTube 视频 · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian，更多即将推出。
+搜索引擎（SearXNG、Tavily、LinkUp、Baidu Search）· Google Drive · OneDrive · Dropbox · Slack · Microsoft Teams · Linear · Jira · ClickUp · Confluence · BookStack · Notion · Gmail · YouTube 视频 · GitHub · Discord · Airtable · Google Calendar · Luma · Circleback · Elasticsearch · Obsidian，更多即将推出。
 
 </details>
 
diff --git a/surfsense_web/content/docs/connectors/baidu-search.mdx b/surfsense_web/content/docs/connectors/baidu-search.mdx
new file mode 100644
index 000000000..56d048d5b
--- /dev/null
+++ b/surfsense_web/content/docs/connectors/baidu-search.mdx
@@ -0,0 +1,121 @@
+---
+title: Baidu Search
+description: Search the Chinese web with Baidu AI Search in SurfSense
+---
+
+# Baidu Search Integration Setup Guide
+
+This guide walks you through connecting Baidu AI Search to SurfSense for Chinese web search and AI-powered research.
+
+## How it works
+
+The Baidu Search connector uses Baidu AI Search through Qianfan AppBuilder's intelligent search generation API. It is a live search connector: SurfSense queries Baidu when the assistant needs current web results instead of periodically indexing content into your knowledge base.
+
+- Baidu Search is best for Simplified Chinese queries and China-focused web content.
+- Results are merged with SurfSense's other configured web search engines.
+- The connector returns Baidu references as sources that can be cited in chat responses.
+
+---
+
+## Authorization
+
+<Callout type="info" title="API Key Required">
+You need a Baidu Qianfan AppBuilder API key to use this connector. The key is encrypted and stored securely by SurfSense.
+</Callout>
+
+### Step 1: Get Your Baidu AI Search API Key
+
+1. Open the [Baidu AI Search product page](https://cloud.baidu.com/product/ai-search.html) and sign in with your Baidu Cloud account.
+2. Open Qianfan AppBuilder or the AI Search console from Baidu Cloud.
+3. Create or select an application that has access to Baidu AI Search.
+4. Generate an API key for the application.
+5. Copy the API key. SurfSense uses it as the `BAIDU_API_KEY` connector setting.
+
+<Callout type="warn">
+Keep this key private. Do not paste it into chat messages, issue reports, screenshots, or public repositories.
+</Callout>
+
+---
+
+## Connecting to SurfSense
+
+1. Navigate to **Connectors** → **Add Connector** → **Baidu Search**.
+2. Fill in the required fields:
+
+| Field | Description | Example |
+|-------|-------------|---------|
+| **Connector Name** | A friendly name to identify this connector | `Baidu Search` |
+| **Baidu AppBuilder API Key** | Your Qianfan AppBuilder API key | `bce-v3/...` |
+
+3. Click **Connect** to save the connector.
+4. Ask a current Chinese web query in chat, such as `今天中国人工智能行业有什么重要新闻？`.
+
+### Optional Advanced Settings
+
+SurfSense stores advanced Baidu options in the connector config. If your deployment exposes these fields, use the following values:
+
+| Setting | Description | Default |
+|---------|-------------|---------|
+| `BAIDU_MODEL` | The model Baidu AI Search uses for answer generation | `ernie-3.5-8k` |
+| `BAIDU_SEARCH_SOURCE` | Baidu search source version | `baidu_search_v2` |
+| `BAIDU_ENABLE_DEEP_SEARCH` | Enables Baidu's deeper search mode when supported by your account | `false` |
+
+SurfSense calls Baidu's intelligent search generation endpoint:
+
+```text
+POST https://qianfan.baidubce.com/v2/ai_search/chat/completions
+```
+
+For request and response details, see Baidu's [intelligent search generation API documentation](https://cloud.baidu.com/doc/qianfan/s/Omh4su4s0).
+
+---
+
+## When to Use Baidu Search
+
+| Use Case | Why Baidu Search Helps |
+|----------|------------------------|
+| Chinese news and current events | Better coverage for China-focused sources |
+| Chinese company, product, or policy research | More local web results than global search engines alone |
+| Mandarin-language fact finding | Native Chinese search and summarization behavior |
+| Cross-checking web search | Adds another source alongside SearXNG, Tavily, or Linkup |
+
+<Callout type="info" title="Live Search Connector">
+Baidu Search does not create indexed documents in your knowledge base. It runs when the assistant calls web search, then returns live sources for that answer.
+</Callout>
+
+---
+
+## Troubleshooting
+
+**No Baidu results appear**
+
+- Confirm the Baidu Search connector is active in the current search space.
+- Try a Chinese query with clear search intent, for example `百度智能云千帆 AppBuilder 最新功能`.
+- Check whether other web search engines are returning results. If none are, review the general [Web Search](/docs/how-to/web-search) setup.
+
+**Authentication failed**
+
+- Verify that the API key was copied from Qianfan AppBuilder, not another Baidu Cloud product.
+- Regenerate the API key if it was rotated, expired, or copied with extra whitespace.
+- Make sure the related application has access to Baidu AI Search.
+
+**Requests time out**
+
+- Baidu AI Search can take longer than ordinary keyword search because it performs search and summarization.
+- Retry with a narrower query.
+- If you self-host SurfSense, verify that the backend container can reach `qianfan.baidubce.com`.
+
+**Results are not relevant**
+
+- Use Chinese keywords for China-focused topics.
+- Include entity names, dates, or locations in the query.
+- Compare with SearXNG or another configured live search connector for broader coverage.
+
+---
+
+## Verification Checklist
+
+- The Baidu Search connector appears in your connector list.
+- A Chinese current-events query triggers web search in chat.
+- Chat responses include Baidu-backed sources with titles and URLs.
+- Invalid API keys fail without breaking other configured search engines.
diff --git a/surfsense_web/content/docs/connectors/index.mdx b/surfsense_web/content/docs/connectors/index.mdx
index ef8d214ef..9b8fa5f93 100644
--- a/surfsense_web/content/docs/connectors/index.mdx
+++ b/surfsense_web/content/docs/connectors/index.mdx
@@ -83,6 +83,11 @@ Connect SurfSense to your favorite tools and services. Browse the available inte
     description="Connect your GitHub repositories to SurfSense"
     href="/docs/connectors/github"
   />
+  <Card
+    title="Baidu Search"
+    description="Search the Chinese web with Baidu AI Search"
+    href="/docs/connectors/baidu-search"
+  />
   <Card
     title="Luma"
     description="Connect your Luma events to SurfSense"
diff --git a/surfsense_web/content/docs/connectors/meta.json b/surfsense_web/content/docs/connectors/meta.json
index 3a3b6e039..d61651575 100644
--- a/surfsense_web/content/docs/connectors/meta.json
+++ b/surfsense_web/content/docs/connectors/meta.json
@@ -17,6 +17,7 @@
 		"airtable",
 		"clickup",
 		"github",
+		"baidu-search",
 		"luma",
 		"circleback",
 		"elasticsearch",
diff --git a/surfsense_web/content/docs/how-to/web-search.mdx b/surfsense_web/content/docs/how-to/web-search.mdx
index edcd28522..cbea11d36 100644
--- a/surfsense_web/content/docs/how-to/web-search.mdx
+++ b/surfsense_web/content/docs/how-to/web-search.mdx
@@ -7,6 +7,8 @@ description: How SurfSense web search works and how to configure it for producti
 
 SurfSense uses [SearXNG](https://docs.searxng.org/) as a bundled meta-search engine to provide web search across all search spaces. SearXNG aggregates results from multiple search engines (Google, DuckDuckGo, Brave, Bing, and more) without requiring any API keys.
 
+You can also add live search connectors such as Baidu Search, Tavily, and Linkup to a search space. When those connectors are active, SurfSense queries them in parallel with SearXNG and merges the results before passing sources to the assistant.
+
 ## How It Works
 
 When a user triggers a web search in SurfSense:
@@ -14,10 +16,25 @@ When a user triggers a web search in SurfSense:
 1. The backend sends a query to the bundled SearXNG instance via its JSON API
 2. SearXNG fans out the query to all enabled search engines simultaneously
 3. Results are aggregated, deduplicated, and ranked by engine weight
-4. The backend receives merged results and presents them to the user
+4. If the current search space has live search connectors, the backend queries them in parallel
+5. The backend deduplicates the merged results and presents them to the user
 
 SearXNG runs as a Docker container alongside the backend. It is never exposed to the internet. Only the backend communicates with it over the internal Docker network.
 
+## Live Search Connectors
+
+Live search connectors are optional API-backed search providers configured per search space. They are useful when you need a specialized index, authenticated search API, or stronger regional coverage.
+
+| Connector | Best For | Setup |
+|-----------|----------|-------|
+| Baidu Search | Chinese web search and China-focused current information | [Baidu Search connector](/docs/connectors/baidu-search) |
+| Tavily | General web research through Tavily's search API | Add the Tavily connector from the Connectors dashboard |
+| Linkup | General web search through Linkup's search API | Add the Linkup connector from the Connectors dashboard |
+
+<Callout type="info" title="Search Space Scoped">
+Live search connectors only run for the search space where they are configured. They do not replace SearXNG globally.
+</Callout>
+
 ## Docker Setup
 
 SearXNG is included in both `docker-compose.yml` and `docker-compose.dev.yml` and works out of the box with no configuration needed.

From c9eb0be45731fff9377b4ec5d183edf61cba3842 Mon Sep 17 00:00:00 2001
From: Anish Sarkar <104695310+AnishSarkar22@users.noreply.github.com>
Date: Tue, 28 Apr 2026 14:55:38 +0530
Subject: [PATCH 31/31] feat(electron-builder): add RPM target to the build
 configuration

---
 surfsense_desktop/electron-builder.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/surfsense_desktop/electron-builder.yml b/surfsense_desktop/electron-builder.yml
index 2c46c827a..ae086a8f1 100644
--- a/surfsense_desktop/electron-builder.yml
+++ b/surfsense_desktop/electron-builder.yml
@@ -81,4 +81,5 @@ linux:
       Categories: Utility;Office;
   target:
     - deb
+    - rpm
     - AppImage