Revert "fix(chats): preserve saved conversations during tidy"

.github/workflows/ci.yml

@@ -179,7 +179,6 @@ jobs:
           uv pip install --system --require-hashes --only-binary=:all: --no-deps -r requirements-bootstrap.txt
           python scripts/check_ca_trust.py --python
           uv pip install --system -r requirements.txt
-          uv pip install --system "playwright==1.62.0"
         if: steps.docs-check.outputs.docs_only != 'true'
       - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020  # v7.0.0
         if: steps.docs-check.outputs.docs_only != 'true'

mcp_servers/image_gen_server.py

@@ -33,7 +33,7 @@ async def list_tools() -> list[Tool]:
                     "prompt": {"type": "string", "description": "Image description prompt"},
                     "model": {"type": "string", "description": "Model name (auto-detects if omitted)"},
                     "size": {"type": "string", "description": "Image size (default 1024x1024)"},
-                    "quality": {"type": "string", "description": "Quality: low, medium, high, auto (default configured quality, otherwise medium)"},
+                    "quality": {"type": "string", "description": "Quality: low, medium, high, auto (default medium)"},
                 },
                 "required": ["prompt"],
             },
@@ -66,7 +66,7 @@ async def call_tool(name: str, arguments: dict) -> list[TextContent]:
 
         if not model_spec:
             model_spec = _settings.get("image_model", "")
-        if "quality" not in arguments and _settings.get("image_quality"):
+        if quality == "medium" and _settings.get("image_quality"):
             quality = _settings["image_quality"]
 
         # Auto-detect best available image model

requirements-dev.txt

@@ -2,4 +2,3 @@
 -r requirements.txt
 # psutil lets `-n auto` use physical cores instead of logical CPU threads.
 pytest-xdist[psutil]>=3.8,<4
-playwright==1.62.0

routes/auth_routes.py

@@ -887,8 +887,6 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
         """Create a new integration (admin only)."""
         _require_admin_user(request)
         body = await request.json()
-        if not isinstance(body, dict):
-            raise HTTPException(400, "Request body must be a JSON object")
         item = add_integration(body)
         return {"ok": True, "integration": mask_integration_secret(item)}
 
@@ -897,8 +895,6 @@ def setup_auth_routes(auth_manager: AuthManager) -> APIRouter:
         """Update an existing integration (admin only)."""
         _require_admin_user(request)
         body = await request.json()
-        if not isinstance(body, dict):
-            raise HTTPException(400, "Request body must be a JSON object")
         item = update_integration(integration_id, body)
         if not item:
             raise HTTPException(404, "Integration not found")

routes/calendar_routes.py

@@ -80,18 +80,6 @@ def _require_user(request: Request) -> str:
     return FALLBACK_OWNER
 
 
-async def _json_object_body(request: Request) -> dict:
-    """Parse a JSON object body. An unreadable body counts as empty; a body
-    that is valid JSON but not an object (a list, string or number) is a 400."""
-    try:
-        body = await request.json()
-    except Exception:
-        return {}
-    if not isinstance(body, dict):
-        raise HTTPException(400, "Request body must be a JSON object")
-    return body
-
-
 def _get_or_404_calendar(db, cal_id: str, owner: str) -> CalendarCal:
     cal = db.query(CalendarCal).filter(CalendarCal.id == cal_id).first()
     if not cal:
@@ -1006,7 +994,10 @@ def setup_calendar_routes(upload_handler=None) -> APIRouter:
     async def save_config(request: Request):
         """Legacy single-account endpoint — upserts the first account."""
         owner = _require_user(request)
-        body = await _json_object_body(request)
+        try:
+            body = await request.json()
+        except Exception:
+            body = {}
         accounts = _get_caldav_accounts(owner)
         if not (body.get("url") or "").strip():
             _save_caldav_accounts(owner, [])
@@ -1061,7 +1052,10 @@ def setup_calendar_routes(upload_handler=None) -> APIRouter:
         """Add a new CalDAV account."""
         import uuid as _uuid
         owner = _require_user(request)
-        body = await _json_object_body(request)
+        try:
+            body = await request.json()
+        except Exception:
+            body = {}
         from src.caldav_sync import validate_caldav_url
         try:
             url = validate_caldav_url(body.get("url", ""))
@@ -1086,7 +1080,10 @@ def setup_calendar_routes(upload_handler=None) -> APIRouter:
     async def update_caldav_account(account_id: str, request: Request):
         """Update an existing CalDAV account by id."""
         owner = _require_user(request)
-        body = await _json_object_body(request)
+        try:
+            body = await request.json()
+        except Exception:
+            body = {}
         accounts = _get_caldav_accounts(owner)
         idx = next((i for i, a in enumerate(accounts) if a.get("id") == account_id), None)
         if idx is None:
@@ -1127,7 +1124,10 @@ def setup_calendar_routes(upload_handler=None) -> APIRouter:
         test an already-saved account. Falls back to the first saved account
         when nothing is provided."""
         owner = _require_user(request)
-        body = await _json_object_body(request)
+        try:
+            body = await request.json()
+        except Exception:
+            body = {}
         url = (body.get("url") or "").strip()
         user = (body.get("username") or "").strip()
         pw = body.get("password") or ""

routes/cookbook_helpers.py

@@ -14,7 +14,6 @@ from fastapi import HTTPException
 from pydantic import BaseModel
 
 from routes._validators import validate_remote_host, validate_ssh_port
-from routes.cookbook_output import HF_PARTIAL_BLOB_HELPER
 from core.platform_compat import _ssh_exec_argv
 
 logger = logging.getLogger(__name__)
@@ -379,7 +378,6 @@ def _cached_model_scan_script(model_dirs: list[str] | None = None, add_hf_cache:
     """
     lines = [
         "import json, os, re, shutil, subprocess, urllib.request",
-        *HF_PARTIAL_BLOB_HELPER.splitlines(),
         "models = []",
         "seen = set()",
         "BLOCKED_ROOTS = ('/sys', '/proc', '/dev', '/run', '/var/run')",
@@ -438,10 +436,8 @@ def _cached_model_scan_script(model_dirs: list[str] | None = None, add_hf_cache:
         "        sz, nf, ic = 0, 0, False",
         "        if os.path.isdir(blobs):",
         "            for f in os.scandir(blobs):",
-        "                if f.name.endswith('.incomplete'):",
-        "                    if not is_partial_blob(f.path): continue",
-        "                    ic = True",
         "                if f.is_file(): nf += 1; sz += f.stat().st_size",
+        "                if f.name.endswith('.incomplete'): ic = True",
         "        snap = os.path.join(cache, d, 'snapshots')",
         "        def snapshot_size():",
         "            total, count, incomplete = 0, 0, False",

routes/cookbook_output.py

@@ -8,20 +8,6 @@ import re
 
 _FETCHING_ZERO_FILES_RE = re.compile(r"Fetching\s+0\s+files", re.IGNORECASE)
 
-# Shared source embedded in local/remote inventory and status probes. A blank
-# retry marker beside its completed, nonempty content-addressed blob is stale;
-# a blank marker alone may be a download that has not received its first byte.
-HF_PARTIAL_BLOB_HELPER = """def is_partial_blob(path):
-    if not path.endswith('.incomplete'):
-        return False
-    try:
-        completed = path[:-len('.incomplete')]
-        return (os.path.getsize(path) != 0 or not os.path.isfile(completed)
-                or os.path.getsize(completed) == 0)
-    except OSError:
-        return True
-"""
-
 # Probe scripts for the dead-session download check, run as
 # `python3 -c <PROBE> <repo_id> <cache_root>` (locally or over SSH).
 # cache_root is the task's custom download dir, '' for the default HF cache.
@@ -29,7 +15,7 @@ HF_PARTIAL_BLOB_HELPER = """def is_partial_blob(path):
 # HF_HOME=<local_dir>, so that task's cache lives under <local_dir>/hub, and
 # the probe process's own environment knows nothing about it.
 HF_CACHE_COMPLETE_PROBE = (
-    "import os,sys\n" + HF_PARTIAL_BLOB_HELPER +
+    "import os,sys;"
     "repo=sys.argv[1];"
     "root=os.path.expanduser(sys.argv[2]) if len(sys.argv)>2 and sys.argv[2] else '';"
     "base=os.path.join(root,'hub') if root else (os.environ.get('HUGGINGFACE_HUB_CACHE') or os.path.join(os.environ.get('HF_HOME', os.path.expanduser('~/.cache/huggingface')), 'hub'));"
@@ -38,18 +24,18 @@ HF_CACHE_COMPLETE_PROBE = (
     "ok=os.path.isdir(snap) and any(os.path.isdir(os.path.join(snap,x)) and os.listdir(os.path.join(snap,x)) for x in os.listdir(snap));"
     "inc=False;"
     "blobs=os.path.join(d,'blobs');"
-    "inc=os.path.isdir(blobs) and any(is_partial_blob(os.path.join(blobs,x)) for x in os.listdir(blobs));"
+    "inc=os.path.isdir(blobs) and any(x.endswith('.incomplete') for x in os.listdir(blobs));"
     "sys.exit(0 if ok and not inc else 1)"
 )
 
 HF_CACHE_INCOMPLETE_PROBE = (
-    "import os,sys\n" + HF_PARTIAL_BLOB_HELPER +
+    "import os,sys;"
     "repo=sys.argv[1];"
     "root=os.path.expanduser(sys.argv[2]) if len(sys.argv)>2 and sys.argv[2] else '';"
     "base=os.path.join(root,'hub') if root else (os.environ.get('HUGGINGFACE_HUB_CACHE') or os.path.join(os.environ.get('HF_HOME', os.path.expanduser('~/.cache/huggingface')), 'hub'));"
     "d=os.path.join(base,'models--'+repo.replace('/','--'));"
     "blobs=os.path.join(d,'blobs');"
-    "inc=os.path.isdir(blobs) and any(is_partial_blob(os.path.join(blobs,x)) for x in os.listdir(blobs));"
+    "inc=os.path.isdir(blobs) and any(x.endswith('.incomplete') for x in os.listdir(blobs));"
     "sys.exit(0 if inc else 1)"
 )
 

routes/cookbook_routes.py

@@ -4302,7 +4302,7 @@ def setup_cookbook_routes() -> APIRouter:
             tmux output can stop at a stale progress line if the pane/session
             disappears before Cookbook captures the final DOWNLOAD_OK marker.
             In that case, trust the cache shape: a snapshot directory with files
-            and no unfinished blobs means HuggingFace finished materializing the
+            and no *.incomplete blobs means HuggingFace finished materializing the
             model. cache_root is the task's custom download dir — the runner
             pointed HF_HOME there, so the cache lives under <cache_root>/hub,
             not wherever this probe's environment says.
@@ -4327,8 +4327,7 @@ def setup_cookbook_routes() -> APIRouter:
             """Best-effort check for resumable HF partial blobs.
 
             A lost SSH/tmux session can leave a real download still incomplete.
-            Treat unfinished blobs (excluding empty markers paired with a
-            completed blob) as stronger evidence than stale
+            Treat any *.incomplete blob as stronger evidence than stale
             "100%" lines in the captured pane output.
             """
             if not repo_id or "/" not in repo_id:

routes/document/document_routes.py

@@ -781,11 +781,9 @@ def setup_document_routes(session_manager, upload_handler=None) -> APIRouter:
         except Exception as e:
             logger.warning("Failed to parse export request body, defaulting to empty", exc_info=e)
             data = {}
-        ids = data.get("ids") if isinstance(data, dict) else None
+        ids = data.get("ids") or []
         if not ids:
             raise HTTPException(400, "No documents specified")
-        if not isinstance(ids, list) or not all(isinstance(i, str) for i in ids):
-            raise HTTPException(400, "ids must be a list of document ids")
         _ext = {
             "javascript": ".js", "python": ".py", "html": ".html", "css": ".css",
             "markdown": ".md", "json": ".json", "yaml": ".yml", "bash": ".sh",

routes/editor_agent_routes.py

@@ -846,64 +846,6 @@ def _plan_psd_steps(prompt: str) -> Optional[List[Dict[str, Any]]]:
     return None
 
 
-def _is_background_removal_intent(prompt: str) -> bool:
-    """Linear-time, bounded intent parser for background removal commands.
-
-    Replaces the previous backtracking regular expression flagged by CodeQL
-    (#1212) while preserving the exact command grammar.
-    """
-    if not prompt or not isinstance(prompt, str):
-        return False
-    i = len(prompt)
-    while i > 0 and prompt[i - 1] in ".! \t\r\n":
-        i -= 1
-    cleaned = prompt[:i].strip()
-    if not cleaned:
-        return False
-
-    tokens = cleaned.split()
-    if not tokens:
-        return False
-
-    idx = 0
-    if tokens[idx].lower() == "please":
-        idx += 1
-        if idx >= len(tokens):
-            return False
-
-    if tokens[idx].lower() not in {"remove", "erase", "delete", "clear", "strip"}:
-        return False
-    idx += 1
-    if idx >= len(tokens):
-        return False
-
-    if tokens[idx].lower() == "the":
-        idx += 1
-        if idx >= len(tokens):
-            return False
-
-    if tokens[idx].lower() not in {"bg", "background", "backdrop"}:
-        return False
-    idx += 1
-
-    if idx == len(tokens):
-        return True
-
-    if tokens[idx].lower() in {"from", "of"}:
-        idx += 1
-        if idx < len(tokens) and tokens[idx].lower() == "the":
-            idx += 1
-        if (
-            idx + 1 < len(tokens)
-            and tokens[idx].lower() in {"active", "current", "selected"}
-            and tokens[idx + 1].lower() == "layer"
-            and idx + 2 == len(tokens)
-        ):
-            return True
-
-    return False
-
-
 def _plan_special(
     prompt: str, state: Any, provider_available: bool,
 ) -> Optional[Tuple[List[Dict[str, Any]], str, str]]:
@@ -913,8 +855,6 @@ def _plan_special(
     left to the model.     Returns (steps, reply, note) or None. These never need an
     image provider except generative border fill, used only when one exists.
     """
-    if _is_background_removal_intent(prompt):
-        return [{"op": "ai.removeBackground", "params": {}}], "Removing the active layer's background.", ""
     # Targeted recolour is fully deterministic (object mask + masked hue shift)
     # and must never be left to the model, which sometimes substitutes a
     # generative placeImage. Highest priority so it can never vary.
@@ -1707,13 +1647,6 @@ def setup_editor_agent_routes() -> APIRouter:
         screenshot = body.get("screenshot")
         # Optional user-picked image model (from the editor model selector).
         model_choice = str(body.get("model") or body.get("image_model") or "").strip()
-        generation_model_choice = str(body.get("generation_model") or "").strip()
-        use_image_settings = body.get("_use_image_settings") is True
-        if use_image_settings:
-            from src.editor_image_settings import editor_image_models
-            image_models = editor_image_models(owner=owner)
-            model_choice = image_models["edit"]
-            generation_model_choice = image_models["generation"]
         # Optional user-picked PLANNER model (the editor agent/planner model).
         agent_model = str(body.get("agent_model") or "").strip()
         tools_offered = [tool for tool in _scoped_editor_tools() if tool not in disabled]
@@ -1864,22 +1797,9 @@ def setup_editor_agent_routes() -> APIRouter:
                 # Planner output is untrusted: it cannot redirect this turn to
                 # another editor session or override an explicit model choice.
                 tool_payload["session"] = session
-                if use_image_settings:
-                    tool_payload["_use_image_settings"] = True
-                    if op == "generate_image" and state.get("width") and state.get("height"):
-                        try:
-                            width, height = int(state["width"]), int(state["height"])
-                            if width > 0 and height > 0:
-                                tool_payload["size"] = f"{width}x{height}"
-                        except (TypeError, ValueError):
-                            pass
                 # Route to the user-picked model when one is selected.
-                selected_model = generation_model_choice if op == "generate_image" else model_choice
-                if selected_model:
-                    tool_payload["model"] = selected_model
-                elif op == "generate_image" or use_image_settings:
-                    # Let server settings resolve Auto, not a planner-invented model.
-                    tool_payload.pop("model", None)
+                if model_choice:
+                    tool_payload["model"] = model_choice
                 # Hand the AI step the canvas image the client already captured
                 # for this request. Without it the tool falls back to a separate
                 # bridge screenshot, which is not reliably answered right after a

routes/font_routes.py

@@ -19,10 +19,9 @@ def _split_family_token(token):
 def _derive_family(filename):
     """Derive a font-family name from a filename like 'JetBrainsMono-Regular.woff2' → 'JetBrains Mono'."""
     name = os.path.splitext(filename)[0]
-    # Strip weight/style suffixes, including BoldItalic and Bold-Italic.
+    # Strip common weight/style suffixes
     name = re.sub(
-        r'[-_ ]?(Thin|ExtraLight|UltraLight|Light|Regular|Medium|SemiBold|DemiBold|Bold|ExtraBold|UltraBold|Black|Heavy|Italic|Oblique|Variable|VF)'
-        r'(?:[-_ ]?(?:Italic|Oblique))?$',
+        r'[-_ ]?(Thin|ExtraLight|UltraLight|Light|Regular|Medium|SemiBold|DemiBold|Bold|ExtraBold|UltraBold|Black|Heavy|Italic|Oblique|Variable|VF)$',
         '', name, flags=re.IGNORECASE
     )
     # Replace dashes/underscores with spaces

routes/gallery/gallery_routes.py

@@ -37,24 +37,6 @@ _SAM_STATE: Dict[str, Any] = {}
 _GROUNDING_STATE: Dict[str, Any] = {}
 
 
-def _compose_cloud_image_edit(source, generated, mask, *, instruction=False):
-    from PIL import Image, ImageChops, ImageOps
-
-    full_frame = instruction or mask.getextrema() == (255, 255)
-    if full_frame:
-        return generated, True
-    # Partial edits must share the source coordinate system, but resizing
-    # width/height independently distorts the subject when the provider changes ratio.
-    fitted = ImageOps.contain(generated, source.size, Image.Resampling.LANCZOS)
-    offset = ((source.width - fitted.width) // 2, (source.height - fitted.height) // 2)
-    aligned = Image.new("RGBA", source.size)
-    aligned.paste(fitted, offset)
-    coverage = Image.new("L", source.size)
-    coverage.paste(255, (offset[0], offset[1], offset[0] + fitted.width, offset[1] + fitted.height))
-    effective_mask = ImageChops.multiply(mask, coverage)
-    return Image.composite(aligned, source, effective_mask), False
-
-
 def _rss_mb() -> float:
     """Current process RSS in MB (from /proc; -1.0 when unavailable)."""
     try:
@@ -586,7 +568,6 @@ def _is_openai_api_base(url: str) -> bool:
 
 
 _GALLERY_ENDPOINT_PATHS = frozenset({
-    "/chat/completions",
     "/images",
     "/images/edits",
     "/images/generations",
@@ -1764,17 +1745,6 @@ def setup_gallery_routes() -> APIRouter:
             if not ok:
                 raise HTTPException(400, f"Rejected endpoint URL: {reason}")
         chosen_model = (body.pop("_model", "") or "").strip()
-        if body.pop("_use_image_settings", False) is True:
-            from src.editor_image_settings import editor_image_models
-            from src.ai_interaction import _resolve_model
-            chosen_model = editor_image_models(owner=user)["edit"]
-            if not chosen_model:
-                raise HTTPException(400, "Choose an image edit model in AI settings")
-            try:
-                edit_url, chosen_model, _ = await asyncio.to_thread(_resolve_model, chosen_model, owner=user)
-            except ValueError as exc:
-                raise HTTPException(400, str(exc)) from exc
-            requested_base = edit_url.removesuffix("/chat/completions").rstrip("/")
         # Optional client-supplied id so GET /api/image/edit-progress can poll the
         # provider's step progress for this op. Ignored by providers that do not
         # implement the progress contract.
@@ -1892,30 +1862,14 @@ def setup_gallery_routes() -> APIRouter:
                         mask_png.save(reference_mask, format="PNG")
                         references = [src_buf.getvalue(), reference_mask.getvalue()]
                         payload = {
-                            "model": oa_model, "n": 1,
+                            "model": oa_model, "size": size, "n": 1,
                             "output_format": "png",
                             "prompt": "Edit the first image. The second image is a mask: white marks the region to edit, black marks the region to preserve. Keep composition and framing unchanged. Requested edit: " + str(body.get("prompt", "")),
                             "input_references": [{"type": "image_url", "image_url": {
                                 "url": "data:image/png;base64," + base64.b64encode(value).decode(),
                             }} for value in references],
                         }
-                        from src.image_model_ids import image_aspect_ratio
-                        payload["aspect_ratio"] = image_aspect_ratio(source_png.width, source_png.height)
-                        from src.ai_interaction import _uses_openrouter_chat_images
-                        if _uses_openrouter_chat_images(oa_model):
-                            payload = {
-                                "model": oa_model,
-                                "messages": [{"role": "user", "content": [
-                                    {"type": "text", "text": payload["prompt"]},
-                                    *[{"type": "image_url", "image_url": ref["image_url"]}
-                                      for ref in payload["input_references"]],
-                                ]}],
-                                "modalities": ["image", "text"], "stream": False,
-                                "image_config": {"aspect_ratio": payload["aspect_ratio"]},
-                            }
-                            r = await client.post(_join_checked_gallery_endpoint(base, "/chat/completions"), headers=headers, json=payload)
-                        else:
-                            r = await client.post(_join_checked_gallery_endpoint(base, "/images"), headers=headers, json=payload)
+                        r = await client.post(_join_checked_gallery_endpoint(base, "/images"), headers=headers, json=payload)
                     else:
                         r = await client.post(_join_checked_gallery_endpoint(base, "/images/edits"), headers=headers, data=data, files=files)
                     if r.status_code != 200:
@@ -1931,12 +1885,6 @@ def setup_gallery_routes() -> APIRouter:
                             pass
                         raise HTTPException(r.status_code, f"{_detail} (provider HTTP {r.status_code})")
                     result = r.json()
-                    from src.ai_interaction import _chat_image_results, _image_response_error
-                    provider_error = _image_response_error(result, oa_model)
-                    if provider_error:
-                        raise HTTPException(400 if "deprecated" in provider_error.lower() else 502, provider_error)
-                    if is_openrouter and _uses_openrouter_chat_images(oa_model):
-                        result = {"data": _chat_image_results(result)}
                     raw_b64 = None
                     if result.get("data"):
                         item = result["data"][0]
@@ -1956,13 +1904,17 @@ def setup_gallery_routes() -> APIRouter:
                     # the masked region actually changes.
                     try:
                         generated = Image.open(io.BytesIO(base64.b64decode(raw_b64))).convert("RGBA")
-                        blended, full_frame = _compose_cloud_image_edit(
-                            source_png, generated, mask_png,
-                            instruction=body.get("mode") == "instruction",
-                        )
+                        # Match the generated image to the source dims.
+                        if generated.size != source_png.size:
+                            generated = generated.resize(source_png.size, Image.LANCZOS)
+                        # mask_png: white = regenerate (use generated),
+                        #           black = keep (use source).
+                        # Composite: result = source * (1 - mask_norm) + generated * mask_norm
+                        # Image.composite does exactly that with `mask`.
+                        blended = Image.composite(generated, source_png, mask_png)
                         out_buf = io.BytesIO()
                         blended.save(out_buf, format="PNG")
-                        return {"image": base64.b64encode(out_buf.getvalue()).decode(), "model": oa_model, "full_frame": full_frame}
+                        return {"image": base64.b64encode(out_buf.getvalue()).decode(), "model": oa_model}
                     except Exception as comp_err:
                         # Never return a full-image edit when masking fails.
                         logger.warning(f"Inpaint compose failed: {comp_err}")
@@ -2481,10 +2433,11 @@ def setup_gallery_routes() -> APIRouter:
         image_b64 = body.get("image")
         amount = body.get("amount", 50) / 100.0
 
-        from PIL import ImageFilter
+        from PIL import Image, ImageFilter
         import base64, io
 
-        img = _b64_to_pil_image(image_b64, mode="RGB")
+        img_bytes = _b64_bytes(image_b64)
+        img = Image.open(io.BytesIO(img_bytes)).convert("RGB")
 
         # Unsharp mask: radius=2, percent=amount*200, threshold=3
         sharpened = img.filter(ImageFilter.UnsharpMask(radius=2, percent=int(amount * 200), threshold=3))
@@ -2519,7 +2472,8 @@ def setup_gallery_routes() -> APIRouter:
         except ImportError:
             raise HTTPException(500, "Server missing a required dependency")
         # Decode source image (RGB; Real-ESRGAN doesn't preserve alpha).
-        src = _b64_to_pil_image(image_b64, mode="RGB")
+        img_bytes = _b64_bytes(image_b64)
+        src = Image.open(io.BytesIO(img_bytes)).convert("RGB")
         try:
             patch_realesrgan_torchvision_compat()
             from realesrgan import RealESRGANer
@@ -2571,7 +2525,8 @@ def setup_gallery_routes() -> APIRouter:
             import numpy as np
         except ImportError:
             raise HTTPException(500, "Server missing a required dependency")
-        src = _b64_to_pil_image(image_b64, mode="RGB")
+        img_bytes = _b64_bytes(image_b64)
+        src = Image.open(io.BytesIO(img_bytes)).convert("RGB")
         try:
             patch_realesrgan_torchvision_compat()
             from basicsr.archs.rrdbnet_arch import RRDBNet
@@ -2619,9 +2574,7 @@ def setup_gallery_routes() -> APIRouter:
             height = int((body or {}).get("height") or 0)
         except (TypeError, ValueError):
             width = height = 0
-        if width > 0 and height > 0:
-            size = f"{width}x{height}"
-        elif height > width:
+        if height > width:
             size = "1024x1536"
         elif width > height:
             size = "1536x1024"
@@ -2634,9 +2587,6 @@ def setup_gallery_routes() -> APIRouter:
         # The editor's model picker may choose a specific (cloud) image model;
         # forward it so settings defaults only apply when none is selected.
         model_choice = str((body or {}).get("model") or "").strip()
-        if body.get("_use_image_settings") is True:
-            from src.editor_image_settings import editor_image_models
-            model_choice = editor_image_models(owner=user)["generation"]
         payload = {"prompt": prompt, "size": size}
         if model_choice:
             payload["model"] = model_choice
@@ -2828,7 +2778,8 @@ def setup_gallery_routes() -> APIRouter:
         from PIL import Image
         import base64, io
 
-        img = _b64_to_pil_image(image_b64)
+        img_bytes = _b64_bytes(image_b64)
+        img = Image.open(io.BytesIO(img_bytes)).convert("RGBA")
         W, H = img.size
 
         hint = None
@@ -2917,7 +2868,8 @@ def setup_gallery_routes() -> APIRouter:
         from PIL import Image, ImageFilter, ImageEnhance
         import numpy as np
 
-        img = _b64_to_pil_image(image_b64, mode="RGB")
+        img_bytes = _b64_bytes(image_b64)
+        img = Image.open(io.BytesIO(img_bytes)).convert("RGB")
 
         # Try GFPGAN first (AI face restoration)
         try:

routes/note/note_routes.py

@@ -728,35 +728,32 @@ def setup_note_routes(task_scheduler=None, upload_handler=None):
             )
             if body.title is not None:
                 note.title = body.title
-            # Omitted fields preserve their values; explicit null clears the
-            # nullable fields used by the editor's removal controls.
-            supplied = body.model_fields_set
-            if "content" in supplied:
+            if body.content is not None:
                 note.content = body.content
-            if "items" in supplied:
-                note.items = json.dumps(body.items) if body.items is not None else None
+            if body.items is not None:
+                note.items = json.dumps(body.items)
                 flag_modified(note, "items")
             if body.note_type is not None:
                 note.note_type = body.note_type
-            if "color" in supplied:
+            if body.color is not None:
                 note.color = body.color
-            if "label" in supplied:
+            if body.label is not None:
                 note.label = body.label
             if body.pinned is not None:
                 note.pinned = body.pinned
             if body.archived is not None:
                 note.archived = body.archived
-            if "due_date" in supplied:
+            if body.due_date is not None:
                 note.due_date = body.due_date
-            if "image_url" in supplied:
+            if body.image_url is not None:
                 note.image_url = body.image_url
-            if "gallery_id" in supplied:
+            if body.gallery_id is not None:
                 note.gallery_id = body.gallery_id
             if body.repeat is not None:
                 note.repeat = body.repeat
             if body.sort_order is not None:
                 note.sort_order = body.sort_order
-            if "agent_session_id" in supplied:
+            if body.agent_session_id is not None:
                 note.agent_session_id = body.agent_session_id
 
             db.commit()

routes/prefs_routes.py

@@ -118,12 +118,8 @@ def setup_prefs_routes():
     async def set_pref(request: Request, key: str, body: dict):
         user = get_current_user(request)
         prefs = _load_for_user(user)
-        val = body.get("value")
-        if val is None:
-            prefs.pop(key, None)
-        else:
-            prefs[key] = val
+        prefs[key] = body.get("value")
         _save_for_user(user, prefs)
-        return {"key": key, "value": prefs.get(key)}
+        return {"key": key, "value": prefs[key]}
 
     return router

routes/session_routes.py

@@ -1315,7 +1315,7 @@ def setup_session_routes(
     def auto_sort_sessions(request: Request, skip_llm: bool = False):
         """Use AI to categorize all sessions into folders.
 
-        Phase 1 deletes empty/Incognito sessions and Phase 2 asks the LLM
+        Phase 1 deletes empty/throwaway sessions and Phase 2 asks the LLM
         to assign folders. When `skip_llm=true` the endpoint returns
         after Phase 1 — used by the "Tidy (no AI)" UI affordance so
         users can clean junk without spending tokens.
@@ -1326,11 +1326,21 @@ def setup_session_routes(
         single_user_mode = not user and _auth_disabled()
         user_sessions = session_manager.get_sessions_for_user(user)
 
-        # Saved conversations are never disposable based on their title or prompt.
+        # Delete empty and throwaway sessions before sorting
         from core.database import ChatMessage as DbMsg
         db = SessionLocal()
         deleted_empty = 0
         deleted_throwaway = 0
+        # Names that indicate a throwaway/test session (case-insensitive exact or prefix match)
+        _THROWAWAY_NAMES = {
+            "test", "testing", "asdf", "asd", "hello", "hi", "hey",
+            "yo", "sup", "hola", "hii", "hiii", "heyo",
+            "foo", "bar", "baz", "tmp", "temp", "scratch", "untitled",
+            "new chat", "delete", "remove", "junk", "trash", "xxx",
+            "abc", "qwerty", "blah", "stuff", "whatever", "idk",
+            "ok", "lol", "bruh", "hmm", "hm", "meh",
+        }
+        _THROWAWAY_MAX_MESSAGES = 4  # only delete if <= this many messages
         try:
             rows_q = db.query(DbSession).filter(DbSession.archived == False)
             if user:
@@ -1339,11 +1349,15 @@ def setup_session_routes(
                 rows_q = rows_q.filter(DbSession.owner == user)
             rows = rows_q.limit(2000).all()
             folder_map = {r.id: r.folder for r in rows}
-            # Precompute per-session message counts in one aggregate query
+            # Precompute per-session message counts in TWO aggregate queries
             # instead of 1–3 queries PER session — with many chats the per-row
             # loop was doing thousands of round-trips and blowing the timeout.
             from sqlalchemy import func as _sa_func
             _counts = dict(db.query(DbMsg.session_id, _sa_func.count(DbMsg.id)).group_by(DbMsg.session_id).all())
+            _asst_counts = dict(
+                db.query(DbMsg.session_id, _sa_func.count(DbMsg.id))
+                .filter(DbMsg.role == "assistant").group_by(DbMsg.session_id).all()
+            )
             cleanup_now = utcnow_naive()
             for row in rows:
                 # Never delete important sessions
@@ -1353,10 +1367,9 @@ def setup_session_routes(
                 if (row.name or "").strip() == "Incognito":
                     should_delete = True
                     deleted_throwaway += 1
+                    db.delete(row)
                     if hasattr(session_manager, 'delete_session'):
                         session_manager.delete_session(row.id)
-                    else:
-                        db.delete(row)
                     continue
                 if is_session_recently_active(row, now=cleanup_now):
                     continue
@@ -1365,11 +1378,31 @@ def setup_session_routes(
                 if msg_count == 0:
                     should_delete = True
                     deleted_empty += 1
+                elif msg_count <= _THROWAWAY_MAX_MESSAGES:
+                    name = (row.name or "").strip().lower()
+                    # Check first user message content (AI renames sessions, so
+                    # "hi" becomes "Casual Greeting Exchange" — name alone won't match)
+                    first_msg = db.query(DbMsg.content).filter(
+                        DbMsg.session_id == row.id, DbMsg.role == "user"
+                    ).order_by(DbMsg.timestamp).first()
+                    first_text = (first_msg[0] or "").strip().lower() if first_msg else ""
+                    # Count assistant messages — if user sent something but AI never replied, it's dead
+                    assistant_count = _asst_counts.get(row.id, 0)
+                    if name in _THROWAWAY_NAMES or name.startswith("chat:") or first_text in _THROWAWAY_NAMES:
+                        should_delete = True
+                        deleted_throwaway += 1
+                    # Single user message with no AI response = dead session
+                    elif msg_count == 1 and assistant_count == 0:
+                        should_delete = True
+                        deleted_throwaway += 1
+                    # Short phrase (1-3 words) with no real AI conversation (<=2 msgs)
+                    elif msg_count <= 2 and first_text and len(first_text.split()) <= 3 and len(first_text) <= 40:
+                        should_delete = True
+                        deleted_throwaway += 1
                 if should_delete:
+                    db.delete(row)
                     if hasattr(session_manager, 'delete_session'):
                         session_manager.delete_session(row.id)
-                    else:
-                        db.delete(row)
             if deleted_empty or deleted_throwaway:
                 db.commit()
                 logger.info(f"Auto-sort: deleted {deleted_empty} empty + {deleted_throwaway} throwaway sessions")

routes/task/task_routes.py

@@ -20,7 +20,7 @@ from src.task_action_policy import (
     is_admin_only_task_action,
     owner_has_admin_task_privileges,
 )
-from src.task_scheduler import compute_next_run, is_valid_cron, HOUSEKEEPING_DEFAULTS
+from src.task_scheduler import compute_next_run, HOUSEKEEPING_DEFAULTS
 from routes.prefs_routes import _load_for_user, _save_for_user
 
 logger = logging.getLogger(__name__)
@@ -475,7 +475,10 @@ def setup_task_routes(task_scheduler) -> APIRouter:
         if req.trigger_type == "schedule" and req.schedule == "cron" and not req.cron_expression:
             raise HTTPException(400, "Cron expression is required for cron schedule")
         if req.trigger_type == "schedule" and req.schedule == "cron" and req.cron_expression:
-            if not is_valid_cron(req.cron_expression):
+            try:
+                from croniter import croniter
+                croniter(req.cron_expression)
+            except Exception:
                 raise HTTPException(400, "Invalid cron expression")
         if req.trigger_type == "event" and not req.trigger_event:
             raise HTTPException(400, "Event name is required for event-triggered tasks")
@@ -785,7 +788,10 @@ def setup_task_routes(task_scheduler) -> APIRouter:
                 task.character_id = req.character_id or None
             if req.cron_expression is not None:
                 if req.cron_expression:
-                    if not is_valid_cron(req.cron_expression):
+                    try:
+                        from croniter import croniter
+                        croniter(req.cron_expression)
+                    except Exception:
                         raise HTTPException(400, "Invalid cron expression")
                 task.cron_expression = req.cron_expression or None
 

scripts/odysseus-gallery

@@ -6,7 +6,6 @@ that are awkward at the shell). Filters images by tag, prompt, favorite,
 album, and surfaces EXIF metadata.
 
     odysseus-gallery list --limit 20 --favorites
-    odysseus-gallery list --tag "sunset,beach"  # all tags, manual or AI
     odysseus-gallery show IMAGE_ID
     odysseus-gallery albums | jq -r '.[] | .name'
     odysseus-gallery search "sunset"          # matches prompt + tags
@@ -84,13 +83,7 @@ def cmd_list(args):
                 fail(f"no album named {args.album!r}")
             q = q.filter(GalleryImage.album_id == al.id)
         if args.tag:
-            for tag in (value.strip() for value in args.tag.split(",")):
-                if not tag:
-                    continue
-                q = q.filter(
-                    GalleryImage.tags.ilike(f"%{tag}%") |
-                    GalleryImage.ai_tags.ilike(f"%{tag}%")
-                )
+            q = q.filter(GalleryImage.tags.ilike(f"%{args.tag}%"))
         q = q.order_by(GalleryImage.created_at.desc()).limit(args.limit)
         emit([_serialize_image(i) for i in q.all()], args)
     finally:
@@ -166,7 +159,7 @@ def _build_parser():
     pl.add_argument("--limit", type=int, default=50)
     pl.add_argument("--favorites", action="store_true")
     pl.add_argument("--album", help="filter by album name")
-    pl.add_argument("--tag", help="comma-separated tags; each matches manual or AI tags by substring")
+    pl.add_argument("--tag", help="substring match against tags column")
     pl.set_defaults(func=cmd_list)
 
     psh = sub.add_parser("show", parents=[common])

scripts/odysseus-mail

@@ -43,7 +43,7 @@ import logging
 import os
 import re
 import sys
-from datetime import datetime, timezone
+from datetime import datetime
 from pathlib import Path
 
 # Anchor the path so the script works when invoked from anywhere.
@@ -136,7 +136,7 @@ def cmd_list(args) -> None:
             emit([], args)
             return
         all_uids = data[0].split()
-        # Keep a bounded arrival batch; order its decoded rows by Date below.
+        # Newest first, limit
         uids = list(reversed(all_uids))[: args.limit]
         out = []
         for uid in uids:
@@ -165,15 +165,10 @@ def cmd_list(args) -> None:
                 sender_name, sender_addr = parseaddr(sender)
                 date_raw = msg.get("Date", "")
                 try:
-                    parsed_date = parsedate_to_datetime(date_raw) if date_raw else None
-                    iso = parsed_date.isoformat() if parsed_date else ""
-                    if parsed_date is not None and parsed_date.tzinfo is None:
-                        parsed_date = parsed_date.replace(tzinfo=timezone.utc)
-                    date_epoch = parsed_date.timestamp() if parsed_date else float("-inf")
+                    iso = parsedate_to_datetime(date_raw).isoformat() if date_raw else ""
                 except Exception:
                     iso = ""
-                    date_epoch = float("-inf")
-                out.append((date_epoch, {
+                out.append({
                     "uid": uid.decode(),
                     "date": iso,
                     "from_addr": sender_addr,
@@ -181,11 +176,10 @@ def cmd_list(args) -> None:
                     "subject": subject,
                     "is_read": "\\Seen" in flags,
                     "is_answered": "\\Answered" in flags,
-                }))
+                })
             except Exception as e:
                 sys.stderr.write(f"warn: skipping uid {uid!r}: {e}\n")
-        out.sort(key=lambda item: item[0], reverse=True)
-        emit([row for _, row in out], args)
+        emit(out, args)
 
 
 # ─── read ────────────────────────────────────────────────────────────

scripts/verify_notes_browser_runtime.py

@@ -11,38 +11,6 @@ import time
 from urllib.request import urlopen
 
 ROOT = Path(__file__).resolve().parents[1]
-if str(ROOT) not in sys.path:
-    sys.path.insert(0, str(ROOT))
-
-
-def _stop_owned_server(server, identity):
-    """Close only identity-bound descendants, including MCP's new sessions.
-
-    Capture before signalling the parent: an orphaned stderr holder can no
-    longer be attributed by ancestry. Never search by executable name or kill
-    the caller's process group.
-    """
-    from src import process_lifecycle as lifecycle
-
-    descendants = (lifecycle.bind_descendants([identity.pid])
-                   if identity.verdict() == lifecycle.OWNED else [])
-    if os.name == "nt":
-        if identity.verdict() == lifecycle.OWNED:
-            lifecycle.taskkill_tree(identity.pid)
-    else:
-        outcome = lifecycle.terminate_identities(
-            [*(entry.identity for entry in reversed(descendants)), identity],
-            steps=lifecycle.term_kill_steps(10),
-        )
-        if outcome.survivors or outcome.unverified:
-            raise RuntimeError(f"Disposable Notes cleanup could not verify exit: {outcome}")
-    try:
-        logs, _ = server.communicate(timeout=2)
-    except subprocess.TimeoutExpired as error:
-        # Do not turn an unidentified pipe holder into an unbounded wait.
-        server.stdout.close()
-        raise RuntimeError("Disposable Notes output pipe remained open after owned cleanup") from error
-    return logs
 
 
 def main():
@@ -68,10 +36,7 @@ def main():
         server = subprocess.Popen(
             [sys.executable, "-m", "uvicorn", "app:app", "--host", "127.0.0.1", "--port", str(port)],
             cwd=target, env=env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True,
-            start_new_session=(os.name != "nt"),
         )
-        from src.process_lifecycle import ProcessIdentity
-        server_identity = ProcessIdentity.capture(server.pid)
         result = None
         try:
             origin = f"http://127.0.0.1:{port}"
@@ -97,7 +62,12 @@ def main():
                 print(result.stderr, file=sys.stderr)
             return result.returncode
         finally:
-            logs = _stop_owned_server(server, server_identity)
+            server.terminate()
+            try:
+                logs, _ = server.communicate(timeout=10)
+            except subprocess.TimeoutExpired:
+                server.kill()
+                logs, _ = server.communicate()
             if result is None or result.returncode:
                 print(logs[-8000:], file=sys.stderr)
 

services/hwfit/hf_discovery.py

@@ -202,35 +202,17 @@ def _infer_use_case(repo_id, pipeline_tag):
     return "general"
 
 
-# HF collections mix in models no Cookbook LLM backend can serve (vision
-# encoders, time-series forecasters, image/video generators). Image models
-# have their own registry, so keep these out of the LLM catalog.
-_NON_LLM_PIPELINE_TAGS = frozenset({
-    "time-series-forecasting",
-    "zero-shot-image-classification",
-    "image-classification",
-    "image-feature-extraction",
-    "text-to-image",
-    "image-to-video",
-    "text-to-video",
-})
-
-
 def _entry_from_collection_item(collection, item, source):
     repo_id = item.get("id") or ""
     if item.get("type") != "model" or not repo_id:
         return None
-    if (item.get("pipeline_tag") or "").strip().lower() in _NON_LLM_PIPELINE_TAGS:
-        return None
     repo_prefix = source.get("repo_prefix")
     if repo_prefix and not repo_id.startswith(repo_prefix):
         return None
     raw_params = item.get("numParameters") or 0
-    # Read the name even when HF gives a total: it is the only source of the
-    # MoE active size (e.g. "-35B-A3B"), which the speed estimate depends on.
-    name_params, active = _parse_params_from_name(repo_id)
+    active = None
     if not raw_params:
-        raw_params = name_params
+        raw_params, active = _parse_params_from_name(repo_id)
     param_label, raw_params = _format_params(raw_params)
     if not raw_params:
         return None

services/memory/skill_format.py

@@ -84,14 +84,10 @@ _FM_KEY_RE = re.compile(r"^([a-z_][a-z0-9_]*):\s*(.*)$", re.IGNORECASE)
 _FM_BLOCK_LIST_RE = re.compile(r"^\s*-\s*(.*)$")
 
 
-def _parse_scalar(raw: str, *, string_only: bool = False) -> Any:
+def _parse_scalar(raw: str) -> Any:
     raw = raw.strip()
     if raw == "":
         return ""
-    # String fields keep their spelling; quoted values still use the decoder
-    # below so existing escapes round-trip as before.
-    if string_only and not (raw[0] == raw[-1] and raw[0] in ("'", '"')):
-        return raw
     if raw.startswith("[") and raw.endswith("]"):
         inner = raw[1:-1].strip()
         if not inner:
@@ -175,7 +171,7 @@ def parse_frontmatter(text: str) -> tuple[Dict[str, Any], str]:
                 pending_key = key
                 fm[key] = []
             else:
-                fm[key] = _parse_scalar(val, string_only=(key == "version"))
+                fm[key] = _parse_scalar(val)
                 pending_key = None
             continue
         m2 = _FM_BLOCK_LIST_RE.match(line)

src/agent_tools/editor_tools.py

@@ -191,7 +191,7 @@ def _persist_png(image_bytes: bytes, owner: Optional[str], session_id: Optional[
         db.close()
 
 
-async def _place_layer(data_url: str, name: str, owner: Optional[str], session: str, *, masked: bool = False, blend: str = "normal", opacity: float = 100.0, mode: Optional[str] = None, native_size: bool = False) -> bool:
+async def _place_layer(data_url: str, name: str, owner: Optional[str], session: str, *, masked: bool = False, blend: str = "normal", opacity: float = 100.0, mode: Optional[str] = None) -> bool:
     params: Dict[str, Any] = {
         "dataUrl": data_url,
         "name": name,
@@ -199,8 +199,6 @@ async def _place_layer(data_url: str, name: str, owner: Optional[str], session:
         "blend": blend or "normal",
         "opacity": opacity,
     }
-    if native_size:
-        params["nativeSize"] = True
     # Forward the edit mode so the client can build a difference mask for
     # instruction-mode results: the whole image was regenerated under an
     # instruction prompt, so untouched pixels must stay pixel-identical (the
@@ -508,8 +506,6 @@ class AiEditImageTool:
             }
         _t["image"] = time.perf_counter()
         payload: Dict[str, Any] = {"image": image}
-        if args.get("_use_image_settings") is True:
-            payload["_use_image_settings"] = True
         model_choice = str(args.get("model") or "").strip()
         mask_used = False
         place_mode: Optional[str] = None
@@ -613,11 +609,10 @@ class AiEditImageTool:
                 f"AI {op}",
                 owner,
                 session,
-                masked=mask_used and data.get("full_frame") is not True,
+                masked=mask_used,
                 blend=str(args.get("blend") or "normal"),
                 opacity=float(args.get("opacity") or 100),
                 mode=place_mode,
-                native_size=data.get("full_frame") is True,
             )
             info["placed"] = placed
             if placed:
@@ -692,7 +687,6 @@ class GenerateImageLayerTool:
                 str(args.get("name") or "Generated image"),
                 owner,
                 session,
-                native_size=True,
                 masked=bool(args.get("mask")),
                 blend=str(args.get("blend") or "normal"),
                 opacity=float(args.get("opacity") or 100),

src/ai_interaction.py

@@ -179,13 +179,8 @@ def _resolve_model(spec: str, owner: Optional[str] = None, model_type: Optional[
                 # served internal id. Include pinned/cached ids in the match set
                 # so chat sessions using the HF repo id still resolve. Do not use
                 # stale cached aliases when the endpoint itself is unreachable.
-                if endpoint_reachable:
-                    # Gateway image models may live in a dedicated catalogue,
-                    # so explicitly pinned IDs are valid on mixed endpoints too.
-                    extras = _json_list(getattr(ep, "pinned_models", None))
-                    if model_type == "image":
-                        extras += _json_list(getattr(ep, "cached_models", None))
-                    for extra in extras:
+                if model_type == "image" and endpoint_reachable:
+                    for extra in _json_list(getattr(ep, "pinned_models", None)) + _json_list(getattr(ep, "cached_models", None)):
                         if extra not in model_ids:
                             model_ids.append(extra)
 
@@ -1181,9 +1176,9 @@ def image_editing_provider_available(owner: Optional[str] = None) -> bool:
     request on this so it never falls back to deterministic approximations.
     """
     try:
-        from src.settings import get_user_setting, load_settings
+        from src.settings import load_settings
 
-        if not load_settings().get("image_gen_enabled", True) or not get_user_setting("image_gen_enabled", owner=owner or "", default=True):
+        if not load_settings().get("image_gen_enabled", True):
             return False
     except Exception:
         pass
@@ -1205,39 +1200,6 @@ def image_editing_provider_available(owner: Optional[str] = None) -> bool:
         return False
 
 
-def _uses_openrouter_chat_images(model_id: str) -> bool:
-    # GPT-5 Image is an LLM wrapper, unlike native gpt-image-* image models.
-    leaf = model_id_leaf(model_id).lower()
-    return leaf.startswith("gpt-") and "-image" in leaf and not leaf.startswith("gpt-image-")
-
-
-def _chat_image_results(data: dict) -> list:
-    images = []
-    for choice in data.get("choices") or []:
-        message = choice.get("message") or {}
-        for item in message.get("images") or []:
-            url = (item.get("image_url") or {}).get("url")
-            if not isinstance(url, str):
-                continue
-            if url.startswith("data:image/") and ";base64," in url:
-                images.append({"b64_json": url.split(",", 1)[1]})
-            elif url.startswith(("https://", "http://")):
-                images.append({"url": url})
-    return images
-
-
-def _image_response_error(data: dict, model_id: str) -> Optional[str]:
-    errors = [data.get("error")]
-    errors.extend(choice.get("error") for choice in data.get("choices") or [])
-    for error in errors:
-        if not error:
-            continue
-        message = str(error.get("message") or "Image provider failed") if isinstance(error, dict) else str(error)
-        hint = " Choose a currently supported image model in AI settings." if "deprecated" in message.lower() else ""
-        return f"Image provider failed for '{model_id}': {message}{hint}"
-    return None
-
-
 async def do_generate_image(content: str, session_id: Optional[str] = None, owner: Optional[str] = None, *, incognito: bool = False) -> Dict:
     """Generate an image using an image-capable model (e.g. gpt-image-1).
 
@@ -1245,7 +1207,7 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
       Line 1: prompt describing the image
       Line 2: model name (optional, default auto-detects: prefers gpt-image-1.5 > gpt-image-1)
       Line 3: size (optional, defaults to 1024x1024)
-      Line 4: quality (optional, defaults to configured quality or medium — low, medium, high, auto)
+      Line 4: quality (optional, defaults to medium — options: low, medium, high, auto)
     """
     import base64
     import httpx
@@ -1263,38 +1225,32 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
         prompt = str(args.get('prompt') or '').strip()
         model_spec = str(args.get('model') or '').strip()
         size = str(args.get('size') or '1024x1024')
-        quality = str(args.get('quality') or '')
+        quality = str(args.get('quality') or 'medium')
     else:
         lines = content.strip().split("\n")
         prompt = lines[0].strip() if lines else ""
         model_spec = lines[1].strip() if len(lines) > 1 and lines[1].strip() else ""
         size = lines[2].strip() if len(lines) > 2 and lines[2].strip() else "1024x1024"
-        quality = lines[3].strip() if len(lines) > 3 and lines[3].strip() else ""
+        quality = lines[3].strip() if len(lines) > 3 and lines[3].strip() else "medium"
 
     if not prompt:
         return {"error": "Image prompt is required (line 1)"}
 
-    # Load settings for defaults
+    # Load admin settings for defaults
     try:
-        from src.settings import get_user_setting, load_settings
+        from src.settings import load_settings
         _settings = load_settings()
     except Exception:
         _settings = {}
-        def get_user_setting(key, owner="", default=None):
-            return default
 
-    # The administrator's global image-generation disable switch is authoritative.
-    # Non-admin preferences cannot re-enable generation when disabled globally.
     if not _settings.get("image_gen_enabled", True):
         return {"error": "Image generation is disabled by the administrator."}
-    if not get_user_setting("image_gen_enabled", owner=owner or "", default=True):
-        return {"error": "Image generation is disabled by user preference."}
 
-    # Use user- or admin-configured model/quality if not specified by the tool call
+    # Use admin-configured model/quality if not specified by the tool call
     if not model_spec:
-        model_spec = get_user_setting("image_model", owner=owner, default="") or ""
-    if not quality:
-        quality = get_user_setting("image_quality", owner=owner, default="medium") or "medium"
+        model_spec = _settings.get("image_model", "")
+    if quality == "medium" and _settings.get("image_quality"):
+        quality = _settings["image_quality"]
 
     # Auto-detect best available image model if still not set
     if not model_spec:
@@ -1386,19 +1342,8 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
     base_url = url.replace("/chat/completions", "").replace("/v1/messages", "").rstrip("/")
     images_url = base_url + "/images/generations"
     from src.model_capability_readers.base import detect_vendor
-    chat_images = detect_vendor(url) == "openrouter" and _uses_openrouter_chat_images(model_id)
     if detect_vendor(url) == "openrouter":
         images_url = base_url + "/images"
-    if chat_images:
-        images_url = base_url + "/chat/completions"
-
-    # Capture the requested geometry before older OpenAI size restrictions.
-    from src.image_model_ids import image_aspect_ratio
-    try:
-        requested_width, requested_height = (int(value) for value in size.lower().split("x"))
-        requested_ratio = image_aspect_ratio(requested_width, requested_height)
-    except (TypeError, ValueError):
-        requested_ratio = "1:1"
 
     # Validate size for cloud image models (local diffusion accepts any WxH)
     valid_gpt_sizes = {"1024x1024", "1024x1536", "1536x1024", "auto"}
@@ -1414,9 +1359,6 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
         "n": 1,
         "size": size,
     }
-    if detect_vendor(url) == "openrouter":
-        payload.pop("size", None)
-        payload["aspect_ratio"] = requested_ratio
 
     # GPT image models and local diffusion support quality; DALL-E does not
     if is_gpt_image or is_local_diffusion:
@@ -1430,16 +1372,7 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
     try:
         # GPT image models can take 30-120s+ depending on quality
         async with httpx.AsyncClient(timeout=httpx.Timeout(connect=30.0, read=300.0, write=30.0, pool=30.0)) as client:
-            request_payload = payload
-            if chat_images:
-                request_payload = {
-                    "model": model_id,
-                    "messages": [{"role": "user", "content": prompt}],
-                    "modalities": ["image", "text"],
-                    "stream": False,
-                    "image_config": {"aspect_ratio": requested_ratio},
-                }
-            resp = await client.post(images_url, json=request_payload, headers=headers)
+            resp = await client.post(images_url, json=payload, headers=headers)
 
             if resp.status_code != 200:
                 error_text = resp.text[:500]
@@ -1454,15 +1387,9 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
                 }
 
             data = resp.json()
-            provider_error = _image_response_error(data, model_id)
-            if provider_error:
-                return {"error": provider_error, "untrusted_content": True}
-            images = _chat_image_results(data) if chat_images else data.get("data", [])
+            images = data.get("data", [])
             if not images:
-                return {"error": (
-                    f"Image model '{model_id}' returned no image. "
-                    "Choose another image generation model in AI settings."
-                )}
+                return {"error": "No images returned from API"}
 
             img = images[0]
             image_url = None
@@ -1555,7 +1482,7 @@ async def do_edit_image(
     session_id: Optional[str] = None,
     owner: Optional[str] = None,
     size: str = "auto",
-    quality: Optional[str] = None,
+    quality: str = "medium",
     progress_callback: Optional[Callable[[Dict[str, Any]], Awaitable[None]]] = None,
     incognito: bool = False,
 ) -> Dict:
@@ -1575,27 +1502,21 @@ async def do_edit_image(
         return {"error": "Attached image file was not found"}
 
     try:
-        from src.settings import get_user_setting, load_settings
+        from src.settings import load_settings
         _settings = load_settings()
     except Exception:
         _settings = {}
-        def get_user_setting(key, owner="", default=None):
-            return default
 
     if not model_spec:
-        model_spec = get_user_setting("image_edit_model", owner=owner) or get_user_setting("image_model", owner=owner, default="")
-    if quality is None:
-        quality = get_user_setting("image_quality", owner=owner, default="medium") or "medium"
+        model_spec = _settings.get("image_model", "")
+    if quality == "medium" and _settings.get("image_quality"):
+        quality = _settings["image_quality"]
     if not model_spec:
         return {"error": "No image model selected for image editing"}
 
     try:
         try:
             def _call():
-                try:
-                    return _resolve_model(model_spec, owner=owner)
-                except ValueError:
-                    pass
                 try:
                     return _resolve_model(model_spec, owner=owner, model_type="image")
                 except TypeError as exc:
@@ -1608,7 +1529,6 @@ async def do_edit_image(
     except ValueError:
         return {"error": f"No endpoint found with image model '{model_spec}'."}
 
-    requested_edit_size = size
     if not size or size == "auto":
         from PIL import Image
         from src.image_model_ids import image_edit_size
@@ -1784,35 +1704,7 @@ async def do_edit_image(
                             "image_url": {"url": f"data:{mime};base64,{image_b64}"},
                         }],
                     }
-                    from src.image_model_ids import image_aspect_ratio
-                    from PIL import Image as ReferenceImage
-                    with ReferenceImage.open(path) as reference:
-                        reference_width, reference_height = reference.size
-                        if reference.getexif().get(274) in {5, 6, 7, 8}:
-                            reference_width, reference_height = reference_height, reference_width
-                    if requested_edit_size and requested_edit_size != "auto":
-                        try:
-                            reference_width, reference_height = (int(value) for value in requested_edit_size.lower().split("x"))
-                        except (TypeError, ValueError):
-                            pass
-                    edit_payload.pop("size", None)
-                    edit_payload["aspect_ratio"] = image_aspect_ratio(reference_width, reference_height)
-                    if _uses_openrouter_chat_images(model_id):
-                        edit_payload = {
-                            "model": model_id,
-                            "messages": [{"role": "user", "content": [
-                                {"type": "text", "text": prompt},
-                                {"type": "image_url", "image_url": {
-                                    "url": f"data:{mime};base64,{image_b64}",
-                                }},
-                            ]}],
-                            "modalities": ["image", "text"],
-                            "stream": False,
-                            "image_config": {"aspect_ratio": edit_payload["aspect_ratio"]},
-                        }
-                        resp = await client.post(base_url + "/chat/completions", json=edit_payload, headers=headers)
-                    else:
-                        resp = await client.post(base_url + "/images", json=edit_payload, headers=headers)
+                    resp = await client.post(base_url + "/images", json=edit_payload, headers=headers)
                 else:
                     with path.open("rb") as f:
                         files = {"image": (path.name, f, mime)}
@@ -1855,12 +1747,7 @@ async def do_edit_image(
                 }
 
             data = resp.json()
-            provider_error = _image_response_error(data, model_id)
-            if provider_error:
-                return {"error": provider_error, "untrusted_content": True}
-            images = (_chat_image_results(data)
-                      if is_openrouter and _uses_openrouter_chat_images(model_id)
-                      else data.get("data", []))
+            images = data.get("data", [])
             if not images:
                 return {"error": "No image returned from edit API"}
 

src/browser_observation.py

@@ -25,7 +25,7 @@ def compact_browser_observation(value, budget=8000):
                 # Snapshot text already contains labels and refs in DOM order.
                 # The refs mapping repeats them and buries menus in raw JSON.
                 lines = [line for line in snapshot.splitlines()
-                         if not re.fullmatch(r'\s*(?:-\s*)?generic(?:\s+\[ref=e\d+\])?:?\s*', line)]
+                         if not re.fullmatch(r'\s*-?\s*generic(?:\s+\[ref=e\d+\])?:?\s*', line)]
                 pages.append(('URL: ' + str(url) + '\n' if url else '') + '\n'.join(lines))
             elif url:
                 notices.append('URL: ' + str(url))
@@ -37,8 +37,7 @@ def compact_browser_observation(value, budget=8000):
                 parsed = json.loads(item)
             except (ValueError, TypeError):
                 # CLI status text precedes the JSON post-interaction state.
-                # Labels are one line; stopping at \n keeps the split linear.
-                parts = re.split(r'\n\n\[(?:post-[^\]\n]+|page state after failed [^\]\n]+)\]\n', item)
+                parts = re.split(r'\n\n\[(?:post-[^\]]+|page state after failed [^\]]+)\]\n', item)
                 if len(parts) > 1:
                     for part in parts:
                         visit(part)

src/clean_agent_preview.py

@@ -1229,7 +1229,7 @@ def tasks_terminal_response(raw, *, user_text='', max_items=20):
     text = str(payload or '').strip()
     rows = []
     for line in text.splitlines():
-        match = re.match(r'^\s*\d+\.\s(.*?)\s\(([^()]+)\)\s+—\s+(.+)$', line)
+        match = re.match(r'^\s*\d+\.\s+(.*?)\s+\(([^)]+)\)\s+—\s+(.+)$', line)
         if match:
             details = match[3].strip()
             rows.append({
@@ -1346,7 +1346,7 @@ def skills_terminal_response(raw, *, user_text='', max_items=20):
             continue
         match = re.match(r'^\s*-\s+\*\*([^*]+)\*\*(?:\s+\(([^)]+)\))?', line)
         if not match:
-            match = re.match(r'^\s*-\s+([^\s:][^:]*?)(?:\s\(([^()]+)\)(?:\s*:|$)|:|$)', line)
+            match = re.match(r'^\s*-\s+([^:]+?)(?:\s+\(([^)]+)\))?(?:\s*:|$)', line)
         if match and status:
             rows.append((status, match.group(1).strip(), (match.group(2) or '').strip()))
     if not rows:
@@ -5065,7 +5065,7 @@ def email_search_result_empty(value):
         try:
             decoded = json.loads(value)
         except (TypeError, ValueError):
-            return bool(re.fullmatch(r'\s*No emails matched [^\n]+(?:\n\s*)?', value, re.I))
+            return bool(re.fullmatch(r'\s*No emails matched [^\n]+\.?\s*', value, re.I))
         if decoded == value:
             return False
         value = decoded
@@ -5339,16 +5339,6 @@ def private_browser_effective_url(result):
     return urls[-1] if urls else ''
 
 
-def is_google_sorry_url(url):
-    """Recognize Google's rate-limit interstitial."""
-    # Matching the host separately keeps this linear; one combined pattern
-    # rescans the host from every dot.
-    return any(
-        re.fullmatch(r'(?:[^/]+\.)?google\.[^/]+', host[1], re.I)
-        for host in re.finditer(r'https?://([^/]+)/sorry/', url, re.I)
-    )
-
-
 def browser_observation_page_missing(raw):
     """Recognize a rendered error page, rather than an article mentioning 404."""
     text = str(raw or '')
@@ -8223,7 +8213,11 @@ async def stream_preview(*, endpoint_url, model, messages, headers, turn_contrac
                         browser_search_url = requested_browser_url or effective_browser_url
                         is_search_engine_navigation = contains_search_engine_navigation(
                             browser_search_url
-                        ) or is_google_sorry_url(effective_browser_url)
+                        ) or bool(re.search(
+                            r'https?://(?:[^/]+\.)?google\.[^/]+/sorry/',
+                            effective_browser_url,
+                            re.I,
+                        ))
                         has_native_search = any(
                             canonical(schema['function']['name']) == 'web_search'
                             for schema in offered

src/editor_image_settings.py

@@ -1,19 +0,0 @@
-"""The shared model defaults used by Quick Edit's image operations."""
-from src.settings import get_user_setting, load_settings
-
-
-def editor_image_models(owner: str = "") -> dict[str, str]:
-    settings = load_settings()
-    generation = ""
-    edit_model = ""
-    if owner:
-        generation = str(get_user_setting("image_model", owner=owner, default="") or "").strip()
-        edit_model = str(get_user_setting("image_edit_model", owner=owner, default="") or "").strip()
-    if not generation:
-        generation = str(settings.get("image_model") or "").strip()
-    if not edit_model:
-        edit_model = str(settings.get("image_edit_model") or generation).strip()
-    return {
-        "generation": generation,
-        "edit": edit_model or generation,
-    }

src/image_model_ids.py

@@ -40,15 +40,6 @@ def image_edit_size(model_id: str, width: int, height: int) -> str:
     return f"{width}x{height}"
 
 
-def image_aspect_ratio(width: int, height: int) -> str:
-    """Choose the nearest common Image API ratio, without distorting pixels."""
-    if width <= 0 or height <= 0:
-        raise ValueError("Image dimensions must be positive")
-    ratios = ((1, 1), (16, 9), (9, 16), (3, 2), (2, 3), (4, 3), (3, 4), (21, 9))
-    w, h = min(ratios, key=lambda ratio: abs(math.log((ratio[0] / ratio[1]) / (width / height))))
-    return f"{w}:{h}"
-
-
 def looks_like_image_generation_model(model_id: str) -> bool:
     """Return True when a model id should use image generation routes.
 

src/llm_core.py

@@ -422,18 +422,7 @@ def _stream_delta_event(text: str, *, thinking: bool = False) -> str:
     return f"data: {json.dumps(payload)}\n\n"
 
 
-_WORD_CHARS = r"A-Za-z0-9_\u0370-\u03ff\u0400-\u04ff"
-_DELIM_RE = re.compile(rf"[^{_WORD_CHARS}+\-.]")
-_NUMERIC_PATTERN = rf"(?<![{_WORD_CHARS}])[+-]?(?:[0-9]+\.[0-9]+|\.[0-9]+|[0-9]+)(?:[eE][+-]?[0-9]+)?(?![{_WORD_CHARS}])"
-_NUMERIC_FULLMATCH_RE = re.compile(rf"^[+-]?(?:[0-9]+\.[0-9]+|\.[0-9]+|[0-9]+)(?:[eE][+-]?[0-9]+)?$")
-_DEGENERATE_WORD_RE = re.compile(rf"[{_WORD_CHARS}]+")
-_TOKEN_RE = re.compile(rf"(?P<NUM>{_NUMERIC_PATTERN})|(?P<WORD>[{_WORD_CHARS}]+)")
-
-
-def _is_numeric_token(token: str) -> bool:
-    if token.isdigit():
-        return True
-    return _NUMERIC_FULLMATCH_RE.fullmatch(token) is not None
+_DEGENERATE_WORD_RE = re.compile(r"[A-Za-z0-9_\u0370-\u03ff\u0400-\u04ff]+")
 
 
 class _DegenerateStreamGuard:
@@ -443,50 +432,32 @@ class _DegenerateStreamGuard:
     "Summer Summer ..."). This is not a useful response and can burn context,
     browser memory, and GPU time. Keep the guard conservative: only fire on long
     same-token runs or a very dominant repeated token in the recent window.
-    Repetition made only of numbers is data (a zero or identity matrix, a
-    padded buffer), so it only stops at a long all-numeric backstop.
     """
 
     def __init__(self, model: str):
         self.model = model or "model"
         self.last_token = ""
         self.same_run = 0
-        self.numeric_run = 0
         self.recent_tokens: List[str] = []
         self.periodic_tokens: List[str] = []
         self.total_chars = 0
-        self._buffer = ""
 
     def check(self, text: str) -> Optional[str]:
         if not text:
             return None
         self.total_chars += len(text)
-        self._buffer += text
-
-        m_delims = list(_DELIM_RE.finditer(self._buffer))
-        if m_delims:
-            split_idx = m_delims[-1].end()
-            head = self._buffer[:split_idx]
-            self._buffer = self._buffer[split_idx:]
-        elif len(self._buffer) >= 256:
-            head = self._buffer
-            self._buffer = ""
-        else:
-            return None
-
-        tokens = []
-        for m in _TOKEN_RE.finditer(head):
-            tokens.append((m.group(0).lower(), m.lastgroup == "NUM"))
+        # Keep one-character tokens. Structured output often varies through
+        # numeric selectors or coordinates; dropping those tokens can make
+        # valid CSS/SVG rows look like an exact repeated phrase.
+        tokens = [t.lower() for t in _DEGENERATE_WORD_RE.findall(text)]
         if not tokens:
             return None
-
-        for token, is_num in tokens:
+        for token in tokens:
             if token == self.last_token:
                 self.same_run += 1
             else:
                 self.last_token = token
                 self.same_run = 1
-            self.numeric_run = self.numeric_run + 1 if is_num else 0
             self.recent_tokens.append(token)
             self.periodic_tokens.append(token)
         if len(self.recent_tokens) > 96:
@@ -495,20 +466,14 @@ class _DegenerateStreamGuard:
             self.periodic_tokens = self.periodic_tokens[-2048:]
 
         reason = None
-        if self.same_run >= 28 and self.total_chars >= 100 and not _is_numeric_token(self.last_token):
+        if self.same_run >= 28 and self.total_chars >= 100:
             reason = f"repeated '{self.last_token}' {self.same_run} times"
         elif len(self.recent_tokens) >= 72:
             top = max(set(self.recent_tokens), key=self.recent_tokens.count)
             count = self.recent_tokens.count(top)
-            if count >= 60 and count / max(len(self.recent_tokens), 1) >= 0.78 and not _is_numeric_token(top):
+            if count >= 60 and count / max(len(self.recent_tokens), 1) >= 0.78:
                 reason = f"repeated '{top}' {count}/{len(self.recent_tokens)} recent tokens"
-        if (
-            not reason
-            and len(self.recent_tokens) >= 48
-            # A window that is mostly numbers is matrix/table data; its
-            # periodicity is real. Mixed loops still hit the exact-block check.
-            and sum(_is_numeric_token(t) for t in self.recent_tokens) * 2 < len(self.recent_tokens)
-        ):
+        if not reason and len(self.recent_tokens) >= 48:
             # Detect a periodic suffix instead of counting repeated n-grams.
             # Reused property names are normal in CSS/SVG/JSON; a collapsed
             # generation repeats nearly every token at a short fixed period.
@@ -543,15 +508,12 @@ class _DegenerateStreamGuard:
                 if history[previous:previous + anchor_size] != anchor:
                     continue
                 period = current_anchor - previous
-                if period < 24 or len(history) < period * 2 or self.numeric_run >= period:
+                if period < 24 or len(history) < period * 2:
                     continue
-                if history[-2 * period:-period] == history[-period:] and not all(_is_numeric_token(t) for t in history[-period:]):
+                if history[-2 * period:-period] == history[-period:]:
                     reason = f"repeated an exact {period}-token block twice"
                     break
 
-        if not reason and self.numeric_run >= 2048:
-            reason = f"emitted {self.numeric_run} numbers in a row"
-
         if not reason:
             return None
 

src/model_discovery.py

@@ -193,10 +193,7 @@ class ModelDiscovery:
             data = r.json()
             # Some OpenAI-compatible servers return a bare list, not {"data": [...]}.
             items = data if isinstance(data, list) else ((data or {}).get("data") or [])
-            ids = [
-                m["id"] for m in items
-                if isinstance(m, dict) and isinstance(m.get("id"), str) and m["id"]
-            ]
+            ids = [m.get("id") for m in items if isinstance(m, dict) and m.get("id")]
             if ids:
                 return {
                     "host": host,

src/pdf_form_doc.py

@@ -102,10 +102,8 @@ _PLAIN_FRONT_MATTER_RE = re.compile(
 #   - **label:** value <!-- field=NAME-ENC type=text -->
 #   - **label** [opts]: value <!-- field=NAME-ENC type=choice -->
 #   - [x] **label** <!-- field=NAME-ENC type=checkbox -->
-# Accept Unicode word characters for older saved markers, whose encoder left
-# non-ASCII letters/numbers literal. Newly rendered names are ASCII-safe.
 _FIELD_BULLET_RE = re.compile(
-    r'^\s*-\s+(?P<body>.*?)\s*<!--\s*field=(?P<name>[\w.%-]+)\s+type=(?P<type>\w+)\s*-->\s*$'
+    r'^\s*-\s+(?P<body>.*?)\s*<!--\s*field=(?P<name>[A-Za-z0-9_.%-]+)\s+type=(?P<type>\w+)\s*-->\s*$'
 )
 
 
@@ -117,7 +115,7 @@ def _encode_name(name: str) -> str:
     """
     out = []
     for ch in name or "":
-        if (ch.isascii() and ch.isalnum()) or ch in ("_", ".", "-"):
+        if ch.isalnum() or ch in ("_", ".", "-"):
             out.append(ch)
         else:
             for b in ch.encode("utf-8"):

src/session_actions.py

@@ -12,6 +12,16 @@ from datetime import datetime, timedelta, timezone
 
 logger = logging.getLogger(__name__)
 
+# Names that indicate a throwaway/test session
+_THROWAWAY_NAMES = {
+    "test", "testing", "asdf", "asd", "hello", "hi", "hey",
+    "yo", "sup", "hola", "hii", "hiii", "heyo",
+    "foo", "bar", "baz", "tmp", "temp", "scratch", "untitled",
+    "new chat", "delete", "remove", "junk", "trash", "xxx",
+    "abc", "qwerty", "blah", "stuff", "whatever", "idk",
+    "ok", "lol", "bruh", "hmm", "hm", "meh",
+}
+_THROWAWAY_MAX_MESSAGES = 4
 _FRESH_EMPTY_SESSION_GRACE = timedelta(minutes=10)
 _FRESH_SESSION_GRACE = _FRESH_EMPTY_SESSION_GRACE
 
@@ -44,15 +54,14 @@ def is_session_recently_active(row, now=None, grace=_FRESH_SESSION_GRACE) -> boo
 
 
 async def run_auto_sort(owner: str, skip_llm: bool = False, delete_throwaway: bool = True) -> str:
-    """Remove empty/Incognito sessions and optionally organize saved chats.
+    """Run session cleanup + (optional) AI folder sort for the given owner.
 
     Args:
         owner: user whose sessions to process
-        skip_llm: when True, do only Phase 1 (delete empty/Incognito sessions);
+        skip_llm: when True, do only Phase 1 (delete empty/throwaway sessions);
             skip Phase 2 (AI folder assignment). Used by the built-in daily
             background sweep so it never burns LLM tokens.
-        delete_throwaway: retained for caller compatibility. Ordinary sessions
-            with saved messages are always preserved, regardless of this flag.
+        delete_throwaway: when False, only empty/incognito sessions are deleted.
 
     Returns a human-readable summary of what was done.
     """
@@ -62,7 +71,7 @@ async def run_auto_sort(owner: str, skip_llm: bool = False, delete_throwaway: bo
 
     db = SessionLocal()
     try:
-        # ── Phase 1: Delete only empty and explicitly Incognito sessions ──
+        # ── Phase 1: Delete empty/throwaway sessions ──
         deleted_empty = 0
         deleted_throwaway = 0
 
@@ -84,13 +93,47 @@ async def run_auto_sort(owner: str, skip_llm: bool = False, delete_throwaway: bo
             if is_session_recently_active(row, now=cleanup_now):
                 continue
 
-            has_messages = db.query(DbMsg.id).filter(
+            msg_count = db.query(DbMsg.id).filter(
                 DbMsg.session_id == row.id
-            ).first() is not None
-            if not has_messages:
+            ).limit(_THROWAWAY_MAX_MESSAGES + 1).count()
+            should_delete = False
+
+            if msg_count == 0:
                 if is_fresh:
                     continue
+                should_delete = True
                 deleted_empty += 1
+            elif delete_throwaway and msg_count <= _THROWAWAY_MAX_MESSAGES:
+                name = (row.name or "").strip().lower()
+                first_msg = db.query(DbMsg.content).filter(
+                    DbMsg.session_id == row.id, DbMsg.role == "user"
+                ).order_by(DbMsg.timestamp).first()
+                first_text = (first_msg[0] or "").strip().lower() if first_msg else ""
+                assistant_count = db.query(DbMsg.id).filter(
+                    DbMsg.session_id == row.id, DbMsg.role == "assistant"
+                ).limit(1).count()
+
+                if name in _THROWAWAY_NAMES or name.startswith("chat:") or first_text in _THROWAWAY_NAMES:
+                    should_delete = True
+                    deleted_throwaway += 1
+                elif msg_count == 1 and assistant_count == 0:
+                    should_delete = True
+                    deleted_throwaway += 1
+                elif msg_count <= 4 and first_text and len(first_text.split()) <= 8 and len(first_text) <= 80:
+                    # Short trivial chats — e.g. "write hi to a friend" → "Hi!"
+                    should_delete = True
+                    deleted_throwaway += 1
+                else:
+                    # Aggressive: total message text under 250 chars combined = trivial
+                    msg_rows = db.query(DbMsg.content).filter(
+                        DbMsg.session_id == row.id
+                    ).all()
+                    total_chars = sum(len(m[0] or "") for m in msg_rows)
+                    if total_chars <= 250:
+                        should_delete = True
+                        deleted_throwaway += 1
+
+            if should_delete:
                 db.delete(row)
 
         if deleted_empty or deleted_throwaway:

src/settings.py

@@ -46,7 +46,6 @@ DEFAULT_SETTINGS = {
     "agent_email_confirm": True,
     "image_gen_enabled": False,
     "image_model": "",
-    "image_edit_model": "",
     "image_quality": "medium",
     # Optional editor planner/caption endpoints. Empty uses configured chat
     # fallback without probing a developer-specific host.
@@ -295,7 +294,7 @@ def is_setting_overridden(key: str) -> bool:
 # resolved by FastAPI deps; an empty/None owner falls through to the global.
 _PER_USER_KEYS = {
     "vision_model", "vision_enabled", "vision_model_fallbacks",
-    "image_model", "image_edit_model", "image_gen_enabled", "image_quality",
+    "image_model", "image_gen_enabled", "image_quality",
     # Default chat endpoint / model — without per-user resolution every new
     # account inherited whatever the most-recent admin picked, which then
     # got injected into the chat composer on first open.
@@ -314,20 +313,6 @@ def get_user_setting(key: str, owner: str = "", default: Any = None) -> Any:
     Falls back gracefully if the prefs module can't be imported (cycle/early
     boot) — admin-global settings keep working.
     """
-    if key == "image_gen_enabled":
-        global_val = get_setting("image_gen_enabled", default if default is not None else False)
-        if not global_val:
-            return False
-        if owner:
-            try:
-                from routes.prefs_routes import _load_for_user
-                prefs = _load_for_user(owner) or {}
-                if "image_gen_enabled" in prefs and prefs["image_gen_enabled"] is not None:
-                    return bool(prefs["image_gen_enabled"])
-            except Exception:
-                pass
-        return bool(global_val)
-
     if owner and key in _PER_USER_KEYS:
         try:
             from routes.prefs_routes import _load_for_user

src/task_scheduler.py

@@ -132,23 +132,6 @@ async def _cached(key: Tuple, ttl: float, fetch: Callable[[], Awaitable[Any]]) -
             _shared_cache_pending.pop(key, None)
 
 
-def is_valid_cron(cron_expression: str) -> bool:
-    """True for a standard 5-field cron expression that croniter can parse.
-
-    croniter also accepts 6- and 7-field expressions with a seconds field, but
-    the scheduler works at one-minute resolution and would run such a task
-    every second.
-    """
-    if len((cron_expression or "").split()) != 5:
-        return False
-    try:
-        from croniter import croniter
-        croniter(cron_expression)
-    except Exception:
-        return False
-    return True
-
-
 def compute_next_run(schedule: str, scheduled_time: str,
                      scheduled_day: int = None,
                      scheduled_date: datetime = None,
@@ -192,9 +175,6 @@ def compute_next_run(schedule: str, scheduled_time: str,
         return dt.astimezone(timezone.utc).replace(tzinfo=None)
 
     if schedule == "cron" and cron_expression:
-        if not is_valid_cron(cron_expression):
-            logger.warning(f"Invalid cron expression '{cron_expression}'")
-            return None
         try:
             from croniter import croniter
             cron = croniter(cron_expression, now)
@@ -326,7 +306,7 @@ def _digest_windows(now):
 
 
 def _checkin_calendar_events(db, owner, start, end):
-    """Calendar events in [start, end) for ONE owner, for the check-in digest.
+    """Calendar events in [start, end] for ONE owner, for the check-in digest.
 
     Ownership lives on CalendarCal.owner; events inherit it via calendar_id.
     The digest query had no owner scope, so it pulled EVERY user's events into
@@ -340,7 +320,7 @@ def _checkin_calendar_events(db, owner, start, end):
         .filter(
             _CC.owner == owner,
             _CE.dtstart >= start,
-            _CE.dtstart < end,
+            _CE.dtstart <= end,
             _CE.status != "cancelled",
         )
         .order_by(_CE.dtstart)

src/tool_schemas.py

@@ -41,7 +41,6 @@ _REQUIRED_NATIVE_TOOL_ARGS = {
     "write_file": ("path",),
     "edit_file": ("path",),
     "apply_patch": ("patch_text", "patchText", "patch"),
-    "generate_image": ("prompt",),
     "host_shell": ("command",),
 }
 

static/css/01-agent-chat.css

@@ -4592,9 +4592,7 @@ body.bg-pattern-ascii-fireflies {
       width:100%; background:var(--bg); color:var(--fg);
       border:1px solid var(--border); border-radius:6px;
       padding:8px; font-family:inherit; font-size:0.95rem;
-      resize:both; outline:none;
-      field-sizing:content;
-      max-width:100%; box-sizing:border-box;
+      resize:vertical; outline:none;
       min-height:80px;
     }
     .edit-textarea:focus { border-color:var(--red); }

static/css/13-image-editor.css

@@ -264,42 +264,7 @@
 /* The brush controls (Color/Size/preset/caret) hug their content; only the
    trailing slider section grows, so the Opacity/Flow/Softness group sits
    right after the caret instead of leaving a wide gap. */
-.ge-controls--in-options #ge-brush-controls { flex: 0 0 auto; flex-direction: row; align-items: center; gap: 8px; }
-.ge-controls--in-options #ge-brush-softness-row input[type="range"] { width: 88px; flex: 0 0 88px; }
-#ge-brush-softness-row {
-  display: grid !important;
-  grid-template-columns: 14px max-content 88px;
-  column-gap: 8px;
-  align-items: center;
-}
-#ge-brush-softness-row:has(> .ge-slider-value) {
-  grid-template-columns: 14px max-content 88px 6ch;
-}
-#ge-brush-softness-row label {
-  flex: 0 0 auto;
-  min-width: max-content;
-  gap: 6px;
-}
-#ge-brush-softness-row #ge-brush-softness-label {
-  position: static;
-  min-width: 6ch;
-  margin: 0;
-  padding: 0;
-  white-space: nowrap;
-  text-align: right;
-  font-variant-numeric: tabular-nums;
-}
-.ge-controls--in-options #ge-brush-controls .ge-brush-size-row {
-  display: grid;
-  grid-template-columns: minmax(6ch, max-content) 96px auto;
-  column-gap: 8px;
-}
-.ge-controls--in-options .ge-brush-size-row label,
-.ge-controls--in-options .ge-brush-size-row .ge-size-label {
-  min-width: 6ch;
-  white-space: nowrap;
-  font-variant-numeric: tabular-nums;
-}
+.ge-controls--in-options #ge-brush-controls { flex: 0 0 auto; }
 .ge-controls--in-options .ge-control-row {
   margin: 0 !important;
   flex: 0 0 auto;
@@ -4642,8 +4607,6 @@ body.ge-editor-open textarea.ge-direct-text-editor {
   pointer-events: auto;
 }
 .ge-filter-modal {
-  max-height: calc(100dvh - 40px);
-  overflow-y: auto;
   width: 240px;
   background: color-mix(in srgb, var(--panel) 95%, transparent);
   border: 1px solid var(--border);
@@ -4668,9 +4631,6 @@ body.ge-editor-open textarea.ge-direct-text-editor {
   gap: 2px;
 }
 .ge-filter-row label {
-  flex: 0 0 auto;
-  min-width: 0;
-  width: 100%;
   font-size: 10px;
   opacity: 0.7;
   display: flex;
@@ -9772,28 +9732,6 @@ body.ge-editor-open .tour-hint {
   margin-left: auto;
   color: var(--color-muted);
 }
-.ge-submenu .dropdown-item-compact {
-  box-sizing: border-box;
-  display: flex;
-  align-items: center;
-  height: 28px;
-  min-height: 28px;
-  max-height: 28px;
-  padding: 0 10px;
-  line-height: 1.2;
-  white-space: nowrap;
-}
-.ge-submenu .dropdown-item-compact svg {
-  flex-shrink: 0;
-  max-height: 16px;
-}
-@media (max-width: 820px) {
-  .ge-submenu .dropdown-item-compact {
-    height: 32px;
-    min-height: 32px;
-    max-height: 32px;
-  }
-}
 .ge-submenu {
   display: none;
   position: absolute;

static/index.html

@@ -1677,10 +1677,6 @@
                 <label class="settings-label">Model</label>
                 <select id="set-imgModelSelect" class="settings-select"><option value="">Auto-detect</option></select>
               </div>
-              <div style="display:flex;align-items:center;gap:0.75rem;">
-                <label class="settings-label" for="set-imgEditModelSelect">Image edit model</label>
-                <select id="set-imgEditModelSelect" class="settings-select"><option value="">Same as generation</option></select>
-              </div>
               <div style="display:flex;align-items:center;gap:0.75rem;">
                 <label class="settings-label">Quality</label>
                 <select id="set-imgQualitySelect" class="settings-select">

static/js/calendar.js

@@ -771,13 +771,7 @@ function _getModal() {
       <button class="cal-side-nav cal-side-nav-next" id="cal-side-next" title="Next" aria-label="Next">&rsaquo;</button>
     </div>`;
   document.body.appendChild(_modal);
-  _modal.querySelector('#cal-close').addEventListener('click', () => {
-    if (_modal.querySelector('.cal-form')) {
-      _render();
-      return;
-    }
-    closeCalendar();
-  });
+  _modal.querySelector('#cal-close').addEventListener('click', closeCalendar);
   _modal.querySelector('#cal-side-prev')?.addEventListener('click', (e) => {
     e.preventDefault();
     e.stopPropagation();

static/js/compare/sse.js

@@ -1,65 +0,0 @@
-function streamError(payload) {
-  const detail = payload?.data ?? payload;
-  const candidates = [detail?.message, detail?.text, detail?.error?.message,
-    detail?.error, payload?.message, payload?.text, payload?.error?.message,
-    payload?.error, typeof payload === 'string' ? payload : null];
-  const message = candidates.find(value => typeof value === 'string' && value.trim());
-  return new Error(message || 'Model request failed.');
-}
-
-/** Decode complete SSE frames, requiring the backend's terminal DONE event. */
-export async function consumeCompareEvents(response, onEvent, onActivity) {
-  const reader = response.body.getReader();
-  const decoder = new TextDecoder();
-  let line = '', event = 'message', data = [], skipLF = false;
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (!done) onActivity?.();
-      let chunk = decoder.decode(value, { stream: !done });
-      if (skipLF && chunk.length) {
-        if (chunk.startsWith('\n')) chunk = chunk.slice(1);
-        skipLF = false;
-      }
-      const separators = /\r\n|\r|\n/g;
-      let start = 0, separator;
-      while ((separator = separators.exec(chunk))) {
-        line += chunk.slice(start, separator.index);
-        start = separator.index + separator[0].length;
-        skipLF = separator[0] === '\r' && start === chunk.length;
-        if (!line) {
-          if (data.length || event === 'error') {
-            const raw = data.join('\n');
-            if (event !== 'error' && raw === '[DONE]') return;
-            let payload;
-            try { payload = JSON.parse(raw); }
-            catch (_) {
-              if (event === 'error') throw streamError(raw);
-              throw new Error('Invalid model stream data.');
-            }
-            if (event === 'error' || payload?.type === 'error') throw streamError(payload);
-            if (!payload || typeof payload !== 'object' || Array.isArray(payload)) {
-              throw new Error('Invalid model stream data.');
-            }
-            await onEvent(payload);
-          }
-          event = 'message';
-          data = [];
-        } else if (!line.startsWith(':')) {
-          const colon = line.indexOf(':');
-          const field = colon < 0 ? line : line.slice(0, colon);
-          let value = colon < 0 ? '' : line.slice(colon + 1);
-          if (value.startsWith(' ')) value = value.slice(1);
-          if (field === 'data') data.push(value);
-          else if (field === 'event') event = value || 'message';
-        }
-        line = '';
-      }
-      line += chunk.slice(start);
-      if (done) throw new Error('Stream ended before completion.');
-    }
-  } finally {
-    try { await reader.cancel(); } catch (_) {}
-    reader.releaseLock();
-  }
-}

static/js/compare/stream.js

@@ -1,6 +1,5 @@
 // compare/stream.js — SSE streaming to panes
 import state from './state.js';
-import { consumeCompareEvents } from './sse.js';
 import { addFinishBadge } from './vote.js?v=20260828resendcaldrag1';
 import { getModelCost, renderAskUserCard, safeDisplayImageSrc } from '../chatRenderer.js?v=20260914metricssummary1';
 import markdownModule from '../markdown.js';
@@ -473,9 +472,25 @@ async function streamToPane(paneIdx, sessionId, message, aiMsgEl, opts) {
     });
     if (!response.ok) throw new Error(`HTTP ${response.status}`);
 
-    await consumeCompareEvents(response,
-      (json) => {
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = '';
+
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      _resetIdleTimeout();  // any chunk = stream is alive
+
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split('\n');
+      buffer = lines.pop() || '';
+
+      for (const line of lines) {
+        if (!line.startsWith('data: ')) continue;
+        const data = line.slice(6);
+        if (data === '[DONE]') break;
         try {
+          const json = JSON.parse(data);
           if (json.type === 'metrics') {
             metrics = json.data;
 
@@ -657,7 +672,7 @@ async function streamToPane(paneIdx, sessionId, message, aiMsgEl, opts) {
             if (hist) hist.scrollTop = hist.scrollHeight;
           } else if (json.delta) {
             // Skip text deltas if we already rendered an image
-            if (aiMsgEl._imageData) return;
+            if (aiMsgEl._imageData) continue;
             // Capture TTFT on very first text delta
             if (!accumulated && !_ttft) _ttft = performance.now() - _timerStart;
             // On first delta, destroy spinner and prepare text area
@@ -686,7 +701,8 @@ async function streamToPane(paneIdx, sessionId, message, aiMsgEl, opts) {
             _scheduleLiveRender(target);
           }
         } catch (e) { console.warn('Compare stream render error:', e); }
-      }, _resetIdleTimeout);
+      }
+    }
 
     streamOk = true;
     // Destroy any remaining spinner
@@ -884,15 +900,9 @@ async function streamToPane(paneIdx, sessionId, message, aiMsgEl, opts) {
       }
     } else {
       console.error('Compare stream error:', error);
-      awaitingChoice = false;
-      const message = state._blindMode ? 'Model request failed. Try again.' : error.message;
-      aiBody.innerHTML = '<span style="color:var(--color-error);">Error: ' + escapeHtml(message) + '</span>';
+      aiBody.innerHTML = '<span style="color:var(--color-error);">Error: ' + escapeHtml(error.message) + '</span>';
     }
   } finally {
-    if (aiMsgEl._spinner) {
-      aiMsgEl._spinner.destroy();
-      aiMsgEl._spinner = null;
-    }
     clearTimeout(timeoutId);
     _timerDone = true;
     cancelAnimationFrame(_rafId);

static/js/cookbook.js

@@ -1195,12 +1195,11 @@ async function _fetchDependencies() {
       // For backends with a recipe catalog (vllm / sglang / llama_cpp),
       // append a caret button that toggles a per-row recipe panel below.
       const hasRecipe = RECIPE_BACKENDS.has(pkg.name);
-      // The caret is the only way to open the recipe panel (the Installed ▾
-      // menu has no recipe item), and the HW Fit / serve-card deep links
-      // open it by clicking this caret (#6747).
-      const recipeCaret = hasRecipe
-        ? `<button class="cookbook-dep-tag cookbook-dep-recipe-caret" data-dep-recipe-toggle="${esc(pkg.name)}" title="Pick a model to see the exact install commands" aria-expanded="false" style="background:none;border:1px solid var(--border);padding:2px 6px;display:inline-flex;align-items:center;cursor:pointer;"><svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" style="transition:transform 0.15s"><polyline points="6 9 12 15 18 9"/></svg></button>`
-        : '';
+      // Standalone recipe-caret button removed — the "Pick install
+      // command" action lives inside the Installed ▾ dropdown menu
+      // (see _showDepMenu) so each row only has ONE caret to click.
+      // Kept the variable so downstream concat code stays the same.
+      const recipeCaret = '';
       const recipePanel = hasRecipe ? _recipePanelHtml(pkg.name) : '';
       // When llama_cpp (or any future engine) reports build_deps_missing
       // from its system_prereqs probe, surface a one-tap install button

static/js/document.js

@@ -5232,7 +5232,7 @@ import { attachColorPicker } from './colorPicker.js?v=20260910eyedropper1';
   }
 
   async function _handleAttachUpload(e) {
-    const files = Array.from(e.target.files || []);
+    const files = e.target.files;
     e.target.value = ''; // reset for next upload
     await _uploadComposeFiles(files);
   }
@@ -5963,7 +5963,7 @@ import { attachColorPicker } from './colorPicker.js?v=20260910eyedropper1';
   }
 
   async function _handleMarkdownImageUpload(e) {
-    const files = Array.from(e.target.files || []);
+    const files = e.target.files;
     e.target.value = '';
     await _uploadMarkdownImages(files);
   }

static/js/editor/ai-inpaint.js

@@ -41,7 +41,6 @@
  * }} deps
  */
 import { state } from './state.js';
-import { imageResultGeometry } from './image-result-geometry.js';
 import { beginAIOperation, decodeAIImage } from './ai-operation.js';
 
 export function wireInpaintButtons({
@@ -185,30 +184,17 @@ export function wireInpaintButtons({
         if (!state.editorOpen) return; // user closed mid-decode
         try {
           saveState('Inpaint result');
-          // Whole-image edits keep the provider's native frame; only masked
-          // edits need registration with the source document's coordinates.
+          // OpenAI returns at one of its allowed sizes (1024²,
+          // 1024×1536, 1536×1024) which often differs from our
+          // canvas. Scale to canvas size with smoothing so the
+          // inpaint blends in regardless of source dims.
           const shortPrompt = (prompt || '').trim().replace(/\s+/g, ' ').slice(0, 40);
           const layerName = shortPrompt ? `Inpaint: ${shortPrompt}` : 'Inpaint Result';
-          const fullFrame = data.full_frame === true;
-          const geometry = imageResultGeometry(resultImg.naturalWidth, resultImg.naturalHeight, state.imgWidth, state.imgHeight);
-          const resultLayer = createLayer(layerName,
-            fullFrame ? geometry.width : state.imgWidth,
-            fullFrame ? geometry.height : state.imgHeight);
+          const resultLayer = createLayer(layerName, state.imgWidth, state.imgHeight);
           resultLayer.ctx.imageSmoothingEnabled = true;
           resultLayer.ctx.imageSmoothingQuality = 'high';
-          if (fullFrame) {
-            resultLayer.ctx.drawImage(resultImg, geometry.drawX, geometry.drawY, geometry.drawWidth, geometry.drawHeight);
-            state.layerOffsets.set(resultLayer.id, {
-              x: geometry.offsetX,
-              y: geometry.offsetY,
-            });
-          } else {
-            const scale = Math.min(state.imgWidth / resultImg.naturalWidth, state.imgHeight / resultImg.naturalHeight);
-            const width = resultImg.naturalWidth * scale, height = resultImg.naturalHeight * scale;
-            resultLayer.ctx.drawImage(resultImg, (state.imgWidth - width) / 2, (state.imgHeight - height) / 2, width, height);
-          }
+          resultLayer.ctx.drawImage(resultImg, 0, 0, state.imgWidth, state.imgHeight);
           // Snapshot the AI result + hard mask used for this run.
-          if (!fullFrame) {
           const aiSnap = document.createElement('canvas');
           aiSnap.width = state.imgWidth; aiSnap.height = state.imgHeight;
           aiSnap.getContext('2d').drawImage(resultLayer.canvas, 0, 0);
@@ -219,7 +205,6 @@ export function wireInpaintButtons({
           resultLayer.inpaintSource = { ai: aiSnap, mask: maskSnap, base: baseSnap, padPx };
           // Apply initial alpha = hard mask (no feather, no edge shift).
           applyInpaintFeather(resultLayer, 0, 0);
-          }
           state.layers.push(resultLayer);
           state.activeLayerId = resultLayer.id;
           state.lastInpaintLayerId = resultLayer.id;
@@ -235,10 +220,6 @@ export function wireInpaintButtons({
           }
           composite();
           renderLayerPanel();
-          if (fullFrame) {
-            if (uiModule) uiModule.showToast('Image edit complete', 4500);
-            return;
-          }
           // Reveal post-generation Feather + Edge Stroke sliders.
           // Cap Edge Stroke at ±padPx so the slider can't ask for
           // more AI buffer than we generated.

static/js/editor/ai-models.js

@@ -54,16 +54,16 @@ export function resolveQuickEditModel() {
       label: ((opt && opt.textContent) || '').trim(),
     };
   }
-  const generation = document.getElementById('ge-ai-model');
-  if (generation?.value && generation.value !== '__serve_cookbook__') {
-    const index = generation.value.indexOf('::');
-    const model = index < 0 ? '' : generation.value.slice(index + 2);
-    if (model && modelCaps(model, '', '').inpaint) {
-      return { endpoint: generation.value.slice(0, index), model,
-        label: generation.options[generation.selectedIndex]?.textContent?.trim() || model };
-    }
-  }
-  return { endpoint: '', model: '', label: 'Auto (saved settings)' };
+  const inp = document.getElementById('ge-ai-inpaint');
+  const opt = resolveInpaintModel(inp);
+  if (!opt) return { endpoint: '', model: '', label: '' };
+  const raw = opt.value || '';
+  const idx = raw.indexOf('::');
+  return {
+    endpoint: idx < 0 ? raw : raw.slice(0, idx),
+    model: idx < 0 ? '' : raw.slice(idx + 2),
+    label: ((opt.textContent || '').trim().replace(/^Auto\s*\((.*)\)$/, '$1')),
+  };
 }
 
 // Resolve the Quick Edit AGENT (planner) model — the vision-language model
@@ -144,19 +144,21 @@ export function modelCaps(modelId, endpointName, endpointType) {
 function syncCommandModel(value) {
   const select = document.getElementById('ge-ai-command-model');
   if (!select || !select._modelsReady) return;
+  if (value && ![...select.options].some(o => !o.disabled && o.value === value && value !== '__serve_cookbook__')) {
+    if (localStorage.getItem('ge-ai-command-model') === value) localStorage.removeItem('ge-ai-command-model');
+    value = '';
+  }
   if (select.value !== value) {
     select.value = value;
     if (select.value !== value) select.value = '';
     updateFooterEditModel();
   }
 }
-if (typeof window !== 'undefined') {
-  window.addEventListener('ge-ai-command-model-change', e => syncCommandModel(e.detail?.value || ''));
-  window.addEventListener('storage', e => {
-    if (e.key === 'ge-ai-command-model') syncCommandModel(e.newValue || '');
-  });
-}
-globalThis.window?.addEventListener('ge:model-endpoints-updated', e => {
+window.addEventListener('ge-ai-command-model-change', e => syncCommandModel(e.detail?.value || ''));
+window.addEventListener('storage', e => {
+  if (e.key === 'ge-ai-command-model') syncCommandModel(e.newValue || '');
+});
+window.addEventListener('ge:model-endpoints-updated', e => {
   document.getElementById('ge-ai-command-model')?._refreshAIModels?.(e.detail?.baseUrl || '');
 });
 
@@ -254,9 +256,9 @@ export function wireAIModelSelectors({ container, apiBase = '', openCookbookForI
       const data = await res.json();
       if (listeners.signal.aborted || !root.isConnected) return;
       const modelsList = data.models || [];
-      if (aiGenSelect) aiGenSelect.innerHTML = '<option value="">Auto-detect</option>';
+      if (aiGenSelect) aiGenSelect.innerHTML = '<option value="">None</option>';
       if (aiInpaintSelect) aiInpaintSelect.innerHTML = '<option value="">Auto</option>';
-      if (aiCommandSelect) aiCommandSelect.innerHTML = '<option value="">Same as generation</option>';
+      if (aiCommandSelect) aiCommandSelect.innerHTML = '<option value="">Auto (default)</option>';
       const perToolSelects = Array.from(document.querySelectorAll('select.ge-tool-model'));
       for (const ts of perToolSelects) ts.innerHTML = '<option value="">Auto</option>';
       let firstGen = null;
@@ -344,15 +346,45 @@ export function wireAIModelSelectors({ container, apiBase = '', openCookbookForI
       // Sentinel changes are handled by the component's delegated listener.
       if (aiCommandSelect) {
         aiCommandSelect._modelsReady = true;
-        // Legacy URL migration check: legacy endpoints with raw URLs are scrubbed.
-        const scrubModelUrl = (saved) => (saved && saved.startsWith('http://') ? '' : saved);
+        try {
+          const rawSaved = localStorage.getItem('ge-ai-command-model') || '';
+          let saved = rawSaved;
+          if (saved.startsWith('http://') || saved.startsWith('https://') || saved.includes('://') || saved.startsWith('::')) {
+            const modelPart = saved.includes('::') ? saved.split('::').pop() : '';
+            const matching = loaded.filter(l => l.model === modelPart);
+            if (matching.length === 1) {
+              saved = matching[0].value;
+            } else {
+              saved = '';
+            }
+            try {
+              if (saved) localStorage.setItem('ge-ai-command-model', saved);
+              else localStorage.removeItem('ge-ai-command-model');
+            } catch {}
+          }
+          if (saved && [...aiCommandSelect.options].some(o => o.value === saved)) {
+            aiCommandSelect.value = saved;
+          } else {
+            aiCommandSelect.value = '';
+          }
+          if (aiCommandSelect.value !== rawSaved) {
+            if (aiCommandSelect.value) localStorage.setItem('ge-ai-command-model', aiCommandSelect.value);
+            else localStorage.removeItem('ge-ai-command-model');
+            window.dispatchEvent(new CustomEvent('ge-ai-command-model-change', { detail: { value: aiCommandSelect.value } }));
+          }
+        } catch {}
+
         if (aiCommandSelect._commandWired !== listeners) {
           aiCommandSelect._commandWired = listeners;
           listen(aiCommandSelect, 'change', () => {
             if (aiCommandSelect.value === '__serve_cookbook__') return;
-            const val = scrubModelUrl(aiCommandSelect.value) || '';
+            const val = aiCommandSelect.value || '';
+            try {
+              if (val) localStorage.setItem('ge-ai-command-model', aiCommandSelect.value);
+              else localStorage.removeItem('ge-ai-command-model');
+            } catch {}
             updateFooterEditModel();
-            globalThis.window?.dispatchEvent?.(new CustomEvent('ge-ai-command-model-change', { detail: { value: val } }));
+            window.dispatchEvent(new CustomEvent('ge-ai-command-model-change', { detail: { value: val } }));
           });
         }
       }
@@ -377,7 +409,6 @@ export function wireAIModelSelectors({ container, apiBase = '', openCookbookForI
         });
       }
       _aiModelsStatus = { ready: true, models: loaded, error: null, at: Date.now() };
-      container.dispatchEvent(new Event('ge-image-models-ready'));
       try { window.dispatchEvent(new CustomEvent('ge:ai-models-status')); } catch {}
     } catch (e) {
       if (listeners.signal.aborted || !root.isConnected) return;

static/js/editor/ai-rembg.js

@@ -2,10 +2,11 @@
  * Background Remove (rembg) + Sharpen wiring + the live edge-cleanup
  * tuner that runs on the most-recent rembg cutout.
  *
- *   rembg-run button: active layer + POST to /api/image/remove-bg with an
+ *   rembg-run button: flatten + POST to /api/image/remove-bg with an
  *     optional hint_mask if the user has a wand/lasso selection
- *     active. Updates only that layer and binds its live edge tuner;
- *     other layers and their visibility remain unchanged.
+ *     active. After the new layer lands, hides every previously-
+ *     visible layer so the cutout reads cleanly, and binds the
+ *     live-tuner to the new layer.
  *
  *   Live edge-cleanup tuner: snapshots the pristine cutout the
  *     moment it lands; subsequent feather/grow slider tweaks
@@ -64,13 +65,37 @@ export function wireRembgAndSharpen({
     // NB: edge_feather / edge_grow are applied CLIENT-side so the
     // sliders can re-tune the cutout without re-running the model.
     const btn = document.getElementById('ge-rembg-run');
-    const editedLayer = await applyImageTool('/api/image/remove-bg', payload, 'BG Removed', btn);
+    const before = state.layers.length;
+    // Snapshot which layers were visible BEFORE the run so we know
+    // which to hide after a successful cutout.
+    const prevVisible = state.layers.filter(l => l.visible).map(l => l.id);
+    await applyImageTool('/api/image/remove-bg', payload, 'BG Removed', btn);
+    // applyImageTool resolves after the returned image is decoded and the
+    // new layer is inserted. Keep a short poll for defensive compatibility
+    // with alternate runners that may still commit on the next frame.
+    let frames = 0;
+    while (state.layers.length <= before && frames < 60) {
+      await new Promise(r => requestAnimationFrame(r));
+      frames++;
+    }
+    if (state.layers.length > before) {
+      const newLayer = state.layers[state.layers.length - 1];
+      bindRembgLiveTuner(newLayer);
+      // Auto-hide underlying layers so the user sees just the
+      // cutout — the eye toggles back on if they re-enable manually.
+      for (const layer of state.layers) {
+        if (prevVisible.includes(layer.id) && layer.id !== newLayer.id) {
+          layer.visible = false;
+        }
+      }
+      composite();
+      renderLayerPanel();
+    }
     // Reset sliders so the new cutout starts clean.
     const f = document.getElementById('ge-rembg-feather');
     const g = document.getElementById('ge-rembg-grow');
     if (f) { f.value = 0; document.getElementById('ge-rembg-feather-label').textContent = '0px'; syncRembgFeather(0); }
     if (g) { g.value = 0; document.getElementById('ge-rembg-grow-label').textContent = '0px'; syncRembgGrow(0); }
-    if (editedLayer) bindRembgLiveTuner(editedLayer);
   });
 
   // ── Live edge-cleanup tuner ──

static/js/editor/ai-settings.js

@@ -5,9 +5,6 @@
  * "Double-check AI edits" toggle. Opened from the Quick Edit gear button and
  * from the editor setup checklist; keeps the Quick Edit box itself uncluttered.
  */
-import { readImagePreferences, saveImagePreferences } from '../settings/imagePreferences.js';
-import { updateFooterEditModel } from './ai-models.js';
-
 export function createAiSettings({ container }) {
   const el = document.createElement('div');
   el.className = 'ge-ai-settings';
@@ -22,14 +19,11 @@ export function createAiSettings({ container }) {
         <button type="button" class="ge-ai-settings-close" data-ai-settings-close aria-label="Close">×</button>
       </div>
       <div class="ge-ai-settings-body">
-        <label class="ge-ai-settings-label" for="ge-ai-model">Image generation model</label>
-        <select class="ge-ai-command-model" id="ge-ai-model" title="Image generation model" aria-label="Image generation model"></select>
         <label class="ge-ai-settings-label" for="ge-ai-command-model">Image edit model</label>
         <select class="ge-ai-command-model" id="ge-ai-command-model" title="Image edit model" aria-label="Image edit model"></select>
         <label class="ge-ai-settings-label" for="ge-ai-command-agent-model">AI agent (vision) model</label>
         <select class="ge-ai-command-model" id="ge-ai-command-agent-model" title="Quick Edit agent model" aria-label="Quick Edit agent model"></select>
         <p class="ge-ai-settings-note">Recommended, not required — the vision agent plans edits and can double-check results.</p>
-        <p class="ge-ai-settings-note" id="ge-ai-settings-save-status" role="status"></p>
         <label class="ge-ai-settings-label" for="ge-look-strength">Look strength</label>
         <div class="ge-ai-settings-strength">
           <input type="range" id="ge-look-strength" min="0.5" max="2" step="0.1" value="1.4" aria-label="Look grade strength" />
@@ -47,7 +41,6 @@ export function createAiSettings({ container }) {
 
   function open(focusId) {
     el.hidden = false;
-    syncModels();
     if (focusId) {
       const target = document.getElementById(focusId);
       if (target) {
@@ -63,59 +56,10 @@ export function createAiSettings({ container }) {
       close();
     }
   });
-  const onKey = (e) => {
-    if (e.key !== 'Escape' || el.hidden) return;
-    e.preventDefault();
-    e.stopImmediatePropagation();
-    close();
-  };
-  window.addEventListener('keydown', onKey, true);
+  const onKey = (e) => { if (e.key === 'Escape' && !el.hidden) close(); };
+  document.addEventListener('keydown', onKey);
 
   container.appendChild(el);
-  const status = el.querySelector('#ge-ai-settings-save-status');
-  const modelFields = [['ge-ai-model', 'image_model'], ['ge-ai-command-model', 'image_edit_model']];
-  function applyModels(settings) {
-    for (const [id, key] of modelFields) {
-      if (!(key in settings)) continue;
-      const select = el.querySelector(`#${id}`);
-      const model = settings[key] || '';
-      let option = [...select.options].find(option => {
-        const value = option.value;
-        return model ? value.slice(value.indexOf('::') + 2) === model : value === '';
-      });
-      if (!option && model && select.options.length) {
-        option = document.createElement('option');
-        option.value = `::${model}`;
-        option.textContent = `${model} (unavailable)`;
-        option.disabled = true;
-        select.append(option);
-      }
-      if (option) select.value = option.value;
-    }
-    updateFooterEditModel();
-  }
-  async function syncModels() {
-    try { applyModels(await readImagePreferences()); }
-    catch (error) { status.textContent = error.message; }
-  }
-  for (const [id, key] of modelFields) {
-    el.querySelector(`#${id}`).addEventListener('change', async (event) => {
-      const raw = event.target.value;
-      if (raw === '__serve_cookbook__') return;
-      const model = raw.includes('::') ? raw.slice(raw.indexOf('::') + 2) : '';
-      try {
-        status.textContent = 'Saving…';
-        await saveImagePreferences({ [key]: model });
-        status.textContent = 'Saved';
-      } catch (error) {
-        await syncModels();
-        status.textContent = error.message;
-      }
-    });
-  }
-  const onPreferencesChanged = event => applyModels(event.detail);
-  window.addEventListener('image-preferences-changed', onPreferencesChanged);
-  container.addEventListener('ge-image-models-ready', syncModels);
 
   const strengthInput = el.querySelector('#ge-look-strength');
   const strengthVal = el.querySelector('#ge-look-strength-val');
@@ -133,9 +77,7 @@ export function createAiSettings({ container }) {
   }
 
   function destroy() {
-    window.removeEventListener('keydown', onKey, true);
-    window.removeEventListener('image-preferences-changed', onPreferencesChanged);
-    container.removeEventListener('ge-image-models-ready', syncModels);
+    document.removeEventListener('keydown', onKey);
     el.remove();
   }
 

static/js/editor/ai-tool-runner.js

@@ -76,12 +76,7 @@ export function createApplyImageTool({
         if (sel.endpoint) extraPayload._endpoint = sel.endpoint;
         if (sel.model && !extraPayload._model) extraPayload._model = sel.model;
       }
-      const removeBackground = endpoint === '/api/image/remove-bg';
-      const targetLayer = removeBackground ? state.layers.find(layer => layer.id === state.activeLayerId) : null;
-      if (removeBackground && (!targetLayer?.canvas || targetLayer.kind === 'adjustment' || targetLayer.locks?.pixels)) {
-        throw new Error('Select an unlocked image layer first');
-      }
-      const flatCanvas = removeBackground ? targetLayer.canvas : flatten();
+      const flatCanvas = flatten();
       const imageB64 = flatCanvas.toDataURL('image/png').split(',')[1];
       const body = { image: imageB64, ...extraPayload };
       const res = await fetch(endpoint, {
@@ -101,23 +96,6 @@ export function createApplyImageTool({
       const img = await decodeAIImage(data.image, operation.signal);
       operation.signal.throwIfAborted();
       if (!state.editorOpen) return; // user closed mid-decode (v2 review HIGH-4)
-      if (removeBackground) {
-        if (!state.layers.includes(targetLayer)) return;
-        saveState('Remove background');
-        // The returned pixels replace the editable source, not just its preview.
-        targetLayer.kind = 'raster';
-        targetLayer.placed = null;
-        targetLayer.text = null;
-        targetLayer.shape = null;
-        targetLayer.ctx.clearRect(0, 0, targetLayer.canvas.width, targetLayer.canvas.height);
-        targetLayer.ctx.drawImage(img, 0, 0, targetLayer.canvas.width, targetLayer.canvas.height);
-        targetLayer._adjCacheKey = null;
-        targetLayer._adjFinalKey = null;
-        composite();
-        renderLayerPanel();
-        uiModule?.showToast('Background removed');
-        return targetLayer;
-      }
       {
         saveState();
         const layer = createLayer(layerName, state.imgWidth, state.imgHeight);

static/js/editor/build/controls.js

@@ -55,11 +55,6 @@ export function controlsHTML({ color, brushSize, wandTolerance, bucketTolerance
         <label>Color</label>
         <input type="color" class="ge-color-picker" value="${color}" />
       </div>
-      <div class="ge-control-row ge-eraser-row" id="ge-brush-softness-row">
-        <span class="ge-eraser-preview" id="ge-brush-preview-softness" aria-hidden="true"></span>
-        <label>Softness <span id="ge-brush-softness-label">100%</span></label>
-        <input type="range" id="ge-brush-softness" min="0" max="1200" value="100" title="Brush edge softness and feathered falloff" />
-      </div>
       <div class="ge-control-row ge-brush-size-row">
         <label><span class="ge-size-label">${brushSize}px</span></label>
       <input type="range" class="ge-size-slider" min="0" max="1000" value="${brushSliderValue}" />
@@ -99,6 +94,11 @@ export function controlsHTML({ color, brushSize, wandTolerance, bucketTolerance
                 <label>Flow <span id="ge-brush-flow-label">100%</span></label>
                 <input type="range" id="ge-brush-flow" min="5" max="100" value="100" />
               </div>
+              <div class="ge-control-row ge-eraser-row" id="ge-brush-softness-row">
+                <span class="ge-eraser-preview" id="ge-brush-preview-softness" aria-hidden="true"></span>
+                <label>Softness <span id="ge-brush-softness-label">100%</span></label>
+                <input type="range" id="ge-brush-softness" min="0" max="300" value="100" title="Soft brush edge — blurs the stroke's alpha for a feathered fade at the perimeter." />
+              </div>
             </div>
             <div class="ge-brush-stroke-group" data-stroke-tool="eraser">
               <div class="ge-section-title">Eraser</div>

static/js/editor/canvas-events.js

@@ -78,7 +78,6 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
   const UI_CHROME_SELECTOR = '.ge-topbar, .ge-toolbar, .ge-controls, .ge-right-panel, '
     + '.ge-dock, .ge-options-bar, .ge-canvas-toolbar, button, input, select, textarea';
   const isUiChrome = e => !!e.target?.closest?.(UI_CHROME_SELECTOR);
-  const canStartOutside = () => ['marquee', 'lasso', 'crop'].includes(state.tool);
   // Only in-progress selection/crop drags are affected by the chrome
   // guard. A committed cropRect/selection is a resting state — clicking
   // its Apply button must not be treated as "strayed onto chrome".
@@ -144,16 +143,15 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
   };
   state.mainCanvas.addEventListener('pointerup', endPen);
   state.mainCanvas.addEventListener('pointercancel', endPen);
-  // Selection and Crop can start OUTSIDE the canvas — fallback mousedown on the
+  // Lasso and Crop can start OUTSIDE the canvas — fallback mousedown on the
   // surrounding canvas-area so the user can begin a path/rect in the empty
   // space around the image. Other tools stay canvas-only.
   canvasArea.addEventListener('mousedown', (e) => {
-    if (!canStartOutside() || Date.now() < suppressMouseUntil) return;
-    if (e.button !== 0 || isDirectPanIntent(state.tool, state.spacePanActive, e.button)) return;
+    if (state.tool !== 'lasso' && state.tool !== 'crop') return;
     if (e.target === state.mainCanvas) return; // already handled
     // Ignore presses on editor chrome inside the area (the crop Apply panel,
     // popups, buttons) so clicking Apply does not start a fresh crop.
-    if (isUiChrome(e) || e.target.closest?.('.ge-crop-apply, .ge-adj-popup, .ge-transform-popup, .ge-fx-popup, .ge-inpaint-popup, .ge-fx-menu')) return;
+    if (e.target.closest?.('button, input, select, textarea, .ge-crop-apply, .ge-adj-popup, .ge-transform-popup, .ge-fx-popup, .ge-inpaint-popup, .ge-controls, .ge-right-panel, .ge-fx-menu')) return;
     beginDraw(e);
   });
   state.mainCanvas.addEventListener('mouseenter', (e) => {
@@ -307,7 +305,6 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
   let panning = false;
   let pid = null;
   let transformPointerId = null;
-  let outsideDrawPointerId = null;
   let startX = 0, startY = 0;
   let startPanX = 0, startPanY = 0;
   const getOffset = () => ({ x: state.panX || 0, y: state.panY || 0 });
@@ -318,23 +315,10 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
   };
   canvasArea.addEventListener('pointerdown', (e) => {
     const directPan = isDirectPanIntent(state.tool, state.spacePanActive, e.button);
-    // With a selection or crop tool, an empty-area press draws a rect/path
+    // With the crop (or lasso) tool, an empty-area press draws a rect/path
     // rather than panning — so the crop can be pulled out past the image.
     // Space-held / middle-mouse (directPan) still pans.
-    if (canStartOutside() && !directPan) {
-      if (e.target === state.mainCanvas || isUiChrome(e) ||
-          e.target.closest?.('.ge-crop-apply, .ge-adj-popup, .ge-transform-popup, .ge-fx-popup, .ge-inpaint-popup, .ge-fx-menu')) return;
-      // Mouse starts through mousedown; pen/touch need their own captured path.
-      if (e.pointerType === 'pen' || e.pointerType === 'touch') {
-        if (outsideDrawPointerId !== null || e.button !== 0) return;
-        outsideDrawPointerId = e.pointerId;
-        suppressMouseUntil = Date.now() + 500;
-        try { canvasArea.setPointerCapture(e.pointerId); } catch {}
-        beginDraw(e);
-        e.preventDefault();
-      }
-      return;
-    }
+    if ((state.tool === 'lasso' || state.tool === 'crop') && !directPan) return;
     if (e.target.closest('button, input, .ge-adj-popup, .ge-transform-popup, .ge-fx-popup, .ge-inpaint-popup, .ge-controls, .ge-right-panel, .ge-fx-menu')) return;
     const onImage = e.target === state.mainCanvas || e.target === state.transformOverlay;
     if (onImage && !directPan) return;
@@ -373,12 +357,6 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
     e.preventDefault();
   });
   canvasArea.addEventListener('pointermove', (e) => {
-    if (outsideDrawPointerId !== null && e.pointerId === outsideDrawPointerId) {
-      suppressMouseUntil = Date.now() + 500;
-      if (!isUiChrome(e)) continueDraw(e);
-      e.preventDefault();
-      return;
-    }
     if (transformPointerId !== null && e.pointerId === transformPointerId) {
       continueDraw(e);
       return;
@@ -392,14 +370,6 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
     applyOffset(next.x, next.y);
   });
   const endPan = (e) => {
-    if (outsideDrawPointerId !== null && (!e || e.pointerId === outsideDrawPointerId)) {
-      const capturedId = outsideDrawPointerId;
-      outsideDrawPointerId = null;
-      suppressMouseUntil = Date.now() + 500;
-      if (e?.type === 'pointercancel') cancelDraw?.();
-      else if (e) endDraw(e);
-      try { canvasArea.releasePointerCapture(capturedId); } catch {}
-    }
     if (transformPointerId !== null && (!e || e.pointerId === transformPointerId)) {
       const capturedId = transformPointerId;
       transformPointerId = null;

static/js/editor/editor-agent.js

@@ -21,7 +21,6 @@ export const EDITOR_AGENT_VERSION = '1.0';
 export const DEFAULT_AGENT_ENDPOINT = '/api/editor/agent';
 
 import { formatCropRect, isGenericIntent } from './nl-edit.js';
-import { waitForImagePreferences } from '../settings/imagePreferences.js';
 
 export function createEditorAgent({
   control,
@@ -29,7 +28,6 @@ export function createEditorAgent({
   fetchImpl = null,
   getSession = null,
   getModel = null,
-  getGenerationModel = null,
   getAgentModel = null,
   onStep = null,
 } = {}) {
@@ -147,7 +145,6 @@ export function createEditorAgent({
     activeStep = report;
     executed = [];
     running = true;
-    await waitForImagePreferences();
 
     // Honest before-image (captured before any client pre-step) for the
     // imperceptible-edit check, then the history mark scoping the undo group.
@@ -197,8 +194,6 @@ export function createEditorAgent({
         signal: signal || undefined,
         body: JSON.stringify({
           prompt, session, editor_session: session, state, screenshot,
-          _use_image_settings: true,
-          generation_model: getGenerationModel ? getGenerationModel() : '',
           model: (modelInfo && modelInfo.model) || '',
           endpoint: (modelInfo && modelInfo.endpoint) || '',
           model_label: (modelInfo && modelInfo.label) || '',

static/js/editor/effects-worker.js

@@ -132,7 +132,7 @@ function renderEffects(source, effects, masks) {
     const contribution = maskedContribution(next, masks[index]);
     const blended = copyCanvas(current);
     const blendCtx = blended.getContext('2d');
-    if (effect.type === 'drop-shadow' && !effect.params.inside) blendCtx.globalCompositeOperation = 'destination-over';
+    if (effect.type === 'drop-shadow') blendCtx.globalCompositeOperation = 'destination-over';
     blendCtx.globalAlpha = effect.opacity;
     blendCtx.drawImage(contribution, 0, 0);
     blendCtx.globalAlpha = 1;

static/js/editor/effects.js

@@ -81,7 +81,6 @@ export function normalizeEffect(effect) {
     params.blendMode = typeof params.blendMode === 'string' ? params.blendMode : defaults.blendMode;
   }
   if (type === 'drop-shadow') {
-    params.inside = params.inside === true || params.inside === 1;
     params.color = /^#[0-9a-f]{6}$/i.test(params.color) ? params.color : defaults.color;
     for (const key of ['opacity', 'blur', 'x', 'y']) params[key] = Number(params[key]) || 0;
     params.opacity = Math.max(0, Math.min(1, params.opacity));
@@ -292,7 +291,7 @@ export function renderEffects(source, effects = [], shouldContinue = () => true)
       : next;
     const blended = copyCanvas(current);
     const blendCtx = blended.getContext('2d');
-    if (effect.type === 'drop-shadow' && !effect.params.inside) blendCtx.globalCompositeOperation = 'destination-over';
+    if (effect.type === 'drop-shadow') blendCtx.globalCompositeOperation = 'destination-over';
     blendCtx.globalAlpha = effect.opacity;
     blendCtx.drawImage(contribution, 0, 0);
     blendCtx.globalAlpha = 1;

static/js/editor/image-generation.js

@@ -1,71 +0,0 @@
-import { decodeAIImage } from './ai-operation.js';
-import { waitForImagePreferences } from '../settings/imagePreferences.js';
-
-export function createImageGenerationAction({
-  getDocument, placeResult, getSignal = () => null, onProgress = () => {},
-  formatError = info => info.detail || 'Image generation failed',
-  fetchImpl = (...args) => fetch(...args), timeoutMs = 330000,
-}) {
-  return async function generateImage(params = {}) {
-    const document = getDocument();
-    if (!document.key) throw new Error('Open a document before generating an image');
-    const controller = new AbortController();
-    const parentSignal = getSignal();
-    const cancel = () => controller.abort();
-    if (parentSignal?.aborted) cancel();
-    parentSignal?.addEventListener('abort', cancel, { once: true });
-    let timedOut = false;
-    const deadline = setTimeout(() => { timedOut = true; controller.abort(); }, timeoutMs);
-    const started = Date.now();
-    const progress = setInterval(() => onProgress(Math.floor((Date.now() - started) / 1000)), 1000);
-    // A selection can change while the provider works; preserve this request's mask.
-    let mask = null;
-    try {
-      if (params.masked && document.mask) {
-        mask = globalThis.document.createElement('canvas');
-        mask.width = document.mask.width; mask.height = document.mask.height;
-        mask.getContext('2d').drawImage(document.mask, 0, 0);
-      }
-      await waitForImagePreferences();
-      controller.signal.throwIfAborted();
-      let response;
-      try { response = await fetchImpl(window.geGenerateImageEndpoint || '/api/image/generate', {
-        method: 'POST', credentials: 'same-origin', signal: controller.signal,
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ _use_image_settings: true, prompt: params.prompt || '',
-          width: Math.max(1, Math.round(Number(params.width) || document.width)),
-          height: Math.max(1, Math.round(Number(params.height) || document.height)) }),
-      }); } catch (error) {
-        if (controller.signal.aborted) throw error;
-        throw new Error(formatError({ network: true, detail: error.message }));
-      }
-      let data;
-      try { data = await response.json(); }
-      catch { throw new Error(response.ok ? 'Image server returned an invalid response' : `Image server failed (${response.status})`); }
-      if (!response.ok || data.error) throw new Error(formatError({ status: response.status,
-        detail: data.detail || data.error || `Image server failed (${response.status})` }));
-      const image = data.image || data.images?.[0];
-      if (!image) throw new Error('Image generation returned no image');
-      const decoded = await decodeAIImage(image, controller.signal);
-      controller.signal.throwIfAborted();
-      const current = getDocument();
-      if (current.key !== document.key || current.width !== document.width || current.height !== document.height) {
-        throw new Error('The document changed during generation. The result was not placed in another document.');
-      }
-      const canvas = globalThis.document.createElement('canvas');
-      canvas.width = decoded.naturalWidth; canvas.height = decoded.naturalHeight;
-      const context = canvas.getContext('2d');
-      context.imageSmoothingEnabled = true;
-      context.imageSmoothingQuality = 'high';
-      context.drawImage(decoded, 0, 0);
-      return placeResult(canvas, 'Generated', mask);
-    } catch (error) {
-      if (timedOut) throw new Error('Image generation timed out. Try again or choose a faster image model.');
-      throw error;
-    } finally {
-      clearTimeout(deadline);
-      clearInterval(progress);
-      parentSignal?.removeEventListener('abort', cancel);
-    }
-  };
-}

static/js/editor/image-result-geometry.js

@@ -1,11 +0,0 @@
-export function imageResultGeometry(width, height, canvasWidth, canvasHeight) {
-  const matchingRatio = Math.abs(width * canvasHeight - height * canvasWidth) <= Math.max(canvasWidth, canvasHeight);
-  if (matchingRatio) {
-    const scale = Math.max(canvasWidth / width, canvasHeight / height);
-    const drawWidth = width * scale, drawHeight = height * scale;
-    return { width: canvasWidth, height: canvasHeight, offsetX: 0, offsetY: 0,
-      drawX: (canvasWidth - drawWidth) / 2, drawY: (canvasHeight - drawHeight) / 2, drawWidth, drawHeight };
-  }
-  return { width, height, offsetX: Math.round((canvasWidth - width) / 2), offsetY: Math.round((canvasHeight - height) / 2),
-    drawX: 0, drawY: 0, drawWidth: width, drawHeight: height };
-}

static/js/editor/keyboard-shortcuts.js

@@ -67,7 +67,7 @@ export function wireKeyboardShortcuts(deps) {
     toolbar, toolKeyMap,
     composite, saveState, undo, redo,
     toggleShortcuts, confirmTransform, cancelTransform, startTransform, nudgeTransform,
-    resizeCustomPrompt, addEmptyLayer, brushSizeSync, openLayerAdjustment,
+    resizeCustomPrompt, addEmptyLayer, brushSizeSync,
     invertSelection,
     wandDeleteSelection, wandCopyToNewLayer, copyPixelsToClipboard,
     lassoDeleteSelection, lassoCopyToLayer,
@@ -181,12 +181,6 @@ export function wireKeyboardShortcuts(deps) {
         return;
       }
       // Save shortcuts — match the hints shown in the Save dropdown.
-      if (e.shiftKey && !e.altKey && e.code === 'KeyU') {
-        e.preventDefault();
-        e.stopPropagation();
-        openLayerAdjustment?.('hue-saturation');
-        return;
-      }
       if ((e.key === 's' || e.key === 'S') && !e.altKey) {
         e.preventDefault();
         document.getElementById(e.shiftKey ? 'ge-export-gallery' : 'ge-save')?.click();
@@ -227,12 +221,11 @@ export function wireKeyboardShortcuts(deps) {
         addEmptyLayer();
         return;
       }
-      // Ctrl+Alt+L edits the current layer, leaving Levels controls open.
+      // Ctrl+Alt+L — Levels adjustment. The Image menu owns the row and its
+      // dialog, so click it instead of duplicating the adjustment here.
       if (e.altKey && e.code === 'KeyL') {
-        e.preventDefault();
-        e.stopPropagation();
-        openLayerAdjustment?.('levels');
-        return;
+        const row = document.querySelector('[data-image-action="adj-levels"]');
+        if (row) { e.preventDefault(); e.stopPropagation(); row.click(); return; }
       }
       // Ctrl/Cmd+J duplicates the active layer through the layer panel's
       // existing implementation, which preserves masks and effects.

static/js/editor/layer-panel.js

@@ -2233,7 +2233,6 @@ export function createLayerPanelRenderer(deps) {
     if (dragSortModule) {
       dragSortModule.enable('ge-layers-list', '.ge-layer-item', {
         instanceKey: 'ge-layers',
-        excludeSelector: '.ge-adj-sub-item',
         threshold: 4,
         ignoreSelector: 'button, input, select, textarea, a, [contenteditable="true"], .ge-adj-sub-item',
         onReorder: (orderedItems) => {
@@ -2259,9 +2258,6 @@ export function createLayerPanelRenderer(deps) {
             state.layers = newLayers;
             normalizeLayerClipping(state);
             composite();
-            // Effects, adjustments and masks are sibling rows, not children
-            // of the dragged row. Rebuild them under their reordered owner.
-            render();
           }
         },
       });

static/js/editor/layer-styles.js

@@ -6,7 +6,7 @@ const size = () => number('size', 'Size', 8, 0, 100);
 const angle = () => number('angle', 'Angle', 120, -180, 180, 'deg');
 export const LAYER_STYLES = {
   'bevel-emboss': { label: 'Bevel & Emboss', controls: [size(), angle(), number('depth', 'Depth', 100, 0, 300, '%'), color('highlight', 'Highlight', '#ffffff'), color('color', 'Shadow', '#000000'), opacity()] },
-  'inner-shadow': { label: 'Inner Shadow', controls: [color('color', 'Color', '#000000'), opacity(), size(), angle(), number('distance', 'Distance', 6, 0, 300)] },
+  'inner-shadow': { label: 'Inner Shadow', controls: [color('color', 'Color', '#000000'), opacity(), size(), angle(), number('distance', 'Distance', 6, 0, 100)] },
   'inner-glow': { label: 'Inner Glow', controls: [color('color', 'Color', '#ffffff'), opacity(), size()] },
   satin: { label: 'Satin', controls: [color('color', 'Color', '#000000'), opacity(), size(), angle(), number('distance', 'Distance', 12, 0, 100)] },
   'gradient-overlay': { label: 'Gradient Overlay', controls: [color('color', 'Start', '#e06c75'), color('endColor', 'End', '#ffffff'), opacity(), angle(), number('scale', 'Scale', 100, 10, 300, '%')] },
@@ -32,13 +32,6 @@ function surface(width, height) {
 }
 
 export function renderDropShadow(source, params) {
-  if (params.inside) {
-    return renderLayerStyle(source, 'inner-shadow', {
-      color: params.color, opacity: params.opacity * 100, size: params.blur / 2,
-      distance: Math.hypot(params.x, params.y),
-      angle: Math.atan2(-params.y, params.x) * 180 / Math.PI,
-    });
-  }
   // Tint alpha first so RGB content cannot leak into the shadow. Draw only
   // this silhouette; compositing the source again thickens translucent edges.
   const silhouette = surface(source.width, source.height);

static/js/editor/quick-edit-job.js

@@ -1,13 +0,0 @@
-export function finishQuickEditJob(job, result) {
-  if (job.cancelled || result?.cancelled) {
-    job.cancelled = true;
-    job.status = 'cancelled';
-    job.detail = 'Cancelled';
-  } else if (job.status === 'error' || result?.ok === false) {
-    job.status = 'error';
-    job.detail = result?.error || result?.message || (job.detail !== 'Working…' && job.detail) || 'Edit failed';
-  } else {
-    job.status = 'done';
-    job.detail = result?.message || 'Done';
-  }
-}

static/js/editor/stroke-pipeline.js

@@ -14,26 +14,19 @@ function toolSettings(tool) {
 
 let _lastColor = null;
 let _lastTransparentColor = null;
-function transparentColor(color, alpha = 0) {
-  const key = `${color}|${alpha}`;
-  if (key === _lastColor && _lastTransparentColor) return _lastTransparentColor;
-  _lastColor = key;
-  _lastTransparentColor = colorWithAlpha(color, alpha);
-  return _lastTransparentColor;
-}
-
-function colorWithAlpha(color, alpha) {
+function transparentColor(color) {
+  if (color === _lastColor && _lastTransparentColor) return _lastTransparentColor;
+  _lastColor = color;
   if (color.startsWith('#')) {
     const raw = color.slice(1);
     const expanded = raw.length === 3 ? raw.split('').map(char => char + char).join('') : raw;
     const rgb = [0, 2, 4].map(index => parseInt(expanded.slice(index, index + 2), 16));
-    return `rgba(${rgb.join(',')},${alpha})`;
+    _lastTransparentColor = `rgba(${rgb.join(',')},0)`;
+    return _lastTransparentColor;
   }
   const match = color.match(/rgba?\(([^)]+)\)/);
-  if (!match) return `rgba(0,0,0,${alpha})`;
-  const components = match[1].split(',');
-  const originalAlpha = components.length > 3 ? Number(components[3]) : 1;
-  return `rgba(${components.slice(0, 3).join(',')},${alpha * originalAlpha})`;
+  _lastTransparentColor = match ? `rgba(${match[1].split(',').slice(0, 3).join(',')},0)` : 'rgba(0,0,0,0)';
+  return _lastTransparentColor;
 }
 
 function circleStamp(ctx, x, y, radius, softness, color, alpha, operation) {
@@ -45,19 +38,8 @@ function circleStamp(ctx, x, y, radius, softness, color, alpha, operation) {
     ctx.fillStyle = color;
   } else {
     const gradient = ctx.createRadialGradient(x, y, radius * hard, x, y, radius);
-    if (softness > 1) {
-      // Above the old maximum, remove the firm core with a progressively
-      // gentler alpha profile while keeping the selected brush diameter.
-      ctx.fillStyle = color;
-      const normalized = ctx.fillStyle;
-      for (let step = 0; step <= 16; step++) {
-        const t = step / 16;
-        gradient.addColorStop(t, transparentColor(normalized, (1 - t) ** softness));
-      }
-    } else {
-      gradient.addColorStop(0, color);
-      gradient.addColorStop(1, transparentColor(color));
-    }
+    gradient.addColorStop(0, color);
+    gradient.addColorStop(1, transparentColor(color));
     ctx.fillStyle = gradient;
   }
   ctx.beginPath();
@@ -292,10 +274,6 @@ export function createStrokePipeline({ activeLayer, getActiveMaskLayer, composit
     if (!PAINT_TOOLS.has(tool)) return;
     const layer = activeLayer();
     if (!layer) return;
-    // Pixel writes invalidate adjusted previews even when adjustment settings
-    // themselves have not changed (otherwise retouch strokes appear late).
-    layer._adjFinalKey = null;
-    layer._adjCacheKey = null;
     if (tool === 'clone') return cloneStamp(sample, layer);
     if (tool === 'heal') {
       // A healing stroke without a picked source uses the convenient local
@@ -316,7 +294,7 @@ export function createStrokePipeline({ activeLayer, getActiveMaskLayer, composit
     let operation = 'source-over';
     let color = state.color;
     let alpha = opacity * flow;
-    let softness = Math.max(0, Math.min(4, settings.softness / 300));
+    let softness = Math.max(0, Math.min(1, settings.softness / 300));
     if (tool === 'eraser') { operation = 'destination-out'; color = 'rgba(0,0,0,1)'; }
     else if (tool === 'inpaint') {
       operation = state.inpaintEraseStroke ? 'destination-out' : 'source-over';

static/js/editor/stroke-tool-sliders.js

@@ -57,11 +57,8 @@ function wireToolSliders(prefix, fields) {
     // softness rises (the CSS already sets the radial gradient — we
     // just tween the inner solid radius to communicate the falloff).
     if (softPrev) {
-      const amount = state[fields.softness];
-      const innerStop = Math.max(0, 60 - amount * 0.55);
-      softPrev.style.background = amount > 300
-        ? `radial-gradient(circle, var(--fg), color-mix(in srgb, var(--fg) ${Math.round(100 * 0.5 ** (amount / 300))}%, transparent) 50%, transparent 100%)`
-        : `radial-gradient(circle, var(--fg) 0%, var(--fg) ${innerStop}%, transparent 90%)`;
+      const innerStop = Math.max(0, 60 - state[fields.softness] * 0.55);
+      softPrev.style.background = `radial-gradient(circle, var(--fg) 0%, var(--fg) ${innerStop}%, transparent 90%)`;
     }
   });
 }

static/js/editor/submenu-toggles.js

@@ -20,23 +20,6 @@ export function wireSubmenuToggles(menu) {
       menu.classList.remove('ge-flyout-open');
     }
   });
-  function positionPanel(parent) {
-    const panel = parent.nextElementSibling;
-    if (!panel?.classList.contains('ge-submenu')) return;
-    const row = parent.getBoundingClientRect();
-    const origin = (panel.offsetParent || menu).getBoundingClientRect();
-    const top = Math.max(8, Math.min(row.top, window.innerHeight - panel.offsetHeight - 8));
-    const left = row.right + panel.offsetWidth > window.innerWidth - 8
-      ? Math.max(8, row.left - panel.offsetWidth) : row.right - 2;
-    panel.style.top = `${top - origin.top + (panel.offsetParent?.scrollTop || 0)}px`;
-    panel.style.left = `${left - origin.left + (panel.offsetParent?.scrollLeft || 0)}px`;
-  }
-  for (const eventName of ['pointerover', 'focusin']) {
-    menu.addEventListener(eventName, (event) => {
-      const parent = event.target.closest('.ge-menu-parent');
-      if (parent) positionPanel(parent);
-    });
-  }
   menu.addEventListener('click', (e) => {
     const parent = e.target.closest('.ge-menu-parent');
     if (!parent) return;
@@ -51,7 +34,10 @@ export function wireSubmenuToggles(menu) {
     parent.setAttribute('aria-expanded', String(willOpen));
     if (willOpen) {
       // Align the flyout with the clicked row rather than the menu top.
-      positionPanel(parent);
+      const panel = parent.nextElementSibling;
+      if (panel && panel.classList.contains('ge-submenu')) {
+        panel.style.top = parent.offsetTop + 'px';
+      }
     }
   });
 }

static/js/editor/wire-topbar.js

@@ -37,7 +37,6 @@
  * }} deps
  */
 import { state } from './state.js';
-import { topPortalZ } from '../toolWindowZOrder.js';
 import { isLayerPixelLocked, isLayerTransparencyLocked } from './layer-groups.js';
 
 const TOPBAR_MENU_IDS = ['ge-file-menu', 'ge-edit-menu', 'ge-view-menu', 'ge-image-menu', 'ge-layer-menu', 'ge-type-menu', 'ge-selection-menu', 'ge-filter-menu', 'ge-window-menu', 'ge-help-menu', 'ge-resize-menu', 'ge-save-menu'];
@@ -102,7 +101,6 @@ export function wireTopbar(deps) {
       };
       const positionSaveMenu = () => {
         const r = saveBtn.getBoundingClientRect();
-        saveMenu.style.zIndex = String(topPortalZ());
         saveMenu.style.top = `${r.bottom + 2}px`;
         saveMenu.style.right = `${Math.max(8, window.innerWidth - r.right)}px`;
         saveMenu.style.left = 'auto';

static/js/emailLibrary/index.js

@@ -2650,14 +2650,7 @@ export function openEmailLibrary(opts = {}) {
   }
 
   // Wire events
-  document.getElementById('email-lib-close').addEventListener('click', () => {
-    const modal = document.getElementById('email-lib-modal');
-    if (modal?.classList.contains('email-reading') || modal?.querySelector('.doclib-card-expanded')) {
-      _exitEmailReaderModeForList();
-      return;
-    }
-    closeEmailLibrary();
-  });
+  document.getElementById('email-lib-close').addEventListener('click', closeEmailLibrary);
   document.getElementById('email-settings-header-back')?.addEventListener('click', _hideEmailSettingsPage);
 
   // Clicking the modal header (anywhere except buttons/inputs) collapses

static/js/emailLibrary/utils.js

@@ -73,24 +73,16 @@ function _isDangerousSrcset(value) {
 
 // Escape + linkify URLs and email addresses. Returns innerHTML-safe markup.
 export function _escLinkify(text) {
-  const raw = String(text || '');
-  // Match raw text once so generated anchors are never linkified again.
-  const tokenRe = /\b((?:https?:\/\/|www\.)[^\s<>"']+[^\s<>"'.,;:!?)\]])|\b([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,})\b/g;
-  const parts = [];
-  let offset = 0;
-  for (const match of raw.matchAll(tokenRe)) {
-    parts.push(_esc(raw.slice(offset, match.index)));
-    const token = match[0];
-    const isUrl = !!match[1];
-    const href = isUrl
-      ? (token.startsWith('www.') ? `https://${token}` : token)
-      : `mailto:${token}`;
-    const attrs = isUrl ? ' target="_blank" rel="noopener noreferrer"' : '';
-    parts.push(`<a href="${_attrEsc(_esc(href))}"${attrs}>${_esc(token)}</a>`);
-    offset = match.index + token.length;
-  }
-  parts.push(_esc(raw.slice(offset)));
-  return parts.join('');
+  const escaped = _esc(text);
+  // URLs: http(s)://... or www....
+  const urlRe = /\b((?:https?:\/\/|www\.)[^\s<>"']+[^\s<>"'.,;:!?)\]])/g;
+  const mailRe = /\b([A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,})\b/g;
+  return escaped
+    .replace(urlRe, (m) => {
+      const href = m.startsWith('www.') ? `https://${m}` : m;
+      return `<a href="${_attrEsc(href)}" target="_blank" rel="noopener noreferrer">${m}</a>`;
+    })
+    .replace(mailRe, (m) => `<a href="${_attrEsc(`mailto:${m}`)}">${m}</a>`);
 }
 
 // Pull display name out of "Name <email@x>"; fallback to local-part of

static/js/gallery.js

@@ -1321,12 +1321,7 @@ function _renderEditorLanding() {
     // openEditor() now returns a Promise — it's async because the size
     // prompt is a styled modal. Await it before checking whether the
     // editor actually opened (the user may have cancelled).
-    try {
-      await openEditor(null, null, null, 'New canvas');
-    } catch (error) {
-      // openEditor reports the initialization error and tears down its shell.
-      console.error('[gallery] New canvas failed', error);
-    }
+    await openEditor(null, null, null, 'New canvas');
     if (!document.querySelector('#gallery-editor-container .gallery-editor')) {
       _renderEditorLanding();
     }

static/js/galleryEditor.js

@@ -277,11 +277,8 @@ import { alphaBounds as _maskAlphaBounds, featherMaskCanvas as _featherMaskCanva
 import { analyzeAutoTone as _analyzeAutoTone, applyAutoTone as _applyAutoTone, boxBlurRGB as _boxBlurRGB, skinMaskFromData as _skinMaskFromData, frequencySeparationSmooth as _frequencySeparationSmooth, blemishRemoval as _blemishRemoval, teethWhitening as _teethWhitening, featureExclusionMask as _featureExclusionMask, dilateAlpha as _dilateAlpha, subtractMask as _subtractMask, guidedClarity as _guidedClarity } from './editor/retouch.js';
 import { wireClipboardAndDrop } from './editor/clipboard-and-drop.js';
 import { wireAIModelSelectors, resolveInpaintModel, resolveQuickEditModel, resolveQuickEditAgentModel } from './editor/ai-models.js';
+import { createPreflight } from './editor/preflight.js';
 import { createAiSettings } from './editor/ai-settings.js';
-import { waitForImagePreferences } from './settings/imagePreferences.js';
-import { createImageGenerationAction } from './editor/image-generation.js';
-import { finishQuickEditJob } from './editor/quick-edit-job.js';
-import { imageResultGeometry } from './editor/image-result-geometry.js';
 import { lookRecipeSteps } from './editor/look-recipes.js';
 import { wireInpaintButtons } from './editor/ai-inpaint.js?v=20260708match1';
 import { wireAIToolsMisc } from './editor/ai-tools-misc.js';
@@ -359,6 +356,7 @@ function _computeTransformSnap(frame, center) {
 const _INPAINT_DEFAULT_BRUSH = 100;
 let _samAbortController = null;
 let _precisionGuides = null;
+let _preflight = null;
 let _aiSettings = null;
 let _selectionAnimationFrame = null;
 let _selectionAnimationLast = 0;
@@ -396,12 +394,6 @@ if (!window.__galleryEditEscHardGuardInstalled) {
     }
     if (e.target?.closest?.('#styled-confirm-overlay')) return;
     if (e.key === 'Escape') {
-      const aiSettings = document.querySelector('.ge-ai-settings:not([hidden])');
-      if (aiSettings) {
-        e.preventDefault(); e.stopImmediatePropagation();
-        aiSettings.querySelector('[data-ai-settings-close]')?.click();
-        return;
-      }
       // Floating dialogs/popups that live outside the editor modal must close on
       // Escape reliably (their document-capture handlers can miss when focus is
       // outside them). Close the top-most one and stop here.
@@ -846,7 +838,6 @@ function _setCanvasAiBusy(busy) {
 }
 
 let _aiProgressTimer = null;
-let _aiProgressEpoch = 0;
 function _setAiProgress(frac, label) {
   const wrap = document.getElementById('ge-ai-command-progress');
   if (!wrap) return;
@@ -866,17 +857,12 @@ function _startAiProgress(requestId) {
   const endpointId = arguments[1] || '';
   _stopAiProgress();
   if (!requestId) return;
-  const epoch = _aiProgressEpoch;
-  let pending = false;
   const tick = async () => {
-    if (pending || epoch !== _aiProgressEpoch) return;
-    pending = true;
     try {
       const epQuery = endpointId ? `&endpoint_id=${encodeURIComponent(endpointId)}` : '';
       const r = await fetch(`/api/image/edit-progress?request_id=${encodeURIComponent(requestId)}` + epQuery, { credentials: 'same-origin' });
       if (!r.ok) return;
       const p = await r.json();
-      if (epoch !== _aiProgressEpoch) return;
       const st = p.stage || '';
       if (st === 'done' || st === 'error') { _setAiProgress(1, st === 'done' ? 'Done' : 'Failed'); return; }
       const frac = typeof p.progress === 'number' ? p.progress : 0;
@@ -885,13 +871,12 @@ function _startAiProgress(requestId) {
       const verb = st === 'editing' ? 'Generating' : (st ? st[0].toUpperCase() + st.slice(1) : 'Working');
       _setAiProgress(frac, `${verb}…${stepTxt}${eta}`);
       _setAiCommandStatus(`${verb}…${stepTxt}${eta}`, 'running');
-    } catch (_) {} finally { pending = false; }
+    } catch (_) {}
   };
   _aiProgressTimer = setInterval(tick, 1000);
   tick();
 }
 function _stopAiProgress() {
-  _aiProgressEpoch++;
   if (_aiProgressTimer) { clearInterval(_aiProgressTimer); _aiProgressTimer = null; }
   _setAiProgress(null);
 }
@@ -1089,7 +1074,6 @@ const _QUICK_EDIT_TOOL_SUGGESTIONS = Object.entries(_TOOLS).map(([id, t]) => ({
   kind: 'Tool',
   icon: t.icon || '',
   toolId: id,
-  runPrompt: id === 'rembg' ? 'remove background' : null,
   aliases: [id],
 }));
 const _QUICK_EDIT_CATALOG = [..._QUICK_EDIT_TOOL_SUGGESTIONS, ..._AI_COMMAND_SUGGESTIONS];
@@ -1297,13 +1281,8 @@ function _wireAiCommandBox() {
     if (item.toolId) {
       _clickToolButton(item.toolId);
       _setAiCommandStatus(`${item.label} tool`, 'done');
-      if (item.runPrompt) {
-        input.value = item.runPrompt;
-        syncClearButton();
-      }
       hideSuggestions();
       input.focus();
-      if (run && item.runPrompt) form.requestSubmit();
       return true;
     }
     input.value = item.insert;
@@ -1492,24 +1471,6 @@ function _wireAiCommandBox() {
   // model (window.geEditorAI) just like the server would route it.
   const _executeQuickEditLocal = async (prompt) => {
     const p = prompt.toLowerCase();
-    // Background-removal intent (shared with the routing guard so the regex
-    // can never drift between the two call sites).
-    if (_looksBackgroundRemoval(p)) {
-      await _runQuickControlOp('ai.removeBackground', {});
-      // Chain a tone step when the prompt also asks for one
-      // ("remove the background and make it brighter", "...and warm it up").
-      if (/\b(bright(?:er|en)?|lighten|exposure|well[-\s]*lit)\b/.test(p)) {
-        await _runQuickControlOp('adjustments.apply', { type: 'brightness-contrast', params: { brightness: 16, contrast: 4 } });
-      } else if (/\b(dark(?:er|en)?|dimmer)\b/.test(p)) {
-        await _runQuickControlOp('adjustments.apply', { type: 'brightness-contrast', params: { brightness: -14, contrast: 4 } });
-      } else if (/\b(warm(?:er)?)\b/.test(p)) {
-        await _runQuickControlOp('adjustments.apply', { type: 'white-balance', params: { temperature: 18 } });
-      } else if (/\b(cool(?:er)?)\b/.test(p)) {
-        await _runQuickControlOp('adjustments.apply', { type: 'white-balance', params: { temperature: -18 } });
-      }
-      _setAiCommandStatus('Background removal finished.', 'done');
-      return;
-    }
     // A targeted recolour ("make only the red car blue", "recolour the rock to
     // teal") needs the model to repaint a specific object — never fake it with a
     // global colour tweak from the deterministic fast path.
@@ -1972,6 +1933,24 @@ function _wireAiCommandBox() {
           return;
         }
       }
+      // Background-removal intent (shared with the routing guard so the regex
+      // can never drift between the two call sites).
+      if (_looksBackgroundRemoval(p)) {
+        await _runQuickControlOp('ai.removeBackground', {});
+        // Chain a tone step when the prompt also asks for one
+        // ("remove the background and make it brighter", "...and warm it up").
+        if (/\b(bright(?:er|en)?|lighten|exposure|well[-\s]*lit)\b/.test(p)) {
+          await _runQuickControlOp('adjustments.apply', { type: 'brightness-contrast', params: { brightness: 16, contrast: 4 } });
+        } else if (/\b(dark(?:er|en)?|dimmer)\b/.test(p)) {
+          await _runQuickControlOp('adjustments.apply', { type: 'brightness-contrast', params: { brightness: -14, contrast: 4 } });
+        } else if (/\b(warm(?:er)?)\b/.test(p)) {
+          await _runQuickControlOp('adjustments.apply', { type: 'white-balance', params: { temperature: 18 } });
+        } else if (/\b(cool(?:er)?)\b/.test(p)) {
+          await _runQuickControlOp('adjustments.apply', { type: 'white-balance', params: { temperature: -18 } });
+        }
+        _setAiCommandStatus('Background removal finished.', 'done');
+        return;
+      }
       if (!/\b(text|title|caption|font|heading|subtitle)\b/.test(p)
         && /\b(upscale|higher\s*res|increase\s*resolution|bigger|2x|4x)\b/.test(p)) {
         // Use the real upscale op (Real-ESRGAN, basic-upscale fallback). The
@@ -2835,8 +2814,8 @@ function _wireAiCommandBox() {
     if (_looksBackgroundRemoval(prompt)) {
       _setAiCommandStatus('Removing the background…', 'running');
       try {
-        await _executeQuickEditLocal(prompt);
-        return { ok: true };
+        const done = await _executeQuickEditLocal(prompt);
+        if (done !== false) return { ok: true };
       } catch (err) {
         if (signal && signal.aborted) { _setAiCommandStatus('', ''); return { ok: false, cancelled: true }; }
         const msg = err && err.message ? err.message : String(err);
@@ -2862,7 +2841,6 @@ function _wireAiCommandBox() {
         _setAiCommandStatus('Generated an image.', 'done');
         return { ok: true, image: res };
       } catch (err) {
-        if (signal?.aborted) return { ok: false, cancelled: true };
         const msg = err && err.message ? err.message : String(err);
         _setAiCommandStatus(_isGenOfflineMsg(msg) ? msg : `Could not generate an image: ${msg}`, 'error');
         return { ok: false, error: msg };
@@ -3105,22 +3083,19 @@ function _wireAiCommandBox() {
         job.controller = controller;
         renderJobStack();
         _quickEditActiveJob = job;
-        let result;
         try {
-          result = await executeQuickEdit(job.prompt, { forceAi: !!job.forceAi, signal: controller ? controller.signal : null });
+          await executeQuickEdit(job.prompt, { forceAi: !!job.forceAi, signal: controller ? controller.signal : null });
         } catch (err) {
           if (!job.cancelled) {
             job.status = 'error';
             job.detail = err?.message || 'AI edit failed';
           }
         } finally {
-          _stopAiProgress();
-          finishQuickEditJob(job, result);
-          _setAiCommandStatus(job.cancelled ? '' : job.detail, job.cancelled ? '' : job.status);
           if (_quickEditActiveJob === job) _quickEditActiveJob = null;
           job.onChange = null;
           job.controller = null;
           if (job.cancelled) continue;
+          if (job.status === 'running') job.status = 'done';
           renderJobStack();
           setTimeout(() => dismissJob(job), job.status === 'error' ? 3200 : 1600);
         }
@@ -5329,14 +5304,9 @@ function _restoreState(snap) {
   // inside _buildEditor, so we touch the DOM here).
   const sizeLabel = document.getElementById('ge-canvas-size');
   if (sizeLabel) sizeLabel.textContent = `${state.imgWidth}×${state.imgHeight} px`;
-  state.rembgLiveLayer = null;
-  state.rembgLiveSnap = null;
 }
 
 function undo() {
-  // End sampling before restoring pixels; pointer-up must not replay the
-  // unfinished stroke into the restored layer without a new history entry.
-  if (state.drawing) _strokeTool.tryEnd();
   if (state.undoStack.length === 0) return;
   const target = state.undoStack.pop();
   const cur = _snapshotState();
@@ -5789,20 +5759,7 @@ function _updateBrushCursor(e) {
     state.cursorEl.style.height = diameterY + 'px';
   }
   state.cursorEl.classList.toggle('ge-brush-cursor--pixel', pixelBrush);
-  // Updating an inline style on every move invalidates document-wide :has()
-  // selectors. A paused animation keeps the same transform in the rendering
-  // pipeline without mutating the cursor's style attribute on every frame.
-  const cursorTransform = `translate3d(${clientX - diameterX / 2}px, ${clientY - diameterY / 2}px, 0)`;
-  if (!state.cursorEl._positionAnimation || state.cursorEl._positionAnimation.playState === 'idle') {
-    state.cursorEl._positionAnimation = state.cursorEl.animate(
-      [{ transform: cursorTransform }, { transform: cursorTransform }],
-      { duration: 1, fill: 'both' },
-    );
-    state.cursorEl._positionAnimation.pause();
-    state.cursorEl._positionAnimation.currentTime = 0;
-  } else {
-    state.cursorEl._positionAnimation.effect.setKeyframes([{ transform: cursorTransform }, { transform: cursorTransform }]);
-  }
+  state.cursorEl.style.transform = `translate3d(${clientX - diameterX / 2}px, ${clientY - diameterY / 2}px, 0)`;
   if (state.cursorEl.style.display !== 'block') {
     state.cursorEl.style.display = 'block';
   }
@@ -6565,11 +6522,6 @@ const _nudgeTransform      = _transformSession.nudgeTransform;
 const _confirmTransform    = _transformSession.confirmTransform;
 const _cancelTransform     = _transformSession.cancelTransform;
 window.__galleryEditorHandleEscape = () => {
-  const aiSettings = document.querySelector('.ge-ai-settings:not([hidden])');
-  if (aiSettings) {
-    aiSettings.querySelector('[data-ai-settings-close]')?.click();
-    return true;
-  }
   const sizePrompt = document.getElementById('ge-canvas-size-overlay');
   if (sizePrompt && getComputedStyle(sizePrompt).display !== 'none') {
     sizePrompt._cancelCanvasSize?.();
@@ -8099,7 +8051,6 @@ async function _canMutateLayerPixels(layer, action = 'editing pixels') {
     return false;
   }
   if (!['placed', 'text', 'shape'].includes(layer.kind)) return true;
-  if (action === 'cutting pixels') return _rasterizeLayerNow(layer);
   return _confirmRasterizeLayer(layer);
 }
 
@@ -8298,13 +8249,10 @@ function _filterSliderPrompt(title, params, onPreview, onCancel) {
       // standard slim red-thumb styling instead of the bare browser
       // default. Value chip on the same line as the label.
       const isColor = p.type === 'color';
-      const isSelect = p.type === 'select';
       rows += `
         <div class="ge-filter-row ge-eraser-row">
-          <label>${p.label}${isColor || isSelect ? '' : ` <span class="ge-filter-row-value" data-val-for="${p.key}">${p.value}${p.suffix || ''}</span>`}</label>
-          ${isSelect
-            ? `<select data-key="${p.key}" class="ge-ctl-select" aria-label="${p.label}">${p.options.map(option => `<option value="${option.value}"${String(option.value) === String(p.value) ? ' selected' : ''}>${option.label}</option>`).join('')}</select>`
-            : isColor
+          <label>${p.label}${isColor ? '' : ` <span class="ge-filter-row-value" data-val-for="${p.key}">${p.value}${p.suffix || ''}</span>`}</label>
+          ${isColor
             ? `<input type="color" data-key="${p.key}" value="${p.value}" aria-label="${p.label}" />`
             : `<input type="range" data-key="${p.key}" min="${p.min}" max="${p.max}" step="${p.step || 1}" value="${p.value}" />`}
         </div>
@@ -8325,7 +8273,7 @@ function _filterSliderPrompt(title, params, onPreview, onCancel) {
     for (const p of params) values[p.key] = p.value;
     // Initial preview render.
     try { onPreview(values); } catch {}
-    overlay.querySelectorAll('input[data-key], select[data-key]').forEach(inp => {
+    overlay.querySelectorAll('input[data-key]').forEach(inp => {
       inp.addEventListener('input', (e) => {
         if (!isCurrent()) { cleanup(null); return; }
         const k = e.target.dataset.key;
@@ -8356,7 +8304,7 @@ function _filterSliderPrompt(title, params, onPreview, onCancel) {
         e.preventDefault();
         cleanup(e.target?.dataset.action === 'cancel' ? null : values);
       } else if (e.key === 'Tab') {
-        const fields = [...overlay.querySelectorAll('input, select, button')];
+        const fields = [...overlay.querySelectorAll('input, button')];
         const index = fields.indexOf(document.activeElement);
         e.preventDefault();
         fields[(index + (e.shiftKey ? -1 : 1) + fields.length) % fields.length]?.focus();
@@ -8368,7 +8316,7 @@ function _filterSliderPrompt(title, params, onPreview, onCancel) {
       if (!overlay.isConnected || !isCurrent()) cleanup(null);
     });
     observer.observe(state.container, { childList: true, subtree: true });
-    overlay.querySelector('input, select, button')?.focus({ preventScroll: true });
+    overlay.querySelector('input, button')?.focus({ preventScroll: true });
     overlay.querySelector('[data-action="apply"]').addEventListener('click', () => cleanup(values));
     overlay.querySelector('[data-action="cancel"]').addEventListener('click', () => cleanup(null));
     // Click outside the modal (on the dim backdrop) = cancel.
@@ -8534,7 +8482,6 @@ function _shadowOffsets(values = {}) {
   return {
     x: Math.round(Math.cos(radians) * distance),
     y: Math.round(-Math.sin(radians) * distance),
-    inside: Number(values.inside) === 1,
   };
 }
 
@@ -8596,7 +8543,6 @@ async function _addRetainedEffect(type, presetName = null) {
       { key: 'color', label: 'Color', type: 'color', value: '#000000' },
       { key: 'opacity', label: 'Opacity', min: 0, max: 100, step: 1, value: 45, suffix: '%' },
       { key: 'blur', label: 'Blur', min: 0, max: 100, step: 1, value: 12, suffix: 'px' },
-      { key: 'inside', label: 'Position', type: 'select', value: 0, options: [{ value: 0, label: 'Outside' }, { value: 1, label: 'Inside' }] },
       { key: 'distance', label: 'Distance', min: 0, max: 200, step: 1, value: _shadowAngleDistance({ x: 4, y: 6 }).distance, suffix: 'px' },
       { key: 'angle', label: 'Direction', min: -180, max: 180, step: 1, value: _shadowAngleDistance({ x: 4, y: 6 }).angle, suffix: '\u00b0' },
     ];
@@ -8810,7 +8756,6 @@ async function _editRetainedEffect(layer, effect) {
         { key: 'color', label: 'Color', type: 'color', value: p.color || '#000000' },
         { key: 'opacity', label: 'Opacity', min: 0, max: 100, step: 1, value: Math.round((Number(p.opacity) || 0) * 100), suffix: '%' },
         { key: 'blur', label: 'Blur', min: 0, max: 100, step: 1, value: Number(p.blur) || 0, suffix: 'px' },
-        { key: 'inside', label: 'Position', type: 'select', value: p.inside ? 1 : 0, options: [{ value: 0, label: 'Outside' }, { value: 1, label: 'Inside' }] },
         { key: 'distance', label: 'Distance', min: 0, max: 200, step: 1, value: _shadowAngleDistance(p).distance, suffix: 'px' },
         { key: 'angle', label: 'Direction', min: -180, max: 180, step: 1, value: _shadowAngleDistance(p).angle, suffix: '\u00b0' },
       ];
@@ -10035,8 +9980,9 @@ function _buildEditor(container) {
       if (colorRow) colorRow.style.display = ['eraser', 'clone', 'heal', 'smudge', 'dodge', 'burn', 'liquify'].includes(toolId) ? 'none' : '';
       const colorLabel = colorRow?.querySelector('label');
       if (colorLabel) colorLabel.textContent = 'Color';
-      // Secondary modifiers stay in More; brush softness remains in the main
-      // strip. Only the active tool's secondary group is shown.
+      // Per-tool stroke modifiers all live in the shared brush "More" menu so
+      // every brush-family tool has the same compact strip as the Brush. Only
+      // the group for the active tool is shown; the rest stay hidden.
       const strokeTool = (toolId === 'brush' || toolId === 'pixel' || toolId === 'dodge' || toolId === 'burn') ? 'brush'
         : toolId === 'eraser' ? 'eraser'
           : (toolId === 'clone' || toolId === 'heal') ? 'clone'
@@ -10046,8 +9992,6 @@ function _buildEditor(container) {
         row.style.display = row.dataset.strokeTool === strokeTool ? '' : 'none';
       });
       const dodgeBurnRow = document.getElementById('ge-dodgeburn-intensity-row');
-      const brushSoftnessRow = document.getElementById('ge-brush-softness-row');
-      if (brushSoftnessRow) brushSoftnessRow.style.display = ['brush', 'dodge', 'burn'].includes(toolId) ? '' : 'none';
       // Intensity sits in the strip next to Size, so it must show for Dodge and
       // Burn only (and never for the other brush-family tools).
       if (dodgeBurnRow) dodgeBurnRow.style.display = (toolId === 'dodge' || toolId === 'burn') ? '' : 'none';
@@ -10500,6 +10444,7 @@ function _buildEditor(container) {
   canvasArea.appendChild(state.transformOverlay);
   canvasArea.appendChild(_buildQuickMaskBar());
   canvasArea.appendChild(_buildAiCommandBox());
+  _preflight = createPreflight({ canvasArea });
   _aiSettings = createAiSettings({ container });
   try { window.geEditorAiSettings = _aiSettings; } catch (_) {}
   // On phones the rulers eat scarce canvas width; default them off.
@@ -10692,10 +10637,19 @@ function _buildEditor(container) {
     const initialStatusTool = document.getElementById('ge-status-tool');
     if (initialStatusTool) initialStatusTool.textContent = _TOOLS[state.tool]?.label || state.tool || '';
   }
-  // Keep model configuration in the AI settings dialog.
+  // Preflight checklist: greet the user on open (unless dismissed) and
+  // expose a footer button to re-open it.
   try {
     const footer = container.querySelector('.ge-editor-footer');
     if (footer) {
+      const setupBtn = document.createElement('button');
+      setupBtn.type = 'button';
+      setupBtn.id = 'ge-setup-btn';
+      setupBtn.className = 'ge-setup-btn';
+      setupBtn.title = 'Editor setup checklist';
+      setupBtn.textContent = 'Setup';
+      setupBtn.addEventListener('click', () => _preflight?.open());
+      footer.appendChild(setupBtn);
       const aiBtn = document.createElement('button');
       aiBtn.type = 'button';
       aiBtn.id = 'ge-ai-settings-btn';
@@ -10705,6 +10659,7 @@ function _buildEditor(container) {
       aiBtn.addEventListener('click', () => _aiSettings?.open());
       footer.appendChild(aiBtn);
     }
+    _preflight?.maybeOpen();
   } catch (_) {}
   try { _initControlKit(container); } catch (_) {}
   let _lastLayoutDesktop = null;
@@ -11824,14 +11779,6 @@ function _buildEditor(container) {
   // Keyboard shortcuts — full implementation in
   // editor/keyboard-shortcuts.js.
   wireKeyboardShortcuts({
-    openLayerAdjustment: (type) => {
-      const layer = activeLayer();
-      if (!layer || !layer.canvas || layer.kind === 'adjustment') {
-        uiModule?.showToast('Select an image layer first');
-        return;
-      }
-      _openAdjPopup(layer, type, document.getElementById('ge-image-menu-btn'));
-    },
     fillSelection: _doFillSelection,
     copyPixelsToClipboard: _copyPixelsToClipboard,
     toolbar, toolKeyMap: _toolKeyMap,
@@ -12196,9 +12143,7 @@ function _buildEditor(container) {
     out.getContext('2d').drawImage(layer.canvas, off.x, off.y);
     return out;
   };
-  const _aiEditCanvas = async (endpoint, payload = {}, { keepNaturalSize = true } = {}) => {
-    await waitForImagePreferences();
-    if (endpoint === '/api/image/inpaint') payload = { ...payload, _use_image_settings: true };
+  const _aiEditCanvas = async (endpoint, payload = {}, { keepNaturalSize = false } = {}) => {
     const flat = _aiEditSourceCanvas();
     const image = flat.toDataURL('image/png').split(',')[1];
     const requestId = 'qe-' + Date.now().toString(36) + '-' + Math.random().toString(36).slice(2, 8);
@@ -12209,7 +12154,7 @@ function _buildEditor(container) {
     } else {
       _startAiProgress(requestId);
     }
-    const body = JSON.stringify({ image, width: flat.width, height: flat.height, request_id: requestId, ...payload });
+    const body = JSON.stringify({ image, request_id: requestId, ...payload });
     // The image servers occasionally reject a request transiently (503 while a
     // model swaps, 502/504 gateways, dropped connections). Retry those a couple
     // of times with backoff so a hiccup doesn't silently leave the canvas
@@ -12267,7 +12212,7 @@ function _buildEditor(container) {
         c.height = state.imgHeight;
       }
       c.getContext('2d').drawImage(img, 0, 0, c.width, c.height);
-      return { canvas: c, dataUrl: c.toDataURL('image/png'), fullFrame: data.full_frame === true };
+      return { canvas: c, dataUrl: c.toDataURL('image/png') };
     } finally {
       if (_timer) clearTimeout(_timer);
       if (_aiEditAbort === _ctl) _aiEditAbort = null;
@@ -12276,17 +12221,12 @@ function _buildEditor(container) {
   };
   const _placeResultLayer = (canvas, name, maskCanvas) => {
     _saveState(`AI: ${name}`);
-    const geometry = imageResultGeometry(canvas.width, canvas.height, state.imgWidth, state.imgHeight);
-    const layer = createLayer(name, geometry.width, geometry.height);
-    const offset = { x: geometry.offsetX, y: geometry.offsetY };
-    state.layerOffsets.set(layer.id, offset);
-    layer.ctx.imageSmoothingEnabled = true;
-    layer.ctx.imageSmoothingQuality = 'high';
-    layer.ctx.drawImage(canvas, geometry.drawX, geometry.drawY, geometry.drawWidth, geometry.drawHeight);
+    const layer = createLayer(name, state.imgWidth, state.imgHeight);
+    layer.ctx.drawImage(canvas, 0, 0);
     if (maskCanvas) {
       layer.ctx.save();
       layer.ctx.globalCompositeOperation = 'destination-in';
-      layer.ctx.drawImage(maskCanvas, -offset.x, -offset.y);
+      layer.ctx.drawImage(maskCanvas, 0, 0);
       layer.ctx.restore();
     }
     state.layers.push(layer);
@@ -12296,24 +12236,13 @@ function _buildEditor(container) {
     _renderLayerPanel();
     return layer.id;
   };
-  const _generateImage = createImageGenerationAction({
-    formatError: _generationErrorMessage,
-    getDocument: () => ({
-      key: state.editorOpen ? `${state.editorSessionToken}:${state.documentId}` : null,
-      width: state.imgWidth, height: state.imgHeight, mask: state.wandMask,
-    }),
-    getSignal: () => _quickEditActiveJob?.controller?.signal,
-    onProgress: seconds => _setAiCommandStatus(`Generating an image… ${seconds}s`, 'running'),
-    placeResult: _placeResultLayer,
-  });
   const _aiInpaintSelection = async (prompt) => {
     if (!state.wandMask) throw new Error('make a selection first');
     const layer = activeLayer() || _activeParentLayer();
     if (!layer) throw new Error('no layer');
     const mask = state.wandMask.toDataURL('image/png').split(',')[1];
-    const selection = state.wandMask;
-    const { canvas, fullFrame } = await _aiEditCanvas('/api/image/inpaint', { mask, prompt: prompt || '', steps: 4 });
-    return _placeResultLayer(canvas, 'Generative fill', fullFrame ? null : selection);
+    const { canvas } = await _aiEditCanvas('/api/image/inpaint', { mask, prompt: prompt || '', steps: 4 });
+    return _placeResultLayer(canvas, 'Generative fill', state.wandMask);
   };
   // Replace the background/scene while keeping the subject: the server derives
   // the subject mask, repaints the inverse (new background), harmonises colour
@@ -12606,7 +12535,7 @@ function _buildEditor(container) {
           'layers.delete': { description: 'Delete layers (defaults to selection).', run: (p) => { if (p && (p.id || p.index || p.name)) _controlSelect(_controlFindLayer(p)); _layerPanelRenderer.deleteSelectedLayers?.(); return true; } },
           'layers.setOpacity': { description: 'Set a layer opacity (0-1).', run: (p) => { const l = _controlFindLayer(p) || activeLayer(); if (!l) throw new Error('layer not found'); _saveState(`Change opacity of ${l.name}`); l.opacity = Math.max(0, Math.min(1, Number(p.opacity))); composite(); _renderLayerPanel(); return l.id; } },
           'layers.setBlend': { description: 'Set a layer blend mode.', run: (p) => { const l = _controlFindLayer(p) || activeLayer(); if (!l) throw new Error('layer not found'); _saveState(`Change blend mode of ${l.name}`); l.blendMode = p.blendMode || p.mode || 'source-over'; composite(); _renderLayerPanel(); return l.id; } },
-          'layers.placeImage': { description: 'Place an image (data URL) as a NEW layer, masked to the current selection when one exists; never overwrites the original. Instruction mode (mode:"instruction" or differenceMask:true) keeps untouched areas pixel-identical via a difference map. {dataUrl,name,masked,blend,opacity,x,y,w,h,mode,differenceMask,diffThreshold,diffGrow,diffFeather}.', run: (p) => new Promise((resolve, reject) => { if (!p || !p.dataUrl) { reject(new Error('dataUrl required')); return; } const img = new Image(); img.onload = () => { try { _saveState(`Place ${p.name || 'image'}`); const dw = state.imgWidth, dh = state.imgHeight; const useDiff = p.nativeSize !== true && ((p.differenceMask === true) || String(p.mode || '').toLowerCase() === 'instruction'); const beforeSnap = useDiff ? flatten() : null; const nativeSize = p.nativeSize === true && !useDiff; const geometry = imageResultGeometry(img.naturalWidth, img.naturalHeight, dw, dh); const layer = createLayer(p.name || 'Placed image', nativeSize ? geometry.width : dw, nativeSize ? geometry.height : dh); const nativeOffset = { x: geometry.offsetX, y: geometry.offsetY }; if (nativeSize) state.layerOffsets.set(layer.id, nativeOffset); let tw = Number(p.w), th = Number(p.h); if (!(tw > 0) || !(th > 0)) { if (nativeSize) { tw = geometry.drawWidth; th = geometry.drawHeight; } else if (useDiff) { tw = dw; th = dh; } else { const scale = Math.min(dw / img.naturalWidth, dh / img.naturalHeight); tw = Math.max(1, Math.round(img.naturalWidth * scale)); th = Math.max(1, Math.round(img.naturalHeight * scale)); } } let tx = Number(p.x), ty = Number(p.y); if (!Number.isFinite(tx)) tx = nativeSize ? geometry.drawX : useDiff ? 0 : Math.round((dw - tw) / 2); if (!Number.isFinite(ty)) ty = nativeSize ? geometry.drawY : useDiff ? 0 : Math.round((dh - th) / 2); layer.ctx.imageSmoothingEnabled = true; layer.ctx.imageSmoothingQuality = 'high'; layer.ctx.drawImage(img, tx, ty, tw, th); if (p.masked !== false && state.wandMask) { layer.ctx.save(); layer.ctx.globalCompositeOperation = 'destination-in'; layer.ctx.drawImage(state.wandMask, nativeSize ? -nativeOffset.x : 0, nativeSize ? -nativeOffset.y : 0); layer.ctx.restore(); } else if (useDiff && beforeSnap) { const diff = _differenceMaskCanvas(beforeSnap, layer.canvas, { threshold: p.diffThreshold, grow: p.diffGrow, feather: p.diffFeather, edgeExcludePx: 0 }); const explicitEdge = p.edgeExcludePx != null ? Number(p.edgeExcludePx) : null; const sceneReplace = diff.changedFraction > 0.5; const edgeExclude = sceneReplace ? 0 : (explicitEdge != null ? explicitEdge : 3); if (edgeExclude > 0) _clearMaskEdgeBand(diff.mask, edgeExclude); layer.ctx.save(); layer.ctx.globalCompositeOperation = 'destination-in'; layer.ctx.drawImage(diff.mask, 0, 0); layer.ctx.restore(); if (sceneReplace) _edgeFillFromInterior(layer.ctx, dw, dh, 3); } if (p.blend) layer.blendMode = p.blend; if (p.opacity != null) layer.opacity = Math.max(0, Math.min(1, Number(p.opacity))); state.layers.push(layer); state.activeLayerId = layer.id; state.selectedLayerIds = [layer.id]; _renderLayerPanel(); composite(); resolve(layer.id); } catch (e) { reject(e); } }; img.onerror = () => reject(new Error('image load failed')); img.src = p.dataUrl; }) },
+          'layers.placeImage': { description: 'Place an image (data URL) as a NEW layer, masked to the current selection when one exists; never overwrites the original. Instruction mode (mode:"instruction" or differenceMask:true) keeps untouched areas pixel-identical via a difference map. {dataUrl,name,masked,blend,opacity,x,y,w,h,mode,differenceMask,diffThreshold,diffGrow,diffFeather}.', run: (p) => new Promise((resolve, reject) => { if (!p || !p.dataUrl) { reject(new Error('dataUrl required')); return; } const img = new Image(); img.onload = () => { try { _saveState(`Place ${p.name || 'image'}`); const dw = state.imgWidth, dh = state.imgHeight; const useDiff = (p.differenceMask === true) || String(p.mode || '').toLowerCase() === 'instruction'; const beforeSnap = useDiff ? flatten() : null; const layer = createLayer(p.name || 'Placed image', dw, dh); let tw = Number(p.w), th = Number(p.h); if (!(tw > 0) || !(th > 0)) { if (useDiff) { tw = dw; th = dh; } else { const scale = Math.min(dw / img.naturalWidth, dh / img.naturalHeight); tw = Math.max(1, Math.round(img.naturalWidth * scale)); th = Math.max(1, Math.round(img.naturalHeight * scale)); } } let tx = Number(p.x), ty = Number(p.y); if (!Number.isFinite(tx)) tx = useDiff ? 0 : Math.round((dw - tw) / 2); if (!Number.isFinite(ty)) ty = useDiff ? 0 : Math.round((dh - th) / 2); layer.ctx.imageSmoothingEnabled = true; layer.ctx.imageSmoothingQuality = 'high'; layer.ctx.drawImage(img, tx, ty, tw, th); if (p.masked !== false && state.wandMask) { layer.ctx.save(); layer.ctx.globalCompositeOperation = 'destination-in'; layer.ctx.drawImage(state.wandMask, 0, 0); layer.ctx.restore(); } else if (useDiff && beforeSnap) { const diff = _differenceMaskCanvas(beforeSnap, layer.canvas, { threshold: p.diffThreshold, grow: p.diffGrow, feather: p.diffFeather, edgeExcludePx: 0 }); const explicitEdge = p.edgeExcludePx != null ? Number(p.edgeExcludePx) : null; const sceneReplace = diff.changedFraction > 0.5; const edgeExclude = sceneReplace ? 0 : (explicitEdge != null ? explicitEdge : 3); if (edgeExclude > 0) _clearMaskEdgeBand(diff.mask, edgeExclude); layer.ctx.save(); layer.ctx.globalCompositeOperation = 'destination-in'; layer.ctx.drawImage(diff.mask, 0, 0); layer.ctx.restore(); if (sceneReplace) _edgeFillFromInterior(layer.ctx, dw, dh, 3); } if (p.blend) layer.blendMode = p.blend; if (p.opacity != null) layer.opacity = Math.max(0, Math.min(1, Number(p.opacity))); state.layers.push(layer); state.activeLayerId = layer.id; state.selectedLayerIds = [layer.id]; _renderLayerPanel(); composite(); resolve(layer.id); } catch (e) { reject(e); } }; img.onerror = () => reject(new Error('image load failed')); img.src = p.dataUrl; }) },
           'layers.addMaskFromSelection': { description: 'Add a layer mask from the current selection (reveals the selection). {invert}.', run: (p) => { const parent = _activeParentLayer(); if (!parent) throw new Error('no layer'); _saveState('Add layer mask'); const mask = _ensureActiveMaskLayer(); if (!mask) throw new Error('could not create mask'); const w = mask.canvas.width, h = mask.canvas.height; const mctx = mask.ctx; const off = state.layerOffsets.get(parent.id) || { x: 0, y: 0 }; const ox = -(off.x || 0), oy = -(off.y || 0); mctx.globalCompositeOperation = 'source-over'; mctx.clearRect(0, 0, w, h); if (state.wandMask) { if (p && p.invert) { mctx.fillStyle = '#fff'; mctx.fillRect(0, 0, w, h); mctx.globalCompositeOperation = 'destination-out'; mctx.drawImage(state.wandMask, ox, oy); mctx.globalCompositeOperation = 'source-over'; } else { mctx.drawImage(state.wandMask, ox, oy); } } else { mctx.fillStyle = (p && p.invert) ? '#000' : '#fff'; mctx.fillRect(0, 0, w, h); } composite(); _renderLayerPanel(); return mask.id; } },
           'layers.removeMask': { description: 'Remove the active layer mask (does not affect pixels).', run: () => { const parent = _activeParentLayer(); if (!parent || !parent.masks || !parent.masks.length) throw new Error('no mask'); _saveState('Remove layer mask'); parent.masks = parent.masks.filter((m) => m.id !== parent.activeMaskId); parent.activeMaskId = parent.masks[0]?.id || null; composite(); _renderLayerPanel(); return true; } },
           'layers.applyMask': { description: 'Bake the active layer mask into the layer alpha and remove the mask.', run: () => { const parent = _activeParentLayer(); const mask = _getActiveMaskLayer(); if (!parent || !parent.ctx || !mask) throw new Error('no mask to apply'); _saveState('Apply layer mask'); _bakeMaskIntoLayer(parent.ctx, mask.canvas, 0, 0); parent.masks = parent.masks.filter((m) => m.id !== mask.id); parent.activeMaskId = parent.masks[0]?.id || null; composite(); _renderLayerPanel(); return true; } },
@@ -12622,7 +12551,7 @@ function _buildEditor(container) {
           'ai.removeObject': { description: 'Remove the selected object and fill naturally. {prompt}.', run: (p) => _aiInpaintSelection((p && p.prompt) || 'remove the object, fill the area naturally') },
           'ai.harmonize': { description: 'Harmonize the layer/selection lighting with the rest of the image; result is a NEW layer. {strength}.', run: async (p) => { const { canvas } = await _aiEditCanvas('/api/image/harmonize', { strength: Number(p && p.strength) || 0.4 }); return _placeResultLayer(canvas, 'Harmonized', state.wandMask || null); } },
           'ai.generativeUpscale': { description: 'Upscale the image 2x/4x; result is a NEW layer. Falls back to a high-quality canvas upscale labelled "basic upscale" when no Real-ESRGAN model is served. {scale}.', run: async (p) => { const scale = Number(p && p.scale) === 4 ? 4 : 2; try { const { canvas } = await _aiEditCanvas('/api/image/upscale-local', { scale }); return _placeResultLayer(canvas, `Upscaled ${scale}x`, null); } catch (e) { const src = flatten(); const c = document.createElement('canvas'); c.width = Math.max(1, Math.round(src.width * scale)); c.height = Math.max(1, Math.round(src.height * scale)); const cx = c.getContext('2d'); cx.imageSmoothingEnabled = true; cx.imageSmoothingQuality = 'high'; cx.drawImage(src, 0, 0, c.width, c.height); _saveState('Upscale (basic)'); _resizeCanvasDocument(state, c.width, c.height, { anchorX: 0, anchorY: 0 }); const layerId = _placeResultLayer(c, `Upscaled ${scale}x (basic upscale)`, null); return { layerId, scale, method: 'basic', reason: String(e && e.message || e) }; } } },
-          'ai.generateImage': { description: 'Generate an image with the saved generation model and fit it proportionally as a new layer. {prompt,width,height}.', run: (p) => _generateImage(p || {}) },
+          'ai.generateImage': { description: 'Generate an image from a prompt (current canvas as reference) and place it as a NEW layer. {prompt,width,height}.', run: async (p) => { const endpoint = (typeof window !== 'undefined' && window.geGenerateImageEndpoint) || '/api/image/generate'; const reference = flatten().toDataURL('image/png').split(',')[1]; const _pickedModel = (() => { try { const v = localStorage.getItem('ge-ai-command-model') || ''; return v.includes('::') ? v.split('::').pop() : ''; } catch (_) { return ''; } })(); const body = { prompt: (p && p.prompt) || '', width: Math.max(1, Math.round(Number(p && p.width) || state.imgWidth)), height: Math.max(1, Math.round(Number(p && p.height) || state.imgHeight)), reference, ...(_pickedModel ? { model: _pickedModel } : {}) }; let _gres = null; try { _gres = await fetch(endpoint, { method: 'POST', credentials: 'same-origin', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) }); } catch (_e) { throw new Error(_generationErrorMessage({ network: true, detail: (_e && _e.message) || 'network error' })); } const res = _gres; if (!res.ok) { let _gd = res.statusText; try { const e = await res.json(); _gd = e.detail || e.error || _gd; } catch (_) {} throw new Error(_generationErrorMessage({ status: res.status, detail: _gd })); } const data = await res.json(); if (data.error) throw new Error(_generationErrorMessage({ detail: data.error })); const b64 = data.image || (Array.isArray(data.images) && data.images[0]); if (!b64) throw new Error('No image returned'); try { window.__geGenerationDisabled = 0; } catch (_) {} const img = await _decodeAIImage(b64, _aiSignal); const c = document.createElement('canvas'); c.width = state.imgWidth; c.height = state.imgHeight; c.getContext('2d').drawImage(img, 0, 0, state.imgWidth, state.imgHeight); return _placeResultLayer(c, 'Generated', state.wandMask || null); } },
           'ai.generativeExpand': { description: 'Generatively expand the canvas to width×height; only the new border is inpainted, the original pixels are kept pixel-identical, and the seam is feathered. {width,height,anchor,prompt}.', run: async (p) => { const tw = Math.max(1, Math.round(Number(p && p.width) || state.imgWidth)); const th = Math.max(1, Math.round(Number(p && p.height) || state.imgHeight)); if (tw <= state.imgWidth && th <= state.imgHeight) throw new Error('target must be larger than the current canvas'); const anchor = (p && p.anchor) || 'center'; const anchorX = anchor === 'left' ? 0 : anchor === 'right' ? 1 : 0.5; const anchorY = anchor === 'top' ? 0 : anchor === 'bottom' ? 1 : 0.5; _saveState('Generative expand'); const steps = Math.max(1, Math.round(Number(p && p.steps) || 4)); const sw = state.imgWidth; const sh = state.imgHeight; _resizeCanvasDocument(state, tw, th, { anchorX, anchorY }); const flat = flatten(); const b = _contentBounds(); const mask = document.createElement('canvas'); mask.width = tw; mask.height = th; const mctx = mask.getContext('2d'); mctx.fillStyle = '#ffffff'; mctx.fillRect(0, 0, tw, th); const prefill = document.createElement('canvas'); prefill.width = tw; prefill.height = th; const pctx = prefill.getContext('2d'); pctx.imageSmoothingEnabled = true; pctx.drawImage(flat, 0, 0, tw, th); if (b) { mctx.clearRect(b.x, b.y, b.w, b.h); const bx = b.x, by = b.y, bw = b.w, bh = b.h, rx = bx + bw, by2 = by + bh; if (bx > 0) pctx.drawImage(flat, bx, by, 1, bh, 0, by, bx, bh); if (rx < tw) pctx.drawImage(flat, rx - 1, by, 1, bh, rx, by, tw - rx, bh); if (by > 0) pctx.drawImage(flat, bx, by, bw, 1, bx, 0, bw, by); if (by2 < th) pctx.drawImage(flat, bx, by2 - 1, bw, 1, bx, by2, bw, th - by2); if (bx > 0 && by > 0) pctx.drawImage(flat, bx, by, 1, 1, 0, 0, bx, by); if (rx < tw && by > 0) pctx.drawImage(flat, rx - 1, by, 1, 1, rx, 0, tw - rx, by); if (bx > 0 && by2 < th) pctx.drawImage(flat, bx, by2 - 1, 1, 1, 0, by2, bx, th - by2); if (rx < tw && by2 < th) pctx.drawImage(flat, rx - 1, by2 - 1, 1, 1, rx, by2, tw - rx, th - by2); } else { const tx = Math.round((tw - sw) * anchorX); const ty = Math.round((th - sh) * anchorY); mctx.clearRect(tx, ty, sw, sh); } const image = prefill.toDataURL('image/png').split(',')[1]; const maskB64 = mask.toDataURL('image/png').split(',')[1]; const res = await fetch('/api/image/inpaint', { method: 'POST', credentials: 'same-origin', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ image, mask: maskB64, prompt: (p && p.prompt) || 'extend the scene seamlessly, continuing the surrounding content and lighting naturally', steps }) }); if (!res.ok) { let err = res.statusText; try { const e = await res.json(); err = e.detail || e.error || err; } catch (_) {} throw new Error(err); } const data = await res.json(); if (data.error) throw new Error(data.error); if (!data.image) throw new Error('No image returned'); const img = await _decodeAIImage(data.image, _aiSignal); const seam = Math.max(12, Math.round(Math.min(tw, th) * 0.02)); let blendMask = _growMaskCanvas(mask, seam, true); blendMask = _featherMaskCanvas((cw, ch) => { const c = document.createElement('canvas'); c.width = cw; c.height = ch; return c; }, blendMask, Math.round(seam * 1.4)); const layer = createLayer('Generative expand', tw, th); layer.ctx.imageSmoothingEnabled = true; layer.ctx.imageSmoothingQuality = 'high'; layer.ctx.drawImage(img, 0, 0, tw, th); if (b) { const edge = _edgeBandAverage(flat, b); if (edge) { layer.ctx.save(); layer.ctx.globalAlpha = 0.14; layer.ctx.fillStyle = `rgb(${edge[0]}, ${edge[1]}, ${edge[2]})`; layer.ctx.fillRect(0, 0, tw, th); layer.ctx.restore(); } } _bakeMaskIntoLayer(layer.ctx, blendMask); state.layers.push(layer); state.activeLayerId = layer.id; state.selectedLayerIds = [layer.id]; composite(); _renderLayerPanel(); return { width: tw, height: th, layerId: layer.id, seam, steps }; } },
           'layers.rename': { description: 'Rename a layer {id|index|name, name|newName}.', run: (p) => { const l = _controlFindLayer(p) || activeLayer(); if (!l) throw new Error('layer not found'); const next = String(p.name || p.newName || '').trim(); if (!next) throw new Error('name required'); _saveState('Rename layer'); l.name = next; _renderLayerPanel(); return l.id; } },
           'layers.setVisibility': { description: 'Show/hide a layer {id|index|name, visible}.', run: (p) => { const l = _controlFindLayer(p) || activeLayer(); if (!l) throw new Error('layer not found'); _saveState('Toggle layer visibility'); l.visible = (p.visible === undefined) ? !l.visible : !!p.visible; composite(); _renderLayerPanel(); return l.visible; } },
@@ -12867,10 +12796,6 @@ function _buildEditor(container) {
         endpoint: window.geEditorAgentEndpoint || '/api/editor/agent',
         getSession: () => agentBridgeSession,
         getModel: () => _getSelectedQuickEditModel(),
-        getGenerationModel: () => {
-          const value = document.getElementById('ge-ai-model')?.value || '';
-          return value.includes('::') ? value.slice(value.indexOf('::') + 2) : '';
-        },
         getAgentModel: () => _getSelectedQuickEditAgentModel(),
       });
     } catch (e) { console.error('[ge-editor] agent init failed', e); }
@@ -13970,12 +13895,6 @@ export function openEditor(imageUrl, imageId, presetSize, displayName, draftId)
         return;
       }
       _finishBlank(size.w, size.h);
-    }).catch(error => {
-      console.error('[openEditor] New project failed:', error);
-      closeEditor({ force: true });
-      window.dispatchEvent(new CustomEvent('gallery-editor-setup-cancelled'));
-      uiModule.showError(`Could not create project: ${error?.message || 'Canvas initialization failed'}`);
-      throw error;
     });
   }
 
@@ -14130,6 +14049,8 @@ export function closeEditor(options = {}) {
   _selectionNudgeTimer = null;
   _selectionNudgeHistorySaved = false;
   _precisionGuides = null;
+  try { _preflight?.destroy(); } catch {}
+  _preflight = null;
   try { _aiSettings?.destroy(); } catch {}
   _aiSettings = null;
   try { delete window.geEditorAiSettings; } catch (_) { window.geEditorAiSettings = null; }
@@ -14140,20 +14061,7 @@ export function closeEditor(options = {}) {
     const h = state.editorDocClickHandlers.pop();
     try { document.removeEventListener('click', h); } catch {}
   }
-  if (_cursorRaf) { cancelAnimationFrame(_cursorRaf); _cursorRaf = null; }
-  _pendingCursorEvent = null;
-  _lastCursorRect = null;
-  state._lastCursorDiameterX = null;
-  state._lastCursorDiameterY = null;
-  state._lastCursorBorderColor = null;
-  if (state.cursorEl) {
-    if (state.cursorEl._positionAnimation) {
-      try { state.cursorEl._positionAnimation.cancel(); } catch {}
-      state.cursorEl._positionAnimation = null;
-    }
-    state.cursorEl.remove();
-    state.cursorEl = null;
-  }
+  if (state.cursorEl) { state.cursorEl.remove(); state.cursorEl = null; }
   try { document.getElementById('ge-cursor-layer')?.remove(); } catch {}
   // Tear down all floating popups + the dock so closing the editor
   // doesn't leave stale chips/panels behind on top of the gallery.

static/js/group.js

@@ -801,8 +801,7 @@ async function _sendRoundRobin(msg, box) {
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({ messages: [{
               role: 'user',
-              content: `[${m._groupName || m.display}]: ${response}`,
-              metadata: { group_peer: true, group_model: m._groupName || m.display, model: m.mid }
+              content: `[${m._groupName || m.display}]: ${response}`
             }]}),
           });
         } catch (e) { console.warn('[group] sync failed:', e); }
@@ -829,8 +828,7 @@ async function _syncAllResponses(holders) {
           headers: { 'Content-Type': 'application/json' },
           body: JSON.stringify({ messages: [{
             role: 'user',
-            content: `[${model._groupName || model.display}]: ${response}`,
-            metadata: { group_peer: true, group_model: model._groupName || model.display, model: model.mid }
+            content: `[${model._groupName || model.display}]: ${response}`
           }]}),
         });
       } catch (e) { /* silent */ }

static/js/memory.js

@@ -163,13 +163,11 @@ function buildCategoryChips() {
   const container = document.getElementById('memory-category-filters');
   if (!container) return;
 
-  const cats = new Set(memories.map(m => m.category || 'fact'));
-  if (activeCategory !== 'all' && !cats.has(activeCategory)) activeCategory = 'all';
-
   // Hide the chip row entirely when there are no memories — no point showing
   // an "all" chip with nothing to filter.
   if (!memories.length) { container.innerHTML = ''; return; }
 
+  const cats = new Set(memories.map(m => m.category || 'fact'));
   const sorted = ['all', ...Array.from(cats).sort()];
   const counts = memories.reduce((result, memory) => {
     const category = memory.category || 'fact';
@@ -279,7 +277,6 @@ export function openMemoryModal(tabName = 'browse') {
       else if (m.default?.loadSkills) m.default.loadSkills(true);
     });
   }
-  if (mode === 'memory') return loadMemories();
 }
 
 function _decodeMemoryAnchorId(memoryId) {
@@ -300,8 +297,9 @@ function _resetMemoryDeepLinkFilters() {
 // Memory search output may expose a shortened id, so prefix matching is
 // intentional here.
 export async function openMemory(memoryId, attempt = 0) {
+  openMemoryModal('browse');
   _resetMemoryDeepLinkFilters();
-  await openMemoryModal('browse');
+  await loadMemories();
   if (renderMemoryList) renderMemoryList();
   const wanted = _decodeMemoryAnchorId(memoryId);
   if (!wanted) return;

static/js/sessions.js

@@ -299,18 +299,7 @@ function _renderHistoryMessage(msg, modelName) {
   } else {
     displayContent = '';
   }
-  let displayRole = msg.role;
-  // Peer turns remain user-role context for the model, but are agent replies
-  // in history. Only explicit identity plus its exact prefix can opt in.
-  if (displayRole === 'user' && meta?.group_peer === true
-      && typeof meta.group_model === 'string' && meta.group_model) {
-    const prefix = `[${meta.group_model}]: `;
-    if (displayContent.startsWith(prefix)) {
-      displayRole = 'assistant';
-      displayContent = displayContent.slice(prefix.length);
-    }
-  }
-  if (displayRole === 'user') {
+  if (msg.role === 'user') {
     displayContent = _stripUserVisionBlocks(displayContent);
     const trimmed = displayContent.trim();
     if (
@@ -327,7 +316,7 @@ function _renderHistoryMessage(msg, modelName) {
       displayContent = `[Doc edit: ${docEditMatch[1]}] ${docEditMatch[3]}`;
     }
   }
-  return _addHistoryMessageWithFullRenderer(displayRole, displayContent, modelName, meta);
+  return _addHistoryMessageWithFullRenderer(msg.role, displayContent, modelName, meta);
 }
 
 function _clearHistoryPager() {

static/js/settings/imageModels.js

@@ -4,14 +4,12 @@
 // them from the same places, so load order and init sequence are untouched.
 
 import { byId as el } from './dom.js';
-import { saveImagePreferences as _postSettings, readImagePreferences } from './imagePreferences.js';
+import { postSettings as _postSettings } from './api.js';
 import { modelCaps } from '../editor/ai-models.js';
 import { sortModelIds } from '../modelSort.js';
-let preferencesListener = null;
 
 export async function initImageSettings() {
   const modelSel = el('set-imgModelSelect');
-  const editModelSel = el('set-imgEditModelSelect');
   const qualSel = el('set-imgQualitySelect');
   const msg = el('set-imgSettingsMsg');
   const enabledToggle = el('set-imgEnabledToggle');
@@ -20,41 +18,25 @@ export async function initImageSettings() {
     const endpointsRes = await fetch('/api/model-endpoints', { credentials: 'same-origin' });
     const endpoints = await endpointsRes.json();
     const imageModels = new Set();
-    const editModels = new Set();
     (Array.isArray(endpoints) ? endpoints : []).forEach(endpoint => {
       if (!endpoint.is_enabled || !endpoint.online) return;
       (Array.isArray(endpoint.models) ? endpoint.models : []).forEach(modelId => {
         if (modelId && modelCaps(modelId, '', endpoint.model_type).gen) imageModels.add(String(modelId));
-        if (modelId && modelCaps(modelId, '', endpoint.model_type).inpaint) editModels.add(String(modelId));
       });
     });
-    modelSel.length = 1;
     sortModelIds(Array.from(imageModels)).forEach(mid => {
       const opt = document.createElement('option');
       opt.value = mid;
       opt.textContent = mid;
       modelSel.appendChild(opt);
     });
-    if (editModelSel) {
-      editModelSel.length = 1;
-      for (const mid of sortModelIds(Array.from(editModels))) {
-        const option = document.createElement('option');
-        option.value = mid;
-        option.textContent = mid;
-        editModelSel.appendChild(option);
-      }
-    }
   } catch (e) { console.warn('Failed to load models for image settings', e); }
-  let currentEnabled = enabledToggle ? enabledToggle.checked : false;
   try {
-    const settings = await readImagePreferences();
-    if (modelSel && 'image_model' in settings) modelSel.value = settings.image_model || '';
-    if (editModelSel && 'image_edit_model' in settings) editModelSel.value = settings.image_edit_model || '';
-    if (qualSel && 'image_quality' in settings) qualSel.value = settings.image_quality || 'medium';
-    if (enabledToggle) {
-      enabledToggle.checked = settings.image_gen_enabled === true;
-      currentEnabled = enabledToggle.checked;
-    }
+    const settingsRes = await fetch('/api/auth/settings', { credentials: 'same-origin' });
+    const settings = await settingsRes.json();
+    if (settings.image_model) modelSel.value = settings.image_model;
+    if (settings.image_quality) qualSel.value = settings.image_quality;
+    if (enabledToggle) enabledToggle.checked = settings.image_gen_enabled === true;
   } catch (e) { console.warn('Failed to load settings', e); }
 
   function syncImgDisabled() {
@@ -65,115 +47,14 @@ export async function initImageSettings() {
   }
   syncImgDisabled();
 
-  function checkIsAdmin() {
-    return typeof window !== 'undefined' && !!window._isAdmin;
-  }
-
-  function applyAdminToggleState() {
-    if (!enabledToggle) return;
-    const admin = checkIsAdmin();
-    if (!admin) {
-      enabledToggle.disabled = true;
-      const adminTitle = 'Admin access is required to change image generation availability.';
-      enabledToggle.title = adminTitle;
-      if (enabledToggle.parentElement) enabledToggle.parentElement.title = adminTitle;
-    } else {
-      enabledToggle.disabled = false;
-      const adminTitle = 'Enable or disable image generation globally';
-      enabledToggle.title = adminTitle;
-      if (enabledToggle.parentElement) enabledToggle.parentElement.title = adminTitle;
-    }
-  }
-  applyAdminToggleState();
-
-  async function saveModelPreferences() {
+  async function saveSettings() {
     try {
-      const res = await _postSettings({
-        image_model: modelSel ? modelSel.value : '',
-        image_edit_model: editModelSel?.value || '',
-        image_quality: qualSel ? qualSel.value : 'medium',
-      });
+      const res = await _postSettings({ image_gen_enabled: enabledToggle ? enabledToggle.checked : false, image_model: modelSel.value, image_quality: qualSel.value });
       if (!res.ok) throw new Error(await res.text().catch(() => `HTTP ${res.status}`));
       msg.textContent = 'Saved'; msg.style.color = 'var(--fg)'; setTimeout(() => { msg.textContent = ''; }, 2000);
-    } catch (e) {
-      if (e.globalSaved) {
-        msg.textContent = 'Policy saved, but failed to clear preferences: ' + (e.message || 'cleanup error');
-        msg.style.color = 'var(--red)';
-      } else {
-        msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
-        msg.style.color = 'var(--red)';
-      }
-    }
+    } catch (e) { msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save'; msg.style.color = 'var(--red)'; }
   }
-
-  async function saveToggle() {
-    if (!checkIsAdmin()) {
-      if (enabledToggle) enabledToggle.checked = currentEnabled;
-      syncImgDisabled();
-      msg.textContent = 'Admin access is required to change these settings.';
-      msg.style.color = 'var(--red)';
-      return;
-    }
-    const targetState = enabledToggle ? enabledToggle.checked : false;
-    try {
-      const res = await _postSettings({ image_gen_enabled: targetState });
-      if (!res.ok) throw new Error(await res.text().catch(() => `HTTP ${res.status}`));
-      if (enabledToggle) currentEnabled = enabledToggle.checked;
-      msg.textContent = 'Saved'; msg.style.color = 'var(--fg)'; setTimeout(() => { msg.textContent = ''; }, 2000);
-    } catch (e) {
-      if (e.globalSaved) {
-        currentEnabled = targetState;
-        try {
-          const authSettings = await readImagePreferences();
-          if (typeof authSettings.image_gen_enabled === 'boolean') {
-            currentEnabled = authSettings.image_gen_enabled;
-          }
-        } catch (_) {}
-        if (enabledToggle) enabledToggle.checked = currentEnabled;
-        syncImgDisabled();
-        msg.textContent = 'Policy saved, but failed to clear preferences: ' + (e.message || 'cleanup error');
-        msg.style.color = 'var(--red)';
-      } else {
-        try {
-          const authSettings = await readImagePreferences();
-          if (typeof authSettings.image_gen_enabled === 'boolean') {
-            currentEnabled = authSettings.image_gen_enabled;
-          }
-        } catch (_) {}
-        if (enabledToggle) enabledToggle.checked = currentEnabled;
-        syncImgDisabled();
-        msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save';
-        msg.style.color = 'var(--red)';
-      }
-    }
-  }
-
-  if (modelSel) modelSel.addEventListener('change', saveModelPreferences);
-  if (editModelSel) editModelSel.addEventListener('change', saveModelPreferences);
-  if (qualSel) qualSel.addEventListener('change', saveModelPreferences);
-  if (enabledToggle) {
-    enabledToggle.addEventListener('change', async function() {
-      if (!checkIsAdmin()) {
-        enabledToggle.checked = currentEnabled;
-        syncImgDisabled();
-        msg.textContent = 'Admin access is required to change these settings.';
-        msg.style.color = 'var(--red)';
-        return;
-      }
-      syncImgDisabled();
-      await saveToggle();
-    });
-  }
-
-  if (preferencesListener) window.removeEventListener('image-preferences-changed', preferencesListener);
-  preferencesListener = event => {
-    if ('image_model' in event.detail && modelSel) modelSel.value = event.detail.image_model || '';
-    if (editModelSel && 'image_edit_model' in event.detail) editModelSel.value = event.detail.image_edit_model || '';
-    if ('image_gen_enabled' in event.detail && enabledToggle) {
-      enabledToggle.checked = event.detail.image_gen_enabled === true;
-      currentEnabled = enabledToggle.checked;
-      syncImgDisabled();
-    }
-  };
-  window.addEventListener('image-preferences-changed', preferencesListener);
+  modelSel.addEventListener('change', saveSettings);
+  qualSel.addEventListener('change', saveSettings);
+  if (enabledToggle) enabledToggle.addEventListener('change', function() { syncImgDisabled(); saveSettings(); });
 }

static/js/settings/imagePreferences.js

@@ -1,107 +0,0 @@
-import { invalidateSettings } from '../appConfig.js';
-
-const USER_PREFERENCE_KEYS = ['image_model', 'image_edit_model', 'image_quality'];
-
-export async function readImagePreferences() {
-  const [prefsRes, settingsRes] = await Promise.all([
-    fetch('/api/prefs', { credentials: 'same-origin' }).catch(() => null),
-    fetch('/api/auth/settings', { credentials: 'same-origin' }).catch(() => null),
-  ]);
-  const prefs = (prefsRes && prefsRes.ok) ? await prefsRes.json().catch(() => ({})) : {};
-  const settings = (settingsRes && settingsRes.ok) ? await settingsRes.json().catch(() => ({})) : {};
-  if (!prefsRes?.ok && !settingsRes?.ok) throw new Error('Could not load image settings');
-  return {
-    ...settings,
-    image_model: prefs?.image_model || settings?.image_model || '',
-    image_edit_model: prefs?.image_edit_model || settings?.image_edit_model || '',
-    image_quality: prefs?.image_quality || settings?.image_quality || 'medium',
-  };
-}
-
-let saveQueue = Promise.resolve();
-export function waitForImagePreferences() { return saveQueue; }
-export function saveImagePreferences(patch) {
-  const save = async () => {
-    let response;
-    try {
-      response = await fetch('/api/auth/settings', {
-        method: 'POST', credentials: 'same-origin',
-        headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(patch),
-      });
-    } catch (netErr) {
-      invalidateSettings();
-      netErr.globalSaved = false;
-      throw netErr;
-    }
-    invalidateSettings();
-    if (response.status === 403) {
-      const userEntries = Object.entries(patch).filter(([k]) => USER_PREFERENCE_KEYS.includes(k));
-      if (userEntries.length === 0) {
-        const err = new Error('Admin access is required to change these settings.');
-        err.status = 403;
-        err.globalSaved = false;
-        throw err;
-      }
-      for (const [key, value] of userEntries) {
-        const prefRes = await fetch(`/api/prefs/${encodeURIComponent(key)}`, {
-          method: 'PUT', credentials: 'same-origin',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ value }),
-        });
-        if (!prefRes.ok) {
-          const err = new Error(await prefRes.text().catch(() => 'Could not save image preferences'));
-          err.status = prefRes.status;
-          err.globalSaved = false;
-          throw err;
-        }
-      }
-      response = typeof Response !== 'undefined'
-        ? new Response(JSON.stringify({ ok: true }), { status: 200, headers: { 'Content-Type': 'application/json' } })
-        : { ok: true, status: 200, json: async () => ({ ok: true }), text: async () => '{"ok":true}' };
-    } else if (response.ok) {
-      const clearResults = await Promise.all(USER_PREFERENCE_KEYS.map(async key => {
-        try {
-          const res = await fetch(`/api/prefs/${encodeURIComponent(key)}`, {
-            method: 'PUT', credentials: 'same-origin',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ value: null }),
-          });
-          if (!res.ok) {
-            const err = new Error(await res.text().catch(() => `HTTP ${res.status}`));
-            err.status = res.status;
-            return { ok: false, error: err };
-          }
-          return { ok: true };
-        } catch (err) {
-          return { ok: false, error: err };
-        }
-      }));
-      const failure = clearResults.find(r => !r.ok);
-      if (failure) {
-        invalidateSettings();
-        if (typeof window !== 'undefined' && typeof CustomEvent !== 'undefined') {
-          window.dispatchEvent(new CustomEvent('image-preferences-changed', { detail: patch }));
-        }
-        const err = new Error(failure.error?.message || 'Could not clear personal preferences');
-        err.status = failure.error?.status || 500;
-        err.cause = failure.error;
-        err.globalSaved = true;
-        err.phase = 'cleanup';
-        throw err;
-      }
-    } else {
-      const err = new Error('Could not save image settings');
-      err.status = response.status;
-      err.globalSaved = false;
-      throw err;
-    }
-    invalidateSettings();
-    if (typeof window !== 'undefined' && typeof CustomEvent !== 'undefined') {
-      window.dispatchEvent(new CustomEvent('image-preferences-changed', { detail: patch }));
-    }
-    return response;
-  };
-  const result = saveQueue.then(save);
-  saveQueue = result.catch(() => {});
-  return result;
-}

static/js/skills.js

@@ -1260,9 +1260,6 @@ async function _expandSkillCard(card, name) {
       card._md = md || '';
     } else {
       pre.textContent = 'Loading…';
-      const editBtn = [...card.querySelectorAll('.skill-card-preview button')]
-        .find(button => button.textContent.trim() === 'Edit');
-      if (editBtn) editBtn.disabled = true;
       try {
         const md = await _fetchSkillMarkdown(name);
         pre.textContent = md || '(empty)';
@@ -1270,8 +1267,6 @@ async function _expandSkillCard(card, name) {
         card._md = md;
       } catch (e) {
         pre.textContent = `Failed to load SKILL.md: ${e.message || 'Unknown error'}`;
-      } finally {
-        if (editBtn) editBtn.disabled = !card._mdLoaded;
       }
     }
   }
@@ -1280,9 +1275,6 @@ async function _expandSkillCard(card, name) {
 // Swap the read-only <pre> for an editable <textarea> (and back). The
 // Edit button toggles; a Save button commits via the markdown endpoint.
 function _toggleSkillEdit(card, name) {
-  // A loading/error preview is not source text. Menu entry points must obey
-  // the same readiness gate as the disabled footer control.
-  if (!card._mdLoaded) return;
   const preview = card.querySelector('.skill-card-preview');
   if (!preview) return;
   const existing = preview.querySelector('.skill-md-editor');
@@ -1296,9 +1288,6 @@ function _toggleSkillEdit(card, name) {
   ta.className = 'skill-md-editor';
   ta.spellcheck = false;
   ta.value = (card._md != null ? card._md : (pre ? pre.textContent : '')) || '';
-  // Let the source set the intrinsic height; the card's existing flex/max
-  // height keeps long files bounded and the Save footer reachable.
-  ta.rows = Math.max(ta.rows, ta.value.split(/\r\n|\r|\n/).length);
   ta.addEventListener('click', (e) => e.stopPropagation());
   if (pre) pre.style.display = 'none';
   preview.insertBefore(ta, preview.querySelector('.doclib-card-expanded-actions'));

static/sw.js

@@ -7,7 +7,7 @@
 //   - Other static assets (images/fonts/libs): cache-first with bg refresh.
 //   - API / non-GET: never cached.
 // Bump CACHE_NAME whenever the precache list or SW logic changes.
-const CACHE_NAME = 'odysseus-v1134-pr40-editor-precache';
+const CACHE_NAME = 'odysseus-v1114-pr40-editor-precache';
 
 // KaTeX resolves these from its own stylesheet, so caching the CSS without them
 // gives offline math fallback glyphs instead of proper typesetting.
@@ -38,7 +38,6 @@ const KATEX_FONTS = [
 // Both are fetched at install time, in the background. Entries must match the
 // exact URL the browser requests, query string included.
 const PRECACHE = [
-  '/static/js/compare/sse.js',
   '/',
   '/static/css/00-tokens.css?v=20260929csssplit',
   '/static/css/01-agent-chat.css?v=20260929csssplit',
@@ -237,10 +236,6 @@ const PANEL_PRECACHE = [
   '/static/js/editor/aspect-fit.js',
   '/static/js/editor/preflight.js',
   '/static/js/editor/ai-settings.js',
-  '/static/js/editor/image-generation.js',
-  '/static/js/editor/image-result-geometry.js',
-  '/static/js/editor/quick-edit-job.js',
-  '/static/js/settings/imagePreferences.js',
   '/static/js/editor/look-recipes.js',
   '/static/js/editor/editor-control.js',
   '/static/js/editor/editor-bridge.js',

tests/cli/test_gallery_cli_tag_filters.py

@@ -1,67 +0,0 @@
-"""Gallery CLI tag filters match both sources and stack like the web library."""
-from datetime import datetime, timedelta
-
-import pytest
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-
-from core.database import Base, GalleryAlbum, GalleryImage
-from tests.helpers.cli_loader import load_script
-
-
-@pytest.fixture
-def gallery_cli(monkeypatch, tmp_path):
-    engine = create_engine(f"sqlite:///{tmp_path / 'gallery.db'}")
-    Base.metadata.create_all(engine)
-    sessions = sessionmaker(bind=engine)
-    with sessions() as db:
-        db.add(GalleryAlbum(id='sea', name='Sea'))
-        for index, (uid, tags, ai_tags, favorite, album) in enumerate([
-            ('manual', 'sunset,beach', '', True, 'sea'),
-            ('ai', '', 'Beach,sunset', False, 'sea'),
-            ('split', 'sunset', 'beach', True, None),
-            ('one', 'sunset', '', False, None),
-            ('other', 'forest', 'moss', False, None),
-            ('inactive', 'sunset,beach', 'sunset,beach', True, 'sea'),
-        ]):
-            db.add(GalleryImage(id=uid, filename=uid+'.png', tags=tags, ai_tags=ai_tags,
-                                favorite=favorite, album_id=album, is_active=uid!='inactive',
-                                created_at=datetime(2026, 1, 1) + timedelta(minutes=index)))
-        db.commit()
-    cli = load_script('odysseus-gallery')
-    monkeypatch.setattr(cli, 'SessionLocal', sessions)
-    output = []
-    monkeypatch.setattr(cli, 'emit', lambda rows, args: output.extend(rows))
-
-    def run(*argv):
-        output.clear()
-        args = cli._build_parser().parse_args(['list', *argv])
-        args.func(args)
-        return [row['id'] for row in output]
-
-    yield run
-    engine.dispose()
-
-
-@pytest.mark.parametrize('tag,expected', [
-    ('sunset', ['one', 'split', 'ai', 'manual']),
-    ('beach,sunset', ['split', 'ai', 'manual']),
-    ('sunset,beach', ['split', 'ai', 'manual']),
-    (', sunset, , BEACH ,', ['split', 'ai', 'manual']),
-    ('forest', ['other']),
-    ('no-match', []),
-    (' , ', ['other', 'one', 'split', 'ai', 'manual']),
-    ('sun', ['one', 'split', 'ai', 'manual']),
-])
-def test_tag_sources_and_stacking(gallery_cli, tag, expected):
-    assert gallery_cli('--tag', tag) == expected
-
-
-@pytest.mark.parametrize('options,expected', [
-    ([], ['other', 'one', 'split', 'ai', 'manual']),
-    (['--tag', 'beach,sunset', '--favorites'], ['split', 'manual']),
-    (['--tag', 'beach,sunset', '--album', 'Sea'], ['ai', 'manual']),
-    (['--tag', 'beach', '--limit', '1'], ['split']),
-])
-def test_tag_filters_preserve_other_list_options(gallery_cli, options, expected):
-    assert gallery_cli(*options) == expected

tests/cli/test_mail_cli_date_order.py

@@ -1,66 +0,0 @@
-"""The bounded arrival batch is displayed by Date, rather than arrival ID."""
-from contextlib import contextmanager
-from types import SimpleNamespace
-
-import pytest
-from tests.cli.test_mail_cli_read_empty_fetch import _load_mail_cli
-
-
-@pytest.mark.parametrize('dates,expected', [
-    (['Wed, 03 Jun 2026 12:00:00 +0000', 'Mon, 01 Jun 2026 09:00:00 +0000'], ['1', '2']),
-    (['Wed, 03 Jun 2026 12:00:00 +0000', 'Wed, 03 Jun 2026 13:00:00 +0200'], ['1', '2']),
-    (['Wed, 03 Jun 2026 12:00:00', 'Wed, 03 Jun 2026 11:00:00 +0000'], ['1', '2']),
-    (['Wed, 03 Jun 2026 12:00:00 +0000', None, 'not a date'], ['1', '3', '2']),
-    (['Wed, 03 Jun 2026 12:00:00 +0000', 'Wed, 03 Jun 2026 14:00:00 +0200'], ['2', '1']),
-    (['Wed, 03 Jun 2026 12:00:00 +0000', 'Thu, 04 Jun 2026 12:00:00 +0000'], ['2', '1']),
-    (['Wed, 31 Dec 1969 12:00:00 +0000', None], ['1', '2']),
-])
-def test_list_sorts_parsed_dates_without_changing_row_schema(monkeypatch, dates, expected):
-    cli = _load_mail_cli(monkeypatch)
-    fetched = []
-
-    class Connection:
-        def select(self, folder, readonly=True):
-            assert readonly is True
-            return 'OK', [str(len(dates)).encode()]
-
-        def search(self, *_):
-            return 'OK', [' '.join(str(i+1) for i in range(len(dates))).encode()]
-
-        def fetch(self, uid, _):
-            fetched.append(uid.decode())
-            date = dates[int(uid)-1]
-            raw = 'From: Sender <sender@example.com>\r\nSubject: Item '+uid.decode()+'\r\n'
-            if date is not None:
-                raw += 'Date: '+date+'\r\n'
-            return 'OK', [(b'1 (FLAGS (\\Seen) RFC822.HEADER)', (raw+'\r\n').encode())]
-
-    @contextmanager
-    def imap(_):
-        yield Connection()
-
-    rows = []
-    monkeypatch.setattr(cli, '_imap', imap)
-    monkeypatch.setattr(cli, 'emit', lambda value, args: rows.extend(value))
-    cli.cmd_list(SimpleNamespace(account='fixture', folder='INBOX', limit=20))
-    assert [row['uid'] for row in rows] == expected
-    assert fetched == [str(i) for i in range(len(dates), 0, -1)]
-    assert all(set(row) == {'uid', 'date', 'from_addr', 'from_name', 'subject', 'is_read', 'is_answered'} for row in rows)
-    assert all(row['is_read'] and not row['is_answered'] for row in rows)
-
-
-def test_list_still_limits_the_arrival_batch(monkeypatch):
-    cli = _load_mail_cli(monkeypatch)
-    fetched = []
-    class Connection:
-        def select(self, *_args, **_kwargs):return 'OK', []
-        def search(self, *_):return 'OK', [b'1 2 3']
-        def fetch(self, uid, _):
-            fetched.append(uid)
-            return 'OK', [(b'3 (FLAGS () RFC822.HEADER)', b'From: x@example.com\r\nSubject: bounded\r\n\r\n')]
-    @contextmanager
-    def imap(_):yield Connection()
-    monkeypatch.setattr(cli, '_imap', imap)
-    monkeypatch.setattr(cli, 'emit', lambda *_:None)
-    cli.cmd_list(SimpleNamespace(account='fixture', folder='INBOX', limit=1))
-    assert fetched == [b'3']

tests/e2e/photo-editor/brush-cursor.spec.js

@@ -46,480 +46,3 @@ test('brush cursor matches the rendered brush diameter and replaces the crosshai
   await expect.poll(async () => (await cursor.boundingBox()).width)
     .toBeCloseTo(measurements.expectedWidth * 2, 1);
 });
-
-
-test('brush cursor follows the pointer before, during, and after a stroke and cancels animations on close', async ({ page }) => {
-  await openBlankEditor(page, { width: 400, height: 300 });
-  await selectTool(page, 'brush');
-  const canvas = await page.locator('.ge-main-canvas').boundingBox();
-  const cursor = page.locator('.ge-brush-cursor');
-  const checkCenter = async (x, y) => {
-    await expect.poll(async () => {
-      const box = await cursor.boundingBox();
-      return box ? Math.max(Math.abs(box.x + box.width / 2 - x), Math.abs(box.y + box.height / 2 - y)) : Infinity;
-    }).toBeLessThan(1);
-  };
-  const a = { x: canvas.x + canvas.width * 0.3, y: canvas.y + canvas.height * 0.4 };
-  const b = { x: canvas.x + canvas.width * 0.7, y: canvas.y + canvas.height * 0.6 };
-  await page.mouse.move(a.x, a.y);
-  await checkCenter(a.x, a.y);
-  await page.mouse.down();
-  await page.mouse.move(b.x, b.y, { steps: 8 });
-  await checkCenter(b.x, b.y);
-  await page.mouse.up();
-  await page.mouse.move(a.x, a.y);
-  await checkCenter(a.x, a.y);
-
-  // 1. Ensure at least one animation exists before checking cancellation
-  // 2. Verify the actual cursor-position animation is paused while active
-  const activeAnimation = await page.evaluate(() => {
-    const cursorEl = document.querySelector('.ge-brush-cursor');
-    const anims = cursorEl ? cursorEl.getAnimations() : [];
-    return {
-      count: anims.length,
-      hasPositionAnim: Boolean(cursorEl?._positionAnimation),
-      positionAnimPaused: cursorEl?._positionAnimation?.playState === 'paused',
-      positionAnimCurrentTime: cursorEl?._positionAnimation?.currentTime,
-      allPaused: anims.length > 0 && anims.every(a => a.playState === 'paused'),
-    };
-  });
-  expect(activeAnimation.count).toBeGreaterThanOrEqual(1);
-  expect(activeAnimation.hasPositionAnim).toBe(true);
-  expect(activeAnimation.positionAnimPaused).toBe(true);
-  expect(activeAnimation.positionAnimCurrentTime).toBe(0);
-  expect(activeAnimation.allPaused).toBe(true);
-
-  // 3. Verify it is canceled when the editor closes
-  // 4. Ensure temporary test-only references are cleaned up
-  const closeOutcome = await page.evaluate(async () => {
-    const cursorEl = document.querySelector('.ge-brush-cursor');
-    const anims = cursorEl ? cursorEl.getAnimations() : [];
-    const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
-    editor.closeEditor({ force: true });
-    return {
-      trackedCount: anims.length,
-      allIdle: anims.length > 0 && anims.every(a => a.playState === 'idle'),
-      states: anims.map(a => a.playState),
-    };
-  });
-  await expect(cursor).toHaveCount(0);
-  expect(closeOutcome.trackedCount).toBeGreaterThanOrEqual(1);
-  expect(closeOutcome.allIdle).toBe(true);
-  expect(closeOutcome.states.every(s => s === 'idle')).toBe(true);
-
-  // Verify no temporary references linger on window
-  const windowClean = await page.evaluate(() => {
-    return !('__cursorAnimationsForTest' in window) && !('__styleTransformMutations' in window);
-  });
-  expect(windowClean).toBe(true);
-});
-
-
-test('steady pointer movement does not perform repeated inline style-transform writes', async ({ page }) => {
-  await openBlankEditor(page, { width: 400, height: 300 });
-  await selectTool(page, 'brush');
-
-  const canvas = await page.locator('.ge-main-canvas').boundingBox();
-  const cursor = page.locator('.ge-brush-cursor');
-
-  // Warm up the cursor first: move pointer onto canvas
-  const startX = canvas.x + canvas.width * 0.25;
-  const startY = canvas.y + canvas.height * 0.25;
-  await page.mouse.move(startX, startY);
-  await expect(cursor).toBeVisible();
-
-  // Observe style attribute mutations during steady pointer movement.
-  // Brush size, color, and mode remain unchanged throughout.
-  await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    window.__styleMutationRecords = [];
-    const observer = new MutationObserver((mutations) => {
-      for (const m of mutations) {
-        if (m.type === 'attributes' && m.attributeName === 'style') {
-          const oldStyle = m.oldValue || '';
-          const currentStyle = el.getAttribute('style') || '';
-          // Track mutations where style-transform was written inline
-          if (el.style.transform || currentStyle.includes('transform:') || oldStyle.includes('transform:')) {
-            window.__styleMutationRecords.push({
-              oldStyle,
-              currentStyle,
-              inlineTransform: el.style.transform,
-            });
-          }
-        }
-      }
-    });
-    observer.observe(el, { attributes: true, attributeFilter: ['style'], attributeOldValue: true });
-    window.__styleMutationObserver = observer;
-  });
-
-  // Preserve actual mouse interactions: steady movement across 10 steps
-  const endX = canvas.x + canvas.width * 0.75;
-  const endY = canvas.y + canvas.height * 0.75;
-  await page.mouse.move(endX, endY, { steps: 10 });
-
-  // Confirm the cursor accurately tracked the pointer
-  await expect.poll(async () => {
-    const box = await cursor.boundingBox();
-    return box ? Math.max(Math.abs(box.x + box.width / 2 - endX), Math.abs(box.y + box.height / 2 - endY)) : Infinity;
-  }).toBeLessThan(1);
-
-  // Collect observation results and clean up observer and globals
-  const { mutationCount, inlineTransform, animCount } = await page.evaluate(() => {
-    window.__styleMutationObserver?.disconnect();
-    delete window.__styleMutationObserver;
-    const records = window.__styleMutationRecords || [];
-    delete window.__styleMutationRecords;
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      mutationCount: records.length,
-      inlineTransform: el?.style.transform || '',
-      animCount: el?.getAnimations?.().length || 0,
-    };
-  });
-
-  // The optimized implementation uses paused Web Animations keyframes, avoiding repeated
-  // inline style-transform writes that trigger expensive :has() document invalidations.
-  expect(mutationCount).toBe(0);
-  expect(inlineTransform).toBe('');
-  expect(animCount).toBeGreaterThanOrEqual(1);
-});
-
-
-test('cross-tool cursor positioning, sizing, and styling across brush, eraser, pixel, lasso, inpaint, liquify, and clone', async ({ page }) => {
-  await openBlankEditor(page, { width: 400, height: 300 });
-  const canvas = await page.locator('.ge-main-canvas').boundingBox();
-  const cursor = page.locator('.ge-brush-cursor');
-
-  const checkCenter = async (x, y) => {
-    await expect.poll(async () => {
-      const box = await cursor.boundingBox();
-      return box ? Math.max(Math.abs(box.x + box.width / 2 - x), Math.abs(box.y + box.height / 2 - y)) : Infinity;
-    }).toBeLessThan(1);
-  };
-
-  const midX = canvas.x + canvas.width / 2;
-  const midY = canvas.y + canvas.height / 2;
-
-  // 1. Brush tool
-  await selectTool(page, 'brush');
-  await page.mouse.move(midX, midY);
-  await expect(cursor).toBeVisible();
-  await checkCenter(midX, midY);
-  let props = await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      isPixel: el.classList.contains('ge-brush-cursor--pixel'),
-      display: el.style.display,
-      borderStyle: el.style.borderStyle,
-    };
-  });
-  expect(props.isPixel).toBe(false);
-  expect(props.display).toBe('block');
-
-  // 2. Eraser tool
-  await selectTool(page, 'eraser');
-  await page.mouse.move(midX + 10, midY + 10);
-  await checkCenter(midX + 10, midY + 10);
-  props = await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      borderColor: el.style.borderColor,
-      isPixel: el.classList.contains('ge-brush-cursor--pixel'),
-    };
-  });
-  expect(props.borderColor).toBe('rgba(255, 255, 255, 0.6)');
-  expect(props.isPixel).toBe(false);
-
-  // 3. Pixel brush (via tool / preset)
-  await page.evaluate(async () => {
-    const { state } = await import('/static/js/editor/state.js');
-    state.tool = 'pixel';
-    state.brushPixel = true;
-    state.brushSize = 16;
-  });
-  await page.mouse.move(midX - 10, midY - 10);
-  await checkCenter(midX - 10, midY - 10);
-  props = await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      isPixel: el.classList.contains('ge-brush-cursor--pixel'),
-      width: parseFloat(el.style.width),
-    };
-  });
-  expect(props.isPixel).toBe(true);
-
-  // 4. Lasso tool
-  await page.evaluate(async () => {
-    const { state } = await import('/static/js/editor/state.js');
-    state.tool = 'lasso';
-    state.brushPixel = false;
-  });
-  await page.mouse.move(midX + 20, midY - 10);
-  await checkCenter(midX + 20, midY - 10);
-  props = await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      borderColor: el.style.borderColor,
-      background: el.style.background,
-    };
-  });
-  expect(props.borderColor).toBe('rgba(255, 255, 255, 0.85)');
-  expect(props.background).toBe('rgba(0, 0, 0, 0.15)');
-
-  // 5. Inpaint tool (paint mode and erase mode)
-  await page.evaluate(async () => {
-    const { state } = await import('/static/js/editor/state.js');
-    state.tool = 'inpaint';
-    state.inpaintEraseMode = false;
-  });
-  await page.mouse.move(midX, midY);
-  await checkCenter(midX, midY);
-  props = await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      borderColor: el.style.borderColor,
-      background: el.style.background,
-      borderStyle: el.style.borderStyle,
-    };
-  });
-  expect(props.borderColor).toBe('rgba(255, 80, 80, 0.8)');
-  expect(props.borderStyle).toBe('solid');
-
-  // Inpaint erase mode
-  await page.evaluate(async () => {
-    const { state } = await import('/static/js/editor/state.js');
-    state.inpaintEraseMode = true;
-  });
-  await page.mouse.move(midX + 5, midY + 5);
-  props = await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      borderColor: el.style.borderColor,
-      borderStyle: el.style.borderStyle,
-    };
-  });
-  expect(props.borderColor).toBe('rgba(255, 255, 255, 0.9)');
-  expect(props.borderStyle).toBe('dashed');
-
-  // 6. Liquify tool
-  await page.evaluate(async () => {
-    const { state } = await import('/static/js/editor/state.js');
-    state.tool = 'liquify';
-    state.liquifySize = 100;
-  });
-  await page.mouse.move(midX - 15, midY + 15);
-  await checkCenter(midX - 15, midY + 15);
-  props = await page.evaluate(() => {
-    const el = document.querySelector('.ge-brush-cursor');
-    return {
-      width: parseFloat(el.style.width),
-      height: parseFloat(el.style.height),
-      display: el.style.display,
-    };
-  });
-  expect(props.display).toBe('block');
-  expect(props.width).toBeGreaterThan(0);
-
-  // 7. Clone tool
-  await page.evaluate(async () => {
-    const { state } = await import('/static/js/editor/state.js');
-    state.tool = 'clone';
-    state.brushSize = 50;
-  });
-  await page.mouse.move(midX, midY);
-  await checkCenter(midX, midY);
-  await expect(cursor).toBeVisible();
-
-  // Clean close
-  await page.evaluate(async () => {
-    const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
-    editor.closeEditor({ force: true });
-  });
-  await expect(cursor).toHaveCount(0);
-});
-
-
-test('canvas boundaries, pointer exit and re-entry, and viewport resize', async ({ page }) => {
-  await openBlankEditor(page, { width: 400, height: 300 });
-  await selectTool(page, 'brush');
-
-  const canvas = await page.locator('.ge-main-canvas').boundingBox();
-  const cursor = page.locator('.ge-brush-cursor');
-
-  const checkCenter = async (x, y) => {
-    await expect.poll(async () => {
-      const box = await cursor.boundingBox();
-      return box ? Math.max(Math.abs(box.x + box.width / 2 - x), Math.abs(box.y + box.height / 2 - y)) : Infinity;
-    }).toBeLessThan(1);
-  };
-
-  // 1. Enter canvas
-  const insideX = canvas.x + canvas.width * 0.5;
-  const insideY = canvas.y + canvas.height * 0.5;
-  await page.mouse.move(insideX, insideY);
-  await expect(cursor).toBeVisible();
-  await checkCenter(insideX, insideY);
-
-  // 2. Exit canvas boundary: cursor should hide
-  const outsideX = canvas.x - 50;
-  const outsideY = canvas.y - 50;
-  await page.mouse.move(outsideX, outsideY);
-  await expect(cursor).toBeHidden();
-
-  // 3. Re-enter canvas: cursor should restore visibility and position
-  await page.mouse.move(insideX, insideY);
-  await expect(cursor).toBeVisible();
-  await checkCenter(insideX, insideY);
-
-  // 4. Viewport resize
-  await page.setViewportSize({ width: 1280, height: 800 });
-  await page.waitForTimeout(100);
-  const newCanvas = await page.locator('.ge-main-canvas').boundingBox();
-  const newInsideX = newCanvas.x + newCanvas.width * 0.5;
-  const newInsideY = newCanvas.y + newCanvas.height * 0.5;
-  await page.mouse.move(newInsideX, newInsideY);
-  await expect(cursor).toBeVisible();
-  await checkCenter(newInsideX, newInsideY);
-
-  // Clean close
-  await page.evaluate(async () => {
-    const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
-    editor.closeEditor({ force: true });
-  });
-  await expect(cursor).toHaveCount(0);
-});
-
-
-for (const view of ['2x zoom', 'fit-to-view']) {
-  test(`zoom and fit-to-view cursor scaling and positioning: ${view}`, async ({ page }) => {
-    const size = view === '2x zoom' ? { width: 400, height: 300 } : { width: 1600, height: 1200 };
-    await openBlankEditor(page, size);
-    await selectTool(page, 'brush');
-
-    await page.evaluate(async () => {
-      const { state } = await import('/static/js/editor/state.js');
-      state.brushSize = 50;
-      // The zoom-in control applies 1.25x through the real zoom handler.
-      state.zoom = 1.6;
-      state.zoomViewMode = 'scale';
-    });
-    await page.locator('#ge-zoom-in').click();
-    await expect.poll(() => page.evaluate(async () => {
-      const { state } = await import('/static/js/editor/state.js');
-      return { zoom: state.zoom, mode: state.zoomViewMode };
-    })).toEqual({ zoom: 2, mode: 'scale' });
-
-    if (view === 'fit-to-view') {
-      await page.locator('#ge-zoom-100').click();
-      const fitted = await page.evaluate(async () => {
-        const { state } = await import('/static/js/editor/state.js');
-        const area = document.querySelector('.ge-canvas-area');
-        const pad = state._footerDocked ? 0 : 20;
-        const rulerPad = state.rulersVisible ? 18 : 0;
-        return {
-          zoom: state.zoom,
-          mode: state.zoomViewMode,
-          expectedZoom: Math.min(1,
-            (area.clientWidth - 2 * pad - rulerPad) / state.imgWidth,
-            (area.clientHeight - 2 * pad - rulerPad) / state.imgHeight),
-        };
-      });
-      expect(fitted.mode).toBe('fit');
-      expect(fitted.zoom).toBeGreaterThan(0);
-      expect(fitted.zoom).toBeLessThan(1);
-      expect(fitted.zoom).toBeCloseTo(fitted.expectedZoom, 6);
-    }
-
-    const canvas = page.locator('.ge-main-canvas');
-    const canvasBox = await canvas.boundingBox();
-    const cursor = page.locator('.ge-brush-cursor');
-    if (view === '2x zoom') {
-      expect(canvasBox.width).toBeCloseTo(size.width * 2, 1);
-      expect(canvasBox.height).toBeCloseTo(size.height * 2, 1);
-    }
-    const targetX = canvasBox.x + canvasBox.width * 0.4;
-    const targetY = canvasBox.y + canvasBox.height * 0.4;
-    await page.mouse.move(targetX, targetY);
-    await expect(cursor).toBeVisible();
-
-    // Pointer coordinates can be rounded to device pixels; keep the existing
-    // subpixel alignment tolerance separate from the stricter diameter check.
-    await expect.poll(async () => {
-      const box = await cursor.boundingBox();
-      return box ? Math.max(
-        Math.abs(box.x + box.width / 2 - targetX),
-        Math.abs(box.y + box.height / 2 - targetY),
-      ) : Infinity;
-    }).toBeLessThan(1);
-    await expect.poll(() => page.evaluate(() => {
-      const canvasEl = document.querySelector('.ge-main-canvas');
-      const canvasRect = canvasEl.getBoundingClientRect();
-      const cursorRect = document.querySelector('.ge-brush-cursor').getBoundingClientRect();
-      return Math.max(
-        Math.abs(cursorRect.width - 50 * canvasRect.width / canvasEl.width),
-        Math.abs(cursorRect.height - 50 * canvasRect.height / canvasEl.height),
-      );
-    })).toBeLessThan(0.1);
-
-    await page.evaluate(async () => {
-      const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
-      editor.closeEditor({ force: true });
-    });
-    await expect(cursor).toHaveCount(0);
-  });
-}
-
-
-test('memory and lifecycle: repeated editor open/close cycles retain no detached cursors or active animations', async ({ page }) => {
-  for (let cycle = 0; cycle < 5; cycle++) {
-    await openBlankEditor(page, { width: 400, height: 300 });
-    await selectTool(page, 'brush');
-
-    const canvas = await page.locator('.ge-main-canvas').boundingBox();
-    await page.mouse.move(canvas.x + canvas.width * 0.5, canvas.y + canvas.height * 0.5);
-    const cursor = page.locator('.ge-brush-cursor');
-    await expect(cursor).toBeVisible();
-
-    // Verify cursor layer and animation are active
-    const cycleState = await page.evaluate(() => {
-      const el = document.querySelector('.ge-brush-cursor');
-      window.__lastCycleAnim = el?._positionAnimation;
-      return {
-        cursorCount: document.querySelectorAll('.ge-brush-cursor').length,
-        layerCount: document.querySelectorAll('#ge-cursor-layer').length,
-        hasAnim: Boolean(el?._positionAnimation),
-        animPaused: el?._positionAnimation?.playState === 'paused',
-      };
-    });
-    expect(cycleState.cursorCount).toBe(1);
-    expect(cycleState.layerCount).toBe(1);
-    expect(cycleState.animPaused).toBe(true);
-
-    // Close editor
-    await page.evaluate(async () => {
-      const editor = await window.__photoEditorImport('/static/js/galleryEditor.js');
-      editor.closeEditor({ force: true });
-    });
-
-    // Verify complete cleanup after close
-    await expect(cursor).toHaveCount(0);
-    const postClose = await page.evaluate(() => {
-      const anim = window.__lastCycleAnim;
-      delete window.__lastCycleAnim;
-      return {
-        cursorCount: document.querySelectorAll('.ge-brush-cursor').length,
-        layerCount: document.querySelectorAll('#ge-cursor-layer').length,
-        animIdle: anim ? anim.playState === 'idle' : true,
-        activeAnims: document.getAnimations().filter(a => {
-          const target = a.effect?.target;
-          return target && (target.classList?.contains('ge-brush-cursor') || target.id === 'ge-cursor-layer');
-        }).length,
-      };
-    });
-    expect(postClose.cursorCount).toBe(0);
-    expect(postClose.layerCount).toBe(0);
-    expect(postClose.animIdle).toBe(true);
-    expect(postClose.activeAnims).toBe(0);
-  }
-});

tests/helpers/test_settings_shell_coordinator.mjs

@@ -24,7 +24,6 @@ const REAL_MODULES = new Set([
   path.join(JS, 'settings/speech.js'),
   path.join(JS, 'settings/writingStyle.js'),
   path.join(JS, 'settings/imageModels.js'),
-  path.join(JS, 'settings/imagePreferences.js'),
   path.join(JS, 'settings/agent.js'),
   path.join(JS, 'settings/shell.js'),
   path.join(JS, 'settings/peek.js'),

tests/test_caldav_redirect_hardening.py

@@ -13,7 +13,6 @@ import socketserver
 import threading
 
 import pytest
-import requests
 
 from src import caldav_sync, caldav_writeback
 
@@ -27,13 +26,12 @@ def test_build_dav_client_disables_redirects():
 
 def test_dav_client_does_not_follow_redirect_to_internal_host():
     """End-to-end through the real DAVClient: a 302 toward an internal host
-    must NOT be followed. Exercise the session limit separately because some
-    caldav versions independently refuse cross-origin PROPFIND redirects."""
+    must NOT be followed. Without the fix the sink is contacted (SSRF); with it
+    the redirect is refused and the sink is never reached."""
     pytest.importorskip("caldav")
 
     sink_hits: list[str] = []
     public_methods: list[str] = []
-    same_origin_hits: list[str] = []
 
     class _Internal(http.server.BaseHTTPRequestHandler):
         # Stand-in for an internal service the attacker redirects toward.
@@ -50,15 +48,9 @@ def test_dav_client_does_not_follow_redirect_to_internal_host():
     class _Public(http.server.BaseHTTPRequestHandler):
         # The "validated" public CalDAV server that redirects everything inward.
         def do_GET(self):  # noqa: N802
-            if self.path == "/landing":
-                same_origin_hits.append(self.path)
-                self.send_response(200)
-                self.end_headers()
-                return
             public_methods.append(self.command)
             self.send_response(302)
-            location = "/landing" if self.path == "/same" else f"http://127.0.0.1:{internal_port}/leak"
-            self.send_header("Location", location)
+            self.send_header("Location", f"http://127.0.0.1:{internal_port}/leak")
             self.end_headers()
 
         do_PROPFIND = do_GET
@@ -70,10 +62,8 @@ def test_dav_client_does_not_follow_redirect_to_internal_host():
     internal_port = internal.server_address[1]
     public = socketserver.TCPServer(("127.0.0.1", 0), _Public)
     public_port = public.server_address[1]
-    internal_thread = threading.Thread(target=internal.serve_forever, daemon=True)
-    public_thread = threading.Thread(target=public.serve_forever, daemon=True)
-    internal_thread.start()
-    public_thread.start()
+    threading.Thread(target=internal.serve_forever, daemon=True).start()
+    threading.Thread(target=public.serve_forever, daemon=True).start()
     try:
         public_url = f"http://127.0.0.1:{public_port}/dav"
         client = caldav_sync._build_dav_client(public_url, "u", "p")
@@ -92,35 +82,17 @@ def test_dav_client_does_not_follow_redirect_to_internal_host():
         assert public_methods in (["PROPFIND"], ["PROPFIND", "GET"]), public_methods
         assert sink_hits == [], "redirect toward an internal host must not be followed"
 
-        # GET redirects are handled by the HTTP session even in caldav 3.7.
-        # This makes the cross-port SSRF assertion sensitive to our own limit.
-        with pytest.raises(Exception, match="Exceeded 0 redirects"):
-            client.request(public_url, "GET", "")
-        assert sink_hits == [], "GET redirect toward the internal sink must be blocked"
-
-        # requests can reach the cross-port sink when redirects are enabled,
-        # even if DAVClient independently rejects cross-origin PROPFIND redirects.
-        with requests.Session() as session:
-            response = session.get(public_url, timeout=5)
-            assert response.status_code == 207
-        assert sink_hits == ["/leak"], "the cross-port redirect must reach the sink"
-
-        # GET follows redirects at the HTTP session layer across these caldav
-        # versions. Check the application's limit on a same-origin redirect too.
-        same_url = f"http://127.0.0.1:{public_port}/same"
-        with pytest.raises(Exception, match="Exceeded 0 redirects"):
-            client.request(same_url, "GET", "")
-        assert same_origin_hits == []
+        # Positive control: demonstrate that the sink would see the redirect
+        # if the session's redirect protection were removed.
         client.session.max_redirects = 30
-        client.request(same_url, "GET", "")
-        assert same_origin_hits == ["/landing"]
+        try:
+            client.request(public_url, "PROPFIND", "")
+        except Exception:
+            pass  # The sink's response is intentionally not a valid DAV body.
+        assert sink_hits == ["/leak"], "the test must detect a followed redirect"
     finally:
         internal.shutdown()
         public.shutdown()
-        internal_thread.join()
-        public_thread.join()
-        internal.server_close()
-        public.server_close()
 
 
 def test_sync_and_writeback_construct_clients_through_the_helper():

tests/test_calendar_config_body.py

@@ -1,35 +0,0 @@
-"""The CalDAV config routes answer 400 for a body that is JSON but not an object."""
-import asyncio
-import json
-from types import SimpleNamespace
-
-import pytest
-from fastapi import HTTPException
-
-from routes.calendar_routes import _json_object_body
-
-
-def _request(raw: bytes):
-    async def _json():
-        return json.loads(raw)
-    return SimpleNamespace(json=_json)
-
-
-def _parse(raw: bytes):
-    return asyncio.run(_json_object_body(_request(raw)))
-
-
-def test_object_body_is_returned():
-    assert _parse(b'{"url": "https://dav.example/"}') == {"url": "https://dav.example/"}
-
-
-@pytest.mark.parametrize("raw", [b"", b"not json"])
-def test_unreadable_body_counts_as_empty(raw):
-    assert _parse(raw) == {}
-
-
-@pytest.mark.parametrize("raw", [b"[]", b'"x"', b"5", b"null"])
-def test_non_object_body_is_a_400(raw):
-    with pytest.raises(HTTPException) as exc:
-        _parse(raw)
-    assert exc.value.status_code == 400

tests/test_chat_tidy_content_preservation.py

@@ -1,148 +0,0 @@
-"""Both chat tidy entry points retain saved conversations and still remove empties."""
-import asyncio
-from datetime import datetime, timedelta, timezone
-
-import pytest
-from fastapi import APIRouter, FastAPI
-from fastapi.testclient import TestClient
-from sqlalchemy import create_engine
-from sqlalchemy.orm import sessionmaker
-
-import core.database as database
-import core.session_manager as manager_module
-import routes.session_routes as routes
-import src.session_actions as actions
-
-
-@pytest.fixture
-def tidy_api(tmp_path, monkeypatch):
-    engine = create_engine(
-        f"sqlite:///{(tmp_path / 'tidy.db').as_posix()}",
-        connect_args={"check_same_thread": False},
-    )
-    database.Base.metadata.create_all(engine)
-    factory = sessionmaker(bind=engine, autoflush=False)
-    monkeypatch.setattr(database, "SessionLocal", factory)
-    monkeypatch.setattr(manager_module, "SessionLocal", factory)
-    monkeypatch.setattr(routes, "SessionLocal", factory)
-    monkeypatch.setattr(routes, "router", APIRouter(prefix="/api"))
-    monkeypatch.setattr(routes, "effective_user", lambda request: "alice")
-    manager = manager_module.SessionManager.__new__(manager_module.SessionManager)
-    manager.sessions = {}
-    manager.upload_handler = None
-    monkeypatch.setattr(manager, "get_sessions_for_user", lambda owner: {})
-    app = FastAPI()
-    app.include_router(routes.setup_session_routes(manager, {}))
-    with TestClient(app) as client:
-        yield client, factory, manager
-    engine.dispose()
-
-
-def run_tidy(client, entrypoint):
-    if entrypoint == "action":
-        return asyncio.run(actions.run_auto_sort("alice", skip_llm=True))
-    response = client.post("/api/sessions/auto-sort?skip_llm=true")
-    assert response.status_code == 200, response.text
-    return response.json()
-
-
-@pytest.mark.parametrize("entrypoint", ["route", "action"])
-@pytest.mark.parametrize("title,prompt", [
-    ("New chat", "Please analyze the following contract and retain all details. " * 20),
-    ("Contract analysis", "Review contract"),
-    ("Chat: analysis", "Explain these results and retain the full answer"),
-    ("Test", "Here is a large input that should be analyzed and retained"),
-], ids=["generic-title", "short-prompt", "title-prefix", "test-title"])
-def test_tidy_preserves_nontrivial_saved_answer(tidy_api, title, prompt, entrypoint):
-    client, factory, manager = tidy_api
-    old = datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(hours=2)
-    answer = "Clause analysis and recommended changes.\n" * 2000
-    with factory() as db:
-        db.add(database.Session(
-            id="valuable-chat", name=title, owner="alice", endpoint_url="", model="",
-            archived=False, is_important=False, message_count=2,
-            created_at=old, updated_at=old, last_accessed=old, last_message_at=old,
-        ))
-        db.commit()
-        db.add_all([
-            database.ChatMessage(id="prompt", session_id="valuable-chat", role="user",
-                                 content=prompt, timestamp=old),
-            database.ChatMessage(id="answer", session_id="valuable-chat", role="assistant",
-                                 content=answer, timestamp=old + timedelta(seconds=1)),
-        ])
-        db.commit()
-    run_tidy(client, entrypoint)
-    with factory() as db:
-        remaining = db.query(database.ChatMessage).filter_by(session_id="valuable-chat").count()
-        survives = db.get(database.Session, "valuable-chat") is not None
-    assert survives and remaining == 2, "Title/prompt heuristics must not erase saved answers"
-    with factory() as db:
-        assert db.get(database.ChatMessage, "answer").content == answer
-
-
-@pytest.mark.parametrize("entrypoint", ["route", "action"])
-@pytest.mark.parametrize("kind", ["unanswered", "greeting", "empty", "fresh-empty", "starred-empty", "archived", "other-owner", "incognito"])
-def test_tidy_cleanup_boundaries(tidy_api, entrypoint, kind):
-    client, factory, manager = tidy_api
-    now = datetime.now(timezone.utc).replace(tzinfo=None)
-    timestamp = now if kind == "fresh-empty" else now - timedelta(hours=2)
-    message = kind in {"unanswered", "greeting", "archived", "other-owner", "incognito"}
-    with factory() as db:
-        db.add(database.Session(
-            id="boundary-chat", name="Incognito" if kind == "incognito" else "New chat",
-            owner="bob" if kind == "other-owner" else "alice", endpoint_url="", model="",
-            archived=kind == "archived", is_important=kind == "starred-empty",
-            # Deliberately inaccurate metadata: cleanup must use message rows.
-            message_count=0 if message else 40,
-            created_at=timestamp, updated_at=timestamp, last_accessed=timestamp, last_message_at=timestamp,
-        ))
-        db.commit()
-        if message:
-            db.add(database.ChatMessage(id="boundary-message", session_id="boundary-chat", role="user",
-                                        content="hi" if kind == "greeting" else "Pending question " * 100,
-                                        timestamp=timestamp))
-            db.commit()
-    run_tidy(client, entrypoint)
-    deleted = kind in {"empty", "incognito"}
-    with factory() as db:
-        assert (db.get(database.Session, "boundary-chat") is None) == deleted
-        assert db.query(database.ChatMessage).filter_by(session_id="boundary-chat").count() == int(message and not deleted)
-
-
-@pytest.mark.parametrize("entrypoint", ["route", "action"])
-def test_tidy_keeps_folder_assignment_working(tidy_api, monkeypatch, entrypoint):
-    from types import SimpleNamespace
-    import src.llm_core as llm
-    import src.task_endpoint as endpoints
-    client, factory, manager = tidy_api
-    old = datetime.now(timezone.utc).replace(tzinfo=None) - timedelta(hours=2)
-    for sid in ["chat-one-long-id", "chat-two-long-id"]:
-        with factory() as db:
-            db.add(database.Session(id=sid, name="New chat", owner="alice", endpoint_url="", model="",
-                                    archived=False, created_at=old, updated_at=old,
-                                    last_accessed=old, last_message_at=old))
-            db.commit()
-            db.add(database.ChatMessage(id=f"{sid}-message", session_id=sid, role="user",
-                                        content="Saved question", timestamp=old))
-            db.commit()
-        manager.sessions[sid] = SimpleNamespace(id=sid, name="New chat", archived=False,
-                                                updated_at=old.isoformat(), created_at=old.isoformat())
-    monkeypatch.setattr(manager, "get_sessions_for_user", lambda owner: manager.sessions)
-    monkeypatch.setattr(endpoints, "resolve_task_endpoint", lambda *args, **kwargs: ("http://model.invalid", "test", {}))
-    response_text = '{"folders":{"Projects":["chat-one","chat-two"]}}'
-    monkeypatch.setattr(llm, "llm_call", lambda *args, **kwargs: response_text)
-
-    async def async_response(*args, **kwargs):
-        return response_text
-
-    monkeypatch.setattr(llm, "llm_call_async", async_response)
-    if entrypoint == "action":
-        result = asyncio.run(actions.run_auto_sort("alice"))
-        assert "Sorted 2 sessions" in result
-    else:
-        response = client.post("/api/sessions/auto-sort")
-        assert response.status_code == 200, response.text
-        assert response.json()["updated"] == 2
-    with factory() as db:
-        assert db.query(database.ChatMessage).count() == 2
-        assert {row.folder for row in db.query(database.Session).all()} == {"Projects"}

tests/test_checkin_digest_owner_scope.py

@@ -7,13 +7,13 @@ CalendarCal.owner; the query must join it, like routes/calendar_routes.
 """
 import uuid
 import sys
-from datetime import datetime, timedelta
+from datetime import datetime
 
 import pytest
 from tests.helpers.database import disposable_database
 
 from core.database import CalendarEvent, CalendarCal
-from src.task_scheduler import _checkin_calendar_events, _digest_windows
+from src.task_scheduler import _checkin_calendar_events
 
 
 @pytest.fixture(autouse=True)
@@ -68,44 +68,3 @@ def test_cancelled_excluded_and_window_respected():
         assert "cancelled" not in [ev.summary for ev in out]
     finally:
         db.close()
-
-
-@pytest.mark.parametrize("days, expected_label", [(2, "this_week"), (7, "next_30_days")])
-def test_boundary_event_appears_in_only_one_digest_window(days, expected_label):
-    now = datetime(2026, 6, 1, 9)
-    boundary = now + timedelta(days=days)
-    with _TS() as db:
-        db.add(CalendarCal(id="boundary-cal", owner="alice", name="Boundary"))
-        db.add(CalendarEvent(
-            uid="boundary-event", calendar_id="boundary-cal", summary="Boundary meeting",
-            dtstart=boundary, dtend=boundary + timedelta(hours=1), status="confirmed",
-        ))
-        db.commit()
-
-        buckets = [
-            label for label, start, end in _digest_windows(now)
-            if _checkin_calendar_events(db, "alice", start, end)
-        ]
-        assert buckets == [expected_label]
-
-
-def test_digest_includes_start_and_excludes_end():
-    start = datetime(2026, 6, 1, 9)
-    end = start + timedelta(days=2)
-    with _TS() as db:
-        db.add(CalendarCal(id="bounds-cal", owner="alice", name="Bounds"))
-        for uid, when in [
-            ("before", start - timedelta(seconds=1)),
-            ("start", start),
-            ("inside", end - timedelta(seconds=1)),
-            ("end", end),
-        ]:
-            db.add(CalendarEvent(
-                uid=uid, calendar_id="bounds-cal", summary=uid, dtstart=when,
-                dtend=when + timedelta(hours=1), status="confirmed",
-            ))
-        db.commit()
-
-        assert [ev.uid for ev in _checkin_calendar_events(db, "alice", start, end)] == [
-            "start", "inside",
-        ]

tests/test_compare_stream_contract_browser.py

@@ -1,70 +0,0 @@
-"""Compare's actual stream consumer must preserve evidence and terminal state."""
-import json
-import shutil
-import subprocess
-from pathlib import Path
-
-import pytest
-
-ROOT = Path(__file__).resolve().parents[1]
-
-CASES = [
-    ("lf", 'data: {"delta":"Hello"}\n\ndata: [DONE]\n\n', False, True, "Hello"),
-    ("crlf", 'data:{"delta":"Héllö"}\r\n\r\ndata:[DONE]\r\n\r\n', False, True, "Héllö"),
-    ("multiline", 'data: {"delta":\ndata: "Hello"}\n\ndata: [DONE]\n\n', False, True, "Hello"),
-    ("eof", 'data: {"delta":"Partial"}\n\n', False, False, "ended before completion"),
-    ("named-error", 'event: error\ndata: {"text":"Provider Z private-model failed"}\n\n', False, False, "Provider Z private-model failed"),
-    ("typed-error", 'data: {"type":"error","data":{"message":"Provider Z <img src=x onerror=alert(1)>"}}\n\ndata: [DONE]\n\n', False, False, "Provider Z <img"),
-    ("blind-error", 'event:error\ndata:{"message":"Provider Z private-model failed"}\n\n', True, False, "request failed"),
-    ("empty-error", 'event:error\ndata:\n\n', False, False, "request failed"),
-    ("done-open", 'data: {"delta":"Hello"}\n\ndata: [DONE]\n\n', False, True, "Hello"),
-    ("heartbeat", 'data: {"delta":"Hello"}\n\ndata: [DONE]\n\n', False, True, "Hello"),
-    ("cr", 'data: {"delta":"Hello"}\r\rdata:[DONE]\r\r', False, True, "Hello"),
-    ("invalid", 'data: not-json\n\ndata: [DONE]\n\n', False, False, "Invalid model stream data"),
-]
-
-
-@pytest.mark.parametrize("kind,wire,blind,success,text", CASES)
-def test_compare_stream_contract(kind, wire, blind, success, text):
-    if not shutil.which("node"):
-        pytest.skip("node not installed")
-    script = r"""
-const assert=require('node:assert/strict');
-let chromium;try{({chromium}=require('playwright'));}catch(e){if(e.code==='MODULE_NOT_FOUND')process.exit(77);throw e;}
-(async()=>{
- const browser=await chromium.launch({headless:true});
- try{
-  const page=await browser.newPage();
-  await page.goto(process.env.ODYSSEUS_TEST_STATIC_ORIGIN+'/static/js/storage.js');
-  await page.setContent('<div class="compare-pane" data-pane="0"><div id="cmp-badge-0"></div><div id="cmp-history-0"><div class="msg msg-ai"><div class="body"></div></div></div></div>');
-  const result=await page.evaluate(async(data)=>{
-   const {default:state}=await import('/static/js/compare/state.js');
-   const {streamToPane}=await import('/static/js/compare/stream.js');
-   Object.assign(state,{isActive:true,_selectedModels:[{model:'fixture',name:'Fixture'}],_paneSessionIds:['session'],_compareMode:'chat',_parallel:true,_blindMode:data.blind,_timeout:data.kind==='heartbeat'?1:5});
-   const nativeFetch=window.fetch,bytes=new TextEncoder().encode(data.wire);let index=0,cancelled=false,context=null;
-   window.fetch=async(url,options)=>{
-    if(!String(url).endsWith('/api/chat_stream'))return nativeFetch(url,options);
-    context=options.body.get('search_context');
-    const heartbeats=[...Array(6).fill(': ping\n\n'),data.wire];
-    return new Response(new ReadableStream({start(controller){options.signal.addEventListener('abort',()=>controller.error(new DOMException('Stopped','AbortError')),{once:true});},async pull(controller){if(data.kind==='heartbeat'){if(index<heartbeats.length){await new Promise(r=>setTimeout(r,200));controller.enqueue(new TextEncoder().encode(heartbeats[index++]));}else controller.close();}else if(index<bytes.length)controller.enqueue(bytes.slice(index,index+=1));else if(data.kind!=='done-open')controller.close();},cancel(){cancelled=true;}}),{headers:{'Content-Type':'text/event-stream'}});
-   };
-   const message=document.querySelector('.msg-ai'),spinner=document.createElement('span');let spinnerDestroyed=false;spinner.textContent='Loading';message.querySelector('.body').appendChild(spinner);message._spinner={element:spinner,destroy(){spinnerDestroyed=true;spinner.remove();}};
-   await Promise.race([streamToPane(0,'session','Prompt',message,{skipBadge:true}),new Promise((_,reject)=>setTimeout(()=>reject(Error('Consumer did not finish at DONE')),data.kind==='heartbeat'?6000:1500))]);
-   const pane=document.querySelector('.compare-pane');
-   return {done:pane.classList.contains('is-done'),failed:pane.classList.contains('is-failed'),text:pane.innerText,images:pane.querySelectorAll('img').length,cancelled,spinnerDestroyed,spinnerOwned:!!message._spinner};
-  },JSON.parse(process.argv[1]));
-  const expected=JSON.parse(process.argv[1]);
-  assert.equal(result.done,expected.success);assert.equal(result.failed,!expected.success);assert(result.text.includes(expected.text),JSON.stringify(result));assert.equal(result.images,0);
-  assert(result.spinnerDestroyed);assert(!result.spinnerOwned);
-  if(expected.blind)assert(!/Provider Z|private-model/.test(result.text),JSON.stringify(result));
-  if(expected.kind==='done-open')assert(result.cancelled);
-  console.log(JSON.stringify(result));
- }finally{await browser.close();}
-})().catch(e=>{console.error(e);process.exitCode=1;});
-"""
-    data = dict(kind=kind, wire=wire, blind=blind, success=success, text=text)
-    result = subprocess.run(["node", "-e", script, json.dumps(data)], cwd=ROOT,
-                            capture_output=True, text=True, timeout=30)
-    if result.returncode == 77:
-        pytest.skip("playwright not installed")
-    assert result.returncode == 0, result.stdout + result.stderr

tests/test_cookbook_recipe_panel_toggle.py

@@ -1,38 +0,0 @@
-"""Guard the only entry point to the Cookbook → Dependencies recipe panel.
-
-The recipe panel (model picker, Pip/Docker toggle, commands and Run) is
-rendered hidden, and only the `[data-dep-recipe-toggle]` caret shows it.
-The HW Fit and serve-card deep links (`openCookbookDependencies(..., {
-expandRecipe })`) open it by clicking that same caret. When the caret was
-dropped from the row markup, nothing could open the panel (#6747).
-"""
-import re
-from pathlib import Path
-
-JS_DIR = Path(__file__).resolve().parent.parent / "static" / "js"
-COOKBOOK_JS = JS_DIR / "cookbook.js"
-DIAGNOSIS_JS = JS_DIR / "cookbook-diagnosis.js"
-
-
-def _row_renderer(source: str) -> str:
-    start = source.index("const hasRecipe = RECIPE_BACKENDS.has(pkg.name);")
-    end = source.index("+ recipePanel;", start)
-    return source[start:end]
-
-
-def test_recipe_rows_render_the_panel_toggle():
-    row = _row_renderer(COOKBOOK_JS.read_text(encoding="utf-8"))
-
-    caret = re.search(r"const recipeCaret = hasRecipe\s*\?\s*`([^`]*)`\s*:\s*'';", row)
-    assert caret, "recipe rows must render a caret, or the recipe panel cannot be opened"
-    assert 'data-dep-recipe-toggle="${esc(pkg.name)}"' in caret.group(1)
-    assert 'aria-expanded="false"' in caret.group(1)
-    assert "+ recipeCaret" in row
-
-
-def test_toggle_handler_and_deep_link_use_the_rendered_attribute():
-    cookbook = COOKBOOK_JS.read_text(encoding="utf-8")
-    diagnosis = DIAGNOSIS_JS.read_text(encoding="utf-8")
-
-    assert "list.querySelectorAll('[data-dep-recipe-toggle]')" in cookbook
-    assert "row.querySelector('[data-dep-recipe-toggle]')" in diagnosis

tests/test_cookbook_stale_cache_markers.py

@@ -1,83 +0,0 @@
-"""A completed blob's empty retry marker must not keep its model stalled."""
-import json
-import os
-import subprocess
-import sys
-
-import pytest
-
-from routes.cookbook_helpers import _cached_model_scan_script
-from routes.cookbook_output import HF_CACHE_COMPLETE_PROBE, HF_CACHE_INCOMPLETE_PROBE
-
-_REPO = "fixture/stale-marker"
-_STATES = ["complete", "stale", "empty-unpaired", "partial", "partial-paired", "empty-paired-empty"]
-
-
-@pytest.fixture(params=["custom", "hf-home", "hub-env"])
-def cache(request, tmp_path):
-    root = tmp_path / "cache with spaces"
-    model = root / "hub" / ("models--" + _REPO.replace("/", "--"))
-    blobs = model / "blobs"
-    blobs.mkdir(parents=True)
-    snapshot = model / "snapshots" / "revision"
-    snapshot.mkdir(parents=True)
-    (snapshot / "config.json").write_text("{}")
-    env = {key: value for key, value in os.environ.items()
-           if key not in {"HF_HOME", "HUGGINGFACE_HUB_CACHE", "HF_HUB_CACHE"}}
-    if request.param == "custom":
-        argument = str(root)
-        scan = _cached_model_scan_script(add_hf_cache=str(root / "hub"))
-    else:
-        argument = ""
-        env["HF_HOME" if request.param == "hf-home" else "HUGGINGFACE_HUB_CACHE"] = str(
-            root if request.param == "hf-home" else root / "hub"
-        )
-        scan = _cached_model_scan_script()
-    return blobs, argument, env, scan
-
-
-def _seed(blobs, state):
-    if state in {"complete", "stale", "partial-paired"}:
-        (blobs / "sha").write_bytes(b"completed model data")
-    elif state == "empty-paired-empty":
-        (blobs / "sha").touch()
-    if state != "complete":
-        (blobs / "sha.incomplete").write_bytes(b"partial" if state.startswith("partial") else b"")
-
-
-@pytest.mark.parametrize("state", _STATES)
-@pytest.mark.parametrize("probe", [HF_CACHE_COMPLETE_PROBE, HF_CACHE_INCOMPLETE_PROBE], ids=["complete", "incomplete"])
-def test_cache_status_probes_distinguish_stale_and_partial(cache, state, probe):
-    blobs, argument, env, _ = cache
-    _seed(blobs, state)
-    before = {path.name: path.read_bytes() for path in blobs.iterdir()}
-    result = subprocess.run([sys.executable, "-c", probe, _REPO, argument],
-                            env=env, capture_output=True, text=True, timeout=15)
-    complete = state in {"complete", "stale"}
-    expected = complete if probe == HF_CACHE_COMPLETE_PROBE else not complete
-    assert result.returncode == (0 if expected else 1), result.stderr
-    assert {path.name: path.read_bytes() for path in blobs.iterdir()} == before
-
-
-@pytest.mark.parametrize("state", _STATES)
-def test_generated_inventory_agrees_without_mutating_cache(cache, state):
-    blobs, _, env, scan = cache
-    _seed(blobs, state)
-    before = {path.name: path.read_bytes() for path in blobs.iterdir()}
-    # Inventory's unrelated Ollama discovery stays off the network. Execute
-    # the actual generated scanner, including its cache-root resolution.
-    harness = (
-        "import urllib.request,shutil\n"
-        "def offline(*args,**kwargs): raise OSError('Ollama outside this fixture')\n"
-        "urllib.request.urlopen=offline\nshutil.which=lambda name: None\n"
-        + scan
-    )
-    result = subprocess.run([sys.executable, "-c", harness], env=env,
-                            capture_output=True, text=True, timeout=15)
-    assert result.returncode == 0, result.stderr
-    row = next(item for item in json.loads(result.stdout) if item["repo_id"] == _REPO)
-    assert row["has_incomplete"] == (state not in {"complete", "stale"})
-    if state in {"complete", "stale"}:
-        assert row["nb_files"] == 1
-        assert row["size_bytes"] == len(b"completed model data")
-    assert {path.name: path.read_bytes() for path in blobs.iterdir()} == before

tests/test_document_export_zip_ids.py

@@ -1,47 +0,0 @@
-"""POST /api/documents/export-zip answers 400 for ids that are not a list of document ids."""
-
-import json
-from types import SimpleNamespace
-from unittest.mock import MagicMock
-
-import pytest
-from fastapi import HTTPException
-
-from tests.helpers.import_state import clear_fake_database_modules
-
-clear_fake_database_modules()
-
-import routes.document_routes as droutes
-
-
-class _Req:
-    def __init__(self, body):
-        self.state = SimpleNamespace(current_user="tester")
-        self._body = body
-
-    async def json(self):
-        return self._body
-
-
-def _export_zip():
-    router = droutes.setup_document_routes(MagicMock(), None)
-    for r in router.routes:
-        if getattr(r, "path", None) == "/api/documents/export-zip":
-            return r.endpoint
-    raise RuntimeError("export-zip route not found")
-
-
-@pytest.mark.parametrize("body", [[], "x", 5, {}, {"ids": []}, {"ids": None}])
-async def test_missing_ids_is_a_400(body):
-    with pytest.raises(HTTPException) as exc:
-        await _export_zip()(_Req(body))
-    assert exc.value.status_code == 400
-    assert exc.value.detail == "No documents specified"
-
-
-@pytest.mark.parametrize("ids", [5, "abc", {"a": 1}, [1, 2], [["a"]], ["a", None]])
-async def test_ids_that_are_not_a_list_of_strings_is_a_400(ids):
-    with pytest.raises(HTTPException) as exc:
-        await _export_zip()(_Req({"ids": ids}))
-    assert exc.value.status_code == 400
-    assert exc.value.detail == "ids must be a list of document ids"

tests/test_editor_brush_more_menu.py

@@ -29,10 +29,8 @@ def test_secondary_brush_controls_live_after_the_menu_open():
     block = CONTROLS[i:j]
     for marker in ('id="ge-brush-spacing"', 'id="ge-brush-smoothing"',
                    'id="ge-brush-blend"', 'ge-brush-pressure-row',
-                   'id="ge-brush-flow-row"'):
+                   'id="ge-brush-flow-row"', 'id="ge-brush-softness-row"'):
         assert marker in block, marker
-    assert 'id="ge-brush-softness-row"' not in block
-    assert CONTROLS.index('id="ge-brush-softness-row"') < i
 
 
 def test_brush_size_label_drops_the_redundant_word():
@@ -100,7 +98,7 @@ def test_brush_strip_fits_and_smudge_row_respects_inline_hide():
     # The Opacity/Flow/Softness sliders are wound tighter so the strip fits.
     assert ".ge-controls--in-options #ge-brush-section { gap: 6px; }" in CSS
     # The brush controls hug their content so the sliders sit next to the caret.
-    assert ".ge-controls--in-options #ge-brush-controls { flex: 0 0 auto; flex-direction: row;" in CSS
+    assert ".ge-controls--in-options #ge-brush-controls { flex: 0 0 auto; }" in CSS
     # The smudge Strength row is hidden with an inline display:none on other
     # tools; the `.ge-eraser-row { display:flex !important }` rule must not
     # override that.

tests/test_editor_generation_error_messages.py

@@ -44,11 +44,9 @@ def test_quick_edit_shows_the_generation_message_verbatim():
     assert "_isGenOfflineMsg" in EDITOR
     assert "_setAiCommandStatus(_isGenOfflineMsg(_genErr) ? _genErr : `Could not generate that edit: ${_genErr}`, 'error');" in EDITOR
     assert "_setAiCommandStatus(_isGenOfflineMsg(msg) ? msg : `Could not generate an image: ${msg}`, 'error');" in EDITOR
-    # The extracted generation action keeps the shared failure classifier.
-    generation = (ROOT / 'static/js/editor/image-generation.js').read_text()
-    assert "formatError: _generationErrorMessage" in EDITOR
-    assert "formatError({ network: true" in generation
-    assert "formatError({ status: response.status" in generation
+    # the generateImage op maps its own fetch/HTTP failures through the classifier
+    assert "_generationErrorMessage({ network: true" in EDITOR
+    assert "_generationErrorMessage({ status: res.status, detail: _gd })" in EDITOR
 
 
 def test_sw_cache_is_bumped():

tests/test_editor_generation_model_routing.py

@@ -1,500 +0,0 @@
-import json
-
-import pytest
-from fastapi import FastAPI
-from fastapi.testclient import TestClient
-
-from routes import editor_agent_routes as routes
-from src.agent_tools import editor_tools
-
-
-@pytest.fixture(autouse=True)
-def allow_image_generation_privilege(monkeypatch):
-    monkeypatch.setattr('src.auth_helpers.require_privilege', lambda *args: 'test-user')
-
-
-@pytest.mark.parametrize("chosen", ["openai/gpt-5-image", ""])
-def test_quick_edit_generation_uses_generation_selection_not_planner_model(monkeypatch, chosen):
-    seen = []
-
-    async def execute(self, content, ctx):
-        seen.append(json.loads(content))
-        return "provider stub", {"exit_code": 1, "error": "test stops before canvas verification"}
-
-    monkeypatch.setattr(editor_tools.GenerateImageLayerTool, "execute", execute)
-    monkeypatch.setattr(routes, "_user", lambda request: None)
-    monkeypatch.setattr(routes.editor_agent_model, "startup_probe", lambda: None)
-    monkeypatch.setattr(routes.style_guide, "strengthen", lambda prompt, steps: steps)
-    monkeypatch.setattr(routes.style_guide, "enforce_guards", lambda steps: steps)
-    monkeypatch.setattr(routes, "_image_provider_available", lambda owner: True)
-    monkeypatch.setattr(routes, "_plan_special", lambda *args: None)
-    monkeypatch.setattr(routes, "_ensure_generative", lambda prompt, steps: steps)
-    monkeypatch.setattr(routes, "_unsure_plan", lambda prompt, plan: plan)
-    routes.set_editor_planner(lambda messages, owner: json.dumps({
-        "reply": "Generate", "steps": [{"op": "generate_image", "params": {
-            "prompt": "a cow", "model": "gpt-image-1",
-        }}],
-    }))
-    app = FastAPI()
-    app.include_router(routes.setup_editor_agent_routes())
-    try:
-        with TestClient(app) as client:
-            response = client.post("/api/editor/agent", json={
-                "prompt": "create a new image of a cow",
-                "model": "edit-only-model", "generation_model": chosen,
-            })
-        assert response.status_code == 200, response.text
-        assert len(seen) == 1, response.text
-        assert seen[0].get("model", "") == chosen
-    finally:
-        routes.set_editor_planner(None)
-
-
-@pytest.mark.parametrize('op,expected', [('generate_image','saved-generation'),('ai_edit_image','saved-editor')])
-def test_quick_edit_agent_uses_saved_models_over_browser_and_planner(monkeypatch, op, expected):
-    seen = []
-
-    async def execute(self, content, ctx):
-        seen.append(json.loads(content))
-        return 'stub', {'exit_code':1, 'error':'stop before verification'}
-
-    monkeypatch.setattr('src.editor_image_settings.load_settings', lambda: {
-        'image_model':'saved-generation', 'image_edit_model':'saved-editor'})
-    monkeypatch.setattr(editor_tools.GenerateImageLayerTool, 'execute', execute)
-    monkeypatch.setattr(editor_tools.AiEditImageTool, 'execute', execute)
-    monkeypatch.setattr(routes, '_user', lambda request: None)
-    monkeypatch.setattr(routes.editor_agent_model, 'startup_probe', lambda: None)
-    monkeypatch.setattr(routes.style_guide, 'strengthen', lambda prompt, steps: steps)
-    monkeypatch.setattr(routes.style_guide, 'enforce_guards', lambda steps: steps)
-    monkeypatch.setattr(routes, '_image_provider_available', lambda owner: True)
-    monkeypatch.setattr(routes, '_plan_special', lambda *args: None)
-    monkeypatch.setattr(routes, '_ensure_generative', lambda prompt, steps: steps)
-    monkeypatch.setattr(routes, '_unsure_plan', lambda prompt, plan: plan)
-    routes.set_editor_planner(lambda messages, owner: json.dumps({
-        'reply':'Edit', 'steps':[{'op':op,'params':{'prompt':'a cow','model':'planner-model','size':'1024x1024'}}]}))
-    app = FastAPI()
-    app.include_router(routes.setup_editor_agent_routes())
-    try:
-        with TestClient(app) as client:
-            response = client.post('/api/editor/agent', json={
-                'prompt':'create an image of a cow','_use_image_settings':True,
-                'model':'stale-editor','generation_model':'stale-generator','state':{'width':1280,'height':720}})
-        assert response.status_code == 200, response.text
-        assert len(seen) == 1, response.text
-        assert seen[0]['model'] == expected
-        assert seen[0]['_use_image_settings'] is True
-        if op == 'generate_image':
-            assert seen[0]['size'] == '1280x720'
-    finally:
-        routes.set_editor_planner(None)
-
-
-def test_quick_generation_route_uses_saved_setting(monkeypatch):
-    import asyncio
-    from routes.gallery import gallery_routes as gallery
-    from src import ai_interaction
-
-    seen = []
-
-    async def generate(content, **kwargs):
-        seen.append(json.loads(content))
-        return {'image_url':'data:image/png;base64,dGVzdA=='}
-
-    monkeypatch.setattr(gallery, 'require_privilege', lambda *args: 'alice')
-    monkeypatch.setattr(ai_interaction, 'do_generate_image', generate)
-    monkeypatch.setattr('src.editor_image_settings.load_settings', lambda: {'image_model':'saved-generation'})
-
-    class Request:
-        async def json(self):
-            return {'prompt':'a cow','model':'stale-generator','_use_image_settings':True,'width':1280,'height':720}
-
-    endpoint = next(route.endpoint for route in gallery.setup_gallery_routes().routes if route.path == '/api/image/generate')
-    result = asyncio.run(endpoint(Request()))
-    assert result['image'] == 'dGVzdA=='
-    assert seen[0]['model'] == 'saved-generation'
-    assert seen[0]['size'] == '1280x720'
-
-
-def test_edit_default_uses_generation_only_when_edit_setting_is_empty(monkeypatch):
-    from src import editor_image_settings
-    monkeypatch.setattr(editor_image_settings, 'load_settings', lambda: {'image_model':'generator','image_edit_model':''})
-    assert editor_image_settings.editor_image_models() == {'generation':'generator','edit':'generator'}
-
-
-def test_editor_image_models_per_user_isolation_and_fallback(tmp_path, monkeypatch):
-    from routes import prefs_routes
-    from src import editor_image_settings, settings
-
-    prefs_file = str(tmp_path / "user_prefs.json")
-    monkeypatch.setattr(prefs_routes, "PREFS_FILE", prefs_file)
-
-    global_config = {"image_model": "global-gen", "image_edit_model": "global-edit"}
-    monkeypatch.setattr(settings, "load_settings", lambda: global_config)
-    monkeypatch.setattr(editor_image_settings, "load_settings", lambda: global_config)
-
-    # Save per-user preferences
-    prefs_routes._save_for_user("alice", {"image_model": "alice-gen", "image_edit_model": "alice-edit"})
-    prefs_routes._save_for_user("bob", {"image_model": "bob-gen"})  # no edit model
-
-    # Alice gets Alice's distinct models
-    alice_models = editor_image_settings.editor_image_models(owner="alice")
-    assert alice_models == {"generation": "alice-gen", "edit": "alice-edit"}
-
-    # Bob gets Bob's generation model, and edit model falls back to global edit model
-    bob_models = editor_image_settings.editor_image_models(owner="bob")
-    assert bob_models == {"generation": "bob-gen", "edit": "global-edit"}
-
-    # When global edit model is empty, edit model falls back to Bob's generation model
-    empty_edit = {"image_model": "global-gen", "image_edit_model": ""}
-    monkeypatch.setattr(settings, "load_settings", lambda: empty_edit)
-    monkeypatch.setattr(editor_image_settings, "load_settings", lambda: empty_edit)
-    bob_fallback_models = editor_image_settings.editor_image_models(owner="bob")
-    assert bob_fallback_models == {"generation": "bob-gen", "edit": "bob-gen"}
-
-    # Restore global settings with global-edit
-    monkeypatch.setattr(settings, "load_settings", lambda: global_config)
-    monkeypatch.setattr(editor_image_settings, "load_settings", lambda: global_config)
-
-    # Charlie (no preferences) falls back to global admin settings
-    charlie_models = editor_image_settings.editor_image_models(owner="charlie")
-    assert charlie_models == {"generation": "global-gen", "edit": "global-edit"}
-
-    # Anonymous/unauthenticated owner falls back to global admin settings
-    anon_models = editor_image_settings.editor_image_models(owner="")
-    assert anon_models == {"generation": "global-gen", "edit": "global-edit"}
-
-
-def test_non_admin_user_prefs_api_routing_and_isolation(tmp_path, monkeypatch):
-    import time
-    from routes import editor_agent_routes, prefs_routes
-    from src import editor_image_settings, settings
-
-    prefs_file = str(tmp_path / "user_prefs.json")
-    monkeypatch.setattr(prefs_routes, "PREFS_FILE", prefs_file)
-
-    global_config = {"image_model": "admin-global-gen", "image_edit_model": "admin-global-edit"}
-    monkeypatch.setattr(settings, "load_settings", lambda: global_config)
-    monkeypatch.setattr(editor_image_settings, "load_settings", lambda: global_config)
-
-    current_user = "alice"
-    app = FastAPI()
-    app.include_router(prefs_routes.setup_prefs_routes())
-    app.include_router(editor_agent_routes.setup_editor_agent_routes())
-
-    monkeypatch.setattr("src.auth_helpers.get_current_user", lambda request: current_user)
-    monkeypatch.setattr(prefs_routes, "get_current_user", lambda request: current_user)
-    monkeypatch.setattr(editor_agent_routes, "_user", lambda request: current_user)
-    monkeypatch.setattr(editor_agent_routes.editor_agent_model, "startup_probe", lambda: None)
-    monkeypatch.setattr(editor_agent_routes.style_guide, "strengthen", lambda prompt, steps: steps)
-    monkeypatch.setattr(editor_agent_routes.style_guide, "enforce_guards", lambda steps: steps)
-    monkeypatch.setattr(editor_agent_routes, "_image_provider_available", lambda owner: True)
-    monkeypatch.setattr(editor_agent_routes, "_plan_special", lambda *args: None)
-    monkeypatch.setattr(editor_agent_routes, "_ensure_generative", lambda prompt, steps: steps)
-    monkeypatch.setattr(editor_agent_routes, "_unsure_plan", lambda prompt, plan: plan)
-
-    seen = []
-
-    async def execute_gen(self, content, ctx):
-        seen.append(("gen", json.loads(content)))
-        return "stub", {"exit_code": 1, "error": "stop"}
-
-    async def execute_edit(self, content, ctx):
-        seen.append(("edit", json.loads(content)))
-        return "stub", {"exit_code": 1, "error": "stop"}
-
-    monkeypatch.setattr(editor_tools.GenerateImageLayerTool, "execute", execute_gen)
-    monkeypatch.setattr(editor_tools.AiEditImageTool, "execute", execute_edit)
-
-    editor_agent_routes.set_editor_planner(lambda messages, owner: json.dumps({
-        "reply": "Gen", "steps": [
-            {"op": "generate_image", "params": {"prompt": "cat", "model": "stale-planner", "size": "512x512"}}
-        ]
-    }))
-
-    try:
-        with TestClient(app) as client:
-            # Alice configures her preferences via PUT /api/prefs/{key}
-            put_gen = client.put("/api/prefs/image_model", json={"value": "alice-fav-gen"})
-            assert put_gen.status_code == 200
-            put_edit = client.put("/api/prefs/image_edit_model", json={"value": "alice-fav-edit"})
-            assert put_edit.status_code == 200
-
-            # Verify GET /api/prefs reflects Alice's choices
-            get_prefs = client.get("/api/prefs")
-            assert get_prefs.status_code == 200
-            assert get_prefs.json()["image_model"] == "alice-fav-gen"
-            assert get_prefs.json()["image_edit_model"] == "alice-fav-edit"
-
-            # Alice invokes quick edit with _use_image_settings: True
-            res = client.post("/api/editor/agent", json={
-                "prompt": "generate a cat",
-                "_use_image_settings": True,
-                "model": "stale-browser-edit",
-                "generation_model": "stale-browser-gen",
-            })
-            assert res.status_code == 200
-            assert len(seen) == 1
-            # Authoritative Alice preference overrides stale planner and browser models
-            assert seen[0][1]["model"] == "alice-fav-gen"
-
-            # Now test Bob (who has no preferences) - should receive global admin settings
-            current_user = "bob"
-            seen.clear()
-            res_bob = client.post("/api/editor/agent", json={
-                "prompt": "generate a dog",
-                "_use_image_settings": True,
-                "model": "stale-browser-edit",
-                "generation_model": "stale-browser-gen",
-            })
-            assert res_bob.status_code == 200
-            assert len(seen) == 1
-            # Bob falls back to global default, not Alice's preference
-            assert seen[0][1]["model"] == "admin-global-gen"
-    finally:
-        editor_agent_routes.set_editor_planner(None)
-
-
-def test_is_background_removal_intent_grammar_and_dos_safety():
-    from routes.editor_agent_routes import _is_background_removal_intent
-    import time
-
-    # Valid commands across all verbs and targets
-    assert _is_background_removal_intent("remove background")
-    assert _is_background_removal_intent("please remove the background")
-    assert _is_background_removal_intent("erase bg")
-    assert _is_background_removal_intent("delete backdrop")
-    assert _is_background_removal_intent("clear the bg from the active layer")
-    assert _is_background_removal_intent("strip background of current layer!")
-    assert _is_background_removal_intent("erase backdrop from selected layer...")
-    assert _is_background_removal_intent("  PLEASE  REMOVE  THE  BG  FROM  THE  SELECTED  LAYER . ! ")
-
-    # Invalid commands rejected
-    assert not _is_background_removal_intent("")
-    assert not _is_background_removal_intent("remove foreground")
-    assert not _is_background_removal_intent("please blur the background")
-    assert not _is_background_removal_intent("remove background and make it dark")
-    assert not _is_background_removal_intent("remove")
-    assert not _is_background_removal_intent("background")
-    assert not _is_background_removal_intent("please remove")
-    assert not _is_background_removal_intent("remove the")
-    assert not _is_background_removal_intent("remove background from layer")  # missing active/current/selected
-    assert not _is_background_removal_intent("remove background?")  # unallowed punctuation
-
-    # ReDoS safety test: large repeated whitespace must run linearly in < 50ms
-    evil_padding = " \t " * 10000
-    evil_prompt = evil_padding + "please" + evil_padding + "remove" + evil_padding + "the" + evil_padding + "bg" + evil_padding + "!"
-    start = time.perf_counter()
-    assert _is_background_removal_intent(evil_prompt)
-    elapsed = time.perf_counter() - start
-    assert elapsed < 0.1, f"Intent parsing took too long: {elapsed:.4f}s (polynomial backtracking risk)"
-
-    evil_invalid = evil_padding + "remove" + evil_padding + "everything"
-    start = time.perf_counter()
-    assert not _is_background_removal_intent(evil_invalid)
-    elapsed_invalid = time.perf_counter() - start
-    assert elapsed_invalid < 0.1, f"Invalid intent parsing took too long: {elapsed_invalid:.4f}s"
-
-
-def test_image_generation_global_disabled_user_enabled_rejected(tmp_path, monkeypatch):
-    import asyncio
-    from fastapi import HTTPException
-    from routes.gallery import gallery_routes as gallery
-    from routes import editor_agent_routes, prefs_routes
-    from src import ai_interaction, settings
-
-    prefs_file = str(tmp_path / "user_prefs.json")
-    monkeypatch.setattr(prefs_routes, "PREFS_FILE", prefs_file)
-
-    # Admin globally disables image generation
-    monkeypatch.setattr(settings, "load_settings", lambda: {"image_gen_enabled": False, "image_model": "gpt-image-1"})
-
-    # User 'alice' has image_gen_enabled = True in her preferences
-    prefs_routes._save_for_user("alice", {"image_gen_enabled": True, "image_model": "alice-model"})
-
-    # 1. get_user_setting must be False despite user preference
-    assert settings.get_user_setting("image_gen_enabled", owner="alice", default=True) is False
-
-    # 2. image_editing_provider_available must be False
-    assert ai_interaction.image_editing_provider_available(owner="alice") is False
-
-    # 3. Direct generation must be rejected with admin disabled message
-    direct_res = asyncio.run(ai_interaction.do_generate_image(
-        json.dumps({"prompt": "a dog"}), owner="alice"
-    ))
-    assert "error" in direct_res
-    assert "disabled by the administrator" in direct_res["error"]
-
-    # 4. Gallery route must reject with 503
-    app = FastAPI()
-    app.include_router(gallery.setup_gallery_routes())
-    monkeypatch.setattr(gallery, "require_privilege", lambda request, priv: "alice")
-    with TestClient(app) as client:
-        gal_res = client.post("/api/image/generate", json={"prompt": "a dog"})
-        assert gal_res.status_code == 503
-        assert "switched off" in gal_res.json()["detail"].lower()
-
-    # 5. Editor agent route must be blocked
-    app_editor = FastAPI()
-    app_editor.include_router(editor_agent_routes.setup_editor_agent_routes())
-    monkeypatch.setattr(editor_agent_routes, "_user", lambda request: "alice")
-    routes.set_editor_planner(lambda messages, owner: json.dumps({
-        "reply": "Gen", "steps": [{"op": "generate_image", "params": {"prompt": "a dog"}}]
-    }))
-    try:
-        with TestClient(app_editor) as client:
-            ed_res = client.post("/api/editor/agent", json={"prompt": "create a dog"})
-            assert ed_res.status_code == 200
-            data = ed_res.json()
-            assert data.get("blocked") is True
-            assert data.get("needs_provider") is True
-    finally:
-        routes.set_editor_planner(None)
-
-
-def test_image_generation_global_enabled_user_disabled_rejected(tmp_path, monkeypatch):
-    import asyncio
-    from routes.gallery import gallery_routes as gallery
-    from routes import editor_agent_routes, prefs_routes
-    from src import ai_interaction, settings
-
-    prefs_file = str(tmp_path / "user_prefs.json")
-    monkeypatch.setattr(prefs_routes, "PREFS_FILE", prefs_file)
-
-    # Admin globally enables image generation
-    monkeypatch.setattr(settings, "load_settings", lambda: {"image_gen_enabled": True, "image_model": "gpt-image-1"})
-
-    # User 'bob' has image_gen_enabled = False in his preferences
-    prefs_routes._save_for_user("bob", {"image_gen_enabled": False, "image_model": "bob-model"})
-
-    # 1. get_user_setting must be False per user preference
-    assert settings.get_user_setting("image_gen_enabled", owner="bob", default=True) is False
-
-    # 2. image_editing_provider_available must be False for bob
-    assert ai_interaction.image_editing_provider_available(owner="bob") is False
-
-    # 3. Direct generation must be rejected with user preference message
-    direct_res = asyncio.run(ai_interaction.do_generate_image(
-        json.dumps({"prompt": "a cat"}), owner="bob"
-    ))
-    assert "error" in direct_res
-    assert "disabled by user preference" in direct_res["error"]
-
-    # 4. Gallery route must reject with 503
-    app = FastAPI()
-    app.include_router(gallery.setup_gallery_routes())
-    monkeypatch.setattr(gallery, "require_privilege", lambda request, priv: "bob")
-    with TestClient(app) as client:
-        gal_res = client.post("/api/image/generate", json={"prompt": "a cat"})
-        assert gal_res.status_code == 503
-
-    # 5. Editor agent route must be blocked for bob
-    app_editor = FastAPI()
-    app_editor.include_router(editor_agent_routes.setup_editor_agent_routes())
-    monkeypatch.setattr(editor_agent_routes, "_user", lambda request: "bob")
-    routes.set_editor_planner(lambda messages, owner: json.dumps({
-        "reply": "Gen", "steps": [{"op": "generate_image", "params": {"prompt": "a cat"}}]
-    }))
-    try:
-        with TestClient(app_editor) as client:
-            ed_res = client.post("/api/editor/agent", json={"prompt": "create a cat"})
-            assert ed_res.status_code == 200
-            data = ed_res.json()
-            assert data.get("blocked") is True
-            assert data.get("needs_provider") is True
-    finally:
-        routes.set_editor_planner(None)
-
-
-def test_image_generation_authorized_generation_and_privilege_checks(tmp_path, monkeypatch):
-    import asyncio
-    from fastapi import HTTPException
-    from routes.gallery import gallery_routes as gallery
-    from routes import editor_agent_routes, prefs_routes
-    from src import ai_interaction, settings
-
-    prefs_file = str(tmp_path / "user_prefs.json")
-    monkeypatch.setattr(prefs_routes, "PREFS_FILE", prefs_file)
-
-    # Admin globally enables image generation
-    monkeypatch.setattr(settings, "load_settings", lambda: {"image_gen_enabled": True, "image_model": "gpt-image-1"})
-
-    # User 'charlie' has image generation enabled (no disabling pref)
-    prefs_routes._save_for_user("charlie", {"image_model": "charlie-gen"})
-
-    assert settings.get_user_setting("image_gen_enabled", owner="charlie", default=True) is True
-
-    # Check privilege enforcement: user lacking can_generate_images is forbidden
-    def require_privilege_mock(request, privilege):
-        if privilege == "can_generate_images":
-            raise HTTPException(403, "Permission denied")
-        return "charlie"
-
-    monkeypatch.setattr("src.auth_helpers.require_privilege", require_privilege_mock)
-    monkeypatch.setattr(gallery, "require_privilege", require_privilege_mock)
-
-    # Gallery checks privilege and returns 403
-    app = FastAPI()
-    app.include_router(gallery.setup_gallery_routes())
-    with TestClient(app) as client:
-        gal_res = client.post("/api/image/generate", json={"prompt": "a bird"})
-        assert gal_res.status_code == 403
-        assert "Permission denied" in gal_res.text
-
-    # Editor checks privilege on AI content and raises 403
-    app_editor = FastAPI()
-    app_editor.include_router(editor_agent_routes.setup_editor_agent_routes())
-    monkeypatch.setattr(editor_agent_routes, "_user", lambda request: "charlie")
-    monkeypatch.setattr(editor_agent_routes, "_image_provider_available", lambda owner: True)
-    routes.set_editor_planner(lambda messages, owner: json.dumps({
-        "reply": "Gen", "steps": [{"op": "generate_image", "params": {"prompt": "a bird"}}]
-    }))
-    try:
-        with TestClient(app_editor) as client:
-            ed_res = client.post("/api/editor/agent", json={"prompt": "create a bird"})
-            assert ed_res.status_code == 403
-    finally:
-        routes.set_editor_planner(None)
-
-    # Now grant privilege: generation proceeds
-    monkeypatch.setattr("src.auth_helpers.require_privilege", lambda request, priv: "charlie")
-    monkeypatch.setattr(gallery, "require_privilege", lambda request, priv: "charlie")
-    seen = []
-    async def fake_do_generate(content, **kwargs):
-        seen.append(kwargs)
-        return {"image_url": "data:image/png;base64,dGVzdA=="}
-    monkeypatch.setattr(ai_interaction, "do_generate_image", fake_do_generate)
-
-    with TestClient(app) as client:
-        gal_ok = client.post("/api/image/generate", json={"prompt": "a bird"})
-        assert gal_ok.status_code == 200
-        assert seen[0]["owner"] == "charlie"
-
-
-def test_put_pref_clears_key_when_value_is_null(tmp_path, monkeypatch):
-    from routes import prefs_routes
-    from src import settings
-
-    prefs_file = str(tmp_path / "user_prefs.json")
-    monkeypatch.setattr(prefs_routes, "PREFS_FILE", prefs_file)
-
-    # Set initial preference
-    prefs_routes._save_for_user("admin_user", {"image_model": "old-admin-model"})
-    assert prefs_routes._load_for_user("admin_user").get("image_model") == "old-admin-model"
-
-    app = FastAPI()
-    app.include_router(prefs_routes.setup_prefs_routes())
-    monkeypatch.setattr("src.auth_helpers.get_current_user", lambda request: "admin_user")
-    monkeypatch.setattr(prefs_routes, "get_current_user", lambda request: "admin_user")
-
-    with TestClient(app) as client:
-        res = client.put("/api/prefs/image_model", json={"value": None})
-        assert res.status_code == 200
-        assert res.json() == {"key": "image_model", "value": None}
-
-    # Verify key is deleted from user's record
-    user_prefs = prefs_routes._load_for_user("admin_user")
-    assert "image_model" not in user_prefs
-
-    # Verify get_user_setting now falls back to global setting
-    monkeypatch.setattr(settings, "load_settings", lambda: {"image_model": "new-global-model"})
-    assert settings.get_user_setting("image_model", owner="admin_user") == "new-global-model"

tests/test_editor_keyboard_shortcuts.py

@@ -49,9 +49,10 @@ def test_ctrl_zoom_shortcuts_drive_the_toolbar_and_override_the_browser():
 
 def test_ctrl_alt_l_opens_the_levels_adjustment():
     keyboard = (ROOT / "static/js/editor/keyboard-shortcuts.js").read_text(encoding="utf-8")
-    # Open layer-local controls without creating/committing a new adjustment layer.
+    # Photoshop-style chord: reuse the Image menu row so the dialog and the
+    # adjustment-layer plumbing stay in one place.
     assert "e.altKey && e.code === 'KeyL'" in keyboard
-    assert "openLayerAdjustment?.('levels');" in keyboard
+    assert "document.querySelector('[data-image-action=\"adj-levels\"]')" in keyboard
 
 
 def test_ctrl_alt_shift_e_stamps_the_visible_layers():

tests/test_editor_layer_scoped_actions_browser.py

@@ -1,992 +0,0 @@
-import os
-from pathlib import Path
-
-import pytest
-
-try:
-    from playwright.sync_api import sync_playwright
-except ImportError:
-    sync_playwright = None
-
-ROOT = Path(__file__).resolve().parents[1]
-
-
-@pytest.fixture
-def page():
-    if sync_playwright is None:
-        pytest.fail("playwright is required for editor browser tests. Install requirements-dev.txt")
-    with sync_playwright() as playwright:
-        launch_kwargs = {"headless": True, "args": ["--disable-dev-shm-usage", "--no-sandbox"]}
-        if os.environ.get("PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH"):
-            launch_kwargs["executable_path"] = os.environ["PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH"]
-        browser = playwright.chromium.launch(**launch_kwargs)
-        page = browser.new_page(viewport={"width": 1000, "height": 700})
-
-        def serve(route):
-            url = route.request.url
-            if '/api/' in url:
-                route.fulfill(status=404, body='{}', content_type='application/json')
-                return
-            relative = url.split('http://editor.test/', 1)[1].split('?', 1)[0]
-            if not relative:
-                route.fulfill(body='<html><body></body></html>', content_type='text/html')
-            elif (ROOT / relative).is_file():
-                route.fulfill(path=str(ROOT / relative))
-            else:
-                route.fulfill(status=404, body='Not found')
-
-        page.route('http://editor.test/**', serve)
-        page.goto('http://editor.test/')
-        yield page
-        browser.close()
-
-
-def test_remove_background_sends_only_active_layer_and_preserves_others(page):
-    result = page.evaluate("""async () => {
-      const {state} = await import('/static/js/editor/state.js');
-      const {createApplyImageTool} = await import('/static/js/editor/ai-tool-runner.js');
-      function layer(id, color) {
-        const canvas = document.createElement('canvas'); canvas.width = canvas.height = 4;
-        const ctx = canvas.getContext('2d'); ctx.fillStyle = color; ctx.fillRect(0,0,4,4);
-        return {id, canvas, ctx, visible:true, locks:{}};
-      }
-      const red = layer('red','red'), blue = layer('blue','blue');
-      red.kind = 'placed'; red.placed = {sourceName:'original'};
-      state.layers = [red, blue]; state.activeLayerId = red.id; state.editorOpen = true;
-      const beforeBlue = blue.canvas.toDataURL(); const expected = red.canvas.toDataURL().split(',')[1];
-      let sent, snapshots = 0;
-      const clear = document.createElement('canvas'); clear.width = clear.height = 4;
-      window.fetch = async (url, opts) => {
-        sent = JSON.parse(opts.body);
-        state.activeLayerId = blue.id; // Changing selection during the request must not change its target.
-        return {ok:true, json:async () => ({image:clear.toDataURL()})};
-      };
-      const run = createApplyImageTool({
-        flatten: () => {throw Error('Must not flatten');}, saveState: () => snapshots++,
-        createLayer: () => {throw Error('Must not create a merged layer');},
-        composite: () => {}, renderLayerPanel: () => {}, deriveBusyLabel: () => 'Removing',
-        getSelectedAIEndpoint: () => ({}), spinnerModule: {}, uiModule: {showToast(){}},
-      });
-      await run('/api/image/remove-bg', {}, 'BG Removed', document.createElement('button'));
-      return {correctInput:sent.image === expected, blueUnchanged:blue.canvas.toDataURL() === beforeBlue,
-        count:state.layers.length, visible:state.layers.every(l => l.visible), snapshots,
-        alpha:red.ctx.getImageData(0,0,1,1).data[3], kind:red.kind, placed:red.placed};
-    }""")
-    assert result == dict(correctInput=True, blueUnchanged=True, count=2, visible=True, snapshots=1, alpha=0, kind='raster', placed=None)
-
-
-def test_levels_shortcut_opens_controls_without_menu_commit(page):
-    result = page.evaluate("""async () => {
-      const {state} = await import('/static/js/editor/state.js');
-      const {wireKeyboardShortcuts} = await import('/static/js/editor/keyboard-shortcuts.js');
-      state.editorOpen = true;
-      let selected;
-      wireKeyboardShortcuts({toolbar:document.createElement('div'), toolKeyMap:{},
-        openLayerAdjustment:type => selected = type});
-      const event = new KeyboardEvent('keydown', {key:'l', code:'KeyL', ctrlKey:true, altKey:true,
-        bubbles:true, cancelable:true});
-      document.dispatchEvent(event);
-      return {selected, prevented:event.defaultPrevented};
-    }""")
-    assert result == dict(selected='levels', prevented=True)
-
-
-def test_hue_saturation_shortcut_opens_adjustment(page):
-    result = page.evaluate("""async () => {
-      const {state} = await import('/static/js/editor/state.js');
-      const {wireKeyboardShortcuts} = await import('/static/js/editor/keyboard-shortcuts.js');
-      state.editorOpen = true;
-      let selected;
-      wireKeyboardShortcuts({toolbar:document.createElement('div'), toolKeyMap:{},
-        openLayerAdjustment:type => selected = type});
-      const event = new KeyboardEvent('keydown', {key:'U', code:'KeyU', ctrlKey:true, shiftKey:true,
-        bubbles:true, cancelable:true});
-      document.dispatchEvent(event);
-      return {selected, prevented:event.defaultPrevented};
-    }""")
-    assert result == dict(selected='hue-saturation', prevented=True)
-
-
-def test_inner_shadow_clips_inside_and_reverses_direction(page):
-    result = page.evaluate("""async () => {
-      const {renderEffects} = await import('/static/js/editor/effects.js');
-      const source = document.createElement('canvas'); source.width=source.height=60;
-      const ctx=source.getContext('2d');ctx.fillStyle='white';ctx.fillRect(15,15,30,30);
-      function sample(inside,x) {
-        const out=renderEffects(source,[{type:'drop-shadow',params:{inside,x,y:0,blur:0,opacity:1,color:'#000000'}}]);
-        const c=out.getContext('2d');
-        return {left:[...c.getImageData(16,30,1,1).data],right:[...c.getImageData(43,30,1,1).data],
-          outside:[...c.getImageData(47,30,1,1).data]};
-      }
-      return {right:sample(true,6),left:sample(true,-6),outer:sample(false,6)};
-    }""")
-    assert result['right']['left'] == [0,0,0,255]
-    assert result['right']['right'] == [255,255,255,255]
-    assert result['left']['right'] == [0,0,0,255]
-    assert result['right']['outside'][3] == 0
-    assert result['outer']['outside'] == [0,0,0,255]
-
-
-def test_cut_placed_image_rasterizes_once_without_confirmation(page):
-    page.route('http://editor.test/api/**', lambda route: route.fulfill(json={}))
-    page.evaluate("""async () => {
-      document.body.innerHTML='<div id="toast"></div><div id="gallery-editor-container"></div>';
-      const editor=await import('/static/js/galleryEditor.js');
-      const {state}=await import('/static/js/editor/state.js');
-      editor.openEditor(null,null,{w:32,h:32},'Cut test');
-      const layer=state.layers.at(-1);
-      layer.ctx.fillStyle='red';layer.ctx.fillRect(0,0,32,32);
-      layer.kind='placed';layer.placed={sourceName:'Original image'};
-      document.activeElement?.blur();
-      document.dispatchEvent(new KeyboardEvent('keydown',{key:'x',code:'KeyX',ctrlKey:true,bubbles:true,cancelable:true}));
-    }""")
-    page.wait_for_function("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      return !!state.internalClipboard && state.layers.at(-1).ctx.getImageData(0,0,1,1).data[3]===0;
-    }""")
-    result=page.evaluate("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      return {kind:state.layers.at(-1).kind,placed:state.layers.at(-1).placed,
-        copied:[...state.internalClipboard.getContext('2d').getImageData(0,0,1,1).data],
-        prompted:document.querySelector('#styled-confirm-modal')?.textContent?.includes('Rasterize layer')||false};
-    }""")
-    assert result==dict(kind='raster',placed=None,copied=[255,0,0,255],prompted=False)
-
-
-def test_drop_shadow_dialog_inside_and_direction_apply(page):
-    page.route('http://editor.test/api/**', lambda route: route.fulfill(json={}))
-    page.add_style_tag(content=(ROOT/'static/css/13-image-editor.css').read_text())
-    page.add_style_tag(content=':root{--panel:#242426;--bg:#171719;--fg:#eee;--border:#454549;--red:#d47965;}body{background:var(--bg);color:var(--fg);font-family:Arial,sans-serif;}')
-    page.evaluate("""async () => {
-      document.body.innerHTML='<div id="toast"></div><div id="gallery-editor-container" style="height:680px"></div>';
-      const editor=await import('/static/js/galleryEditor.js');
-      editor.openEditor(null,null,{w:64,h:64},'Shadow test');
-      document.querySelector('[data-filter-action="effect-drop-shadow"]').click();
-    }""")
-    page.locator('.ge-filter-overlay select[data-key="inside"]').select_option('1')
-    page.locator('.ge-filter-overlay input[data-key="angle"]').evaluate("el=>{el.value='90';el.dispatchEvent(new Event('input',{bubbles:true}));}")
-    page.screenshot(path='/tmp/editor-shadow-inside-direction.png')
-    page.locator('.ge-filter-overlay [data-action="apply"]').click()
-    page.wait_for_function("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      return state.layers.at(-1).effects.length===1;
-    }""")
-    result=page.evaluate("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      const {inside,x,y}=state.layers.at(-1).effects[0].params;
-      return {inside,x,y};
-    }""")
-    assert result==dict(inside=True,x=0,y=-7)
-
-
-def test_reorder_rebuilds_effect_rows_under_their_parent(page):
-    result=page.evaluate("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      const {createLayerPanelRenderer}=await import('/static/js/editor/layer-panel.js');
-      document.body.innerHTML='<div id="ge-layers-list"></div>';
-      state.container=document.body;state.editorOpen=true;
-      function layer(id,effects=[]) {
-        const canvas=document.createElement('canvas');canvas.width=canvas.height=16;
-        return {id,name:id,kind:'raster',canvas,ctx:canvas.getContext('2d'),visible:true,
-          opacity:1,locks:{},effects,masks:[],adjLayers:[]};
-      }
-      const a=layer('a',[{id:'shadow-a',type:'drop-shadow',params:{}}]), b=layer('b');
-      state.layers=[a,b];state.activeLayerId=a.id;state.layerOffsets=new Map();state.layerGroups=[];
-      let options;
-      const renderer=createLayerPanelRenderer({composite(){},saveState(){},
-        dragSortModule:{enable:(id,selector,config)=>{options=config;}},uiModule:{showToast(){}}});
-      renderer.render();
-      const list=document.getElementById('ge-layers-list');
-      const row=id=>list.querySelector(`.ge-layer-item[data-layer-id="${id}"]`);
-      list.insertBefore(row('a'),row('b'));
-      options.onReorder([...list.querySelectorAll('.ge-layer-item[data-layer-id]')]);
-      return {order:state.layers.map(layer=>layer.id),excluded:options.excludeSelector,
-        rows:[...list.children].map(el=>el.dataset.layerId||el.dataset.effectId)};
-    }""")
-    assert result==dict(order=['b','a'],excluded='.ge-adj-sub-item',rows=['a','shadow-a','b'])
-
-
-@pytest.mark.parametrize('tool', ['marquee','lasso'])
-@pytest.mark.parametrize('pointer_type', ['mouse','pen','touch'])
-@pytest.mark.parametrize('pan', [False,True])
-def test_selections_start_outside_canvas_unless_explicitly_panning(page,tool,pointer_type,pan):
-    result=page.evaluate("""async ({tool,pointerType,pan}) => {
-      const {state}=await import('/static/js/editor/state.js');
-      const {wireCanvasEvents}=await import('/static/js/editor/canvas-events.js');
-      document.body.innerHTML='<div id="area"><canvas width="100" height="100"></canvas><button>Chrome</button></div>';
-      const area=document.getElementById('area');
-      state.mainCanvas=area.querySelector('canvas');state.tool=tool;
-      state.editorOpen=true;state.spacePanActive=pan;state.panX=state.panY=0;
-      let starts=0,moves=0,ends=0;
-      wireCanvasEvents({canvasArea:area,beginDraw:()=>starts++,continueDraw:()=>moves++,
-        endDraw:()=>ends++,updateBrushCursor(){},syncZoomControls(){}});
-      function pointer(type,target=area) {
-        target.dispatchEvent(new PointerEvent(type,{pointerId:5,pointerType,button:0,
-          clientX:type==='pointerdown'?10:30,clientY:type==='pointerdown'?10:30,bubbles:true,cancelable:true}));
-      }
-      pointer('pointerdown');
-      if(pointerType==='mouse')area.dispatchEvent(new MouseEvent('mousedown',{button:0,bubbles:true}));
-      pointer('pointermove');
-      if(pointerType==='mouse')window.dispatchEvent(new MouseEvent('mousemove'));
-      pointer('pointerup');
-      if(pointerType==='mouse')window.dispatchEvent(new MouseEvent('mouseup'));
-      const after={starts,moves,ends,panX:state.panX};
-      pointer('pointerdown',area.querySelector('button'));
-      return {...after,chromeStarted:starts!==after.starts};
-    }""",dict(tool=tool,pointerType=pointer_type,pan=pan))
-    assert result['starts']==(0 if pan else 1)
-    assert result['panX']==(20 if pan else 0)
-    assert not result['chromeStarted']
-    if not pan:
-        assert result['moves']==1
-        assert result['ends']==1
-
-
-def test_marquee_drag_from_workspace_creates_clipped_selection(page):
-    result=page.evaluate("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      const {wireCanvasEvents}=await import('/static/js/editor/canvas-events.js');
-      const {createMarqueeTool}=await import('/static/js/editor/tools/marquee.js');
-      document.body.innerHTML='<div id="area"><canvas width="100" height="100" style="position:absolute;left:100px;top:100px;width:100px;height:100px"></canvas></div>';
-      const area=document.getElementById('area');state.mainCanvas=area.querySelector('canvas');
-      state.tool='marquee';state.imgWidth=state.imgHeight=100;state.editorOpen=true;
-      state.spacePanActive=false;state.panX=state.panY=0;state.wandMask=null;
-      const layer={id:'a'};state.layers=[layer];state.activeLayerId='a';state.layerOffsets=new Map();
-      const tool=createMarqueeTool({activeLayer:()=>layer,saveState(){},composite(){},drawOverlay(){},syncSelectionUi(){}});
-      wireCanvasEvents({canvasArea:area,beginDraw:e=>tool.begin(e),continueDraw:e=>tool.drag(e),
-        endDraw:e=>tool.end(e),updateBrushCursor(){},syncZoomControls(){}});
-      area.dispatchEvent(new PointerEvent('pointerdown',{pointerType:'mouse',pointerId:1,button:0,clientX:80,clientY:80,bubbles:true}));
-      area.dispatchEvent(new MouseEvent('mousedown',{button:0,clientX:80,clientY:80,bubbles:true}));
-      window.dispatchEvent(new MouseEvent('mousemove',{clientX:150,clientY:150}));
-      window.dispatchEvent(new MouseEvent('mouseup',{clientX:150,clientY:150}));
-      const ctx=state.wandMask.getContext('2d');
-      return {inside:ctx.getImageData(0,0,1,1).data[3],outside:ctx.getImageData(70,70,1,1).data[3],pan:state.panX};
-    }""")
-    assert result==dict(inside=255,outside=0,pan=0)
-
-
-def test_save_menu_remains_clickable_after_png_export_and_window_raise(page):
-    page.add_style_tag(content='''
-      .modal {position:fixed;inset:0;z-index:20000;background:#222;}
-      #ge-save-menu-btn {position:absolute;right:20px;top:20px;}
-      .ge-save-menu {position:fixed;z-index:10005;width:200px;background:#333;}
-      .ge-save-menu[hidden] {display:none;}
-      .ge-save-menu button {display:block;width:100%;height:30px;}
-    ''')
-    page.evaluate("""async () => {
-      const {wireTopbar}=await import('/static/js/editor/wire-topbar.js');
-      document.body.innerHTML='<div id="gallery-modal" class="modal"><div id="gallery-editor-container"><div class="ge-topbar"><div class="ge-save-wrap"><button id="ge-save-menu-btn">Save</button><div id="ge-save-menu" class="ge-save-menu" hidden><button id="ge-save">Save image</button><button id="ge-export-png">Save as PNG</button></div></div></div></div></div>';
-      window.pngExports=0;window.saves=0;
-      document.getElementById('ge-save').addEventListener('click',()=>window.saves++);
-      wireTopbar({registerDocClickAway(){},exportPNGFile:()=>window.pngExports++});
-    }""")
-    page.locator('#ge-save-menu-btn').click()
-    page.locator('#ge-export-png').click(timeout=2000)
-    page.evaluate("document.getElementById('gallery-modal').style.zIndex='50000'")
-    page.locator('#ge-save-menu-btn').click()
-    page.locator('#ge-save').click(timeout=2000)
-    assert page.evaluate('({png:window.pngExports,saves:window.saves})') == dict(png=1,saves=1)
-
-
-def test_submenu_hover_aligns_to_row_and_flips_at_right_edge(page):
-    page.add_style_tag(content='''
-      #menu {position:absolute; left:780px; top:100px; width:180px;}
-      button {display:block; height:35px; width:180px;}
-      .ge-submenu {display:none; position:absolute; width:160px; height:120px; top:0; left:100%;}
-      .ge-menu-parent:hover + .ge-submenu {display:block;}
-    ''')
-    page.evaluate("""async () => {
-      document.body.innerHTML = '<div id="menu"><button>First</button><button>Second</button>'
-        + '<button class="ge-menu-parent">Blur &gt;</button><div class="ge-submenu">Gaussian</div></div>';
-      const {wireSubmenuToggles} = await import('/static/js/editor/submenu-toggles.js');
-      wireSubmenuToggles(document.getElementById('menu'));
-    }""")
-    page.locator('.ge-menu-parent').hover()
-    row = page.locator('.ge-menu-parent').bounding_box()
-    panel = page.locator('.ge-submenu').bounding_box()
-    assert abs(panel['y'] - row['y']) <= 1
-    assert panel['x'] + panel['width'] <= row['x'] + 1
-    page.screenshot(path='/tmp/editor-submenu-alignment.png')
-
-
-@pytest.mark.parametrize('prompt', ['remove bg', 'remove background', 'remove the background from the selected layer'])
-def test_quick_edit_planner_uses_background_tool(prompt):
-    from routes.editor_agent_routes import _plan_special
-    steps, _, _ = _plan_special(prompt, {}, True)
-    assert steps == [{'op': 'ai.removeBackground', 'params': {}}]
-
-
-def test_quick_edit_background_removal_precedes_creative_routing():
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    local = source.split('const _executeQuickEditLocal = async (prompt) => {', 1)[1]
-    assert local.index('if (_looksBackgroundRemoval(p))') < local.index('if (_looksRecolor(p))')
-
-
-@pytest.mark.parametrize('run', [False, True])
-def test_background_tool_suggestion_prepares_command_and_enter_submits(page, run):
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    picker = 'const pickSuggestion = ' + source.split('const pickSuggestion = ', 1)[1].split("  wrap.addEventListener('pointerdown'", 1)[0]
-    assert "runPrompt: id === 'rembg' ? 'remove background' : null" in source
-    result = page.evaluate("""({picker, run}) => {
-      const suggestionItems = [{toolId:'rembg', label:'Bg Remove', runPrompt:'remove background'}];
-      const input = document.createElement('input'); input.value = 'bg';
-      let submitted = 0, selected = null, clearSynced = false;
-      const form = {requestSubmit: () => submitted++};
-      const _clickToolButton = id => selected = id;
-      const _setAiCommandStatus = () => {};
-      const hideSuggestions = () => {};
-      const syncClearButton = () => clearSynced = true;
-      eval(picker + '; pickSuggestion(0, run);');
-      return {prompt:input.value, submitted, selected, clearSynced};
-    }""", {'picker':picker, 'run':run})
-    assert result == dict(prompt='remove background', submitted=int(run), selected='rembg', clearSynced=True)
-
-
-@pytest.mark.parametrize('tool', ['dodge', 'burn'])
-def test_retouch_invalidates_adjustment_preview_and_stops_before_undo(page, tool):
-    result = page.evaluate("""async tool => {
-      const {state} = await import('/static/js/editor/state.js');
-      const {createStrokePipeline} = await import('/static/js/editor/stroke-pipeline.js');
-      const {renderLayerWithAdjLayers} = await import('/static/js/editor/fx/pixel-pass.js');
-      const canvas = document.createElement('canvas'); canvas.width = canvas.height = 30;
-      const ctx = canvas.getContext('2d'); ctx.fillStyle = 'rgb(100,100,100)'; ctx.fillRect(0,0,30,30);
-      const layer = {id:'target', canvas, ctx, adjLayers:[{id:'adj', type:'brightness-contrast',
-        params:{brightness:1.1,contrast:1}, visible:true, opacity:1}]};
-      state.layers = [layer]; state.layerOffsets = new Map(); state.tool = tool;
-      Object.assign(state,{brushSize:12, brushOpacity:100, brushFlow:100, brushSoftness:0,
-        brushSpacing:20, brushSmoothing:0, dodgeBurnIntensity:50});
-      const original = ctx.getImageData(0,0,30,30);
-      const pixel = () => renderLayerWithAdjLayers(layer).getContext('2d').getImageData(15,15,1,1).data[0];
-      const before = pixel();
-      const pipeline = createStrokePipeline({activeLayer:()=>layer, getActiveMaskLayer:()=>null, composite:()=>{}});
-      pipeline.beginStroke({x:15,y:15,pressure:1},tool);
-      const during = pixel();
-      pipeline.endStroke(null); // Finish before Undo restores the saved pixels.
-      ctx.putImageData(original,0,0); layer._adjFinalKey = null; layer._adjCacheKey = null;
-      pipeline.endStroke({x:28,y:28,pressure:1}); // A late pointer-up cannot replay this stroke.
-      return {before,during,after:pixel(),corner:ctx.getImageData(28,28,1,1).data[0]};
-    }""", tool)
-    assert result['during'] > result['before'] if tool == 'dodge' else result['during'] < result['before']
-    assert result['after'] == result['before']
-    assert result['corner'] == 100
-
-
-def test_undo_finishes_active_stroke_before_restoring_history():
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    undo = source.split('function undo() {', 1)[1].split('function redo()', 1)[0]
-    assert undo.index('if (state.drawing) _strokeTool.tryEnd();') < undo.index('state.undoStack.pop()')
-
-
-@pytest.mark.parametrize('width,height', [(1000,700), (390,844)])
-def test_filter_submenu_rows_have_equal_heights_with_and_without_icons(page, width, height):
-    page.set_viewport_size({'width':width,'height':height})
-    page.add_style_tag(content=(ROOT / 'static/css/13-image-editor.css').read_text())
-    page.evaluate("""() => {
-      document.body.innerHTML = '<div class="ge-submenu" style="display:block;left:8px;top:8px;">'
-        + '<button class="dropdown-item-compact"><span>Plain</span></button>'
-        + '<button class="dropdown-item-compact"><svg width="24" height="24"><circle cx="12" cy="12" r="8"/></svg><span>Icon</span></button>'
-        + '<button class="dropdown-item-compact"><span>Longer label</span><svg width="10" height="10"></svg></button></div>';
-    }""")
-    heights = page.locator('.dropdown-item-compact').evaluate_all('(rows)=>rows.map(row=>row.getBoundingClientRect().height)')
-    assert heights == ([28]*3 if width > 820 else [32]*3)
-    page.screenshot(path=f'/tmp/editor-filter-row-heights-{width}.png')
-
-
-def test_ai_settings_escape_closes_only_the_dialog(page):
-    page.route('**/api/auth/settings', lambda route: route.fulfill(json={'image_model':'', 'image_edit_model':''}))
-    result = page.evaluate("""async () => {
-      const {createAiSettings} = await import('/static/js/editor/ai-settings.js');
-      const container = document.createElement('div'); document.body.append(container);
-      const settings = createAiSettings({container}); settings.open();
-      let reachedEditor = false;
-      document.addEventListener('keydown', () => reachedEditor = true, {capture:true, once:true});
-      document.dispatchEvent(new KeyboardEvent('keydown', {key:'Escape', bubbles:true, cancelable:true}));
-      const result = {closed:settings.element.hidden, reachedEditor}; settings.destroy();
-      return result;
-    }""")
-    assert result == dict(closed=True, reachedEditor=False)
-
-
-def test_image_model_settings_sync_both_directions_and_survive_reopening(page):
-    saved = {'image_model':'openai/gpt-5-image', 'image_edit_model':'', 'image_quality':'medium', 'image_gen_enabled':True}
-    writes = []
-    user_prefs = {}
-
-    def settings_api(route):
-        if route.request.method == 'POST':
-            patch = route.request.post_data_json
-            writes.append(patch)
-            saved.update(patch)
-        route.fulfill(json=dict(saved))
-
-    def prefs_api(route):
-        url = route.request.url
-        if route.request.method == 'PUT':
-            key = url.split('/api/prefs/')[-1]
-            data = route.request.post_data_json or {}
-            val = data.get('value')
-            if val is None:
-                user_prefs.pop(key, None)
-            else:
-                user_prefs[key] = val
-            route.fulfill(status=200, json={'key': key, 'value': val})
-            return
-        route.fulfill(status=200, json=dict(user_prefs))
-
-    page.route('**/api/auth/settings', settings_api)
-    page.route('**/api/prefs**', prefs_api)
-    page.route('**/api/model-endpoints', lambda route: route.fulfill(json=[{
-        'is_enabled':True, 'online':True, 'model_type':'llm',
-        'models':['openai/gpt-5-image','openai/gpt-image-2'],
-    }]))
-    page.evaluate("""async () => {
-      document.body.innerHTML = '<select id="set-imgModelSelect"><option value="">Auto</option></select>'
-        + '<select id="set-imgEditModelSelect"><option value="">Same</option></select>'
-        + '<select id="set-imgQualitySelect"><option value="medium">Medium</option></select>'
-        + '<input type="checkbox" id="set-imgEnabledToggle"><span id="set-imgSettingsMsg"></span>';
-      const {initImageSettings} = await import('/static/js/settings/imageModels.js');
-      await initImageSettings();
-      const {createAiSettings} = await import('/static/js/editor/ai-settings.js');
-      window.dialog = createAiSettings({container:document.body});
-      for (const id of ['ge-ai-model','ge-ai-command-model']) {
-        const select = document.getElementById(id);
-        for (const model of ['', 'openai/gpt-5-image','openai/gpt-image-2']) {
-          const option = document.createElement('option');
-          option.value = model ? 'https://openrouter.ai/api/v1::'+model : '';
-          option.textContent = model || 'Auto'; select.append(option);
-        }
-      }
-      dialog.open();
-    }""")
-    page.wait_for_function("document.getElementById('ge-ai-model').value.endsWith('::openai/gpt-5-image')")
-    page.select_option('#ge-ai-model', 'https://openrouter.ai/api/v1::openai/gpt-image-2')
-    page.wait_for_function("document.getElementById('set-imgModelSelect').value === 'openai/gpt-image-2'")
-    assert saved['image_model'] == 'openai/gpt-image-2'
-    page.select_option('#set-imgEditModelSelect', 'openai/gpt-image-2')
-    page.wait_for_function("document.getElementById('ge-ai-command-model').value.endsWith('::openai/gpt-image-2')")
-    page.evaluate('dialog.close(); dialog.open();')
-    page.wait_for_function("document.getElementById('ge-ai-command-model').value.endsWith('::openai/gpt-image-2')")
-    assert saved['image_edit_model'] == 'openai/gpt-image-2'
-    assert len(writes) == 2
-
-
-def test_non_admin_image_model_preferences_persist_and_reload(page):
-    global_settings = {
-        'image_model': 'global-default-gen',
-        'image_edit_model': '',
-        'image_quality': 'medium',
-        'image_gen_enabled': True,
-    }
-    user_prefs = {}
-    auth_posts = []
-    pref_puts = []
-    is_admin = False
-
-    def handle_auth_settings(route):
-        if route.request.method == 'POST':
-            auth_posts.append(route.request.post_data_json)
-            if not is_admin:
-                route.fulfill(status=403, json={'error': 'Admin access is required to change these settings.'})
-                return
-            global_settings.update(route.request.post_data_json)
-            route.fulfill(status=200, json=dict(global_settings))
-            return
-        route.fulfill(status=200, json=dict(global_settings))
-
-    def handle_prefs(route):
-        url = route.request.url
-        if route.request.method == 'PUT':
-            key = url.split('/api/prefs/')[-1]
-            data = route.request.post_data_json or {}
-            val = data.get('value')
-            pref_puts.append((key, val))
-            if val is None:
-                user_prefs.pop(key, None)
-            else:
-                user_prefs[key] = val
-            route.fulfill(status=200, json={'key': key, 'value': val})
-            return
-        route.fulfill(status=200, json=dict(user_prefs))
-
-    page.route('**/api/auth/settings', handle_auth_settings)
-    page.route('**/api/prefs**', handle_prefs)
-    page.route('**/api/model-endpoints', lambda route: route.fulfill(json=[{
-        'is_enabled': True, 'online': True, 'model_type': 'llm',
-        'models': ['global-default-gen', 'openai/gpt-5-image', 'openai/gpt-image-2'],
-    }]))
-
-    # Step 1: Non-admin loads image settings, selects a preference
-    page.evaluate("""async () => {
-      document.body.innerHTML = '<select id="set-imgModelSelect"><option value="">Auto</option></select>'
-        + '<select id="set-imgEditModelSelect"><option value="">Same</option></select>'
-        + '<select id="set-imgQualitySelect"><option value="medium">Medium</option></select>'
-        + '<input type="checkbox" id="set-imgEnabledToggle" checked><span id="set-imgSettingsMsg"></span>';
-      const {initImageSettings} = await import('/static/js/settings/imageModels.js');
-      await initImageSettings();
-    }""")
-
-    # Non-admin changes generation model
-    page.select_option('#set-imgModelSelect', 'openai/gpt-image-2')
-
-    # Wait for status message to show 'Saved'
-    page.wait_for_function("document.getElementById('set-imgSettingsMsg').textContent === 'Saved'")
-    msg_color = page.evaluate("document.getElementById('set-imgSettingsMsg').style.color")
-    assert msg_color == 'var(--fg)', f"Expected var(--fg), got {msg_color}"
-
-    # Verify per-user preference was saved and global toggle was NOT propagated
-    assert user_prefs.get('image_model') == 'openai/gpt-image-2'
-    assert 'image_gen_enabled' not in user_prefs, "Global policy toggle must not be saved to user prefs"
-
-    # Step 2: Simulate page reload / re-initialization for non-admin
-    page.evaluate("""async () => {
-      document.getElementById('set-imgModelSelect').value = '';
-      const {initImageSettings} = await import('/static/js/settings/imageModels.js');
-      await initImageSettings();
-    }""")
-    page.wait_for_function("document.getElementById('set-imgModelSelect').value === 'openai/gpt-image-2'")
-    assert page.evaluate("document.getElementById('set-imgModelSelect').value") == 'openai/gpt-image-2'
-
-    # Step 3: Admin saves settings - pre-existing per-user preferences must be cleared
-    is_admin = True
-    page.evaluate("""async () => {
-      const {saveImagePreferences} = await import('/static/js/settings/imagePreferences.js');
-      await saveImagePreferences({ image_model: 'admin-chosen-model', image_edit_model: '', image_quality: 'high', image_gen_enabled: true });
-    }""")
-    # Verify per-user preference for image_model was cleared (PUT with value: null)
-    assert 'image_model' not in user_prefs, "Admin save must clear pre-existing per-user preference"
-    assert global_settings['image_model'] == 'admin-chosen-model'
-
-    # Admin reloads settings - receives newly saved global setting, not stale pref
-    page.evaluate("""async () => {
-      const {initImageSettings} = await import('/static/js/settings/imageModels.js');
-      await initImageSettings();
-    }""")
-    assert global_settings['image_model'] == 'admin-chosen-model'
-
-
-def test_generation_places_result_without_stretching_or_refresh(page):
-    result = page.evaluate("""async () => {
-      const {createImageGenerationAction} = await import('/static/js/editor/image-generation.js');
-      const image = document.createElement('canvas'); image.width = 80; image.height = 20;
-      const ctx = image.getContext('2d'); ctx.fillStyle = 'red'; ctx.fillRect(0,0,80,20);
-      const selection = document.createElement('canvas'); selection.width = selection.height = 40;
-      selection.getContext('2d').fillRect(0,0,40,40);
-      let placed = null, body = null;
-      const run = createImageGenerationAction({
-        getDocument:()=>({key:'one',width:40,height:40,mask:selection}),
-        fetchImpl:async (url,opts) => {
-          body = JSON.parse(opts.body);
-          selection.getContext('2d').clearRect(0,0,40,40);
-          return {ok:true,json:async()=>({image:image.toDataURL()})};
-        },
-        placeResult:(canvas,name,mask)=>{
-          const data = canvas.getContext('2d');
-          placed = {width:canvas.width,height:canvas.height,left:data.getImageData(0,10,1,1).data[0],
-            right:data.getImageData(79,10,1,1).data[0], mask:mask.getContext('2d').getImageData(20,20,1,1).data[3]};
-          return 'new-layer';
-        },
-      });
-      const id = await run({prompt:'a cow',masked:true});
-      return {id,placed,body};
-    }""")
-    assert result['id'] == 'new-layer'
-    assert result['placed'] == dict(width=80,height=20,left=255,right=255,mask=255)
-    assert result['body'] == dict(_use_image_settings=True,prompt='a cow',width=40,height=40)
-
-
-@pytest.mark.parametrize('action', ['cancel','timeout','invalid-image','document-switch'])
-def test_generation_finishes_cleanly_on_failure_without_late_placement(page, action):
-    result = page.evaluate("""async action => {
-      const {createImageGenerationAction} = await import('/static/js/editor/image-generation.js');
-      let key = 'original', placements = 0;
-      const controller = new AbortController();
-      const run = createImageGenerationAction({
-        getDocument:()=>({key,width:40,height:40}), getSignal:()=>controller.signal,
-        timeoutMs:action === 'timeout' ? 20 : 2000,
-        fetchImpl:async (url,opts)=>{
-          if (action === 'timeout' || action === 'cancel') {
-            if (action === 'cancel') setTimeout(()=>controller.abort(),10);
-            return new Promise((resolve,reject)=>opts.signal.addEventListener('abort',
-              ()=>reject(new DOMException('Aborted','AbortError')), {once:true}));
-          }
-          if (action === 'invalid-image') return {ok:true,json:async()=>({image:'bad-image-data'})};
-          const image = document.createElement('canvas'); image.width = image.height = 4;
-          key = 'different';
-          return {ok:true,json:async()=>({image:image.toDataURL()})};
-        },
-        placeResult:()=>placements++,
-      });
-      let error = '';
-      try {await run({prompt:'a cow'});} catch (e) {error = e.message;}
-      return {error,placements};
-    }""", action)
-    assert result['placements'] == 0
-    assert result['error']
-    if action == 'timeout':
-        assert 'timed out' in result['error']
-    if action == 'document-switch':
-        assert 'document changed' in result['error']
-
-
-def test_generation_provider_error_is_not_retried_and_next_request_can_succeed(page):
-    result = page.evaluate("""async () => {
-      const {createImageGenerationAction} = await import('/static/js/editor/image-generation.js');
-      let calls = 0, placements = 0;
-      const image = document.createElement('canvas'); image.width = image.height = 4;
-      const run = createImageGenerationAction({
-        getDocument:()=>({key:'one',width:40,height:40}),
-        formatError:({status})=>status === 503 ? 'Generation is disabled' : 'error',
-        fetchImpl:async ()=> ++calls === 1
-          ? {ok:false,status:503,json:async()=>({detail:'Disabled'})}
-          : {ok:true,json:async()=>({image:image.toDataURL()})},
-        placeResult:()=>++placements,
-      });
-      let error;
-      try {await run({prompt:'one'});} catch (e) {error = e.message;}
-      const callsAfterFailure = calls;
-      await run({prompt:'two'});
-      return {error,callsAfterFailure,calls,placements};
-    }""")
-    assert result == dict(error='Generation is disabled',callsAfterFailure=1,calls=2,placements=1)
-
-
-def test_late_progress_response_cannot_restore_working_after_completion(page):
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    functions = source.split('function _startAiProgress(requestId) {',1)[1].split('function _setAiCommandStatus(',1)[0]
-    functions = 'function _startAiProgress(requestId) {' + functions
-    result = page.evaluate("""async functions => {
-      let _aiProgressTimer = null, _aiProgressEpoch = 0, status = 'Working';
-      let resolveRequest;
-      const fetch = () => new Promise(resolve => resolveRequest = resolve);
-      const _setAiProgress = () => {};
-      const _setAiCommandStatus = text => status = text;
-      const api = eval(functions + '; ({start:_startAiProgress,stop:_stopAiProgress});');
-      api.start('old-request');
-      api.stop(); status = 'Done';
-      resolveRequest({ok:true,json:async()=>({stage:'editing',progress:0.5})});
-      await new Promise(resolve=>setTimeout(resolve,20));
-      return status;
-    }""", functions)
-    assert result == 'Done'
-
-
-@pytest.mark.parametrize('success', [True,False])
-def test_quick_edit_queue_clears_working_on_completion(page, success):
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    pump = 'const pumpQuickEdit = ' + source.split('const pumpQuickEdit = ',1)[1].split('  const enqueueQuickEditJob',1)[0]
-    result = page.evaluate("""async ({pump,success}) => {
-      const {finishQuickEditJob} = await import('/static/js/editor/quick-edit-job.js');
-      const jobs = [{id:'one',prompt:'fill',status:'queued'}];
-      let pumping = false, _quickEditActiveJob = null, stopped = 0, terminal;
-      const renderJobStack = () => {};
-      const dismissJob = () => {};
-      const _stopAiProgress = () => stopped++;
-      const _setAiCommandStatus = (text,kind) => terminal = {text,kind};
-      const executeQuickEdit = async () => success ? {ok:true} : {ok:false,error:'Provider failed'};
-      await eval(pump + '; pumpQuickEdit();');
-      return {status:jobs[0].status,detail:jobs[0].detail,terminal,stopped,pumping};
-    }""", {'pump':pump,'success':success})
-    expected = 'done' if success else 'error'
-    message = 'Done' if success else 'Provider failed'
-    assert result == dict(status=expected,detail=message,terminal=dict(text=message,kind=expected),stopped=1,pumping=False)
-
-
-@pytest.mark.parametrize('bridge', [False,True])
-@pytest.mark.parametrize('instruction', [False,True])
-@pytest.mark.parametrize('matching_ratio', [False,True])
-def test_generated_layer_can_keep_pixels_outside_document_bounds(page, bridge, instruction, matching_ratio):
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    placement = 'const _placeResultLayer = ' + source.split('const _placeResultLayer = ',1)[1].split('  const _generateImage',1)[0]
-    bridge_line = next(line for line in source.splitlines() if "'layers.placeImage':" in line)
-    result = page.evaluate("""async ({placement,bridgeLine,bridge,instruction,matchingRatio}) => {
-      const {imageResultGeometry} = await import('/static/js/editor/image-result-geometry.js');
-      const state = {imgWidth:matchingRatio ? 1280 : 40,imgHeight:matchingRatio ? 720 : 40,layers:[],layerOffsets:new Map()};
-      let saved = 0;
-      const _saveState = ()=>saved++;
-      const composite = ()=>{};
-      const _renderLayerPanel = ()=>{};
-      const createLayer = (name,w,h)=>{
-        const canvas = document.createElement('canvas'); canvas.width=w;canvas.height=h;
-        return {id:'new',name,canvas,ctx:canvas.getContext('2d')};
-      };
-      const image = document.createElement('canvas'); image.width=matchingRatio ? 1536 : 80;image.height=matchingRatio ? 864 : 20;
-      image.getContext('2d').fillRect(0,0,image.width,image.height);
-      if (bridge) {
-        const run = eval('({' + bridgeLine + '})')["layers.placeImage"].run;
-        await run({dataUrl:image.toDataURL(),nativeSize:true,masked:false,
-          mode:instruction ? 'instruction' : undefined,differenceMask:instruction});
-      } else {
-        eval(placement + '; _placeResultLayer(image,"Generated",null);');
-      }
-      const layer = state.layers[0];
-      return {width:layer.canvas.width,height:layer.canvas.height,offset:state.layerOffsets.get(layer.id),
-        outsideAlpha:layer.ctx.getImageData(79,10,1,1).data[3],saved};
-    }""", {'placement':placement,'bridgeLine':bridge_line,'bridge':bridge,'instruction':instruction,'matchingRatio':matching_ratio})
-    expected = dict(width=1280,height=720,offset=dict(x=0,y=0),outsideAlpha=255,saved=1) if matching_ratio else dict(width=80,height=20,offset=dict(x=-20,y=10),outsideAlpha=255,saved=1)
-    assert result == expected
-
-
-def test_whole_image_edit_does_not_clip_native_result_to_select_all(page):
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    operation = 'const _aiInpaintSelection = ' + source.split('const _aiInpaintSelection = ',1)[1].split('  // Replace the background/scene',1)[0]
-    result = page.evaluate("""async operation => {
-      const mask = document.createElement('canvas'); mask.width=40;mask.height=40;
-      const canvas = document.createElement('canvas'); canvas.width=80;canvas.height=20;
-      const state = {wandMask:mask};
-      const activeLayer = ()=>({id:'one'});
-      const _aiEditCanvas = async ()=>({canvas,fullFrame:true});
-      const _placeResultLayer = (result,name,resultMask)=>({width:result.width,height:result.height,masked:!!resultMask});
-      return await eval(operation + '; _aiInpaintSelection("change the sky");');
-    }""", operation)
-    assert result == dict(width=80,height=20,masked=False)
-
-
-@pytest.mark.parametrize('matching_ratio', [False,True])
-def test_inpaint_panel_preserves_native_whole_edit_dimensions(page, matching_ratio):
-    source = (ROOT / 'static/js/editor/ai-inpaint.js').read_text()
-    body = 'const fullFrame = ' + source.split('const fullFrame = ',1)[1].split('          // Snapshot the AI result',1)[0]
-    result = page.evaluate("""async ({body,matchingRatio}) => {
-      const {imageResultGeometry} = await import('/static/js/editor/image-result-geometry.js');
-      const state = {imgWidth:matchingRatio ? 1280 : 40,imgHeight:matchingRatio ? 720 : 40,layerOffsets:new Map()};
-      const data = {full_frame:true}, layerName = 'Edit';
-      const createLayer = (name,w,h)=>{
-        const canvas=document.createElement('canvas');canvas.width=w;canvas.height=h;
-        return {id:'result',canvas,ctx:canvas.getContext('2d')};
-      };
-      const source = document.createElement('canvas'); source.width=matchingRatio ? 1536 : 80;source.height=matchingRatio ? 864 : 20;
-      source.getContext('2d').fillRect(0,0,source.width,source.height);
-      const resultImg = new Image(); resultImg.src=source.toDataURL(); await resultImg.decode();
-      return eval(body + '; ({width:resultLayer.canvas.width,height:resultLayer.canvas.height,offset:state.layerOffsets.get(resultLayer.id)});');
-    }""", {'body':body,'matchingRatio':matching_ratio})
-    assert result == (dict(width=1280,height=720,offset=dict(x=0,y=0)) if matching_ratio else dict(width=80,height=20,offset=dict(x=-20,y=10)))
-
-
-def test_brush_softness_is_in_main_bar_and_saves_extended_value(page):
-    page.add_style_tag(content=(ROOT / 'static/css/13-image-editor.css').read_text())
-    result = page.evaluate("""async () => {
-      const {controlsHTML} = await import('/static/js/editor/build/controls.js');
-      const {wireStrokeToolSliders} = await import('/static/js/editor/stroke-tool-sliders.js');
-      const {state} = await import('/static/js/editor/state.js');
-      const bar = document.createElement('div');bar.className='ge-options-bar';
-      const controls = document.createElement('div');controls.className='ge-controls ge-controls--in-options';
-      controls.innerHTML=controlsHTML({color:'#000000',brushSize:40,wandTolerance:20});
-      for(const child of controls.children) if(child.id !== 'ge-brush-controls') child.style.display='none';
-      bar.append(controls);document.body.append(bar);
-      wireStrokeToolSliders();
-      const slider=document.getElementById('ge-brush-softness');
-      slider.value='1200';slider.dispatchEvent(new Event('input',{bubbles:true}));
-      return {inMore:!!slider.closest('#ge-brush-more-menu'),max:slider.max,value:state.brushSoftness,
-        visible:slider.getBoundingClientRect().height>0,label:document.getElementById('ge-brush-softness-label').textContent};
-    }""")
-    assert result == dict(inMore=False,max='1200',value=1200,visible=True,label='1200%')
-    page.screenshot(path='/tmp/editor-brush-softness-main-bar.png')
-
-
-def test_extended_softness_produces_softer_pixels_not_just_larger_slider_values(page):
-    result = page.evaluate("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      const {createStrokePipeline}=await import('/static/js/editor/stroke-pipeline.js');
-      const results=[];
-      for(const softness of [300,1200]) {
-        const canvas=document.createElement('canvas');canvas.width=canvas.height=100;
-        const layer={id:'brush',canvas,ctx:canvas.getContext('2d')};
-        Object.assign(state,{tool:'brush',brushSize:60,brushSoftness:softness,brushOpacity:100,brushFlow:100,
-          brushBlendMode:'source-over',color:'#000000',brushSpacing:15,brushSmoothing:0,
-          brushPixel:false,pressureSize:false,pressureOpacity:false,pressureFlow:false,layerOffsets:new Map()});
-        const pipeline=createStrokePipeline({activeLayer:()=>layer,getActiveMaskLayer:()=>null,composite:()=>{}});
-        pipeline.beginStroke({x:50,y:50,pressure:1},'brush');pipeline.endStroke(null);
-        const alpha=x=>layer.ctx.getImageData(x,50,1,1).data[3];
-        results.push({middle:alpha(65),center:alpha(50),outside:alpha(85)});
-        document.body.append(canvas);
-      }
-      return results;
-    }""")
-    assert result[1]['middle'] < result[0]['middle'] / 3
-    assert result[1]['center'] > 150
-    assert result[0]['outside'] == result[1]['outside'] == 0
-    page.screenshot(path='/tmp/editor-brush-softness-falloff.png')
-
-
-@pytest.mark.parametrize('width', [1000,840])
-def test_brush_numbers_do_not_overlap_after_real_panel_normalization(page,width):
-    page.set_viewport_size({'width':width,'height':700})
-    for stylesheet in ['static/css/13-image-editor.css','static/css/documents-gallery-editor.css']:
-        page.add_style_tag(content=(ROOT / stylesheet).read_text())
-    page.add_style_tag(content=':root{--bg:#171719;--panel:#242426;--fg:#eee;--red:#d47965;--border:#454549;}body{background:var(--bg);}')
-    result = page.evaluate("""async () => {
-      const {state}=await import('/static/js/editor/state.js');
-      const {controlsHTML}=await import('/static/js/editor/build/controls.js');
-      const {buildRightPanel}=await import('/static/js/editor/build/right-panel.js');
-      const {wireStrokeToolSliders}=await import('/static/js/editor/stroke-tool-sliders.js');
-      state.container=document.createElement('div');document.body.append(state.container);
-      state.brushSize=800;
-      const {controls}=buildRightPanel({controlsHTML,layerPanelHTML:()=>'<div></div>'});
-      controls.classList.add('ge-controls--in-options');
-      const bar=document.createElement('div');bar.className='ge-options-bar';bar.append(controls);state.container.append(bar);
-      for(const child of controls.children) if(child.id !== 'ge-brush-controls') child.style.display='none';
-      wireStrokeToolSliders();
-      const slider=document.getElementById('ge-brush-softness');
-      const elements=[document.querySelector('#ge-brush-softness-row label'),slider,
-        document.getElementById('ge-brush-softness-label'),document.querySelector('.ge-brush-size-row label'),
-        document.querySelector('.ge-brush-size-row input')];
-      const bounds=()=>elements.map(element=>{
-        const r=element.getBoundingClientRect();return {x:r.x,right:r.right,width:r.width};
-      });
-      slider.value='1';slider.dispatchEvent(new Event('input'));const small=bounds();
-      slider.value='1200';slider.dispatchEvent(new Event('input'));const large=bounds();
-      return {small,large,value:document.getElementById('ge-brush-softness-label').textContent};
-    }""")
-    assert result['value'] == '1200%'
-    assert all(bounds['width'] > 0 for bounds in result['large']), result
-    for left,right in zip(result['large'],result['large'][1:]):
-        assert left['right'] <= right['x'] + 1, result
-    for small,large in zip(result['small'],result['large']):
-        assert abs(small['x']-large['x']) <= 1, result
-    page.screenshot(path=f'/tmp/editor-brush-number-layout-{width}.png')
-
-
-@pytest.mark.parametrize('fail_once', [False, True])
-def test_new_project_create_initializes_canvas(page, fail_once):
-    errors = []
-    page.on('pageerror', lambda error: errors.append(str(error)))
-    page.route('http://editor.test/api/**', lambda route: route.fulfill(json={}))
-    page.add_style_tag(content='''
-      .modal {position:fixed;inset:0;display:flex;align-items:center;justify-content:center;z-index:250;pointer-events:none;}
-      .modal-content {pointer-events:auto;background:#333;padding:20px;}
-      #gallery-modal {z-index:700;}
-      #gallery-modal > .modal-content {width:90vw;height:90vh;}
-    ''')
-    page.evaluate("""async () => {
-      document.body.innerHTML = '<div id="toast"></div><div class="modal" id="gallery-modal"><div class="modal-content"><div id="gallery-editor-container"></div></div></div>';
-      const editor = await import('/static/js/galleryEditor.js');
-      window.newProject = editor.openEditor(null, null, null, 'New canvas');
-      window.newProject.catch(error => { window.createError = error.stack; });
-    }""")
-    if fail_once:
-        page.evaluate("""() => {
-          const fill = CanvasRenderingContext2D.prototype.fillRect;
-          CanvasRenderingContext2D.prototype.fillRect = function(...args) {
-            if (this.canvas.width === 1024 && this.canvas.height === 1024) {
-              CanvasRenderingContext2D.prototype.fillRect = fill;
-              throw Error('Canvas allocation test failure');
-            }
-            return fill.apply(this, args);
-          };
-        }""")
-    page.locator('#ge-canvas-prompt-ok').click(timeout=3000)
-    if fail_once:
-        page.wait_for_function("window.createError")
-        assert 'Canvas allocation test failure' in page.evaluate('window.createError')
-        assert 'Could not create project' in page.locator('body').inner_text()
-        page.evaluate("""async () => {
-          window.createError = null;
-          const editor = await import('/static/js/galleryEditor.js');
-          window.newProject = editor.openEditor(null, null, null, 'New canvas');
-          window.newProject.catch(error => { window.createError = error.stack; });
-        }""")
-        page.locator('#ge-canvas-prompt-ok').click(timeout=3000)
-    page.wait_for_timeout(500)
-    result = page.evaluate("""async () => {
-      const {state} = await import('/static/js/editor/state.js');
-      return {error:window.createError, width:state.mainCanvas?.width,
-        height:state.mainCanvas?.height, layers:state.layers.map(layer=>layer.name)};
-    }""")
-    assert not errors, errors
-    assert not result.get('error'), result
-    assert result == {'error':None,'width':1024,'height':1024,'layers':['Background','Edit']}
-
-
-def test_undo_clears_rembg_live_layer_and_edge_tuner_cannot_corrupt(page):
-    source = (ROOT / 'static/js/galleryEditor.js').read_text()
-    restore_fn = source.split('function _restoreState(snap) {', 1)[1].split('function undo() {', 1)[0]
-    assert 'state.rembgLiveLayer = null;' in restore_fn
-    assert 'state.rembgLiveSnap = null;' in restore_fn
-
-    page.route('http://editor.test/api/**', lambda route: route.fulfill(json={}))
-    result = page.evaluate("""async () => {
-      document.body.innerHTML = '<div id="toast"></div><div id="gallery-editor-container"></div>';
-      const editor = await import('/static/js/galleryEditor.js');
-      const {state} = await import('/static/js/editor/state.js');
-      editor.openEditor(null, null, {w: 16, h: 16}, 'Rembg edge tuner undo test');
-
-      const layer = state.layers.at(-1);
-      layer.ctx.fillStyle = 'rgba(0, 255, 0, 1)';
-      layer.ctx.fillRect(0, 0, 16, 16);
-      const originalPixel = [...layer.ctx.getImageData(0, 0, 1, 1).data];
-
-      // Save a valid pre-edit snapshot to undoStack
-      const origCanvas = document.createElement('canvas');
-      origCanvas.width = origCanvas.height = 16;
-      origCanvas.getContext('2d').drawImage(layer.canvas, 0, 0);
-      const preEditSnap = {
-        imgWidth: 16, imgHeight: 16,
-        activeLayerId: layer.id,
-        selectedLayerIds: [layer.id],
-        layers: [{
-          id: layer.id,
-          name: 'Layer 1',
-          canvas: origCanvas,
-          imageData: origCanvas.getContext('2d').getImageData(0, 0, 16, 16),
-          visible: true,
-          opacity: 1,
-          blendMode: 'source-over',
-          locks: {},
-        }],
-      };
-      state.undoStack.push(preEditSnap);
-
-      // Create tuner snapshot for background removal
-      const snapCanvas = document.createElement('canvas');
-      snapCanvas.width = snapCanvas.height = 16;
-      const snapCtx = snapCanvas.getContext('2d');
-      snapCtx.fillStyle = 'rgba(255, 0, 0, 1)';
-      snapCtx.fillRect(4, 4, 8, 8); // cutout shape
-
-      // Attach live tuner
-      state.rembgLiveLayer = layer;
-      state.rembgLiveSnap = snapCanvas;
-      const tunerAttached = state.rembgLiveLayer === layer && state.rembgLiveSnap === snapCanvas;
-
-      // Mutate layer pixels to simulate background removal result
-      layer.ctx.clearRect(0, 0, 16, 16);
-      layer.ctx.drawImage(snapCanvas, 0, 0);
-
-      // Trigger Undo via Ctrl+Z
-      document.dispatchEvent(new KeyboardEvent('keydown', {
-        key: 'z', code: 'KeyZ', ctrlKey: true, bubbles: true, cancelable: true,
-      }));
-
-      const clearedAfterUndo = state.rembgLiveLayer === null && state.rembgLiveSnap === null;
-      const restoredLayer = state.layers.at(-1);
-      const restoredPixel = [...restoredLayer.ctx.getImageData(0, 0, 1, 1).data];
-
-      // Now interact with edge tuner sliders after undo
-      const featherInput = document.getElementById('ge-rembg-feather');
-      const growInput = document.getElementById('ge-rembg-grow');
-      if (featherInput) {
-        featherInput.value = '5';
-        featherInput.dispatchEvent(new Event('input', { bubbles: true }));
-      }
-      if (growInput) {
-        growInput.value = '5';
-        growInput.dispatchEvent(new Event('input', { bubbles: true }));
-      }
-
-      // Check pixel again after tuner events: restored pixels must remain untouched
-      const pixelAfterTuner = [...restoredLayer.ctx.getImageData(0, 0, 1, 1).data];
-      return {
-        tunerAttached,
-        clearedAfterUndo,
-        restoredPixel,
-        originalPixel,
-        pixelAfterTuner,
-        rembgLiveLayerNull: state.rembgLiveLayer === null,
-        rembgLiveSnapNull: state.rembgLiveSnap === null,
-      };
-    }""")
-    assert result['tunerAttached'] is True
-    assert result['clearedAfterUndo'] is True
-    assert result['rembgLiveLayerNull'] is True
-    assert result['rembgLiveSnapNull'] is True
-    assert result['restoredPixel'] == result['originalPixel']
-    assert result['pixelAfterTuner'] == result['originalPixel']

tests/test_editor_photoshop_features_more4.py

@@ -93,7 +93,7 @@ def test_custom_filter_reuses_convolve_kernel():
     assert "convolve(readSource(snap), k, divisor, bias, 1)" in EFFECTS
 
 
-def test_blur_and_custom_filter_aliases_registered():
+def test_new_filter_aliases_registered():
     assert "'box-blur': 'blur-box'" in EDITOR
     assert "'surface-blur': 'blur-surface'" in EDITOR
     assert "custom: 'other-custom'" in EDITOR

tests/test_editor_polish_batch2.py

@@ -143,8 +143,8 @@ def test_crop_can_start_outside_the_canvas_without_panning():
     # image (so it can be pulled out past the edge) instead of the canvas-area
     # pan grabbing the pointer and switching to hand mode.
     CE = (ROOT / "static/js/editor/canvas-events.js").read_text(encoding="utf-8")
-    assert "['marquee', 'lasso', 'crop'].includes(state.tool)" in CE
-    assert "if (canStartOutside() && !directPan)" in CE
+    assert "if (state.tool !== 'lasso' && state.tool !== 'crop') return;" in CE
+    assert "(state.tool === 'lasso' || state.tool === 'crop') && !directPan" in CE
     # Pressing editor chrome inside the area (e.g. the crop Apply panel) must
     # not start a fresh crop.
     assert ".ge-crop-apply, .ge-adj-popup, .ge-transform-popup, .ge-fx-popup, .ge-inpaint-popup" in CE

tests/test_editor_preflight.py

@@ -32,12 +32,13 @@ def test_preflight_module_has_the_four_setup_steps():
     assert "required ready" in src
 
 
-def test_editor_uses_ai_settings_without_redundant_setup():
+def test_preflight_is_wired_into_the_editor():
     editor = _read("static/js/galleryEditor.js")
-    assert "createPreflight" not in editor
-    assert "setupBtn.id = 'ge-setup-btn';" not in editor
-    assert "createAiSettings({ container })" in editor
-    assert "aiBtn.addEventListener('click', () => _aiSettings?.open());" in editor
+    assert "import { createPreflight } from './editor/preflight.js';" in editor
+    assert "createPreflight({ canvasArea })" in editor
+    assert "_preflight?.maybeOpen();" in editor
+    assert "setupBtn.id = 'ge-setup-btn';" in editor
+    assert "_preflight?.destroy();" in editor
 
 
 def test_ai_models_exposes_status_for_the_checklist():

tests/test_editor_quick_edit_image_mode.py

@@ -49,42 +49,7 @@ def test_generate_route_forwards_the_picked_model():
     assert 'model_choice = str((body or {}).get("model") or "").strip()' in route
     assert 'payload["model"] = model_choice' in route
     assert "content = _json.dumps(payload)" in route
-    operation = JS.split("'ai.generateImage':", 1)[1].split("\n", 1)[0]
-    generation = (ROOT / 'static/js/editor/image-generation.js').read_text()
-    assert '_generateImage(p || {})' in operation
-    assert "_use_image_settings: true" in generation
-    assert "document.getElementById('ge-ai-model')" not in operation
-    assert "_getSelectedQuickEditModel()" not in operation
-    assert "localStorage.getItem" not in operation
-
-
-def test_ai_settings_separates_generation_from_editing_without_setup():
-    settings = (ROOT / "static/js/editor/ai-settings.js").read_text()
-    assert 'id="ge-ai-model"' in settings
-    assert 'id="ge-ai-command-model"' in settings
-    assert "Image generation model" in settings
-    assert "createPreflight" not in JS
-    assert "ge-setup-btn';" not in JS.split("const aiBtn", 1)[0]
-
-
-def test_generate_uses_live_picker_and_auto_edit_fallback():
-    import subprocess
-
-    module = (ROOT / "static/js/editor/ai-models.js").as_uri()
-    script = """
-import assert from 'node:assert/strict';
-const {resolveQuickEditModel} = await import(MODULE);
-const selected = 'https://openrouter.ai/api/v1::openai/gpt-5-image';
-const option = {value: selected, textContent: 'GPT-5 Image'};
-const picker = {value: selected, selectedIndex: 0, options: [option]};
-const fallback = {value: '', options: [option]};
-globalThis.document = {getElementById: id => id === 'ge-ai-command-model' ? picker : fallback};
-globalThis.localStorage = {getItem: () => {throw new Error('must not read stale storage');}};
-assert.equal(resolveQuickEditModel().model, 'openai/gpt-5-image');
-picker.value = '';
-assert.equal(resolveQuickEditModel().model, '');
-""".replace("MODULE", repr(module))
-    subprocess.run(["node", "--input-type=module", "-e", script], check=True)
+    assert "localStorage.getItem('ge-ai-command-model')" in JS
 
 
 def test_cloud_image_model_is_resolved_before_the_local_fallback():

tests/test_editor_quick_edit_static.py

@@ -52,7 +52,7 @@ def test_quick_edit_flip_and_rotate_accept_numeric_degrees():
 
 def test_quick_edit_transforms_do_not_add_a_second_undo_snapshot():
     start = EDITOR.index("if (/\\brotate\\b.*\\b180\\b")
-    end = EDITOR.index("if (!/\\b(text|title|caption|font|heading|subtitle)", start)
+    end = EDITOR.index("if (_looksBackgroundRemoval(p)) {", start)
     transform_block = EDITOR[start:end]
     assert "_saveState('Rotate" not in transform_block
     assert "_saveState('Flip" not in transform_block
@@ -372,10 +372,9 @@ def test_quick_edit_has_a_model_picker():
     assert "function _getSelectedQuickEditModel()" in EDITOR
     assert "getModel: () => _getSelectedQuickEditModel()," in EDITOR
     # Populated from the provider list and persisted per user.
-    assert "aiCommandSelect.innerHTML = '<option value=\"\">Same as generation</option>';" in models
-    assert "localStorage.setItem('ge-ai-command-model'" not in models
-    assert "localStorage.getItem('ge-ai-command-model')" not in models
-    assert 'saveImagePreferences({ [key]: model })' in AI_SETTINGS
+    assert "aiCommandSelect.innerHTML = '<option value=\"\">Auto (default)</option>';" in models
+    assert "localStorage.setItem('ge-ai-command-model', aiCommandSelect.value)" in models
+    assert "localStorage.getItem('ge-ai-command-model')" in models
     # Styled.
     assert ".ge-ai-settings-card" in STYLE
     assert ".ge-ai-command-model" in STYLE
@@ -699,7 +698,7 @@ def test_quick_edit_shows_a_real_progress_bar():
     assert "fetch(`/api/image/edit-progress?request_id=${encodeURIComponent(requestId)}`" in EDITOR
     # The edit request carries the request_id the server keys progress on.
     assert "const requestId = 'qe-' + Date.now().toString(36)" in EDITOR
-    assert "const body = JSON.stringify({ image, width: flat.width, height: flat.height, request_id: requestId, ...payload });" in EDITOR
+    assert "const body = JSON.stringify({ image, request_id: requestId, ...payload });" in EDITOR
     assert "_startAiProgress(requestId);" in EDITOR
     assert "_stopAiProgress();" in EDITOR
     # Styling exists.
@@ -719,7 +718,7 @@ def test_generation_503_is_handled_gracefully():
     # (returns 503). Surface a clear message and do not retry immediately.
     assert "if (status === 503) return _GEN_DISABLED_MSG;" in EDITOR
     assert "_GEN_DISABLED_MSG = 'Image generation is switched off on the server at the moment.'" in EDITOR
-    assert "formatError: _generationErrorMessage" in EDITOR
+    assert "window.__geGenerationDisabled" in EDITOR
 
 
 def test_sending_a_prompt_returns_focus_to_the_document():