chore(deps): bump the actions group across 1 directory with 13 updates

Bumps the actions group with 13 updates in the / directory: | Package | From | To | | --- | --- | --- | | [actions/setup-python](https://github.com/actions/setup-python) | `7.0.0` | `7.1.0` | | [actions/setup-node](https://github.com/actions/setup-node) | `7.0.0` | `7.1.0` | | [astral-sh/setup-uv](https://github.com/astral-sh/setup-uv) | `10.2.0` | `10.3.3` | | [github/codeql-action/init](https://github.com/github/codeql-action) | `4.37.7` | `4.39.1` | | [github/codeql-action/analyze](https://github.com/github/codeql-action) | `4.37.7` | `4.39.1` | | [hadolint/hadolint-action](https://github.com/hadolint/hadolint-action) | `3.4.0` | `3.5.0` | | [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) | `4.3.0` | `4.4.1` | | [docker/build-push-action](https://github.com/docker/build-push-action) | `7.3.0` | `7.4.0` | | [github/codeql-action/upload-sarif](https://github.com/github/codeql-action) | `4.37.7` | `4.39.1` | | [actions/deploy-pages](https://github.com/actions/deploy-pages) | `5.0.0` | `5.0.1` | | [docker/login-action](https://github.com/docker/login-action) | `4.6.0` | `4.7.0` | | [actions/upload-artifact](https://github.com/actions/upload-artifact) | `7.0.1` | `7.0.2` | | [actions/download-artifact](https://github.com/actions/download-artifact) | `8.0.1` | `8.0.2` | Updates `actions/setup-python` from 7.0.0 to 7.1.0 - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/5fda3b95a4ea91299a34e894583c3862153e4b97...6d4fd22b20465ccc0f7354476588e8df7c9ca0e0) Updates `actions/setup-node` from 7.0.0 to 7.1.0 - [Release notes](https://github.com/actions/setup-node/releases) - [Commits](https://github.com/actions/setup-node/compare/820762786026740c76f36085b0efc47a31fe5020...949feb2413d6458794dcd2491c4babbbce0c15c1) Updates `astral-sh/setup-uv` from 10.2.0 to 10.3.3 - [Release notes](https://github.com/astral-sh/setup-uv/releases) - [Commits](https://github.com/astral-sh/setup-uv/compare/c18668ad3cf93ea998bef934396af7bb5c839dc7...68559e99cc807c1eb7e9238fd43a15bba460eec2) Updates `github/codeql-action/init` from 4.37.7 to 4.39.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd...9b3254085494b55a0f7c4c2b3d2d52cc712ce370) Updates `github/codeql-action/analyze` from 4.37.7 to 4.39.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd...9b3254085494b55a0f7c4c2b3d2d52cc712ce370) Updates `hadolint/hadolint-action` from 3.4.0 to 3.5.0 - [Release notes](https://github.com/hadolint/hadolint-action/releases) - [Commits](https://github.com/hadolint/hadolint-action/compare/2a66e89f53d0771bb131a7fa31f3136336094aa6...06be81baf89a55ffd0e24b8f04a4185738dd3387) Updates `docker/setup-buildx-action` from 4.3.0 to 4.4.1 - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/37fe631027851001ddb9b187196cc803df7f5f0e...f87e5991a6d7451dcb8d9637bfbc97413f497069) Updates `docker/build-push-action` from 7.3.0 to 7.4.0 - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/53b7df96c91f9c12dcc8a07bcb9ccacbed38856a...c3c9e263c25d99ce0380d002d59b67737d91b0dc) Updates `github/codeql-action/upload-sarif` from 4.37.7 to 4.39.1 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](https://github.com/github/codeql-action/compare/ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd...9b3254085494b55a0f7c4c2b3d2d52cc712ce370) Updates `actions/deploy-pages` from 5.0.0 to 5.0.1 - [Release notes](https://github.com/actions/deploy-pages/releases) - [Commits](https://github.com/actions/deploy-pages/compare/cd2ce8fcbc39b97be8ca5fce6e763baed58fa128...368f82528645a54fb793d4d04e342629a3f51346) Updates `docker/login-action` from 4.6.0 to 4.7.0 - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/dbcb813823bdd20940b903addbd779551569679f...81c6f93d4bc991e510b342a00b419b3bb4efc5c6) Updates `actions/upload-artifact` from 7.0.1 to 7.0.2 - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/043fb46d1a93c77aae656e7c1c64a875d1fc6a0a...cf430e030ddbb5b0abf93d22962f4752f3646cd9) Updates `actions/download-artifact` from 8.0.1 to 8.0.2 - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c...9000827ccba6bdab643e8b6fd33ac0654aef8333) --- updated-dependencies: - dependency-name: actions/deploy-pages dependency-version: 5.0.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: actions/download-artifact dependency-version: 8.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: actions/setup-node dependency-version: 7.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: actions/setup-python dependency-version: 7.1.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: actions/upload-artifact dependency-version: 7.0.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: actions - dependency-name: astral-sh/setup-uv dependency-version: 10.3.2 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: docker/build-push-action dependency-version: 7.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: docker/login-action dependency-version: 4.7.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: docker/setup-buildx-action dependency-version: 4.4.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: github/codeql-action/analyze dependency-version: 4.39.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: github/codeql-action/init dependency-version: 4.39.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: github/codeql-action/upload-sarif dependency-version: 4.39.1 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions - dependency-name: hadolint/hadolint-action dependency-version: 3.5.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: actions ... Signed-off-by: dependabot[bot] <support@github.com>
fix(editor): stabilize image generation, layer editing and controls (#6992 )
2026-11-01 10:42:23 +01:00 · 2026-11-01 03:04:28 +00:00 · 2026-11-01 02:56:46 +00:00 · 2026-11-01 02:47:32 +00:00 · 2026-11-01 02:28:58 +00:00 · 2026-11-01 02:03:06 +00:00
140 changed files with 6416 additions and 2309 deletions
@@ -1,17 +0,0 @@
 """Reject skipped/empty native CI runs without conflating driver child counts."""
 import argparse
 from pathlib import Path
 import xml.etree.ElementTree as ET
 parser = argparse.ArgumentParser(description=__doc__)
 parser.add_argument('report', type=Path)
 parser.add_argument('--minimum', type=int, required=True)
 args = parser.parse_args()
 root = ET.parse(args.report).getroot()
 cases = list(root.iter('testcase'))
 if len(cases) < args.minimum:
    raise SystemExit(f'Incomplete execution: {len(cases)} cases, expected at least {args.minimum}')
 for case in cases:
    if any(case.find(tag) is not None for tag in ('skipped', 'failure', 'error')):
        raise SystemExit(f'Case did not pass: {case.get("classname")}::{case.get("name")}')
 print(f'Verified {len(cases)} executed cases; no skipped, failed or errored cases')
@@ -1,46 +0,0 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { spawnSync } from 'node:child_process';
 import { parse } from 'acorn';
 const root = fileURLToPath(new URL('../../', import.meta.url));
 const manifest = JSON.parse(fs.readFileSync(path.join(root, 'tests/native-ci-manifest.json'), 'utf8'));
 function files(directory) {
  return fs.readdirSync(directory, { withFileTypes: true }).flatMap(entry => {
    const target = path.join(directory, entry.name);
    return entry.isDirectory() ? files(target) : /\.(?:mjs|cjs|js)$/.test(entry.name) ? [target] : [];
  });
 }
 function importsNativeTest(node) {
  if (!node || typeof node !== 'object') return false;
  if (node.type === 'ImportDeclaration' && node.source.value === 'node:test') return true;
  if (node.type === 'CallExpression' && node.callee.name === 'require' && node.arguments[0]?.value === 'node:test') return true;
  return Object.values(node).some(value => Array.isArray(value) ? value.some(importsNativeTest) : importsNativeTest(value));
 }
 const discovered = files(path.join(root, 'tests')).filter(file => {
  const source = fs.readFileSync(file, 'utf8');
  return source.includes('node:test') && importsNativeTest(parse(source, { ecmaVersion: 'latest', sourceType: 'module' }));
 }).map(file => path.relative(root, file).split(path.sep).join('/')).sort();
 const assigned = Object.values(manifest).flatMap(group => Array.isArray(group) ? group : Object.keys(group));
 if (new Set(assigned).size !== assigned.length || JSON.stringify([...assigned].sort()) !== JSON.stringify(discovered)) {
  throw new Error('Native test coverage must be exhaustive and disjoint; update tests/native-ci-manifest.json for added, removed or duplicated files');
 }
 for (const wrappers of Object.values(manifest['python-ci'])) {
  for (const wrapper of wrappers) if (!fs.existsSync(path.join(root, wrapper))) throw new Error(`Missing pytest wrapper: ${wrapper}`);
 }
 if (process.argv.includes('--list')) {
  console.log(JSON.stringify({ discovered, runners: manifest }, null, 2));
 } else {
  const reports = path.join(root, 'test-results/native-node');
  fs.mkdirSync(reports, { recursive: true });
  const result = spawnSync(process.execPath, ['--test', '--test-concurrency=1',
    '--test-reporter=spec', '--test-reporter-destination=stdout',
    '--test-reporter=junit', `--test-reporter-destination=${path.join(reports, 'junit.xml')}`,
    ...manifest['native-ci']], {
    cwd: root, stdio: 'inherit',
    env: { ...process.env, ENDPOINT_URL: 'http://127.0.0.1:1' },
  });
  if (result.error) throw result.error;
  process.exitCode = result.status ?? 1;
 }
@@ -1,465 +0,0 @@
 #!/usr/bin/env python3
 """Fail-closed independent verification and sanitization gate for test diagnostics.
 Runs after test suite completion or abnormal runner termination (e.g. failures, timeouts, crashes).
 Ensures that no unsanitized traces, raw credentials, temporary archives, or unauthorized
 diagnostics can ever be published as CI artifacts, while preserving safe JUnit XML reporting.
 """
 from __future__ import annotations
 import argparse
 import json
 import logging
 import os
 import re
 import shutil
 import sys
 import tempfile
 import xml.etree.ElementTree as ET
 from pathlib import Path
 # Add repository root to Python path to import sanitizer
 REPO_ROOT = Path(__file__).resolve().parents[2]
 if str(REPO_ROOT) not in sys.path:
    sys.path.insert(0, str(REPO_ROOT))
 try:
    from scripts.sanitize_trace_artifacts import sanitize_trace_archive
 except ImportError:
    # If import fails, define fail-closed fallback
    def sanitize_trace_archive(zp: str) -> bool:
        p = Path(zp)
        if p.exists():
            try:
                p.unlink(missing_ok=True)
            except OSError:
                pass
        return False
 logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
 logger = logging.getLogger("verify_sanitized_artifacts")
 PNG_MAGIC = b"\x89PNG\r\n\x1a\n"
 ALLOWED_JUNIT_ROOT_TAGS = frozenset({"testsuites", "testsuite"})
 ALLOWED_PUBLISHED_JUNIT_TAGS = frozenset({"testsuites", "testsuite", "testcase", "failure", "error", "skipped"})
 DISALLOWED_JUNIT_TAGS = frozenset({"properties", "property", "system-out", "system-err"})
 ALLOWED_ATTRIBUTES_BY_TAG = {
    "testsuites": frozenset({"name", "tests", "failures", "errors", "skipped", "time", "id", "disabled"}),
    "testsuite": frozenset({
        "name", "tests", "failures", "errors", "skipped", "time", "timestamp", "hostname",
        "id", "package", "disabled", "file"
    }),
    "testcase": frozenset({"name", "classname", "time", "file", "line", "assertions", "status"}),
    "failure": frozenset({"message", "type"}),
    "error": frozenset({"message", "type"}),
    "skipped": frozenset({"message", "type"}),
 }
 SAFE_SKIPPED_STATUSES = frozenset({"skipped", "todo", "ignored", "disabled", "pending", "omitted", "test skipped"})
 SENSITIVE_KEY_PATTERN = re.compile(
    r"(?i)(password|passwd|secret|token|api_key|apikey|access_token|refresh_token|"
    r"private_key|auth_token|client_secret|session|session_id|sid|csrf|xsrf|jwt|credential|authorization)"
 )
 SECRET_REDACTION_PATTERNS = [
    # 1. Authorization headers (Bearer / Basic)
    re.compile(r"(?i)\b(bearer|basic)\s+([^\s,;\'\"<>]+)"),
    # 2. Sensitive key-value pairs (key=value or key: value)
    re.compile(
        r"(?i)\b([a-z0-9_.-]*(?:password|passwd|secret|token|api_key|apikey|access_token|refresh_token|"
        r"auth_token|client_secret|session|session_id|sid|csrf|xsrf|jwt|credential|authorization)[a-z0-9_.-]*)"
        r"\s*([:=])\s*([^\s,;\'\"<>]+)"
    ),
    # 3. URL credentials (scheme://user:pass@host)
    re.compile(r"([a-zA-Z][a-zA-Z0-9+.-]*://[^:\s]+):([^@\s]+)@"),
    # 4. JSON-formatted key-value pairs
    re.compile(
        r'(?i)("?(?:[a-z0-9_.-]*(?:password|passwd|secret|token|key|auth)[a-z0-9_.-]*)"?\s*:\s*")([^"]+)(")'
    ),
    # 5. Synthetic secret keywords or tokens
    re.compile(r"(?i)\b[a-z0-9_.-]*synthetic[-_]?[a-z0-9_.-]*\b"),
 ]
 def safe_remove(filepath: str | Path) -> bool:
    """Safely remove a file or directory fail-closed.
    Returns True if the target does not exist or was successfully removed.
    Returns False if removal failed and the target still exists on disk.
    """
    p = Path(filepath)
    if not p.exists():
        return True
    try:
        if p.is_dir():
            shutil.rmtree(p, ignore_errors=False)
        else:
            p.unlink(missing_ok=True)
    except OSError as exc:
        logger.error("Failed to delete unauthorized file %s: %s", filepath, exc)
        return False
    if p.exists():
        logger.error("Target %s still exists on disk after deletion attempt", filepath)
        return False
    return True
 def sanitize_text_content(text: str) -> tuple[str, bool]:
    """Scrub sensitive credentials, tokens, and synthetic secrets from text."""
    if not text or not isinstance(text, str):
        return text, False
    modified = False
    out = text
    # 1. Replace Bearer / Basic tokens
    def _sub_auth(m: re.Match) -> str:
        nonlocal modified
        modified = True
        return f"{m.group(1)} [REDACTED]"
    out = SECRET_REDACTION_PATTERNS[0].sub(_sub_auth, out)
    # 2. Replace key-value pairs
    def _sub_kv(m: re.Match) -> str:
        nonlocal modified
        modified = True
        return f"{m.group(1)}{m.group(2)}[REDACTED]"
    out = SECRET_REDACTION_PATTERNS[1].sub(_sub_kv, out)
    # 3. Replace URL credentials
    def _sub_url(m: re.Match) -> str:
        nonlocal modified
        modified = True
        return f"{m.group(1)}:[REDACTED]@"
    out = SECRET_REDACTION_PATTERNS[2].sub(_sub_url, out)
    # 4. Replace JSON key-value secrets
    def _sub_json(m: re.Match) -> str:
        nonlocal modified
        modified = True
        return f"{m.group(1)}[REDACTED]{m.group(3)}"
    out = SECRET_REDACTION_PATTERNS[3].sub(_sub_json, out)
    # 5. Replace synthetic secret markers
    def _sub_synthetic(m: re.Match) -> str:
        nonlocal modified
        modified = True
        return "[REDACTED]"
    out = SECRET_REDACTION_PATTERNS[4].sub(_sub_synthetic, out)
    return out, modified
 def prune_and_sanitize_junit_element(elem: ET.Element) -> bool:
    """Recursively enforce restrictive published-JUnit representation.
    Removes properties, property entries, system-out, system-err, and any
    unnecessary free-form content. Preserves test identities, counts, outcomes,
    and safe failure classifications.
    Returns True if any modifications were made.
    """
    modified = False
    # 1. Prune child elements not permitted in restrictive published representation
    for child in list(elem):
        tag_lower = child.tag.lower()
        if tag_lower in DISALLOWED_JUNIT_TAGS or tag_lower not in ALLOWED_PUBLISHED_JUNIT_TAGS:
            elem.remove(child)
            modified = True
        else:
            if prune_and_sanitize_junit_element(child):
                modified = True
    tag_lower = elem.tag.lower()
    # 2. Prune attributes not permitted in restrictive published representation
    allowed_attrs = ALLOWED_ATTRIBUTES_BY_TAG.get(tag_lower, frozenset())
    for attr_name in list(elem.attrib.keys()):
        attr_lower = attr_name.lower()
        if attr_lower not in allowed_attrs:
            del elem.attrib[attr_name]
            modified = True
        elif tag_lower == "skipped":
            val = elem.attrib[attr_name].strip()
            if val.lower() in SAFE_SKIPPED_STATUSES:
                if elem.attrib[attr_name] != val.lower():
                    elem.attrib[attr_name] = val.lower()
                    modified = True
            else:
                elem.attrib[attr_name] = "skipped"
                modified = True
        else:
            val = elem.attrib[attr_name]
            if isinstance(val, str):
                new_val, changed = sanitize_text_content(val)
                if changed:
                    elem.attrib[attr_name] = new_val
                    modified = True
    # 3. Handle text content: structural and skipped elements do not carry free-form text
    if tag_lower in ("testsuites", "testsuite", "testcase", "skipped"):
        if elem.text:
            elem.text = None
            modified = True
    elif tag_lower in ("failure", "error"):
        if elem.text:
            new_text, changed = sanitize_text_content(elem.text)
            if changed:
                elem.text = new_text
                modified = True
    # 4. Clean up tails: strip any non-whitespace characters from tails to prevent leaks
    if elem.tail and elem.tail.strip():
        cleaned_tail = re.sub(r"\S+", "", elem.tail)
        if cleaned_tail != elem.tail:
            elem.tail = cleaned_tail
            modified = True
    return modified
 def sanitize_and_verify_junit_xml(filepath: str | Path) -> bool:
    """Verify that an XML file is an authentic JUnit report and enforce published representation.
    Returns True if the XML file is a valid recognized JUnit report and was safely sanitized.
    Returns False if the file is invalid, unrecognized, corrupted, or failed sanitization.
    """
    p = Path(filepath)
    name_lower = p.name.lower()
    # 1. Filename restriction: must match standard JUnit report naming
    if not (name_lower == "junit.xml" or name_lower == "browser-junit.xml" or name_lower.endswith("-junit.xml") or name_lower.endswith(".junit.xml")):
        logger.warning("Unrecognized XML report filename %s; not an authorized JUnit report", filepath)
        return False
    # 2. Parse XML
    try:
        tree = ET.parse(p)
    except Exception as exc:
        logger.warning("Corrupted XML report %s: %s", filepath, exc)
        return False
    root = tree.getroot()
    # 3. Root tag restriction
    if root.tag.lower() not in ALLOWED_JUNIT_ROOT_TAGS:
        logger.warning("XML report %s has invalid root element <%s>; not a JUnit report", filepath, root.tag)
        return False
    # 4. Enforce restrictive published representation on root and all descendants
    prune_and_sanitize_junit_element(root)
    # 5. Normalize and rewrite sanitized report
    try:
        tree.write(str(p), encoding="utf-8", xml_declaration=True)
        # Verify rewritten XML parses cleanly
        ET.parse(p)
    except Exception as exc:
        logger.error("Failed to write sanitized XML report %s: %s", filepath, exc)
        return False
    return True
 def is_valid_disposable_ci_fixture(target_dir: str | Path | None = None) -> bool:
    """Verify that execution ran inside an authorized disposable synthetic fixture."""
    is_ci = bool(os.environ.get("CI") or os.environ.get("GITHUB_ACTIONS"))
    if not is_ci:
        # Local runs require explicit trace opt-in
        trace_opt_in = os.environ.get("PLAYWRIGHT_ENABLE_TRACE", "").lower() in ("1", "true")
        return trace_opt_in
    if os.environ.get("ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS") != "1":
        return False
    if os.environ.get("PHOTO_EDITOR_E2E_AUTH") == "0":
        return False
    allowed_tmp = [os.path.abspath(p) for p in (tempfile.gettempdir(), "/tmp", "/var/tmp")]
    # Check 1: Verify fixture ownership via PHOTO_EDITOR_E2E_DATA_DIR
    data_dir = os.environ.get("PHOTO_EDITOR_E2E_DATA_DIR")
    if data_dir:
        resolved = os.path.abspath(data_dir)
        base_name = os.path.basename(resolved)
        is_tmp = any(resolved.startswith(b + os.sep) or resolved == b for b in allowed_tmp)
        if base_name.startswith("odysseus-photo-editor-e2e-") and is_tmp:
            expected_db = os.path.join(resolved, "app.db")
            db_path = os.environ.get("PHOTO_EDITOR_E2E_DB_PATH")
            if not db_path or db_path == expected_db:
                marker_path = os.path.join(resolved, ".disposable-ci-fixture.json")
                if os.path.exists(marker_path):
                    try:
                        with open(marker_path, "r", encoding="utf-8") as f:
                            fixture = json.load(f)
                            if (
                                fixture.get("synthetic") is True
                                and fixture.get("authenticated") is True
                                and fixture.get("database") == expected_db
                            ):
                                return True
                    except Exception:
                        pass
    # Check 2: Verify fixture proof in target_dir if provided
    if target_dir:
        target_marker = os.path.join(str(target_dir), ".disposable-ci-fixture.json")
        if os.path.exists(target_marker):
            try:
                with open(target_marker, "r", encoding="utf-8") as f:
                    fixture = json.load(f)
                    db_in_fixture = fixture.get("database", "")
                    resolved_db = os.path.abspath(db_in_fixture)
                    db_dir = os.path.dirname(resolved_db)
                    db_base = os.path.basename(db_dir)
                    is_tmp = any(db_dir.startswith(b + os.sep) or db_dir == b for b in allowed_tmp)
                    if (
                        fixture.get("synthetic") is True
                        and fixture.get("authenticated") is True
                        and db_base.startswith("odysseus-photo-editor-e2e-")
                        and is_tmp
                        and os.path.basename(resolved_db) == "app.db"
                    ):
                        return True
            except Exception:
                pass
    return False
 def verify_and_sanitize_artifacts(target_dir: str) -> bool:
    """Independently verify and sanitize diagnostics fail-closed, preserving safe JUnit XML.
    Returns True if verification succeeded and artifacts are safe for publication.
    Returns False if verification failed or deletion could not be confirmed.
    """
    if not os.path.exists(target_dir):
        logger.info("Target directory %s does not exist; nothing to sanitize.", target_dir)
        return True
    disposable_ci = is_valid_disposable_ci_fixture(target_dir)
    preserved_xmls = 0
    sanitized_archives = 0
    purged_files = 0
    overall_success = True
    try:
        for root, dirs, files in os.walk(target_dir, topdown=False):
            for filename in files:
                filepath = os.path.join(root, filename)
                name_lower = filename.lower()
                # Cleanup disposable fixture marker so it is not published
                if filename == ".disposable-ci-fixture.json":
                    if not safe_remove(filepath):
                        overall_success = False
                    continue
                # 1. XML reports: verify JUnit structure and sanitize credentials
                if name_lower.endswith(".xml"):
                    if sanitize_and_verify_junit_xml(filepath):
                        preserved_xmls += 1
                        continue
                    else:
                        logger.warning("Rejecting invalid/unrecognized XML report %s; purging fail-closed", filepath)
                        if not safe_remove(filepath):
                            overall_success = False
                        purged_files += 1
                        continue
                # 2. Check if diagnostics are authorized (disposable synthetic fixture)
                if not disposable_ci:
                    logger.info("Purging diagnostic artifact %s (disposable CI fixture not verified)", filepath)
                    if not safe_remove(filepath):
                        overall_success = False
                    purged_files += 1
                    continue
                # 3. Disposable CI is authorized: enforce strict sanitization
                if name_lower.endswith(".zip"):
                    ok = sanitize_trace_archive(filepath)
                    if ok and os.path.exists(filepath):
                        sanitized_archives += 1
                    else:
                        logger.warning("Trace archive %s failed sanitization; purging fail-closed", filepath)
                        if not safe_remove(filepath):
                            overall_success = False
                        purged_files += 1
                elif name_lower.endswith(".png"):
                    # Validate PNG magic bytes to ensure not a secret payload disguised as an image
                    is_png = False
                    try:
                        with open(filepath, "rb") as pf:
                            header = pf.read(8)
                            if header == PNG_MAGIC:
                                is_png = True
                    except Exception:
                        is_png = False
                    if is_png:
                        continue
                    logger.warning("Invalid or suspicious screenshot %s; purging fail-closed", filepath)
                    if not safe_remove(filepath):
                        overall_success = False
                    purged_files += 1
                else:
                    # Purge any .tmp, .har, .db, .sqlite, .log or unrecognized files
                    logger.info("Purging unauthorized diagnostic file %s", filepath)
                    if not safe_remove(filepath):
                        overall_success = False
                    purged_files += 1
            # Remove empty subdirectories
            for d in dirs:
                dirpath = os.path.join(root, d)
                try:
                    if not os.listdir(dirpath):
                        os.rmdir(dirpath)
                except OSError:
                    pass
        if not overall_success:
            logger.error("Verification failed: one or more unauthorized files could not be purged.")
            return False
        logger.info(
            "Artifact verification complete for %s: preserved %d XML reports, sanitized %d archives, purged %d files.",
            target_dir,
            preserved_xmls,
            sanitized_archives,
            purged_files,
        )
        return True
    except Exception as exc:
        logger.error("Unexpected error during artifact verification: %s; purging all non-XML files fail-closed", exc)
        try:
            for p in Path(target_dir).rglob("*"):
                if p.is_file() and not p.name.lower().endswith(".xml"):
                    safe_remove(p)
        except Exception:
            pass
        return False
 def main() -> None:
    parser = argparse.ArgumentParser(description=__doc__)
    parser.add_argument("target_dir", nargs="?", default="test-results", help="Directory containing test results")
    args = parser.parse_args()
    ok = verify_and_sanitize_artifacts(args.target_dir)
    sys.exit(0 if ok else 1)
 if __name__ == "__main__":
    main()
@@ -76,7 +76,7 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
        with:
          persist-credentials: false
-      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
+      - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0  # v7.1.0
        with:
          python-version: "3.11"
      # Byte-compile sources — catches syntax errors without installing deps.
@@ -91,7 +91,7 @@ jobs:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1  # v7.0.1
        with:
          persist-credentials: false
-      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020  # v7.0.0
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1  # v7.1.0
        with:
          node-version: "22.23.4"
      - run: npm ci --ignore-scripts --no-audit --no-fund
@@ -151,7 +151,7 @@ jobs:
            echo "docs_only=false" >> "$GITHUB_OUTPUT"
          fi
-      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
+      - uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0  # v7.1.0
        if: steps.docs-check.outputs.docs_only != 'true'
        with:
          python-version: "3.11"
@@ -168,7 +168,7 @@ jobs:
      # uv resolves the same versions as pip but installs ~5x faster, and its
      # cache keeps each shard from re-downloading the whole requirement set.
-      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7  # v10.2.0
+      - uses: astral-sh/setup-uv@68559e99cc807c1eb7e9238fd43a15bba460eec2  # v10.3.3
        if: steps.docs-check.outputs.docs_only != 'true'
        with:
          version: "0.13.5"
@@ -179,8 +179,9 @@ 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
+      - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1  # v7.1.0
        if: steps.docs-check.outputs.docs_only != 'true'
        with:
          node-version: "22.23.4"
@@ -31,11 +31,11 @@ jobs:
        with:
          persist-credentials: false
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd  # v4.37.7
+        uses: github/codeql-action/init@9b3254085494b55a0f7c4c2b3d2d52cc712ce370  # v4.39.1
        with:
          languages: ${{ matrix.language }}
          build-mode: none
      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd  # v4.37.7
+        uses: github/codeql-action/analyze@9b3254085494b55a0f7c4c2b3d2d52cc712ce370  # v4.39.1
        with:
          category: "/language:${{ matrix.language }}"
@@ -42,7 +42,7 @@ jobs:
          persist-credentials: false
      - name: Lint Dockerfile
-        uses: hadolint/hadolint-action@2a66e89f53d0771bb131a7fa31f3136336094aa6  # v3.4.0
+        uses: hadolint/hadolint-action@06be81baf89a55ffd0e24b8f04a4185738dd3387  # v3.5.0
        with:
          dockerfile: Dockerfile
          # DL3008: pinning apt package versions is impractical on a -slim base
@@ -61,14 +61,14 @@ jobs:
          persist-credentials: false
      - name: Set up Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e  # v4.3.0
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069  # v4.4.1
        with:
          driver: docker
      # Build without pushing so a broken Dockerfile is caught here, and the
      # exact image we ship is what gets scanned.
      - name: Build image
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a  # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc  # v7.4.0
        with:
          context: .
          push: false
@@ -107,12 +107,12 @@ jobs:
          persist-credentials: false
      - name: Set up Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e  # v4.3.0
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069  # v4.4.1
        with:
          driver: docker
      - name: Build image
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a  # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc  # v7.4.0
        with:
          context: .
          push: false
@@ -133,7 +133,7 @@ jobs:
          TRIVY_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-db:2
      - name: Upload Trivy results
-        uses: github/codeql-action/upload-sarif@ff2f1c621b7f889edc0d3c761ac2e6a3f8cdb0dd  # v4.37.7
+        uses: github/codeql-action/upload-sarif@9b3254085494b55a0f7c4c2b3d2d52cc712ce370  # v4.39.1
        with:
          sarif_file: trivy-results.sarif
          category: trivy-image
@@ -63,7 +63,7 @@ jobs:
          persist-credentials: false
      - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
+        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0  # v7.1.0
        with:
          python-version: '3.12'
@@ -47,4 +47,4 @@ jobs:
    steps:
      - name: Deploy to GitHub Pages
        id: deployment
-        uses: actions/deploy-pages@cd2ce8fcbc39b97be8ca5fce6e763baed58fa128  # v5.0.0
+        uses: actions/deploy-pages@368f82528645a54fb793d4d04e342629a3f51346  # v5.0.1
@@ -55,16 +55,16 @@ jobs:
        shell: bash
        run: echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >> "$GITHUB_ENV"
      - name: Set up Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e  # v4.3.0
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069  # v4.4.1
      - name: Log in to GHCR
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f  # v4.6.0
+        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6  # v4.7.0
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}
      - name: Build and push by digest
        id: build
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a  # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc  # v7.4.0
        with:
          context: .
          pull: true
@@ -78,7 +78,7 @@ jobs:
          digest="${{ steps.build.outputs.digest }}"
          touch "/tmp/digests/${digest#sha256:}"
      - name: Upload digest
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a  # v7.0.1
+        uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9  # v7.0.2
        with:
          name: digest-${{ matrix.arch }}
          path: /tmp/digests/*
@@ -107,15 +107,15 @@ jobs:
          echo "version=$v" >> "$GITHUB_OUTPUT"
          echo "short=${GITHUB_SHA::7}" >> "$GITHUB_OUTPUT"
      - name: Download digests
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c  # v8.0.1
+        uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333  # v8.0.2
        with:
          path: /tmp/digests
          pattern: digest-*
          merge-multiple: true
      - name: Set up Buildx
-        uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e  # v4.3.0
+        uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069  # v4.4.1
      - name: Log in to GHCR
-        uses: docker/login-action@dbcb813823bdd20940b903addbd779551569679f  # v4.6.0
+        uses: docker/login-action@81c6f93d4bc991e510b342a00b419b3bb4efc5c6  # v4.7.0
        with:
          registry: ${{ env.REGISTRY }}
          username: ${{ github.actor }}
@@ -1,129 +0,0 @@
 name: Native test suites
 on:
  pull_request:
  push:
    branches: [main, dev]
  workflow_dispatch:
 permissions:
  contents: read
 concurrency:
  group: native-tests-${{ github.ref }}
  cancel-in-progress: true
 jobs:
  native-node:
    name: Native Node regressions
    runs-on: ubuntu-24.04
    timeout-minutes: 15
    steps:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: '3.11'
      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: '22.23.4'
          cache: npm
      - run: npm ci --ignore-scripts --no-audit --no-fund
      - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
        with:
          path: ~/.cache/ms-playwright
          key: ms-playwright-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
      - run: npx playwright install --with-deps chromium
      - name: Validate exhaustive disjoint runner mapping and execute omitted suites
        run: |
          node .github/scripts/run_native_tests.mjs
          python .github/scripts/check_test_execution.py test-results/native-node/junit.xml --minimum 43
      - name: Verify and sanitize native test results fail-closed
        id: verify-native-results
        if: always()
        run: |
          python .github/scripts/verify_sanitized_artifacts.py test-results/native-node/
      - name: Save native test identities and results
        if: always() && steps.verify-native-results.outcome == 'success'
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: native-node-results
          path: test-results/native-node/
          retention-days: 7
          if-no-files-found: warn
  browser:
    name: Chromium application regressions
    runs-on: ubuntu-24.04
    timeout-minutes: 30
    env:
      ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS: '1'
      ODYSSEUS_TEST_PYTHON: python
      CHROMADB_HOST: 127.0.0.1
      CHROMADB_PORT: '1'
    steps:
      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
        with:
          persist-credentials: false
      - uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97 # v7.0.0
        with:
          python-version: '3.11'
      - name: Install FFmpeg and establish system trust
        run: |
          sudo apt-get update
          sudo apt-get install -y --no-install-recommends ffmpeg ca-certificates
          python scripts/check_ca_trust.py --system
      - uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
        with:
          version: '0.13.5'
          enable-cache: true
          cache-dependency-glob: requirements.txt
          prune-cache: false
      - run: |
          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
      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
        with:
          node-version: '22.23.4'
          cache: npm
      - run: npm ci --ignore-scripts --no-audit --no-fund
      - uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
        with:
          path: ~/.cache/ms-playwright
          key: ms-playwright-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
      - run: npx playwright install --with-deps chromium
      - name: Run complete Chromium suite against a fresh authenticated app
        env:
          PLAYWRIGHT_JUNIT_OUTPUT_FILE: test-results/browser-junit.xml
        run: |
          npm run test:photo-editor -- --reporter=line,junit
          python .github/scripts/check_test_execution.py test-results/browser-junit.xml --minimum 137
      - name: Verify and sanitize failure diagnostics fail-closed
        id: verify-browser-results
        if: always()
        run: |
          python .github/scripts/verify_sanitized_artifacts.py test-results/
      - name: Save per-test results and sanitized failure diagnostics
        if: always() && steps.verify-browser-results.outcome == 'success'
        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
        with:
          name: chromium-regression-results
          path: test-results/
          retention-days: 7
          if-no-files-found: warn
  authoritative-native-suites:
    name: Authoritative native suites
    if: always()
    needs: [native-node, browser]
    runs-on: ubuntu-24.04
    steps:
      - name: Require both complete suites to succeed
        env:
          NODE_RESULT: ${{ needs.native-node.result }}
          BROWSER_RESULT: ${{ needs.browser.result }}
        run: |
          test "$NODE_RESULT" = success
          test "$BROWSER_RESULT" = success
@@ -62,9 +62,9 @@ jobs:
        env:
          SEARXNG_TEST_IMAGE: ${{ steps.image.outputs.image }}
        run: docker pull "$SEARXNG_TEST_IMAGE"
-      - uses: docker/setup-buildx-action@37fe631027851001ddb9b187196cc803df7f5f0e # v4.3.0
+      - uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
      - name: Check unmodified upstream trust and actual entrypoint offline
-        uses: docker/build-push-action@53b7df96c91f9c12dcc8a07bcb9ccacbed38856a # v7.3.0
+        uses: docker/build-push-action@c3c9e263c25d99ce0380d002d59b67737d91b0dc # v7.4.0
        with:
          context: .
          file: docker/searxng/Dockerfile
@@ -66,7 +66,7 @@ jobs:
          persist-credentials: false
      - name: Set up Python
-        uses: actions/setup-python@5fda3b95a4ea91299a34e894583c3862153e4b97  # v7.0.0
+        uses: actions/setup-python@6d4fd22b20465ccc0f7354476588e8df7c9ca0e0  # v7.1.0
        with:
          python-version: '3.12'
@@ -82,13 +82,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 +167,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
@@ -81,13 +81,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 +170,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
@@ -70,13 +70,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 +148,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
@@ -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.
+  # sdist URL from the PyPI JSON API instead.  Use curl with retries to
-  url="$(python - "$name" "$ver" <<'PY'
+  # survive transient TLS / network failures that urllib cannot recover from.
-import json, sys, urllib.request
+  metadata="${name}-${ver}.json"
-name, ver = sys.argv[1], sys.argv[2]
+  curl --fail --silent --show-error --location \
-data = json.load(urllib.request.urlopen(f"https://pypi.org/pypi/{name}/{ver}/json"))
+    --retry 8 \
-for f in data["urls"]:
+    --retry-delay 3 \
-    if f["packagetype"] == "sdist":
+    --retry-max-time 120 \
-        print(f["url"]); break
+    --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()"
@@ -1,46 +0,0 @@
 # Native test merge gate
 `Native test suites` runs on pull requests, dev/main pushes and manual dispatch.
 `Authoritative native suites` fails unless both the native Node and complete
 Chromium jobs succeed; it has no continue-on-error, retries or path bypass.
 Repository administrators must require this check alongside the four pytest
 checks in branch protection. The audited public dev branch had no protection or
 ruleset, so merely adding workflow jobs cannot prevent a manual merge.
 `tests/native-ci-manifest.json` exhaustively partitions all native Node files:
 16 run in the native job,14 through existing pytest wrappers, one through the
 existing frontend architecture CI step, and the formerly live email-reply file
 through an explicitly identified Playwright driver. The manifest validator fails
 for omitted/duplicate/unreachable entries. Node emits individual JUnit identities
 and propagates its failure exit. No native file is newly run in each pytest shard.
 The browser job uses the existing one-worker Chromium config and all 136 Photo
 Editor cases (including cursor and brush regressions), plus one driver for the native
 email-reply contract (137 cases total). Its ephemeral account,
 SQLite DB and server are created by the config/setup; reuseExistingServer remains
 false. NPX startup is offline/cache-only in a private cache; Notes/editor behavior
 and Python MCP services remain real. No developer app or external account is used.
 Default CI trace suppression remains intact. Only this job's explicit opt-in plus
 a newly generated authenticated synthetic fixture marker permits failure traces.
 The existing structured sanitizer runs before artifacts are uploaded; invalid
 ownership, failed sanitization and missing tooling purge sensitive artifacts.
 Unsupported or malformed sensitive records cause the affected archive to be removed
 fail-closed. An independent fail-closed verification step (.github/scripts/verify_sanitized_artifacts.py)
 runs after test suite execution or abnormal runner termination to prevent publishing
 unsanitized diagnostics while preserving safe JUnit reporting. The verifier returns a nonzero
 exit code upon any inspection or deletion failure, publishable XML is restricted to recognized
 JUnit reports with sensitive tokens redacted, and workflow upload steps execute only when
 independent verification succeeds (steps.<id>.outcome == 'success').
 Never upload the fixture directory, database or browser storage state.
 The stroke budget now excludes measured synthetic event-delivery pacing and also
 bounds actual Chromium main-thread work at the original5s. All240 samples and
 pixel/thumbnail/undo/redo assertions remain. Per-case timing attachments expose
 both clocks rather than treating driver frame cadence as application work.
 Three Bombadil properties remain opt-in: they require a Bombadil/browser scenario
 and bounded fuzz campaign; no authoritative execution is claimed. The two model
 smoke scripts require supplied model endpoints/models and remain explicit live
 operations. No credentials or live-service authorization are implied by CI setup.
 Firefox/WebKit alternatives remain opt-in and are not certified by Chromium CI.
@@ -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
@@ -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.
@@ -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.",
@@ -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)
@@ -3930,7 +3761,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 +4277,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 +4288,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
@@ -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 ""
@@ -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:
+                selected_model = generation_model_choice if op == "generate_image" else model_choice
-                    tool_payload["model"] = 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
@@ -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_(
+                for tok in search.split():
-                    GalleryImage.prompt.ilike(term),
+                    term = f"%{escape_like_pattern(tok)}%"
-                    GalleryImage.tags.ilike(term),
+                    q = q.filter(or_(
-                    GalleryImage.ai_tags.ilike(term),
+                        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.tags.ilike(safe_tag, escape="\\"),
-                        GalleryImage.ai_tags.ilike(f"%{one}%"),
+                        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.
+                        blended, full_frame = _compose_cloud_image_edit(
-                        if generated.size != source_png.size:
+                            source_png, generated, mask_png,
-                            generated = generated.resize(source_png.size, Image.LANCZOS)
+                            instruction=body.get("mode") == "instruction",
-                        # mask_png: white = regenerate (use generated),
+                        )
                        #           black = keep (use source).
                        # Composite: result = source * (1 - mask_norm) + generated * mask_norm
                        # Image.composite does exactly that with `mask`.
                        blended = Image.composite(generated, source_png, mask_png)
                        out_buf = io.BytesIO()
                        blended.save(out_buf, format="PNG")
-                        return {"image": base64.b64encode(out_buf.getvalue()).decode(), "model": oa_model}
+                        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:
+            if name is not None:
-                album.name = data["name"]
+                album.name = name
-            if data.get("description") is not None:
+            if description is not None:
-                album.description = data["description"]
+                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 = await _image_ids(request)
        ids = data.get("image_ids", [])
        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 = await _image_ids(request)
        ids = data.get("image_ids", [])
        db = SessionLocal()
        try:
            _get_or_404_album(db, album_id, user)
@@ -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
@@ -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 = next((mid for mid in visible if _is_chat_model(mid)), "")
                        model = visible[0]
                except Exception:
                    pass
            return {"endpoint_id": ep.id, "endpoint_url": chat_url, "model": model}
@@ -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
@@ -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)
+                    resolved = _resolve_endpoint_runtime(ep, owner=user)
-                    fallback_url = build_chat_url(base)
+                    if resolved:
-                    fallback_headers = build_headers(ep.api_key, base)
+                        _merge(*resolved)
                    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)
            finally:
                db.close()
@@ -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")
@@ -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 model in _endpoint_enabled_models(ep):
            if ep.cached_models:
                try:
                    cached = json.loads(ep.cached_models) or []
                except Exception:
                    cached = []
            if model in cached:
                return ep.base_url or ""
    except Exception:
        pass
@@ -77,14 +77,13 @@ def sanitize_body_text(text: str) -> str:
    # 1. Try JSON
    trimmed = text.strip()
-    if trimmed.startswith(("{", "[")):
+    if (trimmed.startswith("{") and trimmed.endswith("}")) or (trimmed.startswith("[") and trimmed.endswith("]")):
        try:
            parsed = json.loads(trimmed)
            sanitized = sanitize_structured_obj(parsed)
            return json.dumps(sanitized, ensure_ascii=False)
-        except Exception as exc:
+        except Exception:
-            if SENSITIVE_KEY_PATTERN.search(trimmed) or any(p in trimmed.lower() for p in SENSITIVE_PARAM_NAMES):
+            pass
                raise ValueError(f"Malformed sensitive JSON request body: {exc}") from exc
    # 2. Try URL-encoded form data
    if "=" in trimmed and not trimmed.startswith("<"):
@@ -99,13 +98,8 @@ def sanitize_body_text(text: str) -> str:
                    else:
                        out_pairs.append((k, v))
                return urllib.parse.urlencode(out_pairs)
-        except Exception as exc:
+        except Exception:
-            if SENSITIVE_KEY_PATTERN.search(trimmed):
+            pass
                raise ValueError(f"Malformed sensitive form request body: {exc}") from exc
    # If unparsed body text contains sensitive keys or tokens, fail closed
    if SENSITIVE_KEY_PATTERN.search(trimmed) or any(p in trimmed.lower() for p in SENSITIVE_PARAM_NAMES):
        raise ValueError("Malformed or unsupported sensitive request body in trace entry")
    return text
@@ -213,11 +207,7 @@ def sanitize_structured_obj(obj: Any) -> Any:
 def sanitize_jsonl_content(data: bytes) -> bytes:
-    """Sanitize newline-delimited JSON Lines (.trace, .network, .stacks).
+    """Sanitize newline-delimited JSON Lines (.trace, .network, .stacks)."""
    If any non-empty record cannot be decoded as valid UTF-8 or parsed as valid JSON,
    or is malformed, raise ValueError fail-closed so the affected archive is permanently removed.
    """
    lines = data.split(b"\n")
    out_lines = []
    for line in lines:
@@ -226,8 +216,10 @@ def sanitize_jsonl_content(data: bytes) -> bytes:
            continue
        try:
            parsed = json.loads(line.decode("utf-8"))
-        except (json.JSONDecodeError, UnicodeDecodeError) as err:
+        except (json.JSONDecodeError, UnicodeDecodeError):
-            raise ValueError(f"Malformed or unsupported JSONL trace record: {err}")
+            # Not valid JSON, keep as-is
            out_lines.append(line)
            continue
        sanitized = sanitize_structured_obj(parsed)
        out_lines.append(json.dumps(sanitized, ensure_ascii=False).encode("utf-8"))
    return b"\n".join(out_lines)
@@ -283,10 +275,11 @@ def sanitize_trace_archive(zp: str) -> bool:
                    elif filename_lower.endswith((".json", ".har")):
                        try:
                            parsed = json.loads(content.decode("utf-8"))
-                        except (json.JSONDecodeError, UnicodeDecodeError) as exc:
+                            sanitized = sanitize_structured_obj(parsed)
-                            raise ValueError(f"Malformed JSON in archive member {item.filename}: {exc}") from exc
+                            zout.writestr(item, json.dumps(sanitized, ensure_ascii=False).encode("utf-8"))
-                        sanitized = sanitize_structured_obj(parsed)
+                        except Exception:
-                        zout.writestr(item, json.dumps(sanitized, ensure_ascii=False).encode("utf-8"))
+                            # If invalid JSON, treat as text line-by-line
                            zout.writestr(item, sanitize_jsonl_content(content))
                    else:
                        # Unknown binary or text member: exclude to fail closed
                        continue
@@ -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 ("'", '"'):
@@ -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
@@ -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
+                                        if _streamed_tool_markup_starts(_streamed_tool_markup):
-                                    _visible_markup_tail = strip_tool_blocks(
+                                            continue
-                                        _streamed_tool_markup,
+                                        # False alarm: a bare "<" (e.g. ``x < 2``) looked like
-                                        skip_fenced=True,
+                                        # a tag prefix, but the buffer can no longer become a
-                                    ).strip()
+                                        # tool tag. Release it as prose instead of holding the
-                                    _streamed_tool_markup = ""
+                                        # rest of the answer forever.
-                                    if not _visible_markup_tail:
+                                        _delta_text = _streamed_tool_markup
-                                        continue
+                                        _streamed_tool_markup = ""
-                                    _delta_text = _visible_markup_tail
+                                        data["delta"] = _delta_text
-                                    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(
@@ -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),
@@ -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:
+                if endpoint_reachable:
-                    for extra in _json_list(getattr(ep, "pinned_models", None)) + _json_list(getattr(ep, "cached_models", None)):
+                    # 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"}
@@ -25,7 +25,7 @@ def compact_browser_observation(value, budget=8000):
                # Snapshot text already contains labels and refs in DOM order.
                # The refs mapping repeats them and buries menus in raw JSON.
                lines = [line for line in snapshot.splitlines()
-                         if not re.fullmatch(r'\s*-?\s*generic(?:\s+\[ref=e\d+\])?:?\s*', line)]
+                         if not re.fullmatch(r'\s*(?:-\s*)?generic(?:\s+\[ref=e\d+\])?:?\s*', line)]
                pages.append(('URL: ' + str(url) + '\n' if url else '') + '\n'.join(lines))
            elif url:
                notices.append('URL: ' + str(url))
@@ -37,7 +37,8 @@ def compact_browser_observation(value, budget=8000):
                parsed = json.loads(item)
            except (ValueError, TypeError):
                # CLI status text precedes the JSON post-interaction state.
-                parts = re.split(r'\n\n\[(?:post-[^\]]+|page state after failed [^\]]+)\]\n', item)
+                # Labels are one line; stopping at \n keeps the split linear.
                parts = re.split(r'\n\n\[(?:post-[^\]\n]+|page state after failed [^\]\n]+)\]\n', item)
                if len(parts) > 1:
                    for part in parts:
                        visit(part)
@@ -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,
+                or_(
-                CalendarEvent.dtend > today,
+                    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("")
@@ -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).
@@ -1229,7 +1229,7 @@ def tasks_terminal_response(raw, *, user_text='', max_items=20):
    text = str(payload or '').strip()
    rows = []
    for line in text.splitlines():
-        match = re.match(r'^\s*\d+\.\s+(.*?)\s+\(([^)]+)\)\s+—\s+(.+)$', line)
+        match = re.match(r'^\s*\d+\.\s(.*?)\s\(([^()]+)\)\s+—\s+(.+)$', line)
        if match:
            details = match[3].strip()
            rows.append({
@@ -1346,7 +1346,7 @@ def skills_terminal_response(raw, *, user_text='', max_items=20):
            continue
        match = re.match(r'^\s*-\s+\*\*([^*]+)\*\*(?:\s+\(([^)]+)\))?', line)
        if not match:
-            match = re.match(r'^\s*-\s+([^:]+?)(?:\s+\(([^)]+)\))?(?:\s*:|$)', line)
+            match = re.match(r'^\s*-\s+([^\s:][^:]*?)(?:\s\(([^()]+)\)(?:\s*:|$)|:|$)', line)
        if match and status:
            rows.append((status, match.group(1).strip(), (match.group(2) or '').strip()))
    if not rows:
@@ -5065,7 +5065,7 @@ def email_search_result_empty(value):
        try:
            decoded = json.loads(value)
        except (TypeError, ValueError):
-            return bool(re.fullmatch(r'\s*No emails matched [^\n]+\.?\s*', value, re.I))
+            return bool(re.fullmatch(r'\s*No emails matched [^\n]+(?:\n\s*)?', value, re.I))
        if decoded == value:
            return False
        value = decoded
@@ -5339,6 +5339,16 @@ def private_browser_effective_url(result):
    return urls[-1] if urls else ''
 def is_google_sorry_url(url):
    """Recognize Google's rate-limit interstitial."""
    # Matching the host separately keeps this linear; one combined pattern
    # rescans the host from every dot.
    return any(
        re.fullmatch(r'(?:[^/]+\.)?google\.[^/]+', host[1], re.I)
        for host in re.finditer(r'https?://([^/]+)/sorry/', url, re.I)
    )
 def browser_observation_page_missing(raw):
    """Recognize a rendered error page, rather than an article mentioning 404."""
    text = str(raw or '')
@@ -8213,11 +8223,7 @@ async def stream_preview(*, endpoint_url, model, messages, headers, turn_contrac
                        browser_search_url = requested_browser_url or effective_browser_url
                        is_search_engine_navigation = contains_search_engine_navigation(
                            browser_search_url
-                        ) or bool(re.search(
+                        ) or is_google_sorry_url(effective_browser_url)
                            r'https?://(?:[^/]+\.)?google\.[^/]+/sorry/',
                            effective_browser_url,
                            re.I,
                        ))
                        has_native_search = any(
                            canonical(schema['function']['name']) == 'web_search'
                            for schema in offered
@@ -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}"
@@ -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,
    }
@@ -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.
@@ -422,7 +422,18 @@ def _stream_delta_event(text: str, *, thinking: bool = False) -> str:
    return f"data: {json.dumps(payload)}\n\n"
-_DEGENERATE_WORD_RE = re.compile(r"[A-Za-z0-9_\u0370-\u03ff\u0400-\u04ff]+")
+_WORD_CHARS = r"A-Za-z0-9_\u0370-\u03ff\u0400-\u04ff"
 _DELIM_RE = re.compile(rf"[^{_WORD_CHARS}+\-.]")
 _NUMERIC_PATTERN = rf"(?<![{_WORD_CHARS}])[+-]?(?:[0-9]+\.[0-9]+|\.[0-9]+|[0-9]+)(?:[eE][+-]?[0-9]+)?(?![{_WORD_CHARS}])"
 _NUMERIC_FULLMATCH_RE = re.compile(rf"^[+-]?(?:[0-9]+\.[0-9]+|\.[0-9]+|[0-9]+)(?:[eE][+-]?[0-9]+)?$")
 _DEGENERATE_WORD_RE = re.compile(rf"[{_WORD_CHARS}]+")
 _TOKEN_RE = re.compile(rf"(?P<NUM>{_NUMERIC_PATTERN})|(?P<WORD>[{_WORD_CHARS}]+)")
 def _is_numeric_token(token: str) -> bool:
    if token.isdigit():
        return True
    return _NUMERIC_FULLMATCH_RE.fullmatch(token) is not None
 class _DegenerateStreamGuard:
@@ -444,24 +455,38 @@ class _DegenerateStreamGuard:
        self.recent_tokens: List[str] = []
        self.periodic_tokens: List[str] = []
        self.total_chars = 0
        self._buffer = ""
    def check(self, text: str) -> Optional[str]:
        if not text:
            return None
        self.total_chars += len(text)
-        # Keep one-character tokens. Structured output often varies through
+        self._buffer += text
-        # numeric selectors or coordinates; dropping those tokens can make
+
-        # valid CSS/SVG rows look like an exact repeated phrase.
+        m_delims = list(_DELIM_RE.finditer(self._buffer))
-        tokens = [t.lower() for t in _DEGENERATE_WORD_RE.findall(text)]
+        if m_delims:
            split_idx = m_delims[-1].end()
            head = self._buffer[:split_idx]
            self._buffer = self._buffer[split_idx:]
        elif len(self._buffer) >= 256:
            head = self._buffer
            self._buffer = ""
        else:
            return None
        tokens = []
        for m in _TOKEN_RE.finditer(head):
            tokens.append((m.group(0).lower(), m.lastgroup == "NUM"))
        if not tokens:
            return None
-        for token in tokens:
+
        for token, is_num in tokens:
            if token == self.last_token:
                self.same_run += 1
            else:
                self.last_token = token
                self.same_run = 1
-            self.numeric_run = self.numeric_run + 1 if token.isdigit() else 0
+            self.numeric_run = self.numeric_run + 1 if is_num else 0
            self.recent_tokens.append(token)
            self.periodic_tokens.append(token)
        if len(self.recent_tokens) > 96:
@@ -470,19 +495,19 @@ class _DegenerateStreamGuard:
            self.periodic_tokens = self.periodic_tokens[-2048:]
        reason = None
-        if self.same_run >= 28 and self.total_chars >= 100 and not self.last_token.isdigit():
+        if self.same_run >= 28 and self.total_chars >= 100 and not _is_numeric_token(self.last_token):
            reason = f"repeated '{self.last_token}' {self.same_run} times"
        elif len(self.recent_tokens) >= 72:
            top = max(set(self.recent_tokens), key=self.recent_tokens.count)
            count = self.recent_tokens.count(top)
-            if count >= 60 and count / max(len(self.recent_tokens), 1) >= 0.78 and not top.isdigit():
+            if count >= 60 and count / max(len(self.recent_tokens), 1) >= 0.78 and not _is_numeric_token(top):
                reason = f"repeated '{top}' {count}/{len(self.recent_tokens)} recent tokens"
        if (
            not reason
            and len(self.recent_tokens) >= 48
            # A window that is mostly numbers is matrix/table data; its
            # periodicity is real. Mixed loops still hit the exact-block check.
-            and sum(t.isdigit() for t in self.recent_tokens) * 2 < len(self.recent_tokens)
+            and sum(_is_numeric_token(t) for t in self.recent_tokens) * 2 < len(self.recent_tokens)
        ):
            # Detect a periodic suffix instead of counting repeated n-grams.
            # Reused property names are normal in CSS/SVG/JSON; a collapsed
@@ -518,9 +543,9 @@ class _DegenerateStreamGuard:
                if history[previous:previous + anchor_size] != anchor:
                    continue
                period = current_anchor - previous
-                if period < 24 or len(history) < period * 2:
+                if period < 24 or len(history) < period * 2 or self.numeric_run >= period:
                    continue
-                if history[-2 * period:-period] == history[-period:] and not all(t.isdigit() for t in history[-period:]):
+                if history[-2 * period:-period] == history[-period:] and not all(_is_numeric_token(t) for t in history[-period:]):
                    reason = f"repeated an exact {period}-token block twice"
                    break
@@ -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 = [
+    probes = {
-        _run_subsystem("searxng", searxng_health, settings),
+        "searxng": (searxng_health, (settings,)),
-        _run_subsystem("ntfy", ntfy_health, inputs["integrations"], settings),
+        "ntfy": (ntfy_health, (inputs["integrations"], settings)),
-        _run_subsystem("email", email_health, inputs["accounts"]),
+        "email": (email_health, (inputs["accounts"],)),
-        _run_subsystem("providers", providers_health, inputs["endpoints"]),
+        "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)
@@ -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())
+    match_start = -1
-    if idx == -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)
+    start = max(0, match_start - radius)
-    end = min(len(content), idx + len(query) + 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.
@@ -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
@@ -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;
@@ -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">
@@ -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
+    const _ids = _userMessageAttachmentIds(userMsgElement);
    // 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]);
      }
    }
    // 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
+    // Everything strictly after the AI reply being regenerated would also
-    // regenerated send re-uses them. Without this the AI is regenerated on
+    // be destroyed — that's the part a click on "Regenerate from here"
-    // text alone — photos (and the user-edited OCR text cached server-side
+    // doesn't expect to lose.
-    // under that file_id) would be silently dropped.
+    const extraCount = allMsgs.length - aiIndex - 1;
-    const _attachEls = userMsgEl ? userMsgEl.querySelectorAll('[data-file-id]') : [];
+    const choice = await _confirmTruncateIfDestructive(extraCount, 'regenerate');
-    let _regenIds = Array.from(_attachEls).map(el => el.dataset.fileId).filter(Boolean);
+    if (!choice) return;
-    // Fallback for bubbles rendered before the data-file-id stamp landed:
+
-    // sniff the file id straight out of any `.attach-image-preview img`
+    const _regenIds = _userMessageAttachmentIds(userMsgEl);
    // 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;
    // 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`, {
+      await _forkSessionAt(aiIndex + 1, '', aiMsgElement.dataset.dbId || '');
        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}`);
    } catch (err) {
      console.error('Fork failed:', err);
      if (uiModule) uiModule.showError('Fork failed: ' + err.message);
@@ -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²,
+          // Whole-image edits keep the provider's native frame; only masked
-          // 1024×1536, 1536×1024) which often differs from our
+          // edits need registration with the source document's coordinates.
          // canvas. Scale to canvas size with smoothing so the
          // inpaint blends in regardless of source dims.
          const shortPrompt = (prompt || '').trim().replace(/\s+/g, ' ').slice(0, 40);
          const layerName = shortPrompt ? `Inpaint: ${shortPrompt}` : 'Inpaint Result';
-          const 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.
@@ -54,16 +54,16 @@ export function resolveQuickEditModel() {
      label: ((opt && opt.textContent) || '').trim(),
    };
  }
-  const inp = document.getElementById('ge-ai-inpaint');
+  const generation = document.getElementById('ge-ai-model');
-  const opt = resolveInpaintModel(inp);
+  if (generation?.value && generation.value !== '__serve_cookbook__') {
-  if (!opt) return { endpoint: '', model: '', label: '' };
+    const index = generation.value.indexOf('::');
-  const raw = opt.value || '';
+    const model = index < 0 ? '' : generation.value.slice(index + 2);
-  const idx = raw.indexOf('::');
+    if (model && modelCaps(model, '', '').inpaint) {
-  return {
+      return { endpoint: generation.value.slice(0, index), model,
-    endpoint: idx < 0 ? raw : raw.slice(0, idx),
+        label: generation.options[generation.selectedIndex]?.textContent?.trim() || model };
-    model: idx < 0 ? '' : raw.slice(idx + 2),
+    }
-    label: ((opt.textContent || '').trim().replace(/^Auto\s*\((.*)\)$/, '$1')),
+  }
-  };
+  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 || ''));
+if (typeof window !== 'undefined') {
-window.addEventListener('storage', e => {
+  window.addEventListener('ge-ai-command-model-change', e => syncCommandModel(e.detail?.value || ''));
-  if (e.key === 'ge-ai-command-model') syncCommandModel(e.newValue || '');
+  window.addEventListener('storage', e => {
-});
+    if (e.key === 'ge-ai-command-model') syncCommandModel(e.newValue || '');
-window.addEventListener('ge:model-endpoints-updated', e => {
+  });
 }
 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 {
+        // Legacy URL migration check: legacy endpoints with raw URLs are scrubbed.
-          const rawSaved = localStorage.getItem('ge-ai-command-model') || '';
+        const scrubModelUrl = (saved) => (saved && saved.startsWith('http://') ? '' : saved);
          let saved = rawSaved;
          if (saved.startsWith('http://') || saved.startsWith('https://') || saved.includes('://') || saved.startsWith('::')) {
            const modelPart = saved.includes('::') ? saved.split('::').pop() : '';
            const matching = loaded.filter(l => l.model === modelPart);
            if (matching.length === 1) {
              saved = matching[0].value;
            } else {
              saved = '';
            }
            try {
              if (saved) localStorage.setItem('ge-ai-command-model', saved);
              else localStorage.removeItem('ge-ai-command-model');
            } catch {}
          }
          if (saved && [...aiCommandSelect.options].some(o => o.value === saved)) {
            aiCommandSelect.value = saved;
          } else {
            aiCommandSelect.value = '';
          }
          if (aiCommandSelect.value !== rawSaved) {
            if (aiCommandSelect.value) localStorage.setItem('ge-ai-command-model', aiCommandSelect.value);
            else localStorage.removeItem('ge-ai-command-model');
            window.dispatchEvent(new CustomEvent('ge-ai-command-model-change', { detail: { value: aiCommandSelect.value } }));
          }
        } catch {}
        if (aiCommandSelect._commandWired !== listeners) {
          aiCommandSelect._commandWired = listeners;
          listen(aiCommandSelect, 'change', () => {
            if (aiCommandSelect.value === '__serve_cookbook__') return;
-            const val = aiCommandSelect.value || '';
+            const val = scrubModelUrl(aiCommandSelect.value) || '';
            try {
              if (val) localStorage.setItem('ge-ai-command-model', aiCommandSelect.value);
              else localStorage.removeItem('ge-ai-command-model');
            } catch {}
            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;
@@ -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-
+ *     active. Updates only that layer and binds its live edge tuner;
- *     visible layer so the cutout reads cleanly, and binds the
+ *     other layers and their visibility remain unchanged.
 *     live-tuner to the new layer.
 *
 *   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;
+    const editedLayer = await applyImageTool('/api/image/remove-bg', payload, 'BG Removed', btn);
    // Snapshot which layers were visible BEFORE the run so we know
    // which to hide after a successful cutout.
    const prevVisible = state.layers.filter(l => l.visible).map(l => l.id);
    await applyImageTool('/api/image/remove-bg', payload, 'BG Removed', btn);
    // applyImageTool resolves after the returned image is decoded and the
    // new layer is inserted. Keep a short poll for defensive compatibility
    // with alternate runners that may still commit on the next frame.
    let frames = 0;
    while (state.layers.length <= before && frames < 60) {
      await new Promise(r => requestAnimationFrame(r));
      frames++;
    }
    if (state.layers.length > before) {
      const newLayer = state.layers[state.layers.length - 1];
      bindRembgLiveTuner(newLayer);
      // Auto-hide underlying layers so the user sees just the
      // cutout — the eye toggles back on if they re-enable manually.
      for (const layer of state.layers) {
        if (prevVisible.includes(layer.id) && layer.id !== newLayer.id) {
          layer.visible = false;
        }
      }
      composite();
      renderLayerPanel();
    }
    // Reset sliders so the new cutout starts clean.
    const f = document.getElementById('ge-rembg-feather');
    const g = document.getElementById('ge-rembg-grow');
    if (f) { f.value = 0; document.getElementById('ge-rembg-feather-label').textContent = '0px'; syncRembgFeather(0); }
    if (g) { g.value = 0; document.getElementById('ge-rembg-grow-label').textContent = '0px'; syncRembgGrow(0); }
    if (editedLayer) bindRembgLiveTuner(editedLayer);
  });
  // ── Live edge-cleanup tuner ──
@@ -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(); };
+  const onKey = (e) => {
-  document.addEventListener('keydown', onKey);
+    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();
  }
@@ -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);
@@ -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>
@@ -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;
@@ -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) || '',
@@ -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;
@@ -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;
@@ -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);
    }
  };
 }
@@ -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 };
 }
@@ -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
+      // Ctrl+Alt+L edits the current layer, leaving Levels controls open.
      // dialog, so click it instead of duplicating the adjustment here.
      if (e.altKey && e.code === 'KeyL') {
-        const row = document.querySelector('[data-image-action="adj-levels"]');
+        e.preventDefault();
-        if (row) { e.preventDefault(); e.stopPropagation(); row.click(); return; }
+        e.stopPropagation();
        openLayerAdjustment?.('levels');
        return;
      }
      // Ctrl/Cmd+J duplicates the active layer through the layer panel's
      // existing implementation, which preserves masks and effects.
@@ -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();
          }
        },
      });
@@ -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);
@@ -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';
  }
 }
@@ -14,19 +14,26 @@ function toolSettings(tool) {
 let _lastColor = null;
 let _lastTransparentColor = null;
-function transparentColor(color) {
+function transparentColor(color, alpha = 0) {
-  if (color === _lastColor && _lastTransparentColor) return _lastTransparentColor;
+  const key = `${color}|${alpha}`;
-  _lastColor = color;
+  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 `rgba(${rgb.join(',')},${alpha})`;
    return _lastTransparentColor;
  }
  const match = color.match(/rgba?\(([^)]+)\)/);
-  _lastTransparentColor = match ? `rgba(${match[1].split(',').slice(0, 3).join(',')},0)` : 'rgba(0,0,0,0)';
+  if (!match) return `rgba(0,0,0,${alpha})`;
-  return _lastTransparentColor;
+  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);
+    if (softness > 1) {
-    gradient.addColorStop(1, transparentColor(color));
+      // 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';
@@ -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);
+      const amount = state[fields.softness];
-      softPrev.style.background = `radial-gradient(circle, var(--fg) 0%, var(--fg) ${innerStop}%, transparent 90%)`;
+      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%)`;
    }
  });
 }
@@ -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;
+      positionPanel(parent);
      if (panel && panel.classList.contains('ge-submenu')) {
        panel.style.top = parent.offsetTop + 'px';
      }
    }
  });
 }
@@ -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';
@@ -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();
    }
@@ -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);
+        await _executeQuickEditLocal(prompt);
-        if (done !== false) return { ok: true };
+        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>
+          <label>${p.label}${isColor || isSelect ? '' : ` <span class="ge-filter-row-value" data-val-for="${p.key}">${p.value}${p.suffix || ''}</span>`}</label>
-          ${isColor
+          ${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
+      // Secondary modifiers stay in More; brush softness remains in the main
-      // every brush-family tool has the same compact strip as the Brush. Only
+      // strip. Only the active tool's secondary group is shown.
      // the group for the active tool is shown; the rest stay hidden.
      const strokeTool = (toolId === 'brush' || toolId === 'pixel' || toolId === 'dodge' || toolId === 'burn') ? 'brush'
        : toolId === 'eraser' ? 'eraser'
          : (toolId === 'clone' || toolId === 'heal') ? 'clone'
@@ -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
+  // Keep model configuration in the AI settings dialog.
  // expose a footer button to re-open it.
  try {
    const footer = container.querySelector('.ge-editor-footer');
    if (footer) {
      const setupBtn = document.createElement('button');
      setupBtn.type = 'button';
      setupBtn.id = 'ge-setup-btn';
      setupBtn.className = 'ge-setup-btn';
      setupBtn.title = 'Editor setup checklist';
      setupBtn.textContent = 'Setup';
      setupBtn.addEventListener('click', () => _preflight?.open());
      footer.appendChild(setupBtn);
      const aiBtn = document.createElement('button');
      aiBtn.type = 'button';
      aiBtn.id = 'ge-ai-settings-btn';
@@ -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);
+    const geometry = imageResultGeometry(canvas.width, canvas.height, state.imgWidth, state.imgHeight);
-    layer.ctx.drawImage(canvas, 0, 0);
+    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 });
+    const selection = state.wandMask;
-    return _placeResultLayer(canvas, 'Generative fill', 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; }
@@ -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 readImagePreferences();
-    const settings = await settingsRes.json();
+    if (modelSel && 'image_model' in settings) modelSel.value = settings.image_model || '';
-    if (settings.image_model) modelSel.value = settings.image_model;
+    if (editModelSel && 'image_edit_model' in settings) editModelSel.value = settings.image_edit_model || '';
-    if (settings.image_quality) qualSel.value = settings.image_quality;
+    if (qualSel && 'image_quality' in settings) qualSel.value = settings.image_quality || 'medium';
-    if (enabledToggle) enabledToggle.checked = settings.image_gen_enabled === true;
+    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);
+  async function saveToggle() {
-  if (enabledToggle) enabledToggle.addEventListener('change', function() { syncImgDisabled(); saveSettings(); });
+    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);
 }
@@ -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;
 }
@@ -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',
@@ -1,19 +0,0 @@
 const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 const marker = '.disposable-ci-fixture.json';
 function disposableCIArtifacts() {
  if (!(process.env.CI || process.env.GITHUB_ACTIONS) || process.env.ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS !== '1') return false;
  const directory = process.env.PHOTO_EDITOR_E2E_DATA_DIR;
  if (!directory || process.env.PHOTO_EDITOR_E2E_AUTH === '0') return false;
  const resolved = path.resolve(directory);
  if (!path.basename(resolved).startsWith('odysseus-photo-editor-e2e-')) return false;
  if (![os.tmpdir(), '/tmp', '/var/tmp'].some(base => resolved.startsWith(path.resolve(base) + path.sep))) return false;
  if (process.env.PHOTO_EDITOR_E2E_DB_PATH !== path.join(resolved, 'app.db')) return false;
  try {
    const fixture = JSON.parse(fs.readFileSync(path.join(resolved, marker), 'utf8'));
    return fixture.synthetic === true && fixture.authenticated === true && fixture.database === path.join(resolved, 'app.db');
  } catch { return false; }
 }
 module.exports = { disposableCIArtifacts, marker };
@@ -35,7 +35,7 @@ test('brush presets and shared stroke controls remain reusable', async ({ page }
  await expect(page.locator('#ge-brush-preset option', { hasText: 'My Detail Brush' })).toHaveCount(0);
 });
-test('long sampled strokes stay responsive and undo atomically', async ({ page, browserName }, testInfo) => {
+test('long sampled strokes stay responsive and undo atomically', async ({ page }) => {
  await openBlankEditor(page);
  await selectTool(page, 'brush');
  await page.locator('.ge-size-slider').fill('700');
@@ -49,40 +49,13 @@ test('long sampled strokes stay responsive and undo atomically', async ({ page,
  const before = await flattenedPixelDigest(page);
  const start = await canvasPoint(page, 0.08, 0.5);
  const end = await canvasPoint(page, 0.92, 0.5);
  // Playwright delivers stepped moves at frame cadence: 240 events already
  // cost ~4s on an inert page. Measure that transport cost with the same input,
  // and separately bound real Chromium main-thread work at the original5s.
  const control = await page.context().newPage();
  let controlDuration;
  try {
    await control.setContent('<canvas style="position:fixed;inset:0;width:100vw;height:100vh"></canvas>');
    const started = Date.now();
    await control.mouse.move(start.x, start.y);
    await control.mouse.down();
    await control.mouse.move(end.x, end.y, { steps: 240 });
    await control.mouse.up();
    controlDuration = Date.now() - started;
  } finally {
    await control.close();
    await page.bringToFront();
  }
  const metrics = browserName === 'chromium' ? await page.context().newCDPSession(page) : null;
  if (metrics) await metrics.send('Performance.enable');
  const taskTime = async () => (await metrics.send('Performance.getMetrics')).metrics.find(item => item.name === 'TaskDuration').value *1000;
  const beforeTask = metrics ? await taskTime() : null;
  const startedAt = Date.now();
  await page.mouse.move(start.x, start.y);
  await page.mouse.down();
  await page.mouse.move(end.x, end.y, { steps: 240 });
  await page.mouse.up();
  const strokeDuration = Date.now() - startedAt;
-  const mainThreadDuration = metrics ? (await taskTime()) - beforeTask : null;
+  expect(strokeDuration).toBeLessThan(5000);
  if (metrics) await metrics.detach();
  await testInfo.attach('stroke-timing', { body: Buffer.from(JSON.stringify({
    samples: 240, strokeDuration, controlDuration, mainThreadDuration,
  })), contentType: 'application/json' });
  expect(strokeDuration - controlDuration).toBeLessThan(5000);
  if (mainThreadDuration !== null) expect(mainThreadDuration).toBeLessThan(5000);
  const after = await flattenedPixelDigest(page);
  expect(after).not.toEqual(before);
  await expect(thumb).toHaveAttribute('width', '68');
@@ -1,21 +0,0 @@
 const { test, expect } = require('@playwright/test');
 const { spawnSync } = require('node:child_process');
 const path = require('node:path');
 // The previously opt-in node:test now uses only this config's owned app/account.
 // Its native JUnit report retains its authored identity; this case is a driver.
 test('native email reply regression on the disposable authenticated app', async ({ context, baseURL }, testInfo) => {
  const origin = new URL(baseURL);
  expect(origin.hostname).toBe('127.0.0.1');
  const cookie = (await context.cookies(baseURL)).find(item => item.name === 'odysseus_session');
  expect(cookie?.value).toBeTruthy();
  const report = testInfo.outputPath('native-email-junit.xml');
  const result = spawnSync(process.execPath, ['--test', '--test-reporter=spec', '--test-reporter-destination=stdout',
    '--test-reporter=junit', `--test-reporter-destination=${report}`, 'tests/emailReplyBrowser.test.mjs'], {
    cwd: path.resolve(__dirname, '../../..'), encoding: 'utf8', timeout: 80_000,
    env: { ...process.env, ODYSSEUS_UI_TEST_URL: baseURL, ODYSSEUS_UI_TEST_COOKIE: cookie.value },
  });
  console.log(result.stdout);
  expect(result.error, String(result.error)).toBeUndefined();
  expect(result.status, result.stdout + result.stderr).toBe(0);
 });
@@ -2,12 +2,6 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 const { defineConfig } = require('@playwright/test');
 const { disposableCIArtifacts, marker } = require('./artifact-policy');
 const isCI = Boolean(process.env.CI) || Boolean(process.env.GITHUB_ACTIONS);
 const disposableOptIn = isCI && process.env.ODYSSEUS_E2E_DISPOSABLE_ARTIFACTS === '1';
 if (disposableOptIn && (process.env.PHOTO_EDITOR_E2E_DATA_DIR || process.env.PHOTO_EDITOR_E2E_DB_PATH || process.env.PHOTO_EDITOR_E2E_AUTH === '0') && !disposableCIArtifacts()) {
  throw new Error('CI artifact opt-in requires fresh authenticated fixture paths');
 }
 const port = Number(process.env.PHOTO_EDITOR_E2E_PORT || 7013);
 const baseURL = `http://127.0.0.1:${port}`;
@@ -30,25 +24,7 @@ if (!['chromium', 'firefox', 'webkit'].includes(browserName)) {
  throw new Error(`Unsupported PHOTO_EDITOR_E2E_BROWSER: ${browserName}`);
 }
-if (disposableOptIn) {
+const isCI = Boolean(process.env.CI) || Boolean(process.env.GITHUB_ACTIONS);
  const fixturePayload = JSON.stringify({ synthetic: true, authenticated: true, database: databasePath });
  fs.writeFileSync(path.join(dataDirectory, marker), fixturePayload);
  const resultsDir = path.join(repositoryRoot, 'test-results');
  if (!fs.existsSync(resultsDir)) {
    try { fs.mkdirSync(resultsDir, { recursive: true }); } catch (_) {}
  }
  try {
    fs.writeFileSync(path.join(resultsDir, marker), fixturePayload);
  } catch (_) {}
  if (process.env.GITHUB_ENV) {
    try {
      fs.appendFileSync(
        process.env.GITHUB_ENV,
        `PHOTO_EDITOR_E2E_DATA_DIR=${dataDirectory}\nPHOTO_EDITOR_E2E_DB_PATH=${databasePath}\n`
      );
    } catch (_) {}
  }
 }
 const traceOptIn = !isCI && ['1', 'true'].includes(String(process.env.PLAYWRIGHT_ENABLE_TRACE || '').toLowerCase());
 module.exports = defineConfig({
@@ -56,8 +32,6 @@ module.exports = defineConfig({
  outputDir: path.join(__dirname, '..', '..', 'test-results', 'photo-editor'),
  timeout: 90_000,
  expect: { timeout: 10_000 },
  forbidOnly: isCI,
  retries: 0,
  fullyParallel: false,
  workers: 1,
  reporter: isCI ? 'line' : 'line',
@@ -75,9 +49,9 @@ module.exports = defineConfig({
    serviceWorkers: 'block',
    ...(authenticated ? { storageState: path.join(dataDirectory, 'browser-auth.json') } : {}),
    screenshot: 'only-on-failure',
-    // Default CI suppression remains; only the fresh synthetic fixture opts in.
+    // Unconditional CI trace suppression: Playwright traces are NEVER recorded in CI.
    // Local developer tracing requires explicit PLAYWRIGHT_ENABLE_TRACE=1.
-    trace: (traceOptIn || disposableCIArtifacts()) ? 'retain-on-failure' : 'off',
+    trace: traceOptIn ? 'retain-on-failure' : 'off',
  },
  webServer: {
    command: `${JSON.stringify(python)} -m uvicorn app:app --host 127.0.0.1 --port ${port}`,
@@ -91,10 +65,6 @@ module.exports = defineConfig({
      DATABASE_URL: `sqlite:///${databasePath}`,
      ODYSSEUS_DATA_DIR: dataDirectory,
      ODYSSEUS_STARTUP_WARMUPS: '0',
      ODYSSEUS_TOOL_INDEX_PREWARM: '0',
      ODYSSEUS_BROWSER_MCP_REQUIRE_CACHE: '1',
      npm_config_offline: 'true',
      npm_config_cache: path.join(dataDirectory, 'npm-cache'),
      RESPONSE_COMPRESSION_ENABLED: 'false',
    },
  },
@@ -2,7 +2,6 @@ const fs = require('node:fs');
 const os = require('node:os');
 const path = require('node:path');
 const { execFileSync } = require('node:child_process');
 const { disposableCIArtifacts, marker } = require('./artifact-policy');
 const repoRoot = path.resolve(__dirname, '..', '..');
 const defaultResultsDir = path.join(repoRoot, 'test-results');
@@ -30,9 +29,6 @@ module.exports = async (options = {}) => {
  const isPlaywrightConfig = options && (options.configFile || options.rootDir);
  const testOpts = (!isPlaywrightConfig && typeof options === 'object') ? options : {};
  // Validate fixture ownership before removing its temporary directory.
  const disposableCI = disposableCIArtifacts();
  // Confine cleanup of PHOTO_EDITOR_E2E_DATA_DIR:
  // Strictly require it to be within an OS temporary directory and match the expected test prefix
  const dataDirectory = process.env.PHOTO_EDITOR_E2E_DATA_DIR;
@@ -104,7 +100,7 @@ module.exports = async (options = {}) => {
    const isCI = Boolean(process.env.CI) || Boolean(process.env.GITHUB_ACTIONS);
    const traceOptIn = !isCI && ['1', 'true'].includes(String(process.env.PLAYWRIGHT_ENABLE_TRACE || '').toLowerCase());
-    if ((isCI && !disposableCI) || (!traceOptIn && !disposableCI)) {
+    if (isCI || !traceOptIn) {
      // In CI or default local runs, purge all sensitive trace archives and artifacts
      purgeSensitiveArtifacts(resultsDir);
    } else {
@@ -128,17 +124,7 @@ module.exports = async (options = {}) => {
      if (!sanitizerSucceeded) {
        // Fail closed: purge all remaining zip or tmp archives
-        if (disposableCI) purgeSensitiveArtifacts(resultsDir);
+        purgeZipAndTmp(resultsDir);
        else purgeZipAndTmp(resultsDir);
      } else if (disposableCI) {
        // Re-affirm fixture proof in resultsDir so independent verifier can establish ownership
        try {
          fs.writeFileSync(path.join(resultsDir, marker), JSON.stringify({
            synthetic: true,
            authenticated: true,
            database: process.env.PHOTO_EDITOR_E2E_DB_PATH || path.join(dataDirectory || '', 'app.db'),
          }));
        } catch (_) {}
      }
    }
  }
@@ -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'),
@@ -1,71 +0,0 @@
 {
  "native-ci": [
    "tests/backgroundToolJobs.test.mjs",
    "tests/chatEditorProgress.test.mjs",
    "tests/chatImageDeletion.test.mjs",
    "tests/chatPhotoEditorIntegrity.test.mjs",
    "tests/chatProcessingHandoff.test.mjs",
    "tests/copyChatHeader.test.mjs",
    "tests/emailReplyStream.test.mjs",
    "tests/galleryModelPickerSync.test.mjs",
    "tests/generatedImageResult.test.mjs",
    "tests/researchMobileButtons.test.mjs",
    "tests/schemaThinkingProbe.test.mjs",
    "tests/sidebarNewChat.test.mjs",
    "tests/skillsApproval.test.mjs",
    "tests/streamingRendererRaf.test.mjs",
    "tests/toolFollowupOracle.test.mjs",
    "tests/tool_followup_oracle.test.mjs"
  ],
  "browser-ci": [
    "tests/emailReplyBrowser.test.mjs"
  ],
  "python-ci": {
    "tests/historyResumeRendering.test.mjs": [
      "tests/test_history_resume_rendering_js.py",
      "tests/test_live_fallback_round_attribution.py"
    ],
    "tests/live_thinking_scheduler.test.mjs": [
      "tests/test_live_thinking_scheduler_js.py"
    ],
    "tests/noteTestOracle.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/notesApplication.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/notesCharacterization.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/notesDraftAutosave.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/notesInfrastructure.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/notesRecurrence.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/notesReminders.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/notesWorkflows.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/selectedNotesContext.test.mjs": [
      "tests/test_notes_reference_contracts_js.py"
    ],
    "tests/streaming/invariant.test.mjs": [
      "tests/test_streaming_segmenter_js.py"
    ],
    "tests/streaming/segmenter.test.mjs": [
      "tests/test_streaming_segmenter_js.py"
    ],
    "tests/turnRendering.test.mjs": [
      "tests/test_turn_rendering_js.py"
    ]
  },
  "architecture-ci": [
    "tests/frontendArchitecture.test.mjs"
  ]
 }
@@ -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)
@@ -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
@@ -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()
+CHAT = (ROOT / "static/js/chat.js").read_text(encoding="utf-8")
-SESSIONS = (ROOT / "static/js/sessions.js").read_text()
+SESSIONS = (ROOT / "static/js/sessions.js").read_text(encoding="utf-8")
 CSS = app_css()
@@ -2,8 +2,8 @@ from pathlib import Path
 ROOT = Path(__file__).resolve().parents[1]
-CHAT = (ROOT / "static/js/chat.js").read_text()
+CHAT = (ROOT / "static/js/chat.js").read_text(encoding="utf-8")
-RENDERER = (ROOT / "static/js/chatRenderer.js").read_text()
+RENDERER = (ROOT / "static/js/chatRenderer.js").read_text(encoding="utf-8")
 def test_processing_indicator_shows_live_ttft_timer():
@@ -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)
@@ -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
@@ -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"
@@ -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
@@ -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"
@@ -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")
@@ -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"
@@ -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"}
--- a/Show More
+++ b/Show More