fix(chat): honor effective RAG policy in context building

* feat(admin): rename model endpoints inline

* fix(cookbook): keep renamed endpoint names on relaunch

Relaunching a model at an existing endpoint URL reset the endpoint name
to the launched repo's short name, undoing a rename made in Added Models.
Only replace the name when it is still a name the Cookbook generates for
one of the endpoint's pinned models, so endpoints that were never renamed
still follow the newly served model.

---------

Co-authored-by: Alexandre Teixeira <general@alexandreteixeira.dev>

.env.example

@@ -105,6 +105,17 @@ SEARXNG_INSTANCE=http://localhost:8080
 # trusted single-user setups that accept injected content reaching side-effect tools.
 # ODYSSEUS_TOOL_APPROVAL_GATE=1
 
+# Comma-separated list of exact qualified MCP read and write tool names
+# on host-local servers. Only explicitly configured stdio MCP servers qualify.
+# Declarations do not override built-in tool effects. Declared reads remain
+# untrusted (EXTERNAL_UNTRUSTED) to prevent prompt injections from reaching shell
+# or network tools, but allow continuation to declared non-destructive write tools
+# on the exact same stdio server without repeated approvals. Stdio transport does
+# not guarantee network isolation. Authorization must still originate from the
+# trusted request. Automatic same-store writes carry residual prompt-injection risk.
+# ODYSSEUS_LOCAL_MCP_READ_TOOLS=mcp__notes__search_notes,mcp__notes__read_note
+# ODYSSEUS_LOCAL_MCP_WRITE_TOOLS=mcp__notes__create_note,mcp__notes__update_note
+
 # Mark session cookies Secure. Left unset, this follows the request scheme:
 # an HTTPS login gets a Secure cookie, a plain-HTTP one does not. Set true to
 # force it on, or false to force it off while you still serve plain HTTP.

.github/workflows/ci.yml

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

THREAT_MODEL.md

@@ -66,10 +66,11 @@ External content that reaches the LLM is treated as untrusted via `src/prompt_se
 
 It is on unless `ODYSSEUS_TOOL_APPROVAL_GATE` is set to a falsy value (`0`/`false`/`no`/`off`). Request authority narrows which tool families a turn may use, but within an admitted family it does not bind the exact action: a request to read email admits `send_email` and `delete_email`, and agent processes inherit the host network. Until those are covered by their own boundaries, this gate is what stops an injected instruction from reaching them. Turning it off lets a successful injection reach `bash`, `host_shell`, `send_email` and `delete_email` without a separate confirmation.
 
-Two exemptions apply even when the gate is on, both deliberate:
+Three exemptions apply even when the gate is on, all deliberate:
 
 - Sources in `_CONTROL_PLANE_CONTEXT_SOURCES` (skills, runtime descriptors, the open editor document, the open email, uploaded files) are treated as control-plane metadata and still permit read-only tools.
 - A TUI run that advertises a host shell bridge and declares `unattended_mode` exempts the local execution set in `TUI_CLIENT_TOOL_NAMES`. Personal, network and deployment-local tools are never exempted.
+- Narrow continuation for local MCP tools declared via `ODYSSEUS_LOCAL_MCP_READ_TOOLS` and `ODYSSEUS_LOCAL_MCP_WRITE_TOOLS`: Only explicitly configured stdio MCP servers qualify; remote HTTP and SSE servers fail closed. Declarations never override built-in tool effects, so built-in email, browser, memory, image generation, and other built-in servers cannot receive continuation exceptions. Declared read tools remain untrusted (`EXTERNAL_UNTRUSTED`) to ensure that prompt injections in local data cannot reach shell, network, or unrelated tools without approval. Stdio transport does not guarantee network isolation, as local processes may still reach the host network. However, declared non-destructive write tools on the exact same stdio MCP server are permitted to continue without an approval prompt if the only untrusted context in the run was produced by declared local reads on that same server, without any explicit error or external taint. Genuinely external content (web search, web fetch, emails, external message context) blocks these writes. Authorization must still originate from the trusted request: request authority must permit the tool and retain the sealed backend resource grant. The residual same-store write risk (the agent writing to the same local store after reading a local prompt injection) remains subject to the user's initial request authority.
 
 ## Security Headers
 

core/database.py

@@ -568,6 +568,7 @@ class ModelEndpoint(TimestampMixin, Base):
     hidden_models = Column(Text, nullable=True)    # JSON list of model IDs that failed probing
     cached_models = Column(Text, nullable=True)    # JSON list of last-known model IDs (avoids probe on list)
     pinned_models = Column(Text, nullable=True)    # JSON list of admin-pinned model IDs (manual, may not appear in /v1/models)
+    cookbook_serve_session_id = Column(String, nullable=True)  # Current Cookbook serve identity
     model_type = Column(String, nullable=True, default="llm")  # "llm" or "image"
     # auto = classify by URL; local = self-hosted server; api/proxy = external
     # OpenAI-compatible API even when reachable through a private/tailnet IP.
@@ -1378,6 +1379,26 @@ def _migrate_add_pinned_models_column():
         except Exception:
             pass
 
+
+def _migrate_add_cookbook_serve_session_id_column():
+    """Bind Cookbook cleanup to the serve session that owns the endpoint."""
+    from sqlalchemy import inspect
+
+    with engine.begin() as conn:
+        columns = {
+            column["name"]
+            for column in inspect(conn).get_columns("model_endpoints")
+        }
+
+        if "cookbook_serve_session_id" not in columns:
+            conn.execute(
+                text(
+                    "ALTER TABLE model_endpoints "
+                    "ADD COLUMN cookbook_serve_session_id VARCHAR"
+                )
+            )
+
+
 def _migrate_add_notes_sort_order():
     """Add sort_order, image_url, repeat columns to notes if they don't exist."""
     import sqlite3
@@ -2390,6 +2411,7 @@ def init_db():
     _migrate_add_hidden_models_column()
     _migrate_add_cached_models_column()
     _migrate_add_pinned_models_column()
+    _migrate_add_cookbook_serve_session_id_column()
     _migrate_add_notes_sort_order()
     _migrate_add_model_type_column()
     _migrate_add_model_endpoint_refresh_columns()

docker-compose.gpu-amd.yml

@@ -73,6 +73,8 @@ services:
       - ODYSSEUS_CAPTURE_MODEL_REQUESTS=${ODYSSEUS_CAPTURE_MODEL_REQUESTS:-0}
       - ODYSSEUS_MCP_EMAIL_OWNER=${ODYSSEUS_MCP_EMAIL_OWNER:-}
       - ODYSSEUS_SCRIPT_HOST=${ODYSSEUS_SCRIPT_HOST:-localhost}
+      - ODYSSEUS_LOCAL_MCP_READ_TOOLS=${ODYSSEUS_LOCAL_MCP_READ_TOOLS:-}
+      - ODYSSEUS_LOCAL_MCP_WRITE_TOOLS=${ODYSSEUS_LOCAL_MCP_WRITE_TOOLS:-}
       - ODYSSEUS_CHAT_UPLOAD_MAX_BYTES=${ODYSSEUS_CHAT_UPLOAD_MAX_BYTES:-10485760}
       - ODYSSEUS_GALLERY_UPLOAD_MAX_BYTES=${ODYSSEUS_GALLERY_UPLOAD_MAX_BYTES:-104857600}
       - ODYSSEUS_GALLERY_TRANSFORM_UPLOAD_MAX_BYTES=${ODYSSEUS_GALLERY_TRANSFORM_UPLOAD_MAX_BYTES:-26214400}
@@ -82,13 +84,15 @@ services:
       - ODYSSEUS_EDITOR_DRAFT_MAX_BYTES=${ODYSSEUS_EDITOR_DRAFT_MAX_BYTES:-268435456}
       - ODYSSEUS_STT_MAX_AUDIO_BYTES=${ODYSSEUS_STT_MAX_AUDIO_BYTES:-26214400}
       - ODYSSEUS_ICS_MAX_BYTES=${ODYSSEUS_ICS_MAX_BYTES:-10485760}
-      - ODYSSEUS_TTS_CACHE_MAX_BYTES=${ODYSSEUS_TTS_CACHE_MAX_BYTES}
+      - ODYSSEUS_TTS_CACHE_MAX_BYTES=${ODYSSEUS_TTS_CACHE_MAX_BYTES:-524288000}
       # Host workspace translation is opt-in. Keep the public compose file
       # user-neutral; configure these in a local .env or use the host-workspace
       # overlay with ODYSSEUS_HOST_WORKSPACE_DIR.
       - ODYSSEUS_WORKSPACE_HOST_ROOT=${ODYSSEUS_WORKSPACE_HOST_ROOT:-}
       - ODYSSEUS_WORKSPACE_CONTAINER_ROOT=${ODYSSEUS_WORKSPACE_CONTAINER_ROOT:-/workspace}
       - ODYSSEUS_WORKSPACE_DEFAULT=${ODYSSEUS_WORKSPACE_DEFAULT:-}
+      # Local first-token watchdog in seconds; 0 disables it. Empty keeps the code default (60s).
+      - ODYSSEUS_FIRST_TOKEN_TIMEOUT=${ODYSSEUS_FIRST_TOKEN_TIMEOUT:-}
       - DATA_BRAVE_API_KEY=${DATA_BRAVE_API_KEY:-}
       - GOOGLE_API_KEY=${GOOGLE_API_KEY:-}
       - GOOGLE_PSE_CX=${GOOGLE_PSE_CX:-}
@@ -165,7 +169,7 @@ services:
         /usr/local/searxng/.venv/bin/python /tmp/migrate-searxng-settings.py /etc/searxng/settings.yml || true
         exec /usr/local/searxng/entrypoint.sh
     ports:
-      - "127.0.0.1:8080:8080"
+      - "127.0.0.1:${SEARXNG_HOST_PORT:-8080}:8080"
     volumes:
       - searxng-data:/etc/searxng
       - ./config/searxng/settings.yml:/tmp/searxng-settings.yml.template:ro,z

docker-compose.gpu-nvidia.yml

@@ -72,6 +72,8 @@ services:
       - ODYSSEUS_CAPTURE_MODEL_REQUESTS=${ODYSSEUS_CAPTURE_MODEL_REQUESTS:-0}
       - ODYSSEUS_MCP_EMAIL_OWNER=${ODYSSEUS_MCP_EMAIL_OWNER:-}
       - ODYSSEUS_SCRIPT_HOST=${ODYSSEUS_SCRIPT_HOST:-localhost}
+      - ODYSSEUS_LOCAL_MCP_READ_TOOLS=${ODYSSEUS_LOCAL_MCP_READ_TOOLS:-}
+      - ODYSSEUS_LOCAL_MCP_WRITE_TOOLS=${ODYSSEUS_LOCAL_MCP_WRITE_TOOLS:-}
       - ODYSSEUS_CHAT_UPLOAD_MAX_BYTES=${ODYSSEUS_CHAT_UPLOAD_MAX_BYTES:-10485760}
       - ODYSSEUS_GALLERY_UPLOAD_MAX_BYTES=${ODYSSEUS_GALLERY_UPLOAD_MAX_BYTES:-104857600}
       - ODYSSEUS_GALLERY_TRANSFORM_UPLOAD_MAX_BYTES=${ODYSSEUS_GALLERY_TRANSFORM_UPLOAD_MAX_BYTES:-26214400}
@@ -81,13 +83,15 @@ services:
       - ODYSSEUS_EDITOR_DRAFT_MAX_BYTES=${ODYSSEUS_EDITOR_DRAFT_MAX_BYTES:-268435456}
       - ODYSSEUS_STT_MAX_AUDIO_BYTES=${ODYSSEUS_STT_MAX_AUDIO_BYTES:-26214400}
       - ODYSSEUS_ICS_MAX_BYTES=${ODYSSEUS_ICS_MAX_BYTES:-10485760}
-      - ODYSSEUS_TTS_CACHE_MAX_BYTES=${ODYSSEUS_TTS_CACHE_MAX_BYTES}
+      - ODYSSEUS_TTS_CACHE_MAX_BYTES=${ODYSSEUS_TTS_CACHE_MAX_BYTES:-524288000}
       # Host workspace translation is opt-in. Keep the public compose file
       # user-neutral; configure these in a local .env or use the host-workspace
       # overlay with ODYSSEUS_HOST_WORKSPACE_DIR.
       - ODYSSEUS_WORKSPACE_HOST_ROOT=${ODYSSEUS_WORKSPACE_HOST_ROOT:-}
       - ODYSSEUS_WORKSPACE_CONTAINER_ROOT=${ODYSSEUS_WORKSPACE_CONTAINER_ROOT:-/workspace}
       - ODYSSEUS_WORKSPACE_DEFAULT=${ODYSSEUS_WORKSPACE_DEFAULT:-}
+      # Local first-token watchdog in seconds; 0 disables it. Empty keeps the code default (60s).
+      - ODYSSEUS_FIRST_TOKEN_TIMEOUT=${ODYSSEUS_FIRST_TOKEN_TIMEOUT:-}
       - DATA_BRAVE_API_KEY=${DATA_BRAVE_API_KEY:-}
       - GOOGLE_API_KEY=${GOOGLE_API_KEY:-}
       - GOOGLE_PSE_CX=${GOOGLE_PSE_CX:-}
@@ -168,7 +172,7 @@ services:
         /usr/local/searxng/.venv/bin/python /tmp/migrate-searxng-settings.py /etc/searxng/settings.yml || true
         exec /usr/local/searxng/entrypoint.sh
     ports:
-      - "127.0.0.1:8080:8080"
+      - "127.0.0.1:${SEARXNG_HOST_PORT:-8080}:8080"
     volumes:
       - searxng-data:/etc/searxng
       - ./config/searxng/settings.yml:/tmp/searxng-settings.yml.template:ro,z

docker-compose.yml

@@ -61,6 +61,8 @@ services:
       - ODYSSEUS_CAPTURE_MODEL_REQUESTS=${ODYSSEUS_CAPTURE_MODEL_REQUESTS:-0}
       - ODYSSEUS_MCP_EMAIL_OWNER=${ODYSSEUS_MCP_EMAIL_OWNER:-}
       - ODYSSEUS_SCRIPT_HOST=${ODYSSEUS_SCRIPT_HOST:-localhost}
+      - ODYSSEUS_LOCAL_MCP_READ_TOOLS=${ODYSSEUS_LOCAL_MCP_READ_TOOLS:-}
+      - ODYSSEUS_LOCAL_MCP_WRITE_TOOLS=${ODYSSEUS_LOCAL_MCP_WRITE_TOOLS:-}
       - ODYSSEUS_CHAT_UPLOAD_MAX_BYTES=${ODYSSEUS_CHAT_UPLOAD_MAX_BYTES:-10485760}
       - ODYSSEUS_GALLERY_UPLOAD_MAX_BYTES=${ODYSSEUS_GALLERY_UPLOAD_MAX_BYTES:-104857600}
       - ODYSSEUS_GALLERY_TRANSFORM_UPLOAD_MAX_BYTES=${ODYSSEUS_GALLERY_TRANSFORM_UPLOAD_MAX_BYTES:-26214400}
@@ -70,13 +72,15 @@ services:
       - ODYSSEUS_EDITOR_DRAFT_MAX_BYTES=${ODYSSEUS_EDITOR_DRAFT_MAX_BYTES:-268435456}
       - ODYSSEUS_STT_MAX_AUDIO_BYTES=${ODYSSEUS_STT_MAX_AUDIO_BYTES:-26214400}
       - ODYSSEUS_ICS_MAX_BYTES=${ODYSSEUS_ICS_MAX_BYTES:-10485760}
-      - ODYSSEUS_TTS_CACHE_MAX_BYTES=${ODYSSEUS_TTS_CACHE_MAX_BYTES}
+      - ODYSSEUS_TTS_CACHE_MAX_BYTES=${ODYSSEUS_TTS_CACHE_MAX_BYTES:-524288000}
       # Host workspace translation is opt-in. Keep the public compose file
       # user-neutral; configure these in a local .env or use the host-workspace
       # overlay with ODYSSEUS_HOST_WORKSPACE_DIR.
       - ODYSSEUS_WORKSPACE_HOST_ROOT=${ODYSSEUS_WORKSPACE_HOST_ROOT:-}
       - ODYSSEUS_WORKSPACE_CONTAINER_ROOT=${ODYSSEUS_WORKSPACE_CONTAINER_ROOT:-/workspace}
       - ODYSSEUS_WORKSPACE_DEFAULT=${ODYSSEUS_WORKSPACE_DEFAULT:-}
+      # Local first-token watchdog in seconds; 0 disables it. Empty keeps the code default (60s).
+      - ODYSSEUS_FIRST_TOKEN_TIMEOUT=${ODYSSEUS_FIRST_TOKEN_TIMEOUT:-}
       - DATA_BRAVE_API_KEY=${DATA_BRAVE_API_KEY:-}
       - GOOGLE_API_KEY=${GOOGLE_API_KEY:-}
       - GOOGLE_PSE_CX=${GOOGLE_PSE_CX:-}
@@ -146,7 +150,7 @@ services:
         /usr/local/searxng/.venv/bin/python /tmp/migrate-searxng-settings.py /etc/searxng/settings.yml || true
         exec /usr/local/searxng/entrypoint.sh
     ports:
-      - "127.0.0.1:8080:8080"
+      - "127.0.0.1:${SEARXNG_HOST_PORT:-8080}:8080"
     volumes:
       - searxng-data:/etc/searxng
       - ./config/searxng/settings.yml:/tmp/searxng-settings.yml.template:ro,z

docker/build-realesrgan-wheels.sh

@@ -31,21 +31,43 @@ for spec in $SPECS; do
   name="${spec%%==*}"
   ver="${spec##*==}"
   # pip download builds metadata (and trips the same bug), so fetch the raw
-  # sdist URL from the PyPI JSON API instead.
-  url="$(python - "$name" "$ver" <<'PY'
-import json, sys, urllib.request
-name, ver = sys.argv[1], sys.argv[2]
-data = json.load(urllib.request.urlopen(f"https://pypi.org/pypi/{name}/{ver}/json"))
-for f in data["urls"]:
-    if f["packagetype"] == "sdist":
-        print(f["url"]); break
+  # sdist URL from the PyPI JSON API instead.  Use curl with retries to
+  # survive transient TLS / network failures that urllib cannot recover from.
+  metadata="${name}-${ver}.json"
+  curl --fail --silent --show-error --location \
+    --retry 8 \
+    --retry-delay 3 \
+    --retry-max-time 120 \
+    --retry-all-errors \
+    "https://pypi.org/pypi/${name}/${ver}/json" \
+    -o "$metadata"
+
+  url="$(python - "$metadata" <<'PY'
+import json, sys
+
+with open(sys.argv[1], encoding="utf-8") as f:
+    data = json.load(f)
+
+for item in data["urls"]:
+    if item["packagetype"] == "sdist":
+        print(item["url"])
+        break
 else:
-    sys.exit(f"no sdist found for {name}=={ver}")
+    raise SystemExit("no sdist found")
 PY
-)"
+  )"
+  rm -f "$metadata"
+
   echo ">> fetching ${name} ${ver}: ${url}"
-  curl -fsSL "$url" -o "${name}.tar.gz"
+  curl --fail --silent --show-error --location \
+    --retry 8 \
+    --retry-delay 3 \
+    --retry-max-time 120 \
+    --retry-all-errors \
+    "$url" \
+    -o "${name}.tar.gz"
   tar xzf "${name}.tar.gz"
+  rm -f "${name}.tar.gz"
 done
 
 echo ">> patching get_version()"

requirements-dev.txt

@@ -2,3 +2,4 @@
 -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/chat_helpers.py

@@ -1276,6 +1276,7 @@ async def build_chat_context(
         message=_ctx_msg,
         session=sess,
         use_web=use_web_val and not skip_web,
+        use_rag=use_rag_val,
         use_memory=mem_enabled,
         time_filter=time_filter,
         preset_system_prompt=preset.system_prompt,
@@ -1286,8 +1287,6 @@ async def build_chat_context(
         incognito=incognito,
         use_skills=skills_enabled,
     )
-    if use_rag is not None or is_research_spinoff or casual_low_signal:
-        _preface_kwargs["use_rag"] = use_rag_val
     preface, rag_sources, web_sources = chat_processor.build_context_preface(**_preface_kwargs)
 
     # Capture used memories immediately

routes/chat_routes.py

@@ -1901,7 +1901,7 @@ def _ts_or_zero(value) -> float:
 
 
 def _recover_empty_session_model(sess, session_id: str, owner: str | None = None) -> bool:
-    """Re-populate sess.model from the matching endpoint's cached models.
+    """Recover sess.model from the endpoint's visible cached and pinned models.
 
     Covers the window between endpoint setup and the first chat send: the
     picker showed a model in the dropdown but the session record never got
@@ -1965,6 +1965,9 @@ def _recover_empty_session_model(sess, session_id: str, owner: str | None = None
                 visible = _visible_models(cached, getattr(ep, "hidden_models", None))
             except Exception:
                 visible = cached
+        if not is_chatgpt_subscription:
+            from src.endpoint_resolver import _endpoint_enabled_models
+            visible = _endpoint_enabled_models(ep)
         if current_model and current_model in {str(item).strip() for item in visible}:
             return False
         if is_chatgpt_subscription:
@@ -3923,6 +3926,19 @@ def setup_chat_routes(
             if ctx.preprocessed.attachment_meta:
                 yield f"data: {json.dumps({'type': 'attachments', 'data': ctx.preprocessed.attachment_meta})}\n\n"
 
+            # Give the page the saved user message's id. Only the reply's id
+            # was sent back, so a message sent in the open page had none and
+            # a later regenerate/edit of it could not cut the chat by id.
+            try:
+                _last_user_msg = next((m for m in reversed(getattr(sess, "history", None) or [])
+                                       if getattr(m, "role", None) == "user"), None)
+                _user_db_id = ((getattr(_last_user_msg, "metadata", None) or {}).get("_db_id")
+                               if _last_user_msg is not None else None)
+                if _user_db_id:
+                    yield f"data: {json.dumps({'type': 'user_message_saved', 'id': _user_db_id})}\n\n"
+            except Exception:
+                pass
+
             # Announce any docs auto-created during preprocess (e.g. fillable
             # PDF → editable markdown) so the editor pane switches to them
             # before the model starts streaming.

routes/cookbook_helpers.py

@@ -1491,6 +1491,20 @@ def _diagnose_serve_output(text: str) -> dict | None:
             "Port is already in use.",
             [{"label": "retry on port 8001", "op": "replace", "flag": "--port", "value": "8001"}],
         ),
+        (
+            # PyPI torch/vLLM wheels now target CUDA 13, which needs driver 580+.
+            # torch: "The NVIDIA driver on your system is too old (found version 12080)";
+            # vLLM kernels: "CUDA driver version is insufficient for CUDA runtime version".
+            r"NVIDIA driver on your system is too old|CUDA driver version is insufficient",
+            "The installed PyTorch/vLLM build needs a newer NVIDIA driver than this server has.",
+            [
+                {
+                    "label": "install builds for the driver's CUDA version, e.g. vLLM's +cu129 wheel from its GitHub release with uv pip install … --torch-backend cu129",
+                    "op": "manual",
+                },
+                {"label": "or update the NVIDIA driver (CUDA 13 builds need driver 580 or newer)", "op": "manual"},
+            ],
+        ),
         (
             r"No CUDA GPUs are available|no GPU.*found|CUDA_VISIBLE_DEVICES.*invalid",
             "No GPUs are visible to the serve process.",

routes/cookbook_routes.py

@@ -468,175 +468,6 @@ def setup_cookbook_routes() -> APIRouter:
                     task["payload"].pop("hf_token", None)
         return state
 
-    def _diagnose_serve_output(text: str) -> dict | None:
-        """Server-side mirror of the Cookbook UI's common serve diagnoses.
-
-        The browser uses cookbook-diagnosis.js for clickable fixes. This gives
-        the agent/tool path the same structured signal so it can retry with an
-        adjusted command instead of guessing from raw tmux output.
-        """
-        if not text:
-            return None
-        tail = text[-6000:]
-        patterns = [
-            (
-                r"No available memory for the cache blocks|Available KV cache memory:.*-",
-                "No GPU memory left for KV cache after loading model.",
-                [
-                    {"label": "retry with GPU memory utilization 0.95", "op": "replace", "flag": "--gpu-memory-utilization", "value": "0.95"},
-                    {"label": "retry with context 2048", "op": "replace", "flag": "--max-model-len", "value": "2048"},
-                ],
-            ),
-            (
-                r"CUDA out of memory|torch\.cuda\.OutOfMemoryError|CUDA error: out of memory|warming up sampler|max_num_seqs.*gpu_memory_utilization",
-                "GPU ran out of memory during startup or warmup.",
-                [
-                    {"label": "retry with context 4096", "op": "replace", "flag": "--max-model-len", "value": "4096"},
-                    {"label": "retry with GPU memory utilization 0.80", "op": "replace", "flag": "--gpu-memory-utilization", "value": "0.80"},
-                    {"label": "retry with --enforce-eager", "op": "append", "arg": "--enforce-eager"},
-                ],
-            ),
-            (
-                r"not divisib|must be divisible|attention heads.*divisible",
-                "Tensor parallel size is incompatible with the model.",
-                [
-                    {"label": "retry with tensor parallel size 1", "op": "replace", "flag": "--tensor-parallel-size", "value": "1"},
-                    {"label": "retry with tensor parallel size 2", "op": "replace", "flag": "--tensor-parallel-size", "value": "2"},
-                ],
-            ),
-            (
-                r"KV cache.*too (small|large)|max_model_len.*exceeds|maximum.*context",
-                "Context length is too large for available GPU memory.",
-                [
-                    {"label": "retry with context 8192", "op": "replace", "flag": "--max-model-len", "value": "8192"},
-                    {"label": "retry with context 4096", "op": "replace", "flag": "--max-model-len", "value": "4096"},
-                ],
-            ),
-            (
-                r"enable-auto-tool-choice requires --tool-call-parser",
-                "Auto tool choice requires an explicit tool call parser.",
-                [{"label": "retry with Hermes tool parser", "op": "append", "arg": "--tool-call-parser hermes"}],
-            ),
-            (
-                r"Please pass.*trust.remote.code=True|contains custom code which must be executed to correctly load|does not recognize this architecture|model type.*but Transformers does not",
-                "Model requires custom code or newer model support.",
-                [{"label": "retry with --trust-remote-code", "op": "append", "arg": "--trust-remote-code"}],
-            ),
-            (
-                r"Either a revision or a version must be specified|transformers\.integrations\.hub_kernels|kernels/layer",
-                "vLLM/Transformers kernel package mismatch.",
-                [{"label": "update vLLM, Transformers, and kernels on this server", "op": "dependency", "package": "vllm transformers kernels"}],
-            ),
-            (
-                r"Address already in use|bind.*address.*in use",
-                "Port is already in use.",
-                [{"label": "retry on port 8001", "op": "replace", "flag": "--port", "value": "8001"}],
-            ),
-            (
-                r"No CUDA GPUs are available|no GPU.*found|CUDA_VISIBLE_DEVICES.*invalid",
-                "No GPUs are visible to the serve process.",
-                [{"label": "clear Cookbook GPU selection or choose available GPUs", "op": "settings", "field": "gpus", "value": ""}],
-            ),
-            (
-                r"Failed to infer device type|NVML Shared Library Not Found|No module named 'amdsmi'|platform is not available",
-                "vLLM could not find a supported GPU (CUDA or ROCm). "
-                "This machine may have integrated or unsupported graphics only.",
-                [
-                    {"label": "switch to llama.cpp (CPU/Metal, works without a discrete GPU)", "op": "manual"},
-                    {"label": "switch to Ollama (CPU/Metal, works without a discrete GPU)", "op": "manual"},
-                ],
-            ),
-            (
-                r"vllm.*command not found|No module named vllm|ERROR: vLLM is not installed",
-                "vLLM is not installed or not in PATH on this server.",
-                [{"label": "install vLLM in Cookbook Dependencies", "op": "dependency", "package": "vllm"}],
-            ),
-            (
-                r"sgl_kernel[\s\S]*(Python\.h|libnuma\.so\.1|common_ops|libnvrtc\.so)|"
-                r"(Python\.h|libnuma\.so\.1|common_ops|libnvrtc\.so)[\s\S]*sgl_kernel|"
-                r"Could not load any common_ops library|"
-                r"Please ensure sgl_kernel is properly installed",
-                "SGLang native kernel/runtime is missing or mismatched on this server.",
-                [
-                    {"label": "repair sglang-kernel in this Python environment", "op": "dependency", "package": "sglang-kernel"},
-                    {"label": "if libnvrtc is still missing, install the matching CUDA/NVRTC runtime on this host", "op": "manual"},
-                ],
-            ),
-            (
-                r"sglang.*command not found|No module named sglang|SGLang is not installed",
-                "SGLang is not installed or not in PATH on this server.",
-                [{"label": "install SGLang in Cookbook Dependencies", "op": "dependency", "package": "sglang[all]"}],
-            ),
-            (
-                r"No module named ['\"]?mlx_lm|mlx_lm.*command not found|MLX is not installed|MLX LM is not installed",
-                "MLX LM is not installed on this server.",
-                [{"label": "install mlx-lm in Cookbook Dependencies", "op": "dependency", "package": "mlx-lm"}],
-            ),
-            (
-                r"OmniGen2Pipeline|module diffusers has no attribute .*Pipeline|custom_pipeline=.*failed",
-                "This image model uses a custom Diffusers pipeline that the launch environment does not know yet.",
-                [{"label": "update Diffusers image dependencies", "op": "dependency", "package": "diffusers transformers accelerate"}],
-            ),
-            (
-                r"Unable to quantize model of type <class ['\"]mlx_lm\.models\.switch_layers\.QuantizedSwitchLinear['\"]>|QuantizedSwitchLinear",
-                "MLX-LM tried to quantize an already-quantized DeepSeek switch layer.",
-                [
-                    {"label": "relaunch from the cached local Hugging Face snapshot path on this Mac", "op": "manual"},
-                    {"label": "Odysseus now rewrites MLX repo-id launches to a cached snapshot when one exists", "op": "manual"},
-                ],
-            ),
-            # System build deps come BEFORE the generic llama.cpp catch-all
-            # so cmake / build-essential / git missing → a specific OS-package
-            # remediation instead of "install llama-cpp-python[server]" (which
-            # itself fails to compile when cmake is absent).
-            (
-                r"cmake: command not found|cmake.*not found.*[Cc]ould not",
-                "cmake is required to build llama.cpp from source but isn't installed on this server.",
-                [{"label": "install build deps for llama.cpp (apt: cmake build-essential git / pacman: cmake base-devel git / dnf: cmake gcc-c++ make git / brew: cmake git)", "op": "dependency", "package": "llama-cpp-python[server]"}],
-            ),
-            (
-                r"^(make|g\+\+|gcc): command not found|Could not find C\+\+ compiler",
-                "A C/C++ compiler (build-essential) is required to build llama.cpp from source.",
-                [{"label": "install build deps for llama.cpp on this server", "op": "dependency", "package": "llama-cpp-python[server]"}],
-            ),
-            (
-                r"^git: command not found",
-                "git is required to clone the llama.cpp source tree.",
-                [{"label": "install build deps for llama.cpp on this server", "op": "dependency", "package": "llama-cpp-python[server]"}],
-            ),
-            (
-                r"llama-server.*command not found|llama\.cpp.*not found|No module named.*llama_cpp|No module named 'starlette_context'",
-                "llama.cpp / llama-cpp-python dependencies are missing.",
-                [{"label": "install llama.cpp dependencies or llama-cpp-python[server]", "op": "dependency", "package": "llama-cpp-python[server]"}],
-            ),
-            (
-                r"No GGUF found on this host|no \.gguf file|No GGUF file found",
-                "No GGUF file found for this model on this host. The llama.cpp backend needs a .gguf file.",
-                [{"label": "download a GGUF build of this model (repo name usually ends in -GGUF, file like Q4_K_M.gguf)", "op": "manual"}],
-            ),
-            (
-                r"No module named 'torch'|No module named torch|No module named 'torchvision'|No module named torchvision|No module named 'diffusers'|No module named diffusers|No module named 'scipy'|No module named scipy|install scipy if you want to use beta sigmas|requires the Torchvision library",
-                "Diffusion serving requires PyTorch, Torchvision, Diffusers, Accelerate, and SciPy.",
-                [{"label": "install Diffusers image deps in Cookbook Dependencies", "op": "dependency", "package": "diffusers[torch] torchvision accelerate scipy python-multipart"}],
-            ),
-            (
-                r"403 Forbidden|401 Unauthorized|Access to model.*is restricted|gated repo|not in the authorized list|awaiting a review",
-                "Model access is gated or unauthorized.",
-                [{"label": "set HF token and request model access on HuggingFace", "op": "manual"}],
-            ),
-        ]
-        for pattern, message, suggestions in patterns:
-            if re.search(pattern, tail, re.I):
-                return {"message": message, "suggestions": suggestions}
-        if re.search(r"Traceback \(most recent call last\)", tail, re.I) and not re.search(
-            r"Application startup complete|GET /v1/|Uvicorn running on", tail, re.I
-        ):
-            return {
-                "message": "Python traceback detected during serve startup.",
-                "suggestions": [{"label": "inspect traceback and retry with adjusted backend/settings", "op": "manual"}],
-            }
-        return None
-
     def _state_for_client(state):
         """Return cookbook state without raw secrets for browser clients."""
         _strip_task_secrets(state)
@@ -1577,10 +1408,15 @@ def setup_cookbook_routes() -> APIRouter:
 
         return {"models": models, "host": host or "local"}
 
-    def _auto_register_image_endpoint(req: ServeRequest, remote: str | None) -> str | None:
+    def _auto_register_image_endpoint(
+        req: ServeRequest,
+        remote: str | None,
+        serve_session_id: str | None = None,
+    ) -> str | None:
         """Register a diffusion model as an image endpoint so it appears in the model selector."""
         import re
         from core.database import SessionLocal, ModelEndpoint
+        from routes.model_routes import _normalize_model_ids
         from src.settings import load_settings, save_settings
 
         # Parse port from command (--port NNNN), default 8100 for diffusion_server
@@ -1608,9 +1444,13 @@ def setup_cookbook_routes() -> APIRouter:
             if existing:
                 existing.is_enabled = True
                 existing.model_type = "image"
-                existing.name = display_name
+                # Follow the newly served model unless the user renamed the endpoint.
+                pinned_names = {f"{m.split('/')[-1]} (image)" for m in _normalize_model_ids(existing.pinned_models)}
+                if existing.name in pinned_names:
+                    existing.name = display_name
                 existing.endpoint_kind = "local"
                 existing.model_refresh_mode = "manual"
+                existing.cookbook_serve_session_id = serve_session_id
                 if pinned_models:
                     existing.cached_models = json.dumps(pinned_models)
                     existing.pinned_models = json.dumps(pinned_models)
@@ -1634,6 +1474,7 @@ def setup_cookbook_routes() -> APIRouter:
                 model_refresh_mode="manual",
                 cached_models=json.dumps(pinned_models) if pinned_models else None,
                 pinned_models=json.dumps(pinned_models) if pinned_models else None,
+                cookbook_serve_session_id=serve_session_id,
             )
             db.add(ep)
             db.commit()
@@ -1779,43 +1620,71 @@ def setup_cookbook_routes() -> APIRouter:
                 # let the probe layer mark it offline if nothing's listening.
                 logger.info(f"crash-watchdog: serve {session_id} exited cleanly (0); leaving endpoint {endpoint_id}")
                 return
-            # Non-zero exit — drop the endpoint.
+            # A nonzero exit may delete only the endpoint owned by this serve.
             try:
                 from core.database import SessionLocal as _SL, ModelEndpoint as _ME
+                from core.constants import internal_api_base as _internal_api_base
+                from core.middleware import INTERNAL_TOOL_HEADER, INTERNAL_TOOL_TOKEN
+                from urllib.parse import quote
+                import httpx
+
                 db = _SL()
                 try:
                     ep = db.query(_ME).filter(_ME.id == endpoint_id).first()
-                    if ep:
-                        # A scheduled serve can leave old non-zero exit markers
-                        # in tmux scrollback while the current OpenAI endpoint is
-                        # actually alive. Verify reachability before deleting the
-                        # endpoint row; otherwise chats fall back even though the
-                        # served model is ready.
-                        try:
-                            probe_url = ep.base_url.rstrip("/") + "/models"
-                            with urllib.request.urlopen(probe_url, timeout=3) as resp:
-                                if 200 <= getattr(resp, "status", 0) < 300:
-                                    logger.info(
-                                        f"crash-watchdog: serve {session_id} has exit marker {exit_code} "
-                                        f"but endpoint {ep.id} is reachable; leaving it registered"
-                                    )
-                                    return
-                        except Exception:
-                            pass
+                    if not ep or ep.cookbook_serve_session_id != session_id:
                         logger.info(
-                            f"crash-watchdog: dropping endpoint {endpoint_id} "
-                            f"({ep.name} @ {ep.base_url}) — serve exited {exit_code}"
+                            "crash-watchdog: endpoint %s no longer owned by %s",
+                            endpoint_id, session_id,
                         )
-                        db.delete(ep)
-                        db.commit()
+                        return
+                    probe_url = ep.base_url.rstrip("/") + "/models"
                 finally:
                     db.close()
+
+                # Preserve an endpoint that is already healthy, including
+                # after an old runner emits a stale failure marker.
+                try:
+                    with urllib.request.urlopen(probe_url, timeout=3) as resp:
+                        if 200 <= getattr(resp, "status", 0) < 300:
+                            logger.info(
+                                "crash-watchdog: endpoint %s is reachable; keeping it",
+                                endpoint_id,
+                            )
+                            return
+                except Exception:
+                    pass
+
+                async with httpx.AsyncClient(timeout=8) as client:
+                    response = await client.delete(
+                        f"{_internal_api_base()}/api/model-endpoints/{quote(endpoint_id, safe='')}",
+                        params={"expected_cookbook_serve_session_id": session_id},
+                        headers={INTERNAL_TOOL_HEADER: INTERNAL_TOOL_TOKEN},
+                    )
+                if response.status_code == 200:
+                    logger.info(
+                        "crash-watchdog: deleted endpoint %s after serve %s exited %s",
+                        endpoint_id, session_id, exit_code,
+                    )
+                elif response.status_code in (404, 409):
+                    logger.info(
+                        "crash-watchdog: endpoint %s absent or reassigned; keeping it",
+                        endpoint_id,
+                    )
+                else:
+                    logger.warning(
+                        "crash-watchdog: endpoint %s deletion returned HTTP %s",
+                        endpoint_id, response.status_code,
+                    )
             except Exception as e:
-                logger.warning(f"crash-watchdog: endpoint cleanup failed: {e!r}")
+                logger.warning("crash-watchdog: endpoint cleanup failed: %r", e)
             return
         logger.debug(f"crash-watchdog: no exit marker for {session_id} within window; leaving endpoint {endpoint_id}")
 
-    def _auto_register_llm_endpoint(req: ServeRequest, remote: str | None) -> str | None:
+    def _auto_register_llm_endpoint(
+        req: ServeRequest,
+        remote: str | None,
+        serve_session_id: str | None = None,
+    ) -> str | None:
         """Register a freshly-served LLM as a model endpoint so it appears in the
         model picker without a manual /setup step — the text-model sibling of
         _auto_register_image_endpoint.
@@ -1832,6 +1701,7 @@ def setup_cookbook_routes() -> APIRouter:
         )
         import re
         from core.database import SessionLocal, ModelEndpoint
+        from routes.model_routes import _normalize_model_ids
 
         # Port: ordered fallbacks so we match whatever the user actually
         # asked for, not a hardcoded default:
@@ -1893,8 +1763,12 @@ def setup_cookbook_routes() -> APIRouter:
         # deployment alias from /v1/models, and a stale server can answer on the
         # same port while the new launch failed. Keeping the requested model id
         # pinned makes the picker reflect the actual launch intent.
-        pinned_models = [mlx_shim_model_id] if mlx_shim_model_id else ([req.repo_id] if req.repo_id else [])
+        launched_model = mlx_shim_model_id or req.repo_id
+        pinned_models = [launched_model] if launched_model else []
 
+        # Launch registration must not delete other endpoints.
+        # Matching names, model pins, and failed probes do not prove that
+        # another serve has stopped. Lifecycle cleanup owns termination.
         db = SessionLocal()
         try:
             # Reuse an endpoint already pointed at this URL instead of duplicating.
@@ -1902,19 +1776,22 @@ def setup_cookbook_routes() -> APIRouter:
             if existing:
                 existing.is_enabled = True
                 existing.model_type = "llm"
-                existing.name = display_name
+                # Follow the newly served model unless the user renamed the endpoint.
+                pinned_names = {m.split("/")[-1] for m in _normalize_model_ids(existing.pinned_models)}
+                if existing.name in pinned_names:
+                    existing.name = display_name
                 existing.endpoint_kind = "local"
                 existing.model_refresh_mode = "auto"
-                if pinned_models:
-                    try:
-                        existing_pinned = json.loads(existing.pinned_models or "[]")
-                    except Exception:
-                        existing_pinned = []
-                    merged_pinned = []
-                    for mid in [*existing_pinned, *pinned_models]:
-                        if mid and mid not in merged_pinned:
-                            merged_pinned.append(mid)
-                    existing.pinned_models = json.dumps(merged_pinned) if merged_pinned else None
+                # A reused endpoint belongs to the newest serve session.
+                existing.cookbook_serve_session_id = serve_session_id
+                if launched_model:
+                    # Pins represent model selection, not launch history.
+                    existing_pins = _normalize_model_ids(
+                        existing.pinned_models
+                    )
+                    if launched_model not in existing_pins:
+                        existing_pins.append(launched_model)
+                    existing.pinned_models = json.dumps(existing_pins)
                 if is_ollama_endpoint:
                     existing.endpoint_kind = "ollama"
                     if pinned_models:
@@ -1940,22 +1817,6 @@ def setup_cookbook_routes() -> APIRouter:
                             db.commit()
                 except Exception as _pe:
                     logger.warning(f"Re-probe failed for {base_url}: {_pe!r}")
-                # Sweep stale dupes: other endpoints with the same display name
-                # at DIFFERENT URLs (likely failed earlier-attempt ports) get
-                # deleted so the picker doesn't show an offline ghost next to
-                # the working one. Only sweeps endpoints whose id starts with
-                # `local-` so we never touch a user's hand-added DeepSeek/OpenAI/
-                # etc. entry with a coincidentally matching name.
-                stale = (db.query(ModelEndpoint)
-                         .filter(ModelEndpoint.name == display_name)
-                         .filter(ModelEndpoint.base_url != base_url)
-                         .filter(ModelEndpoint.id.like("local-%"))
-                         .all())
-                for s in stale:
-                    logger.info(f"Sweeping stale local endpoint {s.id} ({s.base_url})")
-                    db.delete(s)
-                if stale:
-                    db.commit()
                 return existing.id
 
             ep_id = f"local-{uuid.uuid4().hex[:8]}"
@@ -1971,22 +1832,11 @@ def setup_cookbook_routes() -> APIRouter:
                 cached_models=json.dumps(pinned_models) if pinned_models else None,
                 pinned_models=json.dumps(pinned_models) if pinned_models else None,
                 supports_tools=supports_tools,
+                cookbook_serve_session_id=serve_session_id,
             )
             db.add(ep)
             db.commit()
             logger.info(f"Auto-registered local model endpoint: {display_name} @ {base_url}")
-            # Same sweep on first-register path: drop any pre-existing local-*
-            # endpoints with this display name pointed elsewhere.
-            stale = (db.query(ModelEndpoint)
-                     .filter(ModelEndpoint.name == display_name)
-                     .filter(ModelEndpoint.id != ep_id)
-                     .filter(ModelEndpoint.id.like("local-%"))
-                     .all())
-            for s in stale:
-                logger.info(f"Sweeping stale local endpoint {s.id} ({s.base_url})")
-                db.delete(s)
-            if stale:
-                db.commit()
             # Probe /v1/models NOW and write cached_models so the chat
             # picker actually shows the model on the next /api/models
             # call. Without this immediate probe, the endpoint has empty
@@ -2808,9 +2658,17 @@ def setup_cookbook_routes() -> APIRouter:
         endpoint_id = None
         is_image_endpoint = "diffusion_server.py" in req.cmd or "mlx_image_server.py" in req.cmd
         if is_image_endpoint:
-            endpoint_id = _auto_register_image_endpoint(req, remote)
+            endpoint_id = _auto_register_image_endpoint(
+                req,
+                remote,
+                serve_session_id=session_id,
+            )
         elif not is_pip_install:
-            endpoint_id = _auto_register_llm_endpoint(req, remote)
+            endpoint_id = _auto_register_llm_endpoint(
+                req,
+                remote,
+                serve_session_id=session_id,
+            )
 
         # Crash watchdog: the auto-register above writes the endpoint row
         # IMMEDIATELY (before the server has even bound its port) so the
@@ -3930,7 +3788,7 @@ def setup_cookbook_routes() -> APIRouter:
                     return {"ok": False, "files": [], "error": f"HF API HTTP {resp.status_code}"}
                 data = resp.json()
         except Exception:
-            logger.exception("HF GGUF file scan failed for %s", repo)
+            logger.exception("HF GGUF file scan failed for %s", repo_id)
             return {"ok": False, "files": [], "error": "HF API request failed"}
         files = [
             str(s.get("rfilename") or "")
@@ -4446,7 +4304,9 @@ def setup_cookbook_routes() -> APIRouter:
                 # fills the visible tail. Without this, output_tail ends up
                 # as just "Locale: C / Ubuntu_Odysseus ❯" and the agent
                 # can't diagnose the actual error.
-                capture_cmd = ssh_base + [remote, _remote_tmux_command("capture-pane", "-t", session_id, "-p", "-S", "-500")]
+                # -J joins lines tmux wrapped at the pane width, so an error
+                # split mid-word still matches the serve diagnosis patterns.
+                capture_cmd = ssh_base + [remote, _remote_tmux_command("capture-pane", "-t", session_id, "-p", "-J", "-S", "-500")]
             elif IS_WINDOWS:
                 # LOCAL Windows task: launched as a detached process (no tmux).
                 # Liveness comes from the <session>.pid file, output from the
@@ -4455,7 +4315,7 @@ def setup_cookbook_routes() -> APIRouter:
                 capture_cmd = None
             else:
                 check_cmd = ["tmux", "has-session", "-t", session_id]
-                capture_cmd = ["tmux", "capture-pane", "-t", session_id, "-p", "-S", "-500"]
+                capture_cmd = ["tmux", "capture-pane", "-t", session_id, "-p", "-J", "-S", "-500"]
 
             local_win_task = (not remote) and IS_WINDOWS
 

routes/document/document_routes.py

@@ -16,6 +16,7 @@ from core.database import SessionLocal, Document, DocumentVersion
 from core.database import Session as DbSession
 from src.auth_helpers import get_current_user, _auth_disabled
 from src.constants import MAIL_ATTACHMENTS_DIR
+from src.session_search import _escape_like
 from src.upload_handler import reserve_upload_references
 
 logger = logging.getLogger(__name__)
@@ -571,9 +572,10 @@ def setup_document_routes(session_manager, upload_handler=None) -> APIRouter:
             # match docs containing both words regardless of position/order.
             if search:
                 for tok in search.split():
-                    term = f"%{tok}%"
+                    term = f"%{_escape_like(tok)}%"
                     q = q.filter(
-                        Document.title.ilike(term) | Document.current_content.ilike(term)
+                        Document.title.ilike(term, escape="\\")
+                        | Document.current_content.ilike(term, escape="\\")
                     )
 
             # Language filter. "pdf" is a display language derived from the
@@ -812,10 +814,13 @@ def setup_document_routes(session_manager, upload_handler=None) -> APIRouter:
                     ext = _ext.get(doc.language or "text", ".txt")
                     base = (doc.title or "document").strip() or "document"
                     base = re.sub(r"[^\w\-. ]+", "", base)[:60].strip() or doc.id
-                    name = base if "." in base else base + ext
+                    has_ext = base.lower().endswith(ext)
+                    stem = base[:-len(ext)] if has_ext else base
+                    suffix = base[-len(ext):] if has_ext else ext
+                    name = stem + suffix
                     i = 1
                     while name in used:
-                        name = f"{base}-{i}" + ("" if "." in base else ext)
+                        name = f"{stem}-{i}{suffix}"
                         i += 1
                     used.add(name)
                     content = doc.current_content or ""

routes/editor_agent_routes.py

@@ -846,6 +846,64 @@ 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]]:
@@ -855,6 +913,8 @@ 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.
@@ -1647,6 +1707,13 @@ 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]
@@ -1797,9 +1864,22 @@ 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.
-                if model_choice:
-                    tool_payload["model"] = model_choice
+                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)
                 # 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/gallery/gallery_routes.py

@@ -18,6 +18,7 @@ from fastapi import APIRouter, HTTPException, Query, Request
 from core.database import SessionLocal, GalleryImage, GalleryAlbum, ModelEndpoint
 from core.database import Session as DbSession
 from src.auth_helpers import get_current_user, owner_filter, require_privilege
+from src.session_search import escape_like_pattern
 from src.upload_limits import (
     read_upload_limited,
     GALLERY_UPLOAD_MAX_BYTES,
@@ -37,6 +38,24 @@ _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:
@@ -305,6 +324,23 @@ def _b64_bytes(value: str, *, label: str = "image") -> bytes:
         raise HTTPException(400, f"Invalid {label}") from exc
 
 
+async def _json_object(request: Request) -> dict:
+    try:
+        data = await request.json()
+    except ValueError:
+        raise HTTPException(400, "Invalid JSON body")
+    if not isinstance(data, dict):
+        raise HTTPException(400, "JSON object body required")
+    return data
+
+
+async def _image_ids(request: Request) -> list:
+    ids = (await _json_object(request)).get("image_ids", [])
+    if not isinstance(ids, list) or not all(isinstance(i, str) for i in ids):
+        raise HTTPException(400, "image_ids must be a list of image ids")
+    return ids
+
+
 def _pil_image_to_b64(img, *, fmt: str = "PNG") -> str:
     buf = io.BytesIO()
     img.save(buf, format=fmt)
@@ -568,6 +604,7 @@ def _is_openai_api_base(url: str) -> bool:
 
 
 _GALLERY_ENDPOINT_PATHS = frozenset({
+    "/chat/completions",
     "/images",
     "/images/edits",
     "/images/generations",
@@ -1184,15 +1221,18 @@ def setup_gallery_routes() -> APIRouter:
             )
             q = _owner_filter(q, user)
 
-            # Search filter (prompt + tags + ai_tags)
+            # Per-term AND search: a single `%foo bar%` LIKE only matched the
+            # exact phrase, so "red car" missed "a car that is red".
+            # LIKE wildcards are escaped per token.
             if search:
-                term = f"%{search}%"
                 from sqlalchemy import or_
-                q = q.filter(or_(
-                    GalleryImage.prompt.ilike(term),
-                    GalleryImage.tags.ilike(term),
-                    GalleryImage.ai_tags.ilike(term),
-                ))
+                for tok in search.split():
+                    term = f"%{escape_like_pattern(tok)}%"
+                    q = q.filter(or_(
+                        GalleryImage.prompt.ilike(term, escape="\\"),
+                        GalleryImage.tags.ilike(term, escape="\\"),
+                        GalleryImage.ai_tags.ilike(term, escape="\\"),
+                    ))
 
             # Tag filter. The UI stacks multiple tag pills by passing them
             # comma-separated — each tag adds a separate AND-filter so the
@@ -1203,9 +1243,10 @@ def setup_gallery_routes() -> APIRouter:
                 for one in (t.strip() for t in tag.split(",")):
                     if not one:
                         continue
+                    safe_tag = f"%{escape_like_pattern(one)}%"
                     q = q.filter(_or(
-                        GalleryImage.tags.ilike(f"%{one}%"),
-                        GalleryImage.ai_tags.ilike(f"%{one}%"),
+                        GalleryImage.tags.ilike(safe_tag, escape="\\"),
+                        GalleryImage.ai_tags.ilike(safe_tag, escape="\\"),
                     ))
 
             # Model filter
@@ -1745,6 +1786,17 @@ 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.
@@ -1862,14 +1914,30 @@ def setup_gallery_routes() -> APIRouter:
                         mask_png.save(reference_mask, format="PNG")
                         references = [src_buf.getvalue(), reference_mask.getvalue()]
                         payload = {
-                            "model": oa_model, "size": size, "n": 1,
+                            "model": oa_model, "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],
                         }
-                        r = await client.post(_join_checked_gallery_endpoint(base, "/images"), headers=headers, json=payload)
+                        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)
                     else:
                         r = await client.post(_join_checked_gallery_endpoint(base, "/images/edits"), headers=headers, data=data, files=files)
                     if r.status_code != 200:
@@ -1885,6 +1953,12 @@ 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]
@@ -1904,17 +1978,13 @@ def setup_gallery_routes() -> APIRouter:
                     # the masked region actually changes.
                     try:
                         generated = Image.open(io.BytesIO(base64.b64decode(raw_b64))).convert("RGBA")
-                        # 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)
+                        blended, full_frame = _compose_cloud_image_edit(
+                            source_png, generated, mask_png,
+                            instruction=body.get("mode") == "instruction",
+                        )
                         out_buf = io.BytesIO()
                         blended.save(out_buf, format="PNG")
-                        return {"image": base64.b64encode(out_buf.getvalue()).decode(), "model": oa_model}
+                        return {"image": base64.b64encode(out_buf.getvalue()).decode(), "model": oa_model, "full_frame": full_frame}
                     except Exception as comp_err:
                         # Never return a full-image edit when masking fails.
                         logger.warning(f"Inpaint compose failed: {comp_err}")
@@ -2571,7 +2641,9 @@ def setup_gallery_routes() -> APIRouter:
             height = int((body or {}).get("height") or 0)
         except (TypeError, ValueError):
             width = height = 0
-        if height > width:
+        if width > 0 and height > 0:
+            size = f"{width}x{height}"
+        elif height > width:
             size = "1024x1536"
         elif width > height:
             size = "1536x1024"
@@ -2584,6 +2656,9 @@ 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
@@ -2939,14 +3014,22 @@ def setup_gallery_routes() -> APIRouter:
     @router.put("/api/gallery/albums/{album_id}")
     async def update_album(request: Request, album_id: str):
         user = get_current_user(request)
-        data = await request.json()
+        data = await _json_object(request)
+        name = data.get("name")
+        if name is not None:
+            if not isinstance(name, str) or not name.strip():
+                raise HTTPException(400, "Album name required")
+            name = name.strip()
+        description = data.get("description")
+        if description is not None and not isinstance(description, str):
+            raise HTTPException(400, "Album description must be a string")
         db = SessionLocal()
         try:
             album = _get_or_404_album(db, album_id, user)
-            if data.get("name") is not None:
-                album.name = data["name"]
-            if data.get("description") is not None:
-                album.description = data["description"]
+            if name is not None:
+                album.name = name
+            if description is not None:
+                album.description = description
             if data.get("cover_id") is not None:
                 cover_id = data["cover_id"] or None
                 if cover_id:
@@ -2976,8 +3059,7 @@ def setup_gallery_routes() -> APIRouter:
     @router.post("/api/gallery/albums/{album_id}/add")
     async def add_to_album(request: Request, album_id: str):
         user = get_current_user(request)
-        data = await request.json()
-        ids = data.get("image_ids", [])
+        ids = await _image_ids(request)
         db = SessionLocal()
         try:
             _get_or_404_album(db, album_id, user)
@@ -2994,8 +3076,7 @@ def setup_gallery_routes() -> APIRouter:
     @router.post("/api/gallery/albums/{album_id}/remove")
     async def remove_from_album(request: Request, album_id: str):
         user = get_current_user(request)
-        data = await request.json()
-        ids = data.get("image_ids", [])
+        ids = await _image_ids(request)
         db = SessionLocal()
         try:
             _get_or_404_album(db, album_id, user)

routes/history/history_routes.py

@@ -825,6 +825,23 @@ def setup_history_routes(session_manager, upload_handler=None) -> APIRouter:
         try:
             body = await request.json()
             keep_count = body.get("keep_count", 0)
+            # A message id is exact; keep_count from the client counts only the
+            # messages loaded in the page. before_msg_id forks before that
+            # message, through_msg_id includes it.
+            before_msg_id = str(body.get("before_msg_id") or "").strip()
+            through_msg_id = str(body.get("through_msg_id") or "").strip()
+            if before_msg_id or through_msg_id:
+                db = SessionLocal()
+                try:
+                    all_db_messages = db.query(DbChatMessage).filter(
+                        DbChatMessage.session_id == session_id
+                    ).order_by(DbChatMessage.timestamp).all()
+                finally:
+                    db.close()
+                resolved = _keep_count_before_message(all_db_messages, before_msg_id or through_msg_id)
+                if resolved is None:
+                    raise HTTPException(404, "Message not found")
+                keep_count = resolved + (0 if before_msg_id else 1)
 
             # Get the source session. keep_count indexes into source.history,
             # so this must go through get_session — reading the cache directly

routes/model_routes.py

@@ -659,7 +659,7 @@ _NON_CHAT_CONTAINS = (
     "gliner", "riva", "-parse", "-embedqa", "-nemoretriever",
     "topic-control", "calibration",
     "ai-synthetic-video", "cosmos-reason2",
-    "bge", "llama-guard",
+    "bge", "llama-guard", "-embed", "rerank",
 )
 _NON_CHAT_EXACT_PREFIXES = (
     "gpt-audio",  # gpt-audio, gpt-audio-mini etc. (not gpt-4o-audio-preview which is chat)
@@ -2846,11 +2846,12 @@ def setup_model_routes(model_discovery):
                 return {"endpoint_id": "", "endpoint_url": "", "model": ""}
             base = _normalize_base(ep.base_url)
             chat_url = build_chat_url(base)
+            if model and not _is_chat_model(model):
+                model = ""
             if not model and (getattr(ep, "cached_models", None) or getattr(ep, "pinned_models", None)):
                 try:
                     visible = _visible_models(ep.cached_models, getattr(ep, "hidden_models", None), getattr(ep, "pinned_models", None))
-                    if visible:
-                        model = visible[0]
+                    model = next((mid for mid in visible if _is_chat_model(mid)), "")
                 except Exception:
                     pass
             return {"endpoint_id": ep.id, "endpoint_url": chat_url, "model": model}
@@ -3043,20 +3044,44 @@ def setup_model_routes(model_discovery):
         return {"dependents": _settings_using_endpoint(ep_id)}
 
     @router.delete("/model-endpoints/{ep_id}")
-    def delete_model_endpoint(ep_id: str, request: Request):
+    def delete_model_endpoint(
+        ep_id: str,
+        request: Request,
+        expected_cookbook_serve_session_id: Optional[str] = None,
+    ):
         require_admin(request)
         db = SessionLocal()
         try:
             ep = db.query(ModelEndpoint).filter(ModelEndpoint.id == ep_id).first()
             if not ep or not _chatgpt_endpoint_visible(ep, request):
                 raise HTTPException(404, "Endpoint not found")
+            if expected_cookbook_serve_session_id is not None:
+                # The DELETE itself checks ownership. An old serve must never
+                # mutate the settings of an endpoint reused by another serve.
+                if (
+                    not ep_id.startswith(("local-", "img-"))
+                    or not expected_cookbook_serve_session_id
+                ):
+                    raise HTTPException(409, "Cookbook endpoint ownership mismatch")
+                deleted = (
+                    db.query(ModelEndpoint)
+                    .filter(
+                        ModelEndpoint.id == ep_id,
+                        ModelEndpoint.cookbook_serve_session_id
+                        == expected_cookbook_serve_session_id,
+                    )
+                    .delete(synchronize_session=False)
+                )
+                if not deleted:
+                    raise HTTPException(409, "Cookbook endpoint ownership changed")
             # Clean up any settings that reference this endpoint
             cleared = _clear_settings_for_endpoint(ep_id)
             cleared_user_preferences = _clear_user_prefs_for_endpoint(ep_id)
             cleared_sessions = _clear_sessions_for_endpoint(db, ep.base_url, ep.id, ep.owner)
             cleared_loaded_sessions = _clear_loaded_sessions_for_endpoint(ep.base_url, ep.id, ep.owner)
             auth_id = getattr(ep, "provider_auth_id", None)
-            db.delete(ep)
+            if expected_cookbook_serve_session_id is None:
+                db.delete(ep)
             cleared_provider_auth = _delete_orphaned_provider_auth(db, auth_id, exclude_ep_id=ep_id)
             db.commit()
             _invalidate_models_cache()

routes/prefs_routes.py

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

routes/research/research_routes.py

@@ -183,6 +183,7 @@ def _resolve_endpoint_runtime(ep, owner=None, model: Optional[str] = None):
     OAuth tokens in ProviderAuthSession, so ep.api_key is intentionally empty.
     """
     from src.endpoint_resolver import (
+        _endpoint_enabled_models,
         build_chat_url,
         build_headers,
         resolve_endpoint_runtime as resolve_model_endpoint_runtime,
@@ -197,7 +198,7 @@ def _resolve_endpoint_runtime(ep, owner=None, model: Optional[str] = None):
     ep_model = (model or "").strip()
     if not ep_model:
         try:
-            models = json.loads(ep.cached_models) if ep.cached_models else []
+            models = _endpoint_enabled_models(ep)
             if models:
                 ep_model = _first_chat_model(models)
         except Exception:
@@ -824,23 +825,13 @@ def setup_research_routes(research_handler, session_manager=None) -> APIRouter:
         if not ep_url or not ep_model:
             # Last resort: this user's enabled endpoint, plus legacy shared rows.
             from src.database import SessionLocal
-            from src.endpoint_resolver import normalize_base, build_chat_url, build_headers
             db = SessionLocal()
             try:
                 ep = _owned_enabled_endpoint(db, user)
                 if ep:
-                    base = normalize_base(ep.base_url)
-                    fallback_url = build_chat_url(base)
-                    fallback_headers = build_headers(ep.api_key, base)
-                    fallback_model = ""
-                    if ep.cached_models:
-                        try:
-                            models = json.loads(ep.cached_models)
-                            if models:
-                                fallback_model = _first_chat_model(models)
-                        except Exception:
-                            pass
-                    _merge(fallback_url, fallback_model, fallback_headers)
+                    resolved = _resolve_endpoint_runtime(ep, owner=user)
+                    if resolved:
+                        _merge(*resolved)
             finally:
                 db.close()
 

routes/skills_routes.py

@@ -15,6 +15,7 @@ import httpx
 from fastapi import APIRouter, HTTPException, Request
 from pydantic import BaseModel, Field
 
+from services.memory.skill_format import slugify
 from services.memory.skills import SkillsManager
 from src.auth_helpers import get_current_user
 from services.skills import evaluation as _evaluation
@@ -836,6 +837,10 @@ def setup_skills_routes(skills_manager: SkillsManager) -> APIRouter:
         updates = body.dict(exclude_none=True)
         if not updates:
             return {"ok": True}
+        if "name" in updates:
+            new_name = slugify(updates["name"] or match.get("name"))
+            if new_name != match.get("name") and skills_manager.has_skill(new_name, owner=user):
+                raise HTTPException(409, f"A skill named '{new_name}' already exists")
         ok = skills_manager.update_skill(match.get("name"), updates, owner=user)
         if not ok:
             raise HTTPException(404, "Skill not found")

routes/task/task_routes.py

@@ -289,15 +289,15 @@ def _resolve_run_endpoint(db, task: ScheduledTask, run: TaskRun) -> str:
 
     try:
         from core.database import ModelEndpoint
-        eps = db.query(ModelEndpoint).filter(ModelEndpoint.is_enabled == True).all()
+        from src.auth_helpers import owner_filter
+        from src.endpoint_resolver import _endpoint_enabled_models
+
+        eps = owner_filter(
+            db.query(ModelEndpoint).filter(ModelEndpoint.is_enabled == True),
+            ModelEndpoint, getattr(task, "owner", None),
+        ).all()
         for ep in eps:
-            cached = []
-            if ep.cached_models:
-                try:
-                    cached = json.loads(ep.cached_models) or []
-                except Exception:
-                    cached = []
-            if model in cached:
+            if model in _endpoint_enabled_models(ep):
                 return ep.base_url or ""
     except Exception:
         pass

scripts/generate_env_reference.py

@@ -492,6 +492,25 @@ VARIABLE_NOTES: dict[str, tuple[str, str, str]] = {
         "tools that execute code, mutate state or cause external side effects need "
         "a separate approval. Set to 0 to opt out.",
     ),
+    "ODYSSEUS_LOCAL_MCP_READ_TOOLS": (
+        "Agent loop and tool execution", USER,
+        "Security-relevant. Comma-separated exact MCP read-tool names "
+        "on configured stdio MCP servers. Only stdio servers qualify. "
+        "Declarations do not override built-in tool effects. Output remains "
+        "untrusted to prevent privilege escalation, but allows continuation to "
+        "declared write tools on the same stdio server without external taint. "
+        "Stdio transport does not guarantee network isolation. Automatic "
+        "same-store writes carry residual prompt-injection risk.",
+    ),
+    "ODYSSEUS_LOCAL_MCP_WRITE_TOOLS": (
+        "Agent loop and tool execution", USER,
+        "Security-relevant. Comma-separated exact MCP write-tool names "
+        "on configured stdio MCP servers. Only stdio servers qualify. "
+        "Declarations do not override built-in tool effects. Allowed to execute "
+        "after declared local reads on the same stdio server, but blocked once "
+        "external untrusted context enters the run. Authorization must still "
+        "originate from the trusted request grant.",
+    ),
     "ODYSSEUS_MCP_ALLOWED_COMMANDS": (
         "Agent loop and tool execution", USER,
         "Security-relevant. Comma-separated allowlist of MCP launcher basenames the "

services/memory/skill_format.py

@@ -130,10 +130,15 @@ def _parse_scalar(raw: str, *, string_only: bool = False) -> Any:
 def _split_top_level(s: str, sep: str) -> List[str]:
     """Split `s` on `sep` ignoring separators inside [] or quotes."""
     out, buf, depth, quote = [], [], 0, None
+    escaped = False
     for ch in s:
         if quote:
             buf.append(ch)
-            if ch == quote:
+            if escaped:
+                escaped = False
+            elif ch == "\\" and quote == '"':
+                escaped = True
+            elif ch == quote:
                 quote = None
             continue
         if ch in ("'", '"'):

services/memory/skills.py

@@ -500,6 +500,19 @@ class SkillsManager:
         sk.path = self._skill_file(cat, nm)
         return sk.to_dict()
 
+    def has_skill(self, name: str, owner: Optional[str] = None) -> bool:
+        """Whether `owner` already has a skill called `name`, in any category.
+
+        Update and delete find a skill by name within its owner, so two of
+        one owner's skills sharing a name would make them act on whichever
+        file is walked first.
+        """
+        for path in self._iter_skill_files():
+            sk = self._read_skill(path)
+            if sk and sk.name == name and (sk.owner or "") == (owner or ""):
+                return True
+        return False
+
     def update_skill(self, skill_id: str, updates: Dict, owner: Optional[str] = None) -> bool:
         """`skill_id` is the slug name. Allows updating any field plus
         renames if `name` changes (file is moved on disk).
@@ -551,6 +564,9 @@ class SkillsManager:
             # Rename
             new_name = slugify(updates.get("name") or sk.name)
             if new_name != sk.name:
+                if self.has_skill(new_name, owner=owner):
+                    logger.warning(f"Skill rename target name in use: {new_name}")
+                    return False
                 sk.name = new_name
 
             # Write to potentially new path

src/agent_loop.py

@@ -24193,11 +24193,14 @@ async def stream_agent_loop(
                 budget_is_explicit,
                 hard_max=hard_max,
             )
-            if candidate_context <= 8192:
+            if 0 < candidate_context <= 8192:
                 # Small local servers often tokenize chat wrappers and tool
                 # results much more generously than our rough estimator. Keep
                 # substantial headroom for those wrappers and generation so a
                 # follow-up tool round cannot exceed the server's n_ctx.
+                # 0 means the window is unknown, which already gets the
+                # conservative default budget; clamping it as well cut every
+                # request to 1200 tokens and dropped open documents (#6678).
                 effective_budget = min(
                     effective_budget,
                     max(1200, int(candidate_context * 0.40)),
@@ -27833,16 +27836,25 @@ async def stream_agent_loop(
                                 if _streamed_tool_markup or _streamed_tool_markup_starts(_delta_text):
                                     _streamed_tool_markup += _delta_text
                                     if not _streamed_tool_markup_complete(_streamed_tool_markup):
-                                        continue
-                                    _visible_markup_tail = strip_tool_blocks(
-                                        _streamed_tool_markup,
-                                        skip_fenced=True,
-                                    ).strip()
-                                    _streamed_tool_markup = ""
-                                    if not _visible_markup_tail:
-                                        continue
-                                    _delta_text = _visible_markup_tail
-                                    data["delta"] = _delta_text
+                                        if _streamed_tool_markup_starts(_streamed_tool_markup):
+                                            continue
+                                        # False alarm: a bare "<" (e.g. ``x < 2``) looked like
+                                        # a tag prefix, but the buffer can no longer become a
+                                        # tool tag. Release it as prose instead of holding the
+                                        # rest of the answer forever.
+                                        _delta_text = _streamed_tool_markup
+                                        _streamed_tool_markup = ""
+                                        data["delta"] = _delta_text
+                                    else:
+                                        _visible_markup_tail = strip_tool_blocks(
+                                            _streamed_tool_markup,
+                                            skip_fenced=True,
+                                        ).strip()
+                                        _streamed_tool_markup = ""
+                                        if not _visible_markup_tail:
+                                            continue
+                                        _delta_text = _visible_markup_tail
+                                        data["delta"] = _delta_text
                             full_response += _delta_text
                         if not _suppress_unavailable_web_delta:
                             _qwen_buffered_route = bool(

src/agent_runtime/authority.py

@@ -371,6 +371,101 @@ def interpret_request(request_text, *, history=(), workspace=None, active_docume
     return SemanticIntent(families, selected, required_read_operation_for_request(request_text, history))
 
 
+
+def _trusted_local_mcp_request_tools(request_text: str, intent: SemanticIntent) -> set[str]:
+    """Seal local MCP operations from operator declarations and trusted request intent.
+
+    Discovery validates an operator-declared tool but cannot grant it. For the
+    notes family, only an explicit request for local notes admits matching
+    read operations and explicitly requested non-destructive write verbs. Other
+    MCP domains require the user to name the qualified operation explicitly.
+    """
+    from src.tool_capabilities import (
+        LOCAL_MCP_READ_TOOLS_ENV, LOCAL_MCP_WRITE_TOOLS_ENV,
+        _local_mcp_tools, _is_declared_local_mcp_read_tool,
+        _is_declared_local_mcp_write_tool, capabilities_for_tool, ToolEffect,
+    )
+    from src.tool_utils import get_mcp_manager
+
+    manager = get_mcp_manager()
+    if manager is None:
+        return set()
+
+    request = request_text.casefold()
+    local_notes = (
+        intent.selected_tools is None
+        and intent.required_read is None
+        and "notes" in intent.capabilities
+        and re.search(r"\b(?:local|on my computer|on this machine)\b", request)
+    )
+    write_verbs = {
+        "create": r"\b(?:create|add|make)\b",
+        "add": r"\b(?:add|create)\b",
+        "write": r"\bwrite\b",
+        "save": r"\bsave\b",
+        "update": r"\b(?:update|edit|modify|change)\b",
+        "edit": r"\b(?:edit|update|modify|change)\b",
+        "append": r"\bappend\b",
+        "modify": r"\b(?:modify|edit|update|change)\b",
+    }
+    negative_write = re.search(
+        r"\b(?:do not|don't|never|without|no)\s+(?:\w+\s+){0,2}"
+        r"(?:create|add|make|write|save|update|edit|append|modify)\b",
+        request,
+    )
+    declared = _local_mcp_tools(LOCAL_MCP_READ_TOOLS_ENV) | _local_mcp_tools(LOCAL_MCP_WRITE_TOOLS_ENV)
+    admitted = set()
+    for name in sorted(declared):
+        parts = name.split("__", 2)
+        if len(parts) != 3 or parts[0] != "mcp":
+            continue
+        _, server, bare = parts
+        if manager.is_builtin(server):
+            continue
+        conn = manager.get_server_status(server)
+        if conn.get("status") != "connected" or conn.get("transport") != "stdio":
+            continue
+        resource = manager.resource_identity(name)
+        if resource is None or resource.namespace != "mcp" or resource.endpoint_id != f"stdio:{server}":
+            continue
+        rows = manager._tools.get(server, [])
+        row = next((item for item in rows if item.get("name") == bare), None)
+        if row is None:
+            continue
+        read_ok = _is_declared_local_mcp_read_tool(name)
+        write_ok = _is_declared_local_mcp_write_tool(name)
+        if not (read_ok or write_ok):
+            continue
+        caps = capabilities_for_tool(name)
+        if not caps.known or caps.effects != frozenset({
+            ToolEffect.READ_PRIVATE if read_ok else ToolEffect.WRITE_PRIVATE
+        }):
+            continue
+        ann = row.get("annotations") or {}
+        destructive = ann.get("destructiveHint") if isinstance(ann, dict) else getattr(ann, "destructiveHint", None)
+        if destructive is True:
+            continue
+        if write_ok and re.match(r"^(?:delete|remove|erase|destroy|drop|purge)(?:_|$)", bare, re.I):
+            continue
+
+        # Exact qualified names in the trusted request permit any configured
+        # and validated local operation. Model/tool content is not an input.
+        explicitly_named = bool(re.search(
+            r"(?<![A-Za-z0-9_])" + re.escape(name.casefold()) + r"(?![A-Za-z0-9_])",
+            request,
+        ))
+        if not explicitly_named:
+            if not local_notes or not re.search(r"(?:^|_)notes?(?:_|$)", bare, re.I):
+                continue
+            if write_ok:
+                action = bare.split("_", 1)[0].casefold()
+                if action not in write_verbs or not re.search(write_verbs[action], request):
+                    continue
+                if negative_write:
+                    continue
+        admitted.add(name)
+    return admitted
+
 def create_request_authority(request_text, *, owner=None, session_id=None, workspace=None,
                              history=(), policy=None, active_document=False,
                              image_attachment=False, capabilities=None, client_runtime_context=None):
@@ -393,6 +488,7 @@ def create_request_authority(request_text, *, owner=None, session_id=None, works
         tools = {canonical_tool(operation.tool)}
     else:
         operation = None
+    tools.update(_trusted_local_mcp_request_tools(request_text, intent))
     grants = []
     for name in sorted(tools | {"ask_user", "update_plan"}):
         name = canonical_tool(name)

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) -> 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, native_size: bool = False) -> bool:
     params: Dict[str, Any] = {
         "dataUrl": data_url,
         "name": name,
@@ -199,6 +199,8 @@ 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
@@ -506,6 +508,8 @@ 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
@@ -609,10 +613,11 @@ class AiEditImageTool:
                 f"AI {op}",
                 owner,
                 session,
-                masked=mask_used,
+                masked=mask_used and data.get("full_frame") is not True,
                 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:
@@ -687,6 +692,7 @@ 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,8 +179,13 @@ 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 model_type == "image" and endpoint_reachable:
-                    for extra in _json_list(getattr(ep, "pinned_models", None)) + _json_list(getattr(ep, "cached_models", None)):
+                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 extra not in model_ids:
                             model_ids.append(extra)
 
@@ -1176,9 +1181,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 load_settings
+        from src.settings import get_user_setting, load_settings
 
-        if not load_settings().get("image_gen_enabled", True):
+        if not load_settings().get("image_gen_enabled", True) or not get_user_setting("image_gen_enabled", owner=owner or "", default=True):
             return False
     except Exception:
         pass
@@ -1200,6 +1205,39 @@ 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).
 
@@ -1236,21 +1274,27 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
     if not prompt:
         return {"error": "Image prompt is required (line 1)"}
 
-    # Load admin settings for defaults
+    # Load settings for defaults
     try:
-        from src.settings import load_settings
+        from src.settings import get_user_setting, 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 admin-configured model/quality if not specified by the tool call
+    # Use user- or admin-configured model/quality if not specified by the tool call
     if not model_spec:
-        model_spec = _settings.get("image_model", "")
+        model_spec = get_user_setting("image_model", owner=owner, default="") or ""
     if not quality:
-        quality = _settings.get("image_quality") or "medium"
+        quality = get_user_setting("image_quality", owner=owner, default="medium") or "medium"
 
     # Auto-detect best available image model if still not set
     if not model_spec:
@@ -1342,8 +1386,19 @@ 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"}
@@ -1359,6 +1414,9 @@ 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:
@@ -1372,7 +1430,16 @@ 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:
-            resp = await client.post(images_url, json=payload, headers=headers)
+            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)
 
             if resp.status_code != 200:
                 error_text = resp.text[:500]
@@ -1387,9 +1454,15 @@ async def do_generate_image(content: str, session_id: Optional[str] = None, owne
                 }
 
             data = resp.json()
-            images = data.get("data", [])
+            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", [])
             if not images:
-                return {"error": "No images returned from API"}
+                return {"error": (
+                    f"Image model '{model_id}' returned no image. "
+                    "Choose another image generation model in AI settings."
+                )}
 
             img = images[0]
             image_url = None
@@ -1502,21 +1575,27 @@ async def do_edit_image(
         return {"error": "Attached image file was not found"}
 
     try:
-        from src.settings import load_settings
+        from src.settings import get_user_setting, load_settings
         _settings = load_settings()
     except Exception:
         _settings = {}
+        def get_user_setting(key, owner="", default=None):
+            return default
 
     if not model_spec:
-        model_spec = _settings.get("image_model", "")
+        model_spec = get_user_setting("image_edit_model", owner=owner) or get_user_setting("image_model", owner=owner, default="")
     if quality is None:
-        quality = _settings.get("image_quality") or "medium"
+        quality = get_user_setting("image_quality", owner=owner, default="medium") or "medium"
     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:
@@ -1529,6 +1608,7 @@ 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
@@ -1704,7 +1784,35 @@ async def do_edit_image(
                             "image_url": {"url": f"data:{mime};base64,{image_b64}"},
                         }],
                     }
-                    resp = await client.post(base_url + "/images", json=edit_payload, headers=headers)
+                    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)
                 else:
                     with path.open("rb") as f:
                         files = {"image": (path.name, f, mime)}
@@ -1747,7 +1855,12 @@ async def do_edit_image(
                 }
 
             data = resp.json()
-            images = data.get("data", [])
+            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", []))
             if not images:
                 return {"error": "No image returned from edit API"}
 

src/builtin_actions.py

@@ -10,7 +10,7 @@ import os
 import json
 import re
 import time
-from datetime import datetime
+from datetime import datetime, timezone
 from typing import Tuple
 
 from src.auth_helpers import owner_filter
@@ -1957,6 +1957,23 @@ async def action_learn_sender_signatures(owner: str, **kwargs) -> Tuple[str, boo
         return str(e), False
 
 
+def _daily_brief_utc_boundary(local_dt, tz=None):
+    """Convert a local wall-clock boundary using the offset at that boundary."""
+    if local_dt.tzinfo is None and tz is not None:
+        local_dt = local_dt.replace(tzinfo=tz)
+    return local_dt.astimezone(timezone.utc).replace(tzinfo=None)
+
+
+def _daily_brief_local_start(event, tz=None):
+    """Keep date-only/floating rows local; convert only stored UTC instants."""
+    start = event.dtstart
+    if event.is_utc and not event.all_day:
+        if start.tzinfo is None:
+            start = start.replace(tzinfo=timezone.utc)
+        return start.astimezone(tz).replace(tzinfo=None)
+    return start
+
+
 async def action_daily_brief(owner: str, **kwargs) -> Tuple[str, bool]:
     """Build a short morning digest: today's calendar events, unread email count
     + top-N senders/subjects, active todos."""
@@ -1966,10 +1983,13 @@ async def action_daily_brief(owner: str, **kwargs) -> Tuple[str, bool]:
 
         from core.database import SessionLocal, CalendarEvent, CalendarCal, Note
         from routes.email_helpers import _imap_connect, _decode_header
+        from sqlalchemy import and_, or_
 
         # ----- Calendar: today's events -----
         today = _dt.now().replace(hour=0, minute=0, second=0, microsecond=0)
         tomorrow = today + _td(days=1)
+        utc_today = _daily_brief_utc_boundary(today)
+        utc_tomorrow = _daily_brief_utc_boundary(tomorrow)
         # v2 review HIGH-12: gate the OR-null branch on single-user
         # (unconfigured) deploys only. In a multi-user deploy, one
         # user's daily brief must not include another user's notes or
@@ -1982,13 +2002,25 @@ async def action_daily_brief(owner: str, **kwargs) -> Tuple[str, bool]:
         db = SessionLocal()
         try:
             ev_q = db.query(CalendarEvent).join(CalendarCal).filter(
-                CalendarEvent.dtstart < tomorrow,
-                CalendarEvent.dtend > today,
+                or_(
+                    and_(
+                        CalendarEvent.is_utc.is_(True),
+                        CalendarEvent.all_day.is_not(True),
+                        CalendarEvent.dtstart < utc_tomorrow,
+                        CalendarEvent.dtend > utc_today,
+                    ),
+                    and_(
+                        or_(CalendarEvent.is_utc.is_not(True), CalendarEvent.all_day.is_(True)),
+                        CalendarEvent.dtstart < tomorrow,
+                        CalendarEvent.dtend > today,
+                    ),
+                ),
                 CalendarEvent.status != "cancelled",
             )
             if owner:
                 ev_q = owner_filter(ev_q, CalendarCal, owner, include_shared=_allow_null)
-            events = ev_q.order_by(CalendarEvent.dtstart).all()
+            events = ev_q.all()
+            events.sort(key=_daily_brief_local_start)
             # ----- Notes: pinned + non-archived todos with at least one undone item -----
             n_q = db.query(Note).filter(Note.archived == False)  # noqa: E712
             if owner:
@@ -2058,7 +2090,7 @@ async def action_daily_brief(owner: str, **kwargs) -> Tuple[str, bool]:
         if events:
             plain.append("Calendar:")
             for e in events:
-                t = e.dtstart.strftime("%H:%M") if not e.all_day else "all day"
+                t = _daily_brief_local_start(e).strftime("%H:%M") if not e.all_day else "all day"
                 loc = f" @ {e.location}" if e.location else ""
                 plain.append(f"  {t}  {e.summary}{loc}")
             plain.append("")

src/chat_handler.py

@@ -282,7 +282,13 @@ class ChatHandler:
                                     _sync_upload_vision_to_gallery(file_info, owner, vl_desc)
                                 except Exception:
                                     pass
-                        enhanced_message = f"{enhanced_message}\n\n[Image: {file_info['name']}]\n{vl_desc}"
+                        enhanced_message = f"{enhanced_message}\n\n[Image: {file_info['name']}]\n"
+                        if vl_desc:
+                            # A separate vision call wrote this, but the chat model sees
+                            # one message and answers the prose as if the user wrote it
+                            # (#5573). Label it below the marker line — the client strips
+                            # the block by matching `[Image: <name>]\n`.
+                            enhanced_message += f"[Image description — context only, not part of the user's message]:\n{vl_desc}"
                         # Surface the description to the client live so it renders as a
                         # collapsible "image description" on the user bubble (not just
                         # after a refresh that re-parses the stored message).

src/cookbook_serve_lifecycle.py

@@ -31,63 +31,43 @@ def _internal_headers() -> dict:
 
 
 async def _delete_endpoint_for_task(task: dict) -> None:
-    """Drop the auto-registered model endpoint for a scheduled-stop serve.
+    """Remove a stopped serve's endpoint using the normal deletion contract."""
+    import re
+    from urllib.parse import quote
 
-    Without this, killing the tmux session leaves the endpoint sitting in
-    the picker (probe goes offline; chats still try to route there) and
-    the user has to delete it by hand in Settings -> Endpoints.
-    """
-    endpoint_id = (task.get("_endpointId") or task.get("endpointId") or "").strip()
-    if not endpoint_id:
-        logger.info(
-            "cookbook_serve_lifecycle: task %s has no endpoint id; skipping endpoint deletion",
-            task.get("sessionId") or task.get("id") or "",
-        )
+    endpoint_id = str(task.get("_endpointId") or task.get("endpointId") or "").strip()
+    serve_session_id = str(task.get("sessionId") or task.get("id") or "").strip()
+    if (
+        not re.fullmatch(r"(?:local|img)-[0-9a-f]{8}", endpoint_id)
+        or not serve_session_id
+    ):
+        logger.info("cookbook_serve_lifecycle: missing endpoint/session identity")
         return
-    import re as _re
-    payload = task.get("payload") or {}
-    cmd = str(payload.get("_cmd") or "")
-    remote = task.get("remoteHost") or ""
-    # Build host the same way _auto_register_llm_endpoint does so URL match wins.
-    if remote:
-        host = remote.split("@")[-1] if "@" in remote else remote
-    else:
-        host = "host.docker.internal"
-    port_match = _re.search(r"--port\s+(\d+)", cmd)
-    ollama_host_match = _re.search(r"OLLAMA_HOST=[^\s]*?:(\d+)", cmd)
-    if port_match:
-        port = int(port_match.group(1))
-    elif ollama_host_match:
-        port = int(ollama_host_match.group(1))
-    elif "ollama" in cmd:
-        port = 11434
-    else:
-        port = 8080
-    base_url = f"http://{host}:{port}/v1"
+
     try:
         async with httpx.AsyncClient(timeout=8) as client:
-            r = await client.get(
-                f"{internal_api_base()}/api/model-endpoints",
+            response = await client.delete(
+                f"{internal_api_base()}/api/model-endpoints/{quote(endpoint_id, safe='')}",
+                params={"expected_cookbook_serve_session_id": serve_session_id},
                 headers=_internal_headers(),
             )
-            if r.status_code >= 400:
-                return
-            eps = r.json() if r.content else []
-            # Delete only the endpoint created by this scheduled serve. URL
-            # matching is unsafe because a later scheduled serve can reuse the
-            # same host:port after an older task has gone stale.
-            ep = next((e for e in eps if e.get("id") == endpoint_id), None)
-            if ep:
-                await client.delete(
-                    f"{internal_api_base()}/api/model-endpoints/{ep['id']}",
-                    headers=_internal_headers(),
-                )
-                logger.info(
-                    f"cookbook_serve_lifecycle: deleted endpoint {ep.get('id')} "
-                    f"({ep.get('base_url')}) after scheduled stop"
-                )
-    except Exception as e:
-        logger.warning(f"cookbook_serve_lifecycle: endpoint delete failed: {e}")
+        if response.status_code == 200:
+            logger.info(
+                "cookbook_serve_lifecycle: deleted endpoint %s for serve %s",
+                endpoint_id, serve_session_id,
+            )
+        elif response.status_code in (404, 409):
+            logger.info(
+                "cookbook_serve_lifecycle: endpoint %s absent or reassigned; keeping it",
+                endpoint_id,
+            )
+        else:
+            logger.warning(
+                "cookbook_serve_lifecycle: endpoint %s deletion returned HTTP %s",
+                endpoint_id, response.status_code,
+            )
+    except Exception as exc:
+        logger.warning("cookbook_serve_lifecycle: cleanup failed: %s", exc)
 
 
 async def _stop_serve(session_id: str, remote_host: str = "", ssh_port: str = "") -> bool:

src/document_processor.py

@@ -142,7 +142,10 @@ def _process_pdf(
                         with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmp:
                             temp_img_path = tmp.name
                         try:
-                            img.image.save(temp_img_path, "PNG")  # pypdf -> PIL image
+                            image = img.image
+                            if image.mode == "CMYK":
+                                image = image.convert("RGB")
+                            image.save(temp_img_path, "PNG")
                             ocr_text = analyze_image_with_vl(temp_img_path, owner=owner)
                             if ocr_text and "unavailable" not in ocr_text.lower():
                                 pdf_text += f"\n\n[Page {page_num + 1} image {img_index + 1} text]: {ocr_text}"

src/editor_image_settings.py

@@ -0,0 +1,19 @@
+"""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,6 +40,15 @@ 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/mcp_manager.py

@@ -770,8 +770,11 @@ class McpManager:
                     qualified.add(f"mcp__{server_id}__{tool['name']}")
         return disabled_map, qualified
 
-    def is_builtin(self, server_id: str) -> bool:
+    @staticmethod
+    def is_builtin(server_id: str) -> bool:
         """Check if a server is a built-in (auto-registered) server."""
+        if not isinstance(server_id, str):
+            return False
         return server_id.startswith("builtin_") or server_id in {
             "image_gen",
             "memory",

src/service_health.py

@@ -76,9 +76,23 @@ _ERROR_DETAIL = {
     "auth_or_protocol_error": "authentication or protocol error",
     "no_models": "endpoint returned no models",
     "no_host": "no host configured",
+    "config_source_error": "configuration source could not be read",
     "error": "probe failed",
 }
 
+# Config/inventory source behind each network subsystem. `_gather_inputs()`
+# fails soft, so a source that could not be read hands its probe an empty
+# inventory — indistinguishable from "nothing configured", which every probe
+# answers with `disabled`. The collector therefore reports the source failure
+# instead of running a probe whose verdict would be a lie.
+CONFIG_SOURCE_ERROR = "config_source_error"
+_SUBSYSTEM_SOURCE = {
+    "searxng": "settings",
+    "ntfy": "integrations",
+    "email": "accounts",
+    "providers": "endpoints",
+}
+
 
 def _svc(name: str, status: str, detail: str, **meta: Any) -> Dict[str, Any]:
     return {"name": name, "status": status, "detail": detail, "meta": dict(meta)}
@@ -411,26 +425,33 @@ def _gather_inputs() -> Dict[str, Any]:
     """Pull live config/account/endpoint lists from the app's data sources.
 
     Each lookup fails soft: a broken source yields an empty/neutral value so a
-    single failure can't take down the whole health report.
+    single failure can't take down the whole health report. The failure is also
+    *recorded* under `failed` (source -> controlled category), because the empty
+    value alone cannot be told apart from a source that loaded and is genuinely
+    empty — and the probes read empty as `disabled`.
     """
     settings: Dict[str, Any] = {}
     integrations: List[Dict[str, Any]] = []
     accounts: List[Dict[str, Any]] = []
     endpoints: List[Dict[str, Any]] = []
+    failed: Dict[str, str] = {}
     try:
         from src.settings import load_settings
         settings = load_settings() or {}
     except Exception as e:
+        failed["settings"] = _classify_error(e)
         logger.debug(f"service_health: settings load failed: {e}")
     try:
         from src.integrations import load_integrations
         integrations = load_integrations() or []
     except Exception as e:
+        failed["integrations"] = _classify_error(e)
         logger.debug(f"service_health: integrations load failed: {e}")
     try:
         from routes.email_helpers import _list_email_accounts
         accounts = _list_email_accounts() or []
     except Exception as e:
+        failed["accounts"] = _classify_error(e)
         logger.debug(f"service_health: email accounts load failed: {e}")
     try:
         from core.database import SessionLocal, ModelEndpoint
@@ -443,9 +464,10 @@ def _gather_inputs() -> Dict[str, Any]:
         finally:
             db.close()
     except Exception as e:
+        failed["endpoints"] = _classify_error(e)
         logger.debug(f"service_health: endpoint load failed: {e}")
     return {"settings": settings, "integrations": integrations,
-            "accounts": accounts, "endpoints": endpoints}
+            "accounts": accounts, "endpoints": endpoints, "failed": failed}
 
 
 async def _run_subsystem(name: str, fn: Callable, *args: Any) -> Dict[str, Any]:
@@ -464,6 +486,24 @@ async def _run_subsystem(name: str, fn: Callable, *args: Any) -> Dict[str, Any]:
         return _svc(name, DOWN, _detail_for(category), error=category)
 
 
+async def _source_unavailable(name: str, source: str,
+                              category: str) -> Dict[str, Any]:
+    """Controlled entry for a subsystem whose config source could not be read.
+
+    Deliberately not `disabled`: the configured state is *unknown*, not known to
+    be off. `degraded` rather than `down` because the failure is in reading the
+    inventory, not a probe that reached the subsystem and failed — but it still
+    carries non-zero severity, so a report containing one can never roll up to
+    `ok`. `meta` names the source and the controlled category of the underlying
+    exception; never its text.
+    """
+    return _svc(name, DEGRADED,
+                f"Could not read configuration "
+                f"({_detail_for(CONFIG_SOURCE_ERROR)}).",
+                error=CONFIG_SOURCE_ERROR, source=source,
+                source_error=category)
+
+
 async def collect_service_health(rag_manager: Any = None,
                                  memory_vector: Any = None) -> Dict[str, Any]:
     """Run every probe and return {overall, services, timestamp}.
@@ -472,6 +512,10 @@ async def collect_service_health(rag_manager: Any = None,
     four network subsystems run concurrently, each under `_SUBSYSTEM_DEADLINE`,
     with an overall `_AGGREGATE_DEADLINE` backstop. Per-item probes inside
     providers/email are themselves bounded by `_FANOUT_BUDGET`.
+
+    A subsystem whose config/inventory source failed to load is reported via
+    `_source_unavailable()` instead of being probed with an empty inventory,
+    which every probe would otherwise report as `disabled`.
     """
     from datetime import datetime, timezone
 
@@ -482,12 +526,23 @@ async def collect_service_health(rag_manager: Any = None,
     chroma = chromadb_health(rag_manager, memory_vector)
 
     names = ["searxng", "ntfy", "email", "providers"]
-    coros = [
-        _run_subsystem("searxng", searxng_health, settings),
-        _run_subsystem("ntfy", ntfy_health, inputs["integrations"], settings),
-        _run_subsystem("email", email_health, inputs["accounts"]),
-        _run_subsystem("providers", providers_health, inputs["endpoints"]),
-    ]
+    probes = {
+        "searxng": (searxng_health, (settings,)),
+        "ntfy": (ntfy_health, (inputs["integrations"], settings)),
+        "email": (email_health, (inputs["accounts"],)),
+        "providers": (providers_health, (inputs["endpoints"],)),
+    }
+    # A subsystem whose inventory could not be read is reported as such. The
+    # others are still probed normally — one broken source degrades one entry.
+    failed = inputs.get("failed") or {}
+    coros = []
+    for name in names:
+        source = _SUBSYSTEM_SOURCE[name]
+        if source in failed:
+            coros.append(_source_unavailable(name, source, failed[source]))
+        else:
+            fn, args = probes[name]
+            coros.append(_run_subsystem(name, fn, *args))
     try:
         results = await asyncio.wait_for(asyncio.gather(*coros),
                                          timeout=_AGGREGATE_DEADLINE)

src/session_search.py

@@ -57,25 +57,53 @@ def _message_to_context(msg: DBChatMessage) -> dict[str, Any]:
     }
 
 
-def _escape_like(value: str) -> str:
+def escape_like_pattern(value: str) -> str:
+    """Escape SQL LIKE wildcards (``%``, ``_``) and the escape char itself.
+
+    Public shared helper for building ``ilike(f"%{...}%", escape="\\\\")``
+    patterns from user input. Must escape backslash first.
+    """
     return value.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_")
 
 
+def _escape_like(value: str) -> str:
+    return escape_like_pattern(value)
+
+
 def _snippet(content: str, query: str, radius: int = 60) -> str:
     content = content or ""
     query = query or ""
     if not query:
         return content[: radius * 2]
 
-    idx = content.lower().find(query.lower())
-    if idx == -1:
+    match_start = -1
+    match_length = 0
+    lowered_content = content.lower()
+    for candidate in _query_terms(query):
+        idx = lowered_content.find(candidate.lower())
+        if idx != -1 and (match_start == -1 or idx < match_start):
+            match_start = idx
+            match_length = len(candidate)
+
+    if match_start == -1:
         return content[: radius * 2]
 
-    start = max(0, idx - radius)
-    end = min(len(content), idx + len(query) + radius)
+    start = max(0, match_start - radius)
+    end = min(len(content), match_start + match_length + radius)
     return ("..." if start > 0 else "") + content[start:end] + ("..." if end < len(content) else "")
 
 
+def _query_terms(query: str) -> list[str]:
+    """Return meaningful quoted phrases and tokens in user-entered order."""
+    terms: list[str] = []
+    for match in re.finditer(r'"([^"]+)"|[\w][\w._-]*', query, flags=re.UNICODE):
+        term = match.group(1) if match.group(1) is not None else match.group(0).strip("._-")
+        term = term.strip()
+        if term:
+            terms.append(term)
+    return terms
+
+
 def _sanitize_fts_query(query: str) -> str | None:
     """Convert free text into a conservative FTS5 MATCH query.
 

src/settings.py

@@ -46,6 +46,7 @@ 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.
@@ -294,7 +295,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_gen_enabled", "image_quality",
+    "image_model", "image_edit_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.
@@ -313,6 +314,20 @@ 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/tool_capabilities.py

@@ -334,6 +334,142 @@ _BROWSER_MCP_READ_TOOLS = frozenset(
 )
 
 
+LOCAL_MCP_READ_TOOLS_ENV = "ODYSSEUS_LOCAL_MCP_READ_TOOLS"
+LOCAL_MCP_WRITE_TOOLS_ENV = "ODYSSEUS_LOCAL_MCP_WRITE_TOOLS"
+
+_LOCAL_MCP_READ_CAPABILITIES = _capabilities(
+    ToolEffect.READ_PRIVATE,
+    result_integrity=ResultIntegrity.EXTERNAL_UNTRUSTED,
+)
+_LOCAL_MCP_WRITE_CAPABILITIES = _capabilities(
+    ToolEffect.WRITE_PRIVATE,
+    result_integrity=ResultIntegrity.EXTERNAL_UNTRUSTED,
+)
+
+
+def _local_mcp_tools(variable: str) -> frozenset[str]:
+    """Tool names a deployment declares as touching only the local store.
+
+    Tools served by a user-configured MCP server are absent from the registry
+    above, so they are classified as unknown and fail high. For a server with
+    both a read and a write tool that is unusable: the read result arms the
+    post-external gate, because an unknown result is not SYSTEM integrity, and
+    the write that follows is refused until separately authorized. Every
+    second call needs an approval, for a server that never leaves the host.
+
+    Declaring the tools resolves that without widening the gate:
+
+        ODYSSEUS_LOCAL_MCP_READ_TOOLS=mcp__<server>__search_notes,mcp__<server>__read_note
+        ODYSSEUS_LOCAL_MCP_WRITE_TOOLS=mcp__<server>__create_note
+
+    Read tools become READ_PRIVATE with EXTERNAL_UNTRUSTED integrity. Their
+    results remain untrusted and still arm the gate, preventing prompt
+    injections from reaching shell, network, or unrelated tools. However,
+    declared write tools on the exact same MCP server receive a narrowly
+    scoped continuation exception as long as no external or error taint has
+    entered the run. Once genuinely external content has entered the run,
+    approvals remain required.
+    """
+    raw = os.getenv(variable, "") or ""
+    return frozenset(name.strip() for name in raw.split(",") if name.strip())
+
+
+def _current_mcp_manager():
+    """Retrieve the current McpManager instance safely without hard circular binds."""
+    try:
+        from src import tool_execution
+        if hasattr(tool_execution, "get_mcp_manager"):
+            mgr = tool_execution.get_mcp_manager()
+            if mgr is not None:
+                return mgr
+    except Exception:
+        pass
+    try:
+        from src.tool_utils import get_mcp_manager
+        return get_mcp_manager()
+    except Exception:
+        return None
+
+
+def _is_declared_local_mcp_tool(
+    tool_name: Any, server_id: str | None = None
+) -> bool:
+    """Return whether tool_name is an exact, well-formed declared local MCP tool."""
+    if not isinstance(tool_name, str) or not tool_name:
+        return False
+    parts = tool_name.split("__", 2)
+    if not (
+        len(parts) == 3
+        and parts[0] == "mcp"
+        and bool(parts[1])
+        and bool(parts[2])
+        and not any(char.isspace() for part in parts[1:] for char in part)
+    ):
+        return False
+    sid = parts[1]
+    if server_id is not None and sid != server_id:
+        return False
+    from src.mcp_manager import McpManager
+    if McpManager.is_builtin(sid):
+        return False
+    if tool_name in TOOL_CAPABILITIES:
+        return False
+    declared_read = tool_name in _local_mcp_tools(LOCAL_MCP_READ_TOOLS_ENV)
+    declared_write = tool_name in _local_mcp_tools(LOCAL_MCP_WRITE_TOOLS_ENV)
+    return (declared_read or declared_write) and (declared_read != declared_write)
+
+
+def _is_declared_local_mcp_read_tool(
+    tool_name: Any, server_id: str | None = None
+) -> bool:
+    if not _is_declared_local_mcp_tool(tool_name, server_id):
+        return False
+    declared_read = tool_name in _local_mcp_tools(LOCAL_MCP_READ_TOOLS_ENV)
+    declared_write = tool_name in _local_mcp_tools(LOCAL_MCP_WRITE_TOOLS_ENV)
+    if not (declared_read and not declared_write):
+        return False
+    parts = tool_name.split("__", 2)
+    mgr = _current_mcp_manager()
+    if mgr is not None:
+        tools = mgr._tools.get(parts[1], [])
+        tool_row = next((r for r in tools if r.get("name") == parts[2]), None)
+        if tool_row is not None:
+            from src.mcp_manager import mcp_tool_is_readonly
+            if not mcp_tool_is_readonly(tool_row):
+                return False
+    else:
+        from src.mcp_manager import _MCP_READONLY_VERBS
+        if not parts[2].lower().startswith(_MCP_READONLY_VERBS):
+            return False
+    return True
+
+
+def _is_declared_local_mcp_write_tool(
+    tool_name: Any, server_id: str | None = None
+) -> bool:
+    if not _is_declared_local_mcp_tool(tool_name, server_id):
+        return False
+    declared_read = tool_name in _local_mcp_tools(LOCAL_MCP_READ_TOOLS_ENV)
+    declared_write = tool_name in _local_mcp_tools(LOCAL_MCP_WRITE_TOOLS_ENV)
+    if not (declared_write and not declared_read):
+        return False
+    parts = tool_name.split("__", 2)
+    mgr = _current_mcp_manager()
+    if mgr is not None:
+        tools = mgr._tools.get(parts[1], [])
+        tool_row = next((r for r in tools if r.get("name") == parts[2]), None)
+        if tool_row is not None:
+            ann = tool_row.get("annotations") or {}
+            destructive = (
+                ann.get("destructiveHint")
+                if isinstance(ann, dict)
+                else getattr(ann, "destructiveHint", None)
+            )
+            if destructive is True:
+                return False
+    return True
+
+
 def capabilities_for_tool(tool_name: Any) -> ToolCapabilities:
     """Return deterministic capabilities; malformed and unknown tools fail high."""
     if not isinstance(tool_name, str) or not tool_name:
@@ -348,6 +484,10 @@ def capabilities_for_tool(tool_name: Any) -> ToolCapabilities:
             return capabilities
     if tool_name in _BROWSER_MCP_READ_TOOLS:
         return _BROWSER_MCP_READ_CAPABILITIES
+    if _is_declared_local_mcp_read_tool(tool_name):
+        return _LOCAL_MCP_READ_CAPABILITIES
+    if _is_declared_local_mcp_write_tool(tool_name):
+        return _LOCAL_MCP_WRITE_CAPABILITIES
     return _UNKNOWN_CAPABILITIES
 
 
@@ -785,6 +925,149 @@ def delegated_tool_is_blocked(tool_name: Any, content: Any = None) -> bool:
     )
 
 
+_SERVER_OWNED_CONTROL_PLANE_SOURCES = frozenset(
+    {
+        "skills",
+        "client runtime context",
+        "backend runtime context",
+        "integrations",
+        "mcp tools",
+        "agents.md",
+    }
+)
+
+_PROHIBITED_CONTINUATION_EFFECTS = frozenset(
+    {
+        ToolEffect.NETWORK_EGRESS,
+        ToolEffect.EXTERNAL_SIDE_EFFECT,
+        ToolEffect.EXECUTE_CODE,
+        ToolEffect.ADMIN_CHANGE,
+        ToolEffect.UI_SIDE_EFFECT,
+        ToolEffect.DESTRUCTIVE,
+        ToolEffect.READ_WORKSPACE,
+        ToolEffect.WRITE_WORKSPACE,
+        ToolEffect.BROKERED_NETWORK_READ,
+        ToolEffect.READ_PUBLIC,
+    }
+)
+
+
+def _is_authorized_local_mcp_continuation(
+    tool_name: Any,
+    external_sources: Iterable[str],
+    content: Any = None,
+) -> bool:
+    """Evaluate narrowly scoped continuation for declared local MCP tools.
+
+    Allows a declared local MCP write or read tool when the tool is verified
+    against an explicitly configured and connected stdio MCP server, and the
+    only untrusted sources observed in the run are declared local MCP tools
+    belonging to the exact same MCP server (plus server-owned control plane
+    metadata).
+    """
+    if not isinstance(tool_name, str) or not tool_name:
+        return False
+    parts = tool_name.split("__", 2)
+    if len(parts) != 3 or parts[0] != "mcp" or not parts[1] or not parts[2]:
+        return False
+    server_id = parts[1]
+
+    from src.mcp_manager import McpManager
+    if McpManager.is_builtin(server_id):
+        return False
+
+    if not _is_declared_local_mcp_tool(tool_name, server_id=server_id):
+        return False
+
+    capabilities = capabilities_for_action(tool_name, content)
+    if not capabilities.known:
+        return False
+    if capabilities.effects & _PROHIBITED_CONTINUATION_EFFECTS:
+        return False
+    if capabilities.effects - {ToolEffect.WRITE_PRIVATE, ToolEffect.READ_PRIVATE}:
+        return False
+
+    manager = _current_mcp_manager()
+    if manager is None:
+        return False
+    if manager.is_builtin(server_id):
+        return False
+
+    conn = manager.get_server_status(server_id)
+    if conn.get("status") != "connected":
+        return False
+    if conn.get("transport") != "stdio":
+        return False
+
+    resource_id = manager.resource_identity(tool_name)
+    if resource_id is None or resource_id.namespace != "mcp":
+        return False
+    if resource_id.endpoint_id != f"stdio:{server_id}":
+        return False
+
+    tools_list = manager._tools.get(server_id, [])
+    tool_row = next((r for r in tools_list if r.get("name") == parts[2]), None)
+    if not tool_row:
+        return False
+    ann = tool_row.get("annotations") or {}
+    destructive = (
+        ann.get("destructiveHint")
+        if isinstance(ann, dict)
+        else getattr(ann, "destructiveHint", None)
+    )
+    if destructive is True:
+        return False
+
+    from src.agent_runtime.authority import active_request_authority, ExactOperation, RequestAuthority
+    authority = active_request_authority()
+    if not isinstance(authority, RequestAuthority):
+        return False
+    if authority is not None:
+        try:
+            operation_input = content if isinstance(content, str) else "{}"
+            operation = ExactOperation.normalize(tool_name, operation_input)
+            if not authority.permits(operation):
+                return False
+        except (ValueError, TypeError):
+            return False
+        if resource_id not in authority.backend_resources:
+            return False
+
+    sources = list(external_sources or ())
+    if not sources:
+        return False
+
+    from src.mcp_manager import mcp_tool_is_readonly
+    has_local_tool = False
+    for source in sources:
+        if source in _SERVER_OWNED_CONTROL_PLANE_SOURCES:
+            continue
+        if not _is_declared_local_mcp_tool(source, server_id=server_id):
+            return False
+        source_caps = capabilities_for_tool(source)
+        if not source_caps.known or (source_caps.effects & _PROHIBITED_CONTINUATION_EFFECTS):
+            return False
+        if source_caps.effects - {ToolEffect.READ_PRIVATE, ToolEffect.WRITE_PRIVATE}:
+            return False
+
+        source_resource = manager.resource_identity(source)
+        if source_resource is None or source_resource.endpoint_id != resource_id.endpoint_id:
+            return False
+        if not str(source_resource.endpoint_id).startswith("stdio:"):
+            return False
+
+        source_parts = source.split("__", 2)
+        source_row = next((r for r in tools_list if r.get("name") == source_parts[2]), None)
+        if not source_row:
+            return False
+        if _is_declared_local_mcp_read_tool(source, server_id=server_id) and not mcp_tool_is_readonly(source_row):
+            return False
+
+        has_local_tool = True
+
+    return has_local_tool
+
+
 @dataclass
 class ToolRunSecurityContext:
     """Server-owned integrity state for one agent run."""
@@ -804,6 +1087,19 @@ class ToolRunSecurityContext:
     # Driven by a bearer API token, not a person at a browser. Privileged
     # tools are refused outright and no approval can lift that.
     delegated_credential: bool = False
+    explicit_untrusted_seen: bool = False
+    prompt_external_untrusted_seen: bool = False
+
+    def __post_init__(self) -> None:
+        if self.external_untrusted_context_seen and (
+            not self.external_sources
+            or any(
+                not _is_declared_local_mcp_tool(s)
+                and s not in _SERVER_OWNED_CONTROL_PLANE_SOURCES
+                for s in self.external_sources
+            )
+        ):
+            self.prompt_external_untrusted_seen = True
 
     def observe_messages(self, messages: Iterable[dict]) -> None:
         """Apply server-owned chat scope and promote untrusted prompt context."""
@@ -834,8 +1130,10 @@ class ToolRunSecurityContext:
             if source and source not in self.external_sources:
                 self.external_sources.append(source)
             self.external_untrusted_context_seen = True
+            self.prompt_external_untrusted_seen = True
         if messages_contain_external_untrusted_context(message_list):
             self.external_untrusted_context_seen = True
+            self.prompt_external_untrusted_seen = True
 
     def decision_for(self, tool_name: Any, content: Any = None) -> ToolGateDecision:
         # Checked before the bypasses below, because neither may lift it, and
@@ -858,6 +1156,20 @@ class ToolRunSecurityContext:
         if not self.external_untrusted_context_seen:
             return ToolGateDecision(True)
 
+        # Scoped continuation exception for explicitly declared local MCP tools:
+        # A declared write or read tool on the same MCP server is allowed if
+        # the run's only untrusted context was introduced by declared local
+        # tools on that server, without any explicit/error taint or external
+        # message context.
+        if (
+            not self.prompt_external_untrusted_seen
+            and not self.explicit_untrusted_seen
+            and _is_authorized_local_mcp_continuation(
+                tool_name, self.external_sources, content=content
+            )
+        ):
+            return ToolGateDecision(True)
+
         # Skills and other server-owned descriptors are control-plane metadata
         # rather than external result content; web/document/tool-result taint
         # still gates actions that can mutate state or execute code.
@@ -906,6 +1218,11 @@ class ToolRunSecurityContext:
         if not tool_result_should_arm_gate(tool_name, result, content):
             return
         self.external_untrusted_context_seen = True
+        if isinstance(result, dict) and (
+            result.get("untrusted_content") is True
+            or not tool_result_is_successful(result)
+        ):
+            self.explicit_untrusted_seen = True
         if isinstance(tool_name, str) and tool_name not in self.external_sources:
             self.external_sources.append(tool_name)
 

src/tool_execution.py

@@ -1917,10 +1917,17 @@ async def execute_tool_block(
             )
 
     if isinstance(security_context, ToolRunSecurityContext) and not approval_claimed:
-        decision = security_context.decision_for(
-            getattr(block, "tool_type", None),
-            getattr(block, "content", None),
-        )
+        if isinstance(authority, RequestAuthority):
+            with bind_request_authority(authority):
+                decision = security_context.decision_for(
+                    getattr(block, "tool_type", None),
+                    getattr(block, "content", None),
+                )
+        else:
+            decision = security_context.decision_for(
+                getattr(block, "tool_type", None),
+                getattr(block, "content", None),
+            )
         if not decision.allowed:
             logger.warning(
                 "External-context policy blocked tool=%r",

src/turn_contract.py

@@ -6440,6 +6440,12 @@ def resolve_turn_contract(*, capabilities: Iterable[str], schemas: Iterable[dict
     if 'search_emails' in selected:
         selected.update({'read_email', 'download_attachment', 'list_email_accounts'})
     selected.update(canonical_tool(n) for n in always_available_tools)
+    # Offer only dynamic MCP operations already sealed by trusted request
+    # admission. Tool discovery and model routing never create these grants.
+    from src.agent_runtime.authority import active_request_authority
+    sealed_authority = active_request_authority()
+    if sealed_authority is not None:
+        selected.update(g.tool for g in sealed_authority.grants if g.tool.startswith("mcp__"))
     selected.update(canonical_tool(n) for n in warm_tools if str(n or "").strip())
     # Controls are neutral; enabling Web is permission, never a requested family.
     if selected:

static/css/06-admin-settings.css

@@ -52,6 +52,45 @@
   gap: 8px;
 }
 .admin-user-name { font-size: 13px; font-weight: 500; }
+/* Inline endpoint rename: the input keeps the name's typography so the row doesn't shift */
+.adm-ep-rename-btn {
+  background: none;
+  border: none;
+  padding: 0 2px;
+  color: inherit;
+  line-height: 1;
+  cursor: pointer;
+  opacity: 0.45;
+}
+.adm-ep-rename-btn:hover,
+.adm-ep-rename-btn:focus-visible { opacity: 0.9; }
+@media (hover: hover) {
+  .adm-ep-rename-btn { opacity: 0; }
+  .admin-user-row:hover .adm-ep-rename-btn { opacity: 0.45; }
+  .admin-user-row .adm-ep-rename-btn:hover,
+  .adm-ep-rename-btn:focus-visible { opacity: 0.9; }
+}
+.admin-user-row input.adm-ep-rename-input {
+  width: auto;
+  field-sizing: content;
+  max-width: 100%;
+  height: auto;
+  padding: 0 0 1px;
+  line-height: inherit;
+  color: inherit;
+  background: transparent;
+  border: none;
+  border-bottom: 1px solid var(--red);
+  border-radius: 0;
+  outline: none;
+}
+.admin-user-info:has(.adm-ep-name, .adm-ep-rename-input) { min-width: 0; }
+.adm-ep-name {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
 /* Privilege panel */
 .admin-priv-panel {
   max-height: 600px;

static/css/13-image-editor.css

@@ -264,7 +264,42 @@
 /* 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; }
+.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-control-row {
   margin: 0 !important;
   flex: 0 0 auto;
@@ -4607,6 +4642,8 @@ 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);
@@ -4631,6 +4668,9 @@ 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;
@@ -9732,6 +9772,28 @@ 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,6 +1677,10 @@
                 <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/admin.js

@@ -1074,7 +1074,8 @@ async function loadEndpoints() {
                 <span class="adm-check-dot adm-endpoint-select-dot" aria-hidden="true"></span>
               </label>` : ''}
               <span class="adm-ep-row-logo" style="display:inline-flex;align-items:center;justify-content:center;width:16px;height:16px;flex-shrink:0;opacity:0.9;">${providerLogoFromUrl(ep.base_url) || ''}</span>
-              <span class="admin-user-name">${esc(epTitle)}</span>
+              <span class="admin-user-name adm-ep-name" title="${esc(epTitle)}">${esc(epTitle)}</span>
+              ${_endpointSelectMode || (isChatgptAccount && ep.account_label) ? '' : `<button type="button" class="adm-ep-rename-btn" data-adm-rename-ep="${esc(ep.id)}" data-adm-ep-title="${esc(epTitle)}" title="Rename" aria-label="Rename endpoint"><svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M17 3a2.83 2.83 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5Z"/></svg></button>`}
               ${ep.model_type === 'image' ? '<span class="admin-badge" style="background:color-mix(in srgb, var(--accent) 20%, transparent);color:var(--accent);">Image</span>' : ''}
               ${kindLabel ? `<span class="admin-badge">${esc(kindLabel)}</span>` : ''}
               ${statusBadge}
@@ -1204,6 +1205,70 @@ async function loadEndpoints() {
         loadEndpoints();
       });
     });
+    queryAll('[data-adm-rename-ep]').forEach(btn => {
+      btn.addEventListener('click', (e) => {
+        e.stopPropagation();
+        const nameEl = btn.previousElementSibling;
+        if (!nameEl || !nameEl.classList.contains('admin-user-name')) return;
+        const original = btn.dataset.admEpTitle || '';
+        const input = document.createElement('input');
+        input.type = 'text';
+        input.value = original;
+        input.placeholder = 'Endpoint name';
+        input.setAttribute('aria-label', 'Endpoint name');
+        input.maxLength = 64;
+        input.autocomplete = 'off';
+        input.setAttribute('data-bwignore', '');
+        input.className = 'admin-user-name adm-ep-rename-input';
+        input.style.minWidth = `min(${nameEl.getBoundingClientRect().width}px, 100%)`;
+        nameEl.replaceWith(input);
+        btn.style.visibility = 'hidden';
+        input.focus();
+        input.select();
+        let done = false;
+        const restore = () => {
+          input.replaceWith(nameEl);
+          btn.style.visibility = '';
+        };
+        const commit = async () => {
+          if (done) return;
+          done = true;
+          const name = input.value.trim();
+          if (!name || name === original) { restore(); return; }
+          const epId = btn.dataset.admRenameEp;
+          if (data.some(ep => String(ep.id) !== epId && (ep.name || '').trim().toLowerCase() === name.toLowerCase())) {
+            uiModule.showError(`An endpoint named "${name}" already exists`);
+            done = false;
+            input.focus();
+            return;
+          }
+          input.disabled = true;
+          try {
+            const res = await fetch(`/api/model-endpoints/${encodeURIComponent(epId)}`, {
+              method: 'PATCH',
+              credentials: 'same-origin',
+              headers: { 'Content-Type': 'application/json' },
+              body: JSON.stringify({ name }),
+            });
+            if (!res.ok) {
+              const data = await res.json().catch(() => ({}));
+              throw new Error(data.detail || 'Failed to rename endpoint');
+            }
+          } catch (err) {
+            uiModule.showError(err.message || 'Failed to rename endpoint');
+            restore();
+            return;
+          }
+          await _refreshAfterEndpointChange();
+          loadEndpoints();
+        };
+        input.addEventListener('blur', commit);
+        input.addEventListener('keydown', (ev) => {
+          if (ev.key === 'Enter') { ev.preventDefault(); input.blur(); }
+          if (ev.key === 'Escape') { ev.preventDefault(); ev.stopPropagation(); done = true; restore(); }
+        });
+      });
+    });
     queryAll('[data-adm-copy-url]').forEach(btn => {
       btn.addEventListener('click', (e) => {
         e.stopPropagation();

static/js/chat.js

@@ -336,6 +336,9 @@ import { invalidateSettings } from './appConfig.js';
   let _sendInFlight = false;   // covers the window from click → streaming start
   let _displayOverride = null; // Override visible user bubble text (hides injected prompts)
   let _hideUserBubble = false; // Skip user bubble entirely (e.g. continue after stop)
+  // The user bubble a regenerate keeps on screen. Its resubmitted message is
+  // a new DB row, so the saved id is attached here.
+  let _regenKeptUserBubble = null;
   let _contextHeaderSeq = 0;
   let _contextHeaderData = null;
   let _contextHeaderBound = false;
@@ -4995,6 +4998,15 @@ import { invalidateSettings } from './appConfig.js';
                   refreshChatContextHeader('metrics');
                 }
 
+              } else if (json.type === 'user_message_saved') {
+                // The user bubble gets its DB id too, so regenerating or
+                // editing it later cuts the chat by id, not page position.
+                if (!_isBg && json.id) {
+                  if (_userMsgEl) _userMsgEl.dataset.dbId = json.id;
+                  else if (_regenKeptUserBubble) _regenKeptUserBubble.dataset.dbId = json.id;
+                  _regenKeptUserBubble = null;
+                }
+
               } else if (json.type === 'message_saved') {
                 // Wire the persisted DB id onto the just-streamed bubble so it
                 // can be edited/deleted immediately, without reloading the chat.
@@ -7236,6 +7248,22 @@ import { invalidateSettings } from './appConfig.js';
   /**
    * Edit a user message: show an input, truncate to before it, resubmit the edited text.
    */
+  // Recover attached file IDs from rendered user bubbles, including older
+  // image previews that were rendered before data-file-id was stamped.
+  function _userMessageAttachmentIds(msgElement) {
+    if (!msgElement) return [];
+    const els = msgElement.querySelectorAll('[data-file-id]');
+    const ids = Array.from(els).map(el => el.dataset.fileId).filter(Boolean);
+    if (!ids.length) {
+      const images = msgElement.querySelectorAll('.attach-image-preview img, .attach-card img');
+      for (const image of images) {
+        const match = (image.getAttribute('src') || '').match(/\/api\/upload\/([A-Za-z0-9_\-]+)/);
+        if (match && match[1] && !ids.includes(match[1])) ids.push(match[1]);
+      }
+    }
+    return ids;
+  }
+
   export async function editUserMessage(userMsgElement) {
     const box = document.getElementById('chat-history');
     const allMsgs = Array.from(box.querySelectorAll('.msg'));
@@ -7283,23 +7311,49 @@ import { invalidateSettings } from './appConfig.js';
       e.stopPropagation();
       const newText = editor.value.trim();
       if (!newText) return;
+      const editAttachmentIds = _userMessageAttachmentIds(userMsgElement);
 
       const sessionId = sessionModule.getCurrentSessionId();
       if (!sessionId) return;
 
+      // Everything after the original reply to this message would also be
+      // destroyed. Cancelling leaves the editor open with the draft intact.
+      const extraCount = allMsgs.length - msgIndex - 2;
+      const choice = await _confirmTruncateIfDestructive(extraCount, 'edit');
+      if (!choice) return;
+      if (choice === 'fork') {
+        // Branch just before this user turn and send the edit there; this
+        // chat keeps the original message and everything after it.
+        try {
+          await _forkAndSend(msgIndex, userMsgElement.dataset.dbId || '', newText, editAttachmentIds);
+          bodyEl.innerHTML = originalHTML;
+        } catch (err) {
+          console.error('Fork failed:', err);
+          if (uiModule) uiModule.showError('Fork failed: ' + err.message);
+        }
+        return;
+      }
+
       const keepCount = msgIndex;
+      // Cut at the message's database id: msgIndex counts only the messages
+      // loaded in the page, so it is too small when older history has not
+      // been scrolled in yet.
+      const editBeforeId = userMsgElement.dataset.dbId || '';
       try {
-        await fetch(`${API_BASE}/api/session/${sessionId}/truncate`, {
+        const editTruncate = await fetch(`${API_BASE}/api/session/${sessionId}/truncate`, {
           method: 'POST',
           headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({ keep_count: keepCount })
+          body: JSON.stringify(editBeforeId ? { before_msg_id: editBeforeId } : { keep_count: keepCount })
         });
+        if (!editTruncate.ok) throw new Error('Server error ' + editTruncate.status);
 
         // Remove DOM elements from msgIndex onward
         for (let i = allMsgs.length - 1; i >= msgIndex; i--) {
           allMsgs[i].remove();
         }
 
+        // The edited user turn still refers to its original attachments.
+        _pendingRegenAttachments = editAttachmentIds;
         // Submit the edited text
         const messageInput = uiModule.el('message');
         messageInput.value = newText;
@@ -7323,6 +7377,59 @@ import { invalidateSettings } from './appConfig.js';
     });
   }
 
+  // Regenerate, resend and edit permanently delete (server-side truncate)
+  // everything after the point clicked. Ask first unless nothing comes after
+  // it (extraCount 0), offering a fork that leaves this chat untouched.
+  // Resolves to 'proceed', 'fork', or null (cancelled).
+  const _TRUNCATE_ACTIONS = {
+    regenerate: { lead: 'Regenerating here', confirmText: 'Delete and regenerate' },
+    resend: { lead: 'Resending this message', confirmText: 'Delete and resend' },
+    edit: { lead: 'Sending this edit', confirmText: 'Delete and send' },
+  };
+  async function _confirmTruncateIfDestructive(extraCount, action = 'regenerate') {
+    if (extraCount <= 0) return 'proceed';
+    const { lead, confirmText } = _TRUNCATE_ACTIONS[action] || _TRUNCATE_ACTIONS.regenerate;
+    const result = await uiModule.styledConfirm(
+      `${lead} will also permanently delete the ${extraCount} ` +
+      `message${extraCount === 1 ? '' : 's'} after it. This can't be undone. ` +
+      `Fork from here keeps this chat as it is and continues in a new one instead.`,
+      { confirmText, alternateText: 'Fork from here', cancelText: 'Cancel', danger: true }
+    );
+    if (result === 'alternate') return 'fork';
+    return result ? 'proceed' : null;
+  }
+
+  // Copy the first `keepCount` messages of the current chat into a new chat
+  // and switch to it. Returns the new session id; throws on failure so callers
+  // that replay an action in the fork can stop before sending anything.
+  // Fork by message id when the element has one (before it, or through it);
+  // keepCount is only a fallback, since it counts loaded messages only.
+  async function _forkSessionAt(keepCount, beforeMsgId = '', throughMsgId = '') {
+    const sessionId = sessionModule.getCurrentSessionId();
+    if (!sessionId) throw new Error('No active chat');
+    const res = await fetch(`${API_BASE}/api/session/${sessionId}/fork`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify({ keep_count: keepCount,
+        ...(beforeMsgId ? { before_msg_id: beforeMsgId } : throughMsgId ? { through_msg_id: throughMsgId } : {}) }),
+    });
+    if (!res.ok) throw new Error(await res.text());
+    const data = await res.json();
+    await sessionModule.loadSessions();
+    await sessionModule.selectSession(data.id);
+    if (uiModule) uiModule.showToast(`Forked → ${data.name}`);
+    return data.id;
+  }
+
+  // Fork before a user message and send `text` there; this chat is untouched.
+  // `attachments` (if given) are re-sent only once the fork has succeeded.
+  async function _forkAndSend(keepCount, beforeMsgId, text, attachments) {
+    await _forkSessionAt(keepCount, beforeMsgId);
+    if (attachments !== undefined) _pendingRegenAttachments = attachments;
+    uiModule.el('message').value = text;
+    document.querySelector('.send-btn')?.click();
+  }
+
   /**
    * Resend a user message. By default this replaces from the selected user turn
    * so failed attempts do not remain in model context or SFT traces. Callers can
@@ -7344,18 +7451,7 @@ import { invalidateSettings } from './appConfig.js';
     let text = (userMsgElement.dataset.raw || (bodyEl ? bodyEl.textContent : '') || '').trim();
     text = text.replace(/\s*\[\d+ attachment\(s\)\]$/, '');
 
-    // Collect file_ids attached to this user message so the resend re-carries
-    // the photos / docs (and the chat handler picks up the user-edited OCR
-    // text cached server-side under those file ids).
-    const _attachEls = userMsgElement.querySelectorAll('[data-file-id]');
-    let _ids = Array.from(_attachEls).map(el => el.dataset.fileId).filter(Boolean);
-    if (!_ids.length) {
-      const _imgs = userMsgElement.querySelectorAll('.attach-image-preview img, .attach-card img');
-      for (const _im of _imgs) {
-        const _m = (_im.getAttribute('src') || '').match(/\/api\/upload\/([A-Za-z0-9_\-]+)/);
-        if (_m && _m[1] && !_ids.includes(_m[1])) _ids.push(_m[1]);
-      }
-    }
+    const _ids = _userMessageAttachmentIds(userMsgElement);
 
     // Rescue: legacy bubbles may have stored the filename as the message
     // content (artifact of earlier broken resends). Don't re-send that as
@@ -7378,6 +7474,18 @@ import { invalidateSettings } from './appConfig.js';
 
     try {
       if (replaceFromHere) {
+        // Everything strictly after the immediate AI reply to this user
+        // message would also be destroyed — that's the part a click on
+        // Resend / "Regenerate message" doesn't expect to lose.
+        const extraCount = allMsgs.length - msgIndex - 2;
+        const choice = await _confirmTruncateIfDestructive(extraCount, 'resend');
+        if (!choice) return;
+        if (choice === 'fork') {
+          // Branch just before this user turn and send it again there; this
+          // chat keeps every message.
+          await _forkAndSend(msgIndex, userMsgElement.dataset.dbId || '', text, _ids);
+          return;
+        }
         // Resend/regenerate trims history to this point before resubmitting so
         // the replacement request is the only copy the backend sees.
         const keepCount = msgIndex;
@@ -7442,25 +7550,14 @@ import { invalidateSettings } from './appConfig.js';
       return;
     }
 
-    // Collect any file_ids attached to the original user message so the
-    // regenerated send re-uses them. Without this the AI is regenerated on
-    // text alone — photos (and the user-edited OCR text cached server-side
-    // under that file_id) would be silently dropped.
-    const _attachEls = userMsgEl ? userMsgEl.querySelectorAll('[data-file-id]') : [];
-    let _regenIds = Array.from(_attachEls).map(el => el.dataset.fileId).filter(Boolean);
-    // Fallback for bubbles rendered before the data-file-id stamp landed:
-    // sniff the file id straight out of any `.attach-image-preview img`
-    // src URLs (matches /api/upload/<id>). Otherwise an older bubble would
-    // regen with zero attachments and the photo would be lost from the
-    // resulting message even though the file still exists on disk.
-    if (!_regenIds.length && userMsgEl) {
-      const _imgs = userMsgEl.querySelectorAll('.attach-image-preview img, .attach-card img');
-      for (const _im of _imgs) {
-        const _m = (_im.getAttribute('src') || '').match(/\/api\/upload\/([A-Za-z0-9_\-]+)/);
-        if (_m && _m[1] && !_regenIds.includes(_m[1])) _regenIds.push(_m[1]);
-      }
-    }
-    _pendingRegenAttachments = _regenIds;
+    // Everything strictly after the AI reply being regenerated would also
+    // be destroyed — that's the part a click on "Regenerate from here"
+    // doesn't expect to lose.
+    const extraCount = allMsgs.length - aiIndex - 1;
+    const choice = await _confirmTruncateIfDestructive(extraCount, 'regenerate');
+    if (!choice) return;
+
+    const _regenIds = _userMessageAttachmentIds(userMsgEl);
 
     // Rescue: earlier-version regens (before the dataset.raw fix) stored the
     // photo's filename as the user-message content. On a follow-up regen,
@@ -7469,7 +7566,7 @@ import { invalidateSettings } from './appConfig.js';
     // an image file". If userText is just a bare image filename and we have
     // attachments, drop it so the OCR text (or the image bytes for vision
     // models) is what the model actually sees.
-    if (userText && _pendingRegenAttachments.length &&
+    if (userText && _regenIds.length &&
         /^[^\n\r]{1,200}\.(png|jpe?g|gif|webp|svg|bmp|heic|heif)$/i.test(userText.trim())) {
       userText = '';
     }
@@ -7477,7 +7574,7 @@ import { invalidateSettings } from './appConfig.js';
     // A photo-only message has empty user text — regen must still proceed,
     // because the attachments themselves are the message. Bail only if there
     // is no text AND no attachments to send.
-    if (!userText && !_pendingRegenAttachments.length) {
+    if (!userText && !_regenIds.length) {
       if (uiModule) uiModule.showError('Nothing to regenerate — the user message has no text and no attachments');
       return;
     }
@@ -7485,6 +7582,20 @@ import { invalidateSettings } from './appConfig.js';
     const sessionId = sessionModule.getCurrentSessionId();
     if (!sessionId) return;
 
+    if (choice === 'fork') {
+      // Branch just before the user turn and send it again there, so the new
+      // chat gets a fresh reply to the same message; this chat keeps every
+      // message. No variants or hidden bubble: the fork starts without them.
+      try {
+        await _forkAndSend(userIndex, (userMsgEl && userMsgEl.dataset.dbId) || '', userText, _regenIds);
+      } catch (err) {
+        if (_pendingRegenAttachments === _regenIds) _pendingRegenAttachments = null;
+        console.error('Fork failed:', err);
+        if (uiModule) uiModule.showError('Fork failed: ' + err.message);
+      }
+      return;
+    }
+
     // Save current response as a variant
     const oldRaw = aiMsgElement.dataset.raw || aiMsgElement.querySelector('.body')?.textContent || '';
     const oldHtml = aiMsgElement.querySelector('.body')?.innerHTML || '';
@@ -7496,13 +7607,19 @@ import { invalidateSettings } from './appConfig.js';
     }
 
     const keepCount = userIndex;
+    // Same as resend: cut at the user message's database id, because
+    // userIndex counts only the messages loaded in the page.
+    const regenBeforeId = (userMsgEl && userMsgEl.dataset.dbId) || '';
 
     try {
-      await fetch(`${API_BASE}/api/session/${sessionId}/truncate`, {
+      const regenTruncate = await fetch(`${API_BASE}/api/session/${sessionId}/truncate`, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ keep_count: keepCount })
+        body: JSON.stringify(regenBeforeId ? { before_msg_id: regenBeforeId } : { keep_count: keepCount })
       });
+      // A refused cut (e.g. a stale id) must not stack a second reply.
+      if (!regenTruncate.ok) throw new Error('Server error ' + regenTruncate.status);
+      _pendingRegenAttachments = _regenIds;
 
       // Keep the original user bubble, but remove every rendered trace after
       // it, including agent-thread tool history between the user and AI bubble.
@@ -7519,12 +7636,14 @@ import { invalidateSettings } from './appConfig.js';
       _pendingVariantLabel = 'regen';
 
       _hideUserBubble = true;
+      _regenKeptUserBubble = userMsgEl;
       const messageInput = uiModule.el('message');
       messageInput.value = userText;
       const submitBtn = document.querySelector('.send-btn');
       if (submitBtn) submitBtn.click();
 
     } catch (err) {
+      if (_pendingRegenAttachments === _regenIds) _pendingRegenAttachments = null;
       console.error('Regenerate failed:', err);
       if (uiModule) uiModule.showError('Regenerate failed: ' + err.message);
     }
@@ -7536,6 +7655,8 @@ import { invalidateSettings } from './appConfig.js';
   // File-ids carried over from the original user message during a regen, so
   // photos / OCR overrides survive into the new send. Consumed once.
   let _pendingRegenAttachments = null;
+  // Read-only view for tests.
+  export function _pendingRegenAttachmentIds() { return _pendingRegenAttachments; }
 
   /**
    * Called after streaming completes to attach variant navigation if this was a regen.
@@ -7675,20 +7796,8 @@ import { invalidateSettings } from './appConfig.js';
     const sessionId = sessionModule.getCurrentSessionId();
     if (!sessionId) return;
 
-    const keepCount = aiIndex + 1;
-
     try {
-      const res = await fetch(`${API_BASE}/api/session/${sessionId}/fork`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ keep_count: keepCount }),
-      });
-      if (!res.ok) throw new Error(await res.text());
-      const data = await res.json();
-
-      await sessionModule.loadSessions();
-      await sessionModule.selectSession(data.id);
-      if (uiModule) uiModule.showToast(`Forked → ${data.name}`);
+      await _forkSessionAt(aiIndex + 1, '', aiMsgElement.dataset.dbId || '');
     } catch (err) {
       console.error('Fork failed:', err);
       if (uiModule) uiModule.showError('Fork failed: ' + err.message);

static/js/editor/ai-inpaint.js

@@ -41,6 +41,7 @@
  * }} deps
  */
 import { state } from './state.js';
+import { imageResultGeometry } from './image-result-geometry.js';
 import { beginAIOperation, decodeAIImage } from './ai-operation.js';
 
 export function wireInpaintButtons({
@@ -184,17 +185,30 @@ export function wireInpaintButtons({
         if (!state.editorOpen) return; // user closed mid-decode
         try {
           saveState('Inpaint result');
-          // 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.
+          // Whole-image edits keep the provider's native frame; only masked
+          // edits need registration with the source document's coordinates.
           const shortPrompt = (prompt || '').trim().replace(/\s+/g, ' ').slice(0, 40);
           const layerName = shortPrompt ? `Inpaint: ${shortPrompt}` : 'Inpaint Result';
-          const resultLayer = createLayer(layerName, state.imgWidth, state.imgHeight);
+          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);
           resultLayer.ctx.imageSmoothingEnabled = true;
           resultLayer.ctx.imageSmoothingQuality = 'high';
-          resultLayer.ctx.drawImage(resultImg, 0, 0, state.imgWidth, state.imgHeight);
+          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);
+          }
           // 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);
@@ -205,6 +219,7 @@ 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;
@@ -220,6 +235,10 @@ 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 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')),
-  };
+  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)' };
 }
 
 // Resolve the Quick Edit AGENT (planner) model — the vision-language model
@@ -144,21 +144,19 @@ 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();
   }
 }
-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 => {
+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 => {
   document.getElementById('ge-ai-command-model')?._refreshAIModels?.(e.detail?.baseUrl || '');
 });
 
@@ -256,9 +254,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="">None</option>';
+      if (aiGenSelect) aiGenSelect.innerHTML = '<option value="">Auto-detect</option>';
       if (aiInpaintSelect) aiInpaintSelect.innerHTML = '<option value="">Auto</option>';
-      if (aiCommandSelect) aiCommandSelect.innerHTML = '<option value="">Auto (default)</option>';
+      if (aiCommandSelect) aiCommandSelect.innerHTML = '<option value="">Same as generation</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;
@@ -346,45 +344,15 @@ export function wireAIModelSelectors({ container, apiBase = '', openCookbookForI
       // Sentinel changes are handled by the component's delegated listener.
       if (aiCommandSelect) {
         aiCommandSelect._modelsReady = true;
-        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 {}
-
+        // Legacy URL migration check: legacy endpoints with raw URLs are scrubbed.
+        const scrubModelUrl = (saved) => (saved && saved.startsWith('http://') ? '' : saved);
         if (aiCommandSelect._commandWired !== listeners) {
           aiCommandSelect._commandWired = listeners;
           listen(aiCommandSelect, 'change', () => {
             if (aiCommandSelect.value === '__serve_cookbook__') return;
-            const val = aiCommandSelect.value || '';
-            try {
-              if (val) localStorage.setItem('ge-ai-command-model', aiCommandSelect.value);
-              else localStorage.removeItem('ge-ai-command-model');
-            } catch {}
+            const val = scrubModelUrl(aiCommandSelect.value) || '';
             updateFooterEditModel();
-            window.dispatchEvent(new CustomEvent('ge-ai-command-model-change', { detail: { value: val } }));
+            globalThis.window?.dispatchEvent?.(new CustomEvent('ge-ai-command-model-change', { detail: { value: val } }));
           });
         }
       }
@@ -409,6 +377,7 @@ 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,11 +2,10 @@
  * Background Remove (rembg) + Sharpen wiring + the live edge-cleanup
  * tuner that runs on the most-recent rembg cutout.
  *
- *   rembg-run button: flatten + POST to /api/image/remove-bg with an
+ *   rembg-run button: active layer + POST to /api/image/remove-bg with an
  *     optional hint_mask if the user has a wand/lasso selection
- *     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.
+ *     active. Updates only that layer and binds its live edge tuner;
+ *     other layers and their visibility remain unchanged.
  *
  *   Live edge-cleanup tuner: snapshots the pristine cutout the
  *     moment it lands; subsequent feather/grow slider tweaks
@@ -65,37 +64,13 @@ 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 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();
-    }
+    const editedLayer = await applyImageTool('/api/image/remove-bg', payload, 'BG Removed', btn);
     // 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,6 +5,9 @@
  * "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';
@@ -19,11 +22,14 @@ 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" />
@@ -41,6 +47,7 @@ export function createAiSettings({ container }) {
 
   function open(focusId) {
     el.hidden = false;
+    syncModels();
     if (focusId) {
       const target = document.getElementById(focusId);
       if (target) {
@@ -56,10 +63,59 @@ export function createAiSettings({ container }) {
       close();
     }
   });
-  const onKey = (e) => { if (e.key === 'Escape' && !el.hidden) close(); };
-  document.addEventListener('keydown', onKey);
+  const onKey = (e) => {
+    if (e.key !== 'Escape' || el.hidden) return;
+    e.preventDefault();
+    e.stopImmediatePropagation();
+    close();
+  };
+  window.addEventListener('keydown', onKey, true);
 
   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');
@@ -77,7 +133,9 @@ export function createAiSettings({ container }) {
   }
 
   function destroy() {
-    document.removeEventListener('keydown', onKey);
+    window.removeEventListener('keydown', onKey, true);
+    window.removeEventListener('image-preferences-changed', onPreferencesChanged);
+    container.removeEventListener('ge-image-models-ready', syncModels);
     el.remove();
   }
 

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

@@ -76,7 +76,12 @@ export function createApplyImageTool({
         if (sel.endpoint) extraPayload._endpoint = sel.endpoint;
         if (sel.model && !extraPayload._model) extraPayload._model = sel.model;
       }
-      const flatCanvas = flatten();
+      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 imageB64 = flatCanvas.toDataURL('image/png').split(',')[1];
       const body = { image: imageB64, ...extraPayload };
       const res = await fetch(endpoint, {
@@ -96,6 +101,23 @@ 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,6 +55,11 @@ 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}" />
@@ -94,11 +99,6 @@ 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,6 +78,7 @@ 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".
@@ -143,15 +144,16 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
   };
   state.mainCanvas.addEventListener('pointerup', endPen);
   state.mainCanvas.addEventListener('pointercancel', endPen);
-  // Lasso and Crop can start OUTSIDE the canvas — fallback mousedown on the
+  // Selection 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 (state.tool !== 'lasso' && state.tool !== 'crop') return;
+    if (!canStartOutside() || Date.now() < suppressMouseUntil) return;
+    if (e.button !== 0 || isDirectPanIntent(state.tool, state.spacePanActive, e.button)) 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 (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;
+    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;
     beginDraw(e);
   });
   state.mainCanvas.addEventListener('mouseenter', (e) => {
@@ -305,6 +307,7 @@ 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 });
@@ -315,10 +318,23 @@ export function wireCanvasEvents({ canvasArea, beginDraw, continueDraw, endDraw,
   };
   canvasArea.addEventListener('pointerdown', (e) => {
     const directPan = isDirectPanIntent(state.tool, state.spacePanActive, e.button);
-    // With the crop (or lasso) tool, an empty-area press draws a rect/path
+    // With a selection or crop 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 ((state.tool === 'lasso' || state.tool === 'crop') && !directPan) return;
+    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 (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;
@@ -357,6 +373,12 @@ 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;
@@ -370,6 +392,14 @@ 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,6 +21,7 @@ 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,
@@ -28,6 +29,7 @@ export function createEditorAgent({
   fetchImpl = null,
   getSession = null,
   getModel = null,
+  getGenerationModel = null,
   getAgentModel = null,
   onStep = null,
 } = {}) {
@@ -145,6 +147,7 @@ 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.
@@ -194,6 +197,8 @@ 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') blendCtx.globalCompositeOperation = 'destination-over';
+    if (effect.type === 'drop-shadow' && !effect.params.inside) blendCtx.globalCompositeOperation = 'destination-over';
     blendCtx.globalAlpha = effect.opacity;
     blendCtx.drawImage(contribution, 0, 0);
     blendCtx.globalAlpha = 1;

static/js/editor/effects.js

@@ -81,6 +81,7 @@ 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));
@@ -291,7 +292,7 @@ export function renderEffects(source, effects = [], shouldContinue = () => true)
       : next;
     const blended = copyCanvas(current);
     const blendCtx = blended.getContext('2d');
-    if (effect.type === 'drop-shadow') blendCtx.globalCompositeOperation = 'destination-over';
+    if (effect.type === 'drop-shadow' && !effect.params.inside) blendCtx.globalCompositeOperation = 'destination-over';
     blendCtx.globalAlpha = effect.opacity;
     blendCtx.drawImage(contribution, 0, 0);
     blendCtx.globalAlpha = 1;

static/js/editor/image-generation.js

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

@@ -0,0 +1,11 @@
+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,
+    resizeCustomPrompt, addEmptyLayer, brushSizeSync, openLayerAdjustment,
     invertSelection,
     wandDeleteSelection, wandCopyToNewLayer, copyPixelsToClipboard,
     lassoDeleteSelection, lassoCopyToLayer,
@@ -181,6 +181,12 @@ 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();
@@ -221,11 +227,12 @@ export function wireKeyboardShortcuts(deps) {
         addEmptyLayer();
         return;
       }
-      // Ctrl+Alt+L — Levels adjustment. The Image menu owns the row and its
-      // dialog, so click it instead of duplicating the adjustment here.
+      // Ctrl+Alt+L edits the current layer, leaving Levels controls open.
       if (e.altKey && e.code === 'KeyL') {
-        const row = document.querySelector('[data-image-action="adj-levels"]');
-        if (row) { e.preventDefault(); e.stopPropagation(); row.click(); return; }
+        e.preventDefault();
+        e.stopPropagation();
+        openLayerAdjustment?.('levels');
+        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,6 +2233,7 @@ 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) => {
@@ -2258,6 +2259,9 @@ 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, 100)] },
+  'inner-shadow': { label: 'Inner Shadow', controls: [color('color', 'Color', '#000000'), opacity(), size(), angle(), number('distance', 'Distance', 6, 0, 300)] },
   '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,6 +32,13 @@ 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

@@ -0,0 +1,13 @@
+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,19 +14,26 @@ function toolSettings(tool) {
 
 let _lastColor = null;
 let _lastTransparentColor = null;
-function transparentColor(color) {
-  if (color === _lastColor && _lastTransparentColor) return _lastTransparentColor;
-  _lastColor = color;
+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) {
   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));
-    _lastTransparentColor = `rgba(${rgb.join(',')},0)`;
-    return _lastTransparentColor;
+    return `rgba(${rgb.join(',')},${alpha})`;
   }
   const match = color.match(/rgba?\(([^)]+)\)/);
-  _lastTransparentColor = match ? `rgba(${match[1].split(',').slice(0, 3).join(',')},0)` : 'rgba(0,0,0,0)';
-  return _lastTransparentColor;
+  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})`;
 }
 
 function circleStamp(ctx, x, y, radius, softness, color, alpha, operation) {
@@ -38,8 +45,19 @@ 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);
-    gradient.addColorStop(0, color);
-    gradient.addColorStop(1, transparentColor(color));
+    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));
+    }
     ctx.fillStyle = gradient;
   }
   ctx.beginPath();
@@ -274,6 +292,10 @@ 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
@@ -294,7 +316,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(1, settings.softness / 300));
+    let softness = Math.max(0, Math.min(4, 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,8 +57,11 @@ 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 innerStop = Math.max(0, 60 - state[fields.softness] * 0.55);
-      softPrev.style.background = `radial-gradient(circle, var(--fg) 0%, var(--fg) ${innerStop}%, transparent 90%)`;
+      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%)`;
     }
   });
 }

static/js/editor/submenu-toggles.js

@@ -20,6 +20,23 @@ 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;
@@ -34,10 +51,7 @@ export function wireSubmenuToggles(menu) {
     parent.setAttribute('aria-expanded', String(willOpen));
     if (willOpen) {
       // Align the flyout with the clicked row rather than the menu top.
-      const panel = parent.nextElementSibling;
-      if (panel && panel.classList.contains('ge-submenu')) {
-        panel.style.top = parent.offsetTop + 'px';
-      }
+      positionPanel(parent);
     }
   });
 }

static/js/editor/wire-topbar.js

@@ -37,6 +37,7 @@
  * }} 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'];
@@ -101,6 +102,7 @@ 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/gallery.js

@@ -1321,7 +1321,12 @@ 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).
-    await openEditor(null, null, null, 'New canvas');
+    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);
+    }
     if (!document.querySelector('#gallery-editor-container .gallery-editor')) {
       _renderEditorLanding();
     }

static/js/galleryEditor.js

@@ -277,8 +277,11 @@ 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';
@@ -356,7 +359,6 @@ 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;
@@ -394,6 +396,12 @@ 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.
@@ -838,6 +846,7 @@ function _setCanvasAiBusy(busy) {
 }
 
 let _aiProgressTimer = null;
+let _aiProgressEpoch = 0;
 function _setAiProgress(frac, label) {
   const wrap = document.getElementById('ge-ai-command-progress');
   if (!wrap) return;
@@ -857,12 +866,17 @@ 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;
@@ -871,12 +885,13 @@ 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 (_) {}
+    } catch (_) {} finally { pending = false; }
   };
   _aiProgressTimer = setInterval(tick, 1000);
   tick();
 }
 function _stopAiProgress() {
+  _aiProgressEpoch++;
   if (_aiProgressTimer) { clearInterval(_aiProgressTimer); _aiProgressTimer = null; }
   _setAiProgress(null);
 }
@@ -1074,6 +1089,7 @@ 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];
@@ -1281,8 +1297,13 @@ 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;
@@ -1471,6 +1492,24 @@ 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.
@@ -1933,24 +1972,6 @@ 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
@@ -2814,8 +2835,8 @@ function _wireAiCommandBox() {
     if (_looksBackgroundRemoval(prompt)) {
       _setAiCommandStatus('Removing the background…', 'running');
       try {
-        const done = await _executeQuickEditLocal(prompt);
-        if (done !== false) return { ok: true };
+        await _executeQuickEditLocal(prompt);
+        return { ok: true };
       } catch (err) {
         if (signal && signal.aborted) { _setAiCommandStatus('', ''); return { ok: false, cancelled: true }; }
         const msg = err && err.message ? err.message : String(err);
@@ -2841,6 +2862,7 @@ 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 };
@@ -3083,19 +3105,22 @@ function _wireAiCommandBox() {
         job.controller = controller;
         renderJobStack();
         _quickEditActiveJob = job;
+        let result;
         try {
-          await executeQuickEdit(job.prompt, { forceAi: !!job.forceAi, signal: controller ? controller.signal : null });
+          result = 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);
         }
@@ -5304,9 +5329,14 @@ 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();
@@ -6535,6 +6565,11 @@ 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?.();
@@ -8064,6 +8099,7 @@ 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);
 }
 
@@ -8262,10 +8298,13 @@ 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 ? '' : ` <span class="ge-filter-row-value" data-val-for="${p.key}">${p.value}${p.suffix || ''}</span>`}</label>
-          ${isColor
+          <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
             ? `<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>
@@ -8286,7 +8325,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]').forEach(inp => {
+    overlay.querySelectorAll('input[data-key], select[data-key]').forEach(inp => {
       inp.addEventListener('input', (e) => {
         if (!isCurrent()) { cleanup(null); return; }
         const k = e.target.dataset.key;
@@ -8317,7 +8356,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, button')];
+        const fields = [...overlay.querySelectorAll('input, select, button')];
         const index = fields.indexOf(document.activeElement);
         e.preventDefault();
         fields[(index + (e.shiftKey ? -1 : 1) + fields.length) % fields.length]?.focus();
@@ -8329,7 +8368,7 @@ function _filterSliderPrompt(title, params, onPreview, onCancel) {
       if (!overlay.isConnected || !isCurrent()) cleanup(null);
     });
     observer.observe(state.container, { childList: true, subtree: true });
-    overlay.querySelector('input, button')?.focus({ preventScroll: true });
+    overlay.querySelector('input, select, 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.
@@ -8495,6 +8534,7 @@ function _shadowOffsets(values = {}) {
   return {
     x: Math.round(Math.cos(radians) * distance),
     y: Math.round(-Math.sin(radians) * distance),
+    inside: Number(values.inside) === 1,
   };
 }
 
@@ -8556,6 +8596,7 @@ 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' },
     ];
@@ -8769,6 +8810,7 @@ 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' },
       ];
@@ -9993,9 +10035,8 @@ 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';
-      // 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.
+      // Secondary modifiers stay in More; brush softness remains in the main
+      // strip. Only the active tool's secondary group is shown.
       const strokeTool = (toolId === 'brush' || toolId === 'pixel' || toolId === 'dodge' || toolId === 'burn') ? 'brush'
         : toolId === 'eraser' ? 'eraser'
           : (toolId === 'clone' || toolId === 'heal') ? 'clone'
@@ -10005,6 +10046,8 @@ 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';
@@ -10457,7 +10500,6 @@ 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.
@@ -10650,19 +10692,10 @@ function _buildEditor(container) {
     const initialStatusTool = document.getElementById('ge-status-tool');
     if (initialStatusTool) initialStatusTool.textContent = _TOOLS[state.tool]?.label || state.tool || '';
   }
-  // Preflight checklist: greet the user on open (unless dismissed) and
-  // expose a footer button to re-open it.
+  // Keep model configuration in the AI settings dialog.
   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';
@@ -10672,7 +10705,6 @@ function _buildEditor(container) {
       aiBtn.addEventListener('click', () => _aiSettings?.open());
       footer.appendChild(aiBtn);
     }
-    _preflight?.maybeOpen();
   } catch (_) {}
   try { _initControlKit(container); } catch (_) {}
   let _lastLayoutDesktop = null;
@@ -11792,6 +11824,14 @@ 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,
@@ -12156,7 +12196,9 @@ function _buildEditor(container) {
     out.getContext('2d').drawImage(layer.canvas, off.x, off.y);
     return out;
   };
-  const _aiEditCanvas = async (endpoint, payload = {}, { keepNaturalSize = false } = {}) => {
+  const _aiEditCanvas = async (endpoint, payload = {}, { keepNaturalSize = true } = {}) => {
+    await waitForImagePreferences();
+    if (endpoint === '/api/image/inpaint') payload = { ...payload, _use_image_settings: true };
     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);
@@ -12167,7 +12209,7 @@ function _buildEditor(container) {
     } else {
       _startAiProgress(requestId);
     }
-    const body = JSON.stringify({ image, request_id: requestId, ...payload });
+    const body = JSON.stringify({ image, width: flat.width, height: flat.height, 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
@@ -12225,7 +12267,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') };
+      return { canvas: c, dataUrl: c.toDataURL('image/png'), fullFrame: data.full_frame === true };
     } finally {
       if (_timer) clearTimeout(_timer);
       if (_aiEditAbort === _ctl) _aiEditAbort = null;
@@ -12234,12 +12276,17 @@ function _buildEditor(container) {
   };
   const _placeResultLayer = (canvas, name, maskCanvas) => {
     _saveState(`AI: ${name}`);
-    const layer = createLayer(name, state.imgWidth, state.imgHeight);
-    layer.ctx.drawImage(canvas, 0, 0);
+    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);
     if (maskCanvas) {
       layer.ctx.save();
       layer.ctx.globalCompositeOperation = 'destination-in';
-      layer.ctx.drawImage(maskCanvas, 0, 0);
+      layer.ctx.drawImage(maskCanvas, -offset.x, -offset.y);
       layer.ctx.restore();
     }
     state.layers.push(layer);
@@ -12249,13 +12296,24 @@ 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 { canvas } = await _aiEditCanvas('/api/image/inpaint', { mask, prompt: prompt || '', steps: 4 });
-    return _placeResultLayer(canvas, 'Generative fill', state.wandMask);
+    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);
   };
   // Replace the background/scene while keeping the subject: the server derives
   // the subject mask, repaints the inverse (new background), harmonises colour
@@ -12548,7 +12606,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.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.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.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; } },
@@ -12564,7 +12622,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 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.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.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; } },
@@ -12809,6 +12867,10 @@ 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); }
@@ -13908,6 +13970,12 @@ 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;
     });
   }
 
@@ -14062,8 +14130,6 @@ 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; }

static/js/settings/imageModels.js

@@ -4,12 +4,14 @@
 // them from the same places, so load order and init sequence are untouched.
 
 import { byId as el } from './dom.js';
-import { postSettings as _postSettings } from './api.js';
+import { saveImagePreferences as _postSettings, readImagePreferences } from './imagePreferences.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');
@@ -18,25 +20,41 @@ 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 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;
+    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;
+    }
   } catch (e) { console.warn('Failed to load settings', e); }
 
   function syncImgDisabled() {
@@ -47,14 +65,115 @@ export async function initImageSettings() {
   }
   syncImgDisabled();
 
-  async function saveSettings() {
+  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() {
     try {
-      const res = await _postSettings({ image_gen_enabled: enabledToggle ? enabledToggle.checked : false, image_model: modelSel.value, image_quality: qualSel.value });
+      const res = await _postSettings({
+        image_model: modelSel ? modelSel.value : '',
+        image_edit_model: editModelSel?.value || '',
+        image_quality: qualSel ? qualSel.value : 'medium',
+      });
       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) { msg.textContent = e.status === 403 ? 'Admin access is required to change these settings.' : 'Failed to save'; msg.style.color = 'var(--red)'; }
+    } 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)';
+      }
+    }
   }
-  modelSel.addEventListener('change', saveSettings);
-  qualSel.addEventListener('change', saveSettings);
-  if (enabledToggle) enabledToggle.addEventListener('change', function() { syncImgDisabled(); saveSettings(); });
+
+  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);
 }

static/js/settings/imagePreferences.js

@@ -0,0 +1,107 @@
+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/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-v1115-pr40-editor-precache';
+const CACHE_NAME = 'odysseus-v1134-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.
@@ -237,6 +237,10 @@ 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/helpers/test_settings_shell_coordinator.mjs

@@ -24,6 +24,7 @@ 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_agent_render_ownership.py

@@ -10,7 +10,7 @@ import unittest
 
 
 path = Path(__file__).resolve().parents[1] / "routes/chat_routes.py"
-tree = ast.parse(path.read_text())
+tree = ast.parse(path.read_text(encoding="utf-8"))
 node = next(n for n in tree.body if isinstance(n, ast.ClassDef) and n.name == "_AgentRenderState")
 namespace = {}
 exec(compile(ast.Module(body=[node], type_ignores=[]), str(path), "exec"), namespace)

tests/test_agent_unknown_context_budget.py

@@ -0,0 +1,71 @@
+"""An unknown context window must not be budgeted like a tiny local server (#6678).
+
+``budget_context_for_model`` returns 0 when the endpoint does not prove its
+window, and ``compute_input_token_budget`` answers 0 with the conservative
+default budget. The agent loop's small-server clamp (``<= 8192``) also caught
+0 and cut the request to 1200 tokens, so an open document or earlier context
+of a few thousand tokens was trimmed away before the model saw it.
+"""
+import inspect
+import json
+
+import pytest
+
+DONE = 'data: [DONE]\n\n'
+MARKER = 'NIGHTJAR-7'
+# ~3000 estimated tokens: over the old 1200 clamp, under the 6000 default.
+CONTEXT = ''.join(
+    f'## Project-{n}\nOwner: team {n}. Status: active. Notes: routine maintenance '
+    'and quarterly review scheduled for every workstream in this registry.\n\n'
+    for n in range(60)
+) + f'## Project-Alpha\nAlias: {MARKER}\n'
+
+
+def _event(payload):
+    return 'data: ' + json.dumps(payload) + '\n\n'
+
+
+async def _first_request(monkeypatch, tmp_path, context_window):
+    import src.agent_loop as al
+    from tests.test_agent_runtime_context import _patch_fake_skills
+    _patch_fake_skills(monkeypatch)
+    monkeypatch.setattr('src.tool_index.get_tool_index', lambda: None)
+    monkeypatch.setattr('src.model_context.budget_context_for_model',
+                        lambda *args, **kwargs: context_window)
+    seen = []
+
+    async def provider(candidates, messages, **kwargs):
+        # Like llm_core: the per-candidate factory shapes and trims the request.
+        url, model, headers = candidates[0][:3]
+        request = kwargs['candidate_request_factory'](0, url, model, headers)
+        if inspect.isawaitable(request):
+            request = await request
+        seen.append((request or {}).get('messages', messages))
+        yield _event({'delta': 'ok'})
+        yield DONE
+
+    monkeypatch.setattr(al, 'stream_llm_with_fallback', provider)
+    history = [
+        {'role': 'user', 'content': 'Keep this registry for later:\n\n' + CONTEXT},
+        {'role': 'assistant', 'content': 'Saved.'},
+        {'role': 'user', 'content': 'What is the alias of Project-Alpha?'},
+    ]
+    async for _ in al.stream_agent_loop('http://127.0.0.1:9/v1', 'model', history,
+                                        max_rounds=1, workspace=str(tmp_path)):
+        pass
+    assert seen, 'the provider was never called'
+    return json.dumps(seen[0])
+
+
+@pytest.mark.asyncio
+async def test_unknown_context_window_keeps_earlier_context(monkeypatch, tmp_path):
+    request = await _first_request(monkeypatch, tmp_path, 0)
+    assert MARKER in request
+
+
+@pytest.mark.asyncio
+async def test_known_small_window_is_still_clamped(monkeypatch, tmp_path):
+    # The clamp exists for small local servers whose window is known (n_ctx
+    # 2048 here); it must keep protecting them.
+    request = await _first_request(monkeypatch, tmp_path, 2048)
+    assert MARKER not in request

tests/test_background_chat_completion_ui_static.py

@@ -3,8 +3,8 @@ from tests.helpers.stylesheets import app_css
 
 
 ROOT = Path(__file__).resolve().parents[1]
-CHAT = (ROOT / "static/js/chat.js").read_text()
-SESSIONS = (ROOT / "static/js/sessions.js").read_text()
+CHAT = (ROOT / "static/js/chat.js").read_text(encoding="utf-8")
+SESSIONS = (ROOT / "static/js/sessions.js").read_text(encoding="utf-8")
 CSS = app_css()
 
 

tests/test_c5_rag_disable.py

@@ -0,0 +1,100 @@
+"""Effective RAG policy reaches the real search and context consumer."""
+from types import SimpleNamespace
+from unittest.mock import Mock
+
+import pytest
+
+from src.chat_processor import ChatProcessor
+from tests.test_kv_cache_invalidation_2927 import _build_context_harness
+
+pytestmark = pytest.mark.area_routes
+
+
+@pytest.mark.parametrize('mode', ['chat', 'agent', 'compare'])
+@pytest.mark.parametrize('policy', [
+    'normal', 'incognito', 'preprocessing_disabled', 'research_spinoff', 'low_signal',
+])
+@pytest.mark.parametrize('use_rag', [None, 'true', 'false', True, False])
+async def test_rag_policy_preserves_context_channels(monkeypatch, mode, policy, use_rag):
+    """Exercise effective policy with real preface assembly and synthetic I/O.
+
+    Nonempty results prove permitted retrieval still injects context. Independent
+    memory, skills and web spies ensure a RAG disable cannot disable other channels.
+    """
+    from routes import chat_helpers
+    from src import chat_processor, llm_core, user_time
+
+    sess, request, handler, _ = _build_context_harness(monkeypatch, chat_helpers, history=[])
+    monkeypatch.setattr(chat_helpers, 'load_prefs_for_user', lambda user: {
+        'memory_enabled': True, 'skills_enabled': True})
+    monkeypatch.setattr(user_time, 'current_datetime_context_message', lambda: {
+        'role': 'user', 'content': 'Synthetic current date context'})
+    incognito = policy == 'incognito'
+    preprocessing = policy != 'preprocessing_disabled'
+    if policy == 'research_spinoff':
+        sess.history = [{'role': 'system', 'metadata': {'research_spinoff_from': 'fixture-report'}}]
+    message = 'hi' if policy == 'low_signal' else 'Find the retention policy for archived project documents'
+    search = Mock(return_value=[{
+        'document': 'Synthetic retention document',
+        'metadata': {'filename': 'fixture.txt'}, 'similarity': 0.99,
+    }])
+    memory = Mock(return_value=[{
+        'id': 'fixture-memory', 'text': 'User identity synthetic memory',
+        'category': 'identity', 'pinned': True,
+    }])
+    skills = Mock(return_value=[{'name': 'fixture_skill', 'description': 'Synthetic skill'}])
+    web = Mock(return_value=('Synthetic web context', [{'url': 'https://example.invalid/fixture'}]))
+    query = Mock(return_value='retention policy')
+    monkeypatch.setattr(llm_core, 'llm_call', query)
+    monkeypatch.setattr(chat_processor, 'comprehensive_web_search', web)
+    processor = ChatProcessor(
+        memory_manager=SimpleNamespace(load=memory),
+        personal_docs_manager=SimpleNamespace(rag_manager=SimpleNamespace(search=search)),
+        skills_manager=SimpleNamespace(index_for=skills),
+    )
+    received = []
+    real_preface = processor.build_context_preface
+
+    def capture(**kwargs):
+        received.append(dict(kwargs))
+        return real_preface(**kwargs)
+
+    monkeypatch.setattr(processor, 'build_context_preface', capture)
+    ctx = await chat_helpers.build_chat_context(
+        sess=sess, request=request, chat_handler=handler, chat_processor=processor,
+        message=message, session_id='c5-policy', use_rag=use_rag,
+        incognito=incognito, allow_tool_preprocessing=preprocessing,
+        persist_user_message=False, agent_mode=mode == 'agent',
+        compare_mode=mode == 'compare', use_web='true',
+        search_context='Synthetic prefetched context' if mode == 'compare' else None,
+    )
+    rag_allowed = policy == 'normal' and str(use_rag).lower() != 'false'
+    assert len(received) == 1
+    assert search.call_count == int(rag_allowed)
+    assert received[0]['use_rag'] is rag_allowed
+    if rag_allowed:
+        search.assert_called_once_with(message, k=5, owner='tester')
+        assert ctx.rag_sources == [{
+            'filename': 'fixture.txt', 'snippet': 'Synthetic retention document', 'similarity': 0.99,
+        }]
+    else:
+        assert ctx.rag_sources == []
+    text = '\n'.join(m.get('content', '') for m in ctx.messages)
+    assert ('Synthetic retention document' in text) is rag_allowed
+
+    memory_allowed = policy == 'normal'
+    assert received[0]['use_memory'] is memory_allowed
+    assert memory.call_count == int(memory_allowed)
+    assert ('User identity synthetic memory' in text) is memory_allowed
+    assert bool(ctx.used_memories) is memory_allowed
+    skills_allowed = policy in {'normal', 'research_spinoff'}
+    assert received[0]['use_skills'] is skills_allowed
+    assert skills.call_count == int(skills_allowed and mode == 'agent')
+    assert ('fixture_skill' in text) is (skills_allowed and mode == 'agent')
+    web_allowed = preprocessing and policy != 'low_signal' and mode != 'compare'
+    assert received[0]['use_web'] is web_allowed
+    assert web.call_count == query.call_count == int(web_allowed)
+    assert ('Synthetic web context' in text) is web_allowed
+    assert bool(ctx.web_sources) is web_allowed
+    assert ('Synthetic prefetched context' in text) is (
+        mode == 'compare' and preprocessing and policy != 'low_signal')

tests/test_chat_ttft_timer_static.py

@@ -2,8 +2,8 @@ from pathlib import Path
 
 
 ROOT = Path(__file__).resolve().parents[1]
-CHAT = (ROOT / "static/js/chat.js").read_text()
-RENDERER = (ROOT / "static/js/chatRenderer.js").read_text()
+CHAT = (ROOT / "static/js/chat.js").read_text(encoding="utf-8")
+RENDERER = (ROOT / "static/js/chatRenderer.js").read_text(encoding="utf-8")
 
 
 def test_processing_indicator_shows_live_ttft_timer():

tests/test_compose_env_defaults.py

@@ -0,0 +1,28 @@
+"""Every variable a shipped compose file forwards must carry a default.
+
+A bare ``${VAR}`` makes ``docker compose`` print "variable is not set" on every
+command for a default ``.env`` (#6619), which greets fresh installs with a
+warning that looks like a misconfiguration.
+"""
+
+import re
+from pathlib import Path
+
+import pytest
+
+ROOT = Path(__file__).resolve().parents[1]
+COMPOSE_FILES = sorted(ROOT.glob("docker-compose*.yml")) + sorted((ROOT / "docker").glob("*.yml"))
+
+# ${VAR} with no ``:-``/``-``/``:?``/``?`` modifier.
+BARE_VAR = re.compile(r"\$\{([A-Za-z_][A-Za-z0-9_]*)\}")
+
+
+@pytest.mark.parametrize("path", COMPOSE_FILES, ids=lambda p: p.relative_to(ROOT).as_posix())
+def test_compose_variables_have_defaults(path):
+    bare = [
+        f"{path.name}:{lineno}: ${{{name}}}"
+        for lineno, line in enumerate(path.read_text(encoding="utf-8").splitlines(), 1)
+        if not line.lstrip().startswith("#")
+        for name in BARE_VAR.findall(line)
+    ]
+    assert not bare, "compose variables without a default:\n" + "\n".join(bare)

tests/test_cookbook_endpoint_registration.py

@@ -1,5 +1,9 @@
 from pathlib import Path
 
+import pytest
+
+from tests.helpers.database import disposable_database
+
 
 ROOT = Path(__file__).resolve().parents[1]
 COOKBOOK_RUNNING = ROOT / "static" / "js" / "cookbookRunning.js"
@@ -28,3 +32,496 @@ def test_cookbook_advertised_bind_urls_keep_connectable_host():
     assert "function _endpointFromAdvertisedUrl" in src
     assert "_isAnyBindHost(u.hostname) ? currentHost" in src
     assert "host = u.hostname || host;" not in src
+
+
+@pytest.fixture
+def endpoint_db(tmp_path, monkeypatch):
+    import core.database as database
+    import routes.model_routes as model_routes
+
+    with disposable_database(tmp_path) as factory:
+        monkeypatch.setattr(database, "SessionLocal", factory)
+        monkeypatch.setattr(model_routes, "_probe_endpoint", lambda *args, **kwargs: None)
+        yield factory
+
+
+def _launch_llm(
+    repo_id: str,
+    port: int,
+    serve_session_id: str | None = None,
+) -> str:
+    import routes.cookbook_routes as cookbook_routes
+    from routes.cookbook_helpers import ServeRequest
+
+    router = cookbook_routes.setup_cookbook_routes()
+    serve = next(
+        route.endpoint for route in router.routes
+        if route.path == "/api/model/serve" and "POST" in route.methods
+    )
+    cells = dict(zip(serve.__code__.co_freevars, serve.__closure__ or ()))
+    register = cells["_auto_register_llm_endpoint"].cell_contents
+    endpoint_id = register(
+        ServeRequest(repo_id=repo_id, cmd=f"vllm serve {repo_id} --port {port}"),
+        None,
+        serve_session_id=serve_session_id,
+    )
+    assert endpoint_id
+    return endpoint_id
+
+
+def _endpoint(factory, endpoint_id: str):
+    import core.database as database
+
+    with factory() as db:
+        return db.get(database.ModelEndpoint, endpoint_id)
+
+
+@pytest.mark.parametrize("reuse", [False, True])
+def test_launch_keeps_endpoint_of_other_model_with_same_short_name(endpoint_db, reuse):
+    if reuse:
+        mirror = _launch_llm("unsloth/Llama-3.1-8B-Instruct", 8002)
+    original = _launch_llm("meta-llama/Llama-3.1-8B-Instruct", 8001)
+
+    launched = _launch_llm("unsloth/Llama-3.1-8B-Instruct", 8002)
+
+    if reuse:
+        assert launched == mirror
+    assert _endpoint(endpoint_db, original) is not None
+    assert _endpoint(endpoint_db, launched) is not None
+
+
+@pytest.mark.parametrize("reuse", [False, True])
+def test_relaunch_on_another_port_preserves_existing_endpoint(endpoint_db, reuse):
+    if reuse:
+        current = _launch_llm("meta-llama/Llama-3.1-8B-Instruct", 8002)
+    stale = _launch_llm("Qwen/Qwen3-8B", 8001)
+
+    launched = _launch_llm("Qwen/Qwen3-8B", 8002)
+
+    if reuse:
+        assert launched == current
+    assert _endpoint(endpoint_db, stale) is not None
+    assert _endpoint(endpoint_db, launched) is not None
+
+
+def test_sweep_ignores_endpoint_now_serving_a_different_model(endpoint_db):
+    endpoint = _launch_llm("Qwen/Qwen3-8B", 8001)
+    _launch_llm("meta-llama/Llama-3.1-8B", 8001)
+    _launch_llm("Qwen/Qwen3-8B", 8001)
+
+    _launch_llm("meta-llama/Llama-3.1-8B", 8002)
+
+    assert _endpoint(endpoint_db, endpoint) is not None
+
+
+def test_sweep_ignores_endpoints_not_created_by_cookbook(endpoint_db):
+    import core.database as database
+
+    with endpoint_db() as db:
+        db.add(database.ModelEndpoint(
+            id="manual", name="Qwen3-8B", base_url="http://localhost:9000/v1",
+            pinned_models='["Qwen/Qwen3-8B"]',
+        ))
+        db.commit()
+
+    _launch_llm("Qwen/Qwen3-8B", 8002)
+
+    assert _endpoint(endpoint_db, "manual") is not None
+
+
+def test_manual_pin_order_does_not_change_on_relaunch(endpoint_db):
+    import json
+    from core.database import ModelEndpoint
+
+    endpoint_id = _launch_llm("organization-a/Model-A", 8001)
+
+    with endpoint_db() as db:
+        endpoint = db.get(ModelEndpoint, endpoint_id)
+        endpoint.pinned_models = json.dumps([
+            "organization-a/Model-A",
+            "organization-b/Model-B",
+        ])
+        db.commit()
+
+    _launch_llm("organization-a/Model-A", 8001)
+
+    with endpoint_db() as db:
+        endpoint = db.get(ModelEndpoint, endpoint_id)
+        assert json.loads(endpoint.pinned_models) == [
+            "organization-a/Model-A",
+            "organization-b/Model-B",
+        ]
+
+
+def test_manual_pins_cannot_trigger_endpoint_deletion(endpoint_db):
+    import json
+    from core.database import ModelEndpoint
+
+    original = _launch_llm("organization-a/Model-A", 8001)
+
+    with endpoint_db() as db:
+        endpoint = db.get(ModelEndpoint, original)
+        endpoint.pinned_models = json.dumps([
+            "organization-a/Model-A",
+            "organization-b/Model-B",
+        ])
+        db.commit()
+
+    _launch_llm("organization-b/Model-B", 8002)
+
+    assert _endpoint(endpoint_db, original) is not None
+
+
+def test_unavailable_model_probe_never_deletes_another_endpoint(
+    endpoint_db, monkeypatch
+):
+    import routes.model_routes as model_routes
+
+    original = _launch_llm("organization-a/Model-A", 8001)
+
+    monkeypatch.setattr(
+        model_routes,
+        "_probe_endpoint",
+        lambda *args, **kwargs: [],
+    )
+
+    _launch_llm("organization-a/Model-A", 8002)
+
+    assert _endpoint(endpoint_db, original) is not None
+
+
+@pytest.mark.asyncio
+async def test_old_watchdog_cannot_delete_reused_endpoint(
+    endpoint_db,
+    monkeypatch,
+    endpoint_http_api,
+):
+    import asyncio
+    import urllib.request
+    import routes.cookbook_routes as cookbook_routes
+
+    original = _launch_llm(
+        "organization-a/Model-A",
+        8001,
+        serve_session_id="serve-old",
+    )
+
+    reused = _launch_llm(
+        "organization-b/Model-B",
+        8001,
+        serve_session_id="serve-new",
+    )
+
+    assert original == reused
+
+    with endpoint_db() as db:
+        from core.database import ModelEndpoint
+
+        endpoint = db.get(ModelEndpoint, reused)
+        assert endpoint.cookbook_serve_session_id == "serve-new"
+
+    router = cookbook_routes.setup_cookbook_routes()
+    serve = next(
+        route.endpoint
+        for route in router.routes
+        if route.path == "/api/model/serve"
+        and "POST" in route.methods
+    )
+
+    cells = dict(
+        zip(
+            serve.__code__.co_freevars,
+            serve.__closure__ or (),
+        )
+    )
+
+    watchdog = cells["_serve_crash_watchdog"].cell_contents
+
+    class FakeProcess:
+        async def communicate(self):
+            return (
+                b"=== Process exited with code 1 ===\n",
+                b"",
+            )
+
+    async def fake_subprocess(*args, **kwargs):
+        return FakeProcess()
+
+    async def fake_sleep(seconds):
+        return None
+
+    def unavailable(*args, **kwargs):
+        raise OSError("Server still warming up")
+
+    monkeypatch.setattr(
+        asyncio,
+        "create_subprocess_exec",
+        fake_subprocess,
+    )
+    monkeypatch.setattr(asyncio, "sleep", fake_sleep)
+    monkeypatch.setattr(
+        urllib.request,
+        "urlopen",
+        unavailable,
+    )
+
+    await watchdog(
+        endpoint_id=original,
+        session_id="serve-old",
+        remote=None,
+        ssh_port=None,
+        is_windows=False,
+    )
+
+    assert _endpoint(endpoint_db, reused) is not None
+
+    # The current serve's own crash watchdog must still be able
+    # to remove its endpoint when it actually fails.
+    await watchdog(
+        endpoint_id=reused,
+        session_id="serve-new",
+        remote=None,
+        ssh_port=None,
+        is_windows=False,
+    )
+
+    assert _endpoint(endpoint_db, reused) is None
+
+
+def test_cookbook_serve_session_migration_is_idempotent(
+    tmp_path,
+    monkeypatch,
+):
+    from sqlalchemy import create_engine, inspect, text
+    import core.database as database
+
+    engine = create_engine(
+        f"sqlite:///{tmp_path / 'legacy-endpoints.db'}"
+    )
+
+    try:
+        with engine.begin() as conn:
+            conn.execute(
+                text(
+                    "CREATE TABLE model_endpoints "
+                    "(id VARCHAR PRIMARY KEY)"
+                )
+            )
+
+        monkeypatch.setattr(database, "engine", engine)
+
+        database._migrate_add_cookbook_serve_session_id_column()
+        database._migrate_add_cookbook_serve_session_id_column()
+
+        columns = {
+            column["name"]
+            for column in inspect(engine).get_columns(
+                "model_endpoints"
+            )
+        }
+
+        assert "cookbook_serve_session_id" in columns
+
+    finally:
+        engine.dispose()
+
+
+@pytest.fixture
+def endpoint_http_api(endpoint_db, monkeypatch):
+    """Route deletion through a disposable in-process FastAPI app."""
+    import httpx
+    from fastapi import FastAPI
+    import routes.model_routes as model_routes
+    import routes.prefs_routes as prefs_routes
+    import core.constants as constants
+    import src.cookbook_serve_lifecycle as lifecycle
+
+    monkeypatch.setattr(model_routes, "SessionLocal", endpoint_db)
+    monkeypatch.setattr(model_routes, "require_admin", lambda request: None)
+
+    settings = {}
+    preferences = {}
+    monkeypatch.setattr(model_routes, "_load_settings", lambda: settings)
+    monkeypatch.setattr(model_routes, "_save_settings", lambda value: settings.update(value))
+    monkeypatch.setattr(prefs_routes, "_load", lambda: preferences)
+    monkeypatch.setattr(prefs_routes, "_save", lambda value: preferences.update(value))
+
+    # Endpoint deletion must not touch the user's running sessions.
+    import src.ai_interaction as ai_interaction
+    monkeypatch.setattr(ai_interaction, "get_session_manager", lambda: None)
+
+    app = FastAPI()
+    router = model_routes.setup_model_routes(None)
+    app.include_router(router)
+
+    original_client = httpx.AsyncClient
+    transport = httpx.ASGITransport(app=app)
+
+    def client_factory(*args, **kwargs):
+        kwargs["transport"] = transport
+        return original_client(*args, **kwargs)
+
+    monkeypatch.setattr(httpx, "AsyncClient", client_factory)
+    monkeypatch.setattr(constants, "internal_api_base", lambda: "http://testserver")
+    monkeypatch.setattr(lifecycle, "internal_api_base", lambda: "http://testserver")
+
+    return {"settings": settings, "preferences": preferences, "router": router}
+
+
+@pytest.mark.asyncio
+async def test_ownership_condition_preserves_settings_on_mismatch(
+    endpoint_db, endpoint_http_api,
+):
+    import httpx
+    original = _launch_llm("organization-a/Model-A", 8001, "serve-old")
+    reused = _launch_llm("organization-b/Model-B", 8001, "serve-new")
+    assert reused == original
+    settings = endpoint_http_api["settings"]
+    settings.update({"default_endpoint_id": reused, "default_model": "organization-b/Model-B"})
+    async with httpx.AsyncClient() as client:
+        response = await client.delete(
+            f"http://testserver/api/model-endpoints/{reused}",
+            params={"expected_cookbook_serve_session_id": "serve-old"},
+        )
+    assert response.status_code == 409
+    assert _endpoint(endpoint_db, reused) is not None
+    assert settings["default_endpoint_id"] == reused
+
+
+@pytest.mark.asyncio
+async def test_owned_deletion_clears_settings_and_model_cache(
+    endpoint_db, endpoint_http_api,
+):
+    import httpx
+    from core.database import Session as DbSession
+
+    endpoint_id = _launch_llm("organization-a/Model-A", 8001, "serve-current")
+    settings = endpoint_http_api["settings"]
+    settings.update({
+        "default_endpoint_id": endpoint_id,
+        "default_model": "organization-a/Model-A",
+        "foreground_model_fallbacks": [{"endpoint_id": endpoint_id, "model": "x"}],
+    })
+    with endpoint_db() as db:
+        db.add(DbSession(
+            id="owned-delete-session", name="Test", owner=None,
+            endpoint_url="http://localhost:8001/v1",
+            endpoint_id=endpoint_id, model="organization-a/Model-A",
+            headers={"Authorization": "Bearer test-only"},
+        ))
+        db.commit()
+
+    # Seed the actual model listing cache captured by the route closure.
+    router = endpoint_http_api["router"]
+    route = next(r for r in router.routes if r.path == "/api/model-endpoints/{ep_id}" and "DELETE" in r.methods)
+    closure = dict(zip(route.endpoint.__code__.co_freevars, route.endpoint.__closure__ or ()))
+    invalidate = closure["_invalidate_models_cache"].cell_contents
+    cache_closure = dict(zip(invalidate.__code__.co_freevars, invalidate.__closure__ or ()))
+    models_cache = cache_closure["_models_cache"].cell_contents
+    models_cache["test"] = {"data": [], "time": 0}
+
+    async with httpx.AsyncClient() as client:
+        response = await client.delete(
+            f"http://testserver/api/model-endpoints/{endpoint_id}",
+            params={"expected_cookbook_serve_session_id": "serve-current"},
+        )
+    assert response.status_code == 200, response.text
+    assert _endpoint(endpoint_db, endpoint_id) is None
+    assert settings["default_endpoint_id"] == ""
+    assert settings["foreground_model_fallbacks"] == []
+    assert not models_cache
+    with endpoint_db() as db:
+        sess = db.get(DbSession, "owned-delete-session")
+        assert sess.headers == {}
+
+
+@pytest.mark.asyncio
+async def test_ordinary_admin_delete_does_not_require_serve_owner(
+    endpoint_db, endpoint_http_api,
+):
+    import httpx
+    endpoint_id = _launch_llm("organization-a/Model-A", 8001, "serve-new")
+    async with httpx.AsyncClient() as client:
+        response = await client.delete(f"http://testserver/api/model-endpoints/{endpoint_id}")
+    assert response.status_code == 200, response.text
+    assert _endpoint(endpoint_db, endpoint_id) is None
+
+
+def _launch_image(repo_id: str, port: int, monkeypatch) -> str:
+    import routes.cookbook_routes as cookbook_routes
+    import src.settings as settings
+    from routes.cookbook_helpers import ServeRequest
+
+    monkeypatch.setattr(settings, "load_settings", lambda: {"image_gen_enabled": True, "image_model": repo_id})
+    monkeypatch.setattr(settings, "save_settings", lambda _settings: None)
+    router = cookbook_routes.setup_cookbook_routes()
+    serve = next(
+        route.endpoint for route in router.routes
+        if route.path == "/api/model/serve" and "POST" in route.methods
+    )
+    cells = dict(zip(serve.__code__.co_freevars, serve.__closure__ or ()))
+    register = cells["_auto_register_image_endpoint"].cell_contents
+    endpoint_id = register(
+        ServeRequest(repo_id=repo_id, cmd=f"python diffusion_server.py --model {repo_id} --port {port}"), None
+    )
+    assert endpoint_id
+    return endpoint_id
+
+
+def _rename(factory, endpoint_id: str, name: str) -> None:
+    import core.database as database
+
+    with factory() as db:
+        db.get(database.ModelEndpoint, endpoint_id).name = name
+        db.commit()
+
+
+@pytest.mark.parametrize("relaunched", ["Qwen/Qwen3-8B", "meta-llama/Llama-3.1-8B"])
+def test_relaunch_keeps_renamed_endpoint_name(endpoint_db, relaunched):
+    endpoint = _launch_llm("Qwen/Qwen3-8B", 8001)
+    _rename(endpoint_db, endpoint, "Workstation GPU")
+
+    assert _launch_llm(relaunched, 8001) == endpoint
+
+    assert _endpoint(endpoint_db, endpoint).name == "Workstation GPU"
+
+
+def test_relaunch_names_endpoint_after_served_model_when_not_renamed(endpoint_db):
+    endpoint = _launch_llm("Qwen/Qwen3-8B", 8001)
+
+    for repo_id, name in [
+        ("meta-llama/Llama-3.1-8B", "Llama-3.1-8B"),
+        ("Qwen/Qwen3-8B", "Qwen3-8B"),
+        ("meta-llama/Llama-3.1-8B", "Llama-3.1-8B"),
+    ]:
+        _launch_llm(repo_id, 8001)
+        assert _endpoint(endpoint_db, endpoint).name == name
+
+
+def test_launch_keeps_name_of_endpoint_without_pinned_models(endpoint_db):
+    import core.database as database
+
+    with endpoint_db() as db:
+        db.add(database.ModelEndpoint(id="manual", name="My vLLM box", base_url="http://localhost:8001/v1"))
+        db.commit()
+
+    assert _launch_llm("Qwen/Qwen3-8B", 8001) == "manual"
+
+    assert _endpoint(endpoint_db, "manual").name == "My vLLM box"
+
+
+def test_image_relaunch_keeps_renamed_endpoint_name(endpoint_db, monkeypatch):
+    endpoint = _launch_image("black-forest-labs/FLUX.1-schnell", 8100, monkeypatch)
+    _rename(endpoint_db, endpoint, "Image box")
+
+    _launch_image("stabilityai/sdxl-turbo", 8100, monkeypatch)
+
+    assert _endpoint(endpoint_db, endpoint).name == "Image box"
+
+
+def test_image_relaunch_names_endpoint_after_served_model_when_not_renamed(endpoint_db, monkeypatch):
+    endpoint = _launch_image("black-forest-labs/FLUX.1-schnell", 8100, monkeypatch)
+
+    _launch_image("stabilityai/sdxl-turbo", 8100, monkeypatch)
+
+    assert _endpoint(endpoint_db, endpoint).name == "sdxl-turbo (image)"

tests/test_cookbook_error_feedback.py

@@ -70,3 +70,63 @@ def test_no_gguf_found_pattern():
     result = _diagnose_serve_output(out)
     assert result is not None
     assert "GGUF" in result["message"]
+
+
+def test_cookbook_routes_uses_shared_diagnosis_helper():
+    # /api/cookbook/tasks/status must use the maintained helper. A nested copy in
+    # cookbook_routes.py shadowed the import and silently drifted (missing the
+    # ModelOpt, mflux and MLX bridge diagnoses).
+    import ast
+    from pathlib import Path
+
+    source = (Path(__file__).resolve().parents[1] / "routes" / "cookbook_routes.py").read_text(encoding="utf-8")
+    local_defs = [
+        node.lineno
+        for node in ast.walk(ast.parse(source))
+        if isinstance(node, (ast.FunctionDef, ast.AsyncFunctionDef)) and node.name == "_diagnose_serve_output"
+    ]
+    assert local_defs == []
+
+
+def test_modelopt_lm_head_checkpoint_returns_diagnosis():
+    out = "ValueError: There is no module or parameter named 'lm_head.input_scale' in Qwen3ForCausalLM"
+    result = _diagnose_serve_output(out)
+    assert result is not None
+    assert "ModelOpt" in result["message"]
+
+
+def test_nvidia_driver_too_old_for_torch_returns_diagnosis():
+    # vLLM 0.31 from PyPI ships torch cu130; on driver 570 (CUDA 12.8) the engine dies here.
+    out = (
+        "(EngineCore pid=1) ERROR [core.py:1433]     self.driver_worker.init_device()\n"
+        "(EngineCore pid=1) ERROR [core.py:1433] RuntimeError: The NVIDIA driver on your system is too old "
+        "(found version 12080). Please update your GPU driver by downloading and installing a new version\n"
+        "Traceback (most recent call last):\n"
+        "RuntimeError: Engine core initialization failed. See root cause above. Failed core proc(s): {}\n"
+    )
+    result = _diagnose_serve_output(out)
+    assert result is not None
+    assert "driver" in result["message"].lower()
+    assert any("cu129" in s["label"] for s in result["suggestions"])
+
+
+def test_cuda_runtime_newer_than_driver_returns_diagnosis():
+    # torch switched to cu128 but the vLLM wheel's own kernels still need CUDA 13.
+    out = (
+        "RuntimeError: get_cuda_view_from_cpu_tensor, /workspace/csrc/libtorch_stable/cuda_view.cu:38, "
+        "cudaHostGetDevicePointer failed: CUDA driver version is insufficient for CUDA runtime version\n"
+        "Traceback (most recent call last):\n"
+    )
+    result = _diagnose_serve_output(out)
+    assert result is not None
+    assert "driver" in result["message"].lower()
+
+
+def test_tasks_status_capture_joins_wrapped_tmux_lines():
+    # tmux wraps at the pane width (often mid-word), which hid errors like
+    # "insufficie|nt for CUDA runtime version" from the diagnosis patterns.
+    from pathlib import Path
+
+    source = (Path(__file__).resolve().parents[1] / "routes" / "cookbook_routes.py").read_text(encoding="utf-8")
+    assert '_remote_tmux_command("capture-pane", "-t", session_id, "-p", "-J", "-S", "-500")' in source
+    assert '["tmux", "capture-pane", "-t", session_id, "-p", "-J", "-S", "-500"]' in source

tests/test_cookbook_hf_gguf_files.py

@@ -0,0 +1,62 @@
+import pytest
+import httpx
+from unittest.mock import patch, AsyncMock
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+
+from routes.cookbook_routes import setup_cookbook_routes
+from src.auth_helpers import require_user
+
+app = FastAPI()
+router = setup_cookbook_routes()
+app.include_router(router)
+app.dependency_overrides[require_user] = lambda: "test_user"
+
+client = TestClient(app)
+
+
+def test_hf_gguf_files_success():
+    mock_resp = httpx.Response(
+        200,
+        json={
+            "siblings": [
+                {"rfilename": "model-q4_k_m.gguf"},
+                {"rfilename": "model-q8_0.gguf"},
+                {"rfilename": "README.md"},
+            ]
+        },
+        request=httpx.Request("GET", "https://huggingface.co/api/models/TheBloke/Llama-2-7B-GGUF"),
+    )
+
+    with patch("httpx.AsyncClient.get", new_callable=AsyncMock, return_value=mock_resp):
+        response = client.get("/api/cookbook/hf-gguf-files?repo_id=TheBloke/Llama-2-7B-GGUF")
+        assert response.status_code == 200
+        data = response.json()
+        assert data["ok"] is True
+        assert data["repo_id"] == "TheBloke/Llama-2-7B-GGUF"
+        assert data["files"] == ["model-q4_k_m.gguf", "model-q8_0.gguf"]
+
+
+def test_hf_gguf_files_http_error():
+    mock_resp = httpx.Response(
+        404,
+        json={"error": "Model not found"},
+        request=httpx.Request("GET", "https://huggingface.co/api/models/invalid/repo"),
+    )
+
+    with patch("httpx.AsyncClient.get", new_callable=AsyncMock, return_value=mock_resp):
+        response = client.get("/api/cookbook/hf-gguf-files?repo_id=invalid/repo")
+        assert response.status_code == 200
+        data = response.json()
+        assert data["ok"] is False
+        assert "HF API HTTP 404" in data["error"]
+
+
+def test_hf_gguf_files_exception_handling():
+    with patch("httpx.AsyncClient.get", new_callable=AsyncMock, side_effect=httpx.ConnectError("Network unreachable")):
+        response = client.get("/api/cookbook/hf-gguf-files?repo_id=TheBloke/Llama-2-7B-GGUF")
+        # Should gracefully return JSON error payload, not raise NameError / 500
+        assert response.status_code == 200
+        data = response.json()
+        assert data["ok"] is False
+        assert data["error"] == "HF API request failed"

tests/test_cookbook_serve_lifecycle.py

@@ -4,6 +4,13 @@ import pytest
 
 from src import cookbook_serve_lifecycle as lifecycle
 
+from tests.test_cookbook_endpoint_registration import (
+    endpoint_db,
+    endpoint_http_api,
+    _endpoint,
+    _launch_llm,
+)
+
 
 @pytest.mark.asyncio
 async def test_tick_persists_only_successfully_stopped_serves(tmp_path, monkeypatch):
@@ -48,3 +55,219 @@ async def test_tick_persists_only_successfully_stopped_serves(tmp_path, monkeypa
     assert tasks["stop-succeeds"]["_scheduledStopAtMs"] is None
     assert tasks["stop-fails"]["status"] == "running"
     assert tasks["stop-fails"]["_scheduledStopAtMs"] == 0
+
+
+
+@pytest.mark.asyncio
+async def test_scheduled_stop_preserves_endpoint_reused_by_newer_serve(
+    endpoint_db,
+    endpoint_http_api,
+):
+    original = _launch_llm(
+        "organization-a/Model-A",
+        8001,
+        serve_session_id="serve-old",
+    )
+
+    reused = _launch_llm(
+        "organization-b/Model-B",
+        8001,
+        serve_session_id="serve-new",
+    )
+
+    assert original == reused
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": original,
+        "sessionId": "serve-old",
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, reused) is not None
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": reused,
+        "sessionId": "serve-new",
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, reused) is None
+
+
+@pytest.mark.asyncio
+async def test_scheduled_stop_preserves_legacy_endpoint_without_owner(
+    endpoint_db,
+    endpoint_http_api,
+):
+    endpoint_id = _launch_llm(
+        "organization-a/Model-A",
+        8002,
+    )
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": endpoint_id,
+        "sessionId": "serve-old",
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, endpoint_id) is not None
+
+
+@pytest.mark.asyncio
+async def test_scheduled_stop_cannot_delete_manual_endpoint(
+    endpoint_db,
+    endpoint_http_api,
+):
+    from core.database import ModelEndpoint
+
+    with endpoint_db() as db:
+        db.add(ModelEndpoint(
+            id="manual-endpoint",
+            name="Manual",
+            base_url="http://localhost:9000/v1",
+            cookbook_serve_session_id="serve-old",
+        ))
+        db.commit()
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": "manual-endpoint",
+        "sessionId": "serve-old",
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, "manual-endpoint") is not None
+
+
+@pytest.mark.asyncio
+async def test_scheduled_stop_requires_session_identity(endpoint_db, endpoint_http_api):
+    endpoint_id = _launch_llm(
+        "organization-a/Model-A",
+        8003,
+        serve_session_id="serve-current",
+    )
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": endpoint_id,
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, endpoint_id) is not None
+
+
+
+def _launch_image(repo_id, port, serve_session_id):
+    import routes.cookbook_routes as cookbook_routes
+    from routes.cookbook_helpers import ServeRequest
+
+    router = cookbook_routes.setup_cookbook_routes()
+
+    serve = next(
+        route.endpoint
+        for route in router.routes
+        if route.path == "/api/model/serve"
+        and "POST" in route.methods
+    )
+
+    cells = dict(
+        zip(
+            serve.__code__.co_freevars,
+            serve.__closure__ or (),
+        )
+    )
+
+    register = cells["_auto_register_image_endpoint"].cell_contents
+
+    endpoint_id = register(
+        ServeRequest(
+            repo_id=repo_id,
+            cmd=f"python scripts/diffusion_server.py --port {port}",
+        ),
+        None,
+        serve_session_id=serve_session_id,
+    )
+
+    assert endpoint_id
+    return endpoint_id
+
+
+@pytest.mark.asyncio
+async def test_scheduled_stop_deletes_owned_image_endpoint(
+    endpoint_db,
+    monkeypatch,
+    endpoint_http_api,
+):
+    import src.settings as settings
+    from core.database import ModelEndpoint
+
+    monkeypatch.setattr(settings, "load_settings", lambda: {})
+    monkeypatch.setattr(
+        settings,
+        "save_settings",
+        lambda value: None,
+    )
+
+    endpoint_id = _launch_image(
+        "organization-a/Image-A",
+        8101,
+        "serve-image-a",
+    )
+
+    assert endpoint_id.startswith("img-")
+
+    with endpoint_db() as db:
+        endpoint = db.get(ModelEndpoint, endpoint_id)
+        assert endpoint.cookbook_serve_session_id == "serve-image-a"
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": endpoint_id,
+        "sessionId": "serve-image-a",
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, endpoint_id) is None
+
+
+@pytest.mark.asyncio
+async def test_old_image_serve_cannot_delete_reused_endpoint(
+    endpoint_db,
+    monkeypatch,
+    endpoint_http_api,
+):
+    import src.settings as settings
+
+    monkeypatch.setattr(settings, "load_settings", lambda: {})
+    monkeypatch.setattr(
+        settings,
+        "save_settings",
+        lambda value: None,
+    )
+
+    original = _launch_image(
+        "organization-a/Image-A",
+        8102,
+        "serve-old",
+    )
+
+    reused = _launch_image(
+        "organization-b/Image-B",
+        8102,
+        "serve-new",
+    )
+
+    assert original == reused
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": original,
+        "sessionId": "serve-old",
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, reused) is not None
+
+    await lifecycle._delete_endpoint_for_task({
+        "_endpointId": reused,
+        "sessionId": "serve-new",
+        "type": "serve",
+    })
+
+    assert _endpoint(endpoint_db, reused) is None

tests/test_daily_brief_local_calendar.py

@@ -0,0 +1,103 @@
+"""Daily brief must query and display each calendar storage kind in local time."""
+import asyncio
+import os
+import time
+from contextlib import contextmanager
+from datetime import datetime, timedelta, timezone
+from types import SimpleNamespace
+from zoneinfo import ZoneInfo
+
+import pytest
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy.pool import StaticPool
+
+from core import database
+from src import builtin_actions
+
+
+@contextmanager
+def system_timezone(name):
+    previous = os.environ.get('TZ')
+    os.environ['TZ'] = name
+    time.tzset()
+    try:
+        yield
+    finally:
+        if previous is None:
+            os.environ.pop('TZ', None)
+        else:
+            os.environ['TZ'] = previous
+        time.tzset()
+
+
+@pytest.mark.skipif(not hasattr(time, 'tzset'), reason='requires changing the process local timezone')
+@pytest.mark.parametrize('zone', ['Europe/Berlin', 'America/Los_Angeles'])
+def test_daily_brief_selects_local_day_and_orders_mixed_storage(monkeypatch, zone):
+    engine = create_engine('sqlite://', poolclass=StaticPool)
+    for model in [database.CalendarCal, database.CalendarEvent, database.Note]:
+        model.__table__.create(engine)
+    sessions = sessionmaker(bind=engine)
+    monkeypatch.setattr(database, 'SessionLocal', sessions)
+    from core.auth import AuthManager
+    monkeypatch.setattr(AuthManager, 'is_configured', property(lambda self: True))
+    from routes import email_helpers
+    def no_email(*args):
+        raise RuntimeError('No email account in this calendar-only test')
+    monkeypatch.setattr(email_helpers, '_imap_connect', no_email)
+    try:
+        with system_timezone(zone):
+            today = datetime.now().replace(hour=0, minute=0, second=0, microsecond=0)
+            def utc(value):
+                return value.astimezone(timezone.utc).replace(tzinfo=None)
+            with sessions() as db:
+                for owner in ['alice', 'bob', None]:
+                    db.add(database.CalendarCal(id=owner or 'shared', owner=owner, name=owner or 'shared'))
+                db.flush()
+                def add(uid, start, end, *, utc_row=False, all_day=False, owner='alice', status='confirmed'):
+                    db.add(database.CalendarEvent(uid=uid, calendar_id=owner or 'shared', summary=uid,
+                        dtstart=utc(start) if utc_row and not all_day else start,
+                        dtend=utc(end) if utc_row and not all_day else end,
+                        is_utc=utc_row, all_day=all_day, status=status))
+                add('early', today+timedelta(minutes=30), today+timedelta(hours=1), utc_row=True)
+                add('utc-ten', today+timedelta(hours=10), today+timedelta(hours=11), utc_row=True)
+                add('local-nine', today+timedelta(hours=9), today+timedelta(hours=10))
+                add('all-day', today, today+timedelta(days=1), utc_row=True, all_day=True)
+                add('next-day', today+timedelta(days=1,minutes=30), today+timedelta(days=1,hours=1), utc_row=True)
+                add('ended', today-timedelta(hours=1), today, utc_row=True)
+                add('cancelled', today+timedelta(hours=12), today+timedelta(hours=13), utc_row=True, status='cancelled')
+                add('foreign', today+timedelta(hours=12), today+timedelta(hours=13), utc_row=True, owner='bob')
+                add('unowned', today+timedelta(hours=12), today+timedelta(hours=13), owner=None)
+                db.commit()
+            text, success = asyncio.run(builtin_actions.action_daily_brief('alice'))
+            assert success, text
+            lines = ['all day  all-day', '00:30  early', '09:00  local-nine', '10:00  utc-ten']
+            assert all(line in text for line in lines), text
+            assert [text.index(line) for line in lines] == sorted(text.index(line) for line in lines), text
+            for excluded in ['next-day', 'ended', 'cancelled', 'foreign', 'unowned']:
+                assert excluded not in text, text
+    finally:
+        engine.dispose()
+
+
+@pytest.mark.parametrize('day, hours', [('2026-03-29', 23), ('2026-10-25', 25)])
+def test_utc_day_window_uses_offset_at_each_boundary(day, hours):
+    start = datetime.fromisoformat(day)
+    zone = ZoneInfo('Europe/Berlin')
+    begin = builtin_actions._daily_brief_utc_boundary(start, zone)
+    end = builtin_actions._daily_brief_utc_boundary(start+timedelta(days=1), zone)
+    assert end-begin == timedelta(hours=hours)
+    if hasattr(time, 'tzset'):
+        with system_timezone('Europe/Berlin'):
+            assert builtin_actions._daily_brief_utc_boundary(start) == begin
+            assert builtin_actions._daily_brief_utc_boundary(start+timedelta(days=1)) == end
+
+
+@pytest.mark.parametrize('utc_row, all_day, expected', [
+    (True, False, datetime(2026, 6, 1, 10)),
+    (False, False, datetime(2026, 6, 1, 8)),
+    (True, True, datetime(2026, 6, 1, 8)),
+])
+def test_local_start_preserves_floating_and_date_only_values(utc_row, all_day, expected):
+    event = SimpleNamespace(dtstart=datetime(2026,6,1,8), is_utc=utc_row, all_day=all_day)
+    assert builtin_actions._daily_brief_local_start(event, ZoneInfo('Europe/Berlin')) == expected

tests/test_default_chat_model_filter.py

@@ -0,0 +1,86 @@
+"""Issue #2137: never preselect an embedding or other non-chat model."""
+
+import json
+from types import SimpleNamespace
+
+import pytest
+from fastapi import FastAPI
+from fastapi.testclient import TestClient
+
+from core.database import ModelEndpoint
+from routes import model_routes, prefs_routes
+from tests.helpers.database import disposable_database
+
+
+@pytest.fixture
+def defaults_api(monkeypatch, tmp_path):
+    defaults = {}
+    with disposable_database(tmp_path) as factory:
+        monkeypatch.setattr(model_routes, "SessionLocal", factory)
+        monkeypatch.setattr(model_routes, "_load_settings", lambda: {})
+        monkeypatch.setattr(prefs_routes, "_load_for_user", lambda owner: defaults)
+        app = FastAPI()
+        app.state.auth_manager = SimpleNamespace(is_admin=lambda owner: False)
+
+        @app.middleware("http")
+        async def owner(request, call_next):
+            request.state.current_user = "alice"
+            return await call_next(request)
+
+        app.include_router(model_routes.setup_model_routes(model_discovery=None))
+        with TestClient(app) as client:
+            yield client, factory, defaults
+
+
+def _endpoint(factory, *, cached=(), pinned=(), hidden=(), owner="alice", endpoint_id="ep"):
+    with factory() as db:
+        db.add(ModelEndpoint(
+            id=endpoint_id, name="Fixture", base_url="http://model.invalid/v1", owner=owner,
+            is_enabled=True, cached_models=json.dumps(cached),
+            pinned_models=json.dumps(pinned), hidden_models=json.dumps(hidden),
+        ))
+        db.commit()
+
+
+@pytest.mark.parametrize("non_chat", [
+    "text-embedding-3-small", "nomic-embed-text:latest", "jina-reranker-v2-base",
+    "tts-1", "whisper-1", "gpt-image-1",
+])
+def test_automatic_default_skips_non_chat_models(defaults_api, non_chat):
+    client, factory, _ = defaults_api
+    _endpoint(factory, cached=[non_chat, "chat-model"])
+    assert client.get("/api/default-chat").json()["model"] == "chat-model"
+
+
+def test_non_chat_saved_default_falls_back_to_visible_pinned_chat(defaults_api):
+    client, factory, defaults = defaults_api
+    _endpoint(factory, cached=["text-embedding-3-small", "hidden-chat"],
+              pinned=["jina-reranker-v2-base", "pinned-chat"], hidden=["hidden-chat"])
+    defaults.update(default_endpoint_id="ep", default_model="text-embedding-3-small")
+    assert client.get("/api/default-chat").json()["model"] == "pinned-chat"
+
+
+def test_no_chat_candidate_leaves_model_empty(defaults_api):
+    client, factory, defaults = defaults_api
+    _endpoint(factory, cached=["text-embedding-3-small", "hidden-chat"],
+              pinned=["jina-reranker-v2-base"], hidden=["hidden-chat"])
+    defaults.update(default_endpoint_id="ep", default_model="text-embedding-3-small")
+    result = client.get("/api/default-chat").json()
+    assert result == {"endpoint_id": "ep", "endpoint_url": "http://model.invalid/v1/chat/completions", "model": ""}
+
+
+def test_valid_explicit_model_survives_stale_catalog(defaults_api):
+    client, factory, defaults = defaults_api
+    _endpoint(factory, cached=["text-embedding-3-small", "other-chat"])
+    defaults.update(default_endpoint_id="ep", default_model="my-custom-chat")
+    assert client.get("/api/default-chat").json()["model"] == "my-custom-chat"
+
+
+def test_model_filter_preserves_owner_scope(defaults_api):
+    client, factory, defaults = defaults_api
+    _endpoint(factory, owner="bob", endpoint_id="bobs-endpoint", cached=["bobs-chat"])
+    _endpoint(factory, cached=["text-embedding-3-small", "alices-chat"])
+    defaults.update(default_endpoint_id="bobs-endpoint")
+    result = client.get("/api/default-chat").json()
+    assert result["endpoint_id"] == "ep"
+    assert result["model"] == "alices-chat"

tests/test_docker_devops_hardening.py

@@ -67,6 +67,14 @@ def test_compose_files_forward_companion_base_url():
         assert "COMPANION_BASE_URL" in _compose_env_names(path), path.name
 
 
+def test_compose_files_forward_first_token_timeout():
+    # The local first-event watchdog (src/llm_core.py) reads this from the
+    # process environment, so a Docker install can only reach it when the
+    # compose files forward it from the host .env.
+    for path in COMPOSE_FILES:
+        assert "ODYSSEUS_FIRST_TOKEN_TIMEOUT" in _compose_env_names(path), path.name
+
+
 def test_default_compose_files_do_not_mount_host_docker_socket():
     for path in COMPOSE_FILES:
         text = path.read_text(encoding="utf-8")

tests/test_document_export_zip_filenames.py

@@ -0,0 +1,96 @@
+"""ZIP exports keep language extensions and place collision suffixes before them."""
+import io
+import zipfile
+
+import pytest
+from fastapi import FastAPI, Request
+from fastapi.testclient import TestClient
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+
+from core.database import Base, Document
+from routes.document import document_routes
+
+
+@pytest.fixture
+def exports(tmp_path, monkeypatch):
+    engine = create_engine(f"sqlite:///{tmp_path / 'documents.db'}", connect_args={"check_same_thread": False})
+    Base.metadata.create_all(engine)
+    factory = sessionmaker(bind=engine)
+    monkeypatch.setattr(document_routes, "SessionLocal", factory)
+    monkeypatch.setenv("AUTH_ENABLED", "true")
+    app = FastAPI()
+
+    @app.middleware("http")
+    async def fixture_user(request: Request, call_next):
+        request.state.current_user = "alice"
+        return await call_next(request)
+
+    app.include_router(document_routes.setup_document_routes(None))
+
+    def add(doc_id, title, language, content="body\n", owner="alice"):
+        with factory() as db:
+            db.add(Document(id=doc_id, title=title, language=language,
+                            current_content=content, owner=owner, is_active=True))
+            db.commit()
+
+    with TestClient(app) as client:
+        yield client, add
+    engine.dispose()
+
+
+@pytest.mark.parametrize("title,language,filename", [
+    ("config.local", "python", "config.local.py"),
+    ("report.v2", "markdown", "report.v2.md"),
+    ("data.2024", "json", "data.2024.json"),
+    ("module.ts", "typescript", "module.ts"),
+    ("SCRIPT.PY", "python", "SCRIPT.PY"),
+    ("résumé.v2", "text", "résumé.v2.txt"),
+    ("unknown.v2", "unknown", "unknown.v2.txt"),
+    ("draft", None, "draft.txt"),
+    ("project/report.v2", "markdown", "projectreport.v2.md"),
+])
+def test_export_uses_the_language_extension_even_for_dotted_titles(exports, title, language, filename):
+    client, add = exports
+    body = "Original text: α\n"
+    add("doc", title, language, body)
+    response = client.post("/api/documents/export-zip", json={"ids": ["doc"]})
+    assert response.status_code == 200
+    assert response.headers["content-type"] == "application/zip"
+    with zipfile.ZipFile(io.BytesIO(response.content)) as archive:
+        assert archive.namelist() == [filename]
+        assert archive.read(filename).decode() == body
+
+
+@pytest.mark.parametrize("title", ["config.local", "config.local.py"])
+def test_duplicate_names_keep_the_extension_at_the_end(exports, title):
+    client, add = exports
+    for i in range(3):
+        add(str(i), title, "python", f"body {i}")
+    response = client.post("/api/documents/export-zip", json={"ids": ["0", "1", "2"]})
+    assert response.status_code == 200
+    with zipfile.ZipFile(io.BytesIO(response.content)) as archive:
+        assert set(archive.namelist()) == {"config.local.py", "config.local-1.py", "config.local-2.py"}
+        assert {archive.read(name).decode() for name in archive.namelist()} == {"body 0", "body 1", "body 2"}
+
+
+def test_added_extension_collides_safely_with_an_existing_extension(exports):
+    client, add = exports
+    add("a", "report.v2", "markdown", "first")
+    add("b", "report.v2.md", "markdown", "second")
+    response = client.post("/api/documents/export-zip", json={"ids": ["a", "b"]})
+    assert response.status_code == 200
+    with zipfile.ZipFile(io.BytesIO(response.content)) as archive:
+        assert set(archive.namelist()) == {"report.v2.md", "report.v2-1.md"}
+        assert {archive.read(name) for name in archive.namelist()} == {b"first", b"second"}
+
+
+def test_foreign_documents_are_still_excluded_and_email_body_is_preserved(exports):
+    client, add = exports
+    add("owned", "reply.v2", "email", "Subject: Hello\n---\nBody")
+    add("foreign", "private", "python", "secret", owner="bob")
+    response = client.post("/api/documents/export-zip", json={"ids": ["owned", "foreign"]})
+    assert response.status_code == 200
+    with zipfile.ZipFile(io.BytesIO(response.content)) as archive:
+        assert archive.namelist() == ["reply.v2.eml"]
+        assert archive.read("reply.v2.eml") == b"Subject: Hello\r\n\r\nBody"

tests/test_document_library_literal_search.py

@@ -0,0 +1,74 @@
+"""Literal punctuation in library queries must not become SQL wildcards."""
+
+from types import SimpleNamespace
+from unittest.mock import MagicMock
+
+import pytest
+
+from core.database import Document
+from routes.document import document_routes
+from tests.helpers.database import disposable_database
+
+
+CASES = [
+    ("100%", "100% complete", "1000 complete"),
+    ("a_b", "a_b", "axb"),
+    ("%", "price 10%", "price 100"),
+    ("_", "a_b", "axb"),
+    (r"path\notes", r"path\notes", "pathnotes"),
+    (r"path\_tag", r"path\_tag", r"path\Xtag"),
+    ("50%_done", "50%_done", "500Xdone"),
+    ("can't", "can't stop", "cannot stop"),
+    ("mixed case", "Case ordered Mixed", "Mixed without"),
+]
+
+
+@pytest.mark.parametrize("column", ["title", "current_content"])
+@pytest.mark.parametrize("query,literal,lookalike", CASES)
+@pytest.mark.asyncio
+async def test_library_search_matches_literal_tokens(tmp_path, monkeypatch, column, query, literal, lookalike):
+    with disposable_database(tmp_path) as factory:
+        monkeypatch.setattr(document_routes, "SessionLocal", factory)
+        with factory() as db:
+            for doc_id, text, owner, active, archived in [
+                ("literal", literal, "alice", True, False),
+                ("lookalike", lookalike, "alice", True, False),
+                ("foreign", literal, "bob", True, False),
+                ("inactive", literal, "alice", False, False),
+                ("archived", literal, "alice", True, True),
+            ]:
+                fields = {"title": "Document", "current_content": "Body", column: text}
+                db.add(Document(id=doc_id, owner=owner, is_active=active, archived=archived,
+                                language="text", version_count=1, **fields))
+            db.commit()
+        router = document_routes.setup_document_routes(MagicMock())
+        endpoint = next(r.endpoint for r in router.routes if r.path == "/api/documents/library")
+        request = SimpleNamespace(state=SimpleNamespace(current_user="alice"))
+        result = await endpoint(request, search=query, language=None, sort="recent", offset=0, limit=20, archived=False)
+        assert result["total"] == 1
+        assert [row["id"] for row in result["documents"]] == ["literal"]
+        archived = await endpoint(request, search=query, language=None, sort="recent", offset=0, limit=20, archived=True)
+        assert [row["id"] for row in archived["documents"]] == ["archived"]
+
+
+@pytest.mark.asyncio
+async def test_literal_search_keeps_cross_field_and_pagination_behavior(tmp_path, monkeypatch):
+    with disposable_database(tmp_path) as factory:
+        monkeypatch.setattr(document_routes, "SessionLocal", factory)
+        with factory() as db:
+            for doc_id, title, content in [
+                ("first", "100% ready", "done"),
+                ("second", "done", "100% ready"),
+                ("lookalike", "1000 ready", "done"),
+                ("missing-term", "100% ready", "waiting"),
+            ]:
+                db.add(Document(id=doc_id, owner="alice", title=title, current_content=content,
+                                is_active=True, archived=False, language="text", version_count=1))
+            db.commit()
+        router = document_routes.setup_document_routes(MagicMock())
+        endpoint = next(r.endpoint for r in router.routes if r.path == "/api/documents/library")
+        request = SimpleNamespace(state=SimpleNamespace(current_user="alice"))
+        results = [await endpoint(request, search="100% done", language="text", sort="alpha",
+                                  offset=offset, limit=1, archived=False) for offset in [0, 1]]
+        assert all(result["total"] == 2 for result in results)
+        assert {row["id"] for result in results for row in result["documents"]} == {"first", "second"}

tests/test_editor_brush_more_menu.py

@@ -29,8 +29,10 @@ 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-softness-row"'):
+                   'id="ge-brush-flow-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():
@@ -98,7 +100,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; }" in CSS
+    assert ".ge-controls--in-options #ge-brush-controls { flex: 0 0 auto; flex-direction: row;" 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,9 +44,11 @@ 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 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
+    # 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
 
 
 def test_sw_cache_is_bumped():

tests/test_editor_generation_model_routing.py

@@ -0,0 +1,500 @@
+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,10 +49,9 @@ 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")
-    # Photoshop-style chord: reuse the Image menu row so the dialog and the
-    # adjustment-layer plumbing stay in one place.
+    # Open layer-local controls without creating/committing a new adjustment layer.
     assert "e.altKey && e.code === 'KeyL'" in keyboard
-    assert "document.querySelector('[data-image-action=\"adj-levels\"]')" in keyboard
+    assert "openLayerAdjustment?.('levels');" in keyboard
 
 
 def test_ctrl_alt_shift_e_stamps_the_visible_layers():

tests/test_editor_layer_scoped_actions_browser.py

@@ -0,0 +1,992 @@
+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_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 "if (state.tool !== 'lasso' && state.tool !== 'crop') return;" in CE
-    assert "(state.tool === 'lasso' || state.tool === 'crop') && !directPan" in CE
+    assert "['marquee', 'lasso', 'crop'].includes(state.tool)" in CE
+    assert "if (canStartOutside() && !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,13 +32,12 @@ def test_preflight_module_has_the_four_setup_steps():
     assert "required ready" in src
 
 
-def test_preflight_is_wired_into_the_editor():
+def test_editor_uses_ai_settings_without_redundant_setup():
     editor = _read("static/js/galleryEditor.js")
-    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
+    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
 
 
 def test_ai_models_exposes_status_for_the_checklist():